Preparing for an initial release

packages/plugs/core/core.plug.yaml

@@ -35,6 +35,13 @@ functions:
     path: "./page.ts:parseIndexTextRepublish"
     events:
       - page:index_text
+  reindexSpaceCommand:
+    path: "./page.ts:reindexCommand"
+    command:
+      name: "Space: Reindex"
+  reindexSpace:
+    path: "./page.ts:reindexSpace"
+    env: server
   indexLinks:
     path: "./page.ts:indexLinks"
     events:
@@ -43,25 +50,10 @@ functions:
     path: ./page.ts:linkQueryProvider
     events:
       - query:link
-  # indexItems:
-  #   path: "./item.ts:indexItems"
-  #   events:
-  #     - page:index
-  # itemQueryProvider:
-  #   path: ./item.ts:queryProvider
-  #   events:
-  #     - query:item
   deletePage:
     path: "./page.ts:deletePage"
     command:
       name: "Page: Delete"
-  reindexSpaceCommand:
-    path: "./page.ts:reindexCommand"
-    command:
-      name: "Space: Reindex"
-  reindexSpace:
-    path: "./page.ts:reindexSpace"
-    env: server
   renamePage:
     path: "./page.ts:renamePage"
     command:
@@ -82,38 +74,39 @@ functions:
     path: "./navigate.ts:clickNavigate"
     events:
       - page:click
-  insertToday:
-    path: "./dates.ts:insertToday"
-    slashCommand:
-      name: today
-  insertTomorrow:
-    path: "./dates.ts:insertTomorrow"
-    slashCommand:
-      name: tomorrow
-  parseServerCommand:
-    path: ./debug.ts:parseServerPageCommand
-    command:
-      name: "Debug: Parse Document on Server"
-  parsePage:
-    path: ./debug.ts:parsePage
-  parseCommand:
-    path: ./debug.ts:parsePageCommand
-    command:
-      name: "Debug: Parse Document"
-  showLogsCommand:
-    path: ./debug.ts:showLogsCommand
-    command:
-      name: "Debug: Show Logs"
-      key: "Ctrl-Alt-l"
-      mac: "Cmd-Alt-l"
+
+  # Full text search
+  searchIndex:
+    path: ./search.ts:index
     events:
-      - log:reload
-  hideBhsCommand:
-    path: ./debug.ts:hideBhsCommand
+      - page:index
+  searchUnindex:
+    path: "./search.ts:unindex"
+    env: server
+    events:
+      - page:deleted
+  searchQueryProvider:
+    path: ./search.ts:queryProvider
+    events:
+      - query:full-text
+  searchCommand:
+    path: ./search.ts:searchCommand
     command:
-      name: "UI: Hide BHS"
-      key: "Ctrl-Alt-b"
-      mac: "Cmd-Alt-b"
+      name: "Search Space"
+      key: Ctrl-Shift-f
+      mac: Cmd-Shift-f
+  readPageSearch:
+    path: ./search.ts:readPageSearch
+    pageNamespace:
+      pattern: "@search/.+"
+      operation: readPage
+  getPageMetaSearch:
+    path: ./search.ts:getPageMetaSearch
+    pageNamespace:
+      pattern: "@search/.+"
+      operation: getPageMeta
+
+  # Template commands
   insertPageMeta:
     path: "./page.ts:insertPageMeta"
     slashCommand:
@@ -132,7 +125,16 @@ functions:
     path: ./template.ts:instantiateTemplateCommand
     command:
       name: "Template: Instantiate for Page"
+  insertToday:
+    path: "./dates.ts:insertToday"
+    slashCommand:
+      name: today
+  insertTomorrow:
+    path: "./dates.ts:insertTomorrow"
+    slashCommand:
+      name: tomorrow
 
+  # Text editing commands
   quoteSelection:
     path: ./text.ts:quoteSelection
     command:
@@ -159,3 +161,40 @@ functions:
       name: "Text: Italic"
       key: "Ctrl-i"
       mac: "Cmd-i"
+
+  # Plug manager
+  updatePlugsCommand:
+    path: ./plugmanager.ts:updatePlugsCommand
+    command:
+      name: "Plugs: Update"
+      key: "Ctrl-Shift-p"
+      mac: "Cmd-Shift-p"
+  updatePlugs:
+    path: ./plugmanager.ts:updatePlugs
+    env: server
+
+  # Debug commands
+  parseServerCommand:
+    path: ./debug.ts:parseServerPageCommand
+    command:
+      name: "Debug: Parse Document on Server"
+  parsePage:
+    path: ./debug.ts:parsePage
+  parseCommand:
+    path: ./debug.ts:parsePageCommand
+    command:
+      name: "Debug: Parse Document"
+  showLogsCommand:
+    path: ./debug.ts:showLogsCommand
+    command:
+      name: "Debug: Show Logs"
+      key: "Ctrl-Alt-l"
+      mac: "Cmd-Alt-l"
+    events:
+      - log:reload
+  hideBhsCommand:
+    path: ./debug.ts:hideBhsCommand
+    command:
+      name: "UI: Hide BHS"
+      key: "Ctrl-Alt-b"
+      mac: "Cmd-Alt-b"

