@apollo/client 3.13.8 → 3.13.9-rc.0

package/core/ObservableQuery.js

@@ -1,258 +1,319 @@
-import { __assign, __extends } from "tslib";
-import { invariant } from "../utilities/globals/index.js";
 import { equal } from "@wry/equality";
-import { NetworkStatus, isNetworkRequestInFlight } from "./networkStatus.js";
-import { cloneDeep, compact, getOperationDefinition, Observable, iterateObserversSafely, fixObservableSubclass, getQueryDefinition, preventUnhandledRejection, } from "../utilities/index.js";
-import { ApolloError, isApolloError } from "../errors/index.js";
+import { BehaviorSubject, Observable, share, Subject, tap } from "rxjs";
+import { __DEV__ } from "@apollo/client/utilities/environment";
+import { compact, filterMap, getOperationDefinition, getOperationName, getQueryDefinition, preventUnhandledRejection, toQueryResult, } from "@apollo/client/utilities/internal";
+import { invariant } from "@apollo/client/utilities/invariant";
 import { equalByQuery } from "./equalByQuery.js";
-import { Slot } from "optimism";
-var assign = Object.assign, hasOwnProperty = Object.hasOwnProperty;
-var ObservableQuery = /** @class */ (function (_super) {
-    __extends(ObservableQuery, _super);
-    function ObservableQuery(_a) {
-        var queryManager = _a.queryManager, queryInfo = _a.queryInfo, options = _a.options;
-        var _this = this;
-        var startedInactive = ObservableQuery.inactiveOnCreation.getValue();
-        _this = _super.call(this, function (observer) {
-            if (startedInactive) {
-                queryManager["queries"].set(_this.queryId, queryInfo);
-                startedInactive = false;
-            }
-            // Zen Observable has its own error function, so in order to log correctly
-            // we need to provide a custom error callback.
-            try {
-                var subObserver = observer._subscription._observer;
-                if (subObserver && !subObserver.error) {
-                    subObserver.error = defaultSubscriptionObserverErrorCallback;
-                }
-            }
-            catch (_a) { }
-            var first = !_this.observers.size;
-            _this.observers.add(observer);
-            // Deliver most recent error or result.
-            var last = _this.last;
-            if (last && last.error) {
-                observer.error && observer.error(last.error);
-            }
-            else if (last && last.result) {
-                observer.next && observer.next(_this.maskResult(last.result));
-            }
-            // Initiate observation of this query if it hasn't been reported to
-            // the QueryManager yet.
-            if (first) {
-                // Blindly catching here prevents unhandled promise rejections,
-                // and is safe because the ObservableQuery handles this error with
-                // this.observer.error, so we're not just swallowing the error by
-                // ignoring it here.
-                _this.reobserve().catch(function () { });
-            }
-            return function () {
-                if (_this.observers.delete(observer) && !_this.observers.size) {
-                    _this.tearDownQuery();
-                }
-            };
-        }) || this;
-        _this.observers = new Set();
-        _this.subscriptions = new Set();
-        _this.dirty = false;
-        // related classes
-        _this.queryInfo = queryInfo;
-        _this.queryManager = queryManager;
+import { isNetworkRequestInFlight, NetworkStatus } from "./networkStatus.js";
+const { assign, hasOwnProperty } = Object;
+const uninitialized = {
+    loading: true,
+    networkStatus: NetworkStatus.loading,
+    data: undefined,
+    dataState: "empty",
+    partial: true,
+};
+const empty = {
+    loading: false,
+    networkStatus: NetworkStatus.ready,
+    data: undefined,
+    dataState: "empty",
+    partial: true,
+};
+export class ObservableQuery {
+    options;
+    queryName;
+    /**
+    * @internal will be read and written from `QueryInfo`
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    _lastWrite;
+    // The `query` computed property will always reflect the document transformed
+    // by the last run query. `this.options.query` will always reflect the raw
+    // untransformed query to ensure document transforms with runtime conditionals
+    // are run on the original document.
+    get query() {
+        return this.lastQuery;
+    }
+    /**
+     * An object containing the variables that were provided for the query.
+     */
+    get variables() {
+        return this.options.variables;
+    }
+    unsubscribeFromCache;
+    input;
+    subject;
+    isTornDown;
+    queryManager;
+    subscriptions = new Set();
+    /**
+     * If an `ObservableQuery` is created with a `network-only` fetch policy,
+     * it should actually start receiving cache updates, but not before it has
+     * received the first result from the network.
+     */
+    waitForNetworkResult;
+    lastQuery;
+    linkSubscription;
+    pollingInfo;
+    get networkStatus() {
+        return this.subject.getValue().result.networkStatus;
+    }
+    constructor({ queryManager, options, transformedQuery = queryManager.transform(options.query), }) {
+        this.queryManager = queryManager;
         // active state
-        _this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy);
-        _this.isTornDown = false;
-        _this.subscribeToMore = _this.subscribeToMore.bind(_this);
-        _this.maskResult = _this.maskResult.bind(_this);
-        var _b = queryManager.defaultOptions.watchQuery, _c = _b === void 0 ? {} : _b, _d = _c.fetchPolicy, defaultFetchPolicy = _d === void 0 ? "cache-first" : _d;
-        var _e = options.fetchPolicy, fetchPolicy = _e === void 0 ? defaultFetchPolicy : _e, 
-        // Make sure we don't store "standby" as the initialFetchPolicy.
-        _f = options.initialFetchPolicy, 
+        this.waitForNetworkResult = options.fetchPolicy === "network-only";
+        this.isTornDown = false;
+        this.subscribeToMore = this.subscribeToMore.bind(this);
+        this.maskResult = this.maskResult.bind(this);
+        const { watchQuery: { fetchPolicy: defaultFetchPolicy = "cache-first" } = {}, } = queryManager.defaultOptions;
+        const { fetchPolicy = defaultFetchPolicy, 
         // Make sure we don't store "standby" as the initialFetchPolicy.
-        initialFetchPolicy = _f === void 0 ? fetchPolicy === "standby" ? defaultFetchPolicy : (fetchPolicy) : _f;
-        _this.options = __assign(__assign({}, options), { 
+        initialFetchPolicy = fetchPolicy === "standby" ? defaultFetchPolicy : (fetchPolicy), } = options;
+        this.lastQuery = transformedQuery;
+        this.options = {
+            ...options,
             // Remember the initial options.fetchPolicy so we can revert back to this
             // policy when variables change. This information can also be specified
             // (or overridden) by providing options.initialFetchPolicy explicitly.
-            initialFetchPolicy: initialFetchPolicy, 
+            initialFetchPolicy,
             // This ensures this.options.fetchPolicy always has a string value, in
             // case options.fetchPolicy was not provided.
-            fetchPolicy: fetchPolicy });
-        _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
-        var opDef = getOperationDefinition(_this.query);
-        _this.queryName = opDef && opDef.name && opDef.name.value;
-        return _this;
-    }
-    Object.defineProperty(ObservableQuery.prototype, "query", {
-        // The `query` computed property will always reflect the document transformed
-        // by the last run query. `this.options.query` will always reflect the raw
-        // untransformed query to ensure document transforms with runtime conditionals
-        // are run on the original document.
-        get: function () {
-            return this.lastQuery || this.options.query;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(ObservableQuery.prototype, "variables", {
-        // Computed shorthand for this.options.variables, preserved for
-        // backwards compatibility.
-        /**
-         * An object containing the variables that were provided for the query.
-         */
-        get: function () {
-            return this.options.variables;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    ObservableQuery.prototype.result = function () {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            // TODO: this code doesn’t actually make sense insofar as the observer
-            // will never exist in this.observers due how zen-observable wraps observables.
-            // https://github.com/zenparsing/zen-observable/blob/master/src/Observable.js#L169
-            var observer = {
-                next: function (result) {
-                    resolve(result);
-                    // Stop the query within the QueryManager if we can before
-                    // this function returns.
-                    //
-                    // We do this in order to prevent observers piling up within
-                    // the QueryManager. Notice that we only fully unsubscribe
-                    // from the subscription in a setTimeout(..., 0)  call. This call can
-                    // actually be handled by the browser at a much later time. If queries
-                    // are fired in the meantime, observers that should have been removed
-                    // from the QueryManager will continue to fire, causing an unnecessary
-                    // performance hit.
-                    _this.observers.delete(observer);
-                    if (!_this.observers.size) {
-                        _this.queryManager.removeQuery(_this.queryId);
-                    }
-                    setTimeout(function () {
-                        subscription.unsubscribe();
-                    }, 0);
-                },
-                error: reject,
-            };
-            var subscription = _this.subscribe(observer);
-        });
-    };
-    /** @internal */
-    ObservableQuery.prototype.resetDiff = function () {
-        this.queryInfo.resetDiff();
-    };
-    ObservableQuery.prototype.getCurrentFullResult = function (saveAsLastResult) {
-        if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        // Use the last result as long as the variables match this.variables.
-        var lastResult = this.getLastResult(true);
-        var networkStatus = this.queryInfo.networkStatus ||
-            (lastResult && lastResult.networkStatus) ||
-            NetworkStatus.ready;
-        var result = __assign(__assign({}, lastResult), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
-        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
-        if (
-        // These fetch policies should never deliver data from the cache, unless
-        // redelivering a previously delivered result.
-        skipCacheDataFor(fetchPolicy) ||
-            // If this.options.query has @client(always: true) fields, we cannot
-            // trust diff.result, since it was read from the cache without running
-            // local resolvers (and it's too late to run resolvers now, since we must
-            // return a result synchronously).
-            this.queryManager.getDocumentInfo(this.query).hasForcedResolvers) {
-            // Fall through.
-        }
-        else if (this.waitForOwnResult) {
-            // This would usually be a part of `QueryInfo.getDiff()`.
-            // which we skip in the waitForOwnResult case since we are not
-            // interested in the diff.
-            this.queryInfo["updateWatch"]();
+            fetchPolicy,
+            variables: this.getVariablesWithDefaults(options.variables),
+        };
+        this.initializeObservablesQueue();
+        this["@@observable"] = () => this;
+        if (Symbol.observable) {
+            this[Symbol.observable] = () => this;
         }
-        else {
-            var diff = this.queryInfo.getDiff();
-            if (diff.complete || this.options.returnPartialData) {
-                result.data = diff.result;
-            }
-            if (equal(result.data, {})) {
-                result.data = void 0;
-            }
-            if (diff.complete) {
-                // Similar to setting result.partial to false, but taking advantage of the
-                // falsiness of missing fields.
-                delete result.partial;
-                // If the diff is complete, and we're using a FetchPolicy that
-                // terminates after a complete cache read, we can assume the next result
-                // we receive will have NetworkStatus.ready and !loading.
-                if (diff.complete &&
-                    result.networkStatus === NetworkStatus.loading &&
-                    (fetchPolicy === "cache-first" || fetchPolicy === "cache-only")) {
-                    result.networkStatus = NetworkStatus.ready;
-                    result.loading = false;
+        const opDef = getOperationDefinition(this.query);
+        this.queryName = opDef && opDef.name && opDef.name.value;
+    }
+    initializeObservablesQueue() {
+        this.subject = new BehaviorSubject({
+            query: this.query,
+            variables: this.variables,
+            result: uninitialized,
+            meta: {},
+        });
+        const observable = this.subject.pipe(tap({
+            subscribe: () => {
+                if (!this.subject.observed) {
+                    this.reobserve();
+                    // TODO: See if we can rework updatePolling to better handle this.
+                    // reobserve calls updatePolling but this `subscribe` callback is
+                    // called before the subject is subscribed to so `updatePolling`
+                    // can't accurately detect if there is an active subscription.
+                    // Calling it again here ensures that it can detect if it can poll
+                    setTimeout(() => this.updatePolling());
+                }
+            },
+            unsubscribe: () => {
+                if (!this.subject.observed) {
+                    this.tearDownQuery();
                 }
+            },
+        }), filterMap(({ query, variables, result: current, meta }, context) => {
+            const { shouldEmit } = meta;
+            if (current === uninitialized) {
+                // reset internal state after `ObservableQuery.reset()`
+                context.previous = undefined;
+                context.previousVariables = undefined;
             }
-            else {
-                result.partial = true;
+            if (this.options.fetchPolicy === "standby" ||
+                shouldEmit === 2 /* EmitBehavior.never */)
+                return;
+            if (shouldEmit === 1 /* EmitBehavior.force */)
+                return emit();
+            const { previous, previousVariables } = context;
+            if (previous) {
+                const documentInfo = this.queryManager.getDocumentInfo(query);
+                const dataMasking = this.queryManager.dataMasking;
+                const maskedQuery = dataMasking ? documentInfo.nonReactiveQuery : query;
+                const resultIsEqual = dataMasking || documentInfo.hasNonreactiveDirective ?
+                    equalByQuery(maskedQuery, previous, current, variables)
+                    : equal(previous, current);
+                if (resultIsEqual && equal(previousVariables, variables)) {
+                    return;
+                }
             }
-            // We need to check for both both `error` and `errors` field because there
-            // are cases where sometimes `error` is set, but not `errors` and
-            // vice-versa. This will be updated in the next major version when
-            // `errors` is deprecated in favor of `error`.
-            if (result.networkStatus === NetworkStatus.ready &&
-                (result.error || result.errors)) {
-                result.networkStatus = NetworkStatus.error;
-            }
-            if (globalThis.__DEV__ !== false &&
-                !diff.complete &&
-                !this.options.partialRefetch &&
-                !result.loading &&
-                !result.data &&
-                !result.error) {
-                logMissingFieldErrors(diff.missing);
-            }
-        }
-        if (saveAsLastResult) {
-            this.updateLastResult(result);
-        }
-        return result;
-    };
-    ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
-        if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        return this.maskResult(this.getCurrentFullResult(saveAsLastResult));
-    };
-    // Compares newResult to the snapshot we took of this.lastResult when it was
-    // first received.
-    ObservableQuery.prototype.isDifferentFromLastResult = function (newResult, variables) {
-        if (!this.last) {
-            return true;
-        }
-        var documentInfo = this.queryManager.getDocumentInfo(this.query);
-        var dataMasking = this.queryManager.dataMasking;
-        var query = dataMasking ? documentInfo.nonReactiveQuery : this.query;
-        var resultIsDifferent = dataMasking || documentInfo.hasNonreactiveDirective ?
-            !equalByQuery(query, this.last.result, newResult, this.variables)
-            : !equal(this.last.result, newResult);
-        return (resultIsDifferent || (variables && !equal(this.last.variables, variables)));
-    };
-    ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
-        var last = this.last;
-        if (last &&
-            last[key] &&
-            (!variablesMustMatch || equal(last.variables, this.variables))) {
-            return last[key];
-        }
-    };
-    ObservableQuery.prototype.getLastResult = function (variablesMustMatch) {
-        return this.getLast("result", variablesMustMatch);
-    };
-    ObservableQuery.prototype.getLastError = function (variablesMustMatch) {
-        return this.getLast("error", variablesMustMatch);
-    };
-    ObservableQuery.prototype.resetLastResults = function () {
-        delete this.last;
-        this.isTornDown = false;
-    };
-    ObservableQuery.prototype.resetQueryStoreErrors = function () {
-        this.queryManager.resetErrors(this.queryId);
-    };
+            if (shouldEmit === 3 /* EmitBehavior.networkStatusChange */ &&
+                (!this.options.notifyOnNetworkStatusChange ||
+                    equal(previous, current))) {
+                return;
+            }
+            return emit();
+            function emit() {
+                context.previous = current;
+                context.previousVariables = variables;
+                return current;
+            }
+        }, () => ({})));
+        this.pipe = observable.pipe.bind(observable);
+        this.subscribe = observable.subscribe.bind(observable);
+        this.input = new Subject();
+        // we want to feed many streams into `this.subject`, but none of them should
+        // be able to close `this.input`
+        this.input.complete = () => { };
+        this.input.pipe(this.operator).subscribe(this.subject);
+    }
+    // We can't use Observable['subscribe'] here as the type as it conflicts with
+    // the ability to infer T from Subscribable<T>. This limits the surface area
+    // to the non-deprecated signature which works properly with type inference.
+    subscribe;
+    pipe;
+    [Symbol.observable];
+    ["@@observable"];
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    getCacheDiff({ optimistic = true } = {}) {
+        return this.queryManager.cache.diff({
+            query: this.query,
+            variables: this.variables,
+            returnPartialData: true,
+            optimistic,
+        });
+    }
+    getInitialResult(initialFetchPolicy) {
+        const fetchPolicy = this.queryManager.prioritizeCacheValues ?
+            "cache-first"
+            : initialFetchPolicy || this.options.fetchPolicy;
+        const cacheResult = () => {
+            const diff = this.getCacheDiff();
+            // TODO: queryInfo.getDiff should handle this since cache.diff returns a
+            // null when returnPartialData is false
+            const data = this.options.returnPartialData || diff.complete ?
+                diff.result ?? undefined
+                : undefined;
+            return this.maskResult({
+                data,
+                dataState: diff.complete ? "complete"
+                    : data === undefined ? "empty"
+                        : "partial",
+                loading: !diff.complete,
+                networkStatus: diff.complete ? NetworkStatus.ready : NetworkStatus.loading,
+                partial: !diff.complete,
+            });
+        };
+        switch (fetchPolicy) {
+            case "cache-only": {
+                return {
+                    ...cacheResult(),
+                    loading: false,
+                    networkStatus: NetworkStatus.ready,
+                };
+            }
+            case "cache-first":
+                return cacheResult();
+            case "cache-and-network":
+                return {
+                    ...cacheResult(),
+                    loading: true,
+                    networkStatus: NetworkStatus.loading,
+                };
+            case "standby":
+                return empty;
+            default:
+                return uninitialized;
+        }
+    }
+    resubscribeCache() {
+        const { variables, fetchPolicy } = this.options;
+        const query = this.query;
+        const shouldUnsubscribe = fetchPolicy === "standby" ||
+            fetchPolicy === "no-cache" ||
+            this.waitForNetworkResult;
+        const shouldResubscribe = !isEqualQuery({ query, variables }, this.unsubscribeFromCache) &&
+            !this.waitForNetworkResult;
+        if (shouldUnsubscribe || shouldResubscribe) {
+            this.unsubscribeFromCache?.();
+        }
+        if (shouldUnsubscribe || !shouldResubscribe) {
+            return;
+        }
+        const watch = {
+            query,
+            variables,
+            optimistic: true,
+            watcher: this,
+            callback: (diff) => {
+                const info = this.queryManager.getDocumentInfo(query);
+                if (info.hasClientExports || info.hasForcedResolvers) {
+                    // If this is not set to something different than `diff`, we will
+                    // not be notified about future cache changes with an equal `diff`.
+                    // That would be the case if we are working with client-only fields
+                    // that are forced or with `exports` fields that might change, causing
+                    // local resovlers to return a new result.
+                    // This is based on an implementation detail of `InMemoryCache`, which
+                    // is not optimal - but the only alternative to this would be to
+                    // resubscribe to the cache asynchonouly, which would bear the risk of
+                    // missing further synchronous updates.
+                    watch.lastDiff = undefined;
+                }
+                if (watch.lastOwnDiff === diff) {
+                    // skip cache updates that were caused by our own writes
+                    return;
+                }
+                const { result: previousResult } = this.subject.getValue();
+                if (!diff.complete &&
+                    // If we are trying to deliver an incomplete cache result, we avoid
+                    // reporting it if the query has errored, otherwise we let the broadcast try
+                    // and repair the partial result by refetching the query. This check avoids
+                    // a situation where a query that errors and another succeeds with
+                    // overlapping data does not report the partial data result to the errored
+                    // query.
+                    //
+                    // See https://github.com/apollographql/apollo-client/issues/11400 for more
+                    // information on this issue.
+                    (previousResult.error ||
+                        // Prevent to schedule a notify directly after the `ObservableQuery`
+                        // has been `reset` (which will set the `previousResult` to `uninitialized` or `empty`)
+                        // as in those cases, `resetCache` will manually call `refetch` with more intentional timing.
+                        previousResult === uninitialized ||
+                        previousResult === empty)) {
+                    return;
+                }
+                if (!equal(previousResult.data, diff.result)) {
+                    this.scheduleNotify();
+                }
+            },
+        };
+        const cancelWatch = this.queryManager.cache.watch(watch);
+        this.unsubscribeFromCache = Object.assign(() => {
+            this.unsubscribeFromCache = undefined;
+            cancelWatch();
+        }, { query, variables });
+    }
+    stableLastResult;
+    getCurrentResult() {
+        const { result: current } = this.subject.getValue();
+        let value = (
+        // if the `current` result is in an error state, we will always return that
+        // error state, even if we have no observers
+        (current.networkStatus === NetworkStatus.error ||
+            // if we have observers, we are watching the cache and
+            // this.subject.getValue() will always be up to date
+            this.hasObservers() || // if we are using a `no-cache` fetch policy in which case this
+        // `ObservableQuery` cannot have been updated from the outside - in
+        // that case, we prefer to keep the current value
+        this.options.fetchPolicy === "no-cache")) ?
+            current
+            // otherwise, the `current` value might be outdated due to missed
+            // external updates - calculate it again
+            : this.getInitialResult();
+        if (value === uninitialized) {
+            value = this.getInitialResult();
+        }
+        if (!equal(this.stableLastResult, value)) {
+            this.stableLastResult = value;
+        }
+        return this.stableLastResult;
+    }
     /**
      * Update the variables of this observable query, and fetch the new results.
      * This method should be preferred over `setVariables` in most use cases.
@@ -260,105 +321,112 @@ var ObservableQuery = /** @class */ (function (_super) {
      * @param variables - The new set of variables. If there are missing variables,
      * the previous values of those variables will be used.
      */
-    ObservableQuery.prototype.refetch = function (variables) {
-        var _a;
-        var reobserveOptions = {
+    refetch(variables) {
+        const { fetchPolicy } = this.options;
+        const reobserveOptions = {
             // Always disable polling for refetches.
             pollInterval: 0,
         };
         // Unless the provided fetchPolicy always consults the network
         // (no-cache, network-only, or cache-and-network), override it with
         // network-only to force the refetch for this fetchQuery call.
-        var fetchPolicy = this.options.fetchPolicy;
         if (fetchPolicy === "no-cache") {
             reobserveOptions.fetchPolicy = "no-cache";
         }
         else {
             reobserveOptions.fetchPolicy = "network-only";
         }
-        if (globalThis.__DEV__ !== false && variables && hasOwnProperty.call(variables, "variables")) {
-            var queryDef = getQueryDefinition(this.query);
-            var vars = queryDef.variableDefinitions;
-            if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
-                globalThis.__DEV__ !== false && invariant.warn(
-                    21,
-                    variables,
-                    ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
-                );
+        if (__DEV__ && variables && hasOwnProperty.call(variables, "variables")) {
+            const queryDef = getQueryDefinition(this.query);
+            const vars = queryDef.variableDefinitions;
+            if (!vars || !vars.some((v) => v.variable.name.value === "variables")) {
+                __DEV__ && invariant.warn(79, variables, queryDef.name?.value || queryDef);
             }
         }
-        if (variables && !equal(this.options.variables, variables)) {
+        if (variables && !equal(this.variables, variables)) {
             // Update the existing options with new variables
-            reobserveOptions.variables = this.options.variables = __assign(__assign({}, this.options.variables), variables);
+            reobserveOptions.variables = this.options.variables =
+                this.getVariablesWithDefaults({ ...this.variables, ...variables });
         }
-        this.queryInfo.resetLastWrite();
-        return this.reobserve(reobserveOptions, NetworkStatus.refetch);
-    };
+        this._lastWrite = undefined;
+        return this._reobserve(reobserveOptions, {
+            newNetworkStatus: NetworkStatus.refetch,
+        });
+    }
     /**
      * A function that helps you fetch the next set of results for a [paginated list field](https://www.apollographql.com/docs/react/pagination/core-api/).
      */
-    ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
-        var _this = this;
-        var combinedOptions = __assign(__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : (__assign(__assign(__assign(__assign({}, this.options), { query: this.options.query }), fetchMoreOptions), { variables: __assign(__assign({}, this.options.variables), fetchMoreOptions.variables) })))), { 
+    fetchMore({ query, variables, context, errorPolicy, updateQuery, }) {
+        invariant(
+            this.options.fetchPolicy !== "cache-only",
+            80,
+            getOperationName(this.query, "(anonymous)")
+        );
+        const combinedOptions = {
+            ...compact(this.options, { errorPolicy: "none" }, {
+                query,
+                context,
+                errorPolicy,
+            }),
+            variables: (query ? variables : ({
+                ...this.variables,
+                ...variables,
+            })),
             // The fetchMore request goes immediately to the network and does
             // not automatically write its result to the cache (hence no-cache
             // instead of network-only), because we allow the caller of
             // fetchMore to provide an updateQuery callback that determines how
             // the data gets written to the cache.
-            fetchPolicy: "no-cache" });
+            fetchPolicy: "no-cache",
+            notifyOnNetworkStatusChange: this.options.notifyOnNetworkStatusChange,
+        };
         combinedOptions.query = this.transformDocument(combinedOptions.query);
-        var qid = this.queryManager.generateQueryId();
         // If a temporary query is passed to `fetchMore`, we don't want to store
         // it as the last query result since it may be an optimized query for
         // pagination. We will however run the transforms on the original document
         // as well as the document passed in `fetchMoreOptions` to ensure the cache
         // uses the most up-to-date document which may rely on runtime conditionals.
         this.lastQuery =
-            fetchMoreOptions.query ?
+            query ?
                 this.transformDocument(this.options.query)
                 : combinedOptions.query;
-        // Simulate a loading result for the original query with
-        // result.networkStatus === NetworkStatus.fetchMore.
-        var queryInfo = this.queryInfo;
-        var originalNetworkStatus = queryInfo.networkStatus;
-        queryInfo.networkStatus = NetworkStatus.fetchMore;
-        if (combinedOptions.notifyOnNetworkStatusChange) {
-            this.observe();
-        }
-        var updatedQuerySet = new Set();
-        var updateQuery = fetchMoreOptions === null || fetchMoreOptions === void 0 ? void 0 : fetchMoreOptions.updateQuery;
-        var isCached = this.options.fetchPolicy !== "no-cache";
+        let wasUpdated = false;
+        const isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            invariant(updateQuery, 22);
+            invariant(updateQuery, 81);
         }
+        const { finalize, pushNotification } = this.pushOperation(NetworkStatus.fetchMore);
+        pushNotification({
+            source: "newNetworkStatus",
+            kind: "N",
+            value: {},
+        }, { shouldEmit: 3 /* EmitBehavior.networkStatusChange */ });
         return this.queryManager
-            .fetchQuery(qid, combinedOptions, NetworkStatus.fetchMore)
-            .then(function (fetchMoreResult) {
-            _this.queryManager.removeQuery(qid);
-            if (queryInfo.networkStatus === NetworkStatus.fetchMore) {
-                queryInfo.networkStatus = originalNetworkStatus;
-            }
+            .fetchQuery(combinedOptions, NetworkStatus.fetchMore)
+            .then((fetchMoreResult) => {
+            // disable the `fetchMore` override that is currently active
+            // the next updates caused by this should not be `fetchMore` anymore,
+            // but `ready` or whatever other calculated loading state is currently
+            // appropriate
+            finalize();
             if (isCached) {
                 // Performing this cache update inside a cache.batch transaction ensures
                 // any affected cache.watch watchers are notified at most once about any
                 // updates. Most watchers will be using the QueryInfo class, which
                 // responds to notifications by calling reobserveCacheFirst to deliver
                 // fetchMore cache results back to this ObservableQuery.
-                _this.queryManager.cache.batch({
-                    update: function (cache) {
-                        var updateQuery = fetchMoreOptions.updateQuery;
+                this.queryManager.cache.batch({
+                    update: (cache) => {
                         if (updateQuery) {
                             cache.updateQuery({
-                                query: _this.query,
-                                variables: _this.variables,
+                                query: this.query,
+                                variables: this.variables,
                                 returnPartialData: true,
                                 optimistic: false,
-                            }, function (previous) {
-                                return updateQuery(previous, {
-                                    fetchMoreResult: fetchMoreResult.data,
-                                    variables: combinedOptions.variables,
-                                });
-                            });
+                            }, (previous) => updateQuery(previous, {
+                                fetchMoreResult: fetchMoreResult.data,
+                                variables: combinedOptions.variables,
+                            }));
                         }
                         else {
                             // If we're using a field policy instead of updateQuery, the only
@@ -373,10 +441,10 @@ var ObservableQuery = /** @class */ (function (_super) {
                             });
                         }
                     },
-                    onWatchUpdated: function (watch) {
-                        // Record the DocumentNode associated with any watched query whose
-                        // data were updated by the cache writes above.
-                        updatedQuerySet.add(watch.query);
+                    onWatchUpdated: (watch) => {
+                        if (watch.watcher === this) {
+                            wasUpdated = true;
+                        }
                     },
                 });
             }
@@ -395,26 +463,44 @@ var ObservableQuery = /** @class */ (function (_super) {
                 // adjustment to the types on `updateQuery` since that function
                 // expects that the first argument always contains previous result
                 // data, but not `undefined`.
-                var lastResult = _this.getLast("result");
-                var data = updateQuery(lastResult.data, {
+                const lastResult = this.getCurrentResult();
+                const data = updateQuery(lastResult.data, {
                     fetchMoreResult: fetchMoreResult.data,
                     variables: combinedOptions.variables,
                 });
-                _this.reportResult(__assign(__assign({}, lastResult), { networkStatus: originalNetworkStatus, loading: isNetworkRequestInFlight(originalNetworkStatus), data: data }), _this.variables);
+                // was reportResult
+                pushNotification({
+                    kind: "N",
+                    value: {
+                        ...lastResult,
+                        networkStatus: NetworkStatus.ready,
+                        // will be overwritten anyways, just here for types sake
+                        loading: false,
+                        data: data,
+                        dataState: lastResult.dataState === "streaming" ? "streaming" : "complete",
+                    },
+                    source: "network",
+                });
             }
-            return _this.maskResult(fetchMoreResult);
+            return this.maskResult(fetchMoreResult);
         })
-            .finally(function () {
+            .finally(() => {
+            // call `finalize` a second time in case the `.then` case above was not reached
+            finalize();
             // In case the cache writes above did not generate a broadcast
             // notification (which would have been intercepted by onWatchUpdated),
             // likely because the written data were the same as what was already in
             // the cache, we still want fetchMore to deliver its final loading:false
             // result with the unchanged data.
-            if (isCached && !updatedQuerySet.has(_this.query)) {
-                _this.reobserveCacheFirst();
+            if (isCached && !wasUpdated) {
+                pushNotification({
+                    kind: "N",
+                    source: "newNetworkStatus",
+                    value: {},
+                }, { shouldEmit: 1 /* EmitBehavior.force */ });
             }
         });
-    };
+    }
     // XXX the subscription variables are separate from the query variables.
     // if you want to update subscription variables, right now you have to do that separately,
     // and you can only do it by stopping the subscription and then subscribing again with new variables.
@@ -423,45 +509,51 @@ var ObservableQuery = /** @class */ (function (_super) {
      *
      * This function returns _another_ function that you can call to terminate the subscription.
      */
-    ObservableQuery.prototype.subscribeToMore = function (options) {
-        var _this = this;
-        var subscription = this.queryManager
+    subscribeToMore(options) {
+        const subscription = this.queryManager
             .startGraphQLSubscription({
             query: options.document,
             variables: options.variables,
             context: options.context,
         })
             .subscribe({
-            next: function (subscriptionData) {
-                var updateQuery = options.updateQuery;
-                if (updateQuery) {
-                    _this.updateQuery(function (previous, updateOptions) {
-                        return updateQuery(previous, __assign({ subscriptionData: subscriptionData }, updateOptions));
-                    });
-                }
-            },
-            error: function (err) {
-                if (options.onError) {
-                    options.onError(err);
+            next: (subscriptionData) => {
+                const { updateQuery, onError } = options;
+                const { error } = subscriptionData;
+                if (error) {
+                    if (onError) {
+                        onError(error);
+                    }
+                    else {
+                        __DEV__ && invariant.error(82, error);
+                    }
                     return;
                 }
-                globalThis.__DEV__ !== false && invariant.error(23, err);
+                if (updateQuery) {
+                    this.updateQuery((previous, updateOptions) => updateQuery(previous, {
+                        subscriptionData: subscriptionData,
+                        ...updateOptions,
+                    }));
+                }
             },
         });
         this.subscriptions.add(subscription);
-        return function () {
-            if (_this.subscriptions.delete(subscription)) {
+        return () => {
+            if (this.subscriptions.delete(subscription)) {
                 subscription.unsubscribe();
             }
         };
-    };
-    ObservableQuery.prototype.setOptions = function (newOptions) {
-        return this.reobserve(newOptions);
-    };
-    ObservableQuery.prototype.silentSetOptions = function (newOptions) {
-        var mergedOptions = compact(this.options, newOptions || {});
+    }
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    applyOptions(newOptions) {
+        const mergedOptions = compact(this.options, newOptions || {});
         assign(this.options, mergedOptions);
-    };
+        this.updatePolling();
+    }
     /**
      * Update the variables of this observable query, and fetch the new results
      * if they've changed. Most users should prefer `refetch` instead of
@@ -474,44 +566,40 @@ var ObservableQuery = /** @class */ (function (_super) {
      * Note: the promise will return the old results immediately if the variables
      * have not changed.
      *
-     * Note: the promise will return null immediately if the query is not active
+     * Note: the promise will return the last result immediately if the query is not active
      * (there are no subscribers).
      *
      * @param variables - The new set of variables. If there are missing variables,
      * the previous values of those variables will be used.
      */
-    ObservableQuery.prototype.setVariables = function (variables) {
+    async setVariables(variables) {
+        variables = this.getVariablesWithDefaults(variables);
         if (equal(this.variables, variables)) {
             // If we have no observers, then we don't actually want to make a network
             // request. As soon as someone observes the query, the request will kick
             // off. For now, we just store any changes. (See #1077)
-            return this.observers.size ? this.result() : Promise.resolve();
+            return toQueryResult(this.getCurrentResult());
         }
         this.options.variables = variables;
         // See comment above
-        if (!this.observers.size) {
-            return Promise.resolve();
+        if (!this.hasObservers()) {
+            return toQueryResult(this.getCurrentResult());
         }
-        return this.reobserve({
+        return this._reobserve({
             // Reset options.fetchPolicy to its original value.
             fetchPolicy: this.options.initialFetchPolicy,
-            variables: variables,
-        }, NetworkStatus.setVariables);
-    };
+            variables,
+        }, { newNetworkStatus: NetworkStatus.setVariables });
+    }
     /**
      * A function that enables you to update the query's cached result without executing a followup GraphQL operation.
      *
      * See [using updateQuery and updateFragment](https://www.apollographql.com/docs/react/caching/cache-interaction/#using-updatequery-and-updatefragment) for additional information.
      */
-    ObservableQuery.prototype.updateQuery = function (mapFn) {
-        var queryManager = this.queryManager;
-        var _a = queryManager.cache.diff({
-            query: this.options.query,
-            variables: this.variables,
-            returnPartialData: true,
-            optimistic: false,
-        }), result = _a.result, complete = _a.complete;
-        var newResult = mapFn(result, {
+    updateQuery(mapFn) {
+        const { queryManager } = this;
+        const { result, complete } = this.getCacheDiff({ optimistic: false });
+        const newResult = mapFn(result, {
             variables: this.variables,
             complete: !!complete,
             previousData: result,
@@ -524,30 +612,30 @@ var ObservableQuery = /** @class */ (function (_super) {
             });
             queryManager.broadcastQueries();
         }
-    };
+    }
     /**
      * A function that instructs the query to begin re-executing at a specified interval (in milliseconds).
      */
-    ObservableQuery.prototype.startPolling = function (pollInterval) {
+    startPolling(pollInterval) {
         this.options.pollInterval = pollInterval;
         this.updatePolling();
-    };
+    }
     /**
      * A function that instructs the query to stop polling after a previous call to `startPolling`.
      */
-    ObservableQuery.prototype.stopPolling = function () {
+    stopPolling() {
         this.options.pollInterval = 0;
         this.updatePolling();
-    };
+    }
     // Update options.fetchPolicy according to options.nextFetchPolicy.
-    ObservableQuery.prototype.applyNextFetchPolicy = function (reason, 
+    applyNextFetchPolicy(reason, 
     // It's possible to use this method to apply options.nextFetchPolicy to
     // options.fetchPolicy even if options !== this.options, though that happens
     // most often when the options are temporary, used for only one request and
     // then thrown away, so nextFetchPolicy may not end up mattering.
     options) {
         if (options.nextFetchPolicy) {
-            var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? fetchPolicy : _b;
+            const { fetchPolicy = "cache-first", initialFetchPolicy = fetchPolicy } = options;
             if (fetchPolicy === "standby") {
                 // Do nothing, leaving options.fetchPolicy unchanged.
             }
@@ -561,13 +649,8 @@ var ObservableQuery = /** @class */ (function (_super) {
                 // requests to be triggered only if the cache result is incomplete. To
                 // that end, the options.nextFetchPolicy option provides an easy way to
                 // update options.fetchPolicy after the initial network request, without
-                // having to call observableQuery.setOptions.
-                options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
-                    reason: reason,
-                    options: options,
-                    observable: this,
-                    initialFetchPolicy: initialFetchPolicy,
-                });
+                // having to call observableQuery.reobserve.
+                options.fetchPolicy = options.nextFetchPolicy.call(options, fetchPolicy, { reason, options, observable: this, initialFetchPolicy });
             }
             else if (reason === "variables-changed") {
                 options.fetchPolicy = initialFetchPolicy;
@@ -577,95 +660,191 @@ var ObservableQuery = /** @class */ (function (_super) {
             }
         }
         return options.fetchPolicy;
-    };
-    ObservableQuery.prototype.fetch = function (options, newNetworkStatus, query) {
+    }
+    fetch(options, networkStatus, fetchQuery, operator) {
         // TODO Make sure we update the networkStatus (and infer fetchVariables)
         // before actually committing to the fetch.
-        var queryInfo = this.queryManager.getOrCreateQuery(this.queryId);
-        queryInfo.setObservableQuery(this);
-        return this.queryManager["fetchConcastWithInfo"](queryInfo, options, newNetworkStatus, query);
-    };
+        const initialFetchPolicy = this.options.fetchPolicy;
+        options.context ??= {};
+        let synchronouslyEmitted = false;
+        const onCacheHit = () => {
+            synchronouslyEmitted = true;
+        };
+        const fetchQueryOperator = // we cannot use `tap` here, since it allows only for a "before subscription"
+         
+        // hook with `subscribe` and we care for "directly before and after subscription"
+        (source) => new Observable((subscriber) => {
+            try {
+                return source.subscribe({
+                    next(value) {
+                        synchronouslyEmitted = true;
+                        subscriber.next(value);
+                    },
+                    error: (error) => subscriber.error(error),
+                    complete: () => subscriber.complete(),
+                });
+            }
+            finally {
+                if (!synchronouslyEmitted) {
+                    operation.override = networkStatus;
+                    this.input.next({
+                        kind: "N",
+                        source: "newNetworkStatus",
+                        value: {
+                            resetError: true,
+                        },
+                        query,
+                        variables,
+                        meta: {
+                            shouldEmit: 3 /* EmitBehavior.networkStatusChange */,
+                            /*
+                             * The moment this notification is emitted, `nextFetchPolicy`
+                             * might already have switched from a `network-only` to a
+                             * `cache-something` policy, so we want to ensure that the
+                             * loading state emit doesn't accidentally read from the cache
+                             * in those cases.
+                             */
+                            fetchPolicy: initialFetchPolicy,
+                        },
+                    });
+                }
+            }
+        });
+        let { observable, fromLink } = this.queryManager.fetchObservableWithInfo(options, {
+            networkStatus,
+            query: fetchQuery,
+            onCacheHit,
+            fetchQueryOperator,
+            observableQuery: this,
+        });
+        // track query and variables from the start of the operation
+        const { query, variables } = this;
+        const operation = {
+            abort: () => {
+                subscription.unsubscribe();
+            },
+            query,
+            variables,
+        };
+        this.activeOperations.add(operation);
+        let forceFirstValueEmit = networkStatus == NetworkStatus.refetch ||
+            networkStatus == NetworkStatus.setVariables;
+        observable = observable.pipe(operator, share());
+        const subscription = observable
+            .pipe(tap({
+            next: (notification) => {
+                if (notification.source === "newNetworkStatus" ||
+                    (notification.kind === "N" && notification.value.loading)) {
+                    operation.override = networkStatus;
+                }
+                else {
+                    delete operation.override;
+                }
+            },
+            finalize: () => this.activeOperations.delete(operation),
+        }))
+            .subscribe({
+            next: (value) => {
+                const meta = {};
+                if (forceFirstValueEmit &&
+                    value.kind === "N" &&
+                    "loading" in value.value &&
+                    !value.value.loading) {
+                    forceFirstValueEmit = false;
+                    meta.shouldEmit = 1 /* EmitBehavior.force */;
+                }
+                this.input.next({ ...value, query, variables, meta });
+            },
+        });
+        return { fromLink, subscription, observable };
+    }
     // Turns polling on or off based on this.options.pollInterval.
-    ObservableQuery.prototype.updatePolling = function () {
-        var _this = this;
+    didWarnCacheOnlyPolling = false;
+    updatePolling() {
         // Avoid polling in SSR mode
         if (this.queryManager.ssrMode) {
             return;
         }
-        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;
-        if (!pollInterval || !this.hasObservers()) {
-            if (pollingInfo) {
-                clearTimeout(pollingInfo.timeout);
-                delete this.pollingInfo;
+        const { pollingInfo, options: { fetchPolicy, pollInterval }, } = this;
+        if (!pollInterval || !this.hasObservers() || fetchPolicy === "cache-only") {
+            if (__DEV__) {
+                if (!this.didWarnCacheOnlyPolling &&
+                    pollInterval &&
+                    fetchPolicy === "cache-only") {
+                    __DEV__ && invariant.warn(83, getOperationName(this.query, "(anonymous)"));
+                    this.didWarnCacheOnlyPolling = true;
+                }
             }
+            this.cancelPolling();
             return;
         }
-        if (pollingInfo && pollingInfo.interval === pollInterval) {
+        if (pollingInfo?.interval === pollInterval) {
             return;
         }
-        invariant(pollInterval, 24);
-        var info = pollingInfo || (this.pollingInfo = {});
+        const info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
-        var maybeFetch = function () {
-            var _a, _b;
-            if (_this.pollingInfo) {
-                if (!isNetworkRequestInFlight(_this.queryInfo.networkStatus) &&
-                    !((_b = (_a = _this.options).skipPollAttempt) === null || _b === void 0 ? void 0 : _b.call(_a))) {
-                    _this.reobserve({
+        const maybeFetch = () => {
+            if (this.pollingInfo) {
+                if (!isNetworkRequestInFlight(this.networkStatus) &&
+                    !this.options.skipPollAttempt?.()) {
+                    this._reobserve({
                         // Most fetchPolicy options don't make sense to use in a polling context, as
                         // users wouldn't want to be polling the cache directly. However, network-only and
                         // no-cache are both useful for when the user wants to control whether or not the
                         // polled results are written to the cache.
-                        fetchPolicy: _this.options.initialFetchPolicy === "no-cache" ?
+                        fetchPolicy: this.options.initialFetchPolicy === "no-cache" ?
                             "no-cache"
                             : "network-only",
-                    }, NetworkStatus.poll).then(poll, poll);
+                    }, {
+                        newNetworkStatus: NetworkStatus.poll,
+                    }).then(poll, poll);
                 }
                 else {
                     poll();
                 }
             }
         };
-        var poll = function () {
-            var info = _this.pollingInfo;
+        const poll = () => {
+            const info = this.pollingInfo;
             if (info) {
                 clearTimeout(info.timeout);
                 info.timeout = setTimeout(maybeFetch, info.interval);
             }
         };
         poll();
-    };
-    ObservableQuery.prototype.updateLastResult = function (newResult, variables) {
-        if (variables === void 0) { variables = this.variables; }
-        var error = this.getLastError();
-        // Preserve this.last.error unless the variables have changed.
-        if (error && this.last && !equal(variables, this.last.variables)) {
-            error = void 0;
-        }
-        return (this.last = __assign({ result: this.queryManager.assumeImmutableResults ?
-                newResult
-                : cloneDeep(newResult), variables: variables }, (error ? { error: error } : null)));
-    };
-    ObservableQuery.prototype.reobserveAsConcast = function (newOptions, newNetworkStatus) {
-        var _this = this;
+    }
+    // This differs from stopPolling in that it does not set pollInterval to 0
+    cancelPolling() {
+        if (this.pollingInfo) {
+            clearTimeout(this.pollingInfo.timeout);
+            delete this.pollingInfo;
+        }
+    }
+    /**
+     * Reevaluate the query, optionally against new options. New options will be
+     * merged with the current options when given.
+     */
+    reobserve(newOptions) {
+        return this._reobserve(newOptions);
+    }
+    _reobserve(newOptions, internalOptions) {
         this.isTornDown = false;
-        var useDisposableConcast = 
-        // Refetching uses a disposable Concast to allow refetches using different
-        // options/variables, without permanently altering the options of the
+        let { newNetworkStatus } = internalOptions || {};
+        this.queryManager.obsQueries.add(this);
+        const useDisposableObservable = 
+        // Refetching uses a disposable Observable to allow refetches using different
+        // options, without permanently altering the options of the
         // original ObservableQuery.
         newNetworkStatus === NetworkStatus.refetch ||
-            // The fetchMore method does not actually call the reobserve method, but,
-            // if it did, it would definitely use a disposable Concast.
-            newNetworkStatus === NetworkStatus.fetchMore ||
-            // Polling uses a disposable Concast so the polling options (which force
+            // Polling uses a disposable Observable so the polling options (which force
             // fetchPolicy to be "network-only" or "no-cache") won't override the original options.
             newNetworkStatus === NetworkStatus.poll;
         // Save the old variables, since Object.assign may modify them below.
-        var oldVariables = this.options.variables;
-        var oldFetchPolicy = this.options.fetchPolicy;
-        var mergedOptions = compact(this.options, newOptions || {});
-        var options = useDisposableConcast ?
-            // Disposable Concast fetches receive a shallow copy of this.options
+        const oldVariables = this.variables;
+        const oldFetchPolicy = this.options.fetchPolicy;
+        const mergedOptions = compact(this.options, newOptions || {});
+        const options = useDisposableObservable ?
+            // Disposable Observable fetches receive a shallow copy of this.options
             // (merged with newOptions), leaving this.options unmodified.
             mergedOptions
             : assign(this.options, mergedOptions);
@@ -673,9 +852,19 @@ var ObservableQuery = /** @class */ (function (_super) {
         // overwriting this.options.query when we aren't using a disposable concast.
         // We want to ensure we can re-run the custom document transforms the next
         // time a request is made against the original query.
-        var query = this.transformDocument(options.query);
+        const query = this.transformDocument(options.query);
         this.lastQuery = query;
-        if (!useDisposableConcast) {
+        // Reevaluate variables to allow resetting variables with variables: undefined,
+        // otherwise `compact` will ignore the `variables` key in `newOptions`. We
+        // do this after we run the query transform to ensure we get default
+        // variables from the transformed query.
+        //
+        // Note: updating options.variables may mutate this.options.variables
+        // in the case of a non-disposable query. This is intentional.
+        if (newOptions && "variables" in newOptions) {
+            options.variables = this.getVariablesWithDefaults(newOptions.variables);
+        }
+        if (!useDisposableObservable) {
             // We can skip calling updatePolling if we're not changing this.options.
             this.updatePolling();
             // Reset options.fetchPolicy to its original value when variables change,
@@ -691,185 +880,351 @@ var ObservableQuery = /** @class */ (function (_super) {
                     // A `nextFetchPolicy` function has even higher priority, though,
                     // so in that case `applyNextFetchPolicy` must be called.
                     typeof options.nextFetchPolicy === "function")) {
+                // This might mutate options.fetchPolicy
                 this.applyNextFetchPolicy("variables-changed", options);
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = NetworkStatus.setVariables;
                 }
             }
         }
-        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy));
-        var finishWaitingForOwnResult = function () {
-            if (_this.concast === concast) {
-                _this.waitForOwnResult = false;
+        const oldNetworkStatus = this.networkStatus;
+        if (!newNetworkStatus) {
+            newNetworkStatus = NetworkStatus.loading;
+            if (oldNetworkStatus !== NetworkStatus.loading &&
+                newOptions?.variables &&
+                !equal(newOptions.variables, oldVariables)) {
+                newNetworkStatus = NetworkStatus.setVariables;
             }
-        };
-        var variables = options.variables && __assign({}, options.variables);
-        var _a = this.fetch(options, newNetworkStatus, query), concast = _a.concast, fromLink = _a.fromLink;
-        var observer = {
-            next: function (result) {
-                if (equal(_this.variables, variables)) {
-                    finishWaitingForOwnResult();
-                    _this.reportResult(result, variables);
-                }
-            },
-            error: function (error) {
-                if (equal(_this.variables, variables)) {
-                    // Coming from `getResultsFromLink`, `error` here should always be an `ApolloError`.
-                    // However, calling `concast.cancel` can inject another type of error, so we have to
-                    // wrap it again here.
-                    if (!isApolloError(error)) {
-                        error = new ApolloError({ networkError: error });
-                    }
-                    finishWaitingForOwnResult();
-                    _this.reportError(error, variables);
-                }
+            // QueryManager does not emit any values for standby fetch policies so we
+            // want ensure that the networkStatus remains ready.
+            if (options.fetchPolicy === "standby") {
+                newNetworkStatus = NetworkStatus.ready;
+            }
+        }
+        if (options.fetchPolicy === "standby") {
+            this.cancelPolling();
+        }
+        this.resubscribeCache();
+        const { promise, operator: promiseOperator } = getTrackingOperatorPromise((value) => {
+            switch (value.kind) {
+                case "E":
+                    throw value.error;
+                case "N":
+                    if (value.source !== "newNetworkStatus" && !value.value.loading)
+                        return value.value;
+            }
+        }, 
+        // This default value should only be used when using a `fetchPolicy` of
+        // `standby` since that fetch policy completes without emitting a
+        // result. Since we are converting this to a QueryResult type, we
+        // omit the extra fields from ApolloQueryResult in the default value.
+        options.fetchPolicy === "standby" ?
+            { data: undefined }
+            : undefined);
+        const { subscription, observable, fromLink } = this.fetch(options, newNetworkStatus, query, promiseOperator);
+        if (!useDisposableObservable && (fromLink || !this.linkSubscription)) {
+            if (this.linkSubscription) {
+                this.linkSubscription.unsubscribe();
+            }
+            this.linkSubscription = subscription;
+        }
+        const ret = Object.assign(preventUnhandledRejection(promise
+            .then((result) => toQueryResult(this.maskResult(result)))
+            .finally(() => {
+            if (!this.hasObservers() && this.activeOperations.size === 0) {
+                // If `reobserve` was called on a query without any obervers,
+                // the teardown logic would never be called, so we need to
+                // call it here to ensure the query is properly torn down.
+                this.tearDownQuery();
+            }
+        })), {
+            retain: () => {
+                const subscription = observable.subscribe({});
+                const unsubscribe = () => subscription.unsubscribe();
+                promise.then(unsubscribe, unsubscribe);
+                return ret;
             },
-        };
-        if (!useDisposableConcast && (fromLink || !this.concast)) {
-            // We use the {add,remove}Observer methods directly to avoid wrapping
-            // observer with an unnecessary SubscriptionObserver object.
-            if (this.concast && this.observer) {
-                this.concast.removeObserver(this.observer);
-            }
-            this.concast = concast;
-            this.observer = observer;
-        }
-        concast.addObserver(observer);
-        return concast;
-    };
-    ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        return preventUnhandledRejection(this.reobserveAsConcast(newOptions, newNetworkStatus).promise.then(this.maskResult));
-    };
-    ObservableQuery.prototype.resubscribeAfterError = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        // If `lastError` is set in the current when the subscription is re-created,
-        // the subscription will immediately receive the error, which will
-        // cause it to terminate again. To avoid this, we first clear
-        // the last error/result from the `observableQuery` before re-starting
-        // the subscription, and restore the last value afterwards so that the
-        // subscription has a chance to stay open.
-        var last = this.last;
-        this.resetLastResults();
-        var subscription = this.subscribe.apply(this, args);
-        this.last = last;
-        return subscription;
-    };
-    // (Re)deliver the current result to this.observers without applying fetch
-    // policies or making network requests.
-    ObservableQuery.prototype.observe = function () {
-        this.reportResult(
-        // Passing false is important so that this.getCurrentResult doesn't
-        // save the fetchMore result as this.lastResult, causing it to be
-        // ignored due to the this.isDifferentFromLastResult check in
-        // this.reportResult.
-        this.getCurrentFullResult(false), this.variables);
-    };
-    ObservableQuery.prototype.reportResult = function (result, variables) {
-        var lastError = this.getLastError();
-        var isDifferent = this.isDifferentFromLastResult(result, variables);
-        // Update the last result even when isDifferentFromLastResult returns false,
-        // because the query may be using the @nonreactive directive, and we want to
-        // save the the latest version of any nonreactive subtrees (in case
-        // getCurrentResult is called), even though we skip broadcasting changes.
-        if (lastError || !result.partial || this.options.returnPartialData) {
-            this.updateLastResult(result, variables);
-        }
-        if (lastError || isDifferent) {
-            iterateObserversSafely(this.observers, "next", this.maskResult(result));
-        }
-    };
-    ObservableQuery.prototype.reportError = function (error, variables) {
-        // Since we don't get the current result on errors, only the error, we
-        // must mirror the updates that occur in QueryStore.markQueryError here
-        var errorResult = __assign(__assign({}, this.getLastResult()), { error: error, errors: error.graphQLErrors, networkStatus: NetworkStatus.error, loading: false });
-        this.updateLastResult(errorResult, variables);
-        iterateObserversSafely(this.observers, "error", (this.last.error = error));
-    };
-    ObservableQuery.prototype.hasObservers = function () {
-        return this.observers.size > 0;
-    };
-    ObservableQuery.prototype.tearDownQuery = function () {
+        });
+        return ret;
+    }
+    hasObservers() {
+        return this.subject.observed;
+    }
+    /**
+     * Tears down the `ObservableQuery` and stops all active operations by sending a `complete` notification.
+     */
+    stop() {
+        this.subject.complete();
+        this.initializeObservablesQueue();
+        this.tearDownQuery();
+    }
+    tearDownQuery() {
         if (this.isTornDown)
             return;
-        if (this.concast && this.observer) {
-            this.concast.removeObserver(this.observer);
-            delete this.concast;
-            delete this.observer;
+        this.resetNotifications();
+        this.unsubscribeFromCache?.();
+        if (this.linkSubscription) {
+            this.linkSubscription.unsubscribe();
+            delete this.linkSubscription;
         }
         this.stopPolling();
         // stop all active GraphQL subscriptions
-        this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
+        this.subscriptions.forEach((sub) => sub.unsubscribe());
         this.subscriptions.clear();
-        this.queryManager.stopQuery(this.queryId);
-        this.observers.clear();
+        this.queryManager.obsQueries.delete(this);
         this.isTornDown = true;
-    };
-    ObservableQuery.prototype.transformDocument = function (document) {
+        this.abortActiveOperations();
+        this._lastWrite = undefined;
+    }
+    transformDocument(document) {
         return this.queryManager.transform(document);
-    };
-    ObservableQuery.prototype.maskResult = function (result) {
-        return result && "data" in result ? __assign(__assign({}, result), { data: this.queryManager.maskOperation({
-                document: this.query,
-                data: result.data,
-                fetchPolicy: this.options.fetchPolicy,
-                id: this.queryId,
-            }) }) : result;
-    };
-    /** @internal */
-    ObservableQuery.prototype.resetNotifications = function () {
-        this.cancelNotifyTimeout();
-        this.dirty = false;
-    };
-    ObservableQuery.prototype.cancelNotifyTimeout = function () {
+    }
+    maskResult(result) {
+        const masked = this.queryManager.maskOperation({
+            document: this.query,
+            data: result.data,
+            fetchPolicy: this.options.fetchPolicy,
+            cause: this,
+        });
+        // Maintain object identity as much as possible
+        return masked === result.data ? result : { ...result, data: masked };
+    }
+    dirty = false;
+    notifyTimeout;
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    resetNotifications() {
         if (this.notifyTimeout) {
             clearTimeout(this.notifyTimeout);
             this.notifyTimeout = void 0;
         }
-    };
-    /** @internal */
-    ObservableQuery.prototype.scheduleNotify = function () {
-        var _this = this;
+        this.dirty = false;
+    }
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    scheduleNotify() {
         if (this.dirty)
             return;
         this.dirty = true;
         if (!this.notifyTimeout) {
-            this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
-        }
-    };
-    /** @internal */
-    ObservableQuery.prototype.notify = function () {
-        this.cancelNotifyTimeout();
-        if (this.dirty) {
-            if (this.options.fetchPolicy == "cache-only" ||
+            this.notifyTimeout = setTimeout(() => this.notify(true), 0);
+        }
+    }
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    notify(scheduled = false) {
+        if (!scheduled) {
+            // For queries with client exports or forced resolvers, we don't want to
+            // synchronously reobserve the cache on broadcast,
+            // but actually wait for the `scheduleNotify` timeout triggered by the
+            // `cache.watch` callback from `resubscribeCache`.
+            const info = this.queryManager.getDocumentInfo(this.query);
+            if (info.hasClientExports || info.hasForcedResolvers) {
+                return;
+            }
+        }
+        const { dirty } = this;
+        this.resetNotifications();
+        if (dirty &&
+            (this.options.fetchPolicy == "cache-only" ||
                 this.options.fetchPolicy == "cache-and-network" ||
-                !isNetworkRequestInFlight(this.queryInfo.networkStatus)) {
-                var diff = this.queryInfo.getDiff();
-                if (diff.fromOptimisticTransaction) {
-                    // If this diff came from an optimistic transaction, deliver the
-                    // current cache data to the ObservableQuery, but don't perform a
-                    // reobservation, since oq.reobserveCacheFirst might make a network
-                    // request, and we never want to trigger network requests in the
-                    // middle of optimistic updates.
-                    this.observe();
-                }
-                else {
-                    // Otherwise, make the ObservableQuery "reobserve" the latest data
-                    // using a temporary fetch policy of "cache-first", so complete cache
-                    // results have a chance to be delivered without triggering additional
-                    // network requests, even when options.fetchPolicy is "network-only"
-                    // or "cache-and-network". All other fetch policies are preserved by
-                    // this method, and are handled by calling oq.reobserve(). If this
-                    // reobservation is spurious, isDifferentFromLastResult still has a
-                    // chance to catch it before delivery to ObservableQuery subscribers.
-                    this.reobserveCacheFirst();
+                !this.activeOperations.size)) {
+            const diff = this.getCacheDiff();
+            if (
+            // `fromOptimisticTransaction` is not avaiable through the `cache.diff`
+            // code path, so we need to check it this way
+            equal(diff.result, this.getCacheDiff({ optimistic: false }).result)) {
+                //If this diff did not come from an optimistic transaction
+                // make the ObservableQuery "reobserve" the latest data
+                // using a temporary fetch policy of "cache-first", so complete cache
+                // results have a chance to be delivered without triggering additional
+                // network requests, even when options.fetchPolicy is "network-only"
+                // or "cache-and-network". All other fetch policies are preserved by
+                // this method, and are handled by calling oq.reobserve(). If this
+                // reobservation is spurious, distinctUntilChanged still has a
+                // chance to catch it before delivery to ObservableQuery subscribers.
+                this.reobserveCacheFirst();
+            }
+            else {
+                // If this diff came from an optimistic transaction, deliver the
+                // current cache data to the ObservableQuery, but don't perform a
+                // reobservation, since oq.reobserveCacheFirst might make a network
+                // request, and we never want to trigger network requests in the
+                // middle of optimistic updates.
+                this.input.next({
+                    kind: "N",
+                    value: {
+                        data: diff.result,
+                        dataState: diff.complete ? "complete"
+                            : diff.result ? "partial"
+                                : "empty",
+                        networkStatus: NetworkStatus.ready,
+                        loading: false,
+                        error: undefined,
+                        partial: !diff.complete,
+                    },
+                    source: "cache",
+                    query: this.query,
+                    variables: this.variables,
+                    meta: {},
+                });
+            }
+        }
+    }
+    activeOperations = new Set();
+    pushOperation(networkStatus) {
+        let aborted = false;
+        // track query and variables from the start of the operation
+        const { query, variables } = this;
+        const finalize = () => {
+            this.activeOperations.delete(operation);
+        };
+        const operation = {
+            override: networkStatus,
+            abort: () => {
+                aborted = true;
+                finalize();
+            },
+            query,
+            variables,
+        };
+        this.activeOperations.add(operation);
+        return {
+            finalize,
+            pushNotification: (notification, additionalMeta) => {
+                if (!aborted) {
+                    this.input.next({
+                        ...notification,
+                        query,
+                        variables,
+                        meta: { ...additionalMeta },
+                    });
                 }
+            },
+        };
+    }
+    calculateNetworkStatus(baseNetworkStatus) {
+        if (baseNetworkStatus === NetworkStatus.streaming) {
+            return baseNetworkStatus;
+        }
+        // in the future, this could be more complex logic, e.g. "refetch" and
+        // "fetchMore" having priority over "polling" or "loading" network statuses
+        // as for now we just take the "latest" operation that is still active,
+        // as that lines up best with previous behavior[]
+        const operation = Array.from(this.activeOperations.values()).findLast((operation) => isEqualQuery(operation, this) && operation.override !== undefined);
+        return operation?.override ?? baseNetworkStatus;
+    }
+    abortActiveOperations() {
+        this.activeOperations.forEach((operation) => operation.abort());
+    }
+    /**
+    * @internal
+    * Called from `clearStore`.
+    * * resets the query to its initial state
+    * * cancels all active operations and their subscriptions
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    reset() {
+        // exception for cache-only queries - we reset them into a "ready" state
+        // as we won't trigger a refetch for them
+        const resetToEmpty = this.options.fetchPolicy === "cache-only";
+        this.setResult(resetToEmpty ? empty : uninitialized, {
+            shouldEmit: resetToEmpty ? 1 /* EmitBehavior.force */ : 2 /* EmitBehavior.never */,
+        });
+        this.abortActiveOperations();
+    }
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    setResult(result, additionalMeta) {
+        this.input.next({
+            source: "setResult",
+            kind: "N",
+            value: result,
+            query: this.query,
+            variables: this.variables,
+            meta: { ...additionalMeta },
+        });
+    }
+    operator = filterMap((notification) => {
+        const { query, variables, meta } = notification;
+        if (notification.source === "setResult") {
+            return { query, variables, result: notification.value, meta };
+        }
+        if (notification.kind === "C" || !isEqualQuery(notification, this)) {
+            return;
+        }
+        let result;
+        const previous = this.subject.getValue();
+        if (notification.source === "cache") {
+            result = notification.value;
+            if (result.networkStatus === NetworkStatus.ready &&
+                result.partial &&
+                (!this.options.returnPartialData ||
+                    previous.result.networkStatus === NetworkStatus.error) &&
+                this.options.fetchPolicy !== "cache-only") {
+                return;
             }
         }
-        this.dirty = false;
-    };
+        else if (notification.source === "network") {
+            if (this.waitForNetworkResult) {
+                this.waitForNetworkResult = false;
+                this.resubscribeCache();
+            }
+            result =
+                notification.kind === "E" ?
+                    {
+                        ...(isEqualQuery(previous, notification) ?
+                            previous.result
+                            : { data: undefined, dataState: "empty", partial: true }),
+                        error: notification.error,
+                        networkStatus: NetworkStatus.error,
+                        loading: false,
+                    }
+                    : notification.value;
+            if (notification.kind === "E" && result.dataState === "streaming") {
+                result.dataState = "complete";
+            }
+            if (result.error) {
+                meta.shouldEmit = 1 /* EmitBehavior.force */;
+            }
+        }
+        else if (notification.source === "newNetworkStatus") {
+            const baseResult = isEqualQuery(previous, notification) ?
+                previous.result
+                : this.getInitialResult(meta.fetchPolicy);
+            const { resetError } = notification.value;
+            const error = resetError ? undefined : baseResult.error;
+            const networkStatus = error ? NetworkStatus.error : NetworkStatus.ready;
+            result = {
+                ...baseResult,
+                error,
+                networkStatus,
+            };
+        }
+        // every code path until here should have either returned or set a result,
+        // but typescript needs a little help
+        invariant(result);
+        // normalize result shape
+        if (!result.error)
+            delete result.error;
+        result.networkStatus = this.calculateNetworkStatus(result.networkStatus);
+        result.loading = isNetworkRequestInFlight(result.networkStatus);
+        result = this.maskResult(result);
+        return { query, variables, result, meta };
+    });
     // Reobserve with fetchPolicy effectively set to "cache-first", triggering
     // delivery of any new data from the cache, possibly falling back to the network
     // if any cache data are missing. This allows _complete_ cache results to be
@@ -877,14 +1232,14 @@ var ObservableQuery = /** @class */ (function (_super) {
     // this.options.fetchPolicy is "cache-and-network" or "network-only". When
     // this.options.fetchPolicy is any other policy ("cache-first", "cache-only",
     // "standby", or "no-cache"), we call this.reobserve() as usual.
-    ObservableQuery.prototype.reobserveCacheFirst = function () {
-        var _a = this.options, fetchPolicy = _a.fetchPolicy, nextFetchPolicy = _a.nextFetchPolicy;
+    reobserveCacheFirst() {
+        const { fetchPolicy, nextFetchPolicy } = this.options;
         if (fetchPolicy === "cache-and-network" || fetchPolicy === "network-only") {
-            return this.reobserve({
+            this.reobserve({
                 fetchPolicy: "cache-first",
                 // Use a temporary nextFetchPolicy function that replaces itself with the
                 // previous nextFetchPolicy value and returns the original fetchPolicy.
-                nextFetchPolicy: function (currentFetchPolicy, context) {
+                nextFetchPolicy(currentFetchPolicy, context) {
                     // Replace this nextFetchPolicy function in the options object with the
                     // original this.options.nextFetchPolicy value.
                     this.nextFetchPolicy = nextFetchPolicy;
@@ -898,33 +1253,58 @@ var ObservableQuery = /** @class */ (function (_super) {
                 },
             });
         }
-        return this.reobserve();
-    };
-    /**
-     * @internal
-     * A slot used by the `useQuery` hook to indicate that `client.watchQuery`
-     * should not register the query immediately, but instead wait for the query to
-     * be started registered with the `QueryManager` when `useSyncExternalStore`
-     * actively subscribes to it.
-     */
-    ObservableQuery.inactiveOnCreation = new Slot();
-    return ObservableQuery;
-}(Observable));
-export { ObservableQuery };
-// Necessary because the ObservableQuery constructor has a different
-// signature than the Observable constructor.
-fixObservableSubclass(ObservableQuery);
-function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && invariant.error(25, error.message, error.stack);
+        else {
+            this.reobserve();
+        }
+    }
+    getVariablesWithDefaults(variables) {
+        return this.queryManager.getVariables(this.query, variables);
+    }
 }
 export function logMissingFieldErrors(missing) {
-    if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && invariant.debug(26, missing);
+    if (__DEV__ && missing) {
+        __DEV__ && invariant.debug(84, missing);
     }
 }
-function skipCacheDataFor(fetchPolicy /* `undefined` would mean `"cache-first"` */) {
-    return (fetchPolicy === "network-only" ||
-        fetchPolicy === "no-cache" ||
-        fetchPolicy === "standby");
+function isEqualQuery(a, b) {
+    return !!(a && b && a.query === b.query && equal(a.variables, b.variables));
+}
+function getTrackingOperatorPromise(filterMapCb, defaultValue) {
+    let lastValue = defaultValue, resolve, reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    const operator = tap({
+        next(value) {
+            try {
+                const newValue = filterMapCb(value);
+                if (newValue !== undefined) {
+                    lastValue = newValue;
+                }
+            }
+            catch (error) {
+                reject(error);
+            }
+        },
+        finalize: () => {
+            if (lastValue) {
+                resolve(lastValue);
+            }
+            else {
+                const message = "The operation was aborted.";
+                const name = "AbortError";
+                reject(typeof DOMException !== "undefined" ?
+                    new DOMException(message, name)
+                    // some environments do not have `DOMException`, e.g. node
+                    // uses a normal `Error` with a `name` property instead: https://github.com/phryneas/node/blob/d0579b64f0f6b722f8e49bf8a471dd0d0604a21e/lib/internal/errors.js#L964
+                    // error.code is a legacy property that is not used anymore,
+                    // and also inconsistent across environments (in supporting
+                    // browsers it is `20`, in node `'ABORT_ERR'`) so we omit that.
+                    : Object.assign(new Error(message), { name }));
+            }
+        },
+    });
+    return { promise, operator };
 }
-//# sourceMappingURL=ObservableQuery.js.map
+//# sourceMappingURL=ObservableQuery.js.map