Merge branch 'master' into typed-document-string

.changeset/blue-pans-protect.md

@@ -0,0 +1,63 @@
+---
+'@graphql-codegen/visitor-plugin-common': patch
+'@graphql-codegen/typescript-resolvers': patch
+---
+
+Fix `ResolversUnionTypes` being used in `ResolversParentTypes`
+
+Previously, objects with mappable fields are converted to Omit format that references its own type group or `ResolversTypes` or `ResolversParentTypes` e.g.
+
+```ts
+export type ResolversTypes = {
+  Book: ResolverTypeWrapper<BookMapper>;
+  BookPayload: ResolversTypes["BookResult"] | ResolversTypes["StandardError"];
+  // Note: `result` on the next line references `ResolversTypes["Book"]`
+  BookResult: ResolverTypeWrapper<Omit<BookResult, "result"> & { result?: Maybe<ResolversTypes["Book"]> }>;
+  StandardError: ResolverTypeWrapper<StandardError>;
+};
+
+export type ResolversParentTypes = {
+  Book: BookMapper;
+  BookPayload: ResolversParentTypes["BookResult"] | ResolversParentTypes["StandardError"];
+  // Note: `result` on the next line references `ResolversParentTypes["Book"]`
+  BookResult: Omit<BookResult, "result"> & { result?: Maybe<ResolversParentTypes["Book"]> };
+  StandardError: StandardError;
+};
+```
+
+In https://github.com/dotansimha/graphql-code-generator/pull/9069, we extracted resolver union types to its own group:
+
+```ts
+export type ResolversUnionTypes = {
+  // Note: `result` on the next line references `ResolversTypes["Book"]` which is only correct for the `ResolversTypes` case
+  BookPayload: (Omit<BookResult, "result"> & { result?: Maybe<ResolversTypes["Book"]> }) | StandardError;
+};
+
+export type ResolversTypes = {
+  Book: ResolverTypeWrapper<BookMapper>;
+  BookPayload: ResolverTypeWrapper<ResolversUnionTypes["BookPayload"]>;
+  BookResult: ResolverTypeWrapper<Omit<BookResult, "result"> & { result?: Maybe<ResolversTypes["Book"]> }>;
+  StandardError: ResolverTypeWrapper<StandardError>;
+};
+
+export type ResolversParentTypes = {
+  Book: BookMapper;
+  BookPayload: ResolversUnionTypes["BookPayload"];
+  BookResult: Omit<BookResult, "result"> & { result?: Maybe<ResolversParentTypes["Book"]> };
+  StandardError: StandardError;
+};
+```
+
+This change creates an extra `ResolversUnionParentTypes` that is referenced by `ResolversParentTypes` to ensure backwards compatibility:
+
+```ts
+export type ResolversUnionTypes = {
+  BookPayload: (Omit<BookResult, "result"> & { result?: Maybe<ResolversParentTypes["Book"]> }) | StandardError;
+};
+
+// ... and the reference is changed in ResolversParentTypes:
+export type ResolversParentTypes = {
+  // ... other fields
+  BookPayload: ResolversUnionParentTypes["BookPayload"];
+};
+```

dev-test/modules/types.ts

@@ -167,6 +167,11 @@ export type ResolversUnionTypes = {
   PaymentOption: CreditCard | Paypal;
 };
 
