@pnp/cli-microsoft365 12.0.0-beta.8dff3ac → 12.0.0-beta.93e11fb

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

@@ -1,15 +1,26 @@
-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 _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions, _TeamsTeamListCommand_initValidators, _TeamsTeamListCommand_initOptionSets, _TeamsTeamListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    joined: z.boolean().optional().alias('j'),
+    associated: z.boolean().optional().alias('a'),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value must be a valid user principal name.'
+    })
+        .optional()
+});
 class TeamsTeamListCommand extends GraphCommand {
     get name() {
         return commands.TEAM_LIST;
@@ -20,14 +31,32 @@ class TeamsTeamListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'isArchived', 'description'];
     }
-    constructor() {
-        super();
-        _TeamsTeamListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.joined, opts.associated].filter(o => o !== undefined).length <= 1, {
+            message: `Specify either 'joined' or 'associated', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['joined', 'associated']
+            }
+        })
+            .refine(opts => [opts.userId, opts.userName].filter(o => o !== undefined).length <= 1, {
+            message: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        })
+            .refine(opts => !(opts.userId || opts.userName) || opts.joined || opts.associated, {
+            message: `Specify 'joined' or 'associated' when specifying 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['joined', 'associated']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -103,48 +132,5 @@ class TeamsTeamListCommand extends GraphCommand {
         return response.responses.map(r => r.body);
     }
 }
