@graphql-codegen/visitor-plugin-common 6.0.0-alpha-20250509134235-30ac8930f49f44ab10e6b7dcdd7f12a67bfa9fc4 → 6.0.0-alpha-20250529121049-5e08c758900167a8eaee6ff178599c2b990bf21d

package/cjs/base-resolvers-visitor.js

@@ -328,7 +328,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
      * Function to generate the types of Abstract Type Members i.e. Union Members or Interface Implementing Types
      */
     getAbstractMembersType({ typeName, memberTypes, isTypenameNonOptional, }) {
-        const result = memberTypes
+        const members = memberTypes
             .map(type => {
             const isTypeMapped = this.config.mappers[type.name];
             // 1. If mapped without placehoder, just use it without doing extra checks
@@ -367,8 +367,12 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .map(({ typename, typeValue }) => {
             const nonOptionalTypenameModifier = isTypenameNonOptional ? ` & { __typename: '${typename}' }` : '';
             return `( ${typeValue}${nonOptionalTypenameModifier} )`; // Must wrap every type in explicit "( )" to separate them
-        })
-            .join(' | ') || 'never';
+        });
+        const result = members.length === 0
+            ? 'never'
+            : members.length > 1
+                ? `\n    | ${members.map(m => m.replace(/\n/g, '\n  ')).join('\n    | ')}\n  `
+                : members.join(' | ');
         return result;
     }
     createFieldContextTypeMap() {
@@ -599,6 +603,9 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         }
         return '';
     }
+    // FIXME: this Name method causes a lot of type inconsistencies
+    // because the type of nodes no longer matches the `graphql-js` types
+    // So, we should update this and remove any relevant `as any as string` or `as unknown as string`
     Name(node) {
         return node.value;
     }
