@apollo/client 3.5.0-beta.13 → 3.5.0-beta.17

package/apollo-client.cjs

@@ -45,7 +45,7 @@ function shouldInclude(_a, variables) {
         var evaledValue = false;
         if (ifArgument.value.kind === 'Variable') {
             evaledValue = variables && variables[ifArgument.value.name.value];
-            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @" + directive.name.value + " directive.") : tsInvariant.invariant(evaledValue !== void 0, 39);
+            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @" + directive.name.value + " directive.") : tsInvariant.invariant(evaledValue !== void 0, 37);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -82,13 +82,13 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @" + directiveName + " directive.") : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 40);
+            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @" + directiveName + " directive.") : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 38);
             var ifArgument = directiveArguments[0];
-            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @" + directiveName + " directive.") : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 41);
+            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @" + directiveName + " directive.") : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 39);
             var ifValue = ifArgument.value;
             __DEV__ ? tsInvariant.invariant(ifValue &&
                 (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), "Argument for the @" + directiveName + " directive must be a variable or a boolean value.") : tsInvariant.invariant(ifValue &&
-                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 42);
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 40);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -101,14 +101,14 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
             throw __DEV__ ? new tsInvariant.InvariantError("Found a " + definition.operation + " operation" + (definition.name ? " named '" + definition.name.value + "'" : '') + ". " +
-                'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(43);
+                'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(41);
         }
         if (definition.kind === 'FragmentDefinition') {
             fragments.push(definition);
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found " + fragments.length + " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.") : tsInvariant.invariant(fragments.length === 1, 44);
+        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found " + fragments.length + " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.") : tsInvariant.invariant(fragments.length === 1, 42);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -145,7 +145,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
             return selection;
         case 'FragmentSpread': {
             var fragment = fragmentMap && fragmentMap[selection.name.value];
-            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value + ".") : tsInvariant.invariant(fragment, 45);
+            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value + ".") : tsInvariant.invariant(fragment, 43);
             return fragment;
         }
         default:
@@ -229,7 +229,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
     else {
         throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"" + name.value + "\" of kind \"" + value.kind + "\"" +
             'is not supported. Use variables instead of inline arguments to ' +
-            'overcome this limitation.') : new tsInvariant.InvariantError(54);
+            'overcome this limitation.') : new tsInvariant.InvariantError(52);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -363,16 +363,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 46);
+    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 44);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== 'FragmentDefinition'; })
         .map(function (definition) {
         if (definition.kind !== 'OperationDefinition') {
-            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"" + definition.kind + "\"") : new tsInvariant.InvariantError(47);
+            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"" + definition.kind + "\"") : new tsInvariant.InvariantError(45);
         }
         return definition;
     });
-    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 48);
+    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 46);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -391,14 +391,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 49);
+    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 47);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 50);
-    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 51);
+    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 48);
+    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 49);
     var fragmentDef = doc.definitions[0];
