@silverbulletmd/silverbullet 2.10.0 → 2.11.0

package/client/space_lua/stdlib/os.ts

@@ -147,7 +147,6 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
   const dow = () => wd(d, utc);
 
   return {
-    // Date
     Y: () => yr(d, utc).toString(),
     y: () => pad2(yr(d, utc) % 100),
     C: () => pad2(Math.floor(yr(d, utc) / 100)),
@@ -156,14 +155,12 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
     e: () => da(d, utc).toString().padStart(2, " "),
     j: () => pad3(dayOfYear(d, utc)),
 
-    // Time
     H: () => pad2(h()),
     I: () => pad2(h12()),
     M: () => pad2(mi(d, utc)),
     S: () => pad2(sc(d, utc)),
     p: () => (h() >= 12 ? "PM" : "AM"),
 
-    // Weekday
     A: () =>
       d.toLocaleString("en-US", {
         weekday: "long",
@@ -177,7 +174,6 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
     w: () => dow().toString(),
     u: () => (dow() === 0 ? 7 : dow()).toString(),
 
-    // Month name
     b: () =>
       d.toLocaleString("en-US", {
         month: "short",
@@ -194,14 +190,12 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
         ...(utc ? { timeZone: "UTC" } : {}),
       }),
 
-    // Week number
     U: () => pad2(weekNumber(d, utc, 0, false)),
     W: () => pad2(weekNumber(d, utc, 1, false)),
     V: () => pad2(weekNumber(d, utc, 1, true)),
     G: () => isoWeekYear(d, utc).toString(),
     g: () => pad2(isoWeekYear(d, utc) % 100),
 
-    // Composite specifiers
     c: () =>
       d.toLocaleString("en-US", {
         ...(utc ? { timeZone: "UTC" } : {}),
@@ -225,14 +219,11 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
         h() >= 12 ? "PM" : "AM"
       }`,
 
-    // Epoch
     s: () => Math.floor(d.getTime() / 1000).toString(),
 
-    // Whitespace
     n: () => "\n",
     t: () => "\t",
 
-    // Timezone
     Z: () => {
       if (utc) return "UTC";
       const match = d.toTimeString().match(/\((.*)\)/);
@@ -246,7 +237,6 @@ function buildSpecMap(d: Date, utc: boolean): Record<string, () => string> {
       return `${sign}${pad2(Math.floor(abs / 60))}${pad2(abs % 60)}`;
     },
 
-    // Literal
     "%": () => "%",
   };
 }

package/client/space_lua/stdlib/pattern.ts

@@ -1,5 +1,3 @@
-// Lua Optimized Pattern Matching Engine Implementation
-
 const CH_ESC = 37; // '%'
 const CH_OPEN = 40; // '('
 const CH_CLOSE = 41; // ')'
@@ -40,21 +38,21 @@ interface Capture {
 }
 
 export interface MatchState {
-  src: string; // original source string (for substring extraction)
-  s: Uint8Array; // source bytes
+  src: string;
+  s: Uint16Array;
   slen: number;
-  p: Uint8Array; // pattern bytes
+  p: Uint16Array;
   plen: number;
   level: number;
   capture: Capture[]; // pre-allocated, length `MAX_CAPTURES`
   matchdepth: number;
 }
 
-function toBytes(s: string): Uint8Array {
+function toCodeUnits(s: string): Uint16Array {
   const len = s.length;
-  const arr = new Uint8Array(len);
+  const arr = new Uint16Array(len);
   for (let i = 0; i < len; i++) {
-    arr[i] = s.charCodeAt(i) & 0xff;
+    arr[i] = s.charCodeAt(i);
   }
   return arr;
 }
@@ -108,7 +106,7 @@ function matchClass(c: number, cl: number): boolean {
   return cl >= 97 && cl <= 122 ? res : !res;
 }
 
-function classEnd(p: Uint8Array, plen: number, pi: number): number {
+function classEnd(p: Uint16Array, plen: number, pi: number): number {
   const ch = p[pi];
   pi++;
   if (ch === CH_ESC) {
@@ -138,7 +136,7 @@ function classEnd(p: Uint8Array, plen: number, pi: number): number {
 
 function matchBracketClass(
   c: number,
-  p: Uint8Array,
+  p: Uint16Array,
   pi: number,
   ec: number,
 ): boolean {
@@ -404,8 +402,8 @@ function match(ms: MatchState, si: number, pi: number): number {
 }
 
 function createMatchState(s: string, p: string): MatchState {
-  const sb = toBytes(s);
-  const pb = toBytes(p);
+  const sb = toCodeUnits(s);
+  const pb = toCodeUnits(p);
   const capture: Capture[] = new Array(MAX_CAPTURES);
   for (let i = 0; i < MAX_CAPTURES; i++) {
     capture[i] = { init: 0, len: 0 };
@@ -434,8 +432,6 @@ function noSpecials(p: string): boolean {
   return true;
 }
 
-// Public API
-
 export type CaptureResult = { s: string } | { position: number };
 
 interface RawCapture {
@@ -615,7 +611,6 @@ function expandReplacementString(
         throw new Error("invalid use of '%' in replacement string");
       }
     } else {
-      // Collect consecutive literal characters
       let j = i + 1;
       while (j < repl.length && repl.charCodeAt(j) !== CH_ESC) j++;
       parts.push(repl.substring(i, j));

package/client/space_lua/stdlib/space_lua.ts

@@ -180,7 +180,6 @@ export async function interpolateLuaString(
 
     result += template.slice(currentIndex, startIndex);
 
-    // Find matching closing brace by counting nesting
     let nestLevel = 1;
     let endIndex = startIndex + 2;
     while (nestLevel > 0 && endIndex < template.length) {
@@ -519,7 +518,7 @@ export const spaceluaApi = new LuaTable({
    */
   baseUrl: new LuaBuiltinFunction({
     callback: () => {
-      //NOTE: Removing trailing slash to stay compatible with original code: `location.protocol + "//" + location.host;`
+      // The origin contract excludes a trailing slash.
       return document.baseURI.replace(/\/*$/, "");
     },
     description:

package/client/space_lua/stdlib/string_pack.ts

@@ -145,7 +145,6 @@ function getOption(
   }
 }
 
-// Compute alignment padding
 function getDetails(
   fmt: string,
   pos: number,
@@ -264,7 +263,6 @@ export const strPackFn = new LuaBuiltinFunction({
       let opt: ParsedOption;
       [opt, pos] = getDetails(fmt, pos, h, totalsize);
 
-      // alignment padding
       if (opt.ntoalign > 0) {
         parts.push(new Uint8Array(opt.ntoalign));
         totalsize += opt.ntoalign;
@@ -349,7 +347,6 @@ export const strPackFn = new LuaBuiltinFunction({
       }
     }
 
-    // Concatenate all parts into one binary string (latin-1 encoding)
     let total = 0;
     for (const p of parts) total += p.length;
     const out = new Uint8Array(total);

package/client/space_lua/stdlib/table.ts

@@ -274,12 +274,10 @@ export const tableApi = new LuaTable({
       t: number,
       a2?: LuaTable | any[],
     ) => {
-      // a2 defaults to a1
       if (a2 === undefined || a2 === null) {
         a2 = a1;
       }
 
-      // Empty range: nothing to do, return destination
       if (e < f) {
         return a2;
       }
@@ -422,7 +420,6 @@ export const tableApi = new LuaTable({
         return false;
       }
       if (tbl instanceof LuaTable) {
-        // Iterate over the table
         for (const key of tbl.keys()) {
           if (luaEquals(tbl.get(key), value)) {
             return true;
@@ -459,9 +456,7 @@ export const tableApi = new LuaTable({
       tbl: LuaTable | Record<string, any>,
       ...keys: LuaValue[]
     ) => {
-      // Normalize arguments
       if (Array.isArray(keys[0])) {
-        // First argument is key array, let's unpack
         keys = keys[0];
       } else if (keys[0] instanceof LuaTable) {
         keys = keys[0].toJSArray();

package/client/space_lua/stdlib.ts

@@ -1,3 +1,4 @@
+import { LuaBudgetStopped } from "./budget.ts";
 import {
   getMetatable,
   type ILuaFunction,
@@ -101,7 +102,6 @@ const ipairsFunction = new LuaBuiltinFunction({
 
 const pairsFunction = new LuaBuiltinFunction({
   callback: (sf, t: LuaTable | any[] | Record<string, any>) => {
-    // Respect `__pairs` metamethod for Lua tables
     if (isLuaTable(t)) {
       const mt = (t as any).metatable as LuaTable | null | undefined;
       if (mt) {
@@ -295,27 +295,24 @@ async function pcallBoundary(
     const msg = errMsgOf(e);
     try {
       await luaCloseFromMark(sf, mark, msg);
-      return { ok: false, message: msg };
     } catch (closeErr: any) {
-      return { ok: false, message: errMsgOf(closeErr) };
+      if (!(e instanceof LuaBudgetStopped)) {
+        return { ok: false, message: errMsgOf(closeErr) };
+      }
+    }
+    // A user-initiated stop is not a recoverable Lua error.
+    if (e instanceof LuaBudgetStopped) {
+      throw e;
     }
+    return { ok: false, message: msg };
   }
 }
 
 const pcallFunction = new LuaBuiltinFunction({
   callback: async (sf, fn: ILuaFunction, ...args) => {
-    // To-be-closed variables must be closed when unwinding to the
-    // protected call boundary. Space Lua uses a per-thread close
-    // stack, so we snapshot its length and close anything pushed
-    // after that.
-    //
-    // The protected call boundary must be established *before*
-    // evaluating the function and its arguments.  Otherwise, any
-    // `<close>` locals created while evaluating `pcall`'s arguments
-    // will be wrongly treated as "inside" the protected call, and
-    // `pcall` may end up closing them (or affecting close ordering).
-    //
-    // `threadState` is read-only on the stack frame; do not reassign!
+    // Snapshot the close stack before evaluating the function and arguments,
+    // so argument-owned <close> locals stay outside the protected boundary.
+    // Do not reassign the frame’s read-only threadState.
     const res = await pcallBoundary(sf, fn, args);
     if (res.ok) {
       return new LuaMultiRes([true, ...res.values]);
@@ -345,7 +342,6 @@ const xpcallFunction = new LuaBuiltinFunction({
     errorHandler: ILuaFunction,
     ...args
   ) => {
-    // Same semantic as `pcall` (see comments there)
     const res = await pcallBoundary(sf, fn, args);
     if (res.ok) {
       return new LuaMultiRes([true, ...res.values]);
@@ -505,6 +501,12 @@ const dofileFunction = new LuaBuiltinFunction({
       const env = new LuaEnv(global);
       await evalStatement(parsedExpr, env, sf.withCtx(parsedExpr.ctx));
     } catch (e: any) {
+      // A user-initiated stop must keep its identity so an enclosing
+      // pcall/xpcall still recognizes and rethrows it, rather than being
+      // rewrapped into a recoverable LuaRuntimeError.
+      if (e instanceof LuaBudgetStopped) {
+        throw e;
+      }
       throw new LuaRuntimeError(
         `Error evaluating "${filename}": ${e.message}`,
         sf,
@@ -582,30 +584,24 @@ const nextFunction = new LuaBuiltinFunction({
     index: number | null = null,
   ) => {
     if (!table) {
-      // When nil value
       return null;
     }
     const keys = luaKeys(table);
 
-    // Empty table -> null return value
     if (keys.length === 0) {
       return null;
     }
 
     if (index === null) {
-      // Return the first key, value
       const key = keys[0];
       return new LuaMultiRes([key, luaGet(table, key, sf.astCtx ?? null, sf)]);
     }
-    // Find index in the key list
     const idx = keys.indexOf(index);
     if (idx === -1) {
-      // Not found
       throw new LuaRuntimeError("invalid key to 'next': key not found", sf);
     }
     const key = keys[idx + 1];
     if (key === undefined) {
-      // When called with the last key, should return nil
       return null;
     }
     return new LuaMultiRes([key, luaGet(table, key, sf.astCtx ?? null, sf)]);
@@ -622,7 +618,6 @@ const nextFunction = new LuaBuiltinFunction({
   ],
 });
 
-// Non-standard, but useful
 const someFunction = new LuaBuiltinFunction({
   callback: async (_sf, value: any) => {
     switch (await luaTypeOf(value)) {
@@ -691,13 +686,11 @@ function annotateBuiltinApi(
 
 export function luaBuildStandardEnv() {
   const env = new LuaEnv();
-  // _G global
   env.set("_G", env);
   // Lua version string - for now it signals Lua 5.4 compatibility with
   // selective 5.5 features; kept non-standard so callers can distinguish
   // Space Lua from a plain Lua runtime.
   env.set("_VERSION", "Lua 5.4+");
-  // Top-level builtins
   env.set("print", printFunction);
   env.set("assert", assertFunction);
   env.set("type", typeFunction);
@@ -705,10 +698,8 @@ export function luaBuildStandardEnv() {
   env.set("tonumber", tonumberFunction);
   env.set("select", selectFunction);
   env.set("next", nextFunction);
-  // Iterators
   env.set("pairs", pairsFunction);
   env.set("ipairs", ipairsFunction);
-  // meta table stuff
   env.set("setmetatable", setmetatableFunction);
   env.set("getmetatable", getmetatableFunction);
   env.set("rawlen", rawlenFunction);
@@ -716,19 +707,15 @@ export function luaBuildStandardEnv() {
   env.set("rawget", rawgetFunction);
   env.set("rawequal", rawequalFunction);
   env.set("dofile", dofileFunction);
-  // Error handling
   env.set("error", errorFunction);
   env.set("pcall", pcallFunction);
   env.set("xpcall", xpcallFunction);
-  // Evaluation
   env.set("load", loadFunction);
-  // APIs
   env.set("string", stringApi);
   env.set("table", tableApi);
   env.set("os", osApi);
   env.set("js", jsApi);
   env.set("math", mathApi);
-  // Non-standard
   env.set("each", eachFunction);
   env.set("spacelua", spaceluaApi);
   env.set("encoding", encodingApi);

package/client/space_lua/tonumber.ts

@@ -142,7 +142,6 @@ function parseInt(s: string): { ok: boolean; value: number } {
   let acc = 0;
   let any = false;
 
-  // hex?
   if (s.charCodeAt(i) === 48 && i + 1 < n) {
     // '0'
     const x = s.charCodeAt(i + 1);
@@ -179,7 +178,6 @@ function parseInt(s: string): { ok: boolean; value: number } {
     }
   }
 
-  // decimal integer
   while (i < n) {
     const c = s.charCodeAt(i);
     if (c < 48 || c > 57) {
@@ -221,7 +219,6 @@ function parseDecFloat(s: string): { ok: boolean; value: number } {
   let fracAny = false;
   let val = 0;
 
-  // integer part
   while (i < n) {
     const c = s.charCodeAt(i);
     if (c < 48 || c > 57) {
@@ -233,7 +230,6 @@ function parseDecFloat(s: string): { ok: boolean; value: number } {
     i++;
   }
 
-  // fractional part
   if (i < n) {
     if (s.charCodeAt(i) === 46) {
       // '.'
@@ -253,7 +249,6 @@ function parseDecFloat(s: string): { ok: boolean; value: number } {
     }
   }
 
-  // exponent
   let exp = 0;
   let hasExp = false;
   if (i < n) {
@@ -347,7 +342,6 @@ function parseHexFloat(s: string): { ok: boolean; value: number } {
   let anyHex = false;
   let sawDot = false;
 
-  // integer hex digits
   while (i < n) {
     const c = s.charCodeAt(i);
     let d = -1;
@@ -371,7 +365,6 @@ function parseHexFloat(s: string): { ok: boolean; value: number } {
     i++;
   }
 
-  // optional fractional part
   if (i < n) {
     if (s.charCodeAt(i) === 46) {
       // '.'
@@ -444,7 +437,6 @@ function parseHexFloat(s: string): { ok: boolean; value: number } {
         return { ok: false, value: 0 };
       }
     } else {
-      // no exponent marker
       if (!sawDot) {
         // without dot we must reject so parseInt can claim it as integer
         return { ok: false, value: 0 };
@@ -456,7 +448,6 @@ function parseHexFloat(s: string): { ok: boolean; value: number } {
       exp = 0; // implicit p0
     }
   } else {
-    // end of string
     if (!sawDot) {
       return { ok: false, value: 0 };
     }

package/dist/plug-compile.js

@@ -4,7 +4,7 @@
 import { Command } from "commander";
 
 // version.ts
-var version = "2.10.0";
+var version = "2.11.0";
 
 // client/plugos/plug_compile.ts
 import * as path from "node:path";
@@ -1371,8 +1371,7 @@ ${Object.entries(manifest.functions).map(([funcName, def]) => {
     }
     let [filePath, jsFunctionName] = def.path.split(":");
     filePath = path.join(rootPath, filePath);
-    return `import {${jsFunctionName} as ${funcName}} from "${// Replacing \ with / for Windows
-    path.resolve(filePath).replaceAll("\\", "\\\\")}";
+    return `import {${jsFunctionName} as ${funcName}} from "${path.resolve(filePath).replaceAll("\\", "\\\\")}";
 `;
   }).join("")}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silverbulletmd/silverbullet",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "type": "module",
   "description": "A self-hosted, web-based note taking app",
   "publishConfig": {
@@ -15,20 +15,26 @@
     "./lib/tree": "./plug-api/lib/tree.ts",
     "./lib/ref": "./plug-api/lib/ref.ts",
     "./lib/resolve": "./plug-api/lib/resolve.ts",
+    "./lib/resolve_path": "./plug-api/lib/resolve_path.ts",
+    "./lib/link_write": "./plug-api/lib/link_write.ts",
     "./lib/dates": "./plug-api/lib/dates.ts",
+    "./lib/fuzzy": "./plug-api/lib/fuzzy.ts",
     "./lib/async": "./plug-api/lib/async.ts",
     "./lib/crypto": "./plug-api/lib/crypto.ts",
     "./lib/limited_map": "./plug-api/lib/limited_map.ts",
     "./lib/tags": "./plug-api/lib/tags.ts",
+    "./lib/collation": "./plug-api/lib/collation.ts",
     "./lib/transclusion": "./plug-api/lib/transclusion.ts",
     "./lib/native_fetch": "./plug-api/lib/native_fetch.ts",
     "./lib/query_expression": "./plug-api/lib/query_expression.ts",
+    "./lib/panel_styles": "./plug-api/lib/panel_styles.ts",
     "./type/client": "./plug-api/types/client.ts",
     "./type/config": "./plug-api/types/config.ts",
     "./type/manifest": "./plug-api/types/manifest.ts",
     "./type/namespace": "./plug-api/types/namespace.ts",
     "./type/datastore": "./plug-api/types/datastore.ts",
     "./type/event": "./plug-api/types/event.ts",
+    "./type/revisions": "./plug-api/types/revisions.ts",
     "./type/index": "./plug-api/types/index.ts"
   },
   "bin": {
@@ -41,6 +47,7 @@
     "client/plugos/**/*.ts",
     "!client/plugos/**/*.test.ts",
     "client/asset_bundle/bundle.ts",
+    "client/config.ts",
     "client/data/kv_primitives.ts",
     "client/data/datastore.ts",
     "client/space_lua/**/*.ts",
@@ -48,6 +55,7 @@
     "!client/space_lua/**/*.bench.ts",
     "client/markdown_parser/constants.ts",
     "plugs/builtin_plugs.ts",
+    "plugs/index/types.ts",
     "dist/plug-compile.js"
   ],
   "scripts": {
@@ -55,9 +63,10 @@
     "build:plugs": "tsx build/build_plugs.ts",
     "build:client": "tsx build/build_client.ts",
     "build:plug-compile": "tsx build/build_plug_compile.ts",
+    "prebuild:client": "node build/patch_codemirror_view.mjs",
     "prepublishOnly": "npm run build:plug-compile",
     "test": "vitest run",
-    "check": "tsc --noEmit",
+    "check": "tsc --noEmit && tsc -p tsconfig.e2e.json",
     "lint": "biome lint .",
     "fmt": "biome format --write .",
     "fmt:check": "biome format .",
@@ -92,8 +101,10 @@
     "@lezer/lr": "1.4.8",
     "@lezer/markdown": "1.6.3",
     "@msgpack/msgpack": "3.1.3",
+    "@noble/hashes": "2.0.1",
     "@replit/codemirror-lang-nix": "6.0.1",
     "@replit/codemirror-vim": "6.3.0",
+    "@types/js-yaml": "^4.0.9",
     "commander": "^14.0.3",
     "crelt": "1.0.6",
     "d3-force": "^3.0.0",
@@ -118,7 +129,6 @@
     "@preact/preset-vite": "^2.10.3",
     "@types/d3-force": "^3.0.10",
     "@types/gitignore-parser": "^0.0.3",
-    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.0.0",
     "@types/turndown": "^5.0.6",
     "fake-indexeddb": "6.0.1",

package/plug-api/lib/async.ts

@@ -11,7 +11,6 @@ export function throttle(
       }, limit);
     }
   };
