Merge remote-tracking branch 'origin/main' into pre/v9-combined-testing

Author: NathanWalker

lib/color.ts

@@ -1,12 +1,92 @@
-// using chalk as some of our other dependencies are already using it...
-// exporting from here so we can easily refactor to a different color library if needed
-import * as ansi from "ansi-colors";
-import * as chalk from "chalk";
+import { styleText, stripVTControlCharacters } from "node:util";
 
-export type Color = typeof chalk.Color;
+// Define color types based on util.inspect.colors
+export type StyleFormat =
+	| "reset"
+	| "bold"
+	| "dim"
+	| "italic"
+	| "underline"
+	| "blink"
+	| "inverse"
+	| "hidden"
+	| "strikethrough"
+	| "doubleunderline"
+	| "black"
+	| "red"
+	| "green"
+	| "yellow"
+	| "blue"
+	| "magenta"
+	| "cyan"
+	| "white"
+	| "gray"
+	| "redBright"
+	| "greenBright"
+	| "yellowBright"
+	| "blueBright"
+	| "magentaBright"
+	| "cyanBright"
+	| "whiteBright"
+	| "bgBlack"
+	| "bgRed"
+	| "bgGreen"
+	| "bgYellow"
+	| "bgBlue"
+	| "bgMagenta"
+	| "bgCyan"
+	| "bgWhite"
+	| "bgGray"
+	| "bgRedBright"
+	| "bgGreenBright"
+	| "bgYellowBright"
+	| "bgBlueBright"
+	| "bgMagentaBright"
+	| "bgCyanBright"
+	| "bgWhiteBright";
 
-export function stripColors(formatStr: string) {
-	return ansi.stripColor(formatStr);
-}
+export type Color = StyleFormat;
 
-export const color = chalk;
+// Create a chalk-like API using the Node.js util.styleText function
+export const color = {
+	reset: (text: string) => styleText("reset", text),
+	bold: (text: string) => styleText("bold", text),
+	dim: (text: string) => styleText("dim", text),
+	italic: (text: string) => styleText("italic", text),
+	underline: (text: string) => styleText("underline", text),
+	inverse: (text: string) => styleText("inverse", text),
+	hidden: (text: string) => styleText("hidden", text),
+	strikethrough: (text: string) => styleText("strikethrough", text),
+
+	// Text colors
+	black: (text: string) => styleText("black", text),
+	red: (text: string) => styleText("red", text),
+	blue: (text: string) => styleText("blue", text),
+	magenta: (text: string) => styleText("magenta", text),
+	cyan: (text: string) => styleText("cyan", text),
+	white: (text: string) => styleText("white", text),
+	gray: (text: string) => styleText("gray", text),
+	yellow: (text: string) => styleText("yellow", text),
+	green: (text: string) => styleText("green", text),
+	grey: (text: string) => styleText("grey", text),
+
+	// Background colors
+	bgBlack: (text: string) => styleText("bgBlack", text),
+	bgBlackBright: (text: string) => styleText("bgBlackBright", text),
+	bgRed: (text: string) => styleText("bgRed", text),
+	bgGreen: (text: string) => styleText("bgGreen", text),
+	bgYellow: (text: string) => styleText("bgYellow", text),
+	bgBlue: (text: string) => styleText("bgBlue", text),
+	bgMagenta: (text: string) => styleText("bgMagenta", text),
+	bgCyan: (text: string) => styleText("bgCyan", text),
+	bgWhite: (text: string) => styleText("bgWhite", text),
+	cyanBright: (text: string) => styleText("cyanBright", text),
+	whiteBright: (text: string) => styleText("whiteBright", text),
+	greenBright: (text: string) => styleText("greenBright", text),
+	yellowBright: (text: string) => styleText("yellowBright", text),
+	redBright: (text: string) => styleText("redBright", text),
+
+	styleText,
+};
+
+export const stripColors = (text: string) => stripVTControlCharacters(text);

lib/commands/clean.ts

@@ -267,7 +267,8 @@ export class CleanCommand implements ICommand {
 		spinner.warn(
 			`This will run "${color.yellow(
 				`ns clean`,
-			)}" in all the selected projects and ${color.red.bold(
+			)}" in all the selected projects and ${color.styleText(
+				["red", "bold"],
 				"delete files from your system",
 			)}!`,
 		);

lib/commands/embedding/embed.ts

@@ -24,7 +24,7 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 
 		private $logger: ILogger,
 		private $fs: IFileSystem,
-		private $projectConfigService: IProjectConfigService
+		private $projectConfigService: IProjectConfigService,
 	) {
 		super(
 			$options,
@@ -34,7 +34,7 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 			$platformCommandParameter,
 			$platformsDataService,
 			$prepareDataService,
-			$migrateController
+			$migrateController,
 		);
 	}
 
