diff --git a/packages/typescript/src/api/async/api.ts b/packages/typescript/src/api/async/api.ts index ef6d7fb7ef10b..16eaa43d6d6bb 100644 --- a/packages/typescript/src/api/async/api.ts +++ b/packages/typescript/src/api/async/api.ts @@ -3,7 +3,9 @@ import { CompletionItemKind } from "#enums/completionItemKind"; import { DiagnosticCategory } from "#enums/diagnosticCategory"; import { ElementFlags } from "#enums/elementFlags"; import { EmitOnly } from "#enums/emitOnly"; +import { JsxEmit } from "#enums/jsxEmit"; import { ModuleKind } from "#enums/moduleKind"; +import { ModuleResolutionKind } from "#enums/moduleResolutionKind"; import { NewLineKind } from "#enums/newLineKind"; import { NodeBuilderFlags } from "#enums/nodeBuilderFlags"; import { ObjectFlags } from "#enums/objectFlags"; @@ -136,7 +138,7 @@ import type { export { formatDiagnostics, formatDiagnosticsWithColorAndContext } from "../diagnosticFormatter.ts"; export { documentURIToFileName, fileNameToDocumentURI } from "../path.ts"; -export { CheckFlags, CompletionItemKind, DiagnosticCategory, ElementFlags, EmitOnly, ModifierFlags, ModuleKind, NodeBuilderFlags, ObjectFlags, SignatureFlags, SignatureKind, SymbolFlags, TypeFlags, TypeFormatFlags, TypePredicateKind }; +export { CheckFlags, CompletionItemKind, DiagnosticCategory, ElementFlags, EmitOnly, JsxEmit, ModifierFlags, ModuleKind, ModuleResolutionKind, NodeBuilderFlags, ObjectFlags, SignatureFlags, SignatureKind, SymbolFlags, TypeFlags, TypeFormatFlags, TypePredicateKind }; export type { APIImportAdderAction as ImportAdderAction, APIOptions, diff --git a/packages/typescript/src/api/proto.generated.ts b/packages/typescript/src/api/proto.generated.ts index 6528b59b0f3f9..5c6ab9c905ca4 100644 --- a/packages/typescript/src/api/proto.generated.ts +++ b/packages/typescript/src/api/proto.generated.ts @@ -1,11 +1,18 @@ // Code generated by gen-proto; DO NOT EDIT. -import type { JsxEmit } from "#enums/jsxEmit"; -import type { ModuleDetectionKind } from "#enums/moduleDetectionKind"; -import type { ModuleKind } from "#enums/moduleKind"; -import type { ModuleResolutionKind } from "#enums/moduleResolutionKind"; -import type { NewLineKind } from "#enums/newLineKind"; -import type { ScriptTarget } from "#enums/scriptTarget"; +import { JsxEmit } from "#enums/jsxEmit"; +import { ModuleDetectionKind } from "#enums/moduleDetectionKind"; +import { ModuleKind } from "#enums/moduleKind"; +import { ModuleResolutionKind } from "#enums/moduleResolutionKind"; +import { NewLineKind } from "#enums/newLineKind"; +import { ScriptTarget } from "#enums/scriptTarget"; + +export { JsxEmit } from "#enums/jsxEmit"; +export { ModuleDetectionKind } from "#enums/moduleDetectionKind"; +export { ModuleKind } from "#enums/moduleKind"; +export { ModuleResolutionKind } from "#enums/moduleResolutionKind"; +export { NewLineKind } from "#enums/newLineKind"; +export { ScriptTarget } from "#enums/scriptTarget"; export type APIMethod = { params: TParams; result: TResult; }; diff --git a/packages/typescript/src/api/sync/api.ts b/packages/typescript/src/api/sync/api.ts index b92a3fa26fb72..aab90293bddd9 100644 --- a/packages/typescript/src/api/sync/api.ts +++ b/packages/typescript/src/api/sync/api.ts @@ -20,7 +20,9 @@ import { CompletionItemKind } from "#enums/completionItemKind"; import { DiagnosticCategory } from "#enums/diagnosticCategory"; import { ElementFlags } from "#enums/elementFlags"; import { EmitOnly } from "#enums/emitOnly"; +import { JsxEmit } from "#enums/jsxEmit"; import { ModuleKind } from "#enums/moduleKind"; +import { ModuleResolutionKind } from "#enums/moduleResolutionKind"; import { NewLineKind } from "#enums/newLineKind"; import { NodeBuilderFlags } from "#enums/nodeBuilderFlags"; import { ObjectFlags } from "#enums/objectFlags"; @@ -153,7 +155,7 @@ import type { export { formatDiagnostics, formatDiagnosticsWithColorAndContext } from "../diagnosticFormatter.ts"; export { documentURIToFileName, fileNameToDocumentURI } from "../path.ts"; -export { CheckFlags, CompletionItemKind, DiagnosticCategory, ElementFlags, EmitOnly, ModifierFlags, ModuleKind, NodeBuilderFlags, ObjectFlags, SignatureFlags, SignatureKind, SymbolFlags, TypeFlags, TypeFormatFlags, TypePredicateKind }; +export { CheckFlags, CompletionItemKind, DiagnosticCategory, ElementFlags, EmitOnly, JsxEmit, ModifierFlags, ModuleKind, ModuleResolutionKind, NodeBuilderFlags, ObjectFlags, SignatureFlags, SignatureKind, SymbolFlags, TypeFlags, TypeFormatFlags, TypePredicateKind }; export type { APIImportAdderAction as ImportAdderAction, APIOptions, diff --git a/tools/gen-proto/main.go b/tools/gen-proto/main.go index 2ae7eaebe1656..ce65bc39772fb 100644 --- a/tools/gen-proto/main.go +++ b/tools/gen-proto/main.go @@ -655,7 +655,11 @@ func (r *typeRenderer) importDeclarations() string { for _, path := range paths { names := r.imports[path] sort.Strings(names) - fmt.Fprintf(&out, "import type { %s } from %q;\n", strings.Join(names, ", "), path) + fmt.Fprintf(&out, "import { %s } from %q;\n", strings.Join(names, ", "), path) + } + out.WriteString("\n") + for _, path := range paths { + fmt.Fprintf(&out, "export { %s } from %q;\n", strings.Join(r.imports[path], ", "), path) } return out.String() } diff --git a/tools/gen-proto/main_test.go b/tools/gen-proto/main_test.go index 41990e0f11ea8..12e4876ace63f 100644 --- a/tools/gen-proto/main_test.go +++ b/tools/gen-proto/main_test.go @@ -34,12 +34,6 @@ func TestGenerate(t *testing.T) { `openProjects?: readonly DocumentIdentifier[];`, `snapshot: number;`, `file: DocumentIdentifier;`, - `import type { JsxEmit } from "#enums/jsxEmit";`, - `import type { ModuleDetectionKind } from "#enums/moduleDetectionKind";`, - `import type { ModuleKind } from "#enums/moduleKind";`, - `import type { ModuleResolutionKind } from "#enums/moduleResolutionKind";`, - `import type { NewLineKind } from "#enums/newLineKind";`, - `import type { ScriptTarget } from "#enums/scriptTarget";`, `jsx?: JsxEmit;`, `module?: ModuleKind;`, `moduleResolution?: ModuleResolutionKind;`,