dexie-cloud-addon 4.0.1-beta.36 → 4.0.1-beta.38

package/dist/modern/service-worker.js

@@ -3182,7 +3182,10 @@ function encodeIdsForServer(schema, currentUser, changes) {
 function cloneChange(change, rewriteValues) {
     // clone on demand:
     return Object.assign(Object.assign({}, change), { muts: rewriteValues
-            ? change.muts.map((m) => (Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() })))
+            ? change.muts.map((m) => {
+                return (m.type === 'insert' || m.type === 'upsert') && m.values
+                    ? Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() }) : Object.assign(Object.assign({}, m), { keys: m.keys.slice() });
+            })
             : change.muts.map((m) => (Object.assign(Object.assign({}, m), { keys: m.keys.slice() }))) });
 }
 
@@ -4791,6 +4794,38 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
 function overrideParseStoresSpec(origFunc, dexie) {
     return function (stores, dbSchema) {
         const storesClone = Object.assign(Object.assign({}, DEXIE_CLOUD_SCHEMA), stores);
+        // Merge indexes of DEXIE_CLOUD_SCHEMA with stores
+        Object.keys(DEXIE_CLOUD_SCHEMA).forEach((tableName) => {
+            const schemaSrc = storesClone[tableName];
+            // Verify that they don't try to delete a table that is needed for access control of Dexie Cloud
+            if (schemaSrc == null) {
+                // They try to delete one of the built-in schema tables.
+                throw new Error(`Cannot delete table ${tableName} as it is needed for access control of Dexie Cloud`);
+            }
+            // If not trying to override a built-in table, then we can skip this and continue to next table.
+            if (!stores[tableName]) {
+                // They haven't tried to declare this table. No need to merge indexes.
+                return; // Continue
+            }
+            // They have declared this table. Merge indexes in case they didn't declare all indexes we need.
+            const requestedIndexes = schemaSrc.split(',').map(spec => spec.trim());
+            const builtInIndexes = DEXIE_CLOUD_SCHEMA[tableName].split(',').map(spec => spec.trim());
+            const requestedIndexSet = new Set(requestedIndexes.map(index => index.replace(/([&*]|\+\+)/g, "")));
+            // Verify that primary key is unchanged
+            if (requestedIndexes[0] !== builtInIndexes[0]) {
+                // Primary key must match exactly
+                throw new Error(`Cannot override primary key of table ${tableName}. Please declare it as {${tableName}: ${JSON.stringify(DEXIE_CLOUD_SCHEMA[tableName])}`);
+            }
+            // Merge indexes
+            for (let i = 1; i < builtInIndexes.length; ++i) {
+                const builtInIndex = builtInIndexes[i];
+                if (!requestedIndexSet.has(builtInIndex.replace(/([&*]|\+\+)/g, ""))) {
+                    // Add built-in index if not already requested
+                    storesClone[tableName] += `,${builtInIndex}`;
+                }
+            }
+        });
+        // Populate dexie.cloud.schema
         const cloudSchema = dexie.cloud.schema || (dexie.cloud.schema = {});
         const allPrefixes = new Set();
         Object.keys(storesClone).forEach(tableName => {
@@ -6013,7 +6048,7 @@ function dexieCloud(dexie) {
     });
     const syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.36',
+        version: '4.0.1-beta.38',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6274,7 +6309,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.36';
+dexieCloud.version = '4.0.1-beta.38';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: