@pnp/cli-microsoft365 11.9.0 → 11.10.0-beta.6474466

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,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 _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;
@@ -14,11 +14,8 @@ class PlannerRosterGetCommand extends GraphCommand {
     get description() {
         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

package/dist/m365/planner/commands/roster/roster-member-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 _PlannerRosterMemberRemoveCommand_instances, _PlannerRosterMemberRemoveCommand_initTelemetry, _PlannerRosterMemberRemoveCommand_initOptions, _PlannerRosterMemberRemoveCommand_initOptionSets, _PlannerRosterMemberRemoveCommand_initValidators, _PlannerRosterMemberRemoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -11,6 +7,21 @@ 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,
+    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(),
+    force: z.boolean().optional().alias('f')
+});
 class PlannerRosterMemberRemoveCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_MEMBER_REMOVE;
@@ -18,14 +29,18 @@ class PlannerRosterMemberRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a member from a Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterMemberRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_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) {
@@ -70,45 +85,12 @@ class PlannerRosterMemberRemoveCommand extends GraphCommand {
         if (!args.options.force) {
             const rosterMembers = await odata.getAllItems(`${this.resource}/beta/planner/rosters/${args.options.rosterId}/members?$select=Id`);
             if (rosterMembers.length === 1) {
-                const result = await cli.promptForConfirmation({ message: `You are about to remove the last member of this Roster. When this happens, the Roster and all its contents will be deleted within 30 days. Are you sure you want to proceed?` });
+                const result = await cli.promptForConfirmation({ message: 'You are about to remove the last member of this Roster. When this happens, the Roster and all its contents will be deleted within 30 days. Are you sure you want to proceed?' });
                 return result;
             }
         }
         return true;
     }
 }
-_PlannerRosterMemberRemoveCommand_instances = new WeakSet(), _PlannerRosterMemberRemoveCommand_initTelemetry = function _PlannerRosterMemberRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _PlannerRosterMemberRemoveCommand_initOptions = function _PlannerRosterMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--rosterId <rosterId>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _PlannerRosterMemberRemoveCommand_initOptionSets = function _PlannerRosterMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-}, _PlannerRosterMemberRemoveCommand_initValidators = function _PlannerRosterMemberRemoveCommand_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;
-    });
-}, _PlannerRosterMemberRemoveCommand_initTypes = function _PlannerRosterMemberRemoveCommand_initTypes() {
-    this.types.string.push('rosterId', 'userId', 'userName');
-};
 export default new PlannerRosterMemberRemoveCommand();
 //# sourceMappingURL=roster-member-remove.js.map

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

@@ -1,15 +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 _PlannerRosterPlanListCommand_instances, _PlannerRosterPlanListCommand_initTelemetry, _PlannerRosterPlanListCommand_initOptions, _PlannerRosterPlanListCommand_initValidators, _PlannerRosterPlanListCommand_initTypes, _PlannerRosterPlanListCommand_initOptionSets;
 import auth from '../../../../Auth.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    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 PlannerRosterPlanListCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_PLAN_LIST;
@@ -17,14 +26,18 @@ class PlannerRosterPlanListCommand extends GraphCommand {
     get description() {
         return 'Lists all Microsoft Planner Roster plans for a specific user';
     }
-    constructor() {
-        super();
-        _PlannerRosterPlanListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterPlanListCommand_instances, "m", _PlannerRosterPlanListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterPlanListCommand_instances, "m", _PlannerRosterPlanListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterPlanListCommand_instances, "m", _PlannerRosterPlanListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterPlanListCommand_instances, "m", _PlannerRosterPlanListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterPlanListCommand_instances, "m", _PlannerRosterPlanListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.userId || !opts.userName, {
+            message: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     defaultProperties() {
         return ['id', 'title', 'createdDateTime', 'owner'];
@@ -47,7 +60,7 @@ class PlannerRosterPlanListCommand extends GraphCommand {
         else {
             requestUrl += 'me';
         }
-        requestUrl += `/planner/rosterPlans`;
+        requestUrl += '/planner/rosterPlans';
         try {
             const items = await odata.getAllItems(requestUrl);
             await logger.log(items);
@@ -57,36 +70,5 @@ class PlannerRosterPlanListCommand extends GraphCommand {
         }
     }
 }
-_PlannerRosterPlanListCommand_instances = new WeakSet(), _PlannerRosterPlanListCommand_initTelemetry = function _PlannerRosterPlanListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _PlannerRosterPlanListCommand_initOptions = function _PlannerRosterPlanListCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _PlannerRosterPlanListCommand_initValidators = function _PlannerRosterPlanListCommand_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;
-    });
-}, _PlannerRosterPlanListCommand_initTypes = function _PlannerRosterPlanListCommand_initTypes() {
-    this.types.string.push('userId', 'userName');
-}, _PlannerRosterPlanListCommand_initOptionSets = function _PlannerRosterPlanListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName'],
-        runsWhen: (args) => args.options.userId || args.options.userName
-    });
-};
 export default new PlannerRosterPlanListCommand();
 //# sourceMappingURL=roster-plan-list.js.map

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

@@ -1,13 +1,14 @@
-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 _PlannerRosterRemoveCommand_instances, _PlannerRosterRemoveCommand_initTelemetry, _PlannerRosterRemoveCommand_initOptions, _PlannerRosterRemoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.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(),
+    force: z.boolean().optional().alias('f')
+});
 class PlannerRosterRemoveCommand extends GraphCommand {
     get name() {
         return commands.ROSTER_REMOVE;
@@ -15,12 +16,8 @@ class PlannerRosterRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a Microsoft Planner Roster';
     }
-    constructor() {
-        super();
-        _PlannerRosterRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PlannerRosterRemoveCommand_instances, "m", _PlannerRosterRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterRemoveCommand_instances, "m", _PlannerRosterRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PlannerRosterRemoveCommand_instances, "m", _PlannerRosterRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -52,20 +49,5 @@ class PlannerRosterRemoveCommand extends GraphCommand {
         }
     }
 }
-_PlannerRosterRemoveCommand_instances = new WeakSet(), _PlannerRosterRemoveCommand_initTelemetry = function _PlannerRosterRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _PlannerRosterRemoveCommand_initOptions = function _PlannerRosterRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _PlannerRosterRemoveCommand_initTypes = function _PlannerRosterRemoveCommand_initTypes() {
-    this.types.string.push('id');
-};
 export default new PlannerRosterRemoveCommand();
 //# sourceMappingURL=roster-remove.js.map