@apollo/client 3.11.0-rc.0 → 3.11.0-rc.2

package/core/core.cjs

@@ -10,8 +10,8 @@ var equal = require('@wry/equality');
 var utilities = require('../utilities');
 var cache = require('../cache');
 var errors = require('../errors');
-var graphql = require('graphql');
 var trie = require('@wry/trie');
+var graphql = require('graphql');
 var utils = require('../link/utils');
 var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
@@ -20,7 +20,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = "3.11.0-rc.0";
+var version = "3.11.0-rc.2";
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === "object";
@@ -762,479 +762,165 @@ function skipCacheDataFor(fetchPolicy ) {
         fetchPolicy === "standby");
 }
 
-var LocalState =  (function () {
-    function LocalState(_a) {
-        var cache = _a.cache, client = _a.client, resolvers = _a.resolvers, fragmentMatcher = _a.fragmentMatcher;
-        this.selectionsToResolveCache = new WeakMap();
-        this.cache = cache;
-        if (client) {
-            this.client = client;
+var destructiveMethodCounts = new (utilities.canUseWeakMap ? WeakMap : Map)();
+function wrapDestructiveCacheMethod(cache, methodName) {
+    var original = cache[methodName];
+    if (typeof original === "function") {
+        cache[methodName] = function () {
+            destructiveMethodCounts.set(cache,
+            (destructiveMethodCounts.get(cache) + 1) % 1e15);
+            return original.apply(this, arguments);
+        };
+    }
+}
+function cancelNotifyTimeout(info) {
+    if (info["notifyTimeout"]) {
+        clearTimeout(info["notifyTimeout"]);
+        info["notifyTimeout"] = void 0;
+    }
+}
+var QueryInfo =  (function () {
+    function QueryInfo(queryManager, queryId) {
+        if (queryId === void 0) { queryId = queryManager.generateQueryId(); }
+        this.queryId = queryId;
+        this.listeners = new Set();
+        this.document = null;
+        this.lastRequestId = 1;
+        this.stopped = false;
+        this.dirty = false;
+        this.observableQuery = null;
+        var cache = (this.cache = queryManager.cache);
+        if (!destructiveMethodCounts.has(cache)) {
+            destructiveMethodCounts.set(cache, 0);
+            wrapDestructiveCacheMethod(cache, "evict");
+            wrapDestructiveCacheMethod(cache, "modify");
+            wrapDestructiveCacheMethod(cache, "reset");
         }
-        if (resolvers) {
-            this.addResolvers(resolvers);
+    }
+    QueryInfo.prototype.init = function (query) {
+        var networkStatus = query.networkStatus || exports.NetworkStatus.loading;
+        if (this.variables &&
+            this.networkStatus !== exports.NetworkStatus.loading &&
+            !equal.equal(this.variables, query.variables)) {
+            networkStatus = exports.NetworkStatus.setVariables;
         }
-        if (fragmentMatcher) {
-            this.setFragmentMatcher(fragmentMatcher);
+        if (!equal.equal(query.variables, this.variables)) {
+            this.lastDiff = void 0;
         }
-    }
-    LocalState.prototype.addResolvers = function (resolvers) {
-        var _this = this;
-        this.resolvers = this.resolvers || {};
-        if (Array.isArray(resolvers)) {
-            resolvers.forEach(function (resolverGroup) {
-                _this.resolvers = utilities.mergeDeep(_this.resolvers, resolverGroup);
-            });
+        Object.assign(this, {
+            document: query.document,
+            variables: query.variables,
+            networkError: null,
+            graphQLErrors: this.graphQLErrors || [],
+            networkStatus: networkStatus,
+        });
+        if (query.observableQuery) {
+            this.setObservableQuery(query.observableQuery);
         }
-        else {
-            this.resolvers = utilities.mergeDeep(this.resolvers, resolvers);
+        if (query.lastRequestId) {
+            this.lastRequestId = query.lastRequestId;
         }
+        return this;
     };
-    LocalState.prototype.setResolvers = function (resolvers) {
-        this.resolvers = {};
-        this.addResolvers(resolvers);
+    QueryInfo.prototype.reset = function () {
+        cancelNotifyTimeout(this);
+        this.dirty = false;
     };
-    LocalState.prototype.getResolvers = function () {
-        return this.resolvers || {};
+    QueryInfo.prototype.resetDiff = function () {
+        this.lastDiff = void 0;
     };
-    LocalState.prototype.runResolvers = function (_a) {
-        return tslib.__awaiter(this, arguments, void 0, function (_b) {
-            var document = _b.document, remoteResult = _b.remoteResult, context = _b.context, variables = _b.variables, _c = _b.onlyRunForcedResolvers, onlyRunForcedResolvers = _c === void 0 ? false : _c;
-            return tslib.__generator(this, function (_d) {
-                if (document) {
-                    return [2 , this.resolveDocument(document, remoteResult.data, context, variables, this.fragmentMatcher, onlyRunForcedResolvers).then(function (localResult) { return (tslib.__assign(tslib.__assign({}, remoteResult), { data: localResult.result })); })];
-                }
-                return [2 , remoteResult];
-            });
-        });
+    QueryInfo.prototype.getDiff = function () {
+        var options = this.getDiffOptions();
+        if (this.lastDiff && equal.equal(options, this.lastDiff.options)) {
+            return this.lastDiff.diff;
+        }
+        this.updateWatch(this.variables);
+        var oq = this.observableQuery;
+        if (oq && oq.options.fetchPolicy === "no-cache") {
+            return { complete: false };
+        }
+        var diff = this.cache.diff(options);
+        this.updateLastDiff(diff, options);
+        return diff;
     };
-    LocalState.prototype.setFragmentMatcher = function (fragmentMatcher) {
-        this.fragmentMatcher = fragmentMatcher;
+    QueryInfo.prototype.updateLastDiff = function (diff, options) {
+        this.lastDiff =
+            diff ?
+                {
+                    diff: diff,
+                    options: options || this.getDiffOptions(),
+                }
+                : void 0;
     };
-    LocalState.prototype.getFragmentMatcher = function () {
-        return this.fragmentMatcher;
+    QueryInfo.prototype.getDiffOptions = function (variables) {
+        var _a;
+        if (variables === void 0) { variables = this.variables; }
+        return {
+            query: this.document,
+            variables: variables,
+            returnPartialData: true,
+            optimistic: true,
+            canonizeResults: (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.options.canonizeResults,
+        };
     };
-    LocalState.prototype.clientQuery = function (document) {
-        if (utilities.hasDirectives(["client"], document)) {
-            if (this.resolvers) {
-                return document;
+    QueryInfo.prototype.setDiff = function (diff) {
+        var _this = this;
+        var _a;
+        var oldDiff = this.lastDiff && this.lastDiff.diff;
+        if (diff && !diff.complete && ((_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.getLastError())) {
+            return;
+        }
+        this.updateLastDiff(diff);
+        if (!this.dirty && !equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
+            this.dirty = true;
+            if (!this.notifyTimeout) {
+                this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
             }
         }
-        return null;
-    };
-    LocalState.prototype.serverQuery = function (document) {
-        return utilities.removeClientSetsFromDocument(document);
     };
-    LocalState.prototype.prepareContext = function (context) {
-        var cache = this.cache;
-        return tslib.__assign(tslib.__assign({}, context), { cache: cache,
-            getCacheKey: function (obj) {
-                return cache.identify(obj);
-            } });
-    };
-    LocalState.prototype.addExportedVariables = function (document_1) {
-        return tslib.__awaiter(this, arguments, void 0, function (document, variables, context) {
-            if (variables === void 0) { variables = {}; }
-            if (context === void 0) { context = {}; }
-            return tslib.__generator(this, function (_a) {
-                if (document) {
-                    return [2 , this.resolveDocument(document, this.buildRootValueFromCache(document, variables) || {}, this.prepareContext(context), variables).then(function (data) { return (tslib.__assign(tslib.__assign({}, variables), data.exportedVariables)); })];
+    QueryInfo.prototype.setObservableQuery = function (oq) {
+        var _this = this;
+        if (oq === this.observableQuery)
+            return;
+        if (this.oqListener) {
+            this.listeners.delete(this.oqListener);
+        }
+        this.observableQuery = oq;
+        if (oq) {
+            oq["queryInfo"] = this;
+            this.listeners.add((this.oqListener = function () {
+                var diff = _this.getDiff();
+                if (diff.fromOptimisticTransaction) {
+                    oq["observe"]();
                 }
-                return [2 , tslib.__assign({}, variables)];
-            });
-        });
+                else {
+                    reobserveCacheFirst(oq);
+                }
+            }));
+        }
+        else {
+            delete this.oqListener;
+        }
     };
-    LocalState.prototype.shouldForceResolvers = function (document) {
-        var forceResolvers = false;
-        graphql.visit(document, {
-            Directive: {
-                enter: function (node) {
-                    if (node.name.value === "client" && node.arguments) {
-                        forceResolvers = node.arguments.some(function (arg) {
-                            return arg.name.value === "always" &&
-                                arg.value.kind === "BooleanValue" &&
-                                arg.value.value === true;
-                        });
-                        if (forceResolvers) {
-                            return graphql.BREAK;
-                        }
-                    }
-                },
-            },
-        });
-        return forceResolvers;
+    QueryInfo.prototype.notify = function () {
+        var _this = this;
+        cancelNotifyTimeout(this);
+        if (this.shouldNotify()) {
+            this.listeners.forEach(function (listener) { return listener(_this); });
+        }
+        this.dirty = false;
     };
-    LocalState.prototype.buildRootValueFromCache = function (document, variables) {
-        return this.cache.diff({
-            query: utilities.buildQueryFromSelectionSet(document),
-            variables: variables,
-            returnPartialData: true,
-            optimistic: false,
-        }).result;
-    };
-    LocalState.prototype.resolveDocument = function (document_1, rootValue_1) {
-        return tslib.__awaiter(this, arguments, void 0, function (document, rootValue, context, variables, fragmentMatcher, onlyRunForcedResolvers) {
-            var mainDefinition, fragments, fragmentMap, selectionsToResolve, definitionOperation, defaultOperationType, _a, cache, client, execContext, isClientFieldDescendant;
-            if (context === void 0) { context = {}; }
-            if (variables === void 0) { variables = {}; }
-            if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
-            if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
-            return tslib.__generator(this, function (_b) {
-                mainDefinition = utilities.getMainDefinition(document);
-                fragments = utilities.getFragmentDefinitions(document);
-                fragmentMap = utilities.createFragmentMap(fragments);
-                selectionsToResolve = this.collectSelectionsToResolve(mainDefinition, fragmentMap);
-                definitionOperation = mainDefinition.operation;
-                defaultOperationType = definitionOperation ?
-                    definitionOperation.charAt(0).toUpperCase() +
-                        definitionOperation.slice(1)
-                    : "Query";
-                _a = this, cache = _a.cache, client = _a.client;
-                execContext = {
-                    fragmentMap: fragmentMap,
-                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache, client: client }),
-                    variables: variables,
-                    fragmentMatcher: fragmentMatcher,
-                    defaultOperationType: defaultOperationType,
-                    exportedVariables: {},
-                    selectionsToResolve: selectionsToResolve,
-                    onlyRunForcedResolvers: onlyRunForcedResolvers,
-                };
-                isClientFieldDescendant = false;
-                return [2 , this.resolveSelectionSet(mainDefinition.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (result) { return ({
-                        result: result,
-                        exportedVariables: execContext.exportedVariables,
-                    }); })];
-            });
-        });
-    };
-    LocalState.prototype.resolveSelectionSet = function (selectionSet, isClientFieldDescendant, rootValue, execContext) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var fragmentMap, context, variables, resultsToMerge, execute;
-            var _this = this;
-            return tslib.__generator(this, function (_a) {
-                fragmentMap = execContext.fragmentMap, context = execContext.context, variables = execContext.variables;
-                resultsToMerge = [rootValue];
-                execute = function (selection) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                    var fragment, typeCondition;
-                    return tslib.__generator(this, function (_a) {
-                        if (!isClientFieldDescendant &&
-                            !execContext.selectionsToResolve.has(selection)) {
-                            return [2 ];
-                        }
-                        if (!utilities.shouldInclude(selection, variables)) {
-                            return [2 ];
-                        }
-                        if (utilities.isField(selection)) {
-                            return [2 , this.resolveField(selection, isClientFieldDescendant, rootValue, execContext).then(function (fieldResult) {
-                                    var _a;
-                                    if (typeof fieldResult !== "undefined") {
-                                        resultsToMerge.push((_a = {},
-                                            _a[utilities.resultKeyNameFromField(selection)] = fieldResult,
-                                            _a));
-                                    }
-                                })];
-                        }
-                        if (utilities.isInlineFragment(selection)) {
-                            fragment = selection;
-                        }
-                        else {
-                            fragment = fragmentMap[selection.name.value];
-                            globals.invariant(fragment, 18, selection.name.value);
-                        }
-                        if (fragment && fragment.typeCondition) {
-                            typeCondition = fragment.typeCondition.name.value;
-                            if (execContext.fragmentMatcher(rootValue, typeCondition, context)) {
-                                return [2 , this.resolveSelectionSet(fragment.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (fragmentResult) {
-                                        resultsToMerge.push(fragmentResult);
-                                    })];
-                            }
-                        }
-                        return [2 ];
-                    });
-                }); };
-                return [2 , Promise.all(selectionSet.selections.map(execute)).then(function () {
-                        return utilities.mergeDeepArray(resultsToMerge);
-                    })];
-            });
-        });
-    };
-    LocalState.prototype.resolveField = function (field, isClientFieldDescendant, rootValue, execContext) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var variables, fieldName, aliasedFieldName, aliasUsed, defaultResult, resultPromise, resolverType, resolverMap, resolve;
-            var _this = this;
-            return tslib.__generator(this, function (_a) {
-                if (!rootValue) {
-                    return [2 , null];
-                }
-                variables = execContext.variables;
-                fieldName = field.name.value;
-                aliasedFieldName = utilities.resultKeyNameFromField(field);
-                aliasUsed = fieldName !== aliasedFieldName;
-                defaultResult = rootValue[aliasedFieldName] || rootValue[fieldName];
-                resultPromise = Promise.resolve(defaultResult);
-                if (!execContext.onlyRunForcedResolvers ||
-                    this.shouldForceResolvers(field)) {
-                    resolverType = rootValue.__typename || execContext.defaultOperationType;
-                    resolverMap = this.resolvers && this.resolvers[resolverType];
-                    if (resolverMap) {
-                        resolve = resolverMap[aliasUsed ? fieldName : aliasedFieldName];
-                        if (resolve) {
-                            resultPromise = Promise.resolve(
-                            cache.cacheSlot.withValue(this.cache, resolve, [
-                                rootValue,
-                                utilities.argumentsObjectFromField(field, variables),
-                                execContext.context,
-                                { field: field, fragmentMap: execContext.fragmentMap },
-                            ]));
-                        }
-                    }
-                }
-                return [2 , resultPromise.then(function (result) {
-                        var _a, _b;
-                        if (result === void 0) { result = defaultResult; }
-                        if (field.directives) {
-                            field.directives.forEach(function (directive) {
-                                if (directive.name.value === "export" && directive.arguments) {
-                                    directive.arguments.forEach(function (arg) {
-                                        if (arg.name.value === "as" && arg.value.kind === "StringValue") {
-                                            execContext.exportedVariables[arg.value.value] = result;
-                                        }
-                                    });
-                                }
-                            });
-                        }
-                        if (!field.selectionSet) {
-                            return result;
-                        }
-                        if (result == null) {
-                            return result;
-                        }
-                        var isClientField = (_b = (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d.name.value === "client"; })) !== null && _b !== void 0 ? _b : false;
-                        if (Array.isArray(result)) {
-                            return _this.resolveSubSelectedArray(field, isClientFieldDescendant || isClientField, result, execContext);
-                        }
-                        if (field.selectionSet) {
-                            return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant || isClientField, result, execContext);
-                        }
-                    })];
-            });
-        });
-    };
-    LocalState.prototype.resolveSubSelectedArray = function (field, isClientFieldDescendant, result, execContext) {
-        var _this = this;
-        return Promise.all(result.map(function (item) {
-            if (item === null) {
-                return null;
-            }
-            if (Array.isArray(item)) {
-                return _this.resolveSubSelectedArray(field, isClientFieldDescendant, item, execContext);
-            }
-            if (field.selectionSet) {
-                return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant, item, execContext);
-            }
-        }));
-    };
-    LocalState.prototype.collectSelectionsToResolve = function (mainDefinition, fragmentMap) {
-        var isSingleASTNode = function (node) { return !Array.isArray(node); };
-        var selectionsToResolveCache = this.selectionsToResolveCache;
-        function collectByDefinition(definitionNode) {
-            if (!selectionsToResolveCache.has(definitionNode)) {
-                var matches_1 = new Set();
-                selectionsToResolveCache.set(definitionNode, matches_1);
-                graphql.visit(definitionNode, {
-                    Directive: function (node, _, __, ___, ancestors) {
-                        if (node.name.value === "client") {
-                            ancestors.forEach(function (node) {
-                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
-                                    matches_1.add(node);
-                                }
-                            });
-                        }
-                    },
-                    FragmentSpread: function (spread, _, __, ___, ancestors) {
-                        var fragment = fragmentMap[spread.name.value];
-                        globals.invariant(fragment, 19, spread.name.value);
-                        var fragmentSelections = collectByDefinition(fragment);
-                        if (fragmentSelections.size > 0) {
-                            ancestors.forEach(function (node) {
-                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
-                                    matches_1.add(node);
-                                }
-                            });
-                            matches_1.add(spread);
-                            fragmentSelections.forEach(function (selection) {
-                                matches_1.add(selection);
-                            });
-                        }
-                    },
-                });
-            }
-            return selectionsToResolveCache.get(definitionNode);
-        }
-        return collectByDefinition(mainDefinition);
-    };
-    return LocalState;
-}());
-
-var destructiveMethodCounts = new (utilities.canUseWeakMap ? WeakMap : Map)();
-function wrapDestructiveCacheMethod(cache, methodName) {
-    var original = cache[methodName];
-    if (typeof original === "function") {
-        cache[methodName] = function () {
-            destructiveMethodCounts.set(cache,
-            (destructiveMethodCounts.get(cache) + 1) % 1e15);
-            return original.apply(this, arguments);
-        };
-    }
-}
-function cancelNotifyTimeout(info) {
-    if (info["notifyTimeout"]) {
-        clearTimeout(info["notifyTimeout"]);
-        info["notifyTimeout"] = void 0;
-    }
-}
-var QueryInfo =  (function () {
-    function QueryInfo(queryManager, queryId) {
-        if (queryId === void 0) { queryId = queryManager.generateQueryId(); }
-        this.queryId = queryId;
-        this.listeners = new Set();
-        this.document = null;
-        this.lastRequestId = 1;
-        this.stopped = false;
-        this.dirty = false;
-        this.observableQuery = null;
-        var cache = (this.cache = queryManager.cache);
-        if (!destructiveMethodCounts.has(cache)) {
-            destructiveMethodCounts.set(cache, 0);
-            wrapDestructiveCacheMethod(cache, "evict");
-            wrapDestructiveCacheMethod(cache, "modify");
-            wrapDestructiveCacheMethod(cache, "reset");
-        }
-    }
-    QueryInfo.prototype.init = function (query) {
-        var networkStatus = query.networkStatus || exports.NetworkStatus.loading;
-        if (this.variables &&
-            this.networkStatus !== exports.NetworkStatus.loading &&
-            !equal.equal(this.variables, query.variables)) {
-            networkStatus = exports.NetworkStatus.setVariables;
-        }
-        if (!equal.equal(query.variables, this.variables)) {
-            this.lastDiff = void 0;
-        }
-        Object.assign(this, {
-            document: query.document,
-            variables: query.variables,
-            networkError: null,
-            graphQLErrors: this.graphQLErrors || [],
-            networkStatus: networkStatus,
-        });
-        if (query.observableQuery) {
-            this.setObservableQuery(query.observableQuery);
-        }
-        if (query.lastRequestId) {
-            this.lastRequestId = query.lastRequestId;
-        }
-        return this;
-    };
-    QueryInfo.prototype.reset = function () {
-        cancelNotifyTimeout(this);
-        this.dirty = false;
-    };
-    QueryInfo.prototype.resetDiff = function () {
-        this.lastDiff = void 0;
-    };
-    QueryInfo.prototype.getDiff = function () {
-        var options = this.getDiffOptions();
-        if (this.lastDiff && equal.equal(options, this.lastDiff.options)) {
-            return this.lastDiff.diff;
-        }
-        this.updateWatch(this.variables);
-        var oq = this.observableQuery;
-        if (oq && oq.options.fetchPolicy === "no-cache") {
-            return { complete: false };
-        }
-        var diff = this.cache.diff(options);
-        this.updateLastDiff(diff, options);
-        return diff;
-    };
-    QueryInfo.prototype.updateLastDiff = function (diff, options) {
-        this.lastDiff =
-            diff ?
-                {
-                    diff: diff,
-                    options: options || this.getDiffOptions(),
-                }
-                : void 0;
-    };
-    QueryInfo.prototype.getDiffOptions = function (variables) {
-        var _a;
-        if (variables === void 0) { variables = this.variables; }
-        return {
-            query: this.document,
-            variables: variables,
-            returnPartialData: true,
-            optimistic: true,
-            canonizeResults: (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.options.canonizeResults,
-        };
-    };
-    QueryInfo.prototype.setDiff = function (diff) {
-        var _this = this;
-        var _a;
-        var oldDiff = this.lastDiff && this.lastDiff.diff;
-        if (diff && !diff.complete && ((_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.getLastError())) {
-            return;
-        }
-        this.updateLastDiff(diff);
-        if (!this.dirty && !equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
-            this.dirty = true;
-            if (!this.notifyTimeout) {
-                this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
-            }
-        }
-    };
-    QueryInfo.prototype.setObservableQuery = function (oq) {
-        var _this = this;
-        if (oq === this.observableQuery)
-            return;
-        if (this.oqListener) {
-            this.listeners.delete(this.oqListener);
-        }
-        this.observableQuery = oq;
-        if (oq) {
-            oq["queryInfo"] = this;
-            this.listeners.add((this.oqListener = function () {
-                var diff = _this.getDiff();
-                if (diff.fromOptimisticTransaction) {
-                    oq["observe"]();
-                }
-                else {
-                    reobserveCacheFirst(oq);
-                }
-            }));
-        }
-        else {
-            delete this.oqListener;
-        }
-    };
-    QueryInfo.prototype.notify = function () {
-        var _this = this;
-        cancelNotifyTimeout(this);
-        if (this.shouldNotify()) {
-            this.listeners.forEach(function (listener) { return listener(_this); });
-        }
-        this.dirty = false;
-    };
-    QueryInfo.prototype.shouldNotify = function () {
-        if (!this.dirty || !this.listeners.size) {
-            return false;
-        }
-        if (isNetworkRequestInFlight(this.networkStatus) && this.observableQuery) {
-            var fetchPolicy = this.observableQuery.options.fetchPolicy;
-            if (fetchPolicy !== "cache-only" && fetchPolicy !== "cache-and-network") {
-                return false;
-            }
-        }
-        return true;
+    QueryInfo.prototype.shouldNotify = function () {
+        if (!this.dirty || !this.listeners.size) {
+            return false;
+        }
+        if (isNetworkRequestInFlight(this.networkStatus) && this.observableQuery) {
+            var fetchPolicy = this.observableQuery.options.fetchPolicy;
+            if (fetchPolicy !== "cache-only" && fetchPolicy !== "cache-and-network") {
+                return false;
+            }
+        }
+        return true;
     };
     QueryInfo.prototype.stop = function () {
         if (!this.stopped) {
@@ -1357,8 +1043,7 @@ function shouldWriteResult(result, errorPolicy) {
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 var IGNORE = Object.create(null);
 var QueryManager =  (function () {
-    function QueryManager(_a) {
-        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, documentTransform = _a.documentTransform, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, _e = _a.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? !!cache.assumeImmutableResults : _e, defaultContext = _a.defaultContext;
+    function QueryManager(options) {
         var _this = this;
         this.clientAwareness = {};
         this.queries = new Map();
@@ -1371,22 +1056,23 @@ var QueryManager =  (function () {
         this.inFlightLinkObservables = new trie.Trie(false);
         var defaultDocumentTransform = new utilities.DocumentTransform(function (document) { return _this.cache.transformDocument(document); },
         { cache: false });
-        this.cache = cache;
-        this.link = link;
-        this.defaultOptions = defaultOptions || Object.create(null);
-        this.queryDeduplication = queryDeduplication;
-        this.clientAwareness = clientAwareness;
-        this.localState = localState || new LocalState({ cache: cache });
-        this.ssrMode = ssrMode;
-        this.assumeImmutableResults = assumeImmutableResults;
+        this.cache = options.cache;
+        this.link = options.link;
+        this.defaultOptions = options.defaultOptions;
+        this.queryDeduplication = options.queryDeduplication;
+        this.clientAwareness = options.clientAwareness;
+        this.localState = options.localState;
+        this.ssrMode = options.ssrMode;
+        this.assumeImmutableResults = options.assumeImmutableResults;
+        var documentTransform = options.documentTransform;
         this.documentTransform =
             documentTransform ?
                 defaultDocumentTransform
                     .concat(documentTransform)
                     .concat(defaultDocumentTransform)
                 : defaultDocumentTransform;
-        this.defaultContext = defaultContext || Object.create(null);
-        if ((this.onBroadcast = onBroadcast)) {
+        this.defaultContext = options.defaultContext || Object.create(null);
+        if ((this.onBroadcast = options.onBroadcast)) {
             this.mutationStore = Object.create(null);
         }
     }
@@ -1889,379 +1575,693 @@ var QueryManager =  (function () {
                     if (hasProtocolErrors) {
                         errors$1.protocolErrors = result.extensions[errors.PROTOCOL_ERRORS_SYMBOL];
                     }
-                    if (errorPolicy === "none" || hasProtocolErrors) {
-                        throw new errors.ApolloError(errors$1);
+                    if (errorPolicy === "none" || hasProtocolErrors) {
+                        throw new errors.ApolloError(errors$1);
+                    }
+                }
+                if (errorPolicy === "ignore") {
+                    delete result.errors;
+                }
+                return result;
+            });
+        };
+        if (this.getDocumentInfo(query).hasClientExports) {
+            var observablePromise_1 = this.localState
+                .addExportedVariables(query, variables, context)
+                .then(makeObservable);
+            return new utilities.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 makeObservable(variables);
+    };
+    QueryManager.prototype.stopQuery = function (queryId) {
+        this.stopQueryNoBroadcast(queryId);
+        this.broadcastQueries();
+    };
+    QueryManager.prototype.stopQueryNoBroadcast = function (queryId) {
+        this.stopQueryInStoreNoBroadcast(queryId);
+        this.removeQuery(queryId);
+    };
+    QueryManager.prototype.removeQuery = function (queryId) {
+        this.fetchCancelFns.delete(queryId);
+        if (this.queries.has(queryId)) {
+            this.getQuery(queryId).stop();
+            this.queries.delete(queryId);
+        }
+    };
+    QueryManager.prototype.broadcastQueries = function () {
+        if (this.onBroadcast)
+            this.onBroadcast();
+        this.queries.forEach(function (info) { return info.notify(); });
+    };
+    QueryManager.prototype.getLocalState = function () {
+        return this.localState;
+    };
+    QueryManager.prototype.getObservableFromLink = function (query, context, variables, extensions,
+    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;
+        if (serverQuery) {
+            var _c = this, inFlightLinkObservables_1 = _c.inFlightLinkObservables, link = _c.link;
+            var operation = {
+                query: serverQuery,
+                variables: variables,
+                operationName: utilities.getOperationName(serverQuery) || void 0,
+                context: this.prepareContext(tslib.__assign(tslib.__assign({}, context), { forceFetch: !deduplication })),
+                extensions: extensions,
+            };
+            context = operation.context;
+            if (deduplication) {
+                var printedServerQuery_1 = utilities.print(serverQuery);
+                var varJson_1 = cache.canonicalStringify(variables);
+                var entry = inFlightLinkObservables_1.lookup(printedServerQuery_1, varJson_1);
+                observable = entry.observable;
+                if (!observable) {
+                    var concast = new utilities.Concast([
+                        core.execute(link, operation),
+                    ]);
+                    observable = entry.observable = concast;
+                    concast.beforeNext(function () {
+                        inFlightLinkObservables_1.remove(printedServerQuery_1, varJson_1);
+                    });
+                }
+            }
+            else {
+                observable = new utilities.Concast([
+                    core.execute(link, operation),
+                ]);
+            }
+        }
+        else {
+            observable = new utilities.Concast([utilities.Observable.of({ data: {} })]);
+            context = this.prepareContext(context);
+        }
+        if (clientQuery) {
+            observable = utilities.asyncMap(observable, function (result) {
+                return _this.localState.runResolvers({
+                    document: clientQuery,
+                    remoteResult: result,
+                    context: context,
+                    variables: variables,
+                });
+            });
+        }
+        return observable;
+    };
+    QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
+        var requestId = (queryInfo.lastRequestId = this.generateRequestId());
+        var linkDocument = this.cache.transformForLink(options.query);
+        return utilities.asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
+            var graphQLErrors = utilities.getGraphQLErrorsFromResult(result);
+            var hasErrors = graphQLErrors.length > 0;
+            if (requestId >= queryInfo.lastRequestId) {
+                if (hasErrors && options.errorPolicy === "none") {
+                    throw queryInfo.markError(new errors.ApolloError({
+                        graphQLErrors: graphQLErrors,
+                    }));
+                }
+                queryInfo.markResult(result, linkDocument, options, cacheWriteBehavior);
+                queryInfo.markReady();
+            }
+            var aqr = {
+                data: result.data,
+                loading: false,
+                networkStatus: exports.NetworkStatus.ready,
+            };
+            if (hasErrors && options.errorPolicy !== "ignore") {
+                aqr.errors = graphQLErrors;
+                aqr.networkStatus = exports.NetworkStatus.error;
+            }
+            return aqr;
+        }, function (networkError) {
+            var error = errors.isApolloError(networkError) ? networkError : (new errors.ApolloError({ networkError: networkError }));
+            if (requestId >= queryInfo.lastRequestId) {
+                queryInfo.markError(error);
+            }
+            throw error;
+        });
+    };
+    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options,
+    networkStatus, query) {
+        var _this = this;
+        if (networkStatus === void 0) { networkStatus = exports.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,
+        });
+        var fromVariables = function (variables) {
+            normalized.variables = variables;
+            var sourcesWithInfo = _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            if (
+            normalized.fetchPolicy !== "standby" &&
+                sourcesWithInfo.sources.length > 0 &&
+                queryInfo.observableQuery) {
+                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
+            }
+            return sourcesWithInfo;
+        };
+        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
+        this.fetchCancelFns.set(queryId, function (reason) {
+            cleanupCancelFn();
+            setTimeout(function () { return concast.cancel(reason); });
+        });
+        var concast, containsDataFromLink;
+        if (this.getDocumentInfo(normalized.query).hasClientExports) {
+            concast = new utilities.Concast(this.localState
+                .addExportedVariables(normalized.query, normalized.variables, normalized.context)
+                .then(fromVariables)
+                .then(function (sourcesWithInfo) { return sourcesWithInfo.sources; }));
+            containsDataFromLink = true;
+        }
+        else {
+            var sourcesWithInfo = fromVariables(normalized.variables);
+            containsDataFromLink = sourcesWithInfo.fromLink;
+            concast = new utilities.Concast(sourcesWithInfo.sources);
+        }
+        concast.promise.then(cleanupCancelFn, cleanupCancelFn);
+        return {
+            concast: concast,
+            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 ? utilities.makeUniqueId("refetchQueries") : void 0 : _c, onQueryUpdated = _a.onQueryUpdated;
+        var includedQueriesById = new Map();
+        if (include) {
+            this.getObservableQueries(include).forEach(function (oq, queryId) {
+                includedQueriesById.set(queryId, {
+                    oq: oq,
+                    lastDiff: _this.getQuery(queryId).getDiff(),
+                });
+            });
+        }
+        var results = new Map();
+        if (updateCache) {
+            this.cache.batch({
+                update: updateCache,
+                optimistic: (optimistic && removeOptimistic) || false,
+                removeOptimistic: removeOptimistic,
+                onWatchUpdated: function (watch, diff, lastDiff) {
+                    var oq = watch.watcher instanceof QueryInfo && watch.watcher.observableQuery;
+                    if (oq) {
+                        if (onQueryUpdated) {
+                            includedQueriesById.delete(oq.queryId);
+                            var result = onQueryUpdated(oq, diff, lastDiff);
+                            if (result === true) {
+                                result = oq.refetch();
+                            }
+                            if (result !== false) {
+                                results.set(oq, result);
+                            }
+                            return result;
+                        }
+                        if (onQueryUpdated !== null) {
+                            includedQueriesById.set(oq.queryId, { oq: oq, lastDiff: lastDiff, diff: diff });
+                        }
+                    }
+                },
+            });
+        }
+        if (includedQueriesById.size) {
+            includedQueriesById.forEach(function (_a, queryId) {
+                var oq = _a.oq, lastDiff = _a.lastDiff, diff = _a.diff;
+                var result;
+                if (onQueryUpdated) {
+                    if (!diff) {
+                        var info = oq["queryInfo"];
+                        info.reset();
+                        diff = info.getDiff();
                     }
+                    result = onQueryUpdated(oq, diff, lastDiff);
                 }
-                if (errorPolicy === "ignore") {
-                    delete result.errors;
+                if (!onQueryUpdated || result === true) {
+                    result = oq.refetch();
+                }
+                if (result !== false) {
+                    results.set(oq, result);
+                }
+                if (queryId.indexOf("legacyOneTimeQuery") >= 0) {
+                    _this.stopQueryNoBroadcast(queryId);
                 }
-                return result;
-            });
-        };
-        if (this.getDocumentInfo(query).hasClientExports) {
-            var observablePromise_1 = this.localState
-                .addExportedVariables(query, variables, context)
-                .then(makeObservable);
-            return new utilities.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 makeObservable(variables);
-    };
-    QueryManager.prototype.stopQuery = function (queryId) {
-        this.stopQueryNoBroadcast(queryId);
-        this.broadcastQueries();
-    };
-    QueryManager.prototype.stopQueryNoBroadcast = function (queryId) {
-        this.stopQueryInStoreNoBroadcast(queryId);
-        this.removeQuery(queryId);
-    };
-    QueryManager.prototype.removeQuery = function (queryId) {
-        this.fetchCancelFns.delete(queryId);
-        if (this.queries.has(queryId)) {
-            this.getQuery(queryId).stop();
-            this.queries.delete(queryId);
+        if (removeOptimistic) {
+            this.cache.removeOptimistic(removeOptimistic);
         }
+        return results;
     };
-    QueryManager.prototype.broadcastQueries = function () {
-        if (this.onBroadcast)
-            this.onBroadcast();
-        this.queries.forEach(function (info) { return info.notify(); });
-    };
-    QueryManager.prototype.getLocalState = function () {
-        return this.localState;
-    };
-    QueryManager.prototype.getObservableFromLink = function (query, context, variables, extensions,
-    deduplication) {
+    QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a,
+    networkStatus) {
         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;
-        if (serverQuery) {
-            var _c = this, inFlightLinkObservables_1 = _c.inFlightLinkObservables, link = _c.link;
-            var operation = {
-                query: serverQuery,
-                variables: variables,
-                operationName: utilities.getOperationName(serverQuery) || void 0,
-                context: this.prepareContext(tslib.__assign(tslib.__assign({}, context), { forceFetch: !deduplication })),
-                extensions: extensions,
+        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;
+        queryInfo.init({
+            document: query,
+            variables: variables,
+            networkStatus: networkStatus,
+        });
+        var readCache = function () { return queryInfo.getDiff(); };
+        var resultsFromCache = function (diff, networkStatus) {
+            if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || exports.NetworkStatus.loading; }
+            var data = diff.result;
+            if (globalThis.__DEV__ !== false && !returnPartialData && !equal.equal(data, {})) {
+                logMissingFieldErrors(diff.missing);
+            }
+            var fromData = function (data) {
+                return utilities.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true })));
             };
-            context = operation.context;
-            if (deduplication) {
-                var printedServerQuery_1 = utilities.print(serverQuery);
-                var varJson_1 = cache.canonicalStringify(variables);
-                var entry = inFlightLinkObservables_1.lookup(printedServerQuery_1, varJson_1);
-                observable = entry.observable;
-                if (!observable) {
-                    var concast = new utilities.Concast([
-                        core.execute(link, operation),
-                    ]);
-                    observable = entry.observable = concast;
-                    concast.beforeNext(function () {
-                        inFlightLinkObservables_1.remove(printedServerQuery_1, varJson_1);
-                    });
+            if (data && _this.getDocumentInfo(query).hasForcedResolvers) {
+                return _this.localState
+                    .runResolvers({
+                    document: query,
+                    remoteResult: { data: data },
+                    context: context,
+                    variables: variables,
+                    onlyRunForcedResolvers: true,
+                })
+                    .then(function (resolved) { return fromData(resolved.data || void 0); });
+            }
+            if (errorPolicy === "none" &&
+                networkStatus === exports.NetworkStatus.refetch &&
+                Array.isArray(diff.missing)) {
+                return fromData(void 0);
+            }
+            return fromData(data);
+        };
+        var cacheWriteBehavior = fetchPolicy === "no-cache" ? 0
+            : (networkStatus === exports.NetworkStatus.refetch &&
+                refetchWritePolicy !== "merge") ?
+                1
+                : 2 ;
+        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);
+        switch (fetchPolicy) {
+            default:
+            case "cache-first": {
+                var diff = readCache();
+                if (diff.complete) {
+                    return {
+                        fromLink: false,
+                        sources: [resultsFromCache(diff, queryInfo.markReady())],
+                    };
+                }
+                if (returnPartialData || shouldNotify) {
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(diff), resultsFromLink()],
+                    };
                 }
+                return { fromLink: true, sources: [resultsFromLink()] };
             }
-            else {
-                observable = new utilities.Concast([
-                    core.execute(link, operation),
-                ]);
+            case "cache-and-network": {
+                var diff = readCache();
+                if (diff.complete || returnPartialData || shouldNotify) {
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(diff), resultsFromLink()],
+                    };
+                }
+                return { fromLink: true, sources: [resultsFromLink()] };
             }
+            case "cache-only":
+                return {
+                    fromLink: false,
+                    sources: [resultsFromCache(readCache(), queryInfo.markReady())],
+                };
+            case "network-only":
+                if (shouldNotify) {
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(readCache()), resultsFromLink()],
+                    };
+                }
+                return { fromLink: true, sources: [resultsFromLink()] };
+            case "no-cache":
+                if (shouldNotify) {
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(queryInfo.getDiff()), resultsFromLink()],
+                    };
+                }
+                return { fromLink: true, sources: [resultsFromLink()] };
+            case "standby":
+                return { fromLink: false, sources: [] };
+        }
+    };
+    QueryManager.prototype.getQuery = function (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 tslib.__assign(tslib.__assign(tslib.__assign({}, this.defaultContext), newContext), { clientAwareness: this.clientAwareness });
+    };
+    return QueryManager;
+}());
+
+var LocalState =  (function () {
+    function LocalState(_a) {
+        var cache = _a.cache, client = _a.client, resolvers = _a.resolvers, fragmentMatcher = _a.fragmentMatcher;
+        this.selectionsToResolveCache = new WeakMap();
+        this.cache = cache;
+        if (client) {
+            this.client = client;
+        }
+        if (resolvers) {
+            this.addResolvers(resolvers);
+        }
+        if (fragmentMatcher) {
+            this.setFragmentMatcher(fragmentMatcher);
+        }
+    }
+    LocalState.prototype.addResolvers = function (resolvers) {
+        var _this = this;
+        this.resolvers = this.resolvers || {};
+        if (Array.isArray(resolvers)) {
+            resolvers.forEach(function (resolverGroup) {
+                _this.resolvers = utilities.mergeDeep(_this.resolvers, resolverGroup);
+            });
         }
         else {
-            observable = new utilities.Concast([utilities.Observable.of({ data: {} })]);
-            context = this.prepareContext(context);
+            this.resolvers = utilities.mergeDeep(this.resolvers, resolvers);
         }
-        if (clientQuery) {
-            observable = utilities.asyncMap(observable, function (result) {
-                return _this.localState.runResolvers({
-                    document: clientQuery,
-                    remoteResult: result,
-                    context: context,
-                    variables: variables,
-                });
+    };
+    LocalState.prototype.setResolvers = function (resolvers) {
+        this.resolvers = {};
+        this.addResolvers(resolvers);
+    };
+    LocalState.prototype.getResolvers = function () {
+        return this.resolvers || {};
+    };
+    LocalState.prototype.runResolvers = function (_a) {
+        return tslib.__awaiter(this, arguments, void 0, function (_b) {
+            var document = _b.document, remoteResult = _b.remoteResult, context = _b.context, variables = _b.variables, _c = _b.onlyRunForcedResolvers, onlyRunForcedResolvers = _c === void 0 ? false : _c;
+            return tslib.__generator(this, function (_d) {
+                if (document) {
+                    return [2 , this.resolveDocument(document, remoteResult.data, context, variables, this.fragmentMatcher, onlyRunForcedResolvers).then(function (localResult) { return (tslib.__assign(tslib.__assign({}, remoteResult), { data: localResult.result })); })];
+                }
+                return [2 , remoteResult];
             });
+        });
+    };
+    LocalState.prototype.setFragmentMatcher = function (fragmentMatcher) {
+        this.fragmentMatcher = fragmentMatcher;
+    };
+    LocalState.prototype.getFragmentMatcher = function () {
+        return this.fragmentMatcher;
+    };
+    LocalState.prototype.clientQuery = function (document) {
+        if (utilities.hasDirectives(["client"], document)) {
+            if (this.resolvers) {
+                return document;
+            }
         }
-        return observable;
+        return null;
     };
-    QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
-        var requestId = (queryInfo.lastRequestId = this.generateRequestId());
-        var linkDocument = this.cache.transformForLink(options.query);
-        return utilities.asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
-            var graphQLErrors = utilities.getGraphQLErrorsFromResult(result);
-            var hasErrors = graphQLErrors.length > 0;
-            if (requestId >= queryInfo.lastRequestId) {
-                if (hasErrors && options.errorPolicy === "none") {
-                    throw queryInfo.markError(new errors.ApolloError({
-                        graphQLErrors: graphQLErrors,
-                    }));
+    LocalState.prototype.serverQuery = function (document) {
+        return utilities.removeClientSetsFromDocument(document);
+    };
+    LocalState.prototype.prepareContext = function (context) {
+        var cache = this.cache;
+        return tslib.__assign(tslib.__assign({}, context), { cache: cache,
+            getCacheKey: function (obj) {
+                return cache.identify(obj);
+            } });
+    };
+    LocalState.prototype.addExportedVariables = function (document_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (document, variables, context) {
+            if (variables === void 0) { variables = {}; }
+            if (context === void 0) { context = {}; }
+            return tslib.__generator(this, function (_a) {
+                if (document) {
+                    return [2 , this.resolveDocument(document, this.buildRootValueFromCache(document, variables) || {}, this.prepareContext(context), variables).then(function (data) { return (tslib.__assign(tslib.__assign({}, variables), data.exportedVariables)); })];
                 }
-                queryInfo.markResult(result, linkDocument, options, cacheWriteBehavior);
-                queryInfo.markReady();
-            }
-            var aqr = {
-                data: result.data,
-                loading: false,
-                networkStatus: exports.NetworkStatus.ready,
-            };
-            if (hasErrors && options.errorPolicy !== "ignore") {
-                aqr.errors = graphQLErrors;
-                aqr.networkStatus = exports.NetworkStatus.error;
-            }
-            return aqr;
-        }, function (networkError) {
-            var error = errors.isApolloError(networkError) ? networkError : (new errors.ApolloError({ networkError: networkError }));
-            if (requestId >= queryInfo.lastRequestId) {
-                queryInfo.markError(error);
-            }
-            throw error;
+                return [2 , tslib.__assign({}, variables)];
+            });
         });
     };
-    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options,
-    networkStatus, query) {
-        var _this = this;
-        if (networkStatus === void 0) { networkStatus = exports.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,
-        });
-        var fromVariables = function (variables) {
-            normalized.variables = variables;
-            var sourcesWithInfo = _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
-            if (
-            normalized.fetchPolicy !== "standby" &&
-                sourcesWithInfo.sources.length > 0 &&
-                queryInfo.observableQuery) {
-                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
-            }
-            return sourcesWithInfo;
-        };
-        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
-        this.fetchCancelFns.set(queryId, function (reason) {
-            cleanupCancelFn();
-            setTimeout(function () { return concast.cancel(reason); });
+    LocalState.prototype.shouldForceResolvers = function (document) {
+        var forceResolvers = false;
+        graphql.visit(document, {
+            Directive: {
+                enter: function (node) {
+                    if (node.name.value === "client" && node.arguments) {
+                        forceResolvers = node.arguments.some(function (arg) {
+                            return arg.name.value === "always" &&
+                                arg.value.kind === "BooleanValue" &&
+                                arg.value.value === true;
+                        });
+                        if (forceResolvers) {
+                            return graphql.BREAK;
+                        }
+                    }
+                },
+            },
         });
-        var concast, containsDataFromLink;
-        if (this.getDocumentInfo(normalized.query).hasClientExports) {
-            concast = new utilities.Concast(this.localState
-                .addExportedVariables(normalized.query, normalized.variables, normalized.context)
-                .then(fromVariables)
-                .then(function (sourcesWithInfo) { return sourcesWithInfo.sources; }));
-            containsDataFromLink = true;
-        }
-        else {
-            var sourcesWithInfo = fromVariables(normalized.variables);
-            containsDataFromLink = sourcesWithInfo.fromLink;
-            concast = new utilities.Concast(sourcesWithInfo.sources);
-        }
-        concast.promise.then(cleanupCancelFn, cleanupCancelFn);
-        return {
-            concast: concast,
-            fromLink: containsDataFromLink,
-        };
+        return forceResolvers;
     };
-    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 ? utilities.makeUniqueId("refetchQueries") : void 0 : _c, onQueryUpdated = _a.onQueryUpdated;
-        var includedQueriesById = new Map();
-        if (include) {
-            this.getObservableQueries(include).forEach(function (oq, queryId) {
-                includedQueriesById.set(queryId, {
-                    oq: oq,
-                    lastDiff: _this.getQuery(queryId).getDiff(),
-                });
+    LocalState.prototype.buildRootValueFromCache = function (document, variables) {
+        return this.cache.diff({
+            query: utilities.buildQueryFromSelectionSet(document),
+            variables: variables,
+            returnPartialData: true,
+            optimistic: false,
+        }).result;
+    };
+    LocalState.prototype.resolveDocument = function (document_1, rootValue_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (document, rootValue, context, variables, fragmentMatcher, onlyRunForcedResolvers) {
+            var mainDefinition, fragments, fragmentMap, selectionsToResolve, definitionOperation, defaultOperationType, _a, cache, client, execContext, isClientFieldDescendant;
+            if (context === void 0) { context = {}; }
+            if (variables === void 0) { variables = {}; }
+            if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
+            if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
+            return tslib.__generator(this, function (_b) {
+                mainDefinition = utilities.getMainDefinition(document);
+                fragments = utilities.getFragmentDefinitions(document);
+                fragmentMap = utilities.createFragmentMap(fragments);
+                selectionsToResolve = this.collectSelectionsToResolve(mainDefinition, fragmentMap);
+                definitionOperation = mainDefinition.operation;
+                defaultOperationType = definitionOperation ?
+                    definitionOperation.charAt(0).toUpperCase() +
+                        definitionOperation.slice(1)
+                    : "Query";
+                _a = this, cache = _a.cache, client = _a.client;
+                execContext = {
+                    fragmentMap: fragmentMap,
+                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache, client: client }),
+                    variables: variables,
+                    fragmentMatcher: fragmentMatcher,
+                    defaultOperationType: defaultOperationType,
+                    exportedVariables: {},
+                    selectionsToResolve: selectionsToResolve,
+                    onlyRunForcedResolvers: onlyRunForcedResolvers,
+                };
+                isClientFieldDescendant = false;
+                return [2 , this.resolveSelectionSet(mainDefinition.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (result) { return ({
+                        result: result,
+                        exportedVariables: execContext.exportedVariables,
+                    }); })];
             });
-        }
-        var results = new Map();
-        if (updateCache) {
-            this.cache.batch({
-                update: updateCache,
-                optimistic: (optimistic && removeOptimistic) || false,
-                removeOptimistic: removeOptimistic,
-                onWatchUpdated: function (watch, diff, lastDiff) {
-                    var oq = watch.watcher instanceof QueryInfo && watch.watcher.observableQuery;
-                    if (oq) {
-                        if (onQueryUpdated) {
-                            includedQueriesById.delete(oq.queryId);
-                            var result = onQueryUpdated(oq, diff, lastDiff);
-                            if (result === true) {
-                                result = oq.refetch();
-                            }
-                            if (result !== false) {
-                                results.set(oq, result);
-                            }
-                            return result;
+        });
+    };
+    LocalState.prototype.resolveSelectionSet = function (selectionSet, isClientFieldDescendant, rootValue, execContext) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var fragmentMap, context, variables, resultsToMerge, execute;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                fragmentMap = execContext.fragmentMap, context = execContext.context, variables = execContext.variables;
+                resultsToMerge = [rootValue];
+                execute = function (selection) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var fragment, typeCondition;
+                    return tslib.__generator(this, function (_a) {
+                        if (!isClientFieldDescendant &&
+                            !execContext.selectionsToResolve.has(selection)) {
+                            return [2 ];
                         }
-                        if (onQueryUpdated !== null) {
-                            includedQueriesById.set(oq.queryId, { oq: oq, lastDiff: lastDiff, diff: diff });
+                        if (!utilities.shouldInclude(selection, variables)) {
+                            return [2 ];
+                        }
+                        if (utilities.isField(selection)) {
+                            return [2 , this.resolveField(selection, isClientFieldDescendant, rootValue, execContext).then(function (fieldResult) {
+                                    var _a;
+                                    if (typeof fieldResult !== "undefined") {
+                                        resultsToMerge.push((_a = {},
+                                            _a[utilities.resultKeyNameFromField(selection)] = fieldResult,
+                                            _a));
+                                    }
+                                })];
+                        }
+                        if (utilities.isInlineFragment(selection)) {
+                            fragment = selection;
+                        }
+                        else {
+                            fragment = fragmentMap[selection.name.value];
+                            globals.invariant(fragment, 18, selection.name.value);
+                        }
+                        if (fragment && fragment.typeCondition) {
+                            typeCondition = fragment.typeCondition.name.value;
+                            if (execContext.fragmentMatcher(rootValue, typeCondition, context)) {
+                                return [2 , this.resolveSelectionSet(fragment.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (fragmentResult) {
+                                        resultsToMerge.push(fragmentResult);
+                                    })];
+                            }
                         }
-                    }
-                },
+                        return [2 ];
+                    });
+                }); };
+                return [2 , Promise.all(selectionSet.selections.map(execute)).then(function () {
+                        return utilities.mergeDeepArray(resultsToMerge);
+                    })];
             });
-        }
-        if (includedQueriesById.size) {
-            includedQueriesById.forEach(function (_a, queryId) {
-                var oq = _a.oq, lastDiff = _a.lastDiff, diff = _a.diff;
-                var result;
-                if (onQueryUpdated) {
-                    if (!diff) {
-                        var info = oq["queryInfo"];
-                        info.reset();
-                        diff = info.getDiff();
-                    }
-                    result = onQueryUpdated(oq, diff, lastDiff);
-                }
-                if (!onQueryUpdated || result === true) {
-                    result = oq.refetch();
-                }
-                if (result !== false) {
-                    results.set(oq, result);
+        });
+    };
+    LocalState.prototype.resolveField = function (field, isClientFieldDescendant, rootValue, execContext) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var variables, fieldName, aliasedFieldName, aliasUsed, defaultResult, resultPromise, resolverType, resolverMap, resolve;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                if (!rootValue) {
+                    return [2 , null];
                 }
-                if (queryId.indexOf("legacyOneTimeQuery") >= 0) {
-                    _this.stopQueryNoBroadcast(queryId);
+                variables = execContext.variables;
+                fieldName = field.name.value;
+                aliasedFieldName = utilities.resultKeyNameFromField(field);
+                aliasUsed = fieldName !== aliasedFieldName;
+                defaultResult = rootValue[aliasedFieldName] || rootValue[fieldName];
+                resultPromise = Promise.resolve(defaultResult);
+                if (!execContext.onlyRunForcedResolvers ||
+                    this.shouldForceResolvers(field)) {
+                    resolverType = rootValue.__typename || execContext.defaultOperationType;
+                    resolverMap = this.resolvers && this.resolvers[resolverType];
+                    if (resolverMap) {
+                        resolve = resolverMap[aliasUsed ? fieldName : aliasedFieldName];
+                        if (resolve) {
+                            resultPromise = Promise.resolve(
+                            cache.cacheSlot.withValue(this.cache, resolve, [
+                                rootValue,
+                                utilities.argumentsObjectFromField(field, variables),
+                                execContext.context,
+                                { field: field, fragmentMap: execContext.fragmentMap },
+                            ]));
+                        }
+                    }
                 }
+                return [2 , resultPromise.then(function (result) {
+                        var _a, _b;
+                        if (result === void 0) { result = defaultResult; }
+                        if (field.directives) {
+                            field.directives.forEach(function (directive) {
+                                if (directive.name.value === "export" && directive.arguments) {
+                                    directive.arguments.forEach(function (arg) {
+                                        if (arg.name.value === "as" && arg.value.kind === "StringValue") {
+                                            execContext.exportedVariables[arg.value.value] = result;
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                        if (!field.selectionSet) {
+                            return result;
+                        }
+                        if (result == null) {
+                            return result;
+                        }
+                        var isClientField = (_b = (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d.name.value === "client"; })) !== null && _b !== void 0 ? _b : false;
+                        if (Array.isArray(result)) {
+                            return _this.resolveSubSelectedArray(field, isClientFieldDescendant || isClientField, result, execContext);
+                        }
+                        if (field.selectionSet) {
+                            return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant || isClientField, result, execContext);
+                        }
+                    })];
             });
-        }
-        if (removeOptimistic) {
-            this.cache.removeOptimistic(removeOptimistic);
-        }
-        return results;
+        });
     };
-    QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a,
-    networkStatus) {
+    LocalState.prototype.resolveSubSelectedArray = function (field, isClientFieldDescendant, result, execContext) {
         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;
-        queryInfo.init({
-            document: query,
-            variables: variables,
-            networkStatus: networkStatus,
-        });
-        var readCache = function () { return queryInfo.getDiff(); };
-        var resultsFromCache = function (diff, networkStatus) {
-            if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || exports.NetworkStatus.loading; }
-            var data = diff.result;
-            if (globalThis.__DEV__ !== false && !returnPartialData && !equal.equal(data, {})) {
-                logMissingFieldErrors(diff.missing);
-            }
-            var fromData = function (data) {
-                return utilities.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true })));
-            };
-            if (data && _this.getDocumentInfo(query).hasForcedResolvers) {
-                return _this.localState
-                    .runResolvers({
-                    document: query,
-                    remoteResult: { data: data },
-                    context: context,
-                    variables: variables,
-                    onlyRunForcedResolvers: true,
-                })
-                    .then(function (resolved) { return fromData(resolved.data || void 0); });
-            }
-            if (errorPolicy === "none" &&
-                networkStatus === exports.NetworkStatus.refetch &&
-                Array.isArray(diff.missing)) {
-                return fromData(void 0);
+        return Promise.all(result.map(function (item) {
+            if (item === null) {
+                return null;
             }
-            return fromData(data);
-        };
-        var cacheWriteBehavior = fetchPolicy === "no-cache" ? 0
-            : (networkStatus === exports.NetworkStatus.refetch &&
-                refetchWritePolicy !== "merge") ?
-                1
-                : 2 ;
-        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);
-        switch (fetchPolicy) {
-            default:
-            case "cache-first": {
-                var diff = readCache();
-                if (diff.complete) {
-                    return {
-                        fromLink: false,
-                        sources: [resultsFromCache(diff, queryInfo.markReady())],
-                    };
-                }
-                if (returnPartialData || shouldNotify) {
-                    return {
-                        fromLink: true,
-                        sources: [resultsFromCache(diff), resultsFromLink()],
-                    };
-                }
-                return { fromLink: true, sources: [resultsFromLink()] };
+            if (Array.isArray(item)) {
+                return _this.resolveSubSelectedArray(field, isClientFieldDescendant, item, execContext);
             }
-            case "cache-and-network": {
-                var diff = readCache();
-                if (diff.complete || returnPartialData || shouldNotify) {
-                    return {
-                        fromLink: true,
-                        sources: [resultsFromCache(diff), resultsFromLink()],
-                    };
-                }
-                return { fromLink: true, sources: [resultsFromLink()] };
+            if (field.selectionSet) {
+                return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant, item, execContext);
             }
-            case "cache-only":
-                return {
-                    fromLink: false,
-                    sources: [resultsFromCache(readCache(), queryInfo.markReady())],
-                };
-            case "network-only":
-                if (shouldNotify) {
-                    return {
-                        fromLink: true,
-                        sources: [resultsFromCache(readCache()), resultsFromLink()],
-                    };
-                }
-                return { fromLink: true, sources: [resultsFromLink()] };
-            case "no-cache":
-                if (shouldNotify) {
-                    return {
-                        fromLink: true,
-                        sources: [resultsFromCache(queryInfo.getDiff()), resultsFromLink()],
-                    };
-                }
-                return { fromLink: true, sources: [resultsFromLink()] };
-            case "standby":
-                return { fromLink: false, sources: [] };
-        }
+        }));
     };
-    QueryManager.prototype.getQuery = function (queryId) {
-        if (queryId && !this.queries.has(queryId)) {
-            this.queries.set(queryId, new QueryInfo(this, queryId));
+    LocalState.prototype.collectSelectionsToResolve = function (mainDefinition, fragmentMap) {
+        var isSingleASTNode = function (node) { return !Array.isArray(node); };
+        var selectionsToResolveCache = this.selectionsToResolveCache;
+        function collectByDefinition(definitionNode) {
+            if (!selectionsToResolveCache.has(definitionNode)) {
+                var matches_1 = new Set();
+                selectionsToResolveCache.set(definitionNode, matches_1);
+                graphql.visit(definitionNode, {
+                    Directive: function (node, _, __, ___, ancestors) {
+                        if (node.name.value === "client") {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                        }
+                    },
+                    FragmentSpread: function (spread, _, __, ___, ancestors) {
+                        var fragment = fragmentMap[spread.name.value];
+                        globals.invariant(fragment, 19, spread.name.value);
+                        var fragmentSelections = collectByDefinition(fragment);
+                        if (fragmentSelections.size > 0) {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                            matches_1.add(spread);
+                            fragmentSelections.forEach(function (selection) {
+                                matches_1.add(selection);
+                            });
+                        }
+                    },
+                });
+            }
+            return selectionsToResolveCache.get(definitionNode);
         }
-        return this.queries.get(queryId);
-    };
-    QueryManager.prototype.prepareContext = function (context) {
-        if (context === void 0) { context = {}; }
-        var newContext = this.localState.prepareContext(context);
-        return tslib.__assign(tslib.__assign(tslib.__assign({}, this.defaultContext), newContext), { clientAwareness: this.clientAwareness });
+        return collectByDefinition(mainDefinition);
     };
-    return QueryManager;
+    return LocalState;
 }());
 
 var cacheSizeSymbol = Symbol.for("apollo.cacheSize");
@@ -2395,7 +2395,7 @@ var ApolloClient =  (function () {
             },
             localState: this.localState,
             assumeImmutableResults: assumeImmutableResults,
-            onBroadcast: connectToDevTools ?
+            onBroadcast: this.devtoolsConfig.enabled ?
                 function () {
                     if (_this.devToolsHookCb) {
                         _this.devToolsHookCb({