@apollo/client 3.13.4 → 4.0.0-alpha.1

package/core/QueryManager.js

@@ -1,44 +1,47 @@
-import { __assign, __awaiter, __generator } from "tslib";
-import { invariant, newInvariantError } from "../utilities/globals/index.js";
-import { equal } from "@wry/equality";
-import { execute } from "../link/core/index.js";
-import { addNonReactiveToNamedFragments, hasDirectives, isExecutionPatchIncrementalResult, isExecutionPatchResult, isFullyUnmaskedOperation, removeDirectivesFromDocument, } from "../utilities/index.js";
-import { canonicalStringify } from "../cache/index.js";
-import { getDefaultValues, getOperationDefinition, getOperationName, hasClientExports, graphQLResultHasError, getGraphQLErrorsFromResult, Observable, asyncMap, isNonEmptyArray, Concast, makeUniqueId, isDocumentNode, isNonNullObject, DocumentTransform, } from "../utilities/index.js";
-import { mergeIncrementalData } from "../utilities/common/incrementalResult.js";
-import { ApolloError, isApolloError, graphQLResultHasProtocolErrors, } from "../errors/index.js";
-import { ObservableQuery, logMissingFieldErrors } from "./ObservableQuery.js";
-import { NetworkStatus, isNetworkRequestInFlight } from "./networkStatus.js";
-import { QueryInfo, shouldWriteResult, } from "./QueryInfo.js";
-import { PROTOCOL_ERRORS_SYMBOL } from "../errors/index.js";
-import { print } from "../utilities/index.js";
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var IGNORE = Object.create(null);
 import { Trie } from "@wry/trie";
