@graphql-codegen/visitor-plugin-common 6.0.0-alpha-20250608134954-abd8276c8c3ea60547bf2b0dabfd58c20bc69065 → 6.0.0-alpha-20250609130245-016484a10b6d41d848d7b0967ce8929c5b0ccdc8

package/cjs/base-resolvers-visitor.js

@@ -96,12 +96,9 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             shouldInclude: namedType => !(0, graphql_1.isEnumType)(namedType),
             onNotMappedObjectType: ({ typeName, initialType }) => {
                 let result = initialType;
-                const federationReferenceTypes = this._federation.printReferenceSelectionSets({
-                    typeName,
-                    baseFederationType: `${this.convertName('FederationTypes')}['${typeName}']`,
-                });
-                if (federationReferenceTypes) {
-                    result += ` | ${federationReferenceTypes}`;
+                const referenceSelectionSetsString = this._federation.getMeta()[typeName]?.referenceSelectionSetsString;
+                if (referenceSelectionSetsString) {
+                    result += ` | ${this.convertName('FederationReferenceTypes')}['${typeName}']`;
                 }
                 return result;
             },
@@ -474,6 +471,27 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         })
             .join('\n')).string;
     }
+    buildFederationReferenceTypes() {
+        const federationMeta = this._federation.getMeta();
+        if (Object.keys(federationMeta).length === 0) {
+            return '';
+        }
+        const declarationKind = 'type';
+        return new utils_js_1.DeclarationBlock(this._declarationBlockConfig)
+            .export()
+            .asKind(declarationKind)
+            .withName(this.convertName('FederationReferenceTypes'))
+            .withComment('Mapping of federation reference types')
+            .withBlock(Object.entries(federationMeta)
+            .map(([typeName, { referenceSelectionSetsString }]) => {
+            if (!referenceSelectionSetsString) {
+                return undefined;
+            }
+            return (0, utils_js_1.indent)(`${typeName}: ${referenceSelectionSetsString}${this.getPunctuation(declarationKind)}`);
+        })
+            .filter(v => v)
+            .join('\n')).string;
+    }
     get schema() {
         return this._schema;
     }
@@ -683,12 +701,6 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                         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;
@@ -722,15 +734,16 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                     name: typeName,
                     modifier: avoidResolverOptionals ? '' : '?',
                     type: resolverType,
-                    genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
+                    genericTypes: [mappedTypeKey, this.getParentTypeForSignature(node), contextType, argsType].filter(f => f),
                 };
                 if (this._federation.isResolveReferenceField(node)) {
                     if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
                         return { value: '', meta };
                     }
+                    const resultType = `${mappedTypeKey} | FederationReferenceType`;
+                    const referenceType = 'FederationReferenceType';
                     signature.type = 'ReferenceResolver';
-                    signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
-                    meta.federation = { isResolveReference: true };
+                    signature.genericTypes = [resultType, referenceType, contextType];
                 }
                 return {
                     value: (0, utils_js_1.indent)(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
@@ -839,7 +852,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         ];
         this._federation.addFederationTypeGenericIfApplicable({
             genericTypes,
-            federationTypesType: this.convertName('FederationTypes'),
+            federationTypesType: this.convertName('FederationReferenceTypes'),
             typeName,
         });
         const block = new utils_js_1.DeclarationBlock(this._declarationBlockConfig)

package/esm/base-resolvers-visitor.js

@@ -92,12 +92,9 @@ export class BaseResolversVisitor extends BaseVisitor {
             shouldInclude: namedType => !isEnumType(namedType),
             onNotMappedObjectType: ({ typeName, initialType }) => {
                 let result = initialType;
-                const federationReferenceTypes = this._federation.printReferenceSelectionSets({
-                    typeName,
-                    baseFederationType: `${this.convertName('FederationTypes')}['${typeName}']`,
-                });
-                if (federationReferenceTypes) {
-                    result += ` | ${federationReferenceTypes}`;
+                const referenceSelectionSetsString = this._federation.getMeta()[typeName]?.referenceSelectionSetsString;
+                if (referenceSelectionSetsString) {
+                    result += ` | ${this.convertName('FederationReferenceTypes')}['${typeName}']`;
                 }
                 return result;
             },
@@ -470,6 +467,27 @@ export class BaseResolversVisitor extends BaseVisitor {
         })
             .join('\n')).string;
     }