+/** Mapping of union parent types */
+export type ResolversUnionParentTypes = {
+  PaymentOption: CreditCard | Paypal;
+};
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = {
   Article: ResolverTypeWrapper<Article>;
@@ -198,7 +203,7 @@ export type ResolversParentTypes = {
   ID: Scalars['ID'];
   Int: Scalars['Int'];
   Mutation: {};
-  PaymentOption: ResolversUnionTypes['PaymentOption'];
+  PaymentOption: ResolversUnionParentTypes['PaymentOption'];
   Paypal: Paypal;
   Query: {};
   String: Scalars['String'];

examples/programmatic-typescript/package.json

@@ -21,7 +21,7 @@
     "@graphql-tools/schema": "9.0.17",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
-    "prettier": "2.8.4"
+    "prettier": "2.8.5"
   },
   "devDependencies": {
     "@types/node": "18.15.1",

package.json

@@ -54,7 +54,7 @@
     "jest-junit": "15.0.0",
     "lint-staged": "13.2.0",
     "patch-package": "6.5.1",
-    "prettier": "2.8.4",
+    "prettier": "2.8.5",
     "prettier-plugin-svelte": "2.9.0",
     "rimraf": "4.4.0",
     "ts-jest": "28.0.8",
@@ -75,7 +75,7 @@
     ]
   },
   "resolutions": {
-    "prettier": "2.8.4",
+    "prettier": "2.8.5",
     "babel-jest": "28.1.3",
     "jest-runner": "28.1.3",
     "graphql": "16.6.0",

packages/graphql-codegen-cli/package.json

@@ -89,7 +89,7 @@
     "change-case-all": "1.0.15",
     "js-yaml": "4.1.0",
     "make-dir": "3.1.0",
-    "prettier": "2.8.4"
+    "prettier": "2.8.5"
   },
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -568,7 +568,9 @@ export class BaseResolversVisitor<
   protected _resolversTypes: ResolverTypes = {};
   protected _resolversParentTypes: ResolverParentTypes = {};
   protected _hasReferencedResolversUnionTypes = false;
+  protected _hasReferencedResolversUnionParentTypes = false;
   protected _resolversUnionTypes: Record<string, string> = {};
+  protected _resolversUnionParentTypes: Record<string, string> = {};
   protected _rootTypeNames = new Set<string>();
   protected _globalDeclarations = new Set<string>();
   protected _federation: ApolloFederation;
@@ -625,18 +627,26 @@ export class BaseResolversVisitor<
       this.convertName,
       this.config.namespacedImportName
     );
-    this._resolversTypes = this.createResolversFields(
-      type => this.applyResolverTypeWrapper(type),
-      type => this.clearResolverTypeWrapper(type),
-      name => this.getTypeToUse(name)
-    );
-    this._resolversParentTypes = this.createResolversFields(
-      type => type,
-      type => type,
-      name => this.getParentTypeToUse(name),
-      namedType => !isEnumType(namedType)
-    );
-    this._resolversUnionTypes = this.createResolversUnionTypes();
+
+    this._resolversTypes = this.createResolversFields({
+      applyWrapper: type => this.applyResolverTypeWrapper(type),
+      clearWrapper: type => this.clearResolverTypeWrapper(type),
+      getTypeToUse: name => this.getTypeToUse(name),
+      referencedUnionType: 'ResolversUnionTypes',
+    });
+    this._resolversParentTypes = this.createResolversFields({
+      applyWrapper: type => type,
+      clearWrapper: type => type,
+      getTypeToUse: name => this.getParentTypeToUse(name),
+      referencedUnionType: 'ResolversUnionParentTypes',
+      shouldInclude: namedType => !isEnumType(namedType),
+    });
+    this._resolversUnionTypes = this.createResolversUnionTypes({
+      getTypeToUse: this.getTypeToUse,
+    });
+    this._resolversUnionParentTypes = this.createResolversUnionTypes({
+      getTypeToUse: this.getParentTypeToUse,
+    });
     this._fieldContextTypeMap = this.createFieldContextTypeMap();
     this._directiveContextTypesMap = this.createDirectivedContextType();
     this._directiveResolverMappings = rawConfig.directiveResolverMappings ?? {};
@@ -700,12 +710,19 @@ export class BaseResolversVisitor<
   }
 
   // Kamil: this one is heeeeavvyyyy
