@apollo/client 3.12.0-rc.0 → 3.12.0-rc.2

package/.changeset/brown-readers-smash.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Maintain the existing document if its unchanged by the codemod and move to more naive whitespace formatting

package/.changeset/gorgeous-zebras-confess.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue where data went missing when an unmasked fragment in migrate mode selected fields that the parent did not.

package/.changeset/itchy-penguins-worry.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue where masked data would sometimes get returned when the field was part of a child fragment from a fragment unmasked by the parent query.

package/.changeset/long-zoos-ring.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": minor
+---
+
+Allow `null` as a valid `from` value in `useFragment`.

package/.changeset/mean-bottles-travel.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue where the warning emitted by `@unmask(mode: "migrate")` would trigger unnecessarily when the fragment was used alongside a masked fragment inside an inline fragment.

package/.changeset/nice-countries-share.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix error thrown when applying unmask migrate mode warnings on interface types with selection sets that contain inline fragment conditions.

package/.changeset/pre.json

@@ -5,11 +5,20 @@
     "@apollo/client": "3.11.5"
   },
   "changesets": [
+    "brown-readers-smash",
     "cold-apes-bow",
     "early-bobcats-eat",
     "flat-beans-knock",
+    "gorgeous-zebras-confess",
+    "itchy-penguins-worry",
     "kind-toys-tie",
+    "long-zoos-ring",
+    "mean-bottles-travel",
     "nasty-camels-pay",
-    "nervous-owls-hear"
+    "nervous-owls-hear",
+    "nice-countries-share",
+    "slimy-points-end",
+    "small-bears-confess",
+    "wicked-pans-appear"
   ]
 }

package/.changeset/slimy-points-end.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Ensure documents unchanged by the codemod are left untouched.

package/.changeset/small-bears-confess.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Ensure `null` is retained in nullable types when unmasking a type with the `Unmasked` helper type.

package/.changeset/wicked-pans-appear.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue that threw errors when masking partial data with `@unmask(mode: "migrate")`.

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @apollo/client
 
