typescript 5.6.0-dev.20240624 → 5.6.0-dev.20240626

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240624`;
+var version = `${versionMajorMinor}.0-dev.20240626`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5924,7 +5924,7 @@ var Diagnostics = {
   Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1321, 1 /* Error */, "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321", "Type of 'yield' operand in an async generator must either be a valid promise or must not contain a callable 'then' member."),
   Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1322, 1 /* Error */, "Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322", "Type of iterated elements of a 'yield*' operand must either be a valid promise or must not contain a callable 'then' member."),
   Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd_system_umd_node16_or_nodenext: diag(1323, 1 /* Error */, "Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd__1323", "Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', or 'nodenext'."),
-  Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nodenext: diag(1324, 1 /* Error */, "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nod_1324", "Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', or 'nodenext'."),
+  Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodenext_or_preserve: diag(1324, 1 /* Error */, "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodene_1324", "Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'nodenext', or 'preserve'."),
   Argument_of_dynamic_import_cannot_be_spread_element: diag(1325, 1 /* Error */, "Argument_of_dynamic_import_cannot_be_spread_element_1325", "Argument of dynamic import cannot be spread element."),
   This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments: diag(1326, 1 /* Error */, "This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot__1326", "This use of 'import' is invalid. 'import()' calls can be written, but they must have parentheses and cannot have type arguments."),
   String_literal_with_double_quotes_expected: diag(1327, 1 /* Error */, "String_literal_with_double_quotes_expected_1327", "String literal with double quotes expected."),
@@ -25642,17 +25642,22 @@ var disposeResourcesHelper = {
                     env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
                     env.hasError = true;
                 }
+                var r, s = 0;
                 function next() {
-                    while (env.stack.length) {
-                        var rec = env.stack.pop();
+                    while (r = env.stack.pop()) {
                         try {
-                            var result = rec.dispose && rec.dispose.call(rec.value);
-                            if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                            if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                            if (r.dispose) {
+                                var result = r.dispose.call(r.value);
+                                if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                            }
+                            else s |= 1;
                         }
                         catch (e) {
                             fail(e);
                         }
                     }
+                    if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
                     if (env.hasError) throw env.error;
                 }
                 return next();
@@ -46524,6 +46529,8 @@ function createTypeChecker(host) {
         moduleName,
         moduleName,
         moduleNotFoundError,
+        /*ignoreErrors*/
+        false,
         /*isForAugmentation*/
         true
       );
@@ -48085,14 +48092,14 @@ function createTypeChecker(host) {
   function resolveExternalModuleName(location, moduleReferenceExpression, ignoreErrors) {
     const isClassic = getEmitModuleResolutionKind(compilerOptions) === 1 /* Classic */;
     const errorMessage = isClassic ? Diagnostics.Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_nodenext_or_to_add_aliases_to_the_paths_option : Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations;
-    return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? void 0 : errorMessage);
+    return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? void 0 : errorMessage, ignoreErrors);
   }
-  function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation = false) {
-    return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
+  function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, ignoreErrors = false, isForAugmentation = false) {
+    return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, !ignoreErrors ? moduleReferenceExpression : void 0, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-    if (startsWith(moduleReference, "@types/")) {
+    if (errorNode && startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
       error(errorNode, diag2, withoutAtTypePrefix, moduleReference);
@@ -48114,7 +48121,7 @@ function createTypeChecker(host) {
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? host.getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
     const resolvedModule = (_g = host.getResolvedModule(currentSourceFile, moduleReference, mode)) == null ? void 0 : _g.resolvedModule;
-    const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
+    const resolutionDiagnostic = errorNode && resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
     if (sourceFile) {
       if (resolutionDiagnostic) {
@@ -48122,7 +48129,7 @@ function createTypeChecker(host) {
       }
       if (resolvedModule.resolvedUsingTsExtension && isDeclarationFileName(moduleReference)) {
         const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
-        if (importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
+        if (errorNode && importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
           error(
             errorNode,
             Diagnostics.A_declaration_file_cannot_be_imported_without_import_type_Did_you_mean_to_import_an_implementation_file_0_instead,
@@ -48131,13 +48138,13 @@ function createTypeChecker(host) {
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
         const importOrExport = ((_i = findAncestor(location, isImportDeclaration)) == null ? void 0 : _i.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
-        if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+        if (errorNode && !((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
           const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
           error(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
         }
       }
       if (sourceFile.symbol) {
-        if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
+        if (errorNode && resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
           errorOnImplicitAnyModule(
             /*isError*/
             false,
@@ -48148,9 +48155,9 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
+        if (errorNode && (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */)) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
-          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
+          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l) || isJSDocImportTag(l));
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !hasResolutionModeOverride(overrideHost)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -48208,7 +48215,7 @@ function createTypeChecker(host) {
         }
         return getMergedSymbol(sourceFile.symbol);
       }
-      if (moduleNotFoundError) {
+      if (errorNode && moduleNotFoundError) {
         error(errorNode, Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
       }
       return void 0;
@@ -48223,6 +48230,9 @@ function createTypeChecker(host) {
         return getMergedSymbol(pattern.symbol);
       }
     }
+    if (!errorNode) {
+      return void 0;
+    }
     if (resolvedModule && !resolutionExtensionIsTSOrJson(resolvedModule.extension) && resolutionDiagnostic === void 0 || resolutionDiagnostic === Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type) {
       if (isForAugmentation) {
         const diag2 = Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
@@ -65195,7 +65205,7 @@ function createTypeChecker(host) {
       for (let i = 0; i < types.length; i++) {
         if (include[i]) {
           const targetType = getTypeOfPropertyOrIndexSignatureOfType(types[i], propertyName);
-          if (targetType && related(getDiscriminatingType(), targetType)) {
+          if (targetType && someType(getDiscriminatingType(), (t) => !!related(t, targetType))) {
             matched = true;
           } else {
             include[i] = 3 /* Maybe */;
@@ -87499,11 +87509,11 @@ function createTypeChecker(host) {
       return grammarErrorOnNode(node, Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
     }
     const nodeArguments = node.arguments;
-    if (moduleKind !== 99 /* ESNext */ && moduleKind !== 199 /* NodeNext */ && moduleKind !== 100 /* Node16 */) {
+    if (moduleKind !== 99 /* ESNext */ && moduleKind !== 199 /* NodeNext */ && moduleKind !== 100 /* Node16 */ && moduleKind !== 200 /* Preserve */) {
       checkGrammarForDisallowedTrailingComma(nodeArguments);
       if (nodeArguments.length > 1) {
         const importAttributesArgument = nodeArguments[1];
-        return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nodenext);
+        return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodenext_or_preserve);
       }
     }
     if (nodeArguments.length === 0 || nodeArguments.length > 2) {
@@ -92611,8 +92621,6 @@ function transformClassFields(context) {
       return node;
     }
     switch (node.kind) {
-      case 129 /* AccessorKeyword */:
-        return Debug.fail("Use `modifierVisitor` instead.");
       case 263 /* ClassDeclaration */:
         return visitClassDeclaration(node);
       case 231 /* ClassExpression */:
@@ -118788,7 +118796,7 @@ function getModeForUsageLocation(file, usage, compilerOptions) {
 }
 function getModeForUsageLocationWorker(file, usage, compilerOptions) {
   var _a;
-  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent)) {
+  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent) || isJSDocImportTag(usage.parent)) {
     const isTypeOnly = isExclusivelyTypeOnlyImportOrExport(usage.parent);
     if (isTypeOnly) {
       const override = getResolutionModeOverride(usage.parent.attributes);

package/lib/tsserver.js

@@ -15,9 +15,11 @@ and limitations under the License.
 
 
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -28,11 +30,29 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// src/tsserver/server.ts
+var import_os2 = __toESM(require("os"));
 
 // src/typescript/typescript.ts
 var typescript_exports = {};
 __reExport(typescript_exports, require("./typescript.js"));
 
+// src/tsserver/nodeServer.ts
+var import_child_process = __toESM(require("child_process"));
+var import_fs = __toESM(require("fs"));
+var import_net = __toESM(require("net"));
+var import_os = __toESM(require("os"));
+var import_readline = __toESM(require("readline"));
+
 // src/tsserver/common.ts
 function getLogLevel(level) {
   if (level) {
@@ -107,8 +127,6 @@ function parseServerMode() {
 }
 function initializeNodeSystem() {
   const sys4 = typescript_exports.Debug.checkDefined(typescript_exports.sys);
-  const childProcess = require("child_process");
-  const fs = require("fs");
   class Logger {
     constructor(logFilename, traceToConsole, level) {
       this.logFilename = logFilename;
@@ -120,7 +138,7 @@ function initializeNodeSystem() {
       this.fd = -1;
       if (this.logFilename) {
         try {
-          this.fd = fs.openSync(this.logFilename, "w");
+          this.fd = import_fs.default.openSync(this.logFilename, "w");
         } catch (_) {
         }
       }
@@ -130,7 +148,7 @@ function initializeNodeSystem() {
     }
     close() {
       if (this.fd >= 0) {
-        fs.close(this.fd, typescript_exports.noop);
+        import_fs.default.close(this.fd, typescript_exports.noop);
       }
     }
     getLogFileName() {
@@ -177,7 +195,7 @@ function initializeNodeSystem() {
     write(s, _type) {
       if (this.fd >= 0) {
         const buf = Buffer.from(s);
-        fs.writeSync(
+        import_fs.default.writeSync(
           this.fd,
           buf,
           0,
@@ -228,7 +246,7 @@ function initializeNodeSystem() {
           if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
             logger.info(`Starting ${process.execPath} with args:${typescript_exports.server.stringifyIndented(args)}`);
           }
-          childProcess.execFileSync(process.execPath, args, { stdio: "ignore", env: { ELECTRON_RUN_AS_NODE: "1" } });
+          import_child_process.default.execFileSync(process.execPath, args, { stdio: "ignore", env: { ELECTRON_RUN_AS_NODE: "1" } });
           status = true;
           if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
             logger.info(`WatchGuard for path ${path} returned: OK`);
@@ -267,7 +285,7 @@ function initializeNodeSystem() {
   }
   let cancellationToken;
   try {
-    const factory = require("./cancellationToken");
+    const factory = require("./cancellationToken.js");
     cancellationToken = factory(sys4.args);
   } catch (e) {
     cancellationToken = typescript_exports.server.nullCancellationToken;
@@ -349,11 +367,7 @@ function parseEventPort(eventPortStr) {
   return eventPort !== void 0 && !isNaN(eventPort) ? eventPort : void 0;
 }
 function startNodeSession(options, logger, cancellationToken) {
-  const childProcess = require("child_process");
-  const os = require("os");
-  const net = require("net");
-  const readline = require("readline");
-  const rl = readline.createInterface({
+  const rl = import_readline.default.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: false
@@ -406,7 +420,7 @@ function startNodeSession(options, logger, cancellationToken) {
         }
       }
       const typingsInstaller = (0, typescript_exports.combinePaths)((0, typescript_exports.getDirectoryPath)(typescript_exports.sys.getExecutingFilePath()), "typingsInstaller.js");
-      this.installer = childProcess.fork(typingsInstaller, args, { execArgv });
+      this.installer = import_child_process.default.fork(typingsInstaller, args, { execArgv });
       this.installer.on("message", (m) => this.handleMessage(m));
       this.host.setImmediate(() => this.event({ pid: this.installer.pid }, "typingsInstallerPid"));
       process.on("exit", () => {
@@ -442,7 +456,7 @@ function startNodeSession(options, logger, cancellationToken) {
       });
       this.eventPort = eventPort;
       if (this.canUseEvents && this.eventPort) {
-        const s = net.connect({ port: this.eventPort }, () => {
+        const s = import_net.default.connect({ port: this.eventPort }, () => {
           this.eventSocket = s;
           if (this.socketEventQueue) {
             for (const event2 of this.socketEventQueue) {
@@ -537,7 +551,7 @@ function startNodeSession(options, logger, cancellationToken) {
   function getGlobalTypingsCacheLocation() {
     switch (process.platform) {
       case "win32": {
-        const basePath = process.env.LOCALAPPDATA || process.env.APPDATA || os.homedir && os.homedir() || process.env.USERPROFILE || process.env.HOMEDRIVE && process.env.HOMEPATH && (0, typescript_exports.normalizeSlashes)(process.env.HOMEDRIVE + process.env.HOMEPATH) || os.tmpdir();
+        const basePath = process.env.LOCALAPPDATA || process.env.APPDATA || import_os.default.homedir && import_os.default.homedir() || process.env.USERPROFILE || process.env.HOMEDRIVE && process.env.HOMEPATH && (0, typescript_exports.normalizeSlashes)(process.env.HOMEDRIVE + process.env.HOMEPATH) || import_os.default.tmpdir();
         return (0, typescript_exports.combinePaths)((0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(basePath), "Microsoft/TypeScript"), typescript_exports.versionMajorMinor);
       }
       case "openbsd":
@@ -558,7 +572,7 @@ function startNodeSession(options, logger, cancellationToken) {
       return process.env.XDG_CACHE_HOME;
     }
     const usersDir = platformIsDarwin ? "Users" : "home";
-    const homePath = os.homedir && os.homedir() || process.env.HOME || (process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}` || os.tmpdir();
+    const homePath = import_os.default.homedir && import_os.default.homedir() || process.env.HOME || (process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}` || import_os.default.tmpdir();
     const cacheFolder = platformIsDarwin ? "Library/Caches" : ".cache";
     return (0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(homePath), cacheFolder);
   }
@@ -605,5 +619,5 @@ function start({ args, logger, cancellationToken, serverMode, unknownServerMode,
   );
 }
 typescript_exports.setStackTraceLimit();
-start(initializeNodeSystem(), require("os").platform());
+start(initializeNodeSystem(), import_os2.default.platform());
 //# sourceMappingURL=tsserver.js.map

package/lib/typescript.js

@@ -2377,7 +2377,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240624`;
+var version = `${versionMajorMinor}.0-dev.20240626`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9493,7 +9493,7 @@ var Diagnostics = {
   Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1321, 1 /* Error */, "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321", "Type of 'yield' operand in an async generator must either be a valid promise or must not contain a callable 'then' member."),
   Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1322, 1 /* Error */, "Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322", "Type of iterated elements of a 'yield*' operand must either be a valid promise or must not contain a callable 'then' member."),
   Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd_system_umd_node16_or_nodenext: diag(1323, 1 /* Error */, "Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd__1323", "Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', or 'nodenext'."),
