@apollo/client 3.5.0-rc.1 → 3.5.1

package/apollo-client.cjs

@@ -1291,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.5.0-rc.1';
+var version = '3.5.1';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -2574,330 +2574,6 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
     }
 }
 
-var StoreWriter = (function () {
-    function StoreWriter(cache, reader) {
-        this.cache = cache;
-        this.reader = reader;
-    }
-    StoreWriter.prototype.writeToStore = function (store, _a) {
-        var _this = this;
-        var query = _a.query, result = _a.result, dataId = _a.dataId, variables = _a.variables, overwrite = _a.overwrite;
-        var operationDefinition = getOperationDefinition(query);
-        var merger = makeProcessedFieldsMerger();
-        variables = tslib.__assign(tslib.__assign({}, getDefaultValues(operationDefinition)), variables);
-        var context = {
-            store: store,
-            written: Object.create(null),
-            merge: function (existing, incoming) {
-                return merger.merge(existing, incoming);
-            },
-            variables: variables,
-            varString: canonicalStringify(variables),
-            fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
-            overwrite: !!overwrite,
-            incomingById: new Map,
-            clientOnly: false,
-        };
-        var ref = this.processSelectionSet({
-            result: result || Object.create(null),
-            dataId: dataId,
-            selectionSet: operationDefinition.selectionSet,
-            mergeTree: { map: new Map },
-            context: context,
-        });
-        if (!isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(6);
-        }
-        context.incomingById.forEach(function (_a, dataId) {
-            var fields = _a.fields, mergeTree = _a.mergeTree, selections = _a.selections;
-            var entityRef = makeReference(dataId);
-            if (mergeTree && mergeTree.map.size) {
-                var applied = _this.applyMerges(mergeTree, entityRef, fields, context);
-                if (isReference(applied)) {
-                    return;
-                }
-                fields = applied;
-            }
-            if (__DEV__ && !context.overwrite) {
-                var hasSelectionSet_1 = function (storeFieldName) {
-                    return fieldsWithSelectionSets_1.has(fieldNameFromStoreName(storeFieldName));
-                };
-                var fieldsWithSelectionSets_1 = new Set();
-                selections.forEach(function (selection) {
-                    if (isField(selection) && selection.selectionSet) {
-                        fieldsWithSelectionSets_1.add(selection.name.value);
-                    }
-                });
-                var hasMergeFunction_1 = function (storeFieldName) {
-                    var childTree = mergeTree && mergeTree.map.get(storeFieldName);
-                    return Boolean(childTree && childTree.info && childTree.info.merge);
-                };
-                Object.keys(fields).forEach(function (storeFieldName) {
-                    if (hasSelectionSet_1(storeFieldName) &&
-                        !hasMergeFunction_1(storeFieldName)) {
-                        warnAboutDataLoss(entityRef, fields, storeFieldName, context.store);
-                    }
-                });
-            }
-            store.merge(dataId, fields);
-        });
-        store.retain(ref.__ref);
-        return ref;
-    };
-    StoreWriter.prototype.processSelectionSet = function (_a) {
-        var _this = this;
-        var dataId = _a.dataId, result = _a.result, selectionSet = _a.selectionSet, context = _a.context, mergeTree = _a.mergeTree;
-        var policies = this.cache.policies;
-        var _b = policies.identify(result, selectionSet, context.fragmentMap), id = _b[0], keyObject = _b[1];
-        dataId = dataId || id;
-        if ("string" === typeof dataId) {
-            var sets = context.written[dataId] || (context.written[dataId] = []);
-            var ref = makeReference(dataId);
-            if (sets.indexOf(selectionSet) >= 0)
-                return ref;
-            sets.push(selectionSet);
-            if (this.reader && this.reader.isFresh(result, ref, selectionSet, context)) {
-                return ref;
-            }
-        }
-        var incomingFields = Object.create(null);
-        if (keyObject) {
-            incomingFields = context.merge(incomingFields, keyObject);
-        }
-        var typename = (dataId && policies.rootTypenamesById[dataId]) ||
-            getTypenameFromResult(result, selectionSet, context.fragmentMap) ||
-            (dataId && context.store.get(dataId, "__typename"));
-        if ("string" === typeof typename) {
-            incomingFields.__typename = typename;
-        }
-        var selections = new Set(selectionSet.selections);
-        selections.forEach(function (selection) {
-            var _a;
-            if (!shouldInclude(selection, context.variables))
-                return;
-            if (isField(selection)) {
-                var resultFieldKey = resultKeyNameFromField(selection);
-                var value = result[resultFieldKey];
-                var wasClientOnly = context.clientOnly;
-                context.clientOnly = wasClientOnly || !!(selection.directives &&
-                    selection.directives.some(function (d) { return d.name.value === "client"; }));
-                if (value !== void 0) {
-                    var storeFieldName = policies.getStoreFieldName({
-                        typename: typename,
-                        fieldName: selection.name.value,
-                        field: selection,
-                        variables: context.variables,
-                    });
-                    var childTree = getChildMergeTree(mergeTree, storeFieldName);
-                    var incomingValue = _this.processFieldValue(value, selection, context, childTree);
-                    var childTypename = void 0;
-                    if (selection.selectionSet) {
-                        childTypename = context.store.getFieldValue(incomingValue, "__typename");
-                        if (!childTypename && isReference(incomingValue)) {
-                            var info = context.incomingById.get(incomingValue.__ref);
-                            childTypename = info && info.fields.__typename;
-                        }
-                    }
-                    var merge = policies.getMergeFunction(typename, selection.name.value, childTypename);
-                    if (merge) {
-                        childTree.info = {
-                            field: selection,
-                            typename: typename,
-                            merge: merge,
-                        };
-                    }
-                    else {
-                        maybeRecycleChildMergeTree(mergeTree, storeFieldName);
-                    }
-                    incomingFields = context.merge(incomingFields, (_a = {},
-                        _a[storeFieldName] = incomingValue,
-                        _a));
-                }
-                else if (__DEV__ &&
-                    !context.clientOnly &&
-                    !addTypenameToDocument.added(selection) &&
-                    !policies.getReadFunction(typename, selection.name.value)) {
-                    __DEV__ && tsInvariant.invariant.error(("Missing field '" + resultKeyNameFromField(selection) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
-                }
-                context.clientOnly = wasClientOnly;
-            }
-            else {
-                var fragment = getFragmentFromSelection(selection, context.fragmentMap);
-                if (fragment &&
-                    policies.fragmentMatches(fragment, typename, result, context.variables)) {
-                    fragment.selectionSet.selections.forEach(selections.add, selections);
-                }
-            }
-        });
-        if ("string" === typeof dataId) {
-            var previous = context.incomingById.get(dataId);
-            if (previous) {
-                previous.fields = context.merge(previous.fields, incomingFields);
-                previous.mergeTree = mergeMergeTrees(previous.mergeTree, mergeTree);
-                previous.selections.forEach(selections.add, selections);
-                previous.selections = selections;
-            }
-            else {
-                context.incomingById.set(dataId, {
-                    fields: incomingFields,
-                    mergeTree: mergeTreeIsEmpty(mergeTree) ? void 0 : mergeTree,
-                    selections: selections,
-                });
-            }
-            return makeReference(dataId);
-        }
-        return incomingFields;
-    };
-    StoreWriter.prototype.processFieldValue = function (value, field, context, mergeTree) {
-        var _this = this;
-        if (!field.selectionSet || value === null) {
-            return __DEV__ ? cloneDeep(value) : value;
-        }
-        if (Array.isArray(value)) {
-            return value.map(function (item, i) {
-                var value = _this.processFieldValue(item, field, context, getChildMergeTree(mergeTree, i));
-                maybeRecycleChildMergeTree(mergeTree, i);
-                return value;
-            });
-        }
-        return this.processSelectionSet({
-            result: value,
-            selectionSet: field.selectionSet,
-            context: context,
-            mergeTree: mergeTree,
-        });
-    };
-    StoreWriter.prototype.applyMerges = function (mergeTree, existing, incoming, context, getStorageArgs) {
-        var _a;
-        var _this = this;
-        if (mergeTree.map.size && !isReference(incoming)) {
-            var e_1 = (!Array.isArray(incoming) &&
-                (isReference(existing) || storeValueIsStoreObject(existing))) ? existing : void 0;
-            var i_1 = incoming;
-            if (e_1 && !getStorageArgs) {
-                getStorageArgs = [isReference(e_1) ? e_1.__ref : e_1];
-            }
-            var changedFields_1;
-            var getValue_1 = function (from, name) {
-                return Array.isArray(from)
-                    ? (typeof name === "number" ? from[name] : void 0)
-                    : context.store.getFieldValue(from, String(name));
-            };
-            mergeTree.map.forEach(function (childTree, storeFieldName) {
-                var eVal = getValue_1(e_1, storeFieldName);
-                var iVal = getValue_1(i_1, storeFieldName);
-                if (void 0 === iVal)
-                    return;
-                if (getStorageArgs) {
-                    getStorageArgs.push(storeFieldName);
-                }
-                var aVal = _this.applyMerges(childTree, eVal, iVal, context, getStorageArgs);
-                if (aVal !== iVal) {
-                    changedFields_1 = changedFields_1 || new Map;
-                    changedFields_1.set(storeFieldName, aVal);
-                }
-                if (getStorageArgs) {
-                    tsInvariant.invariant(getStorageArgs.pop() === storeFieldName);
-                }
-            });
-            if (changedFields_1) {
-                incoming = (Array.isArray(i_1) ? i_1.slice(0) : tslib.__assign({}, i_1));
-                changedFields_1.forEach(function (value, name) {
-                    incoming[name] = value;
-                });
-            }
-        }
-        if (mergeTree.info) {
-            return this.cache.policies.runMergeFunction(existing, incoming, mergeTree.info, context, getStorageArgs && (_a = context.store).getStorage.apply(_a, getStorageArgs));
-        }
-        return incoming;
-    };
-    return StoreWriter;
-}());
-var emptyMergeTreePool = [];
-function getChildMergeTree(_a, name) {
-    var map = _a.map;
-    if (!map.has(name)) {
-        map.set(name, emptyMergeTreePool.pop() || { map: new Map });
-    }
-    return map.get(name);
-}
-function mergeMergeTrees(left, right) {
-    if (left === right || !right || mergeTreeIsEmpty(right))
-        return left;
-    if (!left || mergeTreeIsEmpty(left))
-        return right;
-    var info = left.info && right.info ? tslib.__assign(tslib.__assign({}, left.info), right.info) : left.info || right.info;
-    var needToMergeMaps = left.map.size && right.map.size;
-    var map = needToMergeMaps ? new Map :
-        left.map.size ? left.map : right.map;
-    var merged = { info: info, map: map };
-    if (needToMergeMaps) {
-        var remainingRightKeys_1 = new Set(right.map.keys());
-        left.map.forEach(function (leftTree, key) {
-            merged.map.set(key, mergeMergeTrees(leftTree, right.map.get(key)));
-            remainingRightKeys_1.delete(key);
-        });
-        remainingRightKeys_1.forEach(function (key) {
-            merged.map.set(key, mergeMergeTrees(right.map.get(key), left.map.get(key)));
-        });
-    }
-    return merged;
-}
-function mergeTreeIsEmpty(tree) {
-    return !tree || !(tree.info || tree.map.size);
-}
-function maybeRecycleChildMergeTree(_a, name) {
-    var map = _a.map;
-    var childTree = map.get(name);
-    if (childTree && mergeTreeIsEmpty(childTree)) {
-        emptyMergeTreePool.push(childTree);
-        map.delete(name);
-    }
-}
-var warnings = new Set();
-function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
-    var getChild = function (objOrRef) {
-        var child = store.getFieldValue(objOrRef, storeFieldName);
-        return typeof child === "object" && child;
-    };
-    var existing = getChild(existingRef);
-    if (!existing)
-        return;
-    var incoming = getChild(incomingObj);
-    if (!incoming)
-        return;
-    if (isReference(existing))
-        return;
-    if (equality.equal(existing, incoming))
-        return;
-    if (Object.keys(existing).every(function (key) { return store.getFieldValue(incoming, key) !== void 0; })) {
-        return;
-    }
-    var parentType = store.getFieldValue(existingRef, "__typename") ||
-        store.getFieldValue(incomingObj, "__typename");
-    var fieldName = fieldNameFromStoreName(storeFieldName);
-    var typeDotName = parentType + "." + fieldName;
-    if (warnings.has(typeDotName))
-        return;
-    warnings.add(typeDotName);
-    var childTypenames = [];
-    if (!Array.isArray(existing) &&
-        !Array.isArray(incoming)) {
-        [existing, incoming].forEach(function (child) {
-            var typename = store.getFieldValue(child, "__typename");
-            if (typeof typename === "string" &&
-                !childTypenames.includes(typename)) {
-                childTypenames.push(typename);
-            }
-        });
-    }
-    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
-        ? "either ensure all objects of type " +
-            childTypenames.join(" and ") + " have an ID or a custom merge function, or "
-        : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
-}
-
 var cacheSlot = new context.Slot();
 var cacheInfoMap = new WeakMap();
 function getCacheInfo(cache) {
@@ -2961,6 +2637,121 @@ function broadcast(cache) {
     }
 }
 
+var specifierInfoCache = Object.create(null);
+function lookupSpecifierInfo(spec) {
+    var cacheKey = JSON.stringify(spec);
+    return specifierInfoCache[cacheKey] ||
+        (specifierInfoCache[cacheKey] = Object.create(null));
+}
+function keyFieldsFnFromSpecifier(specifier) {
+    var info = lookupSpecifierInfo(specifier);
+    return info.keyFieldsFn || (info.keyFieldsFn = function (object, context) {
+        var extract = function (from, key) { return context.readField(key, from); };
+        var keyObject = context.keyObject = collectSpecifierPaths(specifier, function (schemaKeyPath) {
+            var extracted = extractKeyPath(context.storeObject, schemaKeyPath, extract);
+            if (extracted === void 0 &&
+                object !== context.storeObject &&
+                hasOwn.call(object, schemaKeyPath[0])) {
+                extracted = extractKeyPath(object, schemaKeyPath, extractKey);
+            }
+            __DEV__ ? tsInvariant.invariant(extracted !== void 0, "Missing field '" + schemaKeyPath.join('.') + "' while extracting keyFields from " + JSON.stringify(object)) : tsInvariant.invariant(extracted !== void 0, 2);
+            return extracted;
+        });
+        return context.typename + ":" + JSON.stringify(keyObject);
+    });
+}
+function keyArgsFnFromSpecifier(specifier) {
+    var info = lookupSpecifierInfo(specifier);
+    return info.keyArgsFn || (info.keyArgsFn = function (args, _a) {
+        var field = _a.field, variables = _a.variables, fieldName = _a.fieldName;
+        var collected = collectSpecifierPaths(specifier, function (keyPath) {
+            var firstKey = keyPath[0];
+            var firstChar = firstKey.charAt(0);
+            if (firstChar === "@") {
+                if (field && isNonEmptyArray(field.directives)) {
+                    var directiveName_1 = firstKey.slice(1);
+                    var d = field.directives.find(function (d) { return d.name.value === directiveName_1; });
+                    var directiveArgs = d && argumentsObjectFromField(d, variables);
+                    return directiveArgs && extractKeyPath(directiveArgs, keyPath.slice(1));
+                }
+                return;
+            }
+            if (firstChar === "$") {
+                var variableName = firstKey.slice(1);
+                if (variables && hasOwn.call(variables, variableName)) {
+                    var varKeyPath = keyPath.slice(0);
+                    varKeyPath[0] = variableName;
+                    return extractKeyPath(variables, varKeyPath);
+                }
+                return;
+            }
+            if (args) {
+                return extractKeyPath(args, keyPath);
+            }
+        });
+        var suffix = JSON.stringify(collected);
+        if (args || suffix !== "{}") {
+            fieldName += ":" + suffix;
+        }
+        return fieldName;
+    });
+}
+function collectSpecifierPaths(specifier, extractor) {
+    var merger = new DeepMerger;
+    return getSpecifierPaths(specifier).reduce(function (collected, path) {
+        var _a;
+        var toMerge = extractor(path);
+        if (toMerge !== void 0) {
+            for (var i = path.length - 1; i >= 0; --i) {
+                toMerge = (_a = {}, _a[path[i]] = toMerge, _a);
+            }
+            collected = merger.merge(collected, toMerge);
+        }
+        return collected;
+    }, Object.create(null));
+}
+function getSpecifierPaths(spec) {
+    var info = lookupSpecifierInfo(spec);
+    if (!info.paths) {
+        var paths_1 = info.paths = [];
+        var currentPath_1 = [];
+        spec.forEach(function (s, i) {
+            if (Array.isArray(s)) {
+                getSpecifierPaths(s).forEach(function (p) { return paths_1.push(currentPath_1.concat(p)); });
+                currentPath_1.length = 0;
+            }
+            else {
+                currentPath_1.push(s);
+                if (!Array.isArray(spec[i + 1])) {
+                    paths_1.push(currentPath_1.slice(0));
+                    currentPath_1.length = 0;
+                }
+            }
+        });
+    }
+    return info.paths;
+}
+function extractKey(object, key) {
+    return object[key];
+}
+function extractKeyPath(object, path, extract) {
+    extract = extract || extractKey;
+    return normalize(path.reduce(function reducer(obj, key) {
+        return Array.isArray(obj)
+            ? obj.map(function (child) { return reducer(child, key); })
+            : obj && extract(obj, key);
+    }, object));
+}
+function normalize(value) {
+    if (isNonNullObject(value)) {
+        if (Array.isArray(value)) {
+            return value.map(normalize);
+        }
+        return collectSpecifierPaths(Object.keys(value).sort(), function (path) { return extractKeyPath(value, path); });
+    }
+    return value;
+}
+
 getStoreKeyName.setStringify(canonicalStringify);
 function argsFromFieldSpecifier(spec) {
     return spec.args !== void 0 ? spec.args :
@@ -2995,18 +2786,22 @@ var Policies = (function () {
             this.addTypePolicies(config.typePolicies);
         }
     }
-    Policies.prototype.identify = function (object, selectionSet, fragmentMap) {
-        var typename = selectionSet && fragmentMap
-            ? getTypenameFromResult(object, selectionSet, fragmentMap)
-            : object.__typename;
+    Policies.prototype.identify = function (object, partialContext) {
+        var _a;
+        var policies = this;
+        var typename = partialContext && (partialContext.typename ||
+            ((_a = partialContext.storeObject) === null || _a === void 0 ? void 0 : _a.__typename)) || object.__typename;
         if (typename === this.rootTypenamesById.ROOT_QUERY) {
             return ["ROOT_QUERY"];
         }
-        var context = {
-            typename: typename,
-            selectionSet: selectionSet,
-            fragmentMap: fragmentMap,
-        };
+        var storeObject = partialContext && partialContext.storeObject || object;
+        var context = tslib.__assign(tslib.__assign({}, partialContext), { typename: typename, storeObject: storeObject, readField: partialContext && partialContext.readField || function () {
+                var options = normalizeReadFieldOptions(arguments, storeObject);
+                return policies.readField(options, {
+                    store: policies.cache["data"],
+                    variables: options.variables,
+                });
+            } });
         var id;
         var policy = typename && this.getTypePolicy(typename);
         var keyFn = policy && policy.keyFn || this.config.dataIdFromObject;
@@ -3088,7 +2883,7 @@ var Policies = (function () {
         var rootId = "ROOT_" + which.toUpperCase();
         var old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : tsInvariant.invariant(!old || old === which, 2);
+            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : tsInvariant.invariant(!old || old === which, 3);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -3304,183 +3099,456 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
         storage: storage,
         cache: policies.cache,
         canRead: canRead,
-        readField: function (fieldNameOrOptions, from) {
-            var options;
-            if (typeof fieldNameOrOptions === "string") {
-                options = {
-                    fieldName: fieldNameOrOptions,
-                    from: arguments.length > 1 ? from : objectOrReference,
+        readField: function () {
+            return policies.readField(normalizeReadFieldOptions(arguments, objectOrReference, context), context);
+        },
+        mergeObjects: makeMergeObjectsFunction(context.store),
+    };
+}
+function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables) {
+    var fieldNameOrOptions = readFieldArgs[0], from = readFieldArgs[1], argc = readFieldArgs.length;
+    var options;
+    if (typeof fieldNameOrOptions === "string") {
+        options = {
+            fieldName: fieldNameOrOptions,
+            from: argc > 1 ? from : objectOrReference,
+        };
+    }
+    else {
+        options = tslib.__assign({}, fieldNameOrOptions);
+        if (!hasOwn.call(options, "from")) {
+            options.from = objectOrReference;
+        }
+    }
+    if (__DEV__ && options.from === void 0) {
+        __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + stringifyForDisplay(Array.from(readFieldArgs)));
+    }
+    if (void 0 === options.variables) {
+        options.variables = variables;
+    }
+    return options;
+}
+function makeMergeObjectsFunction(store) {
+    return function mergeObjects(existing, incoming) {
+        if (Array.isArray(existing) || Array.isArray(incoming)) {
+            throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(4);
+        }
+        if (isNonNullObject(existing) &&
+            isNonNullObject(incoming)) {
+            var eType = store.getFieldValue(existing, "__typename");
+            var iType = store.getFieldValue(incoming, "__typename");
+            var typesDiffer = eType && iType && eType !== iType;
+            if (typesDiffer) {
+                return incoming;
+            }
+            if (isReference(existing) &&
+                storeValueIsStoreObject(incoming)) {
+                store.merge(existing.__ref, incoming);
+                return existing;
+            }
+            if (storeValueIsStoreObject(existing) &&
+                isReference(incoming)) {
+                store.merge(existing, incoming.__ref);
+                return incoming;
+            }
+            if (storeValueIsStoreObject(existing) &&
+                storeValueIsStoreObject(incoming)) {
+                return tslib.__assign(tslib.__assign({}, existing), incoming);
+            }
+        }
+        return incoming;
+    };
+}
+
+function getContextFlavor(context, clientOnly, deferred) {
+    var key = "" + clientOnly + deferred;
+    var flavored = context.flavors.get(key);
+    if (!flavored) {
+        context.flavors.set(key, flavored = (context.clientOnly === clientOnly &&
+            context.deferred === deferred) ? context : tslib.__assign(tslib.__assign({}, context), { clientOnly: clientOnly, deferred: deferred }));
+    }
+    return flavored;
+}
+var StoreWriter = (function () {
+    function StoreWriter(cache, reader) {
+        this.cache = cache;
+        this.reader = reader;
+    }
+    StoreWriter.prototype.writeToStore = function (store, _a) {
+        var _this = this;
+        var query = _a.query, result = _a.result, dataId = _a.dataId, variables = _a.variables, overwrite = _a.overwrite;
+        var operationDefinition = getOperationDefinition(query);
+        var merger = makeProcessedFieldsMerger();
+        variables = tslib.__assign(tslib.__assign({}, getDefaultValues(operationDefinition)), variables);
+        var context = {
+            store: store,
+            written: Object.create(null),
+            merge: function (existing, incoming) {
+                return merger.merge(existing, incoming);
+            },
+            variables: variables,
+            varString: canonicalStringify(variables),
+            fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
+            overwrite: !!overwrite,
+            incomingById: new Map,
+            clientOnly: false,
+            deferred: false,
+            flavors: new Map,
+        };
+        var ref = this.processSelectionSet({
+            result: result || Object.create(null),
+            dataId: dataId,
+            selectionSet: operationDefinition.selectionSet,
+            mergeTree: { map: new Map },
+            context: context,
+        });
+        if (!isReference(ref)) {
+            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(6);
+        }
+        context.incomingById.forEach(function (_a, dataId) {
+            var storeObject = _a.storeObject, mergeTree = _a.mergeTree, fieldNodeSet = _a.fieldNodeSet;
+            var entityRef = makeReference(dataId);
+            if (mergeTree && mergeTree.map.size) {
+                var applied = _this.applyMerges(mergeTree, entityRef, storeObject, context);
+                if (isReference(applied)) {
+                    return;
+                }
+                storeObject = applied;
+            }
+            if (__DEV__ && !context.overwrite) {
+                var fieldsWithSelectionSets_1 = Object.create(null);
+                fieldNodeSet.forEach(function (field) {
+                    if (field.selectionSet) {
+                        fieldsWithSelectionSets_1[field.name.value] = true;
+                    }
+                });
+                var hasSelectionSet_1 = function (storeFieldName) {
+                    return fieldsWithSelectionSets_1[fieldNameFromStoreName(storeFieldName)] === true;
+                };
+                var hasMergeFunction_1 = function (storeFieldName) {
+                    var childTree = mergeTree && mergeTree.map.get(storeFieldName);
+                    return Boolean(childTree && childTree.info && childTree.info.merge);
                 };
+                Object.keys(storeObject).forEach(function (storeFieldName) {
+                    if (hasSelectionSet_1(storeFieldName) &&
+                        !hasMergeFunction_1(storeFieldName)) {
+                        warnAboutDataLoss(entityRef, storeObject, storeFieldName, context.store);
+                    }
+                });
             }
-            else if (isNonNullObject(fieldNameOrOptions)) {
-                options = tslib.__assign({}, fieldNameOrOptions);
-                if (!hasOwn.call(fieldNameOrOptions, "from")) {
-                    options.from = objectOrReference;
+            store.merge(dataId, storeObject);
+        });
+        store.retain(ref.__ref);
+        return ref;
+    };
+    StoreWriter.prototype.processSelectionSet = function (_a) {
+        var _this = this;
+        var dataId = _a.dataId, result = _a.result, selectionSet = _a.selectionSet, context = _a.context, mergeTree = _a.mergeTree;
+        var policies = this.cache.policies;
+        var incoming = Object.create(null);
+        var typename = (dataId && policies.rootTypenamesById[dataId]) ||
+            getTypenameFromResult(result, selectionSet, context.fragmentMap) ||
+            (dataId && context.store.get(dataId, "__typename"));
+        if ("string" === typeof typename) {
+            incoming.__typename = typename;
+        }
+        var readField = function () {
+            var options = normalizeReadFieldOptions(arguments, incoming, context.variables);
+            if (isReference(options.from)) {
+                var info = context.incomingById.get(options.from.__ref);
+                if (info) {
+                    var result_1 = policies.readField(tslib.__assign(tslib.__assign({}, options), { from: info.storeObject }), context);
+                    if (result_1 !== void 0) {
+                        return result_1;
+                    }
                 }
             }
-            else {
-                __DEV__ && tsInvariant.invariant.warn("Unexpected readField arguments: " + stringifyForDisplay(Array.from(arguments)));
-                return;
+            return policies.readField(options, context);
+        };
+        var fieldNodeSet = new Set();
+        this.flattenFields(selectionSet, result, context, typename).forEach(function (context, field) {
+            var _a;
+            var resultFieldKey = resultKeyNameFromField(field);
+            var value = result[resultFieldKey];
+            fieldNodeSet.add(field);
+            if (value !== void 0) {
+                var storeFieldName = policies.getStoreFieldName({
+                    typename: typename,
+                    fieldName: field.name.value,
+                    field: field,
+                    variables: context.variables,
+                });
+                var childTree = getChildMergeTree(mergeTree, storeFieldName);
+                var incomingValue = _this.processFieldValue(value, field, field.selectionSet
+                    ? getContextFlavor(context, false, false)
+                    : context, childTree);
+                var childTypename = void 0;
+                if (field.selectionSet &&
+                    (isReference(incomingValue) ||
+                        storeValueIsStoreObject(incomingValue))) {
+                    childTypename = readField("__typename", incomingValue);
+                }
+                var merge = policies.getMergeFunction(typename, field.name.value, childTypename);
+                if (merge) {
+                    childTree.info = {
+                        field: field,
+                        typename: typename,
+                        merge: merge,
+                    };
+                }
+                else {
+                    maybeRecycleChildMergeTree(mergeTree, storeFieldName);
+                }
+                incoming = context.merge(incoming, (_a = {},
+                    _a[storeFieldName] = incomingValue,
+                    _a));
             }
-            if (__DEV__ && options.from === void 0) {
-                __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + stringifyForDisplay(Array.from(arguments)));
+            else if (__DEV__ &&
+                !context.clientOnly &&
+                !context.deferred &&
+                !addTypenameToDocument.added(field) &&
+                !policies.getReadFunction(typename, field.name.value)) {
+                __DEV__ && tsInvariant.invariant.error(("Missing field '" + resultKeyNameFromField(field) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
             }
-            if (void 0 === options.variables) {
-                options.variables = variables;
+        });
+        try {
+            var _b = policies.identify(result, {
+                typename: typename,
+                selectionSet: selectionSet,
+                fragmentMap: context.fragmentMap,
+                storeObject: incoming,
+                readField: readField,
+            }), id = _b[0], keyObject = _b[1];
+            dataId = dataId || id;
+            if (keyObject) {
+                incoming = context.merge(incoming, keyObject);
             }
-            return policies.readField(options, context);
-        },
-        mergeObjects: makeMergeObjectsFunction(context.store),
-    };
-}
-function makeMergeObjectsFunction(store) {
-    return function mergeObjects(existing, incoming) {
-        if (Array.isArray(existing) || Array.isArray(incoming)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(3);
         }
-        if (isNonNullObject(existing) &&
-            isNonNullObject(incoming)) {
-            var eType = store.getFieldValue(existing, "__typename");
-            var iType = store.getFieldValue(incoming, "__typename");
-            var typesDiffer = eType && iType && eType !== iType;
-            if (typesDiffer) {
-                return incoming;
-            }
-            if (isReference(existing) &&
-                storeValueIsStoreObject(incoming)) {
-                store.merge(existing.__ref, incoming);
-                return existing;
+        catch (e) {
+            if (!dataId)
+                throw e;
+        }
+        if ("string" === typeof dataId) {
+            var dataRef = makeReference(dataId);
+            var sets = context.written[dataId] || (context.written[dataId] = []);
+            if (sets.indexOf(selectionSet) >= 0)
+                return dataRef;
+            sets.push(selectionSet);
+            if (this.reader && this.reader.isFresh(result, dataRef, selectionSet, context)) {
+                return dataRef;
             }
-            if (storeValueIsStoreObject(existing) &&
-                isReference(incoming)) {
-                store.merge(existing, incoming.__ref);
-                return incoming;
+            var previous_1 = context.incomingById.get(dataId);
+            if (previous_1) {
+                previous_1.storeObject = context.merge(previous_1.storeObject, incoming);
+                previous_1.mergeTree = mergeMergeTrees(previous_1.mergeTree, mergeTree);
+                fieldNodeSet.forEach(function (field) { return previous_1.fieldNodeSet.add(field); });
             }
-            if (storeValueIsStoreObject(existing) &&
-                storeValueIsStoreObject(incoming)) {
-                return tslib.__assign(tslib.__assign({}, existing), incoming);
+            else {
+                context.incomingById.set(dataId, {
+                    storeObject: incoming,
+                    mergeTree: mergeTreeIsEmpty(mergeTree) ? void 0 : mergeTree,
+                    fieldNodeSet: fieldNodeSet,
+                });
             }
+            return dataRef;
         }
         return incoming;
     };
-}
-function keyArgsFnFromSpecifier(specifier) {
-    return function (args, context) {
-        var key = context.fieldName;
-        var suffix = JSON.stringify(computeKeyArgsObject(specifier, context.field, args, context.variables));
-        if (args || suffix !== "{}") {
-            key += ":" + suffix;
+    StoreWriter.prototype.processFieldValue = function (value, field, context, mergeTree) {
+        var _this = this;
+        if (!field.selectionSet || value === null) {
+            return __DEV__ ? cloneDeep(value) : value;
         }
-        return key;
-    };
-}
-function keyFieldsFnFromSpecifier(specifier) {
-    var trie$1 = new trie.Trie(canUseWeakMap);
-    return function (object, context) {
-        var aliasMap;
-        if (context.selectionSet && context.fragmentMap) {
-            var info = trie$1.lookupArray([
-                context.selectionSet,
-                context.fragmentMap,
-            ]);
-            aliasMap = info.aliasMap || (info.aliasMap = makeAliasMap(context.selectionSet, context.fragmentMap));
+        if (Array.isArray(value)) {
+            return value.map(function (item, i) {
+                var value = _this.processFieldValue(item, field, context, getChildMergeTree(mergeTree, i));
+                maybeRecycleChildMergeTree(mergeTree, i);
+                return value;
+            });
         }
-        var keyObject = context.keyObject =
-            computeKeyFieldsObject(specifier, object, aliasMap);
-        return context.typename + ":" + JSON.stringify(keyObject);
+        return this.processSelectionSet({
+            result: value,
+            selectionSet: field.selectionSet,
+            context: context,
+            mergeTree: mergeTree,
+        });
     };
-}
-function makeAliasMap(selectionSet, fragmentMap) {
-    var map = Object.create(null);
-    var workQueue = new Set([selectionSet]);
-    workQueue.forEach(function (selectionSet) {
-        selectionSet.selections.forEach(function (selection) {
-            if (isField(selection)) {
-                if (selection.alias) {
-                    var responseKey = selection.alias.value;
-                    var storeKey = selection.name.value;
-                    if (storeKey !== responseKey) {
-                        var aliases = map.aliases || (map.aliases = Object.create(null));
-                        aliases[storeKey] = responseKey;
+    StoreWriter.prototype.flattenFields = function (selectionSet, result, context, typename) {
+        if (typename === void 0) { typename = getTypenameFromResult(result, selectionSet, context.fragmentMap); }
+        var fieldMap = new Map();
+        var policies = this.cache.policies;
+        var limitingTrie = new trie.Trie(false);
+        (function flatten(selectionSet, inheritedContext) {
+            var visitedNode = limitingTrie.lookup(selectionSet, inheritedContext.clientOnly, inheritedContext.deferred);
+            if (visitedNode.visited)
+                return;
+            visitedNode.visited = true;
+            selectionSet.selections.forEach(function (selection) {
+                if (!shouldInclude(selection, context.variables))
+                    return;
+                var clientOnly = inheritedContext.clientOnly, deferred = inheritedContext.deferred;
+                if (!(clientOnly && deferred) &&
+                    isNonEmptyArray(selection.directives)) {
+                    selection.directives.forEach(function (dir) {
+                        var name = dir.name.value;
+                        if (name === "client")
+                            clientOnly = true;
+                        if (name === "defer") {
+                            var args = argumentsObjectFromField(dir, context.variables);
+                            if (!args || args.if !== false) {
+                                deferred = true;
+                            }
+                        }
+                    });
+                }
+                if (isField(selection)) {
+                    var existing = fieldMap.get(selection);
+                    if (existing) {
+                        clientOnly = clientOnly && existing.clientOnly;
+                        deferred = deferred && existing.deferred;
                     }
+                    fieldMap.set(selection, getContextFlavor(context, clientOnly, deferred));
                 }
-                if (selection.selectionSet) {
-                    var subsets = map.subsets || (map.subsets = Object.create(null));
-                    subsets[selection.name.value] =
-                        makeAliasMap(selection.selectionSet, fragmentMap);
+                else {
+                    var fragment = getFragmentFromSelection(selection, context.fragmentMap);
+                    if (fragment &&
+                        policies.fragmentMatches(fragment, typename, result, context.variables)) {
+                        flatten(fragment.selectionSet, getContextFlavor(context, clientOnly, deferred));
+                    }
                 }
+            });
+        })(selectionSet, context);
+        return fieldMap;
+    };
+    StoreWriter.prototype.applyMerges = function (mergeTree, existing, incoming, context, getStorageArgs) {
+        var _a;
+        var _this = this;
+        if (mergeTree.map.size && !isReference(incoming)) {
+            var e_1 = (!Array.isArray(incoming) &&
+                (isReference(existing) || storeValueIsStoreObject(existing))) ? existing : void 0;
+            var i_1 = incoming;
+            if (e_1 && !getStorageArgs) {
+                getStorageArgs = [isReference(e_1) ? e_1.__ref : e_1];
             }
-            else {
-                var fragment = getFragmentFromSelection(selection, fragmentMap);
-                if (fragment) {
-                    workQueue.add(fragment.selectionSet);
+            var changedFields_1;
+            var getValue_1 = function (from, name) {
+                return Array.isArray(from)
+                    ? (typeof name === "number" ? from[name] : void 0)
+                    : context.store.getFieldValue(from, String(name));
+            };
+            mergeTree.map.forEach(function (childTree, storeFieldName) {
+                var eVal = getValue_1(e_1, storeFieldName);
+                var iVal = getValue_1(i_1, storeFieldName);
+                if (void 0 === iVal)
+                    return;
+                if (getStorageArgs) {
+                    getStorageArgs.push(storeFieldName);
                 }
-            }
-        });
-    });
-    return map;
-}
-function computeKeyFieldsObject(specifier, response, aliasMap) {
-    var keyObj = Object.create(null);
-    var lastResponseKey;
-    var lastActualKey;
-    var aliases = aliasMap && aliasMap.aliases;
-    var subsets = aliasMap && aliasMap.subsets;
-    specifier.forEach(function (s) {
-        if (Array.isArray(s)) {
-            if (typeof lastActualKey === "string" &&
-                typeof lastResponseKey === "string") {
-                keyObj[lastActualKey] = computeKeyFieldsObject(s, response[lastResponseKey], subsets && subsets[lastActualKey]);
+                var aVal = _this.applyMerges(childTree, eVal, iVal, context, getStorageArgs);
+                if (aVal !== iVal) {
+                    changedFields_1 = changedFields_1 || new Map;
+                    changedFields_1.set(storeFieldName, aVal);
+                }
+                if (getStorageArgs) {
+                    tsInvariant.invariant(getStorageArgs.pop() === storeFieldName);
+                }
+            });
+            if (changedFields_1) {
+                incoming = (Array.isArray(i_1) ? i_1.slice(0) : tslib.__assign({}, i_1));
+                changedFields_1.forEach(function (value, name) {
+                    incoming[name] = value;
+                });
             }
         }
-        else {
-            var responseKey = aliases && aliases[s] || s;
-            __DEV__ ? tsInvariant.invariant(hasOwn.call(response, responseKey), "Missing field '" + responseKey + "' while extracting keyFields from " + JSON.stringify(response)) : tsInvariant.invariant(hasOwn.call(response, responseKey), 4);
-            keyObj[lastActualKey = s] = response[lastResponseKey = responseKey];
+        if (mergeTree.info) {
+            return this.cache.policies.runMergeFunction(existing, incoming, mergeTree.info, context, getStorageArgs && (_a = context.store).getStorage.apply(_a, getStorageArgs));
         }
-    });
-    return keyObj;
+        return incoming;
+    };
+    return StoreWriter;
+}());
+var emptyMergeTreePool = [];
+function getChildMergeTree(_a, name) {
+    var map = _a.map;
+    if (!map.has(name)) {
+        map.set(name, emptyMergeTreePool.pop() || { map: new Map });
+    }
+    return map.get(name);
 }
-function computeKeyArgsObject(specifier, field, source, variables) {
-    var keyObj = Object.create(null);
-    var last;
-    specifier.forEach(function (key) {
-        if (Array.isArray(key)) {
-            if (last) {
-                keyObj[last.key] =
-                    computeKeyArgsObject(key, field, last.source, variables);
-            }
-        }
-        else {
-            var firstChar = key.charAt(0);
-            if (firstChar === "@") {
-                if (field && isNonEmptyArray(field.directives)) {
-                    var directiveName_1 = key.slice(1);
-                    var d = field.directives.find(function (d) { return d.name.value === directiveName_1; });
-                    if (d) {
-                        last = {
-                            key: key,
-                            source: keyObj[key] = argumentsObjectFromField(d, variables),
-                        };
-                        return;
-                    }
-                }
-            }
-            else if (firstChar === "$") {
-                var variableName = key.slice(1);
-                if (variables && hasOwn.call(variables, variableName)) {
-                    last = { key: key, source: keyObj[key] = variables[variableName] };
-                    return;
-                }
-            }
-            else if (source && hasOwn.call(source, key)) {
-                last = { key: key, source: keyObj[key] = source[key] };
-                return;
+function mergeMergeTrees(left, right) {
+    if (left === right || !right || mergeTreeIsEmpty(right))
+        return left;
+    if (!left || mergeTreeIsEmpty(left))
+        return right;
+    var info = left.info && right.info ? tslib.__assign(tslib.__assign({}, left.info), right.info) : left.info || right.info;
+    var needToMergeMaps = left.map.size && right.map.size;
+    var map = needToMergeMaps ? new Map :
+        left.map.size ? left.map : right.map;
+    var merged = { info: info, map: map };
+    if (needToMergeMaps) {
+        var remainingRightKeys_1 = new Set(right.map.keys());
+        left.map.forEach(function (leftTree, key) {
+            merged.map.set(key, mergeMergeTrees(leftTree, right.map.get(key)));
+            remainingRightKeys_1.delete(key);
+        });
+        remainingRightKeys_1.forEach(function (key) {
+            merged.map.set(key, mergeMergeTrees(right.map.get(key), left.map.get(key)));
+        });
+    }
+    return merged;
+}
+function mergeTreeIsEmpty(tree) {
+    return !tree || !(tree.info || tree.map.size);
+}
+function maybeRecycleChildMergeTree(_a, name) {
+    var map = _a.map;
+    var childTree = map.get(name);
+    if (childTree && mergeTreeIsEmpty(childTree)) {
+        emptyMergeTreePool.push(childTree);
+        map.delete(name);
+    }
+}
+var warnings = new Set();
+function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
+    var getChild = function (objOrRef) {
+        var child = store.getFieldValue(objOrRef, storeFieldName);
+        return typeof child === "object" && child;
+    };
+    var existing = getChild(existingRef);
+    if (!existing)
+        return;
+    var incoming = getChild(incomingObj);
+    if (!incoming)
+        return;
+    if (isReference(existing))
+        return;
+    if (equality.equal(existing, incoming))
+        return;
+    if (Object.keys(existing).every(function (key) { return store.getFieldValue(incoming, key) !== void 0; })) {
+        return;
+    }
+    var parentType = store.getFieldValue(existingRef, "__typename") ||
+        store.getFieldValue(incomingObj, "__typename");
+    var fieldName = fieldNameFromStoreName(storeFieldName);
+    var typeDotName = parentType + "." + fieldName;
+    if (warnings.has(typeDotName))
+        return;
+    warnings.add(typeDotName);
+    var childTypenames = [];
+    if (!Array.isArray(existing) &&
+        !Array.isArray(incoming)) {
+        [existing, incoming].forEach(function (child) {
+            var typename = store.getFieldValue(child, "__typename");
+            if (typeof typename === "string" &&
+                !childTypenames.includes(typename)) {
+                childTypenames.push(typename);
             }
-            last = void 0;
-        }
-    });
-    return keyObj;
+        });
+    }
+    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
+        ? "either ensure all objects of type " +
+            childTypenames.join(" and ") + " have an ID or a custom merge function, or "
+        : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
 }
 
 var InMemoryCache = (function (_super) {
@@ -5457,7 +5525,7 @@ var QueryManager = (function () {
                             if (result !== false) {
                                 results.set(oq, result);
                             }
-                            return false;
+                            return result;
                         }
                         if (onQueryUpdated !== null) {
                             includedQueriesById.set(oq.queryId, { oq: oq, lastDiff: lastDiff, diff: diff });