-_TeamsTeamListCommand_instances = new WeakSet(), _TeamsTeamListCommand_initTelemetry = function _TeamsTeamListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            joined: !!args.options.joined,
-            associated: !!args.options.associated,
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _TeamsTeamListCommand_initOptions = function _TeamsTeamListCommand_initOptions() {
-    this.options.unshift({
-        option: '-j, --joined'
-    }, {
-        option: '-a, --associated'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _TeamsTeamListCommand_initValidators = function _TeamsTeamListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for userId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userId} is not a valid UPN for userName.`;
-        }
-        if ((args.options.userId || args.options.userName) && !args.options.joined && !args.options.associated) {
-            return 'You must specify either joined or associated when specifying userId or userName.';
-        }
-        return true;
-    });
-}, _TeamsTeamListCommand_initOptionSets = function _TeamsTeamListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['joined', 'associated'],
-        runsWhen: (args) => !!args.options.joined || !!args.options.associated
-    }, {
-        options: ['userId', 'userName'],
-        runsWhen: (args) => typeof args.options.userId !== 'undefined' || typeof args.options.userName !== 'undefined'
-    });
-}, _TeamsTeamListCommand_initTypes = function _TeamsTeamListCommand_initTypes() {
-    this.types.string.push('userId', 'userName');
-};
 export default new TeamsTeamListCommand();
 //# sourceMappingURL=team-list.js.map

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

@@ -1,16 +1,23 @@
-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 _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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';
+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'),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsTeamRemoveCommand extends GraphCommand {
     get name() {
         return commands.TEAM_REMOVE;
@@ -18,13 +25,17 @@ class TeamsTeamRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the specified Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _TeamsTeamRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.name].filter(o => o !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async getTeamId(args) {
         if (args.options.id) {
@@ -60,29 +71,5 @@ class TeamsTeamRemoveCommand extends GraphCommand {
         }
     }
 }
-_TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initTelemetry = function _TeamsTeamRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _TeamsTeamRemoveCommand_initOptions = function _TeamsTeamRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsTeamRemoveCommand_initValidators = function _TeamsTeamRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsTeamRemoveCommand_initOptionSets = function _TeamsTeamRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsTeamRemoveCommand();
 //# sourceMappingURL=team-remove.js.map

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

@@ -1,14 +1,29 @@
-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 _TeamsTeamSetCommand_instances, _a, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const VisibilityEnum = {
+    Private: 'Private',
+    Public: 'Public'
+};
+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'),
+    description: z.string().optional(),
+    mailNickName: z.string().optional(),
+    classification: z.string().optional(),
+    visibility: zod.coercedEnum(VisibilityEnum).optional()
+});
 class TeamsTeamSetCommand extends GraphCommand {
     get name() {
         return commands.TEAM_SET;
@@ -16,12 +31,8 @@ class TeamsTeamSetCommand extends GraphCommand {
     get description() {
         return 'Updates settings of a Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _TeamsTeamSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     mapRequestBody(options) {
         const requestBody = {};
@@ -60,45 +71,5 @@ class TeamsTeamSetCommand extends GraphCommand {
         }
     }
 }
-_a = TeamsTeamSetCommand, _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        _a.props.forEach((p) => {
-            this.telemetryProperties[p] = typeof args.options[p] !== 'undefined';
-        });
-    });
-}, _TeamsTeamSetCommand_initOptions = function _TeamsTeamSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--description [description]'
-    }, {
-        option: '--mailNickName [mailNickName]'
-    }, {
-        option: '--classification [classification]'
-    }, {
-        option: '--visibility [visibility]',
-        autocomplete: ['Private', 'Public']
-    });
-}, _TeamsTeamSetCommand_initValidators = function _TeamsTeamSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.visibility) {
-            if (args.options.visibility.toLowerCase() !== 'private' && args.options.visibility.toLowerCase() !== 'public') {
-                return `${args.options.visibility} is not a valid visibility type. Allowed values are Private|Public`;
-            }
-        }
-        return true;
-    });
-};
-TeamsTeamSetCommand.props = [
-    'description',
-    'mailNickName',
-    'classification',
-    'visibility '
-];
 export default new TeamsTeamSetCommand();
 //# sourceMappingURL=team-set.js.map

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -1,15 +1,21 @@
-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 _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initValidators, _TeamsTeamUnarchiveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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';
+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')
+});
 class TeamsTeamUnarchiveCommand extends GraphCommand {
     get name() {
         return commands.TEAM_UNARCHIVE;
@@ -17,12 +23,17 @@ class TeamsTeamUnarchiveCommand extends GraphCommand {
     get description() {
         return 'Restores an archived Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _TeamsTeamUnarchiveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.name].filter(o => o !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async getTeamId(args) {
         if (args.options.id) {
@@ -49,21 +60,5 @@ class TeamsTeamUnarchiveCommand extends GraphCommand {
         }
     }
 }
-_TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand_initOptions = function _TeamsTeamUnarchiveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    });
-}, _TeamsTeamUnarchiveCommand_initValidators = function _TeamsTeamUnarchiveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsTeamUnarchiveCommand_initOptionSets = function _TeamsTeamUnarchiveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsTeamUnarchiveCommand();
 //# sourceMappingURL=team-unarchive.js.map

package/dist/m365/teams/commands/user/user-app-add.js

@@ -1,15 +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 _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    name: z.string().optional(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value must be a valid user principal name.'
+    })
+        .optional()
+});
 class TeamsUserAppAddCommand extends GraphCommand {
     get name() {
         return commands.USER_APP_ADD;
@@ -17,13 +32,25 @@ class TeamsUserAppAddCommand extends GraphCommand {
     get description() {
         return 'Installs an app in the personal scope of the specified user';
     }
-    constructor() {
-        super();
-        _TeamsUserAppAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(o => o !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(opts => [opts.userId, opts.userName].filter(o => o !== undefined).length === 1, {
+            message: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -73,41 +100,5 @@ class TeamsUserAppAddCommand extends GraphCommand {
         return result.id;
     }
 }
-_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--id [id]'
-    }, {
-        option: '--name [name]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        return true;
-    });
-}, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new TeamsUserAppAddCommand();
 //# sourceMappingURL=user-app-add.js.map

package/dist/m365/teams/commands/user/user-app-list.js

@@ -1,16 +1,25 @@
-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 _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value must be a valid user principal name.'
+    })
+        .optional()
+});
 class TeamsUserAppListCommand extends GraphCommand {
     get name() {
         return commands.USER_APP_LIST;
@@ -18,13 +27,17 @@ class TeamsUserAppListCommand extends GraphCommand {
     get description() {
         return 'Lists the apps installed in the personal scope of the specified user';
     }
-    constructor() {
-        super();
-        _TeamsUserAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.userId, opts.userName].filter(o => o !== undefined).length === 1, {
+            message: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -68,31 +81,5 @@ class TeamsUserAppListCommand extends GraphCommand {
         return request.get(requestOptions);
     }
 }
-_TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_initTelemetry = function _TeamsUserAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _TeamsUserAppListCommand_initOptions = function _TeamsUserAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _TeamsUserAppListCommand_initValidators = function _TeamsUserAppListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        return true;
-    });
-}, _TeamsUserAppListCommand_initOptionSets = function _TeamsUserAppListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new TeamsUserAppListCommand();
 //# sourceMappingURL=user-app-list.js.map