cry-synced-db-client 0.1.81 → 0.1.84

package/dist/index.js

@@ -1970,9 +1970,9 @@ var PendingChangesManager = class {
     if (existing) {
       clearTimeout(existing.timer);
     }
-    const deltaWithId = existing ? data : __spreadValues({ _id: id }, data);
+    const deltaWithId = existing ? data : __spreadProps(__spreadValues({}, data), { _id: id });
     savePendingWrite(this.tenant, collection, id, deltaWithId);
-    const fullData = existing ? Object.assign(existing.data, data) : __spreadValues({ _id: id }, data);
+    const fullData = existing ? Object.assign(existing.data, data, { _id: id }) : __spreadProps(__spreadValues({}, data), { _id: id });
     const timer = setTimeout(() => {
       this.executePendingChange(key);
     }, this.debounceDexieWritesMs);
@@ -2144,9 +2144,14 @@ var PendingChangesManager = class {
           pending.data
         );
       } else {
-        await this.deps.dexieDb.insert(pending.collection, __spreadValues({
+        const insertData = __spreadProps(__spreadValues({}, pending.data), {
           _id: pending.id
-        }, pending.data));
+          // ensure _id is after spread
+        });
+        if (typeof insertData._id === "object") {
+          console.error(`Dexie: _id is object type in ${pending.collection}:`, typeof insertData._id, insertData._id);
+        }
+        await this.deps.dexieDb.insert(pending.collection, insertData);
       }
       if (this.callbacks.onDexieWriteResult) {
         try {
@@ -3290,7 +3295,7 @@ var NetworkStatusManager = class {
 };
 
 // src/db/SyncedDb.ts
-var SyncedDb = class {
+var SyncedDb = class _SyncedDb {
   constructor(config) {
     this.collections = /* @__PURE__ */ new Map();
     // State
@@ -3669,6 +3674,7 @@ var SyncedDb = class {
   async findById(collection, id, opts) {
     var _a;
     this.assertCollection(collection);
+    id = this.normalizeId(id);
     opts = this.resolveOpts(opts);
     if ((_a = this.collections.get(collection)) == null ? void 0 : _a.writeOnly) {
       return this.writeOnlyFindById(collection, id);
@@ -3705,6 +3711,7 @@ var SyncedDb = class {
   async findByIds(collection, ids, opts) {
     var _a;
     this.assertCollection(collection);
+    ids = ids.map((id) => this.normalizeId(id));
     opts = this.resolveOpts(opts);
     if ((_a = this.collections.get(collection)) == null ? void 0 : _a.writeOnly) {
       return this.writeOnlyFindByIds(collection, ids);
@@ -3743,6 +3750,7 @@ var SyncedDb = class {
   async findOne(collection, query, opts) {
     var _a, _b;
     this.assertCollection(collection);
+    query = _SyncedDb.stringifyObjectIds(query);
     opts = this.resolveOpts(opts);
     if ((_a = this.collections.get(collection)) == null ? void 0 : _a.writeOnly) {
       return this.writeOnlyFindOne(collection, query);
@@ -3788,6 +3796,7 @@ var SyncedDb = class {
   async find(collection, query, opts) {
     var _a;
     this.assertCollection(collection);
+    if (query) query = _SyncedDb.stringifyObjectIds(query);
     opts = this.resolveOpts(opts);
     if ((_a = this.collections.get(collection)) == null ? void 0 : _a.writeOnly) {
       return this.writeOnlyFind(collection, query);
@@ -3902,6 +3911,8 @@ var SyncedDb = class {
   async save(collection, id, update) {
     var _a;
     this.assertCollection(collection);
+    id = this.normalizeId(id);
+    update = _SyncedDb.stringifyObjectIds(update);
     const existing = await this.dexieDb.getById(collection, id);
     if (!existing) {
       console.warn(
@@ -3928,18 +3939,21 @@ var SyncedDb = class {
   }
   async upsert(collection, query, update) {
     this.assertCollection(collection);
+    query = _SyncedDb.stringifyObjectIds(query);
+    update = _SyncedDb.stringifyObjectIds(update);
     const existing = await this.findOne(collection, query);
     if (existing) {
       return this.save(collection, existing._id, update);
     } else {
       const id = new ObjectId2().toHexString();
-      const newDoc = __spreadValues({ _id: id }, update);
+      const newDoc = __spreadProps(__spreadValues({}, update), { _id: id });
       return this.insert(collection, newDoc);
     }
   }
   async insert(collection, data) {
     var _a;
     this.assertCollection(collection);
+    data = _SyncedDb.stringifyObjectIds(data);
     const id = data._id ? String(data._id) : new ObjectId2().toHexString();
     const existing = await this.dexieDb.getById(collection, id);
     if (existing && !existing._deleted && !existing._archived) {
@@ -3953,9 +3967,8 @@ var SyncedDb = class {
       _ts: void 0,
       _rev: void 0
     });
-    const newData = __spreadProps(__spreadValues({
-      _id: id
-    }, data), {
+    const newData = __spreadProps(__spreadValues({}, data), {
+      _id: id,
       _lastUpdaterId: this.updaterId
     });
     this.pendingChanges.schedule(collection, id, newData, 0, "insert");
@@ -3967,6 +3980,7 @@ var SyncedDb = class {
   async deleteOne(collection, id) {
     var _a;
     this.assertCollection(collection);
+    id = this.normalizeId(id);
     const existing = await this.dexieDb.getById(collection, id);
     if (!existing || existing._deleted) {
       return null;
@@ -4027,6 +4041,7 @@ var SyncedDb = class {
   // ==================== Hard Delete Operations (online only) ====================
   async hardDeleteOne(collection, id) {
     this.assertCollection(collection);
+    id = this.normalizeId(id);
     if (!this.isOnline()) {
       throw new Error("hardDeleteOne requires online connection");
     }
@@ -4332,6 +4347,31 @@ var SyncedDb = class {
       throw new Error(`Collection "${name}" not configured`);
     }
   }
+  /** Stringify an Id parameter (ObjectId → hex string). */
+  normalizeId(id) {
+    return typeof id === "object" && id !== null ? String(id) : id;
+  }
+  /**
+   * Recursively stringify all ObjectId values in a document/query.
+   * Mirrors rdb2's preprocessForPack approach: any value with
+   * _bsontype==="ObjectId" or a toHexString() method is converted to string.
+   * Ensures Dexie compatibility and correct local query matching.
+   */
+  static stringifyObjectIds(data) {
+    if (data === null || data === void 0) return data;
+    if (_SyncedDb.isObjectIdLike(data)) return String(data);
+    if (typeof data !== "object") return data;
+    if (data instanceof Date) return data;
+    if (Array.isArray(data)) return data.map((v) => _SyncedDb.stringifyObjectIds(v));
+    const result = {};
+    for (const key of Object.keys(data)) {
+      result[key] = _SyncedDb.stringifyObjectIds(data[key]);
+    }
+    return result;
+  }
+  static isObjectIdLike(v) {
+    return !!(v && typeof v === "object" && (v._bsontype === "ObjectId" || typeof v.toHexString === "function"));
+  }
   /**
    * Asserts write-only collection has online connectivity for reads.
    * @throws Error if offline

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

@@ -142,6 +142,16 @@ export declare class SyncedDb implements I_SyncedDb {
      */
     private loadCollectionToInMem;
     private assertCollection;
+    /** Stringify an Id parameter (ObjectId → hex string). */
+    private normalizeId;
+    /**
+     * Recursively stringify all ObjectId values in a document/query.
+     * Mirrors rdb2's preprocessForPack approach: any value with
+     * _bsontype==="ObjectId" or a toHexString() method is converted to string.
+     * Ensures Dexie compatibility and correct local query matching.
+     */
+    private static stringifyObjectIds;
+    private static isObjectIdLike;
     /**
      * Asserts write-only collection has online connectivity for reads.
      * @throws Error if offline

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.81",
+  "version": "0.1.84",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "cry-db": "^2.4.23",
     "cry-helpers": "^2.1.193",
-    "cry-synced-db-client": "0.1.79",
+    "cry-synced-db-client": "0.1.83",
     "msgpackr": "^1.11.9",
     "notepack": "^0.0.2",
     "notepack.io": "^3.0.1",