@aws-amplify/datastore 3.6.0 → 3.6.2-unstable.2

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.6.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.6.0...@aws-amplify/datastore@3.6.1) (2021-11-16)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
 # [3.6.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.5.2...@aws-amplify/datastore@3.6.0) (2021-11-12)
 
 

package/dist/aws-amplify-datastore.js

@@ -70458,7 +70458,7 @@ var getAmplifyUserAgent = function getAmplifyUserAgent() {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "version", function() { return version; });
 // generated by genversion
-var version = '4.3.5';
+var version = '4.3.7';
 
 /***/ }),
 
@@ -83622,7 +83622,7 @@ function () {
     var e_2, _a, e_3, _b, e_4, _c;
 
     return __awaiter(this, void 0, void 0, function () {
-      var namespace, relations, connectionStoreNames, modelConstructor, relations_1, relations_1_1, relation, fieldName, modelName, targetName, relationType, storeName, modelConstructor_1, _d, recordItem, connectionRecord, e_3_1, recordItem, connectionRecord, e_4_1, e_2_1;
+      var namespace, relations, connectionStoreNames, modelConstructor, relations_1, relations_1_1, relation, fieldName, modelName, targetName, relationType, storeName, modelConstructor_1, _d, recordItem, getByfield, connectionRecord, e_3_1, recordItem, connectionRecord, e_4_1, e_2_1;
 
       var _this = this;
 
@@ -83705,12 +83705,13 @@ function () {
             /*break*/
             , 9];
             recordItem = records_1_1.value;
-            if (!recordItem[fieldName]) return [3
+            getByfield = recordItem[targetName] ? targetName : fieldName;
+            if (!recordItem[getByfield]) return [3
             /*break*/
-            , 8];
+            , 9];
             return [4
             /*yield*/
-            , this.db.get(recordItem[fieldName], storeName)];
+            , this.db.get(recordItem[getByfield], storeName)];
 
           case 7:
             connectionRecord = _e.sent();
@@ -84547,6 +84548,9 @@ function () {
             hasOneIndex = index || 'byId';
             hasOneCustomField = targetName in model;
             value = hasOneCustomField ? model[targetName] : model.id;
+            if (!value) return [3
+            /*break*/
+            , 9];
             return [4
             /*yield*/
             , this.db.getAll(storeName)];
@@ -86740,7 +86744,7 @@ function () {
     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, storeName, store, modelConstructor_1, _d, recordItem, connectionRecord, e_4_1, recordItem, connectionRecord, e_5_1, e_3_1;
+      var namespace, relations, connectionStoreNames, modelConstructor, tx, relations_1, relations_1_1, relation, fieldName, modelName, targetName, storeName, store, modelConstructor_1, _d, recordItem, getByfield, connectionRecord, e_4_1, recordItem, connectionRecord, e_5_1, e_3_1;
 
       var _this = this;
 
@@ -86825,12 +86829,13 @@ function () {
             /*break*/
             , 9];
             recordItem = records_1_1.value;
-            if (!recordItem[fieldName]) return [3
+            getByfield = recordItem[targetName] ? targetName : fieldName;
+            if (!recordItem[getByfield]) return [3
             /*break*/
-            , 8];
+            , 9];
             return [4
             /*yield*/
-            , this._get(store, recordItem[fieldName])];
+            , this._get(store, recordItem[getByfield])];
 
           case 7:
             connectionRecord = _e.sent();
@@ -87811,6 +87816,9 @@ function () {
             hasOneIndex = index || 'byId';
             hasOneCustomField = targetName in model;
             value = hasOneCustomField ? model[targetName] : model.id;
+            if (!value) return [3
+            /*break*/
+            , 9];
             return [4
             /*yield*/
             , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(hasOneIndex).get(value)];
@@ -95565,15 +95573,26 @@ var traverseModel = function traverseModel(srcModelName, instance, namespace, mo
 
             try {
               modelInstance = modelInstanceCreator(modelConstructor, instance[rItem.fieldName]);
-            } catch (error) {// Do nothing
+            } catch (error) {
+              // Do nothing
+              console.log(error);
             }
 
             result.push({
               modelName: rItem.modelName,
               item: instance[rItem.fieldName],
               instance: modelInstance
-            });
-            draftInstance[rItem.fieldName] = draftInstance[rItem.fieldName].id;
+            }); // targetName will be defined for Has One if feature flag
+            // https://docs.amplify.aws/cli/reference/feature-flags/#useAppsyncModelgenPlugin
+            // is true (default as of 5/7/21)
+            // Making this conditional for backward-compatibility
+
+            if (rItem.targetName) {
+              draftInstance[rItem.targetName] = draftInstance[rItem.fieldName].id;
+              delete draftInstance[rItem.fieldName];
+            } else {
+              draftInstance[rItem.fieldName] = draftInstance[rItem.fieldName].id;
+            }
           }
 
           break;