@apollo/client 3.2.0-beta.9 → 3.2.2

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Meteor Development Group, Inc.
+Copyright (c) 2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/apollo-client.cjs.js

@@ -1188,7 +1188,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(23) : new tsInvariant.InvariantError('request is not implemented');
+        throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(21) : new tsInvariant.InvariantError('request is not implemented');
     };
     ApolloLink.prototype.onError = function (reason) {
         throw reason;
@@ -1250,7 +1250,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(25) : new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message);
+        var parseError = process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(23) : new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1300,7 +1300,7 @@ var selectHttpOptionsAndBody = function (operation, fallbackConfig) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(24) : 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    ");
+        throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(22) : 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    ");
     }
 };
 
@@ -1606,7 +1606,7 @@ var Reobserver = (function () {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(pollInterval, 22) : tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.');
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(pollInterval, 20) : tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.');
         if (this.shouldFetch === false) {
             return;
         }
@@ -1655,7 +1655,7 @@ var ObservableQuery = (function (_super) {
                 }
             },
             error: function (error) {
-                _this.updateLastResult(tslib.__assign(tslib.__assign({}, _this.lastResult), { errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false }));
+                _this.updateLastResult(tslib.__assign(tslib.__assign({}, _this.lastResult), { error: error, errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false }));
                 iterateObserversSafely(_this.observers, 'error', _this.lastError = error);
             },
         };
@@ -1696,13 +1696,15 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        var _a = this, lastResult = _a.lastResult, lastError = _a.lastError;
-        var networkStatus = this.queryInfo.networkStatus || exports.NetworkStatus.ready;
-        var result = tslib.__assign(tslib.__assign({}, (lastError ? { error: lastError } : lastResult)), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
+        var lastResult = this.lastResult;
+        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 _b = this.options.fetchPolicy, fetchPolicy = _b === void 0 ? 'cache-first' : _b;
+        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? 'cache-first' : _a;
         if (fetchPolicy === 'no-cache' ||
             fetchPolicy === 'network-only') {
             delete result.partial;
@@ -1749,13 +1751,10 @@ var ObservableQuery = (function (_super) {
         this.queryManager.resetErrors(this.queryId);
     };
     ObservableQuery.prototype.refetch = function (variables) {
-        var fetchPolicy = this.options.fetchPolicy;
-        if (fetchPolicy === 'cache-only') {
-            return Promise.reject(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(13) : new tsInvariant.InvariantError('cache-only fetchPolicy option should not be used together with query refetch.'));
-        }
         var reobserveOptions = {
             pollInterval: 0,
         };
+        var fetchPolicy = this.options.fetchPolicy;
         if (fetchPolicy !== 'no-cache' &&
             fetchPolicy !== 'cache-and-network') {
             reobserveOptions.fetchPolicy = 'network-only';
@@ -2052,11 +2051,27 @@ function getTypenameFromStoreObject(store, objectOrReference) {
         ? store.get(objectOrReference.__ref, "__typename")
         : objectOrReference && objectOrReference.__typename;
 }
-var FieldNamePattern = /^[_A-Za-z0-9]+/;
+var TypeOrFieldNameRegExp = /^[_a-z][_0-9a-z]*/i;
 function fieldNameFromStoreName(storeFieldName) {
-    var match = storeFieldName.match(FieldNamePattern);
+    var match = storeFieldName.match(TypeOrFieldNameRegExp);
     return match ? match[0] : storeFieldName;
 }
+function selectionSetMatchesResult(selectionSet, result, variables) {
+    if (result && typeof result === "object") {
+        return Array.isArray(result)
+            ? result.every(function (item) { return selectionSetMatchesResult(selectionSet, item, variables); })
+            : selectionSet.selections.every(function (field) {
+                if (isField(field) && shouldInclude(field, variables)) {
+                    var key = resultKeyNameFromField(field);
+                    return hasOwn.call(result, key) &&
+                        (!field.selectionSet ||
+                            selectionSetMatchesResult(field.selectionSet, result[key], variables));
+                }
+                return true;
+            });
+    }
+    return false;
+}
 function storeValueIsStoreObject(value) {
     return value !== null &&
         typeof value === "object" &&
@@ -2088,6 +2103,7 @@ var reconcileProcessedFields = function (existingObject, incomingObject, propert
 
 var DELETE = Object.create(null);
 var delModifier = function () { return DELETE; };
+var INVALIDATE = Object.create(null);
 var EntityStore = (function () {
     function EntityStore(policies, group) {
         var _this = this;
@@ -2179,10 +2195,17 @@ var EntityStore = (function () {
             var changedFields_1 = Object.create(null);
             var needToMerge_1 = false;
             var allDeleted_1 = true;
-            var readField_1 = function (fieldNameOrOptions, from) { return _this.policies.readField(typeof fieldNameOrOptions === "string" ? {
-                fieldName: fieldNameOrOptions,
-                from: from || makeReference(dataId),
-            } : fieldNameOrOptions, { store: _this }); };
+            var sharedDetails_1 = {
+                DELETE: DELETE,
+                INVALIDATE: INVALIDATE,
+                isReference: isReference,
+                toReference: this.toReference,
+                canRead: this.canRead,
+                readField: function (fieldNameOrOptions, from) { return _this.policies.readField(typeof fieldNameOrOptions === "string" ? {
+                    fieldName: fieldNameOrOptions,
+                    from: from || makeReference(dataId),
+                } : fieldNameOrOptions, { store: _this }); },
+            };
             Object.keys(storeObject).forEach(function (storeFieldName) {
                 var fieldName = fieldNameFromStoreName(storeFieldName);
                 var fieldValue = storeObject[storeFieldName];
@@ -2193,21 +2216,19 @@ var EntityStore = (function () {
                     : fields[storeFieldName] || fields[fieldName];
                 if (modify) {
                     var newValue = modify === delModifier ? DELETE :
-                        modify(maybeDeepFreeze(fieldValue), {
-                            DELETE: DELETE,
-                            fieldName: fieldName,
-                            storeFieldName: storeFieldName,
-                            isReference: isReference,
-                            toReference: _this.toReference,
-                            canRead: _this.canRead,
-                            readField: readField_1,
-                        });
-                    if (newValue === DELETE)
-                        newValue = void 0;
-                    if (newValue !== fieldValue) {
-                        changedFields_1[storeFieldName] = newValue;
-                        needToMerge_1 = true;
-                        fieldValue = newValue;
+                        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);
+                    }
+                    else {
+                        if (newValue === DELETE)
+                            newValue = void 0;
+                        if (newValue !== fieldValue) {
+                            changedFields_1[storeFieldName] = newValue;
+                            needToMerge_1 = true;
+                            fieldValue = newValue;
+                        }
                     }
                 }
                 if (fieldValue !== void 0) {
@@ -2369,6 +2390,7 @@ function makeDepKey(dataId, storeFieldName) {
         function Root(_a) {
             var policies = _a.policies, _b = _a.resultCaching, resultCaching = _b === void 0 ? true : _b, seed = _a.seed;
             var _this = _super.call(this, policies, new CacheGroup(resultCaching)) || this;
+            _this.storageTrie = new optimism.KeyTrie(canUseWeakMap);
             _this.sharedLayerGroup = new CacheGroup(resultCaching);
             if (seed)
                 _this.replace(seed);
@@ -2380,6 +2402,9 @@ function makeDepKey(dataId, storeFieldName) {
         Root.prototype.removeLayer = function () {
             return this;
         };
+        Root.prototype.getStorage = function (idOrObj, storeFieldName) {
+            return this.storageTrie.lookup(idOrObj, storeFieldName);
+        };
         return Root;
     }(EntityStore));
     EntityStore.Root = Root;
@@ -2422,6 +2447,9 @@ var Layer = (function (_super) {
         var fromParent = this.parent.findChildRefIds(dataId);
         return hasOwn.call(this.data, dataId) ? tslib.__assign(tslib.__assign({}, fromParent), _super.prototype.findChildRefIds.call(this, dataId)) : fromParent;
     };
+    Layer.prototype.getStorage = function (idOrObj, storeFieldName) {
+        return this.parent.getStorage(idOrObj, storeFieldName);
+    };
     return Layer;
 }(EntityStore));
 function storeObjectReconciler(existingObject, incomingObject, property) {
@@ -2467,9 +2495,6 @@ var StoreReader = (function () {
         });
         this.config = tslib.__assign({ addTypename: true }, config);
     }
-    StoreReader.prototype.readQueryFromStore = function (options) {
-        return this.diffQueryAgainstStore(tslib.__assign(tslib.__assign({}, options), { returnPartialData: false })).result;
-    };
     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;
         var policies = this.config.cache.policies;
@@ -2519,7 +2544,7 @@ var StoreReader = (function () {
                 missing: [missingFromInvariant(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(4) : new tsInvariant.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object"), context)],
             };
         }
-        var fragmentMap = context.fragmentMap, variables = context.variables, policies = context.policies, store = context.store;
+        var variables = context.variables, policies = context.policies, store = context.store;
         var objectsToMerge = [];
         var finalResult = { result: null };
         var typename = store.getFieldValue(objectOrReference, "__typename");
@@ -2588,14 +2613,8 @@ var StoreReader = (function () {
                 tsInvariant.invariant(context.path.pop() === resultName);
             }
             else {
-                var fragment = void 0;
-                if (isInlineFragment(selection)) {
-                    fragment = selection;
-                }
-                else {
-                    process.env.NODE_ENV === "production" ? tsInvariant.invariant(fragment = fragmentMap[selection.name.value], 6) : tsInvariant.invariant(fragment = fragmentMap[selection.name.value], "No fragment named " + selection.name.value);
-                }
-                if (policies.fragmentMatches(fragment, typename)) {
+                var fragment = getFragmentFromSelection(selection, context.fragmentMap);
+                if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
                 }
             }
@@ -2659,7 +2678,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (value && typeof value === "object") {
-                process.env.NODE_ENV === "production" ? tsInvariant.invariant(!isReference(value), 7) : tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value);
+                process.env.NODE_ENV === "production" ? tsInvariant.invariant(!isReference(value), 6) : tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2692,7 +2711,7 @@ var StoreWriter = (function () {
             },
         });
         if (!isReference(ref)) {
-            throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(8) : new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result));
+            throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(7) : new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result));
         }
         store.retain(ref.__ref);
         return ref;
@@ -2755,12 +2774,13 @@ var StoreWriter = (function () {
                 }
                 else if (policies.usingPossibleTypes &&
                     !hasDirectives(["defer", "client"], selection)) {
-                    throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(9) : new tsInvariant.InvariantError("Missing field '" + resultFieldKey + "' in " + JSON.stringify(result, null, 2).substring(0, 100));
+                    throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(8) : new tsInvariant.InvariantError("Missing field '" + resultFieldKey + "' in " + JSON.stringify(result, null, 2).substring(0, 100));
                 }
             }
             else {
                 var fragment = getFragmentFromSelection(selection, context.fragmentMap);
-                if (fragment && policies.fragmentMatches(fragment, typename)) {
+                if (fragment &&
+                    policies.fragmentMatches(fragment, typename, result, context.variables)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
                 }
             }
@@ -2917,10 +2937,11 @@ var Policies = (function () {
     function Policies(config) {
         this.config = config;
         this.typePolicies = Object.create(null);
+        this.supertypeMap = new Map();
+        this.fuzzySubtypes = new Map();
         this.rootIdsByTypename = Object.create(null);
         this.rootTypenamesById = Object.create(null);
         this.usingPossibleTypes = false;
-        this.storageTrie = new optimism.KeyTrie(true);
         this.config = tslib.__assign({ dataIdFromObject: defaultDataIdFromObject }, config);
         this.cache = this.config.cache;
         this.setRootTypename("Query");
@@ -3023,8 +3044,14 @@ var Policies = (function () {
         var _this = this;
         this.usingPossibleTypes = true;
         Object.keys(possibleTypes).forEach(function (supertype) {
-            var subtypeSet = _this.getSubtypeSet(supertype, true);
-            possibleTypes[supertype].forEach(subtypeSet.add, subtypeSet);
+            _this.getSupertypeSet(supertype, true);
+            possibleTypes[supertype].forEach(function (subtype) {
+                _this.getSupertypeSet(subtype, true).add(supertype);
+                var match = subtype.match(TypeOrFieldNameRegExp);
+                if (!match || match[0] !== subtype) {
+                    _this.fuzzySubtypes.set(subtype, new RegExp(subtype));
+                }
+            });
         });
     };
     Policies.prototype.getTypePolicy = function (typename, createIfMissing) {
@@ -3032,12 +3059,6 @@ var Policies = (function () {
             return this.typePolicies[typename] || (createIfMissing && (this.typePolicies[typename] = Object.create(null)));
         }
     };
-    Policies.prototype.getSubtypeSet = function (supertype, createIfMissing) {
-        var policy = this.getTypePolicy(supertype, createIfMissing);
-        if (policy) {
-            return policy.subtypes || (createIfMissing ? policy.subtypes = new Set() : void 0);
-        }
-    };
     Policies.prototype.getFieldPolicy = function (typename, fieldName, createIfMissing) {
         var typePolicy = this.getTypePolicy(typename, createIfMissing);
         if (typePolicy) {
@@ -3047,7 +3068,14 @@ var Policies = (function () {
             }
         }
     };
-    Policies.prototype.fragmentMatches = function (fragment, typename) {
+    Policies.prototype.getSupertypeSet = function (subtype, createIfMissing) {
+        var supertypeSet = this.supertypeMap.get(subtype);
+        if (!supertypeSet && createIfMissing) {
+            this.supertypeMap.set(subtype, supertypeSet = new Set());
+        }
+        return supertypeSet;
+    };
+    Policies.prototype.fragmentMatches = function (fragment, typename, result, variables) {
         var _this = this;
         if (!fragment.typeCondition)
             return true;
@@ -3056,17 +3084,41 @@ var Policies = (function () {
         var supertype = fragment.typeCondition.name.value;
         if (typename === supertype)
             return true;
-        if (this.usingPossibleTypes) {
-            var workQueue_1 = [this.getSubtypeSet(supertype, false)];
+        if (this.usingPossibleTypes &&
+            this.supertypeMap.has(supertype)) {
+            var typenameSupertypeSet = this.getSupertypeSet(typename, true);
+            var workQueue_1 = [typenameSupertypeSet];
+            var maybeEnqueue_1 = function (subtype) {
+                var supertypeSet = _this.getSupertypeSet(subtype, false);
+                if (supertypeSet &&
+                    supertypeSet.size &&
+                    workQueue_1.indexOf(supertypeSet) < 0) {
+                    workQueue_1.push(supertypeSet);
+                }
+            };
+            var needToCheckFuzzySubtypes = !!(result && this.fuzzySubtypes.size);
+            var checkingFuzzySubtypes = false;
             for (var i = 0; i < workQueue_1.length; ++i) {
-                var subtypes = workQueue_1[i];
-                if (subtypes) {
-                    if (subtypes.has(typename))
-                        return true;
-                    subtypes.forEach(function (subtype) {
-                        var subsubtypes = _this.getSubtypeSet(subtype, false);
-                        if (subsubtypes && workQueue_1.indexOf(subsubtypes) < 0) {
-                            workQueue_1.push(subsubtypes);
+                var supertypeSet = workQueue_1[i];
+                if (supertypeSet.has(supertype)) {
+                    if (!typenameSupertypeSet.has(supertype)) {
+                        if (checkingFuzzySubtypes) {
+                            process.env.NODE_ENV === "production" || tsInvariant.invariant.warn("Inferring subtype " + typename + " of supertype " + supertype);
+                        }
+                        typenameSupertypeSet.add(supertype);
+                    }
+                    return true;
+                }
+                supertypeSet.forEach(maybeEnqueue_1);
+                if (needToCheckFuzzySubtypes &&
+                    i === workQueue_1.length - 1 &&
+                    selectionSetMatchesResult(fragment.selectionSet, result, variables)) {
+                    needToCheckFuzzySubtypes = false;
+                    checkingFuzzySubtypes = true;
+                    this.fuzzySubtypes.forEach(function (regExp, fuzzyString) {
+                        var match = typename.match(regExp);
+                        if (match && match[0] === typename) {
+                            maybeEnqueue_1(fuzzyString);
                         }
                     });
                 }
@@ -3125,7 +3177,7 @@ var Policies = (function () {
         var policy = this.getFieldPolicy(options.typename, fieldName, false);
         var read = policy && policy.read;
         if (read) {
-            var readOptions = makeFieldFunctionOptions(this, objectOrReference, options, context, this.storageTrie.lookup(isReference(objectOrReference)
+            var readOptions = makeFieldFunctionOptions(this, objectOrReference, options, context, context.store.getStorage(isReference(objectOrReference)
                 ? objectOrReference.__ref
                 : objectOrReference, storeFieldName));
             return cacheSlot.withValue(this.cache, read, [existing, readOptions]);
@@ -3137,16 +3189,15 @@ var Policies = (function () {
         return !!(policy && policy.merge);
     };
     Policies.prototype.applyMerges = function (existing, incoming, context, storageKeys) {
+        var _a;
         var _this = this;
         if (isFieldValueToBeMerged(incoming)) {
             var field = incoming.__field;
             var fieldName = field.name.value;
             var merge = this.getFieldPolicy(incoming.__typename, fieldName, false).merge;
-            var storage = storageKeys
-                ? this.storageTrie.lookupArray(storageKeys)
-                : null;
             incoming = merge(existing, incoming.__value, makeFieldFunctionOptions(this, void 0, { typename: incoming.__typename, fieldName: fieldName,
-                field: field, variables: context.variables }, context, storage));
+                field: field, variables: context.variables }, context, storageKeys
+                ? (_a = context.store).getStorage.apply(_a, storageKeys) : Object.create(null)));
         }
         if (Array.isArray(incoming)) {
             return incoming.map(function (item) { return _this.applyMerges(void 0, item, context); });
@@ -3356,13 +3407,14 @@ var InMemoryCache = (function (_super) {
         if (typeof options.rootId === 'string' && !store.has(options.rootId)) {
             return null;
         }
-        return this.storeReader.readQueryFromStore({
+        return this.storeReader.diffQueryAgainstStore({
             store: store,
             query: options.query,
             variables: options.variables,
             rootId: options.rootId,
             config: this.config,
-        }) || null;
+            returnPartialData: false,
+        }).result || null;
     };
     InMemoryCache.prototype.write = function (options) {
         try {
@@ -3696,7 +3748,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            process.env.NODE_ENV === "production" ? tsInvariant.invariant(fragment, 12) : tsInvariant.invariant(fragment, "No fragment named " + selection.name.value);
+                            process.env.NODE_ENV === "production" ? tsInvariant.invariant(fragment, 11) : tsInvariant.invariant(fragment, "No fragment named " + selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -3953,13 +4005,7 @@ var QueryInfo = (function () {
             this.diff = { result: result.data, complete: true };
         }
         else if (allowCacheWrite) {
-            var ignoreErrors = options.errorPolicy === 'ignore' ||
-                options.errorPolicy === 'all';
-            var writeWithErrors = !graphQLResultHasError(result);
-            if (!writeWithErrors && ignoreErrors && result.data) {
-                writeWithErrors = true;
-            }
-            if (writeWithErrors) {
+            if (shouldWriteResult(result, options.errorPolicy)) {
                 this.cache.performTransaction(function (cache) {
                     if (_this.shouldWrite(result, options.variables)) {
                         cache.writeQuery({
@@ -4014,6 +4060,16 @@ var QueryInfo = (function () {
     };
     return QueryInfo;
 }());
+function shouldWriteResult(result, errorPolicy) {
+    if (errorPolicy === void 0) { errorPolicy = "none"; }
+    var ignoreErrors = errorPolicy === "ignore" ||
+        errorPolicy === "all";
+    var writeWithErrors = !graphQLResultHasError(result);
+    if (!writeWithErrors && ignoreErrors && result.data) {
+        writeWithErrors = true;
+    }
+    return writeWithErrors;
+}
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 var QueryManager = (function () {
@@ -4042,7 +4098,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(14) : new tsInvariant.InvariantError('QueryManager stopped while query was in flight'));
+        this.cancelPendingFetches(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(12) : new tsInvariant.InvariantError('QueryManager stopped while query was in flight'));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -4056,8 +4112,8 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
-                        process.env.NODE_ENV === "production" ? tsInvariant.invariant(mutation, 15) : tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.');
-                        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', 16) : 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.");
+                        process.env.NODE_ENV === "production" ? tsInvariant.invariant(mutation, 13) : tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.');
+                        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!fetchPolicy || fetchPolicy === 'no-cache', 14) : 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.");
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -4098,6 +4154,7 @@ var QueryManager = (function () {
                                         result: { data: optimistic_1 },
                                         document: mutation,
                                         variables: variables,
+                                        errorPolicy: errorPolicy,
                                         queryUpdatersById: generateUpdateQueriesInfo(),
                                         update: updateWithProxyFn,
                                     }, cache);
@@ -4128,6 +4185,7 @@ var QueryManager = (function () {
                                                     result: result,
                                                     document: mutation,
                                                     variables: variables,
+                                                    errorPolicy: errorPolicy,
                                                     queryUpdatersById: generateUpdateQueriesInfo(),
                                                     update: updateWithProxyFn,
                                                 }, self.cache);
@@ -4279,11 +4337,11 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.query = function (options) {
         var _this = this;
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.query, 17) : tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.query, 15) : tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
             'in the query option.');
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.query.kind === 'Document', 18) : tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.');
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!options.returnPartialData, 19) : tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.');
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!options.pollInterval, 20) : tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.');
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.query.kind === 'Document', 16) : tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.');
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!options.returnPartialData, 17) : tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.');
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(!options.pollInterval, 18) : tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.');
         var queryId = this.generateQueryId();
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
@@ -4306,7 +4364,7 @@ var QueryManager = (function () {
             queryInfo.stop();
     };
     QueryManager.prototype.clearStore = function () {
-        this.cancelPendingFetches(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(21) : new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)'));
+        this.cancelPendingFetches(process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(19) : new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)'));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -4348,13 +4406,13 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.startGraphQLSubscription = function (_a) {
         var _this = this;
-        var query = _a.query, fetchPolicy = _a.fetchPolicy, variables = _a.variables, _b = _a.context, context = _b === void 0 ? {} : _b;
+        var query = _a.query, fetchPolicy = _a.fetchPolicy, errorPolicy = _a.errorPolicy, variables = _a.variables, _b = _a.context, context = _b === void 0 ? {} : _b;
         query = this.transform(query).document;
         variables = this.getVariables(query, variables);
         var makeObservable = function (variables) {
             return _this.getObservableFromLink(query, context, variables, false).map(function (result) {
-                if (!fetchPolicy || fetchPolicy !== 'no-cache') {
-                    if (!graphQLResultHasError(result)) {
+                if (fetchPolicy !== 'no-cache') {
+                    if (shouldWriteResult(result, errorPolicy)) {
                         _this.cache.write({
                             query: query,
                             result: result.data,
@@ -4560,7 +4618,8 @@ var QueryManager = (function () {
             var data = diff.result;
             if (process.env.NODE_ENV !== 'production' &&
                 isNonEmptyArray(diff.missing) &&
-                !equality.equal(data, {})) {
+                !equality.equal(data, {}) &&
+                !returnPartialData) {
                 process.env.NODE_ENV === "production" || tsInvariant.invariant.warn("Missing cache result fields: " + diff.missing.map(function (m) { return m.path.join('.'); }).join(', '), diff.missing);
             }
             var fromData = function (data) { return Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
@@ -4640,7 +4699,7 @@ var QueryManager = (function () {
     return QueryManager;
 }());
 function markMutationResult(mutation, cache) {
-    if (!graphQLResultHasError(mutation.result)) {
+    if (shouldWriteResult(mutation.result, mutation.errorPolicy)) {
         var cacheWrites_1 = [{
                 result: mutation.result.data,
                 dataId: 'ROOT_MUTATION',
@@ -4699,7 +4758,7 @@ var ApolloClient = (function () {
                 : ApolloLink.empty();
         }
         if (!cache) {
-            throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(10) : new tsInvariant.InvariantError("To initialize Apollo Client, you must specify a 'cache' property " +
+            throw process.env.NODE_ENV === "production" ? new tsInvariant.InvariantError(9) : 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");
         }
@@ -4791,7 +4850,7 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = compact(this.defaultOptions.query, options);
         }
-        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 11) : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
+        process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 10) : 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.');
@@ -5454,12 +5513,12 @@ var QueryData = (function (_super) {
         }
     };
     QueryData.prototype.updateObservableQuery = function () {
-        if (this.getOptions().skip)
-            return;
         if (!this.currentObservable) {
             this.initializeObservableQuery();
             return;
         }
+        if (this.getOptions().skip)
+            return;
         var newObservableQueryOptions = tslib.__assign(tslib.__assign({}, this.prepareObservableQueryOptions()), { children: null });
         if (!equality.equal(newObservableQueryOptions, this.previousData.observableQueryOptions)) {
             this.previousData.observableQueryOptions = newObservableQueryOptions;