Skip to content

Commit 27bfcca

Browse files
committed
fix CommandLineOptionOfCustomType
1 parent 2e54cbc commit 27bfcca

1,448 files changed

Lines changed: 3062 additions & 2792 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/compiler/commandLineParser.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export const inverseJsxOptionMap: Map<string, string> = new Map(mapIterator(jsxO
146146
// augmented in another lib.
147147
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
148148
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
149-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
149+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
150150
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
151151
const libEntries: [string, string][] = [
152152
// JavaScript only
@@ -562,6 +562,10 @@ export const commonOptionsWithBuild: CommandLineOption[] = [
562562
},
563563
];
564564

565+
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
566+
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
567+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
568+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
565569
/** @internal */
566570
export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
567571
name: "target",
@@ -580,6 +584,7 @@ export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
580584
es2022: ScriptTarget.ES2022,
581585
es2023: ScriptTarget.ES2023,
582586
es2024: ScriptTarget.ES2024,
587+
es2025: ScriptTarget.ES2025,
583588
esnext: ScriptTarget.ESNext,
584589
})),
585590
affectsSourceFile: true,

src/compiler/transformers/esnext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const enum UsingKind {
7171
export function transformESNext(context: TransformationContext): (x: SourceFile | Bundle) => SourceFile | Bundle {
7272
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
7373
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
74-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
74+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
7575
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
7676

7777
const {

src/compiler/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7655,7 +7655,7 @@ export const enum ScriptKind {
76557655

76567656
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
76577657
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
7658-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
7658+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
76597659
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
76607660
export const enum ScriptTarget {
76617661
/** @deprecated */
@@ -8462,7 +8462,7 @@ export type LanugageFeatures =
84628462
// Upcoming Features
84638463
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
84648464
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
8465-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
8465+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
84668466
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
84678467
| "UsingAndAwaitUsing" // `using x = y`, `await using x = y`
84688468
| "ClassAndClassElementDecorators" // `@dec class C {}`, `class C { @dec m() {} }`

src/compiler/utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ export type ScriptTargetFeatures = ReadonlyMap<string, ReadonlyMap<string, strin
13781378

13791379
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
13801380
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
1381-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
1381+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
13821382
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
13831383
/** @internal */
13841384
export const getScriptTargetFeatures: () => ScriptTargetFeatures = /* @__PURE__ */ memoize((): ScriptTargetFeatures =>

src/compiler/utilitiesPublic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ export function sortAndDeduplicateDiagnostics<T extends Diagnostic>(diagnostics:
307307
/** @internal */
308308
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
309309
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
310-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
310+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
311311
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
312312
export const targetToLibMap: Map<ScriptTarget, string> = new Map([
313313
[ScriptTarget.ESNext, "lib.esnext.full.d.ts"],

src/server/protocol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3283,7 +3283,7 @@ export const enum NewLineKind {
32833283

32843284
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
32853285
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
3286-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
3286+
// `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
32873287
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
32883288
export const enum ScriptTarget {
32893289
/** @deprecated */
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//// [tests/cases/conformance/expressions/optionalChaining/callChain/callChainWithSuper.ts] ////
2+
3+
//// [callChainWithSuper.ts]
4+
// GH#34952
5+
class Base { method?() {} }
6+
class Derived extends Base {
7+
method1() { return super.method?.(); }
8+
method2() { return super["method"]?.(); }
9+
}
10+
11+
//// [callChainWithSuper.js]
12+
"use strict";
13+
// GH#34952
14+
class Base {
15+
method() { }
16+
}
17+
class Derived extends Base {
18+
method1() { return super.method?.(); }
19+
method2() { return super["method"]?.(); }
20+
}

tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --target.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ FileNames::
77
0.ts
88
Errors::
99
error TS6044: Compiler option 'target' expects an argument.
10-
error TS6046: Argument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'esnext'.
10+
error TS6046: Argument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'es2025', 'esnext'.

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of target to compiler-options with json api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ CompilerOptions::
2323
"configFilePath": "/apath/tsconfig.json"
2424
}
2525
Errors::
26-
[91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'esnext'.
26+
[91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'es2025', 'esnext'.
2727

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of target to compiler-options with jsonSourceFile api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CompilerOptions::
2323
"configFilePath": "/apath/tsconfig.json"
2424
}
2525
Errors::
26-
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'esnext'.
26+
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'es2023', 'es2024', 'es2025', 'esnext'.
2727

2828
3 "target": "",
2929
   ~~

0 commit comments

Comments
 (0)