@pnp/cli-microsoft365 11.9.0-beta.7b34e40 → 11.9.0-beta.87e70e2

package/dist/m365/base/DateAndPeriodBasedReport.js

@@ -1,18 +1,28 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _DateAndPeriodBasedReport_instances, _DateAndPeriodBasedReport_initTelemetry, _DateAndPeriodBasedReport_initOptions, _DateAndPeriodBasedReport_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
 import PeriodBasedReport from './PeriodBasedReport.js';
-class DateAndPeriodBasedReport extends PeriodBasedReport {
-    constructor() {
-        super();
-        _DateAndPeriodBasedReport_instances.add(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initOptions).call(this);
-        __classPrivateFieldGet(this, _DateAndPeriodBasedReport_instances, "m", _DateAndPeriodBasedReport_initValidators).call(this);
+export const dateAndPeriodBasedReportOptions = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['json', 'csv']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).optional().alias('p'),
+    date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'The supported date format is YYYY-MM-DD').optional().alias('d')
+}).refine(opts => opts.period || opts.date, {
+    message: `Specify either 'period' or 'date'.`,
+    params: {
+        customCode: 'optionSet',
+        options: ['period', 'date']
+    }
+}).refine(opts => !(opts.period && opts.date), {
+    message: `Specify either 'period' or 'date', but not both.`,
+    params: {
+        customCode: 'optionSet',
+        options: ['period', 'date']
+    }
+});
+export default class DateAndPeriodBasedReport extends PeriodBasedReport {
+    get schema() {
+        return dateAndPeriodBasedReportOptions;
     }
     async commandAction(logger, args) {
         const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${formatting.encodeQueryParameter(args.options.period)}')` : '';
@@ -21,31 +31,4 @@ class DateAndPeriodBasedReport extends PeriodBasedReport {
         await this.executeReport(endpoint, logger, args.options.output);
     }
 }
-_DateAndPeriodBasedReport_instances = new WeakSet(), _DateAndPeriodBasedReport_initTelemetry = function _DateAndPeriodBasedReport_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            period: args.options.period,
-            date: typeof args.options.date !== 'undefined'
-        });
-    });
-}, _DateAndPeriodBasedReport_initOptions = function _DateAndPeriodBasedReport_initOptions() {
-    this.options.unshift({ option: '-d, --date [date]' });
-    this.options.forEach(option => {
-        option.option = option.option.replace('-p, --period <period>', '-p, --period [period]');
-    });
-}, _DateAndPeriodBasedReport_initValidators = function _DateAndPeriodBasedReport_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.period && !args.options.date) {
-            return 'Specify period or date, one is required.';
-        }
-        if (args.options.period && args.options.date) {
-            return 'Specify period or date but not both.';
-        }
-        if (args.options.date && !(args.options.date.match(/^\d{4}-\d{2}-\d{2}$/))) {
-            return `${args.options.date} is not a valid date. The supported date format is YYYY-MM-DD`;
-        }
-        return true;
-    });
-};
-export default DateAndPeriodBasedReport;
 //# sourceMappingURL=DateAndPeriodBasedReport.js.map

package/dist/m365/base/PeriodBasedReport.js

@@ -1,21 +1,19 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _PeriodBasedReport_instances, _PeriodBasedReport_initOptions, _PeriodBasedReport_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import request from '../../request.js';
 import { formatting } from '../../utils/formatting.js';
 import GraphCommand from "./GraphCommand.js";
