@graphql-codegen/visitor-plugin-common 7.2.0 → 7.2.1-alpha-20260719125849-4e20a28d5fee4dafc8a6cf0e22a03eedfd6ab3ff

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

@@ -73,7 +73,10 @@ class SelectionSetToObject {
                 // fragment (using @defer).
                 const fieldsWithFragmentDirectives = fields.map(field => ({
                     ...field,
-                    fragmentDirectives: directives,
+                    // A field may already carry `fragmentDirectives` from an enclosing
+                    // conditional fragment spread; keep those in addition to the
+                    // directives on this inline fragment, instead of overwriting them.
+                    fragmentDirectives: [...(field.fragmentDirectives || []), ...(directives || [])],
                 }));
                 if ((0, graphql_1.isObjectType)(typeOnSchema)) {
                     this._appendToTypeMap(types, typeOnSchema.name, fieldsWithFragmentDirectives);
@@ -518,7 +521,7 @@ class SelectionSetToObject {
         selectionNodes = [...selectionNodes];
         let inlineFragmentConditional = false;
         for (const selectionNode of selectionNodes) {
-            // 1. Handle Field or Directtives selection nodes
+            // 1. Handle Field or Directives selection nodes
             if ('kind' in selectionNode) {
                 if (selectionNode.kind === graphql_1.Kind.FIELD) {
                     if (selectionNode.selectionSet) {
@@ -594,6 +597,9 @@ class SelectionSetToObject {
             if (fragmentType == null) {
                 throw new TypeError(`Unexpected error: Type ${selectionNode.onType} does not exist within schema.`);
             }
+            // #region Recursively find all fields and nested fields of the SelectionSet
+            // And by pushing the fields to `selectionNodes`
+            // The for loop continues to build SelectionSet & nested SelectionSet exhaustively
             if (parentSchemaType.name === selectionNode.onType ||
                 parentSchemaType
                     .getInterfaces()
@@ -601,14 +607,21 @@ class SelectionSetToObject {
                 ((0, graphql_1.isUnionType)(fragmentType) &&
                     fragmentType.getTypes().find(objectType => objectType.name === parentSchemaType.name))) {
                 // also process fields from fragment that apply for this parentType
-                const { selectionNodesByTypeName } = this.flattenSelectionSet(selectionNode.selectionNodes, parentSchemaType);
+                const { selectionNodesByTypeName, selectionNodesByTypeNameConditional } = this.flattenSelectionSet(selectionNode.selectionNodes, parentSchemaType);
                 const typeNodes = selectionNodesByTypeName.get(parentSchemaType.name) ?? [];
                 selectionNodes.push(...typeNodes);
                 for (const iinterface of parentSchemaType.getInterfaces()) {
                     const typeNodes = selectionNodesByTypeName.get(iinterface.name) ?? [];
                     selectionNodes.push(...typeNodes);
                 }
+                for (const conditionalNodes of selectionNodesByTypeNameConditional) {
+                    const _selectionNodes = (conditionalNodes.get(parentSchemaType.name) || []).filter((node) => 'fragmentDirectives' in node);
+                    for (const selectionNode of _selectionNodes) {
+                        selectionNodes.push(selectionNode);
+                    }
+                }
             }
+            // #endregion
         }
         const linkFields = [];
         const linkFieldsInterfaces = [];
@@ -637,26 +650,30 @@ class SelectionSetToObject {
             });
         }
         const typeInfoField = this.buildTypeNameField(parentSchemaType, this._config.nonOptionalTypename, requireTypename, this._config.skipTypeNameForRoot);
+        // Only add the typename field if we're not merging fragment
+        // types. If we are merging, we need to wait until we know all
+        // the involved typenames.
+        const transformedTypenameFields = typeInfoField &&
+            (!this._config.mergeFragmentTypes || this._config.inlineFragmentTypes === 'mask')
+            ? this._processor.transformTypenameField(typeInfoField.type, typeInfoField.name)
+            : [];
+        const transformedPrimitiveFields = this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
+            isConditional: (0, utils_js_1.hasConditionalDirectives)(field.directives) ||
+                (0, utils_js_1.hasConditionalDirectives)(field.fragmentDirectives),
+            fieldName: field.name.value,
+        })), options.unsetTypes);
+        const transformedAliasesPrimitiveFields = this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
+            alias: field.alias.value,
+            fieldName: field.name.value,
+            isConditional: (0, utils_js_1.hasConditionalDirectives)(field.directives) ||
+                (0, utils_js_1.hasConditionalDirectives)(field.fragmentDirectives),
+        })), options.unsetTypes);
+        const transformedLinkFields = this._processor.transformLinkFields(linkFields, options.unsetTypes);
         const transformed = [
-            // Only add the typename field if we're not merging fragment
-            // types. If we are merging, we need to wait until we know all
-            // the involved typenames.
-            ...(typeInfoField &&
-                (!this._config.mergeFragmentTypes || this._config.inlineFragmentTypes === 'mask')
-                ? this._processor.transformTypenameField(typeInfoField.type, typeInfoField.name)
-                : []),
-            ...this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
-                isConditional: (0, utils_js_1.hasConditionalDirectives)(field.directives) ||
-                    (0, utils_js_1.hasConditionalDirectives)(field.fragmentDirectives),
-                fieldName: field.name.value,
-            })), options.unsetTypes),
-            ...this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
-                alias: field.alias.value,
-                fieldName: field.name.value,
-                isConditional: (0, utils_js_1.hasConditionalDirectives)(field.directives) ||
-                    (0, utils_js_1.hasConditionalDirectives)(field.fragmentDirectives),
-            })), options.unsetTypes),
-            ...this._processor.transformLinkFields(linkFields, options.unsetTypes),
+            ...transformedTypenameFields,
+            ...transformedPrimitiveFields,
+            ...transformedAliasesPrimitiveFields,
+            ...transformedLinkFields,
         ].filter(Boolean);
         const allStrings = transformed.filter(t => typeof t === 'string');
         const allObjectsMerged = transformed

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

