@typescript-deploys/pr-build 5.1.0-pr-53268-4 → 5.1.0-pr-53292-2

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230315`;
+var version = `${versionMajorMinor}.0-insiders.20230316`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -2177,28 +2177,6 @@ var nativePerformance = nativePerformanceHooks == null ? void 0 : nativePerforma
 var timestamp = nativePerformance ? () => nativePerformance.now() : Date.now ? Date.now : () => +/* @__PURE__ */ new Date();
 
 // src/compiler/perfLogger.ts
-var nullLogger = {
-  logEvent: noop,
-  logErrEvent: noop,
-  logPerfEvent: noop,
-  logInfoEvent: noop,
-  logStartCommand: noop,
-  logStopCommand: noop,
-  logStartUpdateProgram: noop,
-  logStopUpdateProgram: noop,
-  logStartUpdateGraph: noop,
-  logStopUpdateGraph: noop,
-  logStartResolveModule: noop,
-  logStopResolveModule: noop,
-  logStartParseSourceFile: noop,
-  logStopParseSourceFile: noop,
-  logStartReadFile: noop,
-  logStopReadFile: noop,
-  logStartBindFile: noop,
-  logStopBindFile: noop,
-  logStartScheduledOperation: noop,
-  logStopScheduledOperation: noop
-};
 var etwModule;
 var _a;
 try {
@@ -2207,7 +2185,7 @@ try {
 } catch (e) {
   etwModule = void 0;
 }
-var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
 
 // src/compiler/performance.ts
 var performanceImpl;
@@ -4556,13 +4534,15 @@ var sys = (() => {
       return buffer.toString("utf8");
     }
     function readFile(fileName, _encoding) {
-      perfLogger.logStartReadFile(fileName);
+      var _a2, _b;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
       const file = readFileWorker(fileName, _encoding);
-      perfLogger.logStopReadFile();
+      (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
       return file;
     }
     function writeFile2(fileName, data, writeByteOrderMark) {
-      perfLogger.logEvent("WriteFile: " + fileName);
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
       if (writeByteOrderMark) {
         data = byteOrderMarkIndicator + data;
       }
@@ -4583,7 +4563,8 @@ var sys = (() => {
       }
     }
     function getAccessibleFileSystemEntries(path2) {
-      perfLogger.logEvent("ReadDir: " + (path2 || "."));
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path2 || "."));
       try {
         const entries = _fs.readdirSync(path2 || ".", { withFileTypes: true });
         const files = [];
@@ -27361,6 +27342,7 @@ function getConditions(options, esmMode) {
   return concatenate(conditions, options.customConditions);
 }
 function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+  var _a2, _b, _c;
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   if (redirectedReference) {
     compilerOptions = redirectedReference.commandLine.options;
@@ -27402,10 +27384,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
       }
     }
-    perfLogger.logStartResolveModule(
-      moduleName
-      /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-    );
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
     switch (moduleResolution) {
       case 3 /* Node16 */:
         result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -27426,8 +27405,8 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
     }
     if (result && result.resolvedModule)
-      perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-    perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+      (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+    (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
     cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
     if (!isExternalModuleNameRelative(moduleName)) {
       cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
@@ -31606,21 +31585,24 @@ function installNpmPackages(npmPath, tsVersion, packageNames, install) {
   for (let remaining = packageNames.length; remaining > 0; ) {
     const result = getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining);
     remaining = result.remaining;
-    hasError = install(result.command) || hasError;
+    hasError = install(result.command, result.args) || hasError;
   }
   return hasError;
 }
 function getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining) {
   const sliceStart = packageNames.length - remaining;
-  let command, toSlice = remaining;
+  let toSlice = remaining;
+  let args;
   while (true) {
-    command = `${npmPath} install --ignore-scripts ${(toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice)).join(" ")} --save-dev --user-agent="typesInstaller/${tsVersion}"`;
-    if (command.length < 8e3) {
+    const slice = toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice);
+    const length2 = reduceLeft(slice, (total, pkg) => total + pkg.length, 0);
+    if (length2 < 8e3) {
+      args = ["install", "--ignore-scripts", ...slice, "--save-dev", `--user-agent=typesInstaller/${tsVersion}`];
       break;
     }
     toSlice = toSlice - Math.floor(toSlice / 2);
   }
-  return { command, remaining: remaining - toSlice };
+  return { command: npmPath, args, remaining: remaining - toSlice };
 }
 function endsWith2(str, suffix, caseSensitive) {
   const expectedPos = str.length - suffix.length;
@@ -32080,13 +32062,13 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
       this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation2}`);
     }
-    ({ execSync: this.nodeExecSync } = require("child_process"));
+    ({ execSync: this.nodeExecFileSync } = require("child_process"));
     this.ensurePackageDirectoryExists(globalTypingsCacheLocation2);
     try {
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updating ${typesRegistryPackageName} npm package...`);
       }
-      this.execSyncAndLog(`${this.npmPath} install --ignore-scripts ${typesRegistryPackageName}@${this.latestDistTag}`, { cwd: globalTypingsCacheLocation2 });
+      this.execFileSyncAndLog(this.npmPath, ["install", "--ignore-scripts", `${typesRegistryPackageName}@${this.latestDistTag}`], { cwd: globalTypingsCacheLocation2 });
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updated ${typesRegistryPackageName} npm package`);
       }
@@ -32157,19 +32139,19 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(packageNames)}'.`);
     }
     const start = Date.now();
-    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
+    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command, args) => this.execFileSyncAndLog(command, args, { cwd }));
     if (this.log.isEnabled()) {
       this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
     }
     onRequestCompleted(!hasError);
   }
   /** Returns 'true' in case of error. */
-  execSyncAndLog(command, options) {
+  execFileSyncAndLog(command, args, options) {
     if (this.log.isEnabled()) {
       this.log.writeLine(`Exec: ${command}`);
     }
     try {
-      const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
+      const stdout = this.nodeExecFileSync(command, args, { ...options, encoding: "utf-8", timeout: 1e4 });
       if (this.log.isEnabled()) {
         this.log.writeLine(`    Succeeded. stdout:${indent(sys.newLine, stdout)}`);
       }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53268-4",
+  "version": "5.1.0-pr-53292-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "2beae62ff61bf7a01490690d001dc20434fb14bd"
+  "gitHead": "d914d6c336c9c603779e8e9001e3be829e54b878"
 }