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

package/dist/aws-amplify-datastore.js

@@ -83037,17 +83037,17 @@ function () {
 
     this["delete"] = function (modelOrConstructor, identifierOrCriteria) {
       return __awaiter(_this, void 0, void 0, function () {
-        var condition, msg, modelConstructor, msg, modelDefinition, _a, keyField, msg, _b, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _c, _d, deleted;
+        var condition, msg, modelConstructor, msg, modelDefinition, keyFields, msg, msg, _a, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _b, _c, deleted;
 
-        return __generator(this, function (_e) {
-          switch (_e.label) {
+        return __generator(this, function (_d) {
+          switch (_d.label) {
             case 0:
               return [4
               /*yield*/
               , this.start()];
 
             case 1:
-              _e.sent();
+              _d.sent();
 
               if (!modelOrConstructor) {
                 msg = 'Model or Model Constructor required';
@@ -83073,8 +83073,17 @@ function () {
               modelDefinition = getModelDefinition(modelConstructor);
 
               if (typeof identifierOrCriteria === 'string') {
-                _a = __read(Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition), 1), keyField = _a[0];
-                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForSingleField(getModelDefinition(modelConstructor), keyField, identifierOrCriteria);
+                keyFields = Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition);
+
+                if (keyFields.length > 1) {
+                  msg = _util__WEBPACK_IMPORTED_MODULE_12__["errorMessages"].deleteByPkWithCompositeKeyPresent;
+                  logger.error(msg, {
+                    keyFields: keyFields
+                  });
+                  throw new Error(msg);
+                }
+
+                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForSingleField(getModelDefinition(modelConstructor), keyFields[0], identifierOrCriteria);
               } else {
                 if (Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition)) {
                   condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForPk(modelDefinition, identifierOrCriteria);
@@ -83101,7 +83110,7 @@ function () {
               , this.storage["delete"](modelConstructor, condition)];
 
             case 2:
-              _b = __read.apply(void 0, [_e.sent(), 1]), deleted = _b[0];
+              _a = __read.apply(void 0, [_d.sent(), 1]), deleted = _a[0];
               return [2
               /*return*/
               , deleted];
@@ -83140,7 +83149,7 @@ function () {
               , this.storage["delete"](model, condition)];
 
             case 4:
-              _c = __read.apply(void 0, [_e.sent(), 1]), _d = __read(_c[0], 1), deleted = _d[0];
+              _b = __read.apply(void 0, [_d.sent(), 1]), _c = __read(_b[0], 1), deleted = _c[0];
               return [2
               /*return*/
               , deleted];
@@ -83173,6 +83182,15 @@ function () {
           });
           throw new Error(msg);
         }
+      } // observe should not accept object literal syntax
+
+
+      if (identifierOrCriteria && modelConstructor && Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, getModelDefinition(modelConstructor))) {
+        var msg = _util__WEBPACK_IMPORTED_MODULE_12__["errorMessages"].observeWithObjectLiteral;
+        logger.error(msg, {
+          objectLiteral: identifierOrCriteria
+        });
+        throw new Error(msg);
       }
 
       if (identifierOrCriteria !== undefined && modelConstructor === undefined) {
@@ -89255,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;
 
@@ -89277,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) {
@@ -89322,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];
@@ -89363,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();
@@ -89456,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*/
@@ -97503,7 +97519,9 @@ var __values = undefined && undefined.__values || function (o) {
 var ID = 'id';
 var errorMessages = {
   idEmptyString: 'An index field cannot contain an empty string value',
-  queryByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot by queried by a single key value. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys'
+  queryByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot be queried by a single key value. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys',
+  deleteByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot be deleted by a single key value, unless using a predicate. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys',
+  observeWithObjectLiteral: 'Object literal syntax cannot be used with observe. Use a predicate instead: https://docs.amplify.aws/lib/datastore/data-access/q/platform/js/#predicates'
 };
 function extractKeyIfExists(modelDefinition) {
   var _c;