From dbc81497f3de94e90e940e1f5a7ae0863f44b254 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 19 Oct 2026 15:22:46 -0700 Subject: [PATCH 1/4] [api] Remove package.json "imports" --- Herebyfile.mjs | 2 +- packages/typescript/README.md | 6 +++ packages/typescript/lib/tsc.js | 2 +- packages/typescript/package.json | 16 +------- packages/typescript/scripts/copyEnums.mjs | 3 ++ packages/typescript/src/api/async/api.ts | 40 +++++++++---------- packages/typescript/src/api/async/client.ts | 6 +-- packages/typescript/src/api/async/types.ts | 10 ++--- .../src/api/compilerOptions.generated.ts | 24 +++++------ packages/typescript/src/api/fs.ts | 2 +- packages/typescript/src/api/options.ts | 2 +- packages/typescript/src/api/path.ts | 4 +- .../typescript/src/api/proto.generated.ts | 36 ++++++++--------- packages/typescript/src/api/proto.ts | 2 +- packages/typescript/src/api/sync/api.ts | 40 +++++++++---------- packages/typescript/src/api/sync/types.ts | 10 ++--- packages/typescript/src/ast/ast.generated.ts | 8 ++-- packages/typescript/src/ast/ast.ts | 16 ++++---- packages/typescript/src/ast/astnav.ts | 4 +- packages/typescript/src/ast/clone.ts | 2 +- .../typescript/src/ast/factory.generated.ts | 6 +-- packages/typescript/src/ast/index.ts | 30 +++++++------- packages/typescript/src/ast/is.generated.ts | 2 +- packages/typescript/src/ast/is.ts | 10 ++--- packages/typescript/src/ast/modifiers.ts | 4 +- packages/typescript/src/ast/scanner.ts | 14 +++---- packages/typescript/src/ast/spanMap.ts | 6 +-- packages/typescript/src/ast/utils.ts | 12 +++--- .../typescript/src/ast/visitor.generated.ts | 2 +- packages/typescript/src/ast/visitor.ts | 2 +- ...nsitivity.enum.ts => caseSensitivity.d.ts} | 2 +- ...{caseSensitivity.ts => caseSensitivity.js} | 2 +- ...acterCodes.enum.ts => characterCodes.d.ts} | 2 +- .../{characterCodes.ts => characterCodes.js} | 2 +- .../{checkFlags.enum.ts => checkFlags.d.ts} | 2 +- .../enums/{checkFlags.ts => checkFlags.js} | 2 +- .../src/enums/commentDirectiveType.d.ts | 4 ++ .../src/enums/commentDirectiveType.enum.ts | 4 -- ...rectiveType.ts => commentDirectiveType.js} | 2 +- ...emKind.enum.ts => completionItemKind.d.ts} | 2 +- ...etionItemKind.ts => completionItemKind.js} | 2 +- ...tegory.enum.ts => diagnosticCategory.d.ts} | 2 +- ...osticCategory.ts => diagnosticCategory.js} | 2 +- ...enum.ts => diagnosticDirectivePolicy.d.ts} | 2 +- ...Policy.ts => diagnosticDirectivePolicy.js} | 2 +- ...elementFlags.enum.ts => elementFlags.d.ts} | 2 +- .../{elementFlags.ts => elementFlags.js} | 2 +- .../enums/{emitOnly.enum.ts => emitOnly.d.ts} | 2 +- .../src/enums/{emitOnly.ts => emitOnly.js} | 2 +- .../{indexKind.enum.ts => indexKind.d.ts} | 2 +- .../src/enums/{indexKind.ts => indexKind.js} | 2 +- ...olName.enum.ts => internalSymbolName.d.ts} | 2 +- ...nalSymbolName.ts => internalSymbolName.js} | 2 +- ...ionKind.enum.ts => jsDeclarationKind.d.ts} | 2 +- ...eclarationKind.ts => jsDeclarationKind.js} | 2 +- .../enums/{jsxEmit.enum.ts => jsxEmit.d.ts} | 2 +- .../src/enums/{jsxEmit.ts => jsxEmit.js} | 2 +- .../typescript/src/enums/languageVariant.d.ts | 4 ++ .../src/enums/languageVariant.enum.ts | 4 -- ...{languageVariant.ts => languageVariant.js} | 2 +- ...difierFlags.enum.ts => modifierFlags.d.ts} | 2 +- .../{modifierFlags.ts => modifierFlags.js} | 2 +- ...nKind.enum.ts => moduleDetectionKind.d.ts} | 2 +- ...etectionKind.ts => moduleDetectionKind.js} | 2 +- .../{moduleKind.enum.ts => moduleKind.d.ts} | 2 +- .../enums/{moduleKind.ts => moduleKind.js} | 2 +- ...Kind.enum.ts => moduleResolutionKind.d.ts} | 2 +- ...olutionKind.ts => moduleResolutionKind.js} | 2 +- .../{newLineKind.enum.ts => newLineKind.d.ts} | 2 +- .../enums/{newLineKind.ts => newLineKind.js} | 2 +- ...derFlags.enum.ts => nodeBuilderFlags.d.ts} | 2 +- ...odeBuilderFlags.ts => nodeBuilderFlags.js} | 2 +- .../{nodeFlags.enum.ts => nodeFlags.d.ts} | 2 +- .../src/enums/{nodeFlags.ts => nodeFlags.js} | 2 +- .../{objectFlags.enum.ts => objectFlags.d.ts} | 2 +- .../enums/{objectFlags.ts => objectFlags.js} | 2 +- ...inds.enum.ts => outerExpressionKinds.d.ts} | 2 +- ...essionKinds.ts => outerExpressionKinds.js} | 2 +- ...gs.enum.ts => regularExpressionFlags.d.ts} | 2 +- ...sionFlags.ts => regularExpressionFlags.js} | 2 +- .../{scriptKind.enum.ts => scriptKind.d.ts} | 2 +- .../enums/{scriptKind.ts => scriptKind.js} | 2 +- ...scriptTarget.enum.ts => scriptTarget.d.ts} | 2 +- .../{scriptTarget.ts => scriptTarget.js} | 2 +- ...atureFlags.enum.ts => signatureFlags.d.ts} | 2 +- .../{signatureFlags.ts => signatureFlags.js} | 2 +- ...gnatureKind.enum.ts => signatureKind.d.ts} | 2 +- .../{signatureKind.ts => signatureKind.js} | 2 +- ...MapFeature.enum.ts => spanMapFeature.d.ts} | 2 +- .../{spanMapFeature.ts => spanMapFeature.js} | 2 +- ...pFidelity.enum.ts => spanMapFidelity.d.ts} | 2 +- ...{spanMapFidelity.ts => spanMapFidelity.js} | 2 +- .../{spanMapKind.enum.ts => spanMapKind.d.ts} | 2 +- .../enums/{spanMapKind.ts => spanMapKind.js} | 2 +- .../{symbolFlags.enum.ts => symbolFlags.d.ts} | 2 +- .../enums/{symbolFlags.ts => symbolFlags.js} | 2 +- ...OwnerKind.enum.ts => symbolOwnerKind.d.ts} | 2 +- ...{symbolOwnerKind.ts => symbolOwnerKind.js} | 2 +- .../{syntaxKind.enum.ts => syntaxKind.d.ts} | 2 +- .../enums/{syntaxKind.ts => syntaxKind.js} | 2 +- .../{tokenFlags.enum.ts => tokenFlags.d.ts} | 2 +- .../enums/{tokenFlags.ts => tokenFlags.js} | 2 +- .../{typeFlags.enum.ts => typeFlags.d.ts} | 2 +- .../src/enums/{typeFlags.ts => typeFlags.js} | 2 +- ...rmatFlags.enum.ts => typeFormatFlags.d.ts} | 2 +- ...{typeFormatFlags.ts => typeFormatFlags.js} | 2 +- ...ateKind.enum.ts => typePredicateKind.d.ts} | 2 +- ...ePredicateKind.ts => typePredicateKind.js} | 2 +- packages/typescript/test/enums.test.ts | 29 ++++++++++++++ packages/typescript/test/proto.test.ts | 2 +- packages/typescript/test/version.test.ts | 2 +- tools/gen-proto/main.go | 18 ++++----- tools/gen-proto/main_test.go | 2 +- tools/scripts/gen/generatedFile.test.mts | 4 +- tools/scripts/tsc/generate-enums.ts | 20 +++------- tools/scripts/tsc/generate-options.ts | 4 +- tools/scripts/tsc/generate-ts-ast.ts | 18 ++++----- tools/scripts/tsc/options.test.ts | 4 +- 118 files changed, 303 insertions(+), 287 deletions(-) create mode 100644 packages/typescript/scripts/copyEnums.mjs rename packages/typescript/src/enums/{caseSensitivity.enum.ts => caseSensitivity.d.ts} (76%) rename packages/typescript/src/enums/{caseSensitivity.ts => caseSensitivity.js} (89%) rename packages/typescript/src/enums/{characterCodes.enum.ts => characterCodes.d.ts} (93%) rename packages/typescript/src/enums/{characterCodes.ts => characterCodes.js} (97%) rename packages/typescript/src/enums/{checkFlags.enum.ts => checkFlags.d.ts} (94%) rename packages/typescript/src/enums/{checkFlags.ts => checkFlags.js} (97%) create mode 100644 packages/typescript/src/enums/commentDirectiveType.d.ts delete mode 100644 packages/typescript/src/enums/commentDirectiveType.enum.ts rename packages/typescript/src/enums/{commentDirectiveType.ts => commentDirectiveType.js} (85%) rename packages/typescript/src/enums/{completionItemKind.enum.ts => completionItemKind.d.ts} (88%) rename packages/typescript/src/enums/{completionItemKind.ts => completionItemKind.js} (96%) rename packages/typescript/src/enums/{diagnosticCategory.enum.ts => diagnosticCategory.d.ts} (79%) rename packages/typescript/src/enums/{diagnosticCategory.ts => diagnosticCategory.js} (91%) rename packages/typescript/src/enums/{diagnosticDirectivePolicy.enum.ts => diagnosticDirectivePolicy.d.ts} (71%) rename packages/typescript/src/enums/{diagnosticDirectivePolicy.ts => diagnosticDirectivePolicy.js} (88%) rename packages/typescript/src/enums/{elementFlags.enum.ts => elementFlags.d.ts} (88%) rename packages/typescript/src/enums/{elementFlags.ts => elementFlags.js} (94%) rename packages/typescript/src/enums/{emitOnly.enum.ts => emitOnly.d.ts} (80%) rename packages/typescript/src/enums/{emitOnly.ts => emitOnly.js} (90%) rename packages/typescript/src/enums/{indexKind.enum.ts => indexKind.d.ts} (78%) rename packages/typescript/src/enums/{indexKind.ts => indexKind.js} (89%) rename packages/typescript/src/enums/{internalSymbolName.enum.ts => internalSymbolName.d.ts} (91%) rename packages/typescript/src/enums/{internalSymbolName.ts => internalSymbolName.js} (95%) rename packages/typescript/src/enums/{jsDeclarationKind.enum.ts => jsDeclarationKind.d.ts} (84%) rename packages/typescript/src/enums/{jsDeclarationKind.ts => jsDeclarationKind.js} (94%) rename packages/typescript/src/enums/{jsxEmit.enum.ts => jsxEmit.d.ts} (84%) rename packages/typescript/src/enums/{jsxEmit.ts => jsxEmit.js} (92%) create mode 100644 packages/typescript/src/enums/languageVariant.d.ts delete mode 100644 packages/typescript/src/enums/languageVariant.enum.ts rename packages/typescript/src/enums/{languageVariant.ts => languageVariant.js} (84%) rename packages/typescript/src/enums/{modifierFlags.enum.ts => modifierFlags.d.ts} (95%) rename packages/typescript/src/enums/{modifierFlags.ts => modifierFlags.js} (97%) rename packages/typescript/src/enums/{moduleDetectionKind.enum.ts => moduleDetectionKind.d.ts} (76%) rename packages/typescript/src/enums/{moduleDetectionKind.ts => moduleDetectionKind.js} (91%) rename packages/typescript/src/enums/{moduleKind.enum.ts => moduleKind.d.ts} (86%) rename packages/typescript/src/enums/{moduleKind.ts => moduleKind.js} (95%) rename packages/typescript/src/enums/{moduleResolutionKind.enum.ts => moduleResolutionKind.d.ts} (80%) rename packages/typescript/src/enums/{moduleResolutionKind.ts => moduleResolutionKind.js} (93%) rename packages/typescript/src/enums/{newLineKind.enum.ts => newLineKind.d.ts} (78%) rename packages/typescript/src/enums/{newLineKind.ts => newLineKind.js} (89%) rename packages/typescript/src/enums/{nodeBuilderFlags.enum.ts => nodeBuilderFlags.d.ts} (95%) rename packages/typescript/src/enums/{nodeBuilderFlags.ts => nodeBuilderFlags.js} (98%) rename packages/typescript/src/enums/{nodeFlags.enum.ts => nodeFlags.d.ts} (95%) rename packages/typescript/src/enums/{nodeFlags.ts => nodeFlags.js} (97%) rename packages/typescript/src/enums/{objectFlags.enum.ts => objectFlags.d.ts} (95%) rename packages/typescript/src/enums/{objectFlags.ts => objectFlags.js} (98%) rename packages/typescript/src/enums/{outerExpressionKinds.enum.ts => outerExpressionKinds.d.ts} (92%) rename packages/typescript/src/enums/{outerExpressionKinds.ts => outerExpressionKinds.js} (96%) rename packages/typescript/src/enums/{regularExpressionFlags.enum.ts => regularExpressionFlags.d.ts} (81%) rename packages/typescript/src/enums/{regularExpressionFlags.ts => regularExpressionFlags.js} (94%) rename packages/typescript/src/enums/{scriptKind.enum.ts => scriptKind.d.ts} (81%) rename packages/typescript/src/enums/{scriptKind.ts => scriptKind.js} (92%) rename packages/typescript/src/enums/{scriptTarget.enum.ts => scriptTarget.d.ts} (86%) rename packages/typescript/src/enums/{scriptTarget.ts => scriptTarget.js} (95%) rename packages/typescript/src/enums/{signatureFlags.enum.ts => signatureFlags.d.ts} (92%) rename packages/typescript/src/enums/{signatureFlags.ts => signatureFlags.js} (96%) rename packages/typescript/src/enums/{signatureKind.enum.ts => signatureKind.d.ts} (77%) rename packages/typescript/src/enums/{signatureKind.ts => signatureKind.js} (88%) rename packages/typescript/src/enums/{spanMapFeature.enum.ts => spanMapFeature.d.ts} (91%) rename packages/typescript/src/enums/{spanMapFeature.ts => spanMapFeature.js} (96%) rename packages/typescript/src/enums/{spanMapFidelity.enum.ts => spanMapFidelity.d.ts} (79%) rename packages/typescript/src/enums/{spanMapFidelity.ts => spanMapFidelity.js} (91%) rename packages/typescript/src/enums/{spanMapKind.enum.ts => spanMapKind.d.ts} (79%) rename packages/typescript/src/enums/{spanMapKind.ts => spanMapKind.js} (90%) rename packages/typescript/src/enums/{symbolFlags.enum.ts => symbolFlags.d.ts} (96%) rename packages/typescript/src/enums/{symbolFlags.ts => symbolFlags.js} (98%) rename packages/typescript/src/enums/{symbolOwnerKind.enum.ts => symbolOwnerKind.d.ts} (75%) rename packages/typescript/src/enums/{symbolOwnerKind.ts => symbolOwnerKind.js} (88%) rename packages/typescript/src/enums/{syntaxKind.enum.ts => syntaxKind.d.ts} (96%) rename packages/typescript/src/enums/{syntaxKind.ts => syntaxKind.js} (98%) rename packages/typescript/src/enums/{tokenFlags.enum.ts => tokenFlags.d.ts} (95%) rename packages/typescript/src/enums/{tokenFlags.ts => tokenFlags.js} (97%) rename packages/typescript/src/enums/{typeFlags.enum.ts => typeFlags.d.ts} (97%) rename packages/typescript/src/enums/{typeFlags.ts => typeFlags.js} (98%) rename packages/typescript/src/enums/{typeFormatFlags.enum.ts => typeFormatFlags.d.ts} (95%) rename packages/typescript/src/enums/{typeFormatFlags.ts => typeFormatFlags.js} (97%) rename packages/typescript/src/enums/{typePredicateKind.enum.ts => typePredicateKind.d.ts} (79%) rename packages/typescript/src/enums/{typePredicateKind.ts => typePredicateKind.js} (91%) create mode 100644 packages/typescript/test/enums.test.ts diff --git a/Herebyfile.mjs b/Herebyfile.mjs index 2dc41919d51bb..be2c0d5541e6e 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -745,7 +745,7 @@ export const generateAPI = task({ const vendorJsonrpcDir = "packages/typescript/vendor/vscode-jsonrpc"; const vendorJsonrpcSrc = "node_modules/vscode-jsonrpc"; // Files copied verbatim from the installed vscode-jsonrpc package into the -// vendored copy. Only the runtime files needed by the `#vscode-jsonrpc/node` +// vendored copy. Only the runtime files needed by the API's vscode-jsonrpc // import (lib + typings + package.json) plus license/readme are vendored. const vendorJsonrpcFiles = ["package.json", "README.md", "License.txt", "lib", "typings"]; diff --git a/packages/typescript/README.md b/packages/typescript/README.md index c35985115a453..caec642de63fb 100644 --- a/packages/typescript/README.md +++ b/packages/typescript/README.md @@ -22,3 +22,9 @@ The native port of TypeScript is still in progress. We expect many gaps, but are seeking experimentation and feedback. If you have found differences that are not yet known, we encourage you to leave feedback on [the issue tracker](https://github.com/microsoft/TypeScript/tsc/issues). +## Development + +Enums in `src/enums` are represented as `.js` / `.d.ts` pairs. Import them using relative `.js` paths: +TypeScript resolves the enum declarations, while Node loads the JavaScript implementations without a build or enum transformation. +Most are generated from metadata and Go source; run `npx hereby generate:enums` from the repository root to regenerate those pairs. +The package build scripts copy both files into `dist/enums`, since TypeScript does not emit input declaration files. diff --git a/packages/typescript/lib/tsc.js b/packages/typescript/lib/tsc.js index eb869b715737e..506d783f70d69 100644 --- a/packages/typescript/lib/tsc.js +++ b/packages/typescript/lib/tsc.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -import getExePath from "#getExePath"; import { execFileSync } from "node:child_process"; +import getExePath from "./getExePath.js"; const exe = getExePath(); diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 25d720e3d530e..76a13d612199d 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -94,26 +94,14 @@ "default": "./dist/ast/clone.js" } }, - "imports": { - "#getExePath": "./lib/getExePath.js", - "#enums/*": { - "@typescript/source": { - "types": "./src/enums/*.enum.ts", - "default": "./src/enums/*.ts" - }, - "types": "./dist/enums/*.enum.d.ts", - "default": "./dist/enums/*.js" - }, - "#vscode-jsonrpc/node": "./vendor/vscode-jsonrpc/lib/node/main.js" - }, "scripts": { "node": "node --conditions @typescript/source", "generate": "npm run node -- scripts/generate.ts", "generate:ast": "node ../../tools/scripts/tsc/generate-ts-ast.ts", "generate:encoder": "npm run node -- ../../tools/scripts/tsc/generate-encoder.ts", "generate:sync": "npm run node -- scripts/generateSync.ts", - "build": "tsc -b", - "build:test": "tsc -b test", + "build": "tsc -b && node scripts/copyEnums.mjs", + "build:test": "tsc -b test && node scripts/copyEnums.mjs", "test:only": "npm run node -- --test './test/**/*.test.ts'", "test": "npm run test:only" }, diff --git a/packages/typescript/scripts/copyEnums.mjs b/packages/typescript/scripts/copyEnums.mjs new file mode 100644 index 0000000000000..5e7ac48047828 --- /dev/null +++ b/packages/typescript/scripts/copyEnums.mjs @@ -0,0 +1,3 @@ +import { cpSync } from "node:fs"; + +cpSync(new URL("../src/enums", import.meta.url), new URL("../dist/enums", import.meta.url), { recursive: true }); diff --git a/packages/typescript/src/api/async/api.ts b/packages/typescript/src/api/async/api.ts index 6c1eb480123e6..76c9f30b95795 100644 --- a/packages/typescript/src/api/async/api.ts +++ b/packages/typescript/src/api/async/api.ts @@ -1,23 +1,3 @@ -import { CheckFlags } from "#enums/checkFlags"; -import { CompletionItemKind } from "#enums/completionItemKind"; -import { DiagnosticCategory } from "#enums/diagnosticCategory"; -import { ElementFlags } from "#enums/elementFlags"; -import { EmitOnly } from "#enums/emitOnly"; -import { IndexKind } from "#enums/indexKind"; -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"; -import { ScriptKind } from "#enums/scriptKind"; -import { SignatureFlags } from "#enums/signatureFlags"; -import { SignatureKind } from "#enums/signatureKind"; -import { SymbolFlags } from "#enums/symbolFlags"; -import { SymbolOwnerKind } from "#enums/symbolOwnerKind"; -import { TypeFlags } from "#enums/typeFlags"; -import { TypeFormatFlags } from "#enums/typeFormatFlags"; -import { TypePredicateKind } from "#enums/typePredicateKind"; import { type __String, type CallLikeExpression, @@ -39,6 +19,26 @@ import { type TypeNode, unescapeLeadingUnderscores, } from "../../ast/index.ts"; +import { CheckFlags } from "../../enums/checkFlags.js"; +import { CompletionItemKind } from "../../enums/completionItemKind.js"; +import { DiagnosticCategory } from "../../enums/diagnosticCategory.js"; +import { ElementFlags } from "../../enums/elementFlags.js"; +import { EmitOnly } from "../../enums/emitOnly.js"; +import { IndexKind } from "../../enums/indexKind.js"; +import { JsxEmit } from "../../enums/jsxEmit.js"; +import { ModuleKind } from "../../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../../enums/newLineKind.js"; +import { NodeBuilderFlags } from "../../enums/nodeBuilderFlags.js"; +import { ObjectFlags } from "../../enums/objectFlags.js"; +import { ScriptKind } from "../../enums/scriptKind.js"; +import { SignatureFlags } from "../../enums/signatureFlags.js"; +import { SignatureKind } from "../../enums/signatureKind.js"; +import { SymbolFlags } from "../../enums/symbolFlags.js"; +import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; +import { TypeFlags } from "../../enums/typeFlags.js"; +import { TypeFormatFlags } from "../../enums/typeFormatFlags.js"; +import { TypePredicateKind } from "../../enums/typePredicateKind.js"; import { assertNever } from "../../internal/utils.ts"; import { encodeNode, diff --git a/packages/typescript/src/api/async/client.ts b/packages/typescript/src/api/async/client.ts index 9c3319a13b499..aad3f9d29d1a4 100644 --- a/packages/typescript/src/api/async/client.ts +++ b/packages/typescript/src/api/async/client.ts @@ -1,3 +1,5 @@ +import type { ChildProcess } from "node:child_process"; +import type { Socket } from "node:net"; import { createMessageConnection, type MessageConnection, @@ -6,9 +8,7 @@ import { SocketMessageWriter, StreamMessageReader, StreamMessageWriter, -} from "#vscode-jsonrpc/node"; -import type { ChildProcess } from "node:child_process"; -import type { Socket } from "node:net"; +} from "../../../vendor/vscode-jsonrpc/lib/node/main.js"; import type { RootedDirectoryPath, RootedFilePath, diff --git a/packages/typescript/src/api/async/types.ts b/packages/typescript/src/api/async/types.ts index e1c7e0c8753e9..97b189caf50bb 100644 --- a/packages/typescript/src/api/async/types.ts +++ b/packages/typescript/src/api/async/types.ts @@ -1,14 +1,14 @@ -import type { CompletionItemKind } from "#enums/completionItemKind"; -import type { ElementFlags } from "#enums/elementFlags"; -import type { ObjectFlags } from "#enums/objectFlags"; -import type { TypeFlags } from "#enums/typeFlags"; -import type { TypePredicateKind } from "#enums/typePredicateKind"; import type { IndexSignatureDeclaration, NamedTupleMember, ParameterDeclaration, } from "../../ast/ast.ts"; import type { RootedFilePath } from "../../ast/index.ts"; +import type { CompletionItemKind } from "../../enums/completionItemKind.js"; +import type { ElementFlags } from "../../enums/elementFlags.js"; +import type { ObjectFlags } from "../../enums/objectFlags.js"; +import type { TypeFlags } from "../../enums/typeFlags.js"; +import type { TypePredicateKind } from "../../enums/typePredicateKind.js"; import type { Diagnostic, RequestFileSystem, diff --git a/packages/typescript/src/api/compilerOptions.generated.ts b/packages/typescript/src/api/compilerOptions.generated.ts index c694de0043355..82cb93b1e6eb0 100644 --- a/packages/typescript/src/api/compilerOptions.generated.ts +++ b/packages/typescript/src/api/compilerOptions.generated.ts @@ -1,23 +1,23 @@ // Code generated by tools/scripts/tsc/generate-options.ts. 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 type { RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; +import type { JsxEmit } from "../enums/jsxEmit.js"; +import type { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; +import type { ModuleKind } from "../enums/moduleKind.js"; +import type { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; +import type { NewLineKind } from "../enums/newLineKind.js"; +import type { ScriptTarget } from "../enums/scriptTarget.js"; -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 { JsxEmit } from "../enums/jsxEmit.js"; +export { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; +export { ModuleKind } from "../enums/moduleKind.js"; +export { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; +export { NewLineKind } from "../enums/newLineKind.js"; +export { ScriptTarget } from "../enums/scriptTarget.js"; /** CompilerOptions contains the compiler options exposed by the API. */ export interface CompilerOptions { diff --git a/packages/typescript/src/api/fs.ts b/packages/typescript/src/api/fs.ts index ea9c51291c085..25bfe9f044309 100644 --- a/packages/typescript/src/api/fs.ts +++ b/packages/typescript/src/api/fs.ts @@ -1,5 +1,5 @@ -import getExePath from "#getExePath"; import { dirname } from "node:path"; +import getExePath from "../../lib/getExePath.js"; import type { RootedDirectoryPath, RootedFilePath, diff --git a/packages/typescript/src/api/options.ts b/packages/typescript/src/api/options.ts index 2e8954c83a802..02a52af68b622 100644 --- a/packages/typescript/src/api/options.ts +++ b/packages/typescript/src/api/options.ts @@ -2,9 +2,9 @@ * Shared utilities for the TypeScript API client. */ -import getExePath from "#getExePath"; import { existsSync } from "node:fs"; import { fileURLToPath } from "node:url"; +import getExePath from "../../lib/getExePath.js"; import type { FileSystemCallbacks } from "./fs.ts"; export interface ClientSocketOptions { diff --git a/packages/typescript/src/api/path.ts b/packages/typescript/src/api/path.ts index a93656ec38989..86fa0527e47c9 100644 --- a/packages/typescript/src/api/path.ts +++ b/packages/typescript/src/api/path.ts @@ -1,12 +1,12 @@ -import { CaseSensitivity } from "#enums/caseSensitivity"; import type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; +import { CaseSensitivity } from "../enums/caseSensitivity.js"; -export { CaseSensitivity } from "#enums/caseSensitivity"; +export { CaseSensitivity } from "../enums/caseSensitivity.js"; const CharacterCodesSlash = "/".charCodeAt(0); const CharacterCodesBackslash = "\\".charCodeAt(0); diff --git a/packages/typescript/src/api/proto.generated.ts b/packages/typescript/src/api/proto.generated.ts index 01e2fa27b12c2..2063ac4fb1945 100644 --- a/packages/typescript/src/api/proto.generated.ts +++ b/packages/typescript/src/api/proto.generated.ts @@ -1,36 +1,36 @@ // Code generated by gen-proto; DO NOT EDIT. -import { CaseSensitivity } from "#enums/caseSensitivity"; -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 { ScriptKind } from "#enums/scriptKind"; -import { ScriptTarget } from "#enums/scriptTarget"; -import { SymbolOwnerKind } from "#enums/symbolOwnerKind"; import type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; +import { CaseSensitivity } from "../enums/caseSensitivity.js"; +import { JsxEmit } from "../enums/jsxEmit.js"; +import { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; +import { ModuleKind } from "../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../enums/newLineKind.js"; +import { ScriptKind } from "../enums/scriptKind.js"; +import { ScriptTarget } from "../enums/scriptTarget.js"; +import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; import type { CompilerOptions, PluginImport, } from "./compilerOptions.generated.ts"; import type { UserPreferences } from "./userPreferences.generated.ts"; -export { CaseSensitivity } from "#enums/caseSensitivity"; -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 { ScriptKind } from "#enums/scriptKind"; -export { ScriptTarget } from "#enums/scriptTarget"; -export { SymbolOwnerKind } from "#enums/symbolOwnerKind"; export type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath } from "../ast/index.ts"; +export { CaseSensitivity } from "../enums/caseSensitivity.js"; +export { JsxEmit } from "../enums/jsxEmit.js"; +export { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; +export { ModuleKind } from "../enums/moduleKind.js"; +export { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; +export { NewLineKind } from "../enums/newLineKind.js"; +export { ScriptKind } from "../enums/scriptKind.js"; +export { ScriptTarget } from "../enums/scriptTarget.js"; +export { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; export type { CompilerOptions, PluginImport } from "./compilerOptions.generated.ts"; export * from "./compilerOptions.generated.ts"; export type { UserPreferences } from "./userPreferences.generated.ts"; diff --git a/packages/typescript/src/api/proto.ts b/packages/typescript/src/api/proto.ts index 1cf9a8a7ab83b..7929f0ffaec0a 100644 --- a/packages/typescript/src/api/proto.ts +++ b/packages/typescript/src/api/proto.ts @@ -1,4 +1,4 @@ -import { SymbolOwnerKind } from "#enums/symbolOwnerKind"; +import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; import { documentURIToFileName, fileNameToDocumentURI, diff --git a/packages/typescript/src/api/sync/api.ts b/packages/typescript/src/api/sync/api.ts index a2960224381ff..458b0191a4360 100644 --- a/packages/typescript/src/api/sync/api.ts +++ b/packages/typescript/src/api/sync/api.ts @@ -15,26 +15,6 @@ import { cacheGeneratorMethod, } from "./generatorSupport.ts"; -import { CheckFlags } from "#enums/checkFlags"; -import { CompletionItemKind } from "#enums/completionItemKind"; -import { DiagnosticCategory } from "#enums/diagnosticCategory"; -import { ElementFlags } from "#enums/elementFlags"; -import { EmitOnly } from "#enums/emitOnly"; -import { IndexKind } from "#enums/indexKind"; -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"; -import { ScriptKind } from "#enums/scriptKind"; -import { SignatureFlags } from "#enums/signatureFlags"; -import { SignatureKind } from "#enums/signatureKind"; -import { SymbolFlags } from "#enums/symbolFlags"; -import { SymbolOwnerKind } from "#enums/symbolOwnerKind"; -import { TypeFlags } from "#enums/typeFlags"; -import { TypeFormatFlags } from "#enums/typeFormatFlags"; -import { TypePredicateKind } from "#enums/typePredicateKind"; import { type __String, type CallLikeExpression, @@ -56,6 +36,26 @@ import { type TypeNode, unescapeLeadingUnderscores, } from "../../ast/index.ts"; +import { CheckFlags } from "../../enums/checkFlags.js"; +import { CompletionItemKind } from "../../enums/completionItemKind.js"; +import { DiagnosticCategory } from "../../enums/diagnosticCategory.js"; +import { ElementFlags } from "../../enums/elementFlags.js"; +import { EmitOnly } from "../../enums/emitOnly.js"; +import { IndexKind } from "../../enums/indexKind.js"; +import { JsxEmit } from "../../enums/jsxEmit.js"; +import { ModuleKind } from "../../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../../enums/newLineKind.js"; +import { NodeBuilderFlags } from "../../enums/nodeBuilderFlags.js"; +import { ObjectFlags } from "../../enums/objectFlags.js"; +import { ScriptKind } from "../../enums/scriptKind.js"; +import { SignatureFlags } from "../../enums/signatureFlags.js"; +import { SignatureKind } from "../../enums/signatureKind.js"; +import { SymbolFlags } from "../../enums/symbolFlags.js"; +import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; +import { TypeFlags } from "../../enums/typeFlags.js"; +import { TypeFormatFlags } from "../../enums/typeFormatFlags.js"; +import { TypePredicateKind } from "../../enums/typePredicateKind.js"; import { assertNever } from "../../internal/utils.ts"; import { encodeNode, diff --git a/packages/typescript/src/api/sync/types.ts b/packages/typescript/src/api/sync/types.ts index 2f466b6b684ae..0c96e44e34ca3 100644 --- a/packages/typescript/src/api/sync/types.ts +++ b/packages/typescript/src/api/sync/types.ts @@ -11,17 +11,17 @@ import type { APIResponse as ProtocolResponse, } from "../proto.ts"; -import type { CompletionItemKind } from "#enums/completionItemKind"; -import type { ElementFlags } from "#enums/elementFlags"; -import type { ObjectFlags } from "#enums/objectFlags"; -import type { TypeFlags } from "#enums/typeFlags"; -import type { TypePredicateKind } from "#enums/typePredicateKind"; import type { IndexSignatureDeclaration, NamedTupleMember, ParameterDeclaration, } from "../../ast/ast.ts"; import type { RootedFilePath } from "../../ast/index.ts"; +import type { CompletionItemKind } from "../../enums/completionItemKind.js"; +import type { ElementFlags } from "../../enums/elementFlags.js"; +import type { ObjectFlags } from "../../enums/objectFlags.js"; +import type { TypeFlags } from "../../enums/typeFlags.js"; +import type { TypePredicateKind } from "../../enums/typePredicateKind.js"; import type { Diagnostic, RequestFileSystem, diff --git a/packages/typescript/src/ast/ast.generated.ts b/packages/typescript/src/ast/ast.generated.ts index 723093189f812..d5abce9e716d3 100644 --- a/packages/typescript/src/ast/ast.generated.ts +++ b/packages/typescript/src/ast/ast.generated.ts @@ -1,9 +1,9 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import type { ModifierFlags } from "#enums/modifierFlags"; -import type { NodeFlags } from "#enums/nodeFlags"; -import { SyntaxKind } from "#enums/syntaxKind"; -import { TokenFlags } from "#enums/tokenFlags"; +import type { ModifierFlags } from "../enums/modifierFlags.js"; +import type { NodeFlags } from "../enums/nodeFlags.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; +import { TokenFlags } from "../enums/tokenFlags.js"; import type { JsxTagNamePropertyAccess, Node, diff --git a/packages/typescript/src/ast/ast.ts b/packages/typescript/src/ast/ast.ts index 9f644c12fd0c1..30e54a64739ea 100644 --- a/packages/typescript/src/ast/ast.ts +++ b/packages/typescript/src/ast/ast.ts @@ -1,12 +1,12 @@ // ast.ts — Hand-written AST type definitions // Generated types are in ast.generated.ts -import type { DiagnosticDirectivePolicy } from "#enums/diagnosticDirectivePolicy"; -import type { InternalSymbolName } from "#enums/internalSymbolName"; -import type { LanguageVariant } from "#enums/languageVariant"; -import type { NodeFlags } from "#enums/nodeFlags"; -import type { ScriptKind } from "#enums/scriptKind"; -import { SyntaxKind } from "#enums/syntaxKind"; +import type { DiagnosticDirectivePolicy } from "../enums/diagnosticDirectivePolicy.js"; +import type { InternalSymbolName } from "../enums/internalSymbolName.js"; +import type { LanguageVariant } from "../enums/languageVariant.js"; +import type { NodeFlags } from "../enums/nodeFlags.js"; +import type { ScriptKind } from "../enums/scriptKind.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { AssertionExpression, BindingElement, @@ -52,8 +52,8 @@ import type { } from "./ast.generated.ts"; import type { SpanMap } from "./spanMap.ts"; -export { SyntaxKind } from "#enums/syntaxKind"; -export { TokenFlags } from "#enums/tokenFlags"; +export { SyntaxKind } from "../enums/syntaxKind.js"; +export { TokenFlags } from "../enums/tokenFlags.js"; export * from "./ast.generated.ts"; export * as factory from "./factory.generated.ts"; diff --git a/packages/typescript/src/ast/astnav.ts b/packages/typescript/src/ast/astnav.ts index f401215034b9d..5f863082d027c 100644 --- a/packages/typescript/src/ast/astnav.ts +++ b/packages/typescript/src/ast/astnav.ts @@ -1,5 +1,5 @@ -import { NodeFlags } from "#enums/nodeFlags"; -import { SyntaxKind } from "#enums/syntaxKind"; +import { NodeFlags } from "../enums/nodeFlags.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { TokenSyntaxKind } from "./ast.generated.ts"; import type { Node, diff --git a/packages/typescript/src/ast/clone.ts b/packages/typescript/src/ast/clone.ts index f36af7617a1a8..9659c13379cea 100644 --- a/packages/typescript/src/ast/clone.ts +++ b/packages/typescript/src/ast/clone.ts @@ -1,4 +1,4 @@ -import { SyntaxKind } from "#enums/syntaxKind"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { Node, NodeArray, diff --git a/packages/typescript/src/ast/factory.generated.ts b/packages/typescript/src/ast/factory.generated.ts index ac1ac5f377266..3e66d7333360b 100644 --- a/packages/typescript/src/ast/factory.generated.ts +++ b/packages/typescript/src/ast/factory.generated.ts @@ -1,8 +1,8 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import { NodeFlags } from "#enums/nodeFlags"; -import { SyntaxKind } from "#enums/syntaxKind"; -import { TokenFlags } from "#enums/tokenFlags"; +import { NodeFlags } from "../enums/nodeFlags.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; +import { TokenFlags } from "../enums/tokenFlags.js"; import type { ArrayBindingPattern, ArrayLiteralExpression, diff --git a/packages/typescript/src/ast/index.ts b/packages/typescript/src/ast/index.ts index fcef01b579dc5..e46fea67fe3a7 100644 --- a/packages/typescript/src/ast/index.ts +++ b/packages/typescript/src/ast/index.ts @@ -1,18 +1,18 @@ -export { CharacterCodes } from "#enums/characterCodes"; -export { CommentDirectiveType } from "#enums/commentDirectiveType"; -export { DiagnosticDirectivePolicy } from "#enums/diagnosticDirectivePolicy"; -export { InternalSymbolName } from "#enums/internalSymbolName"; -export { LanguageVariant } from "#enums/languageVariant"; -export { ModifierFlags } from "#enums/modifierFlags"; -export { NodeFlags } from "#enums/nodeFlags"; -export { RegularExpressionFlags } from "#enums/regularExpressionFlags"; -export { ScriptKind } from "#enums/scriptKind"; -export { ScriptTarget } from "#enums/scriptTarget"; -export { SpanMapFeature } from "#enums/spanMapFeature"; -export { SpanMapFidelity } from "#enums/spanMapFidelity"; -export { SpanMapKind } from "#enums/spanMapKind"; -export { SyntaxKind } from "#enums/syntaxKind"; -export { TokenFlags } from "#enums/tokenFlags"; +export { CharacterCodes } from "../enums/characterCodes.js"; +export { CommentDirectiveType } from "../enums/commentDirectiveType.js"; +export { DiagnosticDirectivePolicy } from "../enums/diagnosticDirectivePolicy.js"; +export { InternalSymbolName } from "../enums/internalSymbolName.js"; +export { LanguageVariant } from "../enums/languageVariant.js"; +export { ModifierFlags } from "../enums/modifierFlags.js"; +export { NodeFlags } from "../enums/nodeFlags.js"; +export { RegularExpressionFlags } from "../enums/regularExpressionFlags.js"; +export { ScriptKind } from "../enums/scriptKind.js"; +export { ScriptTarget } from "../enums/scriptTarget.js"; +export { SpanMapFeature } from "../enums/spanMapFeature.js"; +export { SpanMapFidelity } from "../enums/spanMapFidelity.js"; +export { SpanMapKind } from "../enums/spanMapKind.js"; +export { SyntaxKind } from "../enums/syntaxKind.js"; +export { TokenFlags } from "../enums/tokenFlags.js"; export * from "./ast.ts"; export * from "./astnav.ts"; export * from "./clone.ts"; diff --git a/packages/typescript/src/ast/is.generated.ts b/packages/typescript/src/ast/is.generated.ts index ca0e420be64b2..34ae31541cbf1 100644 --- a/packages/typescript/src/ast/is.generated.ts +++ b/packages/typescript/src/ast/is.generated.ts @@ -1,8 +1,8 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import { SyntaxKind } from "#enums/syntaxKind"; import type { NodeHandle as AsyncNodeHandle } from "../api/async/api.ts"; import type { NodeHandle as SyncNodeHandle } from "../api/sync/api.ts"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { AbstractKeyword, AccessExpression, diff --git a/packages/typescript/src/ast/is.ts b/packages/typescript/src/ast/is.ts index ecf91f4c74f3b..74f41132e0f32 100644 --- a/packages/typescript/src/ast/is.ts +++ b/packages/typescript/src/ast/is.ts @@ -1,11 +1,11 @@ // is.ts — Hand-written type guard functions // Generated guards are in is.generated.ts -import { ModifierFlags } from "#enums/modifierFlags"; -import { NodeFlags } from "#enums/nodeFlags"; -import { OuterExpressionKinds } from "#enums/outerExpressionKinds"; -import { ScriptKind } from "#enums/scriptKind"; -import { SyntaxKind } from "#enums/syntaxKind"; +import { ModifierFlags } from "../enums/modifierFlags.js"; +import { NodeFlags } from "../enums/nodeFlags.js"; +import { OuterExpressionKinds } from "../enums/outerExpressionKinds.js"; +import { ScriptKind } from "../enums/scriptKind.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { AsExpression, BindingPattern, diff --git a/packages/typescript/src/ast/modifiers.ts b/packages/typescript/src/ast/modifiers.ts index cc00e1651b00a..df74e0ad84921 100644 --- a/packages/typescript/src/ast/modifiers.ts +++ b/packages/typescript/src/ast/modifiers.ts @@ -1,5 +1,5 @@ -import { ModifierFlags } from "#enums/modifierFlags"; -import { SyntaxKind } from "#enums/syntaxKind"; +import { ModifierFlags } from "../enums/modifierFlags.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; export function modifierToFlag(kind: SyntaxKind): ModifierFlags { switch (kind) { diff --git a/packages/typescript/src/ast/scanner.ts b/packages/typescript/src/ast/scanner.ts index 7b103bad149ca..0e72a1e867cad 100644 --- a/packages/typescript/src/ast/scanner.ts +++ b/packages/typescript/src/ast/scanner.ts @@ -1,10 +1,10 @@ -import { CharacterCodes } from "#enums/characterCodes"; -import { CommentDirectiveType } from "#enums/commentDirectiveType"; -import { LanguageVariant } from "#enums/languageVariant"; -import { RegularExpressionFlags } from "#enums/regularExpressionFlags"; -import { ScriptTarget } from "#enums/scriptTarget"; -import { SyntaxKind } from "#enums/syntaxKind"; -import { TokenFlags } from "#enums/tokenFlags"; +import { CharacterCodes } from "../enums/characterCodes.js"; +import { CommentDirectiveType } from "../enums/commentDirectiveType.js"; +import { LanguageVariant } from "../enums/languageVariant.js"; +import { RegularExpressionFlags } from "../enums/regularExpressionFlags.js"; +import { ScriptTarget } from "../enums/scriptTarget.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; +import { TokenFlags } from "../enums/tokenFlags.js"; import type { JsxTokenSyntaxKind, KeywordSyntaxKind, diff --git a/packages/typescript/src/ast/spanMap.ts b/packages/typescript/src/ast/spanMap.ts index dee0610ab2bee..8b2d0ff4547f6 100644 --- a/packages/typescript/src/ast/spanMap.ts +++ b/packages/typescript/src/ast/spanMap.ts @@ -1,6 +1,6 @@ -import { SpanMapFeature } from "#enums/spanMapFeature"; -import { SpanMapFidelity } from "#enums/spanMapFidelity"; -import { SpanMapKind } from "#enums/spanMapKind"; +import { SpanMapFeature } from "../enums/spanMapFeature.js"; +import { SpanMapFidelity } from "../enums/spanMapFidelity.js"; +import { SpanMapKind } from "../enums/spanMapKind.js"; import type { ReadonlyTextRange } from "./ast.ts"; export { SpanMapFeature, SpanMapFidelity, SpanMapKind }; diff --git a/packages/typescript/src/ast/utils.ts b/packages/typescript/src/ast/utils.ts index aef39a99abd87..780e805f73362 100644 --- a/packages/typescript/src/ast/utils.ts +++ b/packages/typescript/src/ast/utils.ts @@ -1,9 +1,9 @@ -import { CharacterCodes } from "#enums/characterCodes"; -import { JSDeclarationKind } from "#enums/jsDeclarationKind"; -import { ModifierFlags } from "#enums/modifierFlags"; -import { NodeFlags } from "#enums/nodeFlags"; -import { OuterExpressionKinds } from "#enums/outerExpressionKinds"; -import { SyntaxKind } from "#enums/syntaxKind"; +import { CharacterCodes } from "../enums/characterCodes.js"; +import { JSDeclarationKind } from "../enums/jsDeclarationKind.js"; +import { ModifierFlags } from "../enums/modifierFlags.js"; +import { NodeFlags } from "../enums/nodeFlags.js"; +import { OuterExpressionKinds } from "../enums/outerExpressionKinds.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { __String, AccessExpression, diff --git a/packages/typescript/src/ast/visitor.generated.ts b/packages/typescript/src/ast/visitor.generated.ts index 7554a06a2eb3e..c9e390f2e9d7e 100644 --- a/packages/typescript/src/ast/visitor.generated.ts +++ b/packages/typescript/src/ast/visitor.generated.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import { SyntaxKind } from "#enums/syntaxKind"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { ArrayBindingPattern, ArrayLiteralExpression, diff --git a/packages/typescript/src/ast/visitor.ts b/packages/typescript/src/ast/visitor.ts index c26259a46514c..d20025a18aaa6 100644 --- a/packages/typescript/src/ast/visitor.ts +++ b/packages/typescript/src/ast/visitor.ts @@ -4,7 +4,7 @@ * delegates to these functions. */ -import { SyntaxKind } from "#enums/syntaxKind"; +import { SyntaxKind } from "../enums/syntaxKind.js"; import type { JSDocComment, JSDocParameterOrPropertyTag, diff --git a/packages/typescript/src/enums/caseSensitivity.enum.ts b/packages/typescript/src/enums/caseSensitivity.d.ts similarity index 76% rename from packages/typescript/src/enums/caseSensitivity.enum.ts rename to packages/typescript/src/enums/caseSensitivity.d.ts index f3d0c88fcc60d..09b051a3bdc01 100644 --- a/packages/typescript/src/enums/caseSensitivity.enum.ts +++ b/packages/typescript/src/enums/caseSensitivity.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/tspath/path.go. DO NOT EDIT. -export enum CaseSensitivity { +export declare enum CaseSensitivity { Insensitive = 0, Sensitive = 1, } diff --git a/packages/typescript/src/enums/caseSensitivity.ts b/packages/typescript/src/enums/caseSensitivity.js similarity index 89% rename from packages/typescript/src/enums/caseSensitivity.ts rename to packages/typescript/src/enums/caseSensitivity.js index 57d30370ccd5c..b62c0fa7fad66 100644 --- a/packages/typescript/src/enums/caseSensitivity.ts +++ b/packages/typescript/src/enums/caseSensitivity.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/tspath/path.go. DO NOT EDIT. -export var CaseSensitivity: any; +export var CaseSensitivity; (function (CaseSensitivity) { CaseSensitivity[CaseSensitivity["Insensitive"] = 0] = "Insensitive"; CaseSensitivity[CaseSensitivity["Sensitive"] = 1] = "Sensitive"; diff --git a/packages/typescript/src/enums/characterCodes.enum.ts b/packages/typescript/src/enums/characterCodes.d.ts similarity index 93% rename from packages/typescript/src/enums/characterCodes.enum.ts rename to packages/typescript/src/enums/characterCodes.d.ts index 052c7e8feb896..079a9825bafbd 100644 --- a/packages/typescript/src/enums/characterCodes.enum.ts +++ b/packages/typescript/src/enums/characterCodes.d.ts @@ -1,4 +1,4 @@ -export enum CharacterCodes { +export declare enum CharacterCodes { EOF = -1, nullCharacter = 0, maxAsciiCharacter = 0x7F, diff --git a/packages/typescript/src/enums/characterCodes.ts b/packages/typescript/src/enums/characterCodes.js similarity index 97% rename from packages/typescript/src/enums/characterCodes.ts rename to packages/typescript/src/enums/characterCodes.js index 232a292da0cd0..e73d898796b6a 100644 --- a/packages/typescript/src/enums/characterCodes.ts +++ b/packages/typescript/src/enums/characterCodes.js @@ -1,4 +1,4 @@ -export var CharacterCodes: any; +export var CharacterCodes; (function (CharacterCodes) { CharacterCodes[CharacterCodes["EOF"] = -1] = "EOF"; CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter"; diff --git a/packages/typescript/src/enums/checkFlags.enum.ts b/packages/typescript/src/enums/checkFlags.d.ts similarity index 94% rename from packages/typescript/src/enums/checkFlags.enum.ts rename to packages/typescript/src/enums/checkFlags.d.ts index c7fc87069accb..b6a027cccc5c0 100644 --- a/packages/typescript/src/enums/checkFlags.enum.ts +++ b/packages/typescript/src/enums/checkFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/checkflags.go. DO NOT EDIT. -export enum CheckFlags { +export declare enum CheckFlags { None = 0, Instantiated = 1 << 0, SyntheticProperty = 1 << 1, diff --git a/packages/typescript/src/enums/checkFlags.ts b/packages/typescript/src/enums/checkFlags.js similarity index 97% rename from packages/typescript/src/enums/checkFlags.ts rename to packages/typescript/src/enums/checkFlags.js index 5b4a963299675..c952c05875ea3 100644 --- a/packages/typescript/src/enums/checkFlags.ts +++ b/packages/typescript/src/enums/checkFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/checkflags.go. DO NOT EDIT. -export var CheckFlags: any; +export var CheckFlags; (function (CheckFlags) { CheckFlags[CheckFlags["None"] = 0] = "None"; CheckFlags[CheckFlags["Instantiated"] = 1] = "Instantiated"; diff --git a/packages/typescript/src/enums/commentDirectiveType.d.ts b/packages/typescript/src/enums/commentDirectiveType.d.ts new file mode 100644 index 0000000000000..d02c94220ae82 --- /dev/null +++ b/packages/typescript/src/enums/commentDirectiveType.d.ts @@ -0,0 +1,4 @@ +export declare enum CommentDirectiveType { + ExpectError = 0, + Ignore = 1, +} diff --git a/packages/typescript/src/enums/commentDirectiveType.enum.ts b/packages/typescript/src/enums/commentDirectiveType.enum.ts deleted file mode 100644 index dc75790bcd812..0000000000000 --- a/packages/typescript/src/enums/commentDirectiveType.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum CommentDirectiveType { - ExpectError = 0, - Ignore = 1, -} diff --git a/packages/typescript/src/enums/commentDirectiveType.ts b/packages/typescript/src/enums/commentDirectiveType.js similarity index 85% rename from packages/typescript/src/enums/commentDirectiveType.ts rename to packages/typescript/src/enums/commentDirectiveType.js index 2c59ede17483c..c65092d0b2e5b 100644 --- a/packages/typescript/src/enums/commentDirectiveType.ts +++ b/packages/typescript/src/enums/commentDirectiveType.js @@ -1,4 +1,4 @@ -export var CommentDirectiveType: any; +export var CommentDirectiveType; (function (CommentDirectiveType) { CommentDirectiveType[CommentDirectiveType["ExpectError"] = 0] = "ExpectError"; CommentDirectiveType[CommentDirectiveType["Ignore"] = 1] = "Ignore"; diff --git a/packages/typescript/src/enums/completionItemKind.enum.ts b/packages/typescript/src/enums/completionItemKind.d.ts similarity index 88% rename from packages/typescript/src/enums/completionItemKind.enum.ts rename to packages/typescript/src/enums/completionItemKind.d.ts index 1b84c46c479d6..d07245fcda88f 100644 --- a/packages/typescript/src/enums/completionItemKind.enum.ts +++ b/packages/typescript/src/enums/completionItemKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/lsp/lsproto/lsp_generated.go. DO NOT EDIT. -export enum CompletionItemKind { +export declare enum CompletionItemKind { Text = 1, Method = 2, Function = 3, diff --git a/packages/typescript/src/enums/completionItemKind.ts b/packages/typescript/src/enums/completionItemKind.js similarity index 96% rename from packages/typescript/src/enums/completionItemKind.ts rename to packages/typescript/src/enums/completionItemKind.js index 00126c380c9d1..45781a4fc9783 100644 --- a/packages/typescript/src/enums/completionItemKind.ts +++ b/packages/typescript/src/enums/completionItemKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/lsp/lsproto/lsp_generated.go. DO NOT EDIT. -export var CompletionItemKind: any; +export var CompletionItemKind; (function (CompletionItemKind) { CompletionItemKind[CompletionItemKind["Text"] = 1] = "Text"; CompletionItemKind[CompletionItemKind["Method"] = 2] = "Method"; diff --git a/packages/typescript/src/enums/diagnosticCategory.enum.ts b/packages/typescript/src/enums/diagnosticCategory.d.ts similarity index 79% rename from packages/typescript/src/enums/diagnosticCategory.enum.ts rename to packages/typescript/src/enums/diagnosticCategory.d.ts index c7ca0e695636e..dc98ba52da229 100644 --- a/packages/typescript/src/enums/diagnosticCategory.enum.ts +++ b/packages/typescript/src/enums/diagnosticCategory.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/diagnostics/diagnostics.go. DO NOT EDIT. -export enum DiagnosticCategory { +export declare enum DiagnosticCategory { Warning = 0, Error = 1, Suggestion = 2, diff --git a/packages/typescript/src/enums/diagnosticCategory.ts b/packages/typescript/src/enums/diagnosticCategory.js similarity index 91% rename from packages/typescript/src/enums/diagnosticCategory.ts rename to packages/typescript/src/enums/diagnosticCategory.js index 26438f4c03c10..166eda60dc552 100644 --- a/packages/typescript/src/enums/diagnosticCategory.ts +++ b/packages/typescript/src/enums/diagnosticCategory.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/diagnostics/diagnostics.go. DO NOT EDIT. -export var DiagnosticCategory: any; +export var DiagnosticCategory; (function (DiagnosticCategory) { DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning"; DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error"; diff --git a/packages/typescript/src/enums/diagnosticDirectivePolicy.enum.ts b/packages/typescript/src/enums/diagnosticDirectivePolicy.d.ts similarity index 71% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.enum.ts rename to packages/typescript/src/enums/diagnosticDirectivePolicy.d.ts index fedd1e5286067..99a67459bbd82 100644 --- a/packages/typescript/src/enums/diagnosticDirectivePolicy.enum.ts +++ b/packages/typescript/src/enums/diagnosticDirectivePolicy.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/ast.go. DO NOT EDIT. -export enum DiagnosticDirectivePolicy { +export declare enum DiagnosticDirectivePolicy { Ignore = 0, Expect = 1, } diff --git a/packages/typescript/src/enums/diagnosticDirectivePolicy.ts b/packages/typescript/src/enums/diagnosticDirectivePolicy.js similarity index 88% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.ts rename to packages/typescript/src/enums/diagnosticDirectivePolicy.js index c17dd1480ea92..2c39debb4c5ff 100644 --- a/packages/typescript/src/enums/diagnosticDirectivePolicy.ts +++ b/packages/typescript/src/enums/diagnosticDirectivePolicy.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/ast.go. DO NOT EDIT. -export var DiagnosticDirectivePolicy: any; +export var DiagnosticDirectivePolicy; (function (DiagnosticDirectivePolicy) { DiagnosticDirectivePolicy[DiagnosticDirectivePolicy["Ignore"] = 0] = "Ignore"; DiagnosticDirectivePolicy[DiagnosticDirectivePolicy["Expect"] = 1] = "Expect"; diff --git a/packages/typescript/src/enums/elementFlags.enum.ts b/packages/typescript/src/enums/elementFlags.d.ts similarity index 88% rename from packages/typescript/src/enums/elementFlags.enum.ts rename to packages/typescript/src/enums/elementFlags.d.ts index 546f54bf3a535..b6ddaa4c6296b 100644 --- a/packages/typescript/src/enums/elementFlags.enum.ts +++ b/packages/typescript/src/enums/elementFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum ElementFlags { +export declare enum ElementFlags { None = 0, Required = 1 << 0, Optional = 1 << 1, diff --git a/packages/typescript/src/enums/elementFlags.ts b/packages/typescript/src/enums/elementFlags.js similarity index 94% rename from packages/typescript/src/enums/elementFlags.ts rename to packages/typescript/src/enums/elementFlags.js index 9400139a6bf01..9b38b354add85 100644 --- a/packages/typescript/src/enums/elementFlags.ts +++ b/packages/typescript/src/enums/elementFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var ElementFlags: any; +export var ElementFlags; (function (ElementFlags) { ElementFlags[ElementFlags["None"] = 0] = "None"; ElementFlags[ElementFlags["Required"] = 1] = "Required"; diff --git a/packages/typescript/src/enums/emitOnly.enum.ts b/packages/typescript/src/enums/emitOnly.d.ts similarity index 80% rename from packages/typescript/src/enums/emitOnly.enum.ts rename to packages/typescript/src/enums/emitOnly.d.ts index f22aba400b828..0c1fa0a9c278f 100644 --- a/packages/typescript/src/enums/emitOnly.enum.ts +++ b/packages/typescript/src/enums/emitOnly.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/compiler/emitter.go. DO NOT EDIT. -export enum EmitOnly { +export declare enum EmitOnly { All = 0, OnlyJs = 1, OnlyDts = 2, diff --git a/packages/typescript/src/enums/emitOnly.ts b/packages/typescript/src/enums/emitOnly.js similarity index 90% rename from packages/typescript/src/enums/emitOnly.ts rename to packages/typescript/src/enums/emitOnly.js index 2856c2f03718f..903de0fc06655 100644 --- a/packages/typescript/src/enums/emitOnly.ts +++ b/packages/typescript/src/enums/emitOnly.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/compiler/emitter.go. DO NOT EDIT. -export var EmitOnly: any; +export var EmitOnly; (function (EmitOnly) { EmitOnly[EmitOnly["All"] = 0] = "All"; EmitOnly[EmitOnly["OnlyJs"] = 1] = "OnlyJs"; diff --git a/packages/typescript/src/enums/indexKind.enum.ts b/packages/typescript/src/enums/indexKind.d.ts similarity index 78% rename from packages/typescript/src/enums/indexKind.enum.ts rename to packages/typescript/src/enums/indexKind.d.ts index 7906d18ec2188..f43f9f449e97b 100644 --- a/packages/typescript/src/enums/indexKind.enum.ts +++ b/packages/typescript/src/enums/indexKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum IndexKind { +export declare enum IndexKind { String = 0, Number = 1, } diff --git a/packages/typescript/src/enums/indexKind.ts b/packages/typescript/src/enums/indexKind.js similarity index 89% rename from packages/typescript/src/enums/indexKind.ts rename to packages/typescript/src/enums/indexKind.js index 21e64454bbc2c..a77cc0fb2222e 100644 --- a/packages/typescript/src/enums/indexKind.ts +++ b/packages/typescript/src/enums/indexKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var IndexKind: any; +export var IndexKind; (function (IndexKind) { IndexKind[IndexKind["String"] = 0] = "String"; IndexKind[IndexKind["Number"] = 1] = "Number"; diff --git a/packages/typescript/src/enums/internalSymbolName.enum.ts b/packages/typescript/src/enums/internalSymbolName.d.ts similarity index 91% rename from packages/typescript/src/enums/internalSymbolName.enum.ts rename to packages/typescript/src/enums/internalSymbolName.d.ts index 155b25fc1985b..74a6d6beee51a 100644 --- a/packages/typescript/src/enums/internalSymbolName.enum.ts +++ b/packages/typescript/src/enums/internalSymbolName.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/symbol.go. DO NOT EDIT. -export enum InternalSymbolName { +export declare enum InternalSymbolName { Call = "__call", Constructor = "__constructor", New = "__new", diff --git a/packages/typescript/src/enums/internalSymbolName.ts b/packages/typescript/src/enums/internalSymbolName.js similarity index 95% rename from packages/typescript/src/enums/internalSymbolName.ts rename to packages/typescript/src/enums/internalSymbolName.js index 5815d341690ce..26291c993b77b 100644 --- a/packages/typescript/src/enums/internalSymbolName.ts +++ b/packages/typescript/src/enums/internalSymbolName.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/symbol.go. DO NOT EDIT. -export var InternalSymbolName: any; +export var InternalSymbolName; (function (InternalSymbolName) { InternalSymbolName["Call"] = "__call"; InternalSymbolName["Constructor"] = "__constructor"; diff --git a/packages/typescript/src/enums/jsDeclarationKind.enum.ts b/packages/typescript/src/enums/jsDeclarationKind.d.ts similarity index 84% rename from packages/typescript/src/enums/jsDeclarationKind.enum.ts rename to packages/typescript/src/enums/jsDeclarationKind.d.ts index 4e6dcbe9fc539..6bb74da182e9d 100644 --- a/packages/typescript/src/enums/jsDeclarationKind.enum.ts +++ b/packages/typescript/src/enums/jsDeclarationKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/utilities.go. DO NOT EDIT. -export enum JSDeclarationKind { +export declare enum JSDeclarationKind { None = 0, ModuleExports = 1, ExportsProperty = 2, diff --git a/packages/typescript/src/enums/jsDeclarationKind.ts b/packages/typescript/src/enums/jsDeclarationKind.js similarity index 94% rename from packages/typescript/src/enums/jsDeclarationKind.ts rename to packages/typescript/src/enums/jsDeclarationKind.js index d09cd90920d20..cb9d1d961630d 100644 --- a/packages/typescript/src/enums/jsDeclarationKind.ts +++ b/packages/typescript/src/enums/jsDeclarationKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/utilities.go. DO NOT EDIT. -export var JSDeclarationKind: any; +export var JSDeclarationKind; (function (JSDeclarationKind) { JSDeclarationKind[JSDeclarationKind["None"] = 0] = "None"; JSDeclarationKind[JSDeclarationKind["ModuleExports"] = 1] = "ModuleExports"; diff --git a/packages/typescript/src/enums/jsxEmit.enum.ts b/packages/typescript/src/enums/jsxEmit.d.ts similarity index 84% rename from packages/typescript/src/enums/jsxEmit.enum.ts rename to packages/typescript/src/enums/jsxEmit.d.ts index 0a728dceeef31..bfba4cd875387 100644 --- a/packages/typescript/src/enums/jsxEmit.enum.ts +++ b/packages/typescript/src/enums/jsxEmit.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum JsxEmit { +export declare enum JsxEmit { None = 0, Preserve = 1, React = 2, diff --git a/packages/typescript/src/enums/jsxEmit.ts b/packages/typescript/src/enums/jsxEmit.js similarity index 92% rename from packages/typescript/src/enums/jsxEmit.ts rename to packages/typescript/src/enums/jsxEmit.js index 4c5aa9d989f47..974c47c905d43 100644 --- a/packages/typescript/src/enums/jsxEmit.ts +++ b/packages/typescript/src/enums/jsxEmit.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var JsxEmit: any; +export var JsxEmit; (function (JsxEmit) { JsxEmit[JsxEmit["None"] = 0] = "None"; JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve"; diff --git a/packages/typescript/src/enums/languageVariant.d.ts b/packages/typescript/src/enums/languageVariant.d.ts new file mode 100644 index 0000000000000..6047765cf9a37 --- /dev/null +++ b/packages/typescript/src/enums/languageVariant.d.ts @@ -0,0 +1,4 @@ +export declare enum LanguageVariant { + Standard = 0, + JSX = 1, +} diff --git a/packages/typescript/src/enums/languageVariant.enum.ts b/packages/typescript/src/enums/languageVariant.enum.ts deleted file mode 100644 index c471ab69ee7a5..0000000000000 --- a/packages/typescript/src/enums/languageVariant.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum LanguageVariant { - Standard = 0, - JSX = 1, -} diff --git a/packages/typescript/src/enums/languageVariant.ts b/packages/typescript/src/enums/languageVariant.js similarity index 84% rename from packages/typescript/src/enums/languageVariant.ts rename to packages/typescript/src/enums/languageVariant.js index 831ca135c8f4d..c2ed2c560dff3 100644 --- a/packages/typescript/src/enums/languageVariant.ts +++ b/packages/typescript/src/enums/languageVariant.js @@ -1,4 +1,4 @@ -export var LanguageVariant: any; +export var LanguageVariant; (function (LanguageVariant) { LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard"; LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX"; diff --git a/packages/typescript/src/enums/modifierFlags.enum.ts b/packages/typescript/src/enums/modifierFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/modifierFlags.enum.ts rename to packages/typescript/src/enums/modifierFlags.d.ts index 1ccf51e96dc26..e95c33363c45b 100644 --- a/packages/typescript/src/enums/modifierFlags.enum.ts +++ b/packages/typescript/src/enums/modifierFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/modifierflags.go. DO NOT EDIT. -export enum ModifierFlags { +export declare enum ModifierFlags { None = 0, Public = 1 << 0, Private = 1 << 1, diff --git a/packages/typescript/src/enums/modifierFlags.ts b/packages/typescript/src/enums/modifierFlags.js similarity index 97% rename from packages/typescript/src/enums/modifierFlags.ts rename to packages/typescript/src/enums/modifierFlags.js index 614dcf3b09ed2..e93bc0329bea5 100644 --- a/packages/typescript/src/enums/modifierFlags.ts +++ b/packages/typescript/src/enums/modifierFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/modifierflags.go. DO NOT EDIT. -export var ModifierFlags: any; +export var ModifierFlags; (function (ModifierFlags) { ModifierFlags[ModifierFlags["None"] = 0] = "None"; ModifierFlags[ModifierFlags["Public"] = 1] = "Public"; diff --git a/packages/typescript/src/enums/moduleDetectionKind.enum.ts b/packages/typescript/src/enums/moduleDetectionKind.d.ts similarity index 76% rename from packages/typescript/src/enums/moduleDetectionKind.enum.ts rename to packages/typescript/src/enums/moduleDetectionKind.d.ts index 3c857ba6bff33..dfe6d5b67f9cc 100644 --- a/packages/typescript/src/enums/moduleDetectionKind.enum.ts +++ b/packages/typescript/src/enums/moduleDetectionKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum ModuleDetectionKind { +export declare enum ModuleDetectionKind { None = 0, Auto = 1, Legacy = 2, diff --git a/packages/typescript/src/enums/moduleDetectionKind.ts b/packages/typescript/src/enums/moduleDetectionKind.js similarity index 91% rename from packages/typescript/src/enums/moduleDetectionKind.ts rename to packages/typescript/src/enums/moduleDetectionKind.js index aef2c39903baf..cc8c317da0e98 100644 --- a/packages/typescript/src/enums/moduleDetectionKind.ts +++ b/packages/typescript/src/enums/moduleDetectionKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var ModuleDetectionKind: any; +export var ModuleDetectionKind; (function (ModuleDetectionKind) { ModuleDetectionKind[ModuleDetectionKind["None"] = 0] = "None"; ModuleDetectionKind[ModuleDetectionKind["Auto"] = 1] = "Auto"; diff --git a/packages/typescript/src/enums/moduleKind.enum.ts b/packages/typescript/src/enums/moduleKind.d.ts similarity index 86% rename from packages/typescript/src/enums/moduleKind.enum.ts rename to packages/typescript/src/enums/moduleKind.d.ts index 4ecadf2728b42..627466edada3a 100644 --- a/packages/typescript/src/enums/moduleKind.enum.ts +++ b/packages/typescript/src/enums/moduleKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum ModuleKind { +export declare enum ModuleKind { None = 0, CommonJS = 1, AMD = 2, diff --git a/packages/typescript/src/enums/moduleKind.ts b/packages/typescript/src/enums/moduleKind.js similarity index 95% rename from packages/typescript/src/enums/moduleKind.ts rename to packages/typescript/src/enums/moduleKind.js index 242fe2a27253c..67b29bd443603 100644 --- a/packages/typescript/src/enums/moduleKind.ts +++ b/packages/typescript/src/enums/moduleKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var ModuleKind: any; +export var ModuleKind; (function (ModuleKind) { ModuleKind[ModuleKind["None"] = 0] = "None"; ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS"; diff --git a/packages/typescript/src/enums/moduleResolutionKind.enum.ts b/packages/typescript/src/enums/moduleResolutionKind.d.ts similarity index 80% rename from packages/typescript/src/enums/moduleResolutionKind.enum.ts rename to packages/typescript/src/enums/moduleResolutionKind.d.ts index 51ef127a5864f..e3bd1a81c25f6 100644 --- a/packages/typescript/src/enums/moduleResolutionKind.enum.ts +++ b/packages/typescript/src/enums/moduleResolutionKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum ModuleResolutionKind { +export declare enum ModuleResolutionKind { Unknown = 0, Classic = 1, Node10 = 2, diff --git a/packages/typescript/src/enums/moduleResolutionKind.ts b/packages/typescript/src/enums/moduleResolutionKind.js similarity index 93% rename from packages/typescript/src/enums/moduleResolutionKind.ts rename to packages/typescript/src/enums/moduleResolutionKind.js index 83a8decbd0cc5..8af872eaa224b 100644 --- a/packages/typescript/src/enums/moduleResolutionKind.ts +++ b/packages/typescript/src/enums/moduleResolutionKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var ModuleResolutionKind: any; +export var ModuleResolutionKind; (function (ModuleResolutionKind) { ModuleResolutionKind[ModuleResolutionKind["Unknown"] = 0] = "Unknown"; ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic"; diff --git a/packages/typescript/src/enums/newLineKind.enum.ts b/packages/typescript/src/enums/newLineKind.d.ts similarity index 78% rename from packages/typescript/src/enums/newLineKind.enum.ts rename to packages/typescript/src/enums/newLineKind.d.ts index 2195a93ee3b0a..6d4c3a1d37ce4 100644 --- a/packages/typescript/src/enums/newLineKind.enum.ts +++ b/packages/typescript/src/enums/newLineKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum NewLineKind { +export declare enum NewLineKind { None = 0, CRLF = 1, LF = 2, diff --git a/packages/typescript/src/enums/newLineKind.ts b/packages/typescript/src/enums/newLineKind.js similarity index 89% rename from packages/typescript/src/enums/newLineKind.ts rename to packages/typescript/src/enums/newLineKind.js index f36d2e22b163c..d731d23de67d3 100644 --- a/packages/typescript/src/enums/newLineKind.ts +++ b/packages/typescript/src/enums/newLineKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var NewLineKind: any; +export var NewLineKind; (function (NewLineKind) { NewLineKind[NewLineKind["None"] = 0] = "None"; NewLineKind[NewLineKind["CRLF"] = 1] = "CRLF"; diff --git a/packages/typescript/src/enums/nodeBuilderFlags.enum.ts b/packages/typescript/src/enums/nodeBuilderFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/nodeBuilderFlags.enum.ts rename to packages/typescript/src/enums/nodeBuilderFlags.d.ts index 28acdaf03703c..6f922a68ac45d 100644 --- a/packages/typescript/src/enums/nodeBuilderFlags.enum.ts +++ b/packages/typescript/src/enums/nodeBuilderFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/nodebuilder/types.go. DO NOT EDIT. -export enum NodeBuilderFlags { +export declare enum NodeBuilderFlags { None = 0, NoTruncation = 1 << 0, WriteArrayAsGenericType = 1 << 1, diff --git a/packages/typescript/src/enums/nodeBuilderFlags.ts b/packages/typescript/src/enums/nodeBuilderFlags.js similarity index 98% rename from packages/typescript/src/enums/nodeBuilderFlags.ts rename to packages/typescript/src/enums/nodeBuilderFlags.js index db674d3717557..83a97b1a3844d 100644 --- a/packages/typescript/src/enums/nodeBuilderFlags.ts +++ b/packages/typescript/src/enums/nodeBuilderFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/nodebuilder/types.go. DO NOT EDIT. -export var NodeBuilderFlags: any; +export var NodeBuilderFlags; (function (NodeBuilderFlags) { NodeBuilderFlags[NodeBuilderFlags["None"] = 0] = "None"; NodeBuilderFlags[NodeBuilderFlags["NoTruncation"] = 1] = "NoTruncation"; diff --git a/packages/typescript/src/enums/nodeFlags.enum.ts b/packages/typescript/src/enums/nodeFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/nodeFlags.enum.ts rename to packages/typescript/src/enums/nodeFlags.d.ts index 1296af0307cbf..b9c3335f7603f 100644 --- a/packages/typescript/src/enums/nodeFlags.enum.ts +++ b/packages/typescript/src/enums/nodeFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/nodeflags.go. DO NOT EDIT. -export enum NodeFlags { +export declare enum NodeFlags { None = 0, Let = 1 << 0, Const = 1 << 1, diff --git a/packages/typescript/src/enums/nodeFlags.ts b/packages/typescript/src/enums/nodeFlags.js similarity index 97% rename from packages/typescript/src/enums/nodeFlags.ts rename to packages/typescript/src/enums/nodeFlags.js index be496dcad7c7f..14fc1251943d3 100644 --- a/packages/typescript/src/enums/nodeFlags.ts +++ b/packages/typescript/src/enums/nodeFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/nodeflags.go. DO NOT EDIT. -export var NodeFlags: any; +export var NodeFlags; (function (NodeFlags) { NodeFlags[NodeFlags["None"] = 0] = "None"; NodeFlags[NodeFlags["Let"] = 1] = "Let"; diff --git a/packages/typescript/src/enums/objectFlags.enum.ts b/packages/typescript/src/enums/objectFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/objectFlags.enum.ts rename to packages/typescript/src/enums/objectFlags.d.ts index 15e497dc6ffb0..fd17f37c6fc0b 100644 --- a/packages/typescript/src/enums/objectFlags.enum.ts +++ b/packages/typescript/src/enums/objectFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum ObjectFlags { +export declare enum ObjectFlags { None = 0, Class = 1 << 0, Interface = 1 << 1, diff --git a/packages/typescript/src/enums/objectFlags.ts b/packages/typescript/src/enums/objectFlags.js similarity index 98% rename from packages/typescript/src/enums/objectFlags.ts rename to packages/typescript/src/enums/objectFlags.js index af3bad5af2d58..013bee411f001 100644 --- a/packages/typescript/src/enums/objectFlags.ts +++ b/packages/typescript/src/enums/objectFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var ObjectFlags: any; +export var ObjectFlags; (function (ObjectFlags) { ObjectFlags[ObjectFlags["None"] = 0] = "None"; ObjectFlags[ObjectFlags["Class"] = 1] = "Class"; diff --git a/packages/typescript/src/enums/outerExpressionKinds.enum.ts b/packages/typescript/src/enums/outerExpressionKinds.d.ts similarity index 92% rename from packages/typescript/src/enums/outerExpressionKinds.enum.ts rename to packages/typescript/src/enums/outerExpressionKinds.d.ts index c6463a9d76964..604aa8acdfa46 100644 --- a/packages/typescript/src/enums/outerExpressionKinds.enum.ts +++ b/packages/typescript/src/enums/outerExpressionKinds.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/utilities.go. DO NOT EDIT. -export enum OuterExpressionKinds { +export declare enum OuterExpressionKinds { Parentheses = 1 << 0, TypeAssertions = 1 << 1, NonNullAssertions = 1 << 2, diff --git a/packages/typescript/src/enums/outerExpressionKinds.ts b/packages/typescript/src/enums/outerExpressionKinds.js similarity index 96% rename from packages/typescript/src/enums/outerExpressionKinds.ts rename to packages/typescript/src/enums/outerExpressionKinds.js index f3efd85e9394c..bf91e2b18192a 100644 --- a/packages/typescript/src/enums/outerExpressionKinds.ts +++ b/packages/typescript/src/enums/outerExpressionKinds.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/utilities.go. DO NOT EDIT. -export var OuterExpressionKinds: any; +export var OuterExpressionKinds; (function (OuterExpressionKinds) { OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses"; OuterExpressionKinds[OuterExpressionKinds["TypeAssertions"] = 2] = "TypeAssertions"; diff --git a/packages/typescript/src/enums/regularExpressionFlags.enum.ts b/packages/typescript/src/enums/regularExpressionFlags.d.ts similarity index 81% rename from packages/typescript/src/enums/regularExpressionFlags.enum.ts rename to packages/typescript/src/enums/regularExpressionFlags.d.ts index 2f85b60897d60..e589a0f78513d 100644 --- a/packages/typescript/src/enums/regularExpressionFlags.enum.ts +++ b/packages/typescript/src/enums/regularExpressionFlags.d.ts @@ -1,4 +1,4 @@ -export enum RegularExpressionFlags { +export declare enum RegularExpressionFlags { None = 0, HasIndices = 1 << 0, Global = 1 << 1, diff --git a/packages/typescript/src/enums/regularExpressionFlags.ts b/packages/typescript/src/enums/regularExpressionFlags.js similarity index 94% rename from packages/typescript/src/enums/regularExpressionFlags.ts rename to packages/typescript/src/enums/regularExpressionFlags.js index ddd797fc1f971..a540693087da6 100644 --- a/packages/typescript/src/enums/regularExpressionFlags.ts +++ b/packages/typescript/src/enums/regularExpressionFlags.js @@ -1,4 +1,4 @@ -export var RegularExpressionFlags: any; +export var RegularExpressionFlags; (function (RegularExpressionFlags) { RegularExpressionFlags[RegularExpressionFlags["None"] = 0] = "None"; RegularExpressionFlags[RegularExpressionFlags["HasIndices"] = 1] = "HasIndices"; diff --git a/packages/typescript/src/enums/scriptKind.enum.ts b/packages/typescript/src/enums/scriptKind.d.ts similarity index 81% rename from packages/typescript/src/enums/scriptKind.enum.ts rename to packages/typescript/src/enums/scriptKind.d.ts index e5f108ddec05b..dfb5f32a952f6 100644 --- a/packages/typescript/src/enums/scriptKind.enum.ts +++ b/packages/typescript/src/enums/scriptKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/core/scriptkind.go. DO NOT EDIT. -export enum ScriptKind { +export declare enum ScriptKind { Unknown = 0, JS = 1, JSX = 2, diff --git a/packages/typescript/src/enums/scriptKind.ts b/packages/typescript/src/enums/scriptKind.js similarity index 92% rename from packages/typescript/src/enums/scriptKind.ts rename to packages/typescript/src/enums/scriptKind.js index 8dd790c4e0f97..bda99d31b38ce 100644 --- a/packages/typescript/src/enums/scriptKind.ts +++ b/packages/typescript/src/enums/scriptKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/core/scriptkind.go. DO NOT EDIT. -export var ScriptKind: any; +export var ScriptKind; (function (ScriptKind) { ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown"; ScriptKind[ScriptKind["JS"] = 1] = "JS"; diff --git a/packages/typescript/src/enums/scriptTarget.enum.ts b/packages/typescript/src/enums/scriptTarget.d.ts similarity index 86% rename from packages/typescript/src/enums/scriptTarget.enum.ts rename to packages/typescript/src/enums/scriptTarget.d.ts index e1ee6bdb19200..29dc2c3824f11 100644 --- a/packages/typescript/src/enums/scriptTarget.enum.ts +++ b/packages/typescript/src/enums/scriptTarget.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export enum ScriptTarget { +export declare enum ScriptTarget { ES2015 = 2, ES2016 = 3, ES2017 = 4, diff --git a/packages/typescript/src/enums/scriptTarget.ts b/packages/typescript/src/enums/scriptTarget.js similarity index 95% rename from packages/typescript/src/enums/scriptTarget.ts rename to packages/typescript/src/enums/scriptTarget.js index 5532d4886d325..255eff8244de5 100644 --- a/packages/typescript/src/enums/scriptTarget.ts +++ b/packages/typescript/src/enums/scriptTarget.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/options.ts. DO NOT EDIT. -export var ScriptTarget: any; +export var ScriptTarget; (function (ScriptTarget) { ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015"; ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016"; diff --git a/packages/typescript/src/enums/signatureFlags.enum.ts b/packages/typescript/src/enums/signatureFlags.d.ts similarity index 92% rename from packages/typescript/src/enums/signatureFlags.enum.ts rename to packages/typescript/src/enums/signatureFlags.d.ts index 6ec54519a379d..e27d3bb21336c 100644 --- a/packages/typescript/src/enums/signatureFlags.enum.ts +++ b/packages/typescript/src/enums/signatureFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum SignatureFlags { +export declare enum SignatureFlags { None = 0, HasRestParameter = 1 << 0, HasLiteralTypes = 1 << 1, diff --git a/packages/typescript/src/enums/signatureFlags.ts b/packages/typescript/src/enums/signatureFlags.js similarity index 96% rename from packages/typescript/src/enums/signatureFlags.ts rename to packages/typescript/src/enums/signatureFlags.js index 0fdfb94f95e5e..82b07aa2380b0 100644 --- a/packages/typescript/src/enums/signatureFlags.ts +++ b/packages/typescript/src/enums/signatureFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var SignatureFlags: any; +export var SignatureFlags; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["HasRestParameter"] = 1] = "HasRestParameter"; diff --git a/packages/typescript/src/enums/signatureKind.enum.ts b/packages/typescript/src/enums/signatureKind.d.ts similarity index 77% rename from packages/typescript/src/enums/signatureKind.enum.ts rename to packages/typescript/src/enums/signatureKind.d.ts index a9963c9c27b97..e151c01b0ce00 100644 --- a/packages/typescript/src/enums/signatureKind.enum.ts +++ b/packages/typescript/src/enums/signatureKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum SignatureKind { +export declare enum SignatureKind { Call = 0, Construct = 1, } diff --git a/packages/typescript/src/enums/signatureKind.ts b/packages/typescript/src/enums/signatureKind.js similarity index 88% rename from packages/typescript/src/enums/signatureKind.ts rename to packages/typescript/src/enums/signatureKind.js index e58344d712159..5b32c12e259f4 100644 --- a/packages/typescript/src/enums/signatureKind.ts +++ b/packages/typescript/src/enums/signatureKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var SignatureKind: any; +export var SignatureKind; (function (SignatureKind) { SignatureKind[SignatureKind["Call"] = 0] = "Call"; SignatureKind[SignatureKind["Construct"] = 1] = "Construct"; diff --git a/packages/typescript/src/enums/spanMapFeature.enum.ts b/packages/typescript/src/enums/spanMapFeature.d.ts similarity index 91% rename from packages/typescript/src/enums/spanMapFeature.enum.ts rename to packages/typescript/src/enums/spanMapFeature.d.ts index 76e8f7d4966be..d09e0845a5eaa 100644 --- a/packages/typescript/src/enums/spanMapFeature.enum.ts +++ b/packages/typescript/src/enums/spanMapFeature.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export enum SpanMapFeature { +export declare enum SpanMapFeature { Hover = 1 << 0, SignatureHelp = 1 << 1, Completion = 1 << 2, diff --git a/packages/typescript/src/enums/spanMapFeature.ts b/packages/typescript/src/enums/spanMapFeature.js similarity index 96% rename from packages/typescript/src/enums/spanMapFeature.ts rename to packages/typescript/src/enums/spanMapFeature.js index 86495362da735..62c97776de84b 100644 --- a/packages/typescript/src/enums/spanMapFeature.ts +++ b/packages/typescript/src/enums/spanMapFeature.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export var SpanMapFeature: any; +export var SpanMapFeature; (function (SpanMapFeature) { SpanMapFeature[SpanMapFeature["Hover"] = 1] = "Hover"; SpanMapFeature[SpanMapFeature["SignatureHelp"] = 2] = "SignatureHelp"; diff --git a/packages/typescript/src/enums/spanMapFidelity.enum.ts b/packages/typescript/src/enums/spanMapFidelity.d.ts similarity index 79% rename from packages/typescript/src/enums/spanMapFidelity.enum.ts rename to packages/typescript/src/enums/spanMapFidelity.d.ts index 7c57d9424f6d0..aecca9bf10c2f 100644 --- a/packages/typescript/src/enums/spanMapFidelity.enum.ts +++ b/packages/typescript/src/enums/spanMapFidelity.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export enum SpanMapFidelity { +export declare enum SpanMapFidelity { Exact = 0, Atom = 1, Approximate = 2, diff --git a/packages/typescript/src/enums/spanMapFidelity.ts b/packages/typescript/src/enums/spanMapFidelity.js similarity index 91% rename from packages/typescript/src/enums/spanMapFidelity.ts rename to packages/typescript/src/enums/spanMapFidelity.js index bbf6159ede42c..43677f2057a6c 100644 --- a/packages/typescript/src/enums/spanMapFidelity.ts +++ b/packages/typescript/src/enums/spanMapFidelity.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export var SpanMapFidelity: any; +export var SpanMapFidelity; (function (SpanMapFidelity) { SpanMapFidelity[SpanMapFidelity["Exact"] = 0] = "Exact"; SpanMapFidelity[SpanMapFidelity["Atom"] = 1] = "Atom"; diff --git a/packages/typescript/src/enums/spanMapKind.enum.ts b/packages/typescript/src/enums/spanMapKind.d.ts similarity index 79% rename from packages/typescript/src/enums/spanMapKind.enum.ts rename to packages/typescript/src/enums/spanMapKind.d.ts index b9634ee2300cf..7ed1e2bfc36f7 100644 --- a/packages/typescript/src/enums/spanMapKind.enum.ts +++ b/packages/typescript/src/enums/spanMapKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export enum SpanMapKind { +export declare enum SpanMapKind { Verbatim = 0, Atom = 1, Alias = 2, diff --git a/packages/typescript/src/enums/spanMapKind.ts b/packages/typescript/src/enums/spanMapKind.js similarity index 90% rename from packages/typescript/src/enums/spanMapKind.ts rename to packages/typescript/src/enums/spanMapKind.js index ef390d8f7869d..7f1b91f4c8c59 100644 --- a/packages/typescript/src/enums/spanMapKind.ts +++ b/packages/typescript/src/enums/spanMapKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/spanmap/spanmap.go. DO NOT EDIT. -export var SpanMapKind: any; +export var SpanMapKind; (function (SpanMapKind) { SpanMapKind[SpanMapKind["Verbatim"] = 0] = "Verbatim"; SpanMapKind[SpanMapKind["Atom"] = 1] = "Atom"; diff --git a/packages/typescript/src/enums/symbolFlags.enum.ts b/packages/typescript/src/enums/symbolFlags.d.ts similarity index 96% rename from packages/typescript/src/enums/symbolFlags.enum.ts rename to packages/typescript/src/enums/symbolFlags.d.ts index e80234baf2606..18d3a7fcf1948 100644 --- a/packages/typescript/src/enums/symbolFlags.enum.ts +++ b/packages/typescript/src/enums/symbolFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/symbolflags.go. DO NOT EDIT. -export enum SymbolFlags { +export declare enum SymbolFlags { None = 0, FunctionScopedVariable = 1 << 0, BlockScopedVariable = 1 << 1, diff --git a/packages/typescript/src/enums/symbolFlags.ts b/packages/typescript/src/enums/symbolFlags.js similarity index 98% rename from packages/typescript/src/enums/symbolFlags.ts rename to packages/typescript/src/enums/symbolFlags.js index 25f906b3e47d9..8c1e2ae54e2c8 100644 --- a/packages/typescript/src/enums/symbolFlags.ts +++ b/packages/typescript/src/enums/symbolFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/symbolflags.go. DO NOT EDIT. -export var SymbolFlags: any; +export var SymbolFlags; (function (SymbolFlags) { SymbolFlags[SymbolFlags["None"] = 0] = "None"; SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable"; diff --git a/packages/typescript/src/enums/symbolOwnerKind.enum.ts b/packages/typescript/src/enums/symbolOwnerKind.d.ts similarity index 75% rename from packages/typescript/src/enums/symbolOwnerKind.enum.ts rename to packages/typescript/src/enums/symbolOwnerKind.d.ts index 0f743c53ee458..6c6f7be4b0f5a 100644 --- a/packages/typescript/src/enums/symbolOwnerKind.enum.ts +++ b/packages/typescript/src/enums/symbolOwnerKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/api/proto.go. DO NOT EDIT. -export enum SymbolOwnerKind { +export declare enum SymbolOwnerKind { File = 0, Snapshot = 1, } diff --git a/packages/typescript/src/enums/symbolOwnerKind.ts b/packages/typescript/src/enums/symbolOwnerKind.js similarity index 88% rename from packages/typescript/src/enums/symbolOwnerKind.ts rename to packages/typescript/src/enums/symbolOwnerKind.js index 97aae72e18725..266e9fd81968a 100644 --- a/packages/typescript/src/enums/symbolOwnerKind.ts +++ b/packages/typescript/src/enums/symbolOwnerKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/api/proto.go. DO NOT EDIT. -export var SymbolOwnerKind: any; +export var SymbolOwnerKind; (function (SymbolOwnerKind) { SymbolOwnerKind[SymbolOwnerKind["File"] = 0] = "File"; SymbolOwnerKind[SymbolOwnerKind["Snapshot"] = 1] = "Snapshot"; diff --git a/packages/typescript/src/enums/syntaxKind.enum.ts b/packages/typescript/src/enums/syntaxKind.d.ts similarity index 96% rename from packages/typescript/src/enums/syntaxKind.enum.ts rename to packages/typescript/src/enums/syntaxKind.d.ts index 1973373f684f3..6954eb2d393cd 100644 --- a/packages/typescript/src/enums/syntaxKind.enum.ts +++ b/packages/typescript/src/enums/syntaxKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/ast.json. DO NOT EDIT. -export enum SyntaxKind { +export declare enum SyntaxKind { Unknown = 0, EndOfFile = 1, SingleLineCommentTrivia = 2, diff --git a/packages/typescript/src/enums/syntaxKind.ts b/packages/typescript/src/enums/syntaxKind.js similarity index 98% rename from packages/typescript/src/enums/syntaxKind.ts rename to packages/typescript/src/enums/syntaxKind.js index 596eeab49f274..e6be66c97d44e 100644 --- a/packages/typescript/src/enums/syntaxKind.ts +++ b/packages/typescript/src/enums/syntaxKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tools/scripts/tsc/ast.json. DO NOT EDIT. -export var SyntaxKind: any; +export var SyntaxKind; (function (SyntaxKind) { SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown"; SyntaxKind[SyntaxKind["EndOfFile"] = 1] = "EndOfFile"; diff --git a/packages/typescript/src/enums/tokenFlags.enum.ts b/packages/typescript/src/enums/tokenFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/tokenFlags.enum.ts rename to packages/typescript/src/enums/tokenFlags.d.ts index 688147408b0ac..9a7b4ce54a782 100644 --- a/packages/typescript/src/enums/tokenFlags.enum.ts +++ b/packages/typescript/src/enums/tokenFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/tokenflags.go. DO NOT EDIT. -export enum TokenFlags { +export declare enum TokenFlags { None = 0, PrecedingLineBreak = 1 << 0, PrecedingJSDocComment = 1 << 1, diff --git a/packages/typescript/src/enums/tokenFlags.ts b/packages/typescript/src/enums/tokenFlags.js similarity index 97% rename from packages/typescript/src/enums/tokenFlags.ts rename to packages/typescript/src/enums/tokenFlags.js index fe13478dd1021..c1b3efff6b514 100644 --- a/packages/typescript/src/enums/tokenFlags.ts +++ b/packages/typescript/src/enums/tokenFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/ast/tokenflags.go. DO NOT EDIT. -export var TokenFlags: any; +export var TokenFlags; (function (TokenFlags) { TokenFlags[TokenFlags["None"] = 0] = "None"; TokenFlags[TokenFlags["PrecedingLineBreak"] = 1] = "PrecedingLineBreak"; diff --git a/packages/typescript/src/enums/typeFlags.enum.ts b/packages/typescript/src/enums/typeFlags.d.ts similarity index 97% rename from packages/typescript/src/enums/typeFlags.enum.ts rename to packages/typescript/src/enums/typeFlags.d.ts index 282cbcfe49406..34a3f63289916 100644 --- a/packages/typescript/src/enums/typeFlags.enum.ts +++ b/packages/typescript/src/enums/typeFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum TypeFlags { +export declare enum TypeFlags { None = 0, Any = 1 << 0, Unknown = 1 << 1, diff --git a/packages/typescript/src/enums/typeFlags.ts b/packages/typescript/src/enums/typeFlags.js similarity index 98% rename from packages/typescript/src/enums/typeFlags.ts rename to packages/typescript/src/enums/typeFlags.js index e1e8432972020..170a906ece4e2 100644 --- a/packages/typescript/src/enums/typeFlags.ts +++ b/packages/typescript/src/enums/typeFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var TypeFlags: any; +export var TypeFlags; (function (TypeFlags) { TypeFlags[TypeFlags["None"] = 0] = "None"; TypeFlags[TypeFlags["Any"] = 1] = "Any"; diff --git a/packages/typescript/src/enums/typeFormatFlags.enum.ts b/packages/typescript/src/enums/typeFormatFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/typeFormatFlags.enum.ts rename to packages/typescript/src/enums/typeFormatFlags.d.ts index a4da6175aac15..d42e0ceca9050 100644 --- a/packages/typescript/src/enums/typeFormatFlags.enum.ts +++ b/packages/typescript/src/enums/typeFormatFlags.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum TypeFormatFlags { +export declare enum TypeFormatFlags { None = 0, NoTruncation = 1 << 0, WriteArrayAsGenericType = 1 << 1, diff --git a/packages/typescript/src/enums/typeFormatFlags.ts b/packages/typescript/src/enums/typeFormatFlags.js similarity index 97% rename from packages/typescript/src/enums/typeFormatFlags.ts rename to packages/typescript/src/enums/typeFormatFlags.js index a2867d17303c1..ad7c2b9e8760f 100644 --- a/packages/typescript/src/enums/typeFormatFlags.ts +++ b/packages/typescript/src/enums/typeFormatFlags.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var TypeFormatFlags: any; +export var TypeFormatFlags; (function (TypeFormatFlags) { TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None"; TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 1] = "NoTruncation"; diff --git a/packages/typescript/src/enums/typePredicateKind.enum.ts b/packages/typescript/src/enums/typePredicateKind.d.ts similarity index 79% rename from packages/typescript/src/enums/typePredicateKind.enum.ts rename to packages/typescript/src/enums/typePredicateKind.d.ts index bbcc31af12ab0..16ad7c3148716 100644 --- a/packages/typescript/src/enums/typePredicateKind.enum.ts +++ b/packages/typescript/src/enums/typePredicateKind.d.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export enum TypePredicateKind { +export declare enum TypePredicateKind { This = 0, Identifier = 1, AssertsThis = 2, diff --git a/packages/typescript/src/enums/typePredicateKind.ts b/packages/typescript/src/enums/typePredicateKind.js similarity index 91% rename from packages/typescript/src/enums/typePredicateKind.ts rename to packages/typescript/src/enums/typePredicateKind.js index d3b0199e0b673..3788298dfe00d 100644 --- a/packages/typescript/src/enums/typePredicateKind.ts +++ b/packages/typescript/src/enums/typePredicateKind.js @@ -1,5 +1,5 @@ // Code generated by tools/scripts/tsc/generate-enums.ts from tsc/internal/checker/types.go. DO NOT EDIT. -export var TypePredicateKind: any; +export var TypePredicateKind; (function (TypePredicateKind) { TypePredicateKind[TypePredicateKind["This"] = 0] = "This"; TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier"; diff --git a/packages/typescript/test/enums.test.ts b/packages/typescript/test/enums.test.ts new file mode 100644 index 0000000000000..6f00fa4cd70f1 --- /dev/null +++ b/packages/typescript/test/enums.test.ts @@ -0,0 +1,29 @@ +import assert from "node:assert/strict"; +import { test } from "node:test"; +import { ScriptKind as ProtocolScriptKind } from "../src/api/proto.ts"; +import { ScriptKind as ASTScriptKind } from "../src/ast/index.ts"; +import { InternalSymbolName } from "../src/enums/internalSymbolName.js"; +import { ScriptKind } from "../src/enums/scriptKind.js"; +import { ScriptTarget } from "../src/enums/scriptTarget.js"; + +test("enum modules preserve runtime values, reverse mappings, and shared identity", () => { + const kind: ScriptKind.TS = ScriptKind.TS; + assert.equal(kind, 3); + assert.equal(ScriptKind[kind], "TS"); + assert.equal(ScriptTarget.Latest, ScriptTarget.ESNext); + assert.equal(InternalSymbolName.Call, "__call"); + assert.strictEqual(ProtocolScriptKind, ScriptKind); + assert.strictEqual(ASTScriptKind, ScriptKind); +}); + +test("enum declarations preserve enum and member types", () => { + // @ts-expect-error Values outside the enum are not assignable. + const invalid: ScriptKind = 123; + // @ts-expect-error Distinct enum members are not assignable. + const wrongMember: ScriptKind.TS = ScriptKind.JS; + // @ts-expect-error String enums do not accept plain strings. + const plainString: InternalSymbolName = "__call"; + assert.equal(invalid, 123); + assert.equal(wrongMember, ScriptKind.JS); + assert.equal(plainString, "__call"); +}); diff --git a/packages/typescript/test/proto.test.ts b/packages/typescript/test/proto.test.ts index 18bd6d9a3dec7..48df9357047b4 100644 --- a/packages/typescript/test/proto.test.ts +++ b/packages/typescript/test/proto.test.ts @@ -14,7 +14,7 @@ import type { PathKey, RootedFilePath, } from "../src/ast/index.ts"; -import { SymbolOwnerKind } from "../src/enums/symbolOwnerKind.ts"; +import { SymbolOwnerKind } from "../src/enums/symbolOwnerKind.js"; test("symbol ownership protocol validation rejects mixed variants", () => { const project = "/tsconfig.json" as ProjectId; diff --git a/packages/typescript/test/version.test.ts b/packages/typescript/test/version.test.ts index a2630f570a209..e7f9d5a2955a7 100644 --- a/packages/typescript/test/version.test.ts +++ b/packages/typescript/test/version.test.ts @@ -1,9 +1,9 @@ -import getExePath from "#getExePath"; import { versionMajorMinor } from "@typescript/typescript"; import assert from "node:assert"; import { execFileSync } from "node:child_process"; import { readFileSync } from "node:fs"; import { test } from "node:test"; +import getExePath from "../lib/getExePath.js"; test("versionMajorMinor runtime and declaration match the compiler version", () => { const compilerVersion = execFileSync(getExePath(), ["--version"], { encoding: "utf8" }) diff --git a/tools/gen-proto/main.go b/tools/gen-proto/main.go index 834a17a7d89a0..5690b941dea1c 100644 --- a/tools/gen-proto/main.go +++ b/tools/gen-proto/main.go @@ -500,7 +500,7 @@ func (r *typeRenderer) namedType(named *types.Named) string { case r.apiPackagePath + ".EnsurePrograms": return "EnsurePrograms" case r.apiPackagePath + ".SymbolOwnerKind": - return r.importType("SymbolOwnerKind", "#enums/symbolOwnerKind") + return r.importType("SymbolOwnerKind", "../enums/symbolOwnerKind.js") case "github.com/microsoft/TypeScript/tsc/internal/project.ID": r.importTypeOnly("PathKey", "../ast/index.ts") return "ProjectId" @@ -523,19 +523,19 @@ func (r *typeRenderer) namedType(named *types.Named) string { case "github.com/microsoft/TypeScript/tsc/internal/ls/lsutil.UserPreferences": return r.importTypeOnly(obj.Name(), "./userPreferences.generated.ts") case "github.com/microsoft/TypeScript/tsc/internal/core.JsxEmit": - return r.importType("JsxEmit", "#enums/jsxEmit") + return r.importType("JsxEmit", "../enums/jsxEmit.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleDetectionKind": - return r.importType("ModuleDetectionKind", "#enums/moduleDetectionKind") + return r.importType("ModuleDetectionKind", "../enums/moduleDetectionKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleKind": - return r.importType("ModuleKind", "#enums/moduleKind") + return r.importType("ModuleKind", "../enums/moduleKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleResolutionKind": - return r.importType("ModuleResolutionKind", "#enums/moduleResolutionKind") + return r.importType("ModuleResolutionKind", "../enums/moduleResolutionKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.NewLineKind": - return r.importType("NewLineKind", "#enums/newLineKind") + return r.importType("NewLineKind", "../enums/newLineKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ScriptTarget": - return r.importType("ScriptTarget", "#enums/scriptTarget") + return r.importType("ScriptTarget", "../enums/scriptTarget.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ScriptKind": - return r.importType("ScriptKind", "#enums/scriptKind") + return r.importType("ScriptKind", "../enums/scriptKind.js") case "github.com/microsoft/TypeScript/tsc/internal/tspath.RootedPath": return r.importTypeOnly("RootedPath", "../ast/index.ts") case "github.com/microsoft/TypeScript/tsc/internal/tspath.RootedFilePath": @@ -545,7 +545,7 @@ func (r *typeRenderer) namedType(named *types.Named) string { case "github.com/microsoft/TypeScript/tsc/internal/tspath.PathKey": return r.importTypeOnly("PathKey", "../ast/index.ts") case "github.com/microsoft/TypeScript/tsc/internal/tspath.CaseSensitivity": - return r.importType("CaseSensitivity", "#enums/caseSensitivity") + return r.importType("CaseSensitivity", "../enums/caseSensitivity.js") case "github.com/microsoft/TypeScript/tsc/internal/tsoptions.RawCompilerOptions": r.rawCompilerOptions = obj compilerOptions := r.packages["github.com/microsoft/TypeScript/tsc/internal/core"].Types.Scope().Lookup("CompilerOptions").(*types.TypeName) diff --git a/tools/gen-proto/main_test.go b/tools/gen-proto/main_test.go index 6a7cdb969ce43..423e46992bbc7 100644 --- a/tools/gen-proto/main_test.go +++ b/tools/gen-proto/main_test.go @@ -62,7 +62,7 @@ func TestGenerate(t *testing.T) { `export interface SourceFileDescriptor { fileName: RootedFilePath; path: PathKey;`, - `import { SymbolOwnerKind } from "#enums/symbolOwnerKind";`, + `import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js";`, `kind: SymbolOwnerKind;`, `/** InitializeResponse is returned by the initialize method. */ export interface InitializeResponse`, diff --git a/tools/scripts/gen/generatedFile.test.mts b/tools/scripts/gen/generatedFile.test.mts index d063b8d098b22..e1b98ce555212 100644 --- a/tools/scripts/gen/generatedFile.test.mts +++ b/tools/scripts/gen/generatedFile.test.mts @@ -357,7 +357,7 @@ test("generate:go runs Go generators directly and shares caches with Go fallback const generate = () => x("npx", ["hereby", "generate:go"], { throwOnError: true, nodeOptions: { cwd: root } }); const first = await generate(); assert.doesNotMatch(first.stdout, /\$ go generate|npm run --silent cache|\$ node .*generate-unicode-data/); - const files = fs.globSync(["tsc/internal/**/*generated.go", "packages/typescript/src/api/*.generated.ts", "packages/typescript/src/enums/*.ts", "packages/typescript/schemas/*.schema.json"], { cwd: root }); + const files = fs.globSync(["tsc/internal/**/*generated.go", "packages/typescript/src/api/*.generated.ts", "packages/typescript/src/enums/*.{js,ts}", "packages/typescript/schemas/*.schema.json"], { cwd: root }); const timestamps = files.map(file => fs.statSync(path.join(root, file)).mtimeMs); const current = await generate(); assert.doesNotMatch(current.stdout, /Generated codegen outputs|Generated Unicode tables/); @@ -812,7 +812,7 @@ test("enum generation skips unchanged outputs and Go verification", async () => const generate = (force = false) => x("npx", ["hereby", "generate:enums", ...(force ? ["--force"] : [])], { throwOnError: true, nodeOptions: { cwd: root } }); await generate(); const files = [ - ...fs.globSync("packages/typescript/src/enums/*.ts", { cwd: root }), + ...fs.globSync("packages/typescript/src/enums/*.{js,ts}", { cwd: root }), "tsc/internal/api/enum_values_generated.go", ].map(file => path.join(root, file)); const timestamps = files.map(file => fs.statSync(file).mtimeMs); diff --git a/tools/scripts/tsc/generate-enums.ts b/tools/scripts/tsc/generate-enums.ts index 757f598fa88c6..05cd86f108933 100644 --- a/tools/scripts/tsc/generate-enums.ts +++ b/tools/scripts/tsc/generate-enums.ts @@ -493,8 +493,8 @@ export default async function generateEnums(force = false) { return { def, camelName, - typeFile: new GeneratedFile(path.join(ROOT, def.outDir, `${camelName}.enum.ts`), enumInputs), - runtimeFile: new GeneratedFile(path.join(ROOT, def.outDir, `${camelName}.ts`), enumInputs), + typeFile: new GeneratedFile(path.join(ROOT, def.outDir, `${camelName}.d.ts`), enumInputs), + runtimeFile: new GeneratedFile(path.join(ROOT, def.outDir, `${camelName}.js`), enumInputs), }; }); const generatedGoFile = new GeneratedFile(enumValuesGeneratedGoPath, [...inputs, ...enumDefs.map(def => path.join(ROOT, def.goFile))]); @@ -513,25 +513,15 @@ export default async function generateEnums(force = false) { }, }).outputText; } - function convertEnumToTs(enumSource: string, enumName: string): string { - return enumSource.replace( - `export var ${enumName};`, - `export var ${enumName}: any;`, - ); - } - console.log("Generating enums from metadata and Go source..."); const generatedEnums: GeneratedEnum[] = []; for (const { def, camelName, typeFile, runtimeFile } of enumFiles) { const { members, code: enumTS } = generateEnum(def); - // Generate .enum.ts (TypeScript enum — used for types) - typeFile.write(enumTS); + typeFile.write(enumTS.replace("export enum ", "export declare enum ")); - // Generate .ts (IIFE — used at runtime) const enumJsCode = transpile(enumTS); - const iifeSource = convertEnumToTs(enumJsCode, def.name); - runtimeFile.write(iifeSource); + runtimeFile.write(enumJsCode); generatedEnums.push({ code: enumJsCode, def, @@ -539,7 +529,7 @@ export default async function generateEnums(force = false) { fileNames: [typeFile.fileName, runtimeFile.fileName], }); - console.log(` ${def.name}: ${members.length} members → ${camelName}.enum.ts, ${camelName}.ts`); + console.log(` ${def.name}: ${members.length} members → ${camelName}.d.ts, ${camelName}.js`); } console.log("Getting values from go"); diff --git a/tools/scripts/tsc/generate-options.ts b/tools/scripts/tsc/generate-options.ts index 0ee304c803521..83305845b76ec 100644 --- a/tools/scripts/tsc/generate-options.ts +++ b/tools/scripts/tsc/generate-options.ts @@ -235,10 +235,10 @@ export function generateCompilerOptionsAPI(model = options): string { const enumNames = [...imports].sort(); const pathTypes = enumNames.filter(name => name.startsWith("Rooted")); const optionEnums = enumNames.filter(name => !name.startsWith("Rooted")); - const enumPath = (name: string) => `#enums/${name[0].toLowerCase() + name.slice(1)}`; + const enumPath = (name: string) => `../enums/${name[0].toLowerCase() + name.slice(1)}.js`; return `${header} -${optionEnums.map(name => `import type { ${name} } from "${enumPath(name)}";`).join("\n")} ${pathTypes.length ? `import type {\n ${pathTypes.join(",\n ")},\n} from "../ast/index.ts";` : ""} +${optionEnums.map(name => `import type { ${name} } from "${enumPath(name)}";`).join("\n")} ${optionEnums.map(name => `export { ${name} } from "${enumPath(name)}";`).join("\n")} diff --git a/tools/scripts/tsc/generate-ts-ast.ts b/tools/scripts/tsc/generate-ts-ast.ts index 4414e14148881..04d1f00314d21 100644 --- a/tools/scripts/tsc/generate-ts-ast.ts +++ b/tools/scripts/tsc/generate-ts-ast.ts @@ -426,10 +426,10 @@ function generateAstGenerated(): string { astImports.sort((a, b) => a.localeCompare(b)); const header = `// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import type { ModifierFlags } from "#enums/modifierFlags"; -import type { NodeFlags } from "#enums/nodeFlags"; -import { SyntaxKind } from "#enums/syntaxKind"; -import { TokenFlags } from "#enums/tokenFlags"; +import type { ModifierFlags } from "../enums/modifierFlags.js"; +import type { NodeFlags } from "../enums/nodeFlags.js"; +import { SyntaxKind } from "../enums/syntaxKind.js"; +import { TokenFlags } from "../enums/tokenFlags.js"; import type { ${astImports.join(", ")} } from "./ast.ts";`; return [header, body].join(eol); @@ -655,9 +655,9 @@ function generateFactory(): string { // ── Header ── out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(""); - out.push(`import { NodeFlags } from "#enums/nodeFlags";`); - out.push(`import { SyntaxKind } from "#enums/syntaxKind";`); - out.push(`import { TokenFlags } from "#enums/tokenFlags";`); + out.push(`import { NodeFlags } from "../enums/nodeFlags.js";`); + out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); + out.push(`import { TokenFlags } from "../enums/tokenFlags.js";`); const sortedImports = [...importTypes].sort((a, b) => a.localeCompare(b)); out.push(`import type {`); @@ -1526,7 +1526,7 @@ function generateIsGenerated(): string { // ── Build output ── out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(``); - out.push(`import { SyntaxKind } from "#enums/syntaxKind";`); + out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); const sortedImports = [...importTypes].sort((a, b) => a.localeCompare(b)); out.push(`import type {`); for (const t of sortedImports) { @@ -1656,7 +1656,7 @@ function generateVisitor(): string { out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(""); - out.push(`import { SyntaxKind } from "#enums/syntaxKind";`); + out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); out.push(`import type {`); for (const typeName of [...typeImports].sort((a, b) => a.localeCompare(b))) { out.push(` ${typeName},`); diff --git a/tools/scripts/tsc/options.test.ts b/tools/scripts/tsc/options.test.ts index 8d647eeb2d906..27c9827bdb056 100644 --- a/tools/scripts/tsc/options.test.ts +++ b/tools/scripts/tsc/options.test.ts @@ -171,8 +171,8 @@ test("metadata enum artifacts are current and use the shared alias ordering", () for (const def of enumDefs.filter(def => def.metadata)) { const { code } = generateEnum(def); const name = def.name[0].toLowerCase() + def.name.slice(1); - const actual = fs.readFileSync(path.join(repoRoot, def.outDir, `${name}.enum.ts`), "utf8"); - assert.equal(actual.replaceAll("\r\n", "\n"), code, def.name); + const actual = fs.readFileSync(path.join(repoRoot, def.outDir, `${name}.d.ts`), "utf8"); + assert.equal(actual.replaceAll("\r\n", "\n"), code.replace("export enum ", "export declare enum "), def.name); } const def = enumDefs.find(def => def.name === "SyntaxKind")!; const { members } = generateEnum({ From bad723905ce8142dd755ec127199fff0b97783c5 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 19 Oct 2026 15:35:05 -0700 Subject: [PATCH 2/4] Validate that the packed output contains all the enums --- Herebyfile.mjs | 14 ++++++++++++- packages/typescript/README.md | 7 ------- packages/typescript/test/enums.test.ts | 29 -------------------------- 3 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 packages/typescript/test/enums.test.ts diff --git a/Herebyfile.mjs b/Herebyfile.mjs index be2c0d5541e6e..4c99fad51ad7d 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -2532,9 +2532,10 @@ async function testNativePreviewPackage(platforms) { const { stdout } = await runOutput("npm", ["pack", "--dry-run", "--json", mainPackageDir]); /** @type {{ files: { path: string }[] }[]} */ const packed = JSON.parse(stdout); + const packedFiles = new Set(packed[0].files.map(file => file.path)); for (const name of ["tsconfig", "jsconfig"]) { const schemaPath = `schemas/${name}.schema.json`; - assert(packed[0].files.some(file => file.path === schemaPath), `Package is missing ${schemaPath}`); + assert(packedFiles.has(schemaPath), `Package is missing ${schemaPath}`); assert.deepEqual( await fs.promises.readFile(path.join(mainPackageDir, schemaPath)), await fs.promises.readFile(path.join("packages/typescript", schemaPath)), @@ -2542,6 +2543,17 @@ async function testNativePreviewPackage(platforms) { assert.equal(require.resolve(`${mainNativePreviewPackage.npmPackageName}/${schemaPath}`), path.join(mainPackageDir, schemaPath)); } + const enumSourceDir = path.resolve("packages/typescript/src/enums"); + for (const file of await fs.promises.readdir(enumSourceDir)) { + const enumPath = `dist/enums/${file}`; + assert(packedFiles.has(enumPath), `Package is missing ${enumPath}`); + assert.deepEqual( + await fs.promises.readFile(path.join(mainPackageDir, enumPath)), + await fs.promises.readFile(path.join(enumSourceDir, file)), + `Packaged ${enumPath} does not match its source`, + ); + } + const binName = publishAsTypescript ? "tsc" : "tsgo"; const binPath = path.join(mainPackageDir, "bin", binName); const { stdout: versionOutput } = await runOutput(process.execPath, [binPath, "--version"]); diff --git a/packages/typescript/README.md b/packages/typescript/README.md index caec642de63fb..e6d01cd5c4736 100644 --- a/packages/typescript/README.md +++ b/packages/typescript/README.md @@ -21,10 +21,3 @@ npx tsgo --help The native port of TypeScript is still in progress. We expect many gaps, but are seeking experimentation and feedback. If you have found differences that are not yet known, we encourage you to leave feedback on [the issue tracker](https://github.com/microsoft/TypeScript/tsc/issues). - -## Development - -Enums in `src/enums` are represented as `.js` / `.d.ts` pairs. Import them using relative `.js` paths: -TypeScript resolves the enum declarations, while Node loads the JavaScript implementations without a build or enum transformation. -Most are generated from metadata and Go source; run `npx hereby generate:enums` from the repository root to regenerate those pairs. -The package build scripts copy both files into `dist/enums`, since TypeScript does not emit input declaration files. diff --git a/packages/typescript/test/enums.test.ts b/packages/typescript/test/enums.test.ts deleted file mode 100644 index 6f00fa4cd70f1..0000000000000 --- a/packages/typescript/test/enums.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import assert from "node:assert/strict"; -import { test } from "node:test"; -import { ScriptKind as ProtocolScriptKind } from "../src/api/proto.ts"; -import { ScriptKind as ASTScriptKind } from "../src/ast/index.ts"; -import { InternalSymbolName } from "../src/enums/internalSymbolName.js"; -import { ScriptKind } from "../src/enums/scriptKind.js"; -import { ScriptTarget } from "../src/enums/scriptTarget.js"; - -test("enum modules preserve runtime values, reverse mappings, and shared identity", () => { - const kind: ScriptKind.TS = ScriptKind.TS; - assert.equal(kind, 3); - assert.equal(ScriptKind[kind], "TS"); - assert.equal(ScriptTarget.Latest, ScriptTarget.ESNext); - assert.equal(InternalSymbolName.Call, "__call"); - assert.strictEqual(ProtocolScriptKind, ScriptKind); - assert.strictEqual(ASTScriptKind, ScriptKind); -}); - -test("enum declarations preserve enum and member types", () => { - // @ts-expect-error Values outside the enum are not assignable. - const invalid: ScriptKind = 123; - // @ts-expect-error Distinct enum members are not assignable. - const wrongMember: ScriptKind.TS = ScriptKind.JS; - // @ts-expect-error String enums do not accept plain strings. - const plainString: InternalSymbolName = "__call"; - assert.equal(invalid, 123); - assert.equal(wrongMember, ScriptKind.JS); - assert.equal(plainString, "__call"); -}); From f529bb0e8c1f39ca69de27359f3808d5dfde25b0 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 19 Oct 2026 15:46:03 -0700 Subject: [PATCH 3/4] Move to top-level directory instead of copying --- Herebyfile.mjs | 14 +---- .../{src => }/enums/caseSensitivity.d.ts | 0 .../{src => }/enums/caseSensitivity.js | 0 .../{src => }/enums/characterCodes.d.ts | 0 .../{src => }/enums/characterCodes.js | 0 .../{src => }/enums/checkFlags.d.ts | 0 .../typescript/{src => }/enums/checkFlags.js | 0 .../{src => }/enums/commentDirectiveType.d.ts | 0 .../{src => }/enums/commentDirectiveType.js | 0 .../{src => }/enums/completionItemKind.d.ts | 0 .../{src => }/enums/completionItemKind.js | 0 .../{src => }/enums/diagnosticCategory.d.ts | 0 .../{src => }/enums/diagnosticCategory.js | 0 .../enums/diagnosticDirectivePolicy.d.ts | 0 .../enums/diagnosticDirectivePolicy.js | 0 .../{src => }/enums/elementFlags.d.ts | 0 .../{src => }/enums/elementFlags.js | 0 .../typescript/{src => }/enums/emitOnly.d.ts | 0 .../typescript/{src => }/enums/emitOnly.js | 0 .../typescript/{src => }/enums/indexKind.d.ts | 0 .../typescript/{src => }/enums/indexKind.js | 0 .../{src => }/enums/internalSymbolName.d.ts | 0 .../{src => }/enums/internalSymbolName.js | 0 .../{src => }/enums/jsDeclarationKind.d.ts | 0 .../{src => }/enums/jsDeclarationKind.js | 0 .../typescript/{src => }/enums/jsxEmit.d.ts | 0 .../typescript/{src => }/enums/jsxEmit.js | 0 .../{src => }/enums/languageVariant.d.ts | 0 .../{src => }/enums/languageVariant.js | 0 .../{src => }/enums/modifierFlags.d.ts | 0 .../{src => }/enums/modifierFlags.js | 0 .../{src => }/enums/moduleDetectionKind.d.ts | 0 .../{src => }/enums/moduleDetectionKind.js | 0 .../{src => }/enums/moduleKind.d.ts | 0 .../typescript/{src => }/enums/moduleKind.js | 0 .../{src => }/enums/moduleResolutionKind.d.ts | 0 .../{src => }/enums/moduleResolutionKind.js | 0 .../{src => }/enums/newLineKind.d.ts | 0 .../typescript/{src => }/enums/newLineKind.js | 0 .../{src => }/enums/nodeBuilderFlags.d.ts | 0 .../{src => }/enums/nodeBuilderFlags.js | 0 .../typescript/{src => }/enums/nodeFlags.d.ts | 0 .../typescript/{src => }/enums/nodeFlags.js | 0 .../{src => }/enums/objectFlags.d.ts | 0 .../typescript/{src => }/enums/objectFlags.js | 0 .../{src => }/enums/outerExpressionKinds.d.ts | 0 .../{src => }/enums/outerExpressionKinds.js | 0 .../enums/regularExpressionFlags.d.ts | 0 .../{src => }/enums/regularExpressionFlags.js | 0 .../{src => }/enums/scriptKind.d.ts | 0 .../typescript/{src => }/enums/scriptKind.js | 0 .../{src => }/enums/scriptTarget.d.ts | 0 .../{src => }/enums/scriptTarget.js | 0 .../{src => }/enums/signatureFlags.d.ts | 0 .../{src => }/enums/signatureFlags.js | 0 .../{src => }/enums/signatureKind.d.ts | 0 .../{src => }/enums/signatureKind.js | 0 .../{src => }/enums/spanMapFeature.d.ts | 0 .../{src => }/enums/spanMapFeature.js | 0 .../{src => }/enums/spanMapFidelity.d.ts | 0 .../{src => }/enums/spanMapFidelity.js | 0 .../{src => }/enums/spanMapKind.d.ts | 0 .../typescript/{src => }/enums/spanMapKind.js | 0 .../{src => }/enums/symbolFlags.d.ts | 0 .../typescript/{src => }/enums/symbolFlags.js | 0 .../{src => }/enums/symbolOwnerKind.d.ts | 0 .../{src => }/enums/symbolOwnerKind.js | 0 .../{src => }/enums/syntaxKind.d.ts | 0 .../typescript/{src => }/enums/syntaxKind.js | 0 .../{src => }/enums/tokenFlags.d.ts | 0 .../typescript/{src => }/enums/tokenFlags.js | 0 .../typescript/{src => }/enums/typeFlags.d.ts | 0 .../typescript/{src => }/enums/typeFlags.js | 0 .../{src => }/enums/typeFormatFlags.d.ts | 0 .../{src => }/enums/typeFormatFlags.js | 0 .../{src => }/enums/typePredicateKind.d.ts | 0 .../{src => }/enums/typePredicateKind.js | 0 packages/typescript/package.json | 5 +- packages/typescript/scripts/copyEnums.mjs | 3 - packages/typescript/src/api/async/api.ts | 40 ++++++------- packages/typescript/src/api/async/types.ts | 10 ++-- .../src/api/compilerOptions.generated.ts | 24 ++++---- packages/typescript/src/api/path.ts | 4 +- .../typescript/src/api/proto.generated.ts | 36 ++++++------ packages/typescript/src/api/proto.ts | 2 +- packages/typescript/src/api/sync/api.ts | 40 ++++++------- packages/typescript/src/api/sync/types.ts | 10 ++-- packages/typescript/src/ast/ast.generated.ts | 8 +-- packages/typescript/src/ast/ast.ts | 16 ++--- packages/typescript/src/ast/astnav.ts | 4 +- packages/typescript/src/ast/clone.ts | 2 +- .../typescript/src/ast/factory.generated.ts | 6 +- packages/typescript/src/ast/index.ts | 30 +++++----- packages/typescript/src/ast/is.generated.ts | 2 +- packages/typescript/src/ast/is.ts | 10 ++-- packages/typescript/src/ast/modifiers.ts | 4 +- packages/typescript/src/ast/scanner.ts | 14 ++--- packages/typescript/src/ast/spanMap.ts | 6 +- packages/typescript/src/ast/utils.ts | 12 ++-- .../typescript/src/ast/visitor.generated.ts | 2 +- packages/typescript/src/ast/visitor.ts | 2 +- packages/typescript/test/proto.test.ts | 2 +- tools/gen-proto/main.go | 18 +++--- tools/gen-proto/main_test.go | 2 +- tools/scripts/gen/generatedFile.test.mts | 4 +- tools/scripts/tsc/generate-enums.ts | 58 +++++++++---------- tools/scripts/tsc/generate-options.ts | 4 +- tools/scripts/tsc/generate-ts-ast.ts | 18 +++--- 108 files changed, 199 insertions(+), 213 deletions(-) rename packages/typescript/{src => }/enums/caseSensitivity.d.ts (100%) rename packages/typescript/{src => }/enums/caseSensitivity.js (100%) rename packages/typescript/{src => }/enums/characterCodes.d.ts (100%) rename packages/typescript/{src => }/enums/characterCodes.js (100%) rename packages/typescript/{src => }/enums/checkFlags.d.ts (100%) rename packages/typescript/{src => }/enums/checkFlags.js (100%) rename packages/typescript/{src => }/enums/commentDirectiveType.d.ts (100%) rename packages/typescript/{src => }/enums/commentDirectiveType.js (100%) rename packages/typescript/{src => }/enums/completionItemKind.d.ts (100%) rename packages/typescript/{src => }/enums/completionItemKind.js (100%) rename packages/typescript/{src => }/enums/diagnosticCategory.d.ts (100%) rename packages/typescript/{src => }/enums/diagnosticCategory.js (100%) rename packages/typescript/{src => }/enums/diagnosticDirectivePolicy.d.ts (100%) rename packages/typescript/{src => }/enums/diagnosticDirectivePolicy.js (100%) rename packages/typescript/{src => }/enums/elementFlags.d.ts (100%) rename packages/typescript/{src => }/enums/elementFlags.js (100%) rename packages/typescript/{src => }/enums/emitOnly.d.ts (100%) rename packages/typescript/{src => }/enums/emitOnly.js (100%) rename packages/typescript/{src => }/enums/indexKind.d.ts (100%) rename packages/typescript/{src => }/enums/indexKind.js (100%) rename packages/typescript/{src => }/enums/internalSymbolName.d.ts (100%) rename packages/typescript/{src => }/enums/internalSymbolName.js (100%) rename packages/typescript/{src => }/enums/jsDeclarationKind.d.ts (100%) rename packages/typescript/{src => }/enums/jsDeclarationKind.js (100%) rename packages/typescript/{src => }/enums/jsxEmit.d.ts (100%) rename packages/typescript/{src => }/enums/jsxEmit.js (100%) rename packages/typescript/{src => }/enums/languageVariant.d.ts (100%) rename packages/typescript/{src => }/enums/languageVariant.js (100%) rename packages/typescript/{src => }/enums/modifierFlags.d.ts (100%) rename packages/typescript/{src => }/enums/modifierFlags.js (100%) rename packages/typescript/{src => }/enums/moduleDetectionKind.d.ts (100%) rename packages/typescript/{src => }/enums/moduleDetectionKind.js (100%) rename packages/typescript/{src => }/enums/moduleKind.d.ts (100%) rename packages/typescript/{src => }/enums/moduleKind.js (100%) rename packages/typescript/{src => }/enums/moduleResolutionKind.d.ts (100%) rename packages/typescript/{src => }/enums/moduleResolutionKind.js (100%) rename packages/typescript/{src => }/enums/newLineKind.d.ts (100%) rename packages/typescript/{src => }/enums/newLineKind.js (100%) rename packages/typescript/{src => }/enums/nodeBuilderFlags.d.ts (100%) rename packages/typescript/{src => }/enums/nodeBuilderFlags.js (100%) rename packages/typescript/{src => }/enums/nodeFlags.d.ts (100%) rename packages/typescript/{src => }/enums/nodeFlags.js (100%) rename packages/typescript/{src => }/enums/objectFlags.d.ts (100%) rename packages/typescript/{src => }/enums/objectFlags.js (100%) rename packages/typescript/{src => }/enums/outerExpressionKinds.d.ts (100%) rename packages/typescript/{src => }/enums/outerExpressionKinds.js (100%) rename packages/typescript/{src => }/enums/regularExpressionFlags.d.ts (100%) rename packages/typescript/{src => }/enums/regularExpressionFlags.js (100%) rename packages/typescript/{src => }/enums/scriptKind.d.ts (100%) rename packages/typescript/{src => }/enums/scriptKind.js (100%) rename packages/typescript/{src => }/enums/scriptTarget.d.ts (100%) rename packages/typescript/{src => }/enums/scriptTarget.js (100%) rename packages/typescript/{src => }/enums/signatureFlags.d.ts (100%) rename packages/typescript/{src => }/enums/signatureFlags.js (100%) rename packages/typescript/{src => }/enums/signatureKind.d.ts (100%) rename packages/typescript/{src => }/enums/signatureKind.js (100%) rename packages/typescript/{src => }/enums/spanMapFeature.d.ts (100%) rename packages/typescript/{src => }/enums/spanMapFeature.js (100%) rename packages/typescript/{src => }/enums/spanMapFidelity.d.ts (100%) rename packages/typescript/{src => }/enums/spanMapFidelity.js (100%) rename packages/typescript/{src => }/enums/spanMapKind.d.ts (100%) rename packages/typescript/{src => }/enums/spanMapKind.js (100%) rename packages/typescript/{src => }/enums/symbolFlags.d.ts (100%) rename packages/typescript/{src => }/enums/symbolFlags.js (100%) rename packages/typescript/{src => }/enums/symbolOwnerKind.d.ts (100%) rename packages/typescript/{src => }/enums/symbolOwnerKind.js (100%) rename packages/typescript/{src => }/enums/syntaxKind.d.ts (100%) rename packages/typescript/{src => }/enums/syntaxKind.js (100%) rename packages/typescript/{src => }/enums/tokenFlags.d.ts (100%) rename packages/typescript/{src => }/enums/tokenFlags.js (100%) rename packages/typescript/{src => }/enums/typeFlags.d.ts (100%) rename packages/typescript/{src => }/enums/typeFlags.js (100%) rename packages/typescript/{src => }/enums/typeFormatFlags.d.ts (100%) rename packages/typescript/{src => }/enums/typeFormatFlags.js (100%) rename packages/typescript/{src => }/enums/typePredicateKind.d.ts (100%) rename packages/typescript/{src => }/enums/typePredicateKind.js (100%) delete mode 100644 packages/typescript/scripts/copyEnums.mjs diff --git a/Herebyfile.mjs b/Herebyfile.mjs index 4c99fad51ad7d..be2c0d5541e6e 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -2532,10 +2532,9 @@ async function testNativePreviewPackage(platforms) { const { stdout } = await runOutput("npm", ["pack", "--dry-run", "--json", mainPackageDir]); /** @type {{ files: { path: string }[] }[]} */ const packed = JSON.parse(stdout); - const packedFiles = new Set(packed[0].files.map(file => file.path)); for (const name of ["tsconfig", "jsconfig"]) { const schemaPath = `schemas/${name}.schema.json`; - assert(packedFiles.has(schemaPath), `Package is missing ${schemaPath}`); + assert(packed[0].files.some(file => file.path === schemaPath), `Package is missing ${schemaPath}`); assert.deepEqual( await fs.promises.readFile(path.join(mainPackageDir, schemaPath)), await fs.promises.readFile(path.join("packages/typescript", schemaPath)), @@ -2543,17 +2542,6 @@ async function testNativePreviewPackage(platforms) { assert.equal(require.resolve(`${mainNativePreviewPackage.npmPackageName}/${schemaPath}`), path.join(mainPackageDir, schemaPath)); } - const enumSourceDir = path.resolve("packages/typescript/src/enums"); - for (const file of await fs.promises.readdir(enumSourceDir)) { - const enumPath = `dist/enums/${file}`; - assert(packedFiles.has(enumPath), `Package is missing ${enumPath}`); - assert.deepEqual( - await fs.promises.readFile(path.join(mainPackageDir, enumPath)), - await fs.promises.readFile(path.join(enumSourceDir, file)), - `Packaged ${enumPath} does not match its source`, - ); - } - const binName = publishAsTypescript ? "tsc" : "tsgo"; const binPath = path.join(mainPackageDir, "bin", binName); const { stdout: versionOutput } = await runOutput(process.execPath, [binPath, "--version"]); diff --git a/packages/typescript/src/enums/caseSensitivity.d.ts b/packages/typescript/enums/caseSensitivity.d.ts similarity index 100% rename from packages/typescript/src/enums/caseSensitivity.d.ts rename to packages/typescript/enums/caseSensitivity.d.ts diff --git a/packages/typescript/src/enums/caseSensitivity.js b/packages/typescript/enums/caseSensitivity.js similarity index 100% rename from packages/typescript/src/enums/caseSensitivity.js rename to packages/typescript/enums/caseSensitivity.js diff --git a/packages/typescript/src/enums/characterCodes.d.ts b/packages/typescript/enums/characterCodes.d.ts similarity index 100% rename from packages/typescript/src/enums/characterCodes.d.ts rename to packages/typescript/enums/characterCodes.d.ts diff --git a/packages/typescript/src/enums/characterCodes.js b/packages/typescript/enums/characterCodes.js similarity index 100% rename from packages/typescript/src/enums/characterCodes.js rename to packages/typescript/enums/characterCodes.js diff --git a/packages/typescript/src/enums/checkFlags.d.ts b/packages/typescript/enums/checkFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/checkFlags.d.ts rename to packages/typescript/enums/checkFlags.d.ts diff --git a/packages/typescript/src/enums/checkFlags.js b/packages/typescript/enums/checkFlags.js similarity index 100% rename from packages/typescript/src/enums/checkFlags.js rename to packages/typescript/enums/checkFlags.js diff --git a/packages/typescript/src/enums/commentDirectiveType.d.ts b/packages/typescript/enums/commentDirectiveType.d.ts similarity index 100% rename from packages/typescript/src/enums/commentDirectiveType.d.ts rename to packages/typescript/enums/commentDirectiveType.d.ts diff --git a/packages/typescript/src/enums/commentDirectiveType.js b/packages/typescript/enums/commentDirectiveType.js similarity index 100% rename from packages/typescript/src/enums/commentDirectiveType.js rename to packages/typescript/enums/commentDirectiveType.js diff --git a/packages/typescript/src/enums/completionItemKind.d.ts b/packages/typescript/enums/completionItemKind.d.ts similarity index 100% rename from packages/typescript/src/enums/completionItemKind.d.ts rename to packages/typescript/enums/completionItemKind.d.ts diff --git a/packages/typescript/src/enums/completionItemKind.js b/packages/typescript/enums/completionItemKind.js similarity index 100% rename from packages/typescript/src/enums/completionItemKind.js rename to packages/typescript/enums/completionItemKind.js diff --git a/packages/typescript/src/enums/diagnosticCategory.d.ts b/packages/typescript/enums/diagnosticCategory.d.ts similarity index 100% rename from packages/typescript/src/enums/diagnosticCategory.d.ts rename to packages/typescript/enums/diagnosticCategory.d.ts diff --git a/packages/typescript/src/enums/diagnosticCategory.js b/packages/typescript/enums/diagnosticCategory.js similarity index 100% rename from packages/typescript/src/enums/diagnosticCategory.js rename to packages/typescript/enums/diagnosticCategory.js diff --git a/packages/typescript/src/enums/diagnosticDirectivePolicy.d.ts b/packages/typescript/enums/diagnosticDirectivePolicy.d.ts similarity index 100% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.d.ts rename to packages/typescript/enums/diagnosticDirectivePolicy.d.ts diff --git a/packages/typescript/src/enums/diagnosticDirectivePolicy.js b/packages/typescript/enums/diagnosticDirectivePolicy.js similarity index 100% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.js rename to packages/typescript/enums/diagnosticDirectivePolicy.js diff --git a/packages/typescript/src/enums/elementFlags.d.ts b/packages/typescript/enums/elementFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/elementFlags.d.ts rename to packages/typescript/enums/elementFlags.d.ts diff --git a/packages/typescript/src/enums/elementFlags.js b/packages/typescript/enums/elementFlags.js similarity index 100% rename from packages/typescript/src/enums/elementFlags.js rename to packages/typescript/enums/elementFlags.js diff --git a/packages/typescript/src/enums/emitOnly.d.ts b/packages/typescript/enums/emitOnly.d.ts similarity index 100% rename from packages/typescript/src/enums/emitOnly.d.ts rename to packages/typescript/enums/emitOnly.d.ts diff --git a/packages/typescript/src/enums/emitOnly.js b/packages/typescript/enums/emitOnly.js similarity index 100% rename from packages/typescript/src/enums/emitOnly.js rename to packages/typescript/enums/emitOnly.js diff --git a/packages/typescript/src/enums/indexKind.d.ts b/packages/typescript/enums/indexKind.d.ts similarity index 100% rename from packages/typescript/src/enums/indexKind.d.ts rename to packages/typescript/enums/indexKind.d.ts diff --git a/packages/typescript/src/enums/indexKind.js b/packages/typescript/enums/indexKind.js similarity index 100% rename from packages/typescript/src/enums/indexKind.js rename to packages/typescript/enums/indexKind.js diff --git a/packages/typescript/src/enums/internalSymbolName.d.ts b/packages/typescript/enums/internalSymbolName.d.ts similarity index 100% rename from packages/typescript/src/enums/internalSymbolName.d.ts rename to packages/typescript/enums/internalSymbolName.d.ts diff --git a/packages/typescript/src/enums/internalSymbolName.js b/packages/typescript/enums/internalSymbolName.js similarity index 100% rename from packages/typescript/src/enums/internalSymbolName.js rename to packages/typescript/enums/internalSymbolName.js diff --git a/packages/typescript/src/enums/jsDeclarationKind.d.ts b/packages/typescript/enums/jsDeclarationKind.d.ts similarity index 100% rename from packages/typescript/src/enums/jsDeclarationKind.d.ts rename to packages/typescript/enums/jsDeclarationKind.d.ts diff --git a/packages/typescript/src/enums/jsDeclarationKind.js b/packages/typescript/enums/jsDeclarationKind.js similarity index 100% rename from packages/typescript/src/enums/jsDeclarationKind.js rename to packages/typescript/enums/jsDeclarationKind.js diff --git a/packages/typescript/src/enums/jsxEmit.d.ts b/packages/typescript/enums/jsxEmit.d.ts similarity index 100% rename from packages/typescript/src/enums/jsxEmit.d.ts rename to packages/typescript/enums/jsxEmit.d.ts diff --git a/packages/typescript/src/enums/jsxEmit.js b/packages/typescript/enums/jsxEmit.js similarity index 100% rename from packages/typescript/src/enums/jsxEmit.js rename to packages/typescript/enums/jsxEmit.js diff --git a/packages/typescript/src/enums/languageVariant.d.ts b/packages/typescript/enums/languageVariant.d.ts similarity index 100% rename from packages/typescript/src/enums/languageVariant.d.ts rename to packages/typescript/enums/languageVariant.d.ts diff --git a/packages/typescript/src/enums/languageVariant.js b/packages/typescript/enums/languageVariant.js similarity index 100% rename from packages/typescript/src/enums/languageVariant.js rename to packages/typescript/enums/languageVariant.js diff --git a/packages/typescript/src/enums/modifierFlags.d.ts b/packages/typescript/enums/modifierFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/modifierFlags.d.ts rename to packages/typescript/enums/modifierFlags.d.ts diff --git a/packages/typescript/src/enums/modifierFlags.js b/packages/typescript/enums/modifierFlags.js similarity index 100% rename from packages/typescript/src/enums/modifierFlags.js rename to packages/typescript/enums/modifierFlags.js diff --git a/packages/typescript/src/enums/moduleDetectionKind.d.ts b/packages/typescript/enums/moduleDetectionKind.d.ts similarity index 100% rename from packages/typescript/src/enums/moduleDetectionKind.d.ts rename to packages/typescript/enums/moduleDetectionKind.d.ts diff --git a/packages/typescript/src/enums/moduleDetectionKind.js b/packages/typescript/enums/moduleDetectionKind.js similarity index 100% rename from packages/typescript/src/enums/moduleDetectionKind.js rename to packages/typescript/enums/moduleDetectionKind.js diff --git a/packages/typescript/src/enums/moduleKind.d.ts b/packages/typescript/enums/moduleKind.d.ts similarity index 100% rename from packages/typescript/src/enums/moduleKind.d.ts rename to packages/typescript/enums/moduleKind.d.ts diff --git a/packages/typescript/src/enums/moduleKind.js b/packages/typescript/enums/moduleKind.js similarity index 100% rename from packages/typescript/src/enums/moduleKind.js rename to packages/typescript/enums/moduleKind.js diff --git a/packages/typescript/src/enums/moduleResolutionKind.d.ts b/packages/typescript/enums/moduleResolutionKind.d.ts similarity index 100% rename from packages/typescript/src/enums/moduleResolutionKind.d.ts rename to packages/typescript/enums/moduleResolutionKind.d.ts diff --git a/packages/typescript/src/enums/moduleResolutionKind.js b/packages/typescript/enums/moduleResolutionKind.js similarity index 100% rename from packages/typescript/src/enums/moduleResolutionKind.js rename to packages/typescript/enums/moduleResolutionKind.js diff --git a/packages/typescript/src/enums/newLineKind.d.ts b/packages/typescript/enums/newLineKind.d.ts similarity index 100% rename from packages/typescript/src/enums/newLineKind.d.ts rename to packages/typescript/enums/newLineKind.d.ts diff --git a/packages/typescript/src/enums/newLineKind.js b/packages/typescript/enums/newLineKind.js similarity index 100% rename from packages/typescript/src/enums/newLineKind.js rename to packages/typescript/enums/newLineKind.js diff --git a/packages/typescript/src/enums/nodeBuilderFlags.d.ts b/packages/typescript/enums/nodeBuilderFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/nodeBuilderFlags.d.ts rename to packages/typescript/enums/nodeBuilderFlags.d.ts diff --git a/packages/typescript/src/enums/nodeBuilderFlags.js b/packages/typescript/enums/nodeBuilderFlags.js similarity index 100% rename from packages/typescript/src/enums/nodeBuilderFlags.js rename to packages/typescript/enums/nodeBuilderFlags.js diff --git a/packages/typescript/src/enums/nodeFlags.d.ts b/packages/typescript/enums/nodeFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/nodeFlags.d.ts rename to packages/typescript/enums/nodeFlags.d.ts diff --git a/packages/typescript/src/enums/nodeFlags.js b/packages/typescript/enums/nodeFlags.js similarity index 100% rename from packages/typescript/src/enums/nodeFlags.js rename to packages/typescript/enums/nodeFlags.js diff --git a/packages/typescript/src/enums/objectFlags.d.ts b/packages/typescript/enums/objectFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/objectFlags.d.ts rename to packages/typescript/enums/objectFlags.d.ts diff --git a/packages/typescript/src/enums/objectFlags.js b/packages/typescript/enums/objectFlags.js similarity index 100% rename from packages/typescript/src/enums/objectFlags.js rename to packages/typescript/enums/objectFlags.js diff --git a/packages/typescript/src/enums/outerExpressionKinds.d.ts b/packages/typescript/enums/outerExpressionKinds.d.ts similarity index 100% rename from packages/typescript/src/enums/outerExpressionKinds.d.ts rename to packages/typescript/enums/outerExpressionKinds.d.ts diff --git a/packages/typescript/src/enums/outerExpressionKinds.js b/packages/typescript/enums/outerExpressionKinds.js similarity index 100% rename from packages/typescript/src/enums/outerExpressionKinds.js rename to packages/typescript/enums/outerExpressionKinds.js diff --git a/packages/typescript/src/enums/regularExpressionFlags.d.ts b/packages/typescript/enums/regularExpressionFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/regularExpressionFlags.d.ts rename to packages/typescript/enums/regularExpressionFlags.d.ts diff --git a/packages/typescript/src/enums/regularExpressionFlags.js b/packages/typescript/enums/regularExpressionFlags.js similarity index 100% rename from packages/typescript/src/enums/regularExpressionFlags.js rename to packages/typescript/enums/regularExpressionFlags.js diff --git a/packages/typescript/src/enums/scriptKind.d.ts b/packages/typescript/enums/scriptKind.d.ts similarity index 100% rename from packages/typescript/src/enums/scriptKind.d.ts rename to packages/typescript/enums/scriptKind.d.ts diff --git a/packages/typescript/src/enums/scriptKind.js b/packages/typescript/enums/scriptKind.js similarity index 100% rename from packages/typescript/src/enums/scriptKind.js rename to packages/typescript/enums/scriptKind.js diff --git a/packages/typescript/src/enums/scriptTarget.d.ts b/packages/typescript/enums/scriptTarget.d.ts similarity index 100% rename from packages/typescript/src/enums/scriptTarget.d.ts rename to packages/typescript/enums/scriptTarget.d.ts diff --git a/packages/typescript/src/enums/scriptTarget.js b/packages/typescript/enums/scriptTarget.js similarity index 100% rename from packages/typescript/src/enums/scriptTarget.js rename to packages/typescript/enums/scriptTarget.js diff --git a/packages/typescript/src/enums/signatureFlags.d.ts b/packages/typescript/enums/signatureFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/signatureFlags.d.ts rename to packages/typescript/enums/signatureFlags.d.ts diff --git a/packages/typescript/src/enums/signatureFlags.js b/packages/typescript/enums/signatureFlags.js similarity index 100% rename from packages/typescript/src/enums/signatureFlags.js rename to packages/typescript/enums/signatureFlags.js diff --git a/packages/typescript/src/enums/signatureKind.d.ts b/packages/typescript/enums/signatureKind.d.ts similarity index 100% rename from packages/typescript/src/enums/signatureKind.d.ts rename to packages/typescript/enums/signatureKind.d.ts diff --git a/packages/typescript/src/enums/signatureKind.js b/packages/typescript/enums/signatureKind.js similarity index 100% rename from packages/typescript/src/enums/signatureKind.js rename to packages/typescript/enums/signatureKind.js diff --git a/packages/typescript/src/enums/spanMapFeature.d.ts b/packages/typescript/enums/spanMapFeature.d.ts similarity index 100% rename from packages/typescript/src/enums/spanMapFeature.d.ts rename to packages/typescript/enums/spanMapFeature.d.ts diff --git a/packages/typescript/src/enums/spanMapFeature.js b/packages/typescript/enums/spanMapFeature.js similarity index 100% rename from packages/typescript/src/enums/spanMapFeature.js rename to packages/typescript/enums/spanMapFeature.js diff --git a/packages/typescript/src/enums/spanMapFidelity.d.ts b/packages/typescript/enums/spanMapFidelity.d.ts similarity index 100% rename from packages/typescript/src/enums/spanMapFidelity.d.ts rename to packages/typescript/enums/spanMapFidelity.d.ts diff --git a/packages/typescript/src/enums/spanMapFidelity.js b/packages/typescript/enums/spanMapFidelity.js similarity index 100% rename from packages/typescript/src/enums/spanMapFidelity.js rename to packages/typescript/enums/spanMapFidelity.js diff --git a/packages/typescript/src/enums/spanMapKind.d.ts b/packages/typescript/enums/spanMapKind.d.ts similarity index 100% rename from packages/typescript/src/enums/spanMapKind.d.ts rename to packages/typescript/enums/spanMapKind.d.ts diff --git a/packages/typescript/src/enums/spanMapKind.js b/packages/typescript/enums/spanMapKind.js similarity index 100% rename from packages/typescript/src/enums/spanMapKind.js rename to packages/typescript/enums/spanMapKind.js diff --git a/packages/typescript/src/enums/symbolFlags.d.ts b/packages/typescript/enums/symbolFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/symbolFlags.d.ts rename to packages/typescript/enums/symbolFlags.d.ts diff --git a/packages/typescript/src/enums/symbolFlags.js b/packages/typescript/enums/symbolFlags.js similarity index 100% rename from packages/typescript/src/enums/symbolFlags.js rename to packages/typescript/enums/symbolFlags.js diff --git a/packages/typescript/src/enums/symbolOwnerKind.d.ts b/packages/typescript/enums/symbolOwnerKind.d.ts similarity index 100% rename from packages/typescript/src/enums/symbolOwnerKind.d.ts rename to packages/typescript/enums/symbolOwnerKind.d.ts diff --git a/packages/typescript/src/enums/symbolOwnerKind.js b/packages/typescript/enums/symbolOwnerKind.js similarity index 100% rename from packages/typescript/src/enums/symbolOwnerKind.js rename to packages/typescript/enums/symbolOwnerKind.js diff --git a/packages/typescript/src/enums/syntaxKind.d.ts b/packages/typescript/enums/syntaxKind.d.ts similarity index 100% rename from packages/typescript/src/enums/syntaxKind.d.ts rename to packages/typescript/enums/syntaxKind.d.ts diff --git a/packages/typescript/src/enums/syntaxKind.js b/packages/typescript/enums/syntaxKind.js similarity index 100% rename from packages/typescript/src/enums/syntaxKind.js rename to packages/typescript/enums/syntaxKind.js diff --git a/packages/typescript/src/enums/tokenFlags.d.ts b/packages/typescript/enums/tokenFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/tokenFlags.d.ts rename to packages/typescript/enums/tokenFlags.d.ts diff --git a/packages/typescript/src/enums/tokenFlags.js b/packages/typescript/enums/tokenFlags.js similarity index 100% rename from packages/typescript/src/enums/tokenFlags.js rename to packages/typescript/enums/tokenFlags.js diff --git a/packages/typescript/src/enums/typeFlags.d.ts b/packages/typescript/enums/typeFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/typeFlags.d.ts rename to packages/typescript/enums/typeFlags.d.ts diff --git a/packages/typescript/src/enums/typeFlags.js b/packages/typescript/enums/typeFlags.js similarity index 100% rename from packages/typescript/src/enums/typeFlags.js rename to packages/typescript/enums/typeFlags.js diff --git a/packages/typescript/src/enums/typeFormatFlags.d.ts b/packages/typescript/enums/typeFormatFlags.d.ts similarity index 100% rename from packages/typescript/src/enums/typeFormatFlags.d.ts rename to packages/typescript/enums/typeFormatFlags.d.ts diff --git a/packages/typescript/src/enums/typeFormatFlags.js b/packages/typescript/enums/typeFormatFlags.js similarity index 100% rename from packages/typescript/src/enums/typeFormatFlags.js rename to packages/typescript/enums/typeFormatFlags.js diff --git a/packages/typescript/src/enums/typePredicateKind.d.ts b/packages/typescript/enums/typePredicateKind.d.ts similarity index 100% rename from packages/typescript/src/enums/typePredicateKind.d.ts rename to packages/typescript/enums/typePredicateKind.d.ts diff --git a/packages/typescript/src/enums/typePredicateKind.js b/packages/typescript/enums/typePredicateKind.js similarity index 100% rename from packages/typescript/src/enums/typePredicateKind.js rename to packages/typescript/enums/typePredicateKind.js diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 76a13d612199d..fbe0c3166e907 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -31,6 +31,7 @@ "lib", "schemas", "dist", + "enums", "vendor" ], "bin": { @@ -100,8 +101,8 @@ "generate:ast": "node ../../tools/scripts/tsc/generate-ts-ast.ts", "generate:encoder": "npm run node -- ../../tools/scripts/tsc/generate-encoder.ts", "generate:sync": "npm run node -- scripts/generateSync.ts", - "build": "tsc -b && node scripts/copyEnums.mjs", - "build:test": "tsc -b test && node scripts/copyEnums.mjs", + "build": "tsc -b", + "build:test": "tsc -b test", "test:only": "npm run node -- --test './test/**/*.test.ts'", "test": "npm run test:only" }, diff --git a/packages/typescript/scripts/copyEnums.mjs b/packages/typescript/scripts/copyEnums.mjs deleted file mode 100644 index 5e7ac48047828..0000000000000 --- a/packages/typescript/scripts/copyEnums.mjs +++ /dev/null @@ -1,3 +0,0 @@ -import { cpSync } from "node:fs"; - -cpSync(new URL("../src/enums", import.meta.url), new URL("../dist/enums", import.meta.url), { recursive: true }); diff --git a/packages/typescript/src/api/async/api.ts b/packages/typescript/src/api/async/api.ts index 76c9f30b95795..f90a5f5e7e22d 100644 --- a/packages/typescript/src/api/async/api.ts +++ b/packages/typescript/src/api/async/api.ts @@ -1,3 +1,23 @@ +import { CheckFlags } from "../../../enums/checkFlags.js"; +import { CompletionItemKind } from "../../../enums/completionItemKind.js"; +import { DiagnosticCategory } from "../../../enums/diagnosticCategory.js"; +import { ElementFlags } from "../../../enums/elementFlags.js"; +import { EmitOnly } from "../../../enums/emitOnly.js"; +import { IndexKind } from "../../../enums/indexKind.js"; +import { JsxEmit } from "../../../enums/jsxEmit.js"; +import { ModuleKind } from "../../../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../../../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../../../enums/newLineKind.js"; +import { NodeBuilderFlags } from "../../../enums/nodeBuilderFlags.js"; +import { ObjectFlags } from "../../../enums/objectFlags.js"; +import { ScriptKind } from "../../../enums/scriptKind.js"; +import { SignatureFlags } from "../../../enums/signatureFlags.js"; +import { SignatureKind } from "../../../enums/signatureKind.js"; +import { SymbolFlags } from "../../../enums/symbolFlags.js"; +import { SymbolOwnerKind } from "../../../enums/symbolOwnerKind.js"; +import { TypeFlags } from "../../../enums/typeFlags.js"; +import { TypeFormatFlags } from "../../../enums/typeFormatFlags.js"; +import { TypePredicateKind } from "../../../enums/typePredicateKind.js"; import { type __String, type CallLikeExpression, @@ -19,26 +39,6 @@ import { type TypeNode, unescapeLeadingUnderscores, } from "../../ast/index.ts"; -import { CheckFlags } from "../../enums/checkFlags.js"; -import { CompletionItemKind } from "../../enums/completionItemKind.js"; -import { DiagnosticCategory } from "../../enums/diagnosticCategory.js"; -import { ElementFlags } from "../../enums/elementFlags.js"; -import { EmitOnly } from "../../enums/emitOnly.js"; -import { IndexKind } from "../../enums/indexKind.js"; -import { JsxEmit } from "../../enums/jsxEmit.js"; -import { ModuleKind } from "../../enums/moduleKind.js"; -import { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; -import { NewLineKind } from "../../enums/newLineKind.js"; -import { NodeBuilderFlags } from "../../enums/nodeBuilderFlags.js"; -import { ObjectFlags } from "../../enums/objectFlags.js"; -import { ScriptKind } from "../../enums/scriptKind.js"; -import { SignatureFlags } from "../../enums/signatureFlags.js"; -import { SignatureKind } from "../../enums/signatureKind.js"; -import { SymbolFlags } from "../../enums/symbolFlags.js"; -import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; -import { TypeFlags } from "../../enums/typeFlags.js"; -import { TypeFormatFlags } from "../../enums/typeFormatFlags.js"; -import { TypePredicateKind } from "../../enums/typePredicateKind.js"; import { assertNever } from "../../internal/utils.ts"; import { encodeNode, diff --git a/packages/typescript/src/api/async/types.ts b/packages/typescript/src/api/async/types.ts index 97b189caf50bb..4e57a57b6ecf3 100644 --- a/packages/typescript/src/api/async/types.ts +++ b/packages/typescript/src/api/async/types.ts @@ -1,14 +1,14 @@ +import type { CompletionItemKind } from "../../../enums/completionItemKind.js"; +import type { ElementFlags } from "../../../enums/elementFlags.js"; +import type { ObjectFlags } from "../../../enums/objectFlags.js"; +import type { TypeFlags } from "../../../enums/typeFlags.js"; +import type { TypePredicateKind } from "../../../enums/typePredicateKind.js"; import type { IndexSignatureDeclaration, NamedTupleMember, ParameterDeclaration, } from "../../ast/ast.ts"; import type { RootedFilePath } from "../../ast/index.ts"; -import type { CompletionItemKind } from "../../enums/completionItemKind.js"; -import type { ElementFlags } from "../../enums/elementFlags.js"; -import type { ObjectFlags } from "../../enums/objectFlags.js"; -import type { TypeFlags } from "../../enums/typeFlags.js"; -import type { TypePredicateKind } from "../../enums/typePredicateKind.js"; import type { Diagnostic, RequestFileSystem, diff --git a/packages/typescript/src/api/compilerOptions.generated.ts b/packages/typescript/src/api/compilerOptions.generated.ts index 82cb93b1e6eb0..83909168cdf09 100644 --- a/packages/typescript/src/api/compilerOptions.generated.ts +++ b/packages/typescript/src/api/compilerOptions.generated.ts @@ -1,23 +1,23 @@ // Code generated by tools/scripts/tsc/generate-options.ts. DO NOT EDIT. +import type { JsxEmit } from "../../enums/jsxEmit.js"; +import type { ModuleDetectionKind } from "../../enums/moduleDetectionKind.js"; +import type { ModuleKind } from "../../enums/moduleKind.js"; +import type { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +import type { NewLineKind } from "../../enums/newLineKind.js"; +import type { ScriptTarget } from "../../enums/scriptTarget.js"; import type { RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; -import type { JsxEmit } from "../enums/jsxEmit.js"; -import type { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; -import type { ModuleKind } from "../enums/moduleKind.js"; -import type { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; -import type { NewLineKind } from "../enums/newLineKind.js"; -import type { ScriptTarget } from "../enums/scriptTarget.js"; -export { JsxEmit } from "../enums/jsxEmit.js"; -export { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; -export { ModuleKind } from "../enums/moduleKind.js"; -export { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; -export { NewLineKind } from "../enums/newLineKind.js"; -export { ScriptTarget } from "../enums/scriptTarget.js"; +export { JsxEmit } from "../../enums/jsxEmit.js"; +export { ModuleDetectionKind } from "../../enums/moduleDetectionKind.js"; +export { ModuleKind } from "../../enums/moduleKind.js"; +export { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +export { NewLineKind } from "../../enums/newLineKind.js"; +export { ScriptTarget } from "../../enums/scriptTarget.js"; /** CompilerOptions contains the compiler options exposed by the API. */ export interface CompilerOptions { diff --git a/packages/typescript/src/api/path.ts b/packages/typescript/src/api/path.ts index 86fa0527e47c9..988cd5937d8b3 100644 --- a/packages/typescript/src/api/path.ts +++ b/packages/typescript/src/api/path.ts @@ -1,12 +1,12 @@ +import { CaseSensitivity } from "../../enums/caseSensitivity.js"; import type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; -import { CaseSensitivity } from "../enums/caseSensitivity.js"; -export { CaseSensitivity } from "../enums/caseSensitivity.js"; +export { CaseSensitivity } from "../../enums/caseSensitivity.js"; const CharacterCodesSlash = "/".charCodeAt(0); const CharacterCodesBackslash = "\\".charCodeAt(0); diff --git a/packages/typescript/src/api/proto.generated.ts b/packages/typescript/src/api/proto.generated.ts index 2063ac4fb1945..608558762756a 100644 --- a/packages/typescript/src/api/proto.generated.ts +++ b/packages/typescript/src/api/proto.generated.ts @@ -1,36 +1,36 @@ // Code generated by gen-proto; DO NOT EDIT. +import { CaseSensitivity } from "../../enums/caseSensitivity.js"; +import { JsxEmit } from "../../enums/jsxEmit.js"; +import { ModuleDetectionKind } from "../../enums/moduleDetectionKind.js"; +import { ModuleKind } from "../../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../../enums/newLineKind.js"; +import { ScriptKind } from "../../enums/scriptKind.js"; +import { ScriptTarget } from "../../enums/scriptTarget.js"; +import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; import type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath, } from "../ast/index.ts"; -import { CaseSensitivity } from "../enums/caseSensitivity.js"; -import { JsxEmit } from "../enums/jsxEmit.js"; -import { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; -import { ModuleKind } from "../enums/moduleKind.js"; -import { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; -import { NewLineKind } from "../enums/newLineKind.js"; -import { ScriptKind } from "../enums/scriptKind.js"; -import { ScriptTarget } from "../enums/scriptTarget.js"; -import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; import type { CompilerOptions, PluginImport, } from "./compilerOptions.generated.ts"; import type { UserPreferences } from "./userPreferences.generated.ts"; +export { CaseSensitivity } from "../../enums/caseSensitivity.js"; +export { JsxEmit } from "../../enums/jsxEmit.js"; +export { ModuleDetectionKind } from "../../enums/moduleDetectionKind.js"; +export { ModuleKind } from "../../enums/moduleKind.js"; +export { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; +export { NewLineKind } from "../../enums/newLineKind.js"; +export { ScriptKind } from "../../enums/scriptKind.js"; +export { ScriptTarget } from "../../enums/scriptTarget.js"; +export { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; export type { PathKey, RootedDirectoryPath, RootedFilePath, RootedPath } from "../ast/index.ts"; -export { CaseSensitivity } from "../enums/caseSensitivity.js"; -export { JsxEmit } from "../enums/jsxEmit.js"; -export { ModuleDetectionKind } from "../enums/moduleDetectionKind.js"; -export { ModuleKind } from "../enums/moduleKind.js"; -export { ModuleResolutionKind } from "../enums/moduleResolutionKind.js"; -export { NewLineKind } from "../enums/newLineKind.js"; -export { ScriptKind } from "../enums/scriptKind.js"; -export { ScriptTarget } from "../enums/scriptTarget.js"; -export { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; export type { CompilerOptions, PluginImport } from "./compilerOptions.generated.ts"; export * from "./compilerOptions.generated.ts"; export type { UserPreferences } from "./userPreferences.generated.ts"; diff --git a/packages/typescript/src/api/proto.ts b/packages/typescript/src/api/proto.ts index 7929f0ffaec0a..d7a0110ceedde 100644 --- a/packages/typescript/src/api/proto.ts +++ b/packages/typescript/src/api/proto.ts @@ -1,4 +1,4 @@ -import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; +import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; import { documentURIToFileName, fileNameToDocumentURI, diff --git a/packages/typescript/src/api/sync/api.ts b/packages/typescript/src/api/sync/api.ts index 458b0191a4360..f23a3e8133e69 100644 --- a/packages/typescript/src/api/sync/api.ts +++ b/packages/typescript/src/api/sync/api.ts @@ -15,6 +15,26 @@ import { cacheGeneratorMethod, } from "./generatorSupport.ts"; +import { CheckFlags } from "../../../enums/checkFlags.js"; +import { CompletionItemKind } from "../../../enums/completionItemKind.js"; +import { DiagnosticCategory } from "../../../enums/diagnosticCategory.js"; +import { ElementFlags } from "../../../enums/elementFlags.js"; +import { EmitOnly } from "../../../enums/emitOnly.js"; +import { IndexKind } from "../../../enums/indexKind.js"; +import { JsxEmit } from "../../../enums/jsxEmit.js"; +import { ModuleKind } from "../../../enums/moduleKind.js"; +import { ModuleResolutionKind } from "../../../enums/moduleResolutionKind.js"; +import { NewLineKind } from "../../../enums/newLineKind.js"; +import { NodeBuilderFlags } from "../../../enums/nodeBuilderFlags.js"; +import { ObjectFlags } from "../../../enums/objectFlags.js"; +import { ScriptKind } from "../../../enums/scriptKind.js"; +import { SignatureFlags } from "../../../enums/signatureFlags.js"; +import { SignatureKind } from "../../../enums/signatureKind.js"; +import { SymbolFlags } from "../../../enums/symbolFlags.js"; +import { SymbolOwnerKind } from "../../../enums/symbolOwnerKind.js"; +import { TypeFlags } from "../../../enums/typeFlags.js"; +import { TypeFormatFlags } from "../../../enums/typeFormatFlags.js"; +import { TypePredicateKind } from "../../../enums/typePredicateKind.js"; import { type __String, type CallLikeExpression, @@ -36,26 +56,6 @@ import { type TypeNode, unescapeLeadingUnderscores, } from "../../ast/index.ts"; -import { CheckFlags } from "../../enums/checkFlags.js"; -import { CompletionItemKind } from "../../enums/completionItemKind.js"; -import { DiagnosticCategory } from "../../enums/diagnosticCategory.js"; -import { ElementFlags } from "../../enums/elementFlags.js"; -import { EmitOnly } from "../../enums/emitOnly.js"; -import { IndexKind } from "../../enums/indexKind.js"; -import { JsxEmit } from "../../enums/jsxEmit.js"; -import { ModuleKind } from "../../enums/moduleKind.js"; -import { ModuleResolutionKind } from "../../enums/moduleResolutionKind.js"; -import { NewLineKind } from "../../enums/newLineKind.js"; -import { NodeBuilderFlags } from "../../enums/nodeBuilderFlags.js"; -import { ObjectFlags } from "../../enums/objectFlags.js"; -import { ScriptKind } from "../../enums/scriptKind.js"; -import { SignatureFlags } from "../../enums/signatureFlags.js"; -import { SignatureKind } from "../../enums/signatureKind.js"; -import { SymbolFlags } from "../../enums/symbolFlags.js"; -import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js"; -import { TypeFlags } from "../../enums/typeFlags.js"; -import { TypeFormatFlags } from "../../enums/typeFormatFlags.js"; -import { TypePredicateKind } from "../../enums/typePredicateKind.js"; import { assertNever } from "../../internal/utils.ts"; import { encodeNode, diff --git a/packages/typescript/src/api/sync/types.ts b/packages/typescript/src/api/sync/types.ts index 0c96e44e34ca3..562f09584efd3 100644 --- a/packages/typescript/src/api/sync/types.ts +++ b/packages/typescript/src/api/sync/types.ts @@ -11,17 +11,17 @@ import type { APIResponse as ProtocolResponse, } from "../proto.ts"; +import type { CompletionItemKind } from "../../../enums/completionItemKind.js"; +import type { ElementFlags } from "../../../enums/elementFlags.js"; +import type { ObjectFlags } from "../../../enums/objectFlags.js"; +import type { TypeFlags } from "../../../enums/typeFlags.js"; +import type { TypePredicateKind } from "../../../enums/typePredicateKind.js"; import type { IndexSignatureDeclaration, NamedTupleMember, ParameterDeclaration, } from "../../ast/ast.ts"; import type { RootedFilePath } from "../../ast/index.ts"; -import type { CompletionItemKind } from "../../enums/completionItemKind.js"; -import type { ElementFlags } from "../../enums/elementFlags.js"; -import type { ObjectFlags } from "../../enums/objectFlags.js"; -import type { TypeFlags } from "../../enums/typeFlags.js"; -import type { TypePredicateKind } from "../../enums/typePredicateKind.js"; import type { Diagnostic, RequestFileSystem, diff --git a/packages/typescript/src/ast/ast.generated.ts b/packages/typescript/src/ast/ast.generated.ts index d5abce9e716d3..8b86d34924172 100644 --- a/packages/typescript/src/ast/ast.generated.ts +++ b/packages/typescript/src/ast/ast.generated.ts @@ -1,9 +1,9 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import type { ModifierFlags } from "../enums/modifierFlags.js"; -import type { NodeFlags } from "../enums/nodeFlags.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; -import { TokenFlags } from "../enums/tokenFlags.js"; +import type { ModifierFlags } from "../../enums/modifierFlags.js"; +import type { NodeFlags } from "../../enums/nodeFlags.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; +import { TokenFlags } from "../../enums/tokenFlags.js"; import type { JsxTagNamePropertyAccess, Node, diff --git a/packages/typescript/src/ast/ast.ts b/packages/typescript/src/ast/ast.ts index 30e54a64739ea..1fcf46fff28b5 100644 --- a/packages/typescript/src/ast/ast.ts +++ b/packages/typescript/src/ast/ast.ts @@ -1,12 +1,12 @@ // ast.ts — Hand-written AST type definitions // Generated types are in ast.generated.ts -import type { DiagnosticDirectivePolicy } from "../enums/diagnosticDirectivePolicy.js"; -import type { InternalSymbolName } from "../enums/internalSymbolName.js"; -import type { LanguageVariant } from "../enums/languageVariant.js"; -import type { NodeFlags } from "../enums/nodeFlags.js"; -import type { ScriptKind } from "../enums/scriptKind.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; +import type { DiagnosticDirectivePolicy } from "../../enums/diagnosticDirectivePolicy.js"; +import type { InternalSymbolName } from "../../enums/internalSymbolName.js"; +import type { LanguageVariant } from "../../enums/languageVariant.js"; +import type { NodeFlags } from "../../enums/nodeFlags.js"; +import type { ScriptKind } from "../../enums/scriptKind.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { AssertionExpression, BindingElement, @@ -52,8 +52,8 @@ import type { } from "./ast.generated.ts"; import type { SpanMap } from "./spanMap.ts"; -export { SyntaxKind } from "../enums/syntaxKind.js"; -export { TokenFlags } from "../enums/tokenFlags.js"; +export { SyntaxKind } from "../../enums/syntaxKind.js"; +export { TokenFlags } from "../../enums/tokenFlags.js"; export * from "./ast.generated.ts"; export * as factory from "./factory.generated.ts"; diff --git a/packages/typescript/src/ast/astnav.ts b/packages/typescript/src/ast/astnav.ts index 5f863082d027c..aaa84482cac4c 100644 --- a/packages/typescript/src/ast/astnav.ts +++ b/packages/typescript/src/ast/astnav.ts @@ -1,5 +1,5 @@ -import { NodeFlags } from "../enums/nodeFlags.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { NodeFlags } from "../../enums/nodeFlags.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { TokenSyntaxKind } from "./ast.generated.ts"; import type { Node, diff --git a/packages/typescript/src/ast/clone.ts b/packages/typescript/src/ast/clone.ts index 9659c13379cea..9ba5daaf0ba7d 100644 --- a/packages/typescript/src/ast/clone.ts +++ b/packages/typescript/src/ast/clone.ts @@ -1,4 +1,4 @@ -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { Node, NodeArray, diff --git a/packages/typescript/src/ast/factory.generated.ts b/packages/typescript/src/ast/factory.generated.ts index 3e66d7333360b..b633caf1bcee1 100644 --- a/packages/typescript/src/ast/factory.generated.ts +++ b/packages/typescript/src/ast/factory.generated.ts @@ -1,8 +1,8 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import { NodeFlags } from "../enums/nodeFlags.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; -import { TokenFlags } from "../enums/tokenFlags.js"; +import { NodeFlags } from "../../enums/nodeFlags.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; +import { TokenFlags } from "../../enums/tokenFlags.js"; import type { ArrayBindingPattern, ArrayLiteralExpression, diff --git a/packages/typescript/src/ast/index.ts b/packages/typescript/src/ast/index.ts index e46fea67fe3a7..a0394995e25d9 100644 --- a/packages/typescript/src/ast/index.ts +++ b/packages/typescript/src/ast/index.ts @@ -1,18 +1,18 @@ -export { CharacterCodes } from "../enums/characterCodes.js"; -export { CommentDirectiveType } from "../enums/commentDirectiveType.js"; -export { DiagnosticDirectivePolicy } from "../enums/diagnosticDirectivePolicy.js"; -export { InternalSymbolName } from "../enums/internalSymbolName.js"; -export { LanguageVariant } from "../enums/languageVariant.js"; -export { ModifierFlags } from "../enums/modifierFlags.js"; -export { NodeFlags } from "../enums/nodeFlags.js"; -export { RegularExpressionFlags } from "../enums/regularExpressionFlags.js"; -export { ScriptKind } from "../enums/scriptKind.js"; -export { ScriptTarget } from "../enums/scriptTarget.js"; -export { SpanMapFeature } from "../enums/spanMapFeature.js"; -export { SpanMapFidelity } from "../enums/spanMapFidelity.js"; -export { SpanMapKind } from "../enums/spanMapKind.js"; -export { SyntaxKind } from "../enums/syntaxKind.js"; -export { TokenFlags } from "../enums/tokenFlags.js"; +export { CharacterCodes } from "../../enums/characterCodes.js"; +export { CommentDirectiveType } from "../../enums/commentDirectiveType.js"; +export { DiagnosticDirectivePolicy } from "../../enums/diagnosticDirectivePolicy.js"; +export { InternalSymbolName } from "../../enums/internalSymbolName.js"; +export { LanguageVariant } from "../../enums/languageVariant.js"; +export { ModifierFlags } from "../../enums/modifierFlags.js"; +export { NodeFlags } from "../../enums/nodeFlags.js"; +export { RegularExpressionFlags } from "../../enums/regularExpressionFlags.js"; +export { ScriptKind } from "../../enums/scriptKind.js"; +export { ScriptTarget } from "../../enums/scriptTarget.js"; +export { SpanMapFeature } from "../../enums/spanMapFeature.js"; +export { SpanMapFidelity } from "../../enums/spanMapFidelity.js"; +export { SpanMapKind } from "../../enums/spanMapKind.js"; +export { SyntaxKind } from "../../enums/syntaxKind.js"; +export { TokenFlags } from "../../enums/tokenFlags.js"; export * from "./ast.ts"; export * from "./astnav.ts"; export * from "./clone.ts"; diff --git a/packages/typescript/src/ast/is.generated.ts b/packages/typescript/src/ast/is.generated.ts index 34ae31541cbf1..4a35d786b5cfe 100644 --- a/packages/typescript/src/ast/is.generated.ts +++ b/packages/typescript/src/ast/is.generated.ts @@ -1,8 +1,8 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { NodeHandle as AsyncNodeHandle } from "../api/async/api.ts"; import type { NodeHandle as SyncNodeHandle } from "../api/sync/api.ts"; -import { SyntaxKind } from "../enums/syntaxKind.js"; import type { AbstractKeyword, AccessExpression, diff --git a/packages/typescript/src/ast/is.ts b/packages/typescript/src/ast/is.ts index 74f41132e0f32..d7cdd426784ff 100644 --- a/packages/typescript/src/ast/is.ts +++ b/packages/typescript/src/ast/is.ts @@ -1,11 +1,11 @@ // is.ts — Hand-written type guard functions // Generated guards are in is.generated.ts -import { ModifierFlags } from "../enums/modifierFlags.js"; -import { NodeFlags } from "../enums/nodeFlags.js"; -import { OuterExpressionKinds } from "../enums/outerExpressionKinds.js"; -import { ScriptKind } from "../enums/scriptKind.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { ModifierFlags } from "../../enums/modifierFlags.js"; +import { NodeFlags } from "../../enums/nodeFlags.js"; +import { OuterExpressionKinds } from "../../enums/outerExpressionKinds.js"; +import { ScriptKind } from "../../enums/scriptKind.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { AsExpression, BindingPattern, diff --git a/packages/typescript/src/ast/modifiers.ts b/packages/typescript/src/ast/modifiers.ts index df74e0ad84921..575f683400892 100644 --- a/packages/typescript/src/ast/modifiers.ts +++ b/packages/typescript/src/ast/modifiers.ts @@ -1,5 +1,5 @@ -import { ModifierFlags } from "../enums/modifierFlags.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { ModifierFlags } from "../../enums/modifierFlags.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; export function modifierToFlag(kind: SyntaxKind): ModifierFlags { switch (kind) { diff --git a/packages/typescript/src/ast/scanner.ts b/packages/typescript/src/ast/scanner.ts index 0e72a1e867cad..1c38d4358687b 100644 --- a/packages/typescript/src/ast/scanner.ts +++ b/packages/typescript/src/ast/scanner.ts @@ -1,10 +1,10 @@ -import { CharacterCodes } from "../enums/characterCodes.js"; -import { CommentDirectiveType } from "../enums/commentDirectiveType.js"; -import { LanguageVariant } from "../enums/languageVariant.js"; -import { RegularExpressionFlags } from "../enums/regularExpressionFlags.js"; -import { ScriptTarget } from "../enums/scriptTarget.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; -import { TokenFlags } from "../enums/tokenFlags.js"; +import { CharacterCodes } from "../../enums/characterCodes.js"; +import { CommentDirectiveType } from "../../enums/commentDirectiveType.js"; +import { LanguageVariant } from "../../enums/languageVariant.js"; +import { RegularExpressionFlags } from "../../enums/regularExpressionFlags.js"; +import { ScriptTarget } from "../../enums/scriptTarget.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; +import { TokenFlags } from "../../enums/tokenFlags.js"; import type { JsxTokenSyntaxKind, KeywordSyntaxKind, diff --git a/packages/typescript/src/ast/spanMap.ts b/packages/typescript/src/ast/spanMap.ts index 8b2d0ff4547f6..6347e619b3407 100644 --- a/packages/typescript/src/ast/spanMap.ts +++ b/packages/typescript/src/ast/spanMap.ts @@ -1,6 +1,6 @@ -import { SpanMapFeature } from "../enums/spanMapFeature.js"; -import { SpanMapFidelity } from "../enums/spanMapFidelity.js"; -import { SpanMapKind } from "../enums/spanMapKind.js"; +import { SpanMapFeature } from "../../enums/spanMapFeature.js"; +import { SpanMapFidelity } from "../../enums/spanMapFidelity.js"; +import { SpanMapKind } from "../../enums/spanMapKind.js"; import type { ReadonlyTextRange } from "./ast.ts"; export { SpanMapFeature, SpanMapFidelity, SpanMapKind }; diff --git a/packages/typescript/src/ast/utils.ts b/packages/typescript/src/ast/utils.ts index 780e805f73362..6bd90317d4879 100644 --- a/packages/typescript/src/ast/utils.ts +++ b/packages/typescript/src/ast/utils.ts @@ -1,9 +1,9 @@ -import { CharacterCodes } from "../enums/characterCodes.js"; -import { JSDeclarationKind } from "../enums/jsDeclarationKind.js"; -import { ModifierFlags } from "../enums/modifierFlags.js"; -import { NodeFlags } from "../enums/nodeFlags.js"; -import { OuterExpressionKinds } from "../enums/outerExpressionKinds.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { CharacterCodes } from "../../enums/characterCodes.js"; +import { JSDeclarationKind } from "../../enums/jsDeclarationKind.js"; +import { ModifierFlags } from "../../enums/modifierFlags.js"; +import { NodeFlags } from "../../enums/nodeFlags.js"; +import { OuterExpressionKinds } from "../../enums/outerExpressionKinds.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { __String, AccessExpression, diff --git a/packages/typescript/src/ast/visitor.generated.ts b/packages/typescript/src/ast/visitor.generated.ts index c9e390f2e9d7e..8cac71d3beeb6 100644 --- a/packages/typescript/src/ast/visitor.generated.ts +++ b/packages/typescript/src/ast/visitor.generated.ts @@ -1,6 +1,6 @@ // Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { ArrayBindingPattern, ArrayLiteralExpression, diff --git a/packages/typescript/src/ast/visitor.ts b/packages/typescript/src/ast/visitor.ts index d20025a18aaa6..b4fa435d4c12c 100644 --- a/packages/typescript/src/ast/visitor.ts +++ b/packages/typescript/src/ast/visitor.ts @@ -4,7 +4,7 @@ * delegates to these functions. */ -import { SyntaxKind } from "../enums/syntaxKind.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { JSDocComment, JSDocParameterOrPropertyTag, diff --git a/packages/typescript/test/proto.test.ts b/packages/typescript/test/proto.test.ts index 48df9357047b4..6089876e0cdbe 100644 --- a/packages/typescript/test/proto.test.ts +++ b/packages/typescript/test/proto.test.ts @@ -1,5 +1,6 @@ import assert from "node:assert"; import test from "node:test"; +import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js"; import type { SymbolOwner as ProtocolSymbolOwner, SymbolResponse as ProtocolSymbolResponse, @@ -14,7 +15,6 @@ import type { PathKey, RootedFilePath, } from "../src/ast/index.ts"; -import { SymbolOwnerKind } from "../src/enums/symbolOwnerKind.js"; test("symbol ownership protocol validation rejects mixed variants", () => { const project = "/tsconfig.json" as ProjectId; diff --git a/tools/gen-proto/main.go b/tools/gen-proto/main.go index 5690b941dea1c..ba89387965e9a 100644 --- a/tools/gen-proto/main.go +++ b/tools/gen-proto/main.go @@ -500,7 +500,7 @@ func (r *typeRenderer) namedType(named *types.Named) string { case r.apiPackagePath + ".EnsurePrograms": return "EnsurePrograms" case r.apiPackagePath + ".SymbolOwnerKind": - return r.importType("SymbolOwnerKind", "../enums/symbolOwnerKind.js") + return r.importType("SymbolOwnerKind", "../../enums/symbolOwnerKind.js") case "github.com/microsoft/TypeScript/tsc/internal/project.ID": r.importTypeOnly("PathKey", "../ast/index.ts") return "ProjectId" @@ -523,19 +523,19 @@ func (r *typeRenderer) namedType(named *types.Named) string { case "github.com/microsoft/TypeScript/tsc/internal/ls/lsutil.UserPreferences": return r.importTypeOnly(obj.Name(), "./userPreferences.generated.ts") case "github.com/microsoft/TypeScript/tsc/internal/core.JsxEmit": - return r.importType("JsxEmit", "../enums/jsxEmit.js") + return r.importType("JsxEmit", "../../enums/jsxEmit.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleDetectionKind": - return r.importType("ModuleDetectionKind", "../enums/moduleDetectionKind.js") + return r.importType("ModuleDetectionKind", "../../enums/moduleDetectionKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleKind": - return r.importType("ModuleKind", "../enums/moduleKind.js") + return r.importType("ModuleKind", "../../enums/moduleKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ModuleResolutionKind": - return r.importType("ModuleResolutionKind", "../enums/moduleResolutionKind.js") + return r.importType("ModuleResolutionKind", "../../enums/moduleResolutionKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.NewLineKind": - return r.importType("NewLineKind", "../enums/newLineKind.js") + return r.importType("NewLineKind", "../../enums/newLineKind.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ScriptTarget": - return r.importType("ScriptTarget", "../enums/scriptTarget.js") + return r.importType("ScriptTarget", "../../enums/scriptTarget.js") case "github.com/microsoft/TypeScript/tsc/internal/core.ScriptKind": - return r.importType("ScriptKind", "../enums/scriptKind.js") + return r.importType("ScriptKind", "../../enums/scriptKind.js") case "github.com/microsoft/TypeScript/tsc/internal/tspath.RootedPath": return r.importTypeOnly("RootedPath", "../ast/index.ts") case "github.com/microsoft/TypeScript/tsc/internal/tspath.RootedFilePath": @@ -545,7 +545,7 @@ func (r *typeRenderer) namedType(named *types.Named) string { case "github.com/microsoft/TypeScript/tsc/internal/tspath.PathKey": return r.importTypeOnly("PathKey", "../ast/index.ts") case "github.com/microsoft/TypeScript/tsc/internal/tspath.CaseSensitivity": - return r.importType("CaseSensitivity", "../enums/caseSensitivity.js") + return r.importType("CaseSensitivity", "../../enums/caseSensitivity.js") case "github.com/microsoft/TypeScript/tsc/internal/tsoptions.RawCompilerOptions": r.rawCompilerOptions = obj compilerOptions := r.packages["github.com/microsoft/TypeScript/tsc/internal/core"].Types.Scope().Lookup("CompilerOptions").(*types.TypeName) diff --git a/tools/gen-proto/main_test.go b/tools/gen-proto/main_test.go index 423e46992bbc7..c7cb555c4cd36 100644 --- a/tools/gen-proto/main_test.go +++ b/tools/gen-proto/main_test.go @@ -62,7 +62,7 @@ func TestGenerate(t *testing.T) { `export interface SourceFileDescriptor { fileName: RootedFilePath; path: PathKey;`, - `import { SymbolOwnerKind } from "../enums/symbolOwnerKind.js";`, + `import { SymbolOwnerKind } from "../../enums/symbolOwnerKind.js";`, `kind: SymbolOwnerKind;`, `/** InitializeResponse is returned by the initialize method. */ export interface InitializeResponse`, diff --git a/tools/scripts/gen/generatedFile.test.mts b/tools/scripts/gen/generatedFile.test.mts index e1b98ce555212..eaf918e759fc3 100644 --- a/tools/scripts/gen/generatedFile.test.mts +++ b/tools/scripts/gen/generatedFile.test.mts @@ -357,7 +357,7 @@ test("generate:go runs Go generators directly and shares caches with Go fallback const generate = () => x("npx", ["hereby", "generate:go"], { throwOnError: true, nodeOptions: { cwd: root } }); const first = await generate(); assert.doesNotMatch(first.stdout, /\$ go generate|npm run --silent cache|\$ node .*generate-unicode-data/); - const files = fs.globSync(["tsc/internal/**/*generated.go", "packages/typescript/src/api/*.generated.ts", "packages/typescript/src/enums/*.{js,ts}", "packages/typescript/schemas/*.schema.json"], { cwd: root }); + const files = fs.globSync(["tsc/internal/**/*generated.go", "packages/typescript/src/api/*.generated.ts", "packages/typescript/enums/*.{js,ts}", "packages/typescript/schemas/*.schema.json"], { cwd: root }); const timestamps = files.map(file => fs.statSync(path.join(root, file)).mtimeMs); const current = await generate(); assert.doesNotMatch(current.stdout, /Generated codegen outputs|Generated Unicode tables/); @@ -812,7 +812,7 @@ test("enum generation skips unchanged outputs and Go verification", async () => const generate = (force = false) => x("npx", ["hereby", "generate:enums", ...(force ? ["--force"] : [])], { throwOnError: true, nodeOptions: { cwd: root } }); await generate(); const files = [ - ...fs.globSync("packages/typescript/src/enums/*.{js,ts}", { cwd: root }), + ...fs.globSync("packages/typescript/enums/*.{js,ts}", { cwd: root }), "tsc/internal/api/enum_values_generated.go", ].map(file => path.join(root, file)); const timestamps = files.map(file => fs.statSync(file).mtimeMs); diff --git a/tools/scripts/tsc/generate-enums.ts b/tools/scripts/tsc/generate-enums.ts index 05cd86f108933..2f2a315e4b49f 100644 --- a/tools/scripts/tsc/generate-enums.ts +++ b/tools/scripts/tsc/generate-enums.ts @@ -31,52 +31,52 @@ interface EnumDef { } export const enumDefs = [ - { name: "SymbolFlags", goPrefix: "SymbolFlags", goFile: "tsc/internal/ast/symbolflags.go", outDir: "packages/typescript/src/enums" }, - { name: "CheckFlags", goPrefix: "CheckFlags", goFile: "tsc/internal/ast/checkflags.go", outDir: "packages/typescript/src/enums" }, - { name: "SymbolOwnerKind", goPrefix: "SymbolOwnerKind", goFile: "tsc/internal/api/proto.go", outDir: "packages/typescript/src/enums" }, - { name: "TypeFlags", goPrefix: "TypeFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "ObjectFlags", goPrefix: "ObjectFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "SignatureFlags", goPrefix: "SignatureFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "SignatureKind", goPrefix: "SignatureKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "IndexKind", goPrefix: "IndexKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "ElementFlags", goPrefix: "ElementFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "TypePredicateKind", goPrefix: "TypePredicateKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "TypeFormatFlags", goPrefix: "TypeFormatFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/src/enums" }, - { name: "DiagnosticCategory", goPrefix: "Category", goFile: "tsc/internal/diagnostics/diagnostics.go", outDir: "packages/typescript/src/enums" }, + { name: "SymbolFlags", goPrefix: "SymbolFlags", goFile: "tsc/internal/ast/symbolflags.go", outDir: "packages/typescript/enums" }, + { name: "CheckFlags", goPrefix: "CheckFlags", goFile: "tsc/internal/ast/checkflags.go", outDir: "packages/typescript/enums" }, + { name: "SymbolOwnerKind", goPrefix: "SymbolOwnerKind", goFile: "tsc/internal/api/proto.go", outDir: "packages/typescript/enums" }, + { name: "TypeFlags", goPrefix: "TypeFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "ObjectFlags", goPrefix: "ObjectFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "SignatureFlags", goPrefix: "SignatureFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "SignatureKind", goPrefix: "SignatureKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "IndexKind", goPrefix: "IndexKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "ElementFlags", goPrefix: "ElementFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "TypePredicateKind", goPrefix: "TypePredicateKind", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "TypeFormatFlags", goPrefix: "TypeFormatFlags", goFile: "tsc/internal/checker/types.go", outDir: "packages/typescript/enums" }, + { name: "DiagnosticCategory", goPrefix: "Category", goFile: "tsc/internal/diagnostics/diagnostics.go", outDir: "packages/typescript/enums" }, { name: "SyntaxKind", goPrefix: "Kind", goFile: "tsc/internal/ast/kind_generated.go", - outDir: "packages/typescript/src/enums", + outDir: "packages/typescript/enums", metadata: { file: "tools/scripts/tsc/ast.json", members: syntaxKindMembers() }, }, - { name: "NodeFlags", goPrefix: "NodeFlags", goFile: "tsc/internal/ast/nodeflags.go", outDir: "packages/typescript/src/enums" }, - { name: "OuterExpressionKinds", goPrefix: "OEK", goFile: "tsc/internal/ast/utilities.go", outDir: "packages/typescript/src/enums" }, - { name: "JSDeclarationKind", goPrefix: "JSDeclarationKind", goFile: "tsc/internal/ast/utilities.go", outDir: "packages/typescript/src/enums", fileName: "jsDeclarationKind" }, - { name: "ModifierFlags", goPrefix: "ModifierFlags", goFile: "tsc/internal/ast/modifierflags.go", outDir: "packages/typescript/src/enums" }, + { name: "NodeFlags", goPrefix: "NodeFlags", goFile: "tsc/internal/ast/nodeflags.go", outDir: "packages/typescript/enums" }, + { name: "OuterExpressionKinds", goPrefix: "OEK", goFile: "tsc/internal/ast/utilities.go", outDir: "packages/typescript/enums" }, + { name: "JSDeclarationKind", goPrefix: "JSDeclarationKind", goFile: "tsc/internal/ast/utilities.go", outDir: "packages/typescript/enums", fileName: "jsDeclarationKind" }, + { name: "ModifierFlags", goPrefix: "ModifierFlags", goFile: "tsc/internal/ast/modifierflags.go", outDir: "packages/typescript/enums" }, ...options.enums.filter(enumDef => enumDef.api).map(enumDef => ({ name: enumDef.name, goPrefix: enumDef.name, goFile: "tsc/internal/core/options_generated.go", - outDir: "packages/typescript/src/enums", + outDir: "packages/typescript/enums", metadata: { file: "tools/scripts/tsc/options.ts", members: enumDef.members.filter(member => !member.excludeFromAPI).map(member => ({ name: member.name, value: String(member.value) })), }, })), - { name: "ScriptKind", goPrefix: "ScriptKind", goFile: "tsc/internal/core/scriptkind.go", outDir: "packages/typescript/src/enums" }, - { name: "CaseSensitivity", goPrefix: "Case", goFile: "tsc/internal/tspath/path.go", outDir: "packages/typescript/src/enums" }, - { name: "TokenFlags", goPrefix: "TokenFlags", goFile: "tsc/internal/ast/tokenflags.go", outDir: "packages/typescript/src/enums" }, - { name: "DiagnosticDirectivePolicy", goPrefix: "MappedDiagnosticDirectivePolicy", goFile: "tsc/internal/ast/ast.go", outDir: "packages/typescript/src/enums" }, - { name: "SpanMapKind", goPrefix: "Kind", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/src/enums" }, - { name: "SpanMapFidelity", goPrefix: "Fidelity", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/src/enums" }, - { name: "SpanMapFeature", goPrefix: "Feature", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/src/enums" }, - { name: "NodeBuilderFlags", goPrefix: "Flags", goFile: "tsc/internal/nodebuilder/types.go", outDir: "packages/typescript/src/enums" }, - { name: "CompletionItemKind", goPrefix: "CompletionItemKind", goFile: "tsc/internal/lsp/lsproto/lsp_generated.go", outDir: "packages/typescript/src/enums" }, - { name: "EmitOnly", goPrefix: "Emit", goFile: "tsc/internal/compiler/emitter.go", outDir: "packages/typescript/src/enums", excludeMembers: ["OnlyBuilderSignature"] }, + { name: "ScriptKind", goPrefix: "ScriptKind", goFile: "tsc/internal/core/scriptkind.go", outDir: "packages/typescript/enums" }, + { name: "CaseSensitivity", goPrefix: "Case", goFile: "tsc/internal/tspath/path.go", outDir: "packages/typescript/enums" }, + { name: "TokenFlags", goPrefix: "TokenFlags", goFile: "tsc/internal/ast/tokenflags.go", outDir: "packages/typescript/enums" }, + { name: "DiagnosticDirectivePolicy", goPrefix: "MappedDiagnosticDirectivePolicy", goFile: "tsc/internal/ast/ast.go", outDir: "packages/typescript/enums" }, + { name: "SpanMapKind", goPrefix: "Kind", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/enums" }, + { name: "SpanMapFidelity", goPrefix: "Fidelity", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/enums" }, + { name: "SpanMapFeature", goPrefix: "Feature", goFile: "tsc/internal/spanmap/spanmap.go", outDir: "packages/typescript/enums" }, + { name: "NodeBuilderFlags", goPrefix: "Flags", goFile: "tsc/internal/nodebuilder/types.go", outDir: "packages/typescript/enums" }, + { name: "CompletionItemKind", goPrefix: "CompletionItemKind", goFile: "tsc/internal/lsp/lsproto/lsp_generated.go", outDir: "packages/typescript/enums" }, + { name: "EmitOnly", goPrefix: "Emit", goFile: "tsc/internal/compiler/emitter.go", outDir: "packages/typescript/enums", excludeMembers: ["OnlyBuilderSignature"] }, // String enum: Go stores internal names with a "\xFE" sentinel prefix, but the escaped // form sent over the wire uses "__" (see EscapeSymbolName), so map the sentinel accordingly. - { name: "InternalSymbolName", goPrefix: "InternalSymbolName", goFile: "tsc/internal/ast/symbol.go", outDir: "packages/typescript/src/enums", stringEnum: true, valueReplacements: { InternalSymbolNamePrefix: "__" } }, + { name: "InternalSymbolName", goPrefix: "InternalSymbolName", goFile: "tsc/internal/ast/symbol.go", outDir: "packages/typescript/enums", stringEnum: true, valueReplacements: { InternalSymbolNamePrefix: "__" } }, ] satisfies EnumDef[]; function syntaxKindMembers(): EnumMember[] { diff --git a/tools/scripts/tsc/generate-options.ts b/tools/scripts/tsc/generate-options.ts index 83305845b76ec..7fc89eac101bd 100644 --- a/tools/scripts/tsc/generate-options.ts +++ b/tools/scripts/tsc/generate-options.ts @@ -235,10 +235,10 @@ export function generateCompilerOptionsAPI(model = options): string { const enumNames = [...imports].sort(); const pathTypes = enumNames.filter(name => name.startsWith("Rooted")); const optionEnums = enumNames.filter(name => !name.startsWith("Rooted")); - const enumPath = (name: string) => `../enums/${name[0].toLowerCase() + name.slice(1)}.js`; + const enumPath = (name: string) => `../../enums/${name[0].toLowerCase() + name.slice(1)}.js`; return `${header} -${pathTypes.length ? `import type {\n ${pathTypes.join(",\n ")},\n} from "../ast/index.ts";` : ""} ${optionEnums.map(name => `import type { ${name} } from "${enumPath(name)}";`).join("\n")} +${pathTypes.length ? `import type {\n ${pathTypes.join(",\n ")},\n} from "../ast/index.ts";` : ""} ${optionEnums.map(name => `export { ${name} } from "${enumPath(name)}";`).join("\n")} diff --git a/tools/scripts/tsc/generate-ts-ast.ts b/tools/scripts/tsc/generate-ts-ast.ts index 04d1f00314d21..434d6e81ed03c 100644 --- a/tools/scripts/tsc/generate-ts-ast.ts +++ b/tools/scripts/tsc/generate-ts-ast.ts @@ -426,10 +426,10 @@ function generateAstGenerated(): string { astImports.sort((a, b) => a.localeCompare(b)); const header = `// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT. -import type { ModifierFlags } from "../enums/modifierFlags.js"; -import type { NodeFlags } from "../enums/nodeFlags.js"; -import { SyntaxKind } from "../enums/syntaxKind.js"; -import { TokenFlags } from "../enums/tokenFlags.js"; +import type { ModifierFlags } from "../../enums/modifierFlags.js"; +import type { NodeFlags } from "../../enums/nodeFlags.js"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; +import { TokenFlags } from "../../enums/tokenFlags.js"; import type { ${astImports.join(", ")} } from "./ast.ts";`; return [header, body].join(eol); @@ -655,9 +655,9 @@ function generateFactory(): string { // ── Header ── out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(""); - out.push(`import { NodeFlags } from "../enums/nodeFlags.js";`); - out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); - out.push(`import { TokenFlags } from "../enums/tokenFlags.js";`); + out.push(`import { NodeFlags } from "../../enums/nodeFlags.js";`); + out.push(`import { SyntaxKind } from "../../enums/syntaxKind.js";`); + out.push(`import { TokenFlags } from "../../enums/tokenFlags.js";`); const sortedImports = [...importTypes].sort((a, b) => a.localeCompare(b)); out.push(`import type {`); @@ -1526,7 +1526,7 @@ function generateIsGenerated(): string { // ── Build output ── out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(``); - out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); + out.push(`import { SyntaxKind } from "../../enums/syntaxKind.js";`); const sortedImports = [...importTypes].sort((a, b) => a.localeCompare(b)); out.push(`import type {`); for (const t of sortedImports) { @@ -1656,7 +1656,7 @@ function generateVisitor(): string { out.push(`// Code generated by tools/scripts/tsc/generate-ts-ast.ts. DO NOT EDIT.`); out.push(""); - out.push(`import { SyntaxKind } from "../enums/syntaxKind.js";`); + out.push(`import { SyntaxKind } from "../../enums/syntaxKind.js";`); out.push(`import type {`); for (const typeName of [...typeImports].sort((a, b) => a.localeCompare(b))) { out.push(` ${typeName},`); From 2b14f336e17079fe0fdc077a04e138c5ab26b2f5 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 19 Oct 2026 15:50:12 -0700 Subject: [PATCH 4/4] Revert stray edit --- packages/typescript/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/typescript/README.md b/packages/typescript/README.md index e6d01cd5c4736..c35985115a453 100644 --- a/packages/typescript/README.md +++ b/packages/typescript/README.md @@ -21,3 +21,4 @@ npx tsgo --help The native port of TypeScript is still in progress. We expect many gaps, but are seeking experimentation and feedback. If you have found differences that are not yet known, we encourage you to leave feedback on [the issue tracker](https://github.com/microsoft/TypeScript/tsc/issues). +