diff --git a/package.json b/package.json
index 8b5b6010..abb81d39 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/packages/server-config/package.json b/packages/server-config/package.json
index 707a6712..4fa33249 100644
--- a/packages/server-config/package.json
+++ b/packages/server-config/package.json
@@ -24,8 +24,8 @@
   "author": "Eddy Nguyen <ch@eddeee888.me>",
   "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": {
diff --git a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/types.generated.ts
index c44f4b41..fdc73cf1 100644
--- a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/types.generated.ts
@@ -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>;
 
@@ -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
@@ -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,
@@ -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']>;
@@ -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'];
@@ -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> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/types.generated.ts
index f05f4076..544e5af6 100644
--- a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/types.generated.ts
@@ -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>;
 
@@ -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
@@ -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,
@@ -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']>;
@@ -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'];
@@ -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> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/types.generated.ts
index 6175db12..c36cae0e 100644
--- a/packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/types.generated.ts
@@ -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>;
 
@@ -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
@@ -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,
@@ -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']>;
@@ -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'];
@@ -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> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/types.generated.ts
index b85602b5..20e8dc27 100644
--- a/packages/typescript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/types.generated.ts
@@ -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>;
 
@@ -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
@@ -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,
@@ -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']>;
 };
 
@@ -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'];
 };
 
@@ -188,7 +200,6 @@ export type BookResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-config-overrides/modules/types.gen.ts b/packages/typescript-resolver-files-e2e/src/test-config-overrides/modules/types.gen.ts
index bb8fa049..341f124c 100644
--- a/packages/typescript-resolver-files-e2e/src/test-config-overrides/modules/types.gen.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-config-overrides/modules/types.gen.ts
@@ -201,7 +201,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>;
 
