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

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

package/dist/m365/entra/commands/user/user-add.js

@@ -1,13 +1,33 @@
-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 _EntraUserAddCommand_instances, _EntraUserAddCommand_initTelemetry, _EntraUserAddCommand_initOptions, _EntraUserAddCommand_initValidators, _EntraUserAddCommand_initOptionSets, _EntraUserAddCommand_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';
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }),
+    accountEnabled: z.boolean().optional(),
+    mailNickname: z.string().optional(),
+    password: z.string().optional(),
+    firstName: z.string().max(64, { error: `The maximum amount of characters for 'firstName' is 64.` }).optional(),
+    lastName: z.string().max(64, { error: `The maximum amount of characters for 'lastName' is 64.` }).optional(),
+    forceChangePasswordNextSignIn: z.boolean().optional(),
+    forceChangePasswordNextSignInWithMfa: z.boolean().optional(),
+    usageLocation: z.string().regex(/^[a-zA-Z]{2}$/, { error: e => `'${e.input}' is not a valid usageLocation.` }).optional(),
+    officeLocation: z.string().optional(),
+    jobTitle: z.string().max(128, { error: `The maximum amount of characters for 'jobTitle' is 128.` }).optional(),
+    companyName: z.string().max(64, { error: `The maximum amount of characters for 'companyName' is 64.` }).optional(),
+    department: z.string().max(64, { error: `The maximum amount of characters for 'department' is 64.` }).optional(),
+    preferredLanguage: z.string().min(2, { error: e => `'${e.input}' is not a valid preferredLanguage.` }).optional(),
+    managerUserId: z.uuid().optional(),
+    managerUserName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name.`
+    }).optional()
+});
 class EntraUserAddCommand extends GraphCommand {
     get name() {
         return commands.USER_ADD;
@@ -18,14 +38,18 @@ class EntraUserAddCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraUserAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserAddCommand_instances, "m", _EntraUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserAddCommand_instances, "m", _EntraUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserAddCommand_instances, "m", _EntraUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserAddCommand_instances, "m", _EntraUserAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraUserAddCommand_instances, "m", _EntraUserAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.managerUserId && options.managerUserName), {
+            error: `Specify either 'managerUserId' or 'managerUserName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['managerUserId', 'managerUserName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -81,7 +105,7 @@ class EntraUserAddCommand extends GraphCommand {
             department: options.department,
             preferredLanguage: options.preferredLanguage
         };
