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

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];
@@ -97512,7 +97521,8 @@ 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) {