@apollo/client 3.6.0-beta.9 → 3.6.0

package/core/core.cjs

@@ -5,17 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var globals = require('../utilities/globals');
 var tslib = require('tslib');
 var core = require('../link/core');
-var utilities = require('../utilities');
 var http = require('../link/http');
 var equality = require('@wry/equality');
 var cache = require('../cache');
+var utilities = require('../utilities');
 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.6.0-beta.9';
+var version = '3.6.0';
 
 exports.NetworkStatus = void 0;
 (function (NetworkStatus) {
@@ -32,7 +32,6 @@ function isNetworkRequestInFlight(networkStatus) {
 }
 
 var assign = Object.assign, hasOwnProperty$1 = Object.hasOwnProperty;
-var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
@@ -65,16 +64,22 @@ var ObservableQuery = (function (_super) {
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
+        _this.queryInfo = queryInfo;
+        _this.queryManager = queryManager;
         _this.isTornDown = false;
-        _this.options = options;
+        _this.options = tslib.__assign({ initialFetchPolicy: options.fetchPolicy || "cache-first" }, options);
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
-        var opDef = utilities.getOperationDefinition(options.query);
+        var opDef = utilities.getOperationDefinition(_this.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
-        _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
-        _this.queryManager = queryManager;
-        _this.queryInfo = queryInfo;
         return _this;
     }
+    Object.defineProperty(ObservableQuery.prototype, "query", {
+        get: function () {
+            return this.queryManager.transform(this.options.query).document;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(ObservableQuery.prototype, "variables", {
         get: function () {
             return this.options.variables;
@@ -188,7 +193,7 @@ var ObservableQuery = (function (_super) {
             reobserveOptions.fetchPolicy = 'network-only';
         }
         if (__DEV__ && variables && hasOwnProperty$1.call(variables, "variables")) {
-            var queryDef = utilities.getQueryDefinition(this.options.query);
+            var queryDef = utilities.getQueryDefinition(this.query);
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 __DEV__ && globals.invariant.warn("Called refetch(".concat(JSON.stringify(variables), ") for query ").concat(((_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 })?"));
@@ -202,37 +207,51 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
         var _this = this;
-        var combinedOptions = tslib.__assign(tslib.__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : tslib.__assign(tslib.__assign(tslib.__assign({}, this.options), fetchMoreOptions), { variables: tslib.__assign(tslib.__assign({}, this.options.variables), fetchMoreOptions.variables) }))), { fetchPolicy: "no-cache" });
+        var combinedOptions = tslib.__assign(tslib.__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, this.options), { query: this.query }), fetchMoreOptions), { variables: tslib.__assign(tslib.__assign({}, this.options.variables), fetchMoreOptions.variables) }))), { fetchPolicy: "no-cache" });
         var qid = this.queryManager.generateQueryId();
+        var queryInfo = this.queryInfo;
+        var originalNetworkStatus = queryInfo.networkStatus;
+        queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
         if (combinedOptions.notifyOnNetworkStatusChange) {
-            this.queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
             this.observe();
         }
+        var updatedQuerySet = new Set();
         return this.queryManager.fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore).then(function (fetchMoreResult) {
-            var data = fetchMoreResult.data;
-            var updateQuery = fetchMoreOptions.updateQuery;
-            if (updateQuery) {
-                if (__DEV__ &&
-                    !warnedAboutUpdateQuery) {
-                    __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, {
-                    fetchMoreResult: data,
-                    variables: combinedOptions.variables,
-                }); });
-            }
-            else {
-                _this.queryManager.cache.writeQuery({
-                    query: combinedOptions.query,
-                    variables: combinedOptions.variables,
-                    data: data,
-                });
+            _this.queryManager.removeQuery(qid);
+            if (queryInfo.networkStatus === exports.NetworkStatus.fetchMore) {
+                queryInfo.networkStatus = originalNetworkStatus;
             }
+            _this.queryManager.cache.batch({
+                update: function (cache) {
+                    var updateQuery = fetchMoreOptions.updateQuery;
+                    if (updateQuery) {
+                        cache.updateQuery({
+                            query: _this.query,
+                            variables: _this.variables,
+                            returnPartialData: true,
+                            optimistic: false,
+                        }, function (previous) { return updateQuery(previous, {
+                            fetchMoreResult: fetchMoreResult.data,
+                            variables: combinedOptions.variables,
+                        }); });
+                    }
+                    else {
+                        cache.writeQuery({
+                            query: combinedOptions.query,
+                            variables: combinedOptions.variables,
+                            data: fetchMoreResult.data,
+                        });
+                    }
+                },
+                onWatchUpdated: function (watch) {
+                    updatedQuerySet.add(watch.query);
+                },
+            });
             return fetchMoreResult;
         }).finally(function () {
-            _this.queryManager.stopQuery(qid);
-            _this.reobserve();
+            if (!updatedQuerySet.has(_this.query)) {
+                reobserveCacheFirst(_this);
+            }
         });
     };
     ObservableQuery.prototype.subscribeToMore = function (options) {
@@ -285,7 +304,7 @@ var ObservableQuery = (function (_super) {
             return Promise.resolve();
         }
         return this.reobserve({
-            fetchPolicy: this.initialFetchPolicy,
+            fetchPolicy: this.options.initialFetchPolicy,
             variables: variables,
         }, exports.NetworkStatus.setVariables);
     };
@@ -318,19 +337,18 @@ var ObservableQuery = (function (_super) {
         this.updatePolling();
     };
     ObservableQuery.prototype.applyNextFetchPolicy = function (reason, options) {
-        if (options === void 0) { options = this.options; }
         if (options.nextFetchPolicy) {
-            var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
+            var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? fetchPolicy : _b;
             if (typeof options.nextFetchPolicy === "function") {
                 options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
                     reason: reason,
                     options: options,
                     observable: this,
-                    initialPolicy: this.initialFetchPolicy,
+                    initialFetchPolicy: initialFetchPolicy,
                 });
             }
             else if (reason === "variables-changed") {
-                options.fetchPolicy = this.initialFetchPolicy;
+                options.fetchPolicy = initialFetchPolicy;
             }
             else {
                 options.fetchPolicy = options.nextFetchPolicy;
@@ -400,16 +418,18 @@ var ObservableQuery = (function (_super) {
             newNetworkStatus === exports.NetworkStatus.fetchMore ||
             newNetworkStatus === exports.NetworkStatus.poll;
         var oldVariables = this.options.variables;
+        var oldFetchPolicy = this.options.fetchPolicy;
+        var mergedOptions = utilities.mergeOptions(this.options, newOptions || {});
         var options = useDisposableConcast
-            ? utilities.compact(this.options, newOptions)
-            : assign(this.options, utilities.compact(newOptions));
+            ? mergedOptions
+            : assign(this.options, mergedOptions);
         if (!useDisposableConcast) {
             this.updatePolling();
             if (newOptions &&
                 newOptions.variables &&
-                !newOptions.fetchPolicy &&
-                !equality.equal(newOptions.variables, oldVariables)) {
-                this.applyNextFetchPolicy("variables-changed");
+                !equality.equal(newOptions.variables, oldVariables) &&
+                (!newOptions.fetchPolicy || newOptions.fetchPolicy === oldFetchPolicy)) {
+                this.applyNextFetchPolicy("variables-changed", options);
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
                 }
@@ -473,6 +493,23 @@ var ObservableQuery = (function (_super) {
     return ObservableQuery;
 }(utilities.Observable));
 utilities.fixObservableSubclass(ObservableQuery);
+function reobserveCacheFirst(obsQuery) {
+    var _a = obsQuery.options, fetchPolicy = _a.fetchPolicy, nextFetchPolicy = _a.nextFetchPolicy;
+    if (fetchPolicy === "cache-and-network" ||
+        fetchPolicy === "network-only") {
+        return obsQuery.reobserve({
+            fetchPolicy: "cache-first",
+            nextFetchPolicy: function () {
+                this.nextFetchPolicy = nextFetchPolicy;
+                if (typeof nextFetchPolicy === "function") {
+                    return nextFetchPolicy.apply(this, arguments);
+                }
+                return fetchPolicy;
+            },
+        });
+    }
+    return obsQuery.reobserve();
+}
 function defaultSubscriptionObserverErrorCallback(error) {
     __DEV__ && globals.invariant.error('Unhandled error', error.message, error.stack);
 }
@@ -863,11 +900,12 @@ var QueryInfo = (function () {
         if (oq) {
             oq["queryInfo"] = this;
             this.listeners.add(this.oqListener = function () {
-                if (_this.getDiff().fromOptimisticTransaction) {
+                var diff = _this.getDiff();
+                if (diff.fromOptimisticTransaction) {
                     oq["observe"]();
                 }
                 else {
-                    oq.reobserve();
+                    reobserveCacheFirst(oq);
                 }
             });
         }
@@ -1330,9 +1368,9 @@ var QueryManager = (function () {
         });
         this.queries.set(observable.queryId, queryInfo);
         queryInfo.init({
-            document: options.query,
+            document: observable.query,
             observableQuery: observable,
-            variables: options.variables,
+            variables: observable.variables,
         });
         return observable;
     };
@@ -1516,8 +1554,10 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.removeQuery = function (queryId) {
         this.fetchCancelFns.delete(queryId);
-        this.getQuery(queryId).stop();
-        this.queries.delete(queryId);
+        if (this.queries.has(queryId)) {
+            this.getQuery(queryId).stop();
+            this.queries.delete(queryId);
+        }
     };
     QueryManager.prototype.broadcastQueries = function () {
         if (this.onBroadcast)
@@ -1601,10 +1641,11 @@ var QueryManager = (function () {
             var aqr = {
                 data: result.data,
                 loading: false,
-                networkStatus: queryInfo.networkStatus || exports.NetworkStatus.ready,
+                networkStatus: exports.NetworkStatus.ready,
             };
             if (hasErrors && options.errorPolicy !== "ignore") {
                 aqr.errors = result.errors;
+                aqr.networkStatus = exports.NetworkStatus.error;
             }
             return aqr;
         }, function (networkError) {
@@ -1722,10 +1763,10 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a, networkStatus) {
         var _this = this;
-        var query = _a.query, variables = _a.variables, fetchPolicy = _a.fetchPolicy, refetchWritePolicy = _a.refetchWritePolicy, errorPolicy = _a.errorPolicy, returnPartialData = _a.returnPartialData, context = _a.context, notifyOnNetworkStatusChange = _a.notifyOnNetworkStatusChange;
+        var query = _a.query, variables = _a.variables, fetchPolicy = _a.fetchPolicy, refetchWritePolicy = _a.refetchWritePolicy, errorPolicy = _a.errorPolicy, returnPartialData = _a.returnPartialData, context = _a.context, notifyOnNetworkStatusChange = _a.notifyOnNetworkStatusChange, fetchBlockingPromise = _a.fetchBlockingPromise;
         var oldNetworkStatus = queryInfo.networkStatus;
         queryInfo.init({
-            document: query,
+            document: this.transform(query).document,
             variables: variables,
             networkStatus: networkStatus,
         });
@@ -1755,12 +1796,26 @@ var QueryManager = (function () {
                 refetchWritePolicy !== "merge") ? 1
                 : 2;
         var resultsFromLink = function () {
-            return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
+            var get = function () { return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
                 variables: variables,
                 context: context,
                 fetchPolicy: fetchPolicy,
                 errorPolicy: errorPolicy,
-            });
+            }); };
+            return fetchBlockingPromise ? fetchBlockingPromise.then(function (ok) { return ok ? get() : utilities.Observable.of(); }, function (error) {
+                var apolloError = errors.isApolloError(error)
+                    ? error
+                    : new errors.ApolloError({ clientErrors: [error] });
+                if (errorPolicy !== "ignore") {
+                    queryInfo.markError(apolloError);
+                }
+                return utilities.Observable.of({
+                    loading: false,
+                    networkStatus: exports.NetworkStatus.error,
+                    error: apolloError,
+                    data: readCache().result,
+                });
+            }) : get();
         };
         var shouldNotify = notifyOnNetworkStatusChange &&
             typeof oldNetworkStatus === "number" &&
@@ -1836,11 +1891,6 @@ var QueryManager = (function () {
 }());
 
 var hasSuggestedDevtools = false;
-function mergeOptions(defaults, options) {
-    return utilities.compact(defaults, options, options.variables && {
-        variables: tslib.__assign(tslib.__assign({}, defaults.variables), options.variables),
-    });
-}
 var ApolloClient = (function () {
     function ApolloClient(options) {
         var _this = this;
@@ -1939,7 +1989,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.watchQuery = function (options) {
         if (this.defaultOptions.watchQuery) {
-            options = mergeOptions(this.defaultOptions.watchQuery, options);
+            options = utilities.mergeOptions(this.defaultOptions.watchQuery, options);
         }
         if (this.disableNetworkFetches &&
             (options.fetchPolicy === 'network-only' ||
@@ -1950,7 +2000,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
-            options = mergeOptions(this.defaultOptions.query, options);
+            options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
         __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 ' +
@@ -1963,7 +2013,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.mutate = function (options) {
         if (this.defaultOptions.mutate) {
-            options = mergeOptions(this.defaultOptions.mutate, options);
+            options = utilities.mergeOptions(this.defaultOptions.mutate, options);
         }
         return this.queryManager.mutate(options);
     };
@@ -2072,15 +2122,16 @@ var ApolloClient = (function () {
 
 tsInvariant.setVerbosity(globals.DEV ? "log" : "silent");
 
-exports.Observable = utilities.Observable;
-exports.isReference = utilities.isReference;
-exports.makeReference = utilities.makeReference;
 exports.ApolloCache = cache.ApolloCache;
 exports.Cache = cache.Cache;
 exports.InMemoryCache = cache.InMemoryCache;
 exports.MissingFieldError = cache.MissingFieldError;
 exports.defaultDataIdFromObject = cache.defaultDataIdFromObject;
 exports.makeVar = cache.makeVar;
+exports.Observable = utilities.Observable;
+exports.isReference = utilities.isReference;
+exports.makeReference = utilities.makeReference;
+exports.mergeOptions = utilities.mergeOptions;
 exports.ApolloError = errors.ApolloError;
 exports.isApolloError = errors.isApolloError;
 exports.fromError = utils.fromError;
@@ -2095,7 +2146,6 @@ exports.gql = graphqlTag.gql;
 exports.resetCaches = graphqlTag.resetCaches;
 exports.ApolloClient = ApolloClient;
 exports.ObservableQuery = ObservableQuery;
-exports.mergeOptions = mergeOptions;
 for (var k in core) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = core[k];
 }