nativescript 8.8.3 → 8.9.0-alpha.1

package/lib/data/debug-data.js

@@ -4,4 +4,3 @@ exports.DebugData = void 0;
 class DebugData {
 }
 exports.DebugData = DebugData;
-//# sourceMappingURL=debug-data.js.map

package/lib/data/platform-data.js

@@ -11,4 +11,3 @@ class AddPlatformData extends controller_data_base_1.ControllerDataBase {
     }
 }
 exports.AddPlatformData = AddPlatformData;
-//# sourceMappingURL=platform-data.js.map

package/lib/data/prepare-data.js

@@ -30,6 +30,7 @@ class PrepareData extends controller_data_base_1.ControllerDataBase {
             this.watchNative = data.watchNative;
         }
         this.hostProjectPath = data.hostProjectPath;
+        this.uniqueBundle = !this.watch && data.uniqueBundle ? Date.now() : 0;
     }
 }
 exports.PrepareData = PrepareData;
@@ -45,4 +46,3 @@ exports.IOSPrepareData = IOSPrepareData;
 class AndroidPrepareData extends PrepareData {
 }
 exports.AndroidPrepareData = AndroidPrepareData;
-//# sourceMappingURL=prepare-data.js.map

package/lib/data/run-data.js

@@ -9,4 +9,3 @@ class RunData {
     }
 }
 exports.RunData = RunData;
-//# sourceMappingURL=run-data.js.map

package/lib/declarations.d.ts

@@ -709,7 +709,7 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
-
+	uniqueBundle: boolean;
 	// allow arbitrary options
 	[optionName: string]: any;
 }

package/lib/definitions/prepare.d.ts

@@ -14,6 +14,8 @@ declare global {
 
 		// embedding
 		hostProjectPath?: string;
+
+		uniqueBundle: number;
 	}
 
 	interface IiOSCodeSigningData {

package/lib/detached-processes/cleanup-js-subprocess.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// NOTE: This file is used to call JS functions when cleaning resources used by CLI, after the CLI is killed.
-// The instances here are not shared with the ones in main CLI process.
 const fs = require("fs");
 const uuid_1 = require("uuid");
 const file_log_service_1 = require("./file-log-service");
@@ -20,7 +18,6 @@ const pathToBootstrap = process.argv[2];
 if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
     throw new Error("Invalid path to bootstrap.");
 }
-// After requiring the bootstrap we can use $injector
 require(pathToBootstrap);
 const logFile = process.argv[3];
 const jsFilePath = process.argv[4];