-  protected createResolversFields(
-    applyWrapper: (str: string) => string,
-    clearWrapper: (str: string) => string,
-    getTypeToUse: (str: string) => string,
-    shouldInclude?: (type: GraphQLNamedType) => boolean
-  ): ResolverTypes {
+  protected createResolversFields({
+    applyWrapper,
+    clearWrapper,
+    getTypeToUse,
+    referencedUnionType,
+    shouldInclude,
+  }: {
+    applyWrapper: (str: string) => string;
+    clearWrapper: (str: string) => string;
+    getTypeToUse: (str: string) => string;
+    referencedUnionType: 'ResolversUnionTypes' | 'ResolversUnionParentTypes';
+    shouldInclude?: (type: GraphQLNamedType) => boolean;
+  }): ResolverTypes {
     const allSchemaTypes = this._schema.getTypeMap();
     const typeNames = this._federation.filterTypeNames(Object.keys(allSchemaTypes));
 
@@ -766,8 +783,12 @@ export class BaseResolversVisitor<
       } else if (isScalar) {
         prev[typeName] = applyWrapper(this._getScalar(typeName));
       } else if (isUnionType(schemaType)) {
-        this._hasReferencedResolversUnionTypes = true;
-        const resolversType = this.convertName('ResolversUnionTypes');
+        if (referencedUnionType === 'ResolversUnionTypes') {
+          this._hasReferencedResolversUnionTypes = true;
+        } else if (referencedUnionType === 'ResolversUnionParentTypes') {
+          this._hasReferencedResolversUnionParentTypes = true;
+        }
+        const resolversType = this.convertName(referencedUnionType);
         prev[typeName] = applyWrapper(`${resolversType}['${typeName}']`);
       } else if (isEnumType(schemaType)) {
         prev[typeName] = this.convertName(typeName, { useTypesPrefix: this.config.enumPrefix }, true);
@@ -861,7 +882,11 @@ export class BaseResolversVisitor<
     return `Array<${t}>`;
   }
 
-  protected createResolversUnionTypes(): Record<string, string> {
+  protected createResolversUnionTypes({
+    getTypeToUse,
+  }: {
+    getTypeToUse: (name: string) => string;
+  }): Record<string, string> {
     if (!this._hasReferencedResolversUnionTypes) {
       return {};
     }
@@ -887,11 +912,8 @@ export class BaseResolversVisitor<
 
           // 2b. Find fields to Omit if needed.
           //  - If no field to Omit, "type with maybe Omit" is typescript type i.e. no Omit
-          //  - If there are fields to Omit, "type with maybe Omit"
-          const fieldsToOmit = this.getRelevantFieldsToOmit({
-            schemaType: unionMemberType,
-            getTypeToUse: this.getTypeToUse,
-          });
+          //  - If there are fields to Omit, keep track of these "type with maybe Omit" to replace in original unionMemberValue
+          const fieldsToOmit = this.getRelevantFieldsToOmit({ schemaType: unionMemberType, getTypeToUse });
           if (fieldsToOmit.length > 0) {
             unionMemberValue = this.replaceFieldsInType(unionMemberValue, fieldsToOmit);
           }
@@ -996,6 +1018,24 @@ export class BaseResolversVisitor<
       ).string;
   }
 
+  public buildResolversUnionParentTypes(): string {
+    if (Object.keys(this._resolversUnionParentTypes).length === 0) {
+      return '';
+    }
+
+    const declarationKind = 'type';
+    return new DeclarationBlock(this._declarationBlockConfig)
+      .export()
+      .asKind(declarationKind)
+      .withName(this.convertName('ResolversUnionParentTypes'))
+      .withComment('Mapping of union parent types')
+      .withBlock(
+        Object.entries(this._resolversUnionParentTypes)
+          .map(([typeName, value]) => indent(`${typeName}: ${value}${this.getPunctuation(declarationKind)}`))
+          .join('\n')
+      ).string;
+  }
+
   public get schema(): GraphQLSchema {
     return this._schema;
   }

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

@@ -246,6 +246,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
   const resolversTypeMapping = visitor.buildResolversTypes();
   const resolversParentTypeMapping = visitor.buildResolversParentTypes();
   const resolversUnionTypesMapping = visitor.buildResolversUnionTypes();
+  const resolversUnionParentTypesMapping = visitor.buildResolversUnionParentTypes();
   const { getRootResolver, getAllDirectiveResolvers, mappersImports, unusedMappers, hasScalars } = visitor;
 
   if (hasScalars()) {
@@ -284,6 +285,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
     content: [
       header,
       resolversUnionTypesMapping,
+      resolversUnionParentTypesMapping,
       resolversTypeMapping,
       resolversParentTypeMapping,
       ...visitorResult.definitions.filter(d => typeof d === 'string'),

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

@@ -140,6 +140,12 @@ export type ResolversUnionTypes = ResolversObject<{
   MyUnion: ( Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversTypes['ChildUnion']> } ) | ( MyOtherType );
 }>;
 
+/** Mapping of union parent types */
+export type ResolversUnionParentTypes = ResolversObject<{
+  ChildUnion: ( Child ) | ( MyOtherType );
+  MyUnion: ( Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversParentTypes['ChildUnion']> } ) | ( MyOtherType );
+}>;
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = ResolversObject<{
   MyType: ResolverTypeWrapper<Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversTypes['ChildUnion']> }>;
@@ -164,13 +170,13 @@ export type ResolversParentTypes = ResolversObject<{
   String: Scalars['String'];
   Child: Child;
   MyOtherType: MyOtherType;
-  ChildUnion: ResolversUnionTypes['ChildUnion'];
+  ChildUnion: ResolversUnionParentTypes['ChildUnion'];
   Query: {};
   Subscription: {};
   Node: ResolversParentTypes['SomeNode'];
   ID: Scalars['ID'];
   SomeNode: SomeNode;
-  MyUnion: ResolversUnionTypes['MyUnion'];
+  MyUnion: ResolversUnionParentTypes['MyUnion'];
   MyScalar: Scalars['MyScalar'];
   Int: Scalars['Int'];
   Boolean: Scalars['Boolean'];
@@ -343,6 +349,12 @@ export type ResolversUnionTypes = ResolversObject<{
   MyUnion: ( Omit<Types.MyType, 'unionChild'> & { unionChild?: Types.Maybe<ResolversTypes['ChildUnion']> } ) | ( Types.MyOtherType );
 }>;
 
+/** Mapping of union parent types */
+export type ResolversUnionParentTypes = ResolversObject<{
+  ChildUnion: ( Types.Child ) | ( Types.MyOtherType );
+  MyUnion: ( Omit<Types.MyType, 'unionChild'> & { unionChild?: Types.Maybe<ResolversParentTypes['ChildUnion']> } ) | ( Types.MyOtherType );
+}>;
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = ResolversObject<{
   MyType: ResolverTypeWrapper<Omit<Types.MyType, 'unionChild'> & { unionChild?: Types.Maybe<ResolversTypes['ChildUnion']> }>;
@@ -367,13 +379,13 @@ export type ResolversParentTypes = ResolversObject<{
   String: Types.Scalars['String'];
   Child: Types.Child;
   MyOtherType: Types.MyOtherType;
-  ChildUnion: ResolversUnionTypes['ChildUnion'];
+  ChildUnion: ResolversUnionParentTypes['ChildUnion'];
   Query: {};
   Subscription: {};
   Node: ResolversParentTypes['SomeNode'];
   ID: Types.Scalars['ID'];
   SomeNode: Types.SomeNode;
-  MyUnion: ResolversUnionTypes['MyUnion'];
+  MyUnion: ResolversUnionParentTypes['MyUnion'];
   MyScalar: Types.Scalars['MyScalar'];
   Int: Types.Scalars['Int'];
   Boolean: Types.Scalars['Boolean'];
@@ -600,6 +612,12 @@ export type ResolversUnionTypes = ResolversObject<{
   MyUnion: ( Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversTypes['ChildUnion']> } ) | ( MyOtherType );
 }>;
 
+/** Mapping of union parent types */
+export type ResolversUnionParentTypes = ResolversObject<{
+  ChildUnion: ( Child ) | ( MyOtherType );
+  MyUnion: ( Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversParentTypes['ChildUnion']> } ) | ( MyOtherType );
+}>;
+
 /** Mapping between all available schema types and the resolvers types */
 export type ResolversTypes = ResolversObject<{
   MyType: ResolverTypeWrapper<Omit<MyType, 'unionChild'> & { unionChild?: Maybe<ResolversTypes['ChildUnion']> }>;
@@ -624,13 +642,13 @@ export type ResolversParentTypes = ResolversObject<{
   String: Scalars['String'];
   Child: Child;
   MyOtherType: MyOtherType;
-  ChildUnion: ResolversUnionTypes['ChildUnion'];
+  ChildUnion: ResolversUnionParentTypes['ChildUnion'];
   Query: {};
   Subscription: {};
   Node: ResolversParentTypes['SomeNode'];
   ID: Scalars['ID'];
   SomeNode: SomeNode;
-  MyUnion: ResolversUnionTypes['MyUnion'];
+  MyUnion: ResolversUnionParentTypes['MyUnion'];
   MyScalar: Scalars['MyScalar'];
   Int: Scalars['Int'];
   Boolean: Scalars['Boolean'];