@pnp/cli-microsoft365 11.9.0-beta.0365d84 → 11.9.0-beta.69c1186

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

@@ -1,12 +1,12 @@
-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 _CliConsentCommand_instances, _CliConsentCommand_initTelemetry, _CliConsentCommand_initOptions, _CliConsentCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
+import { globalOptionsZod } from '../../../Command.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    service: z.enum(['VivaEngage']).alias('s')
+});
 class CliConsentCommand extends AnonymousCommand {
     get name() {
         return commands.CONSENT;
@@ -14,12 +14,8 @@ class CliConsentCommand extends AnonymousCommand {
     get description() {
         return 'Consent additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
     }
-    constructor() {
-        super();
-        _CliConsentCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliConsentCommand_instances, "m", _CliConsentCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _CliConsentCommand_instances, "m", _CliConsentCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _CliConsentCommand_instances, "m", _CliConsentCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let scope = '';
@@ -33,24 +29,5 @@ class CliConsentCommand extends AnonymousCommand {
         await this.commandAction(logger, args);
     }
 }
-_CliConsentCommand_instances = new WeakSet(), _CliConsentCommand_initTelemetry = function _CliConsentCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            service: args.options.service
-        });
-    });
-}, _CliConsentCommand_initOptions = function _CliConsentCommand_initOptions() {
-    this.options.unshift({
-        option: '-s, --service <service>',
-        autocomplete: ['VivaEngage']
-    });
-}, _CliConsentCommand_initValidators = function _CliConsentCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.service !== 'VivaEngage') {
-            return `${args.options.service} is not a valid value for the service option. Allowed values: VivaEngage`;
-        }
-        return true;
-    });
-};
 export default new CliConsentCommand();
 //# sourceMappingURL=cli-consent.js.map

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

@@ -1,10 +1,12 @@
 import os from 'os';
+import { z } from 'zod';
 import auth from '../../../Auth.js';
 import { cli } from '../../../cli/cli.js';
-import Command from '../../../Command.js';
+import Command, { globalOptionsZod } from '../../../Command.js';
 import { app } from '../../../utils/app.js';
 import { validation } from '../../../utils/validation.js';
 import commands from '../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class CliDoctorCommand extends Command {
     get name() {
         return commands.DOCTOR;
@@ -12,6 +14,9 @@ class CliDoctorCommand extends Command {
     get description() {
         return 'Retrieves diagnostic information about the current environment';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         const roles = [];
         const scopes = new Map();

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

@@ -1,12 +1,12 @@
-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 _CliIssueCommand_instances, _a, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['bug', 'command', 'sample']).alias('t')
+});
 class CliIssueCommand extends AnonymousCommand {
     get name() {
         return commands.ISSUE;
@@ -14,12 +14,8 @@ class CliIssueCommand extends AnonymousCommand {
     get description() {
         return 'Returns, or opens a URL that takes the user to the right place in the CLI GitHub repo to create a new issue reporting bug, feedback, ideas, etc.';
     }
-    constructor() {
-        super();
-        _CliIssueCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let issueLink = '';
@@ -38,29 +34,5 @@ class CliIssueCommand extends AnonymousCommand {
         await logger.log(issueLink);
     }
 }
-_a = CliIssueCommand, _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            type: args.options.type
-        });
-    });
-}, _CliIssueCommand_initOptions = function _CliIssueCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type <type>',
-        autocomplete: _a.issueType
-    });
-}, _CliIssueCommand_initValidators = function _CliIssueCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (_a.issueType.indexOf(args.options.type) < 0) {
-            return `${args.options.type} is not a valid Issue type. Allowed values are ${_a.issueType.join(', ')}`;
-        }
-        return true;
-    });
-};
-CliIssueCommand.issueType = [
-    'bug',
-    'command',
-    'sample'
-];
 export default new CliIssueCommand();
 //# sourceMappingURL=cli-issue.js.map

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