+    buildFederationReferenceTypes() {
+        const federationMeta = this._federation.getMeta();
+        if (Object.keys(federationMeta).length === 0) {
+            return '';
+        }
+        const declarationKind = 'type';
+        return new DeclarationBlock(this._declarationBlockConfig)
+            .export()
+            .asKind(declarationKind)
+            .withName(this.convertName('FederationReferenceTypes'))
+            .withComment('Mapping of federation reference types')
+            .withBlock(Object.entries(federationMeta)
+            .map(([typeName, { referenceSelectionSetsString }]) => {
+            if (!referenceSelectionSetsString) {
+                return undefined;
+            }
+            return indent(`${typeName}: ${referenceSelectionSetsString}${this.getPunctuation(declarationKind)}`);
+        })
+            .filter(v => v)
+            .join('\n')).string;
+    }
     get schema() {
         return this._schema;
     }
@@ -679,12 +697,6 @@ export class BaseResolversVisitor extends BaseVisitor {
                         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;
@@ -718,15 +730,16 @@ export class BaseResolversVisitor extends BaseVisitor {
                     name: typeName,
                     modifier: avoidResolverOptionals ? '' : '?',
                     type: resolverType,
-                    genericTypes: [mappedTypeKey, parentTypeSignature, contextType, argsType].filter(f => f),
+                    genericTypes: [mappedTypeKey, this.getParentTypeForSignature(node), contextType, argsType].filter(f => f),
                 };
                 if (this._federation.isResolveReferenceField(node)) {
                     if (!this._federation.getMeta()[parentType.name].hasResolveReference) {
                         return { value: '', meta };
                     }
+                    const resultType = `${mappedTypeKey} | FederationReferenceType`;
+                    const referenceType = 'FederationReferenceType';
                     signature.type = 'ReferenceResolver';
-                    signature.genericTypes = [mappedTypeKey, parentTypeSignature, contextType];
-                    meta.federation = { isResolveReference: true };
+                    signature.genericTypes = [resultType, referenceType, contextType];
                 }
                 return {
                     value: indent(`${signature.name}${signature.modifier}: ${signature.type}<${signature.genericTypes.join(', ')}>${this.getPunctuation(declarationKind)}`),
@@ -835,7 +848,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         ];
         this._federation.addFederationTypeGenericIfApplicable({
             genericTypes,
-            federationTypesType: this.convertName('FederationTypes'),
+            federationTypesType: this.convertName('FederationReferenceTypes'),
             typeName,
         });
         const block = new DeclarationBlock(this._declarationBlockConfig)

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "6.0.0-alpha-20250608134954-abd8276c8c3ea60547bf2b0dabfd58c20bc69065",
+  "version": "6.0.0-alpha-20250609130245-016484a10b6d41d848d7b0967ce8929c5b0ccdc8",
   "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-20250608134954-abd8276c8c3ea60547bf2b0dabfd58c20bc69065",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250609130245-016484a10b6d41d848d7b0967ce8929c5b0ccdc8",
     "@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

@@ -737,6 +737,7 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     buildResolversUnionTypes(): string;
     buildResolversInterfaceTypes(): string;
     buildFederationTypes(): string;
+    buildFederationReferenceTypes(): string;
     get schema(): GraphQLSchema;
     get defaultMapperType(): string;
     get unusedMappers(): string[];

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

@@ -737,6 +737,7 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     buildResolversUnionTypes(): string;
     buildResolversInterfaceTypes(): string;
     buildFederationTypes(): string;
+    buildFederationReferenceTypes(): string;
     get schema(): GraphQLSchema;
     get defaultMapperType(): string;
     get unusedMappers(): string[];