@graphql-codegen/visitor-plugin-common 7.0.0-alpha-20260105124559-f9262ad32043cda0a35998bceda372bdbb1b034c → 7.0.0-alpha-20260106134001-96cfbeda34da3ef03f382f529dae5d10a950b657

package/cjs/base-resolvers-visitor.js

@@ -173,15 +173,17 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             const isMapped = this.config.mappers[typeName];
             const isScalar = this.config.scalars[typeName];
             const hasDefaultMapper = !!this.config.defaultMapper?.type;
-            if (isRootType) {
-                prev[typeName] = applyWrapper(this.config.rootValueType.type);
-                return prev;
-            }
+            // Check for mappers first, even for root types, to allow overriding rootValueType
             if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
                 this.markMapperAsUsed(typeName);
                 prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
+                return prev;
+            }
+            if (isRootType) {
+                prev[typeName] = applyWrapper(this.config.rootValueType.type);
+                return prev;
             }
-            else if ((0, graphql_1.isEnumType)(schemaType) && this.config.enumValues[typeName]) {
+            if ((0, graphql_1.isEnumType)(schemaType) && this.config.enumValues[typeName]) {
                 const isExternalFile = !!this.config.enumValues[typeName].sourceFile;
                 prev[typeName] = isExternalFile
                     ? this.convertName(this.config.enumValues[typeName].typeIdentifier, {

package/cjs/base-visitor.js

@@ -5,11 +5,16 @@ const tslib_1 = require("tslib");
 const auto_bind_1 = tslib_1.__importDefault(require("auto-bind"));
 const naming_js_1 = require("./naming.js");
 const utils_js_1 = require("./utils.js");
+const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 class BaseVisitor {
     _parsedConfig;
     _declarationBlockConfig = {};
     scalars;
     constructor(rawConfig, additionalConfig) {
+        const importExtension = (0, plugin_helpers_1.normalizeImportExtension)({
+            emitLegacyCommonJSImports: rawConfig.emitLegacyCommonJSImports,
+            importExtension: rawConfig.importExtension,
+        });
         this._parsedConfig = {
             convert: (0, naming_js_1.convertFactory)(rawConfig),
             typesPrefix: rawConfig.typesPrefix || '',
@@ -22,6 +27,7 @@ class BaseVisitor {
             allowEnumStringTypes: !!rawConfig.allowEnumStringTypes,
             inlineFragmentTypes: rawConfig.inlineFragmentTypes ?? 'inline',
             emitLegacyCommonJSImports: rawConfig.emitLegacyCommonJSImports === undefined ? true : !!rawConfig.emitLegacyCommonJSImports,
+            importExtension,
             printFieldsOnNewLines: rawConfig.printFieldsOnNewLines ?? false,
             includeExternalFragments: rawConfig.includeExternalFragments ?? false,
             ...(additionalConfig || {}),

package/cjs/client-side-base-visitor.js

@@ -296,7 +296,11 @@ class ClientSideBaseVisitor extends base_visitor_js_1.BaseVisitor {
     }
     clearExtension(path) {
         const extension = (0, path_1.extname)(path);
-        if (!this.config.emitLegacyCommonJSImports && extension === '.js') {
+        const importExtension = (0, plugin_helpers_1.normalizeImportExtension)({
+            emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+            importExtension: this.config.importExtension,
+        });
+        if (extension === importExtension) {
             return path;
         }
         if (EXTENSIONS_TO_REMOVE.includes(extension)) {
@@ -330,9 +334,10 @@ class ClientSideBaseVisitor extends base_visitor_js_1.BaseVisitor {
                 if (this._collectedOperations.length > 0) {
                     if (this.config.importDocumentNodeExternallyFrom === 'near-operation-file' && this._documents.length === 1) {
                         let documentPath = `./${this.clearExtension((0, path_1.basename)(this._documents[0].location))}`;
-                        if (!this.config.emitLegacyCommonJSImports) {
-                            documentPath += '.js';
-                        }
+                        documentPath += (0, plugin_helpers_1.normalizeImportExtension)({
+                            emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                            importExtension: this.config.importExtension,
+                        });
                         this._imports.add(`import * as Operations from '${documentPath}';`);
                     }
                     else {
@@ -350,6 +355,10 @@ class ClientSideBaseVisitor extends base_visitor_js_1.BaseVisitor {
         }
         const excludeFragments = options.excludeFragments || this.config.globalNamespace || this.config.documentMode !== DocumentMode.graphQLTag;
         if (!excludeFragments) {
+            const importExtension = (0, plugin_helpers_1.normalizeImportExtension)({
+                emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                importExtension: this.config.importExtension,
+            });
             const deduplicatedImports = Object.values((0, utils_js_1.groupBy)(this.config.fragmentImports, fi => fi.importSource.path))
                 .map((fragmentImports) => ({
                 ...fragmentImports[0],
@@ -358,6 +367,7 @@ class ClientSideBaseVisitor extends base_visitor_js_1.BaseVisitor {
                     identifiers: (0, utils_js_1.unique)((0, utils_js_1.flatten)(fragmentImports.map(fi => fi.importSource.identifiers)), identifier => identifier.name),
                 },
                 emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                importExtension,
             }))
                 .filter(fragmentImport => fragmentImport.outputPath !== fragmentImport.importSource.path);
             for (const fragmentImport of deduplicatedImports) {

package/cjs/imports.js

@@ -11,6 +11,7 @@ exports.buildTypeImport = buildTypeImport;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const parse_filepath_1 = tslib_1.__importDefault(require("parse-filepath"));
+const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 function generateFragmentImportStatement(statement, kind) {
     const { importSource: fragmentImportSource, ...rest } = statement;
     const { identifiers, path, namespace } = fragmentImportSource;
@@ -33,7 +34,12 @@ function generateImportStatement(statement) {
     const importNames = importSource.identifiers?.length
         ? `{ ${Array.from(new Set(importSource.identifiers)).join(', ')} }`
         : '*';
-    const importExtension = importPath.startsWith('/') || importPath.startsWith('.') ? (statement.emitLegacyCommonJSImports ? '' : '.js') : '';
+    const importExtension = importPath.startsWith('/') || importPath.startsWith('.')
+        ? (0, plugin_helpers_1.normalizeImportExtension)({
+            emitLegacyCommonJSImports: statement.emitLegacyCommonJSImports,
+            importExtension: statement.importExtension,
+        })
+        : '';
     const importAlias = importSource.namespace ? ` as ${importSource.namespace}` : '';
     const importStatement = typesImport ? 'import type' : 'import';
     return `${importStatement} ${importNames}${importAlias} from '${importPath}${importExtension}';${importAlias ? '\n' : ''}`;

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

@@ -687,7 +687,20 @@ class SelectionSetToObject {
     buildParentFieldName(typeName, parentName) {
         // queries/mutations/fragments are guaranteed to be unique type names,
         // so we can skip affixing the field names with typeName
-        return operationTypes.includes(typeName) ? parentName : `${parentName}_${typeName}`;
+        if (operationTypes.includes(typeName)) {
+            return parentName;
+        }
+        const schemaType = this._schema.getType(typeName);
+        // Check if current selection set has fragments (e.g., "... AppNotificationFragment" or "... on AppNotification")
+        const hasFragment = this._selectionSet?.selections?.some(selection => selection.kind === graphql_1.Kind.INLINE_FRAGMENT || selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) ?? false;
+        // When the parent schema type is an interface:
+        // - If we're processing inline fragments, use the concrete type name
+        // - If we're processing the interface directly, use the interface name
+        // - If we're in a named fragment, always use the concrete type name
+        if ((0, graphql_1.isObjectType)(schemaType) && this._parentSchemaType && (0, graphql_1.isInterfaceType)(this._parentSchemaType) && !hasFragment) {
+            return `${parentName}_${this._parentSchemaType.name}`;
+        }
+        return `${parentName}_${typeName}`;
     }
 }
 exports.SelectionSetToObject = SelectionSetToObject;

package/esm/base-resolvers-visitor.js

@@ -169,15 +169,17 @@ export class BaseResolversVisitor extends BaseVisitor {
             const isMapped = this.config.mappers[typeName];
             const isScalar = this.config.scalars[typeName];
             const hasDefaultMapper = !!this.config.defaultMapper?.type;
-            if (isRootType) {
-                prev[typeName] = applyWrapper(this.config.rootValueType.type);
-                return prev;
-            }
+            // Check for mappers first, even for root types, to allow overriding rootValueType
             if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
                 this.markMapperAsUsed(typeName);
                 prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
+                return prev;
+            }
+            if (isRootType) {
+                prev[typeName] = applyWrapper(this.config.rootValueType.type);
+                return prev;
             }
-            else if (isEnumType(schemaType) && this.config.enumValues[typeName]) {
+            if (isEnumType(schemaType) && this.config.enumValues[typeName]) {
                 const isExternalFile = !!this.config.enumValues[typeName].sourceFile;
                 prev[typeName] = isExternalFile
                     ? this.convertName(this.config.enumValues[typeName].typeIdentifier, {

package/esm/base-visitor.js

@@ -1,11 +1,16 @@
 import autoBind from 'auto-bind';
 import { convertFactory } from './naming.js';
 import { getConfigValue } from './utils.js';
+import { normalizeImportExtension } from '@graphql-codegen/plugin-helpers';
 export class BaseVisitor {
     _parsedConfig;
     _declarationBlockConfig = {};
     scalars;
     constructor(rawConfig, additionalConfig) {
+        const importExtension = normalizeImportExtension({
+            emitLegacyCommonJSImports: rawConfig.emitLegacyCommonJSImports,
+            importExtension: rawConfig.importExtension,
+        });
         this._parsedConfig = {
             convert: convertFactory(rawConfig),
             typesPrefix: rawConfig.typesPrefix || '',
@@ -18,6 +23,7 @@ export class BaseVisitor {
             allowEnumStringTypes: !!rawConfig.allowEnumStringTypes,
             inlineFragmentTypes: rawConfig.inlineFragmentTypes ?? 'inline',
             emitLegacyCommonJSImports: rawConfig.emitLegacyCommonJSImports === undefined ? true : !!rawConfig.emitLegacyCommonJSImports,
+            importExtension,
             printFieldsOnNewLines: rawConfig.printFieldsOnNewLines ?? false,
             includeExternalFragments: rawConfig.includeExternalFragments ?? false,
             ...(additionalConfig || {}),

package/esm/client-side-base-visitor.js

@@ -1,5 +1,5 @@
 import { basename, extname } from 'path';
-import { oldVisit } from '@graphql-codegen/plugin-helpers';
+import { normalizeImportExtension, oldVisit } from '@graphql-codegen/plugin-helpers';
 import { optimizeDocumentNode } from '@graphql-tools/optimize';
 import autoBind from 'auto-bind';
 import { pascalCase } from 'change-case-all';
@@ -292,7 +292,11 @@ export class ClientSideBaseVisitor extends BaseVisitor {
     }
     clearExtension(path) {
         const extension = extname(path);
-        if (!this.config.emitLegacyCommonJSImports && extension === '.js') {
+        const importExtension = normalizeImportExtension({
+            emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+            importExtension: this.config.importExtension,
+        });
+        if (extension === importExtension) {
             return path;
         }
         if (EXTENSIONS_TO_REMOVE.includes(extension)) {
@@ -326,9 +330,10 @@ export class ClientSideBaseVisitor extends BaseVisitor {
                 if (this._collectedOperations.length > 0) {
                     if (this.config.importDocumentNodeExternallyFrom === 'near-operation-file' && this._documents.length === 1) {
                         let documentPath = `./${this.clearExtension(basename(this._documents[0].location))}`;
-                        if (!this.config.emitLegacyCommonJSImports) {
-                            documentPath += '.js';
-                        }
+                        documentPath += normalizeImportExtension({
+                            emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                            importExtension: this.config.importExtension,
+                        });
                         this._imports.add(`import * as Operations from '${documentPath}';`);
                     }
                     else {
@@ -346,6 +351,10 @@ export class ClientSideBaseVisitor extends BaseVisitor {
         }
         const excludeFragments = options.excludeFragments || this.config.globalNamespace || this.config.documentMode !== DocumentMode.graphQLTag;
         if (!excludeFragments) {
+            const importExtension = normalizeImportExtension({
+                emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                importExtension: this.config.importExtension,
+            });
             const deduplicatedImports = Object.values(groupBy(this.config.fragmentImports, fi => fi.importSource.path))
                 .map((fragmentImports) => ({
                 ...fragmentImports[0],
@@ -354,6 +363,7 @@ export class ClientSideBaseVisitor extends BaseVisitor {
                     identifiers: unique(flatten(fragmentImports.map(fi => fi.importSource.identifiers)), identifier => identifier.name),
                 },
                 emitLegacyCommonJSImports: this.config.emitLegacyCommonJSImports,
+                importExtension,
             }))
                 .filter(fragmentImport => fragmentImport.outputPath !== fragmentImport.importSource.path);
             for (const fragmentImport of deduplicatedImports) {

package/esm/imports.js

@@ -1,5 +1,6 @@
 import { dirname, isAbsolute, join, relative, resolve } from 'path';
 import parse from 'parse-filepath';
+import { normalizeImportExtension } from '@graphql-codegen/plugin-helpers';
 export function generateFragmentImportStatement(statement, kind) {
     const { importSource: fragmentImportSource, ...rest } = statement;
     const { identifiers, path, namespace } = fragmentImportSource;
@@ -22,7 +23,12 @@ export function generateImportStatement(statement) {
     const importNames = importSource.identifiers?.length
         ? `{ ${Array.from(new Set(importSource.identifiers)).join(', ')} }`
         : '*';
-    const importExtension = importPath.startsWith('/') || importPath.startsWith('.') ? (statement.emitLegacyCommonJSImports ? '' : '.js') : '';
+    const importExtension = importPath.startsWith('/') || importPath.startsWith('.')
+        ? normalizeImportExtension({
+            emitLegacyCommonJSImports: statement.emitLegacyCommonJSImports,
+            importExtension: statement.importExtension,
+        })
+        : '';
     const importAlias = importSource.namespace ? ` as ${importSource.namespace}` : '';
     const importStatement = typesImport ? 'import type' : 'import';
     return `${importStatement} ${importNames}${importAlias} from '${importPath}${importExtension}';${importAlias ? '\n' : ''}`;

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

@@ -683,7 +683,20 @@ export class SelectionSetToObject {
     buildParentFieldName(typeName, parentName) {
         // queries/mutations/fragments are guaranteed to be unique type names,
         // so we can skip affixing the field names with typeName
-        return operationTypes.includes(typeName) ? parentName : `${parentName}_${typeName}`;
+        if (operationTypes.includes(typeName)) {
+            return parentName;
+        }
+        const schemaType = this._schema.getType(typeName);
+        // Check if current selection set has fragments (e.g., "... AppNotificationFragment" or "... on AppNotification")
+        const hasFragment = this._selectionSet?.selections?.some(selection => selection.kind === Kind.INLINE_FRAGMENT || selection.kind === Kind.FRAGMENT_SPREAD) ?? false;
+        // When the parent schema type is an interface:
+        // - If we're processing inline fragments, use the concrete type name
+        // - If we're processing the interface directly, use the interface name
+        // - If we're in a named fragment, always use the concrete type name
+        if (isObjectType(schemaType) && this._parentSchemaType && isInterfaceType(this._parentSchemaType) && !hasFragment) {
+            return `${parentName}_${this._parentSchemaType.name}`;
+        }
+        return `${parentName}_${typeName}`;
     }
 }
 function formatUnion(members) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "7.0.0-alpha-20260105124559-f9262ad32043cda0a35998bceda372bdbb1b034c",
+  "version": "7.0.0-alpha-20260106134001-96cfbeda34da3ef03f382f529dae5d10a950b657",
   "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",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
     "@graphql-tools/relay-operation-optimizer": "^7.0.0",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",

package/typings/base-visitor.d.cts

@@ -20,7 +20,8 @@ export interface ParsedConfig {
     useTypeImports: boolean;
     allowEnumStringTypes: boolean;
     inlineFragmentTypes: InlineFragmentTypeOptions;
-    emitLegacyCommonJSImports: boolean;
+    emitLegacyCommonJSImports?: boolean;
+    importExtension: '' | `.${string}`;
     printFieldsOnNewLines: boolean;
     includeExternalFragments: boolean;
 }
@@ -343,11 +344,17 @@ export interface RawConfig {
      */
     inlineFragmentTypes?: InlineFragmentTypeOptions;
     /**
+     * @deprecated Please use `importExtension` instead.
      * @default true
      * @description Emit legacy common js imports.
      * Default it will be `true` this way it ensure that generated code works with [non-compliant bundlers](https://github.com/dotansimha/graphql-code-generator/issues/8065).
      */
     emitLegacyCommonJSImports?: boolean;
+    /**
+     * @description Append this extension to all imports.
+     * Useful for ESM environments that require file extensions in import statements.
+     */
+    importExtension?: '' | `.${string}`;
     /**
      * @default false
      * @description If you prefer to have each field in generated types printed on a new line, set this to true.

package/typings/base-visitor.d.ts

@@ -20,7 +20,8 @@ export interface ParsedConfig {
     useTypeImports: boolean;
     allowEnumStringTypes: boolean;
     inlineFragmentTypes: InlineFragmentTypeOptions;
-    emitLegacyCommonJSImports: boolean;
+    emitLegacyCommonJSImports?: boolean;
+    importExtension: '' | `.${string}`;
     printFieldsOnNewLines: boolean;
     includeExternalFragments: boolean;
 }
@@ -343,11 +344,17 @@ export interface RawConfig {
      */
     inlineFragmentTypes?: InlineFragmentTypeOptions;
     /**
+     * @deprecated Please use `importExtension` instead.
      * @default true
      * @description Emit legacy common js imports.
      * Default it will be `true` this way it ensure that generated code works with [non-compliant bundlers](https://github.com/dotansimha/graphql-code-generator/issues/8065).
      */
     emitLegacyCommonJSImports?: boolean;
+    /**
+     * @description Append this extension to all imports.
+     * Useful for ESM environments that require file extensions in import statements.
+     */
+    importExtension?: '' | `.${string}`;
     /**
      * @default false
      * @description If you prefer to have each field in generated types printed on a new line, set this to true.

package/typings/imports.d.cts

@@ -5,7 +5,8 @@ export type ImportDeclaration<T = string> = {
     baseOutputDir: string;
     baseDir: string;
     typesImport: boolean;
-    emitLegacyCommonJSImports: boolean;
+    emitLegacyCommonJSImports?: boolean;
+    importExtension: '' | `.${string}`;
 };
 export type ImportSource<T = string> = {
     /**

package/typings/imports.d.ts

@@ -5,7 +5,8 @@ export type ImportDeclaration<T = string> = {
     baseOutputDir: string;
     baseDir: string;
     typesImport: boolean;
-    emitLegacyCommonJSImports: boolean;
+    emitLegacyCommonJSImports?: boolean;
+    importExtension: '' | `.${string}`;
 };
 export type ImportSource<T = string> = {
     /**