@ix-xs/node-comfort 1.0.55 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ix-xs/node-comfort",
-	"version": "1.0.55",
+	"version": "1.0.57",
 	"description": "",
 	"main": "index.js",
 	"types": "types/index.d.ts",

package/src/localStorage.js

@@ -59,10 +59,10 @@ module.exports = class localStorage {
         if (def.notNull) colDef += " NOT NULL";
         if (def.unique) colDef += " UNIQUE";
         if (def.defaultValue !== undefined) {
-          colDef += ` DEFAULT ${JSON.stringify(def.defaultValue)}`;
+          colDef += ` DEFAULT ${this.#toSQLValue(def.defaultValue)}`;
         }
         if (def.values?.length) {
-          colDef += ` CHECK(${col} IN (${def.values.map(v => JSON.stringify(v)).join(", ")}))`;
+          colDef += ` CHECK(${col} IN (${def.values.map(v => this.#toSQLValue(v)).join(", ")}))`;
         }
 
         return colDef;
@@ -106,6 +106,16 @@ module.exports = class localStorage {
     return `${firstCol} DESC`;
   }
 
+  #toSQLValue(value) {
+    if (value === null) return "NULL";
+    if (typeof value === "number") return String(value);
+    if (typeof value === "bigint") return String(value);
+    if (typeof value === "boolean") return value ? "1" : "0";
+    if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
+
+    return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
+  }
+
   /**
    * @param {object} table
    * @param {string} table.name
@@ -203,10 +213,10 @@ module.exports = class localStorage {
   }
 
   /**
-   * @param {string} tableName
-   * @param {*} data
-   * @param {object} where
-   */
+ * @param {string} tableName
+ * @param {object} data
+ * @param {object|null} where
+ */
   async set(tableName, data, where = null) {
     try {
       if (!this.#models.has(tableName)) {
@@ -215,14 +225,24 @@ module.exports = class localStorage {
 
       const lookup = where ?? (data.id ? { id: data.id } : null);
 
-      const columns = Object.keys(data).join(", ");
-      const placeholders = Object.keys(data).map(() => "?").join(", ");
-      const sql = lookup
-        ? `INSERT OR REPLACE INTO ${tableName} (${columns}) VALUES (${placeholders})`
-        : `INSERT INTO ${tableName} (${columns}) VALUES (${placeholders})`;
+      let finalData = data;
+
+      if (lookup) {
+        const existing = await this.get(tableName, lookup);
+
+        if (existing && !existing.error) {
+          finalData = { ...existing, ...data };
+        }
+      }
+
+      const columns = Object.keys(finalData);
+      const placeholders = columns.map(() => "?").join(", ");
+      const sql = `INSERT OR REPLACE INTO ${tableName} (${columns.join(
+        ", ",
+      )}) VALUES (${placeholders})`;
 
       const stmt = this.#$.prepare(sql);
-      stmt.run(...Object.values(data));
+      stmt.run(...Object.values(finalData));
 
       return { ok: true };
     } catch (error) {
@@ -230,6 +250,7 @@ module.exports = class localStorage {
     }
   }
 
+
   /**
    * @param {string} tableName
    * @param {object} where