@apollo/client 3.4.0-rc.7 → 3.4.1

package/apollo-client.cjs.js

@@ -2,12 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var tsInvariant = require('ts-invariant');
+var process$1 = require('ts-invariant/process');
+var graphql = require('graphql');
+var tslib = require('tslib');
 var equality = require('@wry/equality');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
-var graphql = require('graphql');
 var optimism = require('optimism');
 var context = require('@wry/context');
 var trie = require('@wry/trie');
@@ -26,34 +27,30 @@ var global$1 = (maybe(function () { return globalThis; }) ||
     maybe(function () { return global; }) ||
     maybe(function () { return Function("return this")(); }));
 
+var __ = "__";
+var GLOBAL_KEY = [__, __].join("DEV");
 function getDEV() {
     try {
         return Boolean(__DEV__);
     }
     catch (_a) {
-        var maybeNodeEnv = maybe(function () { return process.env.NODE_ENV; });
-        var runningInNode = !!maybe(function () { return process.versions.node; });
-        Object.defineProperty(global$1, "__DEV__", {
-            value: maybeNodeEnv !== "production",
+        Object.defineProperty(global$1, GLOBAL_KEY, {
+            value: maybe(function () { return process.env.NODE_ENV; }) !== "production",
             enumerable: false,
             configurable: true,
             writable: true,
         });
-        if (maybeNodeEnv && !runningInNode) {
-            __DEV__ && tsInvariant.invariant.log([
-                "Apollo Client has provided a default value for the __DEV__ constant " +
-                    ("(" + global$1.__DEV__ + "), but you may be able to reduce production bundle ") +
-                    "sizes by configuring your JavaScript minifier to replace __DEV__ with " +
-                    "false, allowing development-only code to be stripped from the bundle.",
-                "",
-                "For more information about the switch to __DEV__, see " +
-                    "https://github.com/apollographql/apollo-client/pull/8347.",
-            ].join("\n"));
-        }
-        return global$1.__DEV__;
+        return global$1[GLOBAL_KEY];
     }
 }
-var __DEV__$1 = getDEV();
+var DEV = getDEV();
+
+function removeTemporaryGlobals() {
+    graphql.isType(null);
+    return process$1.remove();
+}
+
+removeTemporaryGlobals();
 
 function shouldInclude(_a, variables) {
     var directives = _a.directives;
@@ -65,7 +62,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, 43);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -102,13 +99,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, 44);
             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', 45);
             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'), 46);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -121,17 +118,17 @@ 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(47);
         }
         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, 48);
         actualFragmentName = fragments[0].name.value;
     }
-    var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArrays([
+    var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
             {
                 kind: 'OperationDefinition',
                 operation: 'query',
@@ -165,7 +162,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, 49);
             return fragment;
         }
         default:
@@ -249,7 +246,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(58);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -383,16 +380,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', 50);
     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(51);
         }
         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, 52);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -411,14 +408,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', 53);
     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', 54);
+    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 55);
     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', 56);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -441,7 +438,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(57);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -584,7 +581,7 @@ var addTypenameToDocument = Object.assign(function (doc) {
                     field.directives.some(function (d) { return d.name.value === 'export'; })) {
                     return;
                 }
-                return tslib.__assign(tslib.__assign({}, node), { selections: tslib.__spreadArrays(selections, [TYPENAME_FIELD]) });
+                return tslib.__assign(tslib.__assign({}, node), { selections: tslib.__spreadArray(tslib.__spreadArray([], selections), [TYPENAME_FIELD]) });
             },
         },
     });
