Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

export type to support isolatedModules #8585

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+14 −9
Open

export type to support isolatedModules #8585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e7af08b
export type to support isolatedModules
cungminh2710 Nov 8, 2022
365b272
Merge branch 'master' into patch-1
cungminh2710 Jan 18, 2023
019f74b
Merge branch 'master' into patch-1
cungminh2710 Jun 7, 2023
c5c2c78
Merge branch 'master' into patch-1
cungminh2710 Oct 31, 2023
f06d6fb
Update visitor.ts
cungminh2710 Nov 19, 2023
57440e4
Merge branch 'master' into patch-1
cungminh2710 Nov 19, 2023
9f7959f
add changelog
cungminh2710 Nov 19, 2023
960c6e4
add tests
cungminh2710 Nov 19, 2023
53a60ef
Merge branch 'master' into patch-1
cungminh2710 Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/green-pillows-travel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphql-codegen/typescript': minor
---

export enums type to support isolatedModules
2 changes: 1 addition & 1 deletion packages/plugins/typescript/resolvers/tests/ts-resolvers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
);

expect(mergedOutput).toContain(`import { MyEnum } from './enums'`);
expect(mergedOutput).toContain(`export { MyEnum }`);
expect(mergedOutput).toContain(`export type { MyEnum }`);
expect(mergedOutput).toContain(ENUM_RESOLVERS_SIGNATURE);
expect(mergedOutput).toContain('EnumResolverSignature');
expect(mergedOutput).toContain(
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/typescript/typescript/src/visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export class TsVisitor<

// In case of mapped external enum string
if (this.config.enumValues[enumName]?.sourceFile) {
return `export { ${this.config.enumValues[enumName].typeIdentifier} };\n`;
return `export type { ${this.config.enumValues[enumName].typeIdentifier} };\n`;
}

const getValueFromConfig = (enumValue: string | number) => {
Expand Down
14 changes: 7 additions & 7 deletions packages/plugins/typescript/typescript/tests/typescript.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,7 +3623,7 @@ describe('TypeScript', () => {
)) as Types.ComplexPluginOutput;

expect(result.content).not.toContain(`export enum MyEnum`);
expect(result.content).toContain(`export { MyEnum }`);
expect(result.content).toContain(`export type { MyEnum };`);
expect(result.prepend).toContain(`import MyEnum = NS.ETest;`);
expect(result.prepend).toContain(`import { NS } from './my-file';`);

Expand All @@ -3640,7 +3640,7 @@ describe('TypeScript', () => {
)) as Types.ComplexPluginOutput;

expect(result.content).not.toContain(`export enum MyEnum`);
expect(result.content).toContain(`export { MyEnum };`);
expect(result.content).toContain(`export type { MyEnum };`);
expect(result.prepend).toContain(`import MyEnum = NS.MyEnum;`);
expect(result.prepend).toContain(`import { NS } from './my-file';`);

Expand All @@ -3658,7 +3658,7 @@ describe('TypeScript', () => {

expect(result.content).not.toContain(`export enum MyEnum`);
expect(result.prepend).toContain(`import { MyCustomEnum as MyEnum } from './my-file';`);
expect(result.content).toContain(`export { MyEnum };`);
expect(result.content).toContain(`export type { MyEnum };`);

validateTs(result);
});
Expand Down Expand Up @@ -3689,8 +3689,8 @@ describe('TypeScript', () => {
{ outputFile: '' }
)) as Types.ComplexPluginOutput;

expect(result.content).toContain(`export { MyEnum };`);
expect(result.content).toContain(`export { MyEnum2 };`);
expect(result.content).toContain(`export type { MyEnum };`);
expect(result.content).toContain(`export type { MyEnum2 };`);
expect(result.prepend).toContain(`import { MyEnum2X as MyEnum2 } from './my-file';`);

validateTs(result);
Expand All @@ -3707,8 +3707,8 @@ describe('TypeScript', () => {

expect(result.prepend).toContain(`import { MyEnum } from './my-file';`);
expect(result.prepend).toContain(`import { MyEnum2 } from './my-file';`);
expect(result.content).toContain(`export { MyEnum };`);
expect(result.content).toContain(`export { MyEnum2 };`);
expect(result.content).toContain(`export type { MyEnum };`);
expect(result.content).toContain(`export type { MyEnum2 };`);

validateTs(result);
});
Expand Down