@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.d557a48

package/dist/m365/pa/commands/pcf/pcf-init.js

@@ -1,11 +1,26 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaPcfInitCommand_instances, _PaPcfInitCommand_initTelemetry, _PaPcfInitCommand_initOptions, _PaPcfInitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const template_instantiator_1 = require("../../template-instantiator");
@@ -15,114 +30,103 @@ const template_instantiator_1 = require("../../template-instantiator");
  * Class: bolt.module.pcf.PcfInitVerb
  */
 class PaPcfInitCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _PaPcfInitCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaPcfInitCommand_instances, "m", _PaPcfInitCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaPcfInitCommand_instances, "m", _PaPcfInitCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaPcfInitCommand_instances, "m", _PaPcfInitCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.PCF_INIT;
     }
     get description() {
         return 'Creates new PowerApps component framework project';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.template = args.options.template;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        try {
-            const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
-            const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const componentDirectory = path.join(workingDirectory, args.options.name);
-            const variables = {
-                "$namespaceplaceholder$": args.options.namespace,
-                "$controlnameplaceholder$": args.options.name,
-                "$pcfProjectName$": workingDirectoryName,
-                "pcfprojecttype": workingDirectoryName,
-                "$pcfProjectGuid$": (0, uuid_1.v4)()
-            };
-            if (this.verbose) {
-                logger.logToStderr(`name: ${args.options.name}`);
-                logger.logToStderr(`namespace: ${args.options.namespace}`);
-                logger.logToStderr(`template: ${args.options.template}`);
-                logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
-                logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
+                const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const componentDirectory = path.join(workingDirectory, args.options.name);
+                const variables = {
+                    "$namespaceplaceholder$": args.options.namespace,
+                    "$controlnameplaceholder$": args.options.name,
+                    "$pcfProjectName$": workingDirectoryName,
+                    "pcfprojecttype": workingDirectoryName,
+                    "$pcfProjectGuid$": (0, uuid_1.v4)()
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`name: ${args.options.name}`);
+                    logger.logToStderr(`namespace: ${args.options.namespace}`);
+                    logger.logToStderr(`template: ${args.options.template}`);
+                    logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
+                    logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+                }
+                template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
+                template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
+                logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
             }
-            template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
-            template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
-            }
-            logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
-            logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '--namespace <namespace>'
-            },
-            {
-                option: '--name <name>'
-            },
-            {
-                option: '--template <template>',
-                autocomplete: ['Field', 'Dataset']
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = function _PaPcfInitCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            template: args.options.template
+        });
+    });
+}, _PaPcfInitCommand_initOptions = function _PaPcfInitCommand_initOptions() {
+    this.options.unshift({
+        option: '--namespace <namespace>'
+    }, {
+        option: '--name <name>'
+    }, {
+        option: '--template <template>',
+        autocomplete: ['Field', 'Dataset']
+    });
+}, _PaPcfInitCommand_initValidators = function _PaPcfInitCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (fs.readdirSync(process.cwd()).some(fn => path.extname(fn).toLowerCase().endsWith('proj'))) {
             return 'PowerApps component framework project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
         }
         const workingDirectoryName = path.basename(process.cwd());
-        if (!utils_1.validation.isValidFileName(workingDirectoryName)) {
+        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
             return `Empty or invalid project name '${workingDirectoryName}'`;
         }
-        if (args.options.name) {
-            if (!/^(?!\d)[a-zA-Z0-9]+$/i.test(args.options.name)) {
-                return `Value of 'name' is invalid. Only characters within the ranges [A - Z], [a - z] or [0 - 9] are allowed. The first character may not be a number.`;
-            }
-            if (utils_1.validation.isJavaScriptReservedWord(args.options.name)) {
-                return `The value '${args.options.name}' passed for 'name' is a reserved word.`;
-            }
+        if (!/^(?!\d)[a-zA-Z0-9]+$/i.test(args.options.name)) {
+            return `Value of 'name' is invalid. Only characters within the ranges [A - Z], [a - z] or [0 - 9] are allowed. The first character may not be a number.`;
         }
-        else {
-            return 'Missing required option name.';
+        if (validation_1.validation.isJavaScriptReservedWord(args.options.name)) {
+            return `The value '${args.options.name}' passed for 'name' is a reserved word.`;
         }
-        if (args.options.namespace) {
-            if (!/^(?!\.|\d)(?!.*\.$)(?!.*?\.\d)(?!.*?\.\.)[a-zA-Z0-9.]+$/i.test(args.options.namespace)) {
-                return `Value of 'namespace' is invalid. Only characters within the ranges [A - Z], [a - z], [0 - 9], or '.' are allowed. The first and last character may not be the '.' character. Consecutive '.' characters are not allowed. Numbers are not allowed as the first character or immediately after a period.`;
-            }
-            if (utils_1.validation.isJavaScriptReservedWord(args.options.namespace)) {
-                return `The value '${args.options.namespace}' passed for 'namespace' is or includes a reserved word.`;
-            }
+        if (!/^(?!\.|\d)(?!.*\.$)(?!.*?\.\d)(?!.*?\.\.)[a-zA-Z0-9.]+$/i.test(args.options.namespace)) {
+            return `Value of 'namespace' is invalid. Only characters within the ranges [A - Z], [a - z], [0 - 9], or '.' are allowed. The first and last character may not be the '.' character. Consecutive '.' characters are not allowed. Numbers are not allowed as the first character or immediately after a period.`;
         }
-        else {
-            return 'Missing required option namespace.';
+        if (validation_1.validation.isJavaScriptReservedWord(args.options.namespace)) {
+            return `The value '${args.options.namespace}' passed for 'namespace' is or includes a reserved word.`;
         }
         if (args.options.namespace && args.options.name && (args.options.namespace + args.options.name).length > 75) {
             return `The total length of values for 'name' and 'namespace' cannot exceed 75. Length of 'name' is ${args.options.name.length}, length of 'namespace' is ${args.options.namespace.length}.`;
         }
-        if (args.options.template) {
-            const testTemplate = args.options.template.toLowerCase();
-            if (!(testTemplate === 'field' || testTemplate === 'dataset')) {
-                return `Template must be either 'Field' or 'Dataset', but '${args.options.template}' was provided.`;
-            }
-        }
-        else {
-            return 'Missing required option template.';
+        const testTemplate = args.options.template.toLowerCase();
+        if (!(testTemplate === 'field' || testTemplate === 'dataset')) {
+            return `Template must be either 'Field' or 'Dataset', but '${args.options.template}' was provided.`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PaPcfInitCommand();
 //# sourceMappingURL=pcf-init.js.map

package/dist/m365/pa/commands/solution/solution-init.js

@@ -1,11 +1,26 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaSolutionInitCommand_instances, _PaSolutionInitCommand_initOptions, _PaSolutionInitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const template_instantiator_1 = require("../../template-instantiator");
@@ -15,99 +30,68 @@ const template_instantiator_1 = require("../../template-instantiator");
  * Class: bolt.module.solution.SolutionInitVerb
  */
 class PaSolutionInitCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _PaSolutionInitCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SOLUTION_INIT;
     }
     get description() {
         return 'Initializes a directory with a new CDS solution project';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
-            const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
-            const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
-            const publisherName = args.options.publisherName;
-            const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
-            const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
-            const variables = {
-                "$publisherName$": publisherName,
-                "$customizationPrefix$": publisherPrefix,
-                "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
-                "$cdsProjectGuid$": (0, uuid_1.v4)(),
-                "solutionprojecttype": workingDirectoryName,
-                "$solutionName$": workingDirectoryName
-            };
-            if (this.verbose) {
-                logger.logToStderr(`publisherName: ${publisherName}`);
-                logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
-                logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
-                logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
-                logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
-                logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
-            }
-            template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
-            }
-            logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
-            const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
-            if (cdsAssetsExist) {
-                logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
-            }
-            else {
-                template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
-                logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
-                logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
-            }
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '--publisherName <publisherName>'
-            },
-            {
-                option: '--publisherPrefix <publisherPrefix>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (fs.readdirSync(process.cwd()).some(fn => path.extname(fn).toLowerCase() === '.cdsproj')) {
-            return 'CDS project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
-        }
-        const workingDirectoryName = path.basename(process.cwd());
-        if (!utils_1.validation.isValidFileName(workingDirectoryName)) {
-            return `Empty or invalid project name '${workingDirectoryName}'`;
-        }
-        if (args.options.publisherPrefix) {
-            if (args.options.publisherPrefix.length < 2 || args.options.publisherPrefix.length > 8 || !/^(?!mscrm)^([a-zA-Z])\w*$/i.test(args.options.publisherPrefix)) {
-                return `Value of 'publisherPrefix' is invalid. The prefix must be 2 to 8 characters long, can only consist of alpha-numerics, must start with a letter, and cannot start with 'mscrm'.`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
+                const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
+                const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
+                const publisherName = args.options.publisherName;
+                const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
+                const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
+                const variables = {
+                    "$publisherName$": publisherName,
+                    "$customizationPrefix$": publisherPrefix,
+                    "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
+                    "$cdsProjectGuid$": (0, uuid_1.v4)(),
+                    "solutionprojecttype": workingDirectoryName,
+                    "$solutionName$": workingDirectoryName
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`publisherName: ${publisherName}`);
+                    logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
+                    logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
+                    logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
+                    logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
+                    logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+                }
+                template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
+                const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
+                if (cdsAssetsExist) {
+                    logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
+                }
+                else {
+                    template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
+                    logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
+                    logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
+                }
             }
-        }
-        else {
-            return 'Missing required option publisherPrefix.';
-        }
-        if (args.options.publisherName) {
-            if (!/^([a-zA-Z_])\w*$/i.test(args.options.publisherName)) {
-                return `Value of 'publisherName' is invalid. Only characters within the ranges [A-Z], [a-z], [0-9], or _ are allowed. The first character may only be in the ranges [A-Z], [a-z], or _.`;
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-        }
-        else {
-            return 'Missing required option publisherName.';
-        }
-        return true;
+        });
     }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {
@@ -126,5 +110,29 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
         return h;
     }
 }
