dexie-cloud-addon 4.1.0-beta.42 → 4.1.0-beta.44

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

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.1.0-beta.42, Tue Feb 04 2025
+ * Version 4.1.0-beta.44, Fri Feb 14 2025
  *
  * https://dexie.org
  *
@@ -3680,8 +3680,6 @@
      */
     function setCurrentUser(db, user) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (user.userId === db.cloud.currentUserId)
-                return; // Already this user.
             const $logins = db.table('$logins');
             yield db.transaction('rw', $logins, (tx) => __awaiter(this, void 0, void 0, function* () {
                 const existingLogins = yield $logins.toArray();
@@ -4994,7 +4992,7 @@
             .toArray();
     }
 
-    function $Y$1(db) {
+    function $Y(db) {
         const $Y = db.dx._options.Y;
         if (!$Y)
             throw new Error('Y library not supplied to Dexie constructor');
@@ -5024,7 +5022,7 @@
             for (const table of tablesToSync) {
                 if (table.schema.yProps) {
                     for (const yProp of table.schema.yProps) {
-                        const Y = $Y$1(db); // This is how we retrieve the user-provided Y library
+                        const Y = $Y(db); // This is how we retrieve the user-provided Y library
                         const yTable = db.table(yProp.updatesTable); // the updates-table for this combo of table+propName
                         const syncState = (yield yTable.get(DEXIE_CLOUD_SYNCER_ID));
                         // unsentFrom = the `i` value of updates that aren't yet sent to server (or at least not acked by the server yet)
@@ -6161,8 +6159,14 @@
                         }
                         return Object.assign(Object.assign({}, table), { mutate: (req) => {
                                 var _a, _b;
-                                // @ts-ignore
-                                if (req.trans.disableChangeTracking) {
+                                const idbtrans = req.trans;
+                                if (idbtrans.mode === 'versionchange') {
+                                    // Tell all the other middlewares to skip bothering. We're in versionchange mode.
+                                    // dexie-cloud is not initialized yet.
+                                    idbtrans.disableChangeTracking = true;
+                                    idbtrans.disableAccessControl = true;
+                                }
+                                if (idbtrans.disableChangeTracking) {
                                     // Disable ID policy checks and ID generation
                                     return table.mutate(req);
                                 }
@@ -6219,17 +6223,13 @@
                 return Object.assign(Object.assign({}, core), { table: (tableName) => {
                         const table = core.table(tableName);
                         return Object.assign(Object.assign({}, table), { mutate: (req) => {
-                                var _a, _b, _c, _d;
-                                // @ts-ignore
-                                if (req.trans.disableChangeTracking) {
+                                var _a, _b, _c, _d, _e, _f;
+                                const trans = req.trans;
+                                if (trans.disableChangeTracking) {
                                     return table.mutate(req);
                                 }
-                                const trans = req.trans;
-                                if ((_b = (_a = db.cloud.schema) === null || _a === void 0 ? void 0 : _a[tableName]) === null || _b === void 0 ? void 0 : _b.markedForSync) {
-                                    if (trans.mode === 'versionchange') {
-                                        // Don't mutate tables marked for sync in versionchange transactions.
-                                        return Promise.reject(new Dexie.UpgradeError(`Dexie Cloud Addon: Cannot upgrade or populate synced table "${tableName}". See https://dexie.org/cloud/docs/best-practices`));
-                                    }
+                                const currentUserId = (_b = (_a = trans.currentUser) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : UNAUTHORIZED_USER.userId;
+                                if ((_d = (_c = db.cloud.schema) === null || _c === void 0 ? void 0 : _c[tableName]) === null || _d === void 0 ? void 0 : _d.markedForSync) {
                                     if (req.type === 'add' || req.type === 'put') {
                                         if (tableName === 'members') {
                                             for (const member of req.values) {
@@ -6253,12 +6253,12 @@
                                         // and expect them to be returned. That scenario must work also when db.cloud.currentUserId === 'unauthorized'.
                                         for (const obj of req.values) {
                                             if (!obj.owner) {
-                                                obj.owner = trans.currentUser.userId;
+                                                obj.owner = currentUserId;
                                             }
                                             if (!obj.realmId) {
-                                                obj.realmId = trans.currentUser.userId;
+                                                obj.realmId = currentUserId;
                                             }
-                                            const key = (_d = (_c = table.schema.primaryKey).extractKey) === null || _d === void 0 ? void 0 : _d.call(_c, obj);
+                                            const key = (_f = (_e = table.schema.primaryKey).extractKey) === null || _f === void 0 ? void 0 : _f.call(_e, obj);
                                             if (typeof key === 'string' && key[0] === '#') {
                                                 // Add $ts prop for put operations and
                                                 // disable update operations as well as consistent
@@ -6354,16 +6354,14 @@
             name: 'MutationTrackingMiddleware',
             level: 1,
             create: (core) => {
+                const allTableNames = new Set(core.schema.tables.map((t) => t.name));
                 const ordinaryTables = core.schema.tables.filter((t) => !/^\$/.test(t.name));
-                let mutTableMap;
-                try {
-                    mutTableMap = new Map(ordinaryTables.map((tbl) => [
-                        tbl.name,
-                        core.table(`$${tbl.name}_mutations`),
-                    ]));
-                }
-                catch (_a) {
-                    throwVersionIncrementNeeded();
+                const mutTableMap = new Map();
+                for (const tbl of ordinaryTables) {
+                    const mutationTableName = `$${tbl.name}_mutations`;
+                    if (allTableNames.has(mutationTableName)) {
+                        mutTableMap.set(tbl.name, core.table(mutationTableName));
+                    }
                 }
                 return Object.assign(Object.assign({}, core), { transaction: (tables, mode) => {
                         let tx;
@@ -6441,6 +6439,11 @@
                         }
                         const { schema } = table;
                         const mutsTable = mutTableMap.get(tableName);
+                        if (!mutsTable) {
+                            // We cannot track mutations on this table because there is no mutations table for it.
+                            // This might happen in upgraders that executes before cloud schema is applied.
+                            return table;
+                        }
                         return guardedTable(Object.assign(Object.assign({}, table), { mutate: (req) => {
                                 var _a, _b, _c;
                                 const trans = req.trans;
@@ -8139,7 +8142,7 @@
                     if (provider.destroyed || currentFlowId !== myFlow || !connected)
                         return;
                     if (serverUpdatesSinceLastSync.length > 0) {
-                        const Y = $Y$1(db); // Get the Yjs library from Dexie constructor options
+                        const Y = $Y(db); // Get the Yjs library from Dexie constructor options
                         const mergedUpdate = Y.mergeUpdatesV2(serverUpdatesSinceLastSync.map((update) => update.u));
                         const stateVector = Y.encodeStateVectorFromUpdateV2(mergedUpdate);
                         docOpenMsg.sv = stateVector;
@@ -8159,8 +8162,68 @@
     }
 
     const ydocTriggers = {};
-    const docIsAlreadyHooked = new WeakSet();
     const middlewares = new WeakMap();
+    const txRunner = TriggerRunner("tx");
+    const unloadRunner = TriggerRunner("unload");
+    function TriggerRunner(name) {
+        let triggerExecPromise = null;
+        let triggerScheduled = false;
+        let registry = new Map();
+        function execute(registryCopy) {
+            return __awaiter(this, void 0, void 0, function* () {
+                for (const { db, parentId, triggers, parentTable, prop, } of registryCopy.values()) {
+                    const yDoc = Dexie.DexieYProvider.getOrCreateDocument(db, parentTable, prop, parentId);
+                    try {
+                        Dexie.DexieYProvider.load(yDoc); // If doc is open, this would just be a ++refount
+                        yield yDoc.whenLoaded; // If doc is loaded, this would resolve immediately
+                        for (const trigger of triggers) {
+                            yield trigger(yDoc, parentId);
+                        }
+                    }
+                    catch (error) {
+                        console.error(`Error in YDocTrigger ${error}`);
+                    }
+                    finally {
+                        Dexie.DexieYProvider.release(yDoc);
+                    }
+                }
+            });
+        }
+        return {
+            name,
+            run() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (!triggerScheduled && registry.size > 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 registryCopy = registry;
+                            registry = new Map();
+                            triggerExecPromise = execute(registryCopy).finally(() => (triggerExecPromise = null));
+                        }, 0);
+                    }
+                });
+            },
+            enqueue(db, parentTable, parentId, prop, trigger) {
+                const key = `${db.name}:${parentTable}:${parentId}:${prop}`;
+                let entry = registry.get(key);
+                if (!entry) {
+                    entry = {
+                        db,
+                        parentTable,
+                        parentId,
+                        prop,
+                        triggers: new Set(),
+                    };
+                    registry.set(key, entry);
+                }
+                entry.triggers.add(trigger);
+            },
+        };
+    }
     const createMiddleware = (db) => ({
         stack: 'dbcore',
         level: 10,
@@ -8168,15 +8231,20 @@
         create: (down) => {
             return Object.assign(Object.assign({}, down), { transaction: (stores, mode, options) => {
                     const idbtrans = down.transaction(stores, mode, options);
+                    if (mode === 'readonly')
+                        return idbtrans;
+                    if (!stores.some((store) => ydocTriggers[store]))
+                        return idbtrans;
                     idbtrans.addEventListener('complete', onTransactionCommitted);
                     return idbtrans;
-                }, table: (tblName) => {
-                    const coreTable = down.table(tblName);
-                    const triggerSpec = ydocTriggers[tblName];
+                }, table: (updatesTable) => {
+                    const coreTable = down.table(updatesTable);
+                    const triggerSpec = ydocTriggers[updatesTable];
                     if (!triggerSpec)
                         return coreTable;
                     const { trigger, parentTable, prop } = triggerSpec;
                     return Object.assign(Object.assign({}, coreTable), { mutate(req) {
+                            var _a;
                             switch (req.type) {
                                 case 'add': {
                                     for (const yUpdateRow of req.values) {
@@ -8184,15 +8252,10 @@
                                             continue; // A syncer or garbage collection state does not point to a key
                                         const primaryKey = yUpdateRow.k;
                                         const doc = Dexie.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);
-                                        }
+                                        const runner = doc && ((_a = Dexie.DexieYProvider.for(doc)) === null || _a === void 0 ? void 0 : _a.refCount)
+                                            ? unloadRunner // Document is open. Wait with trigger until it's closed.
+                                            : txRunner; // Document is closed. Run trigger immediately after transaction commits.
+                                        runner.enqueue(db, parentTable, primaryKey, prop, trigger);
                                     }
                                     break;
                                 }
@@ -8215,7 +8278,7 @@
                                                     keySet.addKey(k);
                                             }
                                             for (const interval of keySet) {
-                                                enqueueTrigger(db, tblName, interval.from, trigger);
+                                                txRunner.enqueue(db, parentTable, interval.from, prop, trigger);
                                             }
                                         });
                                     }
@@ -8226,74 +8289,11 @@
                 } });
         },
     });
-    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);
-            }
-        });
+        txRunner.run();
     }
-    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 beforeProviderUnload() {
+        unloadRunner.run();
     }
     function defineYDocTrigger(table, prop, trigger) {
         var _a, _b;
@@ -8312,6 +8312,9 @@
             middlewares.set(db, mw);
         }
         db.use(mw);
+        {
+            Dexie.DexieYProvider.on('beforeunload', beforeProviderUnload);
+        }
     }
 
     const DEFAULT_OPTIONS = {
@@ -8354,7 +8357,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.1.0-beta.42",
+            version: "4.1.0-beta.44",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -8672,7 +8675,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.1.0-beta.42";
+    dexieCloud.version = "4.1.0-beta.44";
     Dexie.Cloud = dexieCloud;
 
     exports.default = dexieCloud;