Generate input types and output enums into target file #10527

ikusakov2 · 2025-12-02T01:47:16Z

Description

Generates input types into target files.
Generates output enums into target files.

Related # #10496

Type of change

Please delete options that are not relevant.

Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

Unit testing

changeset-bot · 2025-12-02T01:47:21Z

🦋 Changeset detected

Latest commit: 9cea149

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages

Name	Type
@graphql-codegen/typescript-operations	Major
@graphql-codegen/client-preset	Major
@graphql-codegen/cli	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

ikusakov2 · 2025-12-02T01:50:58Z

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

    );
    this._declarationBlockConfig = {
      ignoreExport: this.config.noExport,
+      enumNameValueSeparator: ' =',


I experimented with different enumType, this value appears to be required for other enumTypes to work.

Yes you are right! I've got a similar fix in my follow-up Enum PR here: https://github.com/dotansimha/graphql-code-generator/pull/10525/files#diff-d0b5088bd638fefba8ba49f14b488769f115ef1daff777afbe718a4c5ecdf111R172

ikusakov2 · 2025-12-02T02:14:20Z

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

  const operationsResult = oldVisit(allAst, { leave: visitor });

-  let operationsContent = operationsResult.definitions.join('\n');
+  const operationsDefinitions = operationsResult.definitions;


I rearranged/simplified the code here - please check.

ikusakov2 · 2025-12-02T02:15:02Z

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

-    operationsContent = operationsResult.definitions.concat(exportConsts).join('\n');
-  }
-
-  if (config.globalNamespace) {


I moved this block to the end - to include all the generated code.

eddeee888 · 2025-12-03T12:59:17Z

packages/plugins/typescript/operations/tests/ts-documents.standalone.spec.ts

+    `);
+  });
+
+  it('try different ways to generate enums', async () => {


Oops sorry! I should have mentioned I'm working on the tests here: #10525

Since similar tests have been moved to standalone.enum.spec.ts, shall we remove the duplicates in this PR?

Sure! Extra tests removed.
We can probably rearrange tests in a better way - to avoid this file getting cluttered.

eddeee888 · 2025-12-03T14:07:55Z

Sorry! I caused some conflicts in this PR after merging #10525 🙏

eddeee888 · 2025-12-03T14:13:58Z

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

+  private getInputObjectDeclarationBlock(node: InputObjectTypeDefinitionNode): DeclarationBlock {
+    return new DeclarationBlock(this._declarationBlockConfig)
+      .export()
+      .asKind('type')
+      .withName(this.convertName(node))
+      .withComment(node.description?.value)
+      .withBlock((node.fields || []).join('\n'));
+  }
+
+  private getInputObjectOneOfDeclarationBlock(node: InputObjectTypeDefinitionNode): DeclarationBlock {
+    const declarationKind = (node.fields?.length || 0) === 1 ? 'type' : 'type';
+    return new DeclarationBlock(this._declarationBlockConfig)
+      .export()
+      .asKind(declarationKind)
+      .withName(this.convertName(node))
+      .withComment(node.description?.value)
+      .withContent(`\n` + (node.fields || []).join('\n  |'));
+  }
+
+  private isValidVisit(ancestors: any): boolean {
+    const currentVisitContext = this.getVisitorKindContextFromAncestors(ancestors);
+    const isVisitingInputType = currentVisitContext.includes(Kind.INPUT_OBJECT_TYPE_DEFINITION);
+    const isVisitingEnumType = currentVisitContext.includes(Kind.ENUM_TYPE_DEFINITION);
+
+    return isVisitingInputType || isVisitingEnumType;
+  }


With utility functions that can be shared between typescript-operations and base-types-visitor like these, I wonder if we should abstract them into visitor-plugin-common now or in a following PR? 🤔

Having them in visitor-plugin-common helps ensure they'd behave the same all the time. I've done the same for Enum utilities here : https://github.com/dotansimha/graphql-code-generator/pull/10525/files#r2585220345

Sure, I'll move them to visitor-plugin-common!

Maybe after I fix all the bugs that I discover while running over the yelp codebase?
I am working on a quite tricky bug now with enum not being rendered from a fragment in a separate document.

Sure! No rush.
I also put a FIXME or TODO on these utility functions in my PRs to refactor later

eddeee888 · 2025-12-03T14:16:33Z

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

+    const typeInfo = new TypeInfo(schema);
+    visit(
+      documentNode,
+      visitWithTypeInfo(typeInfo, {


Huh, this is my first time learning about this. Could you help me with the TLDR; of TypeInfo and how it helps us here?

I am no expert on this as well. I relied on claude AI for this piece of code.
Having said that, here is what I think this code is doing:

It looks like an operation’s AST doesn’t include field types - only names.

TypeInfo is a stateful helper that tracks typing context while you walk the AST (https://www.graphql-js.org/api-v16/utilities/#typeinfo).

visitWithTypeInfo wires that context into a visitor. I have not found a working docs link on visitWithTypeInfo, I guess our best bet is the docs in the source code which is located at the same place as TypeInfo: https://github.com/graphql/graphql-js/blob/next/src/utilities/TypeInfo.ts.

…ut-types-into-target-file

eddeee888 · 2025-12-21T10:20:24Z

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

+      .withBlock((node.fields || []).join('\n')).string;
+  }
+
+  InputValueDefinition(


In typescript plugin, the logic to generate a Input Value string is spread across multiple methods:

InputObjectTypeDefinition

NamedType

ListType

NonNull

And a couple of private methods

That was very confusing to both maintainers and contributors, and results in as any as string in many places.

This version brings all logic into one place method.
I'll see if this could be re-used between both plugins

Excellent!
I like that you replace all these functions with just one!

However, I am bit concerned about IIFE that you do here. Because this code runs in a hot loop, there is a chance for this code to cause performance issue. The chance is low (it should be optimized by JIT), but still...

Is there a way to write this code without IIFE? In the worst case - we can split it into 3 functions (it is still better than the original version).

Good call! I've replaced the IIFEs with pure functions in 9cea149

Great! Yes, this look safer.
Thanks!

* input types, input/output enums are generated to the target files * cleanup * better code * more tests * cleanup * better code * better tests * bugfixing for inner types and outer enums * bugfixing after merge * cleanup * cleanup * fix snapshots * fix type errors in presets/client * updated tests/examples * Add standalone.input.spec.ts and update standalone tests to TDD * Update operations/visitor.ts to satisfy tests * Revert Client Preset changes * Add oneOf directive for GraphQL 15 * Update changeset * Refactor IIFE --------- Co-authored-by: Igor Kusakov <[email protected]> Co-authored-by: Eddy Nguyen <[email protected]>

input types, input/output enums are generated to the target files

7f99817

ikusakov2 changed the base branch from master to master-next December 2, 2025 01:47

ikusakov2 commented Dec 2, 2025

View reviewed changes

ikusakov2 changed the title ~~Generate Input types, Output enums into target file~~ Generate input types and output enums into target file Dec 2, 2025

cleanup

aa5e43a

ikusakov2 commented Dec 2, 2025

View reviewed changes

ikusakov added 5 commits December 2, 2025 10:38

better code

8e15362

more tests

1ac8a85

cleanup

9480528

better code

477c9e8

better tests

7094891

eddeee888 reviewed Dec 3, 2025

View reviewed changes

eddeee888 mentioned this pull request Dec 3, 2025

[typescript-operations/client-preset] Next major version #10496

Draft

eddeee888 reviewed Dec 3, 2025

View reviewed changes

ikusakov added 3 commits December 4, 2025 12:21

bugfixing for inner types and outer enums

d4177d8

Merge remote-tracking branch 'upstream/master-next' into generate-inp…

334d163

…ut-types-into-target-file

bugfixing after merge

d1fc7cc

eddeee888 mentioned this pull request Dec 7, 2025

[typescript-operations] Add importSchemaTypesFrom to import user-defined+used input/enum types externally #10534

Merged

3 tasks

ikusakov added 6 commits December 11, 2025 15:47

cleanup

3954c3c

Merge remote-tracking branch 'upstream/master-next' into generate-inp…

10b8257

…ut-types-into-target-file

cleanup

34a34db

fix snapshots

aa91f11

fix type errors in presets/client

dbee7db

updated tests/examples

db05491

eddeee888 force-pushed the generate-input-types-into-target-file branch 2 times, most recently from 0b36e76 to eca9224 Compare December 21, 2025 08:32

eddeee888 force-pushed the generate-input-types-into-target-file branch from eca9224 to 83ee745 Compare December 21, 2025 08:39

Add standalone.input.spec.ts and update standalone tests to TDD

e89b353

eddeee888 force-pushed the generate-input-types-into-target-file branch from 83ee745 to e89b353 Compare December 21, 2025 09:51

Update operations/visitor.ts to satisfy tests

3ab45f6

eddeee888 force-pushed the generate-input-types-into-target-file branch 3 times, most recently from ac4d132 to e51f65e Compare December 21, 2025 10:09

Revert Client Preset changes

58a9ac9

eddeee888 force-pushed the generate-input-types-into-target-file branch from e51f65e to 58a9ac9 Compare December 21, 2025 10:11

eddeee888 reviewed Dec 21, 2025

View reviewed changes

eddeee888 added 3 commits December 21, 2025 22:58

Add oneOf directive for GraphQL 15

26b09e6

Update changeset

0adcbed

Refactor IIFE

9cea149

eddeee888 merged commit ba65af5 into dotansimha:master-next Dec 24, 2025
16 checks passed

Generate input types and output enums into target file #10527

Generate input types and output enums into target file #10527

Conversation

ikusakov2 commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

How Has This Been Tested?

Uh oh!

changeset-bot bot commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ikusakov2 Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eddeee888 Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eddeee888 commented Dec 3, 2025

Uh oh!

eddeee888 Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ikusakov2 Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ikusakov2 Dec 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ikusakov2 commented Dec 2, 2025 •

edited

Loading

changeset-bot bot commented Dec 2, 2025 •

edited

Loading

ikusakov2 Dec 2, 2025 •

edited

Loading

eddeee888 Dec 3, 2025 •

edited

Loading

eddeee888 Dec 3, 2025 •

edited

Loading

ikusakov2 Dec 4, 2025 •

edited

Loading

ikusakov2 Dec 23, 2025 •

edited

Loading