+_PaSolutionInitCommand_instances = new WeakSet(), _PaSolutionInitCommand_initOptions = function _PaSolutionInitCommand_initOptions() {
+    this.options.unshift({
+        option: '--publisherName <publisherName>'
+    }, {
+        option: '--publisherPrefix <publisherPrefix>'
+    });
+}, _PaSolutionInitCommand_initValidators = function _PaSolutionInitCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (fs.readdirSync(process.cwd()).some(fn => path.extname(fn).toLowerCase() === '.cdsproj')) {
+            return 'CDS project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
+        }
+        const workingDirectoryName = path.basename(process.cwd());
+        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
+            return `Empty or invalid project name '${workingDirectoryName}'`;
+        }
+        if (args.options.publisherPrefix.length < 2 || args.options.publisherPrefix.length > 8 || !/^(?!mscrm)^([a-zA-Z])\w*$/i.test(args.options.publisherPrefix)) {
+            return `Value of 'publisherPrefix' is invalid. The prefix must be 2 to 8 characters long, can only consist of alpha-numerics, must start with a letter, and cannot start with 'mscrm'.`;
+        }
+        if (!/^([a-zA-Z_])\w*$/i.test(args.options.publisherName)) {
+            return `Value of 'publisherName' is invalid. Only characters within the ranges [A-Z], [a-z], [0-9], or _ are allowed. The first character may only be in the ranges [A-Z], [a-z], or _.`;
+        }
+        return true;
+    }));
+};
 module.exports = new PaSolutionInitCommand();
 //# sourceMappingURL=solution-init.js.map

