A whole lot of enhancements

plugs/core/item.ts

@@ -3,7 +3,7 @@ import {whiteOutQueries} from "./materialized_queries";
 
 import {batchSet} from "plugos-silverbullet-syscall/index";
 import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
-import {collectNodesMatching, MarkdownTree, render} from "../lib/tree";
+import {collectNodesMatching, MarkdownTree, renderMarkdown,} from "../lib/tree";
 
 type Item = {
   item: string;
@@ -27,12 +27,12 @@ export async function indexItems({ name, text }: IndexEvent) {
     let nested: string | undefined;
     for (let child of n.children!.slice(1)) {
       if (child.type === "OrderedList" || child.type === "BulletList") {
-        nested = render(child);
+        nested = renderMarkdown(child);
         break;
       }
       textNodes.push(child);
     }
-    let item = textNodes.map(render).join("").trim();
+    let item = textNodes.map(renderMarkdown).join("").trim();
     let value: Item = {
       item,
     };

plugs/core/markdown.ts

@@ -1,23 +0,0 @@
-import mdParser from "../../webapp/parser";
-import { getText } from "plugos-silverbullet-syscall/editor";
-
-export async function renderMD() {
-  let text = await getText();
-  let tree = mdParser.parser.parse(text);
-  let slicesToRemove: [number, number][] = [];
-
-  tree.iterate({
-    enter(type, from, to): false | void {
-      switch (type.name) {
-        case "Comment":
-          slicesToRemove.push([from, to]);
-          return false;
-      }
-    },
-  });
-  // console.log("output peices", JSON.stringify(tree));
-  slicesToRemove.reverse().forEach(([from, to]) => {
-    text = text.slice(0, from) + text.slice(to);
-  });
-  console.log("Clean md", text);
-}

plugs/core/materialized_queries.ts

@@ -1,11 +1,11 @@
 import {flashNotification, getCurrentPage, reloadPage, save,} from "plugos-silverbullet-syscall/editor";
 
-import {readPage, writePage} from "plugos-silverbullet-syscall/space";
+import {listPages, readPage, writePage,} from "plugos-silverbullet-syscall/space";
 import {invokeFunctionOnServer} from "plugos-silverbullet-syscall/system";
 import {scanPrefixGlobal} from "plugos-silverbullet-syscall";
 
 export const queryRegex =
-  /(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*(group by\s+(?<groupBy>\w+))?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
+  /(<!--\s*#query\s+(?<table>\w+)\s*(filter\s+["'“”‘’](?<filter>[^"'“”‘’]+)["'“”‘’])?\s*\s*(order by\s+(?<orderBy>\w+)(?<orderDesc>\s+desc)?)?(group by\s+(?<groupBy>\w+))?\s*(limit\s+(?<limit>\d+))?\s*-->)(.+?)(<!--\s*#end\s*-->)/gs;
 
 export function whiteOutQueries(text: string): string {
   return text.replaceAll(queryRegex, (match) =>
@@ -40,11 +40,38 @@ export async function updateMaterializedQueriesCommand() {
 export async function updateMaterializedQueriesOnPage(pageName: string) {
   let { text } = await readPage(pageName);
   text = await replaceAsync(text, queryRegex, async (match, ...args) => {
-    let { table, filter, groupBy } = args[args.length - 1];
+    let { table, filter, groupBy, limit, orderBy, orderDesc } =
+      args[args.length - 1];
     const startQuery = args[0];
     const endQuery = args[args.length - 4];
     let results = [];
     switch (table) {
+      case "page":
+        let pages = await listPages();
+        if (orderBy) {
+          pages = pages.sort((a: any, b: any) => {
+            console.log(a, orderBy, a[orderBy]);
+            if (a[orderBy] === b[orderBy]) {
+              return 0;
+            }
+            if (a[orderBy] < b[orderBy]) {
+              return !!orderDesc ? 1 : -1;
+            } else {
+              return !!orderDesc ? -1 : 1;
+            }
+          });
+        }
+        let matchCount = 0;
+        for (let pageMeta of pages) {
+          if (!filter || (filter && pageMeta.name.includes(filter))) {
+            matchCount++;
+            results.push(`* [[${pageMeta.name}]]`);
+            if (limit && matchCount === +limit) {
+              break;
+            }
+          }
+        }
+        return `${startQuery}\n${results.join("\n")}\n${endQuery}`;
       case "task":
         for (let {
           key,

plugs/core/navigate.ts

@@ -3,8 +3,7 @@ import {updateMaterializedQueriesCommand} from "./materialized_queries";
 import {getCursor, getText, navigate as navigateTo, openUrl,} from "plugos-silverbullet-syscall/editor";
 import {taskToggleAtPos} from "../tasks/task";
 import {parseMarkdown} from "plugos-silverbullet-syscall/markdown";
-import {nodeAtPos} from "../lib/tree";
-import type {MarkdownTree} from "../../common/tree";
+import {MarkdownTree, nodeAtPos} from "../lib/tree";
 
 const materializedQueryPrefix = /<!--\s*#query\s+/;
 
@@ -34,14 +33,14 @@ async function actionClickOrActionEnter(mdTree: MarkdownTree | null) {
       await openUrl(mdTree.children![4].children![0].text!);
       break;
     case "TaskMarker":
-      await taskToggleAtPos(mdTree.from + 1);
+      await taskToggleAtPos(mdTree.from! + 1);
       break;
   }
 }
 
 export async function linkNavigate() {
   let mdTree = await parseMarkdown(await getText());
-  let newNode = await nodeAtPos(mdTree, await getCursor());
+  let newNode = nodeAtPos(mdTree, await getCursor());
   await actionClickOrActionEnter(newNode);
 }