@@ -44,7 +41,6 @@ catch (err) {
 const logMessage = (msg, type) => {
     fileLogService.logData({ message: `[${uniqueId}] ${msg}`, type });
 };
-/* tslint:disable:no-floating-promises */
 (() => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logMessage(`Requiring file ${jsFilePath}`);
@@ -56,13 +52,11 @@ const logMessage = (msg, type) => {
                 logMessage(`Finished execution with data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
             }
             catch (err) {
-                logMessage(`Unable to execute action of file ${jsFilePath} when passed data is ${JSON.stringify(data)}. Error is: ${err}.`, "Error" /* FileLogMessageType.Error */);
+                logMessage(`Unable to execute action of file ${jsFilePath} when passed data is ${JSON.stringify(data)}. Error is: ${err}.`, "Error");
             }
         }
     }
     catch (err) {
-        logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error" /* FileLogMessageType.Error */);
+        logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error");
     }
 }))();
-/* tslint:enable:no-floating-promises */
-//# sourceMappingURL=cleanup-js-subprocess.js.map

package/lib/detached-processes/cleanup-process.js

@@ -9,8 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// NOTE: This file is used to clean up resources used by CLI, when the CLI is killed.
-// The instances here are not shared with the ones in main CLI process.
 const fs = require("fs");
 const path = require("path");
 const shelljs = require("shelljs");
@@ -22,7 +20,6 @@ if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
     throw new Error("Invalid path to bootstrap.");
 }
 const logFile = process.argv[3];
-// After requiring the bootstrap we can use $injector
 require(pathToBootstrap);
 const fileLogService = yok_1.injector.resolve(file_log_service_1.FileLogService, {
     logFile,
@@ -75,7 +72,7 @@ const executeJSCleanup = (jsCommand) => __awaiter(void 0, void 0, void 0, functi
     catch (err) {
         fileLogService.logData({
             message: `Unable to execute action for file ${jsCommand.filePath} with data ${JSON.stringify(jsCommand.data)}. Error is: ${err}.`,
-            type: "Error" /* FileLogMessageType.Error */,
+            type: "Error",
         });
     }
 });
@@ -100,7 +97,7 @@ const executeCleanup = () => __awaiter(void 0, void 0, void 0, function* () {
         catch (err) {
             fileLogService.logData({
                 message: `Unable to execute command: ${JSON.stringify(commandInfo)}. Error is: ${err}.`,
-                type: "Error" /* FileLogMessageType.Error */,
+                type: "Error",
             });
         }
     }
@@ -114,7 +111,7 @@ const executeCleanup = () => __awaiter(void 0, void 0, void 0, function* () {
         catch (err) {
             fileLogService.logData({
                 message: `Unable to delete files: ${JSON.stringify(filesToDelete)}. Error is: ${err}.`,
-                type: "Error" /* FileLogMessageType.Error */,
+                type: "Error",
             });
         }
     }
@@ -236,36 +233,36 @@ process.on("message", (cleanupProcessMessage) => __awaiter(void 0, void 0, void
         message: `cleanup-process received message of type: ${JSON.stringify(cleanupProcessMessage)}`,
     });
     switch (cleanupProcessMessage.messageType) {
-        case "AddCleanCommand" /* CleanupProcessMessage.AddCleanCommand */:
+        case "AddCleanCommand":
             addCleanupAction(cleanupProcessMessage.commandInfo);
             break;
-        case "RemoveCleanCommand" /* CleanupProcessMessage.RemoveCleanCommand */:
+        case "RemoveCleanCommand":
             removeCleanupAction(cleanupProcessMessage.commandInfo);
             break;
-        case "AddRequest" /* CleanupProcessMessage.AddRequest */:
+        case "AddRequest":
             addRequest(cleanupProcessMessage.requestInfo);
             break;
-        case "RemoveRequest" /* CleanupProcessMessage.RemoveRequest */:
+        case "RemoveRequest":
             removeRequest(cleanupProcessMessage.requestInfo);
             break;
-        case "AddDeleteFileAction" /* CleanupProcessMessage.AddDeleteFileAction */:
+        case "AddDeleteFileAction":
             addDeleteAction(cleanupProcessMessage.filePath);
             break;
-        case "RemoveDeleteFileAction" /* CleanupProcessMessage.RemoveDeleteFileAction */:
+        case "RemoveDeleteFileAction":
             removeDeleteAction(cleanupProcessMessage.filePath);
             break;
-        case "AddJSFileToRequire" /* CleanupProcessMessage.AddJSFileToRequire */:
+        case "AddJSFileToRequire":
             const jsCleanupMessage = cleanupProcessMessage;
             addJSFile(jsCleanupMessage.jsCommand);
             break;
-        case "RemoveJSFileToRequire" /* CleanupProcessMessage.RemoveJSFileToRequire */:
+        case "RemoveJSFileToRequire":
             const msgToRemove = cleanupProcessMessage;
             removeJSFile(msgToRemove.jsCommand);
             break;
         default:
             fileLogService.logData({
                 message: `Unable to handle message of type ${cleanupProcessMessage.messageType}. Full message is ${JSON.stringify(cleanupProcessMessage)}`,
-                type: "Error" /* FileLogMessageType.Error */,
+                type: "Error",
             });
             break;
     }
@@ -279,7 +276,6 @@ process.on("disconnect", () => __awaiter(void 0, void 0, void 0, function* () {
     process.exit();
 }));
 fileLogService.logData({
-    message: `cleanup-process will send ${"ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */} message`,
+    message: `cleanup-process will send ${"ProcessReadyToReceive"} message`,
 });
-process.send("ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */);
-//# sourceMappingURL=cleanup-process.js.map
+process.send("ProcessReadyToReceive");

package/lib/detached-processes/file-log-service.js

@@ -11,11 +11,10 @@ class FileLogService {
     logData(fileLoggingMessage) {
         if (this.logFile && fileLoggingMessage && fileLoggingMessage.message) {
             fileLoggingMessage.type =
-                fileLoggingMessage.type || "Info" /* FileLogMessageType.Info */;
+                fileLoggingMessage.type || "Info";
             const formattedDate = (0, helpers_1.getFixedLengthDateString)();
             this.$fs.appendFile(this.logFile, `[${formattedDate}] [${fileLoggingMessage.type}] ${fileLoggingMessage.message}${os_1.EOL}`);
         }
     }
 }
 exports.FileLogService = FileLogService;
-//# sourceMappingURL=file-log-service.js.map

package/lib/device-path-provider.js

@@ -58,4 +58,3 @@ class DevicePathProvider {
 }
 exports.DevicePathProvider = DevicePathProvider;
 yok_1.injector.register("devicePathProvider", DevicePathProvider);
-//# sourceMappingURL=device-path-provider.js.map

package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js

@@ -88,7 +88,6 @@ class AppDebugSocketProxyFactory extends events_1.EventEmitter {
             const existingWebProxy = this.deviceWebServers[`${device.deviceInfo.identifier}-${appId}`];
             const result = existingWebProxy ||
                 (yield this.addWebSocketProxy(device, appId, projectName, projectDir));
-            // TODO: do not remove till VSCode waits for this message in order to reattach
             this.$logger.info("Opened localhost " + result.options.port);
             return result;
         });
@@ -101,13 +100,8 @@ class AppDebugSocketProxyFactory extends events_1.EventEmitter {
             if (existingServer) {
                 this.$errors.fail(`Web socket proxy is already running for device '${device.deviceInfo.identifier}' and app '${appId}'`);
             }
-            // NOTE: We will try to provide command line options to select ports, at least on the localhost.
             const localPort = yield this.$net.getAvailablePortInRange(41000);
             this.$logger.info("\nSetting up debugger proxy...\nPress Ctrl + C to terminate, or disconnect.\n");
-            // NB: When the inspector frontend connects we might not have connected to the inspector backend yet.
-            // That's why we use the verifyClient callback of the websocket server to stall the upgrade request until we connect.
-            // We store the socket that connects us to the device in the upgrade request object itself and later on retrieve it
-            // in the connection callback.
             let currentAppSocket = null;
             let currentWebSocket = null;
             const server = new ws.Server({
@@ -221,4 +215,3 @@ class AppDebugSocketProxyFactory extends events_1.EventEmitter {
 }
 exports.AppDebugSocketProxyFactory = AppDebugSocketProxyFactory;
 yok_1.injector.register("appDebugSocketProxyFactory", AppDebugSocketProxyFactory);
-//# sourceMappingURL=app-debug-socket-proxy-factory.js.map

package/lib/device-sockets/ios/notification.js

@@ -6,8 +6,6 @@ const constants_1 = require("../../common/constants");
 const yok_1 = require("../../common/yok");
 class IOSNotification extends events_1.EventEmitter {
     getAttachRequest(appId, deviceId) {
-        // It could be too early to emit this event, but we rely that if you construct attach request,
-        // you will execute it immediately.
         this.emit(constants_1.ATTACH_REQUEST_EVENT_NAME, { deviceId, appId });
         return this.formatNotification(IOSNotification.ATTACH_REQUEST_NOTIFICATION_NAME, appId);
     }
@@ -30,4 +28,3 @@ IOSNotification.ATTACH_REQUEST_NOTIFICATION_NAME = "AttachRequest";
 IOSNotification.READY_FOR_ATTACH_NOTIFICATION_NAME = "ReadyForAttach";
 exports.IOSNotification = IOSNotification;
 yok_1.injector.register("iOSNotification", IOSNotification);
-//# sourceMappingURL=notification.js.map

package/lib/device-sockets/ios/socket-request-executor.js

@@ -39,8 +39,6 @@ class IOSSocketRequestExecutor {
         return __awaiter(this, void 0, void 0, function* () {
             let isSuccessful = false;
             try {
-                // We should create this promise here because we need to send the ObserveNotification on the device
-                // before we send the PostNotification.
                 const socket = yield this.$iOSNotificationService.postNotification(deviceId, successfulyExecutedNotificationName, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
                 const notificationPromise = this.$iOSNotificationService.awaitNotification(deviceId, +socket, timeout);
                 yield this.$iOSNotificationService.postNotification(deviceId, mainRequestName);
@@ -56,4 +54,3 @@ class IOSSocketRequestExecutor {
 }
 exports.IOSSocketRequestExecutor = IOSSocketRequestExecutor;
 yok_1.injector.register("iOSSocketRequestExecutor", IOSSocketRequestExecutor);
-//# sourceMappingURL=socket-request-executor.js.map

package/lib/helpers/android-bundle-validator-helper.js

@@ -22,7 +22,7 @@ class AndroidBundleValidatorHelper extends version_validator_helper_1.VersionVal
     }
     validateRuntimeVersion(projectData) {
         if (this.$options.aab) {
-            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "android" /* PlatformTypes.android */);
+            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "android");
             const androidRuntimeVersion = runtimePackage
                 ? runtimePackage.version
                 : "";
@@ -50,4 +50,3 @@ AndroidBundleValidatorHelper.MIN_RUNTIME_VERSION = "5.0.0";
 AndroidBundleValidatorHelper.MIN_ANDROID_WITH_AAB_SUPPORT = "4.4.0";
 exports.AndroidBundleValidatorHelper = AndroidBundleValidatorHelper;
 yok_1.injector.register("androidBundleValidatorHelper", AndroidBundleValidatorHelper);
-//# sourceMappingURL=android-bundle-validator-helper.js.map

package/lib/helpers/deploy-command-helper.js

@@ -68,4 +68,3 @@ class DeployCommandHelper {
 }
 exports.DeployCommandHelper = DeployCommandHelper;
 yok_1.injector.register("deployCommandHelper", DeployCommandHelper);
-//# sourceMappingURL=deploy-command-helper.js.map

package/lib/helpers/key-command-helper.js

@@ -17,8 +17,7 @@ class KeyCommandHelper {
         this.overrides = {};
         this.onKeyPressed = (data) => __awaiter(this, void 0, void 0, function* () {
             const key = data.toString();
-            // Allow Ctrl + C always.
-            if (this.keyCommandExecutionBlocked && key !== "\u0003" /* SpecialKeys.CtrlC */)
+            if (this.keyCommandExecutionBlocked && key !== "\u0003")
                 return;
             try {
                 const exists = yok_1.injector.getRegisteredKeyCommandsNames().includes(key);
@@ -41,7 +40,7 @@ class KeyCommandHelper {
                                 return;
                             }
                         }
-                        if (keyCommand.key !== "\u0003" /* SpecialKeys.CtrlC */) {
+                        if (keyCommand.key !== "\u0003") {
                             const line = ` ${color_1.color.dim("→")} ${color_1.color.bold(keyCommand.key)} — ${keyCommand.description}`;
                             const lineLength = (0, color_1.stripColors)(line).length - 1;
                             console.log(color_1.color.dim(` ┌${"─".repeat(lineLength)}┐`));
@@ -123,4 +122,3 @@ class KeyCommandHelper {
 }
 exports.default = KeyCommandHelper;
 yok_1.injector.register("keyCommandHelper", KeyCommandHelper);
-//# sourceMappingURL=key-command-helper.js.map

package/lib/helpers/livesync-command-helper.js

@@ -34,7 +34,6 @@ class LiveSyncCommandHelper {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    // TODO: Remove this and replace it with buildData
     getLiveSyncData(projectDir) {
         const liveSyncInfo = {
             projectDir,
@@ -67,7 +66,6 @@ class LiveSyncCommandHelper {
     }
     createDeviceDescriptors(devices, platform, additionalOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Now let's take data for each device:
             const deviceDescriptors = devices.map((d) => {
                 const outputPath = additionalOptions &&
                     additionalOptions.getOutputDirectory &&
@@ -141,7 +139,7 @@ class LiveSyncCommandHelper {
                 const remainingDevicesToSync = devices.map((d) => d.deviceInfo.identifier);
                 _.remove(remainingDevicesToSync, (d) => d === data.deviceIdentifier);
                 if (remainingDevicesToSync.length === 0 && !data.keepProcessAlive) {
-                    process.exit(134 /* ErrorCodes.ALL_DEVICES_DISCONNECTED */);
+                    process.exit(134);
                 }
             }));
         });
@@ -220,4 +218,3 @@ class LiveSyncCommandHelper {
 }
 exports.LiveSyncCommandHelper = LiveSyncCommandHelper;
 yok_1.injector.register("liveSyncCommandHelper", LiveSyncCommandHelper);
-//# sourceMappingURL=livesync-command-helper.js.map

package/lib/helpers/network-connectivity-validator.js

@@ -45,4 +45,3 @@ NetworkConnectivityValidator.NO_INTERNET_ERROR_CODE = "ENOTFOUND";
 NetworkConnectivityValidator.NO_INTERNET_ERROR_MESSAGE = "No internet connection. Check your internet settings and try again.";
 exports.NetworkConnectivityValidator = NetworkConnectivityValidator;
 yok_1.injector.register("networkConnectivityValidator", NetworkConnectivityValidator);
-//# sourceMappingURL=network-connectivity-validator.js.map

package/lib/helpers/options-track-helper.js

@@ -21,7 +21,7 @@ class OptionsTracker {
         return __awaiter(this, void 0, void 0, function* () {
             const trackObject = this.getTrackObject(options);
             yield this.$analyticsService.trackEventActionInGoogleAnalytics({
-                action: "Options" /* TrackActionNames.Options */,
+                action: "Options",
                 additionalData: JSON.stringify(trackObject),
             });
         });
@@ -69,7 +69,7 @@ class OptionsTracker {
             return true;
         }
         const optionDef = options[key];
-        if (optionDef && optionDef.type === "boolean" /* OptionType.Boolean */) {
+        if (optionDef && optionDef.type === "boolean") {
             if ((optionDef.default !== true && value === false) ||
                 (optionDef.default === true && value === true)) {
                 return true;
@@ -86,4 +86,3 @@ OptionsTracker.PATH_REPLACE_VALUE = "_localpath";
 OptionsTracker.SIZE_EXEEDED_REPLACE_VALUE = "sizeExceeded";
 exports.OptionsTracker = OptionsTracker;
 yok_1.injector.register("optionsTracker", OptionsTracker);
-//# sourceMappingURL=options-track-helper.js.map

package/lib/helpers/package-path-helper.js

@@ -4,4 +4,3 @@ exports.resolvePackageJSONPath = exports.resolvePackagePath = void 0;
 const resolve_package_path_1 = require("@rigor789/resolve-package-path");
 Object.defineProperty(exports, "resolvePackagePath", { enumerable: true, get: function () { return resolve_package_path_1.resolvePackagePath; } });
 Object.defineProperty(exports, "resolvePackageJSONPath", { enumerable: true, get: function () { return resolve_package_path_1.resolvePackageJSONPath; } });
-//# sourceMappingURL=package-path-helper.js.map

package/lib/helpers/platform-command-helper.js

@@ -84,10 +84,6 @@ class PlatformCommandHelper {
                     const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
                     this.$fs.deleteDirectory(platformDir);
                     yield this.$packageInstallationManager.uninstall(platformData.frameworkPackageName, projectData.projectDir);
-                    // this.$projectDataService.removeNSProperty(
-                    // 	projectData.projectDir,
-                    // 	platformData.frameworkPackageName
-                    // );
                     this.$logger.info(`Platform ${platform} successfully removed.`);
                 }
                 catch (err) {
@@ -129,7 +125,7 @@ class PlatformCommandHelper {
         const installedPlatforms = this.getInstalledPlatforms(projectData);
         return _.filter(this.$mobileHelper.platformNames, (p) => {
             return (installedPlatforms.indexOf(p) < 0 &&
-                this.$platformValidationService.isPlatformSupportedForOS(p, projectData)); // Only those not already installed
+                this.$platformValidationService.isPlatformSupportedForOS(p, projectData));
         });
     }
     getPreparedPlatforms(projectData) {
@@ -153,7 +149,7 @@ class PlatformCommandHelper {
             return true;
         }
         return (prepareInfo.nativePlatformStatus !==
-            "1" /* constants.NativePlatformStatus.requiresPlatformAdd */);
+            "1");
     }
     updatePlatform(platform, version, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -203,4 +199,3 @@ class PlatformCommandHelper {
 }
 exports.PlatformCommandHelper = PlatformCommandHelper;
 yok_1.injector.register("platformCommandHelper", PlatformCommandHelper);
-//# sourceMappingURL=platform-command-helper.js.map

package/lib/helpers/version-validator-helper.js

@@ -23,4 +23,3 @@ class VersionValidatorHelper {
     }
 }
 exports.VersionValidatorHelper = VersionValidatorHelper;
-//# sourceMappingURL=version-validator-helper.js.map

package/lib/key-commands/bootstrap.js

@@ -13,10 +13,9 @@ yok_1.injector.requireKeyCommand("R", path);
 yok_1.injector.requireKeyCommand("w", path);
 yok_1.injector.requireKeyCommand("c", path);
 yok_1.injector.requireKeyCommand("n", path);
-yok_1.injector.requireKeyCommand("?" /* SpecialKeys.QuestionMark */, path);
-yok_1.injector.requireKeyCommand("\u0003" /* SpecialKeys.CtrlC */, path);
+yok_1.injector.requireKeyCommand("?", path);
+yok_1.injector.requireKeyCommand("\u0003", path);
 yok_1.injector.requireCommand("open|ios", path);
 yok_1.injector.requireCommand("open|android", path);
 yok_1.injector.requireCommand("open|visionos", path);
 yok_1.injector.requireCommand("open|vision", path);
-//# sourceMappingURL=bootstrap.js.map

package/lib/key-commands/index.js

@@ -46,6 +46,25 @@ class ShiftA {
         this.willBlockKeyCommandExecution = true;
         this.isInteractive = true;
     }
+    getAndroidStudioPath() {
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
+            const possibleStudioPaths = [
+                "/Applications/Android Studio.app",
+                `${process.env.HOME}/Applications/Android Studio.app`,
+            ];
+            return possibleStudioPaths.find((p) => fs.existsSync(p)) || null;
+        }
+        else if (os === "win32") {
+            const studioPath = path.join("C:", "Program Files", "Android", "Android Studio", "bin", "studio64.exe");
+            return fs.existsSync(studioPath) ? studioPath : null;
+        }
+        else if (os === "linux") {
+            const studioPath = "/usr/local/android-studio/bin/studio.sh";
+            return fs.existsSync(studioPath) ? studioPath : null;
+        }
+        return null;
+    }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
             this.$liveSyncCommandHelper.validatePlatform(this.platform);
@@ -58,28 +77,20 @@ class ShiftA {
                     process.stdin.resume();
                 }
             }
-            const os = (0, os_1.platform)();
-            if (os === "darwin") {
-                const possibleStudioPaths = [
-                    "/Applications/Android Studio.app",
-                    `${process.env.HOME}/Applications/Android Studio.app`,
-                ];
-                const studioPath = possibleStudioPaths.find((p) => {
-                    this.$logger.trace(`Checking for Android Studio at ${p}`);
-                    return fs.existsSync(p);
-                });
+            let studioPath = null;
+            studioPath = process.env.NATIVESCRIPT_ANDROID_STUDIO_PATH;
+            if (!studioPath) {
+                studioPath = this.getAndroidStudioPath();
                 if (!studioPath) {
-                    this.$logger.error("Android Studio is not installed, or not in a standard location.");
+                    this.$logger.error("Android Studio is not installed, or is not in a standard location. Use NATIVESCRIPT_ANDROID_STUDIO_PATH.");
                     return;
                 }
+            }
+            const os = (0, os_1.platform)();
+            if (os === "darwin") {
                 this.$childProcess.exec(`open -a "${studioPath}" ${androidDir}`);
             }
             else if (os === "win32") {
-                const studioPath = path.join("C:", "Program Files", "Android", "Android Studio", "bin", "studio64.exe");
-                if (!fs.existsSync(studioPath)) {
-                    this.$logger.error("Android Studio is not installed");
-                    return;
-                }
                 const child = this.$childProcess.spawn(studioPath, [androidDir], {
                     detached: true,
                     stdio: "ignore",
@@ -87,11 +98,7 @@ class ShiftA {
                 child.unref();
             }
             else if (os === "linux") {
-                if (!fs.existsSync(`/usr/local/android-studio/bin/studio.sh`)) {
-                    this.$logger.error("Android Studio is not installed");
-                    return;
-                }
-                this.$childProcess.exec(`/usr/local/android-studio/bin/studio.sh ${androidDir}`);
+                this.$childProcess.exec(`${studioPath} ${androidDir}`);
             }
         });
     }
@@ -327,7 +334,7 @@ class ShiftR {
 exports.ShiftR = ShiftR;
 class CtrlC {
     constructor() {
-        this.key = "\u0003" /* SpecialKeys.CtrlC */;
+        this.key = "\u0003";
         this.platform = "all";
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = false;
@@ -406,7 +413,7 @@ exports.N = N;
 class QuestionMark {
     constructor($keyCommandHelper) {
         this.$keyCommandHelper = $keyCommandHelper;
-        this.key = "?" /* SpecialKeys.QuestionMark */;
+        this.key = "?";
         this.platform = "all";
         this.description = "Show this help";
         this.group = "Development Workflow";
@@ -448,10 +455,9 @@ yok_1.injector.registerKeyCommand("w", W);
 yok_1.injector.registerKeyCommand("c", C);
 yok_1.injector.registerKeyCommand("A", ShiftA);
 yok_1.injector.registerKeyCommand("n", N);
-yok_1.injector.registerKeyCommand("?" /* SpecialKeys.QuestionMark */, QuestionMark);
-yok_1.injector.registerKeyCommand("\u0003" /* SpecialKeys.CtrlC */, CtrlC);
+yok_1.injector.registerKeyCommand("?", QuestionMark);
+yok_1.injector.registerKeyCommand("\u0003", CtrlC);
 yok_1.injector.registerCommand("open|ios", OpenIOSCommand);
 yok_1.injector.registerCommand("open|visionos", OpenVisionOSCommand);
 yok_1.injector.registerCommand("open|vision", OpenVisionOSCommand);
 yok_1.injector.registerCommand("open|android", OpenAndroidCommand);
-//# sourceMappingURL=index.js.map

package/lib/nativescript-cli-lib-bootstrap.js

@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const yok_1 = require("./common/yok");
 require("./bootstrap");
 yok_1.injector.overrideAlreadyRequiredModule = true;
-// Temporary!!! Should not require appbuilder's entry point of mobile-cli-lib,
-// but once we separate logics in mobile-cli-lib, we should be able to require only specific bootstrap.
-// Use this hack for now, as this will allow requiring {N} CLI as library directly and executing some device specific operations.
 yok_1.injector.requirePublicClass("deviceEmitter", "./common/mobile/device-emitter");
 yok_1.injector.requirePublicClass("deviceLogProvider", "./common/mobile/device-log-emitter");
 yok_1.injector.resolve("staticConfig").disableAnalytics = true;
-//# sourceMappingURL=nativescript-cli-lib-bootstrap.js.map

package/lib/nativescript-cli-lib.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const yok_1 = require("./common/yok");
 require("./nativescript-cli-lib-bootstrap");
 module.exports = yok_1.injector.publicApi;
-//# sourceMappingURL=nativescript-cli-lib.js.map

package/lib/nativescript-cli.js

@@ -18,7 +18,7 @@ const errors_1 = require("./common/errors");
 const helpers_1 = require("./common/helpers");
 const yok_1 = require("./common/yok");
 const color_1 = require("./color");
-(0, errors_1.installUncaughtExceptionListener)(process.exit.bind(process, 120 /* ErrorCodes.UNCAUGHT */));
+(0, errors_1.installUncaughtExceptionListener)(process.exit.bind(process, 120));
 const logger = yok_1.injector.resolve("logger");
 exports.originalProcessOn = process.on.bind(process);
 process.on = (event, listener) => {
@@ -32,10 +32,8 @@ process.on = (event, listener) => {
         return (0, exports.originalProcessOn)(event, listener);
     }
 };
-/* tslint:disable:no-floating-promises */
 (() => __awaiter(void 0, void 0, void 0, function* () {
     if (process.argv.includes("--get-yargs-completions")) {
-        // This is a special case when we want to get the yargs completions as fast as possible...
         yok_1.injector.resolve("$options");
         return;
     }
@@ -52,13 +50,6 @@ process.on = (event, listener) => {
         logger.trace("Unable to load extensions. Error is: ", err);
     }
     const commandDispatcher = yok_1.injector.resolve("commandDispatcher");
-    // unused...
-    // const messages: IMessagesService = injector.resolve("$messagesService");
-    // messages.pathsToMessageJsonFiles = [
-    // 	/* Place client-specific json message file paths here */
-    // ];
     yield commandDispatcher.dispatchCommand();
     yok_1.injector.dispose();
 }))();
-/* tslint:enable:no-floating-promises */
-//# sourceMappingURL=nativescript-cli.js.map

package/lib/node/pbxproj-dom-xcode.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const pbxprojDomXcodeModule = require("pbxproj-dom/xcode");
 const yok_1 = require("../common/yok");
 yok_1.injector.register("pbxprojDomXcode", pbxprojDomXcodeModule);
-//# sourceMappingURL=pbxproj-dom-xcode.js.map

package/lib/node/xcode.js

@@ -5,4 +5,3 @@ const xcode = require("nativescript-dev-xcode");
 exports.xcode = xcode;
 const yok_1 = require("../common/yok");
 yok_1.injector.register("xcode", xcode);
-//# sourceMappingURL=xcode.js.map