package/dist/m365/pa/commands/solution/solution-reference-add.js

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaSolutionReferenceAddCommand_instances, _PaSolutionReferenceAddCommand_initOptions, _PaSolutionReferenceAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -12,37 +27,52 @@ const commands_1 = require("../../commands");
  * Class: bolt.module.solution.verbs.SolutionAddReferenceVerb
  */
 class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _PaSolutionReferenceAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaSolutionReferenceAddCommand_instances, "m", _PaSolutionReferenceAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaSolutionReferenceAddCommand_instances, "m", _PaSolutionReferenceAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SOLUTION_REFERENCE_ADD;
     }
     get description() {
         return 'Adds a project reference to the solution in the current directory';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.path)[0];
-            const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
-            const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
-            const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
-            const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
-            cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
-            fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-p, --path <path>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.projectPath)[0];
+                const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
+                const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
+                const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
+                const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
+                cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
+                fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                throw new Command_1.CommandError(err);
+            }
+        });
+    }
+    getCdsProjectFile(rootPath) {
+        return fs.readdirSync(rootPath)
+            .filter(fn => path.extname(fn).toLowerCase() === '.cdsproj')
+            .map(entry => path.join(rootPath, entry));
+    }
+    getSupportedProjectFiles(rootPath) {
+        return fs.readdirSync(rootPath).filter(fn => {
+            const ext = path.extname(fn).toLowerCase();
+            return ext === '.pcfproj' || ext === '.csproj';
+        }).map(entry => path.join(rootPath, entry));
     }
-    validate(args) {
+}
+_PaSolutionReferenceAddCommand_instances = new WeakSet(), _PaSolutionReferenceAddCommand_initOptions = function _PaSolutionReferenceAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --projectPath <projectPath>'
+    });
+}, _PaSolutionReferenceAddCommand_initValidators = function _PaSolutionReferenceAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const existingCdsProjects = this.getCdsProjectFile(process.cwd());
         if (existingCdsProjects.length === 0) {
             return 'CDS solution project file with extension cdsproj was not found in the current directory.';
@@ -50,18 +80,15 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
         if (existingCdsProjects.length > 1) {
             return 'Multiple CDS solution project files with extension cdsproj were found in the current directory.';
         }
-        if (!args.options.path) {
-            return 'Missing required option path.';
-        }
-        if (!fs.existsSync(args.options.path)) {
-            return `Path ${args.options.path} is not a valid path.`;
+        if (!fs.existsSync(args.options.projectPath)) {
+            return `Path ${args.options.projectPath} is not a valid path.`;
         }
-        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.path);
+        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.projectPath);
         if (existingSupportedProjects.length === 0) {
-            return `No supported project type found in path ${args.options.path}.`;
+            return `No supported project type found in path ${args.options.projectPath}.`;
         }
         if (existingSupportedProjects.length !== 1) {
-            return `More than one supported project type found in path ${args.options.path}.`;
+            return `More than one supported project type found in path ${args.options.projectPath}.`;
         }
         const cdsProjectName = path.parse(path.basename(existingCdsProjects[0])).name;
         const pcfProjectName = path.parse(path.basename(existingSupportedProjects[0])).name;
@@ -69,18 +96,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
             return `Not able to add reference to a project with same name as CDS project with name: ${pcfProjectName}.`;
         }
         return true;
-    }
-    getCdsProjectFile(rootPath) {
-        return fs.readdirSync(rootPath)
-            .filter(fn => path.extname(fn).toLowerCase() === '.cdsproj')
-            .map(entry => path.join(rootPath, entry));
-    }
-    getSupportedProjectFiles(rootPath) {
-        return fs.readdirSync(rootPath).filter(fn => {
-            const ext = path.extname(fn).toLowerCase();
-            return ext === '.pcfproj' || ext === '.csproj';
-        }).map(entry => path.join(rootPath, entry));
-    }
-}
+    }));
+};
 module.exports = new PaSolutionReferenceAddCommand();
 //# sourceMappingURL=solution-reference-add.js.map