@pnp/cli-microsoft365 12.0.0-beta.792164a → 12.0.0-beta.93e11fb

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

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

@@ -1,10 +1,6 @@
-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 _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets, _EntraM365GroupUserRemoveCommand_initTypes;
+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';
@@ -12,6 +8,22 @@ 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,
+    teamId: z.uuid().optional(),
+    teamName: z.string().optional(),
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional(),
+    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(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_REMOVE;
@@ -19,14 +31,25 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.teamId, opts.groupName, opts.teamName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId, teamId, groupName or teamName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'teamId', 'groupName', '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) {
         const removeUser = async () => {
@@ -94,65 +117,5 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserRemoveCommand_initTelemetry = function _EntraM365GroupUserRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force,
-            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'
-        });
-    });
-}, _EntraM365GroupUserRemoveCommand_initOptions = function _EntraM365GroupUserRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '--ids [ids]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraM365GroupUserRemoveCommand_initValidators = function _EntraM365GroupUserRemoveCommand_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}.`;
-            }
-        }
-        return true;
-    });
-}, _EntraM365GroupUserRemoveCommand_initOptionSets = function _EntraM365GroupUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['groupId', 'teamId', 'groupName', 'teamName']
-    }, {
-        options: ['ids', 'userNames']
-    });
-}, _EntraM365GroupUserRemoveCommand_initTypes = function _EntraM365GroupUserRemoveCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'teamId', 'teamName', 'ids', 'userNames');
-    this.types.boolean.push('force');
-};
 export default new EntraM365GroupUserRemoveCommand();
 //# sourceMappingURL=m365group-user-remove.js.map

package/dist/m365/entra/commands/m365group/m365group-user-set.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 _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets, _EntraM365GroupUserSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { validation } from '../../../../utils/validation.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
-import { entraUser } from '../../../../utils/entraUser.js';
+import { zod } from '../../../../utils/zod.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).alias('r')
+});
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_SET;
@@ -18,15 +35,25 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserSetCommand_instances.add(this);
-        this.allowedRoles = ['owner', 'member'];
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_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 {
@@ -159,64 +186,5 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetCommand_initTelemetry = function _EntraM365GroupUserSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
-        });
-    });
-}, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_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
-    });
-}, _EntraM365GroupUserSetCommand_initValidators = function _EntraM365GroupUserSetCommand_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;
-    });
-}, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['ids', 'userNames'] });
-}, _EntraM365GroupUserSetCommand_initTypes = function _EntraM365GroupUserSetCommand_initTypes() {
-    this.types.string.push('ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
-};
 export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/graph/commands/schemaextension/schemaextension-list.js

@@ -53,22 +53,20 @@ class GraphSchemaExtensionListCommand extends GraphCommand {
         };
         try {
             const res = await request.get(requestOptions);
-            if (res.value && res.value.length > 0) {
-                const size = args.options.pageSize ? parseInt(args.options.pageSize) : parseInt(res.value.length);
-                const result = res.value.slice(-size);
-                if (args.options.output !== 'json' && result.length > 1) {
-                    await logger.log(result.map((x) => ({
-                        id: x.id,
-                        description: x.description,
-                        targetTypes: x.targetTypes,
-                        status: x.status,
-                        owner: x.owner,
-                        properties: JSON.stringify(x.properties)
-                    })));
-                }
-                else {
-                    await logger.log(result);
-                }
+            const size = args.options.pageSize ? parseInt(args.options.pageSize) : res.value.length;
+            const result = res.value.slice(-size);
+            if (args.options.output !== 'json' && result.length > 1) {
+                await logger.log(result.map((x) => ({
+                    id: x.id,
+                    description: x.description,
+                    targetTypes: x.targetTypes,
+                    status: x.status,
+                    owner: x.owner,
+                    properties: JSON.stringify(x.properties)
+                })));
+            }
+            else {
+                await logger.log(result);
             }
         }
         catch (err) {