@apollo/client 3.1.0-pre.1 → 3.1.0

package/apollo-client.cjs.js

@@ -991,6 +991,25 @@ function graphQLResultHasError(result) {
 var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
     navigator.product === 'ReactNative');
 
+function compact() {
+    var objects = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        objects[_i] = arguments[_i];
+    }
+    var result = Object.create(null);
+    objects.forEach(function (obj) {
+        if (!obj)
+            return;
+        Object.keys(obj).forEach(function (key) {
+            var value = obj[key];
+            if (value !== void 0) {
+                result[key] = value;
+            }
+        });
+    });
+    return result;
+}
+
 function fromError(errorValue) {
     return new Observable(function (observer) {
         observer.error(errorValue);
@@ -1558,13 +1577,7 @@ var Reobserver = (function () {
         return (this.concast = concast).promise;
     };
     Reobserver.prototype.updateOptions = function (newOptions) {
-        var _this = this;
-        Object.keys(newOptions).forEach(function (key) {
-            var value = newOptions[key];
-            if (value !== void 0) {
-                _this.options[key] = value;
-            }
-        });
+        Object.assign(this.options, compact(newOptions));
         this.updatePolling();
         return this;
     };
@@ -1623,16 +1636,11 @@ var Reobserver = (function () {
     return Reobserver;
 }());
 
-var hasError = function (storeValue, policy) {
-    if (policy === void 0) { policy = 'none'; }
-    return storeValue && (storeValue.networkError ||
-        (policy === 'none' && isNonEmptyArray(storeValue.graphQLErrors)));
-};
 var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
-        var queryManager = _a.queryManager, options = _a.options;
+        var queryManager = _a.queryManager, queryInfo = _a.queryInfo, options = _a.options;
         var _this = _super.call(this, function (observer) {
             return _this.onSubscribe(observer);
         }) || this;
@@ -1656,6 +1664,7 @@ var ObservableQuery = (function (_super) {
         var opDef = getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
         _this.queryManager = queryManager;
+        _this.queryInfo = queryInfo;
         return _this;
     }
     Object.defineProperty(ObservableQuery.prototype, "variables", {
@@ -1685,54 +1694,32 @@ var ObservableQuery = (function (_super) {
         });
     };
     ObservableQuery.prototype.getCurrentResult = function () {
-        var _a = this, lastResult = _a.lastResult, lastError = _a.lastError, fetchPolicy = _a.options.fetchPolicy;
-        var isNetworkFetchPolicy = fetchPolicy === 'network-only' ||
-            fetchPolicy === 'no-cache';
-        var networkStatus = lastError ? exports.NetworkStatus.error :
-            lastResult ? lastResult.networkStatus :
-                isNetworkFetchPolicy ? exports.NetworkStatus.loading :
-                    exports.NetworkStatus.ready;
-        var result = {
-            data: !lastError && lastResult && lastResult.data || void 0,
-            error: lastError,
-            loading: isNetworkRequestInFlight(networkStatus),
-            networkStatus: networkStatus,
-        };
+        var _a = this, lastResult = _a.lastResult, lastError = _a.lastError;
+        var networkStatus = this.queryInfo.networkStatus || exports.NetworkStatus.ready;
+        var result = tslib.__assign(tslib.__assign({}, (lastError ? { error: lastError } : lastResult)), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
         if (this.isTornDown) {
             return result;
         }
-        var _b = this.getCurrentQueryResult(), data = _b.data, partial = _b.partial;
-        Object.assign(result, { data: data, partial: partial });
-        var queryStoreValue = this.queryManager.getQueryStoreValue(this.queryId);
-        if (queryStoreValue) {
-            var networkStatus_1 = queryStoreValue.networkStatus;
-            if (hasError(queryStoreValue, this.options.errorPolicy)) {
-                return Object.assign(result, {
-                    data: void 0,
-                    networkStatus: networkStatus_1,
-                    error: new ApolloError({
-                        graphQLErrors: queryStoreValue.graphQLErrors,
-                        networkError: queryStoreValue.networkError,
-                    }),
-                });
-            }
-            if (queryStoreValue.variables) {
-                this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), queryStoreValue.variables);
-            }
-            Object.assign(result, {
-                loading: isNetworkRequestInFlight(networkStatus_1),
-                networkStatus: networkStatus_1,
-            });
-            if (queryStoreValue.graphQLErrors && this.options.errorPolicy === 'all') {
-                result.errors = queryStoreValue.graphQLErrors;
+        var _b = this.options.fetchPolicy, fetchPolicy = _b === void 0 ? 'cache-first' : _b;
+        if (fetchPolicy === 'no-cache' ||
+            fetchPolicy === 'network-only') {
+            result.partial = false;
+        }
+        else if (!result.data ||
+            !this.queryManager.transform(this.options.query).hasForcedResolvers) {
+            var diff = this.queryInfo.getDiff();
+            result.partial = !diff.complete;
+            result.data = (diff.complete ||
+                this.options.returnPartialData) ? diff.result : void 0;
+            if (diff.complete &&
+                result.networkStatus === exports.NetworkStatus.loading &&
+                (fetchPolicy === 'cache-first' ||
+                    fetchPolicy === 'cache-only')) {
+                result.networkStatus = exports.NetworkStatus.ready;
+                result.loading = false;
             }
         }
-        if (partial) {
-            this.resetLastResults();
-        }
-        else {
-            this.updateLastResult(result);
-        }
+        this.updateLastResult(result);
         return result;
     };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
@@ -1751,29 +1738,25 @@ var ObservableQuery = (function (_super) {
         this.isTornDown = false;
     };
     ObservableQuery.prototype.resetQueryStoreErrors = function () {
-        var queryStore = this.queryManager.getQueryStoreValue(this.queryId);
-        if (queryStore) {
-            queryStore.networkError = undefined;
-            queryStore.graphQLErrors = [];
-        }
+        this.queryManager.resetErrors(this.queryId);
     };
     ObservableQuery.prototype.refetch = function (variables) {
         var fetchPolicy = this.options.fetchPolicy;
         if (fetchPolicy === 'cache-only') {
             return Promise.reject(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(12) : new tsInvariant.InvariantError('cache-only fetchPolicy option should not be used together with query refetch.'));
         }
+        var reobserveOptions = {
+            pollInterval: 0,
+        };
         if (fetchPolicy !== 'no-cache' &&
             fetchPolicy !== 'cache-and-network') {
-            fetchPolicy = 'network-only';
+            reobserveOptions.fetchPolicy = 'network-only';
+            reobserveOptions.nextFetchPolicy = fetchPolicy;
         }
         if (variables && !equality.equal(this.options.variables, variables)) {
-            this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
+            reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
-        return this.newReobserver(false).reobserve({
-            fetchPolicy: fetchPolicy,
-            variables: this.options.variables,
-            pollInterval: 0,
-        }, exports.NetworkStatus.refetch);
+        return this.newReobserver(false).reobserve(reobserveOptions, exports.NetworkStatus.refetch);
     };
     ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
         var _this = this;
@@ -1781,10 +1764,7 @@ var ObservableQuery = (function (_super) {
         var qid = this.queryManager.generateQueryId();
         if (combinedOptions.notifyOnNetworkStatusChange) {
             var currentResult = this.getCurrentResult();
-            var queryInfo = this.queryManager.getQueryStoreValue(this.queryId);
-            if (queryInfo) {
-                queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
-            }
+            this.queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
             this.observer.next(tslib.__assign(tslib.__assign({}, currentResult), { loading: true, networkStatus: exports.NetworkStatus.fetchMore }));
         }
         return this.queryManager.fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore).then(function (fetchMoreResult) {
@@ -1875,9 +1855,16 @@ var ObservableQuery = (function (_super) {
         }, exports.NetworkStatus.setVariables);
     };
     ObservableQuery.prototype.updateQuery = function (mapFn) {
+        var _a;
         var queryManager = this.queryManager;
-        var previousResult = this.getCurrentQueryResult(false).data;
-        var newResult = mapFn(previousResult, {
+        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;
+        var newResult = mapFn(result, {
             variables: this.variables,
         });
         if (newResult) {
@@ -1889,35 +1876,6 @@ var ObservableQuery = (function (_super) {
             queryManager.broadcastQueries();
         }
     };
-    ObservableQuery.prototype.getCurrentQueryResult = function (optimistic) {
-        var _a, _b;
-        if (optimistic === void 0) { optimistic = true; }
-        var fetchPolicy = this.options.fetchPolicy;
-        var lastData = (_a = this.lastResult) === null || _a === void 0 ? void 0 : _a.data;
-        if (fetchPolicy === 'no-cache' ||
-            fetchPolicy === 'network-only') {
-            return {
-                data: lastData,
-                partial: false,
-            };
-        }
-        var _c = this.queryManager.cache.diff({
-            query: this.options.query,
-            variables: this.variables,
-            previousResult: (_b = this.lastResult) === null || _b === void 0 ? void 0 : _b.data,
-            returnPartialData: true,
-            optimistic: optimistic,
-        }), result = _c.result, complete = _c.complete;
-        if (lastData &&
-            !this.lastError &&
-            this.queryManager.transform(this.options.query).hasForcedResolvers) {
-            result = lastData;
-        }
-        return {
-            data: (complete || this.options.returnPartialData) ? result : void 0,
-            partial: !complete,
-        };
-    };
     ObservableQuery.prototype.startPolling = function (pollInterval) {
         this.getReobserver().updateOptions({ pollInterval: pollInterval });
     };
@@ -1977,7 +1935,7 @@ var ObservableQuery = (function (_super) {
         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 !queryManager.checkInFlight(queryId); }));
+        }, !queryManager.ssrMode && (function () { return !isNetworkRequestInFlight(_this.queryInfo.networkStatus); }));
     };
     ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
         this.isTornDown = false;
@@ -2918,6 +2876,11 @@ var defaultDataIdFromObject = function (_a, context) {
 };
 var nullKeyFieldsFn = function () { return void 0; };
 var simpleKeyArgsFn = function (_args, context) { return context.fieldName; };
+var mergeTrueFn = function (existing, incoming, _a) {
+    var mergeObjects = _a.mergeObjects;
+    return mergeObjects(existing, incoming);
+};
+var mergeFalseFn = function (_, incoming) { return incoming; };
 var Policies = (function () {
     function Policies(config) {
         this.config = config;
@@ -3001,8 +2964,11 @@ var Policies = (function () {
                                         existing.keyFn;
                         if (typeof read === "function")
                             existing.read = read;
-                        if (typeof merge === "function")
-                            existing.merge = merge;
+                        existing.merge =
+                            typeof merge === "function" ? merge :
+                                merge === true ? mergeTrueFn :
+                                    merge === false ? mergeFalseFn :
+                                        existing.merge;
                     }
                     if (existing.read && existing.merge) {
                         existing.keyFn = existing.keyFn || simpleKeyArgsFn;
@@ -3088,6 +3054,7 @@ var Policies = (function () {
                 typename: typename,
                 fieldName: fieldName,
                 field: fieldSpec.field || null,
+                variables: fieldSpec.variables,
             };
             var args = argsFromFieldSpecifier(fieldSpec);
             while (keyFn) {
@@ -3803,6 +3770,9 @@ var QueryInfo = (function () {
             !equality.equal(this.variables, query.variables)) {
             networkStatus = exports.NetworkStatus.setVariables;
         }
+        if (!equality.equal(query.variables, this.variables)) {
+            this.diff = null;
+        }
         Object.assign(this, {
             document: query.document,
             variables: query.variables,
@@ -3818,21 +3788,28 @@ var QueryInfo = (function () {
         }
         return this;
     };
-    QueryInfo.prototype.setDirty = function () {
-        var _this = this;
-        if (!this.dirty) {
-            this.dirty = true;
-            if (!this.notifyTimeout) {
-                this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
-            }
+    QueryInfo.prototype.getDiff = function (variables) {
+        if (variables === void 0) { variables = this.variables; }
+        if (this.diff && equality.equal(variables, this.variables)) {
+            return this.diff;
         }
-        return this;
+        this.updateWatch(this.variables = variables);
+        return this.diff = this.cache.diff({
+            query: this.document,
+            variables: variables,
+            returnPartialData: true,
+            optimistic: true,
+        });
     };
     QueryInfo.prototype.setDiff = function (diff) {
+        var _this = this;
         var oldDiff = this.diff;
         this.diff = diff;
         if (!this.dirty && (diff === null || diff === void 0 ? void 0 : diff.result) !== (oldDiff === null || oldDiff === void 0 ? void 0 : oldDiff.result)) {
-            this.setDirty();
+            this.dirty = true;
+            if (!this.notifyTimeout) {
+                this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
+            }
         }
     };
     QueryInfo.prototype.setObservableQuery = function (oq) {
@@ -3843,6 +3820,7 @@ var QueryInfo = (function () {
         }
         this.observableQuery = oq;
         if (oq) {
+            oq["queryInfo"] = this;
             this.listeners.add(this.oqListener = function () { return oq.reobserve(); });
         }
         else {
@@ -3877,13 +3855,6 @@ var QueryInfo = (function () {
     QueryInfo.prototype.stop = function () {
         this.cancel();
         delete this.cancel;
-        this.variables =
-            this.networkStatus =
-                this.networkError =
-                    this.graphQLErrors =
-                        this.lastWatch =
-                            this.lastWrittenResult =
-                                this.lastWrittenVars = void 0;
         var oq = this.observableQuery;
         if (oq)
             oq.stopPolling();
@@ -3891,6 +3862,11 @@ var QueryInfo = (function () {
     QueryInfo.prototype.cancel = function () { };
     QueryInfo.prototype.updateWatch = function (variables) {
         var _this = this;
+        if (variables === void 0) { variables = this.variables; }
+        var oq = this.observableQuery;
+        if (oq && oq.options.fetchPolicy === "no-cache") {
+            return;
+        }
         if (!this.lastWatch ||
             this.lastWatch.query !== this.document ||
             !equality.equal(variables, this.lastWatch.variables)) {
@@ -3902,7 +3878,6 @@ var QueryInfo = (function () {
                 callback: function (diff) { return _this.setDiff(diff); },
             });
         }
-        return this;
     };
     QueryInfo.prototype.markResult = function (result, options, allowCacheWrite) {
         var _this = this;
@@ -3941,6 +3916,7 @@ var QueryInfo = (function () {
                         returnPartialData: true,
                         optimistic: true,
                     });
+                    _this.updateWatch(options.variables);
                     _this.diff = diff;
                     if (diff.complete) {
                         result.data = diff.result;
@@ -4176,8 +4152,12 @@ var QueryManager = (function () {
         });
         return store;
     };
-    QueryManager.prototype.getQueryStoreValue = function (queryId) {
-        return queryId ? this.queries.get(queryId) : undefined;
+    QueryManager.prototype.resetErrors = function (queryId) {
+        var queryInfo = this.queries.get(queryId);
+        if (queryInfo) {
+            queryInfo.networkError = undefined;
+            queryInfo.graphQLErrors = [];
+        }
     };
     QueryManager.prototype.transform = function (document) {
         var transformCache = this.transformCache;
@@ -4214,11 +4194,14 @@ var QueryManager = (function () {
         if (typeof options.notifyOnNetworkStatusChange === 'undefined') {
             options.notifyOnNetworkStatusChange = false;
         }
+        var queryInfo = new QueryInfo(this.cache);
         var observable = new ObservableQuery({
             queryManager: this,
+            queryInfo: queryInfo,
             options: options,
         });
-        this.getQuery(observable.queryId).init({
+        this.queries.set(observable.queryId, queryInfo);
+        queryInfo.init({
             document: options.query,
             observableQuery: observable,
             variables: options.variables,
@@ -4253,9 +4236,6 @@ var QueryManager = (function () {
         if (queryInfo)
             queryInfo.stop();
     };
-    QueryManager.prototype.addQueryListener = function (queryId, listener) {
-        this.getQuery(queryId).listeners.add(listener);
-    };
     QueryManager.prototype.clearStore = function () {
         this.cancelPendingFetches(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(20) : new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)'));
         this.queries.forEach(function (queryInfo) {
@@ -4451,10 +4431,6 @@ var QueryManager = (function () {
         var queryInfo = this.getQuery(queryId);
         var oldNetworkStatus = queryInfo.networkStatus;
         var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
-        if (fetchPolicy === "cache-and-network" ||
-            fetchPolicy === "network-only") {
-            options.fetchPolicy = "cache-first";
-        }
         var mightUseNetwork = fetchPolicy === "cache-first" ||
             fetchPolicy === "cache-and-network" ||
             fetchPolicy === "network-only" ||
@@ -4488,7 +4464,13 @@ var QueryManager = (function () {
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
             : fromVariables(normalized.variables));
-        concast.cleanup(function () { return _this.fetchCancelFns.delete(queryId); });
+        concast.cleanup(function () {
+            _this.fetchCancelFns.delete(queryId);
+            if (options.nextFetchPolicy) {
+                options.fetchPolicy = options.nextFetchPolicy;
+                options.nextFetchPolicy = void 0;
+            }
+        });
         return concast;
     };
     QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, options, networkStatus) {
@@ -4499,13 +4481,8 @@ var QueryManager = (function () {
             variables: variables,
             lastRequestId: this.generateRequestId(),
             networkStatus: networkStatus,
-        }).updateWatch(variables);
-        var readCache = function () { return _this.cache.diff({
-            query: query,
-            variables: variables,
-            returnPartialData: true,
-            optimistic: true,
-        }); };
+        });
+        var readCache = function () { return queryInfo.getDiff(variables); };
         var resultsFromCache = function (diff, networkStatus) {
             if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || exports.NetworkStatus.loading; }
             var data = diff.result;
@@ -4514,11 +4491,7 @@ var QueryManager = (function () {
                 !equality.equal(data, {})) {
                 process.env.NODE_ENV === "production" || tsInvariant.invariant.warn("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
             }
-            var fromData = function (data) { return Observable.of({
-                data: data,
-                loading: isNetworkRequestInFlight(networkStatus),
-                networkStatus: networkStatus,
-            }); };
+            var fromData = function (data) { return Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
             if (_this.transform(query).hasForcedResolvers) {
                 return _this.localState.runResolvers({
                     document: query,
@@ -4592,13 +4565,6 @@ var QueryManager = (function () {
         var newContext = this.localState.prepareContext(context);
         return tslib.__assign(tslib.__assign({}, newContext), { clientAwareness: this.clientAwareness });
     };
-    QueryManager.prototype.checkInFlight = function (queryId) {
-        var query = this.getQueryStoreValue(queryId);
-        return (!!query &&
-            !!query.networkStatus &&
-            query.networkStatus !== exports.NetworkStatus.ready &&
-            query.networkStatus !== exports.NetworkStatus.error);
-    };
     return QueryManager;
 }());
 function markMutationResult(mutation, cache) {
@@ -4740,7 +4706,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.watchQuery = function (options) {
         if (this.defaultOptions.watchQuery) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.watchQuery), options);
+            options = compact(this.defaultOptions.watchQuery, options);
         }
         if (this.disableNetworkFetches &&
             (options.fetchPolicy === 'network-only' ||
@@ -4751,7 +4717,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.query), options);
+            options = compact(this.defaultOptions.query, options);
         }
         process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 10) : tsInvariant.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 ' +
@@ -4764,7 +4730,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.mutate = function (options) {
         if (this.defaultOptions.mutate) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.mutate), options);
+            options = compact(this.defaultOptions.mutate, options);
         }
         return this.queryManager.mutate(options);
     };
@@ -5172,7 +5138,7 @@ var MutationData = (function (_super) {
     MutationData.prototype.cleanup = function () {
     };
     MutationData.prototype.mutate = function (mutationFunctionOptions) {
-        return this.refreshClient().client.mutate(tslib.__assign(tslib.__assign({}, (this.getOptions() || {})), (mutationFunctionOptions || {})));
+        return this.refreshClient().client.mutate(compact(this.getOptions(), mutationFunctionOptions));
     };
     MutationData.prototype.onMutationStart = function () {
         if (!this.result.loading && !this.getOptions().ignoreResults) {