@pnp/cli-microsoft365 6.0.0-beta.f305313 → 6.0.0-beta.f782445

package/dist/m365/teams/commands/channel/channel-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 _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators, _TeamsChannelGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -7,8 +22,13 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _TeamsChannelGetCommand_instances.add(this);
         this.teamId = "";
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_GET;
@@ -16,15 +36,6 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specific Microsoft Teams team channel';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
-        telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
-        telemetryProps.primary = (!(!args.options.primary)).toString();
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -39,14 +50,14 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         });
     }
     getChannelId(args) {
-        if (args.options.channelId) {
-            return Promise.resolve(args.options.channelId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         if (args.options.primary) {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -91,57 +102,41 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-c, --channelId [channelId]'
-            },
-            {
-                option: '--channelName [channelName]'
-            },
-            {
-                option: '--primary'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
+}
+_TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initTelemetry = function _TeamsChannelGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            primary: (!(!args.options.primary)).toString()
+        });
+    });
+}, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-c, --id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--primary'
+    });
+}, _TeamsChannelGetCommand_initValidators = function _TeamsChannelGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary';
-        }
-        if (!args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && !args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (!args.options.channelId && !args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary, one is required';
-        }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams ChannelId`;
+        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['id', 'name', 'primary']);
+};
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

package/dist/m365/teams/commands/channel/channel-list.js

@@ -1,10 +1,33 @@
 "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 _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsChannelListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.CHANNEL_LIST;
     }
@@ -14,12 +37,6 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -48,29 +65,25 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '--type [type]',
-                autocomplete: ['standard', 'private']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
+}
+_TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_initTelemetry = function _TeamsChannelListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined'
+        });
+    });
+}, _TeamsChannelListCommand_initOptions = function _TeamsChannelListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '--type [type]',
+        autocomplete: ['standard', 'private']
+    });
+}, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -78,7 +91,9 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             return `${args.options.type} is not a valid type value. Allowed values standard|private`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
+};
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -1,34 +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 _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initTelemetry, _TeamsChannelMemberAddCommand_initOptions, _TeamsChannelMemberAddCommand_initValidators, _TeamsChannelMemberAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsChannelMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberAddCommand_instances, "m", _TeamsChannelMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberAddCommand_instances, "m", _TeamsChannelMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberAddCommand_instances, "m", _TeamsChannelMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberAddCommand_instances, "m", _TeamsChannelMemberAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_ADD;
     }
     get description() {
         return 'Adds a conversation member in a private channel.';
     }
-    alias() {
-        return [commands_1.default.CONVERSATIONMEMBER_ADD];
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
-        telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
-        telemetryProps.userId = typeof args.options.userId !== 'undefined';
-        telemetryProps.userDisplayName = typeof args.options.userDisplayName !== 'undefined';
-        telemetryProps.owner = args.options.owner;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
         let teamId = '';
         let channelId = '';
         this
@@ -52,49 +60,6 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    optionSets() {
-        return [
-            ['teamId', 'teamName'],
-            ['channelId', 'channelName'],
-            ['userId', 'userDisplayName']
-        ];
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-c, --channelId [channelId]'
-            },
-            {
-                option: '--channelName [channelName]'
-            },
-            {
-                option: '--userId [userId]'
-            },
-            {
-                option: '--userDisplayName [userDisplayName]'
-            },
-            {
-                option: '--owner'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams ChannelId`;
-        }
-        return true;
-    }
     addUser(userId, endpoint, roles) {
         const requestOptions = {
             url: endpoint,
@@ -181,5 +146,46 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         }, err => { return Promise.reject(err); });
     }
 }
+_TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddCommand_initTelemetry = function _TeamsChannelMemberAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            channelId: typeof args.options.channelId !== 'undefined',
+            channelName: typeof args.options.channelName !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userDisplayName: typeof args.options.userDisplayName !== 'undefined',
+            owner: args.options.owner
+        });
+    });
+}, _TeamsChannelMemberAddCommand_initOptions = function _TeamsChannelMemberAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-c, --channelId [channelId]'
+    }, {
+        option: '--channelName [channelName]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userDisplayName [userDisplayName]'
+    }, {
+        option: '--owner'
+    });
+}, _TeamsChannelMemberAddCommand_initValidators = function _TeamsChannelMemberAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+            return `${args.options.teamId} is not a valid GUID`;
+        }
+        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+            return `${args.options.channelId} is not a valid Teams ChannelId`;
+        }
+        return true;
+    }));
+}, _TeamsChannelMemberAddCommand_initOptionSets = function _TeamsChannelMemberAddCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userId', 'userDisplayName']);
+};
 module.exports = new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -1,14 +1,34 @@
 "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 _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const request_1 = require("../../../../request");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _TeamsChannelMemberListCommand_instances.add(this);
         this.teamId = '';
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_LIST;
@@ -16,23 +36,10 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists members of the specified Microsoft Teams team channel';
     }
-    alias() {
-        return [commands_1.default.CONVERSATIONMEMBER_LIST];
-    }
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
-        telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
-        telemetryProps.role = typeof args.options.role;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_LIST, commands_1.default.CHANNEL_MEMBER_LIST);
         this
             .getTeamId(args)
             .then((teamId) => {
@@ -91,44 +98,35 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
             return Promise.resolve(channelItem.id);
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-c, --channelId [channelId]'
-            },
-            {
-                option: '--channelName [channelName]'
-            },
-            {
-                option: '-r, --role [role]',
-                autocomplete: ['owner', 'member', 'guest']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
+}
+_TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberListCommand_initTelemetry = function _TeamsChannelMemberListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            channelId: typeof args.options.channelId !== 'undefined',
+            channelName: typeof args.options.channelName !== 'undefined',
+            role: typeof args.options.role
+        });
+    });
+}, _TeamsChannelMemberListCommand_initOptions = function _TeamsChannelMemberListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-c, --channelId [channelId]'
+    }, {
+        option: '--channelName [channelName]'
+    }, {
+        option: '-r, --role [role]',
+        autocomplete: ['owner', 'member', 'guest']
+    });
+}, _TeamsChannelMemberListCommand_initValidators = function _TeamsChannelMemberListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
@@ -138,7 +136,9 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
+};
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map