@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators;
+var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_INSTALL;
@@ -55,7 +56,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
                 }
             };
             return request_1.default.post(requestOptions);
@@ -101,21 +102,11 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--appId <appId>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (!args.options.teamId &&
-            !args.options.userId &&
-            !args.options.userName) {
-            return `Specify either teamId, userId or userName`;
-        }
-        if ((args.options.teamId && args.options.userId) ||
-            (args.options.teamId && args.options.userName) ||
-            (args.options.userId && args.options.userName)) {
-            return `Specify either teamId, userId or userName but not multiple`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.teamId &&
             !utils_1.validation.isValidGuid(args.options.teamId)) {
@@ -127,6 +118,8 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         }
         return true;
     }));
+}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'userId', 'userName']);
 };
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-uninstall.js

@@ -37,7 +37,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         const uninstallApp = () => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.appId}`,
+                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 }
@@ -54,7 +54,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to uninstall the app with id ${args.options.appId} from the Microsoft Teams team ${args.options.teamId}?`
+                message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -74,7 +74,7 @@ _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_i
     });
 }, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
     this.options.unshift({
-        option: '--appId <appId>'
+        option: '--id <id>'
     }, {
         option: '--teamId <teamId>'
     }, {

package/dist/m365/teams/commands/app/app-update.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators;
+var _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators, _TeamsAppUpdateCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -28,6 +28,7 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_UPDATE;
@@ -97,12 +98,6 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
     });
 }, _TeamsAppUpdateCommand_initValidators = function _TeamsAppUpdateCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name, but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -115,6 +110,8 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
         }
         return true;
     }));
+}, _TeamsAppUpdateCommand_initOptionSets = function _TeamsAppUpdateCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsAppUpdateCommand();
 //# sourceMappingURL=app-update.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators;
+var _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators, _TeamsChannelAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_ADD;
@@ -121,12 +122,6 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
     });
 }, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -141,6 +136,8 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         }
         return true;
     }));
+}, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
+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");
@@ -28,6 +28,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         __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;
@@ -49,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'
             },
@@ -107,8 +108,8 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         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',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             primary: (!(!args.options.primary)).toString()
         });
     });
@@ -118,43 +119,24 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --channelId [channelId]'
+        option: '-c, --id [id]'
     }, {
-        option: '--channelName [channelName]'
+        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 && 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';
-        }
         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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
+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");
@@ -26,6 +26,7 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         __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;
@@ -83,12 +84,6 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
     });
 }, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -97,6 +92,8 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         }
         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-list.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
+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");
@@ -28,6 +28,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
         __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;
@@ -127,21 +128,9 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
     });
 }, _TeamsChannelMemberListCommand_initValidators = function _TeamsChannelMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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';
-        }
         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`;
         }
@@ -152,6 +141,8 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
         }
         return true;
     }));
+}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
 };
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators;
+var _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -29,6 +29,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_SET;
@@ -167,32 +168,12 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
     });
 }, _TeamsChannelMemberSetCommand_initValidators = function _TeamsChannelMemberSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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';
-        }
         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`;
         }
-        if ((args.options.userName && args.options.userId) ||
-            (args.options.userName && args.options.id) ||
-            (args.options.userId && args.options.id)) {
-            return 'Specify either userName, userId or id, but not multiple.';
-        }
-        if (!args.options.userName && !args.options.userId && !args.options.id) {
-            return 'Specify either userName, userId or id, one is required';
-        }
         if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
@@ -201,6 +182,8 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
         }
         return true;
     }));
+}, _TeamsChannelMemberSetCommand_initOptionSets = function _TeamsChannelMemberSetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userName', 'userId', 'id']);
 };
 module.exports = new TeamsChannelMemberSetCommand();
 //# sourceMappingURL=channel-member-set.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators;
+var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_REMOVE;
@@ -36,9 +37,9 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeChannel = () => {
-            if (args.options.channelName) {
+            if (args.options.name) {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -63,9 +64,9 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
                 })
                     .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
             }
-            if (args.options.channelId) {
+            if (args.options.id) {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.channelId)}`,
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.id)}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -80,7 +81,7 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
             removeChannel();
         }
         else {
-            const channelName = args.options.channelName ? args.options.channelName : args.options.channelId;
+            const channelName = args.options.name ? args.options.name : args.options.id;
             cli_1.Cli.prompt({
                 type: 'confirm',
                 name: 'continue',
@@ -100,16 +101,16 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _TeamsChannelRemoveCommand_initOptions = function _TeamsChannelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-c, --channelId [channelId]'
+        option: '-c, --id [id]'
     }, {
-        option: '-n, --channelName [channelName]'
+        option: '-n, --name [name]'
     }, {
         option: '-i, --teamId <teamId>'
     }, {
@@ -117,20 +118,16 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify channelId or channelName but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName';
-        }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel Id`;
+        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

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

@@ -35,7 +35,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -64,8 +64,8 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.newChannelName) {
-            requestBody.displayName = options.newChannelName;
+        if (options.newName) {
+            requestBody.displayName = options.newName;
         }
         if (options.description) {
             requestBody.description = options.description;
@@ -76,7 +76,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
 _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initTelemetry = function _TeamsChannelSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newChannelName: typeof args.options.newChannelName !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
             description: typeof args.options.description !== 'undefined'
         });
     });
@@ -84,9 +84,9 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     this.options.unshift({
         option: '-i, --teamId <teamId>'
     }, {
-        option: '--channelName <channelName>'
+        option: '--name <name>'
     }, {
-        option: '--newChannelName [newChannelName]'
+        option: '--newName [newName]'
     }, {
         option: '--description [description]'
     });
@@ -95,7 +95,7 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
         if (!utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelName.toLowerCase() === "general") {
+        if (args.options.name.toLowerCase() === "general") {
             return 'General channel cannot be updated';
         }
         return true;

package/dist/m365/teams/commands/chat/chat-get.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators;
+var _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators, _TeamsChatGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
@@ -30,6 +30,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_GET;
@@ -120,22 +121,6 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
     });
 }, _TeamsChatGetCommand_initValidators = function _TeamsChatGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.participants && !args.options.name) {
-            return 'Specify id or participants or name, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.id) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.participants) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.name) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either id or participants or name, but not multiple.';
-        }
         if (args.options.id && !validation_1.validation.isValidTeamsChatId(args.options.id)) {
             return `${args.options.id} is not a valid Teams ChatId.`;
         }
@@ -147,6 +132,8 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
         }
         return true;
     }));
+}, _TeamsChatGetCommand_initOptionSets = function _TeamsChatGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'participants', 'name']);
 };
 module.exports = new TeamsChatGetCommand();
 //# sourceMappingURL=chat-get.js.map