@graphql-codegen/visitor-plugin-common 5.7.0 → 5.7.1-alpha-20250221122145-5ef68e775c396313780244f87714d33191a46522

package/cjs/selection-set-to-object.js

@@ -359,6 +359,7 @@ class SelectionSetToObject {
         selectionNodes = [...selectionNodes];
         let inlineFragmentConditional = false;
         for (const selectionNode of selectionNodes) {
+            // 1. Handle Field or Directtives selection nodes
             if ('kind' in selectionNode) {
                 if (selectionNode.kind === 'Field') {
                     if (selectionNode.selectionSet) {
@@ -410,15 +411,25 @@ class SelectionSetToObject {
                 }
                 continue;
             }
+            // 2. Handle Fragment Spread nodes
+            // A Fragment Spread can be:
+            // - masked: the fields declared in the Fragment do not appear in the operation types
+            // - inline: the fields declared in the Fragment appear in the operation types
+            // 2a. If `inlineFragmentTypes` is 'combine' or 'mask', the Fragment Spread is masked by default
+            // In some cases, a masked node could be unmasked (i.e. treated as inline):
+            // - Fragment spread node is marked with Apollo `@unmask`, e.g. `...User @unmask`
             if (this._config.inlineFragmentTypes === 'combine' || this._config.inlineFragmentTypes === 'mask') {
-                fragmentsSpreadUsages.push(selectionNode.typeName);
-                const isApolloUnmaskEnabled = this._config.customDirectives.apolloUnmask;
-                if (!isApolloUnmaskEnabled ||
-                    (isApolloUnmaskEnabled && !selectionNode.fragmentDirectives?.some(d => d.name.value === 'unmask'))) {
+                let isMasked = true;
+                if (this._config.customDirectives.apolloUnmask &&
+                    selectionNode.fragmentDirectives.some(d => d.name.value === 'unmask')) {
+                    isMasked = false;
+                }
+                if (isMasked) {
+                    fragmentsSpreadUsages.push(selectionNode.typeName);
                     continue;
                 }
             }
-            // Handle Fragment Spreads by generating inline types.
+            // 2b. If the Fragment Spread is not masked, generate inline types.
             const fragmentType = this._schema.getType(selectionNode.onType);
             if (fragmentType == null) {
                 throw new TypeError(`Unexpected error: Type ${selectionNode.onType} does not exist within schema.`);

package/esm/selection-set-to-object.js

@@ -355,6 +355,7 @@ export class SelectionSetToObject {
         selectionNodes = [...selectionNodes];
         let inlineFragmentConditional = false;
         for (const selectionNode of selectionNodes) {
+            // 1. Handle Field or Directtives selection nodes
             if ('kind' in selectionNode) {
                 if (selectionNode.kind === 'Field') {
                     if (selectionNode.selectionSet) {
@@ -406,15 +407,25 @@ export class SelectionSetToObject {
                 }
                 continue;
             }
+            // 2. Handle Fragment Spread nodes
+            // A Fragment Spread can be:
+            // - masked: the fields declared in the Fragment do not appear in the operation types
+            // - inline: the fields declared in the Fragment appear in the operation types
+            // 2a. If `inlineFragmentTypes` is 'combine' or 'mask', the Fragment Spread is masked by default
+            // In some cases, a masked node could be unmasked (i.e. treated as inline):
+            // - Fragment spread node is marked with Apollo `@unmask`, e.g. `...User @unmask`
             if (this._config.inlineFragmentTypes === 'combine' || this._config.inlineFragmentTypes === 'mask') {
-                fragmentsSpreadUsages.push(selectionNode.typeName);
-                const isApolloUnmaskEnabled = this._config.customDirectives.apolloUnmask;
-                if (!isApolloUnmaskEnabled ||
-                    (isApolloUnmaskEnabled && !selectionNode.fragmentDirectives?.some(d => d.name.value === 'unmask'))) {
+                let isMasked = true;
+                if (this._config.customDirectives.apolloUnmask &&
+                    selectionNode.fragmentDirectives.some(d => d.name.value === 'unmask')) {
+                    isMasked = false;
+                }
+                if (isMasked) {
+                    fragmentsSpreadUsages.push(selectionNode.typeName);
                     continue;
                 }
             }
-            // Handle Fragment Spreads by generating inline types.
+            // 2b. If the Fragment Spread is not masked, generate inline types.
             const fragmentType = this._schema.getType(selectionNode.onType);
             if (fragmentType == null) {
                 throw new TypeError(`Unexpected error: Type ${selectionNode.onType} does not exist within schema.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "5.7.0",
+  "version": "5.7.1-alpha-20250221122145-5ef68e775c396313780244f87714d33191a46522",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },