nativescript 9.1.0-alpha.14 → 9.1.0-alpha.16

package/lib/common/mobile/mobile-core/devices-service.js

@@ -62,7 +62,6 @@ class DevicesService extends events_1.EventEmitter {
             const device = await this.getDevice(options.deviceId);
             return device;
         }
-        // Now let's take data for each device:
         const availableDevicesAndEmulators = this.getDeviceInstances().filter((d) => d.deviceInfo.status === constants_2.CONNECTED_STATUS &&
             (!this.platform ||
                 d.deviceInfo.platform.toLowerCase() === this.platform.toLowerCase()));
@@ -85,8 +84,6 @@ class DevicesService extends events_1.EventEmitter {
                 const devices = sortedInstances.filter((d) => !d.isEmulator);
                 let selectedInstance;
                 if (options.onlyEmulators || options.onlyDevices) {
-                    // When --emulator or --forDevice is passed, the instances are already filtered
-                    // So we are sure we have exactly the type we need and we can safely return the last one (highest OS version).
                     selectedInstance = _.last(sortedInstances);
                 }
                 else {
@@ -145,7 +142,6 @@ class DevicesService extends events_1.EventEmitter {
                 ...additionalErrors,
             ];
         }
-        // emulator is already running
         if (emulator.status === constants.RUNNING_EMULATOR_STATUS) {
             return null;
         }
@@ -177,11 +173,9 @@ class DevicesService extends events_1.EventEmitter {
         return !!(this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) &&
             device.isEmulator);
     }
-    /* tslint:disable:no-unused-variable */
     setLogLevel(logLevel, deviceIdentifier) {
         this.$deviceLogProvider.setLogLevel(logLevel, deviceIdentifier);
     }
