@apollo/client 3.6.0-beta.9 → 3.6.0-rc.0

package/apollo-client.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var tsInvariant = require('ts-invariant');
-var equal = require('@wry/equality');
+var equality = require('@wry/equality');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
 var graphql = require('graphql');
@@ -13,8 +13,7 @@ var context = require('@wry/context');
 var trie = require('@wry/trie');
 var graphqlTag = require('graphql-tag');
 var React = require('react');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+var index_js = require('use-sync-external-store/shim/index.js');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -28,7 +27,6 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 function maybe(thunk) {
@@ -542,7 +540,7 @@ function removeDirectivesFromDocument(directives, doc) {
     return modifiedDoc;
 }
 var addTypenameToDocument = Object.assign(function (doc) {
-    return graphql.visit(checkDocument(doc), {
+    return graphql.visit(doc, {
         SelectionSet: {
             enter: function (node, _key, parent) {
                 if (parent &&
@@ -1294,7 +1292,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.9';
+var version = '3.6.0-rc.0';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -2162,7 +2160,7 @@ var Layer = (function (_super) {
                     }
                     else if (ownStoreObject !== parentStoreObject) {
                         Object.keys(ownStoreObject).forEach(function (storeFieldName) {
-                            if (!equal.equal(ownStoreObject[storeFieldName], parentStoreObject[storeFieldName])) {
+                            if (!equality.equal(ownStoreObject[storeFieldName], parentStoreObject[storeFieldName])) {
                                 _this.group.dirty(dataId, storeFieldName);
                             }
                         });
@@ -2206,7 +2204,7 @@ var Stump = (function (_super) {
 function storeObjectReconciler(existingObject, incomingObject, property) {
     var existingValue = existingObject[property];
     var incomingValue = incomingObject[property];
-    return equal.equal(existingValue, incomingValue) ? existingValue : incomingValue;
+    return equality.equal(existingValue, incomingValue) ? existingValue : incomingValue;
 }
 function supportsResultCaching(store) {
     return !!(store instanceof EntityStore && store.group.caching);
@@ -3536,7 +3534,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
         return;
     if (isReference(existing))
         return;
-    if (equal.equal(existing, incoming))
+    if (equality.equal(existing, incoming))
         return;
     if (Object.keys(existing).every(function (key) { return store.getFieldValue(incoming, key) !== void 0; })) {
         return;
@@ -3850,7 +3848,7 @@ var InMemoryCache = (function (_super) {
                 return;
             }
         }
-        if (!lastDiff || !equal.equal(lastDiff.result, diff.result)) {
+        if (!lastDiff || !equality.equal(lastDiff.result, diff.result)) {
             c.callback(c.lastDiff = diff, lastDiff);
         }
     };
@@ -3909,7 +3907,6 @@ function isNetworkRequestInFlight(networkStatus) {
 }
 
 var assign = Object.assign, hasOwnProperty$2 = Object.hasOwnProperty;
-var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
@@ -3943,11 +3940,10 @@ var ObservableQuery = (function (_super) {
         _this.observers = new Set();
         _this.subscriptions = new Set();
         _this.isTornDown = false;
-        _this.options = options;
+        _this.options = tslib.__assign({ initialFetchPolicy: options.fetchPolicy || "cache-first" }, options);
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
         var opDef = getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
-        _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
         _this.queryManager = queryManager;
         _this.queryInfo = queryInfo;
         return _this;
@@ -3995,7 +3991,7 @@ var ObservableQuery = (function (_super) {
             if (diff.complete || this.options.returnPartialData) {
                 result.data = diff.result;
             }
-            if (equal.equal(result.data, {})) {
+            if (equality.equal(result.data, {})) {
                 result.data = void 0;
             }
             if (diff.complete) {
@@ -4026,13 +4022,13 @@ var ObservableQuery = (function (_super) {
         return result;
     };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
-        return !this.last || !equal.equal(this.last.result, newResult);
+        return !this.last || !equality.equal(this.last.result, newResult);
     };
     ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
         var last = this.last;
         if (last &&
             last[key] &&
-            (!variablesMustMatch || equal.equal(last.variables, this.variables))) {
+            (!variablesMustMatch || equality.equal(last.variables, this.variables))) {
             return last[key];
         }
     };
@@ -4071,7 +4067,7 @@ var ObservableQuery = (function (_super) {
                 __DEV__ && tsInvariant.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 })?"));
             }
         }
-        if (variables && !equal.equal(this.options.variables, variables)) {
+        if (variables && !equality.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
         this.queryInfo.resetLastWrite();
@@ -4081,35 +4077,49 @@ var ObservableQuery = (function (_super) {
         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 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__ && 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.");
-                    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.options.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.options.query)) {
+                reobserveCacheFirst(_this);
+            }
         });
     };
     ObservableQuery.prototype.subscribeToMore = function (options) {
@@ -4152,7 +4162,7 @@ var ObservableQuery = (function (_super) {
         return this.reobserve(newOptions);
     };
     ObservableQuery.prototype.setVariables = function (variables) {
-        if (equal.equal(this.variables, variables)) {
+        if (equality.equal(this.variables, variables)) {
             return this.observers.size
                 ? this.result()
                 : Promise.resolve();
@@ -4162,7 +4172,7 @@ var ObservableQuery = (function (_super) {
             return Promise.resolve();
         }
         return this.reobserve({
-            fetchPolicy: this.initialFetchPolicy,
+            fetchPolicy: this.options.initialFetchPolicy,
             variables: variables,
         }, exports.NetworkStatus.setVariables);
     };
@@ -4195,19 +4205,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;
@@ -4277,16 +4286,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 = mergeOptions(this.options, newOptions || {});
         var options = useDisposableConcast
-            ? compact(this.options, newOptions)
-            : assign(this.options, compact(newOptions));
+            ? mergedOptions
+            : assign(this.options, mergedOptions);
         if (!useDisposableConcast) {
             this.updatePolling();
             if (newOptions &&
                 newOptions.variables &&
-                !newOptions.fetchPolicy &&
-                !equal.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;
                 }
@@ -4350,6 +4361,23 @@ var ObservableQuery = (function (_super) {
     return ObservableQuery;
 }(zenObservableTs.Observable));
 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__ && tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
 }
@@ -4659,10 +4687,10 @@ var QueryInfo = (function () {
         var networkStatus = query.networkStatus || exports.NetworkStatus.loading;
         if (this.variables &&
             this.networkStatus !== exports.NetworkStatus.loading &&
-            !equal.equal(this.variables, query.variables)) {
+            !equality.equal(this.variables, query.variables)) {
             networkStatus = exports.NetworkStatus.setVariables;
         }
-        if (!equal.equal(query.variables, this.variables)) {
+        if (!equality.equal(query.variables, this.variables)) {
             this.lastDiff = void 0;
         }
         Object.assign(this, {
@@ -4688,7 +4716,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.getDiff = function (variables) {
         if (variables === void 0) { variables = this.variables; }
         var options = this.getDiffOptions(variables);
-        if (this.lastDiff && equal.equal(options, this.lastDiff.options)) {
+        if (this.lastDiff && equality.equal(options, this.lastDiff.options)) {
             return this.lastDiff.diff;
         }
         this.updateWatch(this.variables = variables);
@@ -4722,7 +4750,7 @@ var QueryInfo = (function () {
         var oldDiff = this.lastDiff && this.lastDiff.diff;
         this.updateLastDiff(diff);
         if (!this.dirty &&
-            !equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
+            !equality.equal(oldDiff && oldDiff.result, diff && diff.result)) {
             this.dirty = true;
             if (!this.notifyTimeout) {
                 this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
@@ -4740,11 +4768,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);
                 }
             });
         }
@@ -4796,7 +4825,7 @@ var QueryInfo = (function () {
         }
         var watchOptions = tslib.__assign(tslib.__assign({}, this.getDiffOptions(variables)), { watcher: this, callback: function (diff) { return _this.setDiff(diff); } });
         if (!this.lastWatch ||
-            !equal.equal(watchOptions, this.lastWatch)) {
+            !equality.equal(watchOptions, this.lastWatch)) {
             this.cancel();
             this.cancel = this.cache.watch(this.lastWatch = watchOptions);
         }
@@ -4808,8 +4837,8 @@ var QueryInfo = (function () {
         var lastWrite = this.lastWrite;
         return !(lastWrite &&
             lastWrite.dmCount === destructiveMethodCounts.get(this.cache) &&
-            equal.equal(variables, lastWrite.variables) &&
-            equal.equal(result.data, lastWrite.result.data));
+            equality.equal(variables, lastWrite.variables) &&
+            equality.equal(result.data, lastWrite.result.data));
     };
     QueryInfo.prototype.markResult = function (result, options, cacheWriteBehavior) {
         var _this = this;
@@ -5393,8 +5422,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)
@@ -5478,10 +5509,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) {
@@ -5599,7 +5631,7 @@ 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,
@@ -5612,7 +5644,7 @@ var QueryManager = (function () {
             var data = diff.result;
             if (__DEV__ &&
                 !returnPartialData &&
-                !equal.equal(data, {})) {
+                !equality.equal(data, {})) {
                 logMissingFieldErrors(diff.missing);
             }
             var fromData = function (data) { return zenObservableTs.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
@@ -5632,12 +5664,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() : zenObservableTs.Observable.of(); }, function (error) {
+                var apolloError = isApolloError(error)
+                    ? error
+                    : new ApolloError({ clientErrors: [error] });
+                if (errorPolicy !== "ignore") {
+                    queryInfo.markError(apolloError);
+                }
+                return zenObservableTs.Observable.of({
+                    loading: false,
+                    networkStatus: exports.NetworkStatus.error,
+                    error: apolloError,
+                    data: readCache().result,
+                });
+            }) : get();
         };
         var shouldNotify = notifyOnNetworkStatusChange &&
             typeof oldNetworkStatus === "number" &&
@@ -6075,26 +6121,9 @@ function verifyDocumentType(document, type) {
         "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
 }
 
-function useNormalizedOptions(optionsOrFunction) {
-    var optionsRef = React.useRef();
-    var options = optionsRef.current || Object.create(null);
-    if (typeof optionsOrFunction === "function") {
-        var newOptions = optionsOrFunction(options);
-        if (newOptions !== options) {
-            Object.assign(options, newOptions, newOptions.variables && {
-                variables: tslib.__assign(tslib.__assign({}, options.variables), newOptions.variables),
-            });
-        }
-    }
-    else if (optionsOrFunction && !equal__default(optionsOrFunction, options)) {
-        options = optionsOrFunction;
-    }
-    return optionsRef.current = options;
-}
-
 var hasOwnProperty = Object.prototype.hasOwnProperty;
-function useQuery(query, optionsOrFunction) {
-    var options = useNormalizedOptions(optionsOrFunction);
+function useQuery(query, options) {
+    if (options === void 0) { options = Object.create(null); }
     return useInternalState(useApolloClient(options.client), query).useQuery(options);
 }
 function useInternalState(client, query) {
@@ -6115,51 +6144,151 @@ var InternalState = (function () {
     function InternalState(client, query) {
         this.client = client;
         this.query = query;
+        this.ssrDisabledResult = maybeDeepFreeze({
+            loading: true,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.loading,
+        });
+        this.skipStandbyResult = maybeDeepFreeze({
+            loading: false,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.ready,
+        });
         this.toQueryResultCache = new (canUseWeakMap ? WeakMap : Map)();
         verifyDocumentType(query, exports.DocumentType.Query);
     }
     InternalState.prototype.forceUpdate = function () {
     };
     InternalState.prototype.useQuery = function (options) {
+        var _this = this;
+        this.renderPromises = React.useContext(getApolloContext()).renderPromises;
         this.useOptions(options);
         var obsQuery = this.useObservableQuery();
-        this.useSubscriptionEffect(obsQuery);
-        var result = this.getCurrentResult();
+        var result = index_js.useSyncExternalStore(React.useCallback(function () {
+            if (_this.renderPromises) {
+                return function () { };
+            }
+            var onNext = function () {
+                var previousResult = _this.result;
+                var result = obsQuery.getCurrentResult();
+                if (previousResult &&
+                    previousResult.loading === result.loading &&
+                    previousResult.networkStatus === result.networkStatus &&
+                    equality.equal(previousResult.data, result.data)) {
+                    return;
+                }
+                _this.setResult(result);
+            };
+            var onError = function (error) {
+                var last = obsQuery["last"];
+                subscription.unsubscribe();
+                try {
+                    obsQuery.resetLastResults();
+                    subscription = obsQuery.subscribe(onNext, onError);
+                }
+                finally {
+                    obsQuery["last"] = last;
+                }
+                if (!hasOwnProperty.call(error, 'graphQLErrors')) {
+                    throw error;
+                }
+                var previousResult = _this.result;
+                if (!previousResult ||
+                    (previousResult && previousResult.loading) ||
+                    !equality.equal(error, previousResult.error)) {
+                    _this.setResult({
+                        data: (previousResult && previousResult.data),
+                        error: error,
+                        loading: false,
+                        networkStatus: exports.NetworkStatus.error,
+                    });
+                }
+            };
+            var subscription = obsQuery.subscribe(onNext, onError);
+            return function () { return subscription.unsubscribe(); };
+        }, [
+            obsQuery,
+            this.renderPromises,
+            this.client.disableNetworkFetches,
+        ]), function () { return _this.getCurrentResult(); });
         this.unsafeHandlePartialRefetch(result);
         return this.toQueryResult(result);
     };
     InternalState.prototype.useOptions = function (options) {
-        this.renderPromises = React.useContext(getApolloContext()).renderPromises;
+        var _a;
         var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options);
-        if (!equal.equal(watchQueryOptions, this.watchQueryOptions)) {
+        var currentWatchQueryOptions = this.watchQueryOptions;
+        var resolveFetchBlockingPromise;
+        if (!equality.equal(watchQueryOptions, currentWatchQueryOptions)) {
             this.watchQueryOptions = watchQueryOptions;
+            if (currentWatchQueryOptions && this.observable) {
+                this.observable.reobserve(tslib.__assign({ fetchBlockingPromise: new Promise(function (resolve) {
+                        resolveFetchBlockingPromise = resolve;
+                    }) }, watchQueryOptions));
+                this.previousData = ((_a = this.result) === null || _a === void 0 ? void 0 : _a.data) || this.previousData;
+                this.result = void 0;
+            }
+        }
+        useUnblockFetchEffect(this.renderPromises, resolveFetchBlockingPromise);
+        this.ssrDisabled = !!(options.ssr === false ||
+            options.skip);
+        this.onCompleted = options.onCompleted || InternalState.prototype.onCompleted;
+        this.onError = options.onError || InternalState.prototype.onError;
+        if ((this.renderPromises || this.client.disableNetworkFetches) &&
+            this.queryHookOptions.ssr === false) {
+            this.result = this.ssrDisabledResult;
+        }
+        else if (this.queryHookOptions.skip ||
+            this.watchQueryOptions.fetchPolicy === 'standby') {
+            this.result = this.skipStandbyResult;
+        }
+        else if (this.result === this.ssrDisabledResult ||
+            this.result === this.skipStandbyResult) {
+            this.result = void 0;
         }
-        this.ssrDisabled = !!(options && (options.ssr === false ||
-            options.skip));
-        this.onCompleted = options
-            && options.onCompleted
-            || InternalState.prototype.onCompleted;
-        this.onError = options
-            && options.onError
-            || InternalState.prototype.onError;
     };
     InternalState.prototype.createWatchQueryOptions = function (_a) {
-        var _b;
         if (_a === void 0) { _a = {}; }
-        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; var otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
-        var watchQueryOptions = Object.assign(otherOptions, { query: this.query });
-        if (skip) {
-            watchQueryOptions.fetchPolicy = 'standby';
+        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; var defaultOptions = _a.defaultOptions, otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName", "defaultOptions"]);
+        var toMerge = [];
+        var globalDefaults = this.client.defaultOptions.watchQuery;
+        if (globalDefaults)
+            toMerge.push(globalDefaults);
+        if (defaultOptions)
+            toMerge.push(defaultOptions);
+        var latestOptions = this.observable && this.observable.options;
+        if (latestOptions && toMerge.length) {
+            var defaults_1 = toMerge.reduce(mergeOptions, Object.create(null));
+            toMerge.length = 1;
+            toMerge[0] = defaults_1;
+            Object.keys(defaults_1).forEach(function (defaultOptionName) {
+                var currentOptionValue = latestOptions[defaultOptionName];
+                if (hasOwnProperty.call(latestOptions, defaultOptionName) &&
+                    !equality.equal(defaults_1[defaultOptionName], currentOptionValue)) {
+                    defaults_1[defaultOptionName] = defaultOptionName === "variables"
+                        ? tslib.__assign(tslib.__assign({}, defaults_1.variables), currentOptionValue) : currentOptionValue;
+                }
+            });
         }
-        else if (((_b = watchQueryOptions.context) === null || _b === void 0 ? void 0 : _b.renderPromises) &&
+        toMerge.push(otherOptions);
+        var merged = toMerge.reduce(mergeOptions, Object.create(null));
+        var watchQueryOptions = Object.assign(merged, { query: this.query });
+        if (this.renderPromises &&
             (watchQueryOptions.fetchPolicy === 'network-only' ||
                 watchQueryOptions.fetchPolicy === 'cache-and-network')) {
             watchQueryOptions.fetchPolicy = 'cache-first';
         }
         else if (!watchQueryOptions.fetchPolicy) {
-            var defaultOptions = this.client.defaultOptions.watchQuery;
-            watchQueryOptions.fetchPolicy =
-                defaultOptions && defaultOptions.fetchPolicy || 'cache-first';
+            watchQueryOptions.fetchPolicy = 'cache-first';
+        }
+        if (skip) {
+            var _b = watchQueryOptions.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? watchQueryOptions.fetchPolicy : _b;
+            Object.assign(watchQueryOptions, {
+                initialFetchPolicy: initialFetchPolicy,
+                fetchPolicy: 'standby',
+            });
         }
         if (!watchQueryOptions.variables) {
             watchQueryOptions.variables = {};
@@ -6169,14 +6298,18 @@ var InternalState = (function () {
     InternalState.prototype.onCompleted = function (data) { };
     InternalState.prototype.onError = function (error) { };
     InternalState.prototype.useObservableQuery = function () {
-        var _this = this;
+        var resolveFetchBlockingPromise;
         var obsQuery = this.observable =
             this.renderPromises
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
-                || this.client.watchQuery(this.watchQueryOptions);
+                || this.client.watchQuery(tslib.__assign({ fetchBlockingPromise: new Promise(function (resolve) {
+                        resolveFetchBlockingPromise = resolve;
+                    }) }, this.watchQueryOptions));
+        useUnblockFetchEffect(this.renderPromises, resolveFetchBlockingPromise);
         this.obsQueryFields = React.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
+            reobserve: obsQuery.reobserve.bind(obsQuery),
             fetchMore: obsQuery.fetchMore.bind(obsQuery),
             updateQuery: obsQuery.updateQuery.bind(obsQuery),
             startPolling: obsQuery.startPolling.bind(obsQuery),
@@ -6186,92 +6319,11 @@ var InternalState = (function () {
         if (this.renderPromises) {
             this.renderPromises.registerSSRObservable(obsQuery);
             if (!this.ssrDisabled && obsQuery.getCurrentResult().loading) {
-                this.renderPromises.addQueryPromise({
-                    getOptions: function () { return obsQuery.options; },
-                    fetchData: function () { return new Promise(function (resolve) {
-                        var sub = obsQuery.subscribe({
-                            next: function (result) {
-                                if (!result.loading) {
-                                    resolve();
-                                    sub.unsubscribe();
-                                }
-                            },
-                            error: function () {
-                                resolve();
-                                sub.unsubscribe();
-                            },
-                            complete: function () {
-                                resolve();
-                            },
-                        });
-                    }); },
-                }, function () { return null; });
-                obsQuery.setOptions(this.watchQueryOptions).catch(function () { });
+                this.renderPromises.addObservableQueryPromise(obsQuery);
             }
         }
-        var prevOptionsRef = React.useRef({
-            watchQueryOptions: this.watchQueryOptions,
-        });
-        React.useEffect(function () {
-            if (_this.renderPromises) ;
-            else if (_this.watchQueryOptions !== prevOptionsRef.current.watchQueryOptions) {
-                obsQuery.setOptions(_this.watchQueryOptions).catch(function () { });
-                prevOptionsRef.current.watchQueryOptions = _this.watchQueryOptions;
-                _this.setResult(obsQuery.getCurrentResult());
-            }
-        }, [obsQuery, this.watchQueryOptions]);
         return obsQuery;
     };
-    InternalState.prototype.useSubscriptionEffect = function (obsQuery) {
-        var _this = this;
-        React.useEffect(function () {
-            if (_this.renderPromises) {
-                return;
-            }
-            var onNext = function () {
-                var previousResult = _this.result;
-                var result = obsQuery.getCurrentResult();
-                if (previousResult &&
-                    previousResult.loading === result.loading &&
-                    previousResult.networkStatus === result.networkStatus &&
-                    equal.equal(previousResult.data, result.data)) {
-                    return;
-                }
-                _this.setResult(result);
-            };
-            var onError = function (error) {
-                var last = obsQuery["last"];
-                subscription.unsubscribe();
-                try {
-                    obsQuery.resetLastResults();
-                    subscription = obsQuery.subscribe(onNext, onError);
-                }
-                finally {
-                    obsQuery["last"] = last;
-                }
-                if (!hasOwnProperty.call(error, 'graphQLErrors')) {
-                    throw error;
-                }
-                var previousResult = _this.result;
-                if (!previousResult ||
-                    (previousResult && previousResult.loading) ||
-                    !equal.equal(error, previousResult.error)) {
-                    _this.setResult({
-                        data: (previousResult && previousResult.data),
-                        error: error,
-                        loading: false,
-                        networkStatus: exports.NetworkStatus.error,
-                    });
-                }
-            };
-            var subscription = obsQuery.subscribe(onNext, onError);
-            return function () { return subscription.unsubscribe(); };
-        }, [
-            obsQuery,
-            this.renderPromises,
-            this.client.disableNetworkFetches,
-        ]);
-    };
     InternalState.prototype.setResult = function (nextResult) {
         var previousResult = this.result;
         if (previousResult && previousResult.data) {
@@ -6292,30 +6344,10 @@ var InternalState = (function () {
         }
     };
     InternalState.prototype.getCurrentResult = function () {
-        var result = this.result;
-        if (!result) {
-            result = this.result = this.observable.getCurrentResult();
-            this.handleErrorOrCompleted(result);
-        }
-        if ((this.renderPromises || this.client.disableNetworkFetches) &&
-            this.queryHookOptions.ssr === false) {
-            result = {
-                loading: true,
-                data: void 0,
-                error: void 0,
-                networkStatus: exports.NetworkStatus.loading,
-            };
-        }
-        else if (this.queryHookOptions.skip ||
-            this.queryHookOptions.fetchPolicy === 'standby') {
-            result = {
-                loading: false,
-                data: void 0,
-                error: void 0,
-                networkStatus: exports.NetworkStatus.ready,
-            };
+        if (!this.result) {
+            this.handleErrorOrCompleted(this.result = this.observable.getCurrentResult());
         }
-        return result;
+        return this.result;
     };
     InternalState.prototype.toQueryResult = function (result) {
         var queryResult = this.toQueryResultCache.get(result);
@@ -6343,34 +6375,52 @@ var InternalState = (function () {
     };
     return InternalState;
 }());
+function useUnblockFetchEffect(renderPromises, resolveFetchBlockingPromise) {
+    if (resolveFetchBlockingPromise) {
+        if (renderPromises) {
+            resolveFetchBlockingPromise(true);
+        }
+        else {
+            setTimeout(function () { return resolveFetchBlockingPromise(false); }, 5000);
+        }
+    }
+    React.useEffect(function () {
+        if (resolveFetchBlockingPromise) {
+            resolveFetchBlockingPromise(true);
+        }
+    }, [resolveFetchBlockingPromise]);
+}
 
 var EAGER_METHODS = [
     'refetch',
+    'reobserve',
     'fetchMore',
     'updateQuery',
     'startPolling',
     'subscribeToMore',
 ];
-function useLazyQuery(query, optionsOrFunction) {
-    var options = useNormalizedOptions(optionsOrFunction);
-    var _a = React.useState({
-        called: false,
-    }), execution = _a[0], setExecution = _a[1];
-    var result = useQuery(query, tslib.__assign(tslib.__assign(tslib.__assign({}, options), execution.options), { fetchPolicy: execution.called ? options === null || options === void 0 ? void 0 : options.fetchPolicy : 'standby', skip: undefined }));
-    if (!execution.called) {
-        result = tslib.__assign(tslib.__assign({}, result), { loading: false, data: void 0, error: void 0, called: false });
-    }
+function useLazyQuery(query, options) {
+    var internalState = useInternalState(useApolloClient(options && options.client), query);
+    var execOptionsRef = React.useRef();
+    var defaultOptions = internalState.client.defaultOptions.watchQuery;
+    var initialFetchPolicy = (options && options.fetchPolicy) ||
+        (execOptionsRef.current && execOptionsRef.current.fetchPolicy) ||
+        (defaultOptions && defaultOptions.fetchPolicy) ||
+        "cache-first";
+    var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign(tslib.__assign({}, options), execOptionsRef.current), { skip: !execOptionsRef.current }));
+    var result = Object.assign(useQueryResult, {
+        called: !!execOptionsRef.current,
+    });
     var eagerMethods = React.useMemo(function () {
         var eagerMethods = {};
         var _loop_1 = function (key) {
             var method = result[key];
             eagerMethods[key] = function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
+                if (!execOptionsRef.current) {
+                    execOptionsRef.current = Object.create(null);
+                    internalState.forceUpdate();
                 }
-                setExecution(function (execution) { return (tslib.__assign(tslib.__assign({}, execution), { called: true })); });
-                return method.apply(void 0, args);
+                return method.apply(this, arguments);
             };
         };
         for (var _i = 0, EAGER_METHODS_1 = EAGER_METHODS; _i < EAGER_METHODS_1.length; _i++) {
@@ -6379,15 +6429,24 @@ function useLazyQuery(query, optionsOrFunction) {
         }
         return eagerMethods;
     }, []);
-    result.error = result.error || void 0;
     Object.assign(result, eagerMethods);
     var execute = React.useCallback(function (executeOptions) {
-        setExecution({ called: true, options: executeOptions });
-        var promise = result.refetch(executeOptions === null || executeOptions === void 0 ? void 0 : executeOptions.variables).then(function (result1) {
-            var result2 = tslib.__assign(tslib.__assign({}, result), { data: result1.data, error: result1.error, called: true, loading: false });
-            Object.assign(result2, eagerMethods);
-            return result2;
-        });
+        var promise = result.reobserve(execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
+            fetchPolicy: initialFetchPolicy,
+        }).then(function (apolloQueryResult) {
+            apolloQueryResult = apolloQueryResult || internalState["getCurrentResult"]();
+            if (apolloQueryResult.error ||
+                isNonEmptyArray(apolloQueryResult.errors)) {
+                var _a = result.observable.options.errorPolicy, errorPolicy = _a === void 0 ? "none" : _a;
+                if (errorPolicy === "none") {
+                    throw apolloQueryResult.error || new ApolloError({
+                        graphQLErrors: apolloQueryResult.errors,
+                    });
+                }
+            }
+            return internalState.toQueryResult(apolloQueryResult);
+        }).then(function (queryResult) { return Object.assign(queryResult, eagerMethods); });
+        internalState.forceUpdate();
         promise.catch(function () { });
         return promise;
     }, []);
@@ -6443,7 +6502,7 @@ function useMutation(mutation, options) {
                     error: error,
                     client: client,
                 };
-                if (ref.current.isMounted && !equal.equal(ref.current.result, result_1)) {
+                if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
                     setResult(ref.current.result = result_1);
                 }
             }
@@ -6461,7 +6520,7 @@ function useMutation(mutation, options) {
                     called: true,
                     client: client,
                 };
-                if (!equal.equal(ref.current.result, result_2)) {
+                if (!equality.equal(ref.current.result, result_2)) {
                     setResult(ref.current.result = result_2);
                 }
             }
@@ -6524,7 +6583,7 @@ function useSubscription(subscription, options) {
             subscription !== ref.current.subscription ||
             (options === null || options === void 0 ? void 0 : options.fetchPolicy) !== ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.fetchPolicy) ||
             !(options === null || options === void 0 ? void 0 : options.skip) !== !((_c = ref.current.options) === null || _c === void 0 ? void 0 : _c.skip) ||
-            !equal.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) {
+            !equality.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) {
             setResult({
                 loading: true,
                 data: void 0,