Merge remote-tracking branch 'nativescript/main'

# Conflicts:
#	package.json

Author: farfromrefug

.prettierrc.json

@@ -1,3 +1,11 @@
 {
-  "useTabs": true
+  "useTabs": true,
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "useTabs": false
+      }
+    }
+  ]
 }

CHANGELOG.md

@@ -1,3 +1,29 @@
+## [8.7.2](https://github.com/NativeScript/nativescript-cli/compare/v8.7.1...v8.7.2) (2024-05-28)
+
+### Bug Fixes
+
+* fix `npm i -g nativescript` on npm 10.4.0+ ([9d2ec7c](https://github.com/NativeScript/nativescript-cli/commit/9d2ec7cb6a12ea10439ea287991812645a156473))
+
+### Features
+
+* don't uninstall app by default ([bac14c0](https://github.com/NativeScript/nativescript-cli/commit/bac14c06568c7a0538618d9ca1e369a56dd272b5))
+
+
+
+## [8.7.1](https://github.com/NativeScript/nativescript-cli/compare/v8.7.0...v8.7.1) (2024-05-16)
+
+
+### Bug Fixes
+
+* **windows:** make compatible with latest node patch levels ([#5802](https://github.com/NativeScript/nativescript-cli/issues/5802)) ([8795e98](https://github.com/NativeScript/nativescript-cli/commit/8795e98e7876d11ac0032135607fb13bf00d246d))
+
+
+### Features
+
+* interactive typings generation for android ([#5798](https://github.com/NativeScript/nativescript-cli/issues/5798)) ([d3f2e70](https://github.com/NativeScript/nativescript-cli/commit/d3f2e70101d44a9bc8450c5d0b90419945c2604f))
+
+
+
 # [8.7.0](https://github.com/NativeScript/nativescript-cli/compare/v8.6.5...v8.7.0) (2024-04-08)
 
 

lib/base-package-manager.ts

@@ -111,6 +111,7 @@ export abstract class BasePackageManager implements INodePackageManager {
 		await this.$childProcess.spawnFromEvent(npmExecutable, params, "close", {
 			cwd: opts.cwd,
 			stdio: stdioValue,
+			shell: this.$hostInfo.isWindows,
 		});
 
 		// Whenever calling "npm install" or "yarn add" without any arguments (hence installing all dependencies) no output is emitted on stdout

lib/commands/typings.ts

@@ -1,9 +1,13 @@
-import { IOptions, IStaticConfig } from "../declarations";
+import { glob } from "glob";
+import { homedir } from "os";
+import * as path from "path";
+import { PromptObject } from "prompts";
+import { color } from "../color";
 import { IChildProcess, IFileSystem, IHostInfo } from "../common/declarations";
 import { ICommand, ICommandParameter } from "../common/definitions/commands";
 import { injector } from "../common/yok";
+import { IOptions, IStaticConfig } from "../declarations";
 import { IProjectData } from "../definitions/project";
-import * as path from "path";
 
 export class TypingsCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
@@ -15,7 +19,8 @@ export class TypingsCommand implements ICommand {
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $childProcess: IChildProcess,
 		private $hostInfo: IHostInfo,
-		private $staticConfig: IStaticConfig
+		private $staticConfig: IStaticConfig,
+		private $prompter: IPrompter
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -49,8 +54,98 @@ export class TypingsCommand implements ICommand {
 		return true;
 	}
 
+	private async resolveGradleDependencies(target: string) {
+		const gradleHome = path.resolve(
+			process.env.GRADLE_USER_HOME ?? path.join(homedir(), `/.gradle`)
+		);
+		const gradleFiles = path.resolve(gradleHome, "caches/modules-2/files-2.1/");
+
+		if (!this.$fs.exists(gradleFiles)) {
+			this.$logger.warn("No gradle files found");
+			return;
+		}
+
+		const pattern = `${target.replaceAll(":", "/")}/**/*.{jar,aar}`;
+
+		const res = await 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("/");
+			return {
+				id: sha1 + version,
+				group,
+				artifact,
+				version,
+				sha1,
+				file,
+				path: path.resolve(gradleFiles, item),
+			};
+		});
+
+		this.$logger.clearScreen();
+
+		const choices = await this.$prompter.promptForChoice(
+			`Select dependencies to generate typings for (${color.greenBright(
+				target
+			)})`,
+			items
+				.sort((a, b) => {
+					if (a.artifact < b.artifact) return -1;
+					if (a.artifact > b.artifact) return 1;
+
+					return a.version.localeCompare(b.version, undefined, {
+						numeric: true,
+						sensitivity: "base",
+					});
+				})
+				.map((item) => {
+					return {
+						title: `${color.white(item.group)}:${color.greenBright(
+							item.artifact
+						)}:${color.yellow(item.version)} - ${color.cyanBright.bold(
+							item.file
+						)}`,
+						value: item.id,
+					};
+				}),
+			true,
+			{
+				optionsPerPage: process.stdout.rows - 6, // 6 lines are taken up by the instructions
+			} as Partial<PromptObject>
+		);
+
+		this.$logger.clearScreen();
+
+		return items
+			.filter((item) => choices.includes(item.id))
+			.map((item) => item.path);
+	}
+
 	private async handleAndroidTypings() {
-		if (!(this.$options.jar || this.$options.aar)) {
+		const targets = this.$options.argv._.slice(2) ?? [];
+		const paths: string[] = [];
+
+		if (targets.length) {
+			for (const target of targets) {
+				try {
+					paths.push(...(await this.resolveGradleDependencies(target)));
+				} catch (err) {
+					this.$logger.trace(
+						`Failed to resolve gradle dependencies for target "${target}"`,
+						err
+					);
+				}
+			}
+		}
+
+		if (!paths.length && !(this.$options.jar || this.$options.aar)) {
 			this.$logger.warn(
 				[
 					"No .jar or .aar file specified. Please specify at least one of the following:",
@@ -78,7 +173,7 @@ export class TypingsCommand implements ICommand {
 				this.$hostInfo.isWindows ? "ns.cmd" : "ns",
 				["prepare", "android"],
 				"exit",
-				{ stdio: "inherit" }
+				{ stdio: "inherit", shell: this.$hostInfo.isWindows }
 			);
 		}
 
@@ -97,6 +192,7 @@ export class TypingsCommand implements ICommand {
 		const inputs: string[] = [
 			...asArray(this.$options.jar),
 			...asArray(this.$options.aar),
+			...paths,
 		];
 
 		await this.$childProcess.spawnFromEvent(

lib/common/mobile/android/android-virtual-device-service.ts

@@ -22,7 +22,8 @@ import {
 import { injector } from "../../yok";
 
 export class AndroidVirtualDeviceService
-	implements Mobile.IAndroidVirtualDeviceService {
+	implements Mobile.IAndroidVirtualDeviceService
+{
 	private androidHome: string;
 	private mapEmulatorIdToImageIdentifier: IStringDictionary = {};
 
@@ -211,7 +212,8 @@ export class AndroidVirtualDeviceService
 		let result: ISpawnResult = null;
 		let devices: Mobile.IDeviceInfo[] = [];
 		let errors: string[] = [];
-		const canExecuteAvdManagerCommand = await this.canExecuteAvdManagerCommand();
+		const canExecuteAvdManagerCommand =
+			await this.canExecuteAvdManagerCommand();
 		if (!canExecuteAvdManagerCommand) {
 			errors = [
 				"Unable to execute avdmanager, ensure JAVA_HOME is set and points to correct directory",
@@ -221,7 +223,8 @@ export class AndroidVirtualDeviceService
 		if (canExecuteAvdManagerCommand) {
 			result = await this.$childProcess.trySpawnFromCloseEvent(
 				this.pathToAvdManagerExecutable,
-				["list", "avds"]
+				["list", "avds"],
+				{ shell: this.$hostInfo.isWindows }
 			);
 		} else if (
 			this.pathToAndroidExecutable &&
@@ -403,9 +406,8 @@ export class AndroidVirtualDeviceService
 	private getAvdManagerDeviceInfo(
 		output: string
 	): Mobile.IAvdManagerDeviceInfo {
-		const avdManagerDeviceInfo: Mobile.IAvdManagerDeviceInfo = Object.create(
-			null
-		);
+		const avdManagerDeviceInfo: Mobile.IAvdManagerDeviceInfo =
+			Object.create(null);
 
 		// Split by `\n`, not EOL as the avdmanager and android executables print results with `\n` only even on Windows
 		_.reduce(
@@ -437,9 +439,8 @@ export class AndroidVirtualDeviceService
 			avdFilePath,
 			AndroidVirtualDevice.CONFIG_INI_FILE_NAME
 		);
-		const configIniFileInfo = this.$androidIniFileParser.parseIniFile(
-			configIniFilePath
-		);
+		const configIniFileInfo =
+			this.$androidIniFileParser.parseIniFile(configIniFilePath);
 
 		const iniFilePath = this.getIniFilePath(configIniFileInfo, avdFilePath);
 		const iniFileInfo = this.$androidIniFileParser.parseIniFile(iniFilePath);

lib/common/mobile/application-manager-base.ts

@@ -6,7 +6,8 @@ import * as _ from "lodash";
 
 export abstract class ApplicationManagerBase
 	extends EventEmitter
-	implements Mobile.IDeviceApplicationManager {
+	implements Mobile.IDeviceApplicationManager
+{
 	private lastInstalledAppIdentifiers: string[];
 	private lastAvailableDebuggableApps: Mobile.IDeviceApplicationInformation[];
 	private lastAvailableDebuggableAppViews: IDictionary<
@@ -36,7 +37,7 @@ export abstract class ApplicationManagerBase
 			appIdentifier
 		);
 
-		if (isApplicationInstalled) {
+		if (isApplicationInstalled && buildData?.clean) {
 			await this.uninstallApplication(appIdentifier);
 		}
 
@@ -65,7 +66,8 @@ export abstract class ApplicationManagerBase
 					// use locking, so the next executions will not get into the body, while the first one is still working.
 					// In case we do not break the next executions, we'll report each app as newly installed several times.
 					try {
-						const currentlyInstalledAppIdentifiers = await this.getInstalledApplications();
+						const currentlyInstalledAppIdentifiers =
+							await this.getInstalledApplications();
 						const previouslyInstalledAppIdentifiers =
 							this.lastInstalledAppIdentifiers || [];
 
@@ -122,9 +124,7 @@ export abstract class ApplicationManagerBase
 		appIdentifier?: string,
 		buildData?: IBuildData
 	): Promise<void>;
-	public abstract uninstallApplication(
-		appIdentifier: string
-	): Promise<void>;
+	public abstract uninstallApplication(appIdentifier: string): Promise<void>;
 	public abstract startApplication(
 		appData: Mobile.IApplicationData
 	): Promise<void>;
@@ -190,9 +190,8 @@ export abstract class ApplicationManagerBase
 		_.each(
 			currentlyAvailableAppViews,
 			(currentlyAvailableViews, appIdentifier) => {
-				const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[
-					appIdentifier
-				];
+				const previouslyAvailableViews =
+					this.lastAvailableDebuggableAppViews[appIdentifier];
 
 				const newAvailableViews = _.differenceBy(
 					currentlyAvailableViews,
@@ -229,9 +228,8 @@ export abstract class ApplicationManagerBase
 					}
 				});
 
-				this.lastAvailableDebuggableAppViews[
-					appIdentifier
-				] = currentlyAvailableViews;
+				this.lastAvailableDebuggableAppViews[appIdentifier] =
+					currentlyAvailableViews;
 			}
 		);
 	}

lib/common/test/unit-tests/mobile/application-manager-base.ts

@@ -321,9 +321,8 @@ describe("ApplicationManagerBase", () => {
 					currentlyAvailableAppsForDebugging,
 					numberOfViewsPerApp
 				);
-				const currentDebuggableViews: IDictionary<
-					Mobile.IDebugWebViewInfo[]
-				> = {};
+				const currentDebuggableViews: IDictionary<Mobile.IDebugWebViewInfo[]> =
+					{};
 				applicationManager.on(
 					"debuggableViewFound",
 					(appIdentifier: string, d: Mobile.IDebugWebViewInfo) => {
@@ -368,9 +367,8 @@ describe("ApplicationManagerBase", () => {
 				const expectedResults = _.cloneDeep(
 					currentlyAvailableAppWebViewsForDebugging
 				);
-				const currentDebuggableViews: IDictionary<
-					Mobile.IDebugWebViewInfo[]
-				> = {};
+				const currentDebuggableViews: IDictionary<Mobile.IDebugWebViewInfo[]> =
+					{};
 
 				applicationManager
 					.checkForApplicationUpdates()
@@ -819,9 +817,8 @@ describe("ApplicationManagerBase", () => {
 					removedApps = removedApps.concat(currentlyRemovedApps);
 
 					const currentlyAddedApps = [`app${index}`];
-					currentlyInstalledApps = currentlyInstalledApps.concat(
-						currentlyAddedApps
-					);
+					currentlyInstalledApps =
+						currentlyInstalledApps.concat(currentlyAddedApps);
 					installedApps = installedApps.concat(currentlyAddedApps);
 
 					await testInstalledAppsResults();
@@ -1004,7 +1001,11 @@ describe("ApplicationManagerBase", () => {
 			applicationManager.isApplicationInstalled = (appIdentifier: string) =>
 				Promise.resolve(true);
 
-			await applicationManager.reinstallApplication("appId", "packageFilePath");
+			await applicationManager.reinstallApplication(
+				"appId",
+				"packageFilePath",
+				{ clean: true } as any
+			);
 			assert.deepStrictEqual(uninstallApplicationAppIdParam, "appId");
 		});
 
@@ -1047,7 +1048,11 @@ describe("ApplicationManagerBase", () => {
 				return Promise.resolve();
 			};
 
-			await applicationManager.reinstallApplication("appId", "packageFilePath");
+			await applicationManager.reinstallApplication(
+				"appId",
+				"packageFilePath",
+				{ clean: true } as any
+			);
 
 			assert.isTrue(
 				isUninstallApplicationCalled,

lib/services/android-plugin-build-service.ts

@@ -797,6 +797,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			await this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", {
 				cwd: pluginBuildSettings.pluginDir,
 				stdio: "inherit",
+				shell: this.$hostInfo.isWindows,
 			});
 		} catch (err) {
 			this.$errors.fail(