-    /* tslint:enable:no-unused-variable */
     isAppInstalledOnDevices(deviceIdentifiers, appId, projectName, projectDir) {
         this.$logger.trace(`Called isInstalledOnDevices for identifiers ${deviceIdentifiers}. AppIdentifier is ${appId}.`);
         return _.map(deviceIdentifiers, (deviceIdentifier) => this.isApplicationInstalledOnDevice(deviceIdentifier, {
@@ -253,9 +247,6 @@ class DevicesService extends events_1.EventEmitter {
         delete this._availableEmulators[emulator.imageIdentifier];
         this.emit(constants.EmulatorDiscoveryNames.EMULATOR_IMAGE_LOST, emulator);
     }
-    /**
-     * Starts looking for devices. Any found devices are pushed to "_devices" variable.
-     */
     async detectCurrentlyAttachedDevices(deviceInitOpts) {
         const options = this.getDeviceLookingOptions(deviceInitOpts);
         for (const deviceDiscovery of this._allDeviceDiscoveries) {
@@ -324,11 +315,6 @@ class DevicesService extends events_1.EventEmitter {
             clearInterval(this.emulatorDetectionInterval);
         }
     }
-    /**
-     * Returns device that matches an identifier.
-     * The identifier is expected to be the same as the running device declares it (emulator-5554 for android or GUID for ios).
-     * @param identifier running emulator or device identifier
-     */
     getDeviceByIdentifier(identifier) {
         const searchedDevice = _.find(this.getDeviceInstances(), (device) => {
             if (this.$mobileHelper.isApplePlatform(device.deviceInfo.platform) &&
@@ -344,9 +330,6 @@ class DevicesService extends events_1.EventEmitter {
         }
         return searchedDevice;
     }
-    /**
-     * Starts looking for running devices. All found devices are pushed to _devices variable.
-     */
     async startLookingForDevices(deviceInitOpts) {
         this.$logger.trace("startLookingForDevices; platform is %s", this._platform);
         if (this._platform) {
@@ -356,20 +339,10 @@ class DevicesService extends events_1.EventEmitter {
         await this.detectCurrentlyAvailableEmulators();
         await this.startDeviceDetectionInterval(deviceInitOpts);
     }
-    /**
-     * Returns device depending on the passed index.
-     * The index refers to assigned number to listed devices by ns device command.
-     * @param index assigned device number
-     */
     getDeviceByIndex(index) {
         this.validateIndex(index - 1);
         return this.getDeviceInstances()[index - 1];
     }
-    /**
-     * Returns running device for specified --device <DeviceId>.
-     * Method expects running devices.
-     * @param deviceOption parameter passed by the user to --device flag. Can be name, identifier or imageIdentifier.
-     */
     async getDevice(deviceOption) {
         let device = null;
         if (!device) {
@@ -389,11 +362,6 @@ class DevicesService extends events_1.EventEmitter {
         }
         return device;
     }
-    /**
-     * Method runs action for a --device (value), specified by the user.
-     * @param action action to be executed if canExecute returns true
-     * @param canExecute predicate to decide whether the command can be ran
-     */
     async executeOnDevice(action, canExecute) {
         if (!canExecute || canExecute(this._device)) {
             return {
@@ -402,11 +370,6 @@ class DevicesService extends events_1.EventEmitter {
             };
         }
     }
-    /**
-     * Executes passed action for each found device.
-     * @param action action to be executed if canExecute returns true
-     * @param canExecute predicate to decide whether the command can be ran
-     */
     async executeOnAllConnectedDevices(action, canExecute) {
         const devices = this.filterDevicesByPlatform();
         const sortedDevices = _.sortBy(devices, (device) => device.deviceInfo.platform);
@@ -458,12 +421,6 @@ class DevicesService extends events_1.EventEmitter {
             });
         });
     }
-    /**
-     * Runs the passed action if the predicate "canExecute" returns true
-     * @param action action to be executed if canExecute returns true.
-     * @param canExecute predicate to decide whether the command can be ran
-     * @param options all possible options that can be passed to the command.
-     */
     async execute(action, canExecute, options) {
         assert.ok(this._isInitialized, "Devices services not initialized!");
         if (this.hasDevices) {
@@ -472,7 +429,6 @@ class DevicesService extends events_1.EventEmitter {
                 this.$mobileHelper.isiOSPlatform(this._platform) &&
                 this.$options.emulator &&
                 !this.isOnlyiOSSimultorRunning()) {
-                // Executes the command only on iOS simulator
                 const originalCanExecute = canExecute;
                 canExecute = (dev) => this.isiOSSimulator(dev) &&
                     (!originalCanExecute || !!originalCanExecute(dev));
@@ -496,11 +452,6 @@ class DevicesService extends events_1.EventEmitter {
             }
         }
     }
-    /**
-     * Starts emulator or simulator if necessary depending on --device or --emulator flags.
-     * If no options are passed runs default emulator/simulator if no devices are connected.
-     * @param deviceInitOpts mainly contains information about --emulator and --deviceId flags.
-     */
     async startEmulatorIfNecessary(deviceInitOpts) {
         if (deviceInitOpts && deviceInitOpts.deviceId && deviceInitOpts.emulator) {
             this.$errors.fail(`--device and --emulator are incompatible options.
@@ -509,7 +460,6 @@ class DevicesService extends events_1.EventEmitter {
         if (deviceInitOpts &&
             deviceInitOpts.platform &&
             !deviceInitOpts.skipEmulatorStart) {
-            // are there any running devices
             this._platform = deviceInitOpts.platform;
             try {
                 await this.startLookingForDevices(deviceInitOpts);
@@ -535,11 +485,9 @@ class DevicesService extends events_1.EventEmitter {
     }
     async _startEmulatorIfNecessary(data) {
         const deviceInstances = this.getDeviceInstances();
-        //if no --device is passed and no devices are found, the default emulator is started
         if (!data.deviceId && _.isEmpty(deviceInstances)) {
             return this.startEmulatorCore(data);
         }
-        //check if --device(value) is running, if it's not or it's not the same as is specified, start with name from --device(value)
         if (data.deviceId) {
             if (!helpers.isNumberWithoutExponent(data.deviceId)) {
                 const activeDeviceInstance = _.find(deviceInstances, (device) => device.deviceInfo.identifier === data.deviceId);
@@ -548,7 +496,6 @@ class DevicesService extends events_1.EventEmitter {
                 }
             }
         }
-        // make sure if the target platform is visionOS we don't try to run it on an already running iOS simulator...
         if (data.platform === this.$devicePlatformsConstants.visionOS &&
             deviceInstances.length) {
             const runningDeviceInstance = deviceInstances.find((device) => device.deviceInfo.platform ===
@@ -557,7 +504,6 @@ class DevicesService extends events_1.EventEmitter {
                 return this.startEmulatorCore(data);
             }
         }
-        // if only emulator flag is passed and no other emulators are running, start default emulator
         if (data.emulator && deviceInstances.length) {
             const runningDeviceInstance = _.some(deviceInstances, (value) => value.isEmulator);
             if (!runningDeviceInstance) {
@@ -565,12 +511,6 @@ class DevicesService extends events_1.EventEmitter {
             }
         }
     }
-    /**
-     * Takes care of gathering information about all running devices.
-     * Sets "_isInitialized" to true after infomation is present.
-     * Method expects running devices.
-     * @param data mainly contains information about --emulator and --deviceId flags.
-     */
     async initialize(data) {
         if (!this._deviceInitializePromise) {
             this._deviceInitializePromise = this.initializeCore(data);
@@ -579,7 +519,6 @@ class DevicesService extends events_1.EventEmitter {
             await this._deviceInitializePromise;
         }
         catch (err) {
-            // In case the initalization fails, we want to allow calling `initlialize` again with other arguments for example, so remove the cached promise value.
             this.$logger.trace(`Error while initializing devicesService: ${err}`);
             this._deviceInitializePromise = null;
             throw err;
@@ -603,7 +542,6 @@ class DevicesService extends events_1.EventEmitter {
         deviceInitOpts = deviceInitOpts || {};
         this._data = deviceInitOpts;
         if (!deviceInitOpts.skipEmulatorStart) {
-            // TODO: Remove from here as it calls startLookingForDevices, so we double the calls to specific device detection services
             await this.startEmulatorIfNecessary(deviceInitOpts);
         }
         const platform = deviceInitOpts.platform;
@@ -634,7 +572,6 @@ class DevicesService extends events_1.EventEmitter {
             await this.startLookingForDevices(deviceLookingOptions);
         }
         else {
-            // platform and deviceId are not specified
             if (deviceInitOpts.skipInferPlatform) {
                 if (deviceInitOpts.skipDeviceDetectionInterval) {
                     await this.detectCurrentlyAttachedDevices(deviceLookingOptions);
@@ -742,11 +679,6 @@ class DevicesService extends events_1.EventEmitter {
         }
         return null;
     }
-    /**
-     * Starts emulator for platform and makes sure started devices/emulators/simulators are in _devices array before finishing.
-     * @param platform (optional) platform to start emulator/simulator for
-     * @param emulatorIdOrName (optional) emulator/simulator image identifier or name
-     */
     async startEmulatorCore(deviceInitOpts = {}) {
         const { deviceId } = deviceInitOpts;
         const platform = deviceInitOpts.platform || this._platform;
@@ -870,4 +802,3 @@ __decorate([
     (0, decorators_1.exported)("devicesService")
 ], DevicesService.prototype, "getDebuggableViews", null);
 yok_1.injector.register("devicesService", DevicesService);
-//# sourceMappingURL=devices-service.js.map

package/lib/common/mobile/mobile-core/ios-device-discovery.js

@@ -22,7 +22,6 @@ class IOSDeviceDiscovery extends device_discovery_1.DeviceDiscovery {
             return;
         }
         if (this.$mobileHelper.isvisionOSPlatform(options.platform)) {
-            // look for ios devices - same logic.
             options.platform = this.$devicePlatformsConstants.iOS;
         }
         await this.$iosDeviceOperations.startLookingForDevices((deviceInfo) => {
@@ -51,4 +50,3 @@ class IOSDeviceDiscovery extends device_discovery_1.DeviceDiscovery {
 }
 exports.IOSDeviceDiscovery = IOSDeviceDiscovery;
 yok_1.injector.register("iOSDeviceDiscovery", IOSDeviceDiscovery);
-//# sourceMappingURL=ios-device-discovery.js.map

package/lib/common/mobile/mobile-core/ios-simulator-discovery.js

@@ -28,14 +28,12 @@ class IOSSimulatorDiscovery extends device_discovery_1.DeviceDiscovery {
     async checkForDevices() {
         if (this.$hostInfo.isDarwin) {
             const currentSimulators = await this.$iOSSimResolver.iOSSim.getRunningSimulators();
-            // Remove old simulators
             _(this.cachedSimulators)
                 .reject((s) => _.some(currentSimulators, (simulator) => simulator &&
                 s &&
                 simulator.id === s.id &&
                 simulator.state === s.state))
                 .each((s) => this.deleteAndRemoveDevice(s));
-            // Add new simulators
             _(currentSimulators)
                 .reject((s) => _.some(this.cachedSimulators, (simulator) => simulator &&
                 s &&
@@ -94,4 +92,3 @@ class IOSSimulatorDiscovery extends device_discovery_1.DeviceDiscovery {
 }
 exports.IOSSimulatorDiscovery = IOSSimulatorDiscovery;
 yok_1.injector.register("iOSSimulatorDiscovery", IOSSimulatorDiscovery);
-//# sourceMappingURL=ios-simulator-discovery.js.map

package/lib/common/mobile/mobile-helper.js

@@ -89,4 +89,3 @@ class MobileHelper {
 exports.MobileHelper = MobileHelper;
 MobileHelper.DEVICE_PATH_SEPARATOR = "/";
 yok_1.injector.register("mobileHelper", MobileHelper);
-//# sourceMappingURL=mobile-helper.js.map

package/lib/common/mobile/wp8/wp8-emulator-services.js

@@ -53,4 +53,3 @@ class Wp8EmulatorServices {
 Wp8EmulatorServices.WP8_LAUNCHER = "XapDeployCmd.exe";
 Wp8EmulatorServices.WP8_LAUNCHER_PATH = "Microsoft SDKs\\Windows Phone\\v8.0\\Tools\\XAP Deployment";
 yok_1.injector.register("wp8EmulatorServices", Wp8EmulatorServices);
-//# sourceMappingURL=wp8-emulator-services.js.map

package/lib/common/opener.js

@@ -14,4 +14,3 @@ class Opener {
 }
 exports.Opener = Opener;
 yok_1.injector.register("opener", Opener);
-//# sourceMappingURL=opener.js.map

package/lib/common/os-info.js

@@ -19,4 +19,3 @@ class OsInfo {
 }
 exports.OsInfo = OsInfo;
 yok_1.injector.register("osInfo", OsInfo);
-//# sourceMappingURL=os-info.js.map

package/lib/common/plist-parser.js

@@ -22,4 +22,3 @@ class PlistParser {
 }
 exports.PlistParser = PlistParser;
 yok_1.injector.register("plistParser", PlistParser);
-//# sourceMappingURL=plist-parser.js.map

package/lib/common/project-helper.js

@@ -68,4 +68,3 @@ class ProjectHelper {
 }
 exports.ProjectHelper = ProjectHelper;
 yok_1.injector.register("projectHelper", ProjectHelper);
-//# sourceMappingURL=project-helper.js.map

package/lib/common/prompter.js

@@ -26,7 +26,6 @@ class Prompter {
                 else {
                     const result = {};
                     _.each(questions, (s) => {
-                        // Curly brackets needed because s.default() may return false and break the loop
                         result[s.name] = s.default();
                     });
                     return result;
@@ -123,9 +122,7 @@ class Prompter {
     }
     muteStdout() {
         if (helpers.isInteractive()) {
-            process.stdin.setRawMode(true); // After setting rawMode to true, Ctrl+C doesn't work for non node.js events loop i.e device log command
-            // We need to create mute-stream and to pass it as output to ctrlcReader
-            // This will prevent the prompter to show the user's text twice on the console
+            process.stdin.setRawMode(true);
             this.muteStreamInstance = new MuteStream();
             this.muteStreamInstance.pipe(process.stdout);
             this.muteStreamInstance.mute();
@@ -134,7 +131,6 @@ class Prompter {
                 output: this.muteStreamInstance,
             });
             this.ctrlcReader.on("SIGINT", () => {
-                // enable terminal cursor
                 process.stdout.write("\x1B[?25h");
                 process.exit();
             });
@@ -144,7 +140,6 @@ class Prompter {
         if (helpers.isInteractive()) {
             process.stdin.setRawMode(false);
             if (this.muteStreamInstance) {
-                // We need to clean the event listeners from the process.stdout because the MuteStream.pipe function calls the pipe function of the Node js Stream which adds event listeners and this can cause memory leak if we display more than ~10 prompts.
                 this.cleanEventListeners(process.stdout);
                 this.muteStreamInstance.unmute();
                 this.muteStreamInstance = null;
@@ -153,8 +148,6 @@ class Prompter {
         }
     }
     cleanEventListeners(stream) {
-        // The events names and listeners names can be found here https://github.com/nodejs/node/blob/master/lib/stream.js
-        // Which event cause memory leak can be tested with stream.listeners("event-name") and if the listeners count keeps increasing with each prompt we need to remove the listener.
         const memoryLeakEvents = [
             {
                 eventName: "close",
@@ -181,4 +174,3 @@ class Prompter {
 }
 exports.Prompter = Prompter;
 yok_1.injector.register("prompter", Prompter);
-//# sourceMappingURL=prompter.js.map

package/lib/common/queue.js

@@ -24,4 +24,3 @@ class Queue {
     }
 }
 exports.Queue = Queue;
-//# sourceMappingURL=queue.js.map

package/lib/common/resource-loader.js

@@ -23,4 +23,3 @@ class ResourceLoader {
 }
 exports.ResourceLoader = ResourceLoader;
 yok_1.injector.register("resources", ResourceLoader);
-//# sourceMappingURL=resource-loader.js.map

package/lib/common/services/analytics/google-analytics-custom-dimensions.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GoogleAnalyticsCustomDimensions = void 0;
+var GoogleAnalyticsCustomDimensions;
+(function (GoogleAnalyticsCustomDimensions) {
+    GoogleAnalyticsCustomDimensions["cliVersion"] = "cd1";
+    GoogleAnalyticsCustomDimensions["projectType"] = "cd2";
+    GoogleAnalyticsCustomDimensions["clientID"] = "cd3";
+    GoogleAnalyticsCustomDimensions["sessionID"] = "cd4";
+    GoogleAnalyticsCustomDimensions["client"] = "cd5";
+    GoogleAnalyticsCustomDimensions["nodeVersion"] = "cd6";
+    GoogleAnalyticsCustomDimensions["isShared"] = "cd9";
+})(GoogleAnalyticsCustomDimensions || (exports.GoogleAnalyticsCustomDimensions = GoogleAnalyticsCustomDimensions = {}));

package/lib/common/services/auto-completion-service.js

@@ -27,15 +27,12 @@ class AutoCompletionService {
     get shellProfiles() {
         return [
             this.getHomePath(".bashrc"),
-            this.getHomePath(".zshrc"), // zsh - http://www.acm.uiuc.edu/workshops/zsh/startup_files.html
+            this.getHomePath(".zshrc"),
         ];
     }
     get cliRunCommandsFile() {
         let cliRunCommandsFile = this.getHomePath(util.format(".%src", this.$staticConfig.CLIENT_NAME.toLowerCase()));
         if (this.$hostInfo.isWindows) {
-            // on Windows bash, file is incorrectly written as C:\Users\<username>, which leads to errors when trying to execute the script:
-            // $ source ~/.bashrc
-            // sh.exe": C:Usersusername.appbuilderrc: No such file or directory
             cliRunCommandsFile = cliRunCommandsFile.replace(/\\/g, "/");
         }
         return cliRunCommandsFile;
@@ -50,9 +47,7 @@ class AutoCompletionService {
         return new RegExp(util.format("%s[\\s\\S]*%s", AutoCompletionService.GENERATED_TABTAB_COMPLETION_START, AutoCompletionService.GENERATED_TABTAB_COMPLETION_END));
     }
     removeObsoleteAutoCompletion() {
-        // In previous releases we were writing directly in .bash_profile, .bashrc, .zshrc and .profile - remove this old code
         const shellProfilesToBeCleared = this.shellProfiles;
-        // Add .profile only here as we do not want new autocompletion in this file, but we have to remove our old code from it.
         shellProfilesToBeCleared.push(this.getHomePath(".profile"));
         shellProfilesToBeCleared.forEach((file) => {
             try {
@@ -105,7 +100,6 @@ class AutoCompletionService {
                 this.isNewAutoCompletionEnabledInFile(filePath) ||
                     this.isObsoleteAutoCompletionEnabledInFile(filePath);
             if (!result) {
-                // break each
                 return false;
             }
         });
@@ -131,7 +125,6 @@ class AutoCompletionService {
         _.each(this.shellProfiles, (shellProfile) => {
             result = this.isObsoleteAutoCompletionEnabledInFile(shellProfile);
             if (!result) {
-                // break each
                 return false;
             }
         });
@@ -170,8 +163,6 @@ class AutoCompletionService {
         }
         catch (err) {
             this.$logger.info("Unable to update %s. Command-line completion might not work.", fileName);
-            // When npm is installed with sudo, in some cases the installation cannot write to shell profiles
-            // Advise the user how to enable autocompletion after the installation is completed.
             if ((err.code === "EPERM" || err.code === "EACCES") &&
                 !this.$hostInfo.isWindows &&
                 process.env.SUDO_USER) {
@@ -192,7 +183,6 @@ class AutoCompletionService {
             }
         }
         catch (err) {
-            // If file does not exist, autocompletion was not working for it, so ignore this error.
             if (err.code !== "ENOENT") {
                 this.$logger.info("Failed to update %s. Auto-completion may still work or work incorrectly. ", fileName);
                 this.$logger.info(err);
@@ -224,7 +214,6 @@ class AutoCompletionService {
                         this.$fs.writeFile(filePath, newText);
                     }
                 }
-                // The generated seems to be inconsistent in it's start/end markers so adding our own.
                 this.$fs.appendFile(filePath, `\n${AutoCompletionService.GENERATED_TABTAB_COMPLETION_START}\n`);
                 await this.$childProcess.exec(`"${process.argv[0]}" "${pathToExecutableFile}" completion_generate_script >> "${filePath}"`);
                 this.$fs.appendFile(filePath, this.completionAliasDefinition);
@@ -261,4 +250,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], AutoCompletionService.prototype, "completionShellScriptContent", null);
 yok_1.injector.register("autoCompletionService", AutoCompletionService);
-//# sourceMappingURL=auto-completion-service.js.map

package/lib/common/services/cancellation.js

@@ -4,6 +4,7 @@ const choki = require("chokidar");
 const path = require("path");
 const os = require("os");
 const _ = require("lodash");
+const enums_1 = require("../enums");
 const yok_1 = require("../yok");
 class CancellationService {
     constructor($fs, $logger, $hostInfo) {
@@ -28,7 +29,7 @@ class CancellationService {
             .watch(triggerFile, { ignoreInitial: true })
             .on("unlink", (filePath) => {
             this.$logger.info(`Exiting process as the file ${filePath} has been deleted. Probably reinstalling CLI while there's a working instance.`);
-            process.exit(132 /* ErrorCodes.DELETED_KILL_FILE */);
+            process.exit(enums_1.ErrorCodes.DELETED_KILL_FILE);
         });
         if (watcher) {
             this.watches[name] = watcher;
@@ -54,4 +55,3 @@ class CancellationService {
     }
 }
 yok_1.injector.register("cancellation", CancellationService);
-//# sourceMappingURL=cancellation.js.map

package/lib/common/services/commands-service.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandsService = void 0;
 const jaroWinklerDistance = require("../vendor/jaro-winkler_distance");
 const helpers = require("../helpers");
+const constants_1 = require("../constants");
 const os_1 = require("os");
 const _ = require("lodash");
+const enums_1 = require("../enums");
 const yok_1 = require("../yok");
 class CommandArgumentsValidationHelper {
     constructor(isValid, _remainingArguments) {
@@ -38,11 +40,11 @@ class CommandsService {
             if (!this.$staticConfig.disableAnalytics &&
                 !command.disableAnalytics &&
                 !this.$options.disableAnalytics) {
-                const analyticsService = this.$injector.resolve("analyticsService"); // This should be resolved here due to cyclic dependency
+                const analyticsService = this.$injector.resolve("analyticsService");
                 await analyticsService.checkConsent();
                 const beautifiedCommandName = this.beautifyCommandName(commandName).replace(/\|/g, " ");
                 const googleAnalyticsPageData = {
-                    googleAnalyticsDataType: "pageview" /* GoogleAnalyticsDataType.Page */,
+                    googleAnalyticsDataType: enums_1.GoogleAnalyticsDataType.Page,
                     path: beautifiedCommandName,
                     title: beautifiedCommandName,
                 };
@@ -52,11 +54,10 @@ class CommandsService {
             const shouldExecuteHooks = !this.$staticConfig.disableCommandHooks &&
                 (command.enableHooks === undefined || command.enableHooks === true);
             if (shouldExecuteHooks) {
-                // Handle correctly hierarchical commands
                 const hierarchicalCommandName = this.$injector.buildHierarchicalCommand(commandName, commandArguments);
                 if (hierarchicalCommandName) {
-                    commandName = helpers.stringReplaceAll(hierarchicalCommandName.commandName, "|*" /* CommandsDelimiters.DefaultHierarchicalCommand */, "-" /* CommandsDelimiters.HooksCommand */);
-                    commandName = helpers.stringReplaceAll(commandName, "|" /* CommandsDelimiters.HierarchicalCommand */, "-" /* CommandsDelimiters.HooksCommand */);
+                    commandName = helpers.stringReplaceAll(hierarchicalCommandName.commandName, constants_1.CommandsDelimiters.DefaultHierarchicalCommand, constants_1.CommandsDelimiters.HooksCommand);
+                    commandName = helpers.stringReplaceAll(commandName, constants_1.CommandsDelimiters.HierarchicalCommand, constants_1.CommandsDelimiters.HooksCommand);
                 }
                 await this.$hooksService.executeBeforeHooks(commandName);
             }
@@ -101,7 +102,6 @@ class CommandsService {
             await this.executeCommandAction(commandName, commandArguments, this.executeCommandUnchecked);
         }
         else {
-            // If canExecuteCommand returns false, the command cannot be executed or there's no such command at all.
             const command = this.$injector.resolveCommand(commandName);
             if (command) {
                 let commandWithArgs = commandName;
@@ -117,15 +117,12 @@ class CommandsService {
         const command = this.$injector.resolveCommand(commandName);
         const beautifiedName = helpers.stringReplaceAll(commandName, "|", " ");
         if (command) {
-            // Verify command is enabled
             if (command.isDisabled) {
                 this.$errors.fail("This command is not applicable to your environment.");
             }
-            // If command wants to handle canExecute logic on its own.
             if (command.canExecute) {
                 return await command.canExecute(commandArguments);
             }
-            // First part of hierarchical commands should be validated in specific way.
             if (await this.$injector.isValidHierarchicalCommand(commandName, commandArguments)) {
                 return true;
             }
@@ -137,8 +134,8 @@ class CommandsService {
         }
         const commandInfo = {
             inputStrings: [commandName, ...commandArguments],
-            commandDelimiter: "|" /* CommandsDelimiters.HierarchicalCommand */,
-            defaultCommandDelimiter: "|*" /* CommandsDelimiters.DefaultHierarchicalCommand */,
+            commandDelimiter: constants_1.CommandsDelimiters.HierarchicalCommand,
+            defaultCommandDelimiter: constants_1.CommandsDelimiters.DefaultHierarchicalCommand,
         };
         const extensionData = await this.$extensibilityService.getExtensionNameWhereCommandIsRegistered(commandInfo);
         if (extensionData) {
@@ -154,13 +151,11 @@ class CommandsService {
     async validateMandatoryParams(commandArguments, mandatoryParams) {
         const commandArgsHelper = new CommandArgumentsValidationHelper(true, commandArguments);
         if (mandatoryParams.length > 0) {
-            // If command has more mandatory params than the passed ones, we shouldn't execute it
             if (mandatoryParams.length > commandArguments.length) {
                 const customErrorMessages = _.map(mandatoryParams, (mp) => mp.errorMessage);
                 customErrorMessages.splice(0, 0, "You need to provide all the required parameters.");
                 this.$errors.failWithHelp(customErrorMessages.join(os_1.EOL));
             }
-            // If we reach here, the commandArguments are at least as much as mandatoryParams. Now we should verify that we have each of them.
             for (let mandatoryParamIndex = 0; mandatoryParamIndex < mandatoryParams.length; ++mandatoryParamIndex) {
                 const mandatoryParam = mandatoryParams[mandatoryParamIndex];
                 let argument = null;
@@ -187,14 +182,12 @@ class CommandsService {
         if (!commandArgsHelper.isValid) {
             return false;
         }
-        // Command doesn't have any allowedParameters
         if (!command.allowedParameters || command.allowedParameters.length === 0) {
             if (commandArguments.length > 0) {
                 this.$errors.failWithHelp("This command doesn't accept parameters.");
             }
         }
         else {
-            // Exclude mandatory params, we've already checked them
             const unverifiedAllowedParams = command.allowedParameters.filter((param) => !param.mandatory);
             for (let remainingArgsIndex = 0; remainingArgsIndex < commandArgsHelper.remainingArguments.length; ++remainingArgsIndex) {
                 const argument = commandArgsHelper.remainingArguments[remainingArgsIndex];
@@ -208,7 +201,6 @@ class CommandsService {
                 }
                 if (parameter) {
                     const index = unverifiedAllowedParams.indexOf(parameter);
-                    // Remove the matched parameter from unverifiedAllowedParams collection, so it will not be used to verify another argument.
                     unverifiedAllowedParams.splice(index, 1);
                 }
                 else {
@@ -253,4 +245,3 @@ class CommandsService {
 }
 exports.CommandsService = CommandsService;
 yok_1.injector.register("commandsService", CommandsService);
-//# sourceMappingURL=commands-service.js.map

package/lib/common/services/help-service.js

@@ -4,6 +4,7 @@ exports.HelpService = void 0;
 const path = require("path");
 const os_1 = require("os");
 const marked_1 = require("marked");
+const constants_1 = require("../constants");
 const yok_1 = require("../yok");
 const _ = require("lodash");
 class HelpService {
@@ -42,7 +43,6 @@ class HelpService {
         this.$logger.trace("Opening help for command '%s'. FileName is '%s'.", commandName, htmlPage);
         this.$fs.ensureDirectoryExists(this.pathToHtmlPages);
         if (!this.tryOpeningSelectedPage(htmlPage)) {
-            // HTML pages may have been skipped on post-install, lets generate them.
             this.$logger.trace("Required HTML file '%s' is missing. Let's try generating HTML files and see if we'll find it.", htmlPage);
             await this.generateHtmlPages();
             if (!this.tryOpeningSelectedPage(htmlPage)) {
@@ -99,11 +99,6 @@ class HelpService {
         const help = await this.getCommandLineHelpForCommand(commandData);
         this.$logger.printMarkdown(help);
     }
-    /**
-     * Gets the help content for a specific command that should be shown on the terminal.
-     * @param {string} commandName Name of the command for which to read the help.
-     * @returns {Promise<string>} Help content of the command parsed with all terminal rules applied (stripped content that should be shown only for html help).
-     */
     async getCommandLineHelpForCommand(commandData) {
         const helpText = await this.readMdFileForCommand(commandData);
         const commandLineHelp = (await this.$microTemplateService.parseContent(helpText, { isHtml: false }))
@@ -115,7 +110,6 @@ class HelpService {
             .replace(HelpService.NEW_LINE_REGEX, os_1.EOL);
         return commandLineHelp;
     }
-    // This method should return Promise in order to generate all html pages simultaneously.
     async createHtmlPage(htmlPageGenerationData) {
         const { basicHtmlPage, pathToMdFile, pathToMdPages, pathToHtmlPages, extensionName, } = htmlPageGenerationData;
         const mdFileName = path.basename(pathToMdFile);
@@ -162,8 +156,8 @@ class HelpService {
         const commandName = commandData.commandName;
         const commandInfo = {
             inputStrings: [commandName, ...commandData.commandArguments],
-            commandDelimiter: "|" /* CommandsDelimiters.HierarchicalCommand */,
-            defaultCommandDelimiter: "|*" /* CommandsDelimiters.DefaultHierarchicalCommand */,
+            commandDelimiter: constants_1.CommandsDelimiters.HierarchicalCommand,
+            defaultCommandDelimiter: constants_1.CommandsDelimiters.DefaultHierarchicalCommand,
         };
         const extensionData = await this.$extensibilityService.getExtensionNameWhereCommandIsRegistered(commandInfo);
         if (extensionData) {
@@ -230,6 +224,5 @@ HelpService.RELATIVE_PATH_TO_INDEX_REGEX = /@RELATIVE_PATH_TO_INDEX@/g;
 HelpService.EXTENSION_NAME_REGEX = /@EXTENSION_NAME@/g;
 HelpService.MARKDOWN_LINK_REGEX = /\[([\w \-\`\<\>\*\:\\]+?)\]\([\s\S]+?\)/g;
 HelpService.SPAN_REGEX = /([\s\S]*?)(?:\r?\n)?<span.*?>([\s\S]*?)<\/span>(?:\r?\n)*/g;
-HelpService.NEW_LINE_REGEX = /<\/?\s*?br\s*?\/?>/g; // <br>, <br > <br/> <br />
+HelpService.NEW_LINE_REGEX = /<\/?\s*?br\s*?\/?>/g;
 yok_1.injector.register("helpService", HelpService);
-//# sourceMappingURL=help-service.js.map