@pnp/cli-microsoft365 11.9.0-beta.9bd71dd → 11.9.0

package/dist/m365/base/DateAndPeriodBasedReport.js

@@ -1,18 +1,28 @@
-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 _DateAndPeriodBasedReport_instances, _DateAndPeriodBasedReport_initTelemetry, _DateAndPeriodBasedReport_initOptions, _DateAndPeriodBasedReport_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
 import PeriodBasedReport from './PeriodBasedReport.js';
-class DateAndPeriodBasedReport extends PeriodBasedReport {
-    constructor() {
-        super();
-        _DateAndPeriodBasedReport_instances.add(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initOptions).call(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initValidators).call(this);
+export const dateAndPeriodBasedReportOptions = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['json', 'csv']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).optional().alias('p'),
+    date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'The supported date format is YYYY-MM-DD').optional().alias('d')
+}).refine(opts => opts.period || opts.date, {
+    message: `Specify either 'period' or 'date'.`,
+    params: {
+        customCode: 'optionSet',
+        options: ['period', 'date']
+    }
+}).refine(opts => !(opts.period && opts.date), {
+    message: `Specify either 'period' or 'date', but not both.`,
+    params: {
+        customCode: 'optionSet',
+        options: ['period', 'date']
+    }
+});
+export default class DateAndPeriodBasedReport extends PeriodBasedReport {
+    get schema() {
+        return dateAndPeriodBasedReportOptions;
     }
     async commandAction(logger, args) {
         const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${formatting.encodeQueryParameter(args.options.period)}')` : '';
@@ -21,31 +31,4 @@ class DateAndPeriodBasedReport extends PeriodBasedReport {
         await this.executeReport(endpoint, logger, args.options.output);
     }
 }
-_DateAndPeriodBasedReport_instances = new WeakSet(), _DateAndPeriodBasedReport_initTelemetry = function _DateAndPeriodBasedReport_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            period: args.options.period,
-            date: typeof args.options.date !== 'undefined'
-        });
-    });
-}, _DateAndPeriodBasedReport_initOptions = function _DateAndPeriodBasedReport_initOptions() {
-    this.options.unshift({ option: '-d, --date [date]' });
-    this.options.forEach(option => {
-        option.option = option.option.replace('-p, --period <period>', '-p, --period [period]');
-    });
-}, _DateAndPeriodBasedReport_initValidators = function _DateAndPeriodBasedReport_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.period && !args.options.date) {
-            return 'Specify period or date, one is required.';
-        }
-        if (args.options.period && args.options.date) {
-            return 'Specify period or date but not both.';
-        }
-        if (args.options.date && !(args.options.date.match(/^\d{4}-\d{2}-\d{2}$/))) {
-            return `${args.options.date} is not a valid date. The supported date format is YYYY-MM-DD`;
-        }
-        return true;
-    });
-};
-export default DateAndPeriodBasedReport;
 //# sourceMappingURL=DateAndPeriodBasedReport.js.map

package/dist/m365/base/PeriodBasedReport.js

@@ -1,21 +1,19 @@
-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 _PeriodBasedReport_instances, _PeriodBasedReport_initOptions, _PeriodBasedReport_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import request from '../../request.js';
 import { formatting } from '../../utils/formatting.js';
 import GraphCommand from "./GraphCommand.js";
