@aws-amplify/datastore 3.7.4-custom-pk.79 → 3.7.4-custom-pk.80

package/dist/aws-amplify-datastore.js

@@ -82412,7 +82412,6 @@ var createModelClass = function createModelClass(modelDefinition) {
       var model = Object(immer__WEBPACK_IMPORTED_MODULE_4__["produce"])(source, function (draft) {
         fn(draft);
         var keyNames = Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition); // Keys are immutable
-        // CPK TODO: Previous comment from Ivan:
         // @ts-ignore TODO: fix type
 
         keyNames.forEach(function (key) {
@@ -87463,9 +87462,10 @@ function () {
   };
 
   IndexedDBAdapter.prototype.getIndexKeyPath = function (namespaceName, modelName) {
-    var _a, _b;
+    var _a;
 
-    var keyPath = (_b = (_a = this.schema.namespaces[namespaceName]) === null || _a === void 0 ? void 0 : _a.keys[modelName]) === null || _b === void 0 ? void 0 : _b.primaryKey;
+    var namespace = this.schema.namespaces[namespaceName];
+    var keyPath = (_a = namespace === null || namespace === void 0 ? void 0 : namespace.keys[modelName]) === null || _a === void 0 ? void 0 : _a.primaryKey;
 
     if (keyPath) {
       return keyPath;
@@ -89108,7 +89108,7 @@ function () {
     var e_10, _a, e_11, _b, e_12, _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, hasManyIndex, 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_11_1, model, keyValues, childrenArray, e_12_1, e_10_1;
 
       var _this = this;
 
@@ -89219,13 +89219,7 @@ function () {
             hasOneIndex_1 = index || 'byPk';
             hasOneCustomField = targetName in model;
             keyValues = this.getIndexKeyValues(model);
-            value = hasOneCustomField ? model[targetName] : keyValues[0];
-
-            if (hasOneIndex_1 === 'byPk') {
-              // byPk requires an array keyValue
-              value = [value];
-            }
-
+            value = hasOneCustomField ? [model[targetName]] : keyValues;
             if (!value) return [3
             /*break*/
             , 12];
@@ -89316,20 +89310,17 @@ function () {
             , 26];
             model = models_2_1.value;
             keyValues = this.getIndexKeyValues(model);
-            hasManyIndex = index || 'byPk';
             return [4
             /*yield*/
-            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(hasManyIndex).getAll(keyValues[0])];
+            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(index).getAll(keyValues)];
 
           case 23:
-            childrenArray = _e.sent(); // .getAll(keyValues); // TODO
-
+            childrenArray = _e.sent();
             return [4
             /*yield*/
             , this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, childrenArray, modelName, nameSpace, deleteQueue)];
 
           case 24:
-            // .getAll(keyValues); // TODO
             _e.sent();
 
             _e.label = 25;
@@ -89660,18 +89651,19 @@ function () {
 
   IndexedDBAdapter.prototype.createObjectStoreForModel = function (db, namespaceName, storeName, modelName) {
     return __awaiter(this, void 0, void 0, function () {
-      var store, indexes, keyPath;
+      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 (index) {
-          return store.createIndex(index, index);
-        });
-        keyPath = this.getIndexKeyPath(namespaceName, modelName);
-        store.createIndex('byPk', keyPath, {
-          unique: true
+        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*/
@@ -96161,11 +96153,17 @@ function getConnectionFields(modelDefinition, namespace) {
             var _b = __read(Object(_util__WEBPACK_IMPORTED_MODULE_4__["establishRelationAndKeys"])(namespace), 1),
                 relations = _b[0];
 
-            var connectedModelName = modelDefinition.fields[name].type['model']; // keyFields are fields of the connected model
+            var connectedModelName = modelDefinition.fields[name].type['model'];
+            var byPkIndex = relations[connectedModelName].indexes.find(function (_a) {
+              var _b = __read(_a, 1),
+                  name = _b[0];
 
-            var keyFields = relations[connectedModelName].indexes; // We rely on `_deleted` when we process the sync query (e.g. in batchSave in the adapters)
+              return name === 'byPk';
+            });
+            var keyFields = byPkIndex && byPkIndex[1];
+            var keyFieldSelectionSet = keyFields === null || keyFields === void 0 ? void 0 : keyFields.join(' '); // We rely on `_deleted` when we process the sync query (e.g. in batchSave in the adapters)
 
-            result.push(name + " { " + keyFields + " _deleted }");
+            result.push(name + " { " + keyFieldSelectionSet + " _deleted }");
           } else {
             // backwards-compatability for schema generated prior to custom primary key support
             result.push(name + " { id _deleted }");
@@ -97094,7 +97092,7 @@ var LimitTimerRaceResolvedValues;
 /*!*************************!*\
   !*** ./lib-esm/util.js ***!
   \*************************/
-/*! exports provided: extractKeyIfExists, extractPrimaryKeyFieldNames, extractPrimaryKeyValues, isIdManaged, isIdOptionallyManaged, NAMESPACES, USER, SYNC, STORAGE, DATASTORE, USER_AGENT_SUFFIX_DATASTORE, exhaustiveCheck, isNullOrUndefined, validatePredicate, validatePredicateField, isModelConstructor, registerNonModelClass, isNonModelConstructor, processCompositeKeys, establishRelationAndKeys, traverseModel, getIndex, getIndexFromAssociation, isPrivateMode, monotonicUlidFactory, getNow, sortCompareFunction, valuesEqual, isAWSDate, isAWSTime, isAWSDateTime, isAWSTimestamp, isAWSEmail, isAWSJSON, isAWSURL, isAWSPhone, isAWSIPAddress, DeferredPromise, DeferredCallbackResolver, mergePatches, extractTargetNamesFromSrc */
+/*! exports provided: extractKeyIfExists, extractPrimaryKeyFieldNames, extractPrimaryKeyValues, isIdManaged, isIdOptionallyManaged, NAMESPACES, USER, SYNC, STORAGE, DATASTORE, USER_AGENT_SUFFIX_DATASTORE, exhaustiveCheck, isNullOrUndefined, validatePredicate, validatePredicateField, isModelConstructor, registerNonModelClass, isNonModelConstructor, processCompositeKeys, establishRelationAndKeys, traverseModel, getIndex, getIndexFromAssociation, isPrivateMode, monotonicUlidFactory, getNow, sortCompareFunction, valuesEqual, isAWSDate, isAWSTime, isAWSDateTime, isAWSTimestamp, isAWSEmail, isAWSJSON, isAWSURL, isAWSPhone, isAWSIPAddress, DeferredPromise, DeferredCallbackResolver, mergePatches, extractTargetNamesFromSrc, indexNameFromKeys */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -97140,6 +97138,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DeferredCallbackResolver", function() { return DeferredCallbackResolver; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergePatches", function() { return mergePatches; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "extractTargetNamesFromSrc", function() { return extractTargetNamesFromSrc; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "indexNameFromKeys", function() { return indexNameFromKeys; });
 /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! buffer */ "../../node_modules/buffer/index.js");
 /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(buffer__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var ulid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ulid */ "../../node_modules/ulid/dist/index.esm.js");
@@ -97616,7 +97615,7 @@ var establishRelationAndKeys = function establishRelationAndKeys(namespace) {
   var relationship = {};
   var keys = {};
   Object.keys(namespace.models).forEach(function (mKey) {
-    var e_1, _c, e_2, _d;
+    var e_1, _c;
 
     relationship[mKey] = {
       indexes: [],
@@ -97639,20 +97638,11 @@ var establishRelationAndKeys = function establishRelationAndKeys(namespace) {
         });
 
         if (connectionType === 'BELONGS_TO') {
-          // const targetNames: string[] = extractTargetNamesFromSrc(
-          // 	fieldAttribute.association
-          // );
-          // targetNames.forEach((targetName: string) => {
-          // 	relationship[mKey].indexes.push(targetName);
-          // });
-          if (fieldAttribute.association.targetName) {
-            // backwards-compatability for schema generated prior to custom primary key support
-            relationship[mKey].indexes.push(fieldAttribute.association['targetName']);
-          } else {
-            // iterate through fieldAttribute.association.targetNames, and push to relationship[mKey].indexes
-            fieldAttribute.association.targetNames.forEach(function (targetName) {
-              relationship[mKey].indexes.push(targetName);
-            });
+          var targetNames = extractTargetNamesFromSrc(fieldAttribute.association);
+
+          if (targetNames) {
+            var idxName = indexNameFromKeys(targetNames);
+            relationship[mKey].indexes.push([idxName, targetNames]);
           }
         }
       }
@@ -97661,41 +97651,37 @@ var establishRelationAndKeys = function establishRelationAndKeys(namespace) {
     if (model.attributes) {
       keys[mKey].compositeKeys = processCompositeKeys(model.attributes);
 
-      try {
-        for (var _e = __values(model.attributes), _f = _e.next(); !_f.done; _f = _e.next()) {
-          var attribute = _f.value;
+      var _loop_1 = function _loop_1(attribute) {
+        if (!Object(_types__WEBPACK_IMPORTED_MODULE_4__["isModelAttributeKey"])(attribute)) {
+          return "continue";
+        }
 
-          if (!Object(_types__WEBPACK_IMPORTED_MODULE_4__["isModelAttributeKey"])(attribute)) {
-            continue;
-          }
+        var fields = attribute.properties.fields;
 
-          if (Object(_types__WEBPACK_IMPORTED_MODULE_4__["isModelAttributePrimaryKey"])(attribute)) {
-            keys[mKey].primaryKey = attribute.properties.fields;
-          }
+        if (Object(_types__WEBPACK_IMPORTED_MODULE_4__["isModelAttributePrimaryKey"])(attribute)) {
+          keys[mKey].primaryKey = fields;
+          return "continue";
+        } // create indexes for all other keys
 
-          var fields = attribute.properties.fields;
 
-          try {
-            for (var fields_1 = (e_2 = void 0, __values(fields)), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
-              var field = fields_1_1.value; // only add index if it hasn't already been added
+        var idxName = indexNameFromKeys(fields);
+        var idxExists = relationship[mKey].indexes.find(function (_c) {
+          var _d = __read(_c, 1),
+              index = _d[0];
 
-              var exists = relationship[mKey].indexes.includes(field);
+          return index === idxName;
+        });
 
-              if (!exists) {
-                relationship[mKey].indexes.push(field);
-              }
-            }
-          } catch (e_2_1) {
-            e_2 = {
-              error: e_2_1
-            };
-          } finally {
-            try {
-              if (fields_1_1 && !fields_1_1.done && (_d = fields_1["return"])) _d.call(fields_1);
-            } finally {
-              if (e_2) throw e_2.error;
-            }
-          }
+        if (!idxExists) {
+          relationship[mKey].indexes.push([idxName, fields]);
+        }
+      };
+
+      try {
+        for (var _d = __values(model.attributes), _e = _d.next(); !_e.done; _e = _d.next()) {
+          var attribute = _e.value;
+
+          _loop_1(attribute);
         }
       } catch (e_1_1) {
         e_1 = {
@@ -97703,16 +97689,22 @@ var establishRelationAndKeys = function establishRelationAndKeys(namespace) {
         };
       } finally {
         try {
-          if (_f && !_f.done && (_c = _e["return"])) _c.call(_e);
+          if (_e && !_e.done && (_c = _d["return"])) _c.call(_d);
         } finally {
           if (e_1) throw e_1.error;
         }
       }
+    } // set 'id' as the PK for models without a custom PK explicitly defined
 
-      if (!keys[mKey].primaryKey) {
-        keys[mKey].primaryKey = [ID];
-      }
-    }
+
+    if (!keys[mKey].primaryKey) {
+      keys[mKey].primaryKey = [ID];
+    } // create primary index
+
+
+    relationship[mKey].indexes.push(['byPk', keys[mKey].primaryKey, {
+      unique: true
+    }]);
   });
   return [relationship, keys];
 };
@@ -97852,10 +97844,21 @@ var getIndex = function getIndex(rel, src) {
   return index;
 };
 var getIndexFromAssociation = function getIndexFromAssociation(indexes, src) {
-  var index = indexes.find(function (idx) {
-    return idx === src;
+  var indexName;
+
+  if (Array.isArray(src)) {
+    indexName = indexNameFromKeys(src);
+  } else {
+    indexName = src;
+  }
+
+  var associationIndex = indexes.find(function (_c) {
+    var _d = __read(_c, 1),
+        idxName = _d[0];
+
+    return idxName === indexName;
   });
-  return index;
+  return associationIndex && associationIndex[0];
 };
 var privateModeCheckResult;
 var isPrivateMode = function isPrivateMode() {
@@ -97953,7 +97956,7 @@ function getNow() {
 }
 function sortCompareFunction(sortPredicates) {
   return function compareFunction(a, b) {
-    var e_3, _c;
+    var e_2, _c;
 
     try {
       // enable multi-field sort by iterating over predicates until
@@ -97973,15 +97976,15 @@ function sortCompareFunction(sortPredicates) {
           return 1 * sortMultiplier;
         }
       }
-    } catch (e_3_1) {
-      e_3 = {
-        error: e_3_1
+    } catch (e_2_1) {
+      e_2 = {
+        error: e_2_1
       };
     } finally {
       try {
         if (sortPredicates_1_1 && !sortPredicates_1_1.done && (_c = sortPredicates_1["return"])) _c.call(sortPredicates_1);
       } finally {
-        if (e_3) throw e_3.error;
+        if (e_2) throw e_2.error;
       }
     }
 
@@ -97994,7 +97997,7 @@ function sortCompareFunction(sortPredicates) {
 // to normalize for GQL response values for undefined fields
 
 function valuesEqual(valA, valB, nullish) {
-  var e_4, _c;
+  var e_3, _c;
 
   if (nullish === void 0) {
     nullish = false;
@@ -98058,15 +98061,15 @@ function valuesEqual(valA, valB, nullish) {
         return false;
       }
     }
-  } catch (e_4_1) {
-    e_4 = {
-      error: e_4_1
+  } catch (e_3_1) {
+    e_3 = {
+      error: e_3_1
     };
   } finally {
     try {
       if (keys_1_1 && !keys_1_1.done && (_c = keys_1["return"])) _c.call(keys_1);
     } finally {
-      if (e_4) throw e_4.error;
+      if (e_3) throw e_3.error;
     }
   }
 
@@ -98262,6 +98265,17 @@ function extractTargetNamesFromSrc(src) {
   } else {
     return undefined;
   }
+} // Generates snake-cased index name from an aray of key field names
+// E.g. for keys `[id, title]` => 'id-title'
+
+function indexNameFromKeys(keys) {
+  return keys.reduce(function (prev, cur, idx) {
+    if (idx === 0) {
+      return cur;
+    }
+
+    return prev + "-" + cur;
+  }, '');
 }
 
 /***/ }),