@@ -56,10 +56,11 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 		if (!this.$fs.exists(resolvedHostProjectPath)) {
 			this.$logger.error(
 				`The host project path ${color.yellow(
-					hostProjectPath
-				)} (resolved to: ${color.yellow.dim(
-					resolvedHostProjectPath
-				)}) does not exist.`
+					hostProjectPath,
+				)} (resolved to: ${color.styleText(
+					["yellow", "dim"],
+					resolvedHostProjectPath,
+				)}) does not exist.`,
 			);
 			return;
 		}
@@ -89,7 +90,7 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 		if (!args[1]) {
 			const hostProjectPath = this.getEmbedConfigForKey(
 				"hostProjectPath",
-				platform
+				platform,
 			);
 			if (hostProjectPath) {
 				args[1] = hostProjectPath;
@@ -99,7 +100,7 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 		if (!args[2]) {
 			const hostProjectModuleName = this.getEmbedConfigForKey(
 				"hostProjectModuleName",
-				platform
+				platform,
 			);
 			if (hostProjectModuleName) {
 				args[2] = hostProjectModuleName;
@@ -119,7 +120,7 @@ export class EmbedCommand extends PrepareCommand implements ICommand {
 		// get the embed.<platform>.<key> value, or fallback to embed.<key> value
 		return this.$projectConfigService.getValue(
 			`embed.${platform}.${key}`,
-			this.$projectConfigService.getValue(`embed.${key}`)
+			this.$projectConfigService.getValue(`embed.${key}`),
 		);
 	}
 }

lib/commands/post-install.ts

@@ -18,7 +18,7 @@ export class PostInstallCliCommand implements ICommand {
 		private $settingsService: ISettingsService,
 		private $analyticsService: IAnalyticsService,
 		private $logger: ILogger,
-		private $hostInfo: IHostInfo
+		private $hostInfo: IHostInfo,
 	) {}
 
 	public disableAnalytics = true;
@@ -35,7 +35,7 @@ export class PostInstallCliCommand implements ICommand {
 				// TODO: Check if this is the correct place, probably we should set this at the end of the command.
 				await this.$fs.setCurrentUserAsOwner(
 					this.$settingsService.getProfileDir(),
-					process.env.SUDO_USER
+					process.env.SUDO_USER,
 				);
 			}
 		}
@@ -55,15 +55,18 @@ export class PostInstallCliCommand implements ICommand {
 	public async postCommandAction(args: string[]): Promise<void> {
 		this.$logger.info("");
 		this.$logger.info(
-			color.green.bold("You have successfully installed the NativeScript CLI!")
+			color.styleText(
+				["green", "bold"],
+				"You have successfully installed the NativeScript CLI!",
+			),
 		);
 		this.$logger.info("");
 		this.$logger.info("Your next step is to create a new project:");
-		this.$logger.info(color.green.bold("ns create"));
+		this.$logger.info(color.styleText(["green", "bold"], "ns create"));
 
 		this.$logger.info("");
 		this.$logger.printMarkdown(
-			"If you have any questions, check Stack Overflow: `https://stackoverflow.com/questions/tagged/nativescript` and our public Discord channel: `https://nativescript.org/discord`"
+			"If you have any questions, check Stack Overflow: `https://stackoverflow.com/questions/tagged/nativescript` and our public Discord channel: `https://nativescript.org/discord`",
 		);
 	}
 }

lib/commands/typings.ts

@@ -1,4 +1,4 @@
-import { glob } from "glob";
+import { glob } from "node:fs/promises";
 import { homedir } from "os";
 import * as path from "path";
 import { PromptObject } from "prompts";
