CODEGEN-479 - Fix client preset not working with exactOptionalPropertyTypes=true when documentMode=string (#10373)

eddeee888 · web-flow · commit c3295f9c6038 · 2025-06-23T22:39:28.000+10:00
* Fix client preset not working with exactOptionalPropertyTypes when documentMode=string

* Update examples

* Add changeset
diff --git a/.changeset/silly-cameras-talk.md b/.changeset/silly-cameras-talk.md
@@ -0,0 +1,6 @@
+---
+'@graphql-codegen/typed-document-node': patch
+'@graphql-codegen/client-preset': patch
+---
+
+Fix client preset not working with exactOptionalPropertyTypes=true when documentMode=string
diff --git a/examples/persisted-documents-string-mode/src/gql/graphql.ts b/examples/persisted-documents-string-mode/src/gql/graphql.ts
@@ -38,7 +38,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
diff --git a/examples/react/tanstack-react-query/src/gql/graphql.ts b/examples/react/tanstack-react-query/src/gql/graphql.ts
@@ -1302,7 +1302,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
diff --git a/examples/react/urql/src/gql/graphql.ts b/examples/react/urql/src/gql/graphql.ts
@@ -1302,7 +1302,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
diff --git a/examples/typescript-graphql-request/src/gql/graphql.ts b/examples/typescript-graphql-request/src/gql/graphql.ts
@@ -1315,7 +1315,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
diff --git a/packages/plugins/typescript/typed-document-node/src/index.ts b/packages/plugins/typescript/typed-document-node/src/index.ts
@@ -41,7 +41,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
diff --git a/packages/presets/client/tests/client-preset.spec.ts b/packages/presets/client/tests/client-preset.spec.ts
@@ -2463,7 +2463,7 @@ export * from "./gql.js";`);
           extends String
           implements DocumentTypeDecoration<TResult, TVariables>
         {
-          __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+          __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
           private value: string;
           public __meta__?: Record<string, any> | undefined;
 
@@ -2608,7 +2608,7 @@ export * from "./gql.js";`);
           extends String
           implements DocumentTypeDecoration<TResult, TVariables>
         {
-          __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+          __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
           private value: string;
           public __meta__?: Record<string, any> | undefined;
 
@@ -2748,7 +2748,7 @@ export * from "./gql.js";`);
           extends String
           implements DocumentTypeDecoration<TResult, TVariables>
         {
-          __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+          __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
           private value: string;
           public __meta__?: Record<string, any> | undefined;
 
@@ -3047,7 +3047,7 @@ export * from "./gql.js";`);
           extends String
           implements DocumentTypeDecoration<TResult, TVariables>
         {
-          __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+          __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
           private value: string;
           public __meta__?: Record<string, any> | undefined;
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export class TypedDocumentString<TResult, TVariables>`
`38`	`38`	`extends String`
`39`	`39`	`implements DocumentTypeDecoration<TResult, TVariables>`
`40`	`40`	`{`
`41`		`- __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];`
	`41`	`+ __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;`
`42`	`42`	`private value: string;`
`43`	`43`	`public __meta__?: Record<string, any> \| undefined;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ export class TypedDocumentString<TResult, TVariables>`
`1302`	`1302`	`extends String`
`1303`	`1303`	`implements DocumentTypeDecoration<TResult, TVariables>`
`1304`	`1304`	`{`
`1305`		`- __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];`
	`1305`	`+ __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;`
`1306`	`1306`	`private value: string;`
`1307`	`1307`	`public __meta__?: Record<string, any> \| undefined;`
`1308`	`1308`
Original file line number	Diff line number	Diff line change
`@@ -1315,7 +1315,7 @@ export class TypedDocumentString<TResult, TVariables>`
`1315`	`1315`	`extends String`
`1316`	`1316`	`implements DocumentTypeDecoration<TResult, TVariables>`
`1317`	`1317`	`{`
`1318`		`- __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];`
	`1318`	`+ __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;`
`1319`	`1319`	`private value: string;`
`1320`	`1320`	`public __meta__?: Record<string, any> \| undefined;`
`1321`	`1321`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export class TypedDocumentString<TResult, TVariables>`
`41`	`41`	`extends String`
`42`	`42`	`implements DocumentTypeDecoration<TResult, TVariables>`
`43`	`43`	`{`
`44`		`- __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];`
	`44`	`+ __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;`
`45`	`45`	`private value: string;`
`46`	`46`	`public __meta__?: Record<string, any> \| undefined;`
`47`	`47`