@aws-amplify/datastore 3.7.4-custom-pk.96 → 3.7.4-custom-pk.97

package/dist/aws-amplify-datastore.js

@@ -89273,7 +89273,7 @@ function () {
     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_10_1, model, keyValues, childrenArray, e_11_1, e_9_1;
+      var rel, relationType, modelName, targetName, targetNames, associatedWith, storeName, _d, model, hasOneIndex, values, recordToDelete, index, values, value, recordToDelete, e_10_1, model, index, keyValues, childrenArray, e_11_1, e_9_1;
 
       var _this = this;
 
@@ -89295,12 +89295,8 @@ function () {
             /*break*/
             , 37];
             rel = relations_2_1.value;
-            relationType = rel.relationType, fieldName = rel.fieldName, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames;
+            relationType = rel.relationType, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames, associatedWith = rel.associatedWith;
             storeName = this.getStorename(nameSpace, modelName);
-            index = Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel) || // if we were unable to find an index via relationTypes
-            // i.e. for keyName connections, attempt to find one by the
-            // associatedWith property
-            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndexFromAssociation"])(this.schema.namespaces[nameSpace].relationships[modelName].indexes, rel.associatedWith);
             _d = relationType;
 
             switch (_d) {
@@ -89340,26 +89336,13 @@ function () {
             /*break*/
             , 12];
             model = models_1_1.value;
-            hasOneIndex = index || 'byPk';
-            if (!(targetNames && targetNames.length > 0)) return [3
+            hasOneIndex = 'byPk';
+            if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3
             /*break*/
             , 8];
-            hasConnectedModelFields = targetNames.every(function (targetName) {
-              return model.hasOwnProperty(targetName);
+            values = targetNames.map(function (targetName) {
+              return model[targetName];
             });
-            keyValues = this.getIndexKeyValues(model);
-            values = [];
-
-            if (hasConnectedModelFields) {
-              // Values will be that of the child model
-              values = targetNames.map(function (targetName) {
-                return model[targetName];
-              });
-            } else {
-              // values will be that of the parent model
-              values = keyValues;
-            }
-
             if (values.length === 0) return [3
             /*break*/
             , 12];
@@ -89381,16 +89364,28 @@ function () {
             , 12];
 
           case 8:
-            hasOneIndex_1 = index || 'byPk';
-            hasOneCustomField = targetName in model;
-            keyValues = this.getIndexKeyValues(model);
-            value = hasOneCustomField ? [model[targetName]] : keyValues;
-            if (!value) return [3
+            index = void 0;
+            values = void 0;
+
+            if (targetName && targetName in model) {
+              index = hasOneIndex;
+              value = model[targetName];
+              values = [value];
+            } else {
+              // backwards compatability for older versions of codegen that did not emit targetName for HAS_ONE relations
+              // TODO: can we deprecate this? it's been ~2 years since codegen started including targetName for HAS_ONE
+              // If we deprecate, we'll need to re-gen the MIPR in __tests__/schema.ts > newSchema
+              // otherwise some unit tests will fail
+              index = Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel);
+              values = this.getIndexKeyValues(model);
+            }
+
+            if (!values || !index) return [3
             /*break*/
             , 12];
             return [4
             /*yield*/
-            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(hasOneIndex_1).get(value)];
+            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(index).get(values)];
 
           case 9:
             recordToDelete = _e.sent();
@@ -89474,6 +89469,9 @@ function () {
             /*break*/
             , 26];
             model = models_2_1.value;
+            index = // explicit bi-directional @hasMany and @manyToMany
+            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel) || // uni and/or implicit @hasMany
+            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndexFromAssociation"])(this.schema.namespaces[nameSpace].relationships[modelName].indexes, associatedWith);
             keyValues = this.getIndexKeyValues(model);
             return [4
             /*yield*/