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

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

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

@@ -1,12 +1,18 @@
-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 _EntraUserGuestAddCommand_instances, _EntraUserGuestAddCommand_initTelemetry, _EntraUserGuestAddCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    emailAddress: z.string(),
+    displayName: z.string().optional(),
+    inviteRedirectUrl: z.string().optional(),
+    welcomeMessage: z.string().optional(),
+    messageLanguage: z.string().optional(),
+    ccRecipients: z.string().optional(),
+    sendInvitationMessage: z.boolean().optional()
+});
 class EntraUserGuestAddCommand extends GraphCommand {
     get name() {
         return commands.USER_GUEST_ADD;
@@ -14,11 +20,8 @@ class EntraUserGuestAddCommand extends GraphCommand {
     get description() {
         return 'Invite an external user to the organization';
     }
-    constructor() {
-        super();
-        _EntraUserGuestAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserGuestAddCommand_instances, "m", _EntraUserGuestAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserGuestAddCommand_instances, "m", _EntraUserGuestAddCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -55,33 +58,5 @@ class EntraUserGuestAddCommand extends GraphCommand {
         }));
     }
 }
-_EntraUserGuestAddCommand_instances = new WeakSet(), _EntraUserGuestAddCommand_initTelemetry = function _EntraUserGuestAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            inviteRedirectUrl: typeof args.options.inviteRedirectUrl !== 'undefined',
-            welcomeMessage: typeof args.options.welcomeMessage !== 'undefined',
-            messageLanguage: typeof args.options.messageLanguage !== 'undefined',
-            ccRecipients: typeof args.options.ccRecipients !== 'undefined',
-            sendInvitationMessage: !!args.options.sendInvitationMessage
-        });
-    });
-}, _EntraUserGuestAddCommand_initOptions = function _EntraUserGuestAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--emailAddress <emailAddress>'
-    }, {
-        option: '--displayName [displayName]'
-    }, {
-        option: '--inviteRedirectUrl [inviteRedirectUrl]'
-    }, {
-        option: '--welcomeMessage [welcomeMessage]'
-    }, {
-        option: '--messageLanguage [messageLanguage]'
-    }, {
-        option: '--ccRecipients [ccRecipients]'
-    }, {
-        option: '--sendInvitationMessage'
-    });
-};
 export default new EntraUserGuestAddCommand();
 //# sourceMappingURL=user-guest-add.js.map

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

@@ -1,14 +1,18 @@
-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 _EntraUserHibpCommand_instances, _EntraUserHibpCommand_initTelemetry, _EntraUserHibpCommand_initOptions, _EntraUserHibpCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: 'Specify valid userName.'
+    }).alias('n'),
+    apiKey: z.string(),
+    domain: z.string().optional()
+});
 class EntraUserHibpCommand extends AnonymousCommand {
     get name() {
         return commands.USER_HIBP;
@@ -16,12 +20,8 @@ class EntraUserHibpCommand extends AnonymousCommand {
     get description() {
         return 'Allows you to retrieve all accounts that have been pwned with the specified username';
     }
-    constructor() {
-        super();
-        _EntraUserHibpCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserHibpCommand_instances, "m", _EntraUserHibpCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserHibpCommand_instances, "m", _EntraUserHibpCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserHibpCommand_instances, "m", _EntraUserHibpCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -46,27 +46,5 @@ class EntraUserHibpCommand extends AnonymousCommand {
         }
     }
 }
-_EntraUserHibpCommand_instances = new WeakSet(), _EntraUserHibpCommand_initTelemetry = function _EntraUserHibpCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            domain: args.options.domain
-        });
-    });
-}, _EntraUserHibpCommand_initOptions = function _EntraUserHibpCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --userName <userName>'
-    }, {
-        option: '--apiKey, <apiKey>'
-    }, {
-        option: '--domain, [domain]'
-    });
-}, _EntraUserHibpCommand_initValidators = function _EntraUserHibpCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidUserPrincipalName(args.options.userName)) {
-            return 'Specify valid userName';
-        }
-        return true;
-    });
-};
 export default new EntraUserHibpCommand();
 //# sourceMappingURL=user-hibp.js.map

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

@@ -1,14 +1,18 @@
-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 _EntraUserLicenseAddCommand_instances, _EntraUserLicenseAddCommand_initTelemetry, _EntraUserLicenseAddCommand_initOptions, _EntraUserLicenseAddCommand_initValidators, _EntraUserLicenseAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.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(),
+    userName: z.string().optional(),
+    ids: z.string().refine(ids => !ids.split(',').some(e => !validation.isValidGuid(e)), {
+        error: e => `'${e.input}' contains one or more invalid GUIDs.`
+    })
+});
 class EntraUserLicenseAddCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_ADD;
@@ -16,19 +20,24 @@ class EntraUserLicenseAddCommand extends GraphCommand {
     get description() {
         return 'Assigns a license to a user';
     }
-    constructor() {
-        super();
-        _EntraUserLicenseAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.userId, options.userName].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const addLicenses = args.options.ids.split(',').map(x => { return { "disabledPlans": [], "skuId": x }; });
         const requestBody = { "addLicenses": addLicenses, "removeLicenses": [] };
         const requestOptions = {
-            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/assignLicense`,
+            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId ?? args.options.userName)}/assignLicense`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -44,33 +53,5 @@ class EntraUserLicenseAddCommand extends GraphCommand {
         }
     }
 }
-_EntraUserLicenseAddCommand_instances = new WeakSet(), _EntraUserLicenseAddCommand_initTelemetry = function _EntraUserLicenseAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _EntraUserLicenseAddCommand_initOptions = function _EntraUserLicenseAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--ids <ids>'
-    });
-}, _EntraUserLicenseAddCommand_initValidators = function _EntraUserLicenseAddCommand_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.ids && args.options.ids.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.ids} contains one or more invalid GUIDs`;
-        }
-        return true;
-    });
-}, _EntraUserLicenseAddCommand_initOptionSets = function _EntraUserLicenseAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new EntraUserLicenseAddCommand();
 //# sourceMappingURL=user-license-add.js.map