@pnp/cli-microsoft365 11.9.0-beta.7b34e40 → 11.9.0-beta.87e70e2

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-remove.js

@@ -1,16 +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 _EntraEnterpriseAppRemoveCommand_instances, _EntraEnterpriseAppRemoveCommand_initTelemetry, _EntraEnterpriseAppRemoveCommand_initOptions, _EntraEnterpriseAppRemoveCommand_initValidators, _EntraEnterpriseAppRemoveCommand_initOptionSets, _EntraEnterpriseAppRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.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,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    objectId: z.uuid().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraEnterpriseAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.ENTERPRISEAPP_REMOVE;
@@ -21,14 +23,18 @@ class EntraEnterpriseAppRemoveCommand extends GraphCommand {
     alias() {
         return [commands.SP_REMOVE];
     }
-    constructor() {
-        super();
-        _EntraEnterpriseAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName, options.objectId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either id, displayName, or objectId',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'objectId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeEnterpriseApplication = async () => {
@@ -84,40 +90,5 @@ class EntraEnterpriseAppRemoveCommand extends GraphCommand {
         return spItem.id;
     }
 }
-_EntraEnterpriseAppRemoveCommand_instances = new WeakSet(), _EntraEnterpriseAppRemoveCommand_initTelemetry = function _EntraEnterpriseAppRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraEnterpriseAppRemoveCommand_initOptions = function _EntraEnterpriseAppRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--objectId [objectId]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraEnterpriseAppRemoveCommand_initValidators = function _EntraEnterpriseAppRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `The option 'id' with value '${args.options.id}' is not a valid GUID.`;
-        }
-        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `The option 'objectId' with value '${args.options.objectId}' is not a valid GUID.`;
-        }
-        return true;
-    });
-}, _EntraEnterpriseAppRemoveCommand_initOptionSets = function _EntraEnterpriseAppRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
-}, _EntraEnterpriseAppRemoveCommand_initTypes = function _EntraEnterpriseAppRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName', 'objectId');
-    this.types.boolean.push('force');
-};
 export default new EntraEnterpriseAppRemoveCommand();
 //# sourceMappingURL=enterpriseapp-remove.js.map

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

