@apollo/client 3.4.7 → 3.4.8

package/apollo-core.cjs.js

@@ -1292,7 +1292,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.4.7';
+var version = '3.4.8';
 
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -3360,24 +3360,27 @@ function makeAliasMap(selectionSet, fragmentMap) {
 }
 function computeKeyObject(response, specifier, strict, aliasMap) {
     var keyObj = Object.create(null);
-    var prevKey;
+    var lastResponseKey;
+    var lastActualKey;
     specifier.forEach(function (s) {
         if (Array.isArray(s)) {
-            if (typeof prevKey === "string") {
+            if (typeof lastActualKey === "string" &&
+                typeof lastResponseKey === "string") {
                 var subsets = aliasMap && aliasMap.subsets;
-                var subset = subsets && subsets[prevKey];
-                keyObj[prevKey] = computeKeyObject(response[prevKey], s, strict, subset);
+                var subset = subsets && subsets[lastActualKey];
+                keyObj[lastActualKey] =
+                    computeKeyObject(response[lastResponseKey], s, strict, subset);
             }
         }
         else {
             var aliases = aliasMap && aliasMap.aliases;
             var responseName = aliases && aliases[s] || s;
             if (hasOwn.call(response, responseName)) {
-                keyObj[prevKey = s] = response[responseName];
+                keyObj[lastActualKey = s] = response[lastResponseKey = responseName];
             }
             else {
                 __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 5);
-                prevKey = void 0;
+                lastResponseKey = lastActualKey = void 0;
             }
         }
     });
@@ -3736,11 +3739,12 @@ var ObservableQuery = (function (_super) {
             catch (_a) { }
             var first = !_this.observers.size;
             _this.observers.add(observer);
-            if (_this.lastError) {
-                observer.error && observer.error(_this.lastError);
+            var last = _this.last;
+            if (last && last.error) {
+                observer.error && observer.error(last.error);
             }
-            else if (_this.lastResult) {
-                observer.next && observer.next(_this.lastResult);
+            else if (last && last.result) {
+                observer.next && observer.next(last.result);
             }
             if (first) {
                 _this.reobserve().catch(function () { });
@@ -3753,18 +3757,6 @@ var ObservableQuery = (function (_super) {
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
-        _this.observer = {
-            next: function (result) {
-                if (_this.lastError || _this.isDifferentFromLastResult(result)) {
-                    _this.updateLastResult(result);
-                    iterateObserversSafely(_this.observers, 'next', result);
-                }
-            },
-            error: function (error) {
-                _this.updateLastResult(tslib.__assign(tslib.__assign({}, _this.lastResult), { error: error, errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false }));
-                iterateObserversSafely(_this.observers, 'error', _this.lastError = error);
-            },
-        };
         _this.isTornDown = false;
         _this.options = options;
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
@@ -3803,15 +3795,20 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        var _a = this, lastResult = _a.lastResult, _b = _a.options.fetchPolicy, fetchPolicy = _b === void 0 ? "cache-first" : _b;
+        var lastResult = this.getLastResult(true);
         var networkStatus = this.queryInfo.networkStatus ||
             (lastResult && lastResult.networkStatus) ||
             exports.NetworkStatus.ready;
         var result = tslib.__assign(tslib.__assign({}, lastResult), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
         if (!this.queryManager.transform(this.options.query).hasForcedResolvers) {
             var diff = this.queryInfo.getDiff();
-            result.data = (diff.complete ||
-                this.options.returnPartialData) ? diff.result : void 0;
+            if (diff.complete || this.options.returnPartialData) {
+                result.data = diff.result;
+            }
+            if (equality.equal(result.data, {})) {
+                result.data = void 0;
+            }
+            var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
             if (diff.complete) {
                 if (result.networkStatus === exports.NetworkStatus.loading &&
                     (fetchPolicy === 'cache-first' ||
@@ -3839,18 +3836,24 @@ var ObservableQuery = (function (_super) {
         return result;
     };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
-        return !equality.equal(this.lastResultSnapshot, newResult);
+        return !this.last || !equality.equal(this.last.result, newResult);
     };
-    ObservableQuery.prototype.getLastResult = function () {
-        return this.lastResult;
+    ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
+        var last = this.last;
+        if (last &&
+            last[key] &&
+            (!variablesMustMatch || equality.equal(last.variables, this.variables))) {
+            return last[key];
+        }
     };
-    ObservableQuery.prototype.getLastError = function () {
-        return this.lastError;
+    ObservableQuery.prototype.getLastResult = function (variablesMustMatch) {
+        return this.getLast("result", variablesMustMatch);
+    };
+    ObservableQuery.prototype.getLastError = function (variablesMustMatch) {
+        return this.getLast("error", variablesMustMatch);
     };
     ObservableQuery.prototype.resetLastResults = function () {
-        delete this.lastResult;
-        delete this.lastResultSnapshot;
-        delete this.lastError;
+        delete this.last;
         this.isTornDown = false;
     };
     ObservableQuery.prototype.resetQueryStoreErrors = function () {
@@ -3963,12 +3966,10 @@ var ObservableQuery = (function (_super) {
         }, exports.NetworkStatus.setVariables);
     };
     ObservableQuery.prototype.updateQuery = function (mapFn) {
-        var _a;
         var queryManager = this.queryManager;
         var result = queryManager.cache.diff({
             query: this.options.query,
             variables: this.variables,
-            previousResult: (_a = this.lastResult) === null || _a === void 0 ? void 0 : _a.data,
             returnPartialData: true,
             optimistic: false,
         }).result;
@@ -4037,18 +4038,18 @@ var ObservableQuery = (function (_super) {
         };
         poll();
     };
-    ObservableQuery.prototype.updateLastResult = function (newResult) {
-        var previousResult = this.lastResult;
-        this.lastResult = newResult;
-        this.lastResultSnapshot = this.queryManager.assumeImmutableResults
-            ? newResult
-            : cloneDeep(newResult);
+    ObservableQuery.prototype.updateLastResult = function (newResult, variables) {
+        if (variables === void 0) { variables = this.variables; }
+        this.last = tslib.__assign(tslib.__assign({}, this.last), { result: this.queryManager.assumeImmutableResults
+                ? newResult
+                : cloneDeep(newResult), variables: variables });
         if (!isNonEmptyArray(newResult.errors)) {
-            delete this.lastError;
+            delete this.last.error;
         }
-        return previousResult;
+        return this.last;
     };
     ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
+        var _this = this;
         this.isTornDown = false;
         var useDisposableConcast = newNetworkStatus === exports.NetworkStatus.refetch ||
             newNetworkStatus === exports.NetworkStatus.fetchMore ||
@@ -4069,18 +4070,39 @@ var ObservableQuery = (function (_super) {
                 }
             }
         }
+        var variables = options.variables && tslib.__assign({}, options.variables);
         var concast = this.fetch(options, newNetworkStatus);
+        var observer = {
+            next: function (result) {
+                _this.reportResult(result, variables);
+            },
+            error: function (error) {
+                _this.reportError(error, variables);
+            },
+        };
         if (!useDisposableConcast) {
-            if (this.concast) {
+            if (this.concast && this.observer) {
                 this.concast.removeObserver(this.observer, true);
             }
             this.concast = concast;
+            this.observer = observer;
         }
-        concast.addObserver(this.observer);
+        concast.addObserver(observer);
         return concast.promise;
     };
     ObservableQuery.prototype.observe = function () {
-        this.observer.next(this.getCurrentResult(false));
+        this.reportResult(this.getCurrentResult(false), this.variables);
+    };
+    ObservableQuery.prototype.reportResult = function (result, variables) {
+        if (this.getLastError() || this.isDifferentFromLastResult(result)) {
+            this.updateLastResult(result, variables);
+            iterateObserversSafely(this.observers, 'next', result);
+        }
+    };
+    ObservableQuery.prototype.reportError = function (error, variables) {
+        var errorResult = tslib.__assign(tslib.__assign({}, this.getLastResult()), { error: error, errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false });
+        this.updateLastResult(errorResult, variables);
+        iterateObserversSafely(this.observers, 'error', this.last.error = error);
     };
     ObservableQuery.prototype.hasObservers = function () {
         return this.observers.size > 0;
@@ -4088,9 +4110,10 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.tearDownQuery = function () {
         if (this.isTornDown)
             return;
-        if (this.concast) {
+        if (this.concast && this.observer) {
             this.concast.removeObserver(this.observer);
             delete this.concast;
+            delete this.observer;
         }
         this.stopPolling();
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });