Skip to content

Commit f3cad5e

Browse files
committed
Remove extraneous UnwrappedObject type
1 parent 70a8f36 commit f3cad5e

File tree

5 files changed

+73
-132
lines changed

5 files changed

+73
-132
lines changed

packages/plugins/typescript/resolvers/src/index.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,6 @@ export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
106106
const stitchingResolverUsage = `StitchingResolver<TResult, TParent, TContext, TArgs>`;
107107

108108
if (visitor.hasFederation()) {
109-
if (visitor.config.wrapFieldDefinitions) {
110-
defsToInclude.push(`export type UnwrappedObject<T> = {
111-
[P in keyof T]: T[P] extends infer R | Promise<infer R> | (() => infer R2 | Promise<infer R2>)
112-
? R & R2 : T[P]
113-
};`);
114-
}
115-
116109
defsToInclude.push(
117110
`export type ReferenceResolver<TResult, TReference, TContext> = (
118111
reference: TReference,

packages/plugins/typescript/resolvers/src/visitor.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ import {
77
ParsedResolversConfig,
88
} from '@graphql-codegen/visitor-plugin-common';
99
import autoBind from 'auto-bind';
10-
import {
11-
EnumTypeDefinitionNode,
12-
FieldDefinitionNode,
13-
GraphQLSchema,
14-
ListTypeNode,
15-
NamedTypeNode,
16-
NonNullTypeNode,
17-
} from 'graphql';
10+
import { EnumTypeDefinitionNode, GraphQLSchema, ListTypeNode, NamedTypeNode, NonNullTypeNode } from 'graphql';
1811
import { TypeScriptResolversPluginConfig } from './config.js';
1912

2013
export const ENUM_RESOLVERS_SIGNATURE =
@@ -96,13 +89,6 @@ export class TypeScriptResolversVisitor extends BaseResolversVisitor<
9689
return `${this.config.immutableTypes ? 'ReadonlyArray' : 'Array'}<${str}>`;
9790
}
9891

99-
protected getParentTypeForSignature(node: FieldDefinitionNode) {
100-
if (this._federation.isResolveReferenceField(node) && this.config.wrapFieldDefinitions) {
101-
return 'UnwrappedObject<ParentType>';
102-
}
103-
return 'ParentType';
104-
}
105-
10692
NamedType(node: NamedTypeNode): string {
10793
return `Maybe<${super.NamedType(node)}>`;
10894
}

packages/plugins/typescript/resolvers/tests/__snapshots__/ts-resolvers.spec.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
166166
info: GraphQLResolveInfo
167167
) => TResult | Promise<TResult>;
168168

169+
169170
/** Mapping of union types */
170171
export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = ResolversObject<{
171172
ChildUnion: ( Omit<Child, 'parent'> & { parent?: Maybe<_RefType['MyType']> } ) | ( MyOtherType );
@@ -425,6 +426,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
425426
info: GraphQLResolveInfo
426427
) => TResult | Promise<TResult>;
427428

429+
428430
/** Mapping of union types */
429431
export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = ResolversObject<{
430432
ChildUnion: ( Omit<Types.Child, 'parent'> & { parent?: Types.Maybe<_RefType['MyType']> } ) | ( Types.MyOtherType );
@@ -770,6 +772,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
770772
info?: GraphQLResolveInfo
771773
) => TResult | Promise<TResult>;
772774

775+
773776
/** Mapping of union types */
774777
export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = ResolversObject<{
775778
ChildUnion: ( Omit<Child, 'parent'> & { parent?: Maybe<_RefType['MyType']> } ) | ( MyOtherType );

0 commit comments

Comments
 (0)