Ensure harness doesn't force or eagerly computes target, stop using raw target elsewhere

src/compiler/emitter.ts

@@ -144,6 +144,7 @@ import {
     getEmitFlags,
     getEmitHelpers,
     getEmitModuleKind,
+    getEmitScriptTarget,
     getExternalHelpersModuleName,
     getExternalModuleName,
     getIdentifierTypeArguments,
@@ -856,8 +857,8 @@ export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFi
             removeComments: compilerOptions.removeComments,
             newLine: compilerOptions.newLine,
             noEmitHelpers: compilerOptions.noEmitHelpers,
-            module: compilerOptions.module,
-            target: compilerOptions.target,
+            module: getEmitModuleKind(compilerOptions),
+            target: getEmitScriptTarget(compilerOptions),
             sourceMap: compilerOptions.sourceMap,
             inlineSourceMap: compilerOptions.inlineSourceMap,
             inlineSources: compilerOptions.inlineSources,

src/harness/compilerImpl.ts

@@ -257,7 +257,6 @@ export function compileFiles(host: fakes.CompilerHost, rootFiles: string[] | und
     }
 
     // establish defaults (aligns with old harness)
-    if (compilerOptions.target === undefined && compilerOptions.module !== ts.ModuleKind.Node16 && compilerOptions.module !== ts.ModuleKind.NodeNext) compilerOptions.target = ts.ScriptTarget.ES3;
     if (compilerOptions.newLine === undefined) compilerOptions.newLine = ts.NewLineKind.CarriageReturnLineFeed;
     if (compilerOptions.skipDefaultLibCheck === undefined) compilerOptions.skipDefaultLibCheck = true;
     if (compilerOptions.noErrorTruncation === undefined) compilerOptions.noErrorTruncation = true;

src/harness/harnessIO.ts

@@ -380,7 +380,6 @@ export namespace Compiler {
         symlinks?: vfs.FileSet,
     ): compiler.CompilationResult {
         const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.cloneCompilerOptions(compilerOptions) : { noResolve: false };
-        options.target = ts.getEmitScriptTarget(options);
         options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
         options.noErrorTruncation = true;
         options.skipDefaultLibCheck = typeof options.skipDefaultLibCheck === "undefined" ? true : options.skipDefaultLibCheck;

src/services/inlayHints.ts

@@ -22,6 +22,7 @@ import {
     GetAccessorDeclaration,
     getEffectiveReturnTypeNode,
     getEffectiveTypeAnnotationNode,
+    getEmitScriptTarget,
     getLanguageVariant,
     getLeadingCommentRanges,
     getNameOfDeclaration,
@@ -350,7 +351,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
     }
 
     function leadingCommentsContainsParameterName(node: Node, name: string) {
-        if (!isIdentifierText(name, compilerOptions.target, getLanguageVariant(file.scriptKind))) {
+        if (!isIdentifierText(name, getEmitScriptTarget(compilerOptions), getLanguageVariant(file.scriptKind))) {
             return false;
         }
 

tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.js

@@ -15,7 +15,7 @@ export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomSelect2 = exports.CustomSelect1 = void 0;
-var CustomSelect1 = function (x) { };
+const CustomSelect1 = (x) => { };
 exports.CustomSelect1 = CustomSelect1;
 function CustomSelect2(x) { }
 exports.CustomSelect2 = CustomSelect2;

tests/baselines/reference/declarationEmitUsingTypeAlias1.js

@@ -31,11 +31,11 @@ export const bar = (thing: SomeType) => {
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = exports.foo = void 0;
-var foo = function (thing) {
+const foo = (thing) => {
     return thing;
 };
 exports.foo = foo;
-var bar = function (thing) {
+const bar = (thing) => {
     return thing.arg;
 };
 exports.bar = bar;

tests/baselines/reference/jsxClassAttributeResolution.js

@@ -27,10 +27,7 @@ import './';
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-var jsx_runtime_1 = require("react/jsx-runtime");
-var App = /** @class */ (function () {
-    function App() {
-    }
-    return App;
-}());
+const jsx_runtime_1 = require("react/jsx-runtime");
+class App {
+}
 exports.a = (0, jsx_runtime_1.jsx)(App, {});

tests/baselines/reference/moduleResolutionWithModule(module=node16,moduleresolution=node16).js

@@ -38,5 +38,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+const p = __importStar(require("pkg"));
 p.thing();

tests/baselines/reference/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js

@@ -38,5 +38,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+const p = __importStar(require("pkg"));
 p.thing();

tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js

@@ -38,5 +38,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+const p = __importStar(require("pkg"));
 p.thing();

tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js

@@ -38,5 +38,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var p = __importStar(require("pkg"));
+const p = __importStar(require("pkg"));
 p.thing();

tests/baselines/reference/moduleResolutionWithoutExtension5.errors.txt

@@ -1,13 +1,8 @@
-error TS2468: Cannot find global value 'Promise'.
-/src/buzz.mts(2,1): error TS2712: A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
 /src/buzz.mts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
 
 
-!!! error TS2468: Cannot find global value 'Promise'.
-==== /src/buzz.mts (2 errors) ====
+==== /src/buzz.mts (1 errors) ====
     // Extensionless relative path dynamic import in an ES module
     import("./foo").then(x => x); // should error, ask for extension
-    ~~~~~~~~~~~~~~~
-!!! error TS2712: A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
            ~~~~~~~
 !!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.

tests/baselines/reference/moduleResolutionWithoutExtension5.js

@@ -6,5 +6,5 @@ import("./foo").then(x => x); // should error, ask for extension
 
 //// [buzz.mjs]
 // Extensionless relative path dynamic import in an ES module
-import("./foo").then(function (x) { return x; }); // should error, ask for extension
+import("./foo").then(x => x); // should error, ask for extension
 export {};

tests/baselines/reference/moduleResolutionWithoutExtension8.errors.txt

@@ -1,13 +1,8 @@
-error TS2468: Cannot find global value 'Promise'.
-/src/bar.cts(2,1): error TS2712: A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
 /src/bar.cts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
 
 
-!!! error TS2468: Cannot find global value 'Promise'.
-==== /src/bar.cts (2 errors) ====
+==== /src/bar.cts (1 errors) ====
     // Extensionless relative path dynamic import in a cjs module
     import("./foo").then(x => x); // should error, ask for extension
-    ~~~~~~~~~~~~~~~
-!!! error TS2712: A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
            ~~~~~~~
 !!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.

tests/baselines/reference/moduleResolutionWithoutExtension8.js

@@ -8,4 +8,4 @@ import("./foo").then(x => x); // should error, ask for extension
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // Extensionless relative path dynamic import in a cjs module
-import("./foo").then(function (x) { return x; }); // should error, ask for extension
+import("./foo").then(x => x); // should error, ask for extension

tests/baselines/reference/nodeAllowJsPackageSelfName(module=node16).js

@@ -55,7 +55,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // esm format file
-var self = __importStar(require("package"));
+const self = __importStar(require("package"));
 self;
 
 

tests/baselines/reference/nodeAllowJsPackageSelfName(module=nodenext).js

@@ -55,7 +55,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // esm format file
-var self = __importStar(require("package"));
+const self = __importStar(require("package"));
 self;