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

package/dist/m365/teams/commands/app/app-uninstall.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 _TeamsAppUninstallCommand_instances, _TeamsAppUninstallCommand_initTelemetry, _TeamsAppUninstallCommand_initOptions, _TeamsAppUninstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,6 +21,13 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppUninstallCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsAppUninstallCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_UNINSTALL;
     }
@@ -15,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'
                 }
@@ -32,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();
@@ -43,27 +65,28 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--teamId <teamId>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: args.options.confirm || false
+        });
+    });
+}, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--teamId <teamId>'
+    }, {
+        option: '--confirm'
+    });
+}, _TeamsAppUninstallCommand_initValidators = function _TeamsAppUninstallCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsAppUninstallCommand();
 //# sourceMappingURL=app-uninstall.js.map

package/dist/m365/teams/commands/app/app-update.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 _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators, _TeamsAppUpdateCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,18 +22,20 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppUpdateCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsAppUpdateCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Updates Teams app in the organization\'s app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const { filePath } = args.options;
         this
@@ -63,28 +80,24 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
             return Promise.resolve(app.id);
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-p, --filePath <filePath>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTelemetry = function _TeamsAppUpdateCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _TeamsAppUpdateCommand_initOptions = function _TeamsAppUpdateCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-p, --filePath <filePath>'
+    });
+}, _TeamsAppUpdateCommand_initValidators = function _TeamsAppUpdateCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -96,7 +109,9 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
             return `Path '${fullPath}' points to a directory`;
         }
         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/cache/cache-remove.js

@@ -8,6 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _TeamsCacheRemoveCommand_instances, _TeamsCacheRemoveCommand_initTelemetry, _TeamsCacheRemoveCommand_initOptions, _TeamsCacheRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util = require("util");
 const cli_1 = require("../../../../cli");
@@ -15,8 +21,12 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _TeamsCacheRemoveCommand_instances.add(this);
         this.exec = util.promisify(require('child_process').exec);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.CACHE_REMOVE;
@@ -24,11 +34,6 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Teams client cache';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (args.options.confirm) {
             this.clearTeamsCache(logger, cb);
@@ -132,16 +137,19 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             }
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate() {
+}
+_TeamsCacheRemoveCommand_instances = new WeakSet(), _TeamsCacheRemoveCommand_initTelemetry = function _TeamsCacheRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _TeamsCacheRemoveCommand_initOptions = function _TeamsCacheRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+}, _TeamsCacheRemoveCommand_initValidators = function _TeamsCacheRemoveCommand_initValidators() {
+    this.validators.push(() => __awaiter(this, void 0, void 0, function* () {
         if (process.env.CLIMICROSOFT365_ENV === 'docker') {
             return 'Because you\'re running CLI for Microsoft 365 in a Docker container, we can\'t clear the cache on your host. Instead run this command on your host using "npx ..."';
         }
@@ -149,7 +157,7 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             return `${process.platform} platform is unsupported for this command`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsCacheRemoveCommand();
 //# sourceMappingURL=cache-remove.js.map

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

@@ -1,25 +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 _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");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsChannelAddCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Adds a channel to the specified Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.type = args.options.type || 'standard';
-        telemetryProps.owner = typeof args.options.owner !== 'undefined';
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -80,38 +94,34 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--type [type]',
-                autocomplete: ['standard', 'private']
-            },
-            {
-                option: '--owner [owner]'
-            }
-        ];
-        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';
-        }
+}
+_TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initTelemetry = function _TeamsChannelAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            type: args.options.type || 'standard',
+            owner: typeof args.options.owner !== 'undefined'
+        });
+    });
+}, _TeamsChannelAddCommand_initOptions = function _TeamsChannelAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--type [type]',
+        autocomplete: ['standard', 'private']
+    }, {
+        option: '--owner [owner]'
+    });
+}, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_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`;
         }
@@ -125,7 +135,9 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             return 'Specify owner only when creating a private channel.';
         }
         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

@@ -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