[typescript-operations] Add missing enum tests & fix enum generating logic for standalone approach#10525
Merged
eddeee888 merged 8 commits intomaster-nextfrom Dec 3, 2025
Merged
[typescript-operations] Add missing enum tests & fix enum generating logic for standalone approach#10525eddeee888 merged 8 commits intomaster-nextfrom
eddeee888 merged 8 commits intomaster-nextfrom
Conversation
🦋 Changeset detectedLatest commit: 24c5851 The changes in this PR will be included in the next version bump. This PR includes changesets to release 9 packages
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 |
This was referenced Nov 30, 2025
eddeee888
commented
Dec 3, 2025
Comment on lines
-814
to
-865
| protected _buildTypeImport(identifier: string, source: string, asDefault = false): string { | ||
| const { useTypeImports } = this.config; | ||
| if (asDefault) { | ||
| if (useTypeImports) { | ||
| return `import type { default as ${identifier} } from '${source}';`; | ||
| } | ||
| return `import ${identifier} from '${source}';`; | ||
| } | ||
| return `import${useTypeImports ? ' type' : ''} { ${identifier} } from '${source}';`; | ||
| } | ||
|
|
||
| protected handleEnumValueMapper( | ||
| typeIdentifier: string, | ||
| importIdentifier: string | null, | ||
| sourceIdentifier: string | null, | ||
| sourceFile: string | null | ||
| ): string[] { | ||
| if (importIdentifier !== sourceIdentifier) { | ||
| // use namespace import to dereference nested enum | ||
| // { enumValues: { MyEnum: './my-file#NS.NestedEnum' } } | ||
| return [ | ||
| this._buildTypeImport(importIdentifier || sourceIdentifier, sourceFile), | ||
| `import ${typeIdentifier} = ${sourceIdentifier};`, | ||
| ]; | ||
| } | ||
| if (sourceIdentifier !== typeIdentifier) { | ||
| return [this._buildTypeImport(`${sourceIdentifier} as ${typeIdentifier}`, sourceFile)]; | ||
| } | ||
| return [this._buildTypeImport(importIdentifier || sourceIdentifier, sourceFile)]; | ||
| } | ||
|
|
||
| public getEnumsImports(): string[] { | ||
| return Object.keys(this.config.enumValues) | ||
| .flatMap(enumName => { | ||
| const mappedValue = this.config.enumValues[enumName]; | ||
|
|
||
| if (mappedValue.sourceFile) { | ||
| if (mappedValue.isDefault) { | ||
| return [this._buildTypeImport(mappedValue.typeIdentifier, mappedValue.sourceFile, true)]; | ||
| } | ||
|
|
||
| return this.handleEnumValueMapper( | ||
| mappedValue.typeIdentifier, | ||
| mappedValue.importIdentifier, | ||
| mappedValue.sourceIdentifier, | ||
| mappedValue.sourceFile | ||
| ); | ||
| } | ||
|
|
||
| return []; | ||
| }) | ||
| .filter(Boolean); |
Collaborator
Author
There was a problem hiding this comment.
These utility functions are now abstracted to be shared between base-types-visitor and typescript-operations
eddeee888
commented
Dec 3, 2025
Collaborator
Author
There was a problem hiding this comment.
This file is huge! And it is all the reasonable tests I could find related to how an enum is generated
eddeee888
commented
Dec 3, 2025
Comment on lines
-167
to
-175
| describe('TypeScript Operations Plugin - Enum', () => { | ||
| it.todo('does not generate unused enum in variables and result'); | ||
| it.todo('handles native numeric enum correctly'); | ||
| it.todo('handles const enum correctly'); | ||
| it.todo('handles native const enum correctly'); | ||
| it.todo('handles native enum correctly'); | ||
| it.todo('handles EnumValues correctly'); | ||
| // Bring over tests from https://github.com/dotansimha/graphql-code-generator/blob/accdab69106605241933e9d66d64dc7077656f30/packages/plugins/typescript/typescript/tests/typescript.spec.ts | ||
| }); |
Collaborator
Author
There was a problem hiding this comment.
These tests are moved to packages/plugins/typescript/operations/tests/ts-documents.standalone.enum.spec.ts since there are so many!
eddeee888
changed the title
eddeee888
added a commit
that referenced
this pull request
Jan 6, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Jan 20, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Feb 25, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 3, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
ikusakov2
pushed a commit
to ikusakov2/graphql-code-generator
that referenced
this pull request
Mar 4, 2026
…logic for standalone approach (dotansimha#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 8, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 8, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 8, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 12, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Mar 19, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
eddeee888
added a commit
that referenced
this pull request
Apr 13, 2026
…logic for standalone approach (#10525) * Add tests for enum * Baselin tests * Ensure correctness of enumValues import * Split enum tests * Abstract import printing functions * Add missing enum tests * Format to minimise conflict * Add changeset
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This is the continuation of #10508. We merged that PR early to unblock the enum-in-input scenario
Related #10496
Type of change
How Has This Been Tested?