refactor: use a shared cliBinPath whenever needed

Author: rigor789

lib/commands/clean.ts

@@ -10,7 +10,7 @@ import {
 } from "../definitions/project";
 
 import type { PromptObject } from "prompts";
-import { IOptions } from "../declarations";
+import { IOptions, IStaticConfig } from "../declarations";
 import {
 	ITerminalSpinner,
 	ITerminalSpinnerService,
@@ -22,8 +22,6 @@ import { resolve } from "path";
 import { readdir } from "fs/promises";
 import { isInteractive } from "../common/helpers";
 
-const CLIPath = resolve(__dirname, "..", "..", "bin", "nativescript.js");
-
 function bytesToHumanReadable(bytes: number): string {
 	const units = ["B", "KB", "MB", "GB", "TB"];
 	let unit = 0;
@@ -90,7 +88,8 @@ export class CleanCommand implements ICommand {
 		private $prompter: IPrompter,
 		private $logger: ILogger,
 		private $options: IOptions,
-		private $childProcess: IChildProcess
+		private $childProcess: IChildProcess,
+		private $staticConfig: IStaticConfig
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -198,9 +197,12 @@ export class CleanCommand implements ICommand {
 			paths,
 			(p) => {
 				return this.$childProcess
-					.exec(`node ${CLIPath} clean --dry-run --json --disable-analytics`, {
-						cwd: p,
-					})
+					.exec(
+						`node ${this.$staticConfig.cliBinPath} clean --dry-run --json --disable-analytics`,
+						{
+							cwd: p,
+						}
+					)
 					.then((res) => {
 						const paths: Record<string, number> = JSON.parse(res).stats;
 						return Object.values(paths).reduce((a, b) => a + b, 0);
@@ -290,7 +292,7 @@ export class CleanCommand implements ICommand {
 
 			const ok = await this.$childProcess
 				.exec(
-					`node ${CLIPath} clean ${
+					`node ${this.$staticConfig.cliBinPath} clean ${
 						this.$options.dryRun ? "--dry-run" : ""
 					} --json --disable-analytics`,
 					{

lib/commands/typings.ts

@@ -1,4 +1,4 @@
-import { IOptions } from "../declarations";
+import { IOptions, IStaticConfig } from "../declarations";
 import { IChildProcess, IFileSystem, IHostInfo } from "../common/declarations";
 import { ICommand, ICommandParameter } from "../common/definitions/commands";
 import { injector } from "../common/yok";
@@ -14,7 +14,8 @@ export class TypingsCommand implements ICommand {
 		private $projectData: IProjectData,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $childProcess: IChildProcess,
-		private $hostInfo: IHostInfo
+		private $hostInfo: IHostInfo,
+		private $staticConfig: IStaticConfig
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -122,11 +123,9 @@ export class TypingsCommand implements ICommand {
 			path.resolve(this.$projectData.projectDir, "typings", "ios")
 		);
 
-		const nsPath = path.resolve(__dirname, "../../bin/nativescript.js");
-
 		await this.$childProcess.spawnFromEvent(
 			"node",
-			[nsPath, "build", "ios"],
+			[this.$staticConfig.cliBinPath, "build", "ios"],
 			"exit",
 			{
 				env: {

lib/common/definitions/config.d.ts

@@ -10,6 +10,7 @@ declare module Config {
 		TRACK_FEATURE_USAGE_SETTING_NAME: string;
 		ERROR_REPORT_SETTING_NAME: string;
 		version: string;
+		cliBinPath: string;
 		getAdbFilePath(): Promise<string>;
 		disableAnalytics?: boolean;
 		disableCommandHooks?: boolean;

lib/config.ts

@@ -58,6 +58,8 @@ export class StaticConfig implements IStaticConfig {
 
 	public version = require("../package.json").version;
 
+	public cliBinPath = path.resolve(__dirname, "..", "bin", "nativescript.js");
+
 	public get HTML_CLI_HELPERS_DIR(): string {
 		return path.join(__dirname, "../docs/helpers");
 	}
@@ -73,9 +75,8 @@ export class StaticConfig implements IStaticConfig {
 	private _adbFilePath: string = null;
 	public async getAdbFilePath(): Promise<string> {
 		if (!this._adbFilePath) {
-			const androidToolsInfo: IAndroidToolsInfo = this.$injector.resolve(
-				"androidToolsInfo"
-			);
+			const androidToolsInfo: IAndroidToolsInfo =
+				this.$injector.resolve("androidToolsInfo");
 			this._adbFilePath =
 				(await androidToolsInfo.getPathToAdbFromAndroidHome()) ||
 				(await this.getAdbFilePathCore());
@@ -111,9 +112,8 @@ export class StaticConfig implements IStaticConfig {
 	}
 
 	private async getAdbFilePathCore(): Promise<string> {
-		const $childProcess: IChildProcess = this.$injector.resolve(
-			"$childProcess"
-		);
+		const $childProcess: IChildProcess =
+			this.$injector.resolve("$childProcess");
 
 		try {
 			// Do NOT use the adb wrapper because it will end blow up with Segmentation fault because the wrapper uses this method!!!

lib/services/start-service.ts

@@ -7,6 +7,7 @@ import {
 import { injector } from "../common/yok";
 import { IProjectData } from "../definitions/project";
 import { IStartService } from "./../definitions/start-service.d";
+import { IStaticConfig } from "../declarations";
 
 export default class StartService implements IStartService {
 	ios: ChildProcess;
@@ -18,7 +19,8 @@ export default class StartService implements IStartService {
 		private $childProcess: IChildProcess,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $projectData: IProjectData,
-		private $logger: ILogger
+		private $logger: ILogger,
+		private $staticConfig: IStaticConfig
 	) {}
 
 	toggleVerbose(): void {
@@ -35,8 +37,8 @@ export default class StartService implements IStartService {
 	async runForPlatform(platform: string) {
 		const platformLowerCase = platform.toLowerCase();
 		(this as any)[platformLowerCase] = this.$childProcess.spawn(
-			"../nativescript-cli/bin/ns",
-			["run", platform.toLowerCase()],
+			"node",
+			[this.$staticConfig.cliBinPath, "run", platform.toLowerCase()],
 			{
 				cwd: this.$projectData.projectDir,
 				stdio: ["ipc"],
@@ -97,7 +99,10 @@ export default class StartService implements IStartService {
 			await this.stopIOS();
 			await this.stopAndroid();
 
-			const clean = this.$childProcess.spawn("ns", ["clean"]);
+			const clean = this.$childProcess.spawn("node", [
+				this.$staticConfig.cliBinPath,
+				"clean",
+			]);
 			clean.stdout.on("data", (data) => {
 				process.stdout.write(data);
 				if (