+## 3.12.0-rc.2
+
+### Patch Changes
+
+- [#12139](https://github.com/apollographql/apollo-client/pull/12139) [`5a53e15`](https://github.com/apollographql/apollo-client/commit/5a53e15e713e5eb2ebc9216615ea1a845fad2685) Thanks [@phryneas](https://github.com/phryneas)! - Fix issue where masked data would sometimes get returned when the field was part of a child fragment from a fragment unmasked by the parent query.
+
+- [#12139](https://github.com/apollographql/apollo-client/pull/12139) [`5a53e15`](https://github.com/apollographql/apollo-client/commit/5a53e15e713e5eb2ebc9216615ea1a845fad2685) Thanks [@phryneas](https://github.com/phryneas)! - Fix issue where the warning emitted by `@unmask(mode: "migrate")` would trigger unnecessarily when the fragment was used alongside a masked fragment inside an inline fragment.
+
+- [#12139](https://github.com/apollographql/apollo-client/pull/12139) [`5a53e15`](https://github.com/apollographql/apollo-client/commit/5a53e15e713e5eb2ebc9216615ea1a845fad2685) Thanks [@phryneas](https://github.com/phryneas)! - Fix issue that threw errors when masking partial data with `@unmask(mode: "migrate")`.
+
+## 3.12.0-rc.1
+
+### Minor Changes
+
+- [#12131](https://github.com/apollographql/apollo-client/pull/12131) [`21c3f08`](https://github.com/apollographql/apollo-client/commit/21c3f083013445707b7b50ae6390318bc568d0f5) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Allow `null` as a valid `from` value in `useFragment`.
+
+### Patch Changes
+
+- [#12126](https://github.com/apollographql/apollo-client/pull/12126) [`d10d702`](https://github.com/apollographql/apollo-client/commit/d10d702ee9bd4d1d1dee2551821140f2c49d5c0c) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Maintain the existing document if its unchanged by the codemod and move to more naive whitespace formatting
+
+- [#12134](https://github.com/apollographql/apollo-client/pull/12134) [`cfaf4ef`](https://github.com/apollographql/apollo-client/commit/cfaf4efc6dea56ae46a5b5199d8ed9414b0f17d8) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix issue where data went missing when an unmasked fragment in migrate mode selected fields that the parent did not.
+
+- [#12130](https://github.com/apollographql/apollo-client/pull/12130) [`1e7d009`](https://github.com/apollographql/apollo-client/commit/1e7d009e4a52949dab0065f3219dfe148837531e) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix error thrown when applying unmask migrate mode warnings on interface types with selection sets that contain inline fragment conditions.
+
+- [#12126](https://github.com/apollographql/apollo-client/pull/12126) [`d10d702`](https://github.com/apollographql/apollo-client/commit/d10d702ee9bd4d1d1dee2551821140f2c49d5c0c) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Ensure documents unchanged by the codemod are left untouched.
+
+- [#12133](https://github.com/apollographql/apollo-client/pull/12133) [`a6ece37`](https://github.com/apollographql/apollo-client/commit/a6ece375119ce12c19749471c55b0059843a7217) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Ensure `null` is retained in nullable types when unmasking a type with the `Unmasked` helper type.
+
 ## 3.12.0-rc.0
 
 ### Patch Changes

package/apollo-client.cjs

@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = "3.12.0-rc.0";
+var version = "3.12.0-rc.2";
 
 function maybe(thunk) {
     try {
@@ -2529,6 +2529,8 @@ function directiveIsNonreactive(dir) {
     return dir.name.value === "nonreactive";
 }
 
+var MapImpl = canUseWeakMap ? WeakMap : Map;
+var SetImpl = canUseWeakSet ? WeakSet : Set;
 var disableWarningsSlot = new optimism.Slot();
 function maskOperation(data, document, cache) {
     var _a;
@@ -2543,17 +2545,14 @@ function maskOperation(data, document, cache) {
     if (data == null) {
         return data;
     }
-    var context = {
+    return maskDefinition(data, definition.selectionSet, {
         operationType: definition.operation,
         operationName: (_a = definition.name) === null || _a === void 0 ? void 0 : _a.value,
         fragmentMap: createFragmentMap(getFragmentDefinitions(document)),
         cache: cache,
-    };
-    var _b = maskSelectionSet(data, definition.selectionSet, context), masked = _b[0], changed = _b[1];
-    if (Object.isFrozen(data)) {
-        disableWarningsSlot.withValue(true, maybeDeepFreeze, [masked]);
-    }
-    return changed ? masked : data;
+        mutableTargets: new MapImpl(),
+        knownChanged: new SetImpl(),
+    });
 }
 function maskFragment(data, document, cache, fragmentName) {
     if (!cache.fragmentMatches) {
@@ -2577,158 +2576,135 @@ function maskFragment(data, document, cache, fragmentName) {
     if (equal.equal(data, {})) {
         return data;
     }
-    var context = {
+    return maskDefinition(data, fragment.selectionSet, {
         operationType: "fragment",
         operationName: fragment.name.value,
         fragmentMap: createFragmentMap(getFragmentDefinitions(document)),
         cache: cache,
-    };
-    var _a = maskSelectionSet(data, fragment.selectionSet, context), masked = _a[0], changed = _a[1];
-    if (Object.isFrozen(data)) {
-        disableWarningsSlot.withValue(true, maybeDeepFreeze, [masked]);
+        mutableTargets: new MapImpl(),
+        knownChanged: new SetImpl(),
+    });
+}
+function maskDefinition(data, selectionSet, context) {
+    return disableWarningsSlot.withValue(true, function () {
+        var masked = maskSelectionSet(data, selectionSet, context, false);
+        if (Object.isFrozen(data)) {
+            maybeDeepFreeze(masked);
+        }
+        return masked;
+    });
+}
+function getMutableTarget(data, mutableTargets) {
+    if (mutableTargets.has(data)) {
+        return mutableTargets.get(data);
     }
-    return changed ? masked : data;
+    var mutableTarget = Array.isArray(data) ? [] : Object.create(null);
+    mutableTargets.set(data, mutableTarget);
+    return mutableTarget;
 }
-function maskSelectionSet(data, selectionSet, context, path) {
+function maskSelectionSet(data, selectionSet, context, migration, path) {
+    var _a;
+    var knownChanged = context.knownChanged;
     if (Array.isArray(data)) {
-        var changed_1 = false;
-        var masked = data.map(function (item, index) {
+        var target = getMutableTarget(data, context.mutableTargets);
+        for (var _i = 0, _b = Array.from(data.entries()); _i < _b.length; _i++) {
+            var _c = _b[_i], index = _c[0], item = _c[1];
             if (item === null) {
-                return null;
+                target[index] = null;
+                continue;
             }
-            var _a = maskSelectionSet(item, selectionSet, context, globalThis.__DEV__ !== false ? "".concat(path || "", "[").concat(index, "]") : void 0), masked = _a[0], itemChanged = _a[1];
-            changed_1 || (changed_1 = itemChanged);
-            return itemChanged ? masked : item;
-        });
-        return [changed_1 ? masked : data, changed_1];
-    }
-    var result = selectionSet.selections.reduce(function (_a, selection) {
-        var memo = _a[0], changed = _a[1];
-        switch (selection.kind) {
-            case graphql.Kind.FIELD: {
-                var keyName = resultKeyNameFromField(selection);
-                var childSelectionSet = selection.selectionSet;
-                memo[keyName] = data[keyName];
-                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) {
-                        memo[keyName] = masked;
-                        changed = true;
-                    }
-                }
-                return [memo, changed];
-            }
-            case graphql.Kind.INLINE_FRAGMENT: {
-                if (selection.typeCondition &&
-                    !context.cache.fragmentMatches(selection, data.__typename)) {
-                    return [memo, changed];
-                }
-                var _c = maskSelectionSet(data, selection.selectionSet, context, path), fragmentData = _c[0], childChanged = _c[1];
-                return [
-                    tslib.__assign(tslib.__assign({}, memo), fragmentData),
-                    changed || childChanged,
-                ];
-            }
-            case graphql.Kind.FRAGMENT_SPREAD: {
-                var fragmentName = selection.name.value;
-                var fragment = context.fragmentMap[fragmentName] ||
-                    (context.fragmentMap[fragmentName] =
-                        context.cache.lookupFragment(fragmentName));
-                invariant(fragment, 41, fragmentName);
-                var mode = getFragmentMaskMode(selection);
-                if (mode === "mask") {
-                    return [memo, true];
-                }
-                if (globalThis.__DEV__ !== false) {
-                    if (mode === "migrate") {
-                        return [
-                            addFieldAccessorWarnings(memo, data, fragment.selectionSet, path || "", context),
-                            true,
-                        ];
-                    }
-                }
-                var _d = maskSelectionSet(data, fragment.selectionSet, context, path), fragmentData = _d[0], changed_2 = _d[1];
-                return [tslib.__assign(tslib.__assign({}, memo), fragmentData), changed_2];
+            var masked = maskSelectionSet(item, selectionSet, context, migration, globalThis.__DEV__ !== false ? "".concat(path || "", "[").concat(index, "]") : void 0);
+            if (knownChanged.has(masked)) {
+                knownChanged.add(target);
             }
+            target[index] = masked;
         }
-    }, [Object.create(null), false]);
-    if (data && "__typename" in data && !("__typename" in result[0])) {
-        result[0].__typename = data.__typename;
-    }
-    return result;
-}
-function addFieldAccessorWarnings(memo, data, selectionSetNode, path, context) {
-    if (Array.isArray(data)) {
-        return data.map(function (item, index) {
-            return addFieldAccessorWarnings(memo[index] || Object.create(null), item, selectionSetNode, "".concat(path, "[").concat(index, "]"), context);
-        });
+        return knownChanged.has(target) ? target : data;
     }
-    return selectionSetNode.selections.reduce(function (memo, selection) {
-        switch (selection.kind) {
-            case graphql.Kind.FIELD: {
-                var keyName = resultKeyNameFromField(selection);
-                var childSelectionSet = selection.selectionSet;
-                if (keyName in memo) {
-                    return memo;
-                }
-                var value = data[keyName];
-                if (childSelectionSet) {
-                    value = addFieldAccessorWarnings(memo[keyName] || Object.create(null), data[keyName], childSelectionSet, "".concat(path, ".").concat(keyName), context);
-                }
-                if (globalThis.__DEV__ !== false) {
-                    addAccessorWarning(memo, value, keyName, path, context);
-                }
-                if (!(globalThis.__DEV__ !== false)) {
-                    memo[keyName] = data[keyName];
+    var memo = getMutableTarget(data, context.mutableTargets);
+    for (var _d = 0, _e = selectionSet.selections; _d < _e.length; _d++) {
+        var selection = _e[_d];
+        var value = void 0;
+        if (migration) {
+            knownChanged.add(memo);
+        }
+        if (selection.kind === graphql.Kind.FIELD) {
+            var keyName = resultKeyNameFromField(selection);
+            var childSelectionSet = selection.selectionSet;
+            value = memo[keyName] || data[keyName];
+            if (value === void 0) {
+                continue;
+            }
+            if (childSelectionSet && value !== null) {
+                var masked = maskSelectionSet(data[keyName], childSelectionSet, context, migration, globalThis.__DEV__ !== false ? "".concat(path || "", ".").concat(keyName) : void 0);
+                if (knownChanged.has(masked)) {
+                    value = masked;
                 }
-                return memo;
             }
-            case graphql.Kind.INLINE_FRAGMENT: {
-                return addFieldAccessorWarnings(memo, data, selection.selectionSet, path, context);
+            if (!(globalThis.__DEV__ !== false)) {
+                memo[keyName] = value;
             }
-            case graphql.Kind.FRAGMENT_SPREAD: {
-                var fragment = context.fragmentMap[selection.name.value];
-                var mode = getFragmentMaskMode(selection);
-                if (mode === "mask") {
-                    return memo;
+            if (globalThis.__DEV__ !== false) {
+                if (migration &&
+                    keyName !== "__typename" &&
+                    !((_a = Object.getOwnPropertyDescriptor(memo, keyName)) === null || _a === void 0 ? void 0 : _a.value)) {
+                    Object.defineProperty(memo, keyName, getAccessorWarningDescriptor(keyName, value, path || "", context.operationName, context.operationType));
                 }
-                if (mode === "unmask") {
-                    var fragmentData = maskSelectionSet(data, fragment.selectionSet, context, path)[0];
-                    return Object.assign(memo, fragmentData);
+                else {
+                    delete memo[keyName];
+                    memo[keyName] = value;
                 }
-                return addFieldAccessorWarnings(memo, data, fragment.selectionSet, path, context);
             }
         }
-    }, memo);
-}
-function addAccessorWarning(data, value, fieldName, path, context) {
-    if (value === void 0) {
-        return;
+        if (selection.kind === graphql.Kind.INLINE_FRAGMENT &&
+            (!selection.typeCondition ||
+                context.cache.fragmentMatches(selection, data.__typename))) {
+            value = maskSelectionSet(data, selection.selectionSet, context, migration, path);
+        }
+        if (selection.kind === graphql.Kind.FRAGMENT_SPREAD) {
+            var fragmentName = selection.name.value;
+            var fragment = context.fragmentMap[fragmentName] ||
+                (context.fragmentMap[fragmentName] =
+                    context.cache.lookupFragment(fragmentName));
+            invariant(fragment, 41, fragmentName);
+            var mode = getFragmentMaskMode(selection);
+            if (mode !== "mask") {
+                value = maskSelectionSet(data, fragment.selectionSet, context, mode === "migrate", path);
+            }
+        }
+        if (knownChanged.has(value)) {
+            knownChanged.add(memo);
+        }
     }
+    if ("__typename" in data && !("__typename" in memo)) {
+        memo.__typename = data.__typename;
+    }
+    if (Object.keys(memo).length !== Object.keys(data).length) {
+        knownChanged.add(memo);
+    }
+    return knownChanged.has(memo) ? memo : data;
+}
+function getAccessorWarningDescriptor(fieldName, value, path, operationName, operationType) {
     var getValue = function () {
         if (disableWarningsSlot.getValue()) {
             return value;
         }
-        globalThis.__DEV__ !== false && invariant.warn(42, context.operationName ?
-            "".concat(context.operationType, " '").concat(context.operationName, "'")
-            : "anonymous ".concat(context.operationType), "".concat(path, ".").concat(fieldName).replace(/^\./, ""));
+        globalThis.__DEV__ !== false && invariant.warn(42, operationName ?
+            "".concat(operationType, " '").concat(operationName, "'")
+            : "anonymous ".concat(operationType), "".concat(path, ".").concat(fieldName).replace(/^\./, ""));
         getValue = function () { return value; };
         return value;
     };
-    Object.defineProperty(data, fieldName, {
+    return {
         get: function () {
             return getValue();
         },
-        set: function (value) {
-            getValue = function () { return value; };
+        set: function (newValue) {
+            getValue = function () { return newValue; };
         },
         enumerable: true,
         configurable: true,
-    });
+    };
 }
 var issuedWarning = false;
 function warnOnImproperCacheImplementation() {
@@ -8566,10 +8542,22 @@ function _useFragment(options) {
     var client = useApolloClient(options.client);
     var cache = client.cache;
     var from = options.from, rest = tslib.__rest(options, ["from"]);
-    var id = React__namespace.useMemo(function () { return (typeof from === "string" ? from : cache.identify(from)); }, [cache, from]);
+    var id = React__namespace.useMemo(function () {
+        return typeof from === "string" ? from
+            : from === null ? null
+                : cache.identify(from);
+    }, [cache, from]);
     var stableOptions = useDeepMemo(function () { return (tslib.__assign(tslib.__assign({}, rest), { from: id })); }, [rest, id]);
     var diff = React__namespace.useMemo(function () {
         var fragment = stableOptions.fragment, fragmentName = stableOptions.fragmentName, from = stableOptions.from, _a = stableOptions.optimistic, optimistic = _a === void 0 ? true : _a;
+        if (from === null) {
+            return {
+                result: diffToResult({
+                    result: {},
+                    complete: false,
+                }),
+            };
+        }
         var cache = client.cache;
         var diff = cache.diff(tslib.__assign(tslib.__assign({}, stableOptions), { returnPartialData: true, id: from, query: cache["getFragmentDoc"](fragment, fragmentName), optimistic: optimistic }));
         return {
@@ -8583,17 +8571,19 @@ function _useFragment(options) {
     var getSnapshot = React__namespace.useCallback(function () { return diff.result; }, [diff]);
     return useSyncExternalStore(React__namespace.useCallback(function (forceUpdate) {
         var lastTimeout = 0;
-        var subscription = client.watchFragment(stableOptions).subscribe({
-            next: function (result) {
-                if (equal__default(result, diff.result))
-                    return;
-                diff.result = result;
-                clearTimeout(lastTimeout);
-                lastTimeout = setTimeout(forceUpdate);
-            },
-        });
+        var subscription = stableOptions.from === null ?
+            null
+            : client.watchFragment(stableOptions).subscribe({
+                next: function (result) {
+                    if (equal__default(result, diff.result))
+                        return;
+                    diff.result = result;
+                    clearTimeout(lastTimeout);
+                    lastTimeout = setTimeout(forceUpdate);
+                },
+            });
         return function () {
-            subscription.unsubscribe();
+            subscription === null || subscription === void 0 ? void 0 : subscription.unsubscribe();
             clearTimeout(lastTimeout);
         };
     }, [client, stableOptions, diff]), getSnapshot, getSnapshot);