@@ -20,7 +20,7 @@ export class TypingsCommand implements ICommand {
 		private $childProcess: IChildProcess,
 		private $hostInfo: IHostInfo,
 		private $staticConfig: IStaticConfig,
-		private $prompter: IPrompter
+		private $prompter: IPrompter,
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -35,15 +35,15 @@ export class TypingsCommand implements ICommand {
 		if (this.$options.copyTo) {
 			this.$fs.copyFile(
 				path.resolve(this.$projectData.projectDir, "typings"),
-				this.$options.copyTo
+				this.$options.copyTo,
 			);
 			typingsFolder = this.$options.copyTo;
 		}
 
 		if (result !== false) {
 			this.$logger.info(
 				"Typings have been generated in the following directory:",
-				typingsFolder
+				typingsFolder,
 			);
 		}
 	}
@@ -56,7 +56,7 @@ export class TypingsCommand implements ICommand {
 
 	private async resolveGradleDependencies(target: string) {
 		const gradleHome = path.resolve(
-			process.env.GRADLE_USER_HOME ?? path.join(homedir(), `/.gradle`)
+			process.env.GRADLE_USER_HOME ?? path.join(homedir(), `/.gradle`),
 		);
 		const gradleFiles = path.resolve(gradleHome, "caches/modules-2/files-2.1/");
 
@@ -67,33 +67,32 @@ export class TypingsCommand implements ICommand {
 
 		const pattern = `${target.replaceAll(":", "/")}/**/*.{jar,aar}`;
 
-		const res = await glob(pattern, {
+		const items = [];
+		for await (const item of glob(pattern, {
 			cwd: gradleFiles,
-		});
-
-		if (!res || res.length === 0) {
-			this.$logger.warn("No files found");
-			return [];
-		}
-
-		const items = res.map((item) => {
+		})) {
 			const [group, artifact, version, sha1, file] = item.split(path.sep);
-			return {
+			items.push({
 				id: sha1 + version,
 				group,
 				artifact,
 				version,
 				sha1,
 				file,
 				path: path.resolve(gradleFiles, item),
-			};
-		});
+			});
+		}
+
+		if (items.length === 0) {
+			this.$logger.warn("No files found");
+			return [];
+		}
 
 		this.$logger.clearScreen();
 
 		const choices = await this.$prompter.promptForChoice(
 			`Select dependencies to generate typings for (${color.greenBright(
-				target
+				target,
 			)})`,
 			items
 				.sort((a, b) => {
@@ -108,17 +107,18 @@ export class TypingsCommand implements ICommand {
 				.map((item) => {
 					return {
 						title: `${color.white(item.group)}:${color.greenBright(
-							item.artifact
-						)}:${color.yellow(item.version)} - ${color.cyanBright.bold(
-							item.file
+							item.artifact,
+						)}:${color.yellow(item.version)} - ${color.styleText(
+							["cyanBright", "bold"],
+							item.file,
 						)}`,
 						value: item.id,
 					};
 				}),
 			true,
 			{
 				optionsPerPage: process.stdout.rows - 6, // 6 lines are taken up by the instructions
-			} as Partial<PromptObject>
+			} as Partial<PromptObject>,
 		);
 
 		this.$logger.clearScreen();
@@ -139,7 +139,7 @@ export class TypingsCommand implements ICommand {
 				} catch (err) {
 					this.$logger.trace(
 						`Failed to resolve gradle dependencies for target "${target}"`,
-						err
+						err,
 					);
 				}
 			}
@@ -151,29 +151,29 @@ export class TypingsCommand implements ICommand {
 					"No .jar or .aar file specified. Please specify at least one of the following:",
 					"  - path to .jar file with --jar <jar>",
 					"  - path to .aar file with --aar <aar>",
-				].join("\n")
+				].join("\n"),
 			);
 			return false;
 		}
 
 		this.$fs.ensureDirectoryExists(
-			path.resolve(this.$projectData.projectDir, "typings", "android")
+			path.resolve(this.$projectData.projectDir, "typings", "android"),
 		);
 
 		const dtsGeneratorPath = path.resolve(
 			this.$projectData.projectDir,
 			"platforms",
 			"android",
 			"build-tools",
-			"dts-generator.jar"
+			"dts-generator.jar",
 		);
 		if (!this.$fs.exists(dtsGeneratorPath)) {
 			this.$logger.warn("No platforms folder found, preparing project now...");
 			await this.$childProcess.spawnFromEvent(
 				this.$hostInfo.isWindows ? "ns.cmd" : "ns",
 				["prepare", "android"],
 				"exit",
-				{ stdio: "inherit", shell: this.$hostInfo.isWindows }
+				{ stdio: "inherit", shell: this.$hostInfo.isWindows },
 			);
 		}
 
@@ -206,7 +206,7 @@ export class TypingsCommand implements ICommand {
 				path.resolve(this.$projectData.projectDir, "typings", "android"),
 			],
 			"exit",
-			{ stdio: "inherit" }
+			{ stdio: "inherit" },
 		);
 	}
 
@@ -216,7 +216,7 @@ export class TypingsCommand implements ICommand {
 		}
 
 		this.$fs.ensureDirectoryExists(
-			path.resolve(this.$projectData.projectDir, "typings", "ios")
+			path.resolve(this.$projectData.projectDir, "typings", "ios"),
 		);
 
 		await this.$childProcess.spawnFromEvent(
@@ -229,11 +229,11 @@ export class TypingsCommand implements ICommand {
 					TNS_TYPESCRIPT_DECLARATIONS_PATH: path.resolve(
 						this.$projectData.projectDir,
 						"typings",
-						"ios"
+						"ios",
 					),
 				},
 				stdio: "inherit",
-			}
+			},
 		);
 	}
 }