@apollo/client 3.1.0-pre.1 → 3.1.0

package/core/Reobserver.js

@@ -1,6 +1,6 @@
+import { NetworkStatus } from "./networkStatus.js";
+import { compact } from "../utilities/index.js";
 import { invariant } from 'ts-invariant';
-import { NetworkStatus } from './networkStatus.js';
-
 var Reobserver = (function () {
     function Reobserver(observer, options, fetch, shouldFetch) {
         this.observer = observer;
@@ -23,13 +23,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;
     };
@@ -75,6 +69,7 @@ var Reobserver = (function () {
                     poll();
                 }
             }
+            ;
         };
         var poll = function () {
             var info = _this.pollingInfo;
@@ -87,6 +82,5 @@ var Reobserver = (function () {
     };
     return Reobserver;
 }());
-
 export { Reobserver };
-//# sourceMappingURL=Reobserver.js.map
+//# sourceMappingURL=Reobserver.js.map

package/core/Reobserver.js.map

@@ -1 +1 @@
-{"version":3,"file":"Reobserver.js","sources":["Reobserver.js"],"sourcesContent":["import { NetworkStatus } from './networkStatus';\nimport { invariant } from 'ts-invariant';\nvar Reobserver = (function () {\n    function Reobserver(observer, options, fetch, shouldFetch) {\n        this.observer = observer;\n        this.options = options;\n        this.fetch = fetch;\n        this.shouldFetch = shouldFetch;\n    }\n    Reobserver.prototype.reobserve = function (newOptions, newNetworkStatus) {\n        if (newOptions) {\n            this.updateOptions(newOptions);\n        }\n        else {\n            this.updatePolling();\n        }\n        var concast = this.fetch(this.options, newNetworkStatus);\n        if (this.concast) {\n            this.concast.removeObserver(this.observer, true);\n        }\n        concast.addObserver(this.observer);\n        return (this.concast = concast).promise;\n    };\n    Reobserver.prototype.updateOptions = function (newOptions) {\n        var _this = this;\n        Object.keys(newOptions).forEach(function (key) {\n            var value = newOptions[key];\n            if (value !== void 0) {\n                _this.options[key] = value;\n            }\n        });\n        this.updatePolling();\n        return this;\n    };\n    Reobserver.prototype.stop = function () {\n        if (this.concast) {\n            this.concast.removeObserver(this.observer);\n            delete this.concast;\n        }\n        if (this.pollingInfo) {\n            clearTimeout(this.pollingInfo.timeout);\n            this.options.pollInterval = 0;\n            this.updatePolling();\n        }\n    };\n    Reobserver.prototype.updatePolling = function () {\n        var _this = this;\n        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;\n        if (!pollInterval) {\n            if (pollingInfo) {\n                clearTimeout(pollingInfo.timeout);\n                delete this.pollingInfo;\n            }\n            return;\n        }\n        if (pollingInfo &&\n            pollingInfo.interval === pollInterval) {\n            return;\n        }\n        process.env.NODE_ENV === \"production\" ? invariant(pollInterval, 21) : invariant(pollInterval, 'Attempted to start a polling query without a polling interval.');\n        if (this.shouldFetch === false) {\n            return;\n        }\n        var info = pollingInfo || (this.pollingInfo = {});\n        info.interval = pollInterval;\n        var maybeFetch = function () {\n            if (_this.pollingInfo) {\n                if (_this.shouldFetch && _this.shouldFetch()) {\n                    _this.reobserve({\n                        fetchPolicy: \"network-only\",\n                    }, NetworkStatus.poll).then(poll, poll);\n                }\n                else {\n                    poll();\n                }\n            }\n            ;\n        };\n        var poll = function () {\n            var info = _this.pollingInfo;\n            if (info) {\n                clearTimeout(info.timeout);\n                info.timeout = setTimeout(maybeFetch, info.interval);\n            }\n        };\n        poll();\n    };\n    return Reobserver;\n}());\nexport { Reobserver };\n//# sourceMappingURL=Reobserver.js.map"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reobserver.js","sourceRoot":"","sources":["../../src/core/Reobserver.ts"],"names":[],"mappings":"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"}

package/core/core.cjs.js

@@ -7,9 +7,9 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 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 utilities = require('../utilities');
 var errors = require('../errors');
 var visitor = require('graphql/language/visitor');
 var cache = require('../cache');
@@ -91,13 +91,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, utilities.compact(newOptions));
         this.updatePolling();
         return this;
     };
@@ -156,16 +150,11 @@ var Reobserver = (function () {
     return Reobserver;
 }());
 
-var hasError = function (storeValue, policy) {
-    if (policy === void 0) { policy = 'none'; }
-    return storeValue && (storeValue.networkError ||
-        (policy === 'none' && utilities.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;
@@ -189,6 +178,7 @@ var ObservableQuery = (function (_super) {
         var opDef = utilities.getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
         _this.queryManager = queryManager;
+        _this.queryInfo = queryInfo;
         return _this;
     }
     Object.defineProperty(ObservableQuery.prototype, "variables", {
@@ -218,54 +208,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 errors.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) {
@@ -284,29 +252,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;
@@ -314,10 +278,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) {
@@ -408,9 +369,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) {
@@ -422,35 +390,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 });
     };
@@ -510,7 +449,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;
@@ -815,6 +754,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,
@@ -830,21 +772,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) {
@@ -855,6 +804,7 @@ var QueryInfo = (function () {
         }
         this.observableQuery = oq;
         if (oq) {
+            oq["queryInfo"] = this;
             this.listeners.add(this.oqListener = function () { return oq.reobserve(); });
         }
         else {
@@ -889,13 +839,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();
@@ -903,6 +846,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)) {
@@ -914,7 +862,6 @@ var QueryInfo = (function () {
                 callback: function (diff) { return _this.setDiff(diff); },
             });
         }
-        return this;
     };
     QueryInfo.prototype.markResult = function (result, options, allowCacheWrite) {
         var _this = this;
@@ -953,6 +900,7 @@ var QueryInfo = (function () {
                         returnPartialData: true,
                         optimistic: true,
                     });
+                    _this.updateWatch(options.variables);
                     _this.diff = diff;
                     if (diff.complete) {
                         result.data = diff.result;
@@ -1188,8 +1136,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;
@@ -1226,11 +1178,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,
@@ -1265,9 +1220,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) {
@@ -1463,10 +1415,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" ||
@@ -1500,7 +1448,13 @@ var QueryManager = (function () {
         var concast = new utilities.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) {
@@ -1511,13 +1465,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;
@@ -1526,11 +1475,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 utilities.Observable.of({
-                data: data,
-                loading: isNetworkRequestInFlight(networkStatus),
-                networkStatus: networkStatus,
-            }); };
+            var fromData = function (data) { return utilities.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,
@@ -1604,13 +1549,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) {
@@ -1752,7 +1690,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.watchQuery = function (options) {
         if (this.defaultOptions.watchQuery) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.watchQuery), options);
+            options = utilities.compact(this.defaultOptions.watchQuery, options);
         }
         if (this.disableNetworkFetches &&
             (options.fetchPolicy === 'network-only' ||
@@ -1763,7 +1701,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.query), options);
+            options = utilities.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 ' +
@@ -1776,7 +1714,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.mutate = function (options) {
         if (this.defaultOptions.mutate) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.mutate), options);
+            options = utilities.compact(this.defaultOptions.mutate, options);
         }
         return this.queryManager.mutate(options);
     };