@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 11.10.0-beta.49639f3

package/dist/m365/planner/commands/plan/plan-remove.js

@@ -1,9 +1,5 @@
-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 _PlannerPlanRemoveCommand_instances, _PlannerPlanRemoveCommand_initTelemetry, _PlannerPlanRemoveCommand_initOptions, _PlannerPlanRemoveCommand_initValidators, _PlannerPlanRemoveCommand_initOptionSets, _PlannerPlanRemoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
@@ -11,6 +7,18 @@ import { planner } from '../../../../utils/planner.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().optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    ownerGroupId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional(),
+    ownerGroupName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class PlannerPlanRemoveCommand extends GraphCommand {
     get name() {
         return commands.PLAN_REMOVE;
@@ -18,14 +26,28 @@ class PlannerPlanRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the Microsoft Planner plan';
     }
-    constructor() {
-        super();
-        _PlannerPlanRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanRemoveCommand_instances, "m", _PlannerPlanRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'id' or 'title'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        })
+            .refine(opts => !opts.title || [opts.ownerGroupId, opts.ownerGroupName].filter(x => x !== undefined).length === 1, {
+            message: `Specify either ownerGroupId or ownerGroupName when using title.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['ownerGroupId', 'ownerGroupName']
+            }
+        })
+            .refine(opts => !opts.id || (!opts.ownerGroupId && !opts.ownerGroupName), {
+            message: `Don't specify ownerGroupId or ownerGroupName when using id`
+        });
     }
     async commandAction(logger, args) {
         const removePlan = async () => {
@@ -74,50 +96,5 @@ class PlannerPlanRemoveCommand extends GraphCommand {
         return entraGroup.getGroupIdByDisplayName(ownerGroupName);
     }
 }
-_PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_initTelemetry = function _PlannerPlanRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
-            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _PlannerPlanRemoveCommand_initOptions = function _PlannerPlanRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--ownerGroupId [ownerGroupId]'
-    }, {
-        option: '--ownerGroupName [ownerGroupName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _PlannerPlanRemoveCommand_initValidators = function _PlannerPlanRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.title) {
-            if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName';
-            }
-            if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName but not both';
-            }
-            if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
-        }
-        else if (args.options.ownerGroupId || args.options.ownerGroupName) {
-            return 'Don\'t specify ownerGroupId or ownerGroupName when using id';
-        }
-        return true;
-    });
-}, _PlannerPlanRemoveCommand_initOptionSets = function _PlannerPlanRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-}, _PlannerPlanRemoveCommand_initTypes = function _PlannerPlanRemoveCommand_initTypes() {
-    this.types.string.push('id', 'title', 'ownerGroupId', 'ownerGroupName');
-};
 export default new PlannerPlanRemoveCommand();
 //# sourceMappingURL=plan-remove.js.map

package/dist/m365/planner/commands/plan/plan-set.js

@@ -1,9 +1,5 @@
-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 _PlannerPlanSetCommand_instances, _PlannerPlanSetCommand_initTelemetry, _PlannerPlanSetCommand_initOptions, _PlannerPlanSetCommand_initValidators, _PlannerPlanSetCommand_initOptionSets, _PlannerPlanSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,29 @@ import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.object({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    ownerGroupId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional(),
+    ownerGroupName: z.string().optional(),
+    rosterId: z.string().optional(),
+    newTitle: z.string().optional(),
+    shareWithUserIds: z.string()
+        .refine(val => validation.isValidGuidArray(val) === true, {
+        message: 'The value contains invalid GUIDs.'
+    })
+        .optional(),
+    shareWithUserNames: z.string()
+        .refine(val => validation.isValidUserPrincipalNameArray(val) === true, {
+        message: 'The value contains invalid user principal names.'
+    })
+        .optional()
+}).catchall(z.unknown());
 class PlannerPlanSetCommand extends GraphCommand {
     get name() {
         return commands.PLAN_SET;
@@ -18,14 +37,39 @@ class PlannerPlanSetCommand extends GraphCommand {
     get description() {
         return 'Updates a Microsoft Planner plan';
     }
-    constructor() {
-        super();
-        _PlannerPlanSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerPlanSetCommand_instances, "m", _PlannerPlanSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.rosterId].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'id', 'title' or 'rosterId'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'rosterId']
+            }
+        })
+            .refine(opts => !opts.title || [opts.ownerGroupId, opts.ownerGroupName].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'ownerGroupId' or 'ownerGroupName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['ownerGroupId', 'ownerGroupName']
+            }
+        })
+            .refine(opts => !opts.shareWithUserIds || !opts.shareWithUserNames, {
+            message: 'Specify either shareWithUserIds or shareWithUserNames but not both'
+        })
+            .refine(opts => {
+            const allowedCategories = Array.from({ length: 25 }, (_, i) => `category${i + 1}`);
+            const keys = Object.keys(opts);
+            const hasCategoryKey = keys.some(key => key.indexOf('category') !== -1);
+            if (!hasCategoryKey) {
+                return true;
+            }
+            return keys.filter(key => key.indexOf('category') !== -1).every(key => allowedCategories.indexOf(key) !== -1);
+        }, {
+            message: 'Specify category values between category1 to category25'
+        });
     }
     allowUnknownOptions() {
         return true;
@@ -181,108 +225,5 @@ class PlannerPlanSetCommand extends GraphCommand {
         }
     }
 }
