Merge branch 'main' into fix/enum-computed-keys

Author: kairosci

src/compiler/checker.ts

@@ -141,12 +141,12 @@ const jsxOptionMap = new Map(Object.entries({
 export const inverseJsxOptionMap: Map<string, string> = new Map(mapIterator(jsxOptionMap.entries(), ([key, value]: [string, JsxEmit]) => ["" + value, key] as const));
 
 // NOTE: The order here is important to default lib ordering as entries will have the same
-//       order in the generated program (see `getDefaultLibPriority` in program.ts). This
+//       order in the generated program (see `getDefaultLibFilePriority` in program.ts). This
 //       order also affects overload resolution when a type declared in one lib is
 //       augmented in another lib.
 // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
 //       June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
-//       `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
+//       `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
 //       compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
 const libEntries: [string, string][] = [
     // JavaScript only
@@ -163,6 +163,7 @@ const libEntries: [string, string][] = [
     ["es2022", "lib.es2022.d.ts"],
     ["es2023", "lib.es2023.d.ts"],
     ["es2024", "lib.es2024.d.ts"],
+    ["es2025", "lib.es2025.d.ts"],
     ["esnext", "lib.esnext.d.ts"],
     // Host only
     ["dom", "lib.dom.d.ts"],
@@ -173,7 +174,7 @@ const libEntries: [string, string][] = [
     ["webworker.iterable", "lib.webworker.iterable.d.ts"],
     ["webworker.asynciterable", "lib.webworker.asynciterable.d.ts"],
     ["scripthost", "lib.scripthost.d.ts"],
-    // ES2015 Or ESNext By-feature options
+    // ES2015 and later By-feature options
     ["es2015.core", "lib.es2015.core.d.ts"],
     ["es2015.collection", "lib.es2015.collection.d.ts"],
     ["es2015.generator", "lib.es2015.generator.d.ts"],
@@ -230,27 +231,33 @@ const libEntries: [string, string][] = [
     ["es2024.regexp", "lib.es2024.regexp.d.ts"],
     ["es2024.sharedmemory", "lib.es2024.sharedmemory.d.ts"],
     ["es2024.string", "lib.es2024.string.d.ts"],
-    ["esnext.array", "lib.es2023.array.d.ts"],
-    ["esnext.collection", "lib.esnext.collection.d.ts"],
-    ["esnext.symbol", "lib.es2019.symbol.d.ts"],
+    ["es2025.collection", "lib.es2025.collection.d.ts"],
+    ["es2025.float16", "lib.es2025.float16.d.ts"],
+    ["es2025.intl", "lib.es2025.intl.d.ts"],
+    ["es2025.iterator", "lib.es2025.iterator.d.ts"],
+    ["es2025.promise", "lib.es2025.promise.d.ts"],
+    ["es2025.regexp", "lib.es2025.regexp.d.ts"],
+    // Fallback for backward compatibility
     ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
-    ["esnext.intl", "lib.esnext.intl.d.ts"],
-    ["esnext.disposable", "lib.esnext.disposable.d.ts"],
+    ["esnext.symbol", "lib.es2019.symbol.d.ts"],
     ["esnext.bigint", "lib.es2020.bigint.d.ts"],
-    ["esnext.string", "lib.es2022.string.d.ts"],
-    ["esnext.promise", "lib.es2024.promise.d.ts"],
     ["esnext.weakref", "lib.es2021.weakref.d.ts"],
-    ["esnext.decorators", "lib.esnext.decorators.d.ts"],
     ["esnext.object", "lib.es2024.object.d.ts"],
-    ["esnext.array", "lib.esnext.array.d.ts"],
     ["esnext.regexp", "lib.es2024.regexp.d.ts"],
     ["esnext.string", "lib.es2024.string.d.ts"],
-    ["esnext.iterator", "lib.esnext.iterator.d.ts"],
-    ["esnext.promise", "lib.esnext.promise.d.ts"],
-    ["esnext.float16", "lib.esnext.float16.d.ts"],
-    ["esnext.typedarrays", "lib.esnext.typedarrays.d.ts"],
+    ["esnext.float16", "lib.es2025.float16.d.ts"],
+    ["esnext.iterator", "lib.es2025.iterator.d.ts"],
+    ["esnext.promise", "lib.es2025.promise.d.ts"],
+    // ESNext By-feature options
+    ["esnext.array", "lib.esnext.array.d.ts"],
+    ["esnext.collection", "lib.esnext.collection.d.ts"],
+    ["esnext.decorators", "lib.esnext.decorators.d.ts"],
+    ["esnext.disposable", "lib.esnext.disposable.d.ts"],
     ["esnext.error", "lib.esnext.error.d.ts"],
+    ["esnext.intl", "lib.esnext.intl.d.ts"],
     ["esnext.sharedmemory", "lib.esnext.sharedmemory.d.ts"],
+    ["esnext.typedarrays", "lib.esnext.typedarrays.d.ts"],
+    // Decorators
     ["decorators", "lib.decorators.d.ts"],
     ["decorators.legacy", "lib.decorators.legacy.d.ts"],
 ];
@@ -555,6 +562,10 @@ export const commonOptionsWithBuild: CommandLineOption[] = [
     },
 ];
 
+// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
+//       June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
+//       `ScriptTargetFeatures`, `CommandLineOptionOfCustomType`, transformers/esnext.ts, compiler/commandLineParser.ts,
+//       compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
 /** @internal */
 export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
     name: "target",
@@ -573,6 +584,7 @@ export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
         es2022: ScriptTarget.ES2022,
         es2023: ScriptTarget.ES2023,
         es2024: ScriptTarget.ES2024,
+        es2025: ScriptTarget.ES2025,
         esnext: ScriptTarget.ESNext,
     })),
     affectsSourceFile: true,
@@ -961,6 +973,16 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         description: Diagnostics.Built_in_iterators_are_instantiated_with_a_TReturn_type_of_undefined_instead_of_any,
         defaultValueDescription: Diagnostics.true_unless_strict_is_false,
     },
+    {
+        name: "stableTypeOrdering",
+        type: "boolean",
+        affectsSemanticDiagnostics: true,
+        affectsBuildInfo: true,
+        showInHelp: false,
+        category: Diagnostics.Type_Checking,
+        description: Diagnostics.Ensure_types_are_ordered_stably_and_deterministically_across_compilations,
+        defaultValueDescription: false,
+    },
     {
         name: "noImplicitThis",
         type: "boolean",

src/compiler/commandLineParser.ts

@@ -1209,7 +1209,7 @@ export function binarySearchKey<T, U>(array: readonly T[], key: U, keySelector:
     while (low <= high) {
         const middle = low + ((high - low) >> 1);
         const midKey = keySelector(array[middle], middle);
-        switch (keyComparer(midKey, key)) {
+        switch (Math.sign(keyComparer(midKey, key))) {
             case Comparison.LessThan:
                 low = middle + 1;
                 break;
@@ -1967,9 +1967,11 @@ export function equateStringsCaseSensitive(a: string, b: string): boolean {
     return equateValues(a, b);
 }
 
-function compareComparableValues(a: string | undefined, b: string | undefined): Comparison;
-function compareComparableValues(a: number | undefined, b: number | undefined): Comparison;
-function compareComparableValues(a: string | number | undefined, b: string | number | undefined) {
+/** @internal */
+export function compareComparableValues(a: string | undefined, b: string | undefined): Comparison;
+/** @internal */
+export function compareComparableValues(a: number | undefined, b: number | undefined): Comparison;
+export function compareComparableValues(a: string | number | undefined, b: string | number | undefined) {
     return a === b ? Comparison.EqualTo :
         a === undefined ? Comparison.LessThan :
         b === undefined ? Comparison.GreaterThan :

src/compiler/core.ts

@@ -6589,6 +6589,10 @@
         "category": "Message",
         "code": 6808
     },
+    "Ensure types are ordered stably and deterministically across compilations.": {
+        "category": "Message",
+        "code": 6809
+    },
 
     "one of:": {
         "category": "Message",

src/compiler/diagnosticMessages.json

@@ -174,10 +174,11 @@ function shouldBePretty(sys: System, options: CompilerOptions | BuildOptions) {
 }
 
 function getOptionsForHelp(commandLine: ParsedCommandLine) {
+    const helpOptions = filter(optionDeclarations.concat(tscBuildOption), option => option.showInHelp !== false);
     // Sort our options by their names, (e.g. "--noImplicitAny" comes before "--watch")
     return !!commandLine.options.all ?
-        toSorted(optionDeclarations.concat(tscBuildOption), (a, b) => compareStringsCaseInsensitive(a.name, b.name)) :
-        filter(optionDeclarations.concat(tscBuildOption), v => !!v.showInSimplifiedHelpView);
+        toSorted(helpOptions, (a, b) => compareStringsCaseInsensitive(a.name, b.name)) :
+        filter(helpOptions, v => !!v.showInSimplifiedHelpView);
 }
 
 function printVersion(sys: System) {
@@ -512,16 +513,16 @@ function printEasyHelp(sys: System, simpleOptions: readonly CommandLineOption[])
 function printAllHelp(sys: System, compilerOptions: readonly CommandLineOption[], buildOptions: readonly CommandLineOption[], watchOptions: readonly CommandLineOption[]) {
     let output: string[] = [...getHeader(sys, `${getDiagnosticText(Diagnostics.tsc_Colon_The_TypeScript_Compiler)} - ${getDiagnosticText(Diagnostics.Version_0, version)}`)];
     output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.ALL_COMPILER_OPTIONS), compilerOptions, /*subCategory*/ true, /*beforeOptionsDescription*/ undefined, formatMessage(Diagnostics.You_can_learn_about_all_of_the_compiler_options_at_0, "https://aka.ms/tsc"))];
-    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.WATCH_OPTIONS), watchOptions, /*subCategory*/ false, getDiagnosticText(Diagnostics.Including_watch_w_will_start_watching_the_current_project_for_the_file_changes_Once_set_you_can_config_watch_mode_with_Colon))];
-    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.BUILD_OPTIONS), filter(buildOptions, option => option !== tscBuildOption), /*subCategory*/ false, formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds"))];
+    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.WATCH_OPTIONS), filter(watchOptions, option => option.showInHelp !== false), /*subCategory*/ false, getDiagnosticText(Diagnostics.Including_watch_w_will_start_watching_the_current_project_for_the_file_changes_Once_set_you_can_config_watch_mode_with_Colon))];
+    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.BUILD_OPTIONS), filter(buildOptions, option => option !== tscBuildOption && option.showInHelp !== false), /*subCategory*/ false, formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds"))];
     for (const line of output) {
         sys.write(line);
     }
 }
 
 function printBuildHelp(sys: System, buildOptions: readonly CommandLineOption[]) {
     let output: string[] = [...getHeader(sys, `${getDiagnosticText(Diagnostics.tsc_Colon_The_TypeScript_Compiler)} - ${getDiagnosticText(Diagnostics.Version_0, version)}`)];
-    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.BUILD_OPTIONS), filter(buildOptions, option => option !== tscBuildOption), /*subCategory*/ false, formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds"))];
+    output = [...output, ...generateSectionOptionsOutput(sys, getDiagnosticText(Diagnostics.BUILD_OPTIONS), filter(buildOptions, option => option !== tscBuildOption && option.showInHelp !== false), /*subCategory*/ false, formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds"))];
     for (const line of output) {
         sys.write(line);
     }

src/compiler/executeCommandLine.ts

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