Mar 15, 2024 · Aug 9, 2023 · Dec 11, 2023 · Dec 11, 2023 · Jan 20, 2024 · Mar 8, 2024
diff --git a/Herebyfile.mjs b/Herebyfile.mjs
    srcEntrypoint: "./src/typingsInstaller/nodeTypingsInstaller.ts",
    builtEntrypoint: "./built/local/typingsInstaller/nodeTypingsInstaller.js",
    output: "./built/local/typingsInstaller.js",
    mainDeps: [services],
    bundlerOptions: { useTypeScriptPublicAPI: true },
 });

 const { main: watchGuard, watch: watchWatchGuard } = entrypointBuildTask({
diff --git a/src/typingsInstaller/_namespaces/ts.server.ts b/src/typingsInstaller/_namespaces/ts.server.ts
diff --git a/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts b/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts
diff --git a/src/typingsInstaller/_namespaces/ts.ts b/src/typingsInstaller/_namespaces/ts.ts
 /* Generated file to emulate the ts namespace. */

 export * from "../../compiler/_namespaces/ts";
 export * from "../../jsTyping/_namespaces/ts";
 export * from "../../typingsInstallerCore/_namespaces/ts";
 import * as server from "./ts.server";
 export { server };
 export * from "../../typescript/typescript";
diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts
    toPath,
    version,
 } from "./_namespaces/ts";
 import {
    Arguments,
    findArgument,
    hasArgument,
    InitializationFailedResponse,
    InstallTypingHost,
    nowString,
    stringifyIndented,
    TypingInstallerRequestUnion,
    TypingInstallerResponseUnion,
 } from "./_namespaces/ts.server";
 import {
    installNpmPackages,
    Log,
    RequestCompletedAction,
    TypingsInstaller,
 } from "./_namespaces/ts.server.typingsInstaller";
 import * as ts from "./_namespaces/ts";

 class FileLog implements Log {
 class FileLog implementsts.server.typingsInstaller.Log {
    constructor(private logFile: string | undefined) {
    }

        if (typeof this.logFile !== "string") return;

        try {
            fs.appendFileSync(this.logFile, `[${nowString()}] ${text}${sys.newLine}`);
            fs.appendFileSync(this.logFile, `[${ts.server.nowString()}] ${text}${sys.newLine}`);
        }
        catch (e) {
            this.logFile = undefined;
 }

 /** Used if `--npmLocation` is not passed. */
 function getDefaultNPMLocation(processName: string, validateDefaultNpmLocation: boolean, host: InstallTypingHost): string {
 function getDefaultNPMLocation(processName: string, validateDefaultNpmLocation: boolean, host:ts.server.InstallTypingHost): string {
    if (path.basename(processName).indexOf("node") === 0) {
        const npmPath = path.join(path.dirname(process.argv[0]), "npm");
        if (!validateDefaultNpmLocation) {
    entries: MapLike<MapLike<string>>;
 }

 function loadTypesRegistryFile(typesRegistryFilePath: string, host: InstallTypingHost, log: Log): Map<string, MapLike<string>> {
 function loadTypesRegistryFile(typesRegistryFilePath: string, host:ts.server.InstallTypingHost, log:ts.server.typingsInstaller.Log): Map<string, MapLike<string>> {
    if (!host.fileExists(typesRegistryFilePath)) {
        if (log.isEnabled()) {
            log.writeLine(`Types registry file '${typesRegistryFilePath}' does not exist`);
 }
 type ExecSync = (command: string, options: ExecSyncOptions) => string;

 export class NodeTypingsInstaller extends TypingsInstaller {
 export class NodeTypingsInstaller extendsts.server.typingsInstaller.TypingsInstaller {
    private readonly nodeExecSync: ExecSync;
    private readonly npmPath: string;
    readonly typesRegistry: Map<string, MapLike<string>>;

    private delayedInitializationError: InitializationFailedResponse | undefined;
    private delayedInitializationError:ts.server.InitializationFailedResponse | undefined;

    constructor(globalTypingsCacheLocation: string, typingSafeListLocation: string, typesMapLocation: string, npmLocation: string | undefined, validateDefaultNpmLocation: boolean, throttleLimit: number, log: Log) {
    constructor(globalTypingsCacheLocation: string, typingSafeListLocation: string, typesMapLocation: string, npmLocation: string | undefined, validateDefaultNpmLocation: boolean, throttleLimit: number, log:ts.server.typingsInstaller.Log) {
        const libDirectory = getDirectoryPath(normalizePath(sys.getExecutingFilePath()));
        super(
            sys,
        }
        if (this.log.isEnabled()) {
            this.log.writeLine(`Process id: ${process.pid}`);
            this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${Arguments.NpmLocation}' ${npmLocation === undefined ? "not " : ""} provided)`);
            this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${ts.server.Arguments.NpmLocation}' ${npmLocation === undefined ? "not " : ""} provided)`);
            this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation}`);
        }
        ({ execSync: this.nodeExecSync } = require("child_process"));
        this.typesRegistry = loadTypesRegistryFile(getTypesRegistryFileLocation(globalTypingsCacheLocation), this.installTypingHost, this.log);
    }

    override handleRequest(req: TypingInstallerRequestUnion) {
    override handleRequest(req:ts.server.TypingInstallerRequestUnion) {
        if (this.delayedInitializationError) {
            // report initializationFailed error
            this.sendResponse(this.delayedInitializationError);
        super.handleRequest(req);
    }

    protected sendResponse(response: TypingInstallerResponseUnion) {
    protected sendResponse(response:ts.server.TypingInstallerResponseUnion) {
        if (this.log.isEnabled()) {
            this.log.writeLine(`Sending response:${stringifyIndented(response)}`);
            this.log.writeLine(`Sending response:${ts.server.stringifyIndented(response)}`);
        }
        process.send!(response); // TODO: GH#18217
        if (this.log.isEnabled()) {
            this.log.writeLine(`Response has been sent.`);
        }
    }

    protected installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
    protected installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted:ts.server.typingsInstaller.RequestCompletedAction): void {
        if (this.log.isEnabled()) {
            this.log.writeLine(`#${requestId} with cwd: ${cwd} arguments: ${JSON.stringify(packageNames)}`);
        }
        const start = Date.now();
        const hasError = installNpmPackages(this.npmPath, version, packageNames, command => this.execSyncAndLog(command, { cwd }));
        const hasError =ts.server.typingsInstaller.installNpmPackages(this.npmPath, version, packageNames, command => this.execSyncAndLog(command, { cwd }));
        if (this.log.isEnabled()) {
            this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
        }
    }
 }

 const logFilePath = findArgument(Arguments.LogFile);
 const globalTypingsCacheLocation = findArgument(Arguments.GlobalCacheLocation);
 const typingSafeListLocation = findArgument(Arguments.TypingSafeListLocation);
 const typesMapLocation = findArgument(Arguments.TypesMapLocation);
 const npmLocation = findArgument(Arguments.NpmLocation);
 const validateDefaultNpmLocation = hasArgument(Arguments.ValidateDefaultNpmLocation);
 const logFilePath =ts.server.findArgument(ts.server.Arguments.LogFile);
 const globalTypingsCacheLocation =ts.server.findArgument(ts.server.Arguments.GlobalCacheLocation);
 const typingSafeListLocation =ts.server.findArgument(ts.server.Arguments.TypingSafeListLocation);
 const typesMapLocation =ts.server.findArgument(ts.server.Arguments.TypesMapLocation);
 const npmLocation =ts.server.findArgument(ts.server.Arguments.NpmLocation);
 const validateDefaultNpmLocation =ts.server.hasArgument(ts.server.Arguments.ValidateDefaultNpmLocation);

 const log = new FileLog(logFilePath);
 if (log.isEnabled()) {
    process.exit(0);
 });
 let installer: NodeTypingsInstaller | undefined;
 process.on("message", (req: TypingInstallerRequestUnion) => {
 process.on("message", (req:ts.server.TypingInstallerRequestUnion) => {
    installer ??= new NodeTypingsInstaller(globalTypingsCacheLocation!, typingSafeListLocation!, typesMapLocation!, npmLocation, validateDefaultNpmLocation, /*throttleLimit*/ 5, log); // TODO: GH#18217
    installer.handleRequest(req);
 });
diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
        ]
    },
    "references": [
        { "path": "../compiler" },
        { "path": "../jsTyping" },
        { "path": "../typingsInstallerCore" }
        { "path": "../typescript" }
    ],
    "include": ["**/*"]
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -588,6 +588,8 @@ const { main: typingsInstaller, watch: watchTypingsInstaller } = entrypointBuild
		srcEntrypoint: "./src/typingsInstaller/nodeTypingsInstaller.ts",
		builtEntrypoint: "./built/local/typingsInstaller/nodeTypingsInstaller.js",
		output: "./built/local/typingsInstaller.js",
		mainDeps: [services],
		bundlerOptions: { useTypeScriptPublicAPI: true },
		});

		const { main: watchGuard, watch: watchWatchGuard } = entrypointBuildTask({
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1 @@
		/* Generated file to emulate the ts namespace. */

		export * from "../../compiler/_namespaces/ts";
		export * from "../../jsTyping/_namespaces/ts";
		export * from "../../typingsInstallerCore/_namespaces/ts";
		import * as server from "./ts.server";
		export { server };
		export * from "../../typescript/typescript";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,25 +12,9 @@ import {
		toPath,
		version,
		} from "./_namespaces/ts";
		import {
		Arguments,
		findArgument,
		hasArgument,
		InitializationFailedResponse,
		InstallTypingHost,
		nowString,
		stringifyIndented,
		TypingInstallerRequestUnion,
		TypingInstallerResponseUnion,
		} from "./_namespaces/ts.server";
		import {
		installNpmPackages,
		Log,
		RequestCompletedAction,
		TypingsInstaller,
		} from "./_namespaces/ts.server.typingsInstaller";
		import * as ts from "./_namespaces/ts";

		class FileLog implements Log {
		class FileLog implementsts.server.typingsInstaller.Log {
		constructor(private logFile: string \| undefined) {
		}

Expand All		@@ -41,7 +25,7 @@ class FileLog implements Log {
		if (typeof this.logFile !== "string") return;

		try {
		fs.appendFileSync(this.logFile, `[${nowString()}] ${text}${sys.newLine}`);
		fs.appendFileSync(this.logFile, `[${ts.server.nowString()}] ${text}${sys.newLine}`);
		}
		catch (e) {
		this.logFile = undefined;
Expand All		@@ -50,7 +34,7 @@ class FileLog implements Log {
		}

		/** Used if `--npmLocation` is not passed. */
		function getDefaultNPMLocation(processName: string, validateDefaultNpmLocation: boolean, host: InstallTypingHost): string {
		function getDefaultNPMLocation(processName: string, validateDefaultNpmLocation: boolean, host:ts.server.InstallTypingHost): string {
		if (path.basename(processName).indexOf("node") === 0) {
		const npmPath = path.join(path.dirname(process.argv[0]), "npm");
		if (!validateDefaultNpmLocation) {
Expand All		@@ -67,7 +51,7 @@ interface TypesRegistryFile {
		entries: MapLike<MapLike<string>>;
		}

		function loadTypesRegistryFile(typesRegistryFilePath: string, host: InstallTypingHost, log: Log): Map<string, MapLike<string>> {
		function loadTypesRegistryFile(typesRegistryFilePath: string, host:ts.server.InstallTypingHost, log:ts.server.typingsInstaller.Log): Map<string, MapLike<string>> {
		if (!host.fileExists(typesRegistryFilePath)) {
		if (log.isEnabled()) {
		log.writeLine(`Types registry file '${typesRegistryFilePath}' does not exist`);
Expand DownExpand Up		@@ -97,14 +81,14 @@ interface ExecSyncOptions {
		}
		type ExecSync = (command: string, options: ExecSyncOptions) => string;

		export class NodeTypingsInstaller extends TypingsInstaller {
		export class NodeTypingsInstaller extendsts.server.typingsInstaller.TypingsInstaller {
		private readonly nodeExecSync: ExecSync;
		private readonly npmPath: string;
		readonly typesRegistry: Map<string, MapLike<string>>;

		private delayedInitializationError: InitializationFailedResponse \| undefined;
		private delayedInitializationError:ts.server.InitializationFailedResponse \| undefined;

		constructor(globalTypingsCacheLocation: string, typingSafeListLocation: string, typesMapLocation: string, npmLocation: string \| undefined, validateDefaultNpmLocation: boolean, throttleLimit: number, log: Log) {
		constructor(globalTypingsCacheLocation: string, typingSafeListLocation: string, typesMapLocation: string, npmLocation: string \| undefined, validateDefaultNpmLocation: boolean, throttleLimit: number, log:ts.server.typingsInstaller.Log) {
		const libDirectory = getDirectoryPath(normalizePath(sys.getExecutingFilePath()));
		super(
		sys,
Expand All		@@ -122,7 +106,7 @@ export class NodeTypingsInstaller extends TypingsInstaller {
		}
		if (this.log.isEnabled()) {
		this.log.writeLine(`Process id: ${process.pid}`);
		this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${Arguments.NpmLocation}' ${npmLocation === undefined ? "not " : ""} provided)`);
		this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${ts.server.Arguments.NpmLocation}' ${npmLocation === undefined ? "not " : ""} provided)`);
		this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation}`);
		}
		({ execSync: this.nodeExecSync } = require("child_process"));
Expand DownExpand Up		@@ -153,7 +137,7 @@ export class NodeTypingsInstaller extends TypingsInstaller {
		this.typesRegistry = loadTypesRegistryFile(getTypesRegistryFileLocation(globalTypingsCacheLocation), this.installTypingHost, this.log);
		}

		override handleRequest(req: TypingInstallerRequestUnion) {
		override handleRequest(req:ts.server.TypingInstallerRequestUnion) {
		if (this.delayedInitializationError) {
		// report initializationFailed error
		this.sendResponse(this.delayedInitializationError);
Expand All		@@ -162,22 +146,22 @@ export class NodeTypingsInstaller extends TypingsInstaller {
		super.handleRequest(req);
		}

		protected sendResponse(response: TypingInstallerResponseUnion) {
		protected sendResponse(response:ts.server.TypingInstallerResponseUnion) {
		if (this.log.isEnabled()) {
		this.log.writeLine(`Sending response:${stringifyIndented(response)}`);
		this.log.writeLine(`Sending response:${ts.server.stringifyIndented(response)}`);
		}
		process.send!(response); // TODO: GH#18217
		if (this.log.isEnabled()) {
		this.log.writeLine(`Response has been sent.`);
		}
		}

		protected installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
		protected installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted:ts.server.typingsInstaller.RequestCompletedAction): void {
		if (this.log.isEnabled()) {
		this.log.writeLine(`#${requestId} with cwd: ${cwd} arguments: ${JSON.stringify(packageNames)}`);
		}
		const start = Date.now();
		const hasError = installNpmPackages(this.npmPath, version, packageNames, command => this.execSyncAndLog(command, { cwd }));
		const hasError =ts.server.typingsInstaller.installNpmPackages(this.npmPath, version, packageNames, command => this.execSyncAndLog(command, { cwd }));
		if (this.log.isEnabled()) {
		this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
		}
Expand All		@@ -204,12 +188,12 @@ export class NodeTypingsInstaller extends TypingsInstaller {
		}
		}

		const logFilePath = findArgument(Arguments.LogFile);
		const globalTypingsCacheLocation = findArgument(Arguments.GlobalCacheLocation);
		const typingSafeListLocation = findArgument(Arguments.TypingSafeListLocation);
		const typesMapLocation = findArgument(Arguments.TypesMapLocation);
		const npmLocation = findArgument(Arguments.NpmLocation);
		const validateDefaultNpmLocation = hasArgument(Arguments.ValidateDefaultNpmLocation);
		const logFilePath =ts.server.findArgument(ts.server.Arguments.LogFile);
		const globalTypingsCacheLocation =ts.server.findArgument(ts.server.Arguments.GlobalCacheLocation);
		const typingSafeListLocation =ts.server.findArgument(ts.server.Arguments.TypingSafeListLocation);
		const typesMapLocation =ts.server.findArgument(ts.server.Arguments.TypesMapLocation);
		const npmLocation =ts.server.findArgument(ts.server.Arguments.NpmLocation);
		const validateDefaultNpmLocation =ts.server.hasArgument(ts.server.Arguments.ValidateDefaultNpmLocation);

		const log = new FileLog(logFilePath);
		if (log.isEnabled()) {
Expand All		@@ -224,7 +208,7 @@ process.on("disconnect", () => {
		process.exit(0);
		});
		let installer: NodeTypingsInstaller \| undefined;
		process.on("message", (req: TypingInstallerRequestUnion) => {
		process.on("message", (req:ts.server.TypingInstallerRequestUnion) => {
		installer ??= new NodeTypingsInstaller(globalTypingsCacheLocation!, typingSafeListLocation!, typesMapLocation!, npmLocation, validateDefaultNpmLocation, /throttleLimit/ 5, log); // TODO: GH#18217
		installer.handleRequest(req);
		});
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,9 +6,7 @@
		]
		},
		"references": [
		{ "path": "../compiler" },
		{ "path": "../jsTyping" },
		{ "path": "../typingsInstallerCore" }
		{ "path": "../typescript" }
		],
		"include": ["*/"]
		}