-        this.addUnknownOptionsToPayload(requestBody, options);
+        this.addUnknownOptionsToPayloadZod(requestBody, options);
         return requestBody;
     }
     /**
@@ -112,108 +136,5 @@ class EntraUserAddCommand extends GraphCommand {
         return characterArray;
     }
 }
-_EntraUserAddCommand_instances = new WeakSet(), _EntraUserAddCommand_initTelemetry = function _EntraUserAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            accountEnabled: typeof args.options.accountEnabled !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            password: typeof args.options.password !== 'undefined',
-            firstName: typeof args.options.firstName !== 'undefined',
-            lastName: typeof args.options.lastName !== 'undefined',
-            forceChangePasswordNextSignIn: !!args.options.forceChangePasswordNextSignIn,
-            forceChangePasswordNextSignInWithMfa: !!args.options.forceChangePasswordNextSignInWithMfa,
-            usageLocation: typeof args.options.usageLocation !== 'undefined',
-            officeLocation: typeof args.options.officeLocation !== 'undefined',
-            jobTitle: typeof args.options.jobTitle !== 'undefined',
-            companyName: typeof args.options.companyName !== 'undefined',
-            department: typeof args.options.department !== 'undefined',
-            preferredLanguage: typeof args.options.preferredLanguage !== 'undefined',
-            managerUserId: typeof args.options.managerUserId !== 'undefined',
-            managerUserName: typeof args.options.managerUserName !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _EntraUserAddCommand_initOptions = function _EntraUserAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--displayName <displayName>'
-    }, {
-        option: '--userName <userName>'
-    }, {
-        option: '--accountEnabled [accountEnabled]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--mailNickname [mailNickname]'
-    }, {
-        option: '--password [password]'
-    }, {
-        option: '--firstName [firstName]'
-    }, {
-        option: '--lastName [lastName]'
-    }, {
-        option: '--forceChangePasswordNextSignIn'
-    }, {
-        option: '--forceChangePasswordNextSignInWithMfa'
-    }, {
-        option: '--usageLocation [usageLocation]'
-    }, {
-        option: '--officeLocation [officeLocation]'
-    }, {
-        option: '--jobTitle [jobTitle]'
-    }, {
-        option: '--companyName [companyName]'
-    }, {
-        option: '--department [department]'
-    }, {
-        option: '--preferredLanguage [preferredLanguage]'
-    }, {
-        option: '--managerUserId [managerUserId]'
-    }, {
-        option: '--managerUserName [managerUserName]'
-    });
-}, _EntraUserAddCommand_initValidators = function _EntraUserAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        if (args.options.usageLocation) {
-            const regex = new RegExp('^[a-zA-Z]{2}$');
-            if (!regex.test(args.options.usageLocation)) {
-                return `'${args.options.usageLocation}' is not a valid usageLocation.`;
-            }
-        }
-        if (args.options.preferredLanguage && args.options.preferredLanguage.length < 2) {
-            return `'${args.options.preferredLanguage}' is not a valid preferredLanguage`;
-        }
-        if (args.options.firstName && args.options.firstName.length > 64) {
-            return `The maximum amount of characters for 'firstName' is 64.`;
-        }
-        if (args.options.lastName && args.options.lastName.length > 64) {
-            return `The maximum amount of characters for 'lastName' is 64.`;
-        }
-        if (args.options.jobTitle && args.options.jobTitle.length > 128) {
-            return `The maximum amount of characters for 'jobTitle' is 128.`;
-        }
-        if (args.options.companyName && args.options.companyName.length > 64) {
-            return `The maximum amount of characters for 'companyName' is 64.`;
-        }
-        if (args.options.department && args.options.department.length > 64) {
-            return `The maximum amount of characters for 'department' is 64.`;
-        }
-        if (args.options.managerUserName && !validation.isValidUserPrincipalName(args.options.managerUserName)) {
-            return `'${args.options.managerUserName}' is not a valid user principal name.`;
-        }
-        if (args.options.managerUserId && !validation.isValidGuid(args.options.managerUserId)) {
-            return `'${args.options.managerUserId}' is not a valid GUID.`;
-        }
-        return true;
-    });
-}, _EntraUserAddCommand_initOptionSets = function _EntraUserAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['managerUserId', 'managerUserName'],
-        runsWhen: (args) => args.options.managerId || args.options.managerUserName
-    });
-}, _EntraUserAddCommand_initTypes = function _EntraUserAddCommand_initTypes() {
-    this.types.boolean.push('accountEnabled');
-};
 export default new EntraUserAddCommand();
 //# sourceMappingURL=user-add.js.map

package/dist/m365/entra/commands/user/user-get.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 _EntraUserGetCommand_instances, _EntraUserGetCommand_initTelemetry, _EntraUserGetCommand_initOptions, _EntraUserGetCommand_initValidators, _EntraUserGetCommand_initOptionSets;
+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';
 import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }).optional().alias('n'),
+    email: z.string().optional(),
+    properties: z.string().optional().alias('p'),
+    withManager: z.boolean().optional()
+});
 class EntraUserGetCommand extends GraphCommand {
     get name() {
         return commands.USER_GET;
@@ -17,13 +23,18 @@ class EntraUserGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specified user';
     }
-    constructor() {
-        super();
-        _EntraUserGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.userName, options.email].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'id', 'userName', or 'email'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'userName', 'email']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -71,41 +82,5 @@ class EntraUserGetCommand extends GraphCommand {
             : `${this.resource}/v1.0/users/${userIdOrPrincipalName}${queryString}`;
     }
 }
-_EntraUserGetCommand_instances = new WeakSet(), _EntraUserGetCommand_initTelemetry = function _EntraUserGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            properties: args.options.properties,
-            withManager: typeof args.options.withManager !== 'undefined'
-        });
-    });
-}, _EntraUserGetCommand_initOptions = function _EntraUserGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '-p, --properties [properties]'
-    }, {
-        option: '--withManager'
-    });
-}, _EntraUserGetCommand_initValidators = function _EntraUserGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        return true;
-    });
-}, _EntraUserGetCommand_initOptionSets = function _EntraUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'userName', 'email'] });
-};
 export default new EntraUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/entra/commands/user/user-groupmembership-list.js

@@ -1,14 +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 _EntraUserGroupmembershipListCommand_instances, _EntraUserGroupmembershipListCommand_initTelemetry, _EntraUserGroupmembershipListCommand_initOptions, _EntraUserGroupmembershipListCommand_initValidators, _EntraUserGroupmembershipListCommand_initOptionSets;
+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,
+    userId: z.uuid().optional().alias('i'),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name.`
+    }).optional().alias('n'),
+    userEmail: z.string().refine(email => validation.isValidUserPrincipalName(email), {
+        error: e => `'${e.input}' is not a valid user email.`
+    }).optional().alias('e'),
+    securityEnabledOnly: z.boolean().optional()
+});
 class EntraUserGroupmembershipListCommand extends GraphCommand {
     get name() {
         return commands.USER_GROUPMEMBERSHIP_LIST;
@@ -16,13 +23,18 @@ class EntraUserGroupmembershipListCommand extends GraphCommand {
     get description() {
         return 'Retrieves all groups where the user is a member of';
     }
-    constructor() {
-        super();
-        _EntraUserGroupmembershipListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserGroupmembershipListCommand_instances, "m", _EntraUserGroupmembershipListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserGroupmembershipListCommand_instances, "m", _EntraUserGroupmembershipListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserGroupmembershipListCommand_instances, "m", _EntraUserGroupmembershipListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserGroupmembershipListCommand_instances, "m", _EntraUserGroupmembershipListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.userId, options.userName, options.userEmail].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'userId', 'userName', or 'userEmail'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'userEmail']
+            }
+        });
     }
     async commandAction(logger, args) {
         let userId = args.options.userId;
@@ -53,40 +65,5 @@ class EntraUserGroupmembershipListCommand extends GraphCommand {
         }
     }
 }
-_EntraUserGroupmembershipListCommand_instances = new WeakSet(), _EntraUserGroupmembershipListCommand_initTelemetry = function _EntraUserGroupmembershipListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            userEmail: typeof args.options.userEmail !== 'undefined',
-            securityEnabledOnly: !!args.options.securityEnabledOnly
-        });
-    });
-}, _EntraUserGroupmembershipListCommand_initOptions = function _EntraUserGroupmembershipListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --userId [userId]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '-e, --userEmail [userEmail]'
-    }, {
-        option: '--securityEnabledOnly [securityEnabledOnly]'
-    });
-}, _EntraUserGroupmembershipListCommand_initValidators = function _EntraUserGroupmembershipListCommand_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`;
-        }
-        if (args.options.userEmail && !validation.isValidUserPrincipalName(args.options.userEmail)) {
-            return `${args.options.userEmail} is not a valid user email`;
-        }
-        return true;
-    });
-}, _EntraUserGroupmembershipListCommand_initOptionSets = function _EntraUserGroupmembershipListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName', 'userEmail'] });
-};
 export default new EntraUserGroupmembershipListCommand();
 //# sourceMappingURL=user-groupmembership-list.js.map