@apollo/client 3.8.0-alpha.5 → 3.8.0-alpha.7

package/README.md

@@ -29,6 +29,7 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 |Jeff Auriemma|[@bignimbus](https://github.com/bignimbus)|
 |Hugh Willson|[@hwillson](https://github.com/hwillson)|
 |Jerel Miller|[@jerelmiller](https://github.com/jerelmiller)|
+|Lenz Weber-Tronic|[@phryneas](https://github.com/phryneas)|
 
 ## Who is Apollo?
 

package/apollo-client.cjs

@@ -4,10 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var tsInvariant = require('ts-invariant');
+var process$1 = require('ts-invariant/process');
+var graphql = require('graphql');
 var equality = require('@wry/equality');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
-var graphql = require('graphql');
 var optimism = require('optimism');
 var context = require('@wry/context');
 var trie = require('@wry/trie');
@@ -35,6 +36,23 @@ function maybe(thunk) {
     catch (_a) { }
 }
 
+var global$1 = (maybe(function () { return globalThis; }) ||
+    maybe(function () { return window; }) ||
+    maybe(function () { return self; }) ||
+    maybe(function () { return global; }) ||
+    maybe(function () { return maybe.constructor("return this")(); }));
+
+var DEV = ("__DEV__" in global$1
+    ? Boolean(global$1.__DEV__)
+    : maybe(function () { return process.env.NODE_ENV; }) !== "production");
+
+function removeTemporaryGlobals() {
+    return typeof graphql.Source === "function" ? process$1.remove() : process$1.remove();
+}
+
+var __DEV__ = DEV;
+removeTemporaryGlobals();
+
 function shouldInclude(_a, variables) {
     var directives = _a.directives;
     if (!directives || !directives.length) {
@@ -1141,6 +1159,26 @@ function mergeOptions(defaults, options) {
     });
 }
 
+function isNodeResponse(value) {
+    return !!value.body;
+}
+function isReadableStream(value) {
+    return !!value.getReader;
+}
+function isAsyncIterableIterator(value) {
+    return !!(canUseAsyncIteratorSymbol &&
+        value[Symbol.asyncIterator]);
+}
+function isStreamableBlob(value) {
+    return !!value.stream;
+}
+function isBlob(value) {
+    return !!value.arrayBuffer;
+}
+function isNodeReadableStream(value) {
+    return !!value.pipe;
+}
+
 function fromError(errorValue) {
     return new zenObservableTs.Observable(function (observer) {
         observer.error(errorValue);
@@ -1196,7 +1234,7 @@ function validateOperation(operation) {
     for (var _i = 0, _a = Object.keys(operation); _i < _a.length; _i++) {
         var key = _a[_i];
         if (OPERATION_FIELDS.indexOf(key) < 0) {
-            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: ".concat(key)) : new tsInvariant.InvariantError(26);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: ".concat(key)) : new tsInvariant.InvariantError(27);
         }
     }
     return operation;
@@ -1319,7 +1357,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(21);
+        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(22);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1345,27 +1383,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.8.0-alpha.5';
-
-function isNodeResponse(value) {
-    return !!value.body;
-}
-function isReadableStream(value) {
-    return !!value.getReader;
-}
-function isAsyncIterableIterator(value) {
-    return !!(canUseAsyncIteratorSymbol &&
-        value[Symbol.asyncIterator]);
-}
-function isStreamableBlob(value) {
-    return !!value.stream;
-}
-function isBlob(value) {
-    return !!value.arrayBuffer;
-}
-function isNodeReadableStream(value) {
-    return !!value.pipe;
-}
+var version = '3.8.0-alpha.7';
 
 function asyncIterator(source) {
     var _a;
@@ -1661,7 +1679,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. ".concat(label, " is not serializable: ").concat(e.message)) : new tsInvariant.InvariantError(23);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. ".concat(label, " is not serializable: ").concat(e.message)) : new tsInvariant.InvariantError(24);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1709,7 +1727,9 @@ function selectHttpOptionsAndBodyInternal(operation, printer) {
         }
         http = tslib.__assign(tslib.__assign({}, http), config.http);
     });
-    options.headers = removeDuplicateHeaders(options.headers, http.preserveHeaderCase);
+    if (options.headers) {
+        options.headers = removeDuplicateHeaders(options.headers, http.preserveHeaderCase);
+    }
     var operationName = operation.operationName, extensions = operation.extensions, variables = operation.variables, query = operation.query;
     var body = { operationName: operationName, variables: variables };
     if (http.includeExtensions)
@@ -1742,7 +1762,7 @@ function removeDuplicateHeaders(headers, preserveHeaderCase) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(22);
+        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(23);
     }
 };
 
@@ -1882,6 +1902,7 @@ var createHttpLink = function (linkOptions) {
             options.method = 'GET';
         }
         if (hasDirectives(['defer'], operation.query)) {
+            options.headers = options.headers || {};
             options.headers.accept = "multipart/mixed; deferSpec=20220824, application/json";
         }
         if (options.method === 'GET') {
@@ -4627,7 +4648,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 12);
+        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 13);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -4776,6 +4797,7 @@ function logMissingFieldErrors(missing) {
 var LocalState = (function () {
     function LocalState(_a) {
         var cache = _a.cache, client = _a.client, resolvers = _a.resolvers, fragmentMatcher = _a.fragmentMatcher;
+        this.selectionsToResolveCache = new WeakMap();
         this.cache = cache;
         if (client) {
             this.client = client;
@@ -4890,13 +4912,13 @@ var LocalState = (function () {
         if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
         if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var mainDefinition, fragments, fragmentMap, definitionOperation, defaultOperationType, _a, cache, client, execContext;
+            var mainDefinition, fragments, fragmentMap, selectionsToResolve, definitionOperation, defaultOperationType, _a, cache, client, execContext, isClientFieldDescendant;
             return tslib.__generator(this, function (_b) {
                 mainDefinition = getMainDefinition(document);
                 fragments = getFragmentDefinitions(document);
                 fragmentMap = createFragmentMap(fragments);
-                definitionOperation = mainDefinition
-                    .operation;
+                selectionsToResolve = this.collectSelectionsToResolve(mainDefinition, fragmentMap);
+                definitionOperation = mainDefinition.operation;
                 defaultOperationType = definitionOperation
                     ? definitionOperation.charAt(0).toUpperCase() +
                         definitionOperation.slice(1)
@@ -4909,16 +4931,18 @@ var LocalState = (function () {
                     fragmentMatcher: fragmentMatcher,
                     defaultOperationType: defaultOperationType,
                     exportedVariables: {},
+                    selectionsToResolve: selectionsToResolve,
                     onlyRunForcedResolvers: onlyRunForcedResolvers,
                 };
-                return [2, this.resolveSelectionSet(mainDefinition.selectionSet, rootValue, execContext).then(function (result) { return ({
+                isClientFieldDescendant = false;
+                return [2, this.resolveSelectionSet(mainDefinition.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (result) { return ({
                         result: result,
                         exportedVariables: execContext.exportedVariables,
                     }); })];
             });
         });
     };
-    LocalState.prototype.resolveSelectionSet = function (selectionSet, rootValue, execContext) {
+    LocalState.prototype.resolveSelectionSet = function (selectionSet, isClientFieldDescendant, rootValue, execContext) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var fragmentMap, context, variables, resultsToMerge, execute;
             var _this = this;
@@ -4928,11 +4952,14 @@ var LocalState = (function () {
                 execute = function (selection) { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var fragment, typeCondition;
                     return tslib.__generator(this, function (_a) {
+                        if (!isClientFieldDescendant && !execContext.selectionsToResolve.has(selection)) {
+                            return [2];
+                        }
                         if (!shouldInclude(selection, variables)) {
                             return [2];
                         }
                         if (isField(selection)) {
-                            return [2, this.resolveField(selection, rootValue, execContext).then(function (fieldResult) {
+                            return [2, this.resolveField(selection, isClientFieldDescendant, rootValue, execContext).then(function (fieldResult) {
                                     var _a;
                                     if (typeof fieldResult !== 'undefined') {
                                         resultsToMerge.push((_a = {},
@@ -4951,7 +4978,7 @@ var LocalState = (function () {
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
                             if (execContext.fragmentMatcher(rootValue, typeCondition, context)) {
-                                return [2, this.resolveSelectionSet(fragment.selectionSet, rootValue, execContext).then(function (fragmentResult) {
+                                return [2, this.resolveSelectionSet(fragment.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (fragmentResult) {
                                         resultsToMerge.push(fragmentResult);
                                     })];
                             }
@@ -4965,11 +4992,14 @@ var LocalState = (function () {
             });
         });
     };
-    LocalState.prototype.resolveField = function (field, rootValue, execContext) {
+    LocalState.prototype.resolveField = function (field, isClientFieldDescendant, rootValue, execContext) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var variables, fieldName, aliasedFieldName, aliasUsed, defaultResult, resultPromise, resolverType, resolverMap, resolve;
             var _this = this;
             return tslib.__generator(this, function (_a) {
+                if (!rootValue) {
+                    return [2, null];
+                }
                 variables = execContext.variables;
                 fieldName = field.name.value;
                 aliasedFieldName = resultKeyNameFromField(field);
@@ -4993,6 +5023,7 @@ var LocalState = (function () {
                     }
                 }
                 return [2, resultPromise.then(function (result) {
+                        var _a, _b;
                         if (result === void 0) { result = defaultResult; }
                         if (field.directives) {
                             field.directives.forEach(function (directive) {
@@ -5011,30 +5042,70 @@ var LocalState = (function () {
                         if (result == null) {
                             return result;
                         }
+                        var isClientField = (_b = (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d.name.value === 'client'; })) !== null && _b !== void 0 ? _b : false;
                         if (Array.isArray(result)) {
-                            return _this.resolveSubSelectedArray(field, result, execContext);
+                            return _this.resolveSubSelectedArray(field, isClientFieldDescendant || isClientField, result, execContext);
                         }
                         if (field.selectionSet) {
-                            return _this.resolveSelectionSet(field.selectionSet, result, execContext);
+                            return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant || isClientField, result, execContext);
                         }
                     })];
             });
         });
     };
-    LocalState.prototype.resolveSubSelectedArray = function (field, result, execContext) {
+    LocalState.prototype.resolveSubSelectedArray = function (field, isClientFieldDescendant, result, execContext) {
         var _this = this;
         return Promise.all(result.map(function (item) {
             if (item === null) {
                 return null;
             }
             if (Array.isArray(item)) {
-                return _this.resolveSubSelectedArray(field, item, execContext);
+                return _this.resolveSubSelectedArray(field, isClientFieldDescendant, item, execContext);
             }
             if (field.selectionSet) {
-                return _this.resolveSelectionSet(field.selectionSet, item, execContext);
+                return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant, item, execContext);
             }
         }));
     };
+    LocalState.prototype.collectSelectionsToResolve = function (mainDefinition, fragmentMap) {
+        var isSingleASTNode = function (node) { return !Array.isArray(node); };
+        var selectionsToResolveCache = this.selectionsToResolveCache;
+        function collectByDefinition(definitionNode) {
+            if (!selectionsToResolveCache.has(definitionNode)) {
+                var matches_1 = new Set();
+                selectionsToResolveCache.set(definitionNode, matches_1);
+                graphql.visit(definitionNode, {
+                    Directive: function (node, _, __, ___, ancestors) {
+                        if (node.name.value === 'client') {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                        }
+                    },
+                    FragmentSpread: function (spread, _, __, ___, ancestors) {
+                        var fragment = fragmentMap[spread.name.value];
+                        __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(spread.name.value)) : tsInvariant.invariant(fragment, 12);
+                        var fragmentSelections = collectByDefinition(fragment);
+                        if (fragmentSelections.size > 0) {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                            matches_1.add(spread);
+                            fragmentSelections.forEach(function (selection) {
+                                matches_1.add(selection);
+                            });
+                        }
+                    }
+                });
+            }
+            return selectionsToResolveCache.get(definitionNode);
+        }
+        return collectByDefinition(mainDefinition);
+    };
     return LocalState;
 }());
 
@@ -5345,7 +5416,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(13));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(14));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -5359,10 +5430,10 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 14);
+                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 15);
                         __DEV__ ? tsInvariant.invariant(fetchPolicy === 'network-only' ||
                             fetchPolicy === 'no-cache', "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write.") : tsInvariant.invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 15);
+                            fetchPolicy === 'no-cache', 16);
                         mutationId = this.generateMutationId();
                         _h = this.transform(mutation), document = _h.document, hasClientExports = _h.hasClientExports;
                         mutation = this.cache.transformForLink(document);
@@ -5479,7 +5550,10 @@ var QueryManager = (function () {
                     optimistic: false,
                     returnPartialData: true,
                 });
-                var mergedData = mergeIncrementalData(diff.result, result);
+                var mergedData = void 0;
+                if (diff.result) {
+                    mergedData = mergeIncrementalData(diff.result, result);
+                }
                 if (typeof mergedData !== 'undefined') {
                     result.data = mergedData;
                     cacheWrites.push({
@@ -5683,10 +5757,10 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         __DEV__ ? tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
-            'in the query option.') : tsInvariant.invariant(options.query, 16);
-        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 17);
-        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 18);
-        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 19);
+            'in the query option.') : tsInvariant.invariant(options.query, 17);
+        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 18);
+        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 19);
+        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 20);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -5711,7 +5785,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(20));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(21));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -6099,6 +6173,11 @@ var QueryManager = (function () {
                     onlyRunForcedResolvers: true,
                 }).then(function (resolved) { return fromData(resolved.data || void 0); });
             }
+            if (errorPolicy === 'none' &&
+                networkStatus === exports.NetworkStatus.refetch &&
+                Array.isArray(diff.missing)) {
+                return fromData(void 0);
+            }
             return fromData(data);
         };
         var cacheWriteBehavior = fetchPolicy === "no-cache" ? 0 :
@@ -6435,7 +6514,7 @@ var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         __DEV__ ? tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
-            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 27);
+            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 28);
         return props.children(context.client);
     }));
 };
@@ -6452,7 +6531,7 @@ var ApolloProvider = function (_a) {
             context = Object.assign({}, context, { suspenseCache: suspenseCache });
         }
         __DEV__ ? tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
-            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 28);
+            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 29);
         return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
     }));
 };
@@ -6462,7 +6541,7 @@ function useApolloClient(override) {
     var client = override || context.client;
     __DEV__ ? tsInvariant.invariant(!!client, 'Could not find "client" in the context or passed in as an option. ' +
         'Wrap the root component in an <ApolloProvider>, or pass an ApolloClient ' +
-        'instance in via options.') : tsInvariant.invariant(!!client, 31);
+        'instance in via options.') : tsInvariant.invariant(!!client, 32);
     return client;
 }
 
