deepbase-sqlite 3.6.7 → 3.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepbase-sqlite",
-  "version": "3.6.7",
+  "version": "3.6.9",
   "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.7"
+    "deepbase": "^3.6.9"
   },
   "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,7 +125,7 @@ export class SqliteDriver extends DeepBaseDriver {
 
     this._setTxn = this.db.transaction((key, jsonValue, keys) => {
       this._expandParentObjects(keys);
-      this.setStmt.run(key, jsonValue);
+      this._replaceRow(key, jsonValue);
     });
 
     this._delTxn = this.db.transaction((key, likePattern, keys) => {
@@ -137,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._replaceRow(key, JSON.stringify(newValue));
       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;
   }
 
@@ -216,9 +220,15 @@ export class SqliteDriver extends DeepBaseDriver {
     return keys;
   }
 
+  _replaceRow(key, jsonValue) {
+    this.delChildrenStmt.run(this._likePrefix(key));
+    this.setStmt.run(key, jsonValue, this._consumeSeq());
+  }
+
   async del(...keys) {
     if (keys.length === 0) {
       this.db.exec('DELETE FROM deepbase');
+      this._nextSeq = 1;
       return;
     }
 
@@ -412,12 +422,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

@@ -429,6 +429,32 @@ for (const pragma of PRAGMA_MODES) {
         assert.deepStrictEqual(await db.get('settings'), { a: 1, b: 99, c: 3, d: 4 });
       });
 
+      it('should replace stale child keys when setting a parent object', async function () {
+        await db.set('profile', 'chinchon:MZM3Z', 'remoteData', 'denounces', 1000);
+        await db.set('profile', 'chinchon:MZM3Z', {
+          game: 'chinchon',
+          remoteData: {
+            hid: 'MZM3Z',
+            denounces: 0,
+          },
+        });
+
+        const profile = await db.get('profile', 'chinchon:MZM3Z');
+        assert.strictEqual(profile.remoteData.denounces, 0);
+        assert.strictEqual(await db.get('profile', 'chinchon:MZM3Z', 'remoteData', 'denounces'), 0);
+      });
+
+      it('should keep sibling keys with similar prefixes when replacing a parent object', async function () {
+        await db.set('a', 'b', 'c', 1);
+        await db.set('a', 'bc', 'c', 2);
+        await db.set('a', 'b', { c: 0 });
+
+        assert.deepStrictEqual(await db.get('a'), {
+          b: { c: 0 },
+          bc: { c: 2 },
+        });
+      });
+
       it('should handle nested object then deeper nesting', async function () {
         await db.set('user', { name: 'Alice', meta: { role: 'admin' } });
         await db.set('user', 'meta', 'role', 'user');