Work on $share

plugs/directive/command.ts

@@ -2,13 +2,13 @@ import { editor, markdown, system } from "$sb/silverbullet-syscall/mod.ts";
 import { nodeAtPos } from "$sb/lib/tree.ts";
 import { replaceAsync } from "$sb/lib/util.ts";
 import { directiveRegex, renderDirectives } from "./directives.ts";
-import { extractMeta } from "./data.ts";
+import { extractFrontmatter } from "$sb/lib/frontmatter.ts";
 
 export async function updateDirectivesOnPageCommand() {
   const pageName = await editor.getCurrentPage();
   const text = await editor.getText();
   const tree = await markdown.parseMarkdown(text);
-  const metaData = extractMeta(tree, ["$disableDirectives"]);
+  const metaData = extractFrontmatter(tree, ["$disableDirectives"]);
   if (metaData.$disableDirectives) {
     // Not updating, directives disabled
     return;

plugs/directive/data.ts

@@ -3,14 +3,7 @@
 
 import type { IndexTreeEvent, QueryProviderEvent } from "$sb/app_event.ts";
 import { index } from "$sb/silverbullet-syscall/mod.ts";
-import {
-  addParentPointers,
-  collectNodesOfType,
-  findNodeOfType,
-  ParseTree,
-  renderToText,
-  replaceNodesMatching,
-} from "$sb/lib/tree.ts";
+import { collectNodesOfType, findNodeOfType } from "$sb/lib/tree.ts";
 import { applyQuery, removeQueries } from "$sb/lib/query.ts";
 import * as YAML from "yaml";
 
@@ -56,105 +49,6 @@ export async function indexData({ name, tree }: IndexTreeEvent) {
   await index.batchSet(name, dataObjects);
 }
 
-export function extractMeta(
-  parseTree: ParseTree,
-  removeKeys: string[] = [],
-): any {
-  let data: any = {};
-  addParentPointers(parseTree);
-
-  replaceNodesMatching(parseTree, (t) => {
-    // Find top-level hash tags
-    if (t.type === "Hashtag") {
-      // Check if if nested directly into a Paragraph
-      if (t.parent && t.parent.type === "Paragraph") {
-        const tagname = t.children![0].text!.substring(1);
-        if (!data.tags) {
-          data.tags = [];
-        }
-        if (!data.tags.includes(tagname)) {
-          data.tags.push(tagname);
-        }
-      }
-      return;
-    }
-    // Find FrontMatter and parse it
-    if (t.type === "FrontMatter") {
-      const yamlText = renderToText(t.children![1].children![0]);
-      try {
-        const parsedData: any = YAML.parse(yamlText);
-        const newData = { ...parsedData };
-        data = { ...data, ...parsedData };
-        if (removeKeys.length > 0) {
-          let removedOne = false;
-
-          for (const key of removeKeys) {
-            if (key in newData) {
-              delete newData[key];
-              removedOne = true;
-            }
-          }
-          if (removedOne) {
-            t.children![0].text = YAML.stringify(newData);
-          }
-        }
-        // If nothing is left, let's just delete this whole block
-        if (Object.keys(newData).length === 0) {
-          return null;
-        }
-      } catch (e: any) {
-        console.error("Could not parse frontmatter", e);
-      }
-    }
-
-    // Find a fenced code block with `meta` as the language type
-    if (t.type !== "FencedCode") {
-      return;
-    }
-    const codeInfoNode = findNodeOfType(t, "CodeInfo");
-    if (!codeInfoNode) {
-      return;
-    }
-    if (codeInfoNode.children![0].text !== "meta") {
-      return;
-    }
-    const codeTextNode = findNodeOfType(t, "CodeText");
-    if (!codeTextNode) {
-      // Honestly, this shouldn't happen
-      return;
-    }
-    const codeText = codeTextNode.children![0].text!;
-    const parsedData: any = YAML.parse(codeText);
-    const newData = { ...parsedData };
-    data = { ...data, ...parsedData };
-    if (removeKeys.length > 0) {
-      let removedOne = false;
-      for (const key of removeKeys) {
-        if (key in newData) {
-          delete newData[key];
-          removedOne = true;
-        }
-      }
-      if (removedOne) {
-        codeTextNode.children![0].text = YAML.stringify(newData).trim();
-      }
-    }
-    // If nothing is left, let's just delete this whole block
-    if (Object.keys(newData).length === 0) {
-      return null;
-    }
-
-    return undefined;
-  });
-
-  if (data.name) {
-    data.displayName = data.name;
-    delete data.name;
-  }
-
-  return data;
-}
-
 export async function queryProvider({
   query,
 }: QueryProviderEvent): Promise<any[]> {

plugs/directive/directives.ts

@@ -2,7 +2,6 @@ import { nodeAtPos, ParseTree, renderToText } from "$sb/lib/tree.ts";
 import { replaceAsync } from "$sb/lib/util.ts";
 import { markdown } from "$sb/silverbullet-syscall/mod.ts";
 
-import { extractMeta } from "./data.ts";
 import { evalDirectiveRenderer } from "./eval_directive.ts";
 import { queryDirectiveRenderer } from "./query_directive.ts";
 import {

plugs/directive/template_directive.ts

@@ -5,7 +5,7 @@ import { markdown, space } from "$sb/silverbullet-syscall/mod.ts";
 import Handlebars from "handlebars";
 
 import { replaceTemplateVars } from "../core/template.ts";
-import { extractMeta } from "./data.ts";
+import { extractFrontmatter } from "$sb/lib/frontmatter.ts";
 import { directiveRegex, renderDirectives } from "./directives.ts";
 
 const templateRegex = /\[\[([^\]]+)\]\]\s*(.*)\s*/;
@@ -44,7 +44,7 @@ export async function templateDirectiveRenderer(
   // if it's a template injection (not a literal "include")
   if (directive === "use" || directive === "use-verbose") {
     const tree = await markdown.parseMarkdown(templateText);
-    extractMeta(tree, ["$disableDirectives"]);
+    extractFrontmatter(tree, ["$disableDirectives"]);
     templateText = renderToText(tree);
     const templateFn = Handlebars.compile(
       replaceTemplateVars(templateText, pageName),