@pnp/cli-microsoft365 12.0.0-beta.d654135 → 12.0.0-beta.e3af9f8

package/dist/m365/entra/commands/m365group/m365group-set.js

@@ -1,12 +1,8 @@
-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 _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initOptionSets, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
+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';
@@ -17,22 +13,97 @@ import auth from '../../../../Auth.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    newDisplayName: z.string().optional(),
+    description: z.string().optional().alias('d'),
+    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(),
+    isPrivate: z.boolean().optional(),
+    logoPath: z.string()
+        .refine(logoPath => {
+        const fullPath = path.resolve(logoPath);
+        return fs.existsSync(fullPath) && !fs.lstatSync(fullPath).isDirectory();
+    }, {
+        error: e => {
+            const fullPath = path.resolve(e.input);
+            return fs.existsSync(fullPath) ? `Path '${fullPath}' points to a directory` : `File '${fullPath}' not found`;
+        }
+    })
+        .optional()
+        .alias('l'),
+    allowExternalSenders: z.boolean().optional(),
+    autoSubscribeNewMembers: z.boolean().optional(),
+    hideFromAddressLists: z.boolean().optional(),
+    hideFromOutlookClients: z.boolean().optional()
+});
 class EntraM365GroupSetCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 500;
+    }
     get name() {
         return commands.M365GROUP_SET;
     }
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
-    constructor() {
-        super();
-        _EntraM365GroupSetCommand_instances.add(this);
-        this.pollingInterval = 500;
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.displayName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id or displayName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        })
+            .refine(opts => !(opts.ownerIds && opts.ownerUserNames), {
+            error: 'Use one of the following options: ownerIds or ownerUserNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['ownerIds', 'ownerUserNames']
+            }
+        })
+            .refine(opts => !(opts.memberIds && opts.memberUserNames), {
+            error: 'Use one of the following options: memberIds or memberUserNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['memberIds', 'memberUserNames']
+            }
+        })
+            .refine(opts => !!opts.newDisplayName ||
+            opts.description !== undefined ||
+            opts.ownerIds !== undefined ||
+            opts.ownerUserNames !== undefined ||
+            opts.memberIds !== undefined ||
+            opts.memberUserNames !== undefined ||
+            opts.isPrivate !== undefined ||
+            opts.logoPath !== undefined ||
+            opts.allowExternalSenders !== undefined ||
+            opts.autoSubscribeNewMembers !== undefined ||
+            opts.hideFromAddressLists !== undefined ||
+            opts.hideFromOutlookClients !== undefined, {
+            error: 'Specify at least one option to update.'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -220,132 +291,6 @@ class EntraM365GroupSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            newDisplayName: typeof args.options.newDisplayName !== 'undefined',
-            description: typeof args.options.description !== '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',
-            isPrivate: !!args.options.isPrivate,
-            logoPath: typeof args.options.logoPath !== 'undefined',
-            allowExternalSenders: !!args.options.allowExternalSenders,
-            autoSubscribeNewMembers: !!args.options.autoSubscribeNewMembers,
-            hideFromAddressLists: !!args.options.hideFromAddressLists,
-            hideFromOutlookClients: !!args.options.hideFromOutlookClients
-        });
-    });
-}, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--newDisplayName [newDisplayName]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--ownerIds [ownerIds]'
-    }, {
-        option: '--ownerUserNames [ownerUserNames]'
-    }, {
-        option: '--memberIds [memberIds]'
-    }, {
-        option: '--memberUserNames [memberUserNames]'
-    }, {
-        option: '--isPrivate [isPrivate]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-l, --logoPath [logoPath]'
-    }, {
-        option: '--allowExternalSenders [allowExternalSenders]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--autoSubscribeNewMembers [autoSubscribeNewMembers]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--hideFromAddressLists [hideFromAddressLists]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--hideFromOutlookClients [hideFromOutlookClients]',
-        autocomplete: ['true', 'false']
-    });
-}, _EntraM365GroupSetCommand_initOptionSets = function _EntraM365GroupSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-    this.optionSets.push({
-        options: ['ownerIds', 'ownerUserNames'],
-        runsWhen: (args) => {
-            return args.options.ownerIds !== undefined || args.options.ownerUserNames !== undefined;
-        }
-    });
-    this.optionSets.push({
-        options: ['memberIds', 'memberUserNames'],
-        runsWhen: (args) => {
-            return args.options.memberIds !== undefined || args.options.memberUserNames !== undefined;
-        }
-    });
-}, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
-    this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
-    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'logoPath');
-}, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.newDisplayName &&
-            args.options.description === undefined &&
-            args.options.ownerIds === undefined &&
-            args.options.ownerUserNames === undefined &&
-            args.options.memberIds === undefined &&
-            args.options.memberUserNames === undefined &&
-            args.options.isPrivate === undefined &&
-            args.options.logoPath === undefined &&
-            args.options.allowExternalSenders === undefined &&
-            args.options.autoSubscribeNewMembers === undefined &&
-            args.options.hideFromAddressLists === undefined &&
-            args.options.hideFromOutlookClients === undefined) {
-            return 'Specify at least one option to update.';
-        }
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        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 (args.options.logoPath) {
-            const fullPath = path.resolve(args.options.logoPath);
-            if (!fs.existsSync(fullPath)) {
-                return `File '${fullPath}' not found`;
-            }
-            if (fs.lstatSync(fullPath).isDirectory()) {
-                return `Path '${fullPath}' points to a directory`;
-            }
-        }
-        return true;
-    });
-};
 EntraM365GroupSetCommand.numRepeat = 15;
 export default new EntraM365GroupSetCommand();
 //# sourceMappingURL=m365group-set.js.map