-  // Immediately execute any pending call and cancel the timer
   throttled.flush = () => {
     if (timer) {
       clearTimeout(timer);
@@ -91,7 +90,7 @@ export class PromiseQueue {
       reject(error);
     }
 
-    void this.process(); // Continue processing the next promise in the queue
+    void this.process();
   }
 }
 
@@ -108,17 +107,13 @@ export async function batchRequests<I, O>(
   batchSize: number,
 ): Promise<O[]> {
   const results: O[] = [];
-  // Split values into batches of batchSize
   const batches: I[][] = [];
   for (let i = 0; i < values.length; i += batchSize) {
     batches.push(values.slice(i, i + batchSize));
   }
-  // Run fn on them in parallel
   const batchResults = await Promise.all(batches.map(fn));
-  // Flatten the results
   for (const batchResult of batchResults) {
     if (Array.isArray(batchResult)) {
-      // If fn returns an array, collect them
       results.push(...batchResult);
     }
   }

package/plug-api/lib/collation.ts

@@ -0,0 +1,22 @@
+import type { QueryCollationConfig } from "../types/config.ts";
+
+/**
+ * Compares two values the same way the query engine's `order by` does:
+ * codepoint order by default, or `Intl.Collator` order when the space's
+ * `queryCollation` config turns it on and both sides are strings.
+ */
+export function compareCollated(
+  // deno-lint-ignore no-explicit-any
+  a: any,
+  // deno-lint-ignore no-explicit-any
+  b: any,
+  collation: QueryCollationConfig | undefined,
+  collator: Intl.Collator,
+): number {
+  if (collation?.enabled && typeof a === "string" && typeof b === "string") {
+    return collator.compare(a, b);
+  }
+  if (a < b) return -1;
+  if (a > b) return 1;
+  return 0;
+}

package/plug-api/lib/crypto.ts

@@ -1,3 +1,5 @@
+import { sha256 } from "@noble/hashes/sha2.js";
+
 export function base64Decode(s: string): Uint8Array {
   const binString = atob(s);
   const len = binString.length;
@@ -32,31 +34,33 @@ export function base64DecodeDataUrl(dataUrl: string): Uint8Array {
   return base64Decode(b64Encoded);
 }
 
-/**
- * Perform sha256 hash using the browser's crypto APIs
- * Note: this will only work over HTTPS
- * @param message
- */
 export async function hashSHA256(
   message: string | Uint8Array,
 ): Promise<string> {
-  // Transform the string into an ArrayBuffer
   const encoder = new TextEncoder();
   const data: Uint8Array =
     typeof message === "string" ? encoder.encode(message) : message;
 
-  // Generate the hash
-  const hashBuffer = await globalThis.crypto.subtle.digest(
-    "SHA-256",
-    data as BufferSource,
-  );
+  const hashBuffer = globalThis.crypto.subtle
+    ? await globalThis.crypto.subtle.digest("SHA-256", data as BufferSource)
+    : sha256(data);
 
-  // Transform the hash into a hex string
   return Array.from(new Uint8Array(hashBuffer))
     .map((b) => b.toString(16).padStart(2, "0"))
     .join("");
 }
 
+export function randomUUID(): string {
+  if (globalThis.crypto.randomUUID) return globalThis.crypto.randomUUID();
+  const bytes = globalThis.crypto.getRandomValues(new Uint8Array(16));
+  bytes[6] = (bytes[6] & 0x0f) | 0x40;
+  bytes[8] = (bytes[8] & 0x3f) | 0x80;
+  const hex = Array.from(bytes, (byte) =>
+    byte.toString(16).padStart(2, "0"),
+  ).join("");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+
 /**
  * To avoid database clashes based on space folder path name, base URLs and encryption keys we derive
  * a database name from a hash of all these combined together
@@ -117,7 +121,6 @@ export async function encryptAesGcm(
   );
   const encrypted = new Uint8Array(encryptedBuffer);
 
-  // Prepend IV to ciphertext
   const result = new Uint8Array(iv.length + encrypted.length);
   result.set(iv, 0);
   result.set(encrypted, iv.length);
@@ -143,10 +146,8 @@ export async function deriveCTRKeyFromPassword(
   password: string,
   salt: Uint8Array,
 ): Promise<CryptoKey> {
-  // Encode password to ArrayBuffer
   const passwordBytes = new TextEncoder().encode(password);
 
-  // Import password as a CryptoKey
   const baseKey = await globalThis.crypto.subtle.importKey(
     "raw",
     passwordBytes,