-class PeriodBasedReport extends GraphCommand {
+export const periodBasedReportOptions = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['json', 'csv']).optional().alias('o'),
+    period: z.enum(['D7', 'D30', 'D90', 'D180']).alias('p')
+});
+export default class PeriodBasedReport extends GraphCommand {
     get allowedOutputs() {
         return ['json', 'csv'];
     }
-    constructor() {
-        super();
-        _PeriodBasedReport_instances.add(this);
-        __classPrivateFieldGet(this, _PeriodBasedReport_instances, "m", _PeriodBasedReport_initOptions).call(this);
-        __classPrivateFieldGet(this, _PeriodBasedReport_instances, "m", _PeriodBasedReport_initValidators).call(this);
+    get schema() {
+        return periodBasedReportOptions;
     }
     async commandAction(logger, args) {
         const endpoint = `${this.resource}/v1.0/reports/${this.usageEndpoint}(period='${formatting.encodeQueryParameter(args.options.period)}')`;
@@ -67,22 +65,5 @@ class PeriodBasedReport extends GraphCommand {
         }
         return jsonObj;
     }
-    async validatePeriod(args) {
-        const period = args.options.period;
-        if (period &&
-            ['D7', 'D30', 'D90', 'D180'].indexOf(period) < 0) {
-            return `${period} is not a valid period type. The supported values are D7|D30|D90|D180`;
-        }
-        return true;
-    }
 }
-_PeriodBasedReport_instances = new WeakSet(), _PeriodBasedReport_initOptions = function _PeriodBasedReport_initOptions() {
-    this.options.push({
-        option: '-p, --period <period>',
-        autocomplete: ['D7', 'D30', 'D90', 'D180']
-    });
-}, _PeriodBasedReport_initValidators = function _PeriodBasedReport_initValidators() {
-    this.validators.push((args) => this.validatePeriod(args));
-};
-export default PeriodBasedReport;
 //# sourceMappingURL=PeriodBasedReport.js.map

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

@@ -15,7 +15,7 @@ class BookingBusinessGetCommand extends GraphCommand {
         return commands.BUSINESS_GET;
     }
     get description() {
-        return 'Retrieve the specified Microsoft Bookings business.';
+        return 'Retrieves the specified Microsoft Bookings business.';
     }
     get schema() {
         return options;

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

@@ -18,7 +18,7 @@ class CliAppAddCommand extends GraphCommand {
         return commands.APP_ADD;
     }
     get description() {
-        return 'Creates a Microsoft Entra application registration for CLI for Microsoft 365';
+        return 'Creates a new app registration to use for the CLI for Microsoft 365';
     }
     get schema() {
         return options;

package/dist/m365/cli/commands/app/app-reconsent.js

@@ -1,3 +1,5 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import auth from '../../../../Auth.js';
@@ -9,12 +11,18 @@ import { settingsNames } from '../../../../settingsNames.js';
 import { browserUtil } from '../../../../utils/browserUtil.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape
+});
 class CliAppReconsentCommand extends GraphCommand {
     get name() {
         return commands.APP_RECONSENT;
     }
     get description() {
-        return 'Reconsent all permission scopes used in CLI for Microsoft 365';
+        return 'Reconsents all permission scopes used in CLI for Microsoft 365';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger) {
         try {

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

@@ -1,25 +1,21 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _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;
     }
     get description() {
-        return 'Consent additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
+        return 'Consents additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
     }
-    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/cli/commands/completion/completion-clink-update.js

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { autocomplete } from '../../../../autocomplete.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape
+});
 class CliCompletionClinkUpdateCommand extends AnonymousCommand {
     get name() {
         return commands.COMPLETION_CLINK_UPDATE;
@@ -8,6 +13,9 @@ class CliCompletionClinkUpdateCommand extends AnonymousCommand {
     get description() {
         return 'Updates command completion for Clink (cmder)';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         await logger.log(autocomplete.getClinkCompletion());
     }

package/dist/m365/cli/commands/completion/completion-pwsh-setup.js

@@ -1,18 +1,17 @@
-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 _CliCompletionPwshSetupCommand_instances, _CliCompletionPwshSetupCommand_initOptions;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import url from 'url';
+import { z } from 'zod';
 import { autocomplete } from '../../../../autocomplete.js';
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    profile: z.string().alias('p')
+});
 class CliCompletionPwshSetupCommand extends AnonymousCommand {
     get name() {
         return commands.COMPLETION_PWSH_SETUP;
@@ -20,10 +19,8 @@ class CliCompletionPwshSetupCommand extends AnonymousCommand {
     get description() {
         return 'Sets up command completion for PowerShell';
     }
-    constructor() {
-        super();
-        _CliCompletionPwshSetupCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliCompletionPwshSetupCommand_instances, "m", _CliCompletionPwshSetupCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.debug) {
@@ -80,10 +77,5 @@ class CliCompletionPwshSetupCommand extends AnonymousCommand {
         }
     }
 }
-_CliCompletionPwshSetupCommand_instances = new WeakSet(), _CliCompletionPwshSetupCommand_initOptions = function _CliCompletionPwshSetupCommand_initOptions() {
-    this.options.unshift({
-        option: '-p, --profile <profile>'
-    });
-};
 export default new CliCompletionPwshSetupCommand();
 //# sourceMappingURL=completion-pwsh-setup.js.map

package/dist/m365/cli/commands/completion/completion-pwsh-update.js

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { autocomplete } from '../../../../autocomplete.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape
+});
 class CliCompletionPwshUpdateCommand extends AnonymousCommand {
     get name() {
         return commands.COMPLETION_PWSH_UPDATE;
@@ -8,6 +13,9 @@ class CliCompletionPwshUpdateCommand extends AnonymousCommand {
     get description() {
         return 'Updates command completion for PowerShell';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.debug) {
             await logger.logToStderr('Generating command completion...');

package/dist/m365/cli/commands/completion/completion-sh-setup.js

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { autocomplete } from '../../../../autocomplete.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape
+});
 class CliCompletionShSetupCommand extends AnonymousCommand {
     get name() {
         return commands.COMPLETION_SH_SETUP;
@@ -8,6 +13,9 @@ class CliCompletionShSetupCommand extends AnonymousCommand {
     get description() {
         return 'Sets up command completion for Zsh, Bash and Fish';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.debug) {
             await logger.logToStderr('Generating command completion...');

package/dist/m365/cli/commands/completion/completion-sh-update.js

@@ -1,6 +1,11 @@
+import { z } from 'zod';
 import { autocomplete } from '../../../../autocomplete.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape
+});
 class CliCompletionShUpdateCommand extends AnonymousCommand {
     get name() {
         return commands.COMPLETION_SH_UPDATE;
@@ -8,6 +13,9 @@ class CliCompletionShUpdateCommand extends AnonymousCommand {
     get description() {
         return 'Updates command completion for Zsh, Bash and Fish';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.debug) {
             await logger.logToStderr('Generating command completion...');

package/dist/m365/cli/commands/config/config-get.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 _CliConfigGetCommand_instances, _a, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from "../../../../cli/cli.js";
+import { globalOptionsZod } from "../../../../Command.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
+const settingNameValues = Object.getOwnPropertyNames(settingsNames);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    key: z.enum(settingNameValues).alias('k')
+});
 class CliConfigGetCommand extends AnonymousCommand {
     get name() {
         return commands.CONFIG_GET;
@@ -15,36 +16,12 @@ class CliConfigGetCommand extends AnonymousCommand {
     get description() {
         return 'Gets value of a CLI for Microsoft 365 configuration option';
     }
-    constructor() {
-        super();
-        _CliConfigGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliConfigGetCommand_instances, "m", _CliConfigGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _CliConfigGetCommand_instances, "m", _CliConfigGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _CliConfigGetCommand_instances, "m", _CliConfigGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         await logger.log(cli.getConfig().get(args.options.key));
     }
 }
-_a = CliConfigGetCommand, _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            key: args.options.key
-        });
-    });
-}, _CliConfigGetCommand_initOptions = function _CliConfigGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-k, --key <key>',
-        autocomplete: _a.optionNames
-    });
-}, _CliConfigGetCommand_initValidators = function _CliConfigGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (_a.optionNames.indexOf(args.options.key) < 0) {
-            return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
-        }
-        return true;
-    });
-};
-CliConfigGetCommand.optionNames = Object.getOwnPropertyNames(settingsNames);
 export default new CliConfigGetCommand();
 //# sourceMappingURL=config-get.js.map

