cry-synced-db-client 0.1.167 → 0.1.170

package/dist/index.js

@@ -329,6 +329,22 @@ function sameIdSequence(a, b) {
   }
   return true;
 }
+function containsIdArrayDescendant(value) {
+  if (value === null || typeof value !== "object") return false;
+  if (value instanceof Date || isObjectIdLike(value)) return false;
+  if (Array.isArray(value)) {
+    if (value.length > 0 && allElementsHaveId(value)) return true;
+    for (const v of value) {
+      if (containsIdArrayDescendant(v)) return true;
+    }
+    return false;
+  }
+  if (!isPlainObject(value)) return false;
+  for (const key of Object.keys(value)) {
+    if (containsIdArrayDescendant(value[key])) return true;
+  }
+  return false;
+}
 function computeArrayDiff(existingArr, updateArr, basePath, diff) {
   if (existingArr.length === 0 && updateArr.length === 0) return;
   if (!allElementsHaveId(updateArr) || existingArr.length > 0 && !allElementsHaveId(existingArr)) {
@@ -354,12 +370,14 @@ function computeArrayDiff(existingArr, updateArr, basePath, diff) {
     if (sameIdSequence(existingArr, updateArr)) {
       for (let i = 0; i < updateArr.length; i++) {
         const elementId = String(updateArr[i]._id);
-        computeDiffInto(
-          existingArr[i],
-          updateArr[i],
-          `${basePath}[${elementId}]`,
-          diff
-        );
+        const elementPath = `${basePath}[${elementId}]`;
+        if (containsIdArrayDescendant(updateArr[i])) {
+          if (!deepEquals(existingArr[i], updateArr[i])) {
+            diff[elementPath] = updateArr[i];
+          }
+        } else {
+          computeDiffInto(existingArr[i], updateArr[i], elementPath, diff);
+        }
       }
     } else {
       diff[basePath] = updateArr;
@@ -383,12 +401,19 @@ function computeArrayDiff(existingArr, updateArr, basePath, diff) {
     for (const updateEl of updateArr) {
       const id = String(updateEl._id);
       if (existingIds.has(id)) {
-        computeDiffInto(
-          existingById.get(id),
-          updateEl,
-          `${basePath}[${id}]`,
-          diff
-        );
+        const elementPath = `${basePath}[${id}]`;
+        if (containsIdArrayDescendant(updateEl)) {
+          if (!deepEquals(existingById.get(id), updateEl)) {
+            diff[elementPath] = updateEl;
+          }
+        } else {
+          computeDiffInto(
+            existingById.get(id),
+            updateEl,
+            elementPath,
+            diff
+          );
+        }
       }
     }
   }
@@ -3271,11 +3296,45 @@ var _SyncEngine = class _SyncEngine {
     let sentCount = 0;
     const collectionSentCounts = {};
     for (const result of results) {
-      const { collection, results: { inserted, updated, deleted, errors: errors2 } } = result;
+      const {
+        collection,
+        results: { inserted, updated, deleted, errors: errors2, warnings }
+      } = result;
+      const erroredIds = /* @__PURE__ */ new Set();
+      if (errors2 && errors2.length > 0) {
+        for (const e of errors2) erroredIds.add(String(e._id));
+      }
       const allSuccessIds = [];
-      for (const e of inserted) allSuccessIds.push(e._id);
-      for (const e of updated) allSuccessIds.push(e._id);
-      for (const e of deleted) allSuccessIds.push(e._id);
+      const ambiguous = [];
+      for (const e of inserted) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      for (const e of updated) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      for (const e of deleted) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      if (ambiguous.length > 0) {
+        console.error(
+          `Sync upload [${collection}]: ${ambiguous.length} id(s) appeared in BOTH inserted/updated/deleted AND errors[] \u2014 keeping dirty for safety. _ids: ${ambiguous.join(", ")}`
+        );
+      }
       if (allSuccessIds.length > 0) {
         await this.dexieDb.clearDirtyChangesBatch(collection, allSuccessIds);
       }
@@ -3368,12 +3427,19 @@ var _SyncEngine = class _SyncEngine {
           });
         }
       }
-      if (errors2) {
-        console.error(
-          `Sync upload errors for ${collection}:`,
-          errors2,
-          "\u2014 dirty entries for failed items will persist until retry"
-        );
+      if (errors2 && errors2.length > 0) {
+        for (const e of errors2) {
+          console.error(
+            `Sync upload error [${collection}] _id=${e._id}: ${e.error} \u2014 dirty entry will persist until retry`
+          );
+        }
+      }
+      if (warnings && warnings.length > 0) {
+        for (const w of warnings) {
+          console.warn(
+            `Sync upload warning [${collection}] _id=${w._id}: ${w.error}`
+          );
+        }
       }
       const sentIds = /* @__PURE__ */ new Set([
         ...collectionBatches.flat().filter((b) => b.collection === collection).flatMap((b) => [
@@ -3433,15 +3499,60 @@ var _SyncEngine = class _SyncEngine {
     );
     let sentCount = 0;
     for (const result of results) {
-      const { results: { inserted, updated, deleted } } = result;
+      const {
+        results: { inserted, updated, deleted, errors: errors2, warnings }
+      } = result;
+      const erroredIds = /* @__PURE__ */ new Set();
+      if (errors2 && errors2.length > 0) {
+        for (const e of errors2) {
+          erroredIds.add(String(e._id));
+          console.error(
+            `Sync upload error [${collection}] _id=${e._id}: ${e.error} \u2014 dirty entry will persist until retry`
+          );
+        }
+      }
+      if (warnings && warnings.length > 0) {
+        for (const w of warnings) {
+          console.warn(
+            `Sync upload warning [${collection}] _id=${w._id}: ${w.error}`
+          );
+        }
+      }
       const allSuccessIds = [];
-      for (const e of inserted) allSuccessIds.push(e._id);
-      for (const e of updated) allSuccessIds.push(e._id);
-      for (const e of deleted) allSuccessIds.push(e._id);
+      const ambiguous = [];
+      for (const e of inserted) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      for (const e of updated) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      for (const e of deleted) {
+        const sid = String(e._id);
+        if (erroredIds.has(sid)) {
+          ambiguous.push(sid);
+          continue;
+        }
+        allSuccessIds.push(e._id);
+      }
+      if (ambiguous.length > 0) {
+        console.error(
+          `Sync upload [${collection}]: ${ambiguous.length} id(s) appeared in BOTH inserted/updated/deleted AND errors[] \u2014 keeping dirty for safety. _ids: ${ambiguous.join(", ")}`
+        );
+      }
       if (allSuccessIds.length > 0) {
         await this.dexieDb.clearDirtyChangesBatch(collection, allSuccessIds);
       }
-      sentCount += inserted.length + updated.length + deleted.length;
+      sentCount += allSuccessIds.length;
     }
     return { sentCount };
   }
@@ -4270,8 +4381,8 @@ var _SyncedDb = class _SyncedDb {
     });
     this.pendingChanges = new PendingChangesManager({
       tenant: this.tenant,
-      debounceDexieWritesMs: (_l = config.debounceDexieWritesMs) != null ? _l : 500,
-      debounceRestWritesMs: (_m = config.debounceRestWritesMs) != null ? _m : 100,
+      debounceDexieWritesMs: (_l = config.debounceDexieWritesMs) != null ? _l : 200,
+      debounceRestWritesMs: (_m = config.debounceRestWritesMs) != null ? _m : 1e3,
       callbacks: {
         onDexieWriteRequest: config.onDexieWriteRequest,
         onDexieWriteResult: config.onDexieWriteResult,
@@ -6312,6 +6423,18 @@ var SyncedDb = _SyncedDb;
 import Dexie from "dexie";
 var SYNC_META_TABLE = "_sync_meta";
 var DIRTY_CHANGES_TABLE = "_dirty_changes";
+var META_ONLY_DIRTY_KEYS = /* @__PURE__ */ new Set([
+  "_id",
+  "_ts",
+  "_rev",
+  "_lastUpdaterId"
+]);
+function isMetaOnlyChanges(changes) {
+  for (const k of Object.keys(changes)) {
+    if (!META_ONLY_DIRTY_KEYS.has(k)) return false;
+  }
+  return true;
+}
 var DexieDb = class extends Dexie {
   constructor(tenant, collectionConfigs) {
     super(`synced-db-${tenant}`);
@@ -6476,6 +6599,7 @@ var DexieDb = class extends Dexie {
     return result;
   }
   async addDirtyChange(collection, id, changes, baseMeta) {
+    if (isMetaOnlyChanges(changes)) return;
     const stringId = this.idToString(id);
     const existing = await this.dirtyChanges.get([collection, stringId]);
     const now = Date.now();
@@ -6498,13 +6622,15 @@ var DexieDb = class extends Dexie {
   async addDirtyChangesBatch(collection, changesList) {
     var _a, _b;
     if (changesList.length === 0) return;
+    const filtered = changesList.filter((c) => !isMetaOnlyChanges(c.changes));
+    if (filtered.length === 0) return;
     const now = Date.now();
     const keys = [];
-    for (const c of changesList) keys.push([collection, this.idToString(c.id)]);
+    for (const c of filtered) keys.push([collection, this.idToString(c.id)]);
     const existingEntries = await this.dirtyChanges.bulkGet(keys);
     const toWrite = [];
-    for (let i = 0; i < changesList.length; i++) {
-      const changeItem = changesList[i];
+    for (let i = 0; i < filtered.length; i++) {
+      const changeItem = filtered[i];
       const stringId = this.idToString(changeItem.id);
       const existing = existingEntries[i];
       if (existing) {

package/dist/src/db/RestProxy.d.ts

@@ -43,7 +43,6 @@ export interface RestProxyConfig {
  * ## Performance
  *
  * Benchmarked at ~5ms per request (after warmup) on localhost.
- * Native fetch performs comparably to undici with connection pooling.
  *
  * ## Progress Callback Limitations
  *

package/dist/src/types/I_SyncedDb.d.ts

@@ -429,9 +429,9 @@ export interface SyncedDbConfig {
     restTimeoutMs?: number;
     /** Timeout za sync REST klice v ms (default: 120000) - daljši ker sync prenaša več podatkov */
     syncTimeoutMs?: number;
-    /** Debounce čas za zapis v Dexie v ms (default: 500) */
+    /** Debounce čas za zapis v Dexie v ms (default: 200) */
     debounceDexieWritesMs?: number;
-    /** Debounce čas za pošiljanje na REST v ms (default: 100) - po uspešnem zapisu v Dexie */
+    /** Debounce čas za pošiljanje na REST v ms (default: 1000) - po uspešnem zapisu v Dexie */
     debounceRestWritesMs?: number;
     /**
      * Callback fired on each sync failure. Unlike the removed `onForcedOffline`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.167",
+  "version": "0.1.170",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,7 +18,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "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 --external:notepack.io",
+    "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 test/*.test.ts test/restProxy/*.test.ts && vitest run",
     "test:bun": "bun test test/*.test.ts test/restProxy/*.test.ts",
@@ -39,10 +39,7 @@
   "dependencies": {
     "cry-helpers": "^2.1.194",
     "msgpackr": "^2.0.1",
-    "notepack": "^0.0.2",
-    "notepack.io": "^3.0.1",
-    "superjson": "^2.2.6",
-    "undici": "^8.2.0"
+    "superjson": "^2.2.6"
   },
   "peerDependencies": {
     "bson": "^6.0.0 || ^7.0.0",