@apollo/client 3.4.0-rc.7 → 3.4.1

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.0-rc.7';
+var version = '3.4.1';
 
 exports.NetworkStatus = void 0;
 (function (NetworkStatus) {
@@ -30,95 +30,35 @@ function isNetworkRequestInFlight(networkStatus) {
     return networkStatus ? networkStatus < 7 : false;
 }
 
-var Reobserver = (function () {
-    function Reobserver(observer, options, fetch, shouldFetch) {
-        this.observer = observer;
-        this.options = options;
-        this.fetch = fetch;
-        this.shouldFetch = shouldFetch;
-    }
-    Reobserver.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        if (newOptions) {
-            this.updateOptions(newOptions);
-        }
-        else {
-            this.updatePolling();
-        }
-        var concast = this.fetch(this.options, newNetworkStatus);
-        if (this.concast) {
-            this.concast.removeObserver(this.observer, true);
-        }
-        concast.addObserver(this.observer);
-        return (this.concast = concast).promise;
-    };
-    Reobserver.prototype.updateOptions = function (newOptions) {
-        Object.assign(this.options, utilities.compact(newOptions));
-        this.updatePolling();
-        return this;
-    };
-    Reobserver.prototype.stop = function () {
-        if (this.concast) {
-            this.concast.removeObserver(this.observer);
-            delete this.concast;
-        }
-        if (this.pollingInfo) {
-            clearTimeout(this.pollingInfo.timeout);
-            this.options.pollInterval = 0;
-            this.updatePolling();
-        }
-    };
-    Reobserver.prototype.updatePolling = function () {
-        var _this = this;
-        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;
-        if (!pollInterval) {
-            if (pollingInfo) {
-                clearTimeout(pollingInfo.timeout);
-                delete this.pollingInfo;
-            }
-            return;
-        }
-        if (pollingInfo &&
-            pollingInfo.interval === pollInterval) {
-            return;
-        }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 21);
-        if (this.shouldFetch === false) {
-            return;
-        }
-        var info = pollingInfo || (this.pollingInfo = {});
-        info.interval = pollInterval;
-        var maybeFetch = function () {
-            if (_this.pollingInfo) {
-                if (_this.shouldFetch && _this.shouldFetch()) {
-                    _this.reobserve({
-                        fetchPolicy: "network-only",
-                        nextFetchPolicy: _this.options.fetchPolicy || "cache-first",
-                    }, exports.NetworkStatus.poll).then(poll, poll);
-                }
-                else {
-                    poll();
-                }
-            }
-        };
-        var poll = function () {
-            var info = _this.pollingInfo;
-            if (info) {
-                clearTimeout(info.timeout);
-                info.timeout = setTimeout(maybeFetch, info.interval);
-            }
-        };
-        poll();
-    };
-    return Reobserver;
-}());
-
 var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
         var queryManager = _a.queryManager, queryInfo = _a.queryInfo, options = _a.options;
         var _this = _super.call(this, function (observer) {
-            return _this.onSubscribe(observer);
+            try {
+                var subObserver = observer._subscription._observer;
+                if (subObserver && !subObserver.error) {
+                    subObserver.error = defaultSubscriptionObserverErrorCallback;
+                }
+            }
+            catch (_a) { }
+            var first = !_this.observers.size;
+            _this.observers.add(observer);
+            if (_this.lastError) {
+                observer.error && observer.error(_this.lastError);
+            }
+            else if (_this.lastResult) {
+                observer.next && observer.next(_this.lastResult);
+            }
+            if (first) {
+                _this.reobserve().catch(function () { });
+            }
+            return function () {
+                if (_this.observers.delete(observer) && !_this.observers.size) {
+                    _this.tearDownQuery();
+                }
+            };
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
@@ -139,6 +79,7 @@ var ObservableQuery = (function (_super) {
         _this.queryId = queryManager.generateQueryId();
         var opDef = utilities.getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
+        _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
         _this.queryManager = queryManager;
         _this.queryInfo = queryInfo;
         return _this;
@@ -171,21 +112,12 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        var lastResult = this.lastResult;
+        var _a = this, lastResult = _a.lastResult, _b = _a.options.fetchPolicy, fetchPolicy = _b === void 0 ? "cache-first" : _b;
         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.isTornDown) {
-            return result;
-        }
-        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? 'cache-first' : _a;
-        if (fetchPolicy === 'no-cache' ||
-            fetchPolicy === 'network-only') {
-            delete result.partial;
-        }
-        else if (!result.data ||
-            !this.queryManager.transform(this.options.query).hasForcedResolvers) {
+        if (!this.queryManager.transform(this.options.query).hasForcedResolvers) {
             var diff = this.queryInfo.getDiff();
             result.data = (diff.complete ||
                 this.options.returnPartialData) ? diff.result : void 0;
@@ -198,7 +130,7 @@ var ObservableQuery = (function (_super) {
                 }
                 delete result.partial;
             }
-            else {
+            else if (fetchPolicy !== "no-cache") {
                 result.partial = true;
             }
             if (!diff.complete &&
@@ -237,16 +169,17 @@ var ObservableQuery = (function (_super) {
             pollInterval: 0,
         };
         var fetchPolicy = this.options.fetchPolicy;
-        if (fetchPolicy !== 'no-cache' &&
-            fetchPolicy !== 'cache-and-network') {
+        if (fetchPolicy === 'no-cache') {
+            reobserveOptions.fetchPolicy = 'no-cache';
+        }
+        else if (fetchPolicy !== 'cache-and-network') {
             reobserveOptions.fetchPolicy = 'network-only';
-            reobserveOptions.nextFetchPolicy = fetchPolicy || "cache-first";
         }
         if (variables && !equality.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
         this.queryInfo.resetLastWrite();
-        return this.newReobserver(false).reobserve(reobserveOptions, exports.NetworkStatus.refetch);
+        return this.reobserve(reobserveOptions, exports.NetworkStatus.refetch);
     };
     ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
         var _this = this;
@@ -332,18 +265,10 @@ var ObservableQuery = (function (_super) {
         if (!this.observers.size) {
             return Promise.resolve();
         }
-        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? 'cache-first' : _a;
-        var reobserveOptions = {
-            fetchPolicy: fetchPolicy,
+        return this.reobserve({
+            fetchPolicy: this.initialFetchPolicy,
             variables: variables,
-        };
-        if (fetchPolicy !== 'cache-first' &&
-            fetchPolicy !== 'no-cache' &&
-            fetchPolicy !== 'network-only') {
-            reobserveOptions.fetchPolicy = 'cache-and-network';
-            reobserveOptions.nextFetchPolicy = fetchPolicy;
-        }
-        return this.reobserve(reobserveOptions, exports.NetworkStatus.setVariables);
+        }, exports.NetworkStatus.setVariables);
     };
     ObservableQuery.prototype.updateQuery = function (mapFn) {
         var _a;
@@ -368,12 +293,57 @@ var ObservableQuery = (function (_super) {
         }
     };
     ObservableQuery.prototype.startPolling = function (pollInterval) {
-        this.getReobserver().updateOptions({ pollInterval: pollInterval });
+        this.options.pollInterval = pollInterval;
+        this.updatePolling();
     };
     ObservableQuery.prototype.stopPolling = function () {
-        if (this.reobserver) {
-            this.reobserver.updateOptions({ pollInterval: 0 });
+        this.options.pollInterval = 0;
+        this.updatePolling();
+    };
+    ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
+        this.queryManager.setObservableQuery(this);
+        return this.queryManager.fetchQueryObservable(this.queryId, options, newNetworkStatus);
+    };
+    ObservableQuery.prototype.updatePolling = function () {
+        var _this = this;
+        if (this.queryManager.ssrMode) {
+            return;
+        }
+        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;
+        if (!pollInterval) {
+            if (pollingInfo) {
+                clearTimeout(pollingInfo.timeout);
+                delete this.pollingInfo;
+            }
+            return;
         }
+        if (pollingInfo &&
+            pollingInfo.interval === pollInterval) {
+            return;
+        }
+        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 13);
+        var info = pollingInfo || (this.pollingInfo = {});
+        info.interval = pollInterval;
+        var maybeFetch = function () {
+            if (_this.pollingInfo) {
+                if (!isNetworkRequestInFlight(_this.queryInfo.networkStatus)) {
+                    _this.reobserve({
+                        fetchPolicy: "network-only",
+                    }, exports.NetworkStatus.poll).then(poll, poll);
+                }
+                else {
+                    poll();
+                }
+            }
+        };
+        var poll = function () {
+            var info = _this.pollingInfo;
+            if (info) {
+                clearTimeout(info.timeout);
+                info.timeout = setTimeout(maybeFetch, info.interval);
+            }
+        };
+        poll();
     };
     ObservableQuery.prototype.updateLastResult = function (newResult) {
         var previousResult = this.lastResult;
@@ -386,50 +356,36 @@ var ObservableQuery = (function (_super) {
         }
         return previousResult;
     };
-    ObservableQuery.prototype.onSubscribe = function (observer) {
-        var _this = this;
-        if (observer === this.observer) {
-            return function () { };
-        }
-        try {
-            var subObserver = observer._subscription._observer;
-            if (subObserver && !subObserver.error) {
-                subObserver.error = defaultSubscriptionObserverErrorCallback;
+    ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
+        this.isTornDown = false;
+        var useDisposableConcast = newNetworkStatus === exports.NetworkStatus.refetch ||
+            newNetworkStatus === exports.NetworkStatus.fetchMore ||
+            newNetworkStatus === exports.NetworkStatus.poll;
+        var oldVariables = this.options.variables;
+        var options = useDisposableConcast
+            ? utilities.compact(this.options, newOptions)
+            : Object.assign(this.options, utilities.compact(newOptions));
+        if (!useDisposableConcast) {
+            this.updatePolling();
+            if (newOptions &&
+                newOptions.variables &&
+                !newOptions.fetchPolicy &&
+                !equality.equal(newOptions.variables, oldVariables)) {
+                options.fetchPolicy = this.initialFetchPolicy;
+                if (newNetworkStatus === void 0) {
+                    newNetworkStatus = exports.NetworkStatus.setVariables;
+                }
             }
         }
-        catch (_a) { }
-        var first = !this.observers.size;
-        this.observers.add(observer);
-        if (this.lastError) {
-            observer.error && observer.error(this.lastError);
-        }
-        else if (this.lastResult) {
-            observer.next && observer.next(this.lastResult);
-        }
-        if (first) {
-            this.reobserve().catch(function () { });
-        }
-        return function () {
-            if (_this.observers.delete(observer) && !_this.observers.size) {
-                _this.tearDownQuery();
+        var concast = this.fetch(options, newNetworkStatus);
+        if (!useDisposableConcast) {
+            if (this.concast) {
+                this.concast.removeObserver(this.observer, true);
             }
-        };
-    };
-    ObservableQuery.prototype.getReobserver = function () {
-        return this.reobserver || (this.reobserver = this.newReobserver(true));
-    };
-    ObservableQuery.prototype.newReobserver = function (shareOptions) {
-        var _this = this;
-        var _a = this, queryManager = _a.queryManager, queryId = _a.queryId;
-        queryManager.setObservableQuery(this);
-        return new Reobserver(this.observer, shareOptions ? this.options : tslib.__assign({}, this.options), function (currentOptions, newNetworkStatus) {
-            queryManager.setObservableQuery(_this);
-            return queryManager.fetchQueryObservable(queryId, currentOptions, newNetworkStatus);
-        }, !queryManager.ssrMode && (function () { return !isNetworkRequestInFlight(_this.queryInfo.networkStatus); }));
-    };
-    ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        this.isTornDown = false;
-        return this.getReobserver().reobserve(newOptions, newNetworkStatus);
+            this.concast = concast;
+        }
+        concast.addObserver(this.observer);
+        return concast.promise;
     };
     ObservableQuery.prototype.observe = function () {
         this.observer.next(this.getCurrentResult(false));
@@ -440,10 +396,11 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.tearDownQuery = function () {
         if (this.isTornDown)
             return;
-        if (this.reobserver) {
-            this.reobserver.stop();
-            delete this.reobserver;
+        if (this.concast) {
+            this.concast.removeObserver(this.observer);
+            delete this.concast;
         }
+        this.stopPolling();
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
         this.subscriptions.clear();
         this.queryManager.stopQuery(this.queryId);
@@ -459,7 +416,6 @@ function defaultSubscriptionObserverErrorCallback(error) {
 function applyNextFetchPolicy(options) {
     var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, nextFetchPolicy = options.nextFetchPolicy;
     if (nextFetchPolicy) {
-        options.nextFetchPolicy = void 0;
         options.fetchPolicy = typeof nextFetchPolicy === "function"
             ? nextFetchPolicy.call(options, fetchPolicy)
             : nextFetchPolicy;
@@ -529,8 +485,7 @@ var LocalState = (function () {
     };
     LocalState.prototype.prepareContext = function (context) {
         var cache = this.cache;
-        return tslib.__assign(tslib.__assign({}, context), { cache: cache,
-            getCacheKey: function (obj) {
+        return tslib.__assign(tslib.__assign({}, context), { cache: cache, getCacheKey: function (obj) {
                 return cache.identify(obj);
             } });
     };
@@ -594,8 +549,7 @@ var LocalState = (function () {
                 _a = this, cache = _a.cache, client = _a.client;
                 execContext = {
                     fragmentMap: fragmentMap,
-                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache,
-                        client: client }),
+                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache, client: client }),
                     variables: variables,
                     fragmentMatcher: fragmentMatcher,
                     defaultOperationType: defaultOperationType,
@@ -815,12 +769,13 @@ var QueryInfo = (function () {
     };
     QueryInfo.prototype.getDiffOptions = function (variables) {
         if (variables === void 0) { variables = this.variables; }
+        var oq = this.observableQuery;
         return {
             query: this.document,
             variables: variables,
             returnPartialData: true,
             optimistic: true,
-            canonizeResults: this.canonize(),
+            canonizeResults: !oq || oq.options.canonizeResults !== false,
         };
     };
     QueryInfo.prototype.setDiff = function (diff) {
@@ -907,10 +862,6 @@ var QueryInfo = (function () {
             this.cancel = this.cache.watch(this.lastWatch = watchOptions);
         }
     };
-    QueryInfo.prototype.canonize = function () {
-        var oq = this.observableQuery;
-        return !oq || oq.options.canonizeResults !== false;
-    };
     QueryInfo.prototype.resetLastWrite = function () {
         this.lastWrite = void 0;
     };
@@ -928,7 +879,7 @@ var QueryInfo = (function () {
         if (options.fetchPolicy === 'no-cache') {
             this.updateLastDiff({ result: result.data, complete: true }, this.getDiffOptions(options.variables));
         }
-        else if (!this.stopped && cacheWriteBehavior !== 0) {
+        else if (cacheWriteBehavior !== 0) {
             if (shouldWriteResult(result, options.errorPolicy)) {
                 this.cache.performTransaction(function (cache) {
                     if (_this.shouldWrite(result, options.variables)) {
@@ -1024,7 +975,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(13));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(14));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1037,8 +988,8 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 14);
-                        __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', 15);
+                        __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);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -1323,10 +1274,10 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         __DEV__ ? tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
-            'in the query option.') : tsInvariant.invariant(options.query, 16);
-        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 17);
-        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 18);
-        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 19);
+            'in the query option.') : tsInvariant.invariant(options.query, 17);
+        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 18);
+        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 19);
+        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 20);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1348,7 +1299,7 @@ var QueryManager = (function () {
             queryInfo.stop();
     };
     QueryManager.prototype.clearStore = function () {
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(20));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(21));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1376,9 +1327,12 @@ var QueryManager = (function () {
         var legacyQueryOptions = new Set();
         if (Array.isArray(include)) {
             include.forEach(function (desc) {
-                if (typeof desc === "string" || utilities.isDocumentNode(desc)) {
+                if (typeof desc === "string") {
                     queryNamesAndDocs.set(desc, false);
                 }
+                else if (utilities.isDocumentNode(desc)) {
+                    queryNamesAndDocs.set(_this.transform(desc).document, false);
+                }
                 else if (utilities.isNonNullObject(desc) && desc.query) {
                     legacyQueryOptions.add(desc);
                 }
@@ -1715,7 +1669,7 @@ var QueryManager = (function () {
                 utilities.isNonEmptyArray(diff.missing) &&
                 !equality.equal(data, {}) &&
                 !returnPartialData) {
-                __DEV__ && tsInvariant.invariant.warn("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
+                __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), 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) {
@@ -2012,6 +1966,9 @@ var ApolloClient = (function () {
         var result = Promise.all(results);
         result.queries = queries;
         result.results = results;
+        result.catch(function (error) {
+            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
+        });
         return result;
     };
     ApolloClient.prototype.getObservableQueries = function (include) {
@@ -2042,10 +1999,9 @@ var ApolloClient = (function () {
     return ApolloClient;
 }());
 
-tsInvariant.setVerbosity("log");
+tsInvariant.setVerbosity(utilities.DEV ? "log" : "silent");
 
 exports.Observable = utilities.Observable;
-exports.__DEV__ = utilities.__DEV__;
 exports.isReference = utilities.isReference;
 exports.makeReference = utilities.makeReference;
 exports.setLogVerbosity = tsInvariant.setVerbosity;