Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start implementing suboptions a different way

Browse Source
This commit is contained in:
Andrew Branch
2023-11-22 11:53:54 -08:00
parent 19e60f1a19
commit 864f641d19
2 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/commandLineParser.ts
+55 -50
View File
@@ -13,6 +13,7 @@ import {
CommandLineOption,
CommandLineOptionOfCustomType,
CommandLineOptionOfListType,
CommandLineOptionOfObjectOrShorthandType,
CompilerOptions,
CompilerOptionsValue,
ConfigFileSpecs,
@@ -555,12 +556,63 @@ const moduleKindMap = new Map(Object.entries({
nodenext: ModuleKind.NodeNext,
}));
const moduleSubOptionDeclarations: readonly CommandLineOption[] = [
{
name: "preset",
type: moduleKindMap,
affectsSourceFile: true,
affectsBuildInfo: true,
affectsEmit: true,
affectsSemanticDiagnostics: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_defaults_for_module_options_suited_for_common_runtimes_and_bundlers,
defaultValueDescription: undefined,
},
{
name: "formatDetection",
type: new Map(Object.entries({
none: ModuleFormatDetectionKind.None,
bundler: ModuleFormatDetectionKind.Bundler,
node16: ModuleFormatDetectionKind.Node16,
nodenext: ModuleFormatDetectionKind.NodeNext,
})),
affectsModuleResolution: true,
affectsSemanticDiagnostics: true,
affectsEmit: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_how_files_are_determined_to_be_ECMAScript_modules_or_CommonJS_modules,
defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_none_otherwise,
},
{
name: "formatInterop",
type: new Map(Object.entries({
babel: ModuleFormatInteropKind.Babel,
bundlernode: ModuleFormatInteropKind.BundlerNode,
node16: ModuleFormatInteropKind.Node16,
nodenext: ModuleFormatInteropKind.NodeNext,
})),
affectsSemanticDiagnostics: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_the_target_runtime_s_rules_for_ESM_CommonJS_interoperation,
defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_babel_otherwise,
},
{
name: "emit",
type: moduleKindMap,
affectsEmit: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_what_module_code_is_generated,
defaultValueDescription: undefined,
},
];
/** @internal */
export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
export const moduleOptionDeclaration: CommandLineOptionOfObjectOrShorthandType = {
name: "module",
shortName: "m",
type: moduleKindMap,
hasNestedVariant: true,
type: "objectOrShorthand",
shorthandType: moduleKindMap,
elementOptions: commandLineOptionsToMap(moduleSubOptionDeclarations),
affectsSourceFile: true,
affectsModuleResolution: true,
affectsEmit: true,
@@ -639,53 +691,6 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
// Basic
targetOptionDeclaration,
moduleOptionDeclaration,
{
name: "module.preset",
type: moduleKindMap,
affectsSourceFile: true,
affectsBuildInfo: true,
affectsEmit: true,
affectsSemanticDiagnostics: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_defaults_for_module_options_suited_for_common_runtimes_and_bundlers,
defaultValueDescription: undefined,
},
{
name: "module.formatDetection",
type: new Map(Object.entries({
none: ModuleFormatDetectionKind.None,
bundler: ModuleFormatDetectionKind.Bundler,
node16: ModuleFormatDetectionKind.Node16,
nodenext: ModuleFormatDetectionKind.NodeNext,
})),
affectsModuleResolution: true,
affectsSemanticDiagnostics: true,
affectsEmit: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_how_files_are_determined_to_be_ECMAScript_modules_or_CommonJS_modules,
defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_none_otherwise,
},
{
name: "module.formatInterop",
type: new Map(Object.entries({
babel: ModuleFormatInteropKind.Babel,
bundlernode: ModuleFormatInteropKind.BundlerNode,
node16: ModuleFormatInteropKind.Node16,
nodenext: ModuleFormatInteropKind.NodeNext,
})),
affectsSemanticDiagnostics: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_the_target_runtime_s_rules_for_ESM_CommonJS_interoperation,
defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_babel_otherwise,
},
{
name: "module.emit",
type: moduleKindMap,
affectsEmit: true,
category: Diagnostics.Modules,
description: Diagnostics.Specify_what_module_code_is_generated,
defaultValueDescription: undefined,
},
{
name: "lib",
src/compiler/types.ts
+11 -2
View File
@@ -7425,8 +7425,7 @@ export interface CreateProgramOptions {
/** @internal */
export interface CommandLineOptionBase {
name: string;
type: "string" | "number" | "boolean" | "object" | "list" | "listOrElement" | Map<string, number | string>; // a value of a primitive type, or an object literal mapping named values to actual values
hasNestedVariant?: boolean; // True for an option namee 'x' if another option named 'x.y' exists
type: "string" | "number" | "boolean" | "object" | "objectOrShorthand" | "list" | "listOrElement" | Map<string, number | string>; // a value of a primitive type, or an object literal mapping named values to actual values
isFilePath?: boolean; // True if option value is a path or fileName
shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help'
description?: DiagnosticMessage; // The message describing what the command line switch does.
@@ -7497,6 +7496,15 @@ export interface TsConfigOnlyOption extends CommandLineOptionBase {
extraKeyDiagnostics?: DidYouMeanOptionsDiagnostics;
}
/** @interface */
export interface CommandLineOptionOfObjectOrShorthandType extends CommandLineOptionBase {
type: "objectOrShorthand";
shorthandType: "string" | "number" | "boolean" | Map<string, number | string>;
defaultValueDescription?: string | number | boolean | DiagnosticMessage;
elementOptions: Map<string, CommandLineOption>;
extraKeyDiagnostics?: DidYouMeanOptionsDiagnostics;
}
/** @internal */
export interface CommandLineOptionOfListType extends CommandLineOptionBase {
type: "list" | "listOrElement";
@@ -7510,6 +7518,7 @@ export type CommandLineOption =
| CommandLineOptionOfStringType
| CommandLineOptionOfNumberType
| CommandLineOptionOfBooleanType
| CommandLineOptionOfObjectOrShorthandType
| TsConfigOnlyOption
| CommandLineOptionOfListType;