@graphql-codegen/visitor-plugin-common 6.0.0-alpha-20250803135812-ba3d434d95a043ee91b84ec36aaff30459a29599 → 6.0.0-alpha-20250803143223-4ac576268d59b30aa3654ed2cf355ae0f3ad2bc7

package/cjs/base-resolvers-visitor.js

@@ -620,12 +620,6 @@ 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;
-    }
     ListType(node) {
         const asString = node.type;
         return this.wrapWithArray(asString);
@@ -634,7 +628,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         return `${this.config.namespacedImportName ? this.config.namespacedImportName + '.' : ''}Scalars['${name}']['output']`;
     }
     NamedType(node) {
-        const nameStr = node.name;
+        const nameStr = node.name.value;
         if (this.config.scalars[nameStr]) {
             return this._getScalar(nameStr);
         }
@@ -668,10 +662,10 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         return {
             node: original,
             printContent: (parentNode, avoidResolverOptionals) => {
-                const parentName = parentNode.name;
+                const parentName = parentNode.name.value;
                 const parentType = this.schema.getType(parentName);
                 const meta = {};
-                const typeName = node.name;
+                const typeName = node.name.value;
                 const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node: parentNode });
                 const shouldGenerateField = fieldsToGenerate.some(field => field.name.value === typeName) ||
                     this._federation.isResolveReferenceField(node);
@@ -721,7 +715,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                         };
                     }
                     const directiveMappings = node.directives
