@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.1752794

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

@@ -1,14 +1,30 @@
-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;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { teams } from '../../../../utils/teams.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    teamName: z.string()
+        .optional(),
+    id: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional()
+        .alias('i'),
+    name: z.string()
+        .optional(),
+    primary: z.boolean()
+        .optional()
+});
 class TeamsChannelGetCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_GET;
@@ -16,13 +32,25 @@ class TeamsChannelGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specific Microsoft Teams team channel';
     }
-    constructor() {
-        super();
-        _TeamsChannelGetCommand_instances.add(this);
-        __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 schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.id, opts.name, opts.primary].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id, name, or primary, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name', 'primary']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -48,40 +76,5 @@ class TeamsChannelGetCommand extends GraphCommand {
         }
     }
 }
-_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
-        });
-    });
-}, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
-    this.options.unshift({
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--name [name]'
-    }, {
-        option: '--primary'
-    });
-}, _TeamsChannelGetCommand_initValidators = function _TeamsChannelGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.id && !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({ options: ['teamId', 'teamName'] }, { options: ['id', 'name', 'primary'] });
-};
 export default new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -1,14 +1,24 @@
-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;
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    type: z.enum(['standard', 'private', 'shared'])
+        .optional()
+        .transform(v => v?.toLowerCase())
+});
 class TeamsChannelListCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_LIST;
@@ -19,23 +29,24 @@ class TeamsChannelListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
-    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 schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        });
     }
     async getTeamId(args) {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async commandAction(logger, args) {
         try {
@@ -52,34 +63,5 @@ class TeamsChannelListCommand extends GraphCommand {
         }
     }
 }
-_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', 'shared']
-    });
-}, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.type && ['standard', 'private', 'shared'].indexOf(args.options.type.toLowerCase()) === -1) {
-            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared`;
-        }
-        return true;
-    });
-}, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] });
-};
 export default new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

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

@@ -1,16 +1,37 @@
-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;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional()
+        .alias('c'),
+    channelName: z.string()
+        .optional(),
+    userIds: z.string()
+        .optional(),
+    userDisplayNames: z.string()
+        .optional(),
+    owner: z.boolean()
+        .optional()
+});
 class TeamsChannelMemberAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_MEMBER_ADD;
@@ -18,13 +39,32 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
     get description() {
         return 'Adds a specified member in the specified Microsoft Teams private or shared team channel';
     }
-    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 schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        })
+            .refine(opts => [opts.userIds, opts.userDisplayNames].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either userIds or userDisplayNames, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userIds', 'userDisplayNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -63,11 +103,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(teamId, args) {
         if (args.options.channelId) {
@@ -122,46 +158,5 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         return userItem.id;
     }
 }
-_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',
-            userIds: typeof args.options.userIds !== 'undefined',
-            userDisplayNames: typeof args.options.userDisplayNames !== '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: '--userIds [userIds]'
-    }, {
-        option: '--userDisplayNames [userDisplayNames]'
-    }, {
-        option: '--owner'
-    });
-}, _TeamsChannelMemberAddCommand_initValidators = function _TeamsChannelMemberAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !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({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userIds', 'userDisplayNames'] });
-};
 export default new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

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

@@ -1,17 +1,39 @@
-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;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional()
+        .alias('c'),
+    channelName: z.string()
+        .optional(),
+    role: z.enum(['owner', 'member', 'guest'])
+        .optional()
+        .alias('r')
+});
 class TeamsChannelMemberListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+    }
     get name() {
         return commands.CHANNEL_MEMBER_LIST;
     }
@@ -21,14 +43,25 @@ class TeamsChannelMemberListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    constructor() {
-        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 schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -55,11 +88,7 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {
@@ -80,46 +109,5 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         return channelItem.id;
     }
 }
-_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(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel ID`;
-        }
-        if (args.options.role) {
-            if (['owner', 'member', 'guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values owner|member|guest`;
-            }
-        }
-        return true;
-    });
-}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] });
-};
 export default new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

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

@@ -1,32 +1,79 @@
-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 _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional(),
+    channelName: z.string()
+        .optional(),
+    userName: z.string()
+        .optional(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    id: z.string()
+        .optional(),
+    force: z.boolean()
+        .optional()
+        .alias('f')
+});
 class TeamsChannelMemberRemoveCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+        this.channelId = '';
+    }
     get name() {
         return commands.CHANNEL_MEMBER_REMOVE;
     }
     get description() {
         return 'Removes the specified member from the specified Microsoft Teams private or shared team channel';
     }
-    constructor() {
-        super();
-        _TeamsChannelMemberRemoveCommand_instances.add(this);
-        this.teamId = '';
-        this.channelId = '';
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        })
+            .refine(opts => [opts.userId, opts.userName, opts.id].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either userId, userName, or id, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'id']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeMember = async () => {
@@ -72,11 +119,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {
@@ -125,52 +168,5 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         return conversationMember.id;
     }
 }
-_TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberRemoveCommand_initTelemetry = function _TeamsChannelMemberRemoveCommand_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',
-            userName: typeof args.options.userName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _TeamsChannelMemberRemoveCommand_initOptions = function _TeamsChannelMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '--channelId [channelId]'
-    }, {
-        option: '--channelName [channelName]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsChannelMemberRemoveCommand_initValidators = function _TeamsChannelMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel ID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsChannelMemberRemoveCommand_initOptionSets = function _TeamsChannelMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userName', 'id'] });
-};
 export default new TeamsChannelMemberRemoveCommand();
 //# sourceMappingURL=channel-member-remove.js.map