-import { AutoCleanedWeakCache, cacheSizes } from "../utilities/index.js";
-import { maskFragment, maskOperation } from "../masking/index.js";
-var QueryManager = /** @class */ (function () {
-    function QueryManager(options) {
-        var _this = this;
-        this.clientAwareness = {};
-        // All the queries that the QueryManager is currently managing (not
-        // including mutations and subscriptions).
-        this.queries = new Map();
-        // Maps from queryId strings to Promise rejection functions for
-        // currently active queries and fetches.
-        // Use protected instead of private field so
-        // @apollo/experimental-nextjs-app-support can access type info.
-        this.fetchCancelFns = new Map();
-        this.transformCache = new AutoCleanedWeakCache(cacheSizes["queryManager.getDocumentInfo"] ||
-            2000 /* defaultCacheSizes["queryManager.getDocumentInfo"] */);
-        this.queryIdCounter = 1;
-        this.requestIdCounter = 1;
-        this.mutationIdCounter = 1;
-        // Use protected instead of private field so
-        // @apollo/experimental-nextjs-app-support can access type info.
-        this.inFlightLinkObservables = new Trie(false);
-        this.noCacheWarningsByQueryId = new Set();
-        var defaultDocumentTransform = new DocumentTransform(function (document) { return _this.cache.transformDocument(document); }, 
+import { catchError, concat, EMPTY, from, lastValueFrom, map, mergeMap, mergeWith, Observable, of, share, shareReplay, Subject, tap, } from "rxjs";
+import { canonicalStringify } from "@apollo/client/cache";
+import { CombinedGraphQLErrors, graphQLResultHasProtocolErrors, UnconventionalError, } from "@apollo/client/errors";
+import { PROTOCOL_ERRORS_SYMBOL } from "@apollo/client/errors";
+import { execute } from "@apollo/client/link/core";
+import { maskFragment, maskOperation } from "@apollo/client/masking";
+import { print } from "@apollo/client/utilities";
+import { AutoCleanedWeakCache, cacheSizes } from "@apollo/client/utilities";
+import { addNonReactiveToNamedFragments, hasDirectives, isExecutionPatchIncrementalResult, isExecutionPatchResult, isFullyUnmaskedOperation, removeDirectivesFromDocument, } from "@apollo/client/utilities";
+import { DocumentTransform, getDefaultValues, getGraphQLErrorsFromResult, getOperationDefinition, getOperationName, graphQLResultHasError, hasClientExports, isDocumentNode, isNonEmptyArray, isNonNullObject, makeUniqueId, } from "@apollo/client/utilities";
+import { mergeIncrementalData } from "@apollo/client/utilities";
+import { __DEV__ } from "@apollo/client/utilities/environment";
+import { onAnyEvent } from "@apollo/client/utilities/internal";
+import { invariant, newInvariantError, } from "@apollo/client/utilities/invariant";
+import { isNetworkRequestInFlight, NetworkStatus } from "./networkStatus.js";
+import { logMissingFieldErrors, ObservableQuery } from "./ObservableQuery.js";
+import { QueryInfo, shouldWriteResult, } from "./QueryInfo.js";
+const { hasOwnProperty } = Object.prototype;
+const IGNORE = {};
+export class QueryManager {
+    cache;
+    link;
+    defaultOptions;
+    assumeImmutableResults;
+    documentTransform;
+    ssrMode;
+    defaultContext;
+    dataMasking;
+    queryDeduplication;
+    clientAwareness = {};
+    localState;
+    onBroadcast;
+    mutationStore;
+    // All the queries that the QueryManager is currently managing (not
+    // including mutations and subscriptions).
+    queries = new Map();
+    // Maps from queryId strings to Promise rejection functions for
+    // currently active queries and fetches.
+    // Use protected instead of private field so
+    // @apollo/experimental-nextjs-app-support can access type info.
+    fetchCancelFns = new Map();
+    constructor(options) {
+        const defaultDocumentTransform = new DocumentTransform((document) => this.cache.transformDocument(document), 
         // Allow the apollo cache to manage its own transform caches
         { cache: false });
         this.cache = options.cache;
@@ -50,7 +53,7 @@ var QueryManager = /** @class */ (function () {
         this.ssrMode = options.ssrMode;
         this.assumeImmutableResults = options.assumeImmutableResults;
         this.dataMasking = options.dataMasking;
-        var documentTransform = options.documentTransform;
+        const documentTransform = options.documentTransform;
         this.documentTransform =
             documentTransform ?
                 defaultDocumentTransform
@@ -61,143 +64,132 @@ var QueryManager = /** @class */ (function () {
                     // selections and fragments from the fragment registry.
                     .concat(defaultDocumentTransform)
                 : defaultDocumentTransform;
-        this.defaultContext = options.defaultContext || Object.create(null);
+        this.defaultContext = options.defaultContext || {};
         if ((this.onBroadcast = options.onBroadcast)) {
-            this.mutationStore = Object.create(null);
+            this.mutationStore = {};
         }
     }
     /**
      * Call this method to terminate any active query processes, making it safe
      * to dispose of this QueryManager instance.
      */
-    QueryManager.prototype.stop = function () {
-        var _this = this;
-        this.queries.forEach(function (_info, queryId) {
-            _this.stopQueryNoBroadcast(queryId);
+    stop() {
+        this.queries.forEach((_info, queryId) => {
+            this.removeQuery(queryId);
         });
-        this.cancelPendingFetches(newInvariantError(27));
-    };
-    QueryManager.prototype.cancelPendingFetches = function (error) {
-        this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
+        this.cancelPendingFetches(newInvariantError(72));
+    }
+    cancelPendingFetches(error) {
+        this.fetchCancelFns.forEach((cancel) => cancel(error));
         this.fetchCancelFns.clear();
-    };
-    QueryManager.prototype.mutate = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
-            var mutationId, hasClientExports, mutationStoreValue, isOptimistic, self;
-            var _c, _d;
-            var mutation = _b.mutation, variables = _b.variables, optimisticResponse = _b.optimisticResponse, updateQueries = _b.updateQueries, _e = _b.refetchQueries, refetchQueries = _e === void 0 ? [] : _e, _f = _b.awaitRefetchQueries, awaitRefetchQueries = _f === void 0 ? false : _f, updateWithProxyFn = _b.update, onQueryUpdated = _b.onQueryUpdated, _g = _b.fetchPolicy, fetchPolicy = _g === void 0 ? ((_c = this.defaultOptions.mutate) === null || _c === void 0 ? void 0 : _c.fetchPolicy) || "network-only" : _g, _h = _b.errorPolicy, errorPolicy = _h === void 0 ? ((_d = this.defaultOptions.mutate) === null || _d === void 0 ? void 0 : _d.errorPolicy) || "none" : _h, keepRootFields = _b.keepRootFields, context = _b.context;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
-                    case 0:
-                        invariant(mutation, 28);
-                        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 29);
-                        mutationId = this.generateMutationId();
-                        mutation = this.cache.transformForLink(this.transform(mutation));
-                        hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
-                        variables = this.getVariables(mutation, variables);
-                        if (!hasClientExports) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.localState.addExportedVariables(mutation, variables, context)];
-                    case 1:
-                        variables = (_j.sent());
-                        _j.label = 2;
-                    case 2:
-                        mutationStoreValue = this.mutationStore &&
-                            (this.mutationStore[mutationId] = {
-                                mutation: mutation,
-                                variables: variables,
-                                loading: true,
-                                error: null,
-                            });
-                        isOptimistic = optimisticResponse &&
-                            this.markMutationOptimistic(optimisticResponse, {
-                                mutationId: mutationId,
-                                document: mutation,
-                                variables: variables,
-                                fetchPolicy: fetchPolicy,
-                                errorPolicy: errorPolicy,
-                                context: context,
-                                updateQueries: updateQueries,
-                                update: updateWithProxyFn,
-                                keepRootFields: keepRootFields,
-                            });
-                        this.broadcastQueries();
-                        self = this;
-                        return [2 /*return*/, new Promise(function (resolve, reject) {
-                                return asyncMap(self.getObservableFromLink(mutation, __assign(__assign({}, context), { optimisticResponse: isOptimistic ? optimisticResponse : void 0 }), variables, {}, false), function (result) {
-                                    if (graphQLResultHasError(result) && errorPolicy === "none") {
-                                        throw new ApolloError({
-                                            graphQLErrors: getGraphQLErrorsFromResult(result),
-                                        });
-                                    }
-                                    if (mutationStoreValue) {
-                                        mutationStoreValue.loading = false;
-                                        mutationStoreValue.error = null;
-                                    }
-                                    var storeResult = __assign({}, result);
-                                    if (typeof refetchQueries === "function") {
-                                        refetchQueries = refetchQueries(storeResult);
-                                    }
-                                    if (errorPolicy === "ignore" && graphQLResultHasError(storeResult)) {
-                                        delete storeResult.errors;
-                                    }
-                                    return self.markMutationResult({
-                                        mutationId: mutationId,
-                                        result: storeResult,
-                                        document: mutation,
-                                        variables: variables,
-                                        fetchPolicy: fetchPolicy,
-                                        errorPolicy: errorPolicy,
-                                        context: context,
-                                        update: updateWithProxyFn,
-                                        updateQueries: updateQueries,
-                                        awaitRefetchQueries: awaitRefetchQueries,
-                                        refetchQueries: refetchQueries,
-                                        removeOptimistic: isOptimistic ? mutationId : void 0,
-                                        onQueryUpdated: onQueryUpdated,
-                                        keepRootFields: keepRootFields,
-                                    });
-                                }).subscribe({
-                                    next: function (storeResult) {
-                                        self.broadcastQueries();
-                                        // Since mutations might receive multiple payloads from the
-                                        // ApolloLink chain (e.g. when used with @defer),
-                                        // we resolve with a SingleExecutionResult or after the final
-                                        // ExecutionPatchResult has arrived and we have assembled the
-                                        // multipart response into a single result.
-                                        if (!("hasNext" in storeResult) || storeResult.hasNext === false) {
-                                            resolve(__assign(__assign({}, storeResult), { data: self.maskOperation({
-                                                    document: mutation,
-                                                    data: storeResult.data,
-                                                    fetchPolicy: fetchPolicy,
-                                                    id: mutationId,
-                                                }) }));
-                                        }
-                                    },
-                                    error: function (err) {
-                                        if (mutationStoreValue) {
-                                            mutationStoreValue.loading = false;
-                                            mutationStoreValue.error = err;
-                                        }
-                                        if (isOptimistic) {
-                                            self.cache.removeOptimistic(mutationId);
-                                        }
-                                        self.broadcastQueries();
-                                        reject(err instanceof ApolloError ? err : (new ApolloError({
-                                            networkError: err,
-                                        })));
-                                    },
-                                });
-                            })];
+    }
+    async mutate({ mutation, variables, optimisticResponse, updateQueries, refetchQueries = [], awaitRefetchQueries = false, update: updateWithProxyFn, onQueryUpdated, fetchPolicy = this.defaultOptions.mutate?.fetchPolicy || "network-only", errorPolicy = this.defaultOptions.mutate?.errorPolicy || "none", keepRootFields, context, }) {
+        invariant(mutation, 73);
+        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 74);
+        const mutationId = this.generateMutationId();
+        mutation = this.cache.transformForLink(this.transform(mutation));
+        const { hasClientExports } = this.getDocumentInfo(mutation);
+        variables = this.getVariables(mutation, variables);
+        if (hasClientExports) {
+            variables = (await this.localState.addExportedVariables(mutation, variables, context));
+        }
+        const mutationStoreValue = this.mutationStore &&
+            (this.mutationStore[mutationId] = {
+                mutation,
+                variables,
+                loading: true,
+                error: null,
+            });
+        const isOptimistic = optimisticResponse &&
+            this.markMutationOptimistic(optimisticResponse, {
+                mutationId,
+                document: mutation,
+                variables,
+                fetchPolicy,
+                errorPolicy,
+                context,
+                updateQueries,
+                update: updateWithProxyFn,
+                keepRootFields,
+            });
+        this.broadcastQueries();
+        return new Promise((resolve, reject) => {
+            return this.getObservableFromLink(mutation, {
+                ...context,
+                optimisticResponse: isOptimistic ? optimisticResponse : void 0,
+            }, variables, {}, false)
+                .pipe(mergeMap((result) => {
+                if (graphQLResultHasError(result) && errorPolicy === "none") {
+                    throw new CombinedGraphQLErrors(getGraphQLErrorsFromResult(result));
+                }
+                if (mutationStoreValue) {
+                    mutationStoreValue.loading = false;
+                    mutationStoreValue.error = null;
+                }
+                const storeResult = { ...result };
+                if (typeof refetchQueries === "function") {
+                    refetchQueries = refetchQueries(storeResult);
+                }
+                if (errorPolicy === "ignore" &&
+                    graphQLResultHasError(storeResult)) {
+                    delete storeResult.errors;
                 }
+                return from(this.markMutationResult({
+                    mutationId,
+                    result: storeResult,
+                    document: mutation,
+                    variables,
+                    fetchPolicy,
+                    errorPolicy,
+                    context,
+                    update: updateWithProxyFn,
+                    updateQueries,
+                    awaitRefetchQueries,
+                    refetchQueries,
+                    removeOptimistic: isOptimistic ? mutationId : void 0,
+                    onQueryUpdated,
+                    keepRootFields,
+                }));
+            }))
+                .subscribe({
+                next: (storeResult) => {
+                    this.broadcastQueries();
+                    // Since mutations might receive multiple payloads from the
+                    // ApolloLink chain (e.g. when used with @defer),
+                    // we resolve with a SingleExecutionResult or after the final
+                    // ExecutionPatchResult has arrived and we have assembled the
+                    // multipart response into a single result.
+                    if (!("hasNext" in storeResult) || storeResult.hasNext === false) {
+                        resolve({
+                            ...storeResult,
+                            data: this.maskOperation({
+                                document: mutation,
+                                data: storeResult.data,
+                                fetchPolicy,
+                                id: mutationId,
+                            }),
+                        });
+                    }
+                },
+                error: (err) => {
+                    err = maybeWrapError(err);
+                    if (mutationStoreValue) {
+                        mutationStoreValue.loading = false;
+                        mutationStoreValue.error = err;
+                    }
+                    if (isOptimistic) {
+                        this.cache.removeOptimistic(mutationId);
+                    }
+                    this.broadcastQueries();
+                    reject(err);
+                },
             });
         });
-    };
-    QueryManager.prototype.markMutationResult = function (mutation, cache) {
-        var _this = this;
-        if (cache === void 0) { cache = this.cache; }
-        var result = mutation.result;
-        var cacheWrites = [];
-        var skipCache = mutation.fetchPolicy === "no-cache";
+    }
+    markMutationResult(mutation, cache = this.cache) {
+        let { result } = mutation;
+        const cacheWrites = [];
+        const skipCache = mutation.fetchPolicy === "no-cache";
         if (!skipCache && shouldWriteResult(result, mutation.errorPolicy)) {
             if (!isExecutionPatchIncrementalResult(result)) {
                 cacheWrites.push({
@@ -209,7 +201,7 @@ var QueryManager = /** @class */ (function () {
             }
             if (isExecutionPatchIncrementalResult(result) &&
                 isNonEmptyArray(result.incremental)) {
-                var diff = cache.diff({
+                const diff = cache.diff({
                     id: "ROOT_MUTATION",
                     // The cache complains if passed a mutation where it expects a
                     // query, so we transform mutations and subscriptions to queries
@@ -219,7 +211,7 @@ var QueryManager = /** @class */ (function () {
                     optimistic: false,
                     returnPartialData: true,
                 });
-                var mergedData = void 0;
+                let mergedData;
                 if (diff.result) {
                     mergedData = mergeIncrementalData(diff.result, result);
                 }
@@ -235,26 +227,25 @@ var QueryManager = /** @class */ (function () {
                     });
                 }
             }
-            var updateQueries_1 = mutation.updateQueries;
-            if (updateQueries_1) {
-                this.queries.forEach(function (_a, queryId) {
-                    var observableQuery = _a.observableQuery;
-                    var queryName = observableQuery && observableQuery.queryName;
-                    if (!queryName || !hasOwnProperty.call(updateQueries_1, queryName)) {
+            const { updateQueries } = mutation;
+            if (updateQueries) {
+                this.queries.forEach(({ observableQuery }, queryId) => {
+                    const queryName = observableQuery && observableQuery.queryName;
+                    if (!queryName || !hasOwnProperty.call(updateQueries, queryName)) {
                         return;
                     }
-                    var updater = updateQueries_1[queryName];
-                    var _b = _this.queries.get(queryId), document = _b.document, variables = _b.variables;
+                    const updater = updateQueries[queryName];
+                    const { document, variables } = this.queries.get(queryId);
                     // Read the current query result from the store.
-                    var _c = cache.diff({
+                    const { result: currentQueryResult, complete } = cache.diff({
                         query: document,
-                        variables: variables,
+                        variables,
                         returnPartialData: true,
                         optimistic: false,
-                    }), currentQueryResult = _c.result, complete = _c.complete;
+                    });
                     if (complete && currentQueryResult) {
                         // Run our reducer using the current query result and the mutation result.
-                        var nextQueryResult = updater(currentQueryResult, {
+                        const nextQueryResult = updater(currentQueryResult, {
                             mutationResult: result,
                             queryName: (document && getOperationName(document)) || void 0,
                             queryVariables: variables,
@@ -265,7 +256,7 @@ var QueryManager = /** @class */ (function () {
                                 result: nextQueryResult,
                                 dataId: "ROOT_QUERY",
                                 query: document,
-                                variables: variables,
+                                variables,
                             });
                         }
                     }
@@ -277,19 +268,19 @@ var QueryManager = /** @class */ (function () {
             mutation.update ||
             mutation.onQueryUpdated ||
             mutation.removeOptimistic) {
-            var results_1 = [];
+            const results = [];
             this.refetchQueries({
-                updateCache: function (cache) {
+                updateCache: (cache) => {
                     if (!skipCache) {
-                        cacheWrites.forEach(function (write) { return cache.write(write); });
+                        cacheWrites.forEach((write) => cache.write(write));
                     }
                     // If the mutation has some writes associated with it then we need to
                     // apply those writes to the store by running this reducer again with
                     // a write action.
-                    var update = mutation.update;
+                    const { update } = mutation;
                     // Determine whether result is a SingleExecutionResult,
                     // or the final ExecutionPatchResult.
-                    var isFinalResult = !isExecutionPatchResult(result) ||
+                    const isFinalResult = !isExecutionPatchResult(result) ||
                         (isExecutionPatchIncrementalResult(result) && !result.hasNext);
                     if (update) {
                         if (!skipCache) {
@@ -297,18 +288,18 @@ var QueryManager = /** @class */ (function () {
                             // (the first cache.write call in the cacheWrites.forEach loop
                             // above), so field read functions have a chance to run for
                             // fields within mutation result objects.
-                            var diff = cache.diff({
+                            const diff = cache.diff({
                                 id: "ROOT_MUTATION",
                                 // The cache complains if passed a mutation where it expects a
                                 // query, so we transform mutations and subscriptions to queries
                                 // (only once, thanks to this.transformCache).
-                                query: _this.getDocumentInfo(mutation.document).asQuery,
+                                query: this.getDocumentInfo(mutation.document).asQuery,
                                 variables: mutation.variables,
                                 optimistic: false,
                                 returnPartialData: true,
                             });
                             if (diff.complete) {
-                                result = __assign(__assign({}, result), { data: diff.result });
+                                result = { ...result, data: diff.result };
                                 if ("incremental" in result) {
                                     delete result.incremental;
                                 }
@@ -332,8 +323,7 @@ var QueryManager = /** @class */ (function () {
                     if (!skipCache && !mutation.keepRootFields && isFinalResult) {
                         cache.modify({
                             id: "ROOT_MUTATION",
-                            fields: function (value, _a) {
-                                var fieldName = _a.fieldName, DELETE = _a.DELETE;
+                            fields(value, { fieldName, DELETE }) {
                                 return fieldName === "__typename" ? value : DELETE;
                             },
                         });
@@ -350,64 +340,48 @@ var QueryManager = /** @class */ (function () {
                 // If no onQueryUpdated function was provided for this mutation, pass
                 // null instead of undefined to disable the default refetching behavior.
                 onQueryUpdated: mutation.onQueryUpdated || null,
-            }).forEach(function (result) { return results_1.push(result); });
+            }).forEach((result) => results.push(result));
             if (mutation.awaitRefetchQueries || mutation.onQueryUpdated) {
                 // Returning a promise here makes the mutation await that promise, so we
                 // include results in that promise's work if awaitRefetchQueries or an
                 // onQueryUpdated function was specified.
-                return Promise.all(results_1).then(function () { return result; });
+                return Promise.all(results).then(() => result);
             }
         }
         return Promise.resolve(result);
-    };
-    QueryManager.prototype.markMutationOptimistic = function (optimisticResponse, mutation) {
-        var _this = this;
-        var data = typeof optimisticResponse === "function" ?
-            optimisticResponse(mutation.variables, { IGNORE: IGNORE })
+    }
+    markMutationOptimistic(optimisticResponse, mutation) {
+        const data = typeof optimisticResponse === "function" ?
+            optimisticResponse(mutation.variables, { IGNORE })
             : optimisticResponse;
         if (data === IGNORE) {
             return false;
         }
-        this.cache.recordOptimisticTransaction(function (cache) {
+        this.cache.recordOptimisticTransaction((cache) => {
             try {
-                _this.markMutationResult(__assign(__assign({}, mutation), { result: { data: data } }), cache);
+                this.markMutationResult({
+                    ...mutation,
+                    result: { data },
+                }, cache);
             }
             catch (error) {
-                globalThis.__DEV__ !== false && invariant.error(error);
+                __DEV__ && invariant.error(error);
             }
         }, mutation.mutationId);
         return true;
-    };
-    QueryManager.prototype.fetchQuery = function (queryId, options, networkStatus) {
-        return this.fetchConcastWithInfo(queryId, options, networkStatus).concast
-            .promise;
-    };
-    QueryManager.prototype.getQueryStore = function () {
-        var store = Object.create(null);
-        this.queries.forEach(function (info, queryId) {
-            store[queryId] = {
-                variables: info.variables,
-                networkStatus: info.networkStatus,
-                networkError: info.networkError,
-                graphQLErrors: info.graphQLErrors,
-            };
-        });
-        return store;
-    };
-    QueryManager.prototype.resetErrors = function (queryId) {
-        var queryInfo = this.queries.get(queryId);
-        if (queryInfo) {
-            queryInfo.networkError = undefined;
-            queryInfo.graphQLErrors = [];
-        }
-    };
-    QueryManager.prototype.transform = function (document) {
+    }
+    fetchQuery(queryId, options, networkStatus) {
+        return lastValueFrom(this.fetchObservableWithInfo(queryId, options, networkStatus).observable, { defaultValue: undefined });
+    }
+    transform(document) {
         return this.documentTransform.transformDocument(document);
-    };
-    QueryManager.prototype.getDocumentInfo = function (document) {
-        var transformCache = this.transformCache;
+    }
+    transformCache = new AutoCleanedWeakCache(cacheSizes["queryManager.getDocumentInfo"] ||
+        2000 /* defaultCacheSizes["queryManager.getDocumentInfo"] */);
+    getDocumentInfo(document) {
+        const { transformCache } = this;
         if (!transformCache.has(document)) {
-            var cacheEntry = {
+            const cacheEntry = {
                 // TODO These three calls (hasClientExports, shouldForceResolvers, and
                 // usesNonreactiveDirective) are performing independent full traversals
                 // of the transformed document. We should consider merging these
@@ -427,35 +401,44 @@ var QueryManager = /** @class */ (function () {
                 defaultVars: getDefaultValues(getOperationDefinition(document)),
                 // Transform any mutation or subscription operations to query operations
                 // so we can read/write them from/to the cache.
-                asQuery: __assign(__assign({}, document), { definitions: document.definitions.map(function (def) {
+                asQuery: {
+                    ...document,
+                    definitions: document.definitions.map((def) => {
                         if (def.kind === "OperationDefinition" &&
                             def.operation !== "query") {
-                            return __assign(__assign({}, def), { operation: "query" });
+                            return { ...def, operation: "query" };
                         }
                         return def;
-                    }) }),
+                    }),
+                },
             };
             transformCache.set(document, cacheEntry);
         }
         return transformCache.get(document);
-    };
-    QueryManager.prototype.getVariables = function (document, variables) {
-        return __assign(__assign({}, this.getDocumentInfo(document).defaultVars), variables);
-    };
-    QueryManager.prototype.watchQuery = function (options) {
-        var query = this.transform(options.query);
+    }
+    getVariables(document, variables) {
+        return {
+            ...this.getDocumentInfo(document).defaultVars,
+            ...variables,
+        };
+    }
+    watchQuery(options) {
+        const query = this.transform(options.query);
         // assign variable default values if supplied
         // NOTE: We don't modify options.query here with the transformed query to
         // ensure observable.options.query is set to the raw untransformed query.
-        options = __assign(__assign({}, options), { variables: this.getVariables(query, options.variables) });
+        options = {
+            ...options,
+            variables: this.getVariables(query, options.variables),
+        };
         if (typeof options.notifyOnNetworkStatusChange === "undefined") {
             options.notifyOnNetworkStatusChange = false;
         }
-        var queryInfo = new QueryInfo(this);
-        var observable = new ObservableQuery({
+        const queryInfo = new QueryInfo(this);
+        const observable = new ObservableQuery({
             queryManager: this,
-            queryInfo: queryInfo,
-            options: options,
+            queryInfo,
+            options,
         });
         observable["lastQuery"] = query;
         this.queries.set(observable.queryId, queryInfo);
@@ -467,85 +450,77 @@ var QueryManager = /** @class */ (function () {
             variables: observable.variables,
         });
         return observable;
-    };
-    QueryManager.prototype.query = function (options, queryId) {
-        var _this = this;
-        if (queryId === void 0) { queryId = this.generateQueryId(); }
-        invariant(options.query, 30);
-        invariant(options.query.kind === "Document", 31);
-        invariant(!options.returnPartialData, 32);
-        invariant(!options.pollInterval, 33);
-        var query = this.transform(options.query);
-        return this.fetchQuery(queryId, __assign(__assign({}, options), { query: query }))
-            .then(function (result) {
-            return result && __assign(__assign({}, result), { data: _this.maskOperation({
-                    document: query,
-                    data: result.data,
-                    fetchPolicy: options.fetchPolicy,
-                    id: queryId,
-                }) });
+    }
+    // TODO: catch `EmptyError` and rethrow as network error if `complete`
+    // notification is emitted without a value.
+    query(options, queryId = this.generateQueryId()) {
+        invariant(options.query, 75);
+        invariant(options.query.kind === "Document", 76);
+        invariant(!options.returnPartialData, 77);
+        invariant(!options.pollInterval, 78);
+        const query = this.transform(options.query);
+        return this.fetchQuery(queryId, { ...options, query })
+            .then((result) => result && {
+            ...result,
+            data: this.maskOperation({
+                document: query,
+                data: result.data,
+                fetchPolicy: options.fetchPolicy,
+                id: queryId,
+            }),
         })
-            .finally(function () { return _this.stopQuery(queryId); });
-    };
-    QueryManager.prototype.generateQueryId = function () {
+            .finally(() => this.stopQuery(queryId));
+    }
+    queryIdCounter = 1;
+    generateQueryId() {
         return String(this.queryIdCounter++);
-    };
-    QueryManager.prototype.generateRequestId = function () {
+    }
+    requestIdCounter = 1;
+    generateRequestId() {
         return this.requestIdCounter++;
-    };
-    QueryManager.prototype.generateMutationId = function () {
+    }
+    mutationIdCounter = 1;
+    generateMutationId() {
         return String(this.mutationIdCounter++);
-    };
-    QueryManager.prototype.stopQueryInStore = function (queryId) {
-        this.stopQueryInStoreNoBroadcast(queryId);
-        this.broadcastQueries();
-    };
-    QueryManager.prototype.stopQueryInStoreNoBroadcast = function (queryId) {
-        var queryInfo = this.queries.get(queryId);
-        if (queryInfo)
-            queryInfo.stop();
-    };
-    QueryManager.prototype.clearStore = function (options) {
-        if (options === void 0) { options = {
-            discardWatches: true,
-        }; }
+    }
+    clearStore(options = {
+        discardWatches: true,
+    }) {
         // Before we have sent the reset action to the store, we can no longer
         // rely on the results returned by in-flight requests since these may
         // depend on values that previously existed in the data portion of the
         // store. So, we cancel the promises and observers that we have issued
         // so far and not yet resolved (in the case of queries).
-        this.cancelPendingFetches(newInvariantError(34));
-        this.queries.forEach(function (queryInfo) {
+        this.cancelPendingFetches(newInvariantError(79));
+        this.queries.forEach((queryInfo) => {
             if (queryInfo.observableQuery) {
                 // Set loading to true so listeners don't trigger unless they want
                 // results with partial data.
-                queryInfo.networkStatus = NetworkStatus.loading;
+                queryInfo.observableQuery["networkStatus"] = NetworkStatus.loading;
             }
             else {
                 queryInfo.stop();
             }
         });
         if (this.mutationStore) {
-            this.mutationStore = Object.create(null);
+            this.mutationStore = {};
         }
         // begin removing data from the store
         return this.cache.reset(options);
-    };
-    QueryManager.prototype.getObservableQueries = function (include) {
-        var _this = this;
-        if (include === void 0) { include = "active"; }
-        var queries = new Map();
-        var queryNames = new Map();
-        var queryNamesAndQueryStrings = new Map();
-        var legacyQueryOptions = new Set();
+    }
+    getObservableQueries(include = "active") {
+        const queries = new Map();
+        const queryNames = new Map();
+        const queryNamesAndQueryStrings = new Map();
+        const legacyQueryOptions = new Set();
         if (Array.isArray(include)) {
-            include.forEach(function (desc) {
+            include.forEach((desc) => {
                 if (typeof desc === "string") {
                     queryNames.set(desc, desc);
                     queryNamesAndQueryStrings.set(desc, false);
                 }
                 else if (isDocumentNode(desc)) {
-                    var queryString = print(_this.transform(desc));
+                    const queryString = print(this.transform(desc));
                     queryNames.set(queryString, getOperationName(desc));
                     queryNamesAndQueryStrings.set(queryString, false);
                 }
@@ -554,14 +529,13 @@ var QueryManager = /** @class */ (function () {
                 }
             });
         }
-        this.queries.forEach(function (_a, queryId) {
-            var oq = _a.observableQuery, document = _a.document;
+        this.queries.forEach(({ observableQuery: oq, document }, queryId) => {
             if (oq) {
                 if (include === "all") {
                     queries.set(queryId, oq);
                     return;
                 }
-                var queryName = oq.queryName, fetchPolicy = oq.options.fetchPolicy;
+                const { queryName, options: { fetchPolicy }, } = oq;
                 if (fetchPolicy === "standby" ||
                     (include === "active" && !oq.hasObservers())) {
                     return;
@@ -578,124 +552,114 @@ var QueryManager = /** @class */ (function () {
             }
         });
         if (legacyQueryOptions.size) {
-            legacyQueryOptions.forEach(function (options) {
+            legacyQueryOptions.forEach((options) => {
                 // We will be issuing a fresh network request for this query, so we
                 // pre-allocate a new query ID here, using a special prefix to enable
                 // cleaning up these temporary queries later, after fetching.
-                var queryId = makeUniqueId("legacyOneTimeQuery");
-                var queryInfo = _this.getQuery(queryId).init({
+                const queryId = makeUniqueId("legacyOneTimeQuery");
+                const queryInfo = this.getQuery(queryId).init({
                     document: options.query,
                     variables: options.variables,
                 });
-                var oq = new ObservableQuery({
-                    queryManager: _this,
-                    queryInfo: queryInfo,
-                    options: __assign(__assign({}, options), { fetchPolicy: "network-only" }),
+                const oq = new ObservableQuery({
+                    queryManager: this,
+                    queryInfo,
+                    options: {
+                        ...options,
+                        fetchPolicy: "network-only",
+                    },
                 });
                 invariant(oq.queryId === queryId);
                 queryInfo.setObservableQuery(oq);
                 queries.set(queryId, oq);
             });
         }
-        if (globalThis.__DEV__ !== false && queryNamesAndQueryStrings.size) {
-            queryNamesAndQueryStrings.forEach(function (included, nameOrQueryString) {
+        if (__DEV__ && queryNamesAndQueryStrings.size) {
+            queryNamesAndQueryStrings.forEach((included, nameOrQueryString) => {
                 if (!included) {
-                    var queryName = queryNames.get(nameOrQueryString);
+                    const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        globalThis.__DEV__ !== false && invariant.warn(35, queryName);
+                        __DEV__ && invariant.warn(80, queryName);
                     }
                     else {
-                        globalThis.__DEV__ !== false && invariant.warn(36);
+                        __DEV__ && invariant.warn(81);
                     }
                 }
             });
         }
         return queries;
-    };
-    QueryManager.prototype.reFetchObservableQueries = function (includeStandby) {
-        var _this = this;
-        if (includeStandby === void 0) { includeStandby = false; }
-        var observableQueryPromises = [];
-        this.getObservableQueries(includeStandby ? "all" : "active").forEach(function (observableQuery, queryId) {
-            var fetchPolicy = observableQuery.options.fetchPolicy;
+    }
+    reFetchObservableQueries(includeStandby = false) {
+        const observableQueryPromises = [];
+        this.getObservableQueries(includeStandby ? "all" : "active").forEach((observableQuery, queryId) => {
+            const { fetchPolicy } = observableQuery.options;
             observableQuery.resetLastResults();
             if (includeStandby ||
                 (fetchPolicy !== "standby" && fetchPolicy !== "cache-only")) {
                 observableQueryPromises.push(observableQuery.refetch());
             }
-            _this.getQuery(queryId).setDiff(null);
+            this.getQuery(queryId).setDiff(null);
         });
         this.broadcastQueries();
         return Promise.all(observableQueryPromises);
-    };
-    QueryManager.prototype.setObservableQuery = function (observableQuery) {
+    }
+    setObservableQuery(observableQuery) {
         this.getQuery(observableQuery.queryId).setObservableQuery(observableQuery);
-    };
-    QueryManager.prototype.startGraphQLSubscription = function (options) {
-        var _this = this;
-        var query = options.query, variables = options.variables;
-        var fetchPolicy = options.fetchPolicy, _a = options.errorPolicy, errorPolicy = _a === void 0 ? "none" : _a, _b = options.context, context = _b === void 0 ? {} : _b, _c = options.extensions, extensions = _c === void 0 ? {} : _c;
+    }
+    startGraphQLSubscription(options) {
+        let { query, variables } = options;
+        const { fetchPolicy, errorPolicy = "none", context = {}, extensions = {}, } = options;
         query = this.transform(query);
         variables = this.getVariables(query, variables);
-        var makeObservable = function (variables) {
-            return _this.getObservableFromLink(query, context, variables, extensions).map(function (result) {
-                if (fetchPolicy !== "no-cache") {
-                    // the subscription interface should handle not sending us results we no longer subscribe to.
-                    // XXX I don't think we ever send in an object with errors, but we might in the future...
-                    if (shouldWriteResult(result, errorPolicy)) {
-                        _this.cache.write({
-                            query: query,
-                            result: result.data,
-                            dataId: "ROOT_SUBSCRIPTION",
-                            variables: variables,
-                        });
-                    }
-                    _this.broadcastQueries();
-                }
-                var hasErrors = graphQLResultHasError(result);
-                var hasProtocolErrors = graphQLResultHasProtocolErrors(result);
-                if (hasErrors || hasProtocolErrors) {
-                    var errors = {};
-                    if (hasErrors) {
-                        errors.graphQLErrors = result.errors;
-                    }
-                    if (hasProtocolErrors) {
-                        errors.protocolErrors = result.extensions[PROTOCOL_ERRORS_SYMBOL];
-                    }
-                    // `errorPolicy` is a mechanism for handling GraphQL errors, according
-                    // to our documentation, so we throw protocol errors regardless of the
-                    // set error policy.
-                    if (errorPolicy === "none" || hasProtocolErrors) {
-                        throw new ApolloError(errors);
-                    }
-                }
-                if (errorPolicy === "ignore") {
-                    delete result.errors;
+        const makeObservable = (variables) => this.getObservableFromLink(query, context, variables, extensions).pipe(map((result) => {
+            if (fetchPolicy !== "no-cache") {
+                // the subscription interface should handle not sending us results we no longer subscribe to.
+                // XXX I don't think we ever send in an object with errors, but we might in the future...
+                if (shouldWriteResult(result, errorPolicy)) {
+                    this.cache.write({
+                        query,
+                        result: result.data,
+                        dataId: "ROOT_SUBSCRIPTION",
+                        variables: variables,
+                    });
                 }
-                return result;
-            });
-        };
+                this.broadcastQueries();
+            }
+            const hasErrors = graphQLResultHasError(result);
+            const hasProtocolErrors = graphQLResultHasProtocolErrors(result);
+            if (hasErrors && errorPolicy === "none") {
+                throw new CombinedGraphQLErrors(result.errors);
+            }
+            if (hasProtocolErrors) {
+                // `errorPolicy` is a mechanism for handling GraphQL errors, according
+                // to our documentation, so we throw protocol errors regardless of the
+                // set error policy.
+                throw result.extensions[PROTOCOL_ERRORS_SYMBOL];
+            }
+            if (errorPolicy === "ignore") {
+                delete result.errors;
+            }
+            return result;
+        }), catchError((error) => {
+            throw maybeWrapError(error);
+        }));
         if (this.getDocumentInfo(query).hasClientExports) {
-            var observablePromise_1 = this.localState
+            const observablePromise = this.localState
                 .addExportedVariables(query, variables, context)
                 .then(makeObservable);
-            return new Observable(function (observer) {
-                var sub = null;
-                observablePromise_1.then(function (observable) { return (sub = observable.subscribe(observer)); }, observer.error);
-                return function () { return sub && sub.unsubscribe(); };
+            return new Observable((observer) => {
+                let sub = null;
+                observablePromise.then((observable) => (sub = observable.subscribe(observer)), observer.error);
+                return () => sub && sub.unsubscribe();
             });
         }
         return makeObservable(variables);
-    };
-    QueryManager.prototype.stopQuery = function (queryId) {
-        this.stopQueryNoBroadcast(queryId);
-        this.broadcastQueries();
-    };
-    QueryManager.prototype.stopQueryNoBroadcast = function (queryId) {
-        this.stopQueryInStoreNoBroadcast(queryId);
+    }
+    stopQuery(queryId) {
         this.removeQuery(queryId);
-    };
-    QueryManager.prototype.removeQuery = function (queryId) {
+        this.broadcastQueries();
+    }
+    removeQuery(queryId) {
         // teardown all links
         // Both `QueryManager.fetchRequest` and `QueryManager.query` create separate promises
         // that each add their reject functions to fetchCancelFns.
@@ -706,104 +670,111 @@ var QueryManager = /** @class */ (function () {
             this.getQuery(queryId).stop();
             this.queries.delete(queryId);
         }
-    };
-    QueryManager.prototype.broadcastQueries = function () {
+    }
+    broadcastQueries() {
         if (this.onBroadcast)
             this.onBroadcast();
-        this.queries.forEach(function (info) { return info.notify(); });
-    };
-    QueryManager.prototype.getLocalState = function () {
+        this.queries.forEach((info) => info.notify());
+    }
+    getLocalState() {
         return this.localState;
-    };
-    QueryManager.prototype.getObservableFromLink = function (query, context, variables, extensions, 
+    }
+    // Use protected instead of private field so
+    // @apollo/experimental-nextjs-app-support can access type info.
+    inFlightLinkObservables = new Trie(false);
+    getObservableFromLink(query, context, variables, extensions, 
     // Prefer context.queryDeduplication if specified.
-    deduplication) {
-        var _this = this;
-        var _a;
-        if (deduplication === void 0) { deduplication = (_a = context === null || context === void 0 ? void 0 : context.queryDeduplication) !== null && _a !== void 0 ? _a : this.queryDeduplication; }
-        var observable;
-        var _b = this.getDocumentInfo(query), serverQuery = _b.serverQuery, clientQuery = _b.clientQuery;
+    deduplication = context?.queryDeduplication ??
+        this.queryDeduplication) {
+        let observable;
+        const { serverQuery, clientQuery } = this.getDocumentInfo(query);
         if (serverQuery) {
-            var _c = this, inFlightLinkObservables_1 = _c.inFlightLinkObservables, link = _c.link;
-            var operation = {
+            const { inFlightLinkObservables, link } = this;
+            const operation = {
                 query: serverQuery,
-                variables: variables,
+                variables,
                 operationName: getOperationName(serverQuery) || void 0,
-                context: this.prepareContext(__assign(__assign({}, context), { forceFetch: !deduplication })),
-                extensions: extensions,
+                context: this.prepareContext({
+                    ...context,
+                    forceFetch: !deduplication,
+                }),
+                extensions,
             };
             context = operation.context;
             if (deduplication) {
-                var printedServerQuery_1 = print(serverQuery);
-                var varJson_1 = canonicalStringify(variables);
-                var entry = inFlightLinkObservables_1.lookup(printedServerQuery_1, varJson_1);
+                const printedServerQuery = print(serverQuery);
+                const varJson = canonicalStringify(variables);
+                const entry = inFlightLinkObservables.lookup(printedServerQuery, varJson);
                 observable = entry.observable;
                 if (!observable) {
-                    var concast_1 = new Concast([
-                        execute(link, operation),
-                    ]);
-                    observable = entry.observable = concast_1;
-                    concast_1.beforeNext(function cb(method, arg) {
-                        if (method === "next" && "hasNext" in arg && arg.hasNext) {
-                            concast_1.beforeNext(cb);
-                        }
-                        else {
-                            inFlightLinkObservables_1.remove(printedServerQuery_1, varJson_1);
+                    observable = entry.observable = execute(link, operation).pipe(onAnyEvent((event) => {
+                        if ((event.type !== "next" ||
+                            !("hasNext" in event.value) ||
+                            !event.value.hasNext) &&
+                            inFlightLinkObservables.peek(printedServerQuery, varJson) ===
+                                entry) {
+                            inFlightLinkObservables.remove(printedServerQuery, varJson);
                         }
-                    });
+                    }), shareReplay({ refCount: true }));
                 }
             }
             else {
-                observable = new Concast([
-                    execute(link, operation),
-                ]);
+                observable = execute(link, operation);
             }
         }
         else {
-            observable = new Concast([Observable.of({ data: {} })]);
+            observable = of({ data: {} });
             context = this.prepareContext(context);
         }
         if (clientQuery) {
-            observable = asyncMap(observable, function (result) {
-                return _this.localState.runResolvers({
+            observable = observable.pipe(mergeMap((result) => {
+                return from(this.localState.runResolvers({
                     document: clientQuery,
                     remoteResult: result,
-                    context: context,
-                    variables: variables,
-                });
-            });
+                    context,
+                    variables,
+                }));
+            }));
         }
         return observable;
-    };
-    QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
-        var requestId = (queryInfo.lastRequestId = this.generateRequestId());
+    }
+    getResultsFromLink(queryInfo, cacheWriteBehavior, options) {
+        const requestId = (queryInfo.lastRequestId = this.generateRequestId());
         // Performing transformForLink here gives this.cache a chance to fill in
         // missing fragment definitions (for example) before sending this document
         // through the link chain.
-        var linkDocument = this.cache.transformForLink(options.query);
-        return asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
-            var graphQLErrors = getGraphQLErrorsFromResult(result);
-            var hasErrors = graphQLErrors.length > 0;
-            var errorPolicy = options.errorPolicy;
+        const linkDocument = this.cache.transformForLink(options.query);
+        return this.getObservableFromLink(linkDocument, options.context, options.variables).pipe(catchError((error) => {
+            error = maybeWrapError(error);
+            // Avoid storing errors from older interrupted queries.
+            if (requestId >= queryInfo.lastRequestId) {
+                queryInfo.resetLastWrite();
+                queryInfo.reset();
+            }
+            throw error;
+        }), map((result) => {
+            const graphQLErrors = getGraphQLErrorsFromResult(result);
+            const hasErrors = graphQLErrors.length > 0;
+            const { errorPolicy } = options;
             // If we interrupted this request by calling getResultsFromLink again
             // with the same QueryInfo object, we ignore the old results.
             if (requestId >= queryInfo.lastRequestId) {
                 if (hasErrors && errorPolicy === "none") {
+                    queryInfo.resetLastWrite();
+                    queryInfo.reset();
                     // Throwing here effectively calls observer.error.
-                    throw queryInfo.markError(new ApolloError({
-                        graphQLErrors: graphQLErrors,
-                    }));
+                    throw new CombinedGraphQLErrors(graphQLErrors);
                 }
                 // Use linkDocument rather than queryInfo.document so the
                 // operation/fragments used to write the result are the same as the
                 // ones used to obtain it from the link.
                 queryInfo.markResult(result, linkDocument, options, cacheWriteBehavior);
-                queryInfo.markReady();
             }
-            var aqr = {
+            const aqr = {
                 data: result.data,
                 loading: false,
                 networkStatus: NetworkStatus.ready,
+                partial: !result.data,
             };
             // In the case we start multiple network requests simulatenously, we
             // want to ensure we properly set `data` if we're reporting on an old
@@ -813,67 +784,60 @@ var QueryManager = /** @class */ (function () {
                 aqr.data = void 0;
             }
             if (hasErrors && errorPolicy !== "ignore") {
-                aqr.errors = graphQLErrors;
+                aqr.error = new CombinedGraphQLErrors(graphQLErrors);
                 aqr.networkStatus = NetworkStatus.error;
             }
             return aqr;
-        }, function (networkError) {
-            var error = isApolloError(networkError) ? networkError : (new ApolloError({ networkError: networkError }));
-            // Avoid storing errors from older interrupted queries.
-            if (requestId >= queryInfo.lastRequestId) {
-                queryInfo.markError(error);
-            }
-            throw error;
-        });
-    };
-    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options, 
+        }));
+    }
+    fetchObservableWithInfo(queryId, options, 
     // The initial networkStatus for this fetch, most often
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
     // or setVariables.
-    networkStatus, query) {
-        var _this = this;
-        if (networkStatus === void 0) { networkStatus = NetworkStatus.loading; }
-        if (query === void 0) { query = options.query; }
-        var variables = this.getVariables(query, options.variables);
-        var queryInfo = this.getQuery(queryId);
-        var defaults = this.defaultOptions.watchQuery;
-        var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? (defaults && defaults.fetchPolicy) || "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? (defaults && defaults.errorPolicy) || "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
-        var normalized = Object.assign({}, options, {
-            query: query,
-            variables: variables,
-            fetchPolicy: fetchPolicy,
-            errorPolicy: errorPolicy,
-            returnPartialData: returnPartialData,
-            notifyOnNetworkStatusChange: notifyOnNetworkStatusChange,
-            context: context,
+    networkStatus = NetworkStatus.loading, query = options.query, emitLoadingState = false) {
+        const variables = this.getVariables(query, options.variables);
+        const queryInfo = this.getQuery(queryId);
+        const defaults = this.defaultOptions.watchQuery;
+        let { fetchPolicy = (defaults && defaults.fetchPolicy) || "cache-first", errorPolicy = (defaults && defaults.errorPolicy) || "none", returnPartialData = false, notifyOnNetworkStatusChange = false, context = {}, } = options;
+        const normalized = Object.assign({}, options, {
+            query,
+            variables,
+            fetchPolicy,
+            errorPolicy,
+            returnPartialData,
+            notifyOnNetworkStatusChange,
+            context,
         });
-        var fromVariables = function (variables) {
+        const fromVariables = (variables) => {
             // Since normalized is always a fresh copy of options, it's safe to
             // modify its properties here, rather than creating yet another new
             // WatchQueryOptions object.
             normalized.variables = variables;
-            var sourcesWithInfo = _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            const observableWithInfo = this.fetchQueryByPolicy(queryInfo, normalized, networkStatus, emitLoadingState);
             if (
             // If we're in standby, postpone advancing options.fetchPolicy using
             // applyNextFetchPolicy.
             normalized.fetchPolicy !== "standby" &&
-                // The "standby" policy currently returns [] from fetchQueryByPolicy, so
-                // this is another way to detect when nothing was done/fetched.
-                sourcesWithInfo.sources.length > 0 &&
                 queryInfo.observableQuery) {
                 queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
             }
-            return sourcesWithInfo;
+            return observableWithInfo;
         };
         // This cancel function needs to be set before the concast is created,
         // in case concast creation synchronously cancels the request.
-        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
-        this.fetchCancelFns.set(queryId, function (reason) {
+        const cleanupCancelFn = () => {
+            this.fetchCancelFns.delete(queryId);
+            // We need to call `complete` on the subject here otherwise the merged
+            // observable will never complete since it waits for all source
+            // observables to complete before itself completes.
+            fetchCancelSubject.complete();
+        };
+        this.fetchCancelFns.set(queryId, (reason) => {
+            fetchCancelSubject.error(reason);
             cleanupCancelFn();
-            // This delay ensures the concast variable has been initialized.
-            setTimeout(function () { return concast.cancel(reason); });
         });
-        var concast, containsDataFromLink;
+        const fetchCancelSubject = new Subject();
+        let observable, containsDataFromLink;
         // If the query has @export(as: ...) directives, then we need to
         // process those directives asynchronously. When there are no
         // @export directives (the common case), we deliberately avoid
@@ -882,10 +846,7 @@ var QueryManager = /** @class */ (function () {
         // for backwards compatibility. TODO This code could be simpler if
         // we deprecated and removed LocalState.
         if (this.getDocumentInfo(normalized.query).hasClientExports) {
-            concast = new Concast(this.localState
-                .addExportedVariables(normalized.query, normalized.variables, normalized.context)
-                .then(fromVariables)
-                .then(function (sourcesWithInfo) { return sourcesWithInfo.sources; }));
+            observable = from(this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context)).pipe(mergeMap((variables) => fromVariables(variables).observable));
             // there is just no way we can synchronously get the *right* value here,
             // so we will assume `true`, which is the behaviour before the bug fix in
             // #10597. This means that bug is not fixed in that case, and is probably
@@ -894,29 +855,26 @@ var QueryManager = /** @class */ (function () {
             containsDataFromLink = true;
         }
         else {
-            var sourcesWithInfo = fromVariables(normalized.variables);
+            const sourcesWithInfo = fromVariables(normalized.variables);
             containsDataFromLink = sourcesWithInfo.fromLink;
-            concast = new Concast(sourcesWithInfo.sources);
+            observable = sourcesWithInfo.observable;
         }
-        concast.promise.then(cleanupCancelFn, cleanupCancelFn);
         return {
-            concast: concast,
+            observable: observable.pipe(tap({ error: cleanupCancelFn, complete: cleanupCancelFn }), mergeWith(fetchCancelSubject), share()),
             fromLink: containsDataFromLink,
         };
-    };
-    QueryManager.prototype.refetchQueries = function (_a) {
-        var _this = this;
-        var updateCache = _a.updateCache, include = _a.include, _b = _a.optimistic, optimistic = _b === void 0 ? false : _b, _c = _a.removeOptimistic, removeOptimistic = _c === void 0 ? optimistic ? makeUniqueId("refetchQueries") : void 0 : _c, onQueryUpdated = _a.onQueryUpdated;
-        var includedQueriesById = new Map();
+    }
+    refetchQueries({ updateCache, include, optimistic = false, removeOptimistic = optimistic ? makeUniqueId("refetchQueries") : void 0, onQueryUpdated, }) {
+        const includedQueriesById = new Map();
         if (include) {
-            this.getObservableQueries(include).forEach(function (oq, queryId) {
+            this.getObservableQueries(include).forEach((oq, queryId) => {
                 includedQueriesById.set(queryId, {
-                    oq: oq,
-                    lastDiff: _this.getQuery(queryId).getDiff(),
+                    oq,
+                    lastDiff: this.getQuery(queryId).getDiff(),
                 });
             });
         }
-        var results = new Map();
+        const results = new Map();
         if (updateCache) {
             this.cache.batch({
                 update: updateCache,
@@ -957,16 +915,16 @@ var QueryManager = /** @class */ (function () {
                 // If an explicit removeOptimistic string is provided with optimistic:
                 // true, the removeOptimistic string will determine the ID of the
                 // temporary optimistic layer, in case that ever matters.
-                removeOptimistic: removeOptimistic,
-                onWatchUpdated: function (watch, diff, lastDiff) {
-                    var oq = watch.watcher instanceof QueryInfo && watch.watcher.observableQuery;
+                removeOptimistic,
+                onWatchUpdated(watch, diff, lastDiff) {
+                    const oq = watch.watcher instanceof QueryInfo && watch.watcher.observableQuery;
                     if (oq) {
                         if (onQueryUpdated) {
                             // Since we're about to handle this query now, remove it from
                             // includedQueriesById, in case it was added earlier because of
                             // options.include.
                             includedQueriesById.delete(oq.queryId);
-                            var result = onQueryUpdated(oq, diff, lastDiff);
+                            let result = onQueryUpdated(oq, diff, lastDiff);
                             if (result === true) {
                                 // The onQueryUpdated function requested the default refetching
                                 // behavior by returning true.
@@ -985,21 +943,20 @@ var QueryManager = /** @class */ (function () {
                             // If we don't have an onQueryUpdated function, and onQueryUpdated
                             // was not disabled by passing null, make sure this query is
                             // "included" like any other options.include-specified query.
-                            includedQueriesById.set(oq.queryId, { oq: oq, lastDiff: lastDiff, diff: diff });
+                            includedQueriesById.set(oq.queryId, { oq, lastDiff, diff });
                         }
                     }
                 },
             });
         }
         if (includedQueriesById.size) {
-            includedQueriesById.forEach(function (_a, queryId) {
-                var oq = _a.oq, lastDiff = _a.lastDiff, diff = _a.diff;
-                var result;
+            includedQueriesById.forEach(({ oq, lastDiff, diff }, queryId) => {
+                let result;
                 // If onQueryUpdated is provided, we want to use it for all included
                 // queries, even the QueryOptions ones.
                 if (onQueryUpdated) {
                     if (!diff) {
-                        var info = oq["queryInfo"];
+                        const info = oq["queryInfo"];
                         info.reset(); // Force info.getDiff() to read from cache.
                         diff = info.getDiff();
                     }
@@ -1013,7 +970,7 @@ var QueryManager = /** @class */ (function () {
                     results.set(oq, result);
                 }
                 if (queryId.indexOf("legacyOneTimeQuery") >= 0) {
-                    _this.stopQueryNoBroadcast(queryId);
+                    this.removeQuery(queryId);
                 }
             });
         }
@@ -1028,68 +985,84 @@ var QueryManager = /** @class */ (function () {
             this.cache.removeOptimistic(removeOptimistic);
         }
         return results;
-    };
-    QueryManager.prototype.maskOperation = function (options) {
-        var _a, _b, _c;
-        var document = options.document, data = options.data;
-        if (globalThis.__DEV__ !== false) {
-            var fetchPolicy = options.fetchPolicy, id = options.id;
-            var operationType = (_a = getOperationDefinition(document)) === null || _a === void 0 ? void 0 : _a.operation;
-            var operationId = ((_b = operationType === null || operationType === void 0 ? void 0 : operationType[0]) !== null && _b !== void 0 ? _b : "o") + id;
+    }
+    noCacheWarningsByQueryId = new Set();
+    maskOperation(options) {
+        const { document, data } = options;
+        if (__DEV__) {
+            const { fetchPolicy, id } = options;
+            const operationType = getOperationDefinition(document)?.operation;
+            const operationId = (operationType?.[0] ?? "o") + id;
             if (this.dataMasking &&
                 fetchPolicy === "no-cache" &&
                 !isFullyUnmaskedOperation(document) &&
                 !this.noCacheWarningsByQueryId.has(operationId)) {
                 this.noCacheWarningsByQueryId.add(operationId);
-                globalThis.__DEV__ !== false && invariant.warn(
-                    37,
-                    (_c = getOperationName(document)) !== null && _c !== void 0 ? _c : "Unnamed ".concat(operationType !== null && operationType !== void 0 ? operationType : "operation")
-                );
+                __DEV__ && invariant.warn(82, getOperationName(document) ??
+                    `Unnamed ${operationType ?? "operation"}`);
             }
         }
         return (this.dataMasking ?
             maskOperation(data, document, this.cache)
             : data);
-    };
-    QueryManager.prototype.maskFragment = function (options) {
-        var data = options.data, fragment = options.fragment, fragmentName = options.fragmentName;
+    }
+    maskFragment(options) {
+        const { data, fragment, fragmentName } = options;
         return this.dataMasking ?
             maskFragment(data, fragment, this.cache, fragmentName)
             : data;
-    };
-    QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a, 
+    }
+    fetchQueryByPolicy(queryInfo, { query, variables, fetchPolicy, refetchWritePolicy, errorPolicy, returnPartialData, context, }, 
     // The initial networkStatus for this fetch, most often
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
     // or setVariables.
-    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 oldNetworkStatus = queryInfo.networkStatus;
+    newNetworkStatus, emitLoadingState) {
         queryInfo.init({
             document: query,
-            variables: variables,
-            networkStatus: networkStatus,
+            variables,
         });
-        var readCache = function () { return queryInfo.getDiff(); };
-        var resultsFromCache = function (diff, networkStatus) {
-            if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || NetworkStatus.loading; }
-            var data = diff.result;
-            if (globalThis.__DEV__ !== false && !returnPartialData && !equal(data, {})) {
+        const readCache = () => queryInfo.getDiff();
+        const resultsFromCache = (diff, networkStatus = newNetworkStatus) => {
+            const data = diff.result;
+            if (__DEV__ && !returnPartialData && data !== null) {
                 logMissingFieldErrors(diff.missing);
             }
-            var fromData = function (data) {
-                return Observable.of(__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true })));
+            const toResult = (data) => {
+                // TODO: Eventually we should move this handling into
+                // queryInfo.getDiff() directly. Since getDiff is updated to return null
+                // on returnPartialData: false, we should take advantage of that instead
+                // of having to patch it elsewhere.
+                if (!diff.complete && !returnPartialData) {
+                    data = undefined;
+                }
+                return {
+                    // TODO: Handle partial data
+                    data: data,
+                    loading: isNetworkRequestInFlight(networkStatus),
+                    networkStatus,
+                    partial: !diff.complete,
+                };
             };
-            if (data && _this.getDocumentInfo(query).hasForcedResolvers) {
-                return _this.localState
+            const fromData = (data) => {
+                return of(toResult(data));
+            };
+            if (this.getDocumentInfo(query).hasForcedResolvers) {
+                return from(this.localState
                     .runResolvers({
                     document: query,
-                    remoteResult: { data: data },
-                    context: context,
-                    variables: variables,
+                    // TODO: Update remoteResult to handle `null`. In v3 the `if`
+                    // statement contained a check against `data`, but this value was
+                    // always `{}` if nothing was in the cache, which meant the check
+                    // above always succeeded when there were forced resolvers. Now that
+                    // `data` is nullable, this `remoteResult` needs to be an empty
+                    // object. Ideally we can pass in `null` here and the resolvers
+                    // would be able to handle this the same way.
+                    remoteResult: { data: data || {} },
+                    context,
+                    variables,
                     onlyRunForcedResolvers: true,
                 })
-                    .then(function (resolved) { return fromData(resolved.data || void 0); });
+                    .then((resolved) => toResult(resolved.data || void 0)));
             }
             // Resolves https://github.com/apollographql/apollo-client/issues/10317.
             // If errorPolicy is 'none' and notifyOnNetworkStatusChange is true,
@@ -1097,99 +1070,111 @@ var QueryManager = /** @class */ (function () {
             // if diff.missing exists, we should not return cache data.
             if (errorPolicy === "none" &&
                 networkStatus === NetworkStatus.refetch &&
-                Array.isArray(diff.missing)) {
+                diff.missing) {
                 return fromData(void 0);
             }
-            return fromData(data);
+            return fromData(data || undefined);
         };
-        var cacheWriteBehavior = fetchPolicy === "no-cache" ? 0 /* CacheWriteBehavior.FORBID */
+        const cacheWriteBehavior = fetchPolicy === "no-cache" ? 0 /* CacheWriteBehavior.FORBID */
             // Watched queries must opt into overwriting existing data on refetch,
             // by passing refetchWritePolicy: "overwrite" in their WatchQueryOptions.
-            : (networkStatus === NetworkStatus.refetch &&
+            : (newNetworkStatus === NetworkStatus.refetch &&
                 refetchWritePolicy !== "merge") ?
                 1 /* CacheWriteBehavior.OVERWRITE */
                 : 2 /* CacheWriteBehavior.MERGE */;
-        var resultsFromLink = function () {
-            return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
-                query: query,
-                variables: variables,
-                context: context,
-                fetchPolicy: fetchPolicy,
-                errorPolicy: errorPolicy,
-            });
-        };
-        var shouldNotify = notifyOnNetworkStatusChange &&
-            typeof oldNetworkStatus === "number" &&
-            oldNetworkStatus !== networkStatus &&
-            isNetworkRequestInFlight(networkStatus);
+        const resultsFromLink = () => this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
+            query,
+            variables,
+            context,
+            fetchPolicy,
+            errorPolicy,
+        });
         switch (fetchPolicy) {
             default:
             case "cache-first": {
-                var diff = readCache();
+                const diff = readCache();
                 if (diff.complete) {
                     return {
                         fromLink: false,
-                        sources: [resultsFromCache(diff, queryInfo.markReady())],
+                        observable: resultsFromCache(diff, NetworkStatus.ready),
                     };
                 }
-                if (returnPartialData || shouldNotify) {
+                if (returnPartialData || emitLoadingState) {
                     return {
                         fromLink: true,
-                        sources: [resultsFromCache(diff), resultsFromLink()],
+                        observable: concat(resultsFromCache(diff), resultsFromLink()),
                     };
                 }
-                return { fromLink: true, sources: [resultsFromLink()] };
+                return { fromLink: true, observable: resultsFromLink() };
             }
             case "cache-and-network": {
-                var diff = readCache();
-                if (diff.complete || returnPartialData || shouldNotify) {
+                const diff = readCache();
+                if (diff.complete || returnPartialData || emitLoadingState) {
                     return {
                         fromLink: true,
-                        sources: [resultsFromCache(diff), resultsFromLink()],
+                        observable: concat(resultsFromCache(diff), resultsFromLink()),
                     };
                 }
-                return { fromLink: true, sources: [resultsFromLink()] };
+                return { fromLink: true, observable: resultsFromLink() };
             }
             case "cache-only":
                 return {
                     fromLink: false,
-                    sources: [resultsFromCache(readCache(), queryInfo.markReady())],
+                    observable: concat(resultsFromCache(readCache(), NetworkStatus.ready)),
                 };
             case "network-only":
-                if (shouldNotify) {
+                if (emitLoadingState) {
                     return {
                         fromLink: true,
-                        sources: [resultsFromCache(readCache()), resultsFromLink()],
+                        observable: concat(resultsFromCache(readCache()), resultsFromLink()),
                     };
                 }
-                return { fromLink: true, sources: [resultsFromLink()] };
+                return { fromLink: true, observable: resultsFromLink() };
             case "no-cache":
-                if (shouldNotify) {
+                if (emitLoadingState) {
                     return {
                         fromLink: true,
                         // Note that queryInfo.getDiff() for no-cache queries does not call
                         // cache.diff, but instead returns a { complete: false } stub result
                         // when there is no queryInfo.diff already defined.
-                        sources: [resultsFromCache(queryInfo.getDiff()), resultsFromLink()],
+                        observable: concat(resultsFromCache(queryInfo.getDiff()), resultsFromLink()),
                     };
                 }
-                return { fromLink: true, sources: [resultsFromLink()] };
+                return { fromLink: true, observable: resultsFromLink() };
             case "standby":
-                return { fromLink: false, sources: [] };
+                return { fromLink: false, observable: EMPTY };
         }
-    };
-    QueryManager.prototype.getQuery = function (queryId) {
+    }
+    getQuery(queryId) {
         if (queryId && !this.queries.has(queryId)) {
             this.queries.set(queryId, new QueryInfo(this, queryId));
         }
         return this.queries.get(queryId);
-    };
-    QueryManager.prototype.prepareContext = function (context) {
-        if (context === void 0) { context = {}; }
-        var newContext = this.localState.prepareContext(context);
-        return __assign(__assign(__assign({}, this.defaultContext), newContext), { clientAwareness: this.clientAwareness });
-    };
-    return QueryManager;
-}());
-export { QueryManager };
-//# sourceMappingURL=QueryManager.js.map
+    }
+    prepareContext(context = {}) {
+        const newContext = this.localState.prepareContext(context);
+        return {
+            ...this.defaultContext,
+            ...newContext,
+            clientAwareness: this.clientAwareness,
+        };
+    }
+}
+function isErrorLike(error) {
+    return (error !== null &&
+        typeof error === "object" &&
+        typeof error.message === "string" &&
+        typeof error.name === "string" &&
+        (typeof error.stack === "undefined" ||
+            typeof error.stack === "string"));
+}
+function maybeWrapError(error) {
+    if (isErrorLike(error)) {
+        return error;
+    }
+    if (typeof error === "string") {
+        return new Error(error, { cause: error });
+    }
+    return new UnconventionalError(error);
+}
+//# sourceMappingURL=QueryManager.js.map