typescript 5.6.0-dev.20240625 → 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.20240625`;
+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();
@@ -87504,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) {

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.20240625`;
+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();
@@ -92387,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) {

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.20240625",
+    "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": "6c01f6c584b01caf58f2e860fe954591e8591166"
+    "gitHead": "ef339af12801c1f88ff4e01d4d4e602addfcca98"
 }