-  Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nodenext: diag(1324, 1 /* Error */, "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nod_1324", "Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', or 'nodenext'."),
+  Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodenext_or_preserve: diag(1324, 1 /* Error */, "Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodene_1324", "Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'nodenext', or 'preserve'."),
   Argument_of_dynamic_import_cannot_be_spread_element: diag(1325, 1 /* Error */, "Argument_of_dynamic_import_cannot_be_spread_element_1325", "Argument of dynamic import cannot be spread element."),
   This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments: diag(1326, 1 /* Error */, "This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot__1326", "This use of 'import' is invalid. 'import()' calls can be written, but they must have parentheses and cannot have type arguments."),
   String_literal_with_double_quotes_expected: diag(1327, 1 /* Error */, "String_literal_with_double_quotes_expected_1327", "String literal with double quotes expected."),
@@ -30045,17 +30045,22 @@ var disposeResourcesHelper = {
                     env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
                     env.hasError = true;
                 }
+                var r, s = 0;
                 function next() {
-                    while (env.stack.length) {
-                        var rec = env.stack.pop();
+                    while (r = env.stack.pop()) {
                         try {
-                            var result = rec.dispose && rec.dispose.call(rec.value);
-                            if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                            if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                            if (r.dispose) {
+                                var result = r.dispose.call(r.value);
+                                if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                            }
+                            else s |= 1;
                         }
                         catch (e) {
                             fail(e);
                         }
                     }
+                    if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
                     if (env.hasError) throw env.error;
                 }
                 return next();
@@ -51407,6 +51412,8 @@ function createTypeChecker(host) {
         moduleName,
         moduleName,
         moduleNotFoundError,
+        /*ignoreErrors*/
+        false,
         /*isForAugmentation*/
         true
       );
@@ -52968,14 +52975,14 @@ function createTypeChecker(host) {
   function resolveExternalModuleName(location, moduleReferenceExpression, ignoreErrors) {
     const isClassic = getEmitModuleResolutionKind(compilerOptions) === 1 /* Classic */;
     const errorMessage = isClassic ? Diagnostics.Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_nodenext_or_to_add_aliases_to_the_paths_option : Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations;
-    return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? void 0 : errorMessage);
+    return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? void 0 : errorMessage, ignoreErrors);
   }
