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

package/dist/Auth.js

@@ -212,7 +212,10 @@ export class Auth {
         };
         this.connection.active = true;
         this.connection.identityName = accessTokenUtil.accessToken.getUserNameFromAccessToken(response.accessToken);
-        this.connection.identityId = accessTokenUtil.accessToken.getUserIdFromAccessToken(response.accessToken);
+        // the oid claim is not available on app-only access tokens issued while
+        // the service principal hasn't been provisioned in the tenant yet. Fall
+        // back to the appId so that the connection still has a valid identity
+        this.connection.identityId = accessTokenUtil.accessToken.getUserIdFromAccessToken(response.accessToken) || this.connection.appId;
         this.connection.identityTenantId = accessTokenUtil.accessToken.getTenantIdFromAccessToken(response.accessToken);
         this.connection.name = this.connection.name || this.connection.identityId;
         try {

package/dist/cli/cli.js

@@ -924,6 +924,9 @@ async function promptForOptionSetNameAndValue(args, options) {
             coercedValue = Number(trimmed);
         }
     }
+    options
+        .filter(optionName => optionName !== selectedOptionName)
+        .forEach(optionName => args.options[optionName] = undefined);
     args.options[selectedOptionName] = coercedValue;
     await cli.error('');
 }

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

@@ -1,32 +1,69 @@
-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 _EntraM365GroupAddCommand_instances, _EntraM365GroupAddCommand_initTelemetry, _EntraM365GroupAddCommand_initOptions, _EntraM365GroupAddCommand_initTypes, _EntraM365GroupAddCommand_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 { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const VisibilityEnum = {
+    Private: 'Private',
+    Public: 'Public',
+    HiddenMembership: 'HiddenMembership'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().alias('n'),
+    mailNickname: z.string().alias('m'),
+    description: z.string().optional().alias('d'),
+    owners: z.string()
+        .refine(owners => owners.split(',').map(o => o.trim()).every(o => o.indexOf('@') > -1), {
+        error: e => `${e.input.split(',').map(o => o.trim()).find(o => o.indexOf('@') < 0)} is not a valid userPrincipalName`
+    }).optional(),
+    members: z.string()
+        .refine(members => members.split(',').map(m => m.trim()).every(m => m.indexOf('@') > -1), {
+        error: e => `${e.input.split(',').map(m => m.trim()).find(m => m.indexOf('@') < 0)} is not a valid userPrincipalName`
+    }).optional(),
+    visibility: zod.coercedEnum(VisibilityEnum).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'),
+    allowMembersToPost: z.boolean().optional(),
+    hideGroupInOutlook: z.boolean().optional(),
+    subscribeNewGroupMembers: z.boolean().optional(),
+    welcomeEmailDisabled: z.boolean().optional()
+});
 class EntraM365GroupAddCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 500;