packages/plugs/core/dates.ts

@@ -1,7 +1,5 @@
 import { insertAtCursor } from "@silverbulletmd/plugos-silverbullet-syscall/editor";
 
-const dateMatchRegex = /(\d{4}\-\d{2}\-\d{2})/g;
-
 export function niceDate(d: Date): string {
   return d.toISOString().split("T")[0];
 }

packages/plugs/core/debug.ts

@@ -1,5 +1,4 @@
 import { getLogs } from "@plugos/plugos-syscall/sandbox";
-import { LogEntry } from "@plugos/plugos/sandbox";
 import {
   getText,
   hideBhs,

packages/plugs/core/markup.ts

@@ -1,38 +0,0 @@
-import {
-  getCursor,
-  getText,
-  insertAtPos,
-  replaceRange,
-} from "@silverbulletmd/plugos-silverbullet-syscall/editor";
-
-export async function toggleH1() {
-  await togglePrefix("# ");
-}
-
-export async function toggleH2() {
-  await togglePrefix("## ");
-}
-
-function lookBack(s: string, pos: number, backString: string): boolean {
-  return s.substring(pos - backString.length, pos) === backString;
-}
-
-async function togglePrefix(prefix: string) {
-  let text = await getText();
-  let pos = await getCursor();
-  if (text[pos] === "\n") {
-    pos--;
-  }
-  while (pos > 0 && text[pos] !== "\n") {
-    if (lookBack(text, pos, prefix)) {
-      // Already has this prefix, let's flip it
-      await replaceRange(pos - prefix.length, pos, "");
-      return;
-    }
-    pos--;
-  }
-  if (pos) {
-    pos++;
-  }
-  await insertAtPos(prefix, pos);
-}

packages/plugs/core/navigate.ts

@@ -8,8 +8,6 @@ import {
 import { parseMarkdown } from "@silverbulletmd/plugos-silverbullet-syscall/markdown";
 import { nodeAtPos, ParseTree } from "@silverbulletmd/common/tree";
 
-const materializedQueryPrefix = /<!--\s*#query\s+/;
-
 async function actionClickOrActionEnter(mdTree: ParseTree | null) {
   if (!mdTree) {
     return;

packages/plugs/core/page.ts

@@ -35,9 +35,7 @@ import {
   replaceNodesMatching,
 } from "@silverbulletmd/common/tree";
 import { applyQuery, QueryProviderEvent } from "../query/engine";
-import { PageMeta } from "@silverbulletmd/common/types";
 import { extractMeta } from "../query/data";
-import { jsonToMDTable } from "../query/util";
 
 // Key space:
 //   pl:toPage:pos => pageName
@@ -101,8 +99,8 @@ export async function linkQueryProvider({
 
 export async function deletePage() {
   let pageName = await getCurrentPage();
-  console.log("Navigating to start page");
-  await navigate("start");
+  console.log("Navigating to index page");
+  await navigate("index");
   console.log("Deleting page from space");
   await deletePageSyscall(pageName);
 }

packages/plugs/core/plugmanager.ts

@@ -0,0 +1,69 @@
+import { dispatch } from "@plugos/plugos-syscall/event";
+import { findNodeOfType } from "@silverbulletmd/common/tree";
+import { flashNotification } from "@silverbulletmd/plugos-silverbullet-syscall/editor";
+import { parseMarkdown } from "@silverbulletmd/plugos-silverbullet-syscall/markdown";
+import {
+  deletePage,
+  listPages,
+  readPage,
+  writePage,
+} from "@silverbulletmd/plugos-silverbullet-syscall/space";
+import {
+  invokeFunction,
+  reloadPlugs,
+} from "@silverbulletmd/plugos-silverbullet-syscall/system";
+import YAML from "yaml";
+
+async function listPlugs(): Promise<string[]> {
+  let unfilteredPages = await listPages(true);
+  return unfilteredPages
+    .filter((p) => p.name.startsWith("_plug/"))
+    .map((p) => p.name.substring("_plug/".length));
+}
+
+export async function updatePlugsCommand() {
+  flashNotification("Updating plugs...");
+  await invokeFunction("server", "updatePlugs");
+  flashNotification("And... done!");
+  await reloadPlugs();
+}
+
+export async function updatePlugs() {
+  let { text: plugPageText } = await readPage("PLUGS");
+
+  let tree = await parseMarkdown(plugPageText);
+
+  let codeTextNode = findNodeOfType(tree, "CodeText");
+  if (!codeTextNode) {
+    console.error("Could not find yaml block in PLUGS");
+    return;
+  }
+  let plugYaml = codeTextNode.children![0].text;
+  let plugList = YAML.parse(plugYaml!);
+  console.log("Plug YAML", plugList);
+  let allPlugNames: string[] = [];
+  for (let plugUri of plugList) {
+    let [protocol, ...rest] = plugUri.split(":");
+    let manifests = await dispatch(`get-plug:${protocol}`, rest.join(":"));
+    if (manifests.length === 0) {
+      console.error("Could not resolve plug", plugUri);
+    }
+    // console.log("Got manifests", plugUri, protocol, manifests);
+    let manifest = manifests[0];
+    allPlugNames.push(manifest.name);
+    // console.log("Writing", `_plug/${manifest.name}`);
+    await writePage(
+      `_plug/${manifest.name}`,
+      JSON.stringify(manifest, null, 2)
+    );
+  }
+
+  // And delete extra ones
+  for (let existingPlug of await listPlugs()) {
+    if (!allPlugNames.includes(existingPlug)) {
+      console.log("Removing plug", existingPlug);
+      await deletePage(`_plug/${existingPlug}`);
+    }
+  }
+  await reloadPlugs();
+}

packages/plugs/core/search.ts

@@ -0,0 +1,87 @@
+import {
+  fullTextDelete,
+  fullTextIndex,
+  fullTextSearch,
+} from "@plugos/plugos-syscall/fulltext";
+import { renderToText } from "@silverbulletmd/common/tree";
+import { PageMeta } from "@silverbulletmd/common/types";
+import { queryPrefix } from "@silverbulletmd/plugos-silverbullet-syscall";
+import {
+  navigate,
+  prompt,
+} from "@silverbulletmd/plugos-silverbullet-syscall/editor";
+import { IndexTreeEvent } from "@silverbulletmd/web/app_event";
+import { applyQuery, QueryProviderEvent } from "../query/engine";
+import { removeQueries } from "../query/util";
+
+export async function index(data: IndexTreeEvent) {
+  removeQueries(data.tree);
+  let cleanText = renderToText(data.tree);
+  await fullTextIndex(data.name, cleanText);
+}
+
+export async function unindex(pageName: string) {
+  await fullTextDelete(pageName);
+}
+
+export async function queryProvider({
+  query,
+}: QueryProviderEvent): Promise<any[]> {
+  let phraseFilter = query.filter.find((f) => f.prop === "phrase");
+  if (!phraseFilter) {
+    throw Error("No 'phrase' filter specified, this is mandatory");
+  }
+  let results = await fullTextSearch(phraseFilter.value, 100);
+
+  let allPageMap: Map<string, any> = new Map(
+    results.map((r: any) => [r.name, r])
+  );
+  for (let { page, value } of await queryPrefix("meta:")) {
+    let p = allPageMap.get(page);
+    if (p) {
+      for (let [k, v] of Object.entries(value)) {
+        p[k] = v;
+      }
+    }
+  }
+
+  // Remove the "phrase" filter
+  query.filter.splice(query.filter.indexOf(phraseFilter), 1);
+
+  results = applyQuery(query, results);
+  return results;
+}
+
+export async function searchCommand() {
+  let phrase = await prompt("Search for: ");
+  if (phrase) {
+    await navigate(`@search/${phrase}`);
+  }
+}
+
+export async function readPageSearch(
+  name: string
+): Promise<{ text: string; meta: PageMeta }> {
+  let phrase = name.substring("@search/".length);
+  let results = await fullTextSearch(phrase, 100);
+  const text = `# Search results for "${phrase}"\n${results
+    .map((r: any) => `* [[${r.name}]] (score: ${r.rank})`)
+    .join("\n")}
+  `;
+  return {
+    text: text,
+    meta: {
+      name,
+      lastModified: 0,
+      perm: "ro",
+    },
+  };
+}
+
+export async function getPageMetaSearch(name: string): Promise<PageMeta> {
+  return {
+    name,
+    lastModified: 0,
+    perm: "ro",
+  };
+}

packages/plugs/core/server.ts

@@ -1,12 +0,0 @@
-import {
-  EndpointRequest,
-  EndpointResponse,
-} from "@plugos/plugos/hooks/endpoint";
-
-export function endpointTest(req: EndpointRequest): EndpointResponse {
-  console.log("I'm running on the server!", req);
-  return {
-    status: 200,
-    body: "Hello world!",
-  };
-}

packages/plugs/core/word_count_command.ts

@@ -1,9 +0,0 @@
-function countWords(str: string): number {
-  const matches = str.match(/[\w\d\'-]+/gi);
-  return matches ? matches.length : 0;
-}
-
-function readingTime(wordCount: number): number {
-  // 225 is average word reading speed for adults
-  return Math.ceil(wordCount / 225);
-}