@@ -69,7 +69,10 @@ export class SelectionSetToObject {
                 // fragment (using @defer).
                 const fieldsWithFragmentDirectives = fields.map(field => ({
                     ...field,
-                    fragmentDirectives: directives,
+                    // A field may already carry `fragmentDirectives` from an enclosing
+                    // conditional fragment spread; keep those in addition to the
+                    // directives on this inline fragment, instead of overwriting them.
+                    fragmentDirectives: [...(field.fragmentDirectives || []), ...(directives || [])],
                 }));
                 if (isObjectType(typeOnSchema)) {
                     this._appendToTypeMap(types, typeOnSchema.name, fieldsWithFragmentDirectives);
@@ -514,7 +517,7 @@ export class SelectionSetToObject {
         selectionNodes = [...selectionNodes];
         let inlineFragmentConditional = false;
         for (const selectionNode of selectionNodes) {
-            // 1. Handle Field or Directtives selection nodes
+            // 1. Handle Field or Directives selection nodes
             if ('kind' in selectionNode) {
                 if (selectionNode.kind === Kind.FIELD) {
                     if (selectionNode.selectionSet) {
@@ -590,6 +593,9 @@ export class SelectionSetToObject {
             if (fragmentType == null) {
                 throw new TypeError(`Unexpected error: Type ${selectionNode.onType} does not exist within schema.`);
             }
+            // #region Recursively find all fields and nested fields of the SelectionSet
+            // And by pushing the fields to `selectionNodes`
+            // The for loop continues to build SelectionSet & nested SelectionSet exhaustively
             if (parentSchemaType.name === selectionNode.onType ||
                 parentSchemaType
                     .getInterfaces()
@@ -597,14 +603,21 @@ export class SelectionSetToObject {
                 (isUnionType(fragmentType) &&
                     fragmentType.getTypes().find(objectType => objectType.name === parentSchemaType.name))) {
                 // also process fields from fragment that apply for this parentType
-                const { selectionNodesByTypeName } = this.flattenSelectionSet(selectionNode.selectionNodes, parentSchemaType);
+                const { selectionNodesByTypeName, selectionNodesByTypeNameConditional } = this.flattenSelectionSet(selectionNode.selectionNodes, parentSchemaType);
                 const typeNodes = selectionNodesByTypeName.get(parentSchemaType.name) ?? [];
                 selectionNodes.push(...typeNodes);
                 for (const iinterface of parentSchemaType.getInterfaces()) {
                     const typeNodes = selectionNodesByTypeName.get(iinterface.name) ?? [];
                     selectionNodes.push(...typeNodes);
                 }
+                for (const conditionalNodes of selectionNodesByTypeNameConditional) {
+                    const _selectionNodes = (conditionalNodes.get(parentSchemaType.name) || []).filter((node) => 'fragmentDirectives' in node);
+                    for (const selectionNode of _selectionNodes) {
+                        selectionNodes.push(selectionNode);
+                    }
+                }
             }
+            // #endregion
         }
         const linkFields = [];
         const linkFieldsInterfaces = [];
@@ -633,26 +646,30 @@ export class SelectionSetToObject {
             });
         }
         const typeInfoField = this.buildTypeNameField(parentSchemaType, this._config.nonOptionalTypename, requireTypename, this._config.skipTypeNameForRoot);
+        // Only add the typename field if we're not merging fragment
+        // types. If we are merging, we need to wait until we know all
+        // the involved typenames.
+        const transformedTypenameFields = typeInfoField &&
+            (!this._config.mergeFragmentTypes || this._config.inlineFragmentTypes === 'mask')
+            ? this._processor.transformTypenameField(typeInfoField.type, typeInfoField.name)
+            : [];
+        const transformedPrimitiveFields = this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
+            isConditional: hasConditionalDirectives(field.directives) ||
+                hasConditionalDirectives(field.fragmentDirectives),
+            fieldName: field.name.value,
+        })), options.unsetTypes);
+        const transformedAliasesPrimitiveFields = this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
+            alias: field.alias.value,
+            fieldName: field.name.value,
+            isConditional: hasConditionalDirectives(field.directives) ||
+                hasConditionalDirectives(field.fragmentDirectives),
+        })), options.unsetTypes);
+        const transformedLinkFields = this._processor.transformLinkFields(linkFields, options.unsetTypes);
         const transformed = [
-            // Only add the typename field if we're not merging fragment
-            // types. If we are merging, we need to wait until we know all
-            // the involved typenames.
-            ...(typeInfoField &&
-                (!this._config.mergeFragmentTypes || this._config.inlineFragmentTypes === 'mask')
-                ? this._processor.transformTypenameField(typeInfoField.type, typeInfoField.name)
-                : []),
-            ...this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
-                isConditional: hasConditionalDirectives(field.directives) ||
-                    hasConditionalDirectives(field.fragmentDirectives),
-                fieldName: field.name.value,
-            })), options.unsetTypes),
-            ...this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
-                alias: field.alias.value,
-                fieldName: field.name.value,
-                isConditional: hasConditionalDirectives(field.directives) ||
-                    hasConditionalDirectives(field.fragmentDirectives),
-            })), options.unsetTypes),
-            ...this._processor.transformLinkFields(linkFields, options.unsetTypes),
+            ...transformedTypenameFields,
+            ...transformedPrimitiveFields,
+            ...transformedAliasesPrimitiveFields,
+            ...transformedLinkFields,
         ].filter(Boolean);
         const allStrings = transformed.filter(t => typeof t === 'string');
         const allObjectsMerged = transformed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "7.2.0",
