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

package/cache/cache.cjs

@@ -15,9 +15,12 @@ var ApolloCache = (function () {
         this.getFragmentDoc = optimism.wrap(utilities.getFragmentQueryDocument);
     }
     ApolloCache.prototype.batch = function (options) {
+        var _this = this;
         var optimisticId = typeof options.optimistic === "string" ? options.optimistic :
             options.optimistic === false ? null : void 0;
-        this.performTransaction(options.update, optimisticId);
+        var updateResult;
+        this.performTransaction(function () { return updateResult = options.update(_this); }, optimisticId);
+        return updateResult;
     };
     ApolloCache.prototype.recordOptimisticTransaction = function (transaction, optimisticId) {
         this.performTransaction(transaction, optimisticId);
@@ -61,20 +64,28 @@ var ApolloCache = (function () {
         }));
     };
     ApolloCache.prototype.updateQuery = function (options, update) {
-        var value = this.readQuery(options);
-        var data = update(value);
-        if (data === void 0 || data === null)
-            return value;
-        this.writeQuery(tslib.__assign(tslib.__assign({}, options), { data: data }));
-        return data;
+        return this.batch({
+            update: function (cache) {
+                var value = cache.readQuery(options);
+                var data = update(value);
+                if (data === void 0 || data === null)
+                    return value;
+                cache.writeQuery(tslib.__assign(tslib.__assign({}, options), { data: data }));
+                return data;
+            },
+        });
     };
     ApolloCache.prototype.updateFragment = function (options, update) {
-        var value = this.readFragment(options);
-        var data = update(value);
-        if (data === void 0 || data === null)
-            return value;
-        this.writeFragment(tslib.__assign(tslib.__assign({}, options), { data: data }));
-        return data;
+        return this.batch({
+            update: function (cache) {
+                var value = cache.readFragment(options);
+                var data = update(value);
+                if (data === void 0 || data === null)
+                    return value;
+                cache.writeFragment(tslib.__assign(tslib.__assign({}, options), { data: data }));
+                return data;
+            },
+        });
     };
     return ApolloCache;
 }());
@@ -83,21 +94,47 @@ exports.Cache = void 0;
 (function (Cache) {
 })(exports.Cache || (exports.Cache = {}));
 
-var MissingFieldError = (function (_super) {
-    tslib.__extends(MissingFieldError, _super);
+var MissingFieldError = (function () {
     function MissingFieldError(message, path, query, variables) {
-        var _this = _super.call(this, message) || this;
-        _this.message = message;
-        _this.path = path;
-        _this.query = query;
-        _this.variables = variables;
-        _this.__proto__ = MissingFieldError.prototype;
-        return _this;
+        this.message = message;
+        this.path = path;
+        this.query = query;
+        this.variables = variables;
     }
     return MissingFieldError;
-}(Error));
+}());
 
 var hasOwn = Object.prototype.hasOwnProperty;
