@pnp/cli-microsoft365 11.9.0-beta.606e85e → 11.9.0-beta.69c1186

package/dist/cli/cli.js

@@ -156,13 +156,30 @@ async function execute(rawArgs) {
                 break;
             }
             else {
-                const hasNonRequiredErrors = result.error.issues.some(i => i.code !== 'invalid_type');
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
-                if (hasNonRequiredErrors === false &&
-                    shouldPrompt) {
+                if (!shouldPrompt) {
+                    result.error.issues.forEach(e => {
+                        if (e.code === 'invalid_type' &&
+                            e.input === undefined) {
+                            e.message = `Required option not specified`;
+                        }
+                    });
+                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                }
+                const missingRequiredValuesErrors = result.error.issues
+                    .filter(e => (e.code === 'invalid_type' && e.input === undefined) ||
+                    (e.code === 'custom' && e.params?.customCode === 'required'));
+                const optionSetErrors = result.error.issues
+                    .filter(e => e.code === 'custom' && e.params?.customCode === 'optionSet');
+                const otherErrors = result.error.issues
+                    .filter(e => !missingRequiredValuesErrors.includes(e) && !optionSetErrors.includes(e));
+                if (otherErrors.length > 0) {
+                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                }
+                if (missingRequiredValuesErrors.length > 0) {
                     await cli.error('🌶️  Provide values for the following parameters:');
-                    for (const issue of result.error.issues) {
-                        const optionName = issue.path.join('.');
+                    for (const error of missingRequiredValuesErrors) {
+                        const optionName = error.path.join('.');
                         const optionInfo = cli.commandToExecute.options.find(o => o.name === optionName);
                         const answer = await cli.promptForValue(optionInfo);
                         // coerce the answer to the correct type
@@ -174,15 +191,13 @@ async function execute(rawArgs) {
                             return cli.closeWithError(e.message, cli.optionsFromArgs, true);
                         }
                     }
+                    continue;
                 }
-                else {
-                    result.error.issues.forEach(i => {
-                        if (i.code === 'invalid_type' &&
-                            i.input === undefined) {
-                            i.message = `Required option not specified`;
-                        }
-                    });
-                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                if (optionSetErrors.length > 0) {
+                    for (const error of optionSetErrors) {
+                        await promptForOptionSetNameAndValue(cli.optionsFromArgs, error.params?.options);
+                    }
+                    continue;
                 }
             }
         }
@@ -891,6 +906,27 @@ function loadOptionValuesFromFiles(args) {
 function shouldTrimOutput(output) {
     return output === 'text';
 }
+async function promptForOptionSetNameAndValue(args, options) {
+    await cli.error(`🌶️  Please specify one of the following options:`);
+    const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: options.map((choice) => { return { name: choice, value: choice }; }) });
+    const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
+    let coercedValue = optionValue;
+    // Basic type coercion to align with how CLI arguments are typically parsed
+    if (typeof optionValue === 'string') {
+        const trimmed = optionValue.trim();
+        if (trimmed === 'true') {
+            coercedValue = true;
+        }
+        else if (trimmed === 'false') {
+            coercedValue = false;
+        }
+        else if (trimmed !== '' && !isNaN(Number(trimmed))) {
+            coercedValue = Number(trimmed);
+        }
+    }
+    args.options[selectedOptionName] = coercedValue;
+    await cli.error('');
+}
 export const cli = {
     closeWithError,
     commands,

package/dist/index.js

@@ -13,6 +13,14 @@ await (async () => {
         const updateNotifier = await import('update-notifier');
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     }
-    await cli.execute(process.argv.slice(2));
+    try {
+        await cli.execute(process.argv.slice(2));
+    }
+    catch (err) {
+        if (err instanceof Error && err.name === 'ExitPromptError') {
+            process.exit(1);
+        }
+        await cli.closeWithError(err, cli.optionsFromArgs || { options: {} });
+    }
 })();
 //# sourceMappingURL=index.js.map

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -29,7 +29,10 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return schema
             .refine(options => !options.cardData || options.card, {
             error: 'When you specify cardData, you must also specify card.',
-            path: ['cardData']
+            path: ['cardData'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => {
             if (options.card) {

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

@@ -30,7 +30,10 @@ class AppPermissionAddCommand extends AppCommand {
         return schema
             .refine(options => options.applicationPermissions || options.delegatedPermissions, {
             error: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
-            path: ['delegatedPermissions']
+            path: ['delegatedPermissions'],
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -23,7 +23,11 @@ class BookingBusinessGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

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/commands/login.js

@@ -42,19 +42,32 @@ class LoginCommand extends Command {
         return schema
             .refine(options => typeof options.appId !== 'undefined' || cli.getClientId() || options.authType === 'identity' || options.authType === 'federatedIdentity', {
             error: `appId is required. TIP: use the "m365 setup" command to configure the default appId.`,
-            path: ['appId']
+            path: ['appId'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'password' || options.userName, {
             error: 'Username is required when using password authentication.',
-            path: ['userName']
+            path: ['userName'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'password' || options.password, {
             error: 'Password is required when using password authentication.',
-            path: ['password']
+            path: ['password'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'certificate' || !(options.certificateFile && options.certificateBase64Encoded), {
             error: 'Specify either certificateFile or certificateBase64Encoded, but not both.',
-            path: ['certificateBase64Encoded']
+            path: ['certificateBase64Encoded'],
+            params: {
+                customCode: 'optionSet',
+                options: ['certificateFile', 'certificateBase64Encoded']
+            }
         })
             .refine(options => options.authType !== 'certificate' ||
             options.certificateFile ||
@@ -62,13 +75,20 @@ class LoginCommand extends Command {
             cli.getConfig().get(settingsNames.clientCertificateFile) ||
             cli.getConfig().get(settingsNames.clientCertificateBase64Encoded), {
             error: 'Specify either certificateFile or certificateBase64Encoded.',
-            path: ['certificateFile']
+            path: ['certificateFile'],
+            params: {
+                customCode: 'optionSet',
+                options: ['certificateFile', 'certificateBase64Encoded']
+            }
         })
             .refine(options => options.authType !== 'secret' ||
             options.secret ||
             cli.getConfig().get(settingsNames.clientSecret), {
             error: 'Secret is required when using secret authentication.',
-            path: ['secret']
+            path: ['secret'],
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

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/administrativeunit/administrativeunit-get.js

@@ -23,7 +23,11 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         });
     }
     async commandAction(logger, args) {

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

@@ -24,10 +24,18 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .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), {
-            error: 'Specify either id or displayName but not both'
+            error: 'Specify either id or displayName but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         });
     }
     async commandAction(logger, args) {

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