@silverbulletmd/silverbullet 2.5.3 → 2.6.1

package/client/space_lua/stdlib/pattern.ts

@@ -54,7 +54,7 @@ function toBytes(s: string): Uint8Array {
   const len = s.length;
   const arr = new Uint8Array(len);
   for (let i = 0; i < len; i++) {
-    arr[i] = s.charCodeAt(i) & 0xFF;
+    arr[i] = s.charCodeAt(i) & 0xff;
   }
   return arr;
 }
@@ -79,8 +79,11 @@ function matchClass(c: number, cl: number): boolean {
       res = c >= 97 && c <= 122;
       break;
     case 112: // 'p'
-      res = (c >= 33 && c <= 47) || (c >= 58 && c <= 64) ||
-        (c >= 91 && c <= 96) || (c >= 123 && c <= 126);
+      res =
+        (c >= 33 && c <= 47) ||
+        (c >= 58 && c <= 64) ||
+        (c >= 91 && c <= 96) ||
+        (c >= 123 && c <= 126);
       break;
     case 115: // 's'
       res = c === 32 || (c >= 9 && c <= 13);
@@ -89,12 +92,12 @@ function matchClass(c: number, cl: number): boolean {
       res = c >= 65 && c <= 90;
       break;
     case 119: // 'w'
-      res = (c >= 65 && c <= 90) || (c >= 97 && c <= 122) ||
-        (c >= 48 && c <= 57);
+      res =
+        (c >= 65 && c <= 90) || (c >= 97 && c <= 122) || (c >= 48 && c <= 57);
       break;
     case 120: // 'x'
-      res = (c >= 48 && c <= 57) || (c >= 65 && c <= 70) ||
-        (c >= 97 && c <= 102);
+      res =
+        (c >= 48 && c <= 57) || (c >= 65 && c <= 70) || (c >= 97 && c <= 102);
       break;
     case 122: // 'z'
       res = c === 0;
@@ -102,7 +105,7 @@ function matchClass(c: number, cl: number): boolean {
     default:
       return cl === c;
   }
-  return (cl >= 97 && cl <= 122) ? res : !res;
+  return cl >= 97 && cl <= 122 ? res : !res;
 }
 
 function classEnd(p: Uint8Array, plen: number, pi: number): number {
@@ -150,9 +153,7 @@ function matchBracketClass(
     if (pch === CH_ESC) {
       pi++;
       if (matchClass(c, p[pi])) return sig;
-    } else if (
-      pi + 2 < ec && p[pi + 1] === CH_DASH
-    ) {
+    } else if (pi + 2 < ec && p[pi + 1] === CH_DASH) {
       pi += 2;
       if (pch <= c && c <= p[pi]) return sig;
     } else if (pch === c) {
@@ -182,11 +183,7 @@ function singleMatch(
   return pch === c;
 }
 
-function matchBalance(
-  ms: MatchState,
-  si: number,
-  pi: number,
-): number {
+function matchBalance(ms: MatchState, si: number, pi: number): number {
   if (pi >= ms.plen - 1) {
     throw new Error("malformed pattern (missing arguments to '%b')");
   }
@@ -209,12 +206,7 @@ function matchBalance(
   return -1;
 }
 
-function maxExpand(
-  ms: MatchState,
-  si: number,
-  pi: number,
-  ep: number,
-): number {
+function maxExpand(ms: MatchState, si: number, pi: number, ep: number): number {
   let i = 0;
   while (singleMatch(ms, si + i, pi, ep)) i++;
   while (i >= 0) {
@@ -225,12 +217,7 @@ function maxExpand(
   return -1;
 }
 
-function minExpand(
-  ms: MatchState,
-  si: number,
-  pi: number,
-  ep: number,
-): number {
+function minExpand(ms: MatchState, si: number, pi: number, ep: number): number {
   for (;;) {
     const res = match(ms, si, ep + 1);
     if (res >= 0) return res;
@@ -326,7 +313,8 @@ function match(ms: MatchState, si: number, pi: number): number {
     }
     if (pch === CH_ESC && pi + 1 < ms.plen) {
       const next = ms.p[pi + 1];
-      if (next === 98) { // 'b'
+      if (next === 98) {
+        // 'b'
         si = matchBalance(ms, si, pi + 2);
         if (si >= 0) {
           pi += 4;
@@ -335,7 +323,8 @@ function match(ms: MatchState, si: number, pi: number): number {
         ms.matchdepth++;
         return -1;
       }
-      if (next === 102) { // 'f'
+      if (next === 102) {
+        // 'f'
         pi += 2;
         if (pi >= ms.plen || ms.p[pi] !== CH_LBRACKET) {
           throw new Error("missing '[' after '%f' in pattern");
@@ -370,7 +359,9 @@ function match(ms: MatchState, si: number, pi: number): number {
       if (ep < ms.plen) {
         const suffix = ms.p[ep];
         if (
-          suffix === CH_STAR || suffix === CH_QUESTION || suffix === CH_DASH
+          suffix === CH_STAR ||
+          suffix === CH_QUESTION ||
+          suffix === CH_DASH
         ) {
           pi = ep + 1;
           continue;
@@ -614,10 +605,12 @@ function expandReplacementString(
       } else if (rc === CH_0) {
         parts.push(ms.src.substring(matchStart, matchEnd));
       } else if (rc >= 49 && rc <= CH_9) {
-        parts.push(getRawCaptureString(
-          ms,
-          getOneRawCapture(ms, rc - 49, matchStart, matchEnd),
-        ));
+        parts.push(
+          getRawCaptureString(
+            ms,
+            getOneRawCapture(ms, rc - 49, matchStart, matchEnd),
+          ),
+        );
       } else {
         throw new Error("invalid use of '%' in replacement string");
       }

package/client/space_lua/stdlib/prng.ts

@@ -10,7 +10,7 @@ export class LuaPRNG {
 
   private rotl(x: bigint, k: number): bigint {
     k = k & 63;
-    return ((x << BigInt(k)) | (x >> BigInt(64 - k))) & 0xFFFFFFFFFFFFFFFFn;
+    return ((x << BigInt(k)) | (x >> BigInt(64 - k))) & 0xffffffffffffffffn;
   }
 
   private nextrand(): bigint {
@@ -20,10 +20,11 @@ export class LuaPRNG {
     const s2 = s[2];
     const s3 = s[3];
 
-    const res = this.rotl((s1 * 5n) & 0xFFFFFFFFFFFFFFFFn, 7) * 9n &
-      0xFFFFFFFFFFFFFFFFn;
+    const res =
+      (this.rotl((s1 * 5n) & 0xffffffffffffffffn, 7) * 9n) &
+      0xffffffffffffffffn;
 
-    const t = (s1 << 17n) & 0xFFFFFFFFFFFFFFFFn;
+    const t = (s1 << 17n) & 0xffffffffffffffffn;
     s[2] = s2 ^ s0;
     s[3] = s3 ^ s1;
     s[1] = s1 ^ s[2];
@@ -35,17 +36,17 @@ export class LuaPRNG {
   }
 
   public setSeed(seed1: bigint, seed2: bigint = 0n): [bigint, bigint] {
-    const MASK = 0xFFFFFFFFFFFFFFFFn;
+    const MASK = 0xffffffffffffffffn;
     const s = this.state;
 
     const sm64 = (x: bigint): bigint => {
-      x = (x ^ (x >> 30n)) * 0xBF58476D1CE4E5B9n & MASK;
-      x = (x ^ (x >> 27n)) * 0x94D049BB133111EBn & MASK;
+      x = ((x ^ (x >> 30n)) * 0xbf58476d1ce4e5b9n) & MASK;
+      x = ((x ^ (x >> 27n)) * 0x94d049bb133111ebn) & MASK;
       return (x ^ (x >> 31n)) & MASK;
     };
 
     s[0] = sm64(seed1 & MASK);
-    s[1] = sm64((seed1 & MASK) | 0xFFn);
+    s[1] = sm64((seed1 & MASK) | 0xffn);
     s[2] = sm64(seed2 & MASK);
     s[3] = sm64(0n);
 
@@ -101,9 +102,8 @@ export class LuaPRNG {
     if (arg2 === undefined) {
       if (arg1 === 0) {
         // Raw 64-bit as signed bigint
-        const signed = rv > 0x7FFFFFFFFFFFFFFFn
-          ? rv - 0x10000000000000000n
-          : rv;
+        const signed =
+          rv > 0x7fffffffffffffffn ? rv - 0x10000000000000000n : rv;
         return signed;
       }
       if (arg1 < 1) {
@@ -133,7 +133,10 @@ export class LuaPRNG {
         "bad argument #1 to 'randomseed' (number has no integer representation)",
       );
     }
-    if (arg2 !== undefined && (!Number.isFinite(arg2) || !Number.isInteger(arg2))) {
+    if (
+      arg2 !== undefined &&
+      (!Number.isFinite(arg2) || !Number.isInteger(arg2))
+    ) {
       throw new Error(
         "bad argument #2 to 'randomseed' (number has no integer representation)",
       );

package/client/space_lua/stdlib/space_lua.ts

@@ -2,6 +2,7 @@ import { parseExpressionString } from "../parse.ts";
 import type { LuaExpression } from "../ast.ts";
 import { evalExpression } from "../eval.ts";
 import {
+  jsToLuaValue,
   LuaBuiltinFunction,
   LuaEnv,
   LuaRuntimeError,
@@ -11,6 +12,7 @@ import {
   luaValueToJS,
   singleResult,
 } from "../runtime.ts";
+import { isSqlNull } from "../liq_null.ts";
 
 /**
  * These are Space Lua specific functions that are available to all scripts, but are not part of the standard Lua language.
@@ -31,7 +33,8 @@ function createAugmentedEnv(
   if (envAugmentation) {
     env.setLocal("_", envAugmentation);
     for (const key of envAugmentation.keys()) {
-      env.setLocal(key, envAugmentation.rawGet(key));
+      const v = envAugmentation.rawGet(key);
+      env.setLocal(key, isSqlNull(v) ? null : v);
     }
   }
   return env;
@@ -89,10 +92,7 @@ export async function interpolateLuaString(
       const luaResult = singleResult(await evalExpression(parsedExpr, env, sf));
       result += await luaToString(luaResult);
     } catch (e: any) {
-      throw new LuaRuntimeError(
-        `Error evaluating "${expr}": ${e.message}`,
-        sf,
-      );
+      throw new LuaRuntimeError(`Error evaluating "${expr}": ${e.message}`, sf);
     }
 
     currentIndex = endIndex + 1;
@@ -109,11 +109,9 @@ export const spaceluaApi = new LuaTable({
    * @param luaExpression - The lua expression to parse.
    * @returns The parsed expression.
    */
-  parseExpression: new LuaBuiltinFunction(
-    (_sf, luaExpression: string) => {
-      return parseExpressionString(luaExpression);
-    },
-  ),
+  parseExpression: new LuaBuiltinFunction((_sf, luaExpression: string) => {
+    return parseExpressionString(luaExpression);
+  }),
   /**
    * Evaluates a parsed lua expression and returns the result.
    *
@@ -132,17 +130,18 @@ export const spaceluaApi = new LuaTable({
    * Interpolates a string with lua expressions and returns the result.
    */
   interpolate: new LuaBuiltinFunction(
-    (sf, template: string, envAugmentation?: LuaTable) => {
+    (sf, template: string, envAugmentation?: LuaTable | any) => {
+      if (envAugmentation && !(envAugmentation instanceof LuaTable)) {
+        envAugmentation = jsToLuaValue(envAugmentation);
+      }
       return interpolateLuaString(sf, template, envAugmentation);
     },
   ),
   /**
    * Returns your SilverBullet instance's base URL
    */
-  baseUrl: new LuaBuiltinFunction(
-    () => {
-      //NOTE: Removing trailing slash to stay compatible with original code: `location.protocol + "//" + location.host;`
-      return document.baseURI.replace(/\/*$/, "");
-    },
-  ),
+  baseUrl: new LuaBuiltinFunction(() => {
+    //NOTE: Removing trailing slash to stay compatible with original code: `location.protocol + "//" + location.host;`
+    return document.baseURI.replace(/\/*$/, "");
+  }),
 });

package/client/space_lua/stdlib/string.ts

@@ -24,9 +24,7 @@ function capturesToLua(caps: CaptureResult[]): any {
     const c = caps[0];
     return "s" in c ? c.s : c.position;
   }
-  return new LuaMultiRes(
-    caps.map((c) => ("s" in c ? c.s : c.position)),
-  );
+  return new LuaMultiRes(caps.map((c) => ("s" in c ? c.s : c.position)));
 }
 
 export const stringApi = new LuaTable({
@@ -72,13 +70,7 @@ export const stringApi = new LuaTable({
     },
   ),
   gsub: new LuaBuiltinFunction(
-    async (
-      sf,
-      s: string,
-      pattern: string,
-      repl: any,
-      n?: number,
-    ) => {
+    async (sf, s: string, pattern: string, repl: any, n?: number) => {
       const callbacks: GsubCallbacks = {};
       if (typeof repl === "string") {
         callbacks.replString = repl;
@@ -121,13 +113,11 @@ export const stringApi = new LuaTable({
   upper: new LuaBuiltinFunction((_sf, s: string) => {
     return luaToString(s.toUpperCase());
   }),
-  match: new LuaBuiltinFunction(
-    (_sf, s: string, pattern: string, init = 1) => {
-      const caps = patternMatch(s, pattern, init);
-      if (!caps) return null;
-      return capturesToLua(caps);
-    },
-  ),
+  match: new LuaBuiltinFunction((_sf, s: string, pattern: string, init = 1) => {
+    const caps = patternMatch(s, pattern, init);
+    if (!caps) return null;
+    return capturesToLua(caps);
+  }),
   rep: new LuaBuiltinFunction((_sf, s: string, n: number, sep?: string) => {
     if (n <= 0) return "";
     sep = sep ?? "";

package/client/space_lua/stdlib/string_pack.ts

@@ -73,7 +73,8 @@ function getOption(
   fmt: string,
   pos: number,
   h: Header,
-): [KOption, number, number] { // [opt, size, newPos]
+): [KOption, number, number] {
+  // [opt, size, newPos]
   const c = fmt[pos++];
   switch (c) {
     case "b":
@@ -171,7 +172,10 @@ function getDetails(
 
   let ntoalign = 0;
   if (
-    opt !== "char" && opt !== "nop" && opt !== "padding" && opt !== "paddalign"
+    opt !== "char" &&
+    opt !== "nop" &&
+    opt !== "padding" &&
+    opt !== "paddalign"
   ) {
     const realign = Math.min(align, h.maxalign);
     if (realign > 0) {
@@ -381,7 +385,9 @@ export const strUnpackFn = new LuaBuiltinFunction(
 
       if (opt.ntoalign + opt.size > buf.length - pos) {
         if (
-          opt.opt !== "nop" && opt.opt !== "paddalign" && opt.opt !== "padding"
+          opt.opt !== "nop" &&
+          opt.opt !== "paddalign" &&
+          opt.opt !== "padding"
         ) {
           throw new LuaRuntimeError("data string too short", sf);
         }
@@ -464,23 +470,21 @@ export const strUnpackFn = new LuaBuiltinFunction(
   },
 );
 
-export const strPackSizeFn = new LuaBuiltinFunction(
-  (_sf, fmt: string) => {
-    const h = makeHeader();
-    let totalsize = 0;
-    let pos = 0;
-
-    while (pos < fmt.length) {
-      let opt: ParsedOption;
-      [opt, pos] = getDetails(fmt, pos, h, totalsize);
+export const strPackSizeFn = new LuaBuiltinFunction((_sf, fmt: string) => {
+  const h = makeHeader();
+  let totalsize = 0;
+  let pos = 0;
 
-      if (opt.opt === "string" || opt.opt === "zstr") {
-        throw new LuaRuntimeError("variable-length format", _sf);
-      }
+  while (pos < fmt.length) {
+    let opt: ParsedOption;
+    [opt, pos] = getDetails(fmt, pos, h, totalsize);
 
-      totalsize += opt.ntoalign + opt.size;
+    if (opt.opt === "string" || opt.opt === "zstr") {
+      throw new LuaRuntimeError("variable-length format", _sf);
     }
 
-    return totalsize;
-  },
-);
+    totalsize += opt.ntoalign + opt.size;
+  }
+
+  return totalsize;
+});

package/client/space_lua/stdlib/table.ts

@@ -84,9 +84,8 @@ export const tableApi = new LuaTable({
           return luaFormatNumber(v.value, "float");
         }
 
-        const ty = typeof v === "object" && v instanceof LuaTable
-          ? "table"
-          : typeof v;
+        const ty =
+          typeof v === "object" && v instanceof LuaTable ? "table" : typeof v;
         throw new LuaRuntimeError(
           `invalid value (${ty}) at index ${idx} in table for 'concat'`,
           sf,
@@ -301,10 +300,7 @@ export const tableApi = new LuaTable({
 
         const ta = typeof av;
         const tb = typeof bv;
-        throw new LuaRuntimeError(
-          `attempt to compare ${ta} with ${tb}`,
-          sf,
-        );
+        throw new LuaRuntimeError(`attempt to compare ${ta} with ${tb}`, sf);
       };
 
       const sorted = await asyncQuickSort(values, cmp);
@@ -399,7 +395,7 @@ export const tableApi = new LuaTable({
     for (let i = 0; i < n; i++) {
       await luaSet(tbl, i + 1, args[i], sf);
     }
-    tbl.rawSet("n", n);
+    void tbl.rawSet("n", n);
     return tbl;
   }),
 
@@ -410,7 +406,7 @@ export const tableApi = new LuaTable({
    */
   unpack: new LuaBuiltinFunction(
     async (sf, tbl: LuaTable | any[], i?: number, j?: number) => {
-      i = (i === undefined || i === null) ? 1 : i;
+      i = i === undefined || i === null ? 1 : i;
       if (j === undefined || j === null) {
         j = Array.isArray(tbl)
           ? tbl.length

package/client/space_lua/stdlib.ts

@@ -35,17 +35,15 @@ import { cryptoApi } from "./stdlib/crypto.ts";
 import { netApi } from "./stdlib/net.ts";
 import { isTaggedFloat, makeLuaFloat } from "./numeric.ts";
 import { isPromise } from "./rp.ts";
+import { isSqlNull } from "./liq_null.ts";
 
 const printFunction = new LuaBuiltinFunction(async (_sf, ...args) => {
-  console.log(
-    "[Lua]",
-    ...(await Promise.all(args.map((v) => luaToString(v)))),
-  );
+  console.log("[Lua]", ...(await Promise.all(args.map((v) => luaToString(v)))));
 });
 
 const assertFunction = new LuaBuiltinFunction(
   async (sf, value: any, message?: string) => {
-    if (!await value) {
+    if (!(await value)) {
       throw new LuaRuntimeError(`Assertion failed: ${message}`, sf);
     }
   },
@@ -143,10 +141,7 @@ const tostringFunction = new LuaBuiltinFunction(
         const unwrap = (v: any): string => {
           const s = singleResult(v);
           if (typeof s !== "string") {
-            throw new LuaRuntimeError(
-              "'__tostring' must return a string",
-              sf,
-            );
+            throw new LuaRuntimeError("'__tostring' must return a string", sf);
           }
           return s;
         };
@@ -203,10 +198,7 @@ async function pcallBoundary(
   sf: LuaStackFrame,
   fn: ILuaFunction,
   args: LuaValue[],
-): Promise<
-  | { ok: true; values: LuaValue[] }
-  | { ok: false; message: string }
-> {
+): Promise<{ ok: true; values: LuaValue[] } | { ok: false; message: string }> {
   const closeStack = luaEnsureCloseStack(sf);
   const mark = closeStack.length;
 
@@ -274,11 +266,9 @@ const setmetatableFunction = new LuaBuiltinFunction(
   },
 );
 
-const rawlenFunction = new LuaBuiltinFunction(
-  (_sf, value: LuaValue) => {
-    return luaLen(value, _sf, true);
-  },
-);
+const rawlenFunction = new LuaBuiltinFunction((_sf, value: LuaValue) => {
+  return luaLen(value, _sf, true);
+});
 
 const rawsetFunction = new LuaBuiltinFunction(
   (_sf, table: LuaTable, key: LuaValue, value: LuaValue) => {
@@ -290,7 +280,8 @@ const rawgetFunction = new LuaBuiltinFunction(
   (_sf, table: any, key: LuaValue) => {
     const isArray = Array.isArray(table);
 
-    const isPlainObj = typeof table === "object" &&
+    const isPlainObj =
+      typeof table === "object" &&
       table !== null &&
       (table as any).constructor === Object;
 
@@ -320,7 +311,7 @@ const rawgetFunction = new LuaBuiltinFunction(
 
     if (isLuaTable(table)) {
       const v = table.rawGet(key);
-      return v === undefined ? null : v;
+      return v === undefined || isSqlNull(v) ? null : v;
     }
 
     const k = isTaggedFloat(key) ? key.value : key;
@@ -339,13 +330,11 @@ const rawgetFunction = new LuaBuiltinFunction(
   },
 );
 
-const rawequalFunction = new LuaBuiltinFunction(
-  (_sf, a: any, b: any) => {
-    const av = isTaggedFloat(a) ? a.value : a;
-    const bv = isTaggedFloat(b) ? b.value : b;
-    return av === bv;
-  },
-);
+const rawequalFunction = new LuaBuiltinFunction((_sf, a: any, b: any) => {
+  const av = isTaggedFloat(a) ? a.value : a;
+  const bv = isTaggedFloat(b) ? b.value : b;
+  return av === bv;
+});
 
 const getmetatableFunction = new LuaBuiltinFunction((_sf, table: LuaTable) => {
   return (table as any).metatable;
@@ -353,12 +342,12 @@ const getmetatableFunction = new LuaBuiltinFunction((_sf, table: LuaTable) => {
 
 const dofileFunction = new LuaBuiltinFunction(async (sf, filename: string) => {
   const global = sf.threadLocal.get("_GLOBAL") as LuaEnv;
-  const file = await luaCall(
+  const file = (await luaCall(
     (global.get("space") as any).get("readFile"),
     [filename],
     sf.astCtx!,
     sf,
-  ) as Uint8Array;
+  )) as Uint8Array;
   const code = new TextDecoder().decode(file);
   try {
     const parsedExpr = parse(code);
@@ -434,7 +423,8 @@ const nextFunction = new LuaBuiltinFunction(
     }
     // Find index in the key list
     const idx = keys.indexOf(index);
-    if (idx === -1) { // Not found
+    if (idx === -1) {
+      // Not found
       throw new LuaRuntimeError("invalid key to 'next': key not found", sf);
     }
     const key = keys[idx + 1];