@@ -1,14 +1,51 @@
-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 _EntraGroupAddCommand_instances, _EntraGroupAddCommand_initOptions, _EntraGroupAddCommand_initValidators, _EntraGroupAddCommand_initTelemetry;
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
-import { validation } from '../../../../utils/validation.js';
+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 { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+const GroupTypeEnum = {
+    microsoft365: 'microsoft365',
+    security: 'security'
+};
+const VisibilityEnum = {
+    Public: 'Public',
+    Private: 'Private',
+    HiddenMembership: 'HiddenMembership'
+};
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().max(256, `The maximum amount of characters for 'displayName' is 256.`).alias('n'),
+    description: z.string().optional().alias('d'),
+    type: zod.coercedEnum(GroupTypeEnum).alias('t'),
+    mailNickname: z.string()
+        .refine(val => validation.isValidMailNickname(val), {
+        error: `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`
+    })
+        .refine(val => val.length <= 64, {
+        error: `The maximum amount of characters for 'mailNickname' is 64.`
+    })
+        .optional().alias('m'),
+    ownerIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'ownerIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    ownerUserNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for the option 'ownerUserNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    memberIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'memberIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    memberUserNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for the option 'memberUserNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    visibility: zod.coercedEnum(VisibilityEnum).optional()
+});
 class EntraGroupAddCommand extends GraphCommand {
     get name() {
         return commands.GROUP_ADD;
@@ -19,12 +56,14 @@ class EntraGroupAddCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraGroupAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.type !== 'microsoft365' || options.visibility !== undefined, {
+            error: `Option 'visibility' must be specified if the option 'type' is set to microsoft365`
+        });
     }
     async commandAction(logger, args) {
         let group;
@@ -64,7 +103,7 @@ class EntraGroupAddCommand extends GraphCommand {
             mailEnabled: options.type === 'security' ? false : true,
             securityEnabled: true
         };
-        this.addUnknownOptionsToPayload(requestBody, options);
+        this.addUnknownOptionsToPayloadZod(requestBody, options);
         return requestBody;
     }
     generateMailNickname() {
@@ -127,91 +166,5 @@ class EntraGroupAddCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptions = function _EntraGroupAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName <displayName>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-t, --type <type>',
-        autocomplete: ['microsoft365', 'security']
-    }, {
-        option: '-m, --mailNickname [mailNickname]'
-    }, {
-        option: '--ownerIds [ownerIds]'
-    }, {
-        option: '--ownerUserNames [ownerUserNames]'
-    }, {
-        option: '--memberIds [memberIds]'
-    }, {
-        option: '--memberUserNames [memberUserNames]'
-    }, {
-        option: '--visibility [visibility]',
-        autocomplete: ['Public', 'Private', 'HiddenMembership']
-    });
-}, _EntraGroupAddCommand_initValidators = function _EntraGroupAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.displayName.length > 256) {
-            return `The maximum amount of characters for 'displayName' is 256.`;
-        }
-        if (args.options.mailNickname) {
-            if (!validation.isValidMailNickname(args.options.mailNickname)) {
-                return `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`;
-            }
-            if (args.options.mailNickname.length > 64) {
-                return `The maximum amount of characters for 'mailNickname' is 64.`;
-            }
-        }
-        if (args.options.ownerIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'ownerIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.ownerUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'ownerUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.memberIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'memberIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.memberUserNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'memberUserNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (['microsoft365', 'security'].indexOf(args.options.type) === -1) {
-            return `Option 'type' must be one of the following values: microsoft365, security.`;
-        }
-        if (args.options.type === 'microsoft365' && !args.options.visibility) {
-            return `Option 'visibility' must be specified if the option 'type' is set to microsoft365`;
-        }
-        if (args.options.visibility && ['Public', 'Private', 'HiddenMembership'].indexOf(args.options.visibility) === -1) {
-            return `Option 'visibility' must be one of the following values: Public, Private, HiddenMembership.`;
-        }
-        return true;
-    });
-}, _EntraGroupAddCommand_initTelemetry = function _EntraGroupAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            type: typeof args.options.type !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            ownerIds: typeof args.options.ownerIds !== 'undefined',
-            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
-            memberIds: typeof args.options.memberIds !== 'undefined',
-            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-};
 export default new EntraGroupAddCommand();
 //# sourceMappingURL=group-add.js.map

package/dist/m365/entra/commands/group/group-get.js

@@ -1,13 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraGroupGetCommand_instances, _EntraGroupGetCommand_initOptions, _EntraGroupGetCommand_initValidators, _EntraGroupGetCommand_initOptionSets, _EntraGroupGetCommand_initTelemetry;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraGroup } from '../../../../utils/entraGroup.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,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    properties: z.string().optional().alias('p')
+});
 class EntraGroupGetCommand extends GraphCommand {
     get name() {
         return commands.GROUP_GET;
@@ -15,13 +16,18 @@ class EntraGroupGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specified Entra group';
     }
-    constructor() {
-        super();
-        _EntraGroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initTelemetry).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id or displayName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let group;
@@ -39,31 +45,5 @@ class EntraGroupGetCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupGetCommand_instances = new WeakSet(), _EntraGroupGetCommand_initOptions = function _EntraGroupGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraGroupGetCommand_initValidators = function _EntraGroupGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraGroupGetCommand_initOptionSets = function _EntraGroupGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-}, _EntraGroupGetCommand_initTelemetry = function _EntraGroupGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-};
 export default new EntraGroupGetCommand();
 //# sourceMappingURL=group-get.js.map

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

@@ -1,13 +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 _EntraGroupListCommand_instances, _a, _EntraGroupListCommand_initTelemetry, _EntraGroupListCommand_initOptions, _EntraGroupListCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const GroupType = {
+    microsoft365: 'microsoft365',
+    security: 'security',
+    distribution: 'distribution',
+    mailEnabledSecurity: 'mailEnabledSecurity'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: zod.coercedEnum(GroupType).optional(),
+    properties: z.string().optional().alias('p')
+});
 class EntraGroupListCommand extends GraphCommand {
     get name() {
         return commands.GROUP_LIST;
@@ -18,20 +26,15 @@ class EntraGroupListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'groupType'];
     }
