@poe-platform/safe-bash 0.1.793 → 0.1.795

package/dist/safe-bash-command-sqlite3/index.js

@@ -228,8 +228,8 @@ function encodeRecordValue(val) {
     view.setFloat64(0, val, false);
     return { serialType: 7, body: b };
   }
-  if (typeof val === "string") {
-    const encoded = textEncoder.encode(val);
+  if (typeof val === "string" || val instanceof String) {
+    const encoded = textEncoder.encode(String(val));
     return { serialType: encoded.byteLength * 2 + 13, body: encoded };
   }
   const u8 = val;
@@ -574,7 +574,7 @@ function compareSqlValuesForBTree(a, b) {
   const rank = (v) => {
     if (v === null || v === void 0) return 0;
     if (typeof v === "number" || typeof v === "bigint" || v instanceof Number) return 1;
-    if (typeof v === "string") return 2;
+    if (typeof v === "string" || v instanceof String) return 2;
     return 3;
   };
   const ra = rank(a);
@@ -786,6 +786,8 @@ function writeSqliteDatabaseBytes(image) {
 
 // packages/safe-bash-command-sqlite3/src/engine.ts
 function serializeSqlJson(value, preserveRealType = true) {
+  if (value instanceof JsonText && preserveRealType) return value.valueOf();
+  if (value instanceof String) return JSON.stringify(value.valueOf());
   if (typeof value === "bigint") return value.toString();
   if (value instanceof Number) {
     const number = value.valueOf();
@@ -799,6 +801,8 @@ function serializeSqlJson(value, preserveRealType = true) {
   }
   return JSON.stringify(value) ?? "null";
 }
+var JsonText = class extends String {
+};
 var textEncoder2 = new TextEncoder();
 var textDecoder2 = new TextDecoder("utf-8", { fatal: false });
 function cloneSqlValue(v) {
@@ -1535,7 +1539,7 @@ function typeRank(v) {
   if (typeof v === "number" || typeof v === "bigint" || v instanceof Number) {
     return 1;
   }
-  if (typeof v === "string") {
+  if (typeof v === "string" || v instanceof String) {
     return 2;
   }
   return 3;
@@ -1558,8 +1562,8 @@ function compareSqlValues(a, b, collation = "BINARY") {
     return nA < nB ? -1 : nA > nB ? 1 : 0;
   }
   if (rA === 2) {
-    let sA = a;
-    let sB = b;
+    let sA = String(a);
+    let sB = String(b);
     const col = collation.toUpperCase();
     if (col === "RTRIM") {
       sA = sA.replace(/ +$/, "");
@@ -1593,8 +1597,8 @@ function toSqlNumber(v) {
   if (typeof v === "number") {
     return v;
   }
-  if (typeof v === "string") {
-    const trimmed = v.trim();
+  if (typeof v === "string" || v instanceof String) {
+    const trimmed = String(v).trim();
     const m = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?/.exec(trimmed);
     return m ? Number(m[0]) : 0;
   }
@@ -1651,7 +1655,8 @@ function arithmeticNumber(value) {
   }
   return real ? new Number(Number(text.slice(0, end))) : integerResult(BigInt(text.slice(0, end)));
 }
-function applyColumnAffinity(value, declaredType) {
+function applyColumnAffinity(storedValue, declaredType) {
+  let value = storedValue instanceof String ? storedValue.valueOf() : storedValue;
   if (value === null || value instanceof Uint8Array) return value;
   const type = declaredType.toUpperCase();
   const integer = type.includes("INT");
@@ -1683,8 +1688,8 @@ function toSqlString(v) {
   if (v === null || v === void 0) {
     return "";
   }
-  if (typeof v === "string") {
-    return v;
+  if (typeof v === "string" || v instanceof String) {
+    return String(v);
   }
   if (typeof v === "bigint") {
     return v.toString();
@@ -3261,9 +3266,12 @@ var SqliteDatabase = class {
       const defVal = colDef.defaultExpr ? yield* this.evalScalarSql(colDef.defaultExpr, {}, []) : null;
       for (const r of tbl.rows) {
         yield;
-        r.data[colDef.name] = defVal;
+        r.data[colDef.name] = applyColumnAffinity(defVal, colDef.type);
       }
-      tbl.sql = tbl.sql.replace(/\)\s*$/, `, ${colDef.name} ${colDef.type})`);
+      const schemaTokens = tokenizeSql(tbl.sql);
+      const closingIndex = schemaTokens.map((token) => token.value).lastIndexOf(")");
+      schemaTokens.splice(closingIndex, 0, ...tokenizeSql(","), ...tokens.slice(idx));
+      tbl.sql = reconstructTokensSql(schemaTokens);
       return;
     }
     if (action === "DROP") {
@@ -3341,8 +3349,8 @@ var SqliteDatabase = class {
       const n = val.valueOf();
       return Number.isFinite(n) && Number.isInteger(n) ? `${n}.0` : String(n);
     }
-    if (typeof val === "string") {
-      return `'${val.replace(/'/g, "''")}'`;
+    if (typeof val === "string" || val instanceof String) {
+      return `'${String(val).replace(/'/g, "''")}'`;
     }
     let hex = "";
     for (const b of val) {
@@ -4822,12 +4830,8 @@ var SqliteDatabase = class {
       }
     }
     return {
-      columns: selectTargets.map((t) => {
-        return t.alias;
-      }),
-      rows: finalProjected.map((p) => {
-        return p.values;
-      })
+      columns: selectTargets.map((t) => t.alias),
+      rows: finalProjected.map((p) => p.values.map((value) => value instanceof String ? value.valueOf() : value))
     };
   }
   *evaluateFromClause(fromTokens, positionalParams, cteScope) {
@@ -5978,16 +5982,16 @@ var SqliteDatabase = class {
       return vals2.length;
     }
     if (u === "JSON_GROUP_OBJECT") {
-      const obj = {};
+      const entries = [];
       for (const r of filteredGroup) {
         yield;
         const k = yield* this.evalExprSteps(expr.args[0], r, positionalParams, cteScope);
         const v = yield* this.evalExprSteps(expr.args[1], r, positionalParams, cteScope);
         if (k !== null && k !== void 0) {
-          obj[toSqlString(k)] = this.sqlValToJsJson(v);
+          entries.push(`${JSON.stringify(toSqlString(k))}:${serializeSqlJson(v)}`);
         }
       }
-      return serializeSqlJson(obj);
+      return new JsonText(`{${entries.join(",")}}`);
     }
     let vals = yield* stepMap(filteredGroup, function* (r) {
       return expr.args[0] ? yield* this.evalExprSteps(expr.args[0], r, positionalParams, cteScope) : null;
@@ -6005,11 +6009,7 @@ var SqliteDatabase = class {
           return true;
         }, this);
       }
-      return serializeSqlJson(
-        vals.map((v) => {
-          return this.sqlValToJsJson(v);
-        })
-      );
+      return new JsonText(serializeSqlJson(vals));
     }
     const nonNull = vals.filter((v) => v !== null && v !== void 0);
     let activeVals = nonNull;
@@ -6119,23 +6119,6 @@ var SqliteDatabase = class {
     }
     return null;
   }
-  sqlValToJsJson(v) {
-    if (v === null || v === void 0) {
-      return null;
-    }
-    if (typeof v === "string") {
-      const trimmed = v.trim();
-      if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
-        try {
-          return JSON.parse(trimmed);
-        } catch {
-          return v;
-        }
-      }
-      return v;
-    }
-    return v;
-  }
   *validateColumns(node, scope, positionalParams, cteScope) {
     if (!node || typeof node !== "object") return;
     if ("kind" in node && node.kind === "column") {
@@ -6448,7 +6431,8 @@ var SqliteDatabase = class {
         const parsed = JSON.parse(toSqlString(l));
         const path = typeof r === "number" ? `$[${r}]` : toSqlString(r).startsWith("$") ? toSqlString(r) : `$.${toSqlString(r)}`;
         const extracted = extractByJsonPath(parsed, path);
-        return jsonValueToSql(extracted, op === "->>");
+        const value = jsonValueToSql(extracted, op === "->>");
+        return op === "->" && typeof value === "string" ? new JsonText(value) : value;
       } catch {
         return null;
       }
@@ -6545,6 +6529,12 @@ var SqliteDatabase = class {
     return Number.isInteger(n) ? n : n;
   }
   *evalScalarFunction(name, args) {
+    const value = yield* this.evalScalarFunctionValue(name, args);
+    const u = name.toUpperCase();
+    const jsonResult = ["JSON", "JSON_ARRAY", "JSON_OBJECT", "JSON_QUOTE", "JSON_PATCH", "JSON_REMOVE", "JSON_SET", "JSON_INSERT", "JSON_REPLACE"].includes(u);
+    return jsonResult && typeof value === "string" ? new JsonText(value) : value;
+  }
+  *evalScalarFunctionValue(name, args) {
     const u = name.toUpperCase();
     const a0 = args[0] ?? null;
     const a1 = args[1] ?? null;
@@ -6576,7 +6566,7 @@ var SqliteDatabase = class {
         if (typeof a0 === "number") {
           return Number.isInteger(a0) ? "integer" : "real";
         }
-        if (typeof a0 === "string") {
+        if (typeof a0 === "string" || a0 instanceof String) {
           return "text";
         }
         return "blob";
@@ -6901,7 +6891,17 @@ var SqliteDatabase = class {
         if (a0 === null) {
           return null;
         }
-        return JSON.stringify(JSON.parse(toSqlString(a0)));
+        const text = toSqlString(a0);
+        JSON.parse(text);
+        let quoted = false;
+        let escaped = false;
+        let compact = "";
+        for (const char of text) {
+          if (quoted || ![" ", "\n", "\r", "	"].includes(char)) compact += char;
+          if (!escaped && char === '"') quoted = !quoted;
+          escaped = quoted && !escaped && char === "\\";
+        }
+        return compact;
       }
       case "JSON_VALID": {
         if (a0 === null) {
@@ -6915,22 +6915,18 @@ var SqliteDatabase = class {
         }
       }
       case "JSON_QUOTE":
-        return a0 === null ? "null" : serializeSqlJson(this.sqlValToJsJson(a0));
+        return a0 === null ? "null" : serializeSqlJson(a0);
       case "JSON_ARRAY":
-        return serializeSqlJson(
-          args.map((x) => {
-            return this.sqlValToJsJson(x);
-          })
-        );
+        return serializeSqlJson(args);
       case "JSON_OBJECT": {
-        const obj = {};
+        const entries = [];
         for (let i = 0; i + 1 < args.length; i += 2) {
           yield;
           if (args[i] !== null && args[i] !== void 0) {
-            obj[toSqlString(args[i])] = this.sqlValToJsJson(args[i + 1] ?? null);
+            entries.push(`${JSON.stringify(toSqlString(args[i]))}:${serializeSqlJson(args[i + 1] ?? null)}`);
           }
         }
-        return serializeSqlJson(obj);
+        return `{${entries.join(",")}}`;
       }
       case "JSON_EXTRACT": {
         if (a0 === null) {
@@ -6940,13 +6936,14 @@ var SqliteDatabase = class {
           const parsed = JSON.parse(toSqlString(a0));
           if (args.length <= 2) {
             const extracted = extractByJsonPath(parsed, toSqlString(a1 ?? "$"));
-            return jsonValueToSql(extracted, true);
+            const value = jsonValueToSql(extracted, true);
+            return extracted !== null && typeof extracted === "object" && typeof value === "string" ? new JsonText(value) : value;
           }
           const arr = args.slice(1).map((p) => {
             const v = extractByJsonPath(parsed, toSqlString(p ?? "$"));
             return v === void 0 ? null : v;
           });
-          return JSON.stringify(arr);
+          return new JsonText(JSON.stringify(arr));
         } catch {
           return null;
         }
@@ -7005,7 +7002,8 @@ var SqliteDatabase = class {
           for (let i = 1; i + 1 < args.length; i += 2) {
             yield;
             const p = toSqlString(args[i] ?? "$");
-            const v = this.sqlValToJsJson(args[i + 1] ?? null);
+            const value = args[i + 1] ?? null;
+            const v = value instanceof JsonText ? JSON.parse(value.valueOf()) : value;
             cur = setByJsonPath(cur, p, v, mode);
           }
           return serializeSqlJson(cur);
@@ -7094,8 +7092,8 @@ function formatSqlQuote(v) {
   if (typeof v === "number") {
     return String(v);
   }
-  if (typeof v === "string") {
-    return `'${v.replace(/'/g, "''")}'`;
+  if (typeof v === "string" || v instanceof String) {
+    return `'${String(v).replace(/'/g, "''")}'`;
   }
   let hex = "";
   for (const b of v) {

package/dist/safe-bash-io-engine/commands/search/requirements.js

@@ -5,8 +5,8 @@ import {
   requiredFileInput,
   searchRequirements,
   sedRequirements
-} from "../../../safe-bash/command-chunks/chunk-JCORWQ2I.js";
-import "../../../safe-bash/command-chunks/chunk-ZJB7XJXD.js";
+} from "../../../safe-bash/command-chunks/chunk-7FKUC34S.js";
+import "../../../safe-bash/command-chunks/chunk-XAFSZDY2.js";
 import "../../../safe-bash/command-chunks/chunk-PM2PFWPC.js";
 import "../../../safe-bash/command-chunks/chunk-RHKBCQYQ.js";
 import "../../../safe-bash/command-chunks/chunk-773DWG4H.js";

package/dist/safe-bash-io-engine/commands/text-programs/shared.js

@@ -1,11 +1,11 @@
 import {
   requiredFileInput
-} from "../../../safe-bash/command-chunks/chunk-JCORWQ2I.js";
+} from "../../../safe-bash/command-chunks/chunk-7FKUC34S.js";
 import {
   RESOLVED_EXIT_ONE,
   RESOLVED_EXIT_ZERO,
   builtInDirectContextExecutors
-} from "../../../safe-bash/command-chunks/chunk-ZJB7XJXD.js";
+} from "../../../safe-bash/command-chunks/chunk-XAFSZDY2.js";
 import "../../../safe-bash/command-chunks/chunk-PM2PFWPC.js";
 import "../../../safe-bash/command-chunks/chunk-RHKBCQYQ.js";
 import {

package/dist/safe-bash-io-engine/internal.js

@@ -44,7 +44,7 @@ import {
   requireOperands,
   syncCommandEvaluators,
   value
-} from "../safe-bash/command-chunks/chunk-ZJB7XJXD.js";
+} from "../safe-bash/command-chunks/chunk-XAFSZDY2.js";
 import "../safe-bash/command-chunks/chunk-PM2PFWPC.js";
 import "../safe-bash/command-chunks/chunk-RHKBCQYQ.js";
 import "../safe-bash/command-chunks/chunk-773DWG4H.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.793",
+  "version": "0.1.795",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -869,7 +869,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.793",
+    "@poe-platform/safe-fs": "0.1.795",
     "pdf-lib": "1.17.1",
     "@noble/hashes": "2.4.0",
     "pako": "3.0.1",
@@ -1383,7 +1383,7 @@
     "./dist/safe-bash-xml-engine/json.js",
     "./dist/safe-bash-xml-engine/limits.js",
     "./dist/safe-bash-xml-engine/query.js",
-    "./dist/safe-bash/chunks/chunk-BENDQWMV.js",
+    "./dist/safe-bash/chunks/chunk-6IBTC4YL.js",
     "./dist/safe-bash/chunks/chunk-D2XB7XIC.js",
     "./dist/safe-bash/chunks/chunk-KV7PKOHV.js",
     "./dist/safe-bash/chunks/chunk-NX2SQVON.js",