@@ -1,13 +1,13 @@
-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 _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions, _ConnectionRemoveCommand_initTypes;
+import { z } from 'zod';
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
-import Command, { CommandError } from '../../../Command.js';
+import Command, { CommandError, globalOptionsZod } from '../../../Command.js';
 import { cli } from '../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class ConnectionRemoveCommand extends Command {
     get name() {
         return commands.REMOVE;
@@ -15,12 +15,8 @@ class ConnectionRemoveCommand extends Command {
     get description() {
         return 'Remove the specified connection';
     }
-    constructor() {
-        super();
-        _ConnectionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const deleteConnection = async () => {
@@ -51,21 +47,5 @@ class ConnectionRemoveCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_initTelemetry = function _ConnectionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _ConnectionRemoveCommand_initOptions = function _ConnectionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-f, --force'
-    });
-}, _ConnectionRemoveCommand_initTypes = function _ConnectionRemoveCommand_initTypes() {
-    this.types.string.push('name');
-    this.types.boolean.push('force');
-};
 export default new ConnectionRemoveCommand();
 //# sourceMappingURL=connection-remove.js.map

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

@@ -1,14 +1,13 @@
-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 _ConnectionUseCommand_instances, _ConnectionUseCommand_initTelemetry, _ConnectionUseCommand_initOptions, _ConnectionUseCommand_initTypes;
+import { z } from 'zod';
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
-import Command, { CommandError } from '../../../Command.js';
+import Command, { CommandError, globalOptionsZod } from '../../../Command.js';
 import { formatting } from '../../../utils/formatting.js';
 import { cli } from '../../../cli/cli.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().optional().alias('n')
+});
 class ConnectionUseCommand extends Command {
     get name() {
         return commands.USE;
@@ -16,12 +15,8 @@ class ConnectionUseCommand extends Command {
     get description() {
         return 'Activate the specified Microsoft 365 tenant connection';
     }
-    constructor() {
-        super();
-        _ConnectionUseCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let connection;
@@ -55,18 +50,5 @@ class ConnectionUseCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initTelemetry = function _ConnectionUseCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    });
-}, _ConnectionUseCommand_initTypes = function _ConnectionUseCommand_initTypes() {
-    this.types.string.push('name');
-};
 export default new ConnectionUseCommand();
 //# sourceMappingURL=connection-use.js.map

package/dist/m365/context/commands/context-init.js

@@ -1,5 +1,8 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import ContextCommand from '../../base/ContextCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class ContextInitCommand extends ContextCommand {
     get name() {
         return commands.INIT;
@@ -7,6 +10,9 @@ class ContextInitCommand extends ContextCommand {
     get description() {
         return 'Initiates CLI for Microsoft 365 context in the current working folder';
     }
+    get schema() {
+        return options;
+    }
     async commandAction() {
         await this.saveContextInfo({});
     }

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

@@ -1,13 +1,13 @@
-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 _ContextOptionSetCommand_instances, _ContextOptionSetCommand_initOptions;
 import fs from 'fs';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import ContextCommand from '../../../base/ContextCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    value: z.string().alias('v')
+});
 class ContextOptionSetCommand extends ContextCommand {
     get name() {
         return commands.OPTION_SET;
@@ -15,10 +15,8 @@ class ContextOptionSetCommand extends ContextCommand {
     get description() {
         return 'Allows to add a new name for the option and value to the local context file.';
     }
-    constructor() {
-        super();
-        _ContextOptionSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ContextOptionSetCommand_instances, "m", _ContextOptionSetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const filePath = '.m365rc.json';
@@ -60,12 +58,5 @@ class ContextOptionSetCommand extends ContextCommand {
         }
     }
 }
-_ContextOptionSetCommand_instances = new WeakSet(), _ContextOptionSetCommand_initOptions = function _ContextOptionSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-v, --value <value>'
-    });
-};
 export default new ContextOptionSetCommand();
 //# sourceMappingURL=option-set.js.map

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

