@apollo/client 3.4.0-rc.7 → 3.4.1

package/cache/cache.cjs.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tsInvariant = require('ts-invariant');
 var utilities = require('../utilities');
 var tslib = require('tslib');
 var optimism = require('optimism');
-var tsInvariant = require('ts-invariant');
 var equality = require('@wry/equality');
 var trie = require('@wry/trie');
 var context = require('@wry/context');
@@ -191,6 +191,10 @@ exports.EntityStore = (function () {
     EntityStore.prototype.merge = function (older, newer) {
         var _this = this;
         var dataId;
+        if (utilities.isReference(older))
+            older = older.__ref;
+        if (utilities.isReference(newer))
+            newer = newer.__ref;
         var existing = typeof older === "string"
             ? this.lookup(dataId = older)
             : older;
@@ -199,7 +203,7 @@ exports.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 utilities.DeepMerger(storeObjectReconciler).merge(existing, incoming);
         this.data[dataId] = merged;
         if (merged !== existing) {
@@ -258,8 +262,7 @@ exports.EntityStore = (function () {
                     : fields[storeFieldName] || fields[fieldName];
                 if (modify) {
                     var newValue = modify === delModifier ? DELETE :
-                        modify(utilities.maybeDeepFreeze(fieldValue), tslib.__assign(tslib.__assign({}, sharedDetails_1), { fieldName: fieldName,
-                            storeFieldName: storeFieldName, storage: _this.getStorage(dataId, storeFieldName) }));
+                        modify(utilities.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);
                     }
@@ -401,15 +404,21 @@ exports.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 (utilities.isReference(obj)) {
                     found_1[obj.__ref] = true;
                 }
-                else if (utilities.isNonNullObject(obj)) {
-                    Object.values(obj)
-                        .filter(utilities.isNonNullObject)
-                        .forEach(workSet_1.add, workSet_1);
+                if (utilities.isNonNullObject(obj)) {
+                    Object.keys(obj).forEach(function (key) {
+                        var child = obj[key];
+                        if (utilities.isNonNullObject(child)) {
+                            workSet_1.add(child);
+                        }
+                    });
                 }
             });
         }
@@ -426,9 +435,12 @@ var CacheGroup = (function () {
         this.caching = caching;
         this.parent = parent;
         this.d = null;
-        this.keyMaker = new trie.Trie(utilities.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(utilities.canUseWeakMap);
+    };
     CacheGroup.prototype.depend = function (dataId, storeFieldName) {
         if (this.d) {
             this.d(makeDepKey(dataId, storeFieldName));
@@ -574,7 +586,7 @@ function shallowCopy(value) {
 }
 var ObjectCanon = (function () {
     function ObjectCanon() {
-        this.known = new (utilities.canUseWeakMap ? WeakSet : Set)();
+        this.known = new (utilities.canUseWeakSet ? WeakSet : Set)();
         this.pool = new trie.Trie(utilities.canUseWeakMap);
         this.passes = new WeakMap();
         this.keysByJSON = new Map();
@@ -657,6 +669,9 @@ var ObjectCanon = (function () {
 }());
 var canonicalStringify = Object.assign(function (value) {
     if (utilities.isNonNullObject(value)) {
+        if (stringifyCanon === void 0) {
+            resetCanonicalStringify();
+        }
         var canonical = stringifyCanon.admit(value);
         var json = stringifyCache.get(canonical);
         if (json === void 0) {
@@ -666,12 +681,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 (utilities.canUseWeakMap ? WeakMap : Map)();
+}
 
 function missingFromInvariant(err, context) {
     return new MissingFieldError(err.message, context.path.slice(), context.query, context.variables);
@@ -687,9 +704,9 @@ function execSelectionSetKeyArgs(options) {
 var StoreReader = (function () {
     function StoreReader(config) {
         var _this = this;
-        this.canon = new ObjectCanon;
-        this.knownResults = new WeakMap();
+        this.knownResults = new (utilities.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;
@@ -726,6 +743,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;
@@ -774,7 +794,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;
@@ -813,7 +833,7 @@ var StoreReader = (function () {
                     if (!utilities.addTypenameToDocument.added(selection)) {
                         getMissing().push(missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Can't find field '" + selection.name.value + "' on " + (utilities.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)) {
@@ -910,7 +930,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (utilities.isNonNullObject(value)) {
-                __DEV__ ? tsInvariant.invariant(!utilities.isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!utilities.isReference(value), 7);
+                __DEV__ ? tsInvariant.invariant(!utilities.isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!utilities.isReference(value), 8);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -939,6 +959,7 @@ var StoreWriter = (function () {
             fragmentMap: utilities.createFragmentMap(utilities.getFragmentDefinitions(query)),
             overwrite: !!overwrite,
             incomingById: new Map,
+            clientOnly: false,
         };
         var ref = this.processSelectionSet({
             result: result || Object.create(null),
@@ -948,13 +969,17 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!utilities.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 = utilities.makeReference(dataId);
             if (mergeTree.map.size) {
-                fields = _this.applyMerges(mergeTree, entityRef, fields, context);
+                var applied = _this.applyMerges(mergeTree, entityRef, fields, context);
+                if (utilities.isReference(applied)) {
+                    return;
+                }
+                fields = applied;
             }
             if (__DEV__ && !context.overwrite) {
                 var hasSelectionSet_1 = function (storeFieldName) {
@@ -1016,7 +1041,10 @@ var StoreWriter = (function () {
             if (utilities.isField(selection)) {
                 var resultFieldKey = utilities.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,
@@ -1048,10 +1076,11 @@ var StoreWriter = (function () {
                         _a[storeFieldName] = incomingValue,
                         _a));
                 }
-                else if (policies.usingPossibleTypes &&
-                    !utilities.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 &&
+                    !utilities.addTypenameToDocument.added(selection)) {
+                    __DEV__ && tsInvariant.invariant.error(("Missing field '" + utilities.resultKeyNameFromField(selection) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
                 }
+                context.clientOnly = wasClientOnly;
             }
             else {
                 var fragment = utilities.getFragmentFromSelection(selection, context.fragmentMap);
@@ -1437,7 +1466,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;
@@ -1650,12 +1679,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 (utilities.isNonNullObject(fieldNameOrOptions)) {
+                options = tslib.__assign({}, fieldNameOrOptions);
+                if (!hasOwn.call(fieldNameOrOptions, "from")) {
+                    options.from = objectOrReference;
+                }
+            }
+            else {
+                __DEV__ && tsInvariant.invariant.warn("Unexpected readField arguments: " + utilities.stringifyForDisplay(Array.from(arguments)));
+                return;
+            }
+            if (__DEV__ && options.from === void 0) {
+                __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + utilities.stringifyForDisplay(Array.from(arguments)));
             }
             if (void 0 === options.variables) {
                 options.variables = variables;
@@ -1668,7 +1710,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 (utilities.isNonNullObject(existing) &&
             utilities.isNonNullObject(incoming)) {
@@ -1765,7 +1807,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;
             }
         }
@@ -1800,16 +1842,23 @@ var InMemoryCache = (function (_super) {
         return _this;
     }
     InMemoryCache.prototype.init = function () {
-        var _this = this;
         var rootStore = this.data = new exports.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);
@@ -1823,8 +1872,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;
@@ -1892,9 +1946,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);
@@ -2037,7 +2100,8 @@ var InMemoryCache = (function (_super) {
     return InMemoryCache;
 }(ApolloCache));
 
-exports.__DEV__ = utilities.__DEV__;
+__DEV__ ? tsInvariant.invariant("boolean" === typeof utilities.DEV, utilities.DEV) : tsInvariant.invariant("boolean" === typeof utilities.DEV, 1);
+
 exports.isReference = utilities.isReference;
 exports.makeReference = utilities.makeReference;
 exports.ApolloCache = ApolloCache;