@pnp/cli-microsoft365 11.9.0-beta.93bd508 → 11.9.0-beta.9bd71dd

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

package/dist/m365/entra/commands/pim/pim-role-request-list.js

@@ -1,15 +1,29 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraPimRoleRequestListCommand_instances, _EntraPimRoleRequestListCommand_initTelemetry, _EntraPimRoleRequestListCommand_initOptions, _EntraPimRoleRequestListCommand_initValidators, _EntraPimRoleRequestListCommand_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';
+const allowedStatuses = ['Canceled', 'Denied', 'Failed', 'Granted', 'PendingAdminDecision', 'PendingApproval', 'PendingProvisioning', 'PendingScheduleCreation', 'Provisioned', 'Revoked', 'ScheduleCreated'];
+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(),
+    createdDateTime: z.string().refine(date => validation.isValidISODateTime(date), {
+        error: e => `'${e.input}' is not a valid ISO 8601 date time string for option 'createdDateTime'.`
+    }).optional().alias('c'),
+    status: z.preprocess(val => {
+        const target = String(val).toLowerCase();
+        return allowedStatuses.find(s => s.toLowerCase() === target) ?? val;
+    }, z.enum(allowedStatuses)).optional().alias('s'),
+    withPrincipalDetails: z.boolean().default(false)
+});
 class EntraPimRoleRequestListCommand extends GraphCommand {
     get name() {
         return commands.PIM_ROLE_REQUEST_LIST;
@@ -17,18 +31,25 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of PIM requests for roles';
     }
+    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 ['id', 'roleDefinitionName', 'principalId'];
     }
-    constructor() {
-        super();
-        _EntraPimRoleRequestListCommand_instances.add(this);
-        this.allowedStatuses = ['Canceled', 'Denied', 'Failed', 'Granted', 'PendingAdminDecision', 'PendingApproval', 'PendingProvisioning', 'PendingScheduleCreation', 'Provisioned', 'Revoked', 'ScheduleCreated'];
-        __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptionSets).call(this);
-    }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of PIM roles requests for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
@@ -91,59 +112,5 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
         return principalId;
     }
 }
-_EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestListCommand_initTelemetry = function _EntraPimRoleRequestListCommand_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',
-            createdDateTime: typeof args.options.createdDateTime !== 'undefined',
-            status: typeof args.options.status !== 'undefined',
-            withPrincipalDetails: !!args.options.withPrincipalDetails
-        });
-    });
-}, _EntraPimRoleRequestListCommand_initOptions = function _EntraPimRoleRequestListCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '-c, --createdDateTime [createdDateTime]'
-    }, {
-        option: '-s, --status [status]',
-        autocomplete: this.allowedStatuses
-    }, {
-        option: '--withPrincipalDetails'
-    });
-}, _EntraPimRoleRequestListCommand_initValidators = function _EntraPimRoleRequestListCommand_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'`;
-        }
-        if (args.options.createdDateTime && !validation.isValidISODateTime(args.options.createdDateTime)) {
-            return `'${args.options.createdDateTime}' is not a valid ISO 8601 date time string for option 'createdDateTime'`;
-        }
-        if (args.options.status && !this.allowedStatuses.some(status => status.toLowerCase() === args.options.status.toLowerCase())) {
-            return `'${args.options.status}' for option 'status' must be one of the following values: ${this.allowedStatuses.join(', ')}.`;
-        }
-        return true;
-    });
-}, _EntraPimRoleRequestListCommand_initOptionSets = function _EntraPimRoleRequestListCommand_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 EntraPimRoleRequestListCommand();
 //# sourceMappingURL=pim-role-request-list.js.map

package/dist/m365/entra/commands/policy/policy-list.js

@@ -1,16 +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 _EntraPolicyListCommand_instances, _a, _EntraPolicyListCommand_initTelemetry, _EntraPolicyListCommand_initOptions, _EntraPolicyListCommand_initValidators;
+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';
 const policyEndPoints = {
     activitybasedtimeout: "activityBasedTimeoutPolicies",
     adminconsentrequest: "adminConsentRequestPolicy",
-    appManagement: "appManagementPolicies",
+    appmanagement: "appManagementPolicies",
     authenticationflows: "authenticationFlowsPolicy",
     authenticationmethods: "authenticationMethodsPolicy",
     authenticationstrength: "authenticationStrengthPolicies",
@@ -28,6 +24,14 @@ const policyEndPoints = {
     tokenissuance: "tokenIssuancePolicies",
     tokenlifetime: "tokenLifetimePolicies"
 };
+const supportedPolicyTypes = ['activityBasedTimeout', 'adminConsentRequest', 'appManagement', 'authenticationFlows', 'authenticationMethods', 'authenticationStrength', 'authorization', 'claimsMapping', 'conditionalAccess', 'crossTenantAccess', 'defaultAppManagement', 'deviceRegistration', 'featureRolloutPolicy', 'homeRealmDiscovery', 'identitySecurityDefaultsEnforcement', 'permissionGrant', 'roleManagement', 'tokenIssuance', 'tokenLifetime'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.preprocess(val => {
+        const target = String(val).toLowerCase();
+        return supportedPolicyTypes.find(t => t.toLowerCase() === target) ?? val;
+    }, z.enum(supportedPolicyTypes)).optional().alias('t')
+});
 class EntraPolicyListCommand extends GraphCommand {
     get name() {
         return commands.POLICY_LIST;
@@ -35,12 +39,8 @@ class EntraPolicyListCommand extends GraphCommand {
     get description() {
         return 'Returns policies from Entra ID';
     }
-    constructor() {
-        super();
-        _EntraPolicyListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraPolicyListCommand_instances, "m", _EntraPolicyListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraPolicyListCommand_instances, "m", _EntraPolicyListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraPolicyListCommand_instances, "m", _EntraPolicyListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
         return ['id', 'displayName', 'isOrganizationDefault'];
@@ -96,48 +96,5 @@ class EntraPolicyListCommand extends GraphCommand {
         }
     }
 }
-_a = EntraPolicyListCommand, _EntraPolicyListCommand_instances = new WeakSet(), _EntraPolicyListCommand_initTelemetry = function _EntraPolicyListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            policyType: args.options.type || 'all'
-        });
-    });
-}, _EntraPolicyListCommand_initOptions = function _EntraPolicyListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: _a.supportedPolicyTypes
-    });
-}, _EntraPolicyListCommand_initValidators = function _EntraPolicyListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            const policyType = args.options.type.toLowerCase();
-            if (!_a.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
-                return `${args.options.type} is not a valid type. Allowed values are ${_a.supportedPolicyTypes.join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
-EntraPolicyListCommand.supportedPolicyTypes = [
-    'activityBasedTimeout',
-    'adminConsentRequest',
-    'appManagement',
-    'authenticationFlows',
-    'authenticationMethods',
-    'authenticationStrength',
-    'authorization',
-    'claimsMapping',
-    'conditionalAccess',
-    'crossTenantAccess',
-    'defaultAppManagement',
-    'deviceRegistration',
-    'featureRolloutPolicy',
-    'homeRealmDiscovery',
-    'identitySecurityDefaultsEnforcement',
-    'permissionGrant',
-    'roleManagement',
-    'tokenIssuance',
-    'tokenLifetime'
-];
 export default new EntraPolicyListCommand();
 //# sourceMappingURL=policy-list.js.map