@@ -1,6 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({})
+    .strict();
 class EntraMultitenantGetCommand extends GraphCommand {
     get name() {
         return commands.MULTITENANT_GET;
@@ -8,7 +12,10 @@ class EntraMultitenantGetCommand extends GraphCommand {
     get description() {
         return 'Gets properties of the multitenant organization';
     }
-    async commandAction(logger) {
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, _args) {
         const requestOptions = {
             url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
             headers: {

package/dist/m365/entra/commands/multitenant/multitenant-remove.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 _EntraMultitenantRemoveCommand_instances, _EntraMultitenantRemoveCommand_initTelemetry, _EntraMultitenantRemoveCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { odata } from '../../../../utils/odata.js';
 import { cli } from '../../../../cli/cli.js';
+export const options = globalOptionsZod
+    .extend({
+    force: z.boolean().optional().alias('f')
+}).strict();
 class EntraMultitenantRemoveCommand extends GraphCommand {
     get name() {
         return commands.MULTITENANT_REMOVE;
@@ -16,11 +16,8 @@ class EntraMultitenantRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a multitenant organization';
     }
-    constructor() {
-        super();
-        _EntraMultitenantRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeMultitenantOrg = async () => {
@@ -103,16 +100,5 @@ class EntraMultitenantRemoveCommand extends GraphCommand {
         await request.delete(requestOptions);
     }
 }
-_EntraMultitenantRemoveCommand_instances = new WeakSet(), _EntraMultitenantRemoveCommand_initTelemetry = function _EntraMultitenantRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _EntraMultitenantRemoveCommand_initOptions = function _EntraMultitenantRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new EntraMultitenantRemoveCommand();
 //# sourceMappingURL=multitenant-remove.js.map

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

@@ -1,12 +1,13 @@
-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 _EntraMultitenantSetCommand_instances, _EntraMultitenantSetCommand_initTelemetry, _EntraMultitenantSetCommand_initOptions, _EntraMultitenantSetCommand_initValidators, _EntraMultitenantSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({
+    displayName: z.string().optional().alias('n'),
+    description: z.string().optional().alias('d')
+}).strict();
 class EntraMultitenantSetCommand extends GraphCommand {
     get name() {
         return commands.MULTITENANT_SET;
@@ -14,13 +15,14 @@ class EntraMultitenantSetCommand extends GraphCommand {
     get description() {
         return 'Updates the properties of a multitenant organization';
     }
-    constructor() {
-        super();
-        _EntraMultitenantSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.displayName || options.description, {
+            error: 'Specify either displayName or description or both'
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,28 +47,5 @@ class EntraMultitenantSetCommand extends GraphCommand {
         }
     }
 }
-_EntraMultitenantSetCommand_instances = new WeakSet(), _EntraMultitenantSetCommand_initTelemetry = function _EntraMultitenantSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            description: typeof args.options.description !== 'undefined'
-        });
-    });
-}, _EntraMultitenantSetCommand_initOptions = function _EntraMultitenantSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-d, --description [description]'
-    });
-}, _EntraMultitenantSetCommand_initValidators = function _EntraMultitenantSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.displayName && !args.options.description) {
-            return 'Specify either displayName or description or both.';
-        }
-        return true;
-    });
-}, _EntraMultitenantSetCommand_initTypes = function _EntraMultitenantSetCommand_initTypes() {
-    this.types.string.push('displayName', 'description');
-};
 export default new EntraMultitenantSetCommand();
 //# sourceMappingURL=multitenant-set.js.map

package/dist/m365/entra/commands/oauth2grant/oauth2grant-add.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 _EntraOAuth2GrantAddCommand_instances, _EntraOAuth2GrantAddCommand_initOptions, _EntraOAuth2GrantAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({
+    clientId: z.uuid().alias('i'),
+    resourceId: z.uuid().alias('r'),
+    scope: z.string().alias('s')
+}).strict();
 class EntraOAuth2GrantAddCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_ADD;
