Massive restructure of plugin API

common/parse_tree.ts

@@ -1,4 +1,4 @@
-import { ParseTree } from "./tree.ts";
+import { ParseTree } from "$sb/lib/tree.ts";
 
 import type { SyntaxNode } from "./deps.ts";
 import type { Language } from "./deps.ts";

common/syscalls/markdown.ts

@@ -1,7 +1,7 @@
 import { SysCallMapping } from "../../plugos/system.ts";
 import { parse } from "../parse_tree.ts";
 import { Language } from "../deps.ts";
-import type { ParseTree } from "../tree.ts";
+import type { ParseTree } from "$sb/lib/tree.ts";
 
 export function markdownSyscalls(lang: Language): SysCallMapping {
   return {

common/tree.test.ts

@@ -1,78 +0,0 @@
-import { parse } from "./parse_tree.ts";
-import {
-  addParentPointers,
-  collectNodesMatching,
-  findParentMatching,
-  nodeAtPos,
-  removeParentPointers,
-  renderToText,
-  replaceNodesMatching,
-} from "./tree.ts";
-import wikiMarkdownLang from "./parser.ts";
-import { assertEquals, assertNotEquals } from "../test_deps.ts";
-
-const mdTest1 = `
-# Heading
-## Sub _heading_ cool
-
-Hello, this is some **bold** text and *italic*. And [a link](http://zef.me).
-
-%% My comment here
-%% And second line
-
-And an @mention
-
-http://zef.plus
-
-- This is a list [[PageLink]]
-- With another item
-- TODOs:
-  - [ ] A task that's not yet done
-  - [x] Hello
-- And a _third_ one [[Wiki Page]] yo
-`;
-
-const mdTest2 = `
-Hello
-
-* Item 1
-*
-
-Sup`;
-
-const mdTest3 = `
-\`\`\`yaml
-name: something
-\`\`\`
-`;
-
-Deno.test("Run a Node sandbox", () => {
-  const lang = wikiMarkdownLang([]);
-  let mdTree = parse(lang, mdTest1);
-  addParentPointers(mdTree);
-  // console.log(JSON.stringify(mdTree, null, 2));
-  let wikiLink = nodeAtPos(mdTree, mdTest1.indexOf("Wiki Page"))!;
-  assertEquals(wikiLink.type, "WikiLink");
-  assertNotEquals(
-    findParentMatching(wikiLink, (n) => n.type === "BulletList"),
-    null,
-  );
-
-  let allTodos = collectNodesMatching(mdTree, (n) => n.type === "Task");
-  assertEquals(allTodos.length, 2);
-
-  // Render back into markdown should be equivalent
-  assertEquals(renderToText(mdTree), mdTest1);
-
-  removeParentPointers(mdTree);
-  replaceNodesMatching(mdTree, (n) => {
-    if (n.type === "Task") {
-      return {
-        type: "Tosk",
-      };
-    }
-  });
-  console.log(JSON.stringify(mdTree, null, 2));
-  let mdTree3 = parse(lang, mdTest3);
-  console.log(JSON.stringify(mdTree3, null, 2));
-});

common/tree.ts

@@ -1,150 +0,0 @@
-export type ParseTree = {
-  type?: string; // undefined === text node
-  from?: number;
-  to?: number;
-  text?: string;
-  children?: ParseTree[];
-  // Only present after running addParentPointers
-  parent?: ParseTree;
-};
-
-export function addParentPointers(tree: ParseTree) {
-  if (!tree.children) {
-    return;
-  }
-  for (let child of tree.children) {
-    if (child.parent) {
-      // Already added parent pointers before
-      return;
-    }
-    child.parent = tree;
-    addParentPointers(child);
-  }
-}
-
-export function removeParentPointers(tree: ParseTree) {
-  delete tree.parent;
-  if (!tree.children) {
-    return;
-  }
-  for (let child of tree.children) {
-    removeParentPointers(child);
-  }
-}
-
-export function findParentMatching(
-  tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean,
-): ParseTree | null {
-  let node = tree.parent;
-  while (node) {
-    if (matchFn(node)) {
-      return node;
-    }
-    node = node.parent;
-  }
-  return null;
-}
-
-export function collectNodesOfType(
-  tree: ParseTree,
-  nodeType: string,
-): ParseTree[] {
-  return collectNodesMatching(tree, (n) => n.type === nodeType);
-}
-
-export function collectNodesMatching(
-  tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean,
-): ParseTree[] {
-  if (matchFn(tree)) {
-    return [tree];
-  }
-  let results: ParseTree[] = [];
-  if (tree.children) {
-    for (let child of tree.children) {
-      results = [...results, ...collectNodesMatching(child, matchFn)];
-    }
-  }
-  return results;
-}
-
-// return value: returning undefined = not matched, continue, null = delete, new node = replace
-export function replaceNodesMatching(
-  tree: ParseTree,
-  substituteFn: (tree: ParseTree) => ParseTree | null | undefined,
-) {
-  if (tree.children) {
-    let children = tree.children.slice();
-    for (let child of children) {
-      let subst = substituteFn(child);
-      if (subst !== undefined) {
-        let pos = tree.children.indexOf(child);
-        if (subst) {
-          tree.children.splice(pos, 1, subst);
-        } else {
-          // null = delete
-          tree.children.splice(pos, 1);
-        }
-      } else {
-        replaceNodesMatching(child, substituteFn);
-      }
-    }
-  }
-}
-
-export function findNodeMatching(
-  tree: ParseTree,
-  matchFn: (tree: ParseTree) => boolean,
-): ParseTree | null {
-  return collectNodesMatching(tree, matchFn)[0];
-}
-
-export function findNodeOfType(
-  tree: ParseTree,
-  nodeType: string,
-): ParseTree | null {
-  return collectNodesMatching(tree, (n) => n.type === nodeType)[0];
-}
-
-export function traverseTree(
-  tree: ParseTree,
-  // Return value = should stop traversal?
-  matchFn: (tree: ParseTree) => boolean,
-): void {
-  // Do a collect, but ignore the result
-  collectNodesMatching(tree, matchFn);
-}
-
-// Finds non-text node at position
-export function nodeAtPos(tree: ParseTree, pos: number): ParseTree | null {
-  if (pos < tree.from! || pos > tree.to!) {
-    return null;
-  }
-  if (!tree.children) {
-    return tree;
-  }
-  for (let child of tree.children) {
-    let n = nodeAtPos(child, pos);
-    if (n && n.text !== undefined) {
-      // Got a text node, let's return its parent
-      return tree;
-    } else if (n) {
-      // Got it
-      return n;
-    }
-  }
-  return null;
-}
-
-// Turn ParseTree back into text
-export function renderToText(tree: ParseTree): string {
-  let pieces: string[] = [];
-  if (tree.text !== undefined) {
-    return tree.text;
-  }
-  for (let child of tree.children!) {
-    pieces.push(renderToText(child));
-  }
-  return pieces.join("");
-}