+function defaultDataIdFromObject(_a, context) {
+    var __typename = _a.__typename, id = _a.id, _id = _a._id;
+    if (typeof __typename === "string") {
+        if (context) {
+            context.keyObject =
+                id !== void 0 ? { id: id } :
+                    _id !== void 0 ? { _id: _id } :
+                        void 0;
+        }
+        if (id === void 0)
+            id = _id;
+        if (id !== void 0) {
+            return __typename + ":" + ((typeof id === "number" ||
+                typeof id === "string") ? id : JSON.stringify(id));
+        }
+    }
+}
+var defaultConfig = {
+    dataIdFromObject: defaultDataIdFromObject,
+    addTypename: true,
+    resultCaching: true,
+    canonizeResults: false,
+};
+function normalizeConfig(config) {
+    return utilities.compact(defaultConfig, config);
+}
+function shouldCanonizeResults(config) {
+    var value = config.canonizeResults;
+    return value === void 0 ? defaultConfig.canonizeResults : value;
+}
 function getTypenameFromStoreObject(store, objectOrReference) {
     return utilities.isReference(objectOrReference)
         ? store.get(objectOrReference.__ref, "__typename")
@@ -326,14 +363,14 @@ exports.EntityStore = (function () {
         }
         return false;
     };
-    EntityStore.prototype.evict = function (options) {
+    EntityStore.prototype.evict = function (options, limit) {
         var evicted = false;
         if (options.id) {
             if (hasOwn.call(this.data, options.id)) {
                 evicted = this.delete(options.id, options.fieldName, options.args);
             }
-            if (this instanceof Layer) {
-                evicted = this.parent.evict(options) || evicted;
+            if (this instanceof Layer && this !== limit) {
+                evicted = this.parent.evict(options, limit) || evicted;
             }
             if (options.fieldName || evicted) {
                 this.group.dirty(options.id, options.fieldName || "__exists");
@@ -706,9 +743,6 @@ function resetCanonicalStringify() {
     stringifyCache = new (utilities.canUseWeakMap ? WeakMap : Map)();
 }
 
-function missingFromInvariant(err, context) {
-    return new MissingFieldError(err.message, context.path.slice(), context.query, context.variables);
-}
 function execSelectionSetKeyArgs(options) {
     return [
         options.selectionSet,
@@ -721,7 +755,10 @@ var StoreReader = (function () {
     function StoreReader(config) {
         var _this = this;
         this.knownResults = new (utilities.canUseWeakMap ? WeakMap : Map)();
-        this.config = tslib.__assign(tslib.__assign({}, config), { addTypename: config.addTypename !== false });
+        this.config = utilities.compact(config, {
+            addTypename: config.addTypename !== false,
+            canonizeResults: shouldCanonizeResults(config),
+        });
         this.canon = config.canon || new ObjectCanon;
         this.executeSelectionSet = optimism.wrap(function (options) {
             var _a;
@@ -763,10 +800,11 @@ var StoreReader = (function () {
         this.canon = new ObjectCanon;
     };
     StoreReader.prototype.diffQueryAgainstStore = function (_a) {
-        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? true : _d;
+        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? this.config.canonizeResults : _d;
         var policies = this.config.cache.policies;
         variables = tslib.__assign(tslib.__assign({}, utilities.getDefaultValues(utilities.getQueryDefinition(query))), variables);
         var rootRef = utilities.makeReference(rootId);
+        var merger = new utilities.DeepMerger;
         var execResult = this.executeSelectionSet({
             selectionSet: utilities.getMainDefinition(query).selectionSet,
             objectOrReference: rootRef,
@@ -779,17 +817,22 @@ var StoreReader = (function () {
                 varString: canonicalStringify(variables),
                 canonizeResults: canonizeResults,
                 fragmentMap: utilities.createFragmentMap(utilities.getFragmentDefinitions(query)),
-                path: [],
+                merge: function (a, b) {
+                    return merger.merge(a, b);
+                },
             },
         });
-        var hasMissingFields = execResult.missing && execResult.missing.length > 0;
-        if (hasMissingFields && !returnPartialData) {
-            throw execResult.missing[0];
+        var missing;
+        if (execResult.missing) {
+            missing = [new MissingFieldError(firstMissing(execResult.missing), execResult.missing, query, variables)];
+            if (!returnPartialData) {
+                throw missing[0];
+            }
         }
         return {
             result: execResult.result,
-            missing: execResult.missing,
-            complete: !hasMissingFields,
+            complete: !missing,
+            missing: missing,
         };
     };
     StoreReader.prototype.isFresh = function (result, parent, selectionSet, context) {
@@ -810,30 +853,28 @@ var StoreReader = (function () {
             !context.store.has(objectOrReference.__ref)) {
             return {
                 result: this.canon.empty,
-                missing: [missingFromInvariant(__DEV__ ? new globals.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new globals.InvariantError(5), context)],
+                missing: "Dangling reference to missing " + objectOrReference.__ref + " object",
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
-        var objectsToMerge = [];
-        var finalResult = { result: null };
         var typename = store.getFieldValue(objectOrReference, "__typename");
+        var result = {};
+        var missing;
         if (this.config.addTypename &&
             typeof typename === "string" &&
             !policies.rootIdsByTypename[typename]) {
-            objectsToMerge.push({ __typename: typename });
+            result = { __typename: typename };
         }
-        function getMissing() {
-            return finalResult.missing || (finalResult.missing = []);
-        }
-        function handleMissing(result) {
+        function handleMissing(result, resultName) {
             var _a;
-            if (result.missing)
-                (_a = getMissing()).push.apply(_a, result.missing);
+            if (result.missing) {
+                missing = context.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
+            }
             return result.result;
         }
         var workSet = new Set(selectionSet.selections);
         workSet.forEach(function (selection) {
-            var _a;
+            var _a, _b;
             if (!utilities.shouldInclude(selection, variables))
                 return;
             if (utilities.isField(selection)) {
@@ -844,12 +885,13 @@ var StoreReader = (function () {
                     from: objectOrReference,
                 }, context);
                 var resultName = utilities.resultKeyNameFromField(selection);
-                context.path.push(resultName);
                 if (fieldValue === void 0) {
                     if (!utilities.addTypenameToDocument.added(selection)) {
-                        getMissing().push(missingFromInvariant(__DEV__ ? new globals.InvariantError("Can't find field '" + selection.name.value + "' on " + (utilities.isReference(objectOrReference)
-                            ? objectOrReference.__ref + " object"
-                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new globals.InvariantError(6), context));
+                        missing = context.merge(missing, (_a = {},
+                            _a[resultName] = "Can't find field '" + selection.name.value + "' on " + (utilities.isReference(objectOrReference)
+                                ? objectOrReference.__ref + " object"
+                                : "object " + JSON.stringify(objectOrReference, null, 2)),
+                            _a));
                     }
                 }
                 else if (Array.isArray(fieldValue)) {
@@ -858,7 +900,7 @@ var StoreReader = (function () {
                         array: fieldValue,
                         enclosingRef: enclosingRef,
                         context: context,
-                    }));
+                    }), resultName);
                 }
                 else if (!selection.selectionSet) {
                     if (context.canonizeResults) {
@@ -871,12 +913,11 @@ var StoreReader = (function () {
                         objectOrReference: fieldValue,
                         enclosingRef: utilities.isReference(fieldValue) ? fieldValue : enclosingRef,
                         context: context,
-                    }));
+                    }), resultName);
                 }
                 if (fieldValue !== void 0) {
-                    objectsToMerge.push((_a = {}, _a[resultName] = fieldValue, _a));
+                    result = context.merge(result, (_b = {}, _b[resultName] = fieldValue, _b));
                 }
-                globals.invariant(context.path.pop() === resultName);
             }
             else {
                 var fragment = utilities.getFragmentFromSelection(selection, context.fragmentMap);
@@ -885,23 +926,24 @@ var StoreReader = (function () {
                 }
             }
         });
-        var merged = utilities.mergeDeepArray(objectsToMerge);
-        finalResult.result = context.canonizeResults
-            ? this.canon.admit(merged)
-            : utilities.maybeDeepFreeze(merged);
-        this.knownResults.set(finalResult.result, selectionSet);
-        return finalResult;
+        var finalResult = { result: result, missing: missing };
+        var frozen = context.canonizeResults
+            ? this.canon.admit(finalResult)
+            : utilities.maybeDeepFreeze(finalResult);
+        if (frozen.result) {
+            this.knownResults.set(frozen.result, selectionSet);
+        }
+        return frozen;
     };
     StoreReader.prototype.execSubSelectedArrayImpl = function (_a) {
         var _this = this;
         var field = _a.field, array = _a.array, enclosingRef = _a.enclosingRef, context = _a.context;
         var missing;
         function handleMissing(childResult, i) {
+            var _a;
             if (childResult.missing) {
-                missing = missing || [];
-                missing.push.apply(missing, childResult.missing);
+                missing = context.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
             }
-            globals.invariant(context.path.pop() === i);
             return childResult.result;
         }
         if (field.selectionSet) {
@@ -911,7 +953,6 @@ var StoreReader = (function () {
             if (item === null) {
                 return null;
             }
-            context.path.push(i);
             if (Array.isArray(item)) {
                 return handleMissing(_this.executeSubSelectedArray({
                     field: field,
@@ -931,7 +972,6 @@ var StoreReader = (function () {
             if (__DEV__) {
                 assertSelectionSetForIdValue(context.store, field, item);
             }
-            globals.invariant(context.path.pop() === i);
             return item;
         });
         return {
@@ -941,12 +981,24 @@ var StoreReader = (function () {
     };
     return StoreReader;
 }());
+function firstMissing(tree) {
+    try {
+        JSON.stringify(tree, function (_, value) {
+            if (typeof value === "string")
+                throw value;
+            return value;
+        });
+    }
+    catch (result) {
+        return result;
+    }
+}
 function assertSelectionSetForIdValue(store, field, fieldValue) {
     if (!field.selectionSet) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (utilities.isNonNullObject(value)) {
-                __DEV__ ? globals.invariant(!utilities.isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : globals.invariant(!utilities.isReference(value), 7);
+                __DEV__ ? globals.invariant(!utilities.isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : globals.invariant(!utilities.isReference(value), 5);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -985,7 +1037,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!utilities.isReference(ref)) {
-            throw __DEV__ ? new globals.InvariantError("Could not identify object " + JSON.stringify(result)) : new globals.InvariantError(8);
+            throw __DEV__ ? new globals.InvariantError("Could not identify object " + JSON.stringify(result)) : new globals.InvariantError(6);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var fields = _a.fields, mergeTree = _a.mergeTree, selections = _a.selections;
@@ -1345,23 +1397,6 @@ function argsFromFieldSpecifier(spec) {
     return spec.args !== void 0 ? spec.args :
         spec.field ? utilities.argumentsObjectFromField(spec.field, spec.variables) : null;
 }
-var defaultDataIdFromObject = function (_a, context) {
-    var __typename = _a.__typename, id = _a.id, _id = _a._id;
-    if (typeof __typename === "string") {
-        if (context) {
-            context.keyObject =
-                id !== void 0 ? { id: id } :
-                    _id !== void 0 ? { _id: _id } :
-                        void 0;
-        }
-        if (id === void 0)
-            id = _id;
-        if (id !== void 0) {
-            return __typename + ":" + ((typeof id === "number" ||
-                typeof id === "string") ? id : JSON.stringify(id));
-        }
-    }
-};
 var nullKeyFieldsFn = function () { return void 0; };
 var simpleKeyArgsFn = function (_args, context) { return context.fieldName; };
 var mergeTrueFn = function (existing, incoming, _a) {
@@ -1879,12 +1914,6 @@ function computeKeyArgsObject(specifier, field, source, variables) {
     return keyObj;
 }
 
-var defaultConfig = {
-    dataIdFromObject: defaultDataIdFromObject,
-    addTypename: true,
-    resultCaching: true,
-    typePolicies: {},
-};
 var InMemoryCache = (function (_super) {
     tslib.__extends(InMemoryCache, _super);
     function InMemoryCache(config) {
@@ -1894,7 +1923,7 @@ var InMemoryCache = (function (_super) {
         _this.typenameDocumentCache = new Map();
         _this.makeVar = makeVar;
         _this.txCount = 0;
-        _this.config = tslib.__assign(tslib.__assign({}, defaultConfig), config);
+        _this.config = normalizeConfig(config);
         _this.addTypename = !!_this.config.addTypename;
         _this.policies = new Policies({
             cache: _this,
@@ -1920,6 +1949,7 @@ var InMemoryCache = (function (_super) {
             cache: this,
             addTypename: this.addTypename,
             resultCacheMaxSize: this.config.resultCacheMaxSize,
+            canonizeResults: shouldCanonizeResults(this.config),
             canon: resetResultIdentities
                 ? void 0
                 : previousReader && previousReader.canon,
@@ -2048,7 +2078,7 @@ var InMemoryCache = (function (_super) {
         }
         try {
             ++this.txCount;
-            return this.optimisticData.evict(options);
+            return this.optimisticData.evict(options, this.data);
         }
         finally {
             if (!--this.txCount && options.broadcast !== false) {
@@ -2057,8 +2087,11 @@ var InMemoryCache = (function (_super) {
         }
     };
     InMemoryCache.prototype.reset = function () {
+        var _this = this;
         this.init();
-        this.broadcastWatches();
+        this.watches.forEach(function (watch) { return _this.maybeBroadcastWatch.forget(watch); });
+        this.watches.clear();
+        forgetCache(this);
         canonicalStringify.reset();
         return Promise.resolve();
     };
@@ -2072,6 +2105,7 @@ var InMemoryCache = (function (_super) {
     InMemoryCache.prototype.batch = function (options) {
         var _this = this;
         var update = options.update, _a = options.optimistic, optimistic = _a === void 0 ? true : _a, removeOptimistic = options.removeOptimistic, onWatchUpdated = options.onWatchUpdated;
+        var updateResult;
         var perform = function (layer) {
             var _a = _this, data = _a.data, optimisticData = _a.optimisticData;
             ++_this.txCount;
@@ -2079,7 +2113,7 @@ var InMemoryCache = (function (_super) {
                 _this.data = _this.optimisticData = layer;
             }
             try {
-                update(_this);
+                return updateResult = update(_this);
             }
             finally {
                 --_this.txCount;
@@ -2121,6 +2155,7 @@ var InMemoryCache = (function (_super) {
         else {
             this.broadcastWatches(options);
         }
+        return updateResult;
     };
     InMemoryCache.prototype.performTransaction = function (update, optimisticId) {
         return this.batch({
@@ -2148,11 +2183,7 @@ var InMemoryCache = (function (_super) {
     };
     InMemoryCache.prototype.broadcastWatch = function (c, options) {
         var lastDiff = c.lastDiff;
-        var diff = this.diff({
-            query: c.query,
-            variables: c.variables,
-            optimistic: c.optimistic,
-        });
+        var diff = this.diff(c);
         if (options) {
             if (c.optimistic &&
                 typeof options.optimistic === "string") {