@@ -15,11 +16,8 @@ class EntraOAuth2GrantAddCommand extends GraphCommand {
     get description() {
         return 'Grant the specified service principal OAuth2 permissions to the specified resource';
     }
-    constructor() {
-        super();
-        _EntraOAuth2GrantAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantAddCommand_instances, "m", _EntraOAuth2GrantAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantAddCommand_instances, "m", _EntraOAuth2GrantAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -47,24 +45,5 @@ class EntraOAuth2GrantAddCommand extends GraphCommand {
         }
     }
 }
-_EntraOAuth2GrantAddCommand_instances = new WeakSet(), _EntraOAuth2GrantAddCommand_initOptions = function _EntraOAuth2GrantAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --clientId <clientId>'
-    }, {
-        option: '-r, --resourceId <resourceId>'
-    }, {
-        option: '-s, --scope <scope>'
-    });
-}, _EntraOAuth2GrantAddCommand_initValidators = function _EntraOAuth2GrantAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.clientId)) {
-            return `${args.options.clientId} is not a valid GUID`;
-        }
-        if (!validation.isValidGuid(args.options.resourceId)) {
-            return `${args.options.resourceId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraOAuth2GrantAddCommand();
 //# sourceMappingURL=oauth2grant-add.js.map

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

@@ -1,14 +1,13 @@
-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 _EntraOAuth2GrantListCommand_instances, _EntraOAuth2GrantListCommand_initOptions, _EntraOAuth2GrantListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.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 = globalOptionsZod
+    .extend({
+    spObjectId: z.uuid().alias('i')
+}).strict();
 class EntraOAuth2GrantListCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_LIST;
@@ -19,11 +18,8 @@ class EntraOAuth2GrantListCommand extends GraphCommand {
     defaultProperties() {
         return ['objectId', 'resourceId', 'scope'];
     }
-    constructor() {
-        super();
-        _EntraOAuth2GrantListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantListCommand_instances, "m", _EntraOAuth2GrantListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantListCommand_instances, "m", _EntraOAuth2GrantListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -38,17 +34,5 @@ class EntraOAuth2GrantListCommand extends GraphCommand {
         }
     }
 }
-_EntraOAuth2GrantListCommand_instances = new WeakSet(), _EntraOAuth2GrantListCommand_initOptions = function _EntraOAuth2GrantListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --spObjectId <spObjectId>'
-    });
-}, _EntraOAuth2GrantListCommand_initValidators = function _EntraOAuth2GrantListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.spObjectId)) {
-            return `${args.options.spObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraOAuth2GrantListCommand();
 //# sourceMappingURL=oauth2grant-list.js.map

package/dist/m365/entra/commands/oauth2grant/oauth2grant-remove.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 _EntraOAuth2GrantRemoveCommand_instances, _EntraOAuth2GrantRemoveCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod
+    .extend({
+    grantId: z.string().alias('i'),
+    force: z.boolean().optional().alias('f')
+}).strict();
 class EntraOAuth2GrantRemoveCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_REMOVE;
@@ -16,10 +17,8 @@ class EntraOAuth2GrantRemoveCommand extends GraphCommand {
     get description() {
         return 'Remove specified service principal OAuth2 permissions';
     }
-    constructor() {
-        super();
-        _EntraOAuth2GrantRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantRemoveCommand_instances, "m", _EntraOAuth2GrantRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeOauth2Grant = async () => {
@@ -51,12 +50,5 @@ class EntraOAuth2GrantRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraOAuth2GrantRemoveCommand_instances = new WeakSet(), _EntraOAuth2GrantRemoveCommand_initOptions = function _EntraOAuth2GrantRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --grantId <grantId>'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new EntraOAuth2GrantRemoveCommand();
 //# sourceMappingURL=oauth2grant-remove.js.map