@@ -265,22 +270,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
@@ -289,10 +301,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,
@@ -363,7 +375,7 @@ export type I_RESOLVERSTYPES = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: I_PAGINATIONINPUT;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<I_PAGINATIONRESULT>;
@@ -371,13 +383,13 @@ export type I_RESOLVERSTYPES = {
     Omit<I_PROFILE, 'user'> & { user: I_RESOLVERSTYPES['User'] }
   >;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeOtherScalars: ResolverTypeWrapper<Scalars['SomeOtherScalars']['output']>;
   StandardError: ResolverTypeWrapper<
     Omit<I_STANDARDERROR, 'error'> & { error: I_RESOLVERSTYPES['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<
     Omit<I_TOPIC, 'creator'> & { creator: I_RESOLVERSTYPES['User'] }
   >;
@@ -428,17 +440,17 @@ export type I_RESOLVERSPARENTTYPES = {
   BigInt: Scalars['BigInt']['output'];
   DateTime: Scalars['DateTime']['output'];
   Error: I_RESOLVERSINTERFACETYPES<I_RESOLVERSPARENTTYPES>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: I_PAGINATIONINPUT;
   Int: Scalars['Int']['output'];
   PaginationResult: I_PAGINATIONRESULT;
   Profile: Omit<I_PROFILE, 'user'> & { user: I_RESOLVERSPARENTTYPES['User'] };
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeOtherScalars: Scalars['SomeOtherScalars']['output'];
   StandardError: I_STANDARDERROR;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: Omit<I_TOPIC, 'creator'> & { creator: I_RESOLVERSPARENTTYPES['User'] };
   TopicByIdPayload: I_RESOLVERSUNIONTYPES<I_RESOLVERSPARENTTYPES>['TopicByIdPayload'];
   TopicByIdResult: Omit<I_TOPICBYIDRESULT, 'result'> & {
@@ -488,7 +500,6 @@ export type I_ERRORRESOLVERS<
   ParentType extends I_RESOLVERSPARENTTYPES['Error'] = I_RESOLVERSPARENTTYPES['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<I_RESOLVERSTYPES['ErrorType'], ParentType, ContextType>;
 };
 
 export type I_ERRORTYPERESOLVERS = EnumResolverSignature<
@@ -526,7 +537,6 @@ export type I_PAGINATIONRESULTRESOLVERS<
   currentPage?: Resolver<I_RESOLVERSTYPES['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<I_RESOLVERSTYPES['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<I_RESOLVERSTYPES['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type I_PROFILERESOLVERS<
@@ -535,7 +545,6 @@ export type I_PROFILERESOLVERS<
 > = {
   id?: Resolver<I_RESOLVERSTYPES['ID'], ParentType, ContextType>;
   user?: Resolver<I_RESOLVERSTYPES['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type I_QUERYRESOLVERS<
@@ -597,7 +606,6 @@ export type I_TOPICRESOLVERS<
   id?: Resolver<I_RESOLVERSTYPES['ID'], ParentType, ContextType>;
   name?: Resolver<I_RESOLVERSTYPES['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<I_RESOLVERSTYPES['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type I_TOPICBYIDPAYLOADRESOLVERS<
@@ -704,7 +712,6 @@ export type I_USERRESOLVERS<
   avatar?: Resolver<Maybe<I_RESOLVERSTYPES['String']>, ParentType, ContextType>;
   id?: Resolver<I_RESOLVERSTYPES['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<I_RESOLVERSTYPES['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type I_USERPAYLOADRESOLVERS<
diff --git a/packages/typescript-resolver-files-e2e/src/test-config-ts/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-config-ts/modules/types.generated.ts
index 671ef7aa..4f9bc382 100644
--- a/packages/typescript-resolver-files-e2e/src/test-config-ts/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-config-ts/modules/types.generated.ts
@@ -59,7 +59,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>;
 
@@ -123,22 +128,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
@@ -147,10 +159,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,
@@ -168,7 +180,7 @@ export type ResolversTypes = {
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   CatChipped: ResolverTypeWrapper<'YES' | 'NO'>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
 
@@ -178,7 +190,7 @@ export type ResolversParentTypes = {
   Int: Scalars['Int']['output'];
   String: Scalars['String']['output'];
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   Boolean: Scalars['Boolean']['output'];
 };
 
@@ -190,7 +202,6 @@ export type CatResolvers<
   fullName?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   isChipped?: Resolver<ResolversTypes['CatChipped'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type CatChippedResolvers = EnumResolverSignature<
diff --git a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/generated/allTypes.ts b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/generated/allTypes.ts
index dfee0007..0f77bb5f 100644
--- a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/generated/allTypes.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/generated/allTypes.ts
@@ -51,7 +51,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>;
 
@@ -115,22 +120,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
@@ -139,10 +151,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,
@@ -156,7 +168,7 @@ export type ResolversTypes = {
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   User: ResolverTypeWrapper<User>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
@@ -166,7 +178,7 @@ export type ResolversParentTypes = {
   Profile: Profile;
   ID: Scalars['ID']['output'];
   String: Scalars['String']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   User: User;
   Boolean: Scalars['Boolean']['output'];
 };
@@ -177,7 +189,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   slug?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -194,7 +205,6 @@ export type UserResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   profile?: Resolver<Maybe<ResolversTypes['Profile']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type Resolvers<ContextType = any> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/profile/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/profile/resolvers/User.ts
index 643afe5a..9787e5d5 100644
--- a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/profile/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/profile/resolvers/User.ts
@@ -1,4 +1,4 @@
 import type { UserResolvers } from './../../generated/allTypes';
-export const User: Pick<UserResolvers, 'profile' | '__isTypeOf'> = {
+export const User: Pick<UserResolvers, 'profile'> = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/user/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/user/resolvers/User.ts
index 601a8c69..cbf76c50 100644
--- a/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/user/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-deep-modules/modules/user/resolvers/User.ts
@@ -1,4 +1,4 @@
 import type { UserResolvers } from './../../generated/allTypes';
-export const User: Pick<UserResolvers, 'id' | 'name' | '__isTypeOf'> = {
+export const User: Pick<UserResolvers, 'id' | 'name'> = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-esm-import/schema/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-esm-import/schema/types.generated.ts
index 3dc69941..25482a37 100644
--- a/packages/typescript-resolver-files-e2e/src/test-esm-import/schema/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-esm-import/schema/types.generated.ts
@@ -192,7 +192,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>;
 
@@ -256,22 +261,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
@@ -280,10 +292,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,
@@ -347,7 +359,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -356,10 +368,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -404,17 +416,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -451,7 +463,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -489,7 +500,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -506,7 +516,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -560,7 +569,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -667,7 +675,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Comedy.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Comedy.ts
new file mode 100644
index 00000000..a0c50054
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Comedy.ts
@@ -0,0 +1,4 @@
+import type { ComedyResolvers } from './../../types.generated';
+export const Comedy: ComedyResolvers = {
+  /* Implement Comedy resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Fantasy.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Fantasy.ts
new file mode 100644
index 00000000..75db8d0e
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Fantasy.ts
@@ -0,0 +1,4 @@
+import type { FantasyResolvers } from './../../types.generated';
+export const Fantasy: Pick<FantasyResolvers, 'id' | '__isTypeOf'> = {
+  /* Implement Fantasy resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Topic.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Topic.ts
index f647ee6b..45011951 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Topic.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/Topic.ts
@@ -1,8 +1,7 @@
 import type { TopicResolvers } from './../../types.generated';
-export const Topic: Pick<TopicResolvers, 'bookStore_for_topic' | '__isTypeOf'> =
-  {
-    /* Implement Topic resolver logic here */
-    bookStore_for_topic: async (_parent, _arg, _ctx) => {
-      /* Topic.bookStore_for_topic resolver is required because Topic.bookStore_for_topic exists but TopicMapper.bookStore_for_topic does not */
-    },
-  };
+export const Topic: Pick<TopicResolvers, 'bookStore_for_topic'> = {
+  /* Implement Topic resolver logic here */
+  bookStore_for_topic: async (_parent, _arg, _ctx) => {
+    /* Topic.bookStore_for_topic resolver is required because Topic.bookStore_for_topic exists but TopicMapper.bookStore_for_topic does not */
+  },
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/User.ts
index 9ca0a2ab..8c3b8e8c 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/resolvers/User.ts
@@ -1,4 +1,4 @@
 import type { UserResolvers } from './../../types.generated';
-export const User: Pick<UserResolvers, 'bookStore_4_user' | '__isTypeOf'> = {
+export const User: Pick<UserResolvers, 'bookStore_4_user'> = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/schema.graphqls b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/schema.graphqls
index 6c340b73..de8475e5 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/schema.graphqls
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/book-store-v2_new_again-final_v3/schema.graphqls
@@ -9,3 +9,13 @@ extend type Topic {
 extend type User {
   bookStore_4_user: BookStore_New
 }
+
+union Genre = Fantasy | Comedy
+
+type Fantasy {
+  id: ID!
+}
+
+type Comedy {
+  id: ID!
+}
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Cat.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Cat.ts
new file mode 100644
index 00000000..0234f2cb
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Cat.ts
@@ -0,0 +1,4 @@
+import type { CatResolvers } from './../../types.generated';
+export const Cat: Pick<CatResolvers, 'canMeow' | 'id' | '__isTypeOf'> = {
+  /* Implement Cat resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Dog.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Dog.ts
new file mode 100644
index 00000000..2a6a2927
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/resolvers/Dog.ts
@@ -0,0 +1,4 @@
+import type { DogResolvers } from './../../types.generated';
+export const Dog: DogResolvers = {
+  /* Implement Dog resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/schema.graphqls b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/schema.graphqls
new file mode 100644
index 00000000..2daa740a
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/pet/schema.graphqls
@@ -0,0 +1,13 @@
+interface Pet {
+  id: ID!
+}
+
+type Dog implements Pet {
+  id: ID!
+  canBark: Boolean!
+}
+
+type Cat implements Pet {
+  id: ID!
+  canMeow: Boolean!
+}
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/resolvers.generated.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/resolvers.generated.ts
index 6a41f679..03c96809 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/resolvers.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/resolvers.generated.ts
@@ -8,6 +8,12 @@ import { topicCreate as Mutation_topicCreate } from './topic/resolvers/Mutation/
 import { topicEdit as Mutation_topicEdit } from './topic/resolvers/Mutation/topicEdit';
 import { profileChanges as Subscription_profileChanges } from './user/resolvers/Subscription/profileChanges';
 import { BookStore_New } from './book-store-v2_new_again-final_v3/resolvers/BookStore_New';
+import { Cat as pet_Cat } from './pet/resolvers/Cat';
+import { Cat as user_Cat } from './user/resolvers/Cat';
+import { Comedy } from './book-store-v2_new_again-final_v3/resolvers/Comedy';
+import { Dog } from './pet/resolvers/Dog';
+import { Fantasy as book_store_v2_new_again_final_v3_Fantasy } from './book-store-v2_new_again-final_v3/resolvers/Fantasy';
+import { Fantasy as user_Fantasy } from './user/resolvers/Fantasy';
 import { PaginationResult } from './base/resolvers/PaginationResult';
 import { PayloadError } from './base/resolvers/PayloadError';
 import { Profile } from './user/resolvers/Profile';
@@ -36,6 +42,10 @@ export const resolvers: Resolvers = {
   },
   Subscription: { profileChanges: Subscription_profileChanges },
   BookStore_New: BookStore_New,
+  Cat: { ...pet_Cat, ...user_Cat },
+  Comedy: Comedy,
+  Dog: Dog,
+  Fantasy: { ...book_store_v2_new_again_final_v3_Fantasy, ...user_Fantasy },
   PaginationResult: PaginationResult,
   PayloadError: PayloadError,
   Profile: Profile,
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/schema.generated.graphqls b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/schema.generated.graphqls
index 48b5a7d6..277fc5bd 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/schema.generated.graphqls
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/schema.generated.graphqls
@@ -2,8 +2,23 @@ type BookStore_New {
   id: ID!
 }
 
+type Cat implements Pet {
+  canMeow: Boolean!
+  id: ID!
+  owner: User
+}
+
+type Comedy {
+  id: ID!
+}
+
 scalar DateTime
 
+type Dog implements Pet {
+  canBark: Boolean!
+  id: ID!
+}
+
 interface Error {
   error: ErrorType!
 }
@@ -15,6 +30,13 @@ enum ErrorType {
   UNEXPECTED_ERROR
 }
 
+type Fantasy {
+  id: ID!
+  likedBy: [User!]!
+}
+
+union Genre = Comedy | Fantasy
+
 type Mutation {
   topicCreate(input: TopicCreateInput!): TopicCreatePayload!
   topicEdit(input: TopicEditInput!): TopicEditPayload!
@@ -35,6 +57,10 @@ type PayloadError implements Error {
   error: ErrorType!
 }
 
+interface Pet {
+  id: ID!
+}
+
 type Profile {
   id: ID!
   user: User!
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/topic/resolvers/Topic.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/topic/resolvers/Topic.ts
index efda7338..40849c4f 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/topic/resolvers/Topic.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/topic/resolvers/Topic.ts
@@ -11,7 +11,6 @@ export const Topic: Pick<
   | 'id'
   | 'name'
   | 'url'
-  | '__isTypeOf'
 > = {
   /* Implement Topic resolver logic here */
   extendedTopicFieldInDifferentFileAndSameModule1: async (
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/typeDefs.generated.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/typeDefs.generated.ts
index f3192d01..6215b017 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/typeDefs.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/typeDefs.generated.ts
@@ -621,6 +621,157 @@ export const typeDefs = {
       directives: [],
       interfaces: [],
     },
+    {
+      kind: 'UnionTypeDefinition',
+      name: { kind: 'Name', value: 'Genre' },
+      directives: [],
+      types: [
+        { kind: 'NamedType', name: { kind: 'Name', value: 'Fantasy' } },
+        { kind: 'NamedType', name: { kind: 'Name', value: 'Comedy' } },
+      ],
+    },
+    {
+      name: { kind: 'Name', value: 'Fantasy' },
+      kind: 'ObjectTypeDefinition',
+      fields: [
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'id' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
+          },
+          directives: [],
+        },
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'likedBy' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: {
+              kind: 'ListType',
+              type: {
+                kind: 'NonNullType',
+                type: {
+                  kind: 'NamedType',
+                  name: { kind: 'Name', value: 'User' },
+                },
+              },
+            },
+          },
+          directives: [],
+        },
+      ],
+      directives: [],
+      interfaces: [],
+    },
+    {
+      kind: 'ObjectTypeDefinition',
+      name: { kind: 'Name', value: 'Comedy' },
+      interfaces: [],
+      directives: [],
+      fields: [
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'id' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
+          },
+          directives: [],
+        },
+      ],
+    },
+    {
+      kind: 'InterfaceTypeDefinition',
+      name: { kind: 'Name', value: 'Pet' },
+      interfaces: [],
+      directives: [],
+      fields: [
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'id' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
+          },
+          directives: [],
+        },
+      ],
+    },
+    {
+      kind: 'ObjectTypeDefinition',
+      name: { kind: 'Name', value: 'Dog' },
+      interfaces: [{ kind: 'NamedType', name: { kind: 'Name', value: 'Pet' } }],
+      directives: [],
+      fields: [
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'id' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
+          },
+          directives: [],
+        },
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'canBark' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: {
+              kind: 'NamedType',
+              name: { kind: 'Name', value: 'Boolean' },
+            },
+          },
+          directives: [],
+        },
+      ],
+    },
+    {
+      name: { kind: 'Name', value: 'Cat' },
+      kind: 'ObjectTypeDefinition',
+      fields: [
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'id' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
+          },
+          directives: [],
+        },
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'canMeow' },
+          arguments: [],
+          type: {
+            kind: 'NonNullType',
+            type: {
+              kind: 'NamedType',
+              name: { kind: 'Name', value: 'Boolean' },
+            },
+          },
+          directives: [],
+        },
+        {
+          kind: 'FieldDefinition',
+          name: { kind: 'Name', value: 'owner' },
+          arguments: [],
+          type: { kind: 'NamedType', name: { kind: 'Name', value: 'User' } },
+          directives: [],
+        },
+      ],
+      directives: [],
+      interfaces: [{ kind: 'NamedType', name: { kind: 'Name', value: 'Pet' } }],
+    },
     {
       kind: 'ObjectTypeDefinition',
       name: { kind: 'Name', value: 'TopicByIdResult' },
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/types.generated.ts
index f35b2900..31ea4393 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/types.generated.ts
@@ -47,6 +47,24 @@ export type BookStore_New = {
   id: Scalars['ID']['output'];
 };
 
+export type Cat = Pet & {
+  __typename?: 'Cat';
+  canMeow: Scalars['Boolean']['output'];
+  id: Scalars['ID']['output'];
+  owner?: Maybe<User>;
+};
+
+export type Comedy = {
+  __typename?: 'Comedy';
+  id: Scalars['ID']['output'];
+};
+
+export type Dog = Pet & {
+  __typename?: 'Dog';
+  canBark: Scalars['Boolean']['output'];
+  id: Scalars['ID']['output'];
+};
+
 export type Error = {
   error: ErrorType;
 };
@@ -57,6 +75,14 @@ export type ErrorType =
   | 'NOT_FOUND'
   | 'UNEXPECTED_ERROR';
 
+export type Fantasy = {
+  __typename?: 'Fantasy';
+  id: Scalars['ID']['output'];
+  likedBy: Array<User>;
+};
+
+export type Genre = Comedy | Fantasy;
+
 export type Mutation = {
   __typename?: 'Mutation';
   topicCreate: TopicCreatePayload;
@@ -88,6 +114,10 @@ export type PayloadError = Error & {
   error: ErrorType;
 };
 
+export type Pet = {
+  id: Scalars['ID']['output'];
+};
+
 export type Profile = {
   __typename?: 'Profile';
   id: Scalars['ID']['output'];
@@ -208,7 +238,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>;
 
@@ -272,22 +307,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
@@ -296,10 +338,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,
@@ -310,6 +352,9 @@ export type DirectiveResolverFn<
 
 /** Mapping of union types */
 export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = {
+  Genre:
+    | (Comedy & { __typename: 'Comedy' })
+    | (Fantasy & { __typename: 'Fantasy' });
   TopicByIdPayload:
     | (Omit<PayloadError, 'error'> & { error: _RefType['ErrorType'] } & {
         __typename: 'PayloadError';
@@ -351,13 +396,18 @@ export type ResolversInterfaceTypes<_RefType extends Record<string, unknown>> =
     Error: Omit<PayloadError, 'error'> & { error: _RefType['ErrorType'] } & {
       __typename: 'PayloadError';
     };
+    Pet: (Cat & { __typename: 'Cat' }) | (Dog & { __typename: 'Dog' });
   };
 
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   BookStore_New: ResolverTypeWrapper<BookStore_New>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
+  Cat: ResolverTypeWrapper<Cat>;
+  Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
+  Comedy: ResolverTypeWrapper<Comedy>;
   DateTime: ResolverTypeWrapper<Scalars['DateTime']['output']>;
+  Dog: ResolverTypeWrapper<Dog>;
   Error: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Error']>;
   ErrorType: ResolverTypeWrapper<
     | 'NOT_FOUND'
@@ -365,18 +415,21 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Fantasy: ResolverTypeWrapper<Fantasy>;
+  Genre: ResolverTypeWrapper<ResolversUnionTypes<ResolversTypes>['Genre']>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
   PayloadError: ResolverTypeWrapper<
     Omit<PayloadError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
+  Pet: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Pet']>;
   Profile: ResolverTypeWrapper<Profile>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -414,25 +467,31 @@ export type ResolversTypes = {
     ResolversUnionTypes<ResolversTypes>['UserPayload']
   >;
   UserResult: ResolverTypeWrapper<UserResult>;
-  Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
 
 /** Mapping between all available schema types and the resolvers parents */
 export type ResolversParentTypes = {
   BookStore_New: BookStore_New;
   ID: Scalars['ID']['output'];
+  Cat: Cat;
+  Boolean: Scalars['Boolean']['output'];
+  Comedy: Comedy;
   DateTime: Scalars['DateTime']['output'];
+  Dog: Dog;
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Fantasy: Fantasy;
+  Genre: ResolversUnionTypes<ResolversParentTypes>['Genre'];
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
+  Pet: ResolversInterfaceTypes<ResolversParentTypes>['Pet'];
   Profile: Profile;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -456,12 +515,28 @@ export type ResolversParentTypes = {
   User: User;
   UserPayload: ResolversUnionTypes<ResolversParentTypes>['UserPayload'];
   UserResult: UserResult;
-  Boolean: Scalars['Boolean']['output'];
 };
 
 export type BookStore_NewResolvers<
   ContextType = any,
   ParentType extends ResolversParentTypes['BookStore_New'] = ResolversParentTypes['BookStore_New']
+> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+};
+
+export type CatResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Cat'] = ResolversParentTypes['Cat']
+> = {
+  canMeow?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  owner?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type ComedyResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Comedy'] = ResolversParentTypes['Comedy']
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -472,12 +547,20 @@ export interface DateTimeScalarConfig
   name: 'DateTime';
 }
 
+export type DogResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Dog'] = ResolversParentTypes['Dog']
+> = {
+  canBark?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type ErrorResolvers<
   ContextType = any,
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -490,6 +573,22 @@ export type ErrorTypeResolvers = EnumResolverSignature<
   ResolversTypes['ErrorType']
 >;
 
+export type FantasyResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Fantasy'] = ResolversParentTypes['Fantasy']
+> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  likedBy?: Resolver<Array<ResolversTypes['User']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type GenreResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Genre'] = ResolversParentTypes['Genre']
+> = {
+  __resolveType?: TypeResolveFn<'Comedy' | 'Fantasy', ParentType, ContextType>;
+};
+
 export type MutationResolvers<
   ContextType = any,
   ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']
@@ -515,7 +614,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -526,13 +624,19 @@ export type PayloadErrorResolvers<
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type PetResolvers<
+  ContextType = any,
+  ParentType extends ResolversParentTypes['Pet'] = ResolversParentTypes['Pet']
+> = {
+  __resolveType?: TypeResolveFn<'Cat' | 'Dog', ParentType, ContextType>;
+};
+
 export type ProfileResolvers<
   ContextType = any,
   ParentType extends ResolversParentTypes['Profile'] = ResolversParentTypes['Profile']
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -636,7 +740,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -748,7 +851,6 @@ export type UserResolvers<
   >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
@@ -772,12 +874,18 @@ export type UserResultResolvers<
 
 export type Resolvers<ContextType = any> = {
   BookStore_New?: BookStore_NewResolvers<ContextType>;
+  Cat?: CatResolvers<ContextType>;
+  Comedy?: ComedyResolvers<ContextType>;
   DateTime?: GraphQLScalarType;
+  Dog?: DogResolvers<ContextType>;
   Error?: ErrorResolvers<ContextType>;
   ErrorType?: ErrorTypeResolvers;
+  Fantasy?: FantasyResolvers<ContextType>;
+  Genre?: GenreResolvers<ContextType>;
   Mutation?: MutationResolvers<ContextType>;
   PaginationResult?: PaginationResultResolvers<ContextType>;
   PayloadError?: PayloadErrorResolvers<ContextType>;
+  Pet?: PetResolvers<ContextType>;
   Profile?: ProfileResolvers<ContextType>;
   Query?: QueryResolvers<ContextType>;
   SomeRandomScalar?: GraphQLScalarType;
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Cat.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Cat.ts
new file mode 100644
index 00000000..ee60bbb8
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Cat.ts
@@ -0,0 +1,4 @@
+import type { CatResolvers } from './../../types.generated';
+export const Cat: Pick<CatResolvers, 'owner' | '__isTypeOf'> = {
+  /* Implement Cat resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Fantasy.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Fantasy.ts
new file mode 100644
index 00000000..e95af9b4
--- /dev/null
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Fantasy.ts
@@ -0,0 +1,4 @@
+import type { FantasyResolvers } from './../../types.generated';
+export const Fantasy: Pick<FantasyResolvers, 'likedBy' | '__isTypeOf'> = {
+  /* Implement Fantasy resolver logic here */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Topic.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Topic.ts
index dff73301..ae668760 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Topic.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/Topic.ts
@@ -5,7 +5,6 @@ export const Topic: Pick<
   | 'extendedTopicFieldInDifferentFileAndDifferentModule1'
   | 'extendedTopicFieldInDifferentFileAndDifferentModule2'
   | 'extendedTopicFieldInDifferentFileAndDifferentModule3'
-  | '__isTypeOf'
 > = {
   /* Implement Topic resolver logic here */
   creator: ({ creator }, _arg, _ctx) => {
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/User.ts
index 36c7066f..2ef09e94 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/resolvers/User.ts
@@ -9,7 +9,6 @@ export const User: Pick<
   | 'avatar'
   | 'id'
   | 'name'
-  | '__isTypeOf'
 > = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/user.graphqls.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/user.graphqls.ts
index 6641ce52..56916f8e 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/user.graphqls.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-base/user/user.graphqls.ts
@@ -27,4 +27,12 @@ export const userTypeDefs = gql`
     extendedTopicFieldInDifferentFileAndDifferentModule2: User!
     extendedTopicFieldInDifferentFileAndDifferentModule3: User!
   }
+
+  extend type Cat {
+    owner: User
+  }
+
+  extend type Fantasy {
+    likedBy: [User!]!
+  }
 `;
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-external-resolver-override-extended-object-type/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-external-resolver-override-extended-object-type/types.generated.ts
index e13d9040..0c6fc462 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-external-resolver-override-extended-object-type/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-external-resolver-override-extended-object-type/types.generated.ts
@@ -201,7 +201,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>;
 
@@ -265,22 +270,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
@@ -289,10 +301,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,
@@ -356,7 +368,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -365,10 +377,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -413,17 +425,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -460,7 +472,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -498,7 +509,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -515,7 +525,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -614,7 +623,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -721,7 +729,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/topic/resolvers/ForeignType.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/topic/resolvers/ForeignType.ts
index 3ebf15f2..05d5faef 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/topic/resolvers/ForeignType.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/topic/resolvers/ForeignType.ts
@@ -1,7 +1,7 @@
 import type { ForeignTypeResolvers } from './../../types.generated';
 export const ForeignType: Pick<
   ForeignTypeResolvers,
-  'id' | 'topics' | '__isTypeOf' | '__resolveReference'
+  'id' | 'topics' | '__resolveReference'
 > = {
   /* Implement ForeignType resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/types.generated.ts
index 14fc77e7..01d74a0a 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/types.generated.ts
@@ -217,7 +217,12 @@ export type GraphQLRecursivePick<T, S> = {
 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>;
 
@@ -281,22 +286,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
@@ -305,10 +317,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,
@@ -317,6 +329,19 @@ export type DirectiveResolverFn<
   info: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 
+/** Mapping of federation types */
+export type FederationTypes = {
+  ForeignType: ForeignType;
+};
+
+/** Mapping of federation reference types */
+export type FederationReferenceTypes = {
+  ForeignType: { __typename: 'ForeignType' } & GraphQLRecursivePick<
+    FederationTypes['ForeignType'],
+    { id: true }
+  >;
+};
+
 /** Mapping of union types */
 export type ResolversUnionTypes<_RefType extends Record<string, unknown>> = {
   TopicByIdPayload:
@@ -376,7 +401,7 @@ export type ResolversTypes = {
     Omit<ForeignType, 'topics'> & { topics: Array<ResolversTypes['Topic']> }
   >;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -384,10 +409,10 @@ export type ResolversTypes = {
     Omit<PayloadError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
   Profile: ResolverTypeWrapper<Profile>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -432,20 +457,22 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  ForeignType: Omit<ForeignType, 'topics'> & {
-    topics: Array<ResolversParentTypes['Topic']>;
-  };
+  ForeignType:
+    | (Omit<ForeignType, 'topics'> & {
+        topics: Array<ResolversParentTypes['Topic']>;
+      })
+    | FederationReferenceTypes['ForeignType'];
   ID: Scalars['ID']['output'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -482,7 +509,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -497,20 +523,17 @@ export type ErrorTypeResolvers = EnumResolverSignature<
 
 export type ForeignTypeResolvers<
   ContextType = any,
-  ParentType extends ResolversParentTypes['ForeignType'] = ResolversParentTypes['ForeignType']
+  ParentType extends ResolversParentTypes['ForeignType'] = ResolversParentTypes['ForeignType'],
+  FederationReferenceType extends FederationReferenceTypes['ForeignType'] = FederationReferenceTypes['ForeignType']
 > = {
   __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['ForeignType']>,
-    { __typename: 'ForeignType' } & GraphQLRecursivePick<
-      ParentType,
-      { id: true }
-    >,
+    Maybe<ResolversTypes['ForeignType']> | FederationReferenceType,
+    FederationReferenceType,
     ContextType
   >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   topics?: Resolver<Array<ResolversTypes['Topic']>, ParentType, ContextType>;
   users?: Resolver<Array<ResolversTypes['User']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type MutationResolvers<
@@ -538,7 +561,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -555,7 +577,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -609,7 +630,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -716,7 +736,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/user/resolvers/ForeignType.ts b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/user/resolvers/ForeignType.ts
index 00157f00..dcf46a0f 100644
--- a/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/user/resolvers/ForeignType.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-extended-object-types/schema-federated-extended-object-type/user/resolvers/ForeignType.ts
@@ -1,7 +1,7 @@
 import type { ForeignTypeResolvers } from './../../types.generated';
 export const ForeignType: Pick<
   ForeignTypeResolvers,
-  'users' | '__isTypeOf' | '__resolveReference'
+  'users' | '__resolveReference'
 > = {
   /* Implement ForeignType resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-external-resolvers/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-external-resolvers/modules/types.generated.ts
index eb928432..a54b7f01 100644
--- a/packages/typescript-resolver-files-e2e/src/test-external-resolvers/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-external-resolvers/modules/types.generated.ts
@@ -199,7 +199,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>;
 
@@ -263,22 +268,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
@@ -287,10 +299,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,
@@ -354,13 +366,13 @@ export type ResolversTypes = {
   >;
   Error: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Error']>;
   ErrorType: ResolverTypeWrapper<ErrorTypeMapper>;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   RelativeDefault: ResolverTypeWrapper<Scalars['RelativeDefault']['output']>;
   RelativeNamedImport: ResolverTypeWrapper<
@@ -372,7 +384,7 @@ export type ResolversTypes = {
   StandardError: ResolverTypeWrapper<
     Omit<StandardError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<Topic>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -410,19 +422,19 @@ export type ResolversParentTypes = {
   DateTimeNamedImport: Scalars['DateTimeNamedImport']['output'];
   DateTimeSameNamedImport: Scalars['DateTimeSameNamedImport']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   RelativeDefault: Scalars['RelativeDefault']['output'];
   RelativeNamedImport: Scalars['RelativeNamedImport']['output'];
   RelativeNamedImportWithAlias: Scalars['RelativeNamedImportWithAlias']['output'];
   StandardError: StandardError;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: Topic;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: TopicByIdResult;
@@ -482,7 +494,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -520,7 +531,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -529,7 +539,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -604,7 +613,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -711,7 +719,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Maker.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Maker.ts
index e2df2ae4..3786e020 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Maker.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Maker.ts
@@ -1,5 +1,5 @@
 import type { MakerResolvers } from './../../types.generated';
-export const Maker: Pick<MakerResolvers, 'products' | '__isTypeOf'> = {
+export const Maker: Pick<MakerResolvers, 'products'> = {
   /* Implement Maker resolver logic here */
   products: async (_parent, _arg, _ctx) => {
     /* Maker.products resolver is required because Maker.products exists but MakerMapper.products does not */
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Product.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Product.ts
index 396e0d1b..8e2d8545 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Product.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-1/resolvers/Product.ts
@@ -1,7 +1,7 @@
 import type { ProductResolvers } from './../../types.generated';
 export const Product: Pick<
   ProductResolvers,
-  'id' | 'name' | 'price' | '__isTypeOf' | '__resolveReference'
+  'id' | 'name' | 'price' | '__resolveReference'
 > = {
   /* Implement Product resolver logic here */
   name: async (_parent, _arg, _ctx) => {
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Maker.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Maker.ts
index 44e50b05..5391dcb0 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Maker.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Maker.ts
@@ -1,5 +1,5 @@
 import type { MakerResolvers } from './../../types.generated';
-export const Maker: Pick<MakerResolvers, 'id' | 'name' | '__isTypeOf'> = {
+export const Maker: Pick<MakerResolvers, 'id' | 'name'> = {
   /* Implement Maker resolver logic here */
   name: async (_parent, _arg, _ctx) => {
     /* Maker.name resolver is required because Maker.name exists but MakerMapper.name does not */
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Product.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Product.ts
index aff0982d..7e763400 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Product.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/part-2/resolvers/Product.ts
@@ -1,7 +1,7 @@
 import type { ProductResolvers } from './../../types.generated';
 export const Product: Pick<
   ProductResolvers,
-  'maker' | 'upc' | '__isTypeOf' | '__resolveReference'
+  'maker' | 'upc' | '__resolveReference'
 > = {
   /* Implement Product resolver logic here */
   maker: async (_parent, _arg, _ctx) => {
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/types.generated.ts
index 098c7c0a..42b3a42c 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-products/types.generated.ts
@@ -80,7 +80,12 @@ export type GraphQLRecursivePick<T, S> = {
 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>;
 
@@ -144,22 +149,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
@@ -168,10 +180,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,
@@ -180,6 +192,19 @@ export type DirectiveResolverFn<
   info: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 
+/** Mapping of federation types */
+export type FederationTypes = {
+  Product: Product;
+};
+
+/** Mapping of federation reference types */
+export type FederationReferenceTypes = {
+  Product: { __typename: 'Product' } & (
+    | GraphQLRecursivePick<FederationTypes['Product'], { id: true }>
+    | GraphQLRecursivePick<FederationTypes['Product'], { upc: true }>
+  );
+};
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   Maker: ResolverTypeWrapper<MakerMapper>;
@@ -187,7 +212,7 @@ export type ResolversTypes = {
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   Product: ResolverTypeWrapper<ProductMapper>;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
 };
 
@@ -198,7 +223,7 @@ export type ResolversParentTypes = {
   String: Scalars['String']['output'];
   Product: ProductMapper;
   Int: Scalars['Int']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   Boolean: Scalars['Boolean']['output'];
 };
 
@@ -213,16 +238,16 @@ export type MakerResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProductResolvers<
   ContextType = any,
-  ParentType extends ResolversParentTypes['Product'] = ResolversParentTypes['Product']
+  ParentType extends ResolversParentTypes['Product'] = ResolversParentTypes['Product'],
+  FederationReferenceType extends FederationReferenceTypes['Product'] = FederationReferenceTypes['Product']
 > = {
   __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['Product']>,
-    { __typename: 'Product' } & GraphQLRecursivePick<ParentType, { upc: true }>,
+    Maybe<ResolversTypes['Product']> | FederationReferenceType,
+    FederationReferenceType,
     ContextType
   >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
@@ -230,7 +255,6 @@ export type ProductResolvers<
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   price?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   upc?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-reviews/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-reviews/types.generated.ts
index 74d37010..f5c28360 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-reviews/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-reviews/types.generated.ts
@@ -71,7 +71,12 @@ export type GraphQLRecursivePick<T, S> = {
 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>;
 
@@ -135,22 +140,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
@@ -159,10 +171,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,
@@ -171,6 +183,24 @@ export type DirectiveResolverFn<
   info: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 
+/** Mapping of federation types */
+export type FederationTypes = {
+  Product: Product;
+  User: User;
+};
+
+/** Mapping of federation reference types */
+export type FederationReferenceTypes = {
+  Product: { __typename: 'Product' } & GraphQLRecursivePick<
+    FederationTypes['Product'],
+    { upc: true }
+  >;
+  User: { __typename: 'User' } & GraphQLRecursivePick<
+    FederationTypes['User'],
+    { id: true }
+  >;
+};
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   Product: ResolverTypeWrapper<Product>;
@@ -183,21 +213,22 @@ export type ResolversTypes = {
 
 /** Mapping between all available schema types and the resolvers parents */
 export type ResolversParentTypes = {
-  Product: Product;
+  Product: Product | FederationReferenceTypes['Product'];
   String: Scalars['String']['output'];
   Review: Review;
-  User: User;
+  User: User | FederationReferenceTypes['User'];
   ID: Scalars['ID']['output'];
   Boolean: Scalars['Boolean']['output'];
 };
 
 export type ProductResolvers<
   ContextType = any,
-  ParentType extends ResolversParentTypes['Product'] = ResolversParentTypes['Product']
+  ParentType extends ResolversParentTypes['Product'] = ResolversParentTypes['Product'],
+  FederationReferenceType extends FederationReferenceTypes['Product'] = FederationReferenceTypes['Product']
 > = {
   __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['Product']>,
-    { __typename: 'Product' } & GraphQLRecursivePick<ParentType, { upc: true }>,
+    Maybe<ResolversTypes['Product']> | FederationReferenceType,
+    FederationReferenceType,
     ContextType
   >;
   reviews?: Resolver<
@@ -206,7 +237,6 @@ export type ProductResolvers<
     ContextType
   >;
   upc?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ReviewResolvers<
@@ -216,34 +246,25 @@ export type ReviewResolvers<
   author?: Resolver<Maybe<ResolversTypes['User']>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   product?: Resolver<Maybe<ResolversTypes['Product']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserResolvers<
   ContextType = any,
-  ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User']
+  ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User'],
+  FederationReferenceType extends FederationReferenceTypes['User'] = FederationReferenceTypes['User']
 > = {
   __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['User']>,
-    { __typename: 'User' } & GraphQLRecursivePick<ParentType, { id: true }>,
-    ContextType
-  >;
-  id?: Resolver<
-    ResolversTypes['ID'],
-    { __typename: 'User' } & GraphQLRecursivePick<ParentType, { id: true }>,
+    Maybe<ResolversTypes['User']> | FederationReferenceType,
+    FederationReferenceType,
     ContextType
   >;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   reviews?: Resolver<
     Maybe<Array<Maybe<ResolversTypes['Review']>>>,
-    { __typename: 'User' } & GraphQLRecursivePick<ParentType, { id: true }>,
-    ContextType
-  >;
-  username?: Resolver<
-    ResolversTypes['String'],
-    { __typename: 'User' } & GraphQLRecursivePick<ParentType, { id: true }>,
+    ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+  username?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
 };
 
 export type Resolvers<ContextType = any> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/Profile.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/Profile.ts
index b00f0656..99d10adb 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/Profile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/Profile.ts
@@ -1,7 +1,4 @@
 import type { ProfileResolvers } from './../../types.generated';
-export const Profile: Pick<
-  ProfileResolvers,
-  'id' | '__isTypeOf' | '__resolveReference'
-> = {
+export const Profile: Pick<ProfileResolvers, 'id'> = {
   /* Implement Profile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/User.ts
index c138e2e8..ca86a103 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-1/resolvers/User.ts
@@ -1,7 +1,7 @@
 import type { UserResolvers } from './../../types.generated';
 export const User: Pick<
   UserResolvers,
-  'id' | 'username' | '__isTypeOf' | '__resolveReference'
+  'id' | 'username' | '__resolveReference'
 > = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/Profile.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/Profile.ts
index 15c75625..0c538ae8 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/Profile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/Profile.ts
@@ -1,7 +1,4 @@
 import type { ProfileResolvers } from './../../types.generated';
-export const Profile: Pick<
-  ProfileResolvers,
-  'user' | '__isTypeOf' | '__resolveReference'
-> = {
+export const Profile: Pick<ProfileResolvers, 'user'> = {
   /* Implement Profile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/User.ts
index 70987a7c..f9f951b2 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/part-2/resolvers/User.ts
@@ -1,7 +1,4 @@
 import type { UserResolvers } from './../../types.generated';
-export const User: Pick<
-  UserResolvers,
-  'profile' | '__isTypeOf' | '__resolveReference'
-> = {
+export const User: Pick<UserResolvers, 'profile' | '__resolveReference'> = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/types.generated.ts
index 90d31eaa..d72409d0 100644
--- a/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-federation/schema-base/subgraph-users/types.generated.ts
@@ -69,7 +69,12 @@ export type GraphQLRecursivePick<T, S> = {
 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>;
 
@@ -133,22 +138,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
@@ -157,10 +169,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,
@@ -169,11 +181,24 @@ export type DirectiveResolverFn<
   info: GraphQLResolveInfo
 ) => TResult | Promise<TResult>;
 
+/** Mapping of federation types */
+export type FederationTypes = {
+  User: User;
+};
+
+/** Mapping of federation reference types */
+export type FederationReferenceTypes = {
+  User: { __typename: 'User' } & GraphQLRecursivePick<
+    FederationTypes['User'],
+    { id: true }
+  >;
+};
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   User: ResolverTypeWrapper<User>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
@@ -183,8 +208,8 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
-  User: User;
+  Query: Record<PropertyKey, never>;
+  User: User | FederationReferenceTypes['User'];
   String: Scalars['String']['output'];
   Boolean: Scalars['Boolean']['output'];
 };
@@ -193,14 +218,8 @@ export type ProfileResolvers<
   ContextType = any,
   ParentType extends ResolversParentTypes['Profile'] = ResolversParentTypes['Profile']
 > = {
-  __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['Profile']>,
-    ParentType,
-    ContextType
-  >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -212,17 +231,17 @@ export type QueryResolvers<
 
 export type UserResolvers<
   ContextType = any,
-  ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User']
+  ParentType extends ResolversParentTypes['User'] = ResolversParentTypes['User'],
+  FederationReferenceType extends FederationReferenceTypes['User'] = FederationReferenceTypes['User']
 > = {
   __resolveReference?: ReferenceResolver<
-    Maybe<ResolversTypes['User']>,
-    { __typename: 'User' } & GraphQLRecursivePick<ParentType, { id: true }>,
+    Maybe<ResolversTypes['User']> | FederationReferenceType,
+    FederationReferenceType,
     ContextType
   >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   profile?: Resolver<Maybe<ResolversTypes['Profile']>, ParentType, ContextType>;
   username?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type Resolvers<ContextType = any> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-mappers-vs-schema-types/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-mappers-vs-schema-types/modules/types.generated.ts
index cb2ad79d..f36c4e64 100644
--- a/packages/typescript-resolver-files-e2e/src/test-mappers-vs-schema-types/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-mappers-vs-schema-types/modules/types.generated.ts
@@ -221,7 +221,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>;
 
@@ -285,22 +290,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
@@ -309,10 +321,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,
@@ -370,12 +382,12 @@ export type ResolversTypes = {
   DateTime: ResolverTypeWrapper<Scalars['DateTime']['output']>;
   Dog: ResolverTypeWrapper<DogMapper>;
   Error: ResolverTypeWrapper<Error>;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Pet: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Pet']>;
   Profile: ResolverTypeWrapper<ProfileMapper>;
   ProfileMeta: ResolverTypeWrapper<ProfileMetaMapper>;
-  Query: ResolverTypeWrapper<{}>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -430,12 +442,12 @@ export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Dog: DogMapper;
   Error: Error;
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   Pet: ResolversInterfaceTypes<ResolversParentTypes>['Pet'];
   Profile: ProfileMapper;
   ProfileMeta: ProfileMetaMapper;
-  Query: {};
-  Subscription: {};
+  Query: Record<PropertyKey, never>;
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -469,7 +481,6 @@ export type AccountResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   isSubscribed?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type CatResolvers<
@@ -489,7 +500,6 @@ export type CountryResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export interface DateTimeScalarConfig
@@ -539,9 +549,6 @@ export type PetResolvers<
   ParentType extends ResolversParentTypes['Pet'] = ResolversParentTypes['Pet']
 > = {
   __resolveType?: TypeResolveFn<'Cat' | 'Dog', ParentType, ContextType>;
-  age?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -550,7 +557,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProfileMetaResolvers<
@@ -560,7 +566,6 @@ export type ProfileMetaResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   isCompleted?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   score?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -626,7 +631,6 @@ export type TopicResolvers<
     ContextType
   >;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -723,7 +727,6 @@ export type UserResolvers<
   fullName?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   role?: Resolver<ResolversTypes['UserRole'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-mappers/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-mappers/modules/types.generated.ts
index 58cbf843..b8044379 100644
--- a/packages/typescript-resolver-files-e2e/src/test-mappers/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-mappers/modules/types.generated.ts
@@ -213,7 +213,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>;
 
@@ -277,22 +282,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
@@ -301,10 +313,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,
@@ -365,18 +377,18 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
   Pet: ResolverTypeWrapper<Pet_Mapper>;
   Profile: ResolverTypeWrapper<Profile_Mapper>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StandardError: ResolverTypeWrapper<
     Omit<StandardError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<Topic>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -412,16 +424,16 @@ export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Dog: Dog;
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   Pet: Pet_Mapper;
   Profile: Profile_Mapper;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   StandardError: StandardError;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: Topic;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: TopicByIdResult;
@@ -467,7 +479,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -505,7 +516,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PetResolvers<
@@ -513,7 +523,6 @@ export type PetResolvers<
   ParentType extends ResolversParentTypes['Pet'] = ResolversParentTypes['Pet']
 > = {
   __resolveType?: TypeResolveFn<'Cat' | 'Dog', ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -522,7 +531,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -585,7 +593,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -692,7 +699,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-merged/graphql/resolvers/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-merged/graphql/resolvers/types.generated.ts
index a7e113ee..99e48410 100644
--- a/packages/typescript-resolver-files-e2e/src/test-merged/graphql/resolvers/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-merged/graphql/resolvers/types.generated.ts
@@ -181,7 +181,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>;
 
@@ -245,22 +250,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
@@ -269,10 +281,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,
@@ -338,11 +350,11 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StandardError: ResolverTypeWrapper<
@@ -394,11 +406,11 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   ID: Scalars['ID']['output'];
   String: Scalars['String']['output'];
   StandardError: StandardError;
@@ -440,7 +452,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -478,7 +489,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -523,7 +533,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -630,7 +639,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-modules-resolver-main-file-mode/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-modules-resolver-main-file-mode/modules/types.generated.ts
index 56a57e82..a4718e9f 100644
--- a/packages/typescript-resolver-files-e2e/src/test-modules-resolver-main-file-mode/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-modules-resolver-main-file-mode/modules/types.generated.ts
@@ -244,7 +244,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>;
 
@@ -308,22 +313,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
@@ -332,10 +344,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,
@@ -407,7 +419,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -426,11 +438,11 @@ export type ResolversTypes = {
     ResolversUnionTypes<ResolversTypes>['PetResult']
   >;
   Profile: ResolverTypeWrapper<Profile>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   StandardError: ResolverTypeWrapper<
     Omit<StandardError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<Topic>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -466,7 +478,7 @@ export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Dog: Dog;
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
@@ -481,9 +493,9 @@ export type ResolversParentTypes = {
   };
   PetResult: ResolversUnionTypes<ResolversParentTypes>['PetResult'];
   Profile: Profile;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   StandardError: StandardError;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: Topic;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: TopicByIdResult;
@@ -535,7 +547,6 @@ export type ErrorResolvers<
     ParentType,
     ContextType
   >;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -579,7 +590,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PetResolvers<
@@ -587,8 +597,6 @@ export type PetResolvers<
   ParentType extends ResolversParentTypes['Pet'] = ResolversParentTypes['Pet']
 > = {
   __resolveType?: TypeResolveFn<'Cat' | 'Dog', ParentType, ContextType>;
-  code?: Resolver<ResolversTypes['PetCode'], ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
 };
 
 export type PetCertResolvers<
@@ -596,7 +604,6 @@ export type PetCertResolvers<
   ParentType extends ResolversParentTypes['PetCert'] = ResolversParentTypes['PetCert']
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export interface PetCodeScalarConfig
@@ -619,7 +626,6 @@ export type PetHousingResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PetOkResolvers<
@@ -643,7 +649,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -706,7 +711,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -813,7 +817,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-modules-typedefs-file-mode/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-modules-typedefs-file-mode/modules/types.generated.ts
index d94070dd..ee24873e 100644
--- a/packages/typescript-resolver-files-e2e/src/test-modules-typedefs-file-mode/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-modules-typedefs-file-mode/modules/types.generated.ts
@@ -190,7 +190,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>;
 
@@ -254,22 +259,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
@@ -278,10 +290,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,
@@ -337,18 +349,18 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StandardError: ResolverTypeWrapper<
     Omit<StandardError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<Topic>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -381,16 +393,16 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   StandardError: StandardError;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: Topic;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: TopicByIdResult;
@@ -419,7 +431,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -457,7 +468,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -466,7 +476,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -523,7 +532,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -630,7 +638,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-modules/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-modules/modules/types.generated.ts
index 32dbac8d..69ea7bfc 100644
--- a/packages/typescript-resolver-files-e2e/src/test-modules/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-modules/modules/types.generated.ts
@@ -207,7 +207,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>;
 
@@ -271,22 +276,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
@@ -295,10 +307,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,
@@ -365,16 +377,16 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
   Profile: ResolverTypeWrapper<ProfileMapper>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   StandardError: ResolverTypeWrapper<
     Omit<StandardError, 'error'> & { error: ResolversTypes['ErrorType'] }
   >;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -422,14 +434,14 @@ export type ResolversParentTypes = {
   String: Scalars['String']['output'];
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   Profile: ProfileMapper;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   StandardError: StandardError;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -465,7 +477,6 @@ export type BookResolvers<
   isbn?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   mainGenre?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   publishedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export interface DateTimeScalarConfig
@@ -478,7 +489,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -516,7 +526,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -525,7 +534,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -588,7 +596,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -695,7 +702,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/course/resolvers/School.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/course/resolvers/School.ts
index 38e4e889..7135d601 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/course/resolvers/School.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/course/resolvers/School.ts
@@ -1,4 +1,4 @@
 import type { SchoolResolvers } from './../../../types.generated';
-export const School: Pick<SchoolResolvers, 'courses' | '__isTypeOf'> = {
+export const School: Pick<SchoolResolvers, 'courses'> = {
   /* Implement School resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/demographics/resolvers/School.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/demographics/resolvers/School.ts
index 545c329b..7d898fc0 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/demographics/resolvers/School.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/demographics/resolvers/School.ts
@@ -1,4 +1,4 @@
 import type { SchoolResolvers } from './../../../types.generated';
-export const School: Pick<SchoolResolvers, 'demographics' | '__isTypeOf'> = {
+export const School: Pick<SchoolResolvers, 'demographics'> = {
   /* Implement School resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/school/resolvers/School.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/school/resolvers/School.ts
index 7ce44e14..6def4ca4 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/school/resolvers/School.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/schools-domain/school/resolvers/School.ts
@@ -1,4 +1,4 @@
 import type { SchoolResolvers } from './../../../types.generated';
-export const School: Pick<SchoolResolvers, 'id' | 'name' | '__isTypeOf'> = {
+export const School: Pick<SchoolResolvers, 'id' | 'name'> = {
   /* Implement School resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/avatar/resolvers/StudentProfile.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/avatar/resolvers/StudentProfile.ts
index 5a15ae8d..2cb2cbf8 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/avatar/resolvers/StudentProfile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/avatar/resolvers/StudentProfile.ts
@@ -1,7 +1,4 @@
 import type { StudentProfileResolvers } from './../../../types.generated';
-export const StudentProfile: Pick<
-  StudentProfileResolvers,
-  'avatar' | '__isTypeOf'
-> = {
+export const StudentProfile: Pick<StudentProfileResolvers, 'avatar'> = {
   /* Implement StudentProfile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/guardians/resolvers/Student.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/guardians/resolvers/Student.ts
index 3adaad5e..5854e932 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/guardians/resolvers/Student.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/guardians/resolvers/Student.ts
@@ -1,4 +1,4 @@
 import type { StudentResolvers } from './../../../types.generated';
-export const Student: Pick<StudentResolvers, 'guardians' | '__isTypeOf'> = {
+export const Student: Pick<StudentResolvers, 'guardians'> = {
   /* Implement Student resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/Student.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/Student.ts
index f9633f53..fde81c90 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/Student.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/Student.ts
@@ -1,4 +1,4 @@
 import type { StudentResolvers } from './../../../types.generated';
-export const Student: Pick<StudentResolvers, 'profile' | '__isTypeOf'> = {
+export const Student: Pick<StudentResolvers, 'profile'> = {
   /* Implement Student resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/StudentProfile.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/StudentProfile.ts
index 73b72928..daa7a27d 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/StudentProfile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/profile/resolvers/StudentProfile.ts
@@ -1,7 +1,7 @@
 import type { StudentProfileResolvers } from './../../../types.generated';
 export const StudentProfile: Pick<
   StudentProfileResolvers,
-  'email' | 'firstName' | 'id' | 'lastName' | 'phoneNumber' | '__isTypeOf'
+  'email' | 'firstName' | 'id' | 'lastName' | 'phoneNumber'
 > = {
   /* Implement StudentProfile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/student/resolvers/Student.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/student/resolvers/Student.ts
index 667fd1b0..5c8e3a39 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/student/resolvers/Student.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/students-domain/student/resolvers/Student.ts
@@ -1,4 +1,4 @@
 import type { StudentResolvers } from './../../../types.generated';
-export const Student: Pick<StudentResolvers, 'id' | '__isTypeOf'> = {
+export const Student: Pick<StudentResolvers, 'id'> = {
   /* Implement Student resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/avatar/resolvers/TeacherProfile.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/avatar/resolvers/TeacherProfile.ts
index 7c0f7fb4..81957571 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/avatar/resolvers/TeacherProfile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/avatar/resolvers/TeacherProfile.ts
@@ -1,7 +1,4 @@
 import type { TeacherProfileResolvers } from './../../../types.generated';
-export const TeacherProfile: Pick<
-  TeacherProfileResolvers,
-  'avatar' | '__isTypeOf'
-> = {
+export const TeacherProfile: Pick<TeacherProfileResolvers, 'avatar'> = {
   /* Implement TeacherProfile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/Teacher.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/Teacher.ts
index 9015e062..3decbb02 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/Teacher.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/Teacher.ts
@@ -1,4 +1,4 @@
 import type { TeacherResolvers } from './../../../types.generated';
-export const Teacher: Pick<TeacherResolvers, 'profile' | '__isTypeOf'> = {
+export const Teacher: Pick<TeacherResolvers, 'profile'> = {
   /* Implement Teacher resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/TeacherProfile.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/TeacherProfile.ts
index 2ad6e4bb..efd92550 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/TeacherProfile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/profile/resolvers/TeacherProfile.ts
@@ -1,7 +1,7 @@
 import type { TeacherProfileResolvers } from './../../../types.generated';
 export const TeacherProfile: Pick<
   TeacherProfileResolvers,
-  'email' | 'firstName' | 'id' | 'lastName' | 'phoneNumber' | '__isTypeOf'
+  'email' | 'firstName' | 'id' | 'lastName' | 'phoneNumber'
 > = {
   /* Implement TeacherProfile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/teacher/resolvers/Teacher.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/teacher/resolvers/Teacher.ts
index 51615790..4f4bdb81 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/teacher/resolvers/Teacher.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/teachers-domain/teacher/resolvers/Teacher.ts
@@ -1,4 +1,4 @@
 import type { TeacherResolvers } from './../../../types.generated';
-export const Teacher: Pick<TeacherResolvers, 'id' | '__isTypeOf'> = {
+export const Teacher: Pick<TeacherResolvers, 'id'> = {
   /* Implement Teacher resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/types.generated.ts
index e6a0b7f1..5efb490a 100644
--- a/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-nested-domain-modules/types.generated.ts
@@ -152,7 +152,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>;
 
@@ -216,22 +221,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
@@ -240,10 +252,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,
@@ -254,8 +266,8 @@ export type DirectiveResolverFn<
 
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
-  Mutation: ResolverTypeWrapper<{}>;
-  Query: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   School: ResolverTypeWrapper<School>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
@@ -267,7 +279,7 @@ export type ResolversTypes = {
   StudentAvatar: ResolverTypeWrapper<StudentAvatar>;
   StudentGuardian: ResolverTypeWrapper<StudentGuardian>;
   StudentProfile: ResolverTypeWrapper<StudentProfile>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Teacher: ResolverTypeWrapper<Teacher>;
   TeacherAvatar: ResolverTypeWrapper<TeacherAvatar>;
   TeacherProfile: ResolverTypeWrapper<TeacherProfile>;
@@ -276,8 +288,8 @@ export type ResolversTypes = {
 
 /** Mapping between all available schema types and the resolvers parents */
 export type ResolversParentTypes = {
-  Mutation: {};
-  Query: {};
+  Mutation: Record<PropertyKey, never>;
+  Query: Record<PropertyKey, never>;
   ID: Scalars['ID']['output'];
   School: School;
   String: Scalars['String']['output'];
@@ -289,7 +301,7 @@ export type ResolversParentTypes = {
   StudentAvatar: StudentAvatar;
   StudentGuardian: StudentGuardian;
   StudentProfile: StudentProfile;
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Teacher: Teacher;
   TeacherAvatar: TeacherAvatar;
   TeacherProfile: TeacherProfile;
@@ -348,7 +360,6 @@ export type SchoolResolvers<
   >;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type SchoolCourseResolvers<
@@ -363,7 +374,6 @@ export type SchoolCourseResolvers<
     ContextType
   >;
   teacher?: Resolver<ResolversTypes['Teacher'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type SchoolDemographicsResolvers<
@@ -394,7 +404,6 @@ export type SchoolDemographicsResolvers<
   schoolId?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   studentCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   teacherCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type StudentResolvers<
@@ -412,7 +421,6 @@ export type StudentResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type StudentAvatarResolvers<
@@ -424,7 +432,6 @@ export type StudentAvatarResolvers<
   hairstyle?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   skinColor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type StudentGuardianResolvers<
@@ -440,7 +447,6 @@ export type StudentGuardianResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type StudentProfileResolvers<
@@ -461,7 +467,6 @@ export type StudentProfileResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type SubscriptionResolvers<
@@ -486,7 +491,6 @@ export type TeacherResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TeacherAvatarResolvers<
@@ -495,7 +499,6 @@ export type TeacherAvatarResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   url?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TeacherProfileResolvers<
@@ -516,7 +519,6 @@ export type TeacherProfileResolvers<
     ParentType,
     ContextType
   >;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type Resolvers<ContextType = any> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-custom-object/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-custom-object/types.generated.ts
index bd58e071..2cbd63b3 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-custom-object/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-custom-object/types.generated.ts
@@ -204,7 +204,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>;
 
@@ -268,22 +273,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
@@ -292,10 +304,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,
@@ -370,7 +382,7 @@ export type ResolversTypes = {
   FeaturedUsersResult: ResolverTypeWrapper<FeaturedUsersResultMapper>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   File: ResolverTypeWrapper<Scalars['File']['output']>;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
@@ -380,9 +392,9 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -430,7 +442,7 @@ export type ResolversParentTypes = {
   FeaturedUsersResult: FeaturedUsersResultMapper;
   String: Scalars['String']['output'];
   File: Scalars['File']['output'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   Boolean: Scalars['Boolean']['output'];
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
@@ -438,9 +450,9 @@ export type ResolversParentTypes = {
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -476,7 +488,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -540,7 +551,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -557,7 +567,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -616,7 +625,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -723,7 +731,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/topic/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/topic/resolvers/User.ts
index ba93010b..6c6f6f66 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/topic/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/topic/resolvers/User.ts
@@ -8,7 +8,7 @@ import type { UserResolvers } from './../../types.generated';
  *
  * If you want to skip this file generation, remove the mapper or update the pattern in the `resolverGeneration.object` config.
  */
-export const User: Pick<UserResolvers, 'topics' | '__isTypeOf'> = {
+export const User: Pick<UserResolvers, 'topics'> = {
   /* Implement User resolver logic here */
   topics: async (_parent, _arg, _ctx) => {
     /* User.topics resolver is required because User.topics exists but UserMapper.topics does not */
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/types.generated.ts
index 51922226..b7306440 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/types.generated.ts
@@ -194,7 +194,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>;
 
@@ -258,22 +263,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
@@ -282,10 +294,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,
@@ -351,7 +363,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -362,10 +374,10 @@ export type ResolversTypes = {
     Omit<Profile, 'user'> & { user: ResolversTypes['User'] }
   >;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -412,17 +424,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Omit<Profile, 'user'> & { user: ResolversParentTypes['User'] };
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -461,7 +473,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -499,7 +510,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -516,7 +526,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -570,7 +579,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -678,7 +686,6 @@ export type UserResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   topics?: Resolver<Array<ResolversTypes['Topic']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/user/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/user/resolvers/User.ts
index d316fa2f..fc8d7ea0 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/user/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-disabled/user/resolvers/User.ts
@@ -18,7 +18,6 @@ export const User: Pick<
   | 'avatar'
   | 'id'
   | 'name'
-  | '__isTypeOf'
 > = {
   /* Implement User resolver logic here */
   accountGitHub: async (_parent, _arg, _ctx) => {
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-full/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-full/types.generated.ts
index 333dfcd4..405c686d 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-full/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-full/types.generated.ts
@@ -192,7 +192,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>;
 
@@ -256,22 +261,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
@@ -280,10 +292,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,
@@ -347,7 +359,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -356,10 +368,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -404,17 +416,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -451,7 +463,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -489,7 +500,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -506,7 +516,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -560,7 +569,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -667,7 +675,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-recommended/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-recommended/types.generated.ts
index 333dfcd4..405c686d 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-recommended/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolver-generation/schema-recommended/types.generated.ts
@@ -192,7 +192,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>;
 
@@ -256,22 +261,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
@@ -280,10 +292,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,
@@ -347,7 +359,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -356,10 +368,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -404,17 +416,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -451,7 +463,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -489,7 +500,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -506,7 +516,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -560,7 +569,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -667,7 +675,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/User.ts b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/User.ts
index 8e42bb4e..8b129e7d 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/User.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/User.ts
@@ -1,5 +1,5 @@
 import type { UserResolvers } from './../../types.generated';
 /* This file has been created on filesystem by @workspace/testing#createTestSetup */
-export const User: Pick<UserResolvers, 'pets' | '__isTypeOf'> = {
+export const User: Pick<UserResolvers, 'pets'> = {
   /* Implement User resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/Zoo.ts b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/Zoo.ts
index e102d51a..d32410d6 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/Zoo.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/pet/resolvers/Zoo.ts
@@ -1,10 +1,4 @@
-/* This file has been created on filesystem by @workspace/testing#createTestSetup */
-
 import type { ZooResolvers } from './../../types.generated';
-export const Zoo: Pick<
-  ZooResolvers,
-  | 'favouritePet'
-  | 'pets'
-  | 'rating'
-  | '__isTypeOf'
-> = { /* Custom */ };
+export const Zoo: Pick<ZooResolvers, 'favouritePet' | 'pets' | 'rating'> = {
+  /* Custom */
+};
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/types.generated.ts
index 2f852c42..ad545bd9 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/types.generated.ts
@@ -234,7 +234,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>;
 
@@ -298,22 +303,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
@@ -322,10 +334,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,
@@ -388,7 +400,7 @@ export type ResolversTypes = {
   Error: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Error']>;
   ErrorType: ResolverTypeWrapper<ErrorTypeMapper>;
   JSON: ResolverTypeWrapper<Scalars['JSON']['output']>;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -401,10 +413,10 @@ export type ResolversTypes = {
   PetHouse: ResolverTypeWrapper<PetHouseMapper>;
   PetToy: ResolverTypeWrapper<PetToy>;
   Profile: ResolverTypeWrapper<Profile>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
   SortOrder: ResolverTypeWrapper<SortOrderMapper>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -451,7 +463,7 @@ export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
   JSON: Scalars['JSON']['output'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
@@ -462,9 +474,9 @@ export type ResolversParentTypes = {
   PetHouse: PetHouseMapper;
   PetToy: PetToy;
   Profile: Profile;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -515,7 +527,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -558,7 +569,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -576,7 +586,6 @@ export type PetResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   primaryOwner?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PetHouseResolvers<
@@ -584,7 +593,6 @@ export type PetHouseResolvers<
   ParentType extends ResolversParentTypes['PetHouse'] = ResolversParentTypes['PetHouse']
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PetToyResolvers<
@@ -593,7 +601,6 @@ export type PetToyResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type ProfileResolvers<
@@ -603,7 +610,6 @@ export type ProfileResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
   zoo?: Resolver<ResolversTypes['Zoo'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -662,7 +668,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -770,7 +775,6 @@ export type UserResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   pets?: Resolver<Array<ResolversTypes['Pet']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
@@ -801,7 +805,6 @@ export type ZooResolvers<
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   pets?: Resolver<Array<ResolversTypes['Pet']>, ParentType, ContextType>;
   rating?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type Resolvers<ContextType = any> = {
diff --git a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/zoo/resolvers/Profile.ts b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/zoo/resolvers/Profile.ts
index 11fa94b1..7b59d8bc 100644
--- a/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/zoo/resolvers/Profile.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-resolvers-auto-wireup/schema/zoo/resolvers/Profile.ts
@@ -1,5 +1,5 @@
 import type { ProfileResolvers } from './../../types.generated';
 /* This file has been created on filesystem by @workspace/testing#createTestSetup */
-export const Profile: Pick<ProfileResolvers, 'zoo' | '__isTypeOf'> = {
+export const Profile: Pick<ProfileResolvers, 'zoo'> = {
   /* Implement Profile resolver logic here */
 };
diff --git a/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema-overrides/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema-overrides/types.generated.ts
index 96b65b00..f454e174 100644
--- a/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema-overrides/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema-overrides/types.generated.ts
@@ -192,7 +192,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>;
 
@@ -256,22 +261,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
@@ -280,10 +292,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,
@@ -347,7 +359,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -356,10 +368,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -404,17 +416,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -451,7 +463,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -489,7 +500,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -506,7 +516,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -560,7 +569,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -667,7 +675,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema/types.generated.ts
index 71717df0..9d845a23 100644
--- a/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-scalars-module/schema/types.generated.ts
@@ -192,7 +192,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>;
 
@@ -256,22 +261,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
@@ -280,10 +292,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,
@@ -347,7 +359,7 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
@@ -356,10 +368,10 @@ export type ResolversTypes = {
   >;
   Profile: ResolverTypeWrapper<Profile>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   SomeRandomScalar: ResolverTypeWrapper<Scalars['SomeRandomScalar']['output']>;
-  Subscription: ResolverTypeWrapper<{}>;
+  Subscription: ResolverTypeWrapper<Record<PropertyKey, never>>;
   Topic: ResolverTypeWrapper<TopicMapper>;
   TopicByIdPayload: ResolverTypeWrapper<
     ResolversUnionTypes<ResolversTypes>['TopicByIdPayload']
@@ -404,17 +416,17 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
   PayloadError: PayloadError;
   Profile: Profile;
   ID: Scalars['ID']['output'];
-  Query: {};
+  Query: Record<PropertyKey, never>;
   String: Scalars['String']['output'];
   SomeRandomScalar: Scalars['SomeRandomScalar']['output'];
-  Subscription: {};
+  Subscription: Record<PropertyKey, never>;
   Topic: TopicMapper;
   TopicByIdPayload: ResolversUnionTypes<ResolversParentTypes>['TopicByIdPayload'];
   TopicByIdResult: Omit<TopicByIdResult, 'result'> & {
@@ -451,7 +463,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'PayloadError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -489,7 +500,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type PayloadErrorResolvers<
@@ -506,7 +516,6 @@ export type ProfileResolvers<
 > = {
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   user?: Resolver<ResolversTypes['User'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -560,7 +569,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -667,7 +675,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules-typedefs-file-mode-mergedWhitelisted/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules-typedefs-file-mode-mergedWhitelisted/types.generated.ts
index 2db5c464..68a146dd 100644
--- a/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules-typedefs-file-mode-mergedWhitelisted/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules-typedefs-file-mode-mergedWhitelisted/types.generated.ts
@@ -180,7 +180,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>;
 
@@ -244,22 +249,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
@@ -268,10 +280,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,
@@ -328,11 +340,11 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StandardError: ResolverTypeWrapper<
@@ -371,11 +383,11 @@ export type ResolversParentTypes = {
   Date: Scalars['Date']['output'];
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   ID: Scalars['ID']['output'];
   String: Scalars['String']['output'];
   StandardError: StandardError;
@@ -412,7 +424,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -450,7 +461,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -495,7 +505,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -602,7 +611,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules/types.generated.ts b/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules/types.generated.ts
index 2db5c464..68a146dd 100644
--- a/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules/types.generated.ts
+++ b/packages/typescript-resolver-files-e2e/src/test-whitelisted/modules/types.generated.ts
@@ -180,7 +180,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>;
 
@@ -244,22 +249,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
@@ -268,10 +280,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,
@@ -328,11 +340,11 @@ export type ResolversTypes = {
     | 'FORBIDDEN_ERROR'
     | 'UNEXPECTED_ERROR'
   >;
-  Mutation: ResolverTypeWrapper<{}>;
+  Mutation: ResolverTypeWrapper<Record<PropertyKey, never>>;
   PaginationInput: PaginationInput;
   Int: ResolverTypeWrapper<Scalars['Int']['output']>;
   PaginationResult: ResolverTypeWrapper<PaginationResult>;
-  Query: ResolverTypeWrapper<{}>;
+  Query: ResolverTypeWrapper<Record<PropertyKey, never>>;
   ID: ResolverTypeWrapper<Scalars['ID']['output']>;
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StandardError: ResolverTypeWrapper<
@@ -371,11 +383,11 @@ export type ResolversParentTypes = {
   Date: Scalars['Date']['output'];
   DateTime: Scalars['DateTime']['output'];
   Error: ResolversInterfaceTypes<ResolversParentTypes>['Error'];
-  Mutation: {};
+  Mutation: Record<PropertyKey, never>;
   PaginationInput: PaginationInput;
   Int: Scalars['Int']['output'];
   PaginationResult: PaginationResult;
-  Query: {};
+  Query: Record<PropertyKey, never>;
   ID: Scalars['ID']['output'];
   String: Scalars['String']['output'];
   StandardError: StandardError;
@@ -412,7 +424,6 @@ export type ErrorResolvers<
   ParentType extends ResolversParentTypes['Error'] = ResolversParentTypes['Error']
 > = {
   __resolveType?: TypeResolveFn<'StandardError', ParentType, ContextType>;
-  error?: Resolver<ResolversTypes['ErrorType'], ParentType, ContextType>;
 };
 
 export type ErrorTypeResolvers = EnumResolverSignature<
@@ -450,7 +461,6 @@ export type PaginationResultResolvers<
   currentPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   recordsPerPage?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   totalPageCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type QueryResolvers<
@@ -495,7 +505,6 @@ export type TopicResolvers<
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type TopicByIdPayloadResolvers<
@@ -602,7 +611,6 @@ export type UserResolvers<
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
 export type UserPayloadResolvers<
diff --git a/packages/typescript-resolver-files/package.json b/packages/typescript-resolver-files/package.json
index d4ea6e4e..9c7f9adc 100644
--- a/packages/typescript-resolver-files/package.json
+++ b/packages/typescript-resolver-files/package.json
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@eddeee888/gcg-server-config": "0.2.3",
-    "@graphql-codegen/add": "^5.0.3",
-    "@graphql-codegen/plugin-helpers": "^5.1.0",
-    "@graphql-codegen/schema-ast": "^4.1.0",
-    "@graphql-codegen/typescript": "^4.1.3",
-    "@graphql-codegen/typescript-resolvers": "^4.4.2",
+    "@graphql-codegen/add": "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
+    "@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-resolvers": "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84",
     "@graphql-tools/merge": "^9.0.4",
     "@graphql-tools/utils": "^10.0.0",
     "micromatch": "^4.0.0",
diff --git a/packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts b/packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts
index 1013c938..a1e8eaff 100644
--- a/packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts
+++ b/packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts
@@ -67,7 +67,12 @@ export const handleGraphQLObjectType: GraphQLTypeHandler<
 
   // __isTypeOf is required to resolve abstract types, should user chooses this approach.
   // TODO: Run static analysis to enforce only one __isTypeOf per Object type, so users cannot accidentally implement/override it across modules
-  if (hasFieldsToPick) {
+  if (
+    hasFieldsToPick &&
+    generatedTypesFileMeta.generatedResolverTypes.userDefined[
+      normalizedResolverName.base
+    ].hasIsTypeOf
+  ) {
     fieldsToPick.push('__isTypeOf');
   }
 
diff --git a/packages/typescript-resolver-files/src/preset.ts b/packages/typescript-resolver-files/src/preset.ts
index d8a4a717..b3de1b6b 100644
--- a/packages/typescript-resolver-files/src/preset.ts
+++ b/packages/typescript-resolver-files/src/preset.ts
@@ -139,9 +139,6 @@ export const preset: Types.OutputPreset<RawPresetConfig> = {
       },
       namingConvention: 'keep',
       emitLegacyCommonJSImports,
-      generateInternalResolversIfNeeded: {
-        __resolveReference: true,
-      },
       ...typesPluginsConfig,
       scalars: mergedConfig.scalarTypes,
       mappers: {
diff --git a/yarn.lock b/yarn.lock
index bd574b94..c31ee040 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1988,12 +1988,12 @@
     "@eslint/core" "^0.15.1"
     levn "^0.4.1"
 
-"@graphql-codegen/add@5.0.3", "@graphql-codegen/add@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.3.tgz#1ede6bac9a93661ed7fa5808b203d079e1b1d215"
-  integrity sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==
+"@graphql-codegen/add@6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#044cba12ab90c0dee9ab466df73d8b823352e499"
+  integrity sha512-3unMjM71xGyRbf5pg+XJUZAQn+vUhcSitt5lFrwO6eDxUJr4L6nj+GkH/iU8OKLkY3titAbUbRg+5wTF/azGNA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     tslib "~2.6.0"
 
 "@graphql-codegen/add@^3.2.1":
@@ -2004,39 +2004,46 @@
     "@graphql-codegen/plugin-helpers" "^3.1.1"
     tslib "~2.4.0"
 
-"@graphql-codegen/cli@5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.4.tgz#22a8fc492ff20028f236dda16ecd9f5bd9783c5a"
-  integrity sha512-vPO1mCtrttFVy8mPR+jMAvsYTv8E/7payIPaneeGE15mQjyvQXXsHoAg06Qpf6tykOdCwKVLWre0Mf6g0KBwUg==
+"@graphql-codegen/add@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.3.tgz#1ede6bac9a93661ed7fa5808b203d079e1b1d215"
+  integrity sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    tslib "~2.6.0"
+
+"@graphql-codegen/cli@6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#b03c2af6eeee934b901972b122ce63d85f5ccc6e"
+  integrity sha512-IrSjHry+N7rX8PSXd2VIoey2mfRscSEH5LxERdIXGNjFzu5ejvFMYtXc9UsOQWJfLu2tkPUpxOY3h1skxkRRrw==
   dependencies:
     "@babel/generator" "^7.18.13"
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.18.13"
-    "@graphql-codegen/client-preset" "^4.6.0"
-    "@graphql-codegen/core" "^4.0.2"
-    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-codegen/client-preset" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/core" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/apollo-engine-loader" "^8.0.0"
     "@graphql-tools/code-file-loader" "^8.0.0"
     "@graphql-tools/git-loader" "^8.0.0"
     "@graphql-tools/github-loader" "^8.0.0"
     "@graphql-tools/graphql-file-loader" "^8.0.0"
     "@graphql-tools/json-file-loader" "^8.0.0"
-    "@graphql-tools/load" "^8.0.0"
-    "@graphql-tools/prisma-loader" "^8.0.0"
+    "@graphql-tools/load" "^8.1.0"
     "@graphql-tools/url-loader" "^8.0.0"
     "@graphql-tools/utils" "^10.0.0"
+    "@inquirer/prompts" "^7.8.2"
     "@whatwg-node/fetch" "^0.10.0"
-    chalk "^4.1.0"
-    cosmiconfig "^8.1.3"
-    debounce "^1.2.0"
-    detect-indent "^6.0.0"
+    chalk "^5.6.0"
+    cosmiconfig "^9.0.0"
+    debounce "^2.0.0"
+    detect-indent "^7.0.0"
     graphql-config "^5.1.1"
-    inquirer "^8.0.0"
     is-glob "^4.0.1"
-    jiti "^1.17.1"
+    jiti "^2.3.0"
     json-to-pretty-yaml "^1.2.2"
-    listr2 "^4.0.5"
-    log-symbols "^4.0.0"
+    listr2 "^9.0.0"
+    log-symbols "^7.0.0"
     micromatch "^4.0.5"
     shell-quote "^1.7.3"
     string-env-interpolation "^1.0.1"
@@ -2045,44 +2052,44 @@
     yaml "^2.3.1"
     yargs "^17.0.0"
 
-"@graphql-codegen/client-preset@^4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-4.6.0.tgz#4461fa3b50cec8331ec486d921a0b58965263745"
-  integrity sha512-+zSdT2ru3BOX6e1iuBk2VMe04HumJQQZDCXO4N2LXzv9c15ohFmjY8HdTtFjoi9IKsAH4fT32BzszY6pqVSvHw==
+"@graphql-codegen/client-preset@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#dc26171064cf5271e29ceba20b85d02022349903"
+  integrity sha512-jloZkkTStmc94uXTWpLe6IXWI4aC2sCSAA5pXIYTk3XBysKoElmIkYIPTFwcNwnFVMXaWcLO+JqY76z47i2gog==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/template" "^7.20.7"
-    "@graphql-codegen/add" "^5.0.3"
-    "@graphql-codegen/gql-tag-operations" "4.0.13"
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/typed-document-node" "^5.0.13"
-    "@graphql-codegen/typescript" "^4.1.3"
-    "@graphql-codegen/typescript-operations" "^4.4.1"
-    "@graphql-codegen/visitor-plugin-common" "^5.6.1"
+    "@graphql-codegen/add" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/gql-tag-operations" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/typed-document-node" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/typescript" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/typescript-operations" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/documents" "^1.0.0"
     "@graphql-tools/utils" "^10.0.0"
     "@graphql-typed-document-node/core" "3.2.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/core@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-4.0.2.tgz#7e6ec266276f54bbf02f60599d9e518f4a59d85e"
-  integrity sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==
+"@graphql-codegen/core@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#14ef9b5d5c7b85cceda626e9d0db1f3106fb2648"
+  integrity sha512-GrigRoL32UtilHDX6ApvhbJTBsaNQ0d+/HD8DQLZtFrj5UKUMVkN+iYQtlEpqehucTRAy/uaw067MXlJfcCVmg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/schema" "^10.0.0"
     "@graphql-tools/utils" "^10.0.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/gql-tag-operations@4.0.13":
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.13.tgz#895dcc9eb6e9df9136dd83afe5420662e2ff0425"
-  integrity sha512-oZYa57ywkCAPZdNmiUknoHnHbPx+5HQNfHDVwCBKRKrVmJS0dMVZuHV0Vr/4GQUNQIFP0Jn6EEFjVlqfPwbEMQ==
+"@graphql-codegen/gql-tag-operations@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#2a4470f23698d767112f048d4846207f076c32fb"
+  integrity sha512-Ty8Q436ijl56YOk1r7vZ5e+NN8FNThHfTcVtlNE3LGEIzAcv1n4PbzyT/whHKrRlom+3c2v2900AXjODQnLzGA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/visitor-plugin-common" "5.6.1"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/utils" "^10.0.0"
-    auto-bind "~4.0.0"
+    auto-bind "^5.0.0"
     tslib "~2.6.0"
 
 "@graphql-codegen/near-operation-file-preset@3.1.0":
@@ -2097,10 +2104,10 @@
     parse-filepath "^1.0.2"
     tslib "^2.8.1"
 
-"@graphql-codegen/plugin-helpers@5.1.0", "@graphql-codegen/plugin-helpers@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.1.0.tgz#5c4ace748b9761d082ec1a0c19a82047bacce553"
-  integrity sha512-Y7cwEAkprbTKzVIe436TIw4w03jorsMruvCvu0HJkavaKMQbWY+lQ1RIuROgszDbxAyM35twB5/sUvYG5oW+yg==
+"@graphql-codegen/plugin-helpers@6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#4ff52eb079f41371bbc292b90f383905c294ecf3"
+  integrity sha512-VfrWfCDxd3LLjFBA63Kp84CqBKKTe9hdKOYO13x74qL4lyVFH4WO8ZXRDpWsPDznLK/dMxYULekZh81DomN+og==
   dependencies:
     "@graphql-tools/utils" "^10.0.0"
     change-case-all "1.0.15"
@@ -2133,44 +2140,47 @@
     lodash "~4.17.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/schema-ast@4.1.0", "@graphql-codegen/schema-ast@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.1.0.tgz#a1e71f99346495b9272161a9ed07756e82648726"
-  integrity sha512-kZVn0z+th9SvqxfKYgztA6PM7mhnSZaj4fiuBWvMTqA+QqQ9BBed6Pz41KuD/jr0gJtnlr2A4++/0VlpVbCTmQ==
+"@graphql-codegen/plugin-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.1.0.tgz#5c4ace748b9761d082ec1a0c19a82047bacce553"
+  integrity sha512-Y7cwEAkprbTKzVIe436TIw4w03jorsMruvCvu0HJkavaKMQbWY+lQ1RIuROgszDbxAyM35twB5/sUvYG5oW+yg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.3"
     "@graphql-tools/utils" "^10.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/schema-ast@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz#aeaa104e4555cca73a058f0a9350b4b0e290b377"
-  integrity sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q==
+"@graphql-codegen/schema-ast@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#a09d906ce17d3a791847a74f621b7ee7c8f53805"
+  integrity sha512-Pnqpvrtqrgw1Spt6duE3gPnLNw6KyIQT4mui8AD1gXT2RtSHK2skAyUkq6ajkHBG3po3PwqWl6+mjx5Fr7JBUQ==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/utils" "^10.0.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/typed-document-node@^5.0.13":
-  version "5.0.13"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.13.tgz#40adbfa8d03c93e8fa8216afaa1854d63024f772"
-  integrity sha512-/r23W1WF9PKymIET3SdCDfyuZ6tHeflvbZF3mL3cMp4849M1fe1J2eWefeqn2MMbKATstNqRVxtrq6peJ3A/Ew==
+"@graphql-codegen/typed-document-node@6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#1681b6a4f725f778982a66933622211c6d2ebe3b"
+  integrity sha512-mN5jGj9r15RTJk2FZcn9oRS5O2iLJRGi1Xlhw7uEy+XlLb9OF4WrT5lHprbK31LkAyAkT6s2LE+jFwl72a705Q==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/visitor-plugin-common" "5.6.1"
-    auto-bind "~4.0.0"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    auto-bind "^5.0.0"
     change-case-all "1.0.15"
     tslib "~2.6.0"
 
-"@graphql-codegen/typescript-operations@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.4.1.tgz#a3d10ff2f0cc7c016493c035cc8f00fad38485b4"
-  integrity sha512-iqAdEe4wfxGPT9s/VD+EhehBzaTxvWdisbsqiM6dMfk+8FfjrOj8SDBsHzKwmkRcrpMK6h9gLr3XcuBPu0JoFg==
+"@graphql-codegen/typescript-operations@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#a2e535cf5cf41ce0b2ab69a031c94333baf8f175"
+  integrity sha512-owkmLKNoB4BOU8OoQmo+/SZJs4FHRzSW0vxO18QCdTRvPpthVXdLoDy+TegcVPapLKA8uoEJ+bZp8UuzzB0Vqw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/typescript" "^4.1.3"
-    "@graphql-codegen/visitor-plugin-common" "5.6.1"
-    auto-bind "~4.0.0"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/typescript" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    auto-bind "^5.0.0"
     tslib "~2.6.0"
 
 "@graphql-codegen/typescript-react-apollo@4.3.3":
@@ -2184,27 +2194,27 @@
     change-case-all "1.0.15"
     tslib "^2.8.1"
 
-"@graphql-codegen/typescript-resolvers@4.4.2", "@graphql-codegen/typescript-resolvers@^4.4.2":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-resolvers/-/typescript-resolvers-4.4.2.tgz#b0886e33d0d6d2354d3a2b92af44f4bf228ead40"
-  integrity sha512-+/wzLYzUDKPKe5p3JYUXszSlLH46oD8w+8+U7c1ttJYItZV/duFE2D3TgF2aBkfYwFiYZ1thnEMI1Jm17vAR3w==
+"@graphql-codegen/typescript-resolvers@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-resolvers/-/typescript-resolvers-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#96f445fc2607477fe2653d562d7b6e445a98af10"
+  integrity sha512-bdtLJYA8ByFK7Kpz00pYTWjwTt+1cQBxPhJQgc/uz/MSZpbWzFoc69EnaFmUdkDsCQAMP0xYKRX7uNIqXr2sJw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/typescript" "^4.1.3"
-    "@graphql-codegen/visitor-plugin-common" "5.6.1"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/typescript" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/utils" "^10.0.0"
-    auto-bind "~4.0.0"
+    auto-bind "^5.0.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/typescript@4.1.3", "@graphql-codegen/typescript@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-4.1.3.tgz#fc16ab6a1c439e1e4ce375aeba2b2335704f824e"
-  integrity sha512-/7qNPj+owhxBZB3Kv0FuUILZq9A6Gl5P5wiIZGAmw500n6Vc8ceOFLRXeVkyvDccxTGWS/vJv+sUnl94T2Pu+A==
+"@graphql-codegen/typescript@5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#a025d6dc65dce7ef0470da04e5adfba5a45f6701"
+  integrity sha512-Upn23JAxSazGJMn36+jlgPZPHU0LSedyz0gDn65vLXAat8DIF4oVYLEYhPAbg9ZKtNk9jrE6XgYoxlidLJAntA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
-    "@graphql-codegen/schema-ast" "^4.0.2"
-    "@graphql-codegen/visitor-plugin-common" "5.6.1"
-    auto-bind "~4.0.0"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/schema-ast" "5.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    "@graphql-codegen/visitor-plugin-common" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+    auto-bind "^5.0.0"
     tslib "~2.6.0"
 
 "@graphql-codegen/visitor-plugin-common@2.13.8":
@@ -2223,18 +2233,18 @@
     parse-filepath "^1.0.2"
     tslib "~2.4.0"
 
-"@graphql-codegen/visitor-plugin-common@5.6.1", "@graphql-codegen/visitor-plugin-common@^5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.6.1.tgz#492ed514530e43a38d875cdbc8b312a565ac8ce0"
-  integrity sha512-q+DkGWWS7pvSc1c4Hw1xD0RI+EplTe2PCyTCT0WuaswnodBytteKTqFOVVGadISLX0xhO25aANTFB4+TLwTBSA==
+"@graphql-codegen/visitor-plugin-common@6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84":
+  version "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84.tgz#06e20aefc0010d906e5344638b9c6a07330fe344"
+  integrity sha512-rh82mO7K6eM4QWwdiLLLG0uZ+HQrpueBCk0uVI2A8mKW/pxR2hi6oxq43R2ghduRPWgRcmjesZu0tt5ToFkQfA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^5.1.0"
+    "@graphql-codegen/plugin-helpers" "6.0.0-alpha-20250828102819-45c39afe00df38220d7a137d66ac1b30fdeeed84"
     "@graphql-tools/optimize" "^2.0.0"
     "@graphql-tools/relay-operation-optimizer" "^7.0.0"
     "@graphql-tools/utils" "^10.0.0"
-    auto-bind "~4.0.0"
+    auto-bind "^5.0.0"
     change-case-all "1.0.15"
-    dependency-graph "^0.11.0"
+    dependency-graph "^1.0.0"
     graphql-tag "^2.11.0"
     parse-filepath "^1.0.2"
     tslib "~2.6.0"
@@ -2415,6 +2425,16 @@
     p-limit "3.1.0"
     tslib "^2.4.0"
 
+"@graphql-tools/load@^8.1.0":
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.1.2.tgz#8d13412b897735b8ad5a8c8e1396b4ae5fc46190"
+  integrity sha512-WhDPv25/jRND+0uripofMX0IEwo6mrv+tJg6HifRmDu8USCD7nZhufT0PP7lIcuutqjIQFyogqT70BQsy6wOgw==
+  dependencies:
+    "@graphql-tools/schema" "^10.0.25"
+    "@graphql-tools/utils" "^10.9.1"
+    p-limit "3.1.0"
+    tslib "^2.4.0"
+
 "@graphql-tools/merge@9.0.4", "@graphql-tools/merge@^9.0.4":
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.4.tgz#66c34cbc2b9a99801c0efca7b8134b2c9aecdb06"
@@ -2431,6 +2451,14 @@
     "@graphql-tools/utils" "^10.0.13"
     tslib "^2.4.0"
 
+"@graphql-tools/merge@^9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.1.1.tgz#6a51775f5ba6bdef213def1fd277536f9468b44c"
+  integrity sha512-BJ5/7Y7GOhTuvzzO5tSBFL4NGr7PVqTJY3KeIDlVTT8YLcTXtBR+hlrC3uyEym7Ragn+zyWdHeJ9ev+nRX1X2w==
+  dependencies:
+    "@graphql-tools/utils" "^10.9.1"
+    tslib "^2.4.0"
+
 "@graphql-tools/optimize@^1.3.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.4.0.tgz#20d6a9efa185ef8fc4af4fd409963e0907c6e112"
@@ -2445,28 +2473,6 @@
   dependencies:
     tslib "^2.4.0"
 
-"@graphql-tools/prisma-loader@^8.0.0":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-8.0.4.tgz#542be5567b93f1b6147ef85819eb5874969486b2"
-  integrity sha512-hqKPlw8bOu/GRqtYr0+dINAI13HinTVYBDqhwGAPIFmLr5s+qKskzgCiwbsckdrb5LWVFmVZc+UXn80OGiyBzg==
-  dependencies:
-    "@graphql-tools/url-loader" "^8.0.2"
-    "@graphql-tools/utils" "^10.0.13"
-    "@types/js-yaml" "^4.0.0"
-    "@whatwg-node/fetch" "^0.9.0"
-    chalk "^4.1.0"
-    debug "^4.3.1"
-    dotenv "^16.0.0"
-    graphql-request "^6.0.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
-    jose "^5.0.0"
-    js-yaml "^4.0.0"
-    lodash "^4.17.20"
-    scuid "^1.1.0"
-    tslib "^2.4.0"
-    yaml-ast-parser "^0.0.43"
-
 "@graphql-tools/relay-operation-optimizer@^6.5.0":
   version "6.5.18"
   resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.18.tgz#a1b74a8e0a5d0c795b8a4d19629b654cf66aa5ab"
@@ -2495,7 +2501,16 @@
     tslib "^2.4.0"
     value-or-promise "^1.0.12"
 
-"@graphql-tools/url-loader@^8.0.0", "@graphql-tools/url-loader@^8.0.2":
+"@graphql-tools/schema@^10.0.25":
+  version "10.0.25"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.25.tgz#73de08bc765f482cde334562a1bebe95a2e5a3c4"
+  integrity sha512-/PqE8US8kdQ7lB9M5+jlW8AyVjRGCKU7TSktuW3WNKSKmDO0MK1wakvb5gGdyT49MjAIb4a3LWxIpwo5VygZuw==
+  dependencies:
+    "@graphql-tools/merge" "^9.1.1"
+    "@graphql-tools/utils" "^10.9.1"
+    tslib "^2.4.0"
+
+"@graphql-tools/url-loader@^8.0.0":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-8.0.2.tgz#ee8e10a85d82c72662f6bc6bbc7b408510a36ebd"
   integrity sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==
@@ -2534,6 +2549,17 @@
     dset "^3.1.2"
     tslib "^2.4.0"
 
+"@graphql-tools/utils@^10.9.1":
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.9.1.tgz#ff4067256f2080db0c66f4475858f29a8da65ecf"
+  integrity sha512-B1wwkXk9UvU7LCBkPs8513WxOQ2H8Fo5p8HR1+Id9WmYE5+bd51vqN+MbrqvWczHCH2gwkREgHJN88tE0n1FCw==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    "@whatwg-node/promise-helpers" "^1.0.0"
+    cross-inspect "1.0.1"
+    dset "^3.1.4"
+    tslib "^2.4.0"
+
 "@graphql-tools/utils@^9.0.0", "@graphql-tools/utils@^9.2.1":
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
@@ -2553,7 +2579,7 @@
     tslib "^2.4.0"
     value-or-promise "^1.0.12"
 
-"@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0":
+"@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
   integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
@@ -2586,6 +2612,146 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
   integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
 
+"@inquirer/checkbox@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-4.2.2.tgz#eabaa7eb6adbd64bb7bb7765c67c0a283ed616eb"
+  integrity sha512-E+KExNurKcUJJdxmjglTl141EwxWyAHplvsYJQgSwXf8qiNWkTxTuCCqmhFEmbIXd4zLaGMfQFJ6WrZ7fSeV3g==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/figures" "^1.0.13"
+    "@inquirer/type" "^3.0.8"
+    ansi-escapes "^4.3.2"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/confirm@^5.1.16":
+  version "5.1.16"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-5.1.16.tgz#4f99603e5c8a1b471b819343f708c75e8abd2b88"
+  integrity sha512-j1a5VstaK5KQy8Mu8cHmuQvN1Zc62TbLhjJxwHvKPPKEoowSF6h/0UdOpA9DNdWZ+9Inq73+puRq1df6OJ8Sag==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+
+"@inquirer/core@^10.2.0":
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-10.2.0.tgz#19ff527dbe0956891d825e320ecbc890bd6a1550"
+  integrity sha512-NyDSjPqhSvpZEMZrLCYUquWNl+XC/moEcVFqS55IEYIYsY0a1cUCevSqk7ctOlnm/RaSBU5psFryNlxcmGrjaA==
+  dependencies:
+    "@inquirer/figures" "^1.0.13"
+    "@inquirer/type" "^3.0.8"
+    ansi-escapes "^4.3.2"
+    cli-width "^4.1.0"
+    mute-stream "^2.0.0"
+    signal-exit "^4.1.0"
+    wrap-ansi "^6.2.0"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/editor@^4.2.18":
+  version "4.2.18"
+  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-4.2.18.tgz#1418aef90025046ad16306451effb6fb36db9664"
+  integrity sha512-yeQN3AXjCm7+Hmq5L6Dm2wEDeBRdAZuyZ4I7tWSSanbxDzqM0KqzoDbKM7p4ebllAYdoQuPJS6N71/3L281i6w==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/external-editor" "^1.0.1"
+    "@inquirer/type" "^3.0.8"
+
+"@inquirer/expand@^4.0.18":
+  version "4.0.18"
+  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-4.0.18.tgz#8bf1bcd1ee99b8fa02e1143ed5bf69dc576bacd7"
+  integrity sha512-xUjteYtavH7HwDMzq4Cn2X4Qsh5NozoDHCJTdoXg9HfZ4w3R6mxV1B9tL7DGJX2eq/zqtsFjhm0/RJIMGlh3ag==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/external-editor@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-1.0.1.tgz#ab0a82c5719a963fb469021cde5cd2b74fea30f8"
+  integrity sha512-Oau4yL24d2B5IL4ma4UpbQigkVhzPDXLoqy1ggK4gnHg/stmkffJE4oOXHXF3uz0UEpywG68KcyXsyYpA1Re/Q==
+  dependencies:
+    chardet "^2.1.0"
+    iconv-lite "^0.6.3"
+
+"@inquirer/figures@^1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.13.tgz#ad0afd62baab1c23175115a9b62f511b6a751e45"
+  integrity sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==
+
+"@inquirer/input@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-4.2.2.tgz#98c420a3bff94ee19124f74a641cef2b1eb01b22"
+  integrity sha512-hqOvBZj/MhQCpHUuD3MVq18SSoDNHy7wEnQ8mtvs71K8OPZVXJinOzcvQna33dNYLYE4LkA9BlhAhK6MJcsVbw==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+
+"@inquirer/number@^3.0.18":
+  version "3.0.18"
+  resolved "https://registry.yarnpkg.com/@inquirer/number/-/number-3.0.18.tgz#b5595c02061498e2753fdfe35d9abae14e9223aa"
+  integrity sha512-7exgBm52WXZRczsydCVftozFTrrwbG5ySE0GqUd2zLNSBXyIucs2Wnm7ZKLe/aUu6NUg9dg7Q80QIHCdZJiY4A==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+
+"@inquirer/password@^4.0.18":
+  version "4.0.18"
+  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-4.0.18.tgz#7500139016247163a6c115228fcafbb9cb448941"
+  integrity sha512-zXvzAGxPQTNk/SbT3carAD4Iqi6A2JS2qtcqQjsL22uvD+JfQzUrDEtPjLL7PLn8zlSNyPdY02IiQjzoL9TStA==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+    ansi-escapes "^4.3.2"
+
+"@inquirer/prompts@^7.8.2":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-7.8.4.tgz#ed150f6d03ad019a7dcc7a0adee7c3cb3790b03f"
+  integrity sha512-MuxVZ1en1g5oGamXV3DWP89GEkdD54alcfhHd7InUW5BifAdKQEK9SLFa/5hlWbvuhMPlobF0WAx7Okq988Jxg==
+  dependencies:
+    "@inquirer/checkbox" "^4.2.2"
+    "@inquirer/confirm" "^5.1.16"
+    "@inquirer/editor" "^4.2.18"
+    "@inquirer/expand" "^4.0.18"
+    "@inquirer/input" "^4.2.2"
+    "@inquirer/number" "^3.0.18"
+    "@inquirer/password" "^4.0.18"
+    "@inquirer/rawlist" "^4.1.6"
+    "@inquirer/search" "^3.1.1"
+    "@inquirer/select" "^4.3.2"
+
+"@inquirer/rawlist@^4.1.6":
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-4.1.6.tgz#805e1c449dde2bdfd8bc7eca56e6fe40938a7dc7"
+  integrity sha512-KOZqa3QNr3f0pMnufzL7K+nweFFCCBs6LCXZzXDrVGTyssjLeudn5ySktZYv1XiSqobyHRYYK0c6QsOxJEhXKA==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/type" "^3.0.8"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/search@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/search/-/search-3.1.1.tgz#f67a559c66043fe4fdc639c053578d34440b3c49"
+  integrity sha512-TkMUY+A2p2EYVY3GCTItYGvqT6LiLzHBnqsU1rJbrpXUijFfM6zvUx0R4civofVwFCmJZcKqOVwwWAjplKkhxA==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/figures" "^1.0.13"
+    "@inquirer/type" "^3.0.8"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/select@^4.3.2":
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-4.3.2.tgz#7ff8942fb052c9c92110c9c044c7abb9b4ba9497"
+  integrity sha512-nwous24r31M+WyDEHV+qckXkepvihxhnyIaod2MG7eCE6G0Zm/HUF6jgN8GXgf4U7AU6SLseKdanY195cwvU6w==
+  dependencies:
+    "@inquirer/core" "^10.2.0"
+    "@inquirer/figures" "^1.0.13"
+    "@inquirer/type" "^3.0.8"
+    ansi-escapes "^4.3.2"
+    yoctocolors-cjs "^2.1.2"
+
+"@inquirer/type@^3.0.8":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-3.0.8.tgz#efc293ba0ed91e90e6267f1aacc1c70d20b8b4e8"
+  integrity sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -3633,11 +3799,6 @@
     expect "^30.0.0"
     pretty-format "^30.0.0"
 
-"@types/js-yaml@^4.0.0":
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2"
-  integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==
-
 "@types/jsdom@^21.1.7":
   version "21.1.7"
   resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.7.tgz#9edcb09e0b07ce876e7833922d3274149c898cfa"
@@ -4022,6 +4183,13 @@
     busboy "^1.6.0"
     tslib "^2.6.3"
 
+"@whatwg-node/promise-helpers@^1.0.0":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/promise-helpers/-/promise-helpers-1.3.2.tgz#3b54987ad6517ef6db5920c66a6f0dada606587d"
+  integrity sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==
+  dependencies:
+    tslib "^2.6.3"
+
 "@xhmikosr/archive-type@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@xhmikosr/archive-type/-/archive-type-7.0.0.tgz#74746a210b59d7d8a77aa69a422f0dae025b3798"
@@ -4165,7 +4333,7 @@ address@^1.0.1:
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
   integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
 
-agent-base@^7.0.2, agent-base@^7.1.0:
+agent-base@^7.1.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
   integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
@@ -4177,14 +4345,6 @@ agent-base@^7.1.2:
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
   integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
 
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -4200,13 +4360,20 @@ ansi-colors@^4.1.1, ansi-colors@^4.1.3:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
+ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
+ansi-escapes@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.0.0.tgz#00fc19f491bbb18e1d481b97868204f92109bfe7"
+  integrity sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==
+  dependencies:
+    environment "^1.0.0"
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -4236,7 +4403,7 @@ ansi-styles@^5.2.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.1.0:
+ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -4281,11 +4448,6 @@ asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async@^3.2.3:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
@@ -4296,6 +4458,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
+auto-bind@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-5.0.1.tgz#50d8e63ea5a1dddcb5e5e36451c1a8266ffbb2ae"
+  integrity sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==
+
 auto-bind@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
@@ -4503,7 +4670,7 @@ binary-version@^7.1.0:
     execa "^8.0.1"
     find-versions "^6.0.0"
 
-bl@^4.0.3, bl@^4.1.0:
+bl@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -4676,7 +4843,7 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4684,6 +4851,11 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.0.tgz#a1a8d294ea3526dbb77660f12649a08490e33ab8"
+  integrity sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==
+
 change-case-all@1.0.15, change-case-all@^1.0.0:
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
@@ -4728,6 +4900,11 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+chardet@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-2.1.0.tgz#1007f441a1ae9f9199a4a67f6e978fb0aa9aa3fe"
+  integrity sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==
+
 ci-info@^3.2.0, ci-info@^3.7.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
@@ -4743,11 +4920,6 @@ cjs-module-lexer@^2.1.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz#586e87d4341cb2661850ece5190232ccdebcff8b"
   integrity sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -4755,6 +4927,13 @@ cli-cursor@3.1.0, cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
+cli-cursor@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
+  integrity sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==
+  dependencies:
+    restore-cursor "^5.0.0"
+
 cli-spinners@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
@@ -4765,18 +4944,18 @@ cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
   integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
 
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+cli-truncate@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a"
+  integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==
   dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
+    slice-ansi "^5.0.0"
+    string-width "^7.0.0"
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+cli-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
+  integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
 
 cliui@^6.0.0:
   version "6.0.0"
@@ -4840,7 +5019,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^2.0.16, colorette@^2.0.20:
+colorette@^2.0.20:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
@@ -4929,7 +5108,7 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmiconfig@^8.1.0, cosmiconfig@^8.1.3:
+cosmiconfig@^8.1.0:
   version "8.3.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
   integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
@@ -4939,6 +5118,16 @@ cosmiconfig@^8.1.0, cosmiconfig@^8.1.3:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
+cosmiconfig@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
+  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
+  dependencies:
+    env-paths "^2.2.1"
+    import-fresh "^3.3.0"
+    js-yaml "^4.1.0"
+    parse-json "^5.2.0"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -5004,10 +5193,10 @@ dataloader@^2.2.2:
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
   integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==
 
-debounce@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+debounce@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-2.2.0.tgz#f895fa2fbdb579a0f0d3dcf5dde19657e50eaad5"
+  integrity sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
@@ -5087,11 +5276,21 @@ dependency-graph@^0.11.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
+dependency-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
+  integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
+detect-indent@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-7.0.1.tgz#cbb060a12842b9c4d333f1cac4aa4da1bb66bc25"
+  integrity sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==
+
 detect-newline@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -5132,7 +5331,7 @@ dotenv-expand@~11.0.6:
   dependencies:
     dotenv "^16.4.4"
 
-dotenv@^16.0.0, dotenv@^16.4.4, dotenv@~16.4.5:
+dotenv@^16.4.4, dotenv@~16.4.5:
   version "16.4.5"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
   integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
@@ -5142,6 +5341,11 @@ dset@^3.1.2:
   resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2"
   integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==
 
+dset@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248"
+  integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -5169,6 +5373,11 @@ emittery@^0.13.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
+emoji-regex@^10.3.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
+  integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -5211,6 +5420,16 @@ entities@^6.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
   integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
 
+env-paths@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+environment@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
+  integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -5398,6 +5617,11 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+eventemitter3@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+
 execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -5465,7 +5689,7 @@ extendable-error@^0.1.5:
   resolved "https://registry.yarnpkg.com/extendable-error/-/extendable-error-0.1.7.tgz#60b9adf206264ac920058a7395685ae4670c2b96"
   integrity sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==
 
-external-editor@^3.0.3, external-editor@^3.1.0:
+external-editor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
@@ -5559,7 +5783,7 @@ fdir@^6.4.4:
   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
   integrity sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==
 
-figures@3.2.0, figures@^3.0.0:
+figures@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -5745,6 +5969,11 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-east-asian-width@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz#21b4071ee58ed04ee0db653371b55b4299875389"
+  integrity sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -5900,14 +6129,6 @@ graphql-config@^5.1.1:
     string-env-interpolation "^1.0.1"
     tslib "^2.4.0"
 
-graphql-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f"
-  integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==
-  dependencies:
-    "@graphql-typed-document-node/core" "^3.2.0"
-    cross-fetch "^3.1.5"
-
 graphql-scalars@1.24.0:
   version "1.24.0"
   resolved "https://registry.yarnpkg.com/graphql-scalars/-/graphql-scalars-1.24.0.tgz#4153d310179f5cfd33c749ba4a77a1fb450d717d"
@@ -5986,7 +6207,7 @@ http-cache-semantics@^4.1.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
   integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
 
-http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2:
+http-proxy-agent@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
   integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
@@ -6002,14 +6223,6 @@ http2-wrapper@^2.1.10:
     quick-lru "^5.1.1"
     resolve-alpn "^1.2.0"
 
-https-proxy-agent@^7.0.0:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
-  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
 https-proxy-agent@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
@@ -6033,7 +6246,7 @@ human-signals@^5.0.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
   integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
-iconv-lite@0.6.3:
+iconv-lite@0.6.3, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -6100,11 +6313,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6118,27 +6326,6 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inquirer@^8.0.0:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562"
-  integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^6.0.1"
-
 inspect-with-kind@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz#fce151d4ce89722c82ca8e9860bb96f9167c316c"
@@ -6200,6 +6387,18 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-fullwidth-code-point@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
+  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
+
+is-fullwidth-code-point@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704"
+  integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==
+  dependencies:
+    get-east-asian-width "^1.0.0"
+
 is-generator-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -6280,6 +6479,11 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-unicode-supported@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz#09f0ab0de6d3744d48d265ebb98f65d11f2a9b3a"
+  integrity sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==
+
 is-upper-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649"
@@ -6783,20 +6987,15 @@ jest@30.0.4:
     import-local "^3.2.0"
     jest-cli "30.0.4"
 
-jiti@^1.17.1:
-  version "1.21.6"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
-  integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
-
 jiti@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
   integrity sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==
 
-jose@^5.0.0:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-5.6.2.tgz#b03628593d3a3c6486b37f4788faa6cc235cec79"
-  integrity sha512-F1t1/WZJ4JdmCE/XoMYw1dPOW5g8JF0xGm6Ox2fwaCAPlCzt+4Bh0EWP59iQuZNHHauDkCdjx+kCZSh5z/PGow==
+jiti@^2.3.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.5.1.tgz#bd099c1c2be1c59bbea4e5adcd127363446759d0"
+  integrity sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -6811,7 +7010,7 @@ js-yaml@^3.10.0, js-yaml@^3.13.1, js-yaml@^3.6.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.0.0, js-yaml@^4.1.0:
+js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -6962,19 +7161,17 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-listr2@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
-  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.5"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
+listr2@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.2.tgz#007f8eaefac2b6de30731f6583ddb10430838354"
+  integrity sha512-VVd7cS6W+vLJu2wmq4QmfVj14Iep7cz4r/OWNk36Aq5ZOY7G8/BfCrQFexcwB1OIxB3yERiePfE/REBjEFulag==
+  dependencies:
+    cli-truncate "^4.0.0"
+    colorette "^2.0.20"
+    eventemitter3 "^5.0.1"
+    log-update "^6.1.0"
+    rfdc "^1.4.1"
+    wrap-ansi "^9.0.0"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -7015,12 +7212,12 @@ lodash.startcase@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8"
   integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==
 
-lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
+lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.0.0, log-symbols@^4.1.0:
+log-symbols@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -7028,15 +7225,24 @@ log-symbols@^4.0.0, log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+log-symbols@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-7.0.1.tgz#f52e68037d96f589fc572ff2193dc424d48c195b"
+  integrity sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==
   dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
+    is-unicode-supported "^2.0.0"
+    yoctocolors "^2.1.1"
+
+log-update@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.1.0.tgz#1a04ff38166f94647ae1af562f4bd6a15b1b7cd4"
+  integrity sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==
+  dependencies:
+    ansi-escapes "^7.0.0"
+    cli-cursor "^5.0.0"
+    slice-ansi "^7.1.0"
+    strip-ansi "^7.1.0"
+    wrap-ansi "^9.0.0"
 
 loose-envify@^1.0.0:
   version "1.4.0"
@@ -7178,6 +7384,11 @@ mimic-fn@^4.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
   integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
+mimic-function@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
+  integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
+
 mimic-response@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -7253,10 +7464,10 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+mute-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-2.0.0.tgz#a5446fc0c512b71c83c44d908d5c7b7b4c493b2b"
+  integrity sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==
 
 napi-postinstall@^0.3.0:
   version "0.3.2"
@@ -7432,6 +7643,13 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
+onetime@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
+  integrity sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==
+  dependencies:
+    mimic-function "^5.0.0"
+
 open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
@@ -7467,21 +7685,6 @@ ora@5.3.0:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -7537,13 +7740,6 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -7974,12 +8170,20 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
+  integrity sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==
+  dependencies:
+    onetime "^7.0.0"
+    signal-exit "^4.1.0"
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
+rfdc@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
   integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
@@ -7996,11 +8200,6 @@ rrweb-cssom@^0.8.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
   integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -8008,13 +8207,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.5.5:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -8032,11 +8224,6 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scuid@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
-  integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==
-
 seek-bzip@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-2.0.0.tgz#f0478ab6acd0ac72345d18dc7525dd84d3c706a2"
@@ -8134,23 +8321,21 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+slice-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
+  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
   dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.0"
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+slice-ansi@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9"
+  integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==
   dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
+    ansi-styles "^6.2.1"
+    is-fullwidth-code-point "^5.0.0"
 
 snake-case@^3.0.4:
   version "3.0.4"
@@ -8290,6 +8475,15 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
+string-width@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
+  integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
+  dependencies:
+    emoji-regex "^10.3.0"
+    get-east-asian-width "^1.0.0"
+    strip-ansi "^7.1.0"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -8311,7 +8505,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1:
+strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
@@ -8461,7 +8655,7 @@ text-decoder@^1.1.0:
   dependencies:
     b4a "^1.6.4"
 
-through@^2.3.6, through@^2.3.8:
+through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -8936,7 +9130,7 @@ which@^2.0.1:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
+wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
   integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
@@ -8963,6 +9157,15 @@ wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
+wrap-ansi@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e"
+  integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==
+  dependencies:
+    ansi-styles "^6.2.1"
+    string-width "^7.0.0"
+    strip-ansi "^7.1.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -9016,11 +9219,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml-ast-parser@^0.0.43:
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
-  integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
-
 yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
@@ -9096,3 +9294,13 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yoctocolors-cjs@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz#7e4964ea8ec422b7a40ac917d3a344cfd2304baa"
+  integrity sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==
+
+yoctocolors@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yoctocolors/-/yoctocolors-2.1.2.tgz#d795f54d173494e7d8db93150cec0ed7f678c83a"
+  integrity sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==