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

package/dist/modern/service-worker.js

@@ -1,5 +1,5 @@
 import Dexie, { cmp, liveQuery } from 'dexie';
-import { Observable as Observable$1, BehaviorSubject, Subject, fromEvent, of, merge, Subscription as Subscription$1, from as from$1, throwError, combineLatest, map as map$1, share, timer as timer$1, switchMap as switchMap$1 } from 'rxjs';
+import { Observable as Observable$1, BehaviorSubject, Subject, fromEvent, of, merge, Subscription as Subscription$1, from as from$1, throwError, combineLatest, map as map$1, share, timer as timer$1 } from 'rxjs';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -1934,7 +1934,7 @@ function randomString$1(bytes) {
 }
 
 //@ts-check
-const randomFillSync = crypto.getRandomValues;
+const randomFillSync = crypto.getRandomValues.bind(crypto);
 
 function assert(b) {
     if (!b)
@@ -1996,17 +1996,17 @@ function setByKeyPath(obj, keyPath, value) {
         }
     }
 }
-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:
@@ -3032,14 +3032,14 @@ var undefinedDef = {
 //     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
     ? {}
@@ -3910,7 +3910,16 @@ function DexieCloudDB(dx) {
                 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');
@@ -3928,6 +3937,11 @@ function DexieCloudDB(dx) {
     }
     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();
@@ -4398,7 +4412,7 @@ function createImplicitPropSetterMiddleware(db) {
                                             // 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.
@@ -4410,7 +4424,7 @@ function createImplicitPropSetterMiddleware(db) {
                                             if (req.type === 'put') {
                                                 delete req.criteria;
                                                 delete req.changeSpec;
-                                                delete req.changeSpecs;
+                                                delete req.updates;
                                                 obj.$ts = Date.now();
                                             }
                                         }
@@ -4615,11 +4629,10 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                             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'
@@ -4651,13 +4664,13 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                                             txid,
                                             userId
                                         }
-                                        : req.changeSpecs
+                                        : updates
                                             ? {
                                                 // One changeSpec per key
                                                 type: 'update',
                                                 ts,
-                                                keys,
-                                                changeSpecs,
+                                                keys: updates.keys,
+                                                changeSpecs: updates.changeSpecs,
                                                 txid,
                                                 userId
                                             }
@@ -5838,10 +5851,10 @@ function permissions(dexie, obj, tableName) {
 }
 
 const getInvitesObservable = associate((db) => {
-    const membersByEmail = getCurrentUserEmitter(db._novip).pipe(switchMap$1((currentUser) => liveQuery(() => db.members.where({ email: currentUser.email || '' }).toArray())));
+    const membersByEmail = getCurrentUserEmitter(db._novip).pipe(switchMap((currentUser) => liveQuery(() => db.members.where({ email: currentUser.email || '' }).toArray())));
     const permissions = getPermissionsLookupObservable(db._novip);
     const accessControl = getInternalAccessControlObservable(db._novip);
-    return createSharedValueObservable(combineLatest([membersByEmail, accessControl, permissions]).pipe(map$1(([membersByEmail, accessControl, realmLookup]) => {
+    return createSharedValueObservable(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);
@@ -5897,7 +5910,7 @@ function dexieCloud(dexie) {
         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() {
@@ -6027,7 +6040,9 @@ function dexieCloud(dexie) {
                     // 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 &&
@@ -6150,7 +6165,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.0-beta.24';
+dexieCloud.version = '4.0.1-beta.27';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: