deepbase-sqlite 3.6.6 → 3.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepbase-sqlite",
-  "version": "3.6.6",
+  "version": "3.6.8",
   "description": "⚡ DeepBase SQLite - SQLite database driver",
   "type": "module",
   "main": "src/index.cjs",
@@ -17,7 +17,7 @@
     "better-sqlite3": "^11.8.1"
   },
   "peerDependencies": {
-    "deepbase": "^3.6.6"
+    "deepbase": "^3.6.8"
   },
   "scripts": {
     "test": "mocha test/test.js"

package/src/SqliteDriver.js

@@ -49,6 +49,7 @@ export class SqliteDriver extends DeepBaseDriver {
     }
 
     this.db = null;
+    this._nextSeq = 1;
     SqliteDriver._instances[this.fileName] = this;
   }
 
@@ -102,9 +103,10 @@ export class SqliteDriver extends DeepBaseDriver {
     }
 
     this.getStmt = this.db.prepare('SELECT value FROM deepbase WHERE key = ?');
+    this.getMaxSeqStmt = this.db.prepare('SELECT IFNULL(MAX(seq), 0) AS maxSeq FROM deepbase');
     this.setStmt = this.db.prepare(`
       INSERT INTO deepbase (key, value, seq)
-      VALUES (?, ?, (SELECT IFNULL(MAX(seq), 0) + 1 FROM deepbase))
+      VALUES (?, ?, ?)
       ON CONFLICT(key) DO UPDATE SET value = excluded.value
     `);
     this.delStmt = this.db.prepare('DELETE FROM deepbase WHERE key = ?');
@@ -123,10 +125,11 @@ export class SqliteDriver extends DeepBaseDriver {
 
     this._setTxn = this.db.transaction((key, jsonValue, keys) => {
       this._expandParentObjects(keys);
-      this.setStmt.run(key, jsonValue);
+      this.setStmt.run(key, jsonValue, this._consumeSeq());
     });
 
-    this._delTxn = this.db.transaction((key, likePattern) => {
+    this._delTxn = this.db.transaction((key, likePattern, keys) => {
+      this._expandParentObjects(keys);
       this.delStmt.run(key);
       this.delChildrenStmt.run(likePattern);
     });
@@ -136,17 +139,19 @@ export class SqliteDriver extends DeepBaseDriver {
       const newValue = func(currentValue);
       const key = this._pathToKey(keys);
       this._expandParentObjects(keys);
-      this.setStmt.run(key, JSON.stringify(newValue));
+      this.setStmt.run(key, JSON.stringify(newValue), this._consumeSeq());
       return keys;
     });
 
     this._setRootTxn = this.db.transaction((entries) => {
       this.db.exec('DELETE FROM deepbase');
+      this._nextSeq = 1;
       for (const [key, value] of entries) {
-        this.setStmt.run(key, JSON.stringify(value));
+        this.setStmt.run(key, JSON.stringify(value), this._consumeSeq());
       }
     });
 
+    this._nextSeq = Number(this.getMaxSeqStmt.get()?.maxSeq || 0) + 1;
     this._connected = true;
   }
 
@@ -218,11 +223,12 @@ export class SqliteDriver extends DeepBaseDriver {
   async del(...keys) {
     if (keys.length === 0) {
       this.db.exec('DELETE FROM deepbase');
+      this._nextSeq = 1;
       return;
     }
 
     const key = this._pathToKey(keys);
-    this._delTxn(key, this._likePrefix(key));
+    this._delTxn(key, this._likePrefix(key), keys);
   }
 
   async inc(...args) {
@@ -411,12 +417,18 @@ export class SqliteDriver extends DeepBaseDriver {
 
           const entries = this._flattenObject(parentValue, parentKey);
           for (const [key, value] of entries) {
-            this.setStmt.run(key, JSON.stringify(value));
+            this.setStmt.run(key, JSON.stringify(value), this._consumeSeq());
           }
         }
       }
     }
   }
+
+  _consumeSeq() {
+    const seq = this._nextSeq;
+    this._nextSeq += 1;
+    return seq;
+  }
 }
 
 export default SqliteDriver;

package/test/test.js

@@ -159,6 +159,15 @@ for (const pragma of PRAGMA_MODES) {
         assert.deepStrictEqual(await db.get('user'), { name: 'Alice' });
       });
 
+      it('should delete a deep key from an object value', async function () {
+        await db.set('a', {
+          b: { c: 1, d: 2 },
+          e: 3,
+        });
+        await db.del('a', 'b', 'c');
+        assert.deepStrictEqual(await db.get('a'), { b: { d: 2 }, e: 3 });
+      });
+
       it('should delete parent and all children', async function () {
         await db.set('parent', 'child1', 'value1');
         await db.set('parent', 'child2', 'value2');