+  "version": "7.2.1-alpha-20260719125849-4e20a28d5fee4dafc8a6cf0e22a03eedfd6ab3ff",
   "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 || ^17.0.0"
   },

package/typings/selection-set-to-object.d.cts

@@ -14,7 +14,7 @@ type FragmentSpreadUsage = {
 /**
  * @description EnrichedFieldNode are field nodes enriched with Codegen metadata for subsequent processing
  */
-type EnrichedFieldNode = FieldNode & {
+export type EnrichedFieldNode = FieldNode & {
     /**
      * A field node may implicitly inherit fragment directives from parents
      * For example, if the field's parent is marked with `@skip`, the field is implicitly marked with `@skip` as well

package/typings/selection-set-to-object.d.ts

@@ -14,7 +14,7 @@ type FragmentSpreadUsage = {
 /**
  * @description EnrichedFieldNode are field nodes enriched with Codegen metadata for subsequent processing
  */
-type EnrichedFieldNode = FieldNode & {
+export type EnrichedFieldNode = FieldNode & {
     /**
      * A field node may implicitly inherit fragment directives from parents
      * For example, if the field's parent is marked with `@skip`, the field is implicitly marked with `@skip` as well

package/typings/utils.d.cts

@@ -1,6 +1,7 @@
 import { DirectiveNode, EnumValueDefinitionNode, FieldDefinitionNode, FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, InputValueDefinitionNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode } from 'graphql';
-import { RawConfig } from './base-visitor.cjs';
-import { LoadedFragment, NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.cjs';
+import type { RawConfig } from './base-visitor.cjs';
+import type { EnrichedFieldNode } from './selection-set-to-object.cjs';
+import type { LoadedFragment, NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.cjs';
 export declare const getConfigValue: <T = any>(value: T, defaultValue: T) => T;
 export declare function quoteIfNeeded(array: string[], joinWith?: string): string;
 export declare function block(array: any): string;
@@ -50,7 +51,7 @@ export declare const REQUIRE_FIELDS_TYPE = "export type RequireFields<T, K exten
 export declare function mergeSelectionSets(selectionSet1: SelectionSetNode, selectionSet2: SelectionSetNode): SelectionSetNode;
 export declare const getFieldNodeNameValue: (node: FieldNode) => string;
 export declare function separateSelectionSet(selections: ReadonlyArray<SelectionNode>): {
-    fields: FieldNode[];
+    fields: EnrichedFieldNode[];
     spreads: FragmentSpreadNode[];
     inlines: InlineFragmentNode[];
 };

package/typings/utils.d.ts

@@ -1,6 +1,7 @@
 import { DirectiveNode, EnumValueDefinitionNode, FieldDefinitionNode, FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, InputValueDefinitionNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode } from 'graphql';
-import { RawConfig } from './base-visitor.js';
-import { LoadedFragment, NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.js';
+import type { RawConfig } from './base-visitor.js';
+import type { EnrichedFieldNode } from './selection-set-to-object.js';
+import type { LoadedFragment, NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.js';
 export declare const getConfigValue: <T = any>(value: T, defaultValue: T) => T;
 export declare function quoteIfNeeded(array: string[], joinWith?: string): string;
 export declare function block(array: any): string;
@@ -50,7 +51,7 @@ export declare const REQUIRE_FIELDS_TYPE = "export type RequireFields<T, K exten
 export declare function mergeSelectionSets(selectionSet1: SelectionSetNode, selectionSet2: SelectionSetNode): SelectionSetNode;
 export declare const getFieldNodeNameValue: (node: FieldNode) => string;
 export declare function separateSelectionSet(selections: ReadonlyArray<SelectionNode>): {
-    fields: FieldNode[];
+    fields: EnrichedFieldNode[];
     spreads: FragmentSpreadNode[];
     inlines: InlineFragmentNode[];
 };