@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.3261c97

package/dist/m365/pa/commands/connector/connector-list.js

@@ -1,10 +1,30 @@
 "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 _PaConnectorListCommand_instances, _PaConnectorListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
 class PaConnectorListCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaConnectorListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaConnectorListCommand_instances, "m", _PaConnectorListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_2.default.CONNECTOR_LIST;
     }
@@ -17,34 +37,33 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((connectors) => {
-            if (connectors.length > 0) {
-                connectors.forEach(c => {
-                    c.displayName = c.properties.displayName;
-                });
-                logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No custom connectors found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
+            try {
+                const connectors = yield utils_1.odata.getAllItems(url);
+                if (connectors.length > 0) {
+                    connectors.forEach(c => {
+                        c.displayName = c.properties.displayName;
+                    });
+                    logger.log(connectors);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No custom connectors found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_PaConnectorListCommand_instances = new WeakSet(), _PaConnectorListCommand_initOptions = function _PaConnectorListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    });
+};
 module.exports = new PaConnectorListCommand();
 //# sourceMappingURL=connector-list.js.map

package/dist/m365/pa/commands/environment/environment-get.js

@@ -1,9 +1,29 @@
 "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 _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
     }
@@ -13,38 +33,37 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'id', 'location', 'displayName', 'provisioningState', 'environmentSku', 'azureRegionHint', 'isDefault'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.displayName = res.properties.displayName;
-            res.provisioningState = res.properties.provisioningState;
-            res.environmentSku = res.properties.environmentSku;
-            res.azureRegionHint = res.properties.azureRegionHint;
-            res.isDefault = res.properties.isDefault;
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                res.displayName = res.properties.displayName;
+                res.provisioningState = res.properties.provisioningState;
+                res.environmentSku = res.properties.environmentSku;
+                res.azureRegionHint = res.properties.azureRegionHint;
+                res.isDefault = res.properties.isDefault;
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    });
+};
 module.exports = new PaEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/pa/commands/environment/environment-list.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
@@ -13,28 +22,31 @@ class PaEnvironmentListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length > 0) {
-                res.value.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
-                logger.log(res.value);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length > 0) {
+                    res.value.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PaEnvironmentListCommand();

package/dist/m365/pa/commands/pcf/pcf-init.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 _PaPcfInitCommand_instances, _PaPcfInitCommand_initTelemetry, _PaPcfInitCommand_initOptions, _PaPcfInitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const fs = require("fs");
@@ -15,71 +30,75 @@ 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.';
         }
@@ -87,42 +106,27 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
         if (!utils_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 (utils_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 (utils_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