@apollo/client 3.4.4 → 3.4.8

package/core/core.cjs.js

@@ -14,7 +14,7 @@ var graphql = require('graphql');
 var utils = require('../link/utils');
 var graphqlTag = require('graphql-tag');
 
-var version = '3.4.4';
+var version = '3.4.8';
 
 exports.NetworkStatus = void 0;
 (function (NetworkStatus) {
@@ -45,11 +45,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 () { });
@@ -62,21 +63,9 @@ 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);
-                    utilities.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 }));
-                utilities.iterateObserversSafely(_this.observers, 'error', _this.lastError = error);
-            },
-        };
         _this.isTornDown = false;
         _this.options = options;
-        _this.queryId = queryManager.generateQueryId();
+        _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
         var opDef = utilities.getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
         _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
@@ -112,15 +101,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' ||
@@ -133,12 +127,13 @@ var ObservableQuery = (function (_super) {
             else if (fetchPolicy !== "no-cache") {
                 result.partial = true;
             }
-            if (!diff.complete &&
+            if (__DEV__ &&
+                !diff.complete &&
                 !this.options.partialRefetch &&
                 !result.loading &&
                 !result.data &&
                 !result.error) {
-                result.error = new errors.ApolloError({ clientErrors: diff.missing });
+                logMissingFieldErrors(diff.missing);
             }
         }
         if (saveAsLastResult) {
@@ -147,18 +142,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.getLast = function (key, variablesMustMatch) {
+        var last = this.last;
+        if (last &&
+            last[key] &&
+            (!variablesMustMatch || equality.equal(last.variables, this.variables))) {
+            return last[key];
+        }
     };
-    ObservableQuery.prototype.getLastResult = function () {
-        return this.lastResult;
+    ObservableQuery.prototype.getLastResult = function (variablesMustMatch) {
+        return this.getLast("result", variablesMustMatch);
     };
-    ObservableQuery.prototype.getLastError = function () {
-        return this.lastError;
+    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 () {
@@ -271,12 +272,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;
@@ -345,18 +344,18 @@ var ObservableQuery = (function (_super) {
         };
         poll();
     };
-    ObservableQuery.prototype.updateLastResult = function (newResult) {
-        var previousResult = this.lastResult;
-        this.lastResult = newResult;
-        this.lastResultSnapshot = this.queryManager.assumeImmutableResults
-            ? newResult
-            : utilities.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
+                : utilities.cloneDeep(newResult), variables: variables });
         if (!utilities.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 ||
@@ -377,18 +376,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);
+            utilities.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);
+        utilities.iterateObserversSafely(this.observers, 'error', this.last.error = error);
     };
     ObservableQuery.prototype.hasObservers = function () {
         return this.observers.size > 0;
@@ -396,9 +416,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(); });
@@ -413,6 +434,11 @@ utilities.fixObservableSubclass(ObservableQuery);
 function defaultSubscriptionObserverErrorCallback(error) {
     __DEV__ && tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
 }
+function logMissingFieldErrors(missing) {
+    if (__DEV__ && utilities.isNonEmptyArray(missing)) {
+        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + missing.map(function (m) { return m.path.join('.'); }).join(', '), missing);
+    }
+}
 function applyNextFetchPolicy(options) {
     var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, nextFetchPolicy = options.nextFetchPolicy;
     if (nextFetchPolicy) {
@@ -700,8 +726,9 @@ function cancelNotifyTimeout(info) {
     }
 }
 var QueryInfo = (function () {
-    function QueryInfo(cache) {
-        this.cache = cache;
+    function QueryInfo(queryManager, queryId) {
+        if (queryId === void 0) { queryId = queryManager.generateQueryId(); }
+        this.queryId = queryId;
         this.listeners = new Set();
         this.document = null;
         this.lastRequestId = 1;
@@ -709,6 +736,7 @@ var QueryInfo = (function () {
         this.stopped = false;
         this.dirty = false;
         this.observableQuery = null;
+        var cache = this.cache = queryManager.cache;
         if (!destructiveMethodCounts.has(cache)) {
             destructiveMethodCounts.set(cache, 0);
             wrapDestructiveCacheMethod(cache, "evict");
@@ -982,22 +1010,24 @@ var QueryManager = (function () {
         this.fetchCancelFns.clear();
     };
     QueryManager.prototype.mutate = function (_a) {
-        var mutation = _a.mutation, variables = _a.variables, optimisticResponse = _a.optimisticResponse, updateQueries = _a.updateQueries, _b = _a.refetchQueries, refetchQueries = _b === void 0 ? [] : _b, _c = _a.awaitRefetchQueries, awaitRefetchQueries = _c === void 0 ? false : _c, updateWithProxyFn = _a.update, onQueryUpdated = _a.onQueryUpdated, _d = _a.errorPolicy, errorPolicy = _d === void 0 ? 'none' : _d, fetchPolicy = _a.fetchPolicy, keepRootFields = _a.keepRootFields, context = _a.context;
+        var mutation = _a.mutation, variables = _a.variables, optimisticResponse = _a.optimisticResponse, updateQueries = _a.updateQueries, _b = _a.refetchQueries, refetchQueries = _b === void 0 ? [] : _b, _c = _a.awaitRefetchQueries, awaitRefetchQueries = _c === void 0 ? false : _c, updateWithProxyFn = _a.update, onQueryUpdated = _a.onQueryUpdated, _d = _a.errorPolicy, errorPolicy = _d === void 0 ? 'none' : _d, _e = _a.fetchPolicy, fetchPolicy = _e === void 0 ? 'network-only' : _e, keepRootFields = _a.keepRootFields, context = _a.context;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var mutationId, mutationStoreValue, self;
-            return tslib.__generator(this, function (_e) {
-                switch (_e.label) {
+            return tslib.__generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 15);
-                        __DEV__ ? tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', "Mutations only support a 'no-cache' fetchPolicy. If you don't want to disable the cache, remove your fetchPolicy setting to proceed with the default mutation behavior.") : tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', 16);
+                        __DEV__ ? tsInvariant.invariant(fetchPolicy === 'network-only' ||
+                            fetchPolicy === 'no-cache', "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write.") : tsInvariant.invariant(fetchPolicy === 'network-only' ||
+                            fetchPolicy === 'no-cache', 16);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
                         if (!this.transform(mutation).hasClientExports) return [3, 2];
                         return [4, this.localState.addExportedVariables(mutation, variables, context)];
                     case 1:
-                        variables = (_e.sent());
-                        _e.label = 2;
+                        variables = (_f.sent());
+                        _f.label = 2;
                     case 2:
                         mutationStoreValue = this.mutationStore &&
                             (this.mutationStore[mutationId] = {
@@ -1256,7 +1286,7 @@ var QueryManager = (function () {
         if (typeof options.notifyOnNetworkStatusChange === 'undefined') {
             options.notifyOnNetworkStatusChange = false;
         }
-        var queryInfo = new QueryInfo(this.cache);
+        var queryInfo = new QueryInfo(this);
         var observable = new ObservableQuery({
             queryManager: this,
             queryInfo: queryInfo,
@@ -1372,6 +1402,7 @@ var QueryManager = (function () {
                     queryInfo: queryInfo,
                     options: tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "network-only" }),
                 });
+                tsInvariant.invariant(oq.queryId === queryId);
                 queryInfo.setObservableQuery(oq);
                 queries.set(queryId, oq);
             });
@@ -1666,10 +1697,9 @@ var QueryManager = (function () {
             if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || exports.NetworkStatus.loading; }
             var data = diff.result;
             if (__DEV__ &&
-                utilities.isNonEmptyArray(diff.missing) &&
-                !equality.equal(data, {}) &&
-                !returnPartialData) {
-                __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
+                !returnPartialData &&
+                !equality.equal(data, {})) {
+                logMissingFieldErrors(diff.missing);
             }
             var fromData = function (data) { return utilities.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
             if (data && _this.transform(query).hasForcedResolvers) {
@@ -1756,7 +1786,7 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.getQuery = function (queryId) {
         if (queryId && !this.queries.has(queryId)) {
-            this.queries.set(queryId, new QueryInfo(this.cache));
+            this.queries.set(queryId, new QueryInfo(this, queryId));
         }
         return this.queries.get(queryId);
     };