@apollo/client 3.8.0-beta.7 → 3.8.0-rc.1

package/apollo-client.cjs

@@ -32,7 +32,7 @@ var invariant__default = /*#__PURE__*/_interopDefaultLegacy(invariant$1);
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = '3.8.0-beta.7';
+var version = '3.8.0-rc.1';
 
 function maybe(thunk) {
     try {
@@ -118,7 +118,7 @@ function shouldInclude(_a, variables) {
         var evaledValue = false;
         if (ifArgument.value.kind === 'Variable') {
             evaledValue = variables && variables[ifArgument.value.name.value];
-            invariant(evaledValue !== void 0, 65, directive.name.value);
+            invariant(evaledValue !== void 0, 64, directive.name.value);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -154,12 +154,12 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            invariant(directiveArguments && directiveArguments.length === 1, 66, directiveName);
+            invariant(directiveArguments && directiveArguments.length === 1, 65, directiveName);
             var ifArgument = directiveArguments[0];
-            invariant(ifArgument.name && ifArgument.name.value === 'if', 67, directiveName);
+            invariant(ifArgument.name && ifArgument.name.value === 'if', 66, directiveName);
             var ifValue = ifArgument.value;
             invariant(ifValue &&
-                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 68, directiveName);
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 67, directiveName);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -186,7 +186,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
             throw newInvariantError(
-                69,
+                68,
                 definition.operation,
                 definition.name ? " named '".concat(definition.name.value, "'") : ''
             );
@@ -196,7 +196,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        invariant(fragments.length === 1, 70, fragments.length);
+        invariant(fragments.length === 1, 69, fragments.length);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -237,7 +237,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
                 return fragmentMap(fragmentName);
             }
             var fragment = fragmentMap && fragmentMap[fragmentName];
-            invariant(fragment, 71, fragmentName);
+            invariant(fragment, 70, fragmentName);
             return fragment || null;
         }
         default:
@@ -315,7 +315,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw newInvariantError(80, name.value, value.kind);
+        throw newInvariantError(79, name.value, value.kind);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -460,16 +460,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    invariant(doc && doc.kind === 'Document', 72);
+    invariant(doc && doc.kind === 'Document', 71);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== 'FragmentDefinition'; })
         .map(function (definition) {
         if (definition.kind !== 'OperationDefinition') {
-            throw newInvariantError(73, definition.kind);
+            throw newInvariantError(72, definition.kind);
         }
         return definition;
     });
-    invariant(operations.length <= 1, 74, operations.length);
+    invariant(operations.length <= 1, 73, operations.length);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -492,14 +492,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    invariant(queryDef && queryDef.operation === 'query', 75);
+    invariant(queryDef && queryDef.operation === 'query', 74);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    invariant(doc.kind === 'Document', 76);
-    invariant(doc.definitions.length <= 1, 77);
+    invariant(doc.kind === 'Document', 75);
+    invariant(doc.definitions.length <= 1, 76);
     var fragmentDef = doc.definitions[0];
-    invariant(fragmentDef.kind === 'FragmentDefinition', 78);
+    invariant(fragmentDef.kind === 'FragmentDefinition', 77);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -522,7 +522,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw newInvariantError(79);
+    throw newInvariantError(78);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -594,7 +594,7 @@ var DocumentTransform = (function () {
             return;
         var cacheKeys = this.getCacheKey(document);
         if (cacheKeys) {
-            invariant(Array.isArray(cacheKeys), 64);
+            invariant(Array.isArray(cacheKeys), 63);
             return this.stableCacheKeys.lookupArray(cacheKeys);
         }
     };
@@ -687,7 +687,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        globalThis.__DEV__ !== false && invariant.error(81);
+        globalThis.__DEV__ !== false && invariant.error(80);
         return null;
     };
     var operationCount = 0;
