@silverbulletmd/silverbullet 2.5.3 → 2.7.0

package/client/plugos/syscalls/editor.ts

@@ -7,21 +7,67 @@ import {
   unfoldCode,
 } from "@codemirror/language";
 import {
+  cursorCharLeft,
+  cursorCharRight,
+  cursorDocEnd,
+  cursorDocStart,
+  cursorGroupLeft,
+  cursorGroupRight,
+  cursorLineBoundaryLeft,
+  cursorLineBoundaryRight,
+  cursorLineDown,
+  cursorLineEnd,
+  cursorLineStart,
+  cursorLineUp,
+  cursorPageDown,
+  cursorPageUp,
+  deleteCharBackward,
+  deleteCharForward,
+  deleteGroupBackward,
+  deleteGroupForward,
   deleteLine,
+  deleteLineBoundaryBackward,
+  deleteLineBoundaryForward,
+  indentLess,
+  indentMore,
   insertNewline,
   insertNewlineAndIndent,
   moveLineDown,
   moveLineUp,
   redo,
+  selectAll,
+  selectCharLeft,
+  selectCharRight,
+  selectDocEnd,
+  selectDocStart,
+  selectGroupLeft,
+  selectGroupRight,
+  selectLineBoundaryLeft,
+  selectLineBoundaryRight,
+  selectLineDown,
+  selectLineEnd,
+  selectLineStart,
+  selectLineUp,
+  selectPageDown,
+  selectPageUp,
   toggleComment,
+  transposeChars,
   undo,
 } from "@codemirror/commands";
+import {
+  acceptCompletion,
+  closeCompletion,
+  moveCompletionSelection,
+  startCompletion,
+} from "@codemirror/autocomplete";
 import type { Transaction } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
-import { getCM as vimGetCm, Vim } from "@replit/codemirror-vim";
+import { getVimModule } from "../../vim_loader.ts";
 import type { SysCallMapping } from "../system.ts";
 import type {
   FilterOption,
+  NotificationAction,
+  NotificationType,
   UploadFile,
 } from "@silverbulletmd/silverbullet/type/client";
 import { openSearchPanel } from "@codemirror/search";
