@pnp/cli-microsoft365 11.8.0 → 11.9.0-beta.16af377

package/dist/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-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 _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { roleAssignment } from '../../../../utils/roleAssignment.js';
 import { roleDefinition } from '../../../../utils/roleDefinition.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,
+    administrativeUnitId: z.uuid().optional().alias('i'),
+    administrativeUnitName: z.string().optional().alias('n'),
+    roleDefinitionId: z.uuid().optional(),
+    roleDefinitionName: z.string().optional(),
+    userId: z.uuid().optional(),
+    userName: z.string().optional()
+});
 class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD;
@@ -18,13 +22,32 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
     get description() {
         return 'Assigns a Microsoft Entra role with administrative unit scope to a user';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.administrativeUnitId, options.administrativeUnitName].filter(Boolean).length === 1, {
+            error: 'Specify either administrativeUnitId or administrativeUnitName',
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
+        })
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(Boolean).length === 1, {
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
+        })
+            .refine(options => [options.userId, options.userName].filter(Boolean).length === 1, {
+            error: 'Specify either userId or userName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -55,48 +78,5 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
-            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
-            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
-            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --administrativeUnitId [administrativeUnitId]'
-    }, {
-        option: '-n, --administrativeUnitName [administrativeUnitName]'
-    }, {
-        option: '--roleDefinitionId [roleDefinitionId]'
-    }, {
-        option: '--roleDefinitionName [roleDefinitionName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
-            return `${args.options.administrativeUnitId} is not a valid GUID`;
-        }
-        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
-            return `${args.options.roleDefinitionId} is not a valid GUID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
-    this.optionSets.push({ options: ['roleDefinitionId', 'roleDefinitionName'] });
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
 export default new EntraAdministrativeUnitRoleAssignmentAddCommand();
 //# sourceMappingURL=administrativeunit-roleassignment-add.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

package/dist/m365/entra/commands/oauth2grant/oauth2grant-set.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 _EntraOAuth2GrantSetCommand_instances, _EntraOAuth2GrantSetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.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'),
+    scope: z.string().alias('s')
+}).strict();
 class EntraOAuth2GrantSetCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_SET;
@@ -15,10 +16,8 @@ class EntraOAuth2GrantSetCommand extends GraphCommand {
     get description() {
         return 'Update OAuth2 permissions for the service principal';
     }
-    constructor() {
-        super();
-        _EntraOAuth2GrantSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraOAuth2GrantSetCommand_instances, "m", _EntraOAuth2GrantSetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -42,12 +41,5 @@ class EntraOAuth2GrantSetCommand extends GraphCommand {
         }
     }
 }
-_EntraOAuth2GrantSetCommand_instances = new WeakSet(), _EntraOAuth2GrantSetCommand_initOptions = function _EntraOAuth2GrantSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --grantId <grantId>'
-    }, {
-        option: '-s, --scope <scope>'
-    });
-};
 export default new EntraOAuth2GrantSetCommand();
 //# sourceMappingURL=oauth2grant-set.js.map

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

@@ -37,16 +37,27 @@ class EntraOrganizationSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.id && options.displayName), {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => [
             options.contactEmail, options.marketingNotificationEmails, options.securityComplianceNotificationMails, options.securityComplianceNotificationPhones,
             options.statementUrl, options.technicalNotificationMails
         ].filter(o => o !== undefined).length > 0, {
-            error: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails'
+            error: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -44,13 +44,21 @@ class EntraRoleAssignmentAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName'
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => Object.values([
             options.userId, options.userName, options.administrativeUnitId, options.administrativeUnitName, options.applicationId, options.applicationObjectId, options.applicationName,
             options.servicePrincipalId, options.servicePrincipalName, options.groupId, options.groupName
         ]).filter(v => typeof v !== 'undefined').length < 2, {
-            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName'
+            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'administrativeUnitId', 'administrativeUnitName', 'applicationId', 'applicationObjectId', 'applicationName', 'servicePrincipalId', 'servicePrincipalName', 'groupId', 'groupName']
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -23,10 +23,18 @@ class EntraRoleDefinitionGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,

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

@@ -25,10 +25,18 @@ class EntraRoleDefinitionRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,

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

@@ -28,17 +28,28 @@ class EntraRoleDefinitionSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,
             path: ['id']
         })
             .refine(options => Object.values([options.newDisplayName, options.description, options.allowedResourceActions, options.enabled, options.version]).filter(v => typeof v !== 'undefined').length > 0, {
-            error: 'Provide value for at least one of the following parameters: newDisplayName, description, allowedResourceActions, enabled or version'
+            error: 'Provide value for at least one of the following parameters: newDisplayName, description, allowedResourceActions, enabled or version',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/user/user-session-revoke.js

@@ -27,7 +27,11 @@ class EntraUserSessionRevokeCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.userId, options.userName].filter(o => o !== undefined).length === 1, {
-            error: `Specify either 'userId' or 'userName'.`
+            error: `Specify either 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {