@pnp/cli-microsoft365 6.0.0-beta.b689fd4 → 6.0.0-beta.bffb677

package/dist/m365/spfx/commands/spfx-doctor.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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
@@ -52,7 +67,8 @@ var SharePointVersion;
 })(SharePointVersion || (SharePointVersion = {}));
 class SpfxDoctorCommand extends AnonymousCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpfxDoctorCommand_instances.add(this);
         this.versions = {
             '1.0.0': {
                 gulp: {
@@ -400,6 +416,10 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             }
         };
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -650,22 +670,20 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         const failure = primarySupported ? '✖' : '×';
         return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --env [env]',
-                autocomplete: ['sp2016', 'sp2019', 'spo']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    types() {
-        return {
-            string: ['e', 'env']
-        };
-    }
-    validate(args) {
+}
+_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            env: args.options.env
+        });
+    });
+}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --env [env]',
+        autocomplete: ['sp2016', 'sp2019', 'spo']
+    });
+}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.env) {
             const sp = this.spVersionStringToEnum(args.options.env);
             if (!sp) {
@@ -676,7 +694,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             return `The output option only accepts the type 'text'`;
         }
         return true;
-    }
-}
+    }));
+}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
+    this.types.string.push('e', 'env');
+};
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -6,7 +6,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
         return new Promise((resolve, reject) => {
-            if (args.options.scope === 'sitecollection') {
+            if (args.options.appCatalogScope === 'sitecollection') {
                 return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
             }
             if (args.options.appCatalogUrl) {

package/dist/m365/spo/commands/app/app-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 _SpoAppAddCommand_instances, _SpoAppAddCommand_initTelemetry, _SpoAppAddCommand_initOptions, _SpoAppAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,21 +22,21 @@ const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_ADD;
     }
     get description() {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.overwrite = (!(!args.options.overwrite)).toString();
-        telemetryProps.scope = args.options.scope || 'tenant';
-        telemetryProps.appCatalogUrl = (!(!args.options.appCatalogUrl)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const overwrite = args.options.overwrite || false;
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -55,34 +70,36 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             cb();
         }, (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-p, --filePath <filePath>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            },
-            {
-                option: '-u, --appCatalogUrl [appCatalogUrl]'
-            },
-            {
-                option: '--overwrite [overwrite]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            overwrite: (!(!args.options.overwrite)).toString(),
+            appCatalogScope: args.options.appCatalogScope || 'tenant',
+            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+        });
+    });
+}, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --filePath <filePath>'
+    }, {
+        option: '-s, --appCatalogScope [appCatalogScope]',
+        autocomplete: ['tenant', 'sitecollection']
+    }, {
+        option: '-u, --appCatalogUrl [appCatalogUrl]'
+    }, {
+        option: '--overwrite [overwrite]'
+    });
+}, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);
@@ -96,7 +113,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppAddCommand();
 //# sourceMappingURL=app-add.js.map

package/dist/m365/spo/commands/app/app-deploy.js

@@ -1,28 +1,41 @@
 "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 _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppDeployCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_DEPLOY;
     }
     get description() {
         return 'Deploys the specified app in the specified app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.name = (!(!args.options.name)).toString();
-        telemetryProps.appCatalogUrl = (!(!args.options.appCatalogUrl)).toString();
-        telemetryProps.skipFeatureDeployment = args.options.skipFeatureDeployment || false;
-        telemetryProps.scope = (!(!args.options.scope)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let appId = '';
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -69,37 +82,40 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         })
             .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-u, --appCatalogUrl [appCatalogUrl]'
-            },
-            {
-                option: '--skipFeatureDeployment'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemetry = function _SpoAppDeployCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            name: (!(!args.options.name)).toString(),
+            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
+            skipFeatureDeployment: args.options.skipFeatureDeployment || false,
+            appCatalogScope: (!(!args.options.appCatalogScope)).toString()
+        });
+    });
+}, _SpoAppDeployCommand_initOptions = function _SpoAppDeployCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-u, --appCatalogUrl [appCatalogUrl]'
+    }, {
+        option: '--skipFeatureDeployment'
+    }, {
+        option: '-s, --appCatalogScope [appCatalogScope]',
+        autocomplete: ['tenant', 'sitecollection']
+    });
+}, _SpoAppDeployCommand_initValidators = function _SpoAppDeployCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!args.options.id && !args.options.name) {
@@ -115,7 +131,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map

package/dist/m365/spo/commands/app/app-get.js

@@ -1,26 +1,40 @@
 "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 _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_GET;
     }
     get description() {
         return 'Gets information about the specific app from the specified app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.name = (!(!args.options.name)).toString();
-        telemetryProps.appCatalogUrl = (!(!args.options.appCatalogUrl)).toString();
-        telemetryProps.scope = args.options.scope || 'tenant';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -62,34 +76,37 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-u, --appCatalogUrl [appCatalogUrl]'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = function _SpoAppGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            name: (!(!args.options.name)).toString(),
+            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
+        });
+    });
+}, _SpoAppGetCommand_initOptions = function _SpoAppGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-u, --appCatalogUrl [appCatalogUrl]'
+    }, {
+        option: '-s, --appCatalogScope [appCatalogScope]',
+        autocomplete: ['tenant', 'sitecollection']
+    });
+}, _SpoAppGetCommand_initValidators = function _SpoAppGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!args.options.id && !args.options.name) {
@@ -105,7 +122,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/spo/commands/app/app-install.js

@@ -1,23 +1,40 @@
 "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 _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppInstallCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoAppInstallCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_INSTALL;
     }
     get description() {
         return 'Installs an app from the specified app catalog in the site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'tenant';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -31,34 +48,35 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-s, --siteUrl <siteUrl>'
-            },
-            {
-                option: '--scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+}
+_SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
+        });
+    });
+}, _SpoAppInstallCommand_initOptions = function _SpoAppInstallCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-s, --siteUrl <siteUrl>'
+    }, {
+        option: '--appCatalogScope [appCatalogScope]',
+        autocomplete: ['tenant', 'sitecollection']
+    });
+}, _SpoAppInstallCommand_initValidators = function _SpoAppInstallCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+};
 module.exports = new SpoAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -1,10 +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 _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppInStanceListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppInStanceListCommand_instances, "m", _SpoAppInStanceListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppInStanceListCommand_instances, "m", _SpoAppInStanceListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_INSTANCE_LIST;
     }
@@ -39,22 +60,19 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand_initOptions = function _SpoAppInStanceListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoAppInStanceListCommand_initValidators = function _SpoAppInStanceListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppInStanceListCommand();
 //# sourceMappingURL=app-instance-list.js.map