dexie-cloud-addon 4.0.0-beta.24 → 4.0.1-beta.27

package/dist/umd/service-worker.js

@@ -1941,7 +1941,7 @@
     }
 
     //@ts-check
-    const randomFillSync = crypto.getRandomValues;
+    const randomFillSync = crypto.getRandomValues.bind(crypto);
 
     function assert(b) {
         if (!b)
@@ -2003,17 +2003,17 @@
             }
         }
     }
-    const randomString = typeof Buffer !== 'undefined' ? (bytes) => {
-        // Node
-        const buf = Buffer.alloc(bytes);
-        randomFillSync(buf);
-        return buf.toString("base64");
-    } : (bytes) => {
+    const randomString = typeof self !== 'undefined' && typeof crypto !== 'undefined' ? (bytes) => {
         // Web
         const buf = new Uint8Array(bytes);
         crypto.getRandomValues(buf);
         return btoa(String.fromCharCode.apply(null, buf));
-    };
+    } : typeof Buffer !== 'undefined' ? (bytes) => {
+        // Node
+        const buf = Buffer.alloc(bytes);
+        randomFillSync(buf);
+        return buf.toString("base64");
+    } : () => { throw new Error("No implementation of randomString was found"); };
 
     /** Verifies that given primary key is valid.
      * The reason we narrow validity for valid keys are twofold:
@@ -3039,14 +3039,14 @@
     //     serverRev.rev = bigIntDef.bigint.revive(server.rev)
     //   else
     //     serverRev.rev = new FakeBigInt(server.rev)
-    const hasBigIntSupport = typeof BigInt(0) === 'bigint';
+    const hasBigIntSupport = typeof BigInt === 'function' && typeof BigInt(0) === 'bigint';
     class FakeBigInt {
-        constructor(value) {
-            this.v = value;
-        }
         toString() {
             return this.v;
         }
+        constructor(value) {
+            this.v = value;
+        }
     }
     const defs = Object.assign(Object.assign({}, undefinedDef), (hasBigIntSupport
         ? {}
@@ -3917,7 +3917,16 @@
                     return db.$syncState.get('syncState');
                 },
                 getSchema() {
-                    return db.$syncState.get('schema');
+                    return db.$syncState.get('schema').then((schema) => {
+                        if (schema) {
+                            for (const table of db.tables) {
+                                if (table.schema.primKey && table.schema.primKey.keyPath && schema[table.name]) {
+                                    schema[table.name].primaryKey = nameFromKeyPath(table.schema.primKey.keyPath);
+                                }
+                            }
+                        }
+                        return schema;
+                    });
                 },
                 getOptions() {
                     return db.$syncState.get('options');
@@ -3935,6 +3944,11 @@
         }
         return db;
     }
+    function nameFromKeyPath(keyPath) {
+        return typeof keyPath === 'string' ?
+            keyPath :
+            keyPath ? ('[' + [].join.call(keyPath, '+') + ']') : "";
+    }
 
     // Emulate true-private property db. Why? So it's not stored in DB.
     const wm = new WeakMap();
@@ -4405,7 +4419,7 @@
                                                 // modify operations. Reason: Server may not have
                                                 // the object. Object should be created on server only
                                                 // if is being updated. An update operation won't create it
-                                                // so we must delete req.changeSpec to decrate operation to
+                                                // so we must delete req.changeSpec to degrade operation to
                                                 // an upsert operation with timestamp so that it will be created.
                                                 // We must also degrade from consistent modify operations for the
                                                 // same reason - object might be there on server. Must but put up instead.
@@ -4417,7 +4431,7 @@
                                                 if (req.type === 'put') {
                                                     delete req.criteria;
                                                     delete req.changeSpec;
-                                                    delete req.changeSpecs;
+                                                    delete req.updates;
                                                     obj.$ts = Date.now();
                                                 }
                                             }
@@ -4622,11 +4636,10 @@
                                 const { numFailures: hasFailures, failures } = res;
                                 let keys = type === 'delete' ? req.keys : res.results;
                                 let values = 'values' in req ? req.values : [];
-                                let changeSpecs = 'changeSpecs' in req ? req.changeSpecs : [];
+                                let updates = 'updates' in req && req.updates;
                                 if (hasFailures) {
                                     keys = keys.filter((_, idx) => !failures[idx]);
                                     values = values.filter((_, idx) => !failures[idx]);
-                                    changeSpecs = changeSpecs.filter((_, idx) => !failures[idx]);
                                 }
                                 const ts = Date.now();
                                 const mut = req.type === 'delete'
@@ -4658,13 +4671,13 @@
                                                 txid,
                                                 userId
                                             }
-                                            : req.changeSpecs
+                                            : updates
                                                 ? {
                                                     // One changeSpec per key
                                                     type: 'update',
                                                     ts,
-                                                    keys,
-                                                    changeSpecs,
+                                                    keys: updates.keys,
+                                                    changeSpecs: updates.changeSpecs,
                                                     txid,
                                                     userId
                                                 }
@@ -5845,10 +5858,10 @@
     }
 
     const getInvitesObservable = associate((db) => {
-        const membersByEmail = getCurrentUserEmitter(db._novip).pipe(rxjs.switchMap((currentUser) => Dexie.liveQuery(() => db.members.where({ email: currentUser.email || '' }).toArray())));
+        const membersByEmail = getCurrentUserEmitter(db._novip).pipe(switchMap((currentUser) => Dexie.liveQuery(() => db.members.where({ email: currentUser.email || '' }).toArray())));
         const permissions = getPermissionsLookupObservable(db._novip);
         const accessControl = getInternalAccessControlObservable(db._novip);
-        return createSharedValueObservable(rxjs.combineLatest([membersByEmail, accessControl, permissions]).pipe(rxjs.map(([membersByEmail, accessControl, realmLookup]) => {
+        return createSharedValueObservable(rxjs.combineLatest([membersByEmail, accessControl, permissions]).pipe(map(([membersByEmail, accessControl, realmLookup]) => {
             const reducer = (result, m) => (Object.assign(Object.assign({}, result), { [m.id]: Object.assign(Object.assign({}, m), { realm: realmLookup[m.realmId] }) }));
             const emailMembersById = membersByEmail.reduce(reducer, {});
             const membersById = accessControl.selfMembers.reduce(reducer, emailMembersById);
@@ -5904,7 +5917,7 @@
             currentUserEmitter.next(UNAUTHORIZED_USER);
         });
         dexie.cloud = {
-            version: '4.0.0-beta.24',
+            version: '4.0.1-beta.27',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -6034,7 +6047,9 @@
                         // Update persisted options:
                         if (!options)
                             throw new Error(`Internal error`); // options cannot be null if configuredProgramatically is set.
-                        yield db.$syncState.put(options, 'options');
+                        const newPersistedOptions = Object.assign({}, options);
+                        delete newPersistedOptions.fetchTokens;
+                        yield db.$syncState.put(newPersistedOptions, 'options');
                     }
                     if (((_h = db.cloud.options) === null || _h === void 0 ? void 0 : _h.tryUseServiceWorker) &&
                         'serviceWorker' in navigator &&
@@ -6157,7 +6172,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.0-beta.24';
+    dexieCloud.version = '4.0.1-beta.27';
     Dexie__default["default"].Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: