Skip to content

Integrate codegen plugins major version #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Integrate codegen plugins major version #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aec1dac
Change to alpha versions
eddeee888 Aug 27, 2025
f5601b2
Update yarn.lock
eddeee888 Aug 27, 2025
7b1d77c
Regen and update tests
eddeee888 Aug 27, 2025
3f8860c
Remove deprecated config
eddeee888 Aug 27, 2025
19f43af
bump alpha version
eddeee888 Aug 28, 2025
cb0f291
Rebase tests
eddeee888 Aug 28, 2025
aace3aa
Only generate __isTypeOf when possible
eddeee888 Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"@eddeee888/eslint-plugin": "0.0.1",
"@eddeee888/nx-graphql-code-generator": "2.0.0",
"@eslint/eslintrc": "3.3.1",
"@graphql-codegen/add": "5.0.3",
"@graphql-codegen/cli": "5.0.4",
"@graphql-codegen/add": "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/cli": "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/near-operation-file-preset": "3.1.0",
"@graphql-codegen/plugin-helpers": "5.1.0",
"@graphql-codegen/schema-ast": "4.1.0",
"@graphql-codegen/typescript": "4.1.3",
"@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/schema-ast": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/typescript": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/typescript-react-apollo": "4.3.3",
"@graphql-codegen/typescript-resolvers": "4.4.2",
"@graphql-codegen/typescript-resolvers": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-tools/merge": "9.0.4",
"@nx/devkit": "21.3.1",
"@nx/eslint": "21.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/server-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"author": "Eddy Nguyen <[email protected]>",
"license": "MIT",
"dependencies": {
"@graphql-codegen/typescript": "^4.1.3",
"@graphql-codegen/typescript-resolvers": "^4.4.2",
"@graphql-codegen/typescript": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"@graphql-codegen/typescript-resolvers": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
"tslib": "^2.3.0"
},
"publishConfig": {
Expand Down
37 changes: 24 additions & 13 deletions packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ export type ResolverTypeWrapper<T> = Promise<T> | T;
export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
};
export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
export type Resolver<
TResult,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ResolverFn<TResult, TParent, TContext, TArgs>
| ResolverWithResolve<TResult, TParent, TContext, TArgs>;

Expand Down Expand Up @@ -111,22 +116,29 @@ export type SubscriptionObject<
export type SubscriptionResolver<
TResult,
TKey extends string,
TParent = {},
TContext = {},
TArgs = {}
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ((
...args: any[]
) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
| SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;

export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
export type TypeResolveFn<
TTypes,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
parent: TParent,
context: TContext,
info: GraphQLResolveInfo
) => Maybe<TTypes> | Promise<Maybe<TTypes>>;

export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type IsTypeOfResolverFn<
T = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
obj: T,
context: TContext,
info: GraphQLResolveInfo
Expand All @@ -135,10 +147,10 @@ export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type NextResolverFn<T> = () => Promise<T>;

export type DirectiveResolverFn<
TResult = {},
TParent = {},
TContext = {},
TArgs = {}
TResult = Record<PropertyKey, never>,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> = (
next: NextResolverFn<TResult>,
parent: TParent,
Expand All @@ -149,7 +161,7 @@ export type DirectiveResolverFn<

/** Mapping between all available schema types and the resolvers types */
export type ResolversTypes = {
Query: ResolverTypeWrapper<{}>;
Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
Test: ResolverTypeWrapper<Test>;
Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
Float: ResolverTypeWrapper<Scalars['Float']['output']>;
Expand All @@ -160,7 +172,7 @@ export type ResolversTypes = {

/** Mapping between all available schema types and the resolvers parents */
export type ResolversParentTypes = {
Query: {};
Query: Record<PropertyKey, never>;
Test: Test;
Boolean: Scalars['Boolean']['output'];
Float: Scalars['Float']['output'];
Expand All @@ -185,7 +197,6 @@ export type TestResolvers<
id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
int?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
string?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
};

export type Resolvers<ContextType = any> = {
Expand Down
37 changes: 24 additions & 13 deletions packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ export type ResolverTypeWrapper<T> = Promise<T> | T;
export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
};
export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
export type Resolver<
TResult,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ResolverFn<TResult, TParent, TContext, TArgs>
| ResolverWithResolve<TResult, TParent, TContext, TArgs>;

Expand Down Expand Up @@ -111,22 +116,29 @@ export type SubscriptionObject<
export type SubscriptionResolver<
TResult,
TKey extends string,
TParent = {},
TContext = {},
TArgs = {}
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ((
...args: any[]
) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
| SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;

export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
export type TypeResolveFn<
TTypes,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
parent: TParent,
context: TContext,
info: GraphQLResolveInfo
) => Maybe<TTypes> | Promise<Maybe<TTypes>>;

export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type IsTypeOfResolverFn<
T = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
obj: T,
context: TContext,
info: GraphQLResolveInfo
Expand All @@ -135,10 +147,10 @@ export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type NextResolverFn<T> = () => Promise<T>;

export type DirectiveResolverFn<
TResult = {},
TParent = {},
TContext = {},
TArgs = {}
TResult = Record<PropertyKey, never>,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> = (
next: NextResolverFn<TResult>,
parent: TParent,
Expand All @@ -149,7 +161,7 @@ export type DirectiveResolverFn<

/** Mapping between all available schema types and the resolvers types */
export type ResolversTypes = {
Query: ResolverTypeWrapper<{}>;
Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
Test: ResolverTypeWrapper<Test>;
Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
Float: ResolverTypeWrapper<Scalars['Float']['output']>;
Expand All @@ -160,7 +172,7 @@ export type ResolversTypes = {

/** Mapping between all available schema types and the resolvers parents */
export type ResolversParentTypes = {
Query: {};
Query: Record<PropertyKey, never>;
Test: Test;
Boolean: Scalars['Boolean']['output'];
Float: Scalars['Float']['output'];
Expand All @@ -185,7 +197,6 @@ export type TestResolvers<
id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
int?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
string?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
};

export type Resolvers<ContextType = any> = {
Expand Down
37 changes: 24 additions & 13 deletions packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ export type ResolverTypeWrapper<T> = Promise<T> | T;
export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
};
export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
export type Resolver<
TResult,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ResolverFn<TResult, TParent, TContext, TArgs>
| ResolverWithResolve<TResult, TParent, TContext, TArgs>;

Expand Down Expand Up @@ -112,22 +117,29 @@ export type SubscriptionObject<
export type SubscriptionResolver<
TResult,
TKey extends string,
TParent = {},
TContext = {},
TArgs = {}
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ((
...args: any[]
) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
| SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;

export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
export type TypeResolveFn<
TTypes,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
parent: TParent,
context: TContext,
info: GraphQLResolveInfo
) => Maybe<TTypes> | Promise<Maybe<TTypes>>;

export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type IsTypeOfResolverFn<
T = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
obj: T,
context: TContext,
info: GraphQLResolveInfo
Expand All @@ -136,10 +148,10 @@ export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type NextResolverFn<T> = () => Promise<T>;

export type DirectiveResolverFn<
TResult = {},
TParent = {},
TContext = {},
TArgs = {}
TResult = Record<PropertyKey, never>,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> = (
next: NextResolverFn<TResult>,
parent: TParent,
Expand All @@ -150,7 +162,7 @@ export type DirectiveResolverFn<

/** Mapping between all available schema types and the resolvers types */
export type ResolversTypes = {
Query: ResolverTypeWrapper<{}>;
Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
Test: ResolverTypeWrapper<Test>;
Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
Float: ResolverTypeWrapper<Scalars['Float']['output']>;
Expand All @@ -161,7 +173,7 @@ export type ResolversTypes = {

/** Mapping between all available schema types and the resolvers parents */
export type ResolversParentTypes = {
Query: {};
Query: Record<PropertyKey, never>;
Test: Test;
Boolean: Scalars['Boolean']['output'];
Float: Scalars['Float']['output'];
Expand All @@ -186,7 +198,6 @@ export type TestResolvers<
id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
int?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
string?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
};

export type Resolvers<ContextType = any> = {
Expand Down
37 changes: 24 additions & 13 deletions ...cript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ export type ResolverTypeWrapper<T> = Promise<T> | T;
export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
};
export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
export type Resolver<
TResult,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ResolverFn<TResult, TParent, TContext, TArgs>
| ResolverWithResolve<TResult, TParent, TContext, TArgs>;

Expand Down Expand Up @@ -118,22 +123,29 @@ export type SubscriptionObject<
export type SubscriptionResolver<
TResult,
TKey extends string,
TParent = {},
TContext = {},
TArgs = {}
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> =
| ((
...args: any[]
) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
| SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;

export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
export type TypeResolveFn<
TTypes,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
parent: TParent,
context: TContext,
info: GraphQLResolveInfo
) => Maybe<TTypes> | Promise<Maybe<TTypes>>;

export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type IsTypeOfResolverFn<
T = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>
> = (
obj: T,
context: TContext,
info: GraphQLResolveInfo
Expand All @@ -142,10 +154,10 @@ export type IsTypeOfResolverFn<T = {}, TContext = {}> = (
export type NextResolverFn<T> = () => Promise<T>;

export type DirectiveResolverFn<
TResult = {},
TParent = {},
TContext = {},
TArgs = {}
TResult = Record<PropertyKey, never>,
TParent = Record<PropertyKey, never>,
TContext = Record<PropertyKey, never>,
TArgs = Record<PropertyKey, never>
> = (
next: NextResolverFn<TResult>,
parent: TParent,
Expand All @@ -159,7 +171,7 @@ export type ResolversTypes = {
Book: ResolverTypeWrapper<BookMapper>;
ID: ResolverTypeWrapper<Scalars['ID']['output']>;
String: ResolverTypeWrapper<Scalars['String']['output']>;
Query: ResolverTypeWrapper<{}>;
Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
};

Expand All @@ -168,7 +180,7 @@ export type ResolversParentTypes = {
Book: BookMapper;
ID: Scalars['ID']['output'];
String: Scalars['String']['output'];
Query: {};
Query: Record<PropertyKey, never>;
Boolean: Scalars['Boolean']['output'];
};

Expand All @@ -188,7 +200,6 @@ export type BookResolvers<
ParentType,
ContextType
>;
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
};

export type QueryResolvers<
Expand Down
Loading
Loading