@aws-amplify/datastore 3.7.1-unstable.5 → 3.7.3-unstable.1

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.7.1...@aws-amplify/datastore@3.7.2) (2021-12-03)
+
+**Note:** Version bump only for package @aws-amplify/datastore
+
+
+
+
+
+## [3.7.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.7.0...@aws-amplify/datastore@3.7.1) (2021-12-02)
+
+
+### Bug Fixes
+
+* **@aws-amplify/datastore:** belongsTo bug ([#9268](https://github.com/aws-amplify/amplify-js/issues/9268)) ([5106639](https://github.com/aws-amplify/amplify-js/commit/510663981a32443b79dd065ca075b664ca8bdff6))
+* **@aws-amplify/datastore:** consecutive saves with timestamps ([#9298](https://github.com/aws-amplify/amplify-js/issues/9298)) ([807dea0](https://github.com/aws-amplify/amplify-js/commit/807dea0acae8389854560ca73b035ecbf220d040))
+
+
+
+
+
 # [3.7.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.6.1...@aws-amplify/datastore@3.7.0) (2021-11-18)
 
 

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.8';
+var version = '4.3.10';
 
 /***/ }),
 
@@ -82381,19 +82381,21 @@ function () {
                   criteria).subscribe(function (_a) {
                     var element = _a.element,
                         model = _a.model,
-                        opType = _a.opType; // Flag items which have been recently deleted
+                        opType = _a.opType;
+
+                    var _b, _c; // Flag items which have been recently deleted
                     // NOTE: Merging of separate operations to the same model instance is handled upstream
                     // in the `mergePage` method within src/sync/merger.ts. The final state of a model instance
                     // depends on the LATEST record (for a given id).
 
+
                     if (opType === 'DELETE') {
                       deletedItemIds.push(element.id);
                     } else {
                       itemsChanged.set(element.id, element);
                     }
 
-                    var isSynced = _this.sync.getModelSyncedStatus(model);
-
+                    var isSynced = (_c = (_b = _this.sync) === null || _b === void 0 ? void 0 : _b.getModelSyncedStatus(model)) !== null && _c !== void 0 ? _c : false;
                     var limit = itemsChanged.size - deletedItemIds.length >= _this.syncPageSize;
 
                     if (limit || isSynced) {
@@ -82427,7 +82429,9 @@ function () {
 
 
         var generateSnapshot = function generateSnapshot() {
-          var isSynced = _this.sync.getModelSyncedStatus(model);
+          var _a, _b;
+
+          var isSynced = (_b = (_a = _this.sync) === null || _a === void 0 ? void 0 : _a.getModelSyncedStatus(model)) !== null && _b !== void 0 ? _b : false;
 
           var itemsArray = __spread(Array.from(items.values()), Array.from(itemsChanged.values()));
 
@@ -91349,7 +91353,7 @@ function () {
 
   MutationEventOutbox.prototype.syncOutboxVersionsOnDequeue = function (storage, record, head, recordOp) {
     return __awaiter(this, void 0, void 0, function () {
-      var _version, _lastChangedAt, _deleted, incomingData, data, __version, __lastChangedAt, __deleted, outgoingData, mutationEventModelDefinition, predicate, outdatedMutations, reconciledMutations;
+      var _version, _lastChangedAt, _deleted, _incomingData, incomingData, data, __version, __lastChangedAt, __deleted, _outgoingData, outgoingData, mutationEventModelDefinition, predicate, outdatedMutations, reconciledMutations;
 
       var _this = this;
 
@@ -91362,7 +91366,8 @@ function () {
               ];
             }
 
-            _version = record._version, _lastChangedAt = record._lastChangedAt, _deleted = record._deleted, incomingData = __rest(record, ["_version", "_lastChangedAt", "_deleted"]);
+            _version = record._version, _lastChangedAt = record._lastChangedAt, _deleted = record._deleted, _incomingData = __rest(record, ["_version", "_lastChangedAt", "_deleted"]);
+            incomingData = this.removeTimestampFields(head.model, _incomingData);
             data = JSON.parse(head.data);
 
             if (!data) {
@@ -91371,7 +91376,8 @@ function () {
               ];
             }
 
-            __version = data._version, __lastChangedAt = data._lastChangedAt, __deleted = data._deleted, outgoingData = __rest(data, ["_version", "_lastChangedAt", "_deleted"]); // Don't sync the version when the data in the response does not match the data
+            __version = data._version, __lastChangedAt = data._lastChangedAt, __deleted = data._deleted, _outgoingData = __rest(data, ["_version", "_lastChangedAt", "_deleted"]);
+            outgoingData = this.removeTimestampFields(head.model, _outgoingData); // Don't sync the version when the data in the response does not match the data
             // in the request, i.e., when there's a handled conflict
 
             if (!Object(_util__WEBPACK_IMPORTED_MODULE_2__["valuesEqual"])(incomingData, outgoingData, true)) {
@@ -91472,6 +91478,45 @@ function () {
       data: data
     }));
   };
+  /*
+  if a model is using custom timestamp fields
+  the custom field names will be stored in the model attributes
+   e.g.
+  "attributes": [
+  {
+          "type": "model",
+          "properties": {
+              "timestamps": {
+                  "createdAt": "createdOn",
+                  "updatedAt": "updatedOn"
+              }
+          }
+  }
+  ]
+  */
+
+
+  MutationEventOutbox.prototype.removeTimestampFields = function (model, record) {
+    var _a, _b;
+
+    var CREATED_AT_DEFAULT_KEY = 'createdAt';
+    var UPDATED_AT_DEFAULT_KEY = 'updatedAt';
+    var createdTimestampKey = CREATED_AT_DEFAULT_KEY;
+    var updatedTimestampKey = UPDATED_AT_DEFAULT_KEY;
+    var modelAttributes = (_a = this.schema.namespaces[_util__WEBPACK_IMPORTED_MODULE_2__["USER"]].models[model].attributes) === null || _a === void 0 ? void 0 : _a.find(function (attr) {
+      return attr.type === 'model';
+    });
+    var timestampFieldsMap = (_b = modelAttributes === null || modelAttributes === void 0 ? void 0 : modelAttributes.properties) === null || _b === void 0 ? void 0 : _b.timestamps;
+
+    if (timestampFieldsMap) {
+      createdTimestampKey = timestampFieldsMap[CREATED_AT_DEFAULT_KEY];
+      updatedTimestampKey = timestampFieldsMap[UPDATED_AT_DEFAULT_KEY];
+    }
+
+    delete record[createdTimestampKey];
+    delete record[updatedTimestampKey];
+    return record;
+  };
 
   return MutationEventOutbox;
 }();