@silverbulletmd/silverbullet 2.4.2 → 2.5.3

package/README.md

@@ -22,7 +22,7 @@ And if you are comfortable **programming** a little bit — now we’re really t
 Check out the [instructions](https://silverbullet.md/Install).
 
 ## Developing SilverBullet
-SilverBullet's frontend is written in [TypeScript](https://www.typescriptlang.org/) and built on top of the excellent [CodeMirror 6](https://codemirror.net/) editor component. Additional UI is built using [Preact](https://preactjs.com). [ESBuild](https://esbuild.github.io)) running through Deno is used to build both the front-end.
+SilverBullet's frontend is written in [TypeScript](https://www.typescriptlang.org/) and built on top of the excellent [CodeMirror 6](https://codemirror.net/) editor component. Additional UI is built using [Preact](https://preactjs.com). [ESBuild](https://esbuild.github.io) is used to build the frontend.
 
 The server backend is written in Go.
 
@@ -43,9 +43,15 @@ If you're considering contributing changes, be aware of the [LLM use policy](htt
 * `website/`: silverbullet.md website content
 
 ### Requirements
-* [Deno](https://deno.com/): Used to build the frontend and plugs
+* [Node.js](https://nodejs.org/) 24+ and npm 10+: Used to build the frontend and plugs
 * [Go](https://go.dev/): Used to build the backend
 
+The project includes `.nvmrc` and `.node-version` files. If you use [nvm](https://github.com/nvm-sh/nvm) or another Node version manager, it will automatically use the correct Node.js version:
+
+```shell
+nvm use  # If using nvm
+```
+
 It's convenient to also install [air](https://github.com/air-verse/air) for development, this will automatically rebuild both the frontend and backend when changes are made:
 
 ```shell
@@ -53,6 +59,12 @@ go install github.com/air-verse/air@latest
 ```
 Make sure your `$GOPATH/bin` is in your $PATH.
 
+First, install dependencies:
+
+```shell
+npm install
+```
+
 To build everything and run the server:
 
 ```shell
@@ -62,7 +74,9 @@ air <PATH-TO-YOUR-SPACE>
 Alternatively, to build:
 
 ```shell
-make
+make build
+# or
+npm run build
 ```
 
 To run the resulting server:
@@ -82,10 +96,12 @@ make check
 make fmt
 # Run all tests
 make test
+# Run benchmarks
+make bench
 ```
 
 ### Build a docker container
-Note, you do not need Deno nor Go locally installed for this to work:
+Note, you do not need Node.js nor Go locally installed for this to work:
 
 ```shell
 docker build -t silverbullet .

package/client/markdown_parser/constants.ts

@@ -4,10 +4,10 @@ export const mdLinkRegex = /!?\[(?<title>[^\]]*)\]\((?<url>.+)\)/g;
 export const tagRegex =
   /#(?:(?:\d*[^\d\s!@#$%^&*(),.?":{}|<>\\][^\s!@#$%^&*(),.?":{}|<>\\]*)|(?:<[^>\n]+>))/;
 export const nakedUrlRegex =
-  /(^https?:\/\/([-a-zA-Z0-9@:%_\+~#=]|(?:[.](?!(\s|$)))){1,256})(([-a-zA-Z0-9(@:%_\+~#?&=\/]|(?:[.,:;)](?!(\s|$))))*)/;
+  /(^https?:\/\/([-a-zA-Z0-9@:%_+~#=]|(?:[.](?!(\s|$)))){1,256})(([-a-zA-Z0-9(@:%_+~#?&=/]|(?:[.,:;)](?!(\s|$))))*)/;
 export const frontmatterQuotesRegex = /["'].*["']/g;
 export const frontmatterUrlRegex = /([a-zA-Z][a-zA-Z0-9+.-]*:\/\/[^\s"']+)/g;
 export const frontmatterWikiLinkRegex =
   /(?<leadingTrivia>!?\[\[)(?<stringRef>.*?)(?:\|(?<alias>.*?))?(?<trailingTrivia>\]\])/g;
 export const frontmatterMailtoRegex = /(mailto:[^@\s]+@[^@\s"']+)/ig;
-export const pWikiLinkRegex = new RegExp("^" + wikiLinkRegex.source); // Modified regex used only in parser
+export const pWikiLinkRegex = new RegExp(`^${wikiLinkRegex.source}`); // Modified regex used only in parser

package/client/plugos/hooks/code_widget.ts

@@ -7,9 +7,6 @@ export class CodeWidgetHook implements Hook<CodeWidgetT> {
   codeWidgetCallbacks = new Map<string, CodeWidgetCallback>();
   codeWidgetModes = new Map<string, "markdown" | "iframe">();
 
-  constructor() {
-  }
-
   collectAllCodeWidgets(system: System<CodeWidgetT>) {
     this.codeWidgetCallbacks.clear();
     for (const plug of system.loadedPlugs.values()) {

package/client/plugos/hooks/document_editor.ts

@@ -9,9 +9,6 @@ export class DocumentEditorHook implements Hook<DocumentEditorT> {
     { extensions: string[]; callback: DocumentEditorCallback }
   >();
 
-  constructor() {
-  }
-
   collectAllDocumentEditors(system: System<DocumentEditorT>) {
     this.documentEditors.clear();
     for (const plug of system.loadedPlugs.values()) {

package/client/plugos/hooks/event.ts

@@ -1,4 +1,4 @@
-// deno-lint-ignore-file ban-types
+
 import type { Manifest } from "../types.ts";
 import type { System } from "../system.ts";
 import type { EventHookI } from "../eventhook.ts";

package/client/plugos/hooks/mq.ts

@@ -1,4 +1,4 @@
-// deno-lint-ignore-file ban-types
+
 import type { Hook, Manifest } from "../types.ts";
 import type { System } from "../system.ts";
 import { throttle } from "@silverbulletmd/silverbullet/lib/async";

package/client/plugos/hooks/plug_namespace.ts

@@ -15,9 +15,6 @@ type SpaceFunction = {
 export class PlugNamespaceHook implements Hook<PlugNamespaceHookT> {
   spaceFunctions: SpaceFunction[] = [];
 
-  constructor() {
-  }
-
   apply(system: System<PlugNamespaceHookT>): void {
     system.on({
       plugLoaded: () => {

package/client/plugos/hooks/slash_command.ts

@@ -15,7 +15,7 @@ import type {
   SlashCompletions,
 } from "@silverbulletmd/silverbullet/type/client";
 
-const slashCommandRegexp = /([^\w:]|^)\/[\w#\-]*/;
+const slashCommandRegexp = /([^\w:]|^)\/[\w#-]*/;
 
 export class SlashCommandHook implements Hook<SlashCommandHookT> {
   slashCommands: SlashCommand[] = [];
@@ -94,7 +94,7 @@ export class SlashCommandHook implements Hook<SlashCommandHookT> {
         continue;
       }
       if (
-        def.exceptContexts && def.exceptContexts.some(
+        def.exceptContexts?.some(
           (context) => parentNodes.some((node) => node.startsWith(context)),
         )
       ) {

package/client/plugos/plug.ts

@@ -70,7 +70,6 @@ export class Plug<HookT> {
     const sandbox = this.sandbox!;
     if (funDef.redirect) {
       // Function redirect, look up
-      // deno-lint-ignore no-this-alias
       let plug: Plug<HookT> | undefined = this;
       if (funDef.redirect.indexOf(".") !== -1) {
         const [plugName, functionName] = funDef.redirect.split(".");

package/client/plugos/plug_compile.ts

@@ -3,23 +3,33 @@ import { readFile, writeFile, mkdtemp, rm, mkdir } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import * as YAML from "js-yaml";
 
-import { denoPlugin, esbuild } from "../../build_deps.ts";
+import * as esbuild from "esbuild";
 import { bundleAssets } from "../asset_bundle/builder.ts";
 import type { Manifest } from "./types.ts";
-import { version } from "../../version.ts";
 
-// const workerRuntimeUrl = new URL(
-//   "../lib/plugos/worker_runtime.ts",
-//   import.meta.url,
-// );
-const workerRuntimeUrl =
-  `https://deno.land/x/silverbullet@${version}/client/plugos/worker_runtime.ts`;
+import { existsSync } from "node:fs";
+
+// Resolve the pre-built worker_runtime bundle path
+// When running from source: ../../dist/worker_runtime_bundle.js (from client/plugos/)
+// When bundled: ./worker_runtime_bundle.js (from dist/)
+const currentDir = import.meta.dirname;
+const bundledPath = path.join(currentDir, "worker_runtime_bundle.js");
+const sourcePath = path.join(currentDir, "../../dist/worker_runtime_bundle.js");
+const workerRuntimeBundlePath = existsSync(bundledPath)
+  ? bundledPath
+  : sourcePath;
+
+const workerRuntimePlugin: esbuild.Plugin = {
+  name: "worker-runtime",
+  setup(build) {
+    build.onResolve({ filter: /^worker-runtime$/ }, () => ({
+      path: workerRuntimeBundlePath,
+    }));
+  },
+};
 
 export type CompileOptions = {
   debug?: boolean;
-  runtimeUrl?: string;
-  // path to config file
-  configPath?: string;
   // Print info on bundle size
   info?: boolean;
 };
@@ -50,9 +60,7 @@ export async function compileManifest(
   }
 
   const jsFile = `
-import { setupMessageListener } from "${
-    options.runtimeUrl || workerRuntimeUrl
-  }";
+import { setupMessageListener } from "worker-runtime";
 
 // Imports
 ${
@@ -64,7 +72,7 @@ ${
       // Resolve path
       filePath = path.join(rootPath, filePath);
 
-      return `import {${jsFunctionName} as ${funcName}} from "file://${
+      return `import {${jsFunctionName} as ${funcName}} from "${
         // Replacing \ with / for Windows
         path.resolve(filePath).replaceAll(
           "\\",
@@ -111,12 +119,7 @@ setupMessageListener(functionMapping, manifest, self.postMessage);
     outfile: outFile,
     metafile: options.info,
     treeShaking: true,
-    plugins: [
-      denoPlugin({
-        configPath: options.configPath &&
-          path.resolve(process.cwd(), options.configPath),
-      }),
-    ],
+    plugins: [workerRuntimePlugin],
   });
 
   if (options.info) {
@@ -125,7 +128,7 @@ setupMessageListener(functionMapping, manifest, self.postMessage);
   }
 
   let jsCode = await readFile(outFile, "utf-8");
-  jsCode = patchDenoLibJS(jsCode);
+  jsCode = patchBundledJS(jsCode);
   await writeFile(outFile, jsCode, "utf-8");
   
   // Clean up temp directory
@@ -172,18 +175,16 @@ export async function compileManifests(
   await buildAll();
 }
 
-export function patchDenoLibJS(code: string): string {
-  // The Deno std lib has one occurence of a regex that Webkit JS doesn't (yet parse), we'll strip it because it's likely never invoked anyway, YOLO
+export function patchBundledJS(code: string): string {
+  // One bundled dependency has a lookbehind regex that WebKit can't parse; replace it with a no-op
   return code.replaceAll("/(?<=\\n)/", "/()/");
 }
 
 export async function plugCompileCommand(
-  { dist, debug, info, config, runtimeUrl }: {
+  { dist, debug, info }: {
     dist: string;
     debug: boolean;
     info: boolean;
-    config?: string;
-    runtimeUrl?: string;
   },
   ...manifestPaths: string[]
 ) {
@@ -193,8 +194,6 @@ export async function plugCompileCommand(
     {
       debug: debug,
       info: info,
-      runtimeUrl,
-      configPath: config,
     },
   );
   esbuild.stop();

package/client/plugos/proxy_fetch.ts

@@ -39,7 +39,7 @@ export async function performLocalFetch(
       method: req.method,
       headers: req.headers,
       body: req.base64Body && base64Decode(req.base64Body),
-      // Casting  to "any" for now, since of weird Deno typing
+      // Casting to any due to TypeScript fetch type limitations
     } as any,
   );
   return {

package/client/plugos/sandboxes/web_worker_sandbox.ts

@@ -11,7 +11,7 @@ export function createWorkerSandboxFromLocalPath<HookT>(
       plug,
       new URL(
         name,
-        document.baseURI.slice(0, -1) + fsEndpoint + "/", // We're NOT striping trailing '/', this used to be `location.origin`
+        `${document.baseURI.slice(0, -1) + fsEndpoint}/`, // We're NOT striping trailing '/', this used to be `location.origin`
       ),
     );
 }

package/client/plugos/sandboxes/worker_sandbox.ts

@@ -94,10 +94,9 @@ export class WorkerSandbox<HookT> implements Sandbox<HookT> {
         const resultCbs = this.outstandingInvocations.get(data.id!);
         this.outstandingInvocations.delete(data.id!);
         if (data.error) {
-          resultCbs &&
-            resultCbs.reject(new Error(data.error));
+          resultCbs?.reject(new Error(data.error));
         } else {
-          resultCbs && resultCbs.resolve(data.result);
+          resultCbs?.resolve(data.result);
         }
         break;
       }

package/client/plugos/syscalls/editor.ts

@@ -110,7 +110,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
       }
 
       if (
-        // @ts-ignore: Legacy support
+        // @ts-expect-error: Legacy support
         ref.page !== undefined
       ) {
         console.warn(
@@ -127,7 +127,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
 
         legacyRef.kind ??= "page";
 
-        let details: Ref["details"] = undefined;
+        let details: Ref["details"] ;
 
         if (typeof legacyRef.pos === "number") {
           details = {
@@ -232,7 +232,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
     "editor.newWindow": () => {
       globalThis.open(
         location.href,
-        "rnd" + Math.random(),
+        `rnd${Math.random()}`,
         `width=${globalThis.innerWidth},heigh=${globalThis.innerHeight}`,
       );
     },
@@ -268,7 +268,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
             const reader = new FileReader();
             reader.readAsArrayBuffer(file);
             reader.onloadend = async (evt) => {
-              if (evt.target?.readyState == FileReader.DONE) {
+              if (evt.target?.readyState === FileReader.DONE) {
                 resolve({
                   name: file.name,
                   contentType: file.type,
@@ -311,7 +311,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
       _ctx,
       id: string,
       mode: number,
-      html: string,
+      html: HTMLElement | HTMLElement[] | string,
       script: string,
     ) => {
       client.ui.viewDispatch({
@@ -506,7 +506,7 @@ export function editorSyscalls(client: Client): SysCallMapping {
     },
     "editor.vimEx": (_ctx, exCommand: string) => {
       const cm = vimGetCm(client.editorView);
-      if (cm && cm.state.vim) {
+      if (cm?.state.vim) {
         return Vim.handleEx(cm as any, exCommand);
       } else {
         throw new Error("Vim mode not active or not initialized.");
@@ -555,30 +555,30 @@ export function editorSyscalls(client: Client): SysCallMapping {
       if (config) {
         config.unmap?.forEach((binding) => {
           if (typeof binding === "string") {
-            console.log("Unmapping " + binding);
-            // @ts-ignore: unmap expects a string for the mode, this is problematic with Ex mappings which requires undefined or false
+            console.log(`Unmapping ${binding}`);
+            // @ts-expect-error: unmap expects a string for the mode, this is problematic with Ex mappings which requires undefined or false
             Vim.unmap(binding, undefined);
           } else if (binding.key) {
             console.log(
-              "Unmapping " + binding.key + " in " + (binding.mode ?? "normal"),
+              `Unmapping ${binding.key} in ${binding.mode ?? "normal"}`,
             );
             Vim.unmap(binding.key, binding.mode ?? "normal");
           }
         });
         config.map?.forEach(({ map, to, mode }) => {
           console.log(
-            "Mapping " + map + " to " + to + " for " + (mode ?? "normal"),
+            `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"),
+            `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);
+          console.log(`Mapping command '${command}' to Ex ${ex}`);
           Vim.defineEx(ex, "", () => client.runCommandByName(command));
         });
       } else {

package/client/plugos/syscalls/fetch.ts

@@ -82,7 +82,7 @@ export function sandboxFetchSyscalls(
       fetchOptions.headers = buildProxyHeaders(options?.headers);
       const resp = await client.httpSpacePrimitives.authenticatedFetch(
         buildProxyUrl(client, url),
-        // Casting this to any because of weird Deno typing
+        // Casting to any due to TypeScript fetch type limitations
         fetchOptions as any,
       );
       const statusCode = +(resp.headers.get("x-proxy-status-code") || "200");

package/client/plugos/syscalls/jsonschema.ts

@@ -33,7 +33,7 @@ export function validateObject(schema: any, object: any): undefined | string {
     } else {
       let text = ajv.errorsText(validate.errors);
       text = text.replaceAll("/", ".");
-      text = text.replace(/^data[\.\s]/, "");
+      text = text.replace(/^data[.\s]/, "");
       return text;
     }
   } catch (e: any) {

package/client/plugos/syscalls/mq.ts

@@ -17,7 +17,7 @@ export function mqSyscalls(
       _ctx,
       def: MQListenerSpec,
     ) => {
-      def.autoAck = def.autoAck != false;
+      def.autoAck = def.autoAck !== false;
       // console.log("Registering Lua event listener: ", def.name);
       client.config.insert([
         "mqSubscriptions",

package/client/plugos/syscalls/space.ts

@@ -32,7 +32,7 @@ export function spaceReadSyscalls(client: Client): SysCallMapping {
       return (await client.space.readRef(ref)).text;
     },
     "space.pageExists": (_ctx, name: string): boolean => {
-      return client.clientSystem.allKnownFiles.has(name + ".md");
+      return client.clientSystem.allKnownFiles.has(`${name}.md`);
     },
     "space.getPageMeta": (_ctx, name: string): Promise<PageMeta> => {
       return client.space.getPageMeta(name);

package/client/plugos/system.ts

@@ -193,8 +193,8 @@ export class System<HookT> extends EventEmitter<SystemEvents<HookT>> {
     this.plugs.delete(name);
   }
 
-  unloadAll(): Promise<void[]> {
-    return Promise.all(
+  async unloadAll(): Promise<void> {
+    await Promise.all(
       Array.from(this.plugs.keys()).map(this.unload.bind(this)),
     );
   }

package/client/plugos/worker_runtime.ts

@@ -15,35 +15,14 @@ let workerPostMessage = (_msg: ControllerMessage): void => {
   throw new Error("Not initialized yet");
 };
 
-// Are we running in a (web) worker?
-
-// Determines if we're running in a web worker environment (Deno or browser)
-// - in a browser's main threads, typeof window is "object"
+// Determines if we're running in a web worker environment
+// - in a browser's main thread, typeof window is "object"
 // - in a browser's worker threads, typeof window === "undefined"
-// - in Deno's main thread typeof window === "object"
-// - in Deno's workers typeof window === "undefined
 // - in Cloudflare workers typeof window === "undefined", but typeof globalThis.WebSocketPair is defined
 const runningAsWebWorker = typeof window === "undefined" &&
-  // @ts-ignore: globalThis
+  // @ts-expect-error: globalThis
   typeof globalThis.WebSocketPair === "undefined";
 
-// @ts-ignore: Check if Deno is defined
-if (typeof Deno === "undefined") {
-  // @ts-ignore: Deno hack
-  self.Deno = {
-    args: [],
-    // @ts-ignore: Deno hack
-    build: {
-      arch: "x86_64",
-    },
-    env: {
-      // @ts-ignore: Deno hack
-      get() {
-      },
-    },
-  };
-}
-
 const pendingRequests = new Map<
   number,
   {
@@ -157,17 +136,16 @@ export async function sandboxFetch(
   return syscall("sandboxFetch.fetch", reqInfo, options);
 }
 
-// @ts-ignore: monkey patching fetch
 globalThis.nativeFetch = globalThis.fetch;
 
 // Monkey patch fetch()
 export function monkeyPatchFetch() {
-  // @ts-ignore: monkey patching fetch
-  globalThis.fetch = async function (
+  // @ts-expect-error: monkey patching fetch
+  globalThis.fetch = async (
     reqInfo: RequestInfo,
     init?: RequestInit,
-  ): Promise<Response> {
-    const encodedBody = init && init.body
+  ): Promise<Response> => {
+    const encodedBody = init?.body
       ? base64Encode(
         new Uint8Array(await (new Response(init.body)).arrayBuffer()),
       )
@@ -180,7 +158,7 @@ export function monkeyPatchFetch() {
         base64Body: encodedBody,
       },
     );
-    // Casting the response to "any" for now, since of weird Deno typing
+    // Casting to any due to TypeScript fetch type limitations
     return new Response(
       (r.base64Body ? base64Decode(r.base64Body) : null) as any,
       {