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

package/.changeset/clean-turkeys-kick.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue when using `Unmasked` with older versions of TypeScript when used with array fields.

package/.changeset/happy-months-happen.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Data masking types: handle overlapping nested array types and fragments on interface types.

package/.changeset/perfect-jobs-flow.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Add a helper that will skip the TS unmasking alorithm when no fragments are present on type level

package/.changeset/pre.json

@@ -6,10 +6,12 @@
   },
   "changesets": [
     "brown-readers-smash",
+    "clean-turkeys-kick",
     "cold-apes-bow",
     "early-bobcats-eat",
     "flat-beans-knock",
     "gorgeous-zebras-confess",
+    "happy-months-happen",
     "itchy-penguins-worry",
     "kind-toys-tie",
     "long-zoos-ring",
@@ -17,6 +19,7 @@
     "nasty-camels-pay",
     "nervous-owls-hear",
     "nice-countries-share",
+    "perfect-jobs-flow",
     "slimy-points-end",
     "small-bears-confess",
     "wicked-pans-appear"

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @apollo/client
 
+## 3.12.0-rc.4
+
+### Patch Changes
+
+- [#12154](https://github.com/apollographql/apollo-client/pull/12154) [`d933def`](https://github.com/apollographql/apollo-client/commit/d933def986d476cd64321059299ab15031297f04) Thanks [@phryneas](https://github.com/phryneas)! - Data masking types: handle overlapping nested array types and fragments on interface types.
+
+## 3.12.0-rc.3
+
+### Patch Changes
+
+- [#12150](https://github.com/apollographql/apollo-client/pull/12150) [`9ed1e1e`](https://github.com/apollographql/apollo-client/commit/9ed1e1ef02b28445614fed4f5c141a289ac32d66) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix issue when using `Unmasked` with older versions of TypeScript when used with array fields.
+
+- [#12152](https://github.com/apollographql/apollo-client/pull/12152) [`78137ec`](https://github.com/apollographql/apollo-client/commit/78137eccba90b80dd29bd8e1423b49ebe51ef8df) Thanks [@phryneas](https://github.com/phryneas)! - Add a helper that will skip the TS unmasking alorithm when no fragments are present on type level
+
 ## 3.12.0-rc.2
 
 ### 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.2";
+var version = "3.12.0-rc.4";
 
 function maybe(thunk) {
     try {
@@ -1615,7 +1615,7 @@ function toPromise(observable) {
         observable.subscribe({
             next: function (data) {
                 if (completed) {
-                    globalThis.__DEV__ !== false && invariant.warn(51);
+                    globalThis.__DEV__ !== false && invariant.warn(45);
                 }
                 else {
                     completed = true;
@@ -1658,7 +1658,7 @@ function validateOperation(operation) {
     for (var _i = 0, _a = Object.keys(operation); _i < _a.length; _i++) {
         var key = _a[_i];
         if (OPERATION_FIELDS.indexOf(key) < 0) {
-            throw newInvariantError(52, key);
+            throw newInvariantError(46, key);
         }
     }
     return operation;
@@ -1767,7 +1767,7 @@ var ApolloLink =  (function () {
     ApolloLink.concat = function (first, second) {
         var firstLink = toLink(first);
         if (isTerminating(firstLink)) {
-            globalThis.__DEV__ !== false && invariant.warn(44, firstLink);
+            globalThis.__DEV__ !== false && invariant.warn(38, firstLink);
             return firstLink;
         }
         var nextLink = toLink(second);
@@ -1793,7 +1793,7 @@ var ApolloLink =  (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw newInvariantError(45);
+        throw newInvariantError(39);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -2175,7 +2175,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = newInvariantError(48, label, e.message);
+        var parseError = newInvariantError(42, label, e.message);
         parseError.parseError = e;
         throw parseError;
     }
@@ -2261,7 +2261,7 @@ function removeDuplicateHeaders(headers, preserveHeaderCase) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === "undefined") {
-        throw newInvariantError(46);
+        throw newInvariantError(40);
     }
 };
 
@@ -2395,7 +2395,7 @@ var createHttpLink = function (linkOptions) {
             options.headers = options.headers || {};
             var acceptHeader = "multipart/mixed;";
             if (isSubscription && hasDefer) {
-                globalThis.__DEV__ !== false && invariant.warn(47);
+                globalThis.__DEV__ !== false && invariant.warn(41);
             }
             if (isSubscription) {
                 acceptHeader +=
@@ -2532,59 +2532,14 @@ function directiveIsNonreactive(dir) {
 var MapImpl = canUseWeakMap ? WeakMap : Map;
 var SetImpl = canUseWeakSet ? WeakSet : Set;
 var disableWarningsSlot = new optimism.Slot();
-function maskOperation(data, document, cache) {
-    var _a;
-    if (!cache.fragmentMatches) {
-        if (globalThis.__DEV__ !== false) {
-            warnOnImproperCacheImplementation();
-        }
-        return data;
-    }
-    var definition = getOperationDefinition(document);
-    invariant(definition, 38);
-    if (data == null) {
-        return data;
-    }
-    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,
-        mutableTargets: new MapImpl(),
-        knownChanged: new SetImpl(),
-    });
-}
-function maskFragment(data, document, cache, fragmentName) {
-    if (!cache.fragmentMatches) {
-        if (globalThis.__DEV__ !== false) {
-            warnOnImproperCacheImplementation();
-        }
-        return data;
-    }
-    var fragments = document.definitions.filter(function (node) {
-        return node.kind === graphql.Kind.FRAGMENT_DEFINITION;
-    });
-    if (typeof fragmentName === "undefined") {
-        invariant(fragments.length === 1, 39, fragments.length);
-        fragmentName = fragments[0].name.value;
-    }
-    var fragment = fragments.find(function (fragment) { return fragment.name.value === fragmentName; });
-    invariant(!!fragment, 40, fragmentName);
-    if (data == null) {
-        return data;
-    }
-    if (equal.equal(data, {})) {
-        return data;
+var issuedWarning = false;
+function warnOnImproperCacheImplementation() {
+    if (!issuedWarning) {
+        issuedWarning = true;
+        globalThis.__DEV__ !== false && invariant.warn(52);
     }
-    return maskDefinition(data, fragment.selectionSet, {
-        operationType: "fragment",
-        operationName: fragment.name.value,
-        fragmentMap: createFragmentMap(getFragmentDefinitions(document)),
-        cache: cache,
-        mutableTargets: new MapImpl(),
-        knownChanged: new SetImpl(),
-    });
 }
+
 function maskDefinition(data, selectionSet, context) {
     return disableWarningsSlot.withValue(true, function () {
         var masked = maskSelectionSet(data, selectionSet, context, false);
@@ -2605,23 +2560,22 @@ function getMutableTarget(data, mutableTargets) {
 function maskSelectionSet(data, selectionSet, context, migration, path) {
     var _a;
     var knownChanged = context.knownChanged;
+    var memo = getMutableTarget(data, context.mutableTargets);
     if (Array.isArray(data)) {
-        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) {
-                target[index] = null;
+                memo[index] = null;
                 continue;
             }
             var masked = maskSelectionSet(item, selectionSet, context, migration, globalThis.__DEV__ !== false ? "".concat(path || "", "[").concat(index, "]") : void 0);
             if (knownChanged.has(masked)) {
-                knownChanged.add(target);
+                knownChanged.add(memo);
             }
-            target[index] = masked;
+            memo[index] = masked;
         }
-        return knownChanged.has(target) ? target : data;
+        return knownChanged.has(memo) ? memo : data;
     }
-    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;
@@ -2666,7 +2620,7 @@ function maskSelectionSet(data, selectionSet, context, migration, path) {
             var fragment = context.fragmentMap[fragmentName] ||
                 (context.fragmentMap[fragmentName] =
                     context.cache.lookupFragment(fragmentName));
-            invariant(fragment, 41, fragmentName);
+            invariant(fragment, 47, fragmentName);
             var mode = getFragmentMaskMode(selection);
             if (mode !== "mask") {
                 value = maskSelectionSet(data, fragment.selectionSet, context, mode === "migrate", path);
@@ -2689,7 +2643,7 @@ function getAccessorWarningDescriptor(fieldName, value, path, operationName, ope
         if (disableWarningsSlot.getValue()) {
             return value;
         }
-        globalThis.__DEV__ !== false && invariant.warn(42, operationName ?
+        globalThis.__DEV__ !== false && invariant.warn(48, operationName ?
             "".concat(operationType, " '").concat(operationName, "'")
             : "anonymous ".concat(operationType), "".concat(path, ".").concat(fieldName).replace(/^\./, ""));
         getValue = function () { return value; };
@@ -2706,12 +2660,60 @@ function getAccessorWarningDescriptor(fieldName, value, path, operationName, ope
         configurable: true,
     };
 }
-var issuedWarning = false;
-function warnOnImproperCacheImplementation() {
-    if (!issuedWarning) {
-        issuedWarning = true;
-        globalThis.__DEV__ !== false && invariant.warn(43);
+
+function maskFragment(data, document, cache, fragmentName) {
+    if (!cache.fragmentMatches) {
+        if (globalThis.__DEV__ !== false) {
+            warnOnImproperCacheImplementation();
+        }
+        return data;
     }
+    var fragments = document.definitions.filter(function (node) {
+        return node.kind === graphql.Kind.FRAGMENT_DEFINITION;
+    });
+    if (typeof fragmentName === "undefined") {
+        invariant(fragments.length === 1, 49, fragments.length);
+        fragmentName = fragments[0].name.value;
+    }
+    var fragment = fragments.find(function (fragment) { return fragment.name.value === fragmentName; });
+    invariant(!!fragment, 50, fragmentName);
+    if (data == null) {
+        return data;
+    }
+    if (equal__default(data, {})) {
+        return data;
+    }
+    return maskDefinition(data, fragment.selectionSet, {
+        operationType: "fragment",
+        operationName: fragment.name.value,
+        fragmentMap: createFragmentMap(getFragmentDefinitions(document)),
+        cache: cache,
+        mutableTargets: new MapImpl(),
+        knownChanged: new SetImpl(),
+    });
+}
+
+function maskOperation(data, document, cache) {
+    var _a;
+    if (!cache.fragmentMatches) {
+        if (globalThis.__DEV__ !== false) {
+            warnOnImproperCacheImplementation();
+        }
+        return data;
+    }
+    var definition = getOperationDefinition(document);
+    invariant(definition, 51);
+    if (data == null) {
+        return data;
+    }
+    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,
+        mutableTargets: new MapImpl(),
+        knownChanged: new SetImpl(),
+    });
 }
 
 var ApolloCache =  (function () {