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

package/dist/m365/spo/commands/eventreceiver/eventreceiver-list.js

@@ -1,10 +1,32 @@
 "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 _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_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 SpoEventreceiverListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoEventreceiverListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.EVENTRECEIVER_LIST;
     }
@@ -14,14 +36,6 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['ReceiverId', 'ReceiverName'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
-        telemetryProps.scope = typeof args.options.scope !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let requestUrl = `${args.options.webUrl}/_api/`;
         let listUrl = '';
@@ -55,29 +69,31 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '--listId  [listId]'
-            },
-            {
-                option: '--listUrl [listUrl]'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['web', 'site']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCommand_initTelemetry = function _SpoEventreceiverListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoEventreceiverListCommand_initOptions = function _SpoEventreceiverListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listId  [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['web', 'site']
+    });
+}, _SpoEventreceiverListCommand_initValidators = function _SpoEventreceiverListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -96,7 +112,7 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             return 'Scope cannot be set to site when retrieving list event receivers.';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoEventreceiverListCommand();
 //# sourceMappingURL=eventreceiver-list.js.map

package/dist/m365/spo/commands/externaluser/externaluser-list.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 _SpoExternalUserListCommand_instances, _SpoExternalUserListCommand_initTelemetry, _SpoExternalUserListCommand_initOptions, _SpoExternalUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,21 +22,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoExternalUserListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoExternalUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.EXTERNALUSER_LIST;
     }
     get description() {
         return 'Lists external users in the tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.filter = (!(!args.options.filter)).toString();
-        telemetryProps.pageSize = (!(!args.options.pageSize)).toString();
-        telemetryProps.position = (!(!args.options.position)).toString();
-        telemetryProps.sortOrder = (!(!args.options.sortOrder)).toString();
-        telemetryProps.siteUrl = (!(!args.options.siteUrl)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         utils_1.spo
@@ -80,29 +93,32 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-f, --filter [filter]'
-            },
-            {
-                option: '-p, --pageSize [pageSize]'
-            },
-            {
-                option: '-i, --position [position]'
-            },
-            {
-                option: '-s, --sortOrder [sortOrder]',
-                autocomplete: ['asc', 'desc']
-            },
-            {
-                option: '-u, --siteUrl [siteUrl]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListCommand_initTelemetry = function _SpoExternalUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            filter: (!(!args.options.filter)).toString(),
+            pageSize: (!(!args.options.pageSize)).toString(),
+            position: (!(!args.options.position)).toString(),
+            sortOrder: (!(!args.options.sortOrder)).toString(),
+            siteUrl: (!(!args.options.siteUrl)).toString()
+        });
+    });
+}, _SpoExternalUserListCommand_initOptions = function _SpoExternalUserListCommand_initOptions() {
+    this.options.unshift({
+        option: '-f, --filter [filter]'
+    }, {
+        option: '-p, --pageSize [pageSize]'
+    }, {
+        option: '-i, --position [position]'
+    }, {
+        option: '-s, --sortOrder [sortOrder]',
+        autocomplete: ['asc', 'desc']
+    }, {
+        option: '-u, --siteUrl [siteUrl]'
+    });
+}, _SpoExternalUserListCommand_initValidators = function _SpoExternalUserListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.pageSize) {
             const pageSize = parseInt(args.options.pageSize);
             if (isNaN(pageSize)) {
@@ -130,7 +146,7 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
             return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoExternalUserListCommand();
 //# sourceMappingURL=externaluser-list.js.map

package/dist/m365/spo/commands/feature/feature-disable.js

@@ -1,21 +1,38 @@
 "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 _SpoFeatureDisableCommand_instances, _SpoFeatureDisableCommand_initTelemetry, _SpoFeatureDisableCommand_initOptions, _SpoFeatureDisableCommand_initValidators, _SpoFeatureDisableCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFeatureDisableCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFeatureDisableCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.FEATURE_DISABLE;
     }
     get description() {
         return 'Disables feature for the specified site or web';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'web';
-        telemetryProps.force = args.options.force || false;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let scope = args.options.scope;
         let force = args.options.force;
@@ -26,9 +43,9 @@ class SpoFeatureDisableCommand extends SpoCommand_1.default {
             force = false;
         }
         if (this.verbose) {
-            logger.logToStderr(`Disabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+            logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
-        const url = `${args.options.url}/_api/${scope}/features/remove(featureId=guid'${args.options.featureId}',force=${force})`;
+        const url = `${args.options.webUrl}/_api/${scope}/features/remove(featureId=guid'${args.options.id}',force=${force})`;
         const requestOptions = {
             url: url,
             headers: {
@@ -39,38 +56,36 @@ class SpoFeatureDisableCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    types() {
-        return {
-            string: ['scope', 's']
-        };
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-f, --featureId <id>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            },
-            {
-                option: '--force'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_initTelemetry = function _SpoFeatureDisableCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'web',
+            force: args.options.force || false
+        });
+    });
+}, _SpoFeatureDisableCommand_initOptions = function _SpoFeatureDisableCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    }, {
+        option: '--force'
+    });
+}, _SpoFeatureDisableCommand_initValidators = function _SpoFeatureDisableCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.scope) {
             if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoFeatureDisableCommand_initTypes = function _SpoFeatureDisableCommand_initTypes() {
+    this.types.string.push('scope', 's');
+};
 module.exports = new SpoFeatureDisableCommand();
 //# sourceMappingURL=feature-disable.js.map

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -1,22 +1,39 @@
 "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 _SpoFeatureEnableCommand_instances, _SpoFeatureEnableCommand_initTelemetry, _SpoFeatureEnableCommand_initOptions, _SpoFeatureEnableCommand_initValidators, _SpoFeatureEnableCommand_initTypes;
 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 SpoFeatureEnableCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFeatureEnableCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.FEATURE_ENABLE;
     }
     get description() {
         return 'Enables feature for the specified site or web';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'web';
-        telemetryProps.force = args.options.force || false;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let scope = args.options.scope;
         let force = args.options.force;
@@ -27,9 +44,9 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
             force = false;
         }
         if (this.verbose) {
-            logger.logToStderr(`Enabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+            logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
-        const url = `${args.options.url}/_api/${scope}/features/add(featureId=guid'${args.options.featureId}',force=${force})`;
+        const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
         const requestOptions = {
             url: url,
             headers: {
@@ -40,38 +57,36 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    types() {
-        return {
-            string: ['scope', 's']
-        };
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-f, --featureId <id>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            },
-            {
-                option: '--force'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_initTelemetry = function _SpoFeatureEnableCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'web',
+            force: args.options.force || false
+        });
+    });
+}, _SpoFeatureEnableCommand_initOptions = function _SpoFeatureEnableCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    }, {
+        option: '--force'
+    });
+}, _SpoFeatureEnableCommand_initValidators = function _SpoFeatureEnableCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.scope) {
             if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
-}
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
+    this.types.string.push('scope', 's');
+};
 module.exports = new SpoFeatureEnableCommand();
 //# sourceMappingURL=feature-enable.js.map

package/dist/m365/spo/commands/feature/feature-list.js

@@ -1,25 +1,42 @@
 "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 _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_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 SpoFeatureListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFeatureListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FEATURE_LIST;
     }
     get description() {
         return 'Lists Features activated in the specified site or site collection';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'Web';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         const requestOptions = {
-            url: `${args.options.url}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
+            url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -39,28 +56,30 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTelemetry = function _SpoFeatureListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'Web'
+        });
+    });
+}, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    });
+}, _SpoFeatureListCommand_initValidators = function _SpoFeatureListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&
                 args.options.scope !== 'Web') {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
-}
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
 module.exports = new SpoFeatureListCommand();
 //# sourceMappingURL=feature-list.js.map