jsql-neo 4.0.2 → 4.1.0

package/lib/table.js

@@ -9,6 +9,102 @@ const BTree = require('./btree');
 const { validateDateType, now } = require('./date-types');
 const { createError } = require('./errors');
 
+function isSafeRegex(pattern) {
+    if (typeof pattern !== 'string') return false;
+    if (pattern.length > 256) return false;
+    const groups = [];
+    let i = 0;
+    const n = pattern.length;
+    while (i < n) {
+        const c = pattern[i];
+        if (c === '\\') { i += 2; continue; }
+        if (c === '[') {
+            while (i < n && pattern[i] !== ']') i++;
+            i++;
+            continue;
+        }
+        if (c === '(') {
+            const nxt = pattern[i + 1];
+            if (nxt === '?') {
+                const t = pattern[i + 2];
+                if (t === ':') {
+                    groups.push({ hasQuant: false, hasAlt: false });
+                    i += 3;
+                    continue;
+                }
+                if (t === '=' || t === '!') {
+                    let depth = 1, j = i + 3;
+                    for (; j < n && depth > 0; j++) {
+                        if (pattern[j] === '\\') { j++; continue; }
+                        if (pattern[j] === '(') depth++;
+                        else if (pattern[j] === ')') depth--;
+                    }
+                    i = j;
+                    continue;
+                }
+                if (t === '<') {
+                    const u = pattern[i + 3];
+                    if (u === '=' || u === '!') {
+                        let depth = 1, j = i + 4;
+                        for (; j < n && depth > 0; j++) {
+                            if (pattern[j] === '\\') { j++; continue; }
+                            if (pattern[j] === '(') depth++;
+                            else if (pattern[j] === ')') depth--;
+                        }
+                        i = j;
+                        continue;
+                    }
+                    const gt = pattern.indexOf('>', i + 3);
+                    if (gt === -1) return false;
+                    groups.push({ hasQuant: false, hasAlt: false });
+                    i = gt + 1;
+                    continue;
+                }
+                return false;
+            }
+            groups.push({ hasQuant: false, hasAlt: false });
+            i++;
+            continue;
+        }
+        if (c === ')') {
+            const g = groups.pop();
+            if (!g) return false;
+            let qi = i + 1;
+            let quant = null;
+            if (pattern[qi] === '+' || pattern[qi] === '*' || pattern[qi] === '?') {
+                quant = pattern[qi];
+            } else if (pattern[qi] === '{') {
+                const close = pattern.indexOf('}', qi);
+                if (close === -1) return false;
+                quant = pattern.slice(qi, close + 1);
+                qi = close + 1;
+            }
+            if (quant && (g.hasQuant || g.hasAlt)) return false;
+            i = qi;
+            continue;
+        }
+        if (c === '+' || c === '*' || c === '?') {
+            if (groups.length > 0) groups[groups.length - 1].hasQuant = true;
+            i++;
+            continue;
+        }
+        if (c === '{' && /[0-9]/.test(pattern[i + 1] || '')) {
+            const close = pattern.indexOf('}', i);
+            if (close === -1) return false;
+            if (groups.length > 0) groups[groups.length - 1].hasQuant = true;
+            i = close + 1;
+            continue;
+        }
+        if (c === '|') {
+            if (groups.length > 0) groups[groups.length - 1].hasAlt = true;
+            i++;
+            continue;
+        }
+        i++;
+    }
+    return groups.length === 0;
+}
+
 class Table {
     constructor(name, schema, db) {
         this._name = name;
@@ -112,7 +208,7 @@ class Table {
         this._rows.push({ ...data });
         this._addToIndexes(rowIndex, data);
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
 
         for (const hook of this._hooks.afterInsert) {
             hook(data);
@@ -131,7 +227,12 @@ class Table {
         }
         const N = items.length;
         const uniqueTracker = {};
-        for (const field of this._cachedUniqueFields) uniqueTracker[field] = new Set();
+        for (const field of this._cachedUniqueFields) {
+            uniqueTracker[field] = new Set();
+            for (const row of this._rows) {
+                if (row[field] !== undefined && row[field] !== null) uniqueTracker[field].add(row[field]);
+            }
+        }
         const dateFields = this._cachedDateFields;
         const hasDateFields = dateFields.length > 0;
         const autoIncField = this._autoIncrementField;
@@ -194,7 +295,7 @@ class Table {
             items[i] = data;
         }
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         for (const hook of this._hooks.afterInsert) {
             for (let i = 0; i < N; i++) hook(items[i]);
         }
@@ -295,7 +396,7 @@ class Table {
 
         if (count > 0) {
             this._dirty = true;
-            this._db._markDirty();
+            this._db._markDirty(this._name);
             for (const hook of this._hooks.afterUpdate) {
                 hook(query, updates, count);
             }
@@ -333,7 +434,7 @@ class Table {
         Object.assign(row, updates);
         this._addToIndexes(rowIndex, row);
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         for (const hook of this._hooks.afterUpdate) {
             hook({ [this._primaryKey]: id }, updates, 1);
         }
@@ -388,7 +489,7 @@ class Table {
                 this._rows.pop();
             }
             this._dirty = true;
-            this._db._markDirty();
+            this._db._markDirty(this._name);
             for (const hook of this._hooks.afterRemove) {
                 hook(query, count);
             }
@@ -434,7 +535,7 @@ class Table {
         }
         this._rows.pop();
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         for (const hook of this._hooks.afterRemove) {
             hook({ [this._primaryKey]: id }, 1);
         }
@@ -485,7 +586,7 @@ class Table {
         this._indexes = {};
         this._autoIncrement = 0;
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         return count;
     }
 
@@ -523,7 +624,7 @@ class Table {
             this._rebuildBTree(field);
         }
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         return this;
     }
 
@@ -543,7 +644,7 @@ class Table {
         if (this._primaryKey === field) this._primaryKey = null;
         if (this._autoIncrementField === field) this._autoIncrementField = null;
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         return this;
     }
 
@@ -567,7 +668,7 @@ class Table {
         if (this._primaryKey === oldName) this._primaryKey = newName;
         if (this._autoIncrementField === oldName) this._autoIncrementField = newName;
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         return this;
     }
 
@@ -582,7 +683,7 @@ class Table {
             this._rebuildBTree(field);
         }
         this._dirty = true;
-        this._db._markDirty();
+        this._db._markDirty(this._name);
         return this;
     }
 
@@ -811,6 +912,7 @@ class Table {
                 if (typeof value !== 'string' || typeof target !== 'string') return false;
                 return new RegExp('^' + target.replace(/%/g, '.*').replace(/_/g, '.') + '$', 'i').test(value);
             case '$regex':
+                if (!isSafeRegex(target)) throw createError('ER_BAD_REGEX', String(target));
                 return new RegExp(target).test(String(value));
             case '$exists':
                 return target ? value !== undefined : value === undefined;

package/lib/wasm_client.js

@@ -44,7 +44,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
     if (nFields >= 2) {
       const v = row[fieldNames[1]];
@@ -57,7 +65,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
     if (nFields >= 3) {
       const v = row[fieldNames[2]];
@@ -70,7 +86,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
     if (nFields >= 4) {
       const v = row[fieldNames[3]];
@@ -83,7 +107,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
     if (nFields >= 5) {
       const v = row[fieldNames[4]];
@@ -96,7 +128,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
     // fallback for >5 fields
     for (let fi = 5; fi < nFields; fi++) {
@@ -110,7 +150,15 @@ function encodeBatch(rows) {
         const sl = Buffer.byteLength(v, 'utf8');
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
-      } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
+      } else if (typeof v === 'boolean') {
+        off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off);
+      } else {
+        const s = typeof v === 'object' ? JSON.stringify(v) : String(v);
+        off = buf.writeUInt8(STR_TAG, off);
+        const sl = Buffer.byteLength(s, 'utf8');
+        off = buf.writeUInt32LE(sl, off);
+        off += buf.write(s, off, sl, 'utf8');
+      }
     }
   }
 
@@ -213,6 +261,7 @@ class JSQL {
   }
 
   async start() {
+    wasmBindings.jsql_reset();
     this._runHooks('onStart', []);
     this._emit('start', {});
   }
@@ -264,6 +313,10 @@ class JSQL {
     return flushed && flushed[table] ? flushed[table] : null;
   }
 
+  async insertMany(table, data) {
+    return this.insert(table, data);
+  }
+
   async createTable(name, schema) {
     await this._flush();
     if (!this._runHooks('beforeCreateTable', [name, schema])) return null;