@@ -1745,13 +1745,13 @@ var ApolloError = (function (_super) {
 }(Error));
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
-function readMultipartBody(response, observer) {
-    var _a, _b, _c, _d, _e;
+function readMultipartBody(response, nextValue) {
+    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _f, value, done, chunk, searchFrom, bi, message, i, headers, contentType_1, body, result, next;
-        var _g, _h;
-        return tslib.__generator(this, function (_j) {
-            switch (_j.label) {
+        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _b, value, done, chunk, searchFrom, bi, message, i, headers, contentType_1, body, result, next;
+        var _c, _d;
+        return tslib.__generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     if (TextDecoder === undefined) {
                         throw new Error("TextDecoder must be defined in the environment: please import a polyfill.");
@@ -1766,12 +1766,12 @@ function readMultipartBody(response, observer) {
                     buffer = "";
                     iterator = responseIterator(response);
                     running = true;
-                    _j.label = 1;
+                    _e.label = 1;
                 case 1:
                     if (!running) return [3, 3];
                     return [4, iterator.next()];
                 case 2:
-                    _f = _j.sent(), value = _f.value, done = _f.done;
+                    _b = _e.sent(), value = _b.value, done = _b.done;
                     chunk = typeof value === "string" ? value : decoder.decode(value);
                     searchFrom = buffer.length - boundary.length + 1;
                     running = !done;
@@ -1779,10 +1779,10 @@ function readMultipartBody(response, observer) {
                     bi = buffer.indexOf(boundary, searchFrom);
                     while (bi > -1) {
                         message = void 0;
-                        _g = [
+                        _c = [
                             buffer.slice(0, bi),
                             buffer.slice(bi + boundary.length),
-                        ], message = _g[0], buffer = _g[1];
+                        ], message = _c[0], buffer = _c[1];
                         i = message.indexOf("\r\n\r\n");
                         headers = parseHeaders(message.slice(0, i));
                         contentType_1 = headers["content-type"];
@@ -1792,43 +1792,36 @@ function readMultipartBody(response, observer) {
                         }
                         body = message.slice(i);
                         if (body) {
-                            try {
-                                result = parseJsonBody(response, body);
-                                if (Object.keys(result).length > 1 ||
-                                    "data" in result ||
-                                    "incremental" in result ||
-                                    "errors" in result ||
-                                    "payload" in result) {
-                                    if (isApolloPayloadResult(result)) {
-                                        next = {};
-                                        if ("payload" in result) {
-                                            next = tslib.__assign({}, result.payload);
-                                        }
-                                        if ("errors" in result) {
-                                            next = tslib.__assign(tslib.__assign({}, next), { extensions: tslib.__assign(tslib.__assign({}, ("extensions" in next ? next.extensions : null)), (_h = {}, _h[PROTOCOL_ERRORS_SYMBOL] = result.errors, _h)) });
-                                        }
-                                        (_b = observer.next) === null || _b === void 0 ? void 0 : _b.call(observer, next);
+                            result = parseJsonBody(response, body);
+                            if (Object.keys(result).length > 1 ||
+                                "data" in result ||
+                                "incremental" in result ||
+                                "errors" in result ||
+                                "payload" in result) {
+                                if (isApolloPayloadResult(result)) {
+                                    next = {};
+                                    if ("payload" in result) {
+                                        next = tslib.__assign({}, result.payload);
                                     }
-                                    else {
-                                        (_c = observer.next) === null || _c === void 0 ? void 0 : _c.call(observer, result);
+                                    if ("errors" in result) {
+                                        next = tslib.__assign(tslib.__assign({}, next), { extensions: tslib.__assign(tslib.__assign({}, ("extensions" in next ? next.extensions : null)), (_d = {}, _d[PROTOCOL_ERRORS_SYMBOL] = result.errors, _d)) });
                                     }
+                                    nextValue(next);
                                 }
-                                else if (Object.keys(result).length === 1 &&
-                                    "hasNext" in result &&
-                                    !result.hasNext) {
-                                    (_d = observer.complete) === null || _d === void 0 ? void 0 : _d.call(observer);
+                                else {
+                                    nextValue(result);
                                 }
                             }
-                            catch (err) {
-                                handleError(err, observer);
+                            else if (Object.keys(result).length === 1 &&
+                                "hasNext" in result &&
+                                !result.hasNext) {
+                                return [2];
                             }
                         }
                         bi = buffer.indexOf(boundary);
                     }
                     return [3, 1];
-                case 3:
-                    (_e = observer.complete) === null || _e === void 0 ? void 0 : _e.call(observer);
-                    return [2];
+                case 3: return [2];
             }
         });
     });
@@ -1870,22 +1863,10 @@ function parseJsonBody(response, bodyText) {
     }
 }
 function handleError(err, observer) {
-    var _a, _b;
-    if (err.name === "AbortError")
-        return;
     if (err.result && err.result.errors && err.result.data) {
-        (_a = observer.next) === null || _a === void 0 ? void 0 : _a.call(observer, err.result);
+        observer.next(err.result);
     }
-    (_b = observer.error) === null || _b === void 0 ? void 0 : _b.call(observer, err);
-}
-function readJsonBody(response, operation, observer) {
-    parseAndCheckHttpResponse(operation)(response)
-        .then(function (result) {
-        var _a, _b;
-        (_a = observer.next) === null || _a === void 0 ? void 0 : _a.call(observer, result);
-        (_b = observer.complete) === null || _b === void 0 ? void 0 : _b.call(observer);
-    })
-        .catch(function (err) { return handleError(err, observer); });
+    observer.error(err);
 }
 function parseAndCheckHttpResponse(operations) {
     return function (response) {
@@ -2110,11 +2091,9 @@ var createHttpLink = function (linkOptions) {
             body.variables = filterOperationVariables(body.variables, operation.query);
         }
         var controller;
-        if (!options.signal) {
-            var _c = createSignalIfSupported(), _controller = _c.controller, signal = _c.signal;
-            controller = _controller;
-            if (controller)
-                options.signal = signal;
+        if (!options.signal && typeof AbortController !== 'undefined') {
+            controller = new AbortController();
+            options.signal = controller.signal;
         }
         var definitionIsMutation = function (d) {
             return d.kind === 'OperationDefinition' && d.operation === 'mutation';
@@ -2143,7 +2122,7 @@ var createHttpLink = function (linkOptions) {
             options.headers.accept = acceptHeader;
         }
         if (options.method === 'GET') {
-            var _d = rewriteURIForGET(chosenURI, body), newURI = _d.newURI, parseError = _d.parseError;
+            var _c = rewriteURIForGET(chosenURI, body), newURI = _c.newURI, parseError = _c.parseError;
             if (parseError) {
                 return fromError(parseError);
             }
@@ -2159,19 +2138,27 @@ var createHttpLink = function (linkOptions) {
         }
         return new zenObservableTs.Observable(function (observer) {
             var currentFetch = preferredFetch || maybe(function () { return fetch; }) || backupFetch;
+            var observerNext = observer.next.bind(observer);
             currentFetch(chosenURI, options)
                 .then(function (response) {
                 var _a;
                 operation.setContext({ response: response });
                 var ctype = (_a = response.headers) === null || _a === void 0 ? void 0 : _a.get('content-type');
                 if (ctype !== null && /^multipart\/mixed/i.test(ctype)) {
-                    return readMultipartBody(response, observer);
+                    return readMultipartBody(response, observerNext);
                 }
                 else {
-                    return readJsonBody(response, operation, observer);
+                    return parseAndCheckHttpResponse(operation)(response).then(observerNext);
                 }
             })
-                .catch(function (err) { return handleError(err, observer); });
+                .then(function () {
+                controller = undefined;
+                observer.complete();
+            })
+                .catch(function (err) {
+                controller = undefined;
+                handleError(err, observer);
+            });
             return function () {
                 if (controller)
                     controller.abort();
@@ -6846,12 +6833,12 @@ var ApolloConsumer = function (props) {
 };
 
 var ApolloProvider = function (_a) {
-    var client = _a.client, suspenseCache = _a.suspenseCache, children = _a.children;
+    var client = _a.client, children = _a.children;
     var ApolloContext = getApolloContext();
     var parentContext = React__namespace.useContext(ApolloContext);
     var context = React__namespace.useMemo(function () {
-        return tslib.__assign(tslib.__assign({}, parentContext), { client: client || parentContext.client, suspenseCache: suspenseCache || parentContext.suspenseCache });
-    }, [parentContext, client, suspenseCache]);
+        return tslib.__assign(tslib.__assign({}, parentContext), { client: client || parentContext.client });
+    }, [parentContext, client]);
     invariant(context.client, 44);
     return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
 };
@@ -6872,7 +6859,7 @@ var useSyncExternalStore = realHook$1 || (function (subscribe, getSnapshot, getS
         !didWarnUncachedGetSnapshot &&
         value !== getSnapshot()) {
         didWarnUncachedGetSnapshot = true;
-        globalThis.__DEV__ !== false && invariant.error(57);
+        globalThis.__DEV__ !== false && invariant.error(56);
     }
     var _a = React__namespace.useState({ inst: { value: value, getSnapshot: getSnapshot } }), inst = _a[0].inst, forceUpdate = _a[1];
     if (canUseLayoutEffect) {
@@ -6935,7 +6922,7 @@ function parser(document) {
     if (cached)
         return cached;
     var variables, type, name;
-    invariant(!!document && !!document.kind, 58, document);
+    invariant(!!document && !!document.kind, 57, document);
     var fragments = [];
     var queries = [];
     var mutations = [];
@@ -6961,10 +6948,10 @@ function parser(document) {
         }
     }
     invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 59);
+        (queries.length || mutations.length || subscriptions.length), 58);
     invariant(
         queries.length + mutations.length + subscriptions.length <= 1,
-        60,
+        59,
         document,
         queries.length,
         subscriptions.length,
@@ -6978,7 +6965,7 @@ function parser(document) {
         : mutations.length
             ? mutations
             : subscriptions;
-    invariant(definitions.length === 1, 61, document, definitions.length);
+    invariant(definitions.length === 1, 60, document, definitions.length);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -6997,7 +6984,7 @@ function verifyDocumentType(document, type) {
     var usedOperationName = operationName(operation.type);
     invariant(
         operation.type === type,
-        62,
+        61,
         requiredOperationName,
         requiredOperationName,
         usedOperationName
@@ -7660,127 +7647,6 @@ var __use = realHook ||
         }
     };
 
-function useSuspenseCache(override) {
-    var context = React__namespace.useContext(getApolloContext());
-    var suspenseCache = override || context.suspenseCache;
-    invariant(suspenseCache, 54);
-    return suspenseCache;
-}
-
-function useSuspenseQuery(query, options) {
-    if (options === void 0) { options = Object.create(null); }
-    var client = useApolloClient(options.client);
-    var suspenseCache = useSuspenseCache(options.suspenseCache);
-    var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
-    var fetchPolicy = watchQueryOptions.fetchPolicy, variables = watchQueryOptions.variables;
-    var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
-    var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
-    var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
-        return client.watchQuery(watchQueryOptions);
-    });
-    var _b = React__namespace.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
-    var promise = promiseCache.get(queryRef.key);
-    if (queryRef.didChangeOptions(watchQueryOptions)) {
-        promise = queryRef.applyOptions(watchQueryOptions);
-        promiseCache.set(queryRef.key, promise);
-    }
-    if (!promise) {
-        promise = queryRef.promise;
-        promiseCache.set(queryRef.key, promise);
-    }
-    React__namespace.useEffect(function () {
-        var dispose = queryRef.retain();
-        var removeListener = queryRef.listen(function (promise) {
-            setPromiseCache(function (promiseCache) {
-                return new Map(promiseCache).set(queryRef.key, promise);
-            });
-        });
-        return function () {
-            removeListener();
-            dispose();
-        };
-    }, [queryRef]);
-    var skipResult = React__namespace.useMemo(function () {
-        var error = toApolloError(queryRef.result);
-        return {
-            loading: false,
-            data: queryRef.result.data,
-            networkStatus: error ? exports.NetworkStatus.error : exports.NetworkStatus.ready,
-            error: error,
-        };
-    }, [queryRef.result]);
-    var result = fetchPolicy === 'standby' ? skipResult : __use(promise);
-    var fetchMore = React__namespace.useCallback(function (options) {
-        var promise = queryRef.fetchMore(options);
-        setPromiseCache(function (previousPromiseCache) {
-            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
-        });
-        return promise;
-    }, [queryRef]);
-    var refetch = React__namespace.useCallback(function (variables) {
-        var promise = queryRef.refetch(variables);
-        setPromiseCache(function (previousPromiseCache) {
-            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
-        });
-        return promise;
-    }, [queryRef]);
-    var subscribeToMore = React__namespace.useCallback(function (options) { return queryRef.observable.subscribeToMore(options); }, [queryRef]);
-    return React__namespace.useMemo(function () {
-        return {
-            client: client,
-            data: result.data,
-            error: toApolloError(result),
-            networkStatus: result.networkStatus,
-            fetchMore: fetchMore,
-            refetch: refetch,
-            subscribeToMore: subscribeToMore,
-        };
-    }, [client, fetchMore, refetch, result, subscribeToMore]);
-}
-function validateOptions(options) {
-    var query = options.query, fetchPolicy = options.fetchPolicy, returnPartialData = options.returnPartialData;
-    verifyDocumentType(query, exports.DocumentType.Query);
-    validateFetchPolicy(fetchPolicy);
-    validatePartialDataReturn(fetchPolicy, returnPartialData);
-}
-function validateFetchPolicy(fetchPolicy) {
-    if (fetchPolicy === void 0) { fetchPolicy = 'cache-first'; }
-    var supportedFetchPolicies = [
-        'cache-first',
-        'network-only',
-        'no-cache',
-        'cache-and-network',
-    ];
-    invariant(supportedFetchPolicies.includes(fetchPolicy), 55, fetchPolicy);
-}
-function validatePartialDataReturn(fetchPolicy, returnPartialData) {
-    if (fetchPolicy === 'no-cache' && returnPartialData) {
-        globalThis.__DEV__ !== false && invariant.warn(56);
-    }
-}
-function toApolloError(result) {
-    return isNonEmptyArray(result.errors)
-        ? new ApolloError({ graphQLErrors: result.errors })
-        : result.error;
-}
-function useWatchQueryOptions(_a) {
-    var client = _a.client, query = _a.query, options = _a.options;
-    return useDeepMemo(function () {
-        var _a;
-        var fetchPolicy = options.fetchPolicy ||
-            ((_a = client.defaultOptions.watchQuery) === null || _a === void 0 ? void 0 : _a.fetchPolicy) ||
-            'cache-first';
-        var watchQueryOptions = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: fetchPolicy, query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 });
-        if (globalThis.__DEV__ !== false) {
-            validateOptions(watchQueryOptions);
-        }
-        if (options.skip) {
-            watchQueryOptions.fetchPolicy = 'standby';
-        }
-        return watchQueryOptions;
-    }, [client, options, query]);
-}
-
 var QUERY_REFERENCE_SYMBOL = Symbol();
 var OBSERVED_CHANGED_OPTIONS = [
     'canonizeResults',
@@ -7956,14 +7822,176 @@ var InternalQueryReference = (function () {
     return InternalQueryReference;
 }());
 
+var SuspenseCache$1 = (function () {
+    function SuspenseCache(options) {
+        if (options === void 0) { options = Object.create(null); }
+        this.queryRefs = new trie.Trie(canUseWeakMap);
+        this.options = options;
+    }
+    SuspenseCache.prototype.getQueryRef = function (cacheKey, createObservable) {
+        var ref = this.queryRefs.lookupArray(cacheKey);
+        if (!ref.current) {
+            ref.current = new InternalQueryReference(createObservable(), {
+                key: cacheKey,
+                autoDisposeTimeoutMs: this.options.autoDisposeTimeoutMs,
+                onDispose: function () {
+                    delete ref.current;
+                },
+            });
+        }
+        return ref.current;
+    };
+    return SuspenseCache;
+}());
+
+var suspenseCacheSymbol = Symbol.for('apollo.suspenseCache');
+function getSuspenseCache(client) {
+    var _a;
+    if (!client[suspenseCacheSymbol]) {
+        client[suspenseCacheSymbol] = new SuspenseCache$1((_a = client.defaultOptions.react) === null || _a === void 0 ? void 0 : _a.suspense);
+    }
+    return client[suspenseCacheSymbol];
+}
+
+var SuspenseCache = (function (_super) {
+    tslib.__extends(SuspenseCache, _super);
+    function SuspenseCache() {
+        _super.call(this) || this;
+        throw new Error('It is no longer necessary to create a `SuspenseCache` instance and pass it into the `ApolloProvider`.\n' +
+            'Please remove this code from your application. \n\n' +
+            'This export will be removed with the final 3.8 release.');
+    }
+    return SuspenseCache;
+}(SuspenseCache$1));
+
+function useSuspenseQuery(query, options) {
+    if (options === void 0) { options = Object.create(null); }
+    var client = useApolloClient(options.client);
+    var suspenseCache = getSuspenseCache(client);
+    var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
+    var fetchPolicy = watchQueryOptions.fetchPolicy, variables = watchQueryOptions.variables;
+    var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
+    var cacheKey = tslib.__spreadArray([
+        query,
+        canonicalStringify(variables)
+    ], [].concat(queryKey), true);
+    var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
+        return client.watchQuery(watchQueryOptions);
+    });
+    var _b = React__namespace.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
+    var promise = promiseCache.get(queryRef.key);
+    if (queryRef.didChangeOptions(watchQueryOptions)) {
+        promise = queryRef.applyOptions(watchQueryOptions);
+        promiseCache.set(queryRef.key, promise);
+    }
+    if (!promise) {
+        promise = queryRef.promise;
+        promiseCache.set(queryRef.key, promise);
+    }
+    React__namespace.useEffect(function () {
+        var dispose = queryRef.retain();
+        var removeListener = queryRef.listen(function (promise) {
+            setPromiseCache(function (promiseCache) {
+                return new Map(promiseCache).set(queryRef.key, promise);
+            });
+        });
+        return function () {
+            removeListener();
+            dispose();
+        };
+    }, [queryRef]);
+    var skipResult = React__namespace.useMemo(function () {
+        var error = toApolloError(queryRef.result);
+        return {
+            loading: false,
+            data: queryRef.result.data,
+            networkStatus: error ? exports.NetworkStatus.error : exports.NetworkStatus.ready,
+            error: error,
+        };
+    }, [queryRef.result]);
+    var result = fetchPolicy === 'standby' ? skipResult : __use(promise);
+    var fetchMore = React__namespace.useCallback(function (options) {
+        var promise = queryRef.fetchMore(options);
+        setPromiseCache(function (previousPromiseCache) {
+            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
+        });
+        return promise;
+    }, [queryRef]);
+    var refetch = React__namespace.useCallback(function (variables) {
+        var promise = queryRef.refetch(variables);
+        setPromiseCache(function (previousPromiseCache) {
+            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
+        });
+        return promise;
+    }, [queryRef]);
+    var subscribeToMore = React__namespace.useCallback(function (options) { return queryRef.observable.subscribeToMore(options); }, [queryRef]);
+    return React__namespace.useMemo(function () {
+        return {
+            client: client,
+            data: result.data,
+            error: toApolloError(result),
+            networkStatus: result.networkStatus,
+            fetchMore: fetchMore,
+            refetch: refetch,
+            subscribeToMore: subscribeToMore,
+        };
+    }, [client, fetchMore, refetch, result, subscribeToMore]);
+}
+function validateOptions(options) {
+    var query = options.query, fetchPolicy = options.fetchPolicy, returnPartialData = options.returnPartialData;
+    verifyDocumentType(query, exports.DocumentType.Query);
+    validateFetchPolicy(fetchPolicy);
+    validatePartialDataReturn(fetchPolicy, returnPartialData);
+}
+function validateFetchPolicy(fetchPolicy) {
+    if (fetchPolicy === void 0) { fetchPolicy = 'cache-first'; }
+    var supportedFetchPolicies = [
+        'cache-first',
+        'network-only',
+        'no-cache',
+        'cache-and-network',
+    ];
+    invariant(supportedFetchPolicies.includes(fetchPolicy), 54, fetchPolicy);
+}
+function validatePartialDataReturn(fetchPolicy, returnPartialData) {
+    if (fetchPolicy === 'no-cache' && returnPartialData) {
+        globalThis.__DEV__ !== false && invariant.warn(55);
+    }
+}
+function toApolloError(result) {
+    return isNonEmptyArray(result.errors)
+        ? new ApolloError({ graphQLErrors: result.errors })
+        : result.error;
+}
+function useWatchQueryOptions(_a) {
+    var client = _a.client, query = _a.query, options = _a.options;
+    return useDeepMemo(function () {
+        var _a;
+        var fetchPolicy = options.fetchPolicy ||
+            ((_a = client.defaultOptions.watchQuery) === null || _a === void 0 ? void 0 : _a.fetchPolicy) ||
+            'cache-first';
+        var watchQueryOptions = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: fetchPolicy, query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 });
+        if (globalThis.__DEV__ !== false) {
+            validateOptions(watchQueryOptions);
+        }
+        if (options.skip) {
+            watchQueryOptions.fetchPolicy = 'standby';
+        }
+        return watchQueryOptions;
+    }, [client, options, query]);
+}
+
 function useBackgroundQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
-    var suspenseCache = useSuspenseCache(options.suspenseCache);
     var client = useApolloClient(options.client);
+    var suspenseCache = getSuspenseCache(client);
     var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
     var variables = watchQueryOptions.variables;
     var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
-    var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
+    var cacheKey = tslib.__spreadArray([
+        query,
+        canonicalStringify(variables)
+    ], [].concat(queryKey), true);
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
@@ -8036,28 +8064,6 @@ function useReadQuery(queryRef) {
     }, [result]);
 }
 
-var SuspenseCache = (function () {
-    function SuspenseCache(options) {
-        if (options === void 0) { options = Object.create(null); }
-        this.queryRefs = new trie.Trie(canUseWeakMap);
-        this.options = options;
-    }
-    SuspenseCache.prototype.getQueryRef = function (cacheKey, createObservable) {
-        var ref = this.queryRefs.lookupArray(cacheKey);
-        if (!ref.current) {
-            ref.current = new InternalQueryReference(createObservable(), {
-                key: cacheKey,
-                autoDisposeTimeoutMs: this.options.autoDisposeTimeoutMs,
-                onDispose: function () {
-                    delete ref.current;
-                },
-            });
-        }
-        return ref.current;
-    };
-    return SuspenseCache;
-}());
-
 exports.setLogVerbosity = invariant$1.setVerbosity;
 exports.Observable = zenObservableTs.Observable;
 exports.disableExperimentalFragmentVariables = graphqlTag.disableExperimentalFragmentVariables;