@aws-amplify/datastore 3.7.4-custom-pk.87 → 3.7.4-custom-pk.90

package/dist/aws-amplify-datastore.js

@@ -82863,7 +82863,7 @@ function () {
 
     this.query = function (modelConstructor, identifierOrCriteria, paginationProducer) {
       return __awaiter(_this, void 0, void 0, function () {
-        var msg, modelDefinition, keyFields, predicate, pagination, result, isSingleFieldIdentifier, returnOne;
+        var msg, modelDefinition, keyFields, predicate, pagination, result, returnOne;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -82921,8 +82921,7 @@ function () {
 
             case 2:
               result = _a.sent();
-              isSingleFieldIdentifier = keyFields.length === 1;
-              returnOne = isSingleFieldIdentifier && (isQueryOne(identifierOrCriteria) || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition));
+              returnOne = isQueryOne(identifierOrCriteria) || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition);
               return [2
               /*return*/
               , returnOne ? result[0] : result];
@@ -87731,14 +87730,14 @@ function () {
             , idb__WEBPACK_IMPORTED_MODULE_1__["openDB"](this.dbName, VERSION, {
               upgrade: function upgrade(db, oldVersion, newVersion, txn) {
                 return __awaiter(_this, void 0, void 0, function () {
-                  var _a, _b, storeName, origStore, tmpName, newStore, origIndexNames, origIndexNames_1, origIndexNames_1_1, idxName, idx, keyPath_1, unique, _c, namespaceName, modelName, keyPath, cursor, count, e_1_1, error_2;
+                  var _a, _b, storeName, origStore, tmpName, _c, namespaceName, modelName, newStore, cursor, count, e_1_1, error_2;
 
-                  var e_1, _d, e_2, _e;
+                  var e_1, _d;
 
                   var _this = this;
 
-                  return __generator(this, function (_f) {
-                    switch (_f.label) {
+                  return __generator(this, function (_e) {
+                    switch (_e.label) {
                       case 0:
                         if (oldVersion === 0) {
                           Object.keys(theSchema.namespaces).forEach(function (namespaceName) {
@@ -87757,18 +87756,18 @@ function () {
                         if (!((oldVersion === 1 || oldVersion === 2) && newVersion === 3)) return [3
                         /*break*/
                         , 16];
-                        _f.label = 1;
+                        _e.label = 1;
 
                       case 1:
-                        _f.trys.push([1, 14,, 15]);
+                        _e.trys.push([1, 14,, 15]);
 
-                        _f.label = 2;
+                        _e.label = 2;
 
                       case 2:
-                        _f.trys.push([2, 11, 12, 13]);
+                        _e.trys.push([2, 11, 12, 13]);
 
                         _a = __values(txn.objectStoreNames), _b = _a.next();
-                        _f.label = 3;
+                        _e.label = 3;
 
                       case 3:
                         if (!!_b.done) return [3
@@ -87778,52 +87777,16 @@ function () {
                         origStore = txn.objectStore(storeName);
                         tmpName = "tmp_" + storeName;
                         origStore.name = tmpName;
-                        newStore = db.createObjectStore(storeName, {
-                          keyPath: undefined,
-                          autoIncrement: true
-                        });
-                        origIndexNames = Object.values(origStore.indexNames);
-
-                        try {
-                          for (origIndexNames_1 = (e_2 = void 0, __values(origIndexNames)), origIndexNames_1_1 = origIndexNames_1.next(); !origIndexNames_1_1.done; origIndexNames_1_1 = origIndexNames_1.next()) {
-                            idxName = origIndexNames_1_1.value;
-
-                            if (idxName === 'byId') {
-                              // don't migrate this index. It'll be replaced with byPk
-                              continue;
-                            }
-
-                            idx = origStore.index(idxName);
-                            keyPath_1 = idx.keyPath, unique = idx.unique;
-                            newStore.createIndex(idxName, keyPath_1, {
-                              unique: unique
-                            });
-                          }
-                        } catch (e_2_1) {
-                          e_2 = {
-                            error: e_2_1
-                          };
-                        } finally {
-                          try {
-                            if (origIndexNames_1_1 && !origIndexNames_1_1.done && (_e = origIndexNames_1["return"])) _e.call(origIndexNames_1);
-                          } finally {
-                            if (e_2) throw e_2.error;
-                          }
-                        }
-
                         _c = this.getNamespaceAndModelFromStorename(storeName), namespaceName = _c.namespaceName, modelName = _c.modelName;
-                        keyPath = this.getIndexKeyPath(namespaceName, modelName);
-                        newStore.createIndex('byPk', keyPath, {
-                          unique: true
-                        });
+                        newStore = this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                         return [4
                         /*yield*/
                         , origStore.openCursor()];
 
                       case 4:
-                        cursor = _f.sent();
+                        cursor = _e.sent();
                         count = 0;
-                        _f.label = 5;
+                        _e.label = 5;
 
                       case 5:
                         if (!(cursor && cursor.value)) return [3
@@ -87836,14 +87799,14 @@ function () {
 
                       case 6:
                         // we don't pass key, since they are all new entries in the new store
-                        _f.sent();
+                        _e.sent();
 
                         return [4
                         /*yield*/
                         , cursor["continue"]()];
 
                       case 7:
-                        cursor = _f.sent();
+                        cursor = _e.sent();
                         count++;
                         return [3
                         /*break*/
@@ -87853,7 +87816,7 @@ function () {
                         // delete original
                         db.deleteObjectStore(tmpName);
                         logger.debug(count + " " + storeName + " records migrated");
-                        _f.label = 9;
+                        _e.label = 9;
 
                       case 9:
                         _b = _a.next();
@@ -87867,7 +87830,7 @@ function () {
                         , 13];
 
                       case 11:
-                        e_1_1 = _f.sent();
+                        e_1_1 = _e.sent();
                         e_1 = {
                           error: e_1_1
                         };
@@ -87913,7 +87876,7 @@ function () {
                         , 15];
 
                       case 14:
-                        error_2 = _f.sent();
+                        error_2 = _e.sent();
                         logger.error('Error migrating IndexedDB data', error_2);
                         txn.abort();
                         throw error_2;
@@ -87988,10 +87951,10 @@ function () {
   };
 
   IndexedDBAdapter.prototype.save = function (model, condition) {
-    var e_3, _a;
+    var e_2, _a;
 
     return __awaiter(this, void 0, void 0, function () {
-      var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, tx, store, keyValues, fromDB, predicates, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, modelKeyValues, keysEqual, key, e_3_1;
+      var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, tx, store, keyValues, fromDB, predicates, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, modelKeyValues, keysEqual, key, e_2_1;
 
       var _this = this;
 
@@ -88117,9 +88080,9 @@ function () {
             , 17];
 
           case 11:
-            e_3_1 = _b.sent();
-            e_3 = {
-              error: e_3_1
+            e_2_1 = _b.sent();
+            e_2 = {
+              error: e_2_1
             };
             return [3
             /*break*/
@@ -88146,7 +88109,7 @@ function () {
             , 16];
 
           case 15:
-            if (e_3) throw e_3.error;
+            if (e_2) throw e_2.error;
             return [7
             /*endfinally*/
             ];
@@ -88175,10 +88138,10 @@ function () {
   IndexedDBAdapter.prototype.load = function (namespaceName, srcModelName, records) {
     var records_1, records_1_1, records_2, records_2_1;
 
-    var e_4, _a, e_5, _b, e_6, _c;
+    var e_3, _a, e_4, _b, e_5, _c;
 
     return __awaiter(this, void 0, void 0, function () {
-      var namespace, relations, connectionStoreNames, modelConstructor, tx, relations_1, relations_1_1, relation, fieldName, modelName, targetName, targetNames, storeName, store, modelConstructor_1, _d, recordItem, getByFields, allPresent, keys, connectionRecord, getByfield, key, connectionRecord, e_5_1, recordItem, allPresent, keys, connectionRecord, key, connectionRecord, e_6_1, e_4_1;
+      var namespace, relations, connectionStoreNames, modelConstructor, tx, relations_1, relations_1_1, relation, fieldName, modelName, targetName, targetNames, storeName, store, modelConstructor_1, _d, recordItem, getByFields, allPresent, keys, connectionRecord, getByfield, key, connectionRecord, e_4_1, recordItem, allPresent, keys, connectionRecord, key, connectionRecord, e_5_1, e_3_1;
 
       var _this = this;
 
@@ -88322,9 +88285,9 @@ function () {
             , 18];
 
           case 12:
-            e_5_1 = _e.sent();
-            e_5 = {
-              error: e_5_1
+            e_4_1 = _e.sent();
+            e_4 = {
+              error: e_4_1
             };
             return [3
             /*break*/
@@ -88351,7 +88314,7 @@ function () {
             , 17];
 
           case 16:
-            if (e_5) throw e_5.error;
+            if (e_4) throw e_4.error;
             return [7
             /*endfinally*/
             ];
@@ -88440,9 +88403,9 @@ function () {
             , 33];
 
           case 27:
-            e_6_1 = _e.sent();
-            e_6 = {
-              error: e_6_1
+            e_5_1 = _e.sent();
+            e_5 = {
+              error: e_5_1
             };
             return [3
             /*break*/
@@ -88469,7 +88432,7 @@ function () {
             , 32];
 
           case 31:
-            if (e_6) throw e_6.error;
+            if (e_5) throw e_5.error;
             return [7
             /*endfinally*/
             ];
@@ -88507,9 +88470,9 @@ function () {
             , 44];
 
           case 38:
-            e_4_1 = _e.sent();
-            e_4 = {
-              error: e_4_1
+            e_3_1 = _e.sent();
+            e_3 = {
+              error: e_3_1
             };
             return [3
             /*break*/
@@ -88536,7 +88499,7 @@ function () {
             , 43];
 
           case 42:
-            if (e_4) throw e_4.error;
+            if (e_3) throw e_3.error;
             return [7
             /*endfinally*/
             ];
@@ -88698,7 +88661,7 @@ function () {
   };
 
   IndexedDBAdapter.prototype.keyValueFromPredicate = function (predicates, keyPath) {
-    var e_7, _a;
+    var e_6, _a;
 
     var predicateObjs = predicates.predicates;
 
@@ -88716,20 +88679,20 @@ function () {
     };
 
     try {
-      for (var keyPath_2 = __values(keyPath), keyPath_2_1 = keyPath_2.next(); !keyPath_2_1.done; keyPath_2_1 = keyPath_2.next()) {
-        var key = keyPath_2_1.value;
+      for (var keyPath_1 = __values(keyPath), keyPath_1_1 = keyPath_1.next(); !keyPath_1_1.done; keyPath_1_1 = keyPath_1.next()) {
+        var key = keyPath_1_1.value;
 
         _loop_1(key);
       }
-    } catch (e_7_1) {
-      e_7 = {
-        error: e_7_1
+    } catch (e_6_1) {
+      e_6 = {
+        error: e_6_1
       };
     } finally {
       try {
-        if (keyPath_2_1 && !keyPath_2_1.done && (_a = keyPath_2["return"])) _a.call(keyPath_2);
+        if (keyPath_1_1 && !keyPath_1_1.done && (_a = keyPath_1["return"])) _a.call(keyPath_1);
       } finally {
-        if (e_7) throw e_7.error;
+        if (e_6) throw e_6.error;
       }
     }
 
@@ -89078,10 +89041,10 @@ function () {
   IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
     var deleteQueue_1, deleteQueue_1_1;
 
-    var e_8, _a, e_9, _b;
+    var e_7, _a, e_8, _b;
 
     return __awaiter(this, void 0, void 0, function () {
-      var connectionStoreNames, tx, deleteItem, storeName, items, store, items_1, items_1_1, item, key, keyValues, itemKey, e_9_1, e_8_1;
+      var connectionStoreNames, tx, deleteItem, storeName, items, store, items_1, items_1_1, item, key, keyValues, itemKey, e_8_1, e_7_1;
       return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
@@ -89180,9 +89143,9 @@ function () {
             , 20];
 
           case 14:
-            e_9_1 = _c.sent();
-            e_9 = {
-              error: e_9_1
+            e_8_1 = _c.sent();
+            e_8 = {
+              error: e_8_1
             };
             return [3
             /*break*/
@@ -89209,7 +89172,7 @@ function () {
             , 19];
 
           case 18:
-            if (e_9) throw e_9.error;
+            if (e_8) throw e_8.error;
             return [7
             /*endfinally*/
             ];
@@ -89230,9 +89193,9 @@ function () {
             , 28];
 
           case 22:
-            e_8_1 = _c.sent();
-            e_8 = {
-              error: e_8_1
+            e_7_1 = _c.sent();
+            e_7 = {
+              error: e_7_1
             };
             return [3
             /*break*/
@@ -89259,7 +89222,7 @@ function () {
             , 27];
 
           case 26:
-            if (e_8) throw e_8.error;
+            if (e_7) throw e_7.error;
             return [7
             /*endfinally*/
             ];
@@ -89281,10 +89244,10 @@ function () {
   IndexedDBAdapter.prototype.deleteTraverse = function (relations, models, srcModel, nameSpace, deleteQueue) {
     var relations_2, relations_2_1, models_1, models_1_1, models_2, models_2_1;
 
-    var e_10, _a, e_11, _b, e_12, _c;
+    var e_9, _a, e_10, _b, e_11, _c;
 
     return __awaiter(this, void 0, void 0, function () {
-      var rel, relationType, fieldName, modelName, targetName, targetNames, storeName, index, _d, model, hasOneIndex, hasConnectedModelFields, keyValues, values, recordToDelete, hasOneIndex_1, hasOneCustomField, keyValues, value, recordToDelete, e_11_1, model, keyValues, childrenArray, e_12_1, e_10_1;
+      var rel, relationType, fieldName, modelName, targetName, targetNames, storeName, index, _d, model, hasOneIndex, hasConnectedModelFields, keyValues, values, recordToDelete, hasOneIndex_1, hasOneCustomField, keyValues, value, recordToDelete, e_10_1, model, keyValues, childrenArray, e_11_1, e_9_1;
 
       var _this = this;
 
@@ -89425,9 +89388,9 @@ function () {
             , 19];
 
           case 13:
-            e_11_1 = _e.sent();
-            e_11 = {
-              error: e_11_1
+            e_10_1 = _e.sent();
+            e_10 = {
+              error: e_10_1
             };
             return [3
             /*break*/
@@ -89454,7 +89417,7 @@ function () {
             , 18];
 
           case 17:
-            if (e_11) throw e_11.error;
+            if (e_10) throw e_10.error;
             return [7
             /*endfinally*/
             ];
@@ -89512,9 +89475,9 @@ function () {
             , 33];
 
           case 27:
-            e_12_1 = _e.sent();
-            e_12 = {
-              error: e_12_1
+            e_11_1 = _e.sent();
+            e_11 = {
+              error: e_11_1
             };
             return [3
             /*break*/
@@ -89541,7 +89504,7 @@ function () {
             , 32];
 
           case 31:
-            if (e_12) throw e_12.error;
+            if (e_11) throw e_11.error;
             return [7
             /*endfinally*/
             ];
@@ -89579,9 +89542,9 @@ function () {
             , 44];
 
           case 38:
-            e_10_1 = _e.sent();
-            e_10 = {
-              error: e_10_1
+            e_9_1 = _e.sent();
+            e_9 = {
+              error: e_9_1
             };
             return [3
             /*break*/
@@ -89608,7 +89571,7 @@ function () {
             , 43];
 
           case 42:
-            if (e_10) throw e_10.error;
+            if (e_9) throw e_9.error;
             return [7
             /*endfinally*/
             ];
@@ -89665,9 +89628,9 @@ function () {
 
   IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
     return __awaiter(this, void 0, void 0, function () {
-      var result, storeName, txn, store, _loop_2, this_1, items_2, items_2_1, item, e_13_1;
+      var result, storeName, txn, store, _loop_2, this_1, items_2, items_2_1, item, e_12_1;
 
-      var e_13, _a;
+      var e_12, _a;
 
       var _this = this;
 
@@ -89790,9 +89753,9 @@ function () {
             , 9];
 
           case 7:
-            e_13_1 = _b.sent();
-            e_13 = {
-              error: e_13_1
+            e_12_1 = _b.sent();
+            e_12 = {
+              error: e_12_1
             };
             return [3
             /*break*/
@@ -89802,7 +89765,7 @@ function () {
             try {
               if (items_2_1 && !items_2_1.done && (_a = items_2["return"])) _a.call(items_2);
             } finally {
-              if (e_13) throw e_13.error;
+              if (e_12) throw e_12.error;
             }
 
             return [7
@@ -89826,26 +89789,19 @@ function () {
   };
 
   IndexedDBAdapter.prototype.createObjectStoreForModel = function (db, namespaceName, storeName, modelName) {
-    return __awaiter(this, void 0, void 0, function () {
-      var store, indexes;
-      return __generator(this, function (_a) {
-        store = db.createObjectStore(storeName, {
-          autoIncrement: true
-        });
-        indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
-        indexes.forEach(function (_a) {
-          var _b = __read(_a, 3),
-              idxName = _b[0],
-              keyPath = _b[1],
-              options = _b[2];
-
-          store.createIndex(idxName, keyPath, options);
-        });
-        return [2
-        /*return*/
-        ];
-      });
+    var store = db.createObjectStore(storeName, {
+      autoIncrement: true
+    });
+    var indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
+    indexes.forEach(function (_a) {
+      var _b = __read(_a, 3),
+          idxName = _b[0],
+          keyPath = _b[1],
+          options = _b[2];
+
+      store.createIndex(idxName, keyPath, options);
     });
+    return store;
   };
 
   return IndexedDBAdapter;
@@ -98023,13 +97979,15 @@ var traverseModel = function traverseModel(srcModelName, instance, namespace, mo
   return result;
 };
 var getIndex = function getIndex(rel, src) {
-  var index = '';
+  var indexName;
   rel.some(function (relItem) {
     if (relItem.modelName === src) {
-      index = relItem.targetName;
+      var targetNames = extractTargetNamesFromSrc(relItem);
+      indexName = targetNames && indexNameFromKeys(targetNames);
+      return true;
     }
   });
-  return index;
+  return indexName;
 };
 var getIndexFromAssociation = function getIndexFromAssociation(indexes, src) {
   var indexName;