-    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 52);
+    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 50);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -421,7 +421,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(53);
+    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(51);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -760,7 +760,12 @@ var DeepMerger = (function () {
         return source;
     };
     DeepMerger.prototype.shallowCopyForMerge = function (value) {
-        if (isNonNullObject(value) && !this.pastCopies.has(value)) {
+        if (isNonNullObject(value)) {
+            if (this.pastCopies.has(value)) {
+                if (!Object.isFrozen(value))
+                    return value;
+                this.pastCopies.delete(value);
+            }
             if (Array.isArray(value)) {
                 value = value.slice(0);
             }
@@ -810,9 +815,7 @@ function cloneDeepHelper(val, seen) {
 function deepFreeze(value) {
     var workSet = new Set([value]);
     workSet.forEach(function (obj) {
-        if (isNonNullObject(obj)) {
-            if (!Object.isFrozen(obj))
-                Object.freeze(obj);
+        if (isNonNullObject(obj) && shallowFreeze(obj) === obj) {
             Object.getOwnPropertyNames(obj).forEach(function (name) {
                 if (isNonNullObject(obj[name]))
                     workSet.add(obj[name]);
@@ -821,6 +824,19 @@ function deepFreeze(value) {
     });
     return value;
 }
+function shallowFreeze(obj) {
+    if (__DEV__ && !Object.isFrozen(obj)) {
+        try {
+            Object.freeze(obj);
+        }
+        catch (e) {
+            if (e instanceof TypeError)
+                return null;
+            throw e;
+        }
+    }
+    return obj;
+}
 function maybeDeepFreeze(obj) {
     if (__DEV__) {
         deepFreeze(obj);
@@ -882,11 +898,17 @@ function asyncMap(observable, mapFn, catchFn) {
     });
 }
 
+var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
+    navigator.product === 'ReactNative');
+var canUseWeakSet = typeof WeakSet === 'function';
+var canUseSymbol = typeof Symbol === 'function' &&
+    typeof Symbol.for === 'function';
+
 function fixObservableSubclass(subclass) {
     function set(key) {
         Object.defineProperty(subclass, key, { value: zenObservableTs.Observable });
     }
-    if (typeof Symbol === "function" && Symbol.species) {
+    if (canUseSymbol && Symbol.species) {
         set(Symbol.species);
     }
     set("@@species");
@@ -1032,10 +1054,6 @@ function graphQLResultHasError(result) {
     return (result.errors && result.errors.length > 0) || false;
 }
 
-var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
-    navigator.product === 'ReactNative');
-var canUseWeakSet = typeof WeakSet === 'function';
-
 function compact() {
     var objects = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -1124,7 +1142,7 @@ function validateOperation(operation) {
     for (var _i = 0, _a = Object.keys(operation); _i < _a.length; _i++) {
         var key = _a[_i];
         if (OPERATION_FIELDS.indexOf(key) < 0) {
-            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(26);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(24);
         }
     }
     return operation;
@@ -1247,7 +1265,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(21);
+        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(19);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1273,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.5.0-beta.13';
+var version = '3.5.0-beta.17';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1313,7 +1331,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(23);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(21);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1374,7 +1392,7 @@ function headersToLowerCase(headers) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(22);
+        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(20);
     }
 };
 
@@ -1566,9 +1584,12 @@ var ApolloCache = (function () {
         this.getFragmentDoc = optimism.wrap(getFragmentQueryDocument);
     }
     ApolloCache.prototype.batch = function (options) {
+        var _this = this;
         var optimisticId = typeof options.optimistic === "string" ? options.optimistic :
             options.optimistic === false ? null : void 0;
-        this.performTransaction(options.update, optimisticId);
+        var updateResult;
+        this.performTransaction(function () { return updateResult = options.update(_this); }, optimisticId);
+        return updateResult;
     };
     ApolloCache.prototype.recordOptimisticTransaction = function (transaction, optimisticId) {
         this.performTransaction(transaction, optimisticId);
@@ -1612,20 +1633,28 @@ var ApolloCache = (function () {
         }));
     };
     ApolloCache.prototype.updateQuery = function (options, update) {
-        var value = this.readQuery(options);
-        var data = update(value);
-        if (data === void 0 || data === null)
-            return value;
-        this.writeQuery(tslib.__assign(tslib.__assign({}, options), { data: data }));
-        return data;
+        return this.batch({
+            update: function (cache) {
+                var value = cache.readQuery(options);
+                var data = update(value);
+                if (data === void 0 || data === null)
+                    return value;
+                cache.writeQuery(tslib.__assign(tslib.__assign({}, options), { data: data }));
+                return data;
+            },
+        });
     };
     ApolloCache.prototype.updateFragment = function (options, update) {
-        var value = this.readFragment(options);
-        var data = update(value);
-        if (data === void 0 || data === null)
-            return value;
-        this.writeFragment(tslib.__assign(tslib.__assign({}, options), { data: data }));
-        return data;
+        return this.batch({
+            update: function (cache) {
+                var value = cache.readFragment(options);
+                var data = update(value);
+                if (data === void 0 || data === null)
+                    return value;
+                cache.writeFragment(tslib.__assign(tslib.__assign({}, options), { data: data }));
+                return data;
+            },
+        });
     };
     return ApolloCache;
 }());
@@ -1634,21 +1663,47 @@ exports.Cache = void 0;
 (function (Cache) {
 })(exports.Cache || (exports.Cache = {}));
 
-var MissingFieldError = (function (_super) {
-    tslib.__extends(MissingFieldError, _super);
+var MissingFieldError = (function () {
     function MissingFieldError(message, path, query, variables) {
-        var _this = _super.call(this, message) || this;
-        _this.message = message;
-        _this.path = path;
-        _this.query = query;
-        _this.variables = variables;
-        _this.__proto__ = MissingFieldError.prototype;
-        return _this;
+        this.message = message;
+        this.path = path;
+        this.query = query;
+        this.variables = variables;
     }
     return MissingFieldError;
-}(Error));
+}());
 
 var hasOwn = Object.prototype.hasOwnProperty;
+function defaultDataIdFromObject(_a, context) {
+    var __typename = _a.__typename, id = _a.id, _id = _a._id;
+    if (typeof __typename === "string") {
+        if (context) {
+            context.keyObject =
+                id !== void 0 ? { id: id } :
+                    _id !== void 0 ? { _id: _id } :
+                        void 0;
+        }
+        if (id === void 0)
+            id = _id;
+        if (id !== void 0) {
+            return __typename + ":" + ((typeof id === "number" ||
+                typeof id === "string") ? id : JSON.stringify(id));
+        }
+    }
+}
+var defaultConfig = {
+    dataIdFromObject: defaultDataIdFromObject,
+    addTypename: true,
+    resultCaching: true,
+    canonizeResults: false,
+};
+function normalizeConfig(config) {
+    return compact(defaultConfig, config);
+}
+function shouldCanonizeResults(config) {
+    var value = config.canonizeResults;
+    return value === void 0 ? defaultConfig.canonizeResults : value;
+}
 function getTypenameFromStoreObject(store, objectOrReference) {
     return isReference(objectOrReference)
         ? store.get(objectOrReference.__ref, "__typename")
@@ -1877,14 +1932,14 @@ var EntityStore = (function () {
         }
         return false;
     };
-    EntityStore.prototype.evict = function (options) {
+    EntityStore.prototype.evict = function (options, limit) {
         var evicted = false;
         if (options.id) {
             if (hasOwn.call(this.data, options.id)) {
                 evicted = this.delete(options.id, options.fieldName, options.args);
             }
-            if (this instanceof Layer) {
-                evicted = this.parent.evict(options) || evicted;
+            if (this instanceof Layer && this !== limit) {
+                evicted = this.parent.evict(options, limit) || evicted;
             }
             if (options.fieldName || evicted) {
                 this.group.dirty(options.id, options.fieldName || "__exists");
@@ -2257,9 +2312,6 @@ function resetCanonicalStringify() {
     stringifyCache = new (canUseWeakMap ? WeakMap : Map)();
 }
 
-function missingFromInvariant(err, context) {
-    return new MissingFieldError(err.message, context.path.slice(), context.query, context.variables);
-}
 function execSelectionSetKeyArgs(options) {
     return [
         options.selectionSet,
@@ -2272,7 +2324,10 @@ var StoreReader = (function () {
     function StoreReader(config) {
         var _this = this;
         this.knownResults = new (canUseWeakMap ? WeakMap : Map)();
-        this.config = tslib.__assign(tslib.__assign({}, config), { addTypename: config.addTypename !== false });
+        this.config = compact(config, {
+            addTypename: config.addTypename !== false,
+            canonizeResults: shouldCanonizeResults(config),
+        });
         this.canon = config.canon || new ObjectCanon;
         this.executeSelectionSet = optimism.wrap(function (options) {
             var _a;
@@ -2314,10 +2369,11 @@ var StoreReader = (function () {
         this.canon = new ObjectCanon;
     };
     StoreReader.prototype.diffQueryAgainstStore = function (_a) {
-        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? true : _d;
+        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? this.config.canonizeResults : _d;
         var policies = this.config.cache.policies;
         variables = tslib.__assign(tslib.__assign({}, getDefaultValues(getQueryDefinition(query))), variables);
         var rootRef = makeReference(rootId);
+        var merger = new DeepMerger;
         var execResult = this.executeSelectionSet({
             selectionSet: getMainDefinition(query).selectionSet,
             objectOrReference: rootRef,
@@ -2330,17 +2386,22 @@ var StoreReader = (function () {
                 varString: canonicalStringify(variables),
                 canonizeResults: canonizeResults,
                 fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
-                path: [],
+                merge: function (a, b) {
+                    return merger.merge(a, b);
+                },
             },
         });
-        var hasMissingFields = execResult.missing && execResult.missing.length > 0;
-        if (hasMissingFields && !returnPartialData) {
-            throw execResult.missing[0];
+        var missing;
+        if (execResult.missing) {
+            missing = [new MissingFieldError(firstMissing(execResult.missing), execResult.missing, query, variables)];
+            if (!returnPartialData) {
+                throw missing[0];
+            }
         }
         return {
             result: execResult.result,
-            missing: execResult.missing,
-            complete: !hasMissingFields,
+            complete: !missing,
+            missing: missing,
         };
     };
     StoreReader.prototype.isFresh = function (result, parent, selectionSet, context) {
@@ -2361,30 +2422,28 @@ var StoreReader = (function () {
             !context.store.has(objectOrReference.__ref)) {
             return {
                 result: this.canon.empty,
-                missing: [missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new tsInvariant.InvariantError(5), context)],
+                missing: "Dangling reference to missing " + objectOrReference.__ref + " object",
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
-        var objectsToMerge = [];
-        var finalResult = { result: null };
         var typename = store.getFieldValue(objectOrReference, "__typename");
+        var result = {};
+        var missing;
         if (this.config.addTypename &&
             typeof typename === "string" &&
             !policies.rootIdsByTypename[typename]) {
-            objectsToMerge.push({ __typename: typename });
+            result = { __typename: typename };
         }
-        function getMissing() {
-            return finalResult.missing || (finalResult.missing = []);
-        }
-        function handleMissing(result) {
+        function handleMissing(result, resultName) {
             var _a;
-            if (result.missing)
-                (_a = getMissing()).push.apply(_a, result.missing);
+            if (result.missing) {
+                missing = context.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
+            }
             return result.result;
         }
         var workSet = new Set(selectionSet.selections);
         workSet.forEach(function (selection) {
-            var _a;
+            var _a, _b;
             if (!shouldInclude(selection, variables))
                 return;
             if (isField(selection)) {
@@ -2395,12 +2454,13 @@ var StoreReader = (function () {
                     from: objectOrReference,
                 }, context);
                 var resultName = resultKeyNameFromField(selection);
-                context.path.push(resultName);
                 if (fieldValue === void 0) {
                     if (!addTypenameToDocument.added(selection)) {
-                        getMissing().push(missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Can't find field '" + selection.name.value + "' on " + (isReference(objectOrReference)
-                            ? objectOrReference.__ref + " object"
-                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new tsInvariant.InvariantError(6), context));
+                        missing = context.merge(missing, (_a = {},
+                            _a[resultName] = "Can't find field '" + selection.name.value + "' on " + (isReference(objectOrReference)
+                                ? objectOrReference.__ref + " object"
+                                : "object " + JSON.stringify(objectOrReference, null, 2)),
+                            _a));
                     }
                 }
                 else if (Array.isArray(fieldValue)) {
@@ -2409,7 +2469,7 @@ var StoreReader = (function () {
                         array: fieldValue,
                         enclosingRef: enclosingRef,
                         context: context,
-                    }));
+                    }), resultName);
                 }
                 else if (!selection.selectionSet) {
                     if (context.canonizeResults) {
@@ -2422,12 +2482,11 @@ var StoreReader = (function () {
                         objectOrReference: fieldValue,
                         enclosingRef: isReference(fieldValue) ? fieldValue : enclosingRef,
                         context: context,
-                    }));
+                    }), resultName);
                 }
                 if (fieldValue !== void 0) {
-                    objectsToMerge.push((_a = {}, _a[resultName] = fieldValue, _a));
+                    result = context.merge(result, (_b = {}, _b[resultName] = fieldValue, _b));
                 }
-                tsInvariant.invariant(context.path.pop() === resultName);
             }
             else {
                 var fragment = getFragmentFromSelection(selection, context.fragmentMap);
@@ -2436,23 +2495,24 @@ var StoreReader = (function () {
                 }
             }
         });
-        var merged = mergeDeepArray(objectsToMerge);
-        finalResult.result = context.canonizeResults
-            ? this.canon.admit(merged)
-            : maybeDeepFreeze(merged);
-        this.knownResults.set(finalResult.result, selectionSet);
-        return finalResult;
+        var finalResult = { result: result, missing: missing };
+        var frozen = context.canonizeResults
+            ? this.canon.admit(finalResult)
+            : maybeDeepFreeze(finalResult);
+        if (frozen.result) {
+            this.knownResults.set(frozen.result, selectionSet);
+        }
+        return frozen;
     };
     StoreReader.prototype.execSubSelectedArrayImpl = function (_a) {
         var _this = this;
         var field = _a.field, array = _a.array, enclosingRef = _a.enclosingRef, context = _a.context;
         var missing;
         function handleMissing(childResult, i) {
+            var _a;
             if (childResult.missing) {
-                missing = missing || [];
-                missing.push.apply(missing, childResult.missing);
+                missing = context.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
             }
-            tsInvariant.invariant(context.path.pop() === i);
             return childResult.result;
         }
         if (field.selectionSet) {
@@ -2462,7 +2522,6 @@ var StoreReader = (function () {
             if (item === null) {
                 return null;
             }
-            context.path.push(i);
             if (Array.isArray(item)) {
                 return handleMissing(_this.executeSubSelectedArray({
                     field: field,
@@ -2482,7 +2541,6 @@ var StoreReader = (function () {
             if (__DEV__) {
                 assertSelectionSetForIdValue(context.store, field, item);
             }
-            tsInvariant.invariant(context.path.pop() === i);
             return item;
         });
         return {
@@ -2492,12 +2550,24 @@ var StoreReader = (function () {
     };
     return StoreReader;
 }());
+function firstMissing(tree) {
+    try {
+        JSON.stringify(tree, function (_, value) {
+            if (typeof value === "string")
+                throw value;
+            return value;
+        });
+    }
+    catch (result) {
+        return result;
+    }
+}
 function assertSelectionSetForIdValue(store, field, fieldValue) {
     if (!field.selectionSet) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (isNonNullObject(value)) {
-                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!isReference(value), 7);
+                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!isReference(value), 5);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2536,7 +2606,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(8);
+            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;
@@ -2896,23 +2966,6 @@ function argsFromFieldSpecifier(spec) {
     return spec.args !== void 0 ? spec.args :
         spec.field ? argumentsObjectFromField(spec.field, spec.variables) : null;
 }
-var defaultDataIdFromObject = function (_a, context) {
-    var __typename = _a.__typename, id = _a.id, _id = _a._id;
-    if (typeof __typename === "string") {
-        if (context) {
-            context.keyObject =
-                id !== void 0 ? { id: id } :
-                    _id !== void 0 ? { _id: _id } :
-                        void 0;
-        }
-        if (id === void 0)
-            id = _id;
-        if (id !== void 0) {
-            return __typename + ":" + ((typeof id === "number" ||
-                typeof id === "string") ? id : JSON.stringify(id));
-        }
-    }
-};
 var nullKeyFieldsFn = function () { return void 0; };
 var simpleKeyArgsFn = function (_args, context) { return context.fieldName; };
 var mergeTrueFn = function (existing, incoming, _a) {
@@ -3430,12 +3483,6 @@ function computeKeyArgsObject(specifier, field, source, variables) {
     return keyObj;
 }
 
-var defaultConfig = {
-    dataIdFromObject: defaultDataIdFromObject,
-    addTypename: true,
-    resultCaching: true,
-    typePolicies: {},
-};
 var InMemoryCache = (function (_super) {
     tslib.__extends(InMemoryCache, _super);
     function InMemoryCache(config) {
@@ -3445,7 +3492,7 @@ var InMemoryCache = (function (_super) {
         _this.typenameDocumentCache = new Map();
         _this.makeVar = makeVar;
         _this.txCount = 0;
-        _this.config = tslib.__assign(tslib.__assign({}, defaultConfig), config);
+        _this.config = normalizeConfig(config);
         _this.addTypename = !!_this.config.addTypename;
         _this.policies = new Policies({
             cache: _this,
@@ -3471,6 +3518,7 @@ var InMemoryCache = (function (_super) {
             cache: this,
             addTypename: this.addTypename,
             resultCacheMaxSize: this.config.resultCacheMaxSize,
+            canonizeResults: shouldCanonizeResults(this.config),
             canon: resetResultIdentities
                 ? void 0
                 : previousReader && previousReader.canon,
@@ -3599,7 +3647,7 @@ var InMemoryCache = (function (_super) {
         }
         try {
             ++this.txCount;
-            return this.optimisticData.evict(options);
+            return this.optimisticData.evict(options, this.data);
         }
         finally {
             if (!--this.txCount && options.broadcast !== false) {
@@ -3608,8 +3656,11 @@ var InMemoryCache = (function (_super) {
         }
     };
     InMemoryCache.prototype.reset = function () {
+        var _this = this;
         this.init();
-        this.broadcastWatches();
+        this.watches.forEach(function (watch) { return _this.maybeBroadcastWatch.forget(watch); });
+        this.watches.clear();
+        forgetCache(this);
         canonicalStringify.reset();
         return Promise.resolve();
     };
@@ -3623,6 +3674,7 @@ var InMemoryCache = (function (_super) {
     InMemoryCache.prototype.batch = function (options) {
         var _this = this;
         var update = options.update, _a = options.optimistic, optimistic = _a === void 0 ? true : _a, removeOptimistic = options.removeOptimistic, onWatchUpdated = options.onWatchUpdated;
+        var updateResult;
         var perform = function (layer) {
             var _a = _this, data = _a.data, optimisticData = _a.optimisticData;
             ++_this.txCount;
@@ -3630,7 +3682,7 @@ var InMemoryCache = (function (_super) {
                 _this.data = _this.optimisticData = layer;
             }
             try {
-                update(_this);
+                return updateResult = update(_this);
             }
             finally {
                 --_this.txCount;
@@ -3672,6 +3724,7 @@ var InMemoryCache = (function (_super) {
         else {
             this.broadcastWatches(options);
         }
+        return updateResult;
     };
     InMemoryCache.prototype.performTransaction = function (update, optimisticId) {
         return this.batch({
@@ -3699,11 +3752,7 @@ var InMemoryCache = (function (_super) {
     };
     InMemoryCache.prototype.broadcastWatch = function (c, options) {
         var lastDiff = c.lastDiff;
-        var diff = this.diff({
-            query: c.query,
-            variables: c.variables,
-            optimistic: c.optimistic,
-        });
+        var diff = this.diff(c);
         if (options) {
             if (c.optimistic &&
                 typeof options.optimistic === "string") {
@@ -4079,7 +4128,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 12);
+        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 10);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -4194,8 +4243,8 @@ function defaultSubscriptionObserverErrorCallback(error) {
     __DEV__ && tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
-    if (__DEV__ && isNonEmptyArray(missing)) {
-        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + missing.map(function (m) { return m.path.join('.'); }).join(', '), missing);
+    if (__DEV__ && missing) {
+        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + JSON.stringify(missing), missing);
     }
 }
 function applyNextFetchPolicy(options) {
@@ -4376,7 +4425,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 11);
+                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 9);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -4555,14 +4604,14 @@ var QueryInfo = (function () {
         } : void 0;
     };
     QueryInfo.prototype.getDiffOptions = function (variables) {
+        var _a;
         if (variables === void 0) { variables = this.variables; }
-        var oq = this.observableQuery;
         return {
             query: this.document,
             variables: variables,
             returnPartialData: true,
             optimistic: true,
-            canonizeResults: !oq || oq.options.canonizeResults !== false,
+            canonizeResults: (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.options.canonizeResults,
         };
     };
     QueryInfo.prototype.setDiff = function (diff) {
@@ -4762,7 +4811,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(13));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(11));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -4775,10 +4824,10 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
-                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 14);
+                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 12);
                         __DEV__ ? tsInvariant.invariant(fetchPolicy === 'network-only' ||
                             fetchPolicy === 'no-cache', "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write.") : tsInvariant.invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 15);
+                            fetchPolicy === 'no-cache', 13);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -5063,10 +5112,10 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         __DEV__ ? tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
-            'in the query option.') : tsInvariant.invariant(options.query, 16);
-        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 17);
-        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 18);
-        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 19);
+            'in the query option.') : tsInvariant.invariant(options.query, 14);
+        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 15);
+        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 16);
+        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 17);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -5088,7 +5137,7 @@ var QueryManager = (function () {
             queryInfo.stop();
     };
     QueryManager.prototype.clearStore = function () {
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(20));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(18));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -5135,7 +5184,8 @@ var QueryManager = (function () {
                     return;
                 }
                 var queryName = oq.queryName, fetchPolicy = oq.options.fetchPolicy;
-                if (fetchPolicy === "standby" || !oq.hasObservers()) {
+                if (fetchPolicy === "standby" ||
+                    (include === "active" && !oq.hasObservers())) {
                     return;
                 }
                 if (include === "active" ||
@@ -5581,7 +5631,7 @@ var ApolloClient = (function () {
         if (!cache) {
             throw __DEV__ ? new tsInvariant.InvariantError("To initialize Apollo Client, you must specify a 'cache' property " +
                 "in the options object. \n" +
-                "For more information, please visit: https://go.apollo.dev/c/docs") : new tsInvariant.InvariantError(9);
+                "For more information, please visit: https://go.apollo.dev/c/docs") : new tsInvariant.InvariantError(7);
         }
         this.link = link;
         this.cache = cache;
@@ -5677,7 +5727,7 @@ var ApolloClient = (function () {
         __DEV__ ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
             'client.query can only return a single result. Please use client.watchQuery ' +
             'to receive multiple results from the cache and the network, or consider ' +
-            'using a different fetchPolicy, such as cache-first or network-only.') : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 10);
+            'using a different fetchPolicy, such as cache-first or network-only.') : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 8);
         if (this.disableNetworkFetches && options.fetchPolicy === 'network-only') {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: 'cache-first' });
         }
@@ -5788,13 +5838,19 @@ var ApolloClient = (function () {
     return ApolloClient;
 }());
 
-var cache$1 = new (canUseWeakMap ? WeakMap : Map)();
+var contextKey = canUseSymbol
+    ? Symbol.for('__APOLLO_CONTEXT__')
+    : '__APOLLO_CONTEXT__';
 function getApolloContext() {
-    var context = cache$1.get(React__namespace.createContext);
+    var context = React__namespace.createContext[contextKey];
     if (!context) {
-        context = React__namespace.createContext({});
+        Object.defineProperty(React__namespace.createContext, contextKey, {
+            value: context = React__namespace.createContext({}),
+            enumerable: false,
+            writable: false,
+            configurable: true,
+        });
         context.displayName = 'ApolloContext';
-        cache$1.set(React__namespace.createContext, context);
     }
     return context;
 }
@@ -5803,7 +5859,7 @@ var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         __DEV__ ? tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
-            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 27);
+            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 25);
         return props.children(context.client);
     });
 };
@@ -5817,7 +5873,7 @@ var ApolloProvider = function (_a) {
             context = Object.assign({}, context, { client: client });
         }
         __DEV__ ? tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
-            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 28);
+            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 26);
         return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
     });
 };
@@ -5827,7 +5883,7 @@ function useApolloClient(override) {
     var client = override || context.client;
     __DEV__ ? tsInvariant.invariant(!!client, 'Could not find "client" in the context or passed in as an option. ' +
         'Wrap the root component in an <ApolloProvider>, or pass an ApolloClient' +
-        'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 31);
+        'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 29);
     return client;
 }
 
@@ -5860,7 +5916,7 @@ function parser(document) {
     var variables, type, name;
     __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of " + document + " passed to parser was not a valid GraphQL " +
         "DocumentNode. You may need to use 'graphql-tag' or another method " +
-        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 32);
+        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 30);
     var fragments = document.definitions.filter(function (x) { return x.kind === 'FragmentDefinition'; });
     var queries = document.definitions.filter(function (x) {
         return x.kind === 'OperationDefinition' && x.operation === 'query';
@@ -5874,11 +5930,11 @@ function parser(document) {
     __DEV__ ? tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), "Passing only a fragment to 'graphql' is not yet supported. " +
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 33);
+        (queries.length || mutations.length || subscriptions.length), 31);
     __DEV__ ? tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, "react-apollo only supports a query, subscription, or a mutation per HOC. " +
         (document + " had " + queries.length + " queries, " + subscriptions.length + " ") +
         ("subscriptions and " + mutations.length + " mutations. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 34);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 32);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
         type = exports.DocumentType.Subscription;
@@ -5889,7 +5945,7 @@ function parser(document) {
             : subscriptions;
     __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. " + document + " had " +
         (definitions.length + " definitions. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 35);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 33);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -5907,7 +5963,7 @@ function verifyDocumentType(document, type) {
     var requiredOperationName = operationName(type);
     var usedOperationName = operationName(operation.type);
     __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a " + requiredOperationName + " requires a graphql " +
-        (requiredOperationName + ", but a " + usedOperationName + " was used instead.")) : tsInvariant.invariant(operation.type === type, 36);
+        (requiredOperationName + ", but a " + usedOperationName + " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
 }
 
 function useQuery(query, options) {