nativescript 9.0.0-alpha.13 → 9.0.0-alpha.14

package/lib/common/yok.js

@@ -9,6 +9,13 @@ const helpers_1 = require("./helpers");
 const constants_1 = require("./constants");
 let indent = "";
 function trace(formatStr, ...args) {
+    // uncomment following lines when debugging dependency injection
+    // const items: any[] = [];
+    // for (let _i = 1; _i < arguments.length; _i++) {
+    // 	items[_i - 1] = arguments[_i];
+    // }
+    // const util = require("util");
+    // console.log(util.format.apply(util, [indent + formatStr].concat(args)));
 }
 function pushIndent() {
     indent += "  ";
@@ -26,6 +33,7 @@ function forEachName(names, action) {
 }
 function register(...rest) {
     return function (target) {
+        // TODO: Check if 'rest' has more arguments that have to be registered
         exports.injector.register(rest[0], target);
     };
 }
@@ -44,7 +52,7 @@ class Yok {
     }
     requireCommand(names, file) {
         forEachName(names, (commandName) => {
-            const commands = commandName.split("|");
+            const commands = commandName.split("|" /* CommandsDelimiters.HierarchicalCommand */);
             if (commands.length > 1) {
                 if (_.startsWith(commands[1], "*") &&
                     this.modules[this.createCommandName(commands[0])]) {
@@ -54,7 +62,7 @@ class Yok {
                 if (!this.hierarchicalCommands[parentCommandName]) {
                     this.hierarchicalCommands[parentCommandName] = [];
                 }
-                this.hierarchicalCommands[parentCommandName].push(_.tail(commands).join("|"));
+                this.hierarchicalCommands[parentCommandName].push(_.tail(commands).join("|" /* CommandsDelimiters.HierarchicalCommand */));
             }
             if (commands.length > 1 &&
                 !this.modules[this.createCommandName(commands[0])]) {
@@ -125,7 +133,7 @@ class Yok {
     }
     registerCommand(names, resolver) {
         forEachName(names, (name) => {
-            const commands = name.split("|");
+            const commands = name.split("|" /* CommandsDelimiters.HierarchicalCommand */);
             this.register(this.createCommandName(name), resolver);
             if (commands.length > 1) {
                 this.createHierarchicalCommand(commands[0]);
@@ -137,7 +145,7 @@ class Yok {
     }
     getDefaultCommand(name, commandArguments) {
         const subCommands = this.hierarchicalCommands[name];
-        const defaultCommand = _.find(subCommands, (command) => _.some(command.split("|"), (c) => _.startsWith(c, "*")));
+        const defaultCommand = _.find(subCommands, (command) => _.some(command.split("|" /* CommandsDelimiters.HierarchicalCommand */), (c) => _.startsWith(c, "*" /* CommandsDelimiters.DefaultCommandSymbol */)));
         return defaultCommand;
     }
     buildHierarchicalCommand(parentCommandName, commandLineArguments) {
@@ -153,7 +161,7 @@ class Yok {
             remainingArguments = _.tail(remainingArguments);
             if ((matchingSubCommandName = _.find(subCommands, (sc) => sc === currentSubCommandName ||
                 sc ===
-                    `${"*"}${currentSubCommandName}`))) {
+                    `${"*" /* CommandsDelimiters.DefaultCommandSymbol */}${currentSubCommandName}`))) {
                 finalSubCommandName = matchingSubCommandName;
                 finalRemainingArguments = remainingArguments;
             }
@@ -162,8 +170,8 @@ class Yok {
             finalSubCommandName =
                 this.getDefaultCommand(parentCommandName, commandLineArguments) || "";
             finalRemainingArguments = _.difference(commandLineArguments, finalSubCommandName
-                .split("|")
-                .map((command) => _.startsWith(command, "*")
+                .split("|" /* CommandsDelimiters.HierarchicalCommand */)
+                .map((command) => _.startsWith(command, "*" /* CommandsDelimiters.DefaultCommandSymbol */)
                 ? command.substr(1)
                 : command));
         }
@@ -194,7 +202,9 @@ class Yok {
                             commandName = defaultCommand
                                 ? this.getHierarchicalCommandName(name, defaultCommand)
                                 : "help";
-                            if (_.includes(this.hierarchicalCommands[name], "*" + args[0])) {
+                            // If we'll execute the default command, but it's full name had been written by the user
+                            // for example "ns run ios", we have to remove the "ios" option from the arguments that we'll pass to the command.
+                            if (_.includes(this.hierarchicalCommands[name], "*" /* CommandsDelimiters.DefaultCommandSymbol */ + args[0])) {
                                 commandArguments = _.tail(args);
                             }
                             else {
@@ -203,11 +213,13 @@ class Yok {
                         }
                     }
                     else {
+                        //Execute only default command without arguments
                         if (defaultCommand) {
                             commandName = this.getHierarchicalCommandName(name, defaultCommand);
                         }
                         else {
                             commandName = "help";
+                            // Show command-line help
                             const options = this.resolve("options");
                             options.help = true;
                         }
@@ -219,7 +231,7 @@ class Yok {
         exports.injector.registerCommand(name, factory);
     }
     getHierarchicalCommandName(parentCommandName, subCommandName) {
-        return [parentCommandName, subCommandName].join("|");
+        return [parentCommandName, subCommandName].join("|" /* CommandsDelimiters.HierarchicalCommand */);
     }
     async isValidHierarchicalCommand(commandName, commandArguments) {
         if (_.includes(Object.keys(this.hierarchicalCommands), commandName)) {
@@ -227,6 +239,8 @@ class Yok {
             if (subCommands) {
                 const fullCommandName = this.buildHierarchicalCommand(commandName, commandArguments);
                 if (!fullCommandName) {
+                    // In case buildHierarchicalCommand doesn't find a valid command
+                    // there isn't a valid command or default with those arguments
                     const errors = exports.injector.resolve("errors");
                     errors.failWithHelp(constants_1.ERROR_NO_VALID_SUBCOMMAND_FORMAT, commandName);
                 }
@@ -236,8 +250,8 @@ class Yok {
         return false;
     }
     isDefaultCommand(commandName) {
-        return (commandName.indexOf("*") > 0 &&
-            commandName.indexOf("|") > 0);
+        return (commandName.indexOf("*" /* CommandsDelimiters.DefaultCommandSymbol */) > 0 &&
+            commandName.indexOf("|" /* CommandsDelimiters.HierarchicalCommand */) > 0);
     }
     register(name, resolver, shared) {
         shared = shared === undefined ? true : shared;
@@ -284,6 +298,12 @@ class Yok {
             return this.resolveByName(param, ctorArguments);
         }
     }
+    /* Regex to match dynamic calls in the following format:
+        #{moduleName.functionName} or
+        #{moduleName.functionName(param1)} or
+        #{moduleName.functionName(param1, param2)} - multiple parameters separated with comma are supported
+        Check dynamicCall method for sample usage of this regular expression and see how to determine the passed parameters
+    */
     get dynamicCallRegex() {
         return /#{([^.]+)\.([^}]+?)(\((.+)\))*}/;
     }
@@ -411,3 +431,4 @@ function setGlobalInjector(inj) {
     global.$injector = exports.injector = inj;
     return inj;
 }
+//# sourceMappingURL=yok.js.map

package/lib/config.js

@@ -7,8 +7,10 @@ const os = require("os");
 const _ = require("lodash");
 const yok_1 = require("./common/yok");
 class Configuration {
+    /*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
     constructor($fs) {
         this.$fs = $fs;
+        // User specific config
         this.DEBUG = false;
         this.ANDROID_DEBUG_UI = null;
         this.USE_POD_SANDBOX = false;
@@ -47,6 +49,7 @@ class StaticConfig {
         this._userAgent = null;
     }
     get disableCommandHooks() {
+        // Never set this to false because it will duplicate execution of hooks realized through method decoration
         return true;
     }
     get HTML_CLI_HELPERS_DIR() {
@@ -88,6 +91,7 @@ class StaticConfig {
     async getAdbFilePathCore() {
         const $childProcess = 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!!!
             const proc = await $childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false });
             if (proc.stderr) {
                 return await this.spawnPrivateAdb();
@@ -100,23 +104,40 @@ class StaticConfig {
         }
         return "adb";
     }
+    /*
+        Problem:
+        1. Adb forks itself as a server which keeps running until adb kill-server is invoked or crashes
+        2. On Windows running processes lock their image files due to memory mapping. Locked files prevent their parent directories from deletion and cannot be overwritten.
+        3. Update and uninstall scenarios are broken
+        Solution:
+        - Copy adb and associated files into a temporary directory. Let this copy of adb run persistently
+        - On Posix OSes, immediately delete the file to not take file space
+        - Tie common lib version to updates of adb, so that when we integrate a newer adb we can use it
+        - Adb is named differently on OSes and may have additional files. The code is hairy to accommodate these differences
+     */
     async spawnPrivateAdb() {
         const $fs = this.$injector.resolve("$fs"), $childProcess = this.$injector.resolve("$childProcess"), $hostInfo = this.$injector.resolve("$hostInfo");
+        // prepare the directory to host our copy of adb
         const defaultAdbDirPath = path.join(__dirname, "common", "resources", "platform-tools", "android", process.platform);
         const pathToPackageJson = path.join(__dirname, "..", "package.json");
         const nsCliVersion = require(pathToPackageJson).version;
         const tmpDir = path.join(os.tmpdir(), `nativescript-cli-${nsCliVersion}`);
         $fs.createDirectory(tmpDir);
+        // copy the adb and associated files
         const targetAdb = path.join(tmpDir, "adb");
+        // In case directory is missing or it's empty, copy the new adb
         if (!$fs.exists(tmpDir) || !$fs.readDirectory(tmpDir).length) {
-            shelljs.cp(path.join(defaultAdbDirPath, "*"), tmpDir);
+            shelljs.cp(path.join(defaultAdbDirPath, "*"), tmpDir); // deliberately ignore copy errors
+            // adb loses its executable bit when packed inside electron asar file. Manually fix the issue
             if (!$hostInfo.isWindows) {
                 shelljs.chmod("+x", targetAdb);
             }
         }
+        // let adb start its global server
         await $childProcess.spawnFromEvent(targetAdb, ["start-server"], "exit");
         return targetAdb;
     }
 }
 exports.StaticConfig = StaticConfig;
 yok_1.injector.register("staticConfig", StaticConfig);
+//# sourceMappingURL=config.js.map

package/lib/constants-provider.js

@@ -10,3 +10,4 @@ class Constants {
 }
 exports.Constants = Constants;
 yok_1.injector.register("constants", Constants);
+//# sourceMappingURL=constants-provider.js.map

package/lib/constants.js

@@ -149,6 +149,7 @@ exports.RESERVED_TEMPLATE_NAMES = {
     solidjs: "@nativescript/template-blank-solid",
     solidts: "@nativescript/template-blank-solid-ts",
     svelte: "@nativescript/template-blank-svelte",
+    // vision templates
     vision: "@nativescript/template-hello-world-ts-vision",
     "vision-vue": "@nativescript/template-blank-vue-vision",
     "vision-ng": "@nativescript/template-hello-world-ng-vision",
@@ -224,6 +225,9 @@ DebugCommandErrors.UNABLE_TO_USE_FOR_DEVICE_AND_EMULATOR = "The options --for-de
 DebugCommandErrors.NO_DEVICES_EMULATORS_FOUND_FOR_OPTIONS = "Unable to find device or emulator for specified options.";
 DebugCommandErrors.UNSUPPORTED_DEVICE_OS_FOR_DEBUGGING = "Unsupported device OS for debugging";
 exports.AnalyticsEventLabelDelimiter = "__";
+/**
+ * Used in ProjectDataService to concatenate the names of the properties inside nativescript key of package.json.
+ */
 exports.NATIVESCRIPT_PROPS_INTERNAL_DELIMITER = "**|__**";
 exports.CLI_RESOURCES_DIR_NAME = "resources";
 class AssetConstants {
@@ -240,6 +244,7 @@ AssetConstants.assets = "assets";
 AssetConstants.sizeDelimiter = "x";
 AssetConstants.defaultScale = 1;
 AssetConstants.defaultOverlayImageScale = 0.8;
+// https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
 class MacOSVersions {
 }
 exports.MacOSVersions = MacOSVersions;
@@ -249,6 +254,14 @@ MacOSVersions.Mojave = "10.14";
 MacOSVersions.Catalina = "10.15";
 exports.MacOSDeprecationStringFormat = "NativeScript does not support macOS %s and some functionality may not work. Please, upgrade to the latest macOS version.";
 exports.XcodeDeprecationStringFormat = "The current Xcode version %s will not be supported in the next release of NativeScript. Consider updating your Xcode to latest official version.";
+// export class TemplateVersions {
+// 	public static v1 = "v1";
+// 	public static v2 = "v2";
+// }
+// export class ProjectTemplateErrors {
+// 	public static InvalidTemplateVersionStringFormat =
+// 		"The template '%s' has a NativeScript version '%s' that is not supported. Unable to create project from it.";
+// }
 class Hooks {
 }
 exports.Hooks = Hooks;
@@ -289,6 +302,7 @@ AndroidAppBundleMessages.ANDROID_APP_BUNDLE_DOCS_MESSAGE = "What is Android App
 AndroidAppBundleMessages.ANDROID_APP_BUNDLE_PUBLISH_DOCS_MESSAGE = "How to use Android App Bundle for publishing: https://docs.nativescript.org/tooling/publishing/publishing-android-apps#android-app-bundle";
 exports.RunOnDeviceEvents = {
     runOnDeviceStopped: "runOnDeviceStopped",
+    // In case we name it error, EventEmitter expects instance of Error to be raised and will also raise uncaught exception in case there's no handler
     runOnDeviceError: "runOnDeviceError",
     runOnDeviceExecuted: "runOnDeviceExecuted",
     runOnDeviceStarted: "runOnDeviceStarted",
@@ -325,14 +339,52 @@ var DeviceConnectionType;
 })(DeviceConnectionType || (exports.DeviceConnectionType = DeviceConnectionType = {}));
 var LoggerLevel;
 (function (LoggerLevel) {
+    /**
+     * Show all log messages.
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["ALL"] = "ALL";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["TRACE"] = "TRACE";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["DEBUG"] = "DEBUG";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["INFO"] = "INFO";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["WARN"] = "WARN";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["ERROR"] = "ERROR";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["FATAL"] = "FATAL";
+    /**
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["MARK"] = "MARK";
+    /**
+     * Disable all logging.
+     * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+     * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+     */
     LoggerLevel["OFF"] = "OFF";
 })(LoggerLevel || (exports.LoggerLevel = LoggerLevel = {}));
 var LoggerConfigData;
@@ -350,3 +402,4 @@ var PackageManagers;
     PackageManagers["yarn2"] = "yarn2";
     PackageManagers["bun"] = "bun";
 })(PackageManagers || (exports.PackageManagers = PackageManagers = {}));
+//# sourceMappingURL=constants.js.map

package/lib/controllers/build-controller.js

@@ -35,7 +35,7 @@ class BuildController extends events_1.EventEmitter {
         const platform = buildData.platform.toLowerCase();
         const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
         const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
-        const action = "Build";
+        const action = "Build" /* constants.TrackActionNames.Build */;
         const isForDevice = this.$mobileHelper.isAndroidPlatform(platform)
             ? null
             : buildData && buildData.buildForDevice;
@@ -45,8 +45,8 @@ class BuildController extends events_1.EventEmitter {
             platform,
             projectDir: projectData.projectDir,
             additionalData: `${buildData.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug}_${buildData.clean
-                ? "Clean"
-                : "Incremental"}`,
+                ? "Clean" /* constants.BuildStates.Clean */
+                : "Incremental" /* constants.BuildStates.Incremental */}`,
         });
         if (buildData.clean) {
             await platformData.platformProjectService.cleanProject(platformData.projectRoot);
@@ -114,3 +114,4 @@ class BuildController extends events_1.EventEmitter {
 }
 exports.BuildController = BuildController;
 yok_1.injector.register("buildController", BuildController);
+//# sourceMappingURL=build-controller.js.map

package/lib/controllers/debug-controller.js

@@ -40,13 +40,13 @@ class DebugController extends events_1.EventEmitter {
             this.$errors.fail(`The device with identifier ${debugData.deviceIdentifier} is unreachable. Make sure it is Trusted and try again.`);
         }
         await this.$analyticsService.trackEventActionInGoogleAnalytics({
-            action: "Debug",
+            action: "Debug" /* TrackActionNames.Debug */,
             device,
             additionalData: this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) &&
                 options &&
                 options.inspector
-                ? "Inspector"
-                : "Chrome",
+                ? "Inspector" /* DebugTools.Inspector */
+                : "Chrome" /* DebugTools.Chrome */,
             projectDir: debugData.projectDir,
         });
         if (!(await device.applicationManager.isApplicationInstalled(debugData.applicationIdentifier))) {
@@ -87,6 +87,7 @@ class DebugController extends events_1.EventEmitter {
         }
     }
     async attachDebugger(attachDebuggerData) {
+        // Default values
         if (attachDebuggerData.debugOptions) {
             attachDebuggerData.debugOptions.chrome =
                 attachDebuggerData.debugOptions.chrome === undefined
@@ -105,6 +106,9 @@ class DebugController extends events_1.EventEmitter {
         }
         const projectData = this.$projectDataService.getProjectData(attachDebuggerData.projectDir);
         const debugData = this.$debugDataService.getDebugData(attachDebuggerData.deviceIdentifier, projectData, attachDebuggerData.debugOptions);
+        // const platformData = this.$platformsDataService.getPlatformData(settings.platform, projectData);
+        // Of the properties below only `buildForDevice` and `release` are currently used.
+        // Leaving the others with placeholder values so that they may not be forgotten in future implementations.
         const debugInfo = await this.startDebug(debugData);
         const result = this.printDebugInformation(debugInfo, attachDebuggerData.debugOptions.forceDebuggerAttachedEvent);
         return result;
@@ -212,3 +216,4 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], DebugController.prototype, "enableDebuggingCoreWithoutWaitingCurrentAction", null);
 yok_1.injector.register("debugController", DebugController);
+//# sourceMappingURL=debug-controller.js.map

package/lib/controllers/deploy-controller.js

@@ -28,3 +28,4 @@ class DeployController {
 }
 exports.DeployController = DeployController;
 yok_1.injector.register("deployController", DeployController);
+//# sourceMappingURL=deploy-controller.js.map