@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 11.10.0-beta.49639f3

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

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

@@ -1,14 +1,22 @@
-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 _EntraGroupMemberListCommand_instances, _EntraGroupMemberListCommand_initTelemetry, _EntraGroupMemberListCommand_initOptions, _EntraGroupMemberListCommand_initOptionSets, _EntraGroupMemberListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.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'),
+    role: zod.coercedEnum(RoleEnum).optional().alias('r'),
+    properties: z.string().optional().alias('p'),
+    filter: z.string().optional().alias('f')
+});
 class EntraGroupMemberListCommand extends GraphCommand {
     get name() {
         return commands.GROUP_MEMBER_LIST;
@@ -19,13 +27,18 @@ class EntraGroupMemberListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'userPrincipalName', 'roles'];
     }
-    constructor() {
-        super();
-        _EntraGroupMemberListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initValidators).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']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -102,45 +115,5 @@ class EntraGroupMemberListCommand extends GraphCommand {
         return users;
     }
 }
-_EntraGroupMemberListCommand_instances = new WeakSet(), _EntraGroupMemberListCommand_initTelemetry = function _EntraGroupMemberListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            role: typeof args.options.role !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined',
-            filter: typeof args.options.filter !== 'undefined'
-        });
-    });
-}, _EntraGroupMemberListCommand_initOptions = function _EntraGroupMemberListCommand_initOptions() {
-    this.options.unshift({
-        option: "-i, --groupId [groupId]"
-    }, {
-        option: "-n, --groupName [groupName]"
-    }, {
-        option: "-r, --role [role]",
-        autocomplete: ["Owner", "Member"]
-    }, {
-        option: "-p, --properties [properties]"
-    }, {
-        option: "-f, --filter [filter]"
-    });
-}, _EntraGroupMemberListCommand_initOptionSets = function _EntraGroupMemberListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['groupId', 'groupName']
-    });
-}, _EntraGroupMemberListCommand_initValidators = function _EntraGroupMemberListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        if (args.options.role) {
-            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
-            }
-        }
-        return true;
-    });
-};
 export default new EntraGroupMemberListCommand();
 //# sourceMappingURL=group-member-list.js.map

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

