Merge branch 'main' into feat/es2025-target

Author: petamoriken

scripts/dtsBundler.mjs

@@ -73,7 +73,7 @@ function getDeclarationStatement(node) {
     return undefined;
 }
 
-const program = ts.createProgram([entrypoint], { target: ts.ScriptTarget.ES5 });
+const program = ts.createProgram([entrypoint], { target: ts.ScriptTarget.ES2015 });
 
 const typeChecker = program.getTypeChecker();
 

src/compiler/checker.ts

@@ -45619,7 +45619,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return undefined;
         }
 
-        const uplevelIteration = languageVersion >= ScriptTarget.ES2015;
+        const iterableExists = getGlobalIterableType(/*reportErrors*/ false) !== emptyGenericType;
+        const uplevelIteration = languageVersion >= ScriptTarget.ES2015 && iterableExists;
         const downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
         const possibleOutOfBounds = compilerOptions.noUncheckedIndexedAccess && !!(use & IterationUse.PossiblyOutOfBounds);
 

src/compiler/commandLineParser.ts

@@ -586,12 +586,12 @@ export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
     affectsModuleResolution: true,
     affectsEmit: true,
     affectsBuildInfo: true,
-    deprecatedKeys: new Set(["es3"]),
+    deprecatedKeys: new Set(["es3", "es5"]),
     paramType: Diagnostics.VERSION,
     showInSimplifiedHelpView: true,
     category: Diagnostics.Language_and_Environment,
     description: Diagnostics.Set_the_JavaScript_language_version_for_emitted_JavaScript_and_include_compatible_library_declarations,
-    defaultValueDescription: ScriptTarget.ES5,
+    defaultValueDescription: ScriptTarget.LatestStandard,
 };
 
 /** @internal */

src/compiler/factory/nodeFactory.ts

@@ -6052,7 +6052,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         node.path = "" as Path;
         node.resolvedPath = "" as Path;
         node.originalFileName = "";
-        node.languageVersion = ScriptTarget.ES5;
+        node.languageVersion = ScriptTarget.LatestStandard;
         node.languageVariant = 0;
         node.scriptKind = 0;
         node.isDeclarationFile = false;

src/compiler/program.ts

@@ -4526,6 +4526,9 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
         });
 
         checkDeprecations("6.0", "7.0", createDiagnostic, createDeprecatedDiagnostic => {
+            if (options.target === ScriptTarget.ES5) {
+                createDeprecatedDiagnostic("target", "ES5");
+            }
             if (options.moduleResolution === ModuleResolutionKind.Node10) {
                 createDeprecatedDiagnostic("moduleResolution", "node10", /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
             }

src/compiler/types.ts

@@ -7659,6 +7659,7 @@ export const enum ScriptKind {
 export const enum ScriptTarget {
     /** @deprecated */
     ES3 = 0,
+    /** @deprecated */
     ES5 = 1,
     ES2015 = 2,
     ES2016 = 3,
@@ -7674,6 +7675,7 @@ export const enum ScriptTarget {
     ESNext = 99,
     JSON = 100,
     Latest = ESNext,
+    LatestStandard = ES2024,
 }
 
 export const enum LanguageVariant {

src/compiler/utilities.ts

@@ -9025,15 +9025,10 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     target: {
-        dependencies: ["module"],
+        dependencies: [],
         computeValue: compilerOptions => {
             const target = compilerOptions.target === ScriptTarget.ES3 ? undefined : compilerOptions.target;
-            return target ??
-                ((compilerOptions.module === ModuleKind.Node16 && ScriptTarget.ES2022) ||
-                    (compilerOptions.module === ModuleKind.Node18 && ScriptTarget.ES2022) ||
-                    (compilerOptions.module === ModuleKind.Node20 && ScriptTarget.ES2023) ||
-                    (compilerOptions.module === ModuleKind.NodeNext && ScriptTarget.ESNext) ||
-                    ScriptTarget.ES5);
+            return target ?? ScriptTarget.LatestStandard;
         },
     },
     module: {

src/harness/evaluatorImpl.ts

@@ -41,6 +41,7 @@ export function evaluateTypeScript(source: string | { files: vfs.FileSet; rootFi
         module: ts.ModuleKind.CommonJS,
         strict: false,
         lib: ["lib.esnext.d.ts", "lib.dom.d.ts"],
+        ignoreDeprecations: "6.0",
         ...options,
     };
     const host = new fakes.CompilerHost(fs, compilerOptions);

src/server/protocol.ts

@@ -3288,6 +3288,7 @@ export const enum NewLineKind {
 export const enum ScriptTarget {
     /** @deprecated */
     ES3 = "es3",
+    /** @deprecated */
     ES5 = "es5",
     ES6 = "es6",
     ES2015 = "es2015",
@@ -3304,6 +3305,7 @@ export const enum ScriptTarget {
     ESNext = "esnext",
     JSON = "json",
     Latest = ESNext,
+    LatestStandard = ES2024,
 }
 
 {

src/services/preProcess.ts

@@ -15,7 +15,7 @@ import {
 
 export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo {
     const pragmaContext: PragmaContext = {
-        languageVersion: ScriptTarget.ES5, // controls whether the token scanner considers unicode identifiers or not - shouldn't matter, since we're only using it for trivia
+        languageVersion: ScriptTarget.LatestStandard, // controls whether the token scanner considers unicode identifiers or not - shouldn't matter, since we're only using it for trivia
         pragmas: undefined,
         checkJsDirective: undefined,
         referencedFiles: [],