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

Revert "Fix showConfig"

Browse Source 
This reverts commit 19e60f1a19.
This commit is contained in:
Andrew Branch
2023-11-22 11:55:00 -08:00
parent 864f641d19
commit dc42c72b95
6 changed files with 100 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/commandLineParser.ts
+61 -47
View File
@@ -86,7 +86,6 @@ import {
ModuleFormatInteropKind,
ModuleKind,
ModuleResolutionKind,
NestedCompilerOption,
NewLineKind,
Node,
NodeArray,
@@ -610,9 +609,26 @@ const moduleSubOptionDeclarations: readonly CommandLineOption[] = [
export const moduleOptionDeclaration: CommandLineOptionOfObjectOrShorthandType = {
name: "module",
shortName: "m",
// HEAD
type: "objectOrShorthand",
shorthandType: moduleKindMap,
elementOptions: commandLineOptionsToMap(moduleSubOptionDeclarations),
//
type: new Map(Object.entries({
none: ModuleKind.None,
commonjs: ModuleKind.CommonJS,
amd: ModuleKind.AMD,
system: ModuleKind.System,
umd: ModuleKind.UMD,
es6: ModuleKind.ES2015,
es2015: ModuleKind.ES2015,
es2020: ModuleKind.ES2020,
es2022: ModuleKind.ES2022,
esnext: ModuleKind.ESNext,
node16: ModuleKind.Node16,
nodenext: ModuleKind.NodeNext,
})),
// parent of 19e60f1a19 (Fix showConfig)
affectsSourceFile: true,
affectsModuleResolution: true,
affectsEmit: true,
@@ -691,7 +707,10 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
// Basic
targetOptionDeclaration,
moduleOptionDeclaration,
// HEAD
//
// parent of 19e60f1a19 (Fix showConfig)
{
name: "lib",
type: "list",
@@ -1209,6 +1228,31 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
category: Diagnostics.Modules,
description: Diagnostics.Conditions_to_set_in_addition_to_the_resolver_specific_defaults_when_resolving_imports,
},
{
name: "moduleFormatDetection",
type: new Map(Object.entries({
none: ModuleFormatDetectionKind.None,
bundler: ModuleFormatDetectionKind.Bundler,
node16: ModuleFormatDetectionKind.Node16,
nodenext: ModuleFormatDetectionKind.NodeNext,
})),
affectsModuleResolution: 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: "moduleFormatInterop",
type: new Map(Object.entries({
babel: ModuleFormatInteropKind.Babel,
bundlernode: ModuleFormatInteropKind.BundlerNode,
node16: ModuleFormatInteropKind.Node16,
nodenext: ModuleFormatInteropKind.NodeNext,
})),
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,
},
// Source Maps
{
@@ -1948,34 +1992,28 @@ function parseOptionValue(
errors.push(createCompilerDiagnostic(diagnostics.optionTypeMismatchDiagnostic, opt.name, getCompilerOptionValueTypeString(opt)));
}
const dotIndex = opt.name.indexOf(".");
const [base = {}, name] = dotIndex > 0 ? [options[opt.name.substring(0, dotIndex)] as OptionsBase, opt.name.substring(dotIndex + 1)] : [options, opt.name];
if (dotIndex > 0) {
options[opt.name.substring(0, dotIndex)] = base;
}
if (args[i] !== "null") {
switch (opt.type) {
case "number":
base[name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
options[opt.name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
i++;
break;
case "boolean":
// boolean flag has optional value true, false, others
const optValue = args[i];
base[name] = validateJsonOptionValue(opt, optValue !== "false", errors);
options[opt.name] = validateJsonOptionValue(opt, optValue !== "false", errors);
// consume next argument as boolean flag value
if (optValue === "false" || optValue === "true") {
i++;
}
break;
case "string":
base[name] = validateJsonOptionValue(opt, args[i] || "", errors);
options[opt.name] = validateJsonOptionValue(opt, args[i] || "", errors);
i++;
break;
case "list":
const result = parseListTypeOption(opt, args[i], errors);
base[name] = result || [];
options[opt.name] = result || [];
if (result) {
i++;
}
@@ -1985,13 +2023,13 @@ function parseOptionValue(
break;
// If not a primitive, the possible types are specified in what is effectively a map of options.
default:
base[name] = parseCustomTypeOption(opt as CommandLineOptionOfCustomType, args[i], errors);
options[opt.name] = parseCustomTypeOption(opt as CommandLineOptionOfCustomType, args[i], errors);
i++;
break;
}
}
else {
base[name] = undefined;
options[opt.name] = undefined;
i++;
}
}
@@ -2480,12 +2518,11 @@ export function convertToJson(
}
function getCompilerOptionValueTypeString(option: CommandLineOption): string {
const primaryType = (option.type === "listOrElement") ?
return (option.type === "listOrElement") ?
`${getCompilerOptionValueTypeString(option.element)} or Array` :
option.type === "list" ?
"Array" :
isString(option.type) ? option.type : "string";
return option.hasNestedVariant ? `${primaryType} or object` : primaryType;
}
function isCompilerOptionsValue(option: CommandLineOption | undefined, value: any): value is CompilerOptionsValue {
@@ -2640,29 +2677,23 @@ function serializeWatchOptions(options: WatchOptions) {
function serializeOptionBaseObject(
options: OptionsBase,
{ optionsNameMap }: Pick<OptionsNameMap, "optionsNameMap">,
{ optionsNameMap }: OptionsNameMap,
pathOptions?: { configFilePath: string; useCaseSensitiveFileNames: boolean; },
containerName?: string,
): Map<string, CompilerOptionsValue> {
const result = new Map<string, CompilerOptionsValue>();
const getCanonicalFileName = pathOptions && createGetCanonicalFileName(pathOptions.useCaseSensitiveFileNames);
for (const name in options) {
if (hasProperty(options, name)) {
const fullOptionName = containerName ? `${containerName}.${name}` : name;
// tsconfig only options cannot be specified via command line,
// so we can assume that only types that can appear here string | number | boolean
if (optionsNameMap.has(fullOptionName) && (optionsNameMap.get(fullOptionName)!.category === Diagnostics.Command_line_Options || optionsNameMap.get(fullOptionName)!.category === Diagnostics.Output_Formatting)) {
if (optionsNameMap.has(name) && (optionsNameMap.get(name)!.category === Diagnostics.Command_line_Options || optionsNameMap.get(name)!.category === Diagnostics.Output_Formatting)) {
continue;
}
const value = options[name] as CompilerOptionsValue;
const optionDefinition = optionsNameMap.get(fullOptionName.toLowerCase());
const optionDefinition = optionsNameMap.get(name.toLowerCase());
if (optionDefinition) {
Debug.assert(optionDefinition.type !== "listOrElement");
if (optionDefinition.hasNestedVariant && value && typeof value === "object" && !isArray(value)) {
result.set(name, optionMapToObject(serializeOptionBaseObject(value as OptionsBase, { optionsNameMap }, pathOptions, name)));
continue;
}
const customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
if (!customTypeMap) {
// There is no map associated with this compiler option then use the value as-is
@@ -3289,12 +3320,12 @@ function getExtendsConfigPathOrArray(
);
}
else {
convertJsonOption(extendsOptionDeclaration.element, value, basePath, errors, /*optionsNameMap*/ undefined, /*diagnostics*/ undefined, propertyAssignment, (valueExpression as ArrayLiteralExpression | undefined)?.elements[index], sourceFile);
convertJsonOption(extendsOptionDeclaration.element, value, basePath, errors, propertyAssignment, (valueExpression as ArrayLiteralExpression | undefined)?.elements[index], sourceFile);
}
}
}
else {
convertJsonOption(extendsOptionDeclaration, value, basePath, errors, /*optionsNameMap*/ undefined, /*diagnostics*/ undefined, propertyAssignment, valueExpression, sourceFile);
convertJsonOption(extendsOptionDeclaration, value, basePath, errors, propertyAssignment, valueExpression, sourceFile);
}
return extendedConfigPath;
}
@@ -3337,7 +3368,7 @@ function parseOwnConfigOfJsonSourceFile(
option: CommandLineOption | undefined,
) {
// Ensure value is verified except for extends which is handled in its own way for error reporting
if (option && option !== extendsOptionDeclaration) value = convertJsonOption(option, value, basePath, errors, parentOption?.elementOptions, parentOption?.extraKeyDiagnostics, propertyAssignment, propertyAssignment.initializer, sourceFile);
if (option && option !== extendsOptionDeclaration) value = convertJsonOption(option, value, basePath, errors, propertyAssignment, propertyAssignment.initializer, sourceFile);
if (parentOption?.name) {
if (option) {
let currentOption;
@@ -3517,7 +3548,7 @@ function convertOptionsFromJson(optionsNameMap: Map<string, CommandLineOption>,
for (const id in jsonOptions) {
const opt = optionsNameMap.get(id);
if (opt) {
(defaultOptions || (defaultOptions = {}))[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors, optionsNameMap, diagnostics);
(defaultOptions || (defaultOptions = {}))[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
}
else {
errors.push(createUnknownOptionError(id, diagnostics));
@@ -3538,8 +3569,6 @@ export function convertJsonOption(
value: any,
basePath: string,
errors: Diagnostic[],
optionsNameMap?: Map<string, CommandLineOption>,
diagnostics?: DidYouMeanOptionsDiagnostics,
propertyAssignment?: PropertyAssignment,
valueExpression?: Expression,
sourceFile?: TsConfigSourceFile,
@@ -3556,7 +3585,7 @@ export function convertJsonOption(
else if (optType === "listOrElement") {
return isArray(value) ?
convertJsonOptionOfListType(opt, value, basePath, errors, propertyAssignment, valueExpression as ArrayLiteralExpression | undefined, sourceFile) :
convertJsonOption(opt.element, value, basePath, errors, optionsNameMap, diagnostics, propertyAssignment, valueExpression, sourceFile);
convertJsonOption(opt.element, value, basePath, errors, propertyAssignment, valueExpression, sourceFile);
}
else if (!isString(opt.type)) {
return convertJsonOptionOfCustomType(opt as CommandLineOptionOfCustomType, value as string, errors, valueExpression, sourceFile);
@@ -3564,21 +3593,6 @@ export function convertJsonOption(
const validatedValue = validateJsonOptionValue(opt, value, errors, valueExpression, sourceFile);
return isNullOrUndefined(validatedValue) ? validatedValue : normalizeNonListOptionValue(opt, basePath, validatedValue);
}
else if (opt.hasNestedVariant && value && typeof value === "object") {
Debug.assertIsDefined(optionsNameMap, "Argument 'optionsNameMap' is required for nested options");
Debug.assertIsDefined(diagnostics, "Argument 'diagnostics' is required for nested options");
const nestedOptionValue: NestedCompilerOption & { [option: string]: CompilerOptionsValue; } = {};
for (const nestedOptionName in value) {
const nestedOption = optionsNameMap.get(`${opt.name}.${nestedOptionName}`);
if (nestedOption) {
nestedOptionValue[nestedOptionName] = convertJsonOption(nestedOption, value[nestedOptionName], basePath, errors, optionsNameMap, diagnostics, propertyAssignment, valueExpression, sourceFile);
}
else {
errors.push(createUnknownOptionError(`${opt.name}.${nestedOptionName}`, diagnostics));
}
}
return nestedOptionValue;
}
else {
errors.push(createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, valueExpression, Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, getCompilerOptionValueTypeString(opt)));
}
@@ -3635,7 +3649,7 @@ function convertJsonOptionOfListType(
valueExpression: ArrayLiteralExpression | undefined,
sourceFile: TsConfigSourceFile | undefined,
): any[] {
return filter(map(values, (v, index) => convertJsonOption(option.element, v, basePath, errors, /*optionsNameMap*/ undefined, /*diagnostics*/ undefined, propertyAssignment, valueExpression?.elements[index], sourceFile)), v => option.listPreserveFalsyValues ? true : !!v);
return filter(map(values, (v, index) => convertJsonOption(option.element, v, basePath, errors, propertyAssignment, valueExpression?.elements[index], sourceFile)), v => option.listPreserveFalsyValues ? true : !!v);
}
/**
src/compiler/diagnosticMessages.json
-4
View File
@@ -6223,10 +6223,6 @@
"category": "Message",
"code": 6806
},
"Specify defaults for module options suited for common runtimes and bundlers.": {
"category": "Message",
"code": 6807
},
"one of:": {
"category": "Message",
src/compiler/transformers/module/esnextAnd2015.ts
+1 -1
View File
@@ -245,7 +245,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
function visitExportDeclaration(node: ExportDeclaration) {
// `export * as ns` only needs to be transformed in ES2015
if (getEmitModuleKind(compilerOptions) > ModuleKind.ES2015) {
if (compilerOptions.module !== undefined && compilerOptions.module > ModuleKind.ES2015) {
return node;
}
src/compiler/types.ts
+4 -11
View File
@@ -7090,16 +7090,7 @@ export enum PollingWatchKind {
FixedChunkSize,
}
export interface ModuleOption {
preset?: ModuleKind;
formatDetection?: ModuleFormatDetectionKind;
formatInterop?: ModuleFormatInteropKind;
emit?: ModuleKind;
}
export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | NestedCompilerOption | PluginImport[] | ProjectReference[] | null | undefined;
export type NestedCompilerOption = ModuleOption;
export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
export interface CompilerOptions {
/** @internal */ all?: boolean;
@@ -7165,7 +7156,9 @@ export interface CompilerOptions {
locale?: string;
mapRoot?: string;
maxNodeModuleJsDepth?: number;
module?: ModuleKind | ModuleOption;
module?: ModuleKind;
moduleFormatDetection?: ModuleFormatDetectionKind;
moduleFormatInterop?: ModuleFormatInteropKind;
moduleResolution?: ModuleResolutionKind;
moduleSuffixes?: string[];
moduleDetection?: ModuleDetectionKind;
src/compiler/utilities.ts
+31 -42
View File
@@ -8560,10 +8560,7 @@ export function getEmitScriptTarget(compilerOptions: { module?: CompilerOptions[
}
/** @internal */
export function getEmitModuleKind(compilerOptions: { module?: CompilerOptions["module"]; target?: CompilerOptions["target"]; }): ModuleKind {
if (typeof compilerOptions.module === "object" && compilerOptions.module.emit !== undefined) {
return compilerOptions.module.emit;
}
export function getEmitModuleKind(compilerOptions: { module?: CompilerOptions["module"]; target?: CompilerOptions["target"]; }) {
return typeof compilerOptions.module === "number" ?
compilerOptions.module :
getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
@@ -8574,44 +8571,6 @@ export function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind) {
return moduleKind >= ModuleKind.ES2015 && moduleKind <= ModuleKind.ESNext;
}
/** @internal */
export function getModulePreset(compilerOptions: CompilerOptions): ModuleKind | undefined {
if (typeof compilerOptions.module === "object") {
return compilerOptions.module.preset;
}
return compilerOptions.module;
}
/** @internal */
export function getModuleFormatDetectionKind(compilerOptions: CompilerOptions): ModuleFormatDetectionKind {
if (typeof compilerOptions.module === "object" && compilerOptions.module.formatDetection !== undefined) {
return compilerOptions.module.formatDetection;
}
switch (getModulePreset(compilerOptions)) {
case ModuleKind.Node16:
return ModuleFormatDetectionKind.Node16;
case ModuleKind.NodeNext:
return ModuleFormatDetectionKind.NodeNext;
default:
return ModuleFormatDetectionKind.None;
}
}
/** @internal */
export function getModuleFormatInteropKind(compilerOptions: CompilerOptions): ModuleFormatInteropKind {
if (typeof compilerOptions.module === "object" && compilerOptions.module.formatInterop !== undefined) {
return compilerOptions.module.formatInterop;
}
switch (getModulePreset(compilerOptions)) {
case ModuleKind.Node16:
return ModuleFormatInteropKind.Node16;
case ModuleKind.NodeNext:
return ModuleFormatInteropKind.NodeNext;
default:
return ModuleFormatInteropKind.Babel;
}
}
/** @internal */
export function getEmitModuleResolutionKind(compilerOptions: CompilerOptions) {
let moduleResolution = compilerOptions.moduleResolution;
@@ -8634,6 +8593,36 @@ export function getEmitModuleResolutionKind(compilerOptions: CompilerOptions) {
return moduleResolution;
}
/** @internal */
export function getModuleFormatDetectionKind(compilerOptions: CompilerOptions): ModuleFormatDetectionKind {
if (compilerOptions.moduleFormatDetection !== undefined) {
return compilerOptions.moduleFormatDetection;
}
switch (getEmitModuleKind(compilerOptions)) {
case ModuleKind.Node16:
return ModuleFormatDetectionKind.Node16;
case ModuleKind.NodeNext:
return ModuleFormatDetectionKind.NodeNext;
default:
return ModuleFormatDetectionKind.None;
}
}
/** @internal */
export function getModuleFormatInteropKind(compilerOptions: CompilerOptions): ModuleFormatInteropKind {
if (compilerOptions.moduleFormatInterop !== undefined) {
return compilerOptions.moduleFormatInterop;
}
switch (getEmitModuleKind(compilerOptions)) {
case ModuleKind.Node16:
return ModuleFormatInteropKind.Node16;
case ModuleKind.NodeNext:
return ModuleFormatInteropKind.NodeNext;
default:
return ModuleFormatInteropKind.Babel;
}
}
/** @internal */
export function getEmitModuleDetectionKind(options: CompilerOptions) {
return options.moduleDetection ||
tests/cases/conformance/module/esbuildInterop.ts
+3 -3
View File
@@ -1,7 +1,7 @@
// @module.emit: esnext
// @module.formatDetection: bundler
// @module.formatInterop: bundlernode
// @module: esnext
// @moduleResolution: bundler
// @moduleFormatDetection: bundler
// @moduleFormatInterop: bundlernode
// @Filename: /node_modules/dep/package.json
{