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

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

@@ -1,13 +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 _EntraGroupSettingAddCommand_instances, _EntraGroupSettingAddCommand_initOptions, _EntraGroupSettingAddCommand_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 = z.looseObject({
+    ...globalOptionsZod.shape,
+    templateId: z.uuid().alias('i')
+});
 class EntraGroupSettingAddCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_ADD;
@@ -15,15 +14,12 @@ class EntraGroupSettingAddCommand extends GraphCommand {
     get description() {
         return 'Creates a group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingAddCommand_instances, "m", _EntraGroupSettingAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingAddCommand_instances, "m", _EntraGroupSettingAddCommand_initValidators).call(this);
-    }
     allowUnknownOptions() {
         return true;
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving group setting template with id '${args.options.templateId}'...`);
@@ -83,17 +79,5 @@ class EntraGroupSettingAddCommand extends GraphCommand {
         return values;
     }
 }
-_EntraGroupSettingAddCommand_instances = new WeakSet(), _EntraGroupSettingAddCommand_initOptions = function _EntraGroupSettingAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --templateId <templateId>'
-    });
-}, _EntraGroupSettingAddCommand_initValidators = function _EntraGroupSettingAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.templateId)) {
-            return `${args.options.templateId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraGroupSettingAddCommand();
 //# sourceMappingURL=groupsetting-add.js.map

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

@@ -1,13 +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 _EntraGroupSettingGetCommand_instances, _EntraGroupSettingGetCommand_initOptions, _EntraGroupSettingGetCommand_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 = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().alias('i')
+});
 class EntraGroupSettingGetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_GET;
@@ -15,11 +14,8 @@ class EntraGroupSettingGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the particular group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingGetCommand_instances, "m", _EntraGroupSettingGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingGetCommand_instances, "m", _EntraGroupSettingGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -38,17 +34,5 @@ class EntraGroupSettingGetCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingGetCommand_instances = new WeakSet(), _EntraGroupSettingGetCommand_initOptions = function _EntraGroupSettingGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _EntraGroupSettingGetCommand_initValidators = function _EntraGroupSettingGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraGroupSettingGetCommand();
 //# sourceMappingURL=groupsetting-get.js.map

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

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class EntraGroupSettingListCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_LIST;
@@ -11,6 +14,9 @@ class EntraGroupSettingListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const groupSettings = await odata.getAllItems(`${this.resource}/v1.0/groupSettings`);

package/dist/m365/entra/commands/groupsetting/groupsetting-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 _EntraGroupSettingRemoveCommand_instances, _EntraGroupSettingRemoveCommand_initTelemetry, _EntraGroupSettingRemoveCommand_initOptions, _EntraGroupSettingRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+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 = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraGroupSettingRemoveCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_REMOVE;
@@ -16,12 +16,8 @@ class EntraGroupSettingRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the particular group setting';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingRemoveCommand_instances, "m", _EntraGroupSettingRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeGroupSetting = async () => {
@@ -52,25 +48,5 @@ class EntraGroupSettingRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingRemoveCommand_instances = new WeakSet(), _EntraGroupSettingRemoveCommand_initTelemetry = function _EntraGroupSettingRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _EntraGroupSettingRemoveCommand_initOptions = function _EntraGroupSettingRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraGroupSettingRemoveCommand_initValidators = function _EntraGroupSettingRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraGroupSettingRemoveCommand();
 //# sourceMappingURL=groupsetting-remove.js.map

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

@@ -1,13 +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 _EntraGroupSettingSetCommand_instances, _EntraGroupSettingSetCommand_initOptions, _EntraGroupSettingSetCommand_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 = z.looseObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().alias('i')
+});
 class EntraGroupSettingSetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTING_SET;
@@ -18,11 +17,8 @@ class EntraGroupSettingSetCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraGroupSettingSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingSetCommand_instances, "m", _EntraGroupSettingSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingSetCommand_instances, "m", _EntraGroupSettingSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -83,17 +79,5 @@ class EntraGroupSettingSetCommand extends GraphCommand {
         return values;
     }
 }
-_EntraGroupSettingSetCommand_instances = new WeakSet(), _EntraGroupSettingSetCommand_initOptions = function _EntraGroupSettingSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _EntraGroupSettingSetCommand_initValidators = function _EntraGroupSettingSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraGroupSettingSetCommand();
 //# sourceMappingURL=groupsetting-set.js.map

package/dist/m365/entra/commands/groupsettingtemplate/groupsettingtemplate-get.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 _EntraGroupSettingTemplateGetCommand_instances, _EntraGroupSettingTemplateGetCommand_initTelemetry, _EntraGroupSettingTemplateGetCommand_initOptions, _EntraGroupSettingTemplateGetCommand_initValidators, _EntraGroupSettingTemplateGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n')
+});
 class EntraGroupSettingTemplateGetCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTINGTEMPLATE_GET;
@@ -15,13 +15,18 @@ class EntraGroupSettingTemplateGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about the specified Entra group settings template';
     }
-    constructor() {
-        super();
-        _EntraGroupSettingTemplateGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupSettingTemplateGetCommand_instances, "m", _EntraGroupSettingTemplateGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -39,29 +44,5 @@ class EntraGroupSettingTemplateGetCommand extends GraphCommand {
         }
     }
 }
-_EntraGroupSettingTemplateGetCommand_instances = new WeakSet(), _EntraGroupSettingTemplateGetCommand_initTelemetry = function _EntraGroupSettingTemplateGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
-        });
-    });
-}, _EntraGroupSettingTemplateGetCommand_initOptions = function _EntraGroupSettingTemplateGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    });
-}, _EntraGroupSettingTemplateGetCommand_initValidators = function _EntraGroupSettingTemplateGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraGroupSettingTemplateGetCommand_initOptionSets = function _EntraGroupSettingTemplateGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-};
 export default new EntraGroupSettingTemplateGetCommand();
 //# sourceMappingURL=groupsettingtemplate-get.js.map

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

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class EntraGroupSettingTemplateListCommand extends GraphCommand {
     get name() {
         return commands.GROUPSETTINGTEMPLATE_LIST;
@@ -11,6 +14,9 @@ class EntraGroupSettingTemplateListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName'];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const templates = await odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);

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