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

package/dist/m365/pa/commands/app/app-get.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 _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -7,18 +22,20 @@ const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
 class PaAppGetCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaAppGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_GET;
     }
     get description() {
         return 'Gets information about the specified Microsoft Power App';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['name', 'displayName', 'description', 'appVersion', 'owner'];
     }
@@ -89,30 +106,29 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         app.owner = app.properties.owner.email || '';
         return app;
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-d, --displayName [displayName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.name && !args.options.displayName) {
-            return 'Specify either name or displayName';
-        }
-        if (args.options.name && args.options.displayName) {
-            return 'Specify either name or displayName but not both';
-        }
+}
+_PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = function _PaAppGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
+        });
+    });
+}, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name [name]'
+    }, {
+        option: '-d, --displayName [displayName]'
+    });
+}, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
+    this.optionSets.push(['name', 'displayName']);
+};
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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

@@ -1,9 +1,31 @@
 "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 _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppListCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaAppListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_LIST;
     }
@@ -13,12 +35,6 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.asAdmin = args.options.asAdmin === true;
-        telemetryProps.environment = typeof args.options.environment !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
         utils_1.odata
@@ -38,19 +54,22 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment [environment]'
-            },
-            {
-                option: '--asAdmin'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PaAppListCommand_instances = new WeakSet(), _PaAppListCommand_initTelemetry = function _PaAppListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: args.options.asAdmin === true,
+            environment: typeof args.options.environment !== 'undefined'
+        });
+    });
+}, _PaAppListCommand_initOptions = function _PaAppListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment [environment]'
+    }, {
+        option: '--asAdmin'
+    });
+}, _PaAppListCommand_initValidators = function _PaAppListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.asAdmin && !args.options.environment) {
             return 'When specifying the asAdmin option the environment option is required as well';
         }
@@ -58,7 +77,7 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
             return 'When specifying the environment option the asAdmin option is required as well';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PaAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/pa/commands/app/app-remove.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 _PaAppRemoveCommand_instances, _PaAppRemoveCommand_initTelemetry, _PaAppRemoveCommand_initOptions, _PaAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,17 +21,19 @@ const utils_1 = require("../../../../utils");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppRemoveCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaAppRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppRemoveCommand_instances, "m", _PaAppRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppRemoveCommand_instances, "m", _PaAppRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppRemoveCommand_instances, "m", _PaAppRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_REMOVE;
     }
     get description() {
         return 'Removes the specified Microsoft Power App';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = typeof args.options.confirm !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
             logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
@@ -60,24 +77,26 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: typeof args.options.confirm !== 'undefined'
+        });
+    });
+}, _PaAppRemoveCommand_initOptions = function _PaAppRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '--confirm'
+    });
+}, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PaAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

package/dist/m365/pa/commands/connector/connector-export.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 _PaConnectorExportCommand_instances, _PaConnectorExportCommand_initTelemetry, _PaConnectorExportCommand_initOptions, _PaConnectorExportCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,6 +22,13 @@ const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
 class PaConnectorExportCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaConnectorExportCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initValidators).call(this);
+    }
     get name() {
         return commands_2.default.CONNECTOR_EXPORT;
     }
@@ -19,7 +41,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
     commandAction(logger, args, cb) {
         const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
             headers: {
                 accept: 'application/json'
             },
@@ -44,7 +66,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
                 apiDefinition: "apiDefinition.swagger.json",
                 apiProperties: "apiProperties.json",
                 connectorId: args.options.connector,
-                environment: args.options.environment,
+                environment: args.options.environmentName,
                 icon: "icon.png",
                 powerAppsApiVersion: "2016-11-01",
                 powerAppsUrl: "https://api.powerapps.com"
@@ -138,22 +160,23 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '-c, --connector <connector>'
-            },
-            {
-                option: '--outputFolder [outputFolder]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_initTelemetry = function _PaConnectorExportCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            outputFolder: typeof args.options.outputFolder !== 'undefined'
+        });
+    });
+}, _PaConnectorExportCommand_initOptions = function _PaConnectorExportCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-c, --connector <connector>'
+    }, {
+        option: '--outputFolder [outputFolder]'
+    });
+}, _PaConnectorExportCommand_initValidators = function _PaConnectorExportCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.outputFolder &&
             !fs.existsSync(path.resolve(args.options.outputFolder))) {
             return `Specified output folder ${args.options.outputFolder} doesn't exist`;
@@ -163,7 +186,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
             return `Connector output folder ${outputFolder} already exists`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PaConnectorExportCommand();
 //# sourceMappingURL=connector-export.js.map

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

@@ -1,10 +1,21 @@
 "use strict";
+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;
     }
@@ -18,7 +29,7 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
         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`;
+        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`;
         utils_1.odata
             .getAllItems(url)
             .then((connectors) => {
@@ -36,15 +47,11 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
-            }
-        ];
-        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,20 @@
 "use strict";
+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;
     }
@@ -36,15 +47,11 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            }
-        ];
-        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/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,17 +30,19 @@ 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');
@@ -63,23 +80,24 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
             cb(new Command_1.CommandError(err));
         }
     }
-    options() {
-        const options = [
-            {
-                option: '--namespace <namespace>'
-            },
-            {
-                option: '--name <name>'
-            },
-            {
-                option: '--template <template>',
-                autocomplete: ['Field', 'Dataset']
-            }
-        ];
-        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 +105,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