typescript 5.5.0-dev.20240319 → 5.5.0-dev.20240321

package/lib/typingsInstaller.js

@@ -53,16 +53,10 @@ module.exports = __toCommonJS(nodeTypingsInstaller_exports);
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 
-// src/typingsInstaller/_namespaces/ts.ts
-var ts_exports = {};
-
 // src/typescript/typescript.ts
 var typescript_exports = {};
 __reExport(typescript_exports, require("./typescript.js"));
 
-// src/typingsInstaller/_namespaces/ts.ts
-__reExport(ts_exports, typescript_exports);
-
 // src/typingsInstaller/nodeTypingsInstaller.ts
 var FileLog = class {
   constructor(logFile) {
@@ -74,7 +68,7 @@ var FileLog = class {
       if (typeof this.logFile !== "string")
         return;
       try {
-        fs.appendFileSync(this.logFile, `[${ts_exports.server.nowString()}] ${text}${ts_exports.sys.newLine}`);
+        fs.appendFileSync(this.logFile, `[${typescript_exports.server.nowString()}] ${text}${typescript_exports.sys.newLine}`);
       } catch (e) {
         this.logFile = void 0;
       }
@@ -112,16 +106,16 @@ function loadTypesRegistryFile(typesRegistryFilePath, host, log2) {
 }
 var typesRegistryPackageName = "types-registry";
 function getTypesRegistryFileLocation(globalTypingsCacheLocation2) {
-  return (0, ts_exports.combinePaths)((0, ts_exports.normalizeSlashes)(globalTypingsCacheLocation2), `node_modules/${typesRegistryPackageName}/index.json`);
+  return (0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(globalTypingsCacheLocation2), `node_modules/${typesRegistryPackageName}/index.json`);
 }
-var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.TypingsInstaller {
+var NodeTypingsInstaller = class extends typescript_exports.server.typingsInstaller.TypingsInstaller {
   constructor(globalTypingsCacheLocation2, typingSafeListLocation2, typesMapLocation2, npmLocation2, validateDefaultNpmLocation2, throttleLimit, log2) {
-    const libDirectory = (0, ts_exports.getDirectoryPath)((0, ts_exports.normalizePath)(ts_exports.sys.getExecutingFilePath()));
+    const libDirectory = (0, typescript_exports.getDirectoryPath)((0, typescript_exports.normalizePath)(typescript_exports.sys.getExecutingFilePath()));
     super(
-      ts_exports.sys,
+      typescript_exports.sys,
       globalTypingsCacheLocation2,
-      typingSafeListLocation2 ? (0, ts_exports.toPath)(typingSafeListLocation2, "", (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)) : (0, ts_exports.toPath)("typingSafeList.json", libDirectory, (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)),
-      typesMapLocation2 ? (0, ts_exports.toPath)(typesMapLocation2, "", (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)) : (0, ts_exports.toPath)("typesMap.json", libDirectory, (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)),
+      typingSafeListLocation2 ? (0, typescript_exports.toPath)(typingSafeListLocation2, "", (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)) : (0, typescript_exports.toPath)("typingSafeList.json", libDirectory, (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)),
+      typesMapLocation2 ? (0, typescript_exports.toPath)(typesMapLocation2, "", (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)) : (0, typescript_exports.toPath)("typesMap.json", libDirectory, (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)),
       throttleLimit,
       log2
     );
@@ -131,7 +125,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
     }
     if (this.log.isEnabled()) {
       this.log.writeLine(`Process id: ${process.pid}`);
-      this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${ts_exports.server.Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
+      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"));
@@ -165,7 +159,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
   }
   sendResponse(response) {
     if (this.log.isEnabled()) {
-      this.log.writeLine(`Sending response:${ts_exports.server.stringifyIndented(response)}`);
+      this.log.writeLine(`Sending response:${typescript_exports.server.stringifyIndented(response)}`);
     }
     process.send(response);
     if (this.log.isEnabled()) {
@@ -177,7 +171,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
       this.log.writeLine(`#${requestId} with cwd: ${cwd} arguments: ${JSON.stringify(packageNames)}`);
     }
     const start = Date.now();
-    const hasError = ts_exports.server.typingsInstaller.installNpmPackages(this.npmPath, ts_exports.version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
+    const hasError = typescript_exports.server.typingsInstaller.installNpmPackages(this.npmPath, typescript_exports.version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
     if (this.log.isEnabled()) {
       this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
     }
@@ -191,22 +185,22 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
     try {
       const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
       if (this.log.isEnabled()) {
-        this.log.writeLine(`    Succeeded. stdout:${indent(ts_exports.sys.newLine, stdout)}`);
+        this.log.writeLine(`    Succeeded. stdout:${indent(typescript_exports.sys.newLine, stdout)}`);
       }
       return false;
     } catch (error) {
       const { stdout, stderr } = error;
-      this.log.writeLine(`    Failed. stdout:${indent(ts_exports.sys.newLine, stdout)}${ts_exports.sys.newLine}    stderr:${indent(ts_exports.sys.newLine, stderr)}`);
+      this.log.writeLine(`    Failed. stdout:${indent(typescript_exports.sys.newLine, stdout)}${typescript_exports.sys.newLine}    stderr:${indent(typescript_exports.sys.newLine, stderr)}`);
       return true;
     }
   }
 };
-var logFilePath = ts_exports.server.findArgument(ts_exports.server.Arguments.LogFile);
-var globalTypingsCacheLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.GlobalCacheLocation);
-var typingSafeListLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypingSafeListLocation);
-var typesMapLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypesMapLocation);
-var npmLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.NpmLocation);
-var validateDefaultNpmLocation = ts_exports.server.hasArgument(ts_exports.server.Arguments.ValidateDefaultNpmLocation);
+var logFilePath = typescript_exports.server.findArgument(typescript_exports.server.Arguments.LogFile);
+var globalTypingsCacheLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.GlobalCacheLocation);
+var typingSafeListLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypingSafeListLocation);
+var typesMapLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypesMapLocation);
+var npmLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.NpmLocation);
+var validateDefaultNpmLocation = typescript_exports.server.hasArgument(typescript_exports.server.Arguments.ValidateDefaultNpmLocation);
 var log = new FileLog(logFilePath);
 if (log.isEnabled()) {
   process.on("uncaughtException", (e) => {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240319",
+    "version": "5.5.0-dev.20240321",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "a9460c8c9367b042a6061000e53681afb2019b83"
+    "gitHead": "dc113f8170bc9408961e4e89f1ffadf3dff5a41b"
 }