@@ -763,7 +760,7 @@ var DeepMerger = (function () {
                 if (hasOwnProperty$2.call(target, sourceKey)) {
                     var targetValue = target[sourceKey];
                     if (source[sourceKey] !== targetValue) {
-                        var result = _this.reconciler.apply(_this, tslib.__spreadArrays([target, source, sourceKey], context));
+                        var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context));
                         if (result !== targetValue) {
                             target = _this.shallowCopyForMerge(target);
                             target[sourceKey] = result;
@@ -1054,6 +1051,7 @@ function graphQLResultHasError(result) {
 
 var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
     navigator.product === 'ReactNative');
+var canUseWeakSet = typeof WeakSet === 'function';
 
 function compact() {
     var objects = [];
@@ -1081,6 +1079,15 @@ function makeUniqueId(prefix) {
     return prefix + ":" + count + ":" + Math.random().toString(36).slice(2);
 }
 
+function stringifyForDisplay(value) {
+    var undefId = makeUniqueId("stringifyForDisplay");
+    return JSON.stringify(value, function (key, value) {
+        return value === void 0 ? undefId : value;
+    }).split(JSON.stringify(undefId)).join("<undefined>");
+}
+
+__DEV__ ? tsInvariant.invariant("boolean" === typeof DEV, DEV) : tsInvariant.invariant("boolean" === typeof DEV, 59);
+
 function fromError(errorValue) {
     return new zenObservableTs.Observable(function (observer) {
         observer.error(errorValue);
@@ -1136,7 +1143,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(27);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(29);
         }
     }
     return operation;
@@ -1259,7 +1266,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(22);
+        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(23);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1285,7 +1292,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.4.0-rc.7';
+var version = '3.4.1';
 
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1325,7 +1332,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(24);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(26);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1356,7 +1363,7 @@ var selectHttpOptionsAndBody = function (operation, fallbackConfig) {
     var options = tslib.__assign(tslib.__assign({}, fallbackConfig.options), { headers: fallbackConfig.headers, credentials: fallbackConfig.credentials });
     var http = fallbackConfig.http || {};
     configs.forEach(function (config) {
-        options = tslib.__assign(tslib.__assign(tslib.__assign({}, options), config.options), { headers: tslib.__assign(tslib.__assign({}, options.headers), config.headers) });
+        options = tslib.__assign(tslib.__assign(tslib.__assign({}, options), config.options), { headers: tslib.__assign(tslib.__assign({}, options.headers), headersToLowerCase(config.headers)) });
         if (config.credentials)
             options.credentials = config.credentials;
         http = tslib.__assign(tslib.__assign({}, http), config.http);
@@ -1372,10 +1379,20 @@ var selectHttpOptionsAndBody = function (operation, fallbackConfig) {
         body: body,
     };
 };
+function headersToLowerCase(headers) {
+    if (headers) {
+        var normalized_1 = Object.create(null);
+        Object.keys(Object(headers)).forEach(function (name) {
+            normalized_1[name.toLowerCase()] = headers[name];
+        });
+        return normalized_1;
+    }
+    return 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(23);
+        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(25);
     }
 };
 
@@ -1742,6 +1759,10 @@ var EntityStore = (function () {
     EntityStore.prototype.merge = function (older, newer) {
         var _this = this;
         var dataId;
+        if (isReference(older))
+            older = older.__ref;
+        if (isReference(newer))
+            newer = newer.__ref;
         var existing = typeof older === "string"
             ? this.lookup(dataId = older)
             : older;
@@ -1750,7 +1771,7 @@ var EntityStore = (function () {
             : newer;
         if (!incoming)
             return;
-        __DEV__ ? tsInvariant.invariant(typeof dataId === "string", "store.merge expects a string ID") : tsInvariant.invariant(typeof dataId === "string", 1);
+        __DEV__ ? tsInvariant.invariant(typeof dataId === "string", "store.merge expects a string ID") : tsInvariant.invariant(typeof dataId === "string", 2);
         var merged = new DeepMerger(storeObjectReconciler).merge(existing, incoming);
         this.data[dataId] = merged;
         if (merged !== existing) {
@@ -1809,8 +1830,7 @@ var EntityStore = (function () {
                     : fields[storeFieldName] || fields[fieldName];
                 if (modify) {
                     var newValue = modify === delModifier ? DELETE :
-                        modify(maybeDeepFreeze(fieldValue), tslib.__assign(tslib.__assign({}, sharedDetails_1), { fieldName: fieldName,
-                            storeFieldName: storeFieldName, storage: _this.getStorage(dataId, storeFieldName) }));
+                        modify(maybeDeepFreeze(fieldValue), tslib.__assign(tslib.__assign({}, sharedDetails_1), { fieldName: fieldName, storeFieldName: storeFieldName, storage: _this.getStorage(dataId, storeFieldName) }));
                     if (newValue === INVALIDATE) {
                         _this.group.dirty(dataId, storeFieldName);
                     }
@@ -1952,15 +1972,21 @@ var EntityStore = (function () {
     EntityStore.prototype.findChildRefIds = function (dataId) {
         if (!hasOwn.call(this.refs, dataId)) {
             var found_1 = this.refs[dataId] = Object.create(null);
-            var workSet_1 = new Set([this.data[dataId]]);
+            var root = this.data[dataId];
+            if (!root)
+                return found_1;
+            var workSet_1 = new Set([root]);
             workSet_1.forEach(function (obj) {
                 if (isReference(obj)) {
                     found_1[obj.__ref] = true;
                 }
-                else if (isNonNullObject(obj)) {
-                    Object.values(obj)
-                        .filter(isNonNullObject)
-                        .forEach(workSet_1.add, workSet_1);
+                if (isNonNullObject(obj)) {
+                    Object.keys(obj).forEach(function (key) {
+                        var child = obj[key];
+                        if (isNonNullObject(child)) {
+                            workSet_1.add(child);
+                        }
+                    });
                 }
             });
         }
@@ -1977,9 +2003,12 @@ var CacheGroup = (function () {
         this.caching = caching;
         this.parent = parent;
         this.d = null;
-        this.keyMaker = new trie.Trie(canUseWeakMap);
-        this.d = caching ? optimism.dep() : null;
+        this.resetCaching();
     }
+    CacheGroup.prototype.resetCaching = function () {
+        this.d = this.caching ? optimism.dep() : null;
+        this.keyMaker = new trie.Trie(canUseWeakMap);
+    };
     CacheGroup.prototype.depend = function (dataId, storeFieldName) {
         if (this.d) {
             this.d(makeDepKey(dataId, storeFieldName));
@@ -2125,7 +2154,7 @@ function shallowCopy(value) {
 }
 var ObjectCanon = (function () {
     function ObjectCanon() {
-        this.known = new (canUseWeakMap ? WeakSet : Set)();
+        this.known = new (canUseWeakSet ? WeakSet : Set)();
         this.pool = new trie.Trie(canUseWeakMap);
         this.passes = new WeakMap();
         this.keysByJSON = new Map();
@@ -2208,6 +2237,9 @@ var ObjectCanon = (function () {
 }());
 var canonicalStringify = Object.assign(function (value) {
     if (isNonNullObject(value)) {
+        if (stringifyCanon === void 0) {
+            resetCanonicalStringify();
+        }
         var canonical = stringifyCanon.admit(value);
         var json = stringifyCache.get(canonical);
         if (json === void 0) {
@@ -2217,12 +2249,14 @@ var canonicalStringify = Object.assign(function (value) {
     }
     return JSON.stringify(value);
 }, {
-    reset: function () {
-        stringifyCanon = new ObjectCanon;
-    },
+    reset: resetCanonicalStringify,
 });
-var stringifyCanon = new ObjectCanon;
-var stringifyCache = new WeakMap();
+var stringifyCanon;
+var stringifyCache;
+function resetCanonicalStringify() {
+    stringifyCanon = new ObjectCanon;
+    stringifyCache = new (canUseWeakMap ? WeakMap : Map)();
+}
 
 function missingFromInvariant(err, context) {
     return new MissingFieldError(err.message, context.path.slice(), context.query, context.variables);
@@ -2238,9 +2272,9 @@ function execSelectionSetKeyArgs(options) {
 var StoreReader = (function () {
     function StoreReader(config) {
         var _this = this;
-        this.canon = new ObjectCanon;
-        this.knownResults = new WeakMap();
+        this.knownResults = new (canUseWeakMap ? WeakMap : Map)();
         this.config = tslib.__assign(tslib.__assign({}, config), { addTypename: config.addTypename !== false });
+        this.canon = config.canon || new ObjectCanon;
         this.executeSelectionSet = optimism.wrap(function (options) {
             var _a;
             var canonizeResults = options.context.canonizeResults;
@@ -2277,6 +2311,9 @@ var StoreReader = (function () {
             }
         });
     }
+    StoreReader.prototype.resetCanon = 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 policies = this.config.cache.policies;
@@ -2325,7 +2362,7 @@ 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: [missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new tsInvariant.InvariantError(6), context)],
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
@@ -2364,7 +2401,7 @@ var StoreReader = (function () {
                     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));
+                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new tsInvariant.InvariantError(7), context));
                     }
                 }
                 else if (Array.isArray(fieldValue)) {
@@ -2461,7 +2498,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
         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), 8);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2490,6 +2527,7 @@ var StoreWriter = (function () {
             fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
             overwrite: !!overwrite,
             incomingById: new Map,
+            clientOnly: false,
         };
         var ref = this.processSelectionSet({
             result: result || Object.create(null),
@@ -2499,13 +2537,17 @@ 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(9);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var fields = _a.fields, mergeTree = _a.mergeTree, selections = _a.selections;
             var entityRef = makeReference(dataId);
             if (mergeTree.map.size) {
-                fields = _this.applyMerges(mergeTree, entityRef, fields, context);
+                var applied = _this.applyMerges(mergeTree, entityRef, fields, context);
+                if (isReference(applied)) {
+                    return;
+                }
+                fields = applied;
             }
             if (__DEV__ && !context.overwrite) {
                 var hasSelectionSet_1 = function (storeFieldName) {
@@ -2567,7 +2609,10 @@ var StoreWriter = (function () {
             if (isField(selection)) {
                 var resultFieldKey = resultKeyNameFromField(selection);
                 var value = result[resultFieldKey];
-                if (typeof value !== 'undefined') {
+                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,
@@ -2599,10 +2644,11 @@ var StoreWriter = (function () {
                         _a[storeFieldName] = incomingValue,
                         _a));
                 }
-                else if (policies.usingPossibleTypes &&
-                    !hasDirectives(["defer", "client"], selection)) {
-                    throw __DEV__ ? new tsInvariant.InvariantError("Missing field '" + resultFieldKey + "' in " + JSON.stringify(result, null, 2).substring(0, 100)) : new tsInvariant.InvariantError(9);
+                else if (!context.clientOnly &&
+                    !addTypenameToDocument.added(selection)) {
+                    __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);
@@ -2988,7 +3034,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;
@@ -3201,12 +3247,25 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
         cache: policies.cache,
         canRead: canRead,
         readField: function (fieldNameOrOptions, from) {
-            var options = typeof fieldNameOrOptions === "string" ? {
-                fieldName: fieldNameOrOptions,
-                from: from,
-            } : tslib.__assign({}, fieldNameOrOptions);
-            if (void 0 === options.from) {
-                options.from = objectOrReference;
+            var options;
+            if (typeof fieldNameOrOptions === "string") {
+                options = {
+                    fieldName: fieldNameOrOptions,
+                    from: arguments.length > 1 ? from : objectOrReference,
+                };
+            }
+            else if (isNonNullObject(fieldNameOrOptions)) {
+                options = tslib.__assign({}, fieldNameOrOptions);
+                if (!hasOwn.call(fieldNameOrOptions, "from")) {
+                    options.from = objectOrReference;
+                }
+            }
+            else {
+                __DEV__ && tsInvariant.invariant.warn("Unexpected readField arguments: " + stringifyForDisplay(Array.from(arguments)));
+                return;
+            }
+            if (__DEV__ && options.from === void 0) {
+                __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + stringifyForDisplay(Array.from(arguments)));
             }
             if (void 0 === options.variables) {
                 options.variables = variables;
@@ -3219,7 +3278,7 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
 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);
+            throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(4);
         }
         if (isNonNullObject(existing) &&
             isNonNullObject(incoming)) {
@@ -3316,7 +3375,7 @@ function computeKeyObject(response, specifier, strict, aliasMap) {
                 keyObj[prevKey = s] = response[responseName];
             }
             else {
-                __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 4);
+                __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 5);
                 prevKey = void 0;
             }
         }
@@ -3351,16 +3410,23 @@ var InMemoryCache = (function (_super) {
         return _this;
     }
     InMemoryCache.prototype.init = function () {
-        var _this = this;
         var rootStore = this.data = new EntityStore.Root({
             policies: this.policies,
             resultCaching: this.config.resultCaching,
         });
         this.optimisticData = rootStore.stump;
+        this.resetResultCache();
+    };
+    InMemoryCache.prototype.resetResultCache = function (resetResultIdentities) {
+        var _this = this;
+        var previousReader = this.storeReader;
         this.storeWriter = new StoreWriter(this, this.storeReader = new StoreReader({
             cache: this,
             addTypename: this.addTypename,
             resultCacheMaxSize: this.config.resultCacheMaxSize,
+            canon: resetResultIdentities
+                ? void 0
+                : previousReader && previousReader.canon,
         }));
         this.maybeBroadcastWatch = optimism.wrap(function (c, options) {
             return _this.broadcastWatch(c, options);
@@ -3374,8 +3440,13 @@ var InMemoryCache = (function (_super) {
                 }
             }
         });
+        new Set([
+            this.data.group,
+            this.optimisticData.group,
+        ]).forEach(function (group) { return group.resetCaching(); });
     };
     InMemoryCache.prototype.restore = function (data) {
+        this.init();
         if (data)
             this.data.replace(data);
         return this;
@@ -3443,9 +3514,18 @@ var InMemoryCache = (function (_super) {
             _this.maybeBroadcastWatch.forget(watch);
         };
     };
-    InMemoryCache.prototype.gc = function () {
+    InMemoryCache.prototype.gc = function (options) {
         canonicalStringify.reset();
-        return this.optimisticData.gc();
+        var ids = this.optimisticData.gc();
+        if (options && !this.txCount) {
+            if (options.resetResultCache) {
+                this.resetResultCache(options.resetResultIdentities);
+            }
+            else if (options.resetResultIdentities) {
+                this.storeReader.resetCanon();
+            }
+        }
+        return ids;
     };
     InMemoryCache.prototype.retain = function (rootId, optimistic) {
         return (optimistic ? this.optimisticData : this.data).retain(rootId);
@@ -3588,6 +3668,7 @@ var InMemoryCache = (function (_super) {
     return InMemoryCache;
 }(ApolloCache));
 
+__DEV__ ? tsInvariant.invariant("boolean" === typeof DEV, DEV) : tsInvariant.invariant("boolean" === typeof DEV, 22);
 function isApolloError(err) {
     return err.hasOwnProperty('graphQLErrors');
 }
@@ -3639,95 +3720,35 @@ function isNetworkRequestInFlight(networkStatus) {
     return networkStatus ? networkStatus < 7 : false;
 }
 
-var Reobserver = (function () {
-    function Reobserver(observer, options, fetch, shouldFetch) {
-        this.observer = observer;
-        this.options = options;
-        this.fetch = fetch;
-        this.shouldFetch = shouldFetch;
-    }
-    Reobserver.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        if (newOptions) {
-            this.updateOptions(newOptions);
-        }
-        else {
-            this.updatePolling();
-        }
-        var concast = this.fetch(this.options, newNetworkStatus);
-        if (this.concast) {
-            this.concast.removeObserver(this.observer, true);
-        }
-        concast.addObserver(this.observer);
-        return (this.concast = concast).promise;
-    };
-    Reobserver.prototype.updateOptions = function (newOptions) {
-        Object.assign(this.options, compact(newOptions));
-        this.updatePolling();
-        return this;
-    };
-    Reobserver.prototype.stop = function () {
-        if (this.concast) {
-            this.concast.removeObserver(this.observer);
-            delete this.concast;
-        }
-        if (this.pollingInfo) {
-            clearTimeout(this.pollingInfo.timeout);
-            this.options.pollInterval = 0;
-            this.updatePolling();
-        }
-    };
-    Reobserver.prototype.updatePolling = function () {
-        var _this = this;
-        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;
-        if (!pollInterval) {
-            if (pollingInfo) {
-                clearTimeout(pollingInfo.timeout);
-                delete this.pollingInfo;
-            }
-            return;
-        }
-        if (pollingInfo &&
-            pollingInfo.interval === pollInterval) {
-            return;
-        }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 21);
-        if (this.shouldFetch === false) {
-            return;
-        }
-        var info = pollingInfo || (this.pollingInfo = {});
-        info.interval = pollInterval;
-        var maybeFetch = function () {
-            if (_this.pollingInfo) {
-                if (_this.shouldFetch && _this.shouldFetch()) {
-                    _this.reobserve({
-                        fetchPolicy: "network-only",
-                        nextFetchPolicy: _this.options.fetchPolicy || "cache-first",
-                    }, exports.NetworkStatus.poll).then(poll, poll);
-                }
-                else {
-                    poll();
-                }
-            }
-        };
-        var poll = function () {
-            var info = _this.pollingInfo;
-            if (info) {
-                clearTimeout(info.timeout);
-                info.timeout = setTimeout(maybeFetch, info.interval);
-            }
-        };
-        poll();
-    };
-    return Reobserver;
-}());
-
 var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
         var queryManager = _a.queryManager, queryInfo = _a.queryInfo, options = _a.options;
         var _this = _super.call(this, function (observer) {
-            return _this.onSubscribe(observer);
+            try {
+                var subObserver = observer._subscription._observer;
+                if (subObserver && !subObserver.error) {
+                    subObserver.error = defaultSubscriptionObserverErrorCallback;
+                }
+            }
+            catch (_a) { }
+            var first = !_this.observers.size;
+            _this.observers.add(observer);
+            if (_this.lastError) {
+                observer.error && observer.error(_this.lastError);
+            }
+            else if (_this.lastResult) {
+                observer.next && observer.next(_this.lastResult);
+            }
+            if (first) {
+                _this.reobserve().catch(function () { });
+            }
+            return function () {
+                if (_this.observers.delete(observer) && !_this.observers.size) {
+                    _this.tearDownQuery();
+                }
+            };
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
@@ -3748,6 +3769,7 @@ var ObservableQuery = (function (_super) {
         _this.queryId = queryManager.generateQueryId();
         var opDef = getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
+        _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
         _this.queryManager = queryManager;
         _this.queryInfo = queryInfo;
         return _this;
@@ -3780,21 +3802,12 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        var lastResult = this.lastResult;
+        var _a = this, lastResult = _a.lastResult, _b = _a.options.fetchPolicy, fetchPolicy = _b === void 0 ? "cache-first" : _b;
         var networkStatus = this.queryInfo.networkStatus ||
             (lastResult && lastResult.networkStatus) ||
             exports.NetworkStatus.ready;
         var result = tslib.__assign(tslib.__assign({}, lastResult), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
-        if (this.isTornDown) {
-            return result;
-        }
-        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? 'cache-first' : _a;
-        if (fetchPolicy === 'no-cache' ||
-            fetchPolicy === 'network-only') {
-            delete result.partial;
-        }
-        else if (!result.data ||
-            !this.queryManager.transform(this.options.query).hasForcedResolvers) {
+        if (!this.queryManager.transform(this.options.query).hasForcedResolvers) {
             var diff = this.queryInfo.getDiff();
             result.data = (diff.complete ||
                 this.options.returnPartialData) ? diff.result : void 0;
@@ -3807,7 +3820,7 @@ var ObservableQuery = (function (_super) {
                 }
                 delete result.partial;
             }
-            else {
+            else if (fetchPolicy !== "no-cache") {
                 result.partial = true;
             }
             if (!diff.complete &&
@@ -3846,16 +3859,17 @@ var ObservableQuery = (function (_super) {
             pollInterval: 0,
         };
         var fetchPolicy = this.options.fetchPolicy;
-        if (fetchPolicy !== 'no-cache' &&
-            fetchPolicy !== 'cache-and-network') {
+        if (fetchPolicy === 'no-cache') {
+            reobserveOptions.fetchPolicy = 'no-cache';
+        }
+        else if (fetchPolicy !== 'cache-and-network') {
             reobserveOptions.fetchPolicy = 'network-only';
-            reobserveOptions.nextFetchPolicy = fetchPolicy || "cache-first";
         }
         if (variables && !equality.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
         this.queryInfo.resetLastWrite();
-        return this.newReobserver(false).reobserve(reobserveOptions, exports.NetworkStatus.refetch);
+        return this.reobserve(reobserveOptions, exports.NetworkStatus.refetch);
     };
     ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
         var _this = this;
@@ -3941,18 +3955,10 @@ var ObservableQuery = (function (_super) {
         if (!this.observers.size) {
             return Promise.resolve();
         }
-        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? 'cache-first' : _a;
-        var reobserveOptions = {
-            fetchPolicy: fetchPolicy,
+        return this.reobserve({
+            fetchPolicy: this.initialFetchPolicy,
             variables: variables,
-        };
-        if (fetchPolicy !== 'cache-first' &&
-            fetchPolicy !== 'no-cache' &&
-            fetchPolicy !== 'network-only') {
-            reobserveOptions.fetchPolicy = 'cache-and-network';
-            reobserveOptions.nextFetchPolicy = fetchPolicy;
-        }
-        return this.reobserve(reobserveOptions, exports.NetworkStatus.setVariables);
+        }, exports.NetworkStatus.setVariables);
     };
     ObservableQuery.prototype.updateQuery = function (mapFn) {
         var _a;
@@ -3977,12 +3983,57 @@ var ObservableQuery = (function (_super) {
         }
     };
     ObservableQuery.prototype.startPolling = function (pollInterval) {
-        this.getReobserver().updateOptions({ pollInterval: pollInterval });
+        this.options.pollInterval = pollInterval;
+        this.updatePolling();
     };
     ObservableQuery.prototype.stopPolling = function () {
-        if (this.reobserver) {
-            this.reobserver.updateOptions({ pollInterval: 0 });
+        this.options.pollInterval = 0;
+        this.updatePolling();
+    };
+    ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
+        this.queryManager.setObservableQuery(this);
+        return this.queryManager.fetchQueryObservable(this.queryId, options, newNetworkStatus);
+    };
+    ObservableQuery.prototype.updatePolling = function () {
+        var _this = this;
+        if (this.queryManager.ssrMode) {
+            return;
         }
+        var _a = this, pollingInfo = _a.pollingInfo, pollInterval = _a.options.pollInterval;
+        if (!pollInterval) {
+            if (pollingInfo) {
+                clearTimeout(pollingInfo.timeout);
+                delete this.pollingInfo;
+            }
+            return;
+        }
+        if (pollingInfo &&
+            pollingInfo.interval === pollInterval) {
+            return;
+        }
+        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 13);
+        var info = pollingInfo || (this.pollingInfo = {});
+        info.interval = pollInterval;
+        var maybeFetch = function () {
+            if (_this.pollingInfo) {
+                if (!isNetworkRequestInFlight(_this.queryInfo.networkStatus)) {
+                    _this.reobserve({
+                        fetchPolicy: "network-only",
+                    }, exports.NetworkStatus.poll).then(poll, poll);
+                }
+                else {
+                    poll();
+                }
+            }
+        };
+        var poll = function () {
+            var info = _this.pollingInfo;
+            if (info) {
+                clearTimeout(info.timeout);
+                info.timeout = setTimeout(maybeFetch, info.interval);
+            }
+        };
+        poll();
     };
     ObservableQuery.prototype.updateLastResult = function (newResult) {
         var previousResult = this.lastResult;
@@ -3995,50 +4046,36 @@ var ObservableQuery = (function (_super) {
         }
         return previousResult;
     };
-    ObservableQuery.prototype.onSubscribe = function (observer) {
-        var _this = this;
-        if (observer === this.observer) {
-            return function () { };
-        }
-        try {
-            var subObserver = observer._subscription._observer;
-            if (subObserver && !subObserver.error) {
-                subObserver.error = defaultSubscriptionObserverErrorCallback;
+    ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
+        this.isTornDown = false;
+        var useDisposableConcast = newNetworkStatus === exports.NetworkStatus.refetch ||
+            newNetworkStatus === exports.NetworkStatus.fetchMore ||
+            newNetworkStatus === exports.NetworkStatus.poll;
+        var oldVariables = this.options.variables;
+        var options = useDisposableConcast
+            ? compact(this.options, newOptions)
+            : Object.assign(this.options, compact(newOptions));
+        if (!useDisposableConcast) {
+            this.updatePolling();
+            if (newOptions &&
+                newOptions.variables &&
+                !newOptions.fetchPolicy &&
+                !equality.equal(newOptions.variables, oldVariables)) {
+                options.fetchPolicy = this.initialFetchPolicy;
+                if (newNetworkStatus === void 0) {
+                    newNetworkStatus = exports.NetworkStatus.setVariables;
+                }
             }
         }
-        catch (_a) { }
-        var first = !this.observers.size;
-        this.observers.add(observer);
-        if (this.lastError) {
-            observer.error && observer.error(this.lastError);
-        }
-        else if (this.lastResult) {
-            observer.next && observer.next(this.lastResult);
-        }
-        if (first) {
-            this.reobserve().catch(function () { });
-        }
-        return function () {
-            if (_this.observers.delete(observer) && !_this.observers.size) {
-                _this.tearDownQuery();
+        var concast = this.fetch(options, newNetworkStatus);
+        if (!useDisposableConcast) {
+            if (this.concast) {
+                this.concast.removeObserver(this.observer, true);
             }
-        };
-    };
-    ObservableQuery.prototype.getReobserver = function () {
-        return this.reobserver || (this.reobserver = this.newReobserver(true));
-    };
-    ObservableQuery.prototype.newReobserver = function (shareOptions) {
-        var _this = this;
-        var _a = this, queryManager = _a.queryManager, queryId = _a.queryId;
-        queryManager.setObservableQuery(this);
-        return new Reobserver(this.observer, shareOptions ? this.options : tslib.__assign({}, this.options), function (currentOptions, newNetworkStatus) {
-            queryManager.setObservableQuery(_this);
-            return queryManager.fetchQueryObservable(queryId, currentOptions, newNetworkStatus);
-        }, !queryManager.ssrMode && (function () { return !isNetworkRequestInFlight(_this.queryInfo.networkStatus); }));
-    };
-    ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        this.isTornDown = false;
-        return this.getReobserver().reobserve(newOptions, newNetworkStatus);
+            this.concast = concast;
+        }
+        concast.addObserver(this.observer);
+        return concast.promise;
     };
     ObservableQuery.prototype.observe = function () {
         this.observer.next(this.getCurrentResult(false));
@@ -4049,10 +4086,11 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.tearDownQuery = function () {
         if (this.isTornDown)
             return;
-        if (this.reobserver) {
-            this.reobserver.stop();
-            delete this.reobserver;
+        if (this.concast) {
+            this.concast.removeObserver(this.observer);
+            delete this.concast;
         }
+        this.stopPolling();
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
         this.subscriptions.clear();
         this.queryManager.stopQuery(this.queryId);
@@ -4068,7 +4106,6 @@ function defaultSubscriptionObserverErrorCallback(error) {
 function applyNextFetchPolicy(options) {
     var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, nextFetchPolicy = options.nextFetchPolicy;
     if (nextFetchPolicy) {
-        options.nextFetchPolicy = void 0;
         options.fetchPolicy = typeof nextFetchPolicy === "function"
             ? nextFetchPolicy.call(options, fetchPolicy)
             : nextFetchPolicy;
@@ -4138,8 +4175,7 @@ var LocalState = (function () {
     };
     LocalState.prototype.prepareContext = function (context) {
         var cache = this.cache;
-        return tslib.__assign(tslib.__assign({}, context), { cache: cache,
-            getCacheKey: function (obj) {
+        return tslib.__assign(tslib.__assign({}, context), { cache: cache, getCacheKey: function (obj) {
                 return cache.identify(obj);
             } });
     };
@@ -4203,8 +4239,7 @@ var LocalState = (function () {
                 _a = this, cache = _a.cache, client = _a.client;
                 execContext = {
                     fragmentMap: fragmentMap,
-                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache,
-                        client: client }),
+                    context: tslib.__assign(tslib.__assign({}, context), { cache: cache, client: client }),
                     variables: variables,
                     fragmentMatcher: fragmentMatcher,
                     defaultOperationType: defaultOperationType,
@@ -4424,12 +4459,13 @@ var QueryInfo = (function () {
     };
     QueryInfo.prototype.getDiffOptions = function (variables) {
         if (variables === void 0) { variables = this.variables; }
+        var oq = this.observableQuery;
         return {
             query: this.document,
             variables: variables,
             returnPartialData: true,
             optimistic: true,
-            canonizeResults: this.canonize(),
+            canonizeResults: !oq || oq.options.canonizeResults !== false,
         };
     };
     QueryInfo.prototype.setDiff = function (diff) {
@@ -4516,10 +4552,6 @@ var QueryInfo = (function () {
             this.cancel = this.cache.watch(this.lastWatch = watchOptions);
         }
     };
-    QueryInfo.prototype.canonize = function () {
-        var oq = this.observableQuery;
-        return !oq || oq.options.canonizeResults !== false;
-    };
     QueryInfo.prototype.resetLastWrite = function () {
         this.lastWrite = void 0;
     };
@@ -4537,7 +4569,7 @@ var QueryInfo = (function () {
         if (options.fetchPolicy === 'no-cache') {
             this.updateLastDiff({ result: result.data, complete: true }, this.getDiffOptions(options.variables));
         }
-        else if (!this.stopped && cacheWriteBehavior !== 0) {
+        else if (cacheWriteBehavior !== 0) {
             if (shouldWriteResult(result, options.errorPolicy)) {
                 this.cache.performTransaction(function (cache) {
                     if (_this.shouldWrite(result, options.variables)) {
@@ -4633,7 +4665,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(14));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -4646,8 +4678,8 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_e) {
                 switch (_e.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(!fetchPolicy || fetchPolicy === 'no-cache', "Mutations only support a 'no-cache' fetchPolicy. If you don't want to disable the cache, remove your fetchPolicy setting to proceed with the default mutation behavior.") : tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', 15);
+                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 15);
+                        __DEV__ ? tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', "Mutations only support a 'no-cache' fetchPolicy. If you don't want to disable the cache, remove your fetchPolicy setting to proceed with the default mutation behavior.") : tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', 16);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -4932,10 +4964,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, 17);
+        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 18);
+        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 19);
+        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 20);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -4957,7 +4989,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(21));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -4985,9 +5017,12 @@ var QueryManager = (function () {
         var legacyQueryOptions = new Set();
         if (Array.isArray(include)) {
             include.forEach(function (desc) {
-                if (typeof desc === "string" || isDocumentNode(desc)) {
+                if (typeof desc === "string") {
                     queryNamesAndDocs.set(desc, false);
                 }
+                else if (isDocumentNode(desc)) {
+                    queryNamesAndDocs.set(_this.transform(desc).document, false);
+                }
                 else if (isNonNullObject(desc) && desc.query) {
                     legacyQueryOptions.add(desc);
                 }
@@ -5324,7 +5359,7 @@ var QueryManager = (function () {
                 isNonEmptyArray(diff.missing) &&
                 !equality.equal(data, {}) &&
                 !returnPartialData) {
-                __DEV__ && tsInvariant.invariant.warn("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
+                __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
             }
             var fromData = function (data) { return zenObservableTs.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
             if (data && _this.transform(query).hasForcedResolvers) {
@@ -5621,6 +5656,9 @@ var ApolloClient = (function () {
         var result = Promise.all(results);
         result.queries = queries;
         result.results = results;
+        result.catch(function (error) {
+            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
+        });
         return result;
     };
     ApolloClient.prototype.getObservableQueries = function (include) {
@@ -5651,7 +5689,7 @@ var ApolloClient = (function () {
     return ApolloClient;
 }());
 
-tsInvariant.setVerbosity("log");
+tsInvariant.setVerbosity(DEV ? "log" : "silent");
 
 exports.setLogVerbosity = tsInvariant.setVerbosity;
 exports.Observable = zenObservableTs.Observable;
@@ -5668,7 +5706,6 @@ exports.HttpLink = HttpLink;
 exports.InMemoryCache = InMemoryCache;
 exports.MissingFieldError = MissingFieldError;
 exports.ObservableQuery = ObservableQuery;
-exports.__DEV__ = __DEV__$1;
 exports.applyNextFetchPolicy = applyNextFetchPolicy;
 exports.checkFetcher = checkFetcher;
 exports.concat = concat;