Rewrote all plugs using MarkdownTree
This commit is contained in:
+57
-48
@@ -1,50 +1,45 @@
|
||||
import type { ClickEvent } from "../../webapp/app_event";
|
||||
import { IndexEvent } from "../../webapp/app_event";
|
||||
import type {ClickEvent} from "../../webapp/app_event";
|
||||
import {IndexEvent} from "../../webapp/app_event";
|
||||
|
||||
import { whiteOutQueries } from "../core/materialized_queries";
|
||||
import { batchSet } from "plugos-silverbullet-syscall/index";
|
||||
import { readPage, writePage } from "plugos-silverbullet-syscall/space";
|
||||
import {
|
||||
dispatch,
|
||||
getLineUnderCursor,
|
||||
getSyntaxNodeAtPos,
|
||||
} from "plugos-silverbullet-syscall/editor";
|
||||
|
||||
const taskFullRe =
|
||||
/(?<prefix>[\t ]*)[\-\*]\s*\[([ Xx])\]\s*([^\n]+)(\n\k<prefix>\s+[\-\*][^\n]+)*/g;
|
||||
|
||||
const extractPageLink = /[\-\*]\s*\[[ Xx]\]\s\[\[([^\]]+)@(\d+)\]\]\s*(.*)/;
|
||||
import {whiteOutQueries} from "../core/materialized_queries";
|
||||
import {batchSet} from "plugos-silverbullet-syscall/index";
|
||||
import {readPage, writePage} from "plugos-silverbullet-syscall/space";
|
||||
import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
|
||||
import {dispatch, getText,} from "plugos-silverbullet-syscall/editor";
|
||||
import {addParentPointers, collectNodesMatching, nodeAtPos, render,} from "../lib/tree";
|
||||
|
||||
type Task = {
|
||||
task: string;
|
||||
complete: boolean;
|
||||
pos?: number;
|
||||
children?: string[];
|
||||
nested?: string;
|
||||
};
|
||||
|
||||
export async function indexTasks({ name, text }: IndexEvent) {
|
||||
console.log("Indexing tasks");
|
||||
let tasks: { key: string; value: Task }[] = [];
|
||||
text = whiteOutQueries(text);
|
||||
for (let match of text.matchAll(taskFullRe)) {
|
||||
let entire = match[0];
|
||||
let complete = match[2] !== " ";
|
||||
let task = match[3];
|
||||
let pos = match.index!;
|
||||
let lines = entire.split("\n");
|
||||
let mdTree = await parseMarkdown(text);
|
||||
addParentPointers(mdTree);
|
||||
collectNodesMatching(mdTree, (n) => n.type === "Task").forEach((n) => {
|
||||
let task = n.children!.slice(1).map(render).join("").trim();
|
||||
let complete = n.children![0].children![0].text! !== "[ ]";
|
||||
|
||||
let value: Task = {
|
||||
task,
|
||||
complete,
|
||||
};
|
||||
if (lines.length > 1) {
|
||||
value.children = lines.slice(1);
|
||||
let taskIndex = n.parent!.children!.indexOf(n);
|
||||
let nestedItems = n.parent!.children!.slice(taskIndex + 1);
|
||||
if (nestedItems.length > 0) {
|
||||
value.nested = nestedItems.map(render).join("").trim();
|
||||
}
|
||||
tasks.push({
|
||||
key: `task:${pos}`,
|
||||
key: `task:${n.from}`,
|
||||
value,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
console.log("Found", tasks.length, "task(s)");
|
||||
await batchSet(name, tasks);
|
||||
}
|
||||
@@ -54,41 +49,55 @@ export async function taskToggle(event: ClickEvent) {
|
||||
}
|
||||
|
||||
export async function taskToggleAtPos(pos: number) {
|
||||
let syntaxNode = await getSyntaxNodeAtPos(pos);
|
||||
if (syntaxNode && syntaxNode.name === "TaskMarker") {
|
||||
let text = await getText();
|
||||
let mdTree = await parseMarkdown(text);
|
||||
addParentPointers(mdTree);
|
||||
|
||||
let node = nodeAtPos(mdTree, pos);
|
||||
if (node && node.type === "TaskMarker") {
|
||||
let changeTo = "[x]";
|
||||
if (syntaxNode.text === "[x]" || syntaxNode.text === "[X]") {
|
||||
if (node.children![0].text === "[x]" || node.children![0].text === "[X]") {
|
||||
changeTo = "[ ]";
|
||||
}
|
||||
await dispatch({
|
||||
changes: {
|
||||
from: syntaxNode.from,
|
||||
to: syntaxNode.to,
|
||||
from: node.from,
|
||||
to: node.to,
|
||||
insert: changeTo,
|
||||
},
|
||||
selection: {
|
||||
anchor: pos,
|
||||
},
|
||||
});
|
||||
// In case there's a page reference with @ position in the task, let's propagate this change back to that page
|
||||
// Example: * [ ] [[MyPage@123]] My task
|
||||
let line = await getLineUnderCursor();
|
||||
let match = line.match(extractPageLink);
|
||||
if (match) {
|
||||
console.log("Found a remote task reference, updating other page");
|
||||
let [, page, posS] = match;
|
||||
let pos = +posS;
|
||||
let pageData = await readPage(page);
|
||||
let text = pageData.text;
|
||||
|
||||
// Apply the toggle
|
||||
text =
|
||||
text.substring(0, pos) +
|
||||
text
|
||||
.substring(pos)
|
||||
.replace(/^(\s*[\-\*]\s*)\[[ xX]\]/, "$1" + changeTo);
|
||||
let parentWikiLinks = collectNodesMatching(
|
||||
node.parent!,
|
||||
(n) => n.type === "WikiLinkPage"
|
||||
);
|
||||
for (let wikiLink of parentWikiLinks) {
|
||||
let ref = wikiLink.children![0].text!;
|
||||
if (ref.includes("@")) {
|
||||
let [page, pos] = ref.split("@");
|
||||
let pageData = await readPage(page);
|
||||
let text = pageData.text;
|
||||
|
||||
await writePage(page, text);
|
||||
let referenceMdTree = await parseMarkdown(text);
|
||||
// Adding +1 to immediately hit the task marker
|
||||
let taskMarkerNode = nodeAtPos(referenceMdTree, +pos + 1);
|
||||
|
||||
if (!taskMarkerNode || taskMarkerNode.type !== "TaskMarker") {
|
||||
console.error(
|
||||
"Reference not a task marker, out of date?",
|
||||
taskMarkerNode
|
||||
);
|
||||
return;
|
||||
}
|
||||
taskMarkerNode.children![0].text = changeTo;
|
||||
console.log("This will be the new marker", render(taskMarkerNode));
|
||||
text = render(referenceMdTree);
|
||||
console.log("Updated reference paged text", text);
|
||||
await writePage(page, text);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user