@pnp/cli-microsoft365 6.0.0-beta.4d2402f → 6.0.0-beta.550f33a

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-set.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 _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -8,17 +23,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoServicePrincipalSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_SET;
     }
     get description() {
         return 'Enable or disable the service principal';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.enabled = args.options.enabled === 'true';
-        return telemetryProps;
-    }
     alias() {
         return [commands_1.default.SP_SET];
     }
@@ -79,27 +96,29 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
             });
         }
     }
-    validate(args) {
+}
+_SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSetCommand_initTelemetry = function _SpoServicePrincipalSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            enabled: args.options.enabled === 'true'
+        });
+    });
+}, _SpoServicePrincipalSetCommand_initOptions = function _SpoServicePrincipalSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --enabled <enabled>',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--confirm'
+    });
+}, _SpoServicePrincipalSetCommand_initValidators = function _SpoServicePrincipalSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const enabled = args.options.enabled.toLowerCase();
         if (enabled !== 'true' &&
             enabled !== 'false') {
             return `${args.options.enabled} is not a valid boolean value. Allowed values are true|false`;
         }
         return true;
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --enabled <enabled>',
-                autocomplete: ['true', 'false']
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-}
+    }));
+};
 module.exports = new SpoServicePrincipalSetCommand();
 //# sourceMappingURL=serviceprincipal-set.js.map

package/dist/m365/spo/commands/site/site-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 _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const Command_1 = require("../../../../Command");
@@ -8,6 +23,13 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initValidators).call(this);
+    }
     get supportedLcids() {
         // Languages supported by SharePoint
         // https://support.microsoft.com/en-us/office/languages-supported-by-sharepoint-dfbf3652-2902-4809-be21-9080b6512fff
@@ -20,33 +42,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates new SharePoint Online site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        const isClassicSite = args.options.type === 'ClassicSite';
-        const isCommunicationSite = args.options.type === 'CommunicationSite';
-        telemetryProps.siteType = args.options.type || 'TeamSite';
-        telemetryProps.description = (!(!args.options.description)).toString();
-        telemetryProps.classification = (!(!args.options.classification)).toString();
-        telemetryProps.isPublic = args.options.isPublic || false;
-        telemetryProps.lcid = args.options.lcid;
-        telemetryProps.owners = typeof args.options.owners !== 'undefined';
-        if (isCommunicationSite) {
-            telemetryProps.allowFileSharingForGuestUsers = args.options.allowFileSharingForGuestUsers || false;
-            telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
-            telemetryProps.siteDesign = args.options.siteDesign;
-            telemetryProps.siteDesignId = (!(!args.options.siteDesignId)).toString();
-        }
-        else if (isClassicSite) {
-            telemetryProps.webTemplate = typeof args.options.webTemplate !== 'undefined';
-            telemetryProps.resourceQuota = typeof args.options.resourceQuota !== 'undefined';
-            telemetryProps.resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel !== 'undefined';
-            telemetryProps.storageQuota = typeof args.options.storageQuota !== 'undefined';
-            telemetryProps.storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel !== 'undefined';
-            telemetryProps.removeDeletedSite = args.options.removeDeletedSite;
-            telemetryProps.wait = args.options.wait;
-        }
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const isClassicSite = args.options.type === 'ClassicSite';
         if (isClassicSite) {
@@ -390,78 +385,83 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--type [type]',
-                autocomplete: ['TeamSite', 'CommunicationSite', 'ClassicSite']
-            },
-            {
-                option: '-t, --title <title>'
-            },
-            {
-                option: '-a, --alias [alias]'
-            },
-            {
-                option: '-u, --url [url]'
-            },
-            {
-                option: '-z, --timeZone [timeZone]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-l, --lcid [lcid]'
-            },
-            {
-                option: '--owners [owners]'
-            },
-            {
-                option: '--isPublic'
-            },
-            {
-                option: '-c, --classification [classification]'
-            },
-            {
-                option: '--siteDesign [siteDesign]',
-                autocomplete: ['Topic', 'Showcase', 'Blank']
-            },
-            {
-                option: '--siteDesignId [siteDesignId]'
-            },
-            {
-                option: '--allowFileSharingForGuestUsers'
-            },
-            {
-                option: '--shareByEmailEnabled'
-            },
-            {
-                option: '-w, --webTemplate [webTemplate]'
-            },
-            {
-                option: '--resourceQuota [resourceQuota]'
-            },
-            {
-                option: '--resourceQuotaWarningLevel [resourceQuotaWarningLevel]'
-            },
-            {
-                option: '--storageQuota [storageQuota]'
-            },
-            {
-                option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
-            },
-            {
-                option: '--removeDeletedSite'
-            },
-            {
-                option: '--wait'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry = function _SpoSiteAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        const telemetryProps = {};
+        const isClassicSite = args.options.type === 'ClassicSite';
+        const isCommunicationSite = args.options.type === 'CommunicationSite';
+        telemetryProps.siteType = args.options.type || 'TeamSite';
+        telemetryProps.description = (!(!args.options.description)).toString();
+        telemetryProps.classification = (!(!args.options.classification)).toString();
+        telemetryProps.isPublic = args.options.isPublic || false;
+        telemetryProps.lcid = args.options.lcid;
+        telemetryProps.owners = typeof args.options.owners !== 'undefined';
+        if (isCommunicationSite) {
+            telemetryProps.allowFileSharingForGuestUsers = args.options.allowFileSharingForGuestUsers || false;
+            telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
+            telemetryProps.siteDesign = args.options.siteDesign;
+            telemetryProps.siteDesignId = (!(!args.options.siteDesignId)).toString();
+        }
+        else if (isClassicSite) {
+            telemetryProps.webTemplate = typeof args.options.webTemplate !== 'undefined';
+            telemetryProps.resourceQuota = typeof args.options.resourceQuota !== 'undefined';
+            telemetryProps.resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel !== 'undefined';
+            telemetryProps.storageQuota = typeof args.options.storageQuota !== 'undefined';
+            telemetryProps.storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel !== 'undefined';
+            telemetryProps.removeDeletedSite = args.options.removeDeletedSite;
+            telemetryProps.wait = args.options.wait;
+        }
+        Object.assign(this.telemetryProperties, telemetryProps);
+    });
+}, _SpoSiteAddCommand_initOptions = function _SpoSiteAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--type [type]',
+        autocomplete: ['TeamSite', 'CommunicationSite', 'ClassicSite']
+    }, {
+        option: '-t, --title <title>'
+    }, {
+        option: '-a, --alias [alias]'
+    }, {
+        option: '-u, --url [url]'
+    }, {
+        option: '-z, --timeZone [timeZone]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-l, --lcid [lcid]'
+    }, {
+        option: '--owners [owners]'
+    }, {
+        option: '--isPublic'
+    }, {
+        option: '-c, --classification [classification]'
+    }, {
+        option: '--siteDesign [siteDesign]',
+        autocomplete: ['Topic', 'Showcase', 'Blank']
+    }, {
+        option: '--siteDesignId [siteDesignId]'
+    }, {
+        option: '--allowFileSharingForGuestUsers'
+    }, {
+        option: '--shareByEmailEnabled'
+    }, {
+        option: '-w, --webTemplate [webTemplate]'
+    }, {
+        option: '--resourceQuota [resourceQuota]'
+    }, {
+        option: '--resourceQuotaWarningLevel [resourceQuotaWarningLevel]'
+    }, {
+        option: '--storageQuota [storageQuota]'
+    }, {
+        option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
+    }, {
+        option: '--removeDeletedSite'
+    }, {
+        option: '--wait'
+    });
+}, _SpoSiteAddCommand_initValidators = function _SpoSiteAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isClassicSite = args.options.type === 'ClassicSite';
         const isCommunicationSite = args.options.type === 'CommunicationSite';
         const isTeamSite = isCommunicationSite === false && isClassicSite === false;
