Refactor, cleanup

Author: zefhemel

build_web.ts

@@ -79,6 +79,7 @@ export async function copyAssets(dist: string) {
   bundleJs = patchDenoLibJS(bundleJs);
   await Deno.writeTextFile(`${dist}/client.js`, bundleJs);
 }
+
 async function buildCopyBundleAssets() {
   await Deno.mkdir("dist_client_bundle", { recursive: true });
   await Deno.mkdir("dist_plug_bundle", { recursive: true });

cmd/compile.ts

@@ -145,6 +145,7 @@ export async function compileManifests(
 ) {
   let building = false;
   dist = path.resolve(dist);
+
   async function buildAll() {
     if (building) {
       return;

cmd/test/runtime.test.ts

@@ -1,9 +1,9 @@
 import { createSandbox } from "../../lib/plugos/sandboxes/deno_worker_sandbox.ts";
+import type { SysCallMapping } from "../../lib/plugos/system.ts";
 import { System } from "../../lib/plugos/system.ts";
 import { assertEquals } from "@std/assert";
 import { compileManifest } from "../compile.ts";
 import * as esbuild from "esbuild";
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
 import { fileURLToPath } from "node:url";
 
 Deno.test("Run a deno sandbox", {

deno.json

@@ -31,30 +31,23 @@
   "tasks": {
     "clean": "rm -rf dist dist_client_bundle dist_plug_bundle",
     "deep-clean-mac": "rm -f deno.lock && rm -rf $HOME/Library/Caches/deno && deno task clean",
-
     "install": "deno install -g -f -A --import-map deno.json silverbullet.ts",
-
     "check": "find . -name '*.ts*' | xargs deno check",
     "lint": "deno lint",
     "fmt": "deno fmt",
     "test": "deno test -A",
     "bench": "deno bench",
-
     "build": "rm -rf dist dist_client_bundle dist_plug_bundle && deno run -A build_plugs.ts && deno run -A build_web.ts && deno task compile",
     "plugs": "deno run -A build_plugs.ts",
     "server": "deno run -A  --check silverbullet.ts",
     "generate": "./scripts/generate.sh",
     "docker": "./scripts/build_docker.sh",
-
     "watch-web": "deno run -A --check build_web.ts --watch",
     "watch-server": "deno run -A --check --watch silverbullet.ts",
     "watch-plugs": "deno run -A --check build_plugs.ts -w",
     "watch-all": "deno task watch-web & deno task watch-plugs & deno task watch-server",
-
     "bundle": "deno run -A build_bundle.ts",
-
     "compile": "deno task bundle && deno compile -A -o silverbullet dist/silverbullet.js",
-
     "server:dist:linux-x86_64": "deno task bundle && deno compile -A --target x86_64-unknown-linux-gnu -o silverbullet dist/silverbullet.js",
     "server:zip:linux-x86_64": "deno task server:dist:linux-x86_64 && zip silverbullet-server-linux-x86_64.zip silverbullet",
     "server:dist:linux-aarch64": "deno task bundle && deno compile -A --target aarch64-unknown-linux-gnu -o silverbullet dist/silverbullet.js",
@@ -75,7 +68,11 @@
       "cmd/test/test_space"
     ],
     "rules": {
-      "exclude": ["no-explicit-any", "no-slow-types", "jsx-boolean-value"]
+      "exclude": [
+        "no-explicit-any",
+        "no-slow-types",
+        "jsx-boolean-value"
+      ]
     }
   },
   "fmt": {
@@ -90,7 +87,12 @@
     ]
   },
   "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "dom.asynciterable", "deno.ns"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "dom.asynciterable",
+      "deno.ns"
+    ],
     "jsx": "react-jsx",
     "jsxImportSource": "https://esm.sh/preact@10.26.4"
   },

lib/README.md

@@ -1 +1,2 @@
-This folder contains library functions that is generally reusable, not specific to SilverBullet. This code can be used from within plugs or the core code base. It may move out of this repo at some point.
+This folder contains library functions that is generally reusable, not specific to SilverBullet. This code can be used
+from within plugs or the core code base. It may move out of this repo at some point.

lib/data/datastore.test.ts

@@ -5,8 +5,8 @@ import type { KvPrimitives } from "../data/kv_primitives.ts";
 import { assertEquals } from "@std/assert";
 import { PrefixedKvPrimitives } from "../data/prefixed_kv_primitives.ts";
 import { DataStore } from "$lib/data/datastore.ts";
-import { LuaEnv, LuaStackFrame } from "../../web/space_lua/runtime.ts";
-import { parseExpressionString } from "../../web/space_lua/parse.ts";
+import { LuaEnv, LuaStackFrame } from "../space_lua/runtime.ts";
+import { parseExpressionString } from "../space_lua/parse.ts";
 
 async function test(db: KvPrimitives) {
   const datastore = new DataStore(new PrefixedKvPrimitives(db, ["ds"]));

lib/data/datastore.ts

@@ -1,8 +1,8 @@
 import {
   type LuaCollectionQuery,
   queryLua,
-} from "../../web/space_lua/query_collection.ts";
-import { LuaEnv, LuaStackFrame } from "../../web/space_lua/runtime.ts";
+} from "../space_lua/query_collection.ts";
+import { LuaEnv, LuaStackFrame } from "../space_lua/runtime.ts";
 import type { KV, KvKey } from "../../plug-api/types.ts";
 import type { KvPrimitives, KvQueryOptions } from "./kv_primitives.ts";
 

lib/data/indexeddb_kv_primitives.ts

@@ -75,6 +75,10 @@ export class IndexedDBKvPrimitives implements KvPrimitives {
     }
   }
 
+  close() {
+    this.db.close();
+  }
+
   private buildKey(key: KvKey): string {
     for (const k of key) {
       if (k.includes(sep)) {
@@ -87,8 +91,4 @@ export class IndexedDBKvPrimitives implements KvPrimitives {
   private extractKey(key: string): KvKey {
     return key.split(sep);
   }
-
-  close() {
-    this.db.close();
-  }
 }

lib/data/kv_primitives.ts

@@ -6,10 +6,15 @@ export type KvQueryOptions = {
 
 export interface KvPrimitives {
   batchGet(keys: KvKey[]): Promise<(any | undefined)[]>;
+
   batchSet(entries: KV[]): Promise<void>;
+
   batchDelete(keys: KvKey[]): Promise<void>;
+
   query(options: KvQueryOptions): AsyncIterableIterator<KV>;
+
   // Completely clear all data from this datastore
   clear(): Promise<void>;
+
   close(): void;
 }

lib/data/memory_kv_primitives.ts

@@ -28,6 +28,27 @@ export class MemoryKvPrimitives implements KvPrimitives {
       }
     }
   }
+
+  static fromJSON(json: Record<string, any>): MemoryKvPrimitives {
+    const result = new MemoryKvPrimitives();
+    for (const key of Object.keys(json)) {
+      result.store.set(key, json[key]);
+    }
+    return result;
+  }
+
+  /**
+   * Create a new MemoryKvPrimitives instance from a file and initialize it
+   */
+  static async fromFile(
+    filePath: string,
+    options: { throttleMs?: number } = {},
+  ): Promise<MemoryKvPrimitives> {
+    const instance = new MemoryKvPrimitives(filePath, options);
+    await instance.init();
+    return instance;
+  }
+
   clear(): Promise<void> {
     this.store.clear();
     return Promise.resolve();
@@ -62,23 +83,6 @@ export class MemoryKvPrimitives implements KvPrimitives {
     }
   }
 
-  /**
-   * Persist the current state to disk
-   */
-  private async persistToDisk(): Promise<void> {
-    if (!this.filePath) return;
-
-    try {
-      const jsonData = this.toJSON();
-      await Deno.writeTextFile(
-        this.filePath,
-        JSON.stringify(jsonData, null, 2),
-      );
-    } catch (error) {
-      console.error(`Failed to persist KV store to ${this.filePath}:`, error);
-    }
-  }
-
   batchGet(keys: KvKey[]): Promise<any[]> {
     return Promise.resolve(
       keys.map((key) => this.store.get(key.join(memoryKeySeparator))),
@@ -125,14 +129,6 @@ export class MemoryKvPrimitives implements KvPrimitives {
     return result;
   }
 
-  static fromJSON(json: Record<string, any>): MemoryKvPrimitives {
-    const result = new MemoryKvPrimitives();
-    for (const key of Object.keys(json)) {
-      result.store.set(key, json[key]);
-    }
-    return result;
-  }
-
   async *query(options: KvQueryOptions): AsyncIterableIterator<KV> {
     const prefix = options.prefix?.join(memoryKeySeparator);
     const sortedKeys = [...this.store.keys()].sort();
@@ -155,14 +151,19 @@ export class MemoryKvPrimitives implements KvPrimitives {
   }
 
   /**
-   * Create a new MemoryKvPrimitives instance from a file and initialize it
+   * Persist the current state to disk
    */
-  static async fromFile(
-    filePath: string,
-    options: { throttleMs?: number } = {},
-  ): Promise<MemoryKvPrimitives> {
-    const instance = new MemoryKvPrimitives(filePath, options);
-    await instance.init();
-    return instance;
+  private async persistToDisk(): Promise<void> {
+    if (!this.filePath) return;
+
+    try {
+      const jsonData = this.toJSON();
+      await Deno.writeTextFile(
+        this.filePath,
+        JSON.stringify(jsonData, null, 2),
+      );
+    } catch (error) {
+      console.error(`Failed to persist KV store to ${this.filePath}:`, error);
+    }
   }
 }