cry-synced-db-client 2.0.6 → 2.0.7

package/dist/index.js

@@ -919,21 +919,23 @@ var InMemManager = class {
     const config = this.collections.get(collection);
     const source = (_a = opts == null ? void 0 : opts.source) != null ? _a : "incremental";
     if (operation === "upsert") {
-      this.inMemDb.saveMany(collection, items, { source });
+      const itemsToWrite = source === "incremental" ? this.dropRevRegressions(collection, items) : items;
+      if (itemsToWrite.length === 0) return;
+      this.inMemDb.saveMany(collection, itemsToWrite, { source });
       if (this.useObjectMetadata && (config == null ? void 0 : config.hasMetadata)) {
         const ids = [];
-        for (const item of items) ids.push(item._id);
+        for (const item of itemsToWrite) ids.push(item._id);
         let metadatas;
         if (config.onObjectsUpdated) {
           try {
-            metadatas = config.onObjectsUpdated(items);
+            metadatas = config.onObjectsUpdated(itemsToWrite);
           } catch (err) {
             console.error(`[InMem] onObjectsUpdated callback failed: ${err}`, err);
             return;
           }
         } else if (config.onObjectUpdated) {
           try {
-            metadatas = items.map((item) => config.onObjectUpdated(item));
+            metadatas = itemsToWrite.map((item) => config.onObjectUpdated(item));
           } catch (err) {
             console.error(`[InMem] onObjectUpdated callback failed: ${err}`, err);
             return;
@@ -952,6 +954,30 @@ var InMemManager = class {
       }
     }
   }
+  /**
+   * Filter out items whose `_rev` is lower than what in-mem already holds
+   * for that id — an incremental write with a stale rev is, by definition,
+   * confirming/echoing a write that a later one has already superseded.
+   * Items without a numeric `_rev` on either side are let through unchanged
+   * (legacy collections without rev tracking).
+   */
+  dropRevRegressions(collection, items) {
+    const result = [];
+    for (const item of items) {
+      const incomingRev = item._rev;
+      if (typeof incomingRev !== "number") {
+        result.push(item);
+        continue;
+      }
+      const current = this.inMemDb.getById(collection, item._id);
+      const currentRev = current == null ? void 0 : current._rev;
+      if (typeof currentRev === "number" && incomingRev < currentRev) {
+        continue;
+      }
+      result.push(item);
+    }
+    return result;
+  }
   /**
    * Initialize collection from Dexie data.
    * Called during SyncedDb.init().
@@ -3866,8 +3892,8 @@ var SyncEngine = class {
             collection,
             idsToCheck
           );
-          const dexieSaveBatch = [];
-          const inMemUpdateBatch = [];
+          const saveIds = [];
+          const revById = /* @__PURE__ */ new Map();
           const inMemDeleteIds = [];
           const dexieDeleteIds = [];
           for (let i = 0; i < insertedAndUpdated.length; i++) {
@@ -3875,17 +3901,29 @@ var SyncEngine = class {
             const dexieItem = dexieItems[i];
             if (mustRefreshIds.has(String(entity._id))) continue;
             if (dexieItem) {
-              dexieItem._rev = entity._rev;
-              dexieItem._ts = entity._ts;
               if (dexieItem._deleted) {
                 inMemDeleteIds.push(entity._id);
                 dexieDeleteIds.push(entity._id);
               } else {
-                dexieSaveBatch.push(dexieItem);
-                inMemUpdateBatch.push(dexieItem);
+                saveIds.push(entity._id);
+                revById.set(String(entity._id), { rev: entity._rev, ts: entity._ts });
               }
             }
           }
+          const dexieSaveBatch = [];
+          const inMemUpdateBatch = [];
+          if (saveIds.length > 0) {
+            const freshItems = await this.dexieDb.getByIds(collection, saveIds);
+            for (const freshItem of freshItems) {
+              if (!freshItem) continue;
+              const revTs = revById.get(String(freshItem._id));
+              if (!revTs) continue;
+              freshItem._rev = revTs.rev;
+              freshItem._ts = revTs.ts;
+              dexieSaveBatch.push(freshItem);
+              inMemUpdateBatch.push(freshItem);
+            }
+          }
           if (dexieSaveBatch.length > 0) {
             await this.dexieDb.saveMany(collection, dexieSaveBatch);
           }

package/dist/src/db/managers/InMemManager.d.ts

@@ -28,6 +28,14 @@ export declare class InMemManager implements I_InMemManager {
     writeBatch<T extends DbEntity>(collection: string, items: T[], operation: "upsert" | "delete", opts?: {
         source?: SyncSource;
     }): void;
+    /**
+     * Filter out items whose `_rev` is lower than what in-mem already holds
+     * for that id — an incremental write with a stale rev is, by definition,
+     * confirming/echoing a write that a later one has already superseded.
+     * Items without a numeric `_rev` on either side are let through unchanged
+     * (legacy collections without rev tracking).
+     */
+    private dropRevRegressions;
     /**
      * Initialize collection from Dexie data.
      * Called during SyncedDb.init().

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -20,8 +20,9 @@
     "build": "bun run clean && bun run build:js && bun run build:types",
     "build:js": "esbuild ./src/index.ts --bundle --outdir=./dist --target=es2017 --format=esm --platform=browser --external:dexie --external:bson --external:cry-helpers",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "test": "bun test --preload ./test/preload-bun.cjs test/*.test.ts test/restProxy/*.test.ts; vitest run",
-    "test:bun": "bun test test/*.test.ts test/restProxy/*.test.ts",
+    "test": "bash test/run-all.sh",
+    "test:ci": "SKIP_REAL_MONGO=1 bash test/run-all.sh",
+    "test:bun": "bun test --preload ./test/preload-bun.cjs test/*.test.ts test/restProxy/*.test.ts test/node-only-bun/*.test.ts",
     "test:node-only": "vitest run",
     "test:real-mongo": "USE_REAL_MONGO=1 npx vitest run test/node-only/",
     "prepublishOnly": "bun run build"