Rewrote all plugs using MarkdownTree

plugs/core/item.ts

@@ -1,40 +1,49 @@
-import { IndexEvent } from "../../webapp/app_event";
-import { whiteOutQueries } from "./materialized_queries";
+import {IndexEvent} from "../../webapp/app_event";
+import {whiteOutQueries} from "./materialized_queries";
 
-import { batchSet } from "plugos-silverbullet-syscall/index";
+import {batchSet} from "plugos-silverbullet-syscall/index";
+import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
+import {collectNodesMatching, MarkdownTree, render} from "../lib/tree";
 
 type Item = {
   item: string;
-  children?: string[];
+  nested?: string;
 };
 
-const pageRefRe = /\[\[[^\]]+@\d+\]\]/;
-const itemFullRe =
-  /(?<prefix>[\t ]*)[\-\*]\s*([^\n]+)(\n\k<prefix>\s+[\-\*][^\n]+)*/g;
-
 export async function indexItems({ name, text }: IndexEvent) {
   let items: { key: string; value: Item }[] = [];
   text = whiteOutQueries(text);
-  for (let match of text.matchAll(itemFullRe)) {
-    let entire = match[0];
-    let item = match[2];
-    if (item.match(pageRefRe)) {
-      continue;
-    }
-    let pos = match.index!;
-    let lines = entire.split("\n");
 
+  console.log("Indexing items", name);
+  let mdTree = await parseMarkdown(text);
+
+  let coll = collectNodesMatching(mdTree, (n) => n.type === "ListItem");
+
+  coll.forEach((n) => {
+    if (!n.children) {
+      return;
+    }
+    let textNodes: MarkdownTree[] = [];
+    let nested: string | undefined;
+    for (let child of n.children!.slice(1)) {
+      if (child.type === "OrderedList" || child.type === "BulletList") {
+        nested = render(child);
+        break;
+      }
+      textNodes.push(child);
+    }
+    let item = textNodes.map(render).join("").trim();
     let value: Item = {
       item,
     };
-    if (lines.length > 1) {
-      value.children = lines.slice(1);
+    if (nested) {
+      value.nested = nested;
     }
     items.push({
-      key: `it:${pos}`,
+      key: `it:${n.from}`,
       value,
     });
-  }
+  });
   console.log("Found", items.length, "item(s)");
   await batchSet(name, items);
 }

plugs/core/materialized_queries.ts

@@ -49,13 +49,13 @@ export async function updateMaterializedQueriesOnPage(pageName: string) {
         for (let {
           key,
           page,
-          value: { task, complete, children },
+          value: { task, complete, nested },
         } of await scanPrefixGlobal("task:")) {
           let [, pos] = key.split(":");
           if (!filter || (filter && task.includes(filter))) {
             results.push(
               `* [${complete ? "x" : " "}] [[${page}@${pos}]] ${task}` +
-                (children ? "\n" + children.join("\n") : "")
+                (nested ? "\n  " + nested : "")
             );
           }
         }
@@ -78,13 +78,12 @@ export async function updateMaterializedQueriesOnPage(pageName: string) {
         for (let {
           key,
           page,
-          value: { item, children },
+          value: { item, nested },
         } of await scanPrefixGlobal("it:")) {
           let [, pos] = key.split(":");
           if (!filter || (filter && item.includes(filter))) {
             results.push(
-              `* [[${page}@${pos}]] ${item}` +
-                (children ? "\n" + children.join("\n") : "")
+              `* [[${page}@${pos}]] ${item}` + (nested ? "\n  " + nested : "")
             );
           }
         }

plugs/core/navigate.ts

@@ -2,7 +2,8 @@ import {ClickEvent} from "../../webapp/app_event";
 import {updateMaterializedQueriesCommand} from "./materialized_queries";
 import {getCursor, getText, navigate as navigateTo, openUrl,} from "plugos-silverbullet-syscall/editor";
 import {taskToggleAtPos} from "../tasks/task";
-import {nodeAtPos, parse} from "plugos-silverbullet-syscall/markdown";
+import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
+import {nodeAtPos} from "../lib/tree";
 import type {MarkdownTree} from "../../common/tree";
 
 const materializedQueryPrefix = /<!--\s*#query\s+/;
@@ -39,16 +40,15 @@ async function actionClickOrActionEnter(mdTree: MarkdownTree | null) {
 }
 
 export async function linkNavigate() {
-  let mdTree = await parse(await getText());
+  let mdTree = await parseMarkdown(await getText());
   let newNode = await nodeAtPos(mdTree, await getCursor());
   await actionClickOrActionEnter(newNode);
 }
 
 export async function clickNavigate(event: ClickEvent) {
   if (event.ctrlKey || event.metaKey) {
-    let mdTree = await parse(await getText());
-    let newNode = await nodeAtPos(mdTree, event.pos);
-    console.log("New node", newNode);
+    let mdTree = await parseMarkdown(await getText());
+    let newNode = nodeAtPos(mdTree, event.pos);
     await actionClickOrActionEnter(newNode);
   }
 }