@@ -1,16 +1,38 @@
-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 _EntraGroupMemberRemoveCommand_instances, _EntraGroupMemberRemoveCommand_initTelemetry, _EntraGroupMemberRemoveCommand_initOptions, _EntraGroupMemberRemoveCommand_initValidators, _EntraGroupMemberRemoveCommand_initOptionSets, _EntraGroupMemberRemoveCommand_initTypes;
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
-import request from '../../../../request.js';
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+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 => `Invalid GUIDs found for option 'userIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    userNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `Invalid UPNs found for option 'userNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    subgroupIds: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `Invalid GUIDs found for option 'subgroupIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    subgroupNames: z.string().optional(),
+    role: zod.coercedEnum(RoleEnum).optional().alias('r'),
+    suppressNotFound: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraGroupMemberRemoveCommand extends GraphCommand {
     get name() {
         return commands.GROUP_MEMBER_REMOVE;
@@ -18,15 +40,28 @@ class EntraGroupMemberRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes members from a Microsoft Entra group';
     }
-    constructor() {
-        super();
-        _EntraGroupMemberRemoveCommand_instances.add(this);
-        this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupMemberRemoveCommand_instances, "m", _EntraGroupMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberRemoveCommand_instances, "m", _EntraGroupMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberRemoveCommand_instances, "m", _EntraGroupMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberRemoveCommand_instances, "m", _EntraGroupMemberRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberRemoveCommand_instances, "m", _EntraGroupMemberRemoveCommand_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 !== undefined || options.subgroupNames !== undefined) || options.role?.toLowerCase() === 'member', {
+            error: `When removing subgroups, the 'role' option must be set to 'Member'.`
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -121,77 +156,5 @@ class EntraGroupMemberRemoveCommand extends GraphCommand {
         return subGroupIds;
     }
 }
-_EntraGroupMemberRemoveCommand_instances = new WeakSet(), _EntraGroupMemberRemoveCommand_initTelemetry = function _EntraGroupMemberRemoveCommand_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',
-            role: typeof args.options.role !== 'undefined',
-            suppressNotFound: !!args.options.suppressNotFound,
-            force: !!args.options.force
-        });
-    });
-}, _EntraGroupMemberRemoveCommand_initOptions = function _EntraGroupMemberRemoveCommand_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
-    }, {
-        option: '--suppressNotFound'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraGroupMemberRemoveCommand_initValidators = function _EntraGroupMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId !== undefined && !validation.isValidGuid(args.options.groupId)) {
-            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
-        }
-        if (args.options.userIds !== undefined) {
-            const invalidGuids = validation.isValidGuidArray(args.options.userIds);
-            if (invalidGuids !== true) {
-                return `Invalid GUIDs found for option 'ids': ${invalidGuids}.`;
-            }
-        }
-        if (args.options.userNames !== undefined) {
-            const invalidUpns = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (invalidUpns !== true) {
-                return `Invalid UPNs found for option 'userNames': ${invalidUpns}.`;
-            }
-        }
-        if (args.options.subgroupIds !== undefined) {
-            const invalidGuids = validation.isValidGuidArray(args.options.subgroupIds);
-            if (invalidGuids !== true) {
-                return `Invalid GUIDs found for option 'subgroupIds': ${invalidGuids}.`;
-            }
-        }
-        if (args.options.role !== undefined && this.roleValues.indexOf(args.options.role) === -1) {
-            return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
-        }
-        if ((args.options.subgroupIds !== undefined || args.options.subgroupNames !== undefined) && args.options.role?.toLowerCase() !== 'member') {
-            return `When removing subgroups, the 'role' option must be set to 'Member'.`;
-        }
-        return true;
-    });
-}, _EntraGroupMemberRemoveCommand_initOptionSets = function _EntraGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
-}, _EntraGroupMemberRemoveCommand_initTypes = function _EntraGroupMemberRemoveCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'ids', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
-    this.types.boolean.push('force', 'suppressNotFound');
-};
 export default new EntraGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

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

@@ -1,15 +1,30 @@
-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 _EntraGroupMemberSetCommand_instances, _EntraGroupMemberSetCommand_initTelemetry, _EntraGroupMemberSetCommand_initOptions, _EntraGroupMemberSetCommand_initValidators, _EntraGroupMemberSetCommand_initOptionSets, _EntraGroupMemberSetCommand_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 => `User principal name '${validation.isValidUserPrincipalNameArray(e.input)}' is invalid for option 'userNames'.`
+    }).optional(),
+    role: zod.coercedEnum(RoleEnum).alias('r')
+});
 class EntraGroupMemberSetCommand extends GraphCommand {
     get name() {
         return commands.GROUP_MEMBER_SET;
@@ -17,15 +32,25 @@ class EntraGroupMemberSetCommand extends GraphCommand {
     get description() {
         return 'Updates the role of members in a Microsoft Entra ID group';
     }
-    constructor() {
-        super();
-        _EntraGroupMemberSetCommand_instances.add(this);
-        this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_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].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: userIds or userNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userIds', 'userNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -153,54 +178,5 @@ class EntraGroupMemberSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetCommand_initTelemetry = function _EntraGroupMemberSetCommand_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'
-        });
-    });
-}, _EntraGroupMemberSetCommand_initOptions = function _EntraGroupMemberSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-n, --groupName [groupName]'
-    }, {
-        option: '--userIds [userIds]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '-r, --role <role>',
-        autocomplete: this.roleValues
-    });
-}, _EntraGroupMemberSetCommand_initValidators = function _EntraGroupMemberSetCommand_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 isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (isValidUserPrincipalNameArray !== true) {
-                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'userNames'.`;
-            }
-        }
-        if (this.roleValues.indexOf(args.options.role) === -1) {
-            return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
-        }
-        return true;
-    });
-}, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userIds', 'userNames'] });
-}, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'userIds', 'userNames', 'role');
-};
 export default new EntraGroupMemberSetCommand();
 //# sourceMappingURL=group-member-set.js.map