@apollo/client 3.2.0-beta.9 → 3.2.2

package/cache/cache.cjs.js

@@ -90,11 +90,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 (utilities.isField(field) && utilities.shouldInclude(field, variables)) {
+                    var key = utilities.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" &&
@@ -126,6 +142,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;
@@ -217,10 +234,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 || utilities.makeReference(dataId),
-            } : fieldNameOrOptions, { store: _this }); };
+            var sharedDetails_1 = {
+                DELETE: DELETE,
+                INVALIDATE: INVALIDATE,
+                isReference: utilities.isReference,
+                toReference: this.toReference,
+                canRead: this.canRead,
+                readField: function (fieldNameOrOptions, from) { return _this.policies.readField(typeof fieldNameOrOptions === "string" ? {
+                    fieldName: fieldNameOrOptions,
+                    from: from || utilities.makeReference(dataId),
+                } : fieldNameOrOptions, { store: _this }); },
+            };
             Object.keys(storeObject).forEach(function (storeFieldName) {
                 var fieldName = fieldNameFromStoreName(storeFieldName);
                 var fieldValue = storeObject[storeFieldName];
@@ -231,21 +255,19 @@ var EntityStore = (function () {
                     : fields[storeFieldName] || fields[fieldName];
                 if (modify) {
                     var newValue = modify === delModifier ? DELETE :
-                        modify(utilities.maybeDeepFreeze(fieldValue), {
-                            DELETE: DELETE,
-                            fieldName: fieldName,
-                            storeFieldName: storeFieldName,
-                            isReference: utilities.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(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);
+                    }
+                    else {
+                        if (newValue === DELETE)
+                            newValue = void 0;
+                        if (newValue !== fieldValue) {
+                            changedFields_1[storeFieldName] = newValue;
+                            needToMerge_1 = true;
+                            fieldValue = newValue;
+                        }
                     }
                 }
                 if (fieldValue !== void 0) {
@@ -407,6 +429,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(utilities.canUseWeakMap);
             _this.sharedLayerGroup = new CacheGroup(resultCaching);
             if (seed)
                 _this.replace(seed);
@@ -418,6 +441,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;
@@ -460,6 +486,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) {
@@ -505,9 +534,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;
@@ -557,7 +583,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");
@@ -626,14 +652,8 @@ var StoreReader = (function () {
                 tsInvariant.invariant(context.path.pop() === resultName);
             }
             else {
-                var fragment = void 0;
-                if (utilities.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 = utilities.getFragmentFromSelection(selection, context.fragmentMap);
+                if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
                 }
             }
@@ -697,7 +717,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(!utilities.isReference(value), 7) : tsInvariant.invariant(!utilities.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(!utilities.isReference(value), 6) : tsInvariant.invariant(!utilities.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);
             }
         });
@@ -730,7 +750,7 @@ var StoreWriter = (function () {
             },
         });
         if (!utilities.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;
@@ -793,12 +813,13 @@ var StoreWriter = (function () {
                 }
                 else if (policies.usingPossibleTypes &&
                     !utilities.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 = utilities.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);
                 }
             }
@@ -955,10 +976,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");
@@ -1061,8 +1083,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) {
@@ -1070,12 +1098,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) {
@@ -1085,7 +1107,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;
@@ -1094,17 +1123,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);
                         }
                     });
                 }
@@ -1163,7 +1216,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(utilities.isReference(objectOrReference)
+            var readOptions = makeFieldFunctionOptions(this, objectOrReference, options, context, context.store.getStorage(utilities.isReference(objectOrReference)
                 ? objectOrReference.__ref
                 : objectOrReference, storeFieldName));
             return cacheSlot.withValue(this.cache, read, [existing, readOptions]);
@@ -1175,16 +1228,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); });
@@ -1394,13 +1446,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 {