feat: add android embedding and merge main

lib/controllers/prepare-controller.ts

@@ -22,7 +22,7 @@ import {
 	TrackActionNames,
 	WEBPACK_COMPILATION_COMPLETE,
 } from "../constants";
-import { IWatchIgnoreListService } from "../declarations";
+import { IOptions, IWatchIgnoreListService } from "../declarations";
 import {
 	INodeModulesDependenciesBuilder,
 	IPlatformController,
@@ -59,6 +59,7 @@ export class PrepareController extends EventEmitter {
 		public $hooksService: IHooksService,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
+		private $options: IOptions,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
 		private $platformsDataService: IPlatformsDataService,
@@ -134,10 +135,13 @@ export class PrepareController extends EventEmitter {
 		projectData: IProjectData
 	): Promise<IPrepareResultData> {
 		await this.$projectService.ensureAppResourcesExist(projectData.projectDir);
-		await this.$platformController.addPlatformIfNeeded(
-			prepareData,
-			projectData
-		);
+		if (!this.$options.nativeHost) {
+			await this.$platformController.addPlatformIfNeeded(
+				prepareData,
+				projectData
+			);
+		}
+
 		await this.trackRuntimeVersion(prepareData.platform, projectData);
 
 		this.$logger.info("Preparing project...");
@@ -479,9 +483,9 @@ export class PrepareController extends EventEmitter {
 			console.log("!!!!! VM: proj root: " + platformData.projectRoot);
 			packagePath = path.join(
 				platformData.projectRoot,
-				"app",
+				this.$options.nativeHostModule,
 				"src",
-				"main",
+				this.$options.nativeHost ? "nativescript" : "main",
 				"assets",
 				"app",
 				"package.json"

lib/declarations.d.ts

@@ -578,16 +578,18 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
-interface IAndroidOptions {
-	gradlePath: string;
-	gradleArgs: string;
+interface IEmbedOptions {
 	nativeHost: string;
+	nativeHostModule: string;
 }
 
-interface IIOSOptions {
-	nativeHost: string;
+interface IAndroidOptions extends IEmbedOptions {
+	gradlePath: string;
+	gradleArgs: string;
 }
 
+interface IIOSOptions extends IEmbedOptions {}
+
 interface ITypingsOptions {
 	jar: string;
 	aar: string;

lib/helpers/platform-command-helper.ts

@@ -39,6 +39,11 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 		frameworkPath: string,
 		nativeHost?: string
 	): Promise<void> {
+		if (this.$options.nativeHost) {
+			this.$logger.info("Ignoring platform add becuase of --android-host flag");
+			return;
+		}
+
 		const platformsDir = projectData.platformsDir;
 		this.$fs.ensureDirectoryExists(platformsDir);
 
@@ -86,6 +91,13 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 		platforms: string[],
 		projectData: IProjectData
 	): Promise<void> {
+		if (this.$options.nativeHost) {
+			this.$logger.info(
+				"Ignoring platform remove becuase of --android-host flag"
+			);
+			return;
+		}
+
 		for (const platform of platforms) {
 			this.$platformValidationService.validatePlatformInstalled(
 				platform,

lib/options.ts

@@ -10,6 +10,7 @@ import {
 	ISettingsService,
 } from "./common/declarations";
 import { injector } from "./common/yok";
+import { APP_FOLDER_NAME } from "./constants";
 export class Options {
 	private static DASHED_OPTION_REGEX = /(.+?)([A-Z])(.*)/;
 	private static NONDASHED_OPTION_REGEX = /(.+?)[-]([a-zA-Z])(.*)/;
@@ -228,6 +229,11 @@ export class Options {
 			gradlePath: { type: OptionType.String, hasSensitiveValue: false },
 			gradleArgs: { type: OptionType.String, hasSensitiveValue: false },
 			nativeHost: { type: OptionType.String, hasSensitiveValue: false },
+			nativeHostModule: {
+				type: OptionType.String,
+				hasSensitiveValue: false,
+				default: APP_FOLDER_NAME,
+			},
 			aab: { type: OptionType.Boolean, hasSensitiveValue: false },
 			performance: { type: OptionType.Object, hasSensitiveValue: true },
 			appleApplicationSpecificPassword: {

lib/providers/project-files-provider.ts

@@ -54,7 +54,7 @@ export class ProjectFilesProvider extends ProjectFilesProviderBase {
 			);
 			mappedFilePath = path.join(
 				platformData.appDestinationDirectoryPath,
-				constants.APP_FOLDER_NAME,
+				this.$options.nativeHostModule,
 				relativePath
 			);
 		}

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

@@ -15,6 +15,7 @@ import {
 	INodePackageManager,
 	IAndroidToolsInfo,
 	IWatchIgnoreListService,
+	IOptions,
 } from "../declarations";
 import { IPlatformsDataService } from "../definitions/platform";
 import { IProjectData, IProjectDataService } from "../definitions/project";
@@ -37,6 +38,7 @@ import { IInjector } from "../common/definitions/yok";
 import { injector } from "../common/yok";
 import * as _ from "lodash";
 import { resolvePackageJSONPath } from "@rigor789/resolve-package-path";
+import { cwd } from "process";
 
 export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 	private get $platformsDataService(): IPlatformsDataService {
@@ -47,6 +49,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		private $fs: IFileSystem,
 		private $childProcess: IChildProcess,
 		private $hostInfo: IHostInfo,
+		private $options: IOptions,
 		private $androidToolsInfo: IAndroidToolsInfo,
 		private $logger: ILogger,
 		private $packageManager: INodePackageManager,
@@ -803,6 +806,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
 			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
 		];
+
 		if (pluginBuildSettings.gradleArgs) {
 			localArgs.push(pluginBuildSettings.gradleArgs);
 		}
@@ -811,12 +815,29 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			localArgs.push("--quiet");
 		}
 
+		const opts: any = {
+			cwd: pluginBuildSettings.pluginDir,
+			stdio: "inherit",
+			shell: this.$hostInfo.isWindows,
+		};
+
+		if (this.$options.nativeHost) {
+			opts.env = {
+				USER_PROJECT_PLATFORMS_ANDROID: path.resolve(
+					cwd(),
+					this.$options.nativeHost
+				), // TODO: couldn't `nativeHost` have an absolute path already?
+				...process.env, // TODO: any other way to pass automatically the current process.env?
+			};
+		}
+
 		try {
-			await this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", {
-				cwd: pluginBuildSettings.pluginDir,
-				stdio: "inherit",
-				shell: this.$hostInfo.isWindows,
-			});
+			await this.$childProcess.spawnFromEvent(
+				gradlew,
+				localArgs,
+				"close",
+				opts
+			);
 		} catch (err) {
 			this.$errors.fail(
 				`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`

lib/services/android-project-service.ts

@@ -173,21 +173,21 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 			const appDestinationDirectoryArr = [
 				projectRoot,
-				constants.APP_FOLDER_NAME,
+				this.$options.nativeHostModule,
 				constants.SRC_DIR,
 				constants.MAIN_DIR,
 				constants.ASSETS_DIR,
 			];
 			const configurationsDirectoryArr = [
 				projectRoot,
-				constants.APP_FOLDER_NAME,
+				this.$options.nativeHostModule,
 				constants.SRC_DIR,
 				constants.MAIN_DIR,
 				constants.MANIFEST_FILE_NAME,
 			];
 			const deviceBuildOutputArr = [
 				projectRoot,
-				constants.APP_FOLDER_NAME,
+				this.$options.nativeHostModule,
 				constants.BUILD_DIR,
 				constants.OUTPUTS_DIR,
 				constants.APK_DIR,
@@ -210,7 +210,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					if (buildOptions.androidBundle) {
 						return path.join(
 							projectRoot,
-							constants.APP_FOLDER_NAME,
+							this.$options.nativeHostModule,
 							constants.BUILD_DIR,
 							constants.OUTPUTS_DIR,
 							constants.BUNDLE_DIR
@@ -229,8 +229,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					if (buildOptions.androidBundle) {
 						return {
 							packageNames: [
-								`${constants.APP_FOLDER_NAME}${constants.AAB_EXTENSION_NAME}`,
-								`${constants.APP_FOLDER_NAME}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
+								`${this.$options.nativeHostModule}${constants.AAB_EXTENSION_NAME}`,
+								`${this.$options.nativeHostModule}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
 							],
 						};
 					}
@@ -240,11 +240,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 							`${packageName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
 							`${projectData.projectName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
 							`${projectData.projectName}${constants.APK_EXTENSION_NAME}`,
-							`${constants.APP_FOLDER_NAME}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+							`${this.$options.nativeHostModule}-${buildMode}${constants.APK_EXTENSION_NAME}`,
 						],
 						regexes: [
 							new RegExp(
-								`(${packageName}|${constants.APP_FOLDER_NAME})-.*-(${Configurations.Debug}|${Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`,
+								`(${packageName}|${this.$options.nativeHostModule})-.*-(${Configurations.Debug}|${Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`,
 								"i"
 							),
 						],
@@ -570,7 +570,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this.$fs.exists(
 			path.join(
 				this.getPlatformData(projectData).appDestinationDirectoryPath,
-				constants.APP_FOLDER_NAME
+				this.$options.nativeHostModule
 			)
 		);
 	}
@@ -879,7 +879,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		projectData: IProjectData
 	): string {
 		const resourcePath: string[] = [
-			constants.APP_FOLDER_NAME,
+			this.$options.nativeHostModule,
 			constants.SRC_DIR,
 			constants.MAIN_DIR,
 			constants.RESOURCES_DIR,
@@ -895,7 +895,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		projectData: IProjectData
 	): string {
 		const resourcePath: string[] = [
-			constants.APP_FOLDER_NAME,
+			this.$options.nativeHostModule,
 			constants.SRC_DIR,
 		];
 

lib/services/files-hash-service.ts

@@ -1,15 +1,20 @@
 import { executeActionByChunks } from "../common/helpers";
 import { DEFAULT_CHUNK_SIZE } from "../common/constants";
-import { APP_FOLDER_NAME, HASHES_FILE_NAME } from "../constants";
+import { HASHES_FILE_NAME } from "../constants";
 import * as path from "path";
 import * as _ from "lodash";
 import { IFilesHashService } from "../definitions/files-hash-service";
 import { IPlatformData } from "../definitions/platform";
 import { IFileSystem, IStringDictionary } from "../common/declarations";
 import { injector } from "../common/yok";
+import { IOptions } from "../declarations";
 
 export class FilesHashService implements IFilesHashService {
-	constructor(private $fs: IFileSystem, private $logger: ILogger) {}
+	constructor(
+		private $fs: IFileSystem,
+		private $logger: ILogger,
+		private $options: IOptions
+	) {}
 
 	public async generateHashes(files: string[]): Promise<IStringDictionary> {
 		const result: IStringDictionary = {};
@@ -37,7 +42,7 @@ export class FilesHashService implements IFilesHashService {
 	): Promise<IStringDictionary> {
 		const appFilesPath = path.join(
 			platformData.appDestinationDirectoryPath,
-			APP_FOLDER_NAME
+			this.$options.nativeHostModule
 		);
 		const files = this.$fs.enumerateFilesInDirectorySync(appFilesPath);
 		const hashes = await this.generateHashes(files);

lib/services/livesync/android-device-livesync-sockets-service.ts

@@ -1,5 +1,4 @@
 import { AndroidDeviceLiveSyncServiceBase } from "./android-device-livesync-service-base";
-import { APP_FOLDER_NAME } from "../../constants";
 import { LiveSyncPaths } from "../../common/constants";
 import { AndroidLivesyncTool } from "./android-livesync-tool";
 import * as path from "path";
@@ -19,7 +18,8 @@ export class AndroidDeviceSocketsLiveSyncService
 	extends AndroidDeviceLiveSyncServiceBase
 	implements
 		IAndroidNativeScriptDeviceLiveSyncService,
-		INativeScriptDeviceLiveSyncService {
+		INativeScriptDeviceLiveSyncService
+{
 	private livesyncTool: IAndroidLivesyncTool;
 	private static STATUS_UPDATE_INTERVAL = 10000;
 	private static MINIMAL_VERSION_LONG_LIVING_CONNECTION = "0.2.0";
@@ -279,7 +279,7 @@ export class AndroidDeviceSocketsLiveSyncService
 		);
 		const projectFilesPath = path.join(
 			platformData.appDestinationDirectoryPath,
-			APP_FOLDER_NAME
+			this.$options.nativeHostModule
 		);
 		if (!this.livesyncTool.hasConnection()) {
 			await this.livesyncTool.connect({

lib/services/livesync/android-livesync-service.ts

@@ -13,25 +13,29 @@ import {
 } from "../../common/declarations";
 import { IInjector } from "../../common/definitions/yok";
 import { injector } from "../../common/yok";
+import { IOptions } from "../../declarations";
 
 export class AndroidLiveSyncService
 	extends PlatformLiveSyncServiceBase
-	implements IPlatformLiveSyncService {
+	implements IPlatformLiveSyncService
+{
 	private static MIN_SOCKETS_LIVESYNC_RUNTIME_VERSION = "4.2.0-2018-07-20-02";
 	constructor(
 		protected $platformsDataService: IPlatformsDataService,
 		protected $projectFilesManager: IProjectFilesManager,
 		private $injector: IInjector,
 		$devicePathProvider: IDevicePathProvider,
 		$fs: IFileSystem,
-		$logger: ILogger
+		$logger: ILogger,
+		$options: IOptions
 	) {
 		super(
 			$fs,
 			$logger,
 			$platformsDataService,
 			$projectFilesManager,
-			$devicePathProvider
+			$devicePathProvider,
+			$options
 		);
 	}