deepbase-sqlite 3.6.8 → 3.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepbase-sqlite",
-  "version": "3.6.8",
+  "version": "3.6.10",
   "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.8"
+    "deepbase": "^3.6.10"
   },
   "scripts": {
     "test": "mocha test/test.js"

package/src/SqliteDriver.js

@@ -125,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._consumeSeq());
+      this._replaceRow(key, jsonValue);
     });
 
     this._delTxn = this.db.transaction((key, likePattern, keys) => {
@@ -139,7 +139,7 @@ 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._consumeSeq());
+      this._replaceRow(key, JSON.stringify(newValue));
       return keys;
     });
 
@@ -220,6 +220,11 @@ 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');
@@ -347,12 +352,24 @@ export class SqliteDriver extends DeepBaseDriver {
     if (path.length === 0) return;
 
     if (path.length === 1) {
-      obj[path[0]] = value;
+      const key = path[0];
+      const existing = obj[key];
+      if (
+        value === null &&
+        existing !== null &&
+        typeof existing === 'object' &&
+        !Array.isArray(existing) &&
+        Object.keys(existing).length > 0
+      ) {
+        return;
+      }
+      obj[key] = value;
       return;
     }
 
     const key = path[0];
-    if (!obj.hasOwnProperty(key) || typeof obj[key] !== 'object') {
+    const current = obj[key];
+    if (!obj.hasOwnProperty(key) || current === null || typeof current !== 'object' || Array.isArray(current)) {
       obj[key] = {};
     }
 

package/test/test.js

@@ -394,6 +394,37 @@ for (const pragma of PRAGMA_MODES) {
         assert.deepStrictEqual(await db.get(), { new: 'data' });
         assert.strictEqual(await db.get('old'), null);
       });
+
+      it('should read root when a null parent row coexists with child rows', async function () {
+        const itemPath = await db.add('user1', 'message', 'pending', { test: 1 });
+        const itemId = itemPath[itemPath.length - 1];
+        const driver = db.getDriver(0);
+        driver.db.prepare('INSERT OR REPLACE INTO deepbase (key, value, seq) VALUES (?, ?, ?)').run(
+          'user1.message.pending',
+          'null',
+          999,
+        );
+
+        const pending = {
+          [itemId]: { test: 1 },
+        };
+        const message = {
+          pending,
+        };
+        const user = {
+          message,
+        };
+
+        assert.deepStrictEqual(await db.get(), {
+          user1: {
+            message,
+          },
+        });
+        assert.deepStrictEqual(await db.get('user1'), user);
+        assert.deepStrictEqual(await db.get('user1', 'message'), message);
+        assert.deepStrictEqual(await db.get('user1', 'message', 'pending'), pending);
+        assert.deepStrictEqual(await db.keys('user1', 'message', 'pending'), [itemId]);
+      });
     });
 
     describe('Deep Nesting', function () {
@@ -429,6 +460,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');