@graphql-codegen/typescript-resolvers 4.4.2-rc-20250118081149-55f7ee4aab7d41c285ef1a76bac8bf5b4d20a327 → 5.0.0-alpha-20250118081501-dd2b0bdaa05321a511f89cfeee5bf398fc77b86b

package/cjs/index.js

@@ -84,12 +84,6 @@ export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
     const resolverWithResolveUsage = `ResolverWithResolve<TResult, TParent, TContext, TArgs>`;
     const stitchingResolverUsage = `StitchingResolver<TResult, TParent, TContext, TArgs>`;
     if (visitor.hasFederation()) {
-        if (visitor.config.wrapFieldDefinitions) {
-            defsToInclude.push(`export type UnwrappedObject<T> = {
-        [P in keyof T]: T[P] extends infer R | Promise<infer R> | (() => infer R2 | Promise<infer R2>)
-          ? R & R2 : T[P]
-      };`);
-        }
         defsToInclude.push(`export type ReferenceResolver<TResult, TReference, TContext> = (
       reference: TReference,
       context: TContext,
@@ -210,6 +204,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
   info${optionalSignForInfoArg}: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 `;
+    const federationTypes = visitor.buildFederationTypes();
     const resolversTypeMapping = visitor.buildResolversTypes();
     const resolversParentTypeMapping = visitor.buildResolversParentTypes();
     const resolversUnionTypesMapping = visitor.buildResolversUnionTypes();
@@ -243,6 +238,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
         prepend,
         content: [
             header,
+            federationTypes,
             resolversUnionTypesMapping,
             resolversInterfaceTypesMapping,
             resolversTypeMapping,

package/cjs/visitor.js

@@ -47,12 +47,6 @@ class TypeScriptResolversVisitor extends visitor_plugin_common_1.BaseResolversVi
     wrapWithListType(str) {
         return `${this.config.immutableTypes ? 'ReadonlyArray' : 'Array'}<${str}>`;
     }
-    getParentTypeForSignature(node) {
-        if (this._federation.isResolveReferenceField(node) && this.config.wrapFieldDefinitions) {
-            return 'UnwrappedObject<ParentType>';
-        }
-        return 'ParentType';
-    }
     NamedType(node) {
         return `Maybe<${super.NamedType(node)}>`;
     }

package/esm/index.js

@@ -80,12 +80,6 @@ export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
     const resolverWithResolveUsage = `ResolverWithResolve<TResult, TParent, TContext, TArgs>`;
     const stitchingResolverUsage = `StitchingResolver<TResult, TParent, TContext, TArgs>`;
     if (visitor.hasFederation()) {
-        if (visitor.config.wrapFieldDefinitions) {
-            defsToInclude.push(`export type UnwrappedObject<T> = {
-        [P in keyof T]: T[P] extends infer R | Promise<infer R> | (() => infer R2 | Promise<infer R2>)
-          ? R & R2 : T[P]
-      };`);
-        }
         defsToInclude.push(`export type ReferenceResolver<TResult, TReference, TContext> = (
       reference: TReference,
       context: TContext,
@@ -206,6 +200,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
   info${optionalSignForInfoArg}: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 `;
+    const federationTypes = visitor.buildFederationTypes();
     const resolversTypeMapping = visitor.buildResolversTypes();
     const resolversParentTypeMapping = visitor.buildResolversParentTypes();
     const resolversUnionTypesMapping = visitor.buildResolversUnionTypes();
@@ -239,6 +234,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
         prepend,
         content: [
             header,
+            federationTypes,
             resolversUnionTypesMapping,
             resolversInterfaceTypesMapping,
             resolversTypeMapping,

package/esm/visitor.js

@@ -43,12 +43,6 @@ export class TypeScriptResolversVisitor extends BaseResolversVisitor {
     wrapWithListType(str) {
         return `${this.config.immutableTypes ? 'ReadonlyArray' : 'Array'}<${str}>`;
     }
-    getParentTypeForSignature(node) {
-        if (this._federation.isResolveReferenceField(node) && this.config.wrapFieldDefinitions) {
-            return 'UnwrappedObject<ParentType>';
-        }
-        return 'ParentType';
-    }
     NamedType(node) {
         return `Maybe<${super.NamedType(node)}>`;
     }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-codegen/typescript-resolvers",
-  "version": "4.4.2-rc-20250118081149-55f7ee4aab7d41c285ef1a76bac8bf5b4d20a327",
+  "version": "5.0.0-alpha-20250118081501-dd2b0bdaa05321a511f89cfeee5bf398fc77b86b",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for resolvers signature",
   "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-codegen/plugin-helpers": "^5.1.0",
-    "@graphql-codegen/typescript": "4.1.3-rc-20250118081149-55f7ee4aab7d41c285ef1a76bac8bf5b4d20a327",
-    "@graphql-codegen/visitor-plugin-common": "5.6.1-rc-20250118081149-55f7ee4aab7d41c285ef1a76bac8bf5b4d20a327",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250118081501-dd2b0bdaa05321a511f89cfeee5bf398fc77b86b",
+    "@graphql-codegen/typescript": "4.1.3-alpha-20250118081501-dd2b0bdaa05321a511f89cfeee5bf398fc77b86b",
+    "@graphql-codegen/visitor-plugin-common": "6.0.0-alpha-20250118081501-dd2b0bdaa05321a511f89cfeee5bf398fc77b86b",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"

package/typings/visitor.d.cts

@@ -1,5 +1,5 @@
 import { BaseResolversVisitor, DeclarationKind, ParsedResolversConfig } from '@graphql-codegen/visitor-plugin-common';
-import { EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLSchema, ListTypeNode, NamedTypeNode, NonNullTypeNode } from 'graphql';
+import { EnumTypeDefinitionNode, GraphQLSchema, ListTypeNode, NamedTypeNode, NonNullTypeNode } from 'graphql';
 import { TypeScriptResolversPluginConfig } from './config.cjs';
 export declare const ENUM_RESOLVERS_SIGNATURE = "export type EnumResolverSignature<T, AllowedValues = any> = { [key in keyof T]?: AllowedValues };";
 export interface ParsedTypeScriptResolversConfig extends ParsedResolversConfig {
@@ -15,7 +15,6 @@ export declare class TypeScriptResolversVisitor extends BaseResolversVisitor<Typ
     private clearOptional;
     ListType(node: ListTypeNode): string;
     protected wrapWithListType(str: string): string;
-    protected getParentTypeForSignature(node: FieldDefinitionNode): "ParentType" | "UnwrappedObject<ParentType>";
     NamedType(node: NamedTypeNode): string;
     NonNullType(node: NonNullTypeNode): string;
     protected getPunctuation(_declarationKind: DeclarationKind): string;

package/typings/visitor.d.ts

@@ -1,5 +1,5 @@
 import { BaseResolversVisitor, DeclarationKind, ParsedResolversConfig } from '@graphql-codegen/visitor-plugin-common';
-import { EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLSchema, ListTypeNode, NamedTypeNode, NonNullTypeNode } from 'graphql';
+import { EnumTypeDefinitionNode, GraphQLSchema, ListTypeNode, NamedTypeNode, NonNullTypeNode } from 'graphql';
 import { TypeScriptResolversPluginConfig } from './config.js';
 export declare const ENUM_RESOLVERS_SIGNATURE = "export type EnumResolverSignature<T, AllowedValues = any> = { [key in keyof T]?: AllowedValues };";
 export interface ParsedTypeScriptResolversConfig extends ParsedResolversConfig {
@@ -15,7 +15,6 @@ export declare class TypeScriptResolversVisitor extends BaseResolversVisitor<Typ
     private clearOptional;
     ListType(node: ListTypeNode): string;
     protected wrapWithListType(str: string): string;
-    protected getParentTypeForSignature(node: FieldDefinitionNode): "ParentType" | "UnwrappedObject<ParentType>";
     NamedType(node: NamedTypeNode): string;
     NonNullType(node: NonNullTypeNode): string;
     protected getPunctuation(_declarationKind: DeclarationKind): string;