@@ -48,11 +94,11 @@ export function editorSyscalls(client: Client): SysCallMapping {
       return client.currentPath();
     },
     "editor.getCurrentEditor": (): string => {
-      return client.documentEditor?.name || "page";
+      return client.contentManager.documentEditor?.name || "page";
     },
     "editor.getRecentlyOpenedPages": (): PageMeta[] => {
-      return client.ui.viewState.allPages.sort((a, b) =>
-        (b.lastOpened || 0) - (a.lastOpened || 0)
+      return client.ui.viewState.allPages.sort(
+        (a, b) => (b.lastOpened || 0) - (a.lastOpened || 0),
       );
     },
     "editor.getText": () => {
@@ -68,12 +114,14 @@ export function editorSyscalls(client: Client): SysCallMapping {
       const line = client.editorView.state.doc.lineAt(pos);
       return {
         ...line,
-        textWithCursor: line.text.slice(0, pos - line.from) + "|^|" +
+        textWithCursor:
+          line.text.slice(0, pos - line.from) +
+          "|^|" +
           line.text.slice(pos - line.from),
       };
     },
     "editor.setText": (_ctx, newText: string, shouldIsolateHistory = false) => {
-      client.setEditorText(newText, shouldIsolateHistory);
+      client.contentManager.setEditorText(newText, shouldIsolateHistory);
     },
     "editor.getCursor": (): number => {
       return client.editorView.state.selection.main.from;
@@ -127,7 +175,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
 
         legacyRef.kind ??= "page";
 
-        let details: Ref["details"] ;
+        let details: Ref["details"];
 
         if (typeof legacyRef.pos === "number") {
           details = {
@@ -160,13 +208,9 @@ export function editorSyscalls(client: Client): SysCallMapping {
       // some validation library. Didn't want to use jsonschemas here tho.
       // Ideally this would be moved into a function too
       if (!isValidPath(ref.path) && ref.path !== "") {
-        throw new Error(
-          "Path passed in ref to `editor.navigate` is invalid",
-        );
+        throw new Error("Path passed in ref to `editor.navigate` is invalid");
       } else if (typeof ref.meta !== "boolean" && ref.meta !== undefined) {
-        throw new Error(
-          "ref.meta has to be of type `boolean`",
-        );
+        throw new Error("ref.meta has to be of type `boolean`");
       } else if (ref.details !== undefined && typeof ref.details !== "object") {
         throw new Error(
           "ref.details has to be of type `object` or `undefined`",
@@ -181,17 +225,15 @@ export function editorSyscalls(client: Client): SysCallMapping {
       }
 
       if (
-        ref.details?.type === "position" && typeof ref.details.pos !== "number"
+        ref.details?.type === "position" &&
+        typeof ref.details.pos !== "number"
       ) {
-        throw new Error(
-          "ref.details.pos has to be of type `number`",
-        );
+        throw new Error("ref.details.pos has to be of type `number`");
       } else if (
-        ref.details?.type === "header" && typeof ref.details.header !== "string"
+        ref.details?.type === "header" &&
+        typeof ref.details.header !== "string"
       ) {
-        throw new Error(
-          "ref.details.header has to be of type `string`",
-        );
+        throw new Error("ref.details.header has to be of type `string`");
       } else if (
         ref.details?.type === "linecolumn" &&
         typeof ref.details.line !== "number" &&
@@ -214,14 +256,12 @@ export function editorSyscalls(client: Client): SysCallMapping {
       client.rebuildEditorState();
     },
     "editor.reloadConfigAndCommands": async () => {
-      await client.clientSystem.system.localSyscall(
-        "system.loadScripts",
-        [],
-      );
+      await client.clientSystem.system.localSyscall("system.loadScripts", []);
       await client.clientSystem.system.localSyscall(
         "system.loadSpaceStyles",
         [],
       );
+      client.reconfigureLanguage();
     },
     "editor.invokeCommand": (_ctx, name: string, args?: string[]) => {
       return client.runCommandByName(name, args);
@@ -288,15 +328,19 @@ export function editorSyscalls(client: Client): SysCallMapping {
           reject(e);
         };
 
+        input.style.display = "none";
+        document.body.appendChild(input);
         input.click();
+        setTimeout(() => document.body.removeChild(input), 1000);
       });
     },
     "editor.flashNotification": (
       _ctx,
       message: string,
-      type: "error" | "info" = "info",
+      type: NotificationType = "info",
+      options?: { timeout?: number; actions?: NotificationAction[] },
     ) => {
-      client.flashNotification(message, type);
+      client.ui.flashNotification(message, type, options);
     },
     "editor.filterBox": (
       _ctx,
@@ -305,7 +349,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
       helpText = "",
       placeHolder = "",
     ): Promise<FilterOption | undefined> => {
-      return client.filterBox(label, options, helpText, placeHolder);
+      return client.ui.filterBox(label, options, helpText, placeHolder);
     },
     "editor.showPanel": (
       _ctx,
@@ -324,6 +368,9 @@ export function editorSyscalls(client: Client): SysCallMapping {
         client.editorView.dispatch({});
       });
     },
+    "editor.focus": () => {
+      client.focus();
+    },
     "editor.hidePanel": (_ctx, id: string) => {
       client.ui.viewDispatch({
         type: "hide-panel",
@@ -339,7 +386,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
       progressPercentage?: number,
       progressType?: "sync" | "index",
     ) => {
-      client.showProgress(progressPercentage, progressType);
+      client.ui.showProgress(progressPercentage, progressType);
     },
     "editor.insertAtPos": (
       _ctx,
@@ -351,7 +398,8 @@ export function editorSyscalls(client: Client): SysCallMapping {
       if (cursorPlaceHolder) {
         cursorPlaceholderPos = text.indexOf("|^|");
         if (cursorPlaceholderPos !== -1) {
-          text = text.slice(0, cursorPlaceholderPos) +
+          text =
+            text.slice(0, cursorPlaceholderPos) +
             text.slice(cursorPlaceholderPos + 3);
         } else {
           cursorPlaceHolder = false;
@@ -369,9 +417,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
           selection: {
             anchor: cursorPos,
           },
-          effects: [
-            EditorView.scrollIntoView(cursorPos),
-          ],
+          effects: [EditorView.scrollIntoView(cursorPos)],
         });
       }
     },
@@ -385,7 +431,8 @@ export function editorSyscalls(client: Client): SysCallMapping {
       let cursorPlaceholderPos = -1;
       if (cursorPlaceHolder) {
         cursorPlaceholderPos = text.indexOf("|^|");
-        text = text.slice(0, cursorPlaceholderPos) +
+        text =
+          text.slice(0, cursorPlaceholderPos) +
           text.slice(cursorPlaceholderPos + 3);
       }
       client.editorView.dispatch({
@@ -401,9 +448,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
           selection: {
             anchor: cursorPos,
           },
-          effects: [
-            EditorView.scrollIntoView(cursorPos),
-          ],
+          effects: [EditorView.scrollIntoView(cursorPos)],
         });
       }
     },
@@ -416,12 +461,9 @@ export function editorSyscalls(client: Client): SysCallMapping {
       if (center) {
         client.editorView.dispatch({
           effects: [
-            EditorView.scrollIntoView(
-              pos,
-              {
-                y: "center",
-              },
-            ),
+            EditorView.scrollIntoView(pos, {
+              y: "center",
+            }),
           ],
         });
       }
@@ -459,7 +501,8 @@ export function editorSyscalls(client: Client): SysCallMapping {
       const from = editorView.state.selection.main.from;
       const cursorPlaceholderPos = text.indexOf("|^|");
       if (cursorPlaceHolder && cursorPlaceholderPos !== -1) {
-        text = text.slice(0, cursorPlaceholderPos) +
+        text =
+          text.slice(0, cursorPlaceholderPos) +
           text.slice(cursorPlaceholderPos + 3);
       } else {
         cursorPlaceHolder = false;
@@ -485,10 +528,10 @@ export function editorSyscalls(client: Client): SysCallMapping {
       message: string,
       defaultValue = "",
     ): Promise<string | undefined> => {
-      return client.prompt(message, defaultValue);
+      return client.ui.prompt(message, defaultValue);
     },
     "editor.confirm": (_ctx, message: string): Promise<boolean> => {
-      return client.confirm(message);
+      return client.ui.confirm(message);
     },
     "editor.alert": (_ctx, message: string) => {
       alert(message);
@@ -502,17 +545,26 @@ export function editorSyscalls(client: Client): SysCallMapping {
         key,
         value,
       });
-      client.reloadEditor();
+      void client.reloadEditor();
     },
     "editor.vimEx": (_ctx, exCommand: string) => {
-      const cm = vimGetCm(client.editorView);
+      const vimMod = getVimModule();
+      if (!vimMod) {
+        throw new Error("Vim module not loaded.");
+      }
+      const cm = vimMod.getCM(client.editorView);
       if (cm?.state.vim) {
-        return Vim.handleEx(cm as any, exCommand);
+        return vimMod.Vim.handleEx(cm as any, exCommand);
       } else {
         throw new Error("Vim mode not active or not initialized.");
       }
     },
     "editor.configureVimMode": () => {
+      const vimMod = getVimModule();
+      if (!vimMod) {
+        throw new Error("Vim module not loaded.");
+      }
+      const { Vim } = vimMod;
       // Override the default "o" binding to be more intelligent and follow the markdown editor's behavior
       Vim.mapCommand("o", "action", "newline-continue-markup", {}, {});
       Vim.mapCommand("O", "action", "back-newline-continue-markup", {}, {});
@@ -566,20 +618,18 @@ export function editorSyscalls(client: Client): SysCallMapping {
           }
         });
         config.map?.forEach(({ map, to, mode }) => {
-          console.log(
-            `Mapping ${map} to ${to} for ${mode ?? "normal"}`,
-          );
+          console.log(`Mapping ${map} to ${to} for ${mode ?? "normal"}`);
           Vim.map(map, to, mode ?? "normal");
         });
         config.noremap?.forEach(({ map, to, mode }) => {
-          console.log(
-            `Noremapping ${map} to ${to} for ${mode ?? "normal"}`,
-          );
+          console.log(`Noremapping ${map} to ${to} for ${mode ?? "normal"}`);
           Vim.noremap(map, to, mode ?? "normal");
         });
         config.commands?.forEach(({ ex, command }) => {
           console.log(`Mapping command '${command}' to Ex ${ex}`);
-          Vim.defineEx(ex, "", () => client.runCommandByName(command));
+          Vim.defineEx(ex, "", (_, params) =>
+            client.runCommandByName(command, params.args),
+          );
         });
       } else {
         console.log("No vim config found");
@@ -592,11 +642,29 @@ export function editorSyscalls(client: Client): SysCallMapping {
       client.startPageNavigate(mode);
     },
     "editor.openCommandPalette": () => {
-      client.startCommandPalette();
+      void client.startCommandPalette();
     },
     "editor.deleteLine": () => {
       deleteLine(client.editorView);
     },
+    "editor.selectAll": () => {
+      return selectAll({
+        state: client.editorView.state,
+        dispatch: client.editorView.dispatch,
+      });
+    },
+    "editor.indentMore": () => {
+      return indentMore({
+        state: client.editorView.state,
+        dispatch: client.editorView.dispatch,
+      });
+    },
+    "editor.indentLess": () => {
+      return indentLess({
+        state: client.editorView.state,
+        dispatch: client.editorView.dispatch,
+      });
+    },
     "editor.toggleComment": () => {
       return toggleComment({
         state: client.editorView.state,
@@ -637,6 +705,77 @@ export function editorSyscalls(client: Client): SysCallMapping {
     "editor.redo": () => {
       return redo(client.editorView);
     },
+    // Cursor motion syscalls
+    "editor.cursorCharLeft": () => cursorCharLeft(client.editorView),
+    "editor.cursorCharRight": () => cursorCharRight(client.editorView),
+    "editor.cursorGroupLeft": () => cursorGroupLeft(client.editorView),
+    "editor.cursorGroupRight": () => cursorGroupRight(client.editorView),
+    "editor.cursorLineBoundaryLeft": () =>
+      cursorLineBoundaryLeft(client.editorView),
+    "editor.cursorLineBoundaryRight": () =>
+      cursorLineBoundaryRight(client.editorView),
+    "editor.cursorLineStart": () => cursorLineStart(client.editorView),
+    "editor.cursorLineEnd": () => cursorLineEnd(client.editorView),
+    "editor.cursorDocStart": () => cursorDocStart(client.editorView),
+    "editor.cursorDocEnd": () => cursorDocEnd(client.editorView),
+    // Cursor motions that also navigate the completion popup if it's open
+    "editor.cursorLineUp": () => {
+      const view = client.editorView;
+      if (moveCompletionSelection(false)(view)) return true;
+      return cursorLineUp(view);
+    },
+    "editor.cursorLineDown": () => {
+      const view = client.editorView;
+      if (moveCompletionSelection(true)(view)) return true;
+      return cursorLineDown(view);
+    },
+    "editor.cursorPageUp": () => {
+      const view = client.editorView;
+      if (moveCompletionSelection(false, "page")(view)) return true;
+      return cursorPageUp(view);
+    },
+    "editor.cursorPageDown": () => {
+      const view = client.editorView;
+      if (moveCompletionSelection(true, "page")(view)) return true;
+      return cursorPageDown(view);
+    },
+    // Selection-extending motions
+    "editor.selectCharLeft": () => selectCharLeft(client.editorView),
+    "editor.selectCharRight": () => selectCharRight(client.editorView),
+    "editor.selectGroupLeft": () => selectGroupLeft(client.editorView),
+    "editor.selectGroupRight": () => selectGroupRight(client.editorView),
+    "editor.selectLineBoundaryLeft": () =>
+      selectLineBoundaryLeft(client.editorView),
+    "editor.selectLineBoundaryRight": () =>
+      selectLineBoundaryRight(client.editorView),
+    "editor.selectLineStart": () => selectLineStart(client.editorView),
+    "editor.selectLineEnd": () => selectLineEnd(client.editorView),
+    "editor.selectDocStart": () => selectDocStart(client.editorView),
+    "editor.selectDocEnd": () => selectDocEnd(client.editorView),
+    "editor.selectLineUp": () => selectLineUp(client.editorView),
+    "editor.selectLineDown": () => selectLineDown(client.editorView),
+    "editor.selectPageUp": () => selectPageUp(client.editorView),
+    "editor.selectPageDown": () => selectPageDown(client.editorView),
+    // Delete
+    "editor.deleteCharBackward": () => deleteCharBackward(client.editorView),
+    "editor.deleteCharForward": () => deleteCharForward(client.editorView),
+    "editor.deleteGroupBackward": () => deleteGroupBackward(client.editorView),
+    "editor.deleteGroupForward": () => deleteGroupForward(client.editorView),
+    "editor.deleteLineBoundaryBackward": () =>
+      deleteLineBoundaryBackward(client.editorView),
+    "editor.deleteLineBoundaryForward": () =>
+      deleteLineBoundaryForward(client.editorView),
+    "editor.transposeChars": () => transposeChars(client.editorView),
+    // Enter: accept completion if popup is open, else newline-and-indent
+    "editor.insertNewline": () => {
+      const view = client.editorView;
+      if (acceptCompletion(view)) return true;
+      return insertNewlineAndIndent(view);
+    },
+    // Completion popup control
+    "editor.acceptCompletion": () => acceptCompletion(client.editorView),
+    "editor.startCompletion": () => startCompletion(client.editorView),
+    "editor.closeCompletion": () => closeCompletion(client.editorView),
     "editor.openSearchPanel": () => {
       openSearchPanel(client.editorView);
     },
@@ -651,13 +790,13 @@ export function editorSyscalls(client: Client): SysCallMapping {
         }
       } catch (e) {
         console.error(e);
-        client.flashNotification(`Could not copy to clipboard: ${e}`);
+        client.ui.flashNotification(`Could not copy to clipboard: ${e}`);
       }
     },
     "editor.sendMessage": (_ctx, type: string, data: any) => {
-      if (!client.isDocumentEditor()) return;
+      if (!client.contentManager.isDocumentEditor()) return;
 
-      client.documentEditor.sendPublicMessage({
+      client.contentManager.documentEditor.sendPublicMessage({
         type,
         data,
       });

package/client/plugos/syscalls/event.ts

@@ -18,19 +18,16 @@ export function eventSyscalls(
     /**
      * Define a Lua event listener
      */
-    "event.listen": (
-      _ctx,
-      def: EventSubscription,
-    ) => {
+    "event.listen": (_ctx, def: EventSubscription) => {
       // console.log("Registering Lua event listener: ", def.name);
-      client.config.insert([
-        "eventListeners",
-        def.name,
-      ], async (...args: any[]) => {
-        // Convert return value to JS
-        const val = await def.run(...args);
-        return luaValueToJS(val, LuaStackFrame.lostFrame);
-      });
+      client.config.insert(
+        ["eventListeners", def.name],
+        async (...args: any[]) => {
+          // Convert return value to JS
+          const val = await def.run(...args);
+          return luaValueToJS(val, LuaStackFrame.lostFrame);
+        },
+      );
     },
   };
 }

package/client/plugos/syscalls/fetch.ts

@@ -12,9 +12,7 @@ import {
 } from "@silverbulletmd/silverbullet/lib/crypto";
 import { fsEndpoint } from "../../spaces/constants.ts";
 
-export function sandboxFetchSyscalls(
-  client: Client,
-): SysCallMapping {
+export function sandboxFetchSyscalls(client: Client): SysCallMapping {
   return {
     // For use in Lua
     "http.request": async (
@@ -25,17 +23,18 @@ export function sandboxFetchSyscalls(
       console.warn("Deprecated: use net.proxyFetch() instead");
       // JSONify any non-serializable body
       if (
-        options?.body && typeof options.body !== "string" &&
+        options?.body &&
+        typeof options.body !== "string" &&
         !(options.body instanceof Uint8Array)
       ) {
         options.body = JSON.stringify(options.body);
       }
       const fetchOptions = options
         ? {
-          method: options.method,
-          headers: {} as Record<string, string>,
-          body: options.body,
-        }
+            method: options.method,
+            headers: {} as Record<string, string>,
+            body: options.body,
+          }
         : {};
 
       fetchOptions.headers = buildProxyHeaders(options?.headers);
@@ -45,19 +44,27 @@ export function sandboxFetchSyscalls(
         fetchOptions,
       );
       // Do sensible things with the body based on the content type
+      // Read as ArrayBuffer first to safely handle empty responses (e.g.
+      // PUT/DELETE returning 204 with Content-Type: application/json).
+      // resp.arrayBuffer() never throws on an empty body, whereas
+      // resp.json() would throw a SyntaxError.
+      const rawBytes = new Uint8Array(await resp.arrayBuffer());
       let body: any;
-      const contentTypeHeader = options.responseEncoding ||
+      const contentTypeHeader =
+        options.responseEncoding ||
         resp.headers.get("x-proxy-header-content-type");
       const statusCode = +(resp.headers.get("x-proxy-status-code") || "200");
-      if (contentTypeHeader?.startsWith("application/json")) {
-        body = await resp.json();
+      if (rawBytes.length === 0) {
+        body = null;
+      } else if (contentTypeHeader?.startsWith("application/json")) {
+        body = JSON.parse(new TextDecoder().decode(rawBytes));
       } else if (
         contentTypeHeader?.startsWith("application/xml") ||
         contentTypeHeader?.startsWith("text/")
       ) {
-        body = await resp.text();
+        body = new TextDecoder().decode(rawBytes);
       } else {
-        body = new Uint8Array(await resp.arrayBuffer());
+        body = rawBytes;
       }
       return {
         ok: resp.ok,
@@ -74,10 +81,10 @@ export function sandboxFetchSyscalls(
       // console.log("Got sandbox fetch ", url, op);
       const fetchOptions = options
         ? {
-          method: options.method,
-          headers: options.headers,
-          body: options.base64Body && base64Decode(options.base64Body),
-        }
+            method: options.method,
+            headers: options.headers,
+            body: options.base64Body && base64Decode(options.base64Body),
+          }
         : {};
       fetchOptions.headers = buildProxyHeaders(options?.headers);
       const resp = await client.httpSpacePrimitives.authenticatedFetch(
@@ -100,8 +107,11 @@ export function sandboxFetchSyscalls(
 function buildProxyUrl(client: Client, url: string) {
   url = url.replace(/^https?:\/\//, "");
   // Strip off the /.fs and replace with /.proxy
-  return client.httpSpacePrimitives.url.slice(0, -fsEndpoint.length) +
-    "/.proxy/" + url;
+  return (
+    client.httpSpacePrimitives.url.slice(0, -fsEndpoint.length) +
+    "/.proxy/" +
+    url
+  );
 }
 
 function buildProxyHeaders(headers?: Record<string, any>): Record<string, any> {
@@ -115,9 +125,7 @@ function buildProxyHeaders(headers?: Record<string, any>): Record<string, any> {
   return newHeaders;
 }
 
-function extractProxyHeaders(
-  headers: Headers,
-): Record<string, any> {
+function extractProxyHeaders(headers: Headers): Record<string, any> {
   const newHeaders: Record<string, any> = {};
   for (const [key, value] of headers.entries()) {
     if (key.toLowerCase().startsWith("x-proxy-header-")) {

package/client/plugos/syscalls/index.ts

@@ -20,7 +20,16 @@ export function indexSyscalls(
     "index.tag": (_ctx, tagName: string): LuaQueryCollection => {
       return objectIndex.tag(tagName);
     },
-    "index.ensureFullIndex": (_ctx) => {
+    "index.contentPages": (): LuaQueryCollection => {
+      return objectIndex.contentPages();
+    },
+    "index.metaPages": (): LuaQueryCollection => {
+      return objectIndex.metaPages();
+    },
+    "index.aggregates": (): LuaQueryCollection => {
+      return objectIndex.aggregates();
+    },
+    "index.ensureFullIndex": () => {
       return objectIndex.ensureFullIndex(client.space);
     },
     "index.reindexSpace": () => {
@@ -58,7 +67,7 @@ export function indexSyscalls(
       tag: string,
       ref: string,
     ): Promise<ObjectValue | undefined> => {
-      return objectIndex.getObjectByRef(ref, page, tag);
+      return objectIndex.getObjectByRef(page, tag, ref);
     },
     "index.queryLuaObjects": (
       _ctx,