@@ -640,88 +647,96 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
     FieldDefinition(node, key, parent) {
         const hasArguments = node.arguments && node.arguments.length > 0;
         const declarationKind = 'type';
-        return (parentName, avoidResolverOptionals) => {
-            const original = parent[key];
-            const parentType = this.schema.getType(parentName);
-            const meta = {};
-            if (this._federation.skipField({ fieldNode: original, parentType })) {
-                return { value: null, meta };
-            }
-            const contextType = this.getContextType(parentName, node);
-            let argsType = hasArguments
-                ? this.convertName(parentName +
-                    (this.config.addUnderscoreToArgsType ? '_' : '') +
-                    this.convertName(node.name, {
-                        useTypesPrefix: false,
-                        useTypesSuffix: false,
-                    }) +
-                    'Args', {
-                    useTypesPrefix: true,
-                }, true)
-                : null;
-            const avoidInputsOptionals = this.config.avoidOptionals.inputValue;
-            if (argsType !== null) {
-                const argsToForceRequire = original.arguments.filter(arg => !!arg.defaultValue || arg.type.kind === 'NonNullType');
-                if (argsToForceRequire.length > 0) {
-                    argsType = this.applyRequireFields(argsType, argsToForceRequire);
+        const original = parent[key];
+        return {
+            node: original,
+            printContent: (parentNode, avoidResolverOptionals) => {
+                const parentName = parentNode.name;
+                const parentType = this.schema.getType(parentName);
+                const meta = {};
+                const typeName = node.name;
+                const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node: parentNode });
+                const shouldGenerateField = fieldsToGenerate.some(field => field.name.value === typeName) ||
+                    this._federation.isResolveReferenceField(node);
+                if (!shouldGenerateField) {
+                    return { value: null, meta };
                 }
-                else if (original.arguments.length > 0 && avoidInputsOptionals !== true) {
-                    argsType = this.applyOptionalFields(argsType, original.arguments);
+                const contextType = this.getContextType(parentName, node);
+                let argsType = hasArguments
+                    ? this.convertName(parentName +
+                        (this.config.addUnderscoreToArgsType ? '_' : '') +
+                        this.convertName(typeName, {
+                            useTypesPrefix: false,
+                            useTypesSuffix: false,
+                        }) +
+                        'Args', {
+                        useTypesPrefix: true,
+                    }, true)
+                    : null;
+                const avoidInputsOptionals = this.config.avoidOptionals.inputValue;
+                if (argsType !== null) {
+                    const argsToForceRequire = original.arguments.filter(arg => !!arg.defaultValue || arg.type.kind === 'NonNullType');
+                    if (argsToForceRequire.length > 0) {
+                        argsType = this.applyRequireFields(argsType, argsToForceRequire);
+                    }
+                    else if (original.arguments.length > 0 && avoidInputsOptionals !== true) {
+                        argsType = this.applyOptionalFields(argsType, original.arguments);
+                    }
                 }
-            }
-            const parentTypeSignature = this._federation.transformFieldParentType({
-                fieldNode: original,
-                parentType,
-                parentTypeSignature: this.getParentTypeForSignature(node),
-                federationTypeSignature: 'FederationType',
-            });
-            const { mappedTypeKey, resolverType } = (() => {
-                const baseType = (0, utils_js_1.getBaseTypeNode)(original.type);
-                const realType = baseType.name.value;
-                const typeToUse = this.getTypeToUse(realType);
-                /**
-                 * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
-                 * - String!  -> ResolversTypes['String']>
-                 * - String   -> Maybe<ResolversTypes['String']>
-                 * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
-                 * - [String!]! -> Array<ResolversTypes['String']>
-                 */
-                const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
-                const subscriptionType = this._schema.getSubscriptionType();
-                const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
-                if (isSubscriptionType) {
+                const parentTypeSignature = this._federation.transformFieldParentType({
+                    fieldNode: original,
+                    parentType,
+                    parentTypeSignature: this.getParentTypeForSignature(node),
+                    federationTypeSignature: 'FederationType',
+                });
+                const { mappedTypeKey, resolverType } = (() => {
+                    const baseType = (0, utils_js_1.getBaseTypeNode)(original.type);
+                    const realType = baseType.name.value;
+                    const typeToUse = this.getTypeToUse(realType);
+                    /**
+                     * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
+                     * - String!  -> ResolversTypes['String']>
+                     * - String   -> Maybe<ResolversTypes['String']>
+                     * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
+                     * - [String!]! -> Array<ResolversTypes['String']>
+                     */
+                    const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
+                    const subscriptionType = this._schema.getSubscriptionType();
+                    const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
+                    if (isSubscriptionType) {
+                        return {
+                            mappedTypeKey: `${mappedType}, "${typeName}"`,
+                            resolverType: 'SubscriptionResolver',
+                        };
+                    }
+                    const directiveMappings = node.directives
+                        ?.map(directive => this._directiveResolverMappings[directive.name])
+                        .filter(Boolean)
+                        .reverse() ?? [];
                     return {
-                        mappedTypeKey: `${mappedType}, "${node.name}"`,
-                        resolverType: 'SubscriptionResolver',
+                        mappedTypeKey: mappedType,
+                        resolverType: directiveMappings[0] ?? 'Resolver',
                     };
+                })();
+                const signature = {
+                    name: typeName,
+                    modifier: avoidResolverOptionals ? '' : '?',
+                    type: resolverType,
+                    genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
+                };
+                if (this._federation.isResolveReferenceField(node)) {
+                    if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
+                        return { value: '', meta };
+                    }
+                    signature.type = 'ReferenceResolver';
+                    signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
+                    meta.federation = { isResolveReference: true };
                 }
-                const directiveMappings = node.directives
-                    ?.map(directive => this._directiveResolverMappings[directive.name])
-                    .filter(Boolean)
-                    .reverse() ?? [];
                 return {
-                    mappedTypeKey: mappedType,
-                    resolverType: directiveMappings[0] ?? 'Resolver',
+                    value: (0, utils_js_1.indent)(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
+                    meta,
                 };
-            })();
-            const signature = {
-                name: node.name,
-                modifier: avoidResolverOptionals ? '' : '?',
-                type: resolverType,
-                genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
-            };
-            if (this._federation.isResolveReferenceField(node)) {
-                if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
-                    return { value: '', meta };
-                }
-                signature.type = 'ReferenceResolver';
-                signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
-                meta.federation = { isResolveReference: true };
-            }
-            return {
-                value: (0, utils_js_1.indent)(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
-                meta,
-            };
+            },
         };
     }
     getFieldContextType(parentName, node) {
@@ -782,11 +797,15 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         return `Partial<${argsType}>`;
     }
     ObjectTypeDefinition(node) {
+        const typeName = node.name;
+        const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node });
+        if (fieldsToGenerate.length === 0) {
+            return null;
+        }
         const declarationKind = 'type';
         const name = this.convertName(node, {
             suffix: this.config.resolverTypeSuffix,
         });
-        const typeName = node.name;
         const parentType = this.getParentTypeToUse(typeName);
         const rootType = (() => {
             if (this.schema.getQueryType()?.name === typeName) {
@@ -800,15 +819,20 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             }
             return false;
         })();
-        const fieldsContent = node.fields.map(f => {
-            return f(typeName, (rootType === 'query' && this.config.avoidOptionals.query) ||
+        const fieldsContent = node.fields
+            .map(({ printContent }) => {
+            return printContent(node, (rootType === 'query' && this.config.avoidOptionals.query) ||
                 (rootType === 'mutation' && this.config.avoidOptionals.mutation) ||
                 (rootType === 'subscription' && this.config.avoidOptionals.subscription) ||
                 (rootType === false && this.config.avoidOptionals.resolvers)).value;
-        });
+        })
+            .filter(v => v);
         if (!rootType && this._parsedSchemaMeta.typesWithIsTypeOf[typeName]) {
             fieldsContent.push((0, utils_js_1.indent)(`${this.config.internalResolversPrefix}isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>${this.getPunctuation(declarationKind)}`));
         }
+        if (fieldsContent.length === 0) {
+            return null;
+        }
         const genericTypes = [
             `ContextType = ${this.config.contextType.type}`,
             this.transformParentGenericType(parentType),
@@ -968,7 +992,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         ];
         // An Interface in Federation may have the additional __resolveReference resolver, if resolvable.
         // So, we filter out the normal fields declared on the Interface and add the __resolveReference resolver.
-        const fields = node.fields.map(f => f(typeName, this.config.avoidOptionals.resolvers));
+        const fields = node.fields.map(({ printContent }) => printContent(node, this.config.avoidOptionals.resolvers));
         for (const field of fields) {
             if (field.meta.federation?.isResolveReference) {
                 blockFields.push(field.value);

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

@@ -589,7 +589,7 @@ class SelectionSetToObject {
                 .join(' & ')),
             this.getEmptyObjectTypeString(mustAddEmptyObject),
         ].filter(Boolean);
-        const content = typeParts.join(' | ');
+        const content = formatUnion(typeParts);
         if (typeParts.length > 1 && this._config.extractAllFieldsToTypes) {
             return {
                 mergedTypeString: fieldName,
@@ -662,7 +662,7 @@ class SelectionSetToObject {
                 .export()
                 .asKind('type')
                 .withName(mergedTypeString)
-                .withContent(subTypes.map(t => t.name).join(' | ')).string,
+                .withContent(formatUnion(subTypes.map(t => t.name))).string,
         ].join('\n');
     }
     buildFragmentTypeName(name, suffix, typeName = '') {
@@ -678,3 +678,9 @@ class SelectionSetToObject {
     }
 }
 exports.SelectionSetToObject = SelectionSetToObject;
+function formatUnion(members) {
+    if (members.length > 1) {
+        return `\n  | ${members.map(m => m.replace(/\n/g, '\n  ')).join('\n  | ')}\n`;
+    }
+    return members.join(' | ');
+}

package/esm/base-resolvers-visitor.js

@@ -324,7 +324,7 @@ export class BaseResolversVisitor extends BaseVisitor {
      * Function to generate the types of Abstract Type Members i.e. Union Members or Interface Implementing Types
      */
     getAbstractMembersType({ typeName, memberTypes, isTypenameNonOptional, }) {
-        const result = memberTypes
+        const members = memberTypes
             .map(type => {
             const isTypeMapped = this.config.mappers[type.name];
             // 1. If mapped without placehoder, just use it without doing extra checks
@@ -363,8 +363,12 @@ export class BaseResolversVisitor extends BaseVisitor {
             .map(({ typename, typeValue }) => {
             const nonOptionalTypenameModifier = isTypenameNonOptional ? ` & { __typename: '${typename}' }` : '';
             return `( ${typeValue}${nonOptionalTypenameModifier} )`; // Must wrap every type in explicit "( )" to separate them
-        })
-            .join(' | ') || 'never';
+        });
+        const result = members.length === 0
+            ? 'never'
+            : members.length > 1
+                ? `\n    | ${members.map(m => m.replace(/\n/g, '\n  ')).join('\n    | ')}\n  `
+                : members.join(' | ');
         return result;
     }
     createFieldContextTypeMap() {
@@ -595,6 +599,9 @@ export class BaseResolversVisitor extends BaseVisitor {
         }
         return '';
     }
+    // FIXME: this Name method causes a lot of type inconsistencies
+    // because the type of nodes no longer matches the `graphql-js` types
+    // So, we should update this and remove any relevant `as any as string` or `as unknown as string`
     Name(node) {
         return node.value;
     }
@@ -636,88 +643,96 @@ export class BaseResolversVisitor extends BaseVisitor {
     FieldDefinition(node, key, parent) {
         const hasArguments = node.arguments && node.arguments.length > 0;
         const declarationKind = 'type';
-        return (parentName, avoidResolverOptionals) => {
-            const original = parent[key];
-            const parentType = this.schema.getType(parentName);
-            const meta = {};
-            if (this._federation.skipField({ fieldNode: original, parentType })) {
-                return { value: null, meta };
-            }
-            const contextType = this.getContextType(parentName, node);
-            let argsType = hasArguments
-                ? this.convertName(parentName +
-                    (this.config.addUnderscoreToArgsType ? '_' : '') +
-                    this.convertName(node.name, {
-                        useTypesPrefix: false,
-                        useTypesSuffix: false,
-                    }) +
-                    'Args', {
-                    useTypesPrefix: true,
-                }, true)
-                : null;
-            const avoidInputsOptionals = this.config.avoidOptionals.inputValue;
-            if (argsType !== null) {
-                const argsToForceRequire = original.arguments.filter(arg => !!arg.defaultValue || arg.type.kind === 'NonNullType');
-                if (argsToForceRequire.length > 0) {
-                    argsType = this.applyRequireFields(argsType, argsToForceRequire);
+        const original = parent[key];
+        return {
+            node: original,
+            printContent: (parentNode, avoidResolverOptionals) => {
+                const parentName = parentNode.name;
+                const parentType = this.schema.getType(parentName);
+                const meta = {};
+                const typeName = node.name;
+                const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node: parentNode });
+                const shouldGenerateField = fieldsToGenerate.some(field => field.name.value === typeName) ||
+                    this._federation.isResolveReferenceField(node);
+                if (!shouldGenerateField) {
+                    return { value: null, meta };
                 }
-                else if (original.arguments.length > 0 && avoidInputsOptionals !== true) {
-                    argsType = this.applyOptionalFields(argsType, original.arguments);
+                const contextType = this.getContextType(parentName, node);
+                let argsType = hasArguments
+                    ? this.convertName(parentName +
+                        (this.config.addUnderscoreToArgsType ? '_' : '') +
+                        this.convertName(typeName, {
+                            useTypesPrefix: false,
+                            useTypesSuffix: false,
+                        }) +
+                        'Args', {
+                        useTypesPrefix: true,
+                    }, true)
+                    : null;
+                const avoidInputsOptionals = this.config.avoidOptionals.inputValue;
+                if (argsType !== null) {
+                    const argsToForceRequire = original.arguments.filter(arg => !!arg.defaultValue || arg.type.kind === 'NonNullType');
+                    if (argsToForceRequire.length > 0) {
+                        argsType = this.applyRequireFields(argsType, argsToForceRequire);
+                    }
+                    else if (original.arguments.length > 0 && avoidInputsOptionals !== true) {
+                        argsType = this.applyOptionalFields(argsType, original.arguments);
+                    }
                 }
-            }
-            const parentTypeSignature = this._federation.transformFieldParentType({
-                fieldNode: original,
-                parentType,
-                parentTypeSignature: this.getParentTypeForSignature(node),
-                federationTypeSignature: 'FederationType',
-            });
-            const { mappedTypeKey, resolverType } = (() => {
-                const baseType = getBaseTypeNode(original.type);
-                const realType = baseType.name.value;
-                const typeToUse = this.getTypeToUse(realType);
-                /**
-                 * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
-                 * - String!  -> ResolversTypes['String']>
-                 * - String   -> Maybe<ResolversTypes['String']>
-                 * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
-                 * - [String!]! -> Array<ResolversTypes['String']>
-                 */
-                const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
-                const subscriptionType = this._schema.getSubscriptionType();
-                const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
-                if (isSubscriptionType) {
+                const parentTypeSignature = this._federation.transformFieldParentType({
+                    fieldNode: original,
+                    parentType,
+                    parentTypeSignature: this.getParentTypeForSignature(node),
+                    federationTypeSignature: 'FederationType',
+                });
+                const { mappedTypeKey, resolverType } = (() => {
+                    const baseType = getBaseTypeNode(original.type);
+                    const realType = baseType.name.value;
+                    const typeToUse = this.getTypeToUse(realType);
+                    /**
+                     * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
+                     * - String!  -> ResolversTypes['String']>
+                     * - String   -> Maybe<ResolversTypes['String']>
+                     * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
+                     * - [String!]! -> Array<ResolversTypes['String']>
+                     */
+                    const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
+                    const subscriptionType = this._schema.getSubscriptionType();
+                    const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
+                    if (isSubscriptionType) {
+                        return {
+                            mappedTypeKey: `${mappedType}, "${typeName}"`,
+                            resolverType: 'SubscriptionResolver',
+                        };
+                    }
+                    const directiveMappings = node.directives
+                        ?.map(directive => this._directiveResolverMappings[directive.name])
+                        .filter(Boolean)
+                        .reverse() ?? [];
                     return {
-                        mappedTypeKey: `${mappedType}, "${node.name}"`,
-                        resolverType: 'SubscriptionResolver',
+                        mappedTypeKey: mappedType,
+                        resolverType: directiveMappings[0] ?? 'Resolver',
                     };
+                })();
+                const signature = {
+                    name: typeName,
+                    modifier: avoidResolverOptionals ? '' : '?',
+                    type: resolverType,
+                    genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
+                };
+                if (this._federation.isResolveReferenceField(node)) {
+                    if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
+                        return { value: '', meta };
+                    }
+                    signature.type = 'ReferenceResolver';
+                    signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
+                    meta.federation = { isResolveReference: true };
                 }
-                const directiveMappings = node.directives
-                    ?.map(directive => this._directiveResolverMappings[directive.name])
-                    .filter(Boolean)
-                    .reverse() ?? [];
                 return {
-                    mappedTypeKey: mappedType,
-                    resolverType: directiveMappings[0] ?? 'Resolver',
+                    value: indent(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
+                    meta,
                 };
-            })();
-            const signature = {
-                name: node.name,
-                modifier: avoidResolverOptionals ? '' : '?',
-                type: resolverType,
-                genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
-            };
-            if (this._federation.isResolveReferenceField(node)) {
-                if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
-                    return { value: '', meta };
-                }
-                signature.type = 'ReferenceResolver';
-                signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
-                meta.federation = { isResolveReference: true };
-            }
-            return {
-                value: indent(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
-                meta,
-            };
+            },
         };
     }
     getFieldContextType(parentName, node) {
@@ -778,11 +793,15 @@ export class BaseResolversVisitor extends BaseVisitor {
         return `Partial<${argsType}>`;
     }
     ObjectTypeDefinition(node) {
+        const typeName = node.name;
+        const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node });
+        if (fieldsToGenerate.length === 0) {
+            return null;
+        }
         const declarationKind = 'type';
         const name = this.convertName(node, {
             suffix: this.config.resolverTypeSuffix,
         });
-        const typeName = node.name;
         const parentType = this.getParentTypeToUse(typeName);
         const rootType = (() => {
             if (this.schema.getQueryType()?.name === typeName) {
@@ -796,15 +815,20 @@ export class BaseResolversVisitor extends BaseVisitor {
             }
             return false;
         })();
-        const fieldsContent = node.fields.map(f => {
-            return f(typeName, (rootType === 'query' && this.config.avoidOptionals.query) ||
+        const fieldsContent = node.fields
+            .map(({ printContent }) => {
+            return printContent(node, (rootType === 'query' && this.config.avoidOptionals.query) ||
                 (rootType === 'mutation' && this.config.avoidOptionals.mutation) ||
                 (rootType === 'subscription' && this.config.avoidOptionals.subscription) ||
                 (rootType === false && this.config.avoidOptionals.resolvers)).value;
-        });
+        })
+            .filter(v => v);
         if (!rootType && this._parsedSchemaMeta.typesWithIsTypeOf[typeName]) {
             fieldsContent.push(indent(`${this.config.internalResolversPrefix}isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>${this.getPunctuation(declarationKind)}`));
         }
+        if (fieldsContent.length === 0) {
+            return null;
+        }
         const genericTypes = [
             `ContextType = ${this.config.contextType.type}`,
             this.transformParentGenericType(parentType),
@@ -964,7 +988,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         ];
         // An Interface in Federation may have the additional __resolveReference resolver, if resolvable.
         // So, we filter out the normal fields declared on the Interface and add the __resolveReference resolver.
-        const fields = node.fields.map(f => f(typeName, this.config.avoidOptionals.resolvers));
+        const fields = node.fields.map(({ printContent }) => printContent(node, this.config.avoidOptionals.resolvers));
         for (const field of fields) {
             if (field.meta.federation?.isResolveReference) {
                 blockFields.push(field.value);

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

@@ -585,7 +585,7 @@ export class SelectionSetToObject {
                 .join(' & ')),
             this.getEmptyObjectTypeString(mustAddEmptyObject),
         ].filter(Boolean);
-        const content = typeParts.join(' | ');
+        const content = formatUnion(typeParts);
         if (typeParts.length > 1 && this._config.extractAllFieldsToTypes) {
             return {
                 mergedTypeString: fieldName,
@@ -658,7 +658,7 @@ export class SelectionSetToObject {
                 .export()
                 .asKind('type')
                 .withName(mergedTypeString)
-                .withContent(subTypes.map(t => t.name).join(' | ')).string,
+                .withContent(formatUnion(subTypes.map(t => t.name))).string,
         ].join('\n');
     }
     buildFragmentTypeName(name, suffix, typeName = '') {
@@ -673,3 +673,9 @@ export class SelectionSetToObject {
         return operationTypes.includes(typeName) ? parentName : `${parentName}_${typeName}`;
     }
 }
+function formatUnion(members) {
+    if (members.length > 1) {
+        return `\n  | ${members.map(m => m.replace(/\n/g, '\n  ')).join('\n  | ')}\n`;
+    }
+    return members.join(' | ');
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "6.0.0-alpha-20250509134235-30ac8930f49f44ab10e6b7dcdd7f12a67bfa9fc4",
+  "version": "6.0.0-alpha-20250529121049-5e08c758900167a8eaee6ff178599c2b990bf21d",
   "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"
   },
   "dependencies": {
     "@graphql-tools/optimize": "^2.0.0",
-    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250509134235-30ac8930f49f44ab10e6b7dcdd7f12a67bfa9fc4",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250529121049-5e08c758900167a8eaee6ff178599c2b990bf21d",
     "@graphql-tools/relay-operation-optimizer": "^7.0.0",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",

package/typings/base-resolvers-visitor.d.cts

@@ -31,7 +31,11 @@ export interface ParsedResolversConfig extends ParsedConfig {
     resolversNonOptionalTypename: ResolversNonOptionalTypenameConfig;
     avoidCheckingAbstractTypesRecursively: boolean;
 }
-type FieldDefinitionPrintFn = (parentName: string, avoidResolverOptionals: boolean) => {
+export interface FieldDefinitionResult {
+    node: FieldDefinitionNode;
+    printContent: FieldDefinitionPrintFn;
+}
+type FieldDefinitionPrintFn = (parentNode: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode, avoidResolverOptionals: boolean) => {
     value: string | null;
     meta: {
         federation?: {
@@ -756,13 +760,13 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     protected getParentTypeToUse(name: string): string;
     protected getParentTypeForSignature(_node: FieldDefinitionNode): string;
     protected transformParentGenericType(parentType: string): string;
-    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionPrintFn;
+    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionResult;
     private getFieldContextType;
     private getContextType;
     private parseSchemaMeta;
     protected applyRequireFields(argsType: string, fields: InputValueDefinitionNode[]): string;
     protected applyOptionalFields(argsType: string, _fields: readonly InputValueDefinitionNode[]): string;
-    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string;
+    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string | null;
     UnionTypeDefinition(node: UnionTypeDefinitionNode, key: string | number, parent: any): string;
     ScalarTypeDefinition(node: ScalarTypeDefinitionNode): string;
     DirectiveDefinition(node: DirectiveDefinitionNode, key: string | number, parent: any): string;

package/typings/base-resolvers-visitor.d.ts

@@ -31,7 +31,11 @@ export interface ParsedResolversConfig extends ParsedConfig {
     resolversNonOptionalTypename: ResolversNonOptionalTypenameConfig;
     avoidCheckingAbstractTypesRecursively: boolean;
 }
-type FieldDefinitionPrintFn = (parentName: string, avoidResolverOptionals: boolean) => {
+export interface FieldDefinitionResult {
+    node: FieldDefinitionNode;
+    printContent: FieldDefinitionPrintFn;
+}
+type FieldDefinitionPrintFn = (parentNode: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode, avoidResolverOptionals: boolean) => {
     value: string | null;
     meta: {
         federation?: {
@@ -756,13 +760,13 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     protected getParentTypeToUse(name: string): string;
     protected getParentTypeForSignature(_node: FieldDefinitionNode): string;
     protected transformParentGenericType(parentType: string): string;
-    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionPrintFn;
+    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionResult;
     private getFieldContextType;
     private getContextType;
     private parseSchemaMeta;
     protected applyRequireFields(argsType: string, fields: InputValueDefinitionNode[]): string;
     protected applyOptionalFields(argsType: string, _fields: readonly InputValueDefinitionNode[]): string;
-    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string;
+    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string | null;
     UnionTypeDefinition(node: UnionTypeDefinitionNode, key: string | number, parent: any): string;
     ScalarTypeDefinition(node: ScalarTypeDefinitionNode): string;
     DirectiveDefinition(node: DirectiveDefinitionNode, key: string | number, parent: any): string;