@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 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/approleassignment/approleassignment-add.js

@@ -1,16 +1,20 @@
-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 _EntraAppRoleAssignmentAddCommand_instances, _EntraAppRoleAssignmentAddCommand_initTelemetry, _EntraAppRoleAssignmentAddCommand_initOptions, _EntraAppRoleAssignmentAddCommand_initValidators, _EntraAppRoleAssignmentAddCommand_initOptionSets;
 import os from 'os';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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 { cli } from '../../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.uuid().optional(),
+    appObjectId: z.uuid().optional(),
+    appDisplayName: z.string().optional(),
+    resource: z.string().alias('r'),
+    scopes: z.string().transform((value) => value.split(',').map(String)).alias('s')
+});
 class EntraAppRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_ADD;
@@ -18,13 +22,18 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
     get description() {
         return 'Adds service principal permissions also known as scopes and app role assignments for specified Microsoft Entra application registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentAddCommand_instances, "m", _EntraAppRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         let objectId;
@@ -100,7 +109,7 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
                 throw `The resource '${args.options.resource}' does not have any application permissions available.`;
             }
             // search for match between the found app roles and the specified scopes option value
-            for (const scope of args.options.scopes.split(',')) {
+            for (const scope of args.options.scopes) {
                 const existingRoles = appRolesFound.filter((role) => {
                     return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                 });
@@ -149,39 +158,5 @@ class EntraAppRoleAssignmentAddCommand extends GraphCommand {
         return request.post(requestOptions);
     }
 }
-_EntraAppRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAppRoleAssignmentAddCommand_initTelemetry = function _EntraAppRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
-        });
-    });
-}, _EntraAppRoleAssignmentAddCommand_initOptions = function _EntraAppRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--appId [appId]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    }, {
-        option: '--appDisplayName [appDisplayName]'
-    }, {
-        option: '-r, --resource <resource>',
-        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-    }, {
-        option: '-s, --scopes <scopes>'
-    });
-}, _EntraAppRoleAssignmentAddCommand_initValidators = function _EntraAppRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentAddCommand_initOptionSets = function _EntraAppRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map

package/dist/m365/entra/commands/approleassignment/approleassignment-list.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 _EntraAppRoleAssignmentListCommand_instances, _EntraAppRoleAssignmentListCommand_initTelemetry, _EntraAppRoleAssignmentListCommand_initOptions, _EntraAppRoleAssignmentListCommand_initValidators, _EntraAppRoleAssignmentListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    appId: z.uuid().optional().alias('i'),
+    appDisplayName: z.string().optional().alias('n'),
+    appObjectId: z.uuid().optional()
+});
 class EntraAppRoleAssignmentListCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_LIST;
@@ -16,13 +17,18 @@ class EntraAppRoleAssignmentListCommand extends GraphCommand {
     get description() {
         return 'Lists app role assignments for the specified application registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     defaultProperties() {
         return ['resourceDisplayName', 'roleName'];
@@ -115,34 +121,5 @@ class EntraAppRoleAssignmentListCommand extends GraphCommand {
         return request.get(spRequestOptions);
     }
 }
-_EntraAppRoleAssignmentListCommand_instances = new WeakSet(), _EntraAppRoleAssignmentListCommand_initTelemetry = function _EntraAppRoleAssignmentListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined'
-        });
-    });
-}, _EntraAppRoleAssignmentListCommand_initOptions = function _EntraAppRoleAssignmentListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --appId [appId]'
-    }, {
-        option: '-n, --appDisplayName [appDisplayName]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    });
-}, _EntraAppRoleAssignmentListCommand_initValidators = function _EntraAppRoleAssignmentListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentListCommand_initOptionSets = function _EntraAppRoleAssignmentListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

package/dist/m365/entra/commands/approleassignment/approleassignment-remove.js

@@ -1,16 +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 _EntraAppRoleAssignmentRemoveCommand_instances, _EntraAppRoleAssignmentRemoveCommand_initTelemetry, _EntraAppRoleAssignmentRemoveCommand_initOptions, _EntraAppRoleAssignmentRemoveCommand_initValidators, _EntraAppRoleAssignmentRemoveCommand_initOptionSets;
 import os from 'os';
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    appId: z.uuid().optional(),
+    appObjectId: z.uuid().optional(),
+    appDisplayName: z.string().optional(),
+    resource: z.string().alias('r'),
+    scopes: z.string().transform((value) => value.split(',').map(String)).alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_REMOVE;
@@ -18,13 +23,18 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
     get description() {
         return 'Deletes an app role assignment for the specified Entra Application Registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAssignmentRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appDisplayName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appDisplayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appDisplayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeAppRoleAssignment = async () => {
@@ -80,7 +90,7 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
                 if (!appRolesFound.length) {
                     throw `The resource '${args.options.resource}' does not have any application permissions available.`;
                 }
-                for (const scope of args.options.scopes.split(',')) {
+                for (const scope of args.options.scopes) {
                     const existingRoles = appRolesFound.filter((role) => {
                         return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                     });
@@ -138,42 +148,5 @@ class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
         return request.delete(spRequestOptions);
     }
 }
-_EntraAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _EntraAppRoleAssignmentRemoveCommand_initTelemetry = function _EntraAppRoleAssignmentRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            force: (!!args.options.force).toString()
-        });
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initOptions = function _EntraAppRoleAssignmentRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--appId [appId]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    }, {
-        option: '--appDisplayName [appDisplayName]'
-    }, {
-        option: '-r, --resource <resource>',
-        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-    }, {
-        option: '-s, --scopes <scopes>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initValidators = function _EntraAppRoleAssignmentRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAssignmentRemoveCommand_initOptionSets = function _EntraAppRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
-};
 export default new EntraAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map