@@ -6540,7 +6619,7 @@ function parser(document) {
     var variables, type, name;
     __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of ".concat(document, " passed to parser was not a valid GraphQL ") +
         "DocumentNode. You may need to use 'graphql-tag' or another method " +
-        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 34);
+        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 35);
     var fragments = [];
     var queries = [];
     var mutations = [];
@@ -6568,11 +6647,11 @@ function parser(document) {
     __DEV__ ? tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), "Passing only a fragment to 'graphql' is not yet supported. " +
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 35);
+        (queries.length || mutations.length || subscriptions.length), 36);
     __DEV__ ? tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, "react-apollo only supports a query, subscription, or a mutation per HOC. " +
         "".concat(document, " had ").concat(queries.length, " queries, ").concat(subscriptions.length, " ") +
         "subscriptions and ".concat(mutations.length, " mutations. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 36);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 37);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
         type = exports.DocumentType.Subscription;
@@ -6583,7 +6662,7 @@ function parser(document) {
             : subscriptions;
     __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. ".concat(document, " had ") +
         "".concat(definitions.length, " definitions. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 37);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 38);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -6601,7 +6680,7 @@ function verifyDocumentType(document, type) {
     var requiredOperationName = operationName(type);
     var usedOperationName = operationName(operation.type);
     __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a ".concat(requiredOperationName, " requires a graphql ") +
-        "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 38);
+        "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 39);
 }
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -6903,12 +6982,11 @@ var EAGER_METHODS = [
     'subscribeToMore',
 ];
 function useLazyQuery(query, options) {
+    var _a, _b;
     var abortControllersRef = React.useRef(new Set());
-    var internalState = useInternalState(useApolloClient(options && options.client), query);
     var execOptionsRef = React.useRef();
-    var merged = execOptionsRef.current
-        ? mergeOptions(options, execOptionsRef.current)
-        : options;
+    var merged = execOptionsRef.current ? mergeOptions(options, execOptionsRef.current) : options;
+    var internalState = useInternalState(useApolloClient(options && options.client), (_b = (_a = execOptionsRef.current) === null || _a === void 0 ? void 0 : _a.query) !== null && _b !== void 0 ? _b : query);
     var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign({}, merged), { skip: !execOptionsRef.current }));
     var initialFetchPolicy = useQueryResult.observable.options.initialFetchPolicy ||
         internalState.getDefaultFetchPolicy();
@@ -7211,20 +7289,21 @@ function useFragment_experimental(options) {
     var diffOptions = tslib.__assign(tslib.__assign({}, rest), { id: typeof from === "string" ? from : cache.identify(from), query: cache["getFragmentDoc"](fragment, fragmentName), optimistic: optimistic });
     var resultRef = React.useRef();
     var latestDiff = cache.diff(diffOptions);
+    var getSnapshot = function () {
+        var latestDiffToResult = diffToResult(latestDiff);
+        return resultRef.current &&
+            equality.equal(resultRef.current.data, latestDiffToResult.data)
+            ? resultRef.current
+            : (resultRef.current = latestDiffToResult);
+    };
     return useSyncExternalStore(function (forceUpdate) {
         return cache.watch(tslib.__assign(tslib.__assign({}, diffOptions), { immediate: true, callback: function (diff) {
                 if (!equality.equal(diff, latestDiff)) {
-                    resultRef.current = diffToResult(latestDiff = diff);
+                    resultRef.current = diffToResult((latestDiff = diff));
                     forceUpdate();
                 }
             } }));
-    }, function () {
-        var latestDiffToResult = diffToResult(latestDiff);
-        return resultRef.current &&
-            equality.equal(resultRef.current.data, latestDiffToResult.data)
-            ? resultRef.current
-            : (resultRef.current = latestDiffToResult);
-    });
+    }, getSnapshot, getSnapshot);
 }
 function diffToResult(diff) {
     var result = {
@@ -7252,7 +7331,7 @@ var useIsomorphicLayoutEffect = canUseLayoutEffect
 function useSuspenseCache() {
     var suspenseCache = React.useContext(getApolloContext()).suspenseCache;
     __DEV__ ? tsInvariant.invariant(suspenseCache, 'Could not find a "suspenseCache" in the context. Wrap the root component ' +
-        'in an <ApolloProvider> and provide a suspenseCache.') : tsInvariant.invariant(suspenseCache, 32);
+        'in an <ApolloProvider> and provide a suspenseCache.') : tsInvariant.invariant(suspenseCache, 33);
     return suspenseCache;
 }
 
@@ -7348,7 +7427,7 @@ function validateOptions(options) {
     validatePartialDataReturn(fetchPolicy, returnPartialData);
 }
 function validateFetchPolicy(fetchPolicy) {
-    __DEV__ ? tsInvariant.invariant(SUPPORTED_FETCH_POLICIES.includes(fetchPolicy), "The fetch policy `".concat(fetchPolicy, "` is not supported with suspense.")) : tsInvariant.invariant(SUPPORTED_FETCH_POLICIES.includes(fetchPolicy), 33);
+    __DEV__ ? tsInvariant.invariant(SUPPORTED_FETCH_POLICIES.includes(fetchPolicy), "The fetch policy `".concat(fetchPolicy, "` is not supported with suspense.")) : tsInvariant.invariant(SUPPORTED_FETCH_POLICIES.includes(fetchPolicy), 34);
 }
 function validatePartialDataReturn(fetchPolicy, returnPartialData) {
     if (fetchPolicy === 'no-cache' && returnPartialData) {