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

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

@@ -108,7 +108,7 @@
      *
      * ==========================================================================
      *
-     * Version 4.0.1-beta.36, Mon Apr 17 2023
+     * Version 4.0.1-beta.38, Mon Apr 17 2023
      *
      * https://dexie.org
      *
@@ -3758,7 +3758,10 @@
     function cloneChange(change, rewriteValues) {
         // clone on demand:
         return Object.assign(Object.assign({}, change), { muts: rewriteValues
-                ? change.muts.map(function (m) { return (Object.assign(Object.assign({}, m), { keys: m.keys.slice(), values: m.values.slice() })); })
+                ? change.muts.map(function (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(function (m) { return (Object.assign(Object.assign({}, m), { keys: m.keys.slice() })); }) });
     }
     //import {BisonWebStreamReader} from "dreambase-library/dist/typeson-simplified/BisonWebStreamReader";
@@ -5448,6 +5451,38 @@
     function overrideParseStoresSpec(origFunc, dexie) {
         return function (stores, dbSchema) {
             var storesClone = Object.assign(Object.assign({}, DEXIE_CLOUD_SCHEMA), stores);
+            // Merge indexes of DEXIE_CLOUD_SCHEMA with stores
+            Object.keys(DEXIE_CLOUD_SCHEMA).forEach(function (tableName) {
+                var 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 ".concat(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.
+                var requestedIndexes = schemaSrc.split(',').map(function (spec) { return spec.trim(); });
+                var builtInIndexes = DEXIE_CLOUD_SCHEMA[tableName].split(',').map(function (spec) { return spec.trim(); });
+                var requestedIndexSet = new Set(requestedIndexes.map(function (index) { return 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 ".concat(tableName, ". Please declare it as {").concat(tableName, ": ").concat(JSON.stringify(DEXIE_CLOUD_SCHEMA[tableName])));
+                }
+                // Merge indexes
+                for (var i_6 = 1; i_6 < builtInIndexes.length; ++i_6) {
+                    var builtInIndex = builtInIndexes[i_6];
+                    if (!requestedIndexSet.has(builtInIndex.replace(/([&*]|\+\+)/g, ""))) {
+                        // Add built-in index if not already requested
+                        storesClone[tableName] += ",".concat(builtInIndex);
+                    }
+                }
+            });
+            // Populate dexie.cloud.schema
             var cloudSchema = dexie.cloud.schema || (dexie.cloud.schema = {});
             var allPrefixes = new Set();
             Object.keys(storesClone).forEach(function (tableName) {
@@ -7046,7 +7081,7 @@
         });
         var syncComplete = new rxjs.Subject();
         dexie.cloud = {
-            version: '4.0.1-beta.36',
+            version: '4.0.1-beta.38',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -7385,7 +7420,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.1-beta.36';
+    dexieCloud.version = '4.0.1-beta.38';
     Dexie__default["default"].Cloud = dexieCloud;
 
     exports["default"] = dexieCloud;