@apollo/client 3.12.0-alpha.0 → 3.12.0-rc.1

package/cache/cache.cjs

@@ -126,6 +126,7 @@ function directiveIsNonreactive(dir) {
     return dir.name.value === "nonreactive";
 }
 
+var disableWarningsSlot = new optimism.Slot();
 function maskFragment(data, document, cache, fragmentName) {
     if (!cache.fragmentMatches) {
         if (globalThis.__DEV__ !== false) {
@@ -137,14 +138,17 @@ function maskFragment(data, document, cache, fragmentName) {
         return node.kind === graphql.Kind.FRAGMENT_DEFINITION;
     });
     if (typeof fragmentName === "undefined") {
-        globals.invariant(fragments.length === 1, 38, fragments.length);
+        globals.invariant(fragments.length === 1, 39, fragments.length);
         fragmentName = fragments[0].name.value;
     }
     var fragment = fragments.find(function (fragment) { return fragment.name.value === fragmentName; });
-    globals.invariant(!!fragment, 39, fragmentName);
+    globals.invariant(!!fragment, 40, fragmentName);
     if (data == null) {
         return data;
     }
+    if (equal.equal(data, {})) {
+        return data;
+    }
     var context = {
         operationType: "fragment",
         operationName: fragment.name.value,
@@ -153,9 +157,7 @@ function maskFragment(data, document, cache, fragmentName) {
     };
     var _a = maskSelectionSet(data, fragment.selectionSet, context), masked = _a[0], changed = _a[1];
     if (Object.isFrozen(data)) {
-        context.disableWarnings = true;
-        utilities.maybeDeepFreeze(masked);
-        context.disableWarnings = false;
+        disableWarningsSlot.withValue(true, utilities.maybeDeepFreeze, [masked]);
     }
     return changed ? masked : data;
 }
@@ -172,14 +174,22 @@ function maskSelectionSet(data, selectionSet, context, path) {
         });
         return [changed_1 ? masked : data, changed_1];
     }
