@graphql-codegen/visitor-plugin-common 6.2.0-alpha-20251119131248-4aa0bce27decc294509fae591f5c2236858abdbb → 6.2.1

package/cjs/base-resolvers-visitor.js

@@ -175,15 +175,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/selection-set-to-object.js

@@ -683,7 +683,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;
+        }
+        // When the parent schema type is an interface, use the interface name instead of the concrete type
+        // BUT only if we're not inside a fragment (fragments explicitly target specific types)
+        const schemaType = this._schema.getType(typeName);
+        const isInFragment = parentName.includes('Fragment');
+        if ((0, graphql_1.isObjectType)(schemaType) &&
+            this._parentSchemaType &&
+            (0, graphql_1.isInterfaceType)(this._parentSchemaType) &&
+            !isInFragment) {
+            return `${parentName}_${this._parentSchemaType.name}`;
+        }
+        return `${parentName}_${typeName}`;
     }
 }
 exports.SelectionSetToObject = SelectionSetToObject;

package/esm/base-resolvers-visitor.js

@@ -171,15 +171,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/selection-set-to-object.js

@@ -679,7 +679,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;
+        }
+        // When the parent schema type is an interface, use the interface name instead of the concrete type
+        // BUT only if we're not inside a fragment (fragments explicitly target specific types)
+        const schemaType = this._schema.getType(typeName);
+        const isInFragment = parentName.includes('Fragment');
+        if (isObjectType(schemaType) &&
+            this._parentSchemaType &&
+            isInterfaceType(this._parentSchemaType) &&
+            !isInFragment) {
+            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": "6.2.0-alpha-20251119131248-4aa0bce27decc294509fae591f5c2236858abdbb",
+  "version": "6.2.1",
   "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.1.0-alpha-20251119131248-4aa0bce27decc294509fae591f5c2236858abdbb",
+    "@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",