@aws-amplify/datastore 3.11.4-unstable.12 → 3.11.4-unstable.13

package/dist/aws-amplify-datastore.js

@@ -83037,6 +83037,8 @@ function () {
 
         (function () {
           return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+
             return __generator(this, function (_a) {
               switch (_a.label) {
                 case 0:
@@ -83052,24 +83054,44 @@ function () {
                   handle = this.storage.observe(modelConstructor, predicate).filter(function (_a) {
                     var model = _a.model;
                     return namespaceResolver(model) === _util__WEBPACK_IMPORTED_MODULE_9__["USER"];
-                  }).map(function (event) {
-                    // The `element` returned by storage only contains updated fields.
-                    // Intercept the event to send the `savedElement` so that the first
-                    // snapshot returned to the consumer contains all fields.
-                    // In the event of a delete we return `element`, as `savedElement`
-                    // here is undefined.
-                    var opType = event.opType,
-                        model = event.model,
-                        condition = event.condition,
-                        element = event.element,
-                        savedElement = event.savedElement;
-                    return {
-                      opType: opType,
-                      element: savedElement || element,
-                      model: model,
-                      condition: condition
-                    };
-                  }).subscribe(observer);
+                  }).subscribe({
+                    next: function next(item) {
+                      return __awaiter(_this, void 0, void 0, function () {
+                        var message, freshElement;
+                        return __generator(this, function (_a) {
+                          switch (_a.label) {
+                            case 0:
+                              message = item;
+                              if (!(item.opType !== 'DELETE')) return [3
+                              /*break*/
+                              , 2];
+                              return [4
+                              /*yield*/
+                              , this.query(item.model, item.element.id)];
+
+                            case 1:
+                              freshElement = _a.sent();
+                              message = __assign(__assign({}, message), {
+                                element: freshElement
+                              });
+                              _a.label = 2;
+
+                            case 2:
+                              observer.next(message);
+                              return [2
+                              /*return*/
+                              ];
+                          }
+                        });
+                      });
+                    },
+                    error: function error(err) {
+                      return observer.error(err);
+                    },
+                    complete: function complete() {
+                      return observer.complete();
+                    }
+                  });
                   return [2
                   /*return*/
                   ];