diff --git a/Herebyfile.mjs b/Herebyfile.mjs index ad1fb24d43cfa..bf3010588e80a 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/src/enums/caseSensitivity.enum.ts b/packages/typescript/enums/caseSensitivity.d.ts similarity index 76% rename from packages/typescript/src/enums/caseSensitivity.enum.ts rename to packages/typescript/enums/caseSensitivity.d.ts index f3d0c88fcc60d..09b051a3bdc01 100644 --- a/packages/typescript/src/enums/caseSensitivity.enum.ts +++ b/packages/typescript/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/enums/caseSensitivity.js similarity index 89% rename from packages/typescript/src/enums/caseSensitivity.ts rename to packages/typescript/enums/caseSensitivity.js index 57d30370ccd5c..b62c0fa7fad66 100644 --- a/packages/typescript/src/enums/caseSensitivity.ts +++ b/packages/typescript/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/enums/characterCodes.d.ts similarity index 93% rename from packages/typescript/src/enums/characterCodes.enum.ts rename to packages/typescript/enums/characterCodes.d.ts index 052c7e8feb896..079a9825bafbd 100644 --- a/packages/typescript/src/enums/characterCodes.enum.ts +++ b/packages/typescript/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/enums/characterCodes.js similarity index 97% rename from packages/typescript/src/enums/characterCodes.ts rename to packages/typescript/enums/characterCodes.js index 232a292da0cd0..e73d898796b6a 100644 --- a/packages/typescript/src/enums/characterCodes.ts +++ b/packages/typescript/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/enums/checkFlags.d.ts similarity index 94% rename from packages/typescript/src/enums/checkFlags.enum.ts rename to packages/typescript/enums/checkFlags.d.ts index c7fc87069accb..b6a027cccc5c0 100644 --- a/packages/typescript/src/enums/checkFlags.enum.ts +++ b/packages/typescript/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/enums/checkFlags.js similarity index 97% rename from packages/typescript/src/enums/checkFlags.ts rename to packages/typescript/enums/checkFlags.js index 5b4a963299675..c952c05875ea3 100644 --- a/packages/typescript/src/enums/checkFlags.ts +++ b/packages/typescript/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/enums/commentDirectiveType.d.ts b/packages/typescript/enums/commentDirectiveType.d.ts new file mode 100644 index 0000000000000..d02c94220ae82 --- /dev/null +++ b/packages/typescript/enums/commentDirectiveType.d.ts @@ -0,0 +1,4 @@ +export declare enum CommentDirectiveType { + ExpectError = 0, + Ignore = 1, +} diff --git a/packages/typescript/src/enums/commentDirectiveType.ts b/packages/typescript/enums/commentDirectiveType.js similarity index 85% rename from packages/typescript/src/enums/commentDirectiveType.ts rename to packages/typescript/enums/commentDirectiveType.js index 2c59ede17483c..c65092d0b2e5b 100644 --- a/packages/typescript/src/enums/commentDirectiveType.ts +++ b/packages/typescript/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/enums/completionItemKind.d.ts similarity index 88% rename from packages/typescript/src/enums/completionItemKind.enum.ts rename to packages/typescript/enums/completionItemKind.d.ts index 1b84c46c479d6..d07245fcda88f 100644 --- a/packages/typescript/src/enums/completionItemKind.enum.ts +++ b/packages/typescript/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/enums/completionItemKind.js similarity index 96% rename from packages/typescript/src/enums/completionItemKind.ts rename to packages/typescript/enums/completionItemKind.js index 00126c380c9d1..45781a4fc9783 100644 --- a/packages/typescript/src/enums/completionItemKind.ts +++ b/packages/typescript/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/enums/diagnosticCategory.d.ts similarity index 79% rename from packages/typescript/src/enums/diagnosticCategory.enum.ts rename to packages/typescript/enums/diagnosticCategory.d.ts index c7ca0e695636e..dc98ba52da229 100644 --- a/packages/typescript/src/enums/diagnosticCategory.enum.ts +++ b/packages/typescript/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/enums/diagnosticCategory.js similarity index 91% rename from packages/typescript/src/enums/diagnosticCategory.ts rename to packages/typescript/enums/diagnosticCategory.js index 26438f4c03c10..166eda60dc552 100644 --- a/packages/typescript/src/enums/diagnosticCategory.ts +++ b/packages/typescript/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/enums/diagnosticDirectivePolicy.d.ts similarity index 71% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.enum.ts rename to packages/typescript/enums/diagnosticDirectivePolicy.d.ts index fedd1e5286067..99a67459bbd82 100644 --- a/packages/typescript/src/enums/diagnosticDirectivePolicy.enum.ts +++ b/packages/typescript/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/enums/diagnosticDirectivePolicy.js similarity index 88% rename from packages/typescript/src/enums/diagnosticDirectivePolicy.ts rename to packages/typescript/enums/diagnosticDirectivePolicy.js index c17dd1480ea92..2c39debb4c5ff 100644 --- a/packages/typescript/src/enums/diagnosticDirectivePolicy.ts +++ b/packages/typescript/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/enums/elementFlags.d.ts similarity index 88% rename from packages/typescript/src/enums/elementFlags.enum.ts rename to packages/typescript/enums/elementFlags.d.ts index 546f54bf3a535..b6ddaa4c6296b 100644 --- a/packages/typescript/src/enums/elementFlags.enum.ts +++ b/packages/typescript/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/enums/elementFlags.js similarity index 94% rename from packages/typescript/src/enums/elementFlags.ts rename to packages/typescript/enums/elementFlags.js index 9400139a6bf01..9b38b354add85 100644 --- a/packages/typescript/src/enums/elementFlags.ts +++ b/packages/typescript/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/enums/emitOnly.d.ts similarity index 80% rename from packages/typescript/src/enums/emitOnly.enum.ts rename to packages/typescript/enums/emitOnly.d.ts index f22aba400b828..0c1fa0a9c278f 100644 --- a/packages/typescript/src/enums/emitOnly.enum.ts +++ b/packages/typescript/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/enums/emitOnly.js similarity index 90% rename from packages/typescript/src/enums/emitOnly.ts rename to packages/typescript/enums/emitOnly.js index 2856c2f03718f..903de0fc06655 100644 --- a/packages/typescript/src/enums/emitOnly.ts +++ b/packages/typescript/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/enums/indexKind.d.ts similarity index 78% rename from packages/typescript/src/enums/indexKind.enum.ts rename to packages/typescript/enums/indexKind.d.ts index 7906d18ec2188..f43f9f449e97b 100644 --- a/packages/typescript/src/enums/indexKind.enum.ts +++ b/packages/typescript/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/enums/indexKind.js similarity index 89% rename from packages/typescript/src/enums/indexKind.ts rename to packages/typescript/enums/indexKind.js index 21e64454bbc2c..a77cc0fb2222e 100644 --- a/packages/typescript/src/enums/indexKind.ts +++ b/packages/typescript/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/enums/internalSymbolName.d.ts similarity index 91% rename from packages/typescript/src/enums/internalSymbolName.enum.ts rename to packages/typescript/enums/internalSymbolName.d.ts index 155b25fc1985b..74a6d6beee51a 100644 --- a/packages/typescript/src/enums/internalSymbolName.enum.ts +++ b/packages/typescript/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/enums/internalSymbolName.js similarity index 95% rename from packages/typescript/src/enums/internalSymbolName.ts rename to packages/typescript/enums/internalSymbolName.js index 5815d341690ce..26291c993b77b 100644 --- a/packages/typescript/src/enums/internalSymbolName.ts +++ b/packages/typescript/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/enums/jsDeclarationKind.d.ts similarity index 84% rename from packages/typescript/src/enums/jsDeclarationKind.enum.ts rename to packages/typescript/enums/jsDeclarationKind.d.ts index 4e6dcbe9fc539..6bb74da182e9d 100644 --- a/packages/typescript/src/enums/jsDeclarationKind.enum.ts +++ b/packages/typescript/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/enums/jsDeclarationKind.js similarity index 94% rename from packages/typescript/src/enums/jsDeclarationKind.ts rename to packages/typescript/enums/jsDeclarationKind.js index d09cd90920d20..cb9d1d961630d 100644 --- a/packages/typescript/src/enums/jsDeclarationKind.ts +++ b/packages/typescript/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/enums/jsxEmit.d.ts similarity index 84% rename from packages/typescript/src/enums/jsxEmit.enum.ts rename to packages/typescript/enums/jsxEmit.d.ts index 0a728dceeef31..bfba4cd875387 100644 --- a/packages/typescript/src/enums/jsxEmit.enum.ts +++ b/packages/typescript/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/enums/jsxEmit.js similarity index 92% rename from packages/typescript/src/enums/jsxEmit.ts rename to packages/typescript/enums/jsxEmit.js index 4c5aa9d989f47..974c47c905d43 100644 --- a/packages/typescript/src/enums/jsxEmit.ts +++ b/packages/typescript/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/enums/languageVariant.d.ts b/packages/typescript/enums/languageVariant.d.ts new file mode 100644 index 0000000000000..6047765cf9a37 --- /dev/null +++ b/packages/typescript/enums/languageVariant.d.ts @@ -0,0 +1,4 @@ +export declare enum LanguageVariant { + Standard = 0, + JSX = 1, +} diff --git a/packages/typescript/src/enums/languageVariant.ts b/packages/typescript/enums/languageVariant.js similarity index 84% rename from packages/typescript/src/enums/languageVariant.ts rename to packages/typescript/enums/languageVariant.js index 831ca135c8f4d..c2ed2c560dff3 100644 --- a/packages/typescript/src/enums/languageVariant.ts +++ b/packages/typescript/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/enums/modifierFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/modifierFlags.enum.ts rename to packages/typescript/enums/modifierFlags.d.ts index 1ccf51e96dc26..e95c33363c45b 100644 --- a/packages/typescript/src/enums/modifierFlags.enum.ts +++ b/packages/typescript/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/enums/modifierFlags.js similarity index 97% rename from packages/typescript/src/enums/modifierFlags.ts rename to packages/typescript/enums/modifierFlags.js index 614dcf3b09ed2..e93bc0329bea5 100644 --- a/packages/typescript/src/enums/modifierFlags.ts +++ b/packages/typescript/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/enums/moduleDetectionKind.d.ts similarity index 76% rename from packages/typescript/src/enums/moduleDetectionKind.enum.ts rename to packages/typescript/enums/moduleDetectionKind.d.ts index 3c857ba6bff33..dfe6d5b67f9cc 100644 --- a/packages/typescript/src/enums/moduleDetectionKind.enum.ts +++ b/packages/typescript/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/enums/moduleDetectionKind.js similarity index 91% rename from packages/typescript/src/enums/moduleDetectionKind.ts rename to packages/typescript/enums/moduleDetectionKind.js index aef2c39903baf..cc8c317da0e98 100644 --- a/packages/typescript/src/enums/moduleDetectionKind.ts +++ b/packages/typescript/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/enums/moduleKind.d.ts similarity index 86% rename from packages/typescript/src/enums/moduleKind.enum.ts rename to packages/typescript/enums/moduleKind.d.ts index 4ecadf2728b42..627466edada3a 100644 --- a/packages/typescript/src/enums/moduleKind.enum.ts +++ b/packages/typescript/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/enums/moduleKind.js similarity index 95% rename from packages/typescript/src/enums/moduleKind.ts rename to packages/typescript/enums/moduleKind.js index 242fe2a27253c..67b29bd443603 100644 --- a/packages/typescript/src/enums/moduleKind.ts +++ b/packages/typescript/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/enums/moduleResolutionKind.d.ts similarity index 80% rename from packages/typescript/src/enums/moduleResolutionKind.enum.ts rename to packages/typescript/enums/moduleResolutionKind.d.ts index 51ef127a5864f..e3bd1a81c25f6 100644 --- a/packages/typescript/src/enums/moduleResolutionKind.enum.ts +++ b/packages/typescript/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/enums/moduleResolutionKind.js similarity index 93% rename from packages/typescript/src/enums/moduleResolutionKind.ts rename to packages/typescript/enums/moduleResolutionKind.js index 83a8decbd0cc5..8af872eaa224b 100644 --- a/packages/typescript/src/enums/moduleResolutionKind.ts +++ b/packages/typescript/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/enums/newLineKind.d.ts similarity index 78% rename from packages/typescript/src/enums/newLineKind.enum.ts rename to packages/typescript/enums/newLineKind.d.ts index 2195a93ee3b0a..6d4c3a1d37ce4 100644 --- a/packages/typescript/src/enums/newLineKind.enum.ts +++ b/packages/typescript/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/enums/newLineKind.js similarity index 89% rename from packages/typescript/src/enums/newLineKind.ts rename to packages/typescript/enums/newLineKind.js index f36d2e22b163c..d731d23de67d3 100644 --- a/packages/typescript/src/enums/newLineKind.ts +++ b/packages/typescript/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/enums/nodeBuilderFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/nodeBuilderFlags.enum.ts rename to packages/typescript/enums/nodeBuilderFlags.d.ts index 28acdaf03703c..6f922a68ac45d 100644 --- a/packages/typescript/src/enums/nodeBuilderFlags.enum.ts +++ b/packages/typescript/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/enums/nodeBuilderFlags.js similarity index 98% rename from packages/typescript/src/enums/nodeBuilderFlags.ts rename to packages/typescript/enums/nodeBuilderFlags.js index db674d3717557..83a97b1a3844d 100644 --- a/packages/typescript/src/enums/nodeBuilderFlags.ts +++ b/packages/typescript/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/enums/nodeFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/nodeFlags.enum.ts rename to packages/typescript/enums/nodeFlags.d.ts index 1296af0307cbf..b9c3335f7603f 100644 --- a/packages/typescript/src/enums/nodeFlags.enum.ts +++ b/packages/typescript/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/enums/nodeFlags.js similarity index 97% rename from packages/typescript/src/enums/nodeFlags.ts rename to packages/typescript/enums/nodeFlags.js index be496dcad7c7f..14fc1251943d3 100644 --- a/packages/typescript/src/enums/nodeFlags.ts +++ b/packages/typescript/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/enums/objectFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/objectFlags.enum.ts rename to packages/typescript/enums/objectFlags.d.ts index 15e497dc6ffb0..fd17f37c6fc0b 100644 --- a/packages/typescript/src/enums/objectFlags.enum.ts +++ b/packages/typescript/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/enums/objectFlags.js similarity index 98% rename from packages/typescript/src/enums/objectFlags.ts rename to packages/typescript/enums/objectFlags.js index af3bad5af2d58..013bee411f001 100644 --- a/packages/typescript/src/enums/objectFlags.ts +++ b/packages/typescript/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/enums/outerExpressionKinds.d.ts similarity index 92% rename from packages/typescript/src/enums/outerExpressionKinds.enum.ts rename to packages/typescript/enums/outerExpressionKinds.d.ts index c6463a9d76964..604aa8acdfa46 100644 --- a/packages/typescript/src/enums/outerExpressionKinds.enum.ts +++ b/packages/typescript/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/enums/outerExpressionKinds.js similarity index 96% rename from packages/typescript/src/enums/outerExpressionKinds.ts rename to packages/typescript/enums/outerExpressionKinds.js index f3efd85e9394c..bf91e2b18192a 100644 --- a/packages/typescript/src/enums/outerExpressionKinds.ts +++ b/packages/typescript/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/enums/regularExpressionFlags.d.ts similarity index 81% rename from packages/typescript/src/enums/regularExpressionFlags.enum.ts rename to packages/typescript/enums/regularExpressionFlags.d.ts index 2f85b60897d60..e589a0f78513d 100644 --- a/packages/typescript/src/enums/regularExpressionFlags.enum.ts +++ b/packages/typescript/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/enums/regularExpressionFlags.js similarity index 94% rename from packages/typescript/src/enums/regularExpressionFlags.ts rename to packages/typescript/enums/regularExpressionFlags.js index ddd797fc1f971..a540693087da6 100644 --- a/packages/typescript/src/enums/regularExpressionFlags.ts +++ b/packages/typescript/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/enums/scriptKind.d.ts similarity index 81% rename from packages/typescript/src/enums/scriptKind.enum.ts rename to packages/typescript/enums/scriptKind.d.ts index e5f108ddec05b..dfb5f32a952f6 100644 --- a/packages/typescript/src/enums/scriptKind.enum.ts +++ b/packages/typescript/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/enums/scriptKind.js similarity index 92% rename from packages/typescript/src/enums/scriptKind.ts rename to packages/typescript/enums/scriptKind.js index 8dd790c4e0f97..bda99d31b38ce 100644 --- a/packages/typescript/src/enums/scriptKind.ts +++ b/packages/typescript/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/enums/scriptTarget.d.ts similarity index 86% rename from packages/typescript/src/enums/scriptTarget.enum.ts rename to packages/typescript/enums/scriptTarget.d.ts index e1ee6bdb19200..29dc2c3824f11 100644 --- a/packages/typescript/src/enums/scriptTarget.enum.ts +++ b/packages/typescript/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/enums/scriptTarget.js similarity index 95% rename from packages/typescript/src/enums/scriptTarget.ts rename to packages/typescript/enums/scriptTarget.js index 5532d4886d325..255eff8244de5 100644 --- a/packages/typescript/src/enums/scriptTarget.ts +++ b/packages/typescript/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/enums/signatureFlags.d.ts similarity index 92% rename from packages/typescript/src/enums/signatureFlags.enum.ts rename to packages/typescript/enums/signatureFlags.d.ts index 6ec54519a379d..e27d3bb21336c 100644 --- a/packages/typescript/src/enums/signatureFlags.enum.ts +++ b/packages/typescript/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/enums/signatureFlags.js similarity index 96% rename from packages/typescript/src/enums/signatureFlags.ts rename to packages/typescript/enums/signatureFlags.js index 0fdfb94f95e5e..82b07aa2380b0 100644 --- a/packages/typescript/src/enums/signatureFlags.ts +++ b/packages/typescript/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/enums/signatureKind.d.ts similarity index 77% rename from packages/typescript/src/enums/signatureKind.enum.ts rename to packages/typescript/enums/signatureKind.d.ts index a9963c9c27b97..e151c01b0ce00 100644 --- a/packages/typescript/src/enums/signatureKind.enum.ts +++ b/packages/typescript/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/enums/signatureKind.js similarity index 88% rename from packages/typescript/src/enums/signatureKind.ts rename to packages/typescript/enums/signatureKind.js index e58344d712159..5b32c12e259f4 100644 --- a/packages/typescript/src/enums/signatureKind.ts +++ b/packages/typescript/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/enums/spanMapFeature.d.ts similarity index 91% rename from packages/typescript/src/enums/spanMapFeature.enum.ts rename to packages/typescript/enums/spanMapFeature.d.ts index 76e8f7d4966be..d09e0845a5eaa 100644 --- a/packages/typescript/src/enums/spanMapFeature.enum.ts +++ b/packages/typescript/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/enums/spanMapFeature.js similarity index 96% rename from packages/typescript/src/enums/spanMapFeature.ts rename to packages/typescript/enums/spanMapFeature.js index 86495362da735..62c97776de84b 100644 --- a/packages/typescript/src/enums/spanMapFeature.ts +++ b/packages/typescript/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/enums/spanMapFidelity.d.ts similarity index 79% rename from packages/typescript/src/enums/spanMapFidelity.enum.ts rename to packages/typescript/enums/spanMapFidelity.d.ts index 7c57d9424f6d0..aecca9bf10c2f 100644 --- a/packages/typescript/src/enums/spanMapFidelity.enum.ts +++ b/packages/typescript/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/enums/spanMapFidelity.js similarity index 91% rename from packages/typescript/src/enums/spanMapFidelity.ts rename to packages/typescript/enums/spanMapFidelity.js index bbf6159ede42c..43677f2057a6c 100644 --- a/packages/typescript/src/enums/spanMapFidelity.ts +++ b/packages/typescript/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/enums/spanMapKind.d.ts similarity index 79% rename from packages/typescript/src/enums/spanMapKind.enum.ts rename to packages/typescript/enums/spanMapKind.d.ts index b9634ee2300cf..7ed1e2bfc36f7 100644 --- a/packages/typescript/src/enums/spanMapKind.enum.ts +++ b/packages/typescript/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/enums/spanMapKind.js similarity index 90% rename from packages/typescript/src/enums/spanMapKind.ts rename to packages/typescript/enums/spanMapKind.js index ef390d8f7869d..7f1b91f4c8c59 100644 --- a/packages/typescript/src/enums/spanMapKind.ts +++ b/packages/typescript/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/enums/symbolFlags.d.ts similarity index 96% rename from packages/typescript/src/enums/symbolFlags.enum.ts rename to packages/typescript/enums/symbolFlags.d.ts index e80234baf2606..18d3a7fcf1948 100644 --- a/packages/typescript/src/enums/symbolFlags.enum.ts +++ b/packages/typescript/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/enums/symbolFlags.js similarity index 98% rename from packages/typescript/src/enums/symbolFlags.ts rename to packages/typescript/enums/symbolFlags.js index 25f906b3e47d9..8c1e2ae54e2c8 100644 --- a/packages/typescript/src/enums/symbolFlags.ts +++ b/packages/typescript/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/enums/symbolOwnerKind.d.ts similarity index 75% rename from packages/typescript/src/enums/symbolOwnerKind.enum.ts rename to packages/typescript/enums/symbolOwnerKind.d.ts index 0f743c53ee458..6c6f7be4b0f5a 100644 --- a/packages/typescript/src/enums/symbolOwnerKind.enum.ts +++ b/packages/typescript/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/enums/symbolOwnerKind.js similarity index 88% rename from packages/typescript/src/enums/symbolOwnerKind.ts rename to packages/typescript/enums/symbolOwnerKind.js index 97aae72e18725..266e9fd81968a 100644 --- a/packages/typescript/src/enums/symbolOwnerKind.ts +++ b/packages/typescript/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/enums/syntaxKind.d.ts similarity index 96% rename from packages/typescript/src/enums/syntaxKind.enum.ts rename to packages/typescript/enums/syntaxKind.d.ts index 1973373f684f3..6954eb2d393cd 100644 --- a/packages/typescript/src/enums/syntaxKind.enum.ts +++ b/packages/typescript/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/enums/syntaxKind.js similarity index 98% rename from packages/typescript/src/enums/syntaxKind.ts rename to packages/typescript/enums/syntaxKind.js index 596eeab49f274..e6be66c97d44e 100644 --- a/packages/typescript/src/enums/syntaxKind.ts +++ b/packages/typescript/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/enums/tokenFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/tokenFlags.enum.ts rename to packages/typescript/enums/tokenFlags.d.ts index 688147408b0ac..9a7b4ce54a782 100644 --- a/packages/typescript/src/enums/tokenFlags.enum.ts +++ b/packages/typescript/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/enums/tokenFlags.js similarity index 97% rename from packages/typescript/src/enums/tokenFlags.ts rename to packages/typescript/enums/tokenFlags.js index fe13478dd1021..c1b3efff6b514 100644 --- a/packages/typescript/src/enums/tokenFlags.ts +++ b/packages/typescript/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/enums/typeFlags.d.ts similarity index 97% rename from packages/typescript/src/enums/typeFlags.enum.ts rename to packages/typescript/enums/typeFlags.d.ts index 282cbcfe49406..34a3f63289916 100644 --- a/packages/typescript/src/enums/typeFlags.enum.ts +++ b/packages/typescript/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/enums/typeFlags.js similarity index 98% rename from packages/typescript/src/enums/typeFlags.ts rename to packages/typescript/enums/typeFlags.js index e1e8432972020..170a906ece4e2 100644 --- a/packages/typescript/src/enums/typeFlags.ts +++ b/packages/typescript/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/enums/typeFormatFlags.d.ts similarity index 95% rename from packages/typescript/src/enums/typeFormatFlags.enum.ts rename to packages/typescript/enums/typeFormatFlags.d.ts index a4da6175aac15..d42e0ceca9050 100644 --- a/packages/typescript/src/enums/typeFormatFlags.enum.ts +++ b/packages/typescript/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/enums/typeFormatFlags.js similarity index 97% rename from packages/typescript/src/enums/typeFormatFlags.ts rename to packages/typescript/enums/typeFormatFlags.js index a2867d17303c1..ad7c2b9e8760f 100644 --- a/packages/typescript/src/enums/typeFormatFlags.ts +++ b/packages/typescript/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/enums/typePredicateKind.d.ts similarity index 79% rename from packages/typescript/src/enums/typePredicateKind.enum.ts rename to packages/typescript/enums/typePredicateKind.d.ts index bbcc31af12ab0..16ad7c3148716 100644 --- a/packages/typescript/src/enums/typePredicateKind.enum.ts +++ b/packages/typescript/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/enums/typePredicateKind.js similarity index 91% rename from packages/typescript/src/enums/typePredicateKind.ts rename to packages/typescript/enums/typePredicateKind.js index d3b0199e0b673..3788298dfe00d 100644 --- a/packages/typescript/src/enums/typePredicateKind.ts +++ b/packages/typescript/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/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..fbe0c3166e907 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -31,6 +31,7 @@ "lib", "schemas", "dist", + "enums", "vendor" ], "bin": { @@ -94,18 +95,6 @@ "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", diff --git a/packages/typescript/src/api/async/api.ts b/packages/typescript/src/api/async/api.ts index a9dd53fe3a3f1..64dbd13a61a75 100644 --- a/packages/typescript/src/api/async/api.ts +++ b/packages/typescript/src/api/async/api.ts @@ -1,23 +1,23 @@ -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 { 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, diff --git a/packages/typescript/src/api/async/client.ts b/packages/typescript/src/api/async/client.ts index 6838dde4fbb8c..9d06cbdedfb27 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..4e57a57b6ecf3 100644 --- a/packages/typescript/src/api/async/types.ts +++ b/packages/typescript/src/api/async/types.ts @@ -1,8 +1,8 @@ -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 { 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, diff --git a/packages/typescript/src/api/compilerOptions.generated.ts b/packages/typescript/src/api/compilerOptions.generated.ts index c694de0043355..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"; -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 { 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"; -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 2474bd52996fb..1cc066f5e18f0 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..988cd5937d8b3 100644 --- a/packages/typescript/src/api/path.ts +++ b/packages/typescript/src/api/path.ts @@ -1,4 +1,4 @@ -import { CaseSensitivity } from "#enums/caseSensitivity"; +import { CaseSensitivity } from "../../enums/caseSensitivity.js"; import type { PathKey, RootedDirectoryPath, @@ -6,7 +6,7 @@ import type { RootedPath, } from "../ast/index.ts"; -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 93774869c4407..6f49fab3ca6ab 100644 --- a/packages/typescript/src/api/proto.generated.ts +++ b/packages/typescript/src/api/proto.generated.ts @@ -1,14 +1,14 @@ // 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 { 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, @@ -21,15 +21,15 @@ import type { } 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 { 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 type { CompilerOptions, PluginImport } from "./compilerOptions.generated.ts"; export * from "./compilerOptions.generated.ts"; diff --git a/packages/typescript/src/api/proto.ts b/packages/typescript/src/api/proto.ts index 57536ef418a4e..322b3ff4b2bb8 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 8950863c33460..f08ef255288b9 100644 --- a/packages/typescript/src/api/sync/api.ts +++ b/packages/typescript/src/api/sync/api.ts @@ -15,26 +15,26 @@ 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 { 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, diff --git a/packages/typescript/src/api/sync/types.ts b/packages/typescript/src/api/sync/types.ts index 2f466b6b684ae..562f09584efd3 100644 --- a/packages/typescript/src/api/sync/types.ts +++ b/packages/typescript/src/api/sync/types.ts @@ -11,11 +11,11 @@ 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 { 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, diff --git a/packages/typescript/src/ast/ast.generated.ts b/packages/typescript/src/ast/ast.generated.ts index 723093189f812..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"; -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..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"; -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 53bc447d2a0d7..edcf6ec03b99f 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..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"; +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..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"; -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..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"; -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..4a35d786b5cfe 100644 --- a/packages/typescript/src/ast/is.generated.ts +++ b/packages/typescript/src/ast/is.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 { NodeHandle as AsyncNodeHandle } from "../api/async/api.ts"; import type { NodeHandle as SyncNodeHandle } from "../api/sync/api.ts"; import type { diff --git a/packages/typescript/src/ast/is.ts b/packages/typescript/src/ast/is.ts index ecf91f4c74f3b..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"; -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..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"; -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..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"; -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..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"; -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..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"; -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..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"; +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..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"; +import { SyntaxKind } from "../../enums/syntaxKind.js"; import type { JSDocComment, JSDocParameterOrPropertyTag, 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/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/test/proto.test.ts b/packages/typescript/test/proto.test.ts index 39159e79c6c9f..f2f57267f1869 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.ts"; test("symbol ownership protocol validation rejects mixed variants", () => { const project = 1; diff --git a/packages/typescript/test/timingDump.test.ts b/packages/typescript/test/timingDump.test.ts index 87528afa0de91..ff0069fbe7ea5 100644 --- a/packages/typescript/test/timingDump.test.ts +++ b/packages/typescript/test/timingDump.test.ts @@ -1,8 +1,3 @@ -import { - createMessageConnection, - SocketMessageReader, - SocketMessageWriter, -} from "#vscode-jsonrpc/node"; import { API as AsyncAPI } from "@typescript/typescript/async"; import { API as SyncAPI } from "@typescript/typescript/sync"; import assert from "node:assert/strict"; @@ -22,6 +17,11 @@ import { disabledServerTimingInfo, TimingCollector, } from "../src/api/timing.ts"; +import { + createMessageConnection, + SocketMessageReader, + SocketMessageWriter, +} from "../vendor/vscode-jsonrpc/lib/node/main.js"; import { createVirtualFileSystem } from "./testUtils.ts"; test("disabled server timing preserves the client-only snapshot", () => { 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..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") + 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..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";`, + `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..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/*.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/*.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 757f598fa88c6..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[] { @@ -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..7fc89eac101bd 100644 --- a/tools/scripts/tsc/generate-options.ts +++ b/tools/scripts/tsc/generate-options.ts @@ -235,7 +235,7 @@ 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";` : ""} diff --git a/tools/scripts/tsc/generate-ts-ast.ts b/tools/scripts/tsc/generate-ts-ast.ts index 4414e14148881..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"; -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({