@@ -576,7 +576,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoSiteAddCommand();
 //# sourceMappingURL=site-add.js.map

package/dist/m365/spo/commands/site/site-appcatalog-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 _SpoSiteAppCatalogAddCommand_instances, _SpoSiteAppCatalogAddCommand_initOptions, _SpoSiteAppCatalogAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,19 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteAppCatalogAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogAddCommand_instances, "m", _SpoSiteAppCatalogAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogAddCommand_instances, "m", _SpoSiteAppCatalogAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITE_APPCATALOG_ADD;
     }
     get description() {
         return 'Creates a site collection app catalog in the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.url = (!(!args.options.url)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        const url = args.options.url;
+        const url = args.options.siteUrl;
         let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
@@ -55,18 +71,13 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_SpoSiteAppCatalogAddCommand_instances = new WeakSet(), _SpoSiteAppCatalogAddCommand_initOptions = function _SpoSiteAppCatalogAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoSiteAppCatalogAddCommand_initValidators = function _SpoSiteAppCatalogAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoSiteAppCatalogAddCommand();
 //# sourceMappingURL=site-appcatalog-add.js.map

package/dist/m365/spo/commands/site/site-appcatalog-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 _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,19 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteAppCatalogRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITE_APPCATALOG_REMOVE;
     }
     get description() {
         return 'Removes site collection app catalog from the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.url = (!(!args.options.url)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        const url = args.options.url;
+        const url = args.options.siteUrl;
         let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
@@ -55,18 +71,13 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

package/dist/m365/spo/commands/site/site-apppermission-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 _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators, _SpoSiteAppPermissionAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -6,8 +21,13 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpoSiteAppPermissionAddCommand_instances.add(this);
         this.siteId = '';
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_ADD;
@@ -15,12 +35,6 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds an application permissions to the site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appDisplayName = typeof args.options.appDisplayName !== 'undefined';
-        return telemetryProps;
-    }
     getSpoSiteId(args) {
         const url = new URL(args.options.siteUrl);
         const requestOptions = {
@@ -73,7 +87,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     }
     mapRequestBody(permission, appInfo) {
         const requestBody = {
-            roles: permission.split(',')
+            roles: [permission]
         };
         requestBody.grantedToIdentities = [];
         requestBody.grantedToIdentities.push({ application: { "id": appInfo.appId, "displayName": appInfo.displayName } });
@@ -104,39 +118,36 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            },
-            {
-                option: '-p, --permission <permission>'
-            },
-            {
-                option: '-i, --appId [appId]'
-            },
-            {
-                option: '-n, --appDisplayName [appDisplayName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.appId && !args.options.appDisplayName) {
-            return `Specify appId or appDisplayName, one is required`;
-        }
+}
+_SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermissionAddCommand_initTelemetry = function _SpoSiteAppPermissionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
+        });
+    });
+}, _SpoSiteAppPermissionAddCommand_initOptions = function _SpoSiteAppPermissionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-p, --permission <permission>'
+    }, {
+        option: '-i, --appId [appId]'
+    }, {
+        option: '-n, --appDisplayName [appDisplayName]'
+    });
+}, _SpoSiteAppPermissionAddCommand_initValidators = function _SpoSiteAppPermissionAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values read|write|read,write`;
-            }
+        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+}, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName']);
+};
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.js.map