-                        ?.map(directive => this._directiveResolverMappings[directive.name])
+                        ?.map(directive => this._directiveResolverMappings[directive.name.value])
                         .filter(Boolean)
                         .reverse() ?? [];
                     return {
@@ -753,15 +747,15 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         };
     }
     getFieldContextType(parentName, node) {
-        if (this._fieldContextTypeMap[`${parentName}.${node.name}`]) {
-            return this._fieldContextTypeMap[`${parentName}.${node.name}`].type;
+        if (this._fieldContextTypeMap[`${parentName}.${node.name.value}`]) {
+            return this._fieldContextTypeMap[`${parentName}.${node.name.value}`].type;
         }
         return 'ContextType';
     }
     getContextType(parentName, node) {
         let contextType = this.getFieldContextType(parentName, node);
         for (const directive of node.directives) {
-            const name = directive.name;
+            const name = directive.name.value;
             const directiveMap = this._directiveContextTypesMap[name];
             if (directiveMap) {
                 contextType = `${directiveMap.type}<${contextType}>`;
@@ -810,7 +804,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         return `Partial<${argsType}>`;
     }
     ObjectTypeDefinition(node) {
-        const typeName = node.name;
+        const typeName = node.name.value;
         const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node });
         if (fieldsToGenerate.length === 0) {
             return null;
@@ -860,7 +854,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .asKind(declarationKind)
             .withName(name, `<${genericTypes.join(', ')}>`)
             .withBlock(fieldsContent.join('\n'));
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: name + '<ContextType>',
             baseGeneratedTypename: name,
         };
@@ -876,11 +870,11 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .map(node => node.name.value)
             .map(f => `'${f}'`)
             .join(' | ');
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: name + '<ContextType>',
             baseGeneratedTypename: name,
         };
-        const parentType = this.getParentTypeToUse(node.name);
+        const parentType = this.getParentTypeToUse(node.name.value);
         return new utils_js_1.DeclarationBlock(this._declarationBlockConfig)
             .export()
             .asKind(declarationKind)
@@ -888,13 +882,13 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .withBlock((0, utils_js_1.indent)(`${this.config.internalResolversPrefix}resolveType${this.config.optionalResolveType ? '?' : ''}: TypeResolveFn<${possibleTypes}, ParentType, ContextType>${this.getPunctuation(declarationKind)}`)).string;
     }
     ScalarTypeDefinition(node) {
-        const nameAsString = node.name;
+        const nameAsString = node.name.value;
         const baseName = this.getTypeToUse(nameAsString);
         if (this._federation.skipScalar(nameAsString)) {
             return null;
         }
         this._hasScalars = true;
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: 'GraphQLScalarType',
         };
         return new utils_js_1.DeclarationBlock({
@@ -908,10 +902,10 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .withName(this.convertName(node, {
             suffix: 'ScalarConfig',
         }), ` extends GraphQLScalarTypeConfig<${baseName}, any>`)
-            .withBlock((0, utils_js_1.indent)(`name: '${node.name}'${this.getPunctuation('interface')}`)).string;
+            .withBlock((0, utils_js_1.indent)(`name: '${node.name.value}'${this.getPunctuation('interface')}`)).string;
     }
     DirectiveDefinition(node, key, parent) {
-        if (this._federation.skipDirective(node.name)) {
+        if (this._federation.skipDirective(node.name.value)) {
             return null;
         }
         const directiveName = this.convertName(node, {
@@ -919,7 +913,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         });
         const sourceNode = parent[key];
         const hasArguments = sourceNode.arguments && sourceNode.arguments.length > 0;
-        this._collectedDirectiveResolvers[node.name] = directiveName + '<any, any, ContextType>';
+        this._collectedDirectiveResolvers[node.name.value] = directiveName + '<any, any, ContextType>';
         const directiveArgsTypeName = this.convertName(node, {
             suffix: 'DirectiveArgs',
         });
@@ -955,7 +949,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         throw new Error(`buildEnumResolversExplicitMappedValues is not implemented!`);
     }
     EnumTypeDefinition(node) {
-        const rawTypeName = node.name;
+        const rawTypeName = node.name.value;
         // If we have enumValues set, and it's point to an external enum - we need to allow internal values resolvers
         // In case we have enumValues set but as explicit values, no need to to do mapping since it's already
         // have type validation (the original enum has been modified by base types plugin).
@@ -982,7 +976,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             suffix: this.config.resolverTypeSuffix,
         });
         const declarationKind = 'type';
-        const typeName = node.name;
+        const typeName = node.name.value;
         const implementingTypes = Object.keys(this._parsedSchemaMeta.types.interface[typeName].implementingTypes);
         this._collectedResolvers[typeName] = {
             typename: name + '<ContextType>',

package/esm/base-resolvers-visitor.js

@@ -616,12 +616,6 @@ 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;
-    }
     ListType(node) {
         const asString = node.type;
         return this.wrapWithArray(asString);
@@ -630,7 +624,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         return `${this.config.namespacedImportName ? this.config.namespacedImportName + '.' : ''}Scalars['${name}']['output']`;
     }
     NamedType(node) {
-        const nameStr = node.name;
+        const nameStr = node.name.value;
         if (this.config.scalars[nameStr]) {
             return this._getScalar(nameStr);
         }
@@ -664,10 +658,10 @@ export class BaseResolversVisitor extends BaseVisitor {
         return {
             node: original,
             printContent: (parentNode, avoidResolverOptionals) => {
-                const parentName = parentNode.name;
+                const parentName = parentNode.name.value;
                 const parentType = this.schema.getType(parentName);
                 const meta = {};
-                const typeName = node.name;
+                const typeName = node.name.value;
                 const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node: parentNode });
                 const shouldGenerateField = fieldsToGenerate.some(field => field.name.value === typeName) ||
                     this._federation.isResolveReferenceField(node);
@@ -717,7 +711,7 @@ export class BaseResolversVisitor extends BaseVisitor {
                         };
                     }
                     const directiveMappings = node.directives
-                        ?.map(directive => this._directiveResolverMappings[directive.name])
+                        ?.map(directive => this._directiveResolverMappings[directive.name.value])
                         .filter(Boolean)
                         .reverse() ?? [];
                     return {
@@ -749,15 +743,15 @@ export class BaseResolversVisitor extends BaseVisitor {
         };
     }
     getFieldContextType(parentName, node) {
-        if (this._fieldContextTypeMap[`${parentName}.${node.name}`]) {
-            return this._fieldContextTypeMap[`${parentName}.${node.name}`].type;
+        if (this._fieldContextTypeMap[`${parentName}.${node.name.value}`]) {
+            return this._fieldContextTypeMap[`${parentName}.${node.name.value}`].type;
         }
         return 'ContextType';
     }
     getContextType(parentName, node) {
         let contextType = this.getFieldContextType(parentName, node);
         for (const directive of node.directives) {
-            const name = directive.name;
+            const name = directive.name.value;
             const directiveMap = this._directiveContextTypesMap[name];
             if (directiveMap) {
                 contextType = `${directiveMap.type}<${contextType}>`;
@@ -806,7 +800,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         return `Partial<${argsType}>`;
     }
     ObjectTypeDefinition(node) {
-        const typeName = node.name;
+        const typeName = node.name.value;
         const fieldsToGenerate = this._federation.findFieldNodesToGenerate({ node });
         if (fieldsToGenerate.length === 0) {
             return null;
@@ -856,7 +850,7 @@ export class BaseResolversVisitor extends BaseVisitor {
             .asKind(declarationKind)
             .withName(name, `<${genericTypes.join(', ')}>`)
             .withBlock(fieldsContent.join('\n'));
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: name + '<ContextType>',
             baseGeneratedTypename: name,
         };
@@ -872,11 +866,11 @@ export class BaseResolversVisitor extends BaseVisitor {
             .map(node => node.name.value)
             .map(f => `'${f}'`)
             .join(' | ');
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: name + '<ContextType>',
             baseGeneratedTypename: name,
         };
-        const parentType = this.getParentTypeToUse(node.name);
+        const parentType = this.getParentTypeToUse(node.name.value);
         return new DeclarationBlock(this._declarationBlockConfig)
             .export()
             .asKind(declarationKind)
@@ -884,13 +878,13 @@ export class BaseResolversVisitor extends BaseVisitor {
             .withBlock(indent(`${this.config.internalResolversPrefix}resolveType${this.config.optionalResolveType ? '?' : ''}: TypeResolveFn<${possibleTypes}, ParentType, ContextType>${this.getPunctuation(declarationKind)}`)).string;
     }
     ScalarTypeDefinition(node) {
-        const nameAsString = node.name;
+        const nameAsString = node.name.value;
         const baseName = this.getTypeToUse(nameAsString);
         if (this._federation.skipScalar(nameAsString)) {
             return null;
         }
         this._hasScalars = true;
-        this._collectedResolvers[node.name] = {
+        this._collectedResolvers[node.name.value] = {
             typename: 'GraphQLScalarType',
         };
         return new DeclarationBlock({
@@ -904,10 +898,10 @@ export class BaseResolversVisitor extends BaseVisitor {
             .withName(this.convertName(node, {
             suffix: 'ScalarConfig',
         }), ` extends GraphQLScalarTypeConfig<${baseName}, any>`)
-            .withBlock(indent(`name: '${node.name}'${this.getPunctuation('interface')}`)).string;
+            .withBlock(indent(`name: '${node.name.value}'${this.getPunctuation('interface')}`)).string;
     }
     DirectiveDefinition(node, key, parent) {
-        if (this._federation.skipDirective(node.name)) {
+        if (this._federation.skipDirective(node.name.value)) {
             return null;
         }
         const directiveName = this.convertName(node, {
@@ -915,7 +909,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         });
         const sourceNode = parent[key];
         const hasArguments = sourceNode.arguments && sourceNode.arguments.length > 0;
-        this._collectedDirectiveResolvers[node.name] = directiveName + '<any, any, ContextType>';
+        this._collectedDirectiveResolvers[node.name.value] = directiveName + '<any, any, ContextType>';
         const directiveArgsTypeName = this.convertName(node, {
             suffix: 'DirectiveArgs',
         });
@@ -951,7 +945,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         throw new Error(`buildEnumResolversExplicitMappedValues is not implemented!`);
     }
     EnumTypeDefinition(node) {
-        const rawTypeName = node.name;
+        const rawTypeName = node.name.value;
         // If we have enumValues set, and it's point to an external enum - we need to allow internal values resolvers
         // In case we have enumValues set but as explicit values, no need to to do mapping since it's already
         // have type validation (the original enum has been modified by base types plugin).
@@ -978,7 +972,7 @@ export class BaseResolversVisitor extends BaseVisitor {
             suffix: this.config.resolverTypeSuffix,
         });
         const declarationKind = 'type';
-        const typeName = node.name;
+        const typeName = node.name.value;
         const implementingTypes = Object.keys(this._parsedSchemaMeta.types.interface[typeName].implementingTypes);
         this._collectedResolvers[typeName] = {
             typename: name + '<ContextType>',

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "6.0.0-alpha-20250803135812-ba3d434d95a043ee91b84ec36aaff30459a29599",
+  "version": "6.0.0-alpha-20250803143223-4ac576268d59b30aa3654ed2cf355ae0f3ad2bc7",
   "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-20250803135812-ba3d434d95a043ee91b84ec36aaff30459a29599",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250803143223-4ac576268d59b30aa3654ed2cf355ae0f3ad2bc7",
     "@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

@@ -1,5 +1,5 @@
 import { ApolloFederation, type FederationMeta } from '@graphql-codegen/plugin-helpers';
-import { ASTNode, DirectiveDefinitionNode, EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLInterfaceType, GraphQLNamedType, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, InputValueDefinitionNode, InterfaceTypeDefinitionNode, ListTypeNode, NamedTypeNode, NameNode, NonNullTypeNode, ObjectTypeDefinitionNode, ScalarTypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
+import { ASTNode, DirectiveDefinitionNode, EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLInterfaceType, GraphQLNamedType, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, InputValueDefinitionNode, InterfaceTypeDefinitionNode, ListTypeNode, NamedTypeNode, NonNullTypeNode, ObjectTypeDefinitionNode, ScalarTypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
 import { BaseVisitor, BaseVisitorConvertOptions, ParsedConfig, RawConfig } from './base-visitor.cjs';
 import { ParsedMapper } from './mappers.cjs';
 import { AvoidOptionalsConfig, ConvertOptions, DeclarationKind, EnumValuesMap, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, ParsedEnumValuesMap, ResolversNonOptionalTypenameConfig } from './types.cjs';
@@ -751,7 +751,6 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     getRootResolver(): RootResolver;
     protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string;
     getAllDirectiveResolvers(): string;
-    Name(node: NameNode): string;
     ListType(node: ListTypeNode): string;
     protected _getScalar(name: string): string;
     NamedType(node: NamedTypeNode): string;

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

@@ -1,5 +1,5 @@
 import { ApolloFederation, type FederationMeta } from '@graphql-codegen/plugin-helpers';
-import { ASTNode, DirectiveDefinitionNode, EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLInterfaceType, GraphQLNamedType, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, InputValueDefinitionNode, InterfaceTypeDefinitionNode, ListTypeNode, NamedTypeNode, NameNode, NonNullTypeNode, ObjectTypeDefinitionNode, ScalarTypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
+import { ASTNode, DirectiveDefinitionNode, EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLInterfaceType, GraphQLNamedType, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, InputValueDefinitionNode, InterfaceTypeDefinitionNode, ListTypeNode, NamedTypeNode, NonNullTypeNode, ObjectTypeDefinitionNode, ScalarTypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
 import { BaseVisitor, BaseVisitorConvertOptions, ParsedConfig, RawConfig } from './base-visitor.js';
 import { ParsedMapper } from './mappers.js';
 import { AvoidOptionalsConfig, ConvertOptions, DeclarationKind, EnumValuesMap, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, ParsedEnumValuesMap, ResolversNonOptionalTypenameConfig } from './types.js';
@@ -751,7 +751,6 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     getRootResolver(): RootResolver;
     protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string;
     getAllDirectiveResolvers(): string;
-    Name(node: NameNode): string;
     ListType(node: ListTypeNode): string;
     protected _getScalar(name: string): string;
     NamedType(node: NamedTypeNode): string;