-    constructor() {
-        super();
-        _EntraGroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
             let requestUrl = `${this.resource}/v1.0/groups`;
             let useConsistencyLevelHeader = false;
             if (args.options.type) {
-                const groupType = _a.groupTypes.find(g => g.toLowerCase() === args.options.type?.toLowerCase());
-                switch (groupType) {
+                switch (args.options.type) {
                     case 'microsoft365':
                         requestUrl += `?$filter=groupTypes/any(c:c+eq+'Unified')`;
                         break;
@@ -99,28 +102,5 @@ class EntraGroupListCommand extends GraphCommand {
         }
     }
 }
-_a = EntraGroupListCommand, _EntraGroupListCommand_instances = new WeakSet(), _EntraGroupListCommand_initTelemetry = function _EntraGroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            type: typeof args.options.type !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraGroupListCommand_initOptions = function _EntraGroupListCommand_initOptions() {
-    this.options.unshift({
-        option: '--type [type]',
-        autocomplete: _a.groupTypes
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraGroupListCommand_initValidators = function _EntraGroupListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && _a.groupTypes.every(g => g.toLowerCase() !== args.options.type?.toLowerCase())) {
-            return `${args.options.type} is not a valid type value. Allowed values microsoft365|security|distribution|mailEnabledSecurity.`;
-        }
-        return true;
-    });
-};
-EntraGroupListCommand.groupTypes = ['microsoft365', 'security', 'distribution', 'mailEnabledSecurity'];
 export default new EntraGroupListCommand();
 //# sourceMappingURL=group-list.js.map

package/dist/m365/entra/commands/group/group-member-add.js

@@ -1,15 +1,35 @@
-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 _EntraGroupMemberAddCommand_instances, _EntraGroupMemberAddCommand_initTelemetry, _EntraGroupMemberAddCommand_initOptions, _EntraGroupMemberAddCommand_initValidators, _EntraGroupMemberAddCommand_initOptionSets, _EntraGroupMemberAddCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const RoleEnum = {
+    Owner: 'Owner',
+    Member: 'Member'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional().alias('n'),
+    userIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'userIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    userNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for the option 'userNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    subgroupIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'subgroupIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    subgroupNames: z.string().optional(),
+    role: zod.coercedEnum(RoleEnum).alias('r')
+});
 class EntraGroupMemberAddCommand extends GraphCommand {
     get name() {
         return commands.GROUP_MEMBER_ADD;
@@ -17,15 +37,28 @@ class EntraGroupMemberAddCommand extends GraphCommand {
     get description() {
         return 'Adds members to a Microsoft Entra group';
     }
-    constructor() {
-        super();
-        _EntraGroupMemberAddCommand_instances.add(this);
-        this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.groupId, options.groupName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId or groupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        })
+            .refine(options => [options.userIds, options.userNames, options.subgroupIds, options.subgroupNames].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: userIds, userNames, subgroupIds, or subgroupNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userIds', 'userNames', 'subgroupIds', 'subgroupNames']
+            }
+        })
+            .refine(options => !(options.subgroupIds || options.subgroupNames) || options.role !== 'Owner', {
+            error: `Subgroups cannot be set as owners.`
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -106,69 +139,5 @@ class EntraGroupMemberAddCommand extends GraphCommand {
         return entraGroup.getGroupIdsByDisplayNames(options.subgroupNames.split(',').map(u => u.trim()));
     }
 }
-_EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddCommand_initTelemetry = function _EntraGroupMemberAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            userIds: typeof args.options.userIds !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined',
-            subgroupIds: typeof args.options.subgroupIds !== 'undefined',
-            subgroupNames: typeof args.options.subgroupNames !== 'undefined'
-        });
-    });
-}, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-n, --groupName [groupName]'
-    }, {
-        option: '--userIds [userIds]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '--subgroupIds [subgroupIds]'
-    }, {
-        option: '--subgroupNames [subgroupNames]'
-    }, {
-        option: '-r, --role <role>',
-        autocomplete: this.roleValues
-    });
-}, _EntraGroupMemberAddCommand_initValidators = function _EntraGroupMemberAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID for option groupId.`;
-        }
-        if (args.options.userIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.userNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.subgroupIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.subgroupIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'subgroupIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if ((args.options.subgroupIds || args.options.subgroupNames) && args.options.role === 'Owner') {
-            return `Subgroups cannot be set as owners.`;
-        }
-        if (this.roleValues.indexOf(args.options.role) === -1) {
-            return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
-        }
-        return true;
-    });
-}, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
-}, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
-};
 export default new EntraGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map