@apollo/client 3.4.7 → 3.4.11

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 globals = require('../utilities/globals');
 var tslib = require('tslib');
 var optimism = require('optimism');
+var utilities = require('../utilities');
 var equality = require('@wry/equality');
 var trie = require('@wry/trie');
 var context = require('@wry/context');
@@ -203,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", 2);
+        __DEV__ ? globals.invariant(typeof dataId === "string", "store.merge expects a string ID") : globals.invariant(typeof dataId === "string", 1);
         var merged = new utilities.DeepMerger(storeObjectReconciler).merge(existing, incoming);
         this.data[dataId] = merged;
         if (merged !== existing) {
@@ -794,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(6), context)],
+                missing: [missingFromInvariant(__DEV__ ? new globals.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new globals.InvariantError(5), context)],
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
@@ -831,9 +831,9 @@ var StoreReader = (function () {
                 context.path.push(resultName);
                 if (fieldValue === void 0) {
                     if (!utilities.addTypenameToDocument.added(selection)) {
-                        getMissing().push(missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Can't find field '" + selection.name.value + "' on " + (utilities.isReference(objectOrReference)
+                        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 tsInvariant.InvariantError(7), context));
+                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new globals.InvariantError(6), context));
                     }
                 }
                 else if (Array.isArray(fieldValue)) {
@@ -860,7 +860,7 @@ var StoreReader = (function () {
                 if (fieldValue !== void 0) {
                     objectsToMerge.push((_a = {}, _a[resultName] = fieldValue, _a));
                 }
-                tsInvariant.invariant(context.path.pop() === resultName);
+                globals.invariant(context.path.pop() === resultName);
             }
             else {
                 var fragment = utilities.getFragmentFromSelection(selection, context.fragmentMap);
@@ -885,7 +885,7 @@ var StoreReader = (function () {
                 missing = missing || [];
                 missing.push.apply(missing, childResult.missing);
             }
-            tsInvariant.invariant(context.path.pop() === i);
+            globals.invariant(context.path.pop() === i);
             return childResult.result;
         }
         if (field.selectionSet) {
@@ -915,7 +915,7 @@ var StoreReader = (function () {
             if (__DEV__) {
                 assertSelectionSetForIdValue(context.store, field, item);
             }
-            tsInvariant.invariant(context.path.pop() === i);
+            globals.invariant(context.path.pop() === i);
             return item;
         });
         return {
@@ -930,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), 8);
+                __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);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -969,7 +969,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!utilities.isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(9);
+            throw __DEV__ ? new globals.InvariantError("Could not identify object " + JSON.stringify(result)) : new globals.InvariantError(8);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var fields = _a.fields, mergeTree = _a.mergeTree, selections = _a.selections;
@@ -1078,7 +1078,7 @@ var StoreWriter = (function () {
                 }
                 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));
+                    __DEV__ && globals.invariant.error(("Missing field '" + utilities.resultKeyNameFromField(selection) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
                 }
                 context.clientOnly = wasClientOnly;
             }
@@ -1158,7 +1158,7 @@ var StoreWriter = (function () {
                     changedFields_1.set(storeFieldName, aVal);
                 }
                 if (getStorageArgs) {
-                    tsInvariant.invariant(getStorageArgs.pop() === storeFieldName);
+                    globals.invariant(getStorageArgs.pop() === storeFieldName);
                 }
             });
             if (changedFields_1) {
@@ -1253,7 +1253,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
+    __DEV__ && globals.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
         ? "either ensure all objects of type " +
             childTypenames.join(" and ") + " have an ID or a custom merge function, or "
         : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
@@ -1466,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, 3);
+            __DEV__ ? globals.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : globals.invariant(!old || old === which, 2);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -1550,7 +1550,7 @@ var Policies = (function () {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && tsInvariant.invariant.warn("Inferring subtype " + typename + " of supertype " + supertype);
+                            __DEV__ && globals.invariant.warn("Inferring subtype " + typename + " of supertype " + supertype);
                         }
                         typenameSupertypeSet.add(supertype);
                     }
@@ -1693,11 +1693,11 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
                 }
             }
             else {
-                __DEV__ && tsInvariant.invariant.warn("Unexpected readField arguments: " + utilities.stringifyForDisplay(Array.from(arguments)));
+                __DEV__ && globals.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)));
+                __DEV__ && globals.invariant.warn("Undefined 'from' passed to readField with arguments " + utilities.stringifyForDisplay(Array.from(arguments)));
             }
             if (void 0 === options.variables) {
                 options.variables = variables;
@@ -1710,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(4);
+            throw __DEV__ ? new globals.InvariantError("Cannot automatically merge arrays") : new globals.InvariantError(3);
         }
         if (utilities.isNonNullObject(existing) &&
             utilities.isNonNullObject(incoming)) {
@@ -1791,24 +1791,27 @@ function makeAliasMap(selectionSet, fragmentMap) {
 }
 function computeKeyObject(response, specifier, strict, aliasMap) {
     var keyObj = Object.create(null);
-    var prevKey;
+    var lastResponseKey;
+    var lastActualKey;
     specifier.forEach(function (s) {
         if (Array.isArray(s)) {
-            if (typeof prevKey === "string") {
+            if (typeof lastActualKey === "string" &&
+                typeof lastResponseKey === "string") {
                 var subsets = aliasMap && aliasMap.subsets;
-                var subset = subsets && subsets[prevKey];
-                keyObj[prevKey] = computeKeyObject(response[prevKey], s, strict, subset);
+                var subset = subsets && subsets[lastActualKey];
+                keyObj[lastActualKey] =
+                    computeKeyObject(response[lastResponseKey], s, strict, subset);
             }
         }
         else {
             var aliases = aliasMap && aliasMap.aliases;
             var responseName = aliases && aliases[s] || s;
             if (hasOwn.call(response, responseName)) {
-                keyObj[prevKey = s] = response[responseName];
+                keyObj[lastActualKey = s] = response[lastResponseKey = responseName];
             }
             else {
-                __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 5);
-                prevKey = void 0;
+                __DEV__ ? globals.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : globals.invariant(!strict, 4);
+                lastResponseKey = lastActualKey = void 0;
             }
         }
     });
@@ -2100,8 +2103,6 @@ var InMemoryCache = (function (_super) {
     return InMemoryCache;
 }(ApolloCache));
 
-__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;