-  function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation = false) {
-    return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
+  function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, ignoreErrors = false, isForAugmentation = false) {
+    return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, !ignoreErrors ? moduleReferenceExpression : void 0, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-    if (startsWith(moduleReference, "@types/")) {
+    if (errorNode && startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
       error2(errorNode, diag2, withoutAtTypePrefix, moduleReference);
@@ -52997,7 +53004,7 @@ function createTypeChecker(host) {
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? host.getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
     const resolvedModule = (_g = host.getResolvedModule(currentSourceFile, moduleReference, mode)) == null ? void 0 : _g.resolvedModule;
-    const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
+    const resolutionDiagnostic = errorNode && resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
     if (sourceFile) {
       if (resolutionDiagnostic) {
@@ -53005,7 +53012,7 @@ function createTypeChecker(host) {
       }
       if (resolvedModule.resolvedUsingTsExtension && isDeclarationFileName(moduleReference)) {
         const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
-        if (importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
+        if (errorNode && importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
           error2(
             errorNode,
             Diagnostics.A_declaration_file_cannot_be_imported_without_import_type_Did_you_mean_to_import_an_implementation_file_0_instead,
@@ -53014,13 +53021,13 @@ function createTypeChecker(host) {
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
         const importOrExport = ((_i = findAncestor(location, isImportDeclaration)) == null ? void 0 : _i.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
-        if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+        if (errorNode && !((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
           const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
           error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
         }
       }
       if (sourceFile.symbol) {
-        if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
+        if (errorNode && resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
           errorOnImplicitAnyModule(
             /*isError*/
             false,
@@ -53031,9 +53038,9 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
+        if (errorNode && (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */)) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
-          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
+          const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l) || isJSDocImportTag(l));
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !hasResolutionModeOverride(overrideHost)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error2(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -53091,7 +53098,7 @@ function createTypeChecker(host) {
         }
         return getMergedSymbol(sourceFile.symbol);
       }
-      if (moduleNotFoundError) {
+      if (errorNode && moduleNotFoundError) {
         error2(errorNode, Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
       }
       return void 0;
@@ -53106,6 +53113,9 @@ function createTypeChecker(host) {
         return getMergedSymbol(pattern.symbol);
       }
     }
+    if (!errorNode) {
+      return void 0;
+    }
     if (resolvedModule && !resolutionExtensionIsTSOrJson(resolvedModule.extension) && resolutionDiagnostic === void 0 || resolutionDiagnostic === Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type) {
       if (isForAugmentation) {
         const diag2 = Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
@@ -70078,7 +70088,7 @@ function createTypeChecker(host) {
       for (let i = 0; i < types.length; i++) {
         if (include[i]) {
           const targetType = getTypeOfPropertyOrIndexSignatureOfType(types[i], propertyName);
-          if (targetType && related(getDiscriminatingType(), targetType)) {
+          if (targetType && someType(getDiscriminatingType(), (t) => !!related(t, targetType))) {
             matched = true;
           } else {
             include[i] = 3 /* Maybe */;
@@ -92382,11 +92392,11 @@ function createTypeChecker(host) {
       return grammarErrorOnNode(node, Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
     }
     const nodeArguments = node.arguments;
-    if (moduleKind !== 99 /* ESNext */ && moduleKind !== 199 /* NodeNext */ && moduleKind !== 100 /* Node16 */) {
+    if (moduleKind !== 99 /* ESNext */ && moduleKind !== 199 /* NodeNext */ && moduleKind !== 100 /* Node16 */ && moduleKind !== 200 /* Preserve */) {
       checkGrammarForDisallowedTrailingComma(nodeArguments);
       if (nodeArguments.length > 1) {
         const importAttributesArgument = nodeArguments[1];
-        return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_or_nodenext);
+        return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_nodenext_or_preserve);
       }
     }
     if (nodeArguments.length === 0 || nodeArguments.length > 2) {
@@ -97676,8 +97686,6 @@ function transformClassFields(context) {
       return node;
     }
     switch (node.kind) {
-      case 129 /* AccessorKeyword */:
-        return Debug.fail("Use `modifierVisitor` instead.");
       case 263 /* ClassDeclaration */:
         return visitClassDeclaration(node);
       case 231 /* ClassExpression */:
@@ -123903,7 +123911,7 @@ function getModeForUsageLocation(file, usage, compilerOptions) {
 }
 function getModeForUsageLocationWorker(file, usage, compilerOptions) {
   var _a;
-  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent)) {
+  if (isImportDeclaration(usage.parent) || isExportDeclaration(usage.parent) || isJSDocImportTag(usage.parent)) {
     const isTypeOnly = isExclusivelyTypeOnlyImportOrExport(usage.parent);
     if (isTypeOnly) {
       const override = getResolutionModeOverride(usage.parent.attributes);
@@ -188826,11 +188834,12 @@ var MultistepOperation = class {
   }
   complete() {
     if (this.requestId !== void 0) {
-      this.operationHost.sendRequestCompletedEvent(this.requestId);
+      this.operationHost.sendRequestCompletedEvent(this.requestId, this.performanceData);
       this.requestId = void 0;
     }
     this.setTimerHandle(void 0);
     this.setImmediateId(void 0);
+    this.performanceData = void 0;
   }
   immediate(actionType, action) {
     const requestId = this.requestId;
@@ -188838,7 +188847,7 @@ var MultistepOperation = class {
     this.setImmediateId(
       this.operationHost.getServerHost().setImmediate(() => {
         this.immediateId = void 0;
-        this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
+        this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action), this.performanceData);
       }, actionType)
     );
   }
@@ -188849,7 +188858,7 @@ var MultistepOperation = class {
       this.operationHost.getServerHost().setTimeout(
         () => {
           this.timerHandle = void 0;
-          this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
+          this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action), this.performanceData);
         },
         ms,
         actionType
@@ -188878,6 +188887,7 @@ var MultistepOperation = class {
         this.operationHost.logError(e, `delayed processing of request ${this.requestId}`);
       }
     }
+    this.performanceData = this.operationHost.getPerformanceData();
     if (stop || !this.hasPendingWork()) {
       this.complete();
     }
@@ -189334,7 +189344,10 @@ var Session3 = class _Session {
       },
       ["exit" /* Exit */]: () => {
         this.exit();
-        return this.notRequired();
+        return this.notRequired(
+          /*request*/
+          void 0
+        );
       },
       ["definition" /* Definition */]: (request) => {
         return this.requiredResponse(this.getDefinition(
@@ -189426,7 +189439,7 @@ var Session3 = class _Session {
           // TODO: GH#18217
           request.arguments.projectRootPath ? toNormalizedPath(request.arguments.projectRootPath) : void 0
         );
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["quickinfo" /* Quickinfo */]: (request) => {
         return this.requiredResponse(this.getQuickInfoWorker(
@@ -189576,41 +189589,39 @@ var Session3 = class _Session {
       },
       ["geterr" /* Geterr */]: (request) => {
         this.errorCheck.startNew((next) => this.getDiagnostics(next, request.arguments.delay, request.arguments.files));
-        return this.notRequired();
+        return this.notRequired(
+          /*request*/
+          void 0
+        );
       },
       ["geterrForProject" /* GeterrForProject */]: (request) => {
         this.errorCheck.startNew((next) => this.getDiagnosticsForProject(next, request.arguments.delay, request.arguments.file));
-        return this.notRequired();
+        return this.notRequired(
+          /*request*/
+          void 0
+        );
       },
       ["change" /* Change */]: (request) => {
         this.change(request.arguments);
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["configure" /* Configure */]: (request) => {
         this.projectService.setHostConfiguration(request.arguments);
-        this.doOutput(
-          /*info*/
-          void 0,
-          "configure" /* Configure */,
-          request.seq,
-          /*success*/
-          true
-        );
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["reload" /* Reload */]: (request) => {
-        this.reload(request.arguments, request.seq);
+        this.reload(request.arguments);
         return this.requiredResponse({ reloadFinished: true });
       },
       ["saveto" /* Saveto */]: (request) => {
         const savetoArgs = request.arguments;
         this.saveToTmp(savetoArgs.file, savetoArgs.tmpfile);
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["close" /* Close */]: (request) => {
         const closeArgs = request.arguments;
         this.closeClientFile(closeArgs.file);
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["navto" /* Navto */]: (request) => {
         return this.requiredResponse(this.getNavigateToItems(
@@ -189692,9 +189703,9 @@ var Session3 = class _Session {
       ["projectInfo" /* ProjectInfo */]: (request) => {
         return this.requiredResponse(this.getProjectInfo(request.arguments));
       },
-      ["reloadProjects" /* ReloadProjects */]: () => {
+      ["reloadProjects" /* ReloadProjects */]: (request) => {
         this.projectService.reloadProjects();
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["jsxClosingTag" /* JsxClosingTag */]: (request) => {
         return this.requiredResponse(this.getJsxClosingTag(request.arguments));
@@ -189789,15 +189800,7 @@ var Session3 = class _Session {
       },
       ["configurePlugin" /* ConfigurePlugin */]: (request) => {
         this.configurePlugin(request.arguments);
-        this.doOutput(
-          /*info*/
-          void 0,
-          "configurePlugin" /* ConfigurePlugin */,
-          request.seq,
-          /*success*/
-          true
-        );
-        return this.notRequired();
+        return this.notRequired(request);
       },
       ["selectionRange" /* SelectionRange */]: (request) => {
         return this.requiredResponse(this.getSmartSelectionRange(
@@ -189897,11 +189900,12 @@ var Session3 = class _Session {
     const { throttleWaitMilliseconds } = opts;
     this.eventHandler = this.canUseEvents ? opts.eventHandler || ((event) => this.defaultEventHandler(event)) : void 0;
     const multistepOperationHost = {
-      executeWithRequestId: (requestId, action) => this.executeWithRequestId(requestId, action),
+      executeWithRequestId: (requestId, action, performanceData) => this.executeWithRequestId(requestId, action, performanceData),
       getCurrentRequestId: () => this.currentRequestId,
+      getPerformanceData: () => this.performanceData,
       getServerHost: () => this.host,
       logError: (err, cmd) => this.logError(err, cmd),
-      sendRequestCompletedEvent: (requestId) => this.sendRequestCompletedEvent(requestId),
+      sendRequestCompletedEvent: (requestId, performanceData) => this.sendRequestCompletedEvent(requestId, performanceData),
       isCancellationRequested: () => this.cancellationToken.isCancellationRequested()
     };
     this.errorCheck = new MultistepOperation(multistepOperationHost);
@@ -189953,8 +189957,8 @@ var Session3 = class _Session {
         Debug.assertNever(this.projectService.serverMode);
     }
   }
-  sendRequestCompletedEvent(requestId) {
-    this.event({ request_seq: requestId, performanceData: this.performanceData }, "requestCompleted");
+  sendRequestCompletedEvent(requestId, performanceData) {
+    this.event({ request_seq: requestId, performanceData }, "requestCompleted");
   }
   addPerformanceData(key, value) {
     if (!this.performanceData) {
@@ -190111,14 +190115,14 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     this.send(toEvent(eventName, body));
   }
   /** @internal */
-  doOutput(info, cmdName, reqSeq, success, message) {
+  doOutput(info, cmdName, reqSeq, success, performanceData, message) {
     const res = {
       seq: 0,
       type: "response",
       command: cmdName,
       request_seq: reqSeq,
       success,
-      performanceData: this.performanceData
+      performanceData
     };
     if (success) {
       let metadata;
@@ -190148,7 +190152,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
   }
   semanticCheck(file, project) {
     var _a, _b;
-    const diagnosticsStartTime = this.hrtime();
+    const diagnosticsStartTime = timestamp();
     (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "semanticCheck", { file, configFilePath: project.canonicalConfigFilePath });
     const diags = isDeclarationFileInJSOnlyNonConfiguredProject(project, file) ? emptyArray2 : project.getLanguageService().getSemanticDiagnostics(file).filter((d) => !!d.file);
     this.sendDiagnosticsEvent(file, project, diags, "semanticDiag", diagnosticsStartTime);
@@ -190156,21 +190160,21 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
   }
   syntacticCheck(file, project) {
     var _a, _b;
-    const diagnosticsStartTime = this.hrtime();
+    const diagnosticsStartTime = timestamp();
     (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "syntacticCheck", { file, configFilePath: project.canonicalConfigFilePath });
     this.sendDiagnosticsEvent(file, project, project.getLanguageService().getSyntacticDiagnostics(file), "syntaxDiag", diagnosticsStartTime);
     (_b = tracing) == null ? void 0 : _b.pop();
   }
   suggestionCheck(file, project) {
     var _a, _b;
-    const diagnosticsStartTime = this.hrtime();
+    const diagnosticsStartTime = timestamp();
     (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "suggestionCheck", { file, configFilePath: project.canonicalConfigFilePath });
     this.sendDiagnosticsEvent(file, project, project.getLanguageService().getSuggestionDiagnostics(file), "suggestionDiag", diagnosticsStartTime);
     (_b = tracing) == null ? void 0 : _b.pop();
   }
   regionSemanticCheck(file, project, ranges) {
     var _a, _b, _c;
-    const diagnosticsStartTime = this.hrtime();
+    const diagnosticsStartTime = timestamp();
     (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "regionSemanticCheck", { file, configFilePath: project.canonicalConfigFilePath });
     let diagnosticsResult;
     if (!this.shouldDoRegionCheck(file) || !(diagnosticsResult = project.getLanguageService().getRegionSemanticDiagnostics(file, ranges))) {
@@ -190192,7 +190196,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
   sendDiagnosticsEvent(file, project, diagnostics, kind, diagnosticsStartTime, spans) {
     try {
       const scriptInfo = Debug.checkDefined(project.getScriptInfo(file));
-      const duration = hrTimeToMilliseconds(this.hrtime(diagnosticsStartTime));
+      const duration = timestamp() - diagnosticsStartTime;
       const body = {
         file,
         diagnostics: diagnostics.map((diag2) => formatDiag(file, project, diag2)),
@@ -191379,22 +191383,13 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       );
     }
   }
-  reload(args, reqSeq) {
+  reload(args) {
     const file = toNormalizedPath(args.file);
     const tempFileName = args.tmpfile === void 0 ? void 0 : toNormalizedPath(args.tmpfile);
     const info = this.projectService.getScriptInfoForNormalizedPath(file);
     if (info) {
       this.changeSeq++;
-      if (info.reloadFromFile(tempFileName)) {
-        this.doOutput(
-          /*info*/
-          void 0,
-          "reload" /* Reload */,
-          reqSeq,
-          /*success*/
-          true
-        );
-      }
+      info.reloadFromFile(tempFileName);
     }
   }
   saveToTmp(fileName, tempFileName) {
@@ -191943,11 +191938,20 @@ ${e.message}`;
   }
   exit() {
   }
-  notRequired() {
-    return { responseRequired: false };
+  notRequired(request) {
+    if (request) this.doOutput(
+      /*info*/
+      void 0,
+      request.command,
+      request.seq,
+      /*success*/
+      true,
+      this.performanceData
+    );
+    return { responseRequired: false, performanceData: this.performanceData };
   }
   requiredResponse(response) {
-    return { response, responseRequired: true };
+    return { response, responseRequired: true, performanceData: this.performanceData };
   }
   addProtocolHandler(command, handler) {
     if (this.handlers.has(command)) {
@@ -191965,18 +191969,27 @@ ${e.message}`;
     this.currentRequestId = void 0;
     this.cancellationToken.resetRequest(requestId);
   }
-  executeWithRequestId(requestId, f) {
+  // eslint-disable-line @typescript-eslint/unified-signatures
+  executeWithRequestId(requestId, f, perfomanceData) {
+    const currentPerformanceData = this.performanceData;
     try {
+      this.performanceData = perfomanceData;
       this.setCurrentRequest(requestId);
       return f();
     } finally {
       this.resetCurrentRequest(requestId);
+      this.performanceData = currentPerformanceData;
     }
   }
   executeCommand(request) {
     const handler = this.handlers.get(request.command);
     if (handler) {
-      const response = this.executeWithRequestId(request.seq, () => handler(request));
+      const response = this.executeWithRequestId(
+        request.seq,
+        () => handler(request),
+        /*perfomanceData*/
+        void 0
+      );
       this.projectService.enableRequestedPlugins();
       return response;
     } else {
@@ -191988,6 +192001,8 @@ ${e.message}`;
         request.seq,
         /*success*/
         false,
+        /*performanceData*/
+        void 0,
         `Unrecognized JSON command: ${request.command}`
       );
       return { responseRequired: false };
@@ -191996,8 +192011,8 @@ ${e.message}`;
   onMessage(message) {
     var _a, _b, _c, _d, _e, _f, _g;
     this.gcTimer.scheduleCollect();
-    this.performanceData = void 0;
     let start;
+    const currentPerformanceData = this.performanceData;
     if (this.logger.hasLevel(2 /* requestTime */)) {
       start = this.hrtime();
       if (this.logger.hasLevel(3 /* verbose */)) {
@@ -192017,7 +192032,7 @@ ${e.message}`;
         /*separateBeginAndEnd*/
         true
       );
-      const { response, responseRequired } = this.executeCommand(request);
+      const { response, responseRequired, performanceData } = this.executeCommand(request);
       (_c = tracing) == null ? void 0 : _c.pop();
       if (this.logger.hasLevel(2 /* requestTime */)) {
         const elapsedTime = hrTimeToMilliseconds(this.hrtime(start)).toFixed(4);
@@ -192034,7 +192049,8 @@ ${e.message}`;
           request.command,
           request.seq,
           /*success*/
-          true
+          true,
+          performanceData
         );
       } else if (responseRequired) {
         this.doOutput(
@@ -192044,6 +192060,7 @@ ${e.message}`;
           request.seq,
           /*success*/
           false,
+          performanceData,
           "No content available."
         );
       }
@@ -192056,7 +192073,8 @@ ${e.message}`;
           request.command,
           request.seq,
           /*success*/
-          true
+          true,
+          this.performanceData
         );
         return;
       }
@@ -192069,8 +192087,11 @@ ${e.message}`;
         request ? request.seq : 0,
         /*success*/
         false,
+        this.performanceData,
         "Error processing request. " + err.message + "\n" + err.stack
       );
+    } finally {
+      this.performanceData = currentPerformanceData;
     }
   }
   parseMessage(message) {

package/lib/typingsInstaller.js

@@ -50,6 +50,7 @@ __export(nodeTypingsInstaller_exports, {
   NodeTypingsInstaller: () => NodeTypingsInstaller
 });
 module.exports = __toCommonJS(nodeTypingsInstaller_exports);
+var import_child_process = require("child_process");
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 
@@ -127,7 +128,6 @@ var NodeTypingsInstaller = class extends typescript_exports.server.typingsInstal
       this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${typescript_exports.server.Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
       this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation2}`);
     }
-    ({ execSync: this.nodeExecSync } = require("child_process"));
     this.ensurePackageDirectoryExists(globalTypingsCacheLocation2);
     try {
       if (this.log.isEnabled()) {
@@ -182,7 +182,7 @@ var NodeTypingsInstaller = class extends typescript_exports.server.typingsInstal
       this.log.writeLine(`Exec: ${command}`);
     }
     try {
-      const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
+      const stdout = (0, import_child_process.execFileSync)(command, { ...options, encoding: "utf-8" });
       if (this.log.isEnabled()) {
         this.log.writeLine(`    Succeeded. stdout:${indent(typescript_exports.sys.newLine, stdout)}`);
       }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240624",
+    "version": "5.6.0-dev.20240626",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -13,11 +13,11 @@
         "javascript"
     ],
     "bugs": {
-        "url": "https://github.com/Microsoft/TypeScript/issues"
+        "url": "https://github.com/microsoft/TypeScript/issues"
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/Microsoft/TypeScript.git"
+        "url": "https://github.com/microsoft/TypeScript.git"
     },
     "main": "./lib/typescript.js",
     "typings": "./lib/typescript.d.ts",
@@ -44,6 +44,7 @@
         "@esfx/canceltoken": "^1.0.0",
         "@octokit/rest": "^20.1.1",
         "@types/chai": "^4.3.16",
+        "@types/diff": "^5.2.1",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
         "@types/ms": "^0.7.34",
@@ -110,5 +111,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "5d70bf894efe9014d24d4ba439807311e5b33fb8"
+    "gitHead": "ef339af12801c1f88ff4e01d4d4e602addfcca98"
 }