@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.235caf5

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

@@ -1,14 +1,18 @@
-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;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.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,
+    id: z.string(),
+    teamId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsAppUninstallCommand extends GraphCommand {
     get name() {
         return commands.APP_UNINSTALL;
@@ -16,12 +20,8 @@ class TeamsAppUninstallCommand extends GraphCommand {
     get description() {
         return 'Uninstalls an app from a Microsoft Team team';
     }
-    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 schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const uninstallApp = async () => {
@@ -52,27 +52,5 @@ class TeamsAppUninstallCommand extends GraphCommand {
         }
     }
 }
-_TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    }, {
-        option: '--teamId <teamId>'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsAppUninstallCommand_initValidators = function _TeamsAppUninstallCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new TeamsAppUninstallCommand();
 //# sourceMappingURL=app-uninstall.js.map

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

@@ -1,9 +1,3 @@
-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;
 import fs from 'fs';
 import path from 'path';
 import request from '../../../../request.js';
@@ -12,6 +6,29 @@ 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,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    filePath: z.string()
+        .refine(val => {
+        const fullPath = path.resolve(val);
+        if (!fs.existsSync(fullPath)) {
+            return false;
+        }
+        if (fs.lstatSync(fullPath).isDirectory()) {
+            return false;
+        }
+        return true;
+    }, {
+        message: 'Specified file does not exist or points to a directory.'
+    })
+        .alias('p')
+});
 class TeamsAppUpdateCommand extends GraphCommand {
     get name() {
         return commands.APP_UPDATE;
@@ -19,13 +36,18 @@ class TeamsAppUpdateCommand extends GraphCommand {
     get description() {
         return 'Updates Teams app in the organization\'s app catalog';
     }
-    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 schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         const { filePath } = args.options;
@@ -72,37 +94,5 @@ class TeamsAppUpdateCommand extends GraphCommand {
         return app.id;
     }
 }
-_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(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        const fullPath = path.resolve(args.options.filePath);
-        if (!fs.existsSync(fullPath)) {
-            return `File '${fullPath}' not found`;
-        }
-        if (fs.lstatSync(fullPath).isDirectory()) {
-            return `Path '${fullPath}' points to a directory`;
-        }
-        return true;
-    });
-}, _TeamsAppUpdateCommand_initOptionSets = function _TeamsAppUpdateCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsAppUpdateCommand();
 //# sourceMappingURL=app-update.js.map

package/dist/m365/teams/commands/channel/channel-add.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 _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators, _TeamsChannelAddCommand_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()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    name: z.string()
+        .alias('n'),
+    description: z.string()
+        .optional()
+        .alias('d'),
+    type: z.enum(['standard', 'private', 'shared'])
+        .optional(),
+    owner: z.string()
+        .optional()
+});
 class TeamsChannelAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_ADD;
@@ -16,13 +32,30 @@ class TeamsChannelAddCommand extends GraphCommand {
     get description() {
         return 'Adds a channel to the specified Microsoft Teams team';
     }
-    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 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.type === 'private' || opts.type === 'shared') && !opts.owner), {
+            message: 'Specify owner when creating a private or shared channel.',
+            params: {
+                customCode: 'required'
+            }
+        })
+            .refine(opts => !((opts.type !== 'private' && opts.type !== 'shared') && opts.owner), {
+            message: 'Specify owner only when creating a private or shared channel.',
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -66,49 +99,5 @@ class TeamsChannelAddCommand extends GraphCommand {
         return request.post(requestOptions);
     }
 }
-_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', 'shared']
-    }, {
-        option: '--owner [owner]'
-    });
-}, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_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) === -1) {
-            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared.`;
-        }
-        if ((args.options.type === 'private' || args.options.type === 'shared') && !args.options.owner) {
-            return `Specify owner when creating a ${args.options.type} channel.`;
-        }
-        if ((args.options.type !== 'private' && args.options.type !== 'shared') && args.options.owner) {
-            return `Specify owner only when creating a private or shared channel.`;
-        }
-        return true;
-    });
-}, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] });
-};
 export default new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map

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 { 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,13 +29,18 @@ 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) {
@@ -48,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,9 +1,3 @@
-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 { formatting } from '../../../../utils/formatting.js';
 import { teams } from '../../../../utils/teams.js';
@@ -11,6 +5,33 @@ 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 {
@@ -118,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