package/dist/m365/cli/commands/config/config-list.js

@@ -1,12 +1,20 @@
+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
+});
 class CliConfigListCommand extends AnonymousCommand {
     get name() {
         return commands.CONFIG_LIST;
     }
     get description() {
-        return 'List all self set CLI for Microsoft 365 configurations';
+        return 'Lists all self set CLI for Microsoft 365 configurations';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger) {
         await logger.log(cli.getConfig().all);

package/dist/m365/cli/commands/config/config-reset.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 _CliConfigResetCommand_instances, _a, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from "../../../../cli/cli.js";
+import { globalOptionsZod } from "../../../../Command.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
+const settingNameValues = Object.getOwnPropertyNames(settingsNames);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    key: z.enum(settingNameValues).optional().alias('k')
+});
 class CliConfigResetCommand extends AnonymousCommand {
     get name() {
         return commands.CONFIG_RESET;
@@ -15,12 +16,8 @@ class CliConfigResetCommand extends AnonymousCommand {
     get description() {
         return 'Resets the specified CLI configuration option to its default value';
     }
-    constructor() {
-        super();
-        _CliConfigResetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliConfigResetCommand_instances, "m", _CliConfigResetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _CliConfigResetCommand_instances, "m", _CliConfigResetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _CliConfigResetCommand_instances, "m", _CliConfigResetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.key) {
@@ -31,27 +28,5 @@ class CliConfigResetCommand extends AnonymousCommand {
         }
     }
 }
-_a = CliConfigResetCommand, _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            key: args.options.key
-        });
-    });
-}, _CliConfigResetCommand_initOptions = function _CliConfigResetCommand_initOptions() {
-    this.options.unshift({
-        option: '-k, --key [key]',
-        autocomplete: _a.optionNames
-    });
-}, _CliConfigResetCommand_initValidators = function _CliConfigResetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.key) {
-            if (_a.optionNames.indexOf(args.options.key) < 0) {
-                return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
-CliConfigResetCommand.optionNames = Object.getOwnPropertyNames(settingsNames);
 export default new CliConfigResetCommand();
 //# sourceMappingURL=config-reset.js.map