@pnp/cli-microsoft365 11.9.0-beta.8c1ee05 → 11.9.0-beta.9bd71dd

package/dist/m365/entra/commands/oauth2grant/oauth2grant-set.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 _EntraOAuth2GrantSetCommand_instances, _EntraOAuth2GrantSetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({
+    grantId: z.string().alias('i'),
+    scope: z.string().alias('s')
+}).strict();
 class EntraOAuth2GrantSetCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_SET;
@@ -15,10 +16,8 @@ class EntraOAuth2GrantSetCommand extends GraphCommand {
     get description() {
         return 'Update OAuth2 permissions for the service principal';
     }
-    constructor() {
-        super();
-        _EntraOAuth2GrantSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantSetCommand_instances, "m", _EntraOAuth2GrantSetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -42,12 +41,5 @@ class EntraOAuth2GrantSetCommand extends GraphCommand {
         }
     }
 }
-_EntraOAuth2GrantSetCommand_instances = new WeakSet(), _EntraOAuth2GrantSetCommand_initOptions = function _EntraOAuth2GrantSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --grantId <grantId>'
-    }, {
-        option: '-s, --scope <scope>'
-    });
-};
 export default new EntraOAuth2GrantSetCommand();
 //# sourceMappingURL=oauth2grant-set.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-add.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 _EntraPimRoleAssignmentAddCommand_instances, _EntraPimRoleAssignmentAddCommand_initTelemetry, _EntraPimRoleAssignmentAddCommand_initOptions, _EntraPimRoleAssignmentAddCommand_initValidators, _EntraPimRoleAssignmentAddCommand_initOptionSets;
+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';
@@ -13,6 +9,30 @@ import { entraUser } from '../../../../utils/entraUser.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    roleDefinitionName: z.string().optional().alias('n'),
+    roleDefinitionId: z.uuid().optional().alias('i'),
+    userId: z.uuid().optional(),
+    userName: z.string().optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    administrativeUnitId: z.uuid().optional(),
+    applicationId: z.uuid().optional(),
+    justification: z.string().optional().alias('j'),
+    startDateTime: z.string().refine(date => validation.isValidISODateTime(date), {
+        error: e => `'${e.input}' is not a valid ISO 8601 date time string.`
+    }).optional().alias('s'),
+    endDateTime: z.string().refine(date => validation.isValidISODateTime(date), {
+        error: e => `'${e.input}' is not a valid ISO 8601 date time string.`
+    }).optional().alias('e'),
+    duration: z.string().refine(dur => validation.isValidISODuration(dur), {
+        error: e => `'${e.input}' is not a valid ISO 8601 duration.`
+    }).optional().alias('d'),
+    ticketNumber: z.string().optional(),
+    ticketSystem: z.string().optional(),
+    noExpiration: z.boolean().default(false)
+});
 class EntraPimRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.PIM_ROLE_ASSIGNMENT_ADD;
@@ -20,13 +40,48 @@ class EntraPimRoleAssignmentAddCommand extends GraphCommand {
     get description() {
         return 'Request activation of an Entra role assignment for a user or group';
     }
-    constructor() {
-        super();
-        _EntraPimRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
+            message: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
+        })
+            .refine(options => {
+            const specified = [options.noExpiration ? true : undefined, options.endDateTime, options.duration].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: noExpiration, endDateTime, duration',
+            params: {
+                customCode: 'optionSet',
+                options: ['noExpiration', 'endDateTime', 'duration']
+            }
+        })
+            .refine(options => {
+            const specified = [options.userId, options.userName, options.groupId, options.groupName].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: userId, userName, groupId, groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        })
+            .refine(options => {
+            const specified = [options.administrativeUnitId, options.applicationId].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: administrativeUnitId, applicationId',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'applicationId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const { userId, userName, groupId, groupName, startDateTime, endDateTime, ticketNumber, ticketSystem } = args.options;
@@ -128,106 +183,5 @@ class EntraPimRoleAssignmentAddCommand extends GraphCommand {
         return '/';
     }
 }
-_EntraPimRoleAssignmentAddCommand_instances = new WeakSet(), _EntraPimRoleAssignmentAddCommand_initTelemetry = function _EntraPimRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
-            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            applicationId: typeof args.options.applicationId !== 'undefined',
-            justification: typeof args.options.justification !== 'undefined',
-            startDateTime: typeof args.options.startDateTime !== 'undefined',
-            endDateTime: typeof args.options.endDateTime !== 'undefined',
-            duration: typeof args.options.duration !== 'undefined',
-            ticketNumber: typeof args.options.ticketNumber !== 'undefined',
-            ticketSystem: typeof args.options.ticketSystem !== 'undefined',
-            noExpiration: !!args.options.noExpiration
-        });
-    });
-}, _EntraPimRoleAssignmentAddCommand_initOptions = function _EntraPimRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --roleDefinitionName [roleDefinitionName]'
-    }, {
-        option: '-i, --roleDefinitionId [roleDefinitionId]'
-    }, {
-        option: "--userId [userId]"
-    }, {
-        option: "--userName [userName]"
-    }, {
-        option: "--groupId [groupId]"
-    }, {
-        option: "--groupName [groupName]"
-    }, {
-        option: "--administrativeUnitId [administrativeUnitId]"
-    }, {
-        option: "--applicationId [applicationId]"
-    }, {
-        option: "-j, --justification [justification]"
-    }, {
-        option: "-s, --startDateTime [startDateTime]"
-    }, {
-        option: "-e, --endDateTime [endDateTime]"
-    }, {
-        option: "-d, --duration [duration]"
-    }, {
-        option: "--ticketNumber [ticketNumber]"
-    }, {
-        option: "--ticketSystem [ticketSystem]"
-    }, {
-        option: "--no-expiration"
-    });
-}, _EntraPimRoleAssignmentAddCommand_initValidators = function _EntraPimRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
-            return `${args.options.roleDefinitionId} 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.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
-            return `${args.options.startDateTime} is not a valid ISO 8601 date time string`;
-        }
-        if (args.options.endDateTime && !validation.isValidISODateTime(args.options.endDateTime)) {
-            return `${args.options.endDateTime} is not a valid ISO 8601 date time string`;
-        }
-        if (args.options.duration && !validation.isValidISODuration(args.options.duration)) {
-            return `${args.options.duration} is not a valid ISO 8601 duration`;
-        }
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.applicationId && !validation.isValidGuid(args.options.applicationId)) {
-            return `${args.options.applicationId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraPimRoleAssignmentAddCommand_initOptionSets = function _EntraPimRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['roleDefinitionName', 'roleDefinitionId'] });
-    this.optionSets.push({
-        options: ['noExpiration', 'endDateTime', 'duration'],
-        runsWhen: (args) => {
-            return !!args.options.noExpiration || args.options.endDateTime !== undefined || args.options.duration !== undefined;
-        }
-    });
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName'],
-        runsWhen: (args) => {
-            return args.options.userId !== undefined || args.options.userName !== undefined || args.options.groupId !== undefined || args.options.groupName !== undefined;
-        }
-    });
-    this.optionSets.push({
-        options: ['administrativeUnitId', 'applicationId'],
-        runsWhen: (args) => {
-            return args.options.administrativeUnitId !== undefined || args.options.applicationId !== undefined;
-        }
-    });
-};
 export default new EntraPimRoleAssignmentAddCommand();
 //# sourceMappingURL=pim-role-assignment-add.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-eligibility-list.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 _EntraPimRoleAssignmentEligibilityListCommand_instances, _EntraPimRoleAssignmentEligibilityListCommand_initTelemetry, _EntraPimRoleAssignmentEligibilityListCommand_initOptions, _EntraPimRoleAssignmentEligibilityListCommand_initValidators, _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets;
+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 { entraUser } from '../../../../utils/entraUser.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
+        error: e => `'${e.input}' is not a valid user principal name for option 'userName'.`
+    }).optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    withPrincipalDetails: z.boolean().default(false)
+});
 class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
     get name() {
         return commands.PIM_ROLE_ASSIGNMENT_ELIGIBILITY_LIST;
@@ -17,17 +23,25 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of eligible roles a user or group can be assigned to';
     }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const specified = [options.userId, options.userName, options.groupId, options.groupName].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: userId, userName, groupId, groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        });
+    }
     defaultProperties() {
         return ['roleDefinitionId', 'roleDefinitionName', 'principalId'];
     }
-    constructor() {
-        super();
-        _EntraPimRoleAssignmentEligibilityListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets).call(this);
-    }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of eligible roles for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
@@ -79,46 +93,5 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
         return principalId;
     }
 }
-_EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraPimRoleAssignmentEligibilityListCommand_initTelemetry = function _EntraPimRoleAssignmentEligibilityListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            withPrincipalDetails: !!args.options.withPrincipalDetails
-        });
-    });
-}, _EntraPimRoleAssignmentEligibilityListCommand_initOptions = function _EntraPimRoleAssignmentEligibilityListCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--withPrincipalDetails'
-    });
-}, _EntraPimRoleAssignmentEligibilityListCommand_initValidators = function _EntraPimRoleAssignmentEligibilityListCommand_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 option 'userId'.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `'${args.options.userName} is not a valid user principal name for option 'userName'.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
-        }
-        return true;
-    });
-}, _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets = function _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName'],
-        runsWhen: (args) => args.options.userId || args.options.userName || args.options.groupName || args.options.groupId
-    });
-};
 export default new EntraPimRoleAssignmentEligibilityListCommand();
 //# sourceMappingURL=pim-role-assignment-eligibility-list.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-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 _EntraPimRoleAssignmentListCommand_instances, _EntraPimRoleAssignmentListCommand_initTelemetry, _EntraPimRoleAssignmentListCommand_initOptions, _EntraPimRoleAssignmentListCommand_initValidators, _EntraPimRoleAssignmentListCommand_initOptionSets;
+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 { entraUser } from '../../../../utils/entraUser.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.uuid().optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
+        error: e => `'${e.input}' is not a valid user principal name for option 'userName'.`
+    }).optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    startDateTime: z.string().refine(date => validation.isValidISODateTime(date), {
+        error: e => `'${e.input}' is not a valid ISO 8601 date time string.`
+    }).optional().alias('s'),
+    withPrincipalDetails: z.boolean().default(false)
+});
 class EntraPimRoleAssignmentListCommand extends GraphCommand {
     get name() {
         return commands.PIM_ROLE_ASSIGNMENT_LIST;
@@ -17,13 +26,21 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of Entra role assignments for a user or group';
     }
-    constructor() {
-        super();
-        _EntraPimRoleAssignmentListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const specified = [options.userId, options.userName, options.groupId, options.groupName].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: userId, userName, groupId, groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const queryParameters = [];
@@ -74,49 +91,5 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
         return principalId;
     }
 }
-_EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssignmentListCommand_initTelemetry = function _EntraPimRoleAssignmentListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            startDateTime: typeof args.options.startDateTime !== 'undefined',
-            withPrincipalDetails: !!args.options.withPrincipalDetails
-        });
-    });
-}, _EntraPimRoleAssignmentListCommand_initOptions = function _EntraPimRoleAssignmentListCommand_initOptions() {
-    this.options.unshift({
-        option: "--userId [userId]"
-    }, {
-        option: "--userName [userName]"
-    }, {
-        option: "--groupId [groupId]"
-    }, {
-        option: "--groupName [groupName]"
-    }, {
-        option: "-s, --startDateTime [startDateTime]"
-    }, {
-        option: "--withPrincipalDetails"
-    });
-}, _EntraPimRoleAssignmentListCommand_initValidators = function _EntraPimRoleAssignmentListCommand_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.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
-            return `${args.options.startDateTime} is not a valid ISO 8601 date time string`;
-        }
-        return true;
-    });
-}, _EntraPimRoleAssignmentListCommand_initOptionSets = function _EntraPimRoleAssignmentListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName'],
-        runsWhen: (args) => args.options.userId || args.options.userName || args.options.groupId || args.options.groupName
-    });
-};
 export default new EntraPimRoleAssignmentListCommand();
 //# sourceMappingURL=pim-role-assignment-list.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-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 _EntraPimRoleAssignmentRemoveCommand_instances, _EntraPimRoleAssignmentRemoveCommand_initTelemetry, _EntraPimRoleAssignmentRemoveCommand_initOptions, _EntraPimRoleAssignmentRemoveCommand_initValidators, _EntraPimRoleAssignmentRemoveCommand_initOptionSets, _EntraPimRoleAssignmentRemoveCommand_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';
@@ -13,6 +9,22 @@ import { entraUser } from '../../../../utils/entraUser.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    roleDefinitionName: z.string().optional().alias('n'),
+    roleDefinitionId: z.uuid().optional().alias('i'),
+    userId: z.uuid().optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), {
+        error: e => `'${e.input}' is not a valid user principal name for option 'userName'.`
+    }).optional(),
+    groupId: z.uuid().optional(),
+    groupName: z.string().optional(),
+    administrativeUnitId: z.uuid().optional(),
+    applicationId: z.uuid().optional(),
+    justification: z.string().optional().alias('j'),
+    ticketNumber: z.string().optional(),
+    ticketSystem: z.string().optional()
+});
 class EntraPimRoleAssignmentRemoveCommand extends GraphCommand {
     get name() {
         return commands.PIM_ROLE_ASSIGNMENT_REMOVE;
@@ -20,14 +32,38 @@ class EntraPimRoleAssignmentRemoveCommand extends GraphCommand {
     get description() {
         return 'Request deactivation of an Entra role assignment for a user or group';
     }
-    constructor() {
-        super();
-        _EntraPimRoleAssignmentRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentRemoveCommand_instances, "m", _EntraPimRoleAssignmentRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentRemoveCommand_instances, "m", _EntraPimRoleAssignmentRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentRemoveCommand_instances, "m", _EntraPimRoleAssignmentRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentRemoveCommand_instances, "m", _EntraPimRoleAssignmentRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleAssignmentRemoveCommand_instances, "m", _EntraPimRoleAssignmentRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
+            message: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
+        })
+            .refine(options => {
+            const specified = [options.userId, options.userName, options.groupId, options.groupName].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: userId, userName, groupId, groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName']
+            }
+        })
+            .refine(options => {
+            const specified = [options.administrativeUnitId, options.applicationId].filter(o => o !== undefined).length;
+            return specified <= 1;
+        }, {
+            message: 'Specify only one of the following options: administrativeUnitId, applicationId',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'applicationId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const { userId, userName, groupId, groupName, ticketNumber, ticketSystem } = args.options;
@@ -106,81 +142,5 @@ class EntraPimRoleAssignmentRemoveCommand extends GraphCommand {
         return '/';
     }
 }
-_EntraPimRoleAssignmentRemoveCommand_instances = new WeakSet(), _EntraPimRoleAssignmentRemoveCommand_initTelemetry = function _EntraPimRoleAssignmentRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
-            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            applicationId: typeof args.options.applicationId !== 'undefined',
-            justification: typeof args.options.justification !== 'undefined',
-            ticketNumber: typeof args.options.ticketNumber !== 'undefined',
-            ticketSystem: typeof args.options.ticketSystem !== 'undefined'
-        });
-    });
-}, _EntraPimRoleAssignmentRemoveCommand_initOptions = function _EntraPimRoleAssignmentRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --roleDefinitionName [roleDefinitionName]'
-    }, {
-        option: '-i, --roleDefinitionId [roleDefinitionId]'
-    }, {
-        option: "--userId [userId]"
-    }, {
-        option: "--userName [userName]"
-    }, {
-        option: "--groupId [groupId]"
-    }, {
-        option: "--groupName [groupName]"
-    }, {
-        option: "--administrativeUnitId [administrativeUnitId]"
-    }, {
-        option: "--applicationId [applicationId]"
-    }, {
-        option: "-j, --justification [justification]"
-    }, {
-        option: "--ticketNumber [ticketNumber]"
-    }, {
-        option: "--ticketSystem [ticketSystem]"
-    });
-}, _EntraPimRoleAssignmentRemoveCommand_initValidators = function _EntraPimRoleAssignmentRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
-            return `${args.options.roleDefinitionId} 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.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.applicationId && !validation.isValidGuid(args.options.applicationId)) {
-            return `${args.options.applicationId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraPimRoleAssignmentRemoveCommand_initOptionSets = function _EntraPimRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['roleDefinitionName', 'roleDefinitionId'] });
-    this.optionSets.push({
-        options: ['userId', 'userName', 'groupId', 'groupName'],
-        runsWhen: (args) => {
-            return args.options.userId !== undefined || args.options.userName !== undefined || args.options.groupId !== undefined || args.options.groupName !== undefined;
-        }
-    });
-    this.optionSets.push({
-        options: ['administrativeUnitId', 'applicationId'],
-        runsWhen: (args) => {
-            return args.options.administrativeUnitId !== undefined || args.options.applicationId !== undefined;
-        }
-    });
-}, _EntraPimRoleAssignmentRemoveCommand_initTypes = function _EntraPimRoleAssignmentRemoveCommand_initTypes() {
-    this.types.string.push('userId', 'userName', 'groupId', 'groupName', 'administrativeUnitId', 'applicationId', 'roleDefinitionName', 'roleDefinitionId', 'justification', 'ticketNumber', 'ticketSystem');
-};
 export default new EntraPimRoleAssignmentRemoveCommand();
 //# sourceMappingURL=pim-role-assignment-remove.js.map