dexie-cloud-addon 4.1.0-beta.38 → 4.1.0-beta.40

package/dist/modern/dexie-cloud-addon.d.ts

@@ -1,4 +1,3 @@
 import dexieCloudAddon from './dexie-cloud-client';
 export * from './dexie-cloud-client';
-export { defineYDocTrigger } from './define-ydoc-trigger';
 export default dexieCloudAddon;

package/dist/modern/dexie-cloud-addon.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.1.0-beta.38, Fri Dec 06 2024
+ * Version 4.1.0-beta.40, Mon Jan 20 2025
  *
  * https://dexie.org
  *
@@ -4222,7 +4222,7 @@ var numberDef = {
     },
 };
 
-const bigIntDef = {
+const bigIntDef$1 = {
     bigint: {
         replace: (realVal) => {
             return { $t: "bigint", v: "" + realVal };
@@ -4465,7 +4465,7 @@ var BlobDef = {
 
 const builtin = {
     ...numberDef,
-    ...bigIntDef,
+    ...bigIntDef$1,
     ...DateDef,
     ...SetDef,
     ...MapDef,
@@ -4575,7 +4575,7 @@ class FakeBigInt {
         this.v = value;
     }
 }
-const defs = Object.assign(Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
+const bigIntDef = hasBigIntSupport
     ? {}
     : {
         bigint: {
@@ -4583,17 +4583,19 @@ const defs = Object.assign(Object.assign(Object.assign({}, undefinedDef), (hasBi
             replace: (fakeBigInt) => {
                 return Object.assign({ $t: 'bigint' }, fakeBigInt);
             },
-            revive: ({ v, }) => new FakeBigInt(v)
-        }
-    })), { PropModification: {
+            revive: ({ v }) => new FakeBigInt(v),
+        },
+    };
+const defs = Object.assign(Object.assign(Object.assign({}, undefinedDef), bigIntDef), { PropModification: {
         test: (val) => val instanceof PropModification,
         replace: (propModification) => {
-            return Object.assign({ $t: 'PropModification' }, propModification);
+            return Object.assign({ $t: 'PropModification' }, propModification['@@propmod']);
         },
         revive: (_a) => {
-            var propModification = __rest(_a, ["$t"]);
-            return new PropModification(propModification);
-        }
+            var propModSpec = __rest(_a, ["$t"]) // keep the rest
+            ;
+            return new PropModification(propModSpec);
+        },
     } });
 const TSON = TypesonSimplified(builtin, defs);
 const BISON = Bison(defs);
@@ -4741,11 +4743,12 @@ function syncWithServer(changes, y, syncState, baseRevs, db, databaseUrl, schema
         db.syncStateChangedEvent.next({
             phase: 'pushing',
         });
+        const body = TSON.stringify(syncRequest);
         const res = yield fetch(`${databaseUrl}/sync`, {
             method: 'post',
             headers,
             credentials: 'include', // For Arr Affinity cookie only, for better Rate-Limit counting only.
-            body: TSON.stringify(syncRequest),
+            body,
         });
         //const contentLength = Number(res.headers.get('content-length'));
         db.syncStateChangedEvent.next({
@@ -5580,7 +5583,12 @@ function _sync(db_1, options_1, schema_1) {
         const usingYProps = Object.values(schema).some(tbl => { var _a; return (_a = tbl.yProps) === null || _a === void 0 ? void 0 : _a.length; });
         const serverSupportsYprops = !!res.yMessages;
         if (usingYProps && serverSupportsYprops) {
-            yield downloadYDocsFromServer(db, databaseUrl, newSyncState);
+            try {
+                yield downloadYDocsFromServer(db, databaseUrl, newSyncState);
+            }
+            catch (error) {
+                console.error('Failed to download Yjs documents from server', error);
+            }
         }
         console.debug('SYNC DONE', { isInitialSync });
         db.syncCompleteEvent.next();
@@ -8117,6 +8125,162 @@ function getTiedObjectId(realmId) {
     return realmId.startsWith('rlm~') ? realmId.substr(4) : null;
 }
 
+const ydocTriggers = {};
+const docIsAlreadyHooked = new WeakSet();
+const middlewares = new WeakMap();
+const createMiddleware = (db) => ({
+    stack: 'dbcore',
+    level: 10,
+    name: 'yTriggerMiddleware',
+    create: (down) => {
+        return Object.assign(Object.assign({}, down), { transaction: (stores, mode, options) => {
+                const idbtrans = down.transaction(stores, mode, options);
+                idbtrans.addEventListener('complete', onTransactionCommitted);
+                return idbtrans;
+            }, table: (tblName) => {
+                const coreTable = down.table(tblName);
+                const triggerSpec = ydocTriggers[tblName];
+                if (!triggerSpec)
+                    return coreTable;
+                const { trigger, parentTable, prop } = triggerSpec;
+                return Object.assign(Object.assign({}, coreTable), { mutate(req) {
+                        switch (req.type) {
+                            case 'add': {
+                                for (const yUpdateRow of req.values) {
+                                    if (yUpdateRow.k == undefined)
+                                        continue; // A syncer or garbage collection state does not point to a key
+                                    const primaryKey = yUpdateRow.k;
+                                    const doc = DexieYProvider.getDocCache(db).find(parentTable, primaryKey, prop);
+                                    if (doc) {
+                                        if (!docIsAlreadyHooked.has(doc)) {
+                                            hookToDoc(doc, primaryKey, trigger);
+                                            docIsAlreadyHooked.add(doc);
+                                        }
+                                    }
+                                    else {
+                                        enqueueTrigger(db, tblName, primaryKey, trigger);
+                                    }
+                                }
+                                break;
+                            }
+                            case 'delete':
+                                // @ts-ignore
+                                if (req.trans._rejecting_y_ypdate) {
+                                    // The deletion came from a rejection, not garbage collection.
+                                    // When that happens, let the triggers run to compute new values
+                                    // based on the deleted updates.
+                                    coreTable
+                                        .getMany({
+                                        keys: req.keys,
+                                        trans: req.trans,
+                                        cache: 'immutable',
+                                    })
+                                        .then((updates) => {
+                                        const keySet = new RangeSet();
+                                        for (const { k } of updates) {
+                                            if (k != undefined)
+                                                keySet.addKey(k);
+                                        }
+                                        for (const interval of keySet) {
+                                            enqueueTrigger(db, tblName, interval.from, trigger);
+                                        }
+                                    });
+                                }
+                                break;
+                        }
+                        return coreTable.mutate(req);
+                    } });
+            } });
+    },
+});
+let triggerExecPromise = null;
+let triggerScheduled = false;
+let scheduledTriggers = [];
+function $Y(db) {
+    const $Y = db._options.Y;
+    if (!$Y)
+        throw new Error('Y library not supplied to Dexie constructor');
+    return $Y;
+}
+function executeTriggers(triggersToRun) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (const { db, parentId, trigger, updatesTable } of triggersToRun) {
+            // Load entire document into an Y.Doc instance:
+            const updates = yield db
+                .table(updatesTable)
+                .where({ k: parentId })
+                .toArray();
+            const Y = $Y(db);
+            const yDoc = new Y.Doc();
+            for (const update of updates) {
+                Y.applyUpdateV2(yDoc, update.u);
+            }
+            try {
+                yield trigger(yDoc, parentId);
+            }
+            catch (error) {
+                console.error(`Error in YDocTrigger ${error}`);
+            }
+        }
+    });
+}
+function enqueueTrigger(db, updatesTable, parentId, trigger) {
+    scheduledTriggers.push({
+        db,
+        updatesTable,
+        parentId,
+        trigger,
+    });
+}
+function onTransactionCommitted() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!triggerScheduled && scheduledTriggers.length > 0) {
+            triggerScheduled = true;
+            if (triggerExecPromise)
+                yield triggerExecPromise.catch(() => { });
+            setTimeout(() => {
+                // setTimeout() is to escape from Promise.PSD zones and never run within liveQueries or transaction scopes
+                triggerScheduled = false;
+                const triggersToRun = scheduledTriggers;
+                scheduledTriggers = [];
+                triggerExecPromise = executeTriggers(triggersToRun).finally(() => (triggerExecPromise = null));
+            }, 0);
+        }
+    });
+}
+function hookToDoc(doc, parentId, trigger) {
+    // From now on, keep listening to doc updates and execute the trigger when it happens there instead
+    doc.on('updateV2', (update, origin) => {
+        //Dexie.ignoreTransaction(()=>{
+        trigger(doc, parentId);
+        //});
+    });
+    /*
+      NOT NEEDED because DexieYProvider's docCache will also listen to destroy and remove it from its cache:
+      doc.on('destroy', ()=>{
+      docIsAlreadyHooked.delete(doc);
+    })
+    */
+}
+function defineYDocTrigger(table, prop, trigger) {
+    var _a, _b;
+    const updatesTable = (_b = (_a = table.schema.yProps) === null || _a === void 0 ? void 0 : _a.find((p) => p.prop === prop)) === null || _b === void 0 ? void 0 : _b.updatesTable;
+    if (!updatesTable)
+        throw new Error(`Table ${table.name} does not have a Yjs property named ${prop}`);
+    ydocTriggers[updatesTable] = {
+        trigger,
+        parentTable: table.name,
+        prop,
+    };
+    const db = table.db._novip;
+    let mw = middlewares.get(db);
+    if (!mw) {
+        mw = createMiddleware(db);
+        middlewares.set(db, mw);
+    }
+    db.use(mw);
+}
+
 const DEFAULT_OPTIONS = {
     nameSuffix: true,
 };
@@ -8157,7 +8321,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.1.0-beta.38",
+        version: "4.1.0-beta.40",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -8475,164 +8639,8 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.1.0-beta.38";
+dexieCloud.version = "4.1.0-beta.40";
 Dexie.Cloud = dexieCloud;
 
-const ydocTriggers = {};
-const docIsAlreadyHooked = new WeakSet();
-const middlewares = new WeakMap();
-const createMiddleware = (db) => ({
-    stack: 'dbcore',
-    level: 10,
-    name: 'yTriggerMiddleware',
-    create: (down) => {
-        return Object.assign(Object.assign({}, down), { transaction: (stores, mode, options) => {
-                const idbtrans = down.transaction(stores, mode, options);
-                idbtrans.addEventListener('complete', onTransactionCommitted);
-                return idbtrans;
-            }, table: (tblName) => {
-                const coreTable = down.table(tblName);
-                const triggerSpec = ydocTriggers[tblName];
-                if (!triggerSpec)
-                    return coreTable;
-                const { trigger, parentTable, prop } = triggerSpec;
-                return Object.assign(Object.assign({}, coreTable), { mutate(req) {
-                        switch (req.type) {
-                            case 'add': {
-                                for (const yUpdateRow of req.values) {
-                                    if (yUpdateRow.k == undefined)
-                                        continue; // A syncer or garbage collection state does not point to a key
-                                    const primaryKey = yUpdateRow.k;
-                                    const doc = DexieYProvider.getDocCache(db).find(parentTable, primaryKey, prop);
-                                    if (doc) {
-                                        if (!docIsAlreadyHooked.has(doc)) {
-                                            hookToDoc(doc, primaryKey, trigger);
-                                            docIsAlreadyHooked.add(doc);
-                                        }
-                                    }
-                                    else {
-                                        enqueueTrigger(db, tblName, primaryKey, trigger);
-                                    }
-                                }
-                                break;
-                            }
-                            case 'delete':
-                                // @ts-ignore
-                                if (req.trans._rejecting_y_ypdate) {
-                                    // The deletion came from a rejection, not garbage collection.
-                                    // When that happens, let the triggers run to compute new values
-                                    // based on the deleted updates.
-                                    coreTable
-                                        .getMany({
-                                        keys: req.keys,
-                                        trans: req.trans,
-                                        cache: 'immutable',
-                                    })
-                                        .then((updates) => {
-                                        const keySet = new RangeSet();
-                                        for (const { k } of updates) {
-                                            if (k != undefined)
-                                                keySet.addKey(k);
-                                        }
-                                        for (const interval of keySet) {
-                                            enqueueTrigger(db, tblName, interval.from, trigger);
-                                        }
-                                    });
-                                }
-                                break;
-                        }
-                        return coreTable.mutate(req);
-                    } });
-            } });
-    },
-});
-let triggerExecPromise = null;
-let triggerScheduled = false;
-let scheduledTriggers = [];
-function $Y(db) {
-    const $Y = db._options.Y;
-    if (!$Y)
-        throw new Error('Y library not supplied to Dexie constructor');
-    return $Y;
-}
-function executeTriggers(triggersToRun) {
-    return __awaiter(this, void 0, void 0, function* () {
-        for (const { db, parentId, trigger, updatesTable } of triggersToRun) {
-            // Load entire document into an Y.Doc instance:
-            const updates = yield db
-                .table(updatesTable)
-                .where({ k: parentId })
-                .toArray();
-            const Y = $Y(db);
-            const yDoc = new Y.Doc();
-            for (const update of updates) {
-                Y.applyUpdateV2(yDoc, update.u);
-            }
-            try {
-                yield trigger(yDoc, parentId);
-            }
-            catch (error) {
-                console.error(`Error in YDocTrigger ${error}`);
-            }
-        }
-    });
-}
-function enqueueTrigger(db, updatesTable, parentId, trigger) {
-    scheduledTriggers.push({
-        db,
-        updatesTable,
-        parentId,
-        trigger,
-    });
-}
-function onTransactionCommitted() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!triggerScheduled && scheduledTriggers.length > 0) {
-            triggerScheduled = true;
-            if (triggerExecPromise)
-                yield triggerExecPromise.catch(() => { });
-            setTimeout(() => {
-                // setTimeout() is to escape from Promise.PSD zones and never run within liveQueries or transaction scopes
-                triggerScheduled = false;
-                const triggersToRun = scheduledTriggers;
-                scheduledTriggers = [];
-                triggerExecPromise = executeTriggers(triggersToRun).finally(() => (triggerExecPromise = null));
-            }, 0);
-        }
-    });
-}
-function hookToDoc(doc, parentId, trigger) {
-    // From now on, keep listening to doc updates and execute the trigger when it happens there instead
-    doc.on('updateV2', (update, origin) => {
-        //Dexie.ignoreTransaction(()=>{
-        trigger(doc, parentId);
-        //});
-    });
-    /*
-      NOT NEEDED because DexieYProvider's docCache will also listen to destroy and remove it from its cache:
-      doc.on('destroy', ()=>{
-      docIsAlreadyHooked.delete(doc);
-    })
-    */
-}
-function defineYDocTrigger(table, prop, trigger) {
-    var _a, _b;
-    const updatesTable = (_b = (_a = table.schema.yProps) === null || _a === void 0 ? void 0 : _a.find((p) => p.prop === prop)) === null || _b === void 0 ? void 0 : _b.updatesTable;
-    if (!updatesTable)
-        throw new Error(`Table ${table.name} does not have a Yjs property named ${prop}`);
-    ydocTriggers[updatesTable] = {
-        trigger,
-        parentTable: table.name,
-        prop,
-    };
-    const db = table.db._novip;
-    let mw = middlewares.get(db);
-    if (!mw) {
-        mw = createMiddleware(db);
-        middlewares.set(db, mw);
-    }
-    db.use(mw);
-}
-
 export { dexieCloud as default, defineYDocTrigger, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };
 //# sourceMappingURL=dexie-cloud-addon.js.map