package/dist/m365/entra/commands/m365group/m365group-teamify.js

@@ -1,15 +1,16 @@
-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 _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets, _EntraM365GroupTeamifyCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.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'),
+    mailNickname: z.string().optional()
+});
 class EntraM365GroupTeamifyCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_TEAMIFY;
@@ -17,14 +18,18 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
     get description() {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupTeamifyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.displayName, opts.mailNickname].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: id, displayName or mailNickname.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName', 'mailNickname']
+            }
+        });
     }
     async getGroupId(options) {
         if (options.id) {
@@ -71,33 +76,5 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyCommand_initTelemetry = function _EntraM365GroupTeamifyCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
-        });
-    });
-}, _EntraM365GroupTeamifyCommand_initOptions = function _EntraM365GroupTeamifyCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--mailNickname [mailNickname]'
-    });
-}, _EntraM365GroupTeamifyCommand_initValidators = function _EntraM365GroupTeamifyCommand_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;
-    });
-}, _EntraM365GroupTeamifyCommand_initOptionSets = function _EntraM365GroupTeamifyCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
-}, _EntraM365GroupTeamifyCommand_initTypes = function _EntraM365GroupTeamifyCommand_initTypes() {
-    this.types.string.push('id', 'displayName', 'mailNickname');
-};
 export default new EntraM365GroupTeamifyCommand();
 //# sourceMappingURL=m365group-teamify.js.map

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

@@ -1,16 +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 _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets, _EntraM365GroupUserAddCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import { validation } from '../../../../utils/validation.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import { entraUser } from '../../../../utils/entraUser.js';
 import commands from '../../commands.js';
+const RoleEnum = {
+    owner: 'owner',
+    member: 'member'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    ids: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'ids': ${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(),
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional(),
+    teamId: z.uuid().optional(),
+    teamName: z.string().optional(),
+    role: zod.coercedEnum(RoleEnum).optional().alias('r')
+});
 class EntraM365GroupUserAddCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_ADD;
@@ -18,15 +35,25 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     get description() {
         return 'Adds user to specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserAddCommand_instances.add(this);
-        this.allowedRoles = ['owner', 'member'];
-        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupName, opts.teamId, opts.teamName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId, groupName, teamId or teamName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName', 'teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.ids, opts.userNames].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: ids or userNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['ids', 'userNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -103,65 +130,5 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddCommand_initTelemetry = function _EntraM365GroupUserAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            role: args.options.role !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
-        });
-    });
-}, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--ids [ids]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-r, --role [role]',
-        autocomplete: this.allowedRoles
-    });
-}, _EntraM365GroupUserAddCommand_initValidators = function _EntraM365GroupUserAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `'${args.options.teamId}' is not a valid GUID for option 'teamId'.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
-        }
-        if (args.options.ids) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'ids': ${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.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
-            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
-        }
-        return true;
-    });
-}, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['ids', 'userNames'] });
-}, _EntraM365GroupUserAddCommand_initTypes = function _EntraM365GroupUserAddCommand_initTypes() {
-    this.types.string.push('ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
-};
 export default new EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

package/dist/m365/entra/commands/m365group/m365group-user-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 _EntraM365GroupUserListCommand_instances, _EntraM365GroupUserListCommand_initTelemetry, _EntraM365GroupUserListCommand_initOptions, _EntraM365GroupUserListCommand_initOptionSets, _EntraM365GroupUserListCommand_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';
-import { entraGroup } from '../../../../utils/entraGroup.js';
+const RoleEnum = {
+    Owner: 'Owner',
+    Member: 'Member'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    filter: z.string().optional().alias('f'),
+    groupId: z.uuid().optional().alias('i'),
+    groupDisplayName: z.string().optional().alias('n'),
+    properties: z.string().optional().alias('p'),
+    role: zod.coercedEnum(RoleEnum).optional().alias('r')
+});
 class EntraM365GroupUserListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_LIST;
@@ -16,13 +24,18 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId or groupDisplayName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupDisplayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -103,45 +116,5 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserListCommand_initTelemetry = function _EntraM365GroupUserListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
-            role: typeof args.options.role !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined',
-            filter: typeof args.options.filter !== 'undefined'
-        });
-    });
-}, _EntraM365GroupUserListCommand_initOptions = function _EntraM365GroupUserListCommand_initOptions() {
-    this.options.unshift({
-        option: "-i, --groupId [groupId]"
-    }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
-    }, {
-        option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member"]
-    }, {
-        option: "-p, --properties [properties]"
-    }, {
-        option: "-f, --filter [filter]"
-    });
-}, _EntraM365GroupUserListCommand_initOptionSets = function _EntraM365GroupUserListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['groupId', 'groupDisplayName']
-    });
-}, _EntraM365GroupUserListCommand_initValidators = function _EntraM365GroupUserListCommand_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 EntraM365GroupUserListCommand();
 //# sourceMappingURL=m365group-user-list.js.map