-class PeriodBasedReport extends GraphCommand {
+export const periodBasedReportOptions = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['json', 'csv']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
+export default class PeriodBasedReport extends GraphCommand {
     get allowedOutputs() {
         return ['json', 'csv'];
     }
-    constructor() {
-        super();
-        _PeriodBasedReport_instances.add(this);
-        __classPrivateFieldGet(this, _PeriodBasedReport_instances, "m", _PeriodBasedReport_initOptions).call(this);
-        __classPrivateFieldGet(this, _PeriodBasedReport_instances, "m", _PeriodBasedReport_initValidators).call(this);
+    get schema() {
+        return periodBasedReportOptions;
     }
     async commandAction(logger, args) {
         const endpoint = `${this.resource}/v1.0/reports/${this.usageEndpoint}(period='${formatting.encodeQueryParameter(args.options.period)}')`;
@@ -67,22 +65,5 @@ class PeriodBasedReport extends GraphCommand {
         }
         return jsonObj;
     }
-    async validatePeriod(args) {
-        const period = args.options.period;
-        if (period &&
-            ['D7', 'D30', 'D90', 'D180'].indexOf(period) < 0) {
-            return `${period} is not a valid period type. The supported values are D7|D30|D90|D180`;
-        }
-        return true;
-    }
 }
-_PeriodBasedReport_instances = new WeakSet(), _PeriodBasedReport_initOptions = function _PeriodBasedReport_initOptions() {
-    this.options.push({
-        option: '-p, --period <period>',
-        autocomplete: ['D7', 'D30', 'D90', 'D180']
-    });
-}, _PeriodBasedReport_initValidators = function _PeriodBasedReport_initValidators() {
-    this.validators.push((args) => this.validatePeriod(args));
-};
-export default PeriodBasedReport;
 //# sourceMappingURL=PeriodBasedReport.js.map

package/dist/m365/booking/commands/business/business-get.js

@@ -15,7 +15,7 @@ class BookingBusinessGetCommand extends GraphCommand {
         return commands.BUSINESS_GET;
     }
     get description() {
-        return 'Retrieve the specified Microsoft Bookings business.';
+        return 'Retrieves the specified Microsoft Bookings business.';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/app/app-add.js

@@ -18,7 +18,7 @@ class CliAppAddCommand extends GraphCommand {
         return commands.APP_ADD;
     }
     get description() {
-        return 'Creates a Microsoft Entra application registration for CLI for Microsoft 365';
+        return 'Creates a new app registration to use for the CLI for Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/app/app-reconsent.js

@@ -19,7 +19,7 @@ class CliAppReconsentCommand extends GraphCommand {
         return commands.APP_RECONSENT;
     }
     get description() {
-        return 'Reconsent all permission scopes used in CLI for Microsoft 365';
+        return 'Reconsents all permission scopes used in CLI for Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/cli-consent.js

@@ -12,7 +12,7 @@ class CliConsentCommand extends AnonymousCommand {
         return commands.CONSENT;
     }
     get description() {
-        return 'Consent additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
+        return 'Consents additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/config/config-list.js

@@ -11,7 +11,7 @@ class CliConfigListCommand extends AnonymousCommand {
         return commands.CONFIG_LIST;
     }
     get description() {
-        return 'List all self set CLI for Microsoft 365 configurations';
+        return 'Lists all self set CLI for Microsoft 365 configurations';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/config/config-set.js

@@ -17,7 +17,7 @@ class CliConfigSetCommand extends AnonymousCommand {
         return commands.CONFIG_SET;
     }
     get description() {
-        return 'Manage global configuration settings about the CLI for Microsoft 365';
+        return 'Sets CLI for Microsoft 365 configuration options';
     }
     get schema() {
         return options;

package/dist/m365/commands/login.js

@@ -33,7 +33,7 @@ class LoginCommand extends Command {
         return commands.LOGIN;
     }
     get description() {
-        return 'Log in to Microsoft 365';
+        return 'Logs in to Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/commands/logout.js

@@ -7,7 +7,7 @@ class LogoutCommand extends Command {
         return commands.LOGOUT;
     }
     get description() {
-        return 'Log out from Microsoft 365';
+        return 'Logs out from Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-list.js

@@ -9,7 +9,7 @@ class ConnectionListCommand extends Command {
         return commands.LIST;
     }
     get description() {
-        return 'Show the list of available connections';
+        return 'Shows the list of available connections';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-remove.js

@@ -13,7 +13,7 @@ class ConnectionRemoveCommand extends Command {
         return commands.REMOVE;
     }
     get description() {
-        return 'Remove the specified connection';
+        return 'Removes the specified connection';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-set.js

@@ -18,7 +18,7 @@ class ConnectionSetCommand extends Command {
         return commands.SET;
     }
     get description() {
-        return 'Rename the specified connection';
+        return 'Renames the specified connection';
     }
     get schema() {
         return options;

package/dist/m365/connection/commands/connection-use.js

@@ -13,7 +13,7 @@ class ConnectionUseCommand extends Command {
         return commands.USE;
     }
     get description() {
-        return 'Activate the specified Microsoft 365 tenant connection';
+        return 'Activates the specified Microsoft 365 tenant connection';
     }
     get schema() {
         return options;

package/dist/m365/context/commands/option/option-list.js

@@ -9,7 +9,7 @@ class ContextOptionListCommand extends ContextCommand {
         return commands.OPTION_LIST;
     }
     get description() {
-        return 'List all options added to the context';
+        return 'Lists all options added to the context';
     }
     get schema() {
         return options;

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

@@ -23,7 +23,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
         return commands.ADMINISTRATIVEUNIT_MEMBER_ADD;
     }
     get description() {
-        return 'Adds a member (user, group, device) to an administrative unit';
+        return 'Adds a member (user, group, or device) to an administrative unit';
     }
     get schema() {
         return options;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-get.js

@@ -16,7 +16,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
         return commands.ADMINISTRATIVEUNIT_MEMBER_GET;
     }
     get description() {
-        return 'Retrieve a specific member (user, group, or device) of an administrative unit';
+        return 'Retrieves info about a specific member of an administrative unit';
     }
     get schema() {
         return options;

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

@@ -26,7 +26,7 @@ class EntraAdministrativeUnitMemberRemoveCommand extends GraphCommand {
         return commands.ADMINISTRATIVEUNIT_MEMBER_REMOVE;
     }
     get description() {
-        return 'Remove a specific member (user, group, or device) from an administrative unit';
+        return 'Removes a member (user, group, or device) from an administrative unit';
     }
     get schema() {
         return options;

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

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

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

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

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

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