-_PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTelemetry = function _PlannerPlanSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
-            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            rosterId: typeof args.options.rosterId !== 'undefined',
-            newTitle: typeof args.options.newTitle !== 'undefined',
-            shareWithUserIds: typeof args.options.shareWithUserIds !== 'undefined',
-            shareWithUserNames: typeof args.options.shareWithUserNames !== 'undefined'
-        });
-    });
-}, _PlannerPlanSetCommand_initOptions = function _PlannerPlanSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--ownerGroupId [ownerGroupId]'
-    }, {
-        option: '--ownerGroupName [ownerGroupName]'
-    }, {
-        option: '--rosterId [rosterId]'
-    }, {
-        option: '--newTitle [newTitle]'
-    }, {
-        option: '--shareWithUserIds [shareWithUserIds]'
-    }, {
-        option: '--shareWithUserNames [shareWithUserNames]'
-    });
-}, _PlannerPlanSetCommand_initValidators = function _PlannerPlanSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.title) {
-            if (args.options.ownerGroupId && !validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
-        }
-        if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
-            return 'Specify either shareWithUserIds or shareWithUserNames but not both';
-        }
-        if (args.options.shareWithUserIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.shareWithUserIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'shareWithUserIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.shareWithUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.shareWithUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'shareWithUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        const allowedCategories = [
-            'category1',
-            'category2',
-            'category3',
-            'category4',
-            'category5',
-            'category6',
-            'category7',
-            'category8',
-            'category9',
-            'category10',
-            'category11',
-            'category12',
-            'category13',
-            'category14',
-            'category15',
-            'category16',
-            'category17',
-            'category18',
-            'category19',
-            'category20',
-            'category21',
-            'category22',
-            'category23',
-            'category24',
-            'category25'
-        ];
-        let invalidCategoryOptions = false;
-        Object.keys(args.options).forEach(key => {
-            if (key.indexOf('category') !== -1 && allowedCategories.indexOf(key) === -1) {
-                invalidCategoryOptions = true;
-            }
-        });
-        if (invalidCategoryOptions) {
-            return 'Specify category values between category1 to category25';
-        }
-        return true;
-    });
-}, _PlannerPlanSetCommand_initOptionSets = function _PlannerPlanSetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'title', 'rosterId']
-    }, {
-        options: ['ownerGroupId', 'ownerGroupName'],
-        runsWhen: (args) => {
-            return args.options.title !== undefined;
-        }
-    });
-}, _PlannerPlanSetCommand_initTypes = function _PlannerPlanSetCommand_initTypes() {
-    this.types.string.push('id', 'title', 'ownerGroupId', 'ownerGroupName', 'rosterId', 'newTitle', 'shareWithUserIds', 'shareWithUserNames');
-};
 export default new PlannerPlanSetCommand();
 //# sourceMappingURL=plan-set.js.map

package/dist/m365/planner/commands/roster/roster-add.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class PlannerRosterAddCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_ADD;
@@ -8,6 +10,9 @@ class PlannerRosterAddCommand extends GraphCommand {
     get description() {
         return 'Creates a new Microsoft Planner Roster';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.verbose) {
             await logger.logToStderr('Creating a new Microsoft Planner Roster');

package/dist/m365/planner/commands/roster/roster-get.js

@@ -1,24 +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 _PlannerRosterGetCommand_instances, _PlannerRosterGetCommand_initOptions, _PlannerRosterGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+});
 class PlannerRosterGetCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_GET;
     }
     get description() {
-        return 'Retrieve information about a specific Microsoft Planner Roster';
+        return 'Gets information about the specific Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterGetCommand_instances, "m", _PlannerRosterGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterGetCommand_instances, "m", _PlannerRosterGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -40,12 +37,5 @@ class PlannerRosterGetCommand extends GraphCommand {
         }
     }
 }
-_PlannerRosterGetCommand_instances = new WeakSet(), _PlannerRosterGetCommand_initOptions = function _PlannerRosterGetCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    });
-}, _PlannerRosterGetCommand_initTypes = function _PlannerRosterGetCommand_initTypes() {
-    this.types.string.push('id');
-};
 export default new PlannerRosterGetCommand();
 //# sourceMappingURL=roster-get.js.map

package/dist/m365/planner/commands/roster/roster-member-add.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 _PlannerRosterMemberAddCommand_instances, _PlannerRosterMemberAddCommand_initTelemetry, _PlannerRosterMemberAddCommand_initOptions, _PlannerRosterMemberAddCommand_initOptionSets, _PlannerRosterMemberAddCommand_initValidators, _PlannerRosterMemberAddCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.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,
+    rosterId: z.string(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value is not a valid user principal name (UPN).'
+    })
+        .optional()
+});
 class PlannerRosterMemberAddCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_MEMBER_ADD;