-    var result = selectionSet.selections.reduce(function (_a, selection) {
+    var result = selectionSet.selections
+        .concat()
+        .sort(sortFragmentsLast)
+        .reduce(function (_a, selection) {
         var memo = _a[0], changed = _a[1];
         switch (selection.kind) {
             case graphql.Kind.FIELD: {
                 var keyName = utilities.resultKeyNameFromField(selection);
                 var childSelectionSet = selection.selectionSet;
                 memo[keyName] = data[keyName];
-                if (childSelectionSet && data[keyName] !== null) {
+                if (memo[keyName] === void 0) {
+                    delete memo[keyName];
+                }
+                if (keyName in memo &&
+                    childSelectionSet &&
+                    data[keyName] !== null) {
                     var _b = maskSelectionSet(data[keyName], childSelectionSet, context, globalThis.__DEV__ !== false ? "".concat(path || "", ".").concat(keyName) : void 0), masked = _b[0], childChanged = _b[1];
                     if (childChanged ||
                         Object.keys(masked).length !== Object.keys(data[keyName]).length) {
@@ -205,7 +215,7 @@ function maskSelectionSet(data, selectionSet, context, path) {
                 var fragment = context.fragmentMap[fragmentName] ||
                     (context.fragmentMap[fragmentName] =
                         context.cache.lookupFragment(fragmentName));
-                globals.invariant(fragment, 40, fragmentName);
+                globals.invariant(fragment, 41, fragmentName);
                 var mode = utilities.getFragmentMaskMode(selection);
                 if (mode === "mask") {
                     return [memo, true];
@@ -223,7 +233,7 @@ function maskSelectionSet(data, selectionSet, context, path) {
             }
         }
     }, [Object.create(null), false]);
-    if ("__typename" in data && !("__typename" in result[0])) {
+    if (data && "__typename" in data && !("__typename" in result[0])) {
         result[0].__typename = data.__typename;
     }
     return result;
@@ -234,20 +244,29 @@ function addFieldAccessorWarnings(memo, data, selectionSetNode, path, context) {
             return addFieldAccessorWarnings(memo[index] || Object.create(null), item, selectionSetNode, "".concat(path, "[").concat(index, "]"), context);
         });
     }
-    return selectionSetNode.selections.reduce(function (memo, selection) {
+    return selectionSetNode.selections
+        .concat()
+        .sort(sortFragmentsLast)
+        .reduce(function (memo, selection) {
         switch (selection.kind) {
             case graphql.Kind.FIELD: {
                 var keyName = utilities.resultKeyNameFromField(selection);
                 var childSelectionSet = selection.selectionSet;
-                if (keyName in memo) {
+                if (keyName in memo && !childSelectionSet) {
                     return memo;
                 }
                 var value = data[keyName];
                 if (childSelectionSet) {
-                    value = addFieldAccessorWarnings(memo[keyName] || Object.create(null), data[keyName], childSelectionSet, "".concat(path, ".").concat(keyName), context);
+                    value = addFieldAccessorWarnings(memo[keyName] ||
+                        (Array.isArray(data[keyName]) ? [] : Object.create(null)), data[keyName], childSelectionSet, "".concat(path, ".").concat(keyName), context);
                 }
                 if (globalThis.__DEV__ !== false) {
-                    addAccessorWarning(memo, value, keyName, path, context);
+                    if (keyName in memo) {
+                        memo[keyName] = value;
+                    }
+                    else {
+                        addAccessorWarning(memo, value, keyName, path, context);
+                    }
                 }
                 if (!(globalThis.__DEV__ !== false)) {
                     memo[keyName] = data[keyName];
@@ -255,6 +274,10 @@ function addFieldAccessorWarnings(memo, data, selectionSetNode, path, context) {
                 return memo;
             }
             case graphql.Kind.INLINE_FRAGMENT: {
+                if (selection.typeCondition &&
+                    !context.cache.fragmentMatches(selection, data.__typename)) {
+                    return memo;
+                }
                 return addFieldAccessorWarnings(memo, data, selection.selectionSet, path, context);
             }
             case graphql.Kind.FRAGMENT_SPREAD: {
@@ -273,11 +296,14 @@ function addFieldAccessorWarnings(memo, data, selectionSetNode, path, context) {
     }, memo);
 }
 function addAccessorWarning(data, value, fieldName, path, context) {
+    if (value === void 0) {
+        return;
+    }
     var getValue = function () {
-        if (context.disableWarnings) {
+        if (disableWarningsSlot.getValue()) {
             return value;
         }
-        globalThis.__DEV__ !== false && globals.invariant.warn(41, context.operationName ?
+        globalThis.__DEV__ !== false && globals.invariant.warn(42, context.operationName ?
             "".concat(context.operationType, " '").concat(context.operationName, "'")
             : "anonymous ".concat(context.operationType), "".concat(path, ".").concat(fieldName).replace(/^\./, ""));
         getValue = function () { return value; };
@@ -298,9 +324,15 @@ var issuedWarning = false;
 function warnOnImproperCacheImplementation() {
     if (!issuedWarning) {
         issuedWarning = true;
-        globalThis.__DEV__ !== false && globals.invariant.warn(42);
+        globalThis.__DEV__ !== false && globals.invariant.warn(43);
     }
 }
+function sortFragmentsLast(a, b) {
+    if (a.kind === b.kind) {
+        return 0;
+    }
+    return a.kind === graphql.Kind.FRAGMENT_SPREAD ? 1 : -1;
+}
 
 var ApolloCache =  (function () {
     function ApolloCache() {
@@ -1648,16 +1680,18 @@ var Policies =  (function () {
         var id;
         var policy = typename && this.getTypePolicy(typename);
         var keyFn = (policy && policy.keyFn) || this.config.dataIdFromObject;
-        while (keyFn) {
-            var specifierOrId = keyFn(tslib.__assign(tslib.__assign({}, object), storeObject), context);
-            if (utilities.isArray(specifierOrId)) {
-                keyFn = keyFieldsFnFromSpecifier(specifierOrId);
-            }
-            else {
-                id = specifierOrId;
-                break;
+        disableWarningsSlot.withValue(true, function () {
+            while (keyFn) {
+                var specifierOrId = keyFn(tslib.__assign(tslib.__assign({}, object), storeObject), context);
+                if (utilities.isArray(specifierOrId)) {
+                    keyFn = keyFieldsFnFromSpecifier(specifierOrId);
+                }
+                else {
+                    id = specifierOrId;
+                    break;
+                }
             }
-        }
+        });
         id = id ? String(id) : void 0;
         return context.keyObject ? [id, context.keyObject] : [id];
     };