+    }
     get name() {
         return commands.M365GROUP_ADD;
     }
     get description() {
         return 'Creates a Microsoft 365 Group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupAddCommand_instances.add(this);
-        this.pollingInterval = 500;
-        this.allowedVisibilities = ['Private', 'Public', 'HiddenMembership'];
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.mailNickname.indexOf(' ') === -1, {
+            error: 'The option mailNickname cannot contain spaces.',
+            path: ['mailNickname']
+        });
     }
     async commandAction(logger, args) {
         let group;
@@ -177,88 +214,6 @@ class EntraM365GroupAddCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupAddCommand_instances = new WeakSet(), _EntraM365GroupAddCommand_initTelemetry = function _EntraM365GroupAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            owners: typeof args.options.owners !== 'undefined',
-            members: typeof args.options.members !== 'undefined',
-            logoPath: typeof args.options.logoPath !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined',
-            allowMembersToPost: !!args.options.allowMembersToPost,
-            hideGroupInOutlook: !!args.options.hideGroupInOutlook,
-            subscribeNewGroupMembers: !!args.options.subscribeNewGroupMembers,
-            welcomeEmailDisabled: !!args.options.welcomeEmailDisabled
-        });
-    });
-}, _EntraM365GroupAddCommand_initOptions = function _EntraM365GroupAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName <displayName>'
-    }, {
-        option: '-m, --mailNickname <mailNickname>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--owners [owners]'
-    }, {
-        option: '--members [members]'
-    }, {
-        option: '--visibility [visibility]',
-        autocomplete: this.allowedVisibilities
-    }, {
-        option: '--allowMembersToPost [allowMembersToPost]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--hideGroupInOutlook [hideGroupInOutlook]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--subscribeNewGroupMembers [subscribeNewGroupMembers]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--welcomeEmailDisabled [welcomeEmailDisabled]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-l, --logoPath [logoPath]'
-    });
-}, _EntraM365GroupAddCommand_initTypes = function _EntraM365GroupAddCommand_initTypes() {
-    this.types.string.push('displayName', 'mailNickname', 'description', 'owners', 'members', 'visibility', 'logoPath');
-    this.types.boolean.push('allowMembersToPost', 'hideGroupInOutlook', 'subscribeNewGroupMembers', 'welcomeEmailDisabled');
-}, _EntraM365GroupAddCommand_initValidators = function _EntraM365GroupAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.owners) {
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            for (let i = 0; i < owners.length; i++) {
-                if (owners[i].indexOf('@') < 0) {
-                    return `${owners[i]} is not a valid userPrincipalName`;
-                }
-            }
-        }
-        if (args.options.members) {
-            const members = args.options.members.split(',').map(m => m.trim());
-            for (let i = 0; i < members.length; i++) {
-                if (members[i].indexOf('@') < 0) {
-                    return `${members[i]} is not a valid userPrincipalName`;
-                }
-            }
-        }
-        if (args.options.mailNickname.indexOf(' ') !== -1) {
-            return 'The option mailNickname cannot contain spaces.';
-        }
-        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`;
-            }
-        }
-        if (args.options.visibility && this.allowedVisibilities.map(x => x.toLowerCase()).indexOf(args.options.visibility.toLowerCase()) === -1) {
-            return `${args.options.visibility} is not a valid visibility. Allowed values are ${this.allowedVisibilities.join(', ')}`;
-        }
-        return true;
-    });
-};
 EntraM365GroupAddCommand.numRepeat = 15;
 export default new EntraM365GroupAddCommand();
 //# sourceMappingURL=m365group-add.js.map

package/dist/m365/entra/commands/m365group/m365group-conversation-list.js

@@ -1,14 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraM365GroupConversationListCommand_instances, _EntraM365GroupConversationListCommand_initOptions, _EntraM365GroupConversationListCommand_initValidators, _EntraM365GroupConversationListCommand_initOptionSets, _EntraM365GroupConversationListCommand_initTypes;
+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 GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional().alias('n')
+});
 class EntraM365GroupConversationListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_CONVERSATION_LIST;
@@ -19,13 +19,18 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
     defaultProperties() {
         return ['topic', 'lastDeliveredDateTime', 'id'];
     }
-    constructor() {
-        super();
-        _EntraM365GroupConversationListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.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) {
         if (this.verbose) {
@@ -48,23 +53,5 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupConversationListCommand_instances = new WeakSet(), _EntraM365GroupConversationListCommand_initOptions = function _EntraM365GroupConversationListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-n, --groupName [groupName]'
-    });
-}, _EntraM365GroupConversationListCommand_initValidators = function _EntraM365GroupConversationListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraM365GroupConversationListCommand_initOptionSets = function _EntraM365GroupConversationListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] });
-}, _EntraM365GroupConversationListCommand_initTypes = function _EntraM365GroupConversationListCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName');
-};
 export default new EntraM365GroupConversationListCommand();
 //# sourceMappingURL=m365group-conversation-list.js.map

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.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 _EntraM365GroupConversationPostListCommand_instances, _EntraM365GroupConversationPostListCommand_initTelemetry, _EntraM365GroupConversationPostListCommand_initOptions, _EntraM365GroupConversationPostListCommand_initValidators, _EntraM365GroupConversationPostListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.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,
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional().alias('d'),
+    threadId: z.string().alias('t')
+});
 class EntraM365GroupConversationPostListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_CONVERSATION_POST_LIST;
@@ -17,13 +18,18 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
     get description() {
         return 'Lists conversation posts of a Microsoft 365 group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupConversationPostListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId or groupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        });
     }
     defaultProperties() {
         return ['receivedDateTime', 'id'];
@@ -50,30 +56,5 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         return group.id;
     }
 }
-_EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365GroupConversationPostListCommand_initTelemetry = function _EntraM365GroupConversationPostListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined'
-        });
-    });
-}, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-d, --groupName [groupName]'
-    }, {
-        option: '-t, --threadId <threadId>'
-    });
-}, _EntraM365GroupConversationPostListCommand_initValidators = function _EntraM365GroupConversationPostListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] });
-};
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

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

@@ -1,14 +1,15 @@
-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 _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initTelemetry, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_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 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'),
+    withSiteUrl: z.boolean().optional()
+});
 class EntraM365GroupGetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_GET;
@@ -16,14 +17,18 @@ class EntraM365GroupGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_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']
+            }
+        });
     }
     async commandAction(logger, args) {
         let group;
@@ -65,31 +70,5 @@ class EntraM365GroupGetCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initTelemetry = function _EntraM365GroupGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            withSiteUrl: !!args.options.withSiteUrl
-        });
-    });
-}, _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '--withSiteUrl'
-    });
-}, _EntraM365GroupGetCommand_initValidators = function _EntraM365GroupGetCommand_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;
-    });
-}, _EntraM365GroupGetCommand_initOptionSets = function _EntraM365GroupGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-}, _EntraM365GroupGetCommand_initTypes = function _EntraM365GroupGetCommand_initTypes() {
-    this.types.string.push('id', 'displayName');
-};
 export default new EntraM365GroupGetCommand();
 //# sourceMappingURL=m365group-get.js.map

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

@@ -1,14 +1,17 @@
-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 _EntraM365GroupListCommand_instances, _EntraM365GroupListCommand_initTelemetry, _EntraM365GroupListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().optional().alias('d'),
+    mailNickname: z.string().optional().alias('m'),
+    withSiteUrl: z.boolean().optional(),
+    orphaned: z.boolean().optional()
+});
 class EntraM365GroupListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_LIST;
@@ -16,11 +19,8 @@ class EntraM365GroupListCommand extends GraphCommand {
     get description() {
         return 'Lists Microsoft 365 Groups in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraM365GroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupListCommand_instances, "m", _EntraM365GroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupListCommand_instances, "m", _EntraM365GroupListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname', 'siteUrl'];
@@ -76,25 +76,5 @@ class EntraM365GroupListCommand extends GraphCommand {
         };
     }
 }
-_EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand_initTelemetry = function _EntraM365GroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined',
-            withSiteUrl: !!args.options.withSiteUrl,
-            orphaned: !!args.options.orphaned
-        });
-    });
-}, _EntraM365GroupListCommand_initOptions = function _EntraM365GroupListCommand_initOptions() {
-    this.options.unshift({
-        option: '-d, --displayName [displayName]'
-    }, {
-        option: '-m, --mailNickname [displayName]'
-    }, {
-        option: '--withSiteUrl'
-    }, {
-        option: '--orphaned'
-    });
-};
 export default new EntraM365GroupListCommand();
 //# sourceMappingURL=m365group-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-clear.js

@@ -1,14 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraM365GroupRecycleBinItemClearCommand_instances, _EntraM365GroupRecycleBinItemClearCommand_initTelemetry, _EntraM365GroupRecycleBinItemClearCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    force: z.boolean().optional().alias('f')
+});
 class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_CLEAR;
@@ -16,11 +16,8 @@ class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
     get description() {
         return 'Clears all M365 Groups from recycle bin.';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemClearCommand_instances, "m", _EntraM365GroupRecycleBinItemClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemClearCommand_instances, "m", _EntraM365GroupRecycleBinItemClearCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const clearM365GroupRecycleBinItems = async () => {
@@ -62,16 +59,5 @@ class EntraM365GroupRecycleBinItemClearCommand extends GraphCommand {
         await Promise.all(deletePromises);
     }
 }
-_EntraM365GroupRecycleBinItemClearCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemClearCommand_initTelemetry = function _EntraM365GroupRecycleBinItemClearCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: typeof args.options.force !== 'undefined'
-        });
-    });
-}, _EntraM365GroupRecycleBinItemClearCommand_initOptions = function _EntraM365GroupRecycleBinItemClearCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new EntraM365GroupRecycleBinItemClearCommand();
 //# sourceMappingURL=m365group-recyclebinitem-clear.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-list.js

@@ -1,13 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraM365GroupRecycleBinItemListCommand_instances, _EntraM365GroupRecycleBinItemListCommand_initTelemetry, _EntraM365GroupRecycleBinItemListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    groupName: z.string().optional().alias('d'),
+    groupMailNickname: z.string().optional().alias('m')
+});
 class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_LIST;
@@ -15,11 +16,8 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
     get description() {
         return 'Lists Microsoft 365 Groups deleted in the current tenant';
     }
-    constructor() {
-        super();
-        _EntraM365GroupRecycleBinItemListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemListCommand_instances, "m", _EntraM365GroupRecycleBinItemListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupRecycleBinItemListCommand_instances, "m", _EntraM365GroupRecycleBinItemListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname'];
@@ -39,19 +37,5 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupName: typeof args.options.groupName !== 'undefined',
-            groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
-        });
-    });
-}, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
-    this.options.unshift({
-        option: '-d, --groupName [groupName]'
-    }, {
-        option: '-m, --groupMailNickname [groupMailNickname]'
-    });
-};
 export default new EntraM365GroupRecycleBinItemListCommand();
 //# sourceMappingURL=m365group-recyclebinitem-list.js.map