@@ -16,14 +26,18 @@ class PlannerRosterMemberAddCommand extends GraphCommand {
     get description() {
         return 'Adds a user to a Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterMemberAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberAddCommand_instances, "m", _PlannerRosterMemberAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -50,7 +64,7 @@ class PlannerRosterMemberAddCommand extends GraphCommand {
     }
     async getUserId(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr("Getting the user ID");
+            await logger.logToStderr('Getting the user ID');
         }
         if (args.options.userId) {
             return args.options.userId;
@@ -59,35 +73,5 @@ class PlannerRosterMemberAddCommand extends GraphCommand {
         return userId;
     }
 }
-_PlannerRosterMemberAddCommand_instances = new WeakSet(), _PlannerRosterMemberAddCommand_initTelemetry = function _PlannerRosterMemberAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _PlannerRosterMemberAddCommand_initOptions = function _PlannerRosterMemberAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--rosterId <rosterId>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _PlannerRosterMemberAddCommand_initOptionSets = function _PlannerRosterMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-}, _PlannerRosterMemberAddCommand_initValidators = function _PlannerRosterMemberAddCommand_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 user principal name (UPN)`;
-        }
-        return true;
-    });
-}, _PlannerRosterMemberAddCommand_initTypes = function _PlannerRosterMemberAddCommand_initTypes() {
-    this.types.string.push('rosterId', 'userId', 'userName');
-};
 export default new PlannerRosterMemberAddCommand();
 //# sourceMappingURL=roster-member-add.js.map

package/dist/m365/planner/commands/roster/roster-member-get.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 _PlannerRosterMemberGetCommand_instances, _PlannerRosterMemberGetCommand_initTelemetry, _PlannerRosterMemberGetCommand_initOptions, _PlannerRosterMemberGetCommand_initOptionSets, _PlannerRosterMemberGetCommand_initValidators, _PlannerRosterMemberGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraUser } from '../../../../utils/entraUser.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    rosterId: z.string(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value is not a valid user principal name (UPN).'
+    })
+        .optional()
+});
 class PlannerRosterMemberGetCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_MEMBER_GET;
@@ -16,14 +26,18 @@ class PlannerRosterMemberGetCommand extends GraphCommand {
     get description() {
         return 'Gets a member of the specified Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterMemberGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            message: `Specify exactly one of the following options: 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -52,35 +66,5 @@ class PlannerRosterMemberGetCommand extends GraphCommand {
         return entraUser.getUserIdByUpn(args.options.userName);
     }
 }
-_PlannerRosterMemberGetCommand_instances = new WeakSet(), _PlannerRosterMemberGetCommand_initTelemetry = function _PlannerRosterMemberGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _PlannerRosterMemberGetCommand_initOptions = function _PlannerRosterMemberGetCommand_initOptions() {
-    this.options.unshift({
-        option: '--rosterId <rosterId>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _PlannerRosterMemberGetCommand_initOptionSets = function _PlannerRosterMemberGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-}, _PlannerRosterMemberGetCommand_initValidators = function _PlannerRosterMemberGetCommand_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;
-    });
-}, _PlannerRosterMemberGetCommand_initTypes = function _PlannerRosterMemberGetCommand_initTypes() {
-    this.types.string.push('rosterId', 'userId', 'userName');
-};
 export default new PlannerRosterMemberGetCommand();
 //# sourceMappingURL=roster-member-get.js.map

package/dist/m365/planner/commands/roster/roster-member-list.js

@@ -1,12 +1,12 @@
-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 _PlannerRosterMemberListCommand_instances, _PlannerRosterMemberListCommand_initOptions, _PlannerRosterMemberListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    rosterId: z.string()
+});
 class PlannerRosterMemberListCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_MEMBER_LIST;
@@ -14,11 +14,8 @@ class PlannerRosterMemberListCommand extends GraphCommand {
     get description() {
         return 'Lists members of the specified Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterMemberListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberListCommand_instances, "m", _PlannerRosterMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberListCommand_instances, "m", _PlannerRosterMemberListCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -33,12 +30,5 @@ class PlannerRosterMemberListCommand extends GraphCommand {
         }
     }
 }
-_PlannerRosterMemberListCommand_instances = new WeakSet(), _PlannerRosterMemberListCommand_initOptions = function _PlannerRosterMemberListCommand_initOptions() {
-    this.options.unshift({
-        option: '--rosterId <rosterId>'
-    });
-}, _PlannerRosterMemberListCommand_initTypes = function _PlannerRosterMemberListCommand_initTypes() {
-    this.types.string.push('rosterId');
-};
 export default new PlannerRosterMemberListCommand();
 //# sourceMappingURL=roster-member-list.js.map