@apollo/client 3.4.8 → 3.4.12

package/core/core.cjs.js

@@ -2,19 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utilities = require('../utilities');
+var globals = require('../utilities/globals');
 var tslib = require('tslib');
-var tsInvariant = require('ts-invariant');
 var core = require('../link/core');
+var utilities = require('../utilities');
 var http = require('../link/http');
 var equality = require('@wry/equality');
 var cache = require('../cache');
 var errors = require('../errors');
 var graphql = require('graphql');
 var utils = require('../link/utils');
+var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
 
-var version = '3.4.8';
+var version = '3.4.12';
 
 exports.NetworkStatus = void 0;
 (function (NetworkStatus) {
@@ -30,6 +31,7 @@ function isNetworkRequestInFlight(networkStatus) {
     return networkStatus ? networkStatus < 7 : false;
 }
 
+var assign = Object.assign, hasOwnProperty$1 = Object.hasOwnProperty;
 var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
@@ -106,7 +108,12 @@ var ObservableQuery = (function (_super) {
             (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 _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
+        var shouldReturnCachedData = lastResult || (fetchPolicy !== 'network-only' &&
+            fetchPolicy !== 'no-cache' &&
+            fetchPolicy !== 'standby');
+        if (shouldReturnCachedData &&
+            !this.queryManager.transform(this.options.query).hasForcedResolvers) {
             var diff = this.queryInfo.getDiff();
             if (diff.complete || this.options.returnPartialData) {
                 result.data = diff.result;
@@ -114,7 +121,6 @@ var ObservableQuery = (function (_super) {
             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' ||
@@ -166,6 +172,7 @@ var ObservableQuery = (function (_super) {
         this.queryManager.resetErrors(this.queryId);
     };
     ObservableQuery.prototype.refetch = function (variables) {
+        var _a;
         var reobserveOptions = {
             pollInterval: 0,
         };
@@ -176,6 +183,13 @@ var ObservableQuery = (function (_super) {
         else if (fetchPolicy !== 'cache-and-network') {
             reobserveOptions.fetchPolicy = 'network-only';
         }
+        if (__DEV__ && variables && hasOwnProperty$1.call(variables, "variables")) {
+            var queryDef = utilities.getQueryDefinition(this.options.query);
+            var vars = queryDef.variableDefinitions;
+            if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
+                __DEV__ && globals.invariant.warn("Called refetch(" + JSON.stringify(variables) + ") for query " + (((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || JSON.stringify(queryDef)) + ", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?");
+            }
+        }
         if (variables && !equality.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
@@ -196,7 +210,7 @@ var ObservableQuery = (function (_super) {
             if (updateQuery) {
                 if (__DEV__ &&
                     !warnedAboutUpdateQuery) {
-                    __DEV__ && tsInvariant.invariant.warn("The updateQuery callback for fetchMore is deprecated, and will be removed\nin the next major version of Apollo Client.\n\nPlease convert updateQuery functions to field policies with appropriate\nread and merge functions, or use/adapt a helper function (such as\nconcatPagination, offsetLimitPagination, or relayStylePagination) from\n@apollo/client/utilities.\n\nThe field policy system handles pagination more effectively than a\nhand-written updateQuery function, and you only need to define the policy\nonce, rather than every time you call fetchMore.");
+                    __DEV__ && globals.invariant.warn("The updateQuery callback for fetchMore is deprecated, and will be removed\nin the next major version of Apollo Client.\n\nPlease convert updateQuery functions to field policies with appropriate\nread and merge functions, or use/adapt a helper function (such as\nconcatPagination, offsetLimitPagination, or relayStylePagination) from\n@apollo/client/utilities.\n\nThe field policy system handles pagination more effectively than a\nhand-written updateQuery function, and you only need to define the policy\nonce, rather than every time you call fetchMore.");
                     warnedAboutUpdateQuery = true;
                 }
                 _this.updateQuery(function (previous) { return updateQuery(previous, {
@@ -243,7 +257,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                __DEV__ && tsInvariant.invariant.error('Unhandled GraphQL subscription error', err);
+                __DEV__ && globals.invariant.error('Unhandled GraphQL subscription error', err);
             },
         });
         this.subscriptions.add(subscription);
@@ -320,7 +334,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 13);
+        __DEV__ ? globals.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : globals.invariant(pollInterval, 12);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -363,7 +377,7 @@ var ObservableQuery = (function (_super) {
         var oldVariables = this.options.variables;
         var options = useDisposableConcast
             ? utilities.compact(this.options, newOptions)
-            : Object.assign(this.options, utilities.compact(newOptions));
+            : assign(this.options, utilities.compact(newOptions));
         if (!useDisposableConcast) {
             this.updatePolling();
             if (newOptions &&
@@ -432,11 +446,11 @@ var ObservableQuery = (function (_super) {
 }(utilities.Observable));
 utilities.fixObservableSubclass(ObservableQuery);
 function defaultSubscriptionObserverErrorCallback(error) {
-    __DEV__ && tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
+    __DEV__ && globals.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);
+        __DEV__ && globals.invariant.debug("Missing cache result fields: " + missing.map(function (m) { return m.path.join('.'); }).join(', '), missing);
     }
 }
 function applyNextFetchPolicy(options) {
@@ -617,7 +631,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 12);
+                            __DEV__ ? globals.invariant(fragment, "No fragment named " + selection.name.value) : globals.invariant(fragment, 11);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -1003,7 +1017,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(14));
+        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('QueryManager stopped while query was in flight') : new globals.InvariantError(13));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1016,10 +1030,10 @@ var QueryManager = (function () {
             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 === '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);
+                        __DEV__ ? globals.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : globals.invariant(mutation, 14);
+                        __DEV__ ? globals.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.") : globals.invariant(fetchPolicy === 'network-only' ||
+                            fetchPolicy === 'no-cache', 15);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -1218,7 +1232,7 @@ var QueryManager = (function () {
                 _this.markMutationResult(tslib.__assign(tslib.__assign({}, mutation), { result: { data: data } }), cache);
             }
             catch (error) {
-                __DEV__ && tsInvariant.invariant.error(error);
+                __DEV__ && globals.invariant.error(error);
             }
         }, mutation.mutationId);
     };
@@ -1303,11 +1317,11 @@ var QueryManager = (function () {
     QueryManager.prototype.query = function (options, queryId) {
         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, 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);
+        __DEV__ ? globals.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
+            'in the query option.') : globals.invariant(options.query, 16);
+        __DEV__ ? globals.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : globals.invariant(options.query.kind === 'Document', 17);
+        __DEV__ ? globals.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : globals.invariant(!options.returnPartialData, 18);
+        __DEV__ ? globals.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : globals.invariant(!options.pollInterval, 19);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1329,7 +1343,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(21));
+        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('Store reset while query was in flight (not completed in link chain)') : new globals.InvariantError(20));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1402,7 +1416,7 @@ var QueryManager = (function () {
                     queryInfo: queryInfo,
                     options: tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "network-only" }),
                 });
-                tsInvariant.invariant(oq.queryId === queryId);
+                globals.invariant(oq.queryId === queryId);
                 queryInfo.setObservableQuery(oq);
                 queries.set(queryId, oq);
             });
@@ -1410,7 +1424,7 @@ var QueryManager = (function () {
         if (__DEV__ && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    __DEV__ && tsInvariant.invariant.warn("Unknown query " + (typeof nameOrDoc === "string" ? "named " : "") + JSON.stringify(nameOrDoc, null, 2) + " requested in refetchQueries options.include array");
+                    __DEV__ && globals.invariant.warn("Unknown query " + (typeof nameOrDoc === "string" ? "named " : "") + JSON.stringify(nameOrDoc, null, 2) + " requested in refetchQueries options.include array");
                 }
             });
         }
@@ -1604,7 +1618,7 @@ var QueryManager = (function () {
             return _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
         };
         this.fetchCancelFns.set(queryId, function (reason) {
-            Promise.resolve().then(function () { return concast.cancel(reason); });
+            setTimeout(function () { return concast.cancel(reason); });
         });
         var concast = new utilities.Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
@@ -1820,9 +1834,9 @@ var ApolloClient = (function () {
                 : core.ApolloLink.empty();
         }
         if (!cache) {
-            throw __DEV__ ? new tsInvariant.InvariantError("To initialize Apollo Client, you must specify a 'cache' property " +
+            throw __DEV__ ? new globals.InvariantError("To initialize Apollo Client, you must specify a 'cache' property " +
                 "in the options object. \n" +
-                "For more information, please visit: https://go.apollo.dev/c/docs") : new tsInvariant.InvariantError(10);
+                "For more information, please visit: https://go.apollo.dev/c/docs") : new globals.InvariantError(9);
         }
         this.link = link;
         this.cache = cache;
@@ -1860,7 +1874,7 @@ var ApolloClient = (function () {
                     }
                 }
                 if (url) {
-                    __DEV__ && tsInvariant.invariant.log("Download the Apollo DevTools for a better development " +
+                    __DEV__ && globals.invariant.log("Download the Apollo DevTools for a better development " +
                         "experience: " + url);
                 }
             }
@@ -1915,10 +1929,10 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = mergeOptions(this.defaultOptions.query, options);
         }
-        __DEV__ ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
+        __DEV__ ? globals.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
             'client.query can only return a single result. Please use client.watchQuery ' +
             'to receive multiple results from the cache and the network, or consider ' +
-            'using a different fetchPolicy, such as cache-first or network-only.') : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 11);
+            'using a different fetchPolicy, such as cache-first or network-only.') : globals.invariant(options.fetchPolicy !== 'cache-and-network', 10);
         if (this.disableNetworkFetches && options.fetchPolicy === 'network-only') {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: 'cache-first' });
         }
@@ -1997,7 +2011,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
+            __DEV__ && globals.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
         });
         return result;
     };
@@ -2029,12 +2043,11 @@ var ApolloClient = (function () {
     return ApolloClient;
 }());
 
-tsInvariant.setVerbosity(utilities.DEV ? "log" : "silent");
+tsInvariant.setVerbosity(globals.DEV ? "log" : "silent");
 
 exports.Observable = utilities.Observable;
 exports.isReference = utilities.isReference;
 exports.makeReference = utilities.makeReference;
-exports.setLogVerbosity = tsInvariant.setVerbosity;
 exports.ApolloCache = cache.ApolloCache;
 exports.Cache = cache.Cache;
 exports.InMemoryCache = cache.InMemoryCache;
@@ -2047,6 +2060,7 @@ exports.fromError = utils.fromError;
 exports.fromPromise = utils.fromPromise;
 exports.throwServerError = utils.throwServerError;
 exports.toPromise = utils.toPromise;
+exports.setLogVerbosity = tsInvariant.setVerbosity;
 exports.disableExperimentalFragmentVariables = graphqlTag.disableExperimentalFragmentVariables;
 exports.disableFragmentWarnings = graphqlTag.disableFragmentWarnings;
 exports.enableExperimentalFragmentVariables = graphqlTag.enableExperimentalFragmentVariables;