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

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

@@ -1,15 +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 _CliConfigSetCommand_instances, _a, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
+import { z } from 'zod';
 import { AuthType } from "../../../../Auth.js";
 import { cli } from "../../../../cli/cli.js";
+import { globalOptionsZod } from "../../../../Command.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import { validation } from "../../../../utils/validation.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'),
+    value: z.string().alias('v')
+});
 class CliConfigSetCommand extends AnonymousCommand {
     get name() {
         return commands.CONFIG_SET;
@@ -17,12 +19,84 @@ class CliConfigSetCommand extends AnonymousCommand {
     get description() {
         return 'Manage global configuration settings about the CLI for Microsoft 365';
     }
-    constructor() {
-        super();
-        _CliConfigSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _CliConfigSetCommand_instances, "m", _CliConfigSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _CliConfigSetCommand_instances, "m", _CliConfigSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _CliConfigSetCommand_instances, "m", _CliConfigSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.key === settingsNames.output) {
+                return ['text', 'json', 'csv', 'md', 'none'].includes(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.output}. Allowed values: text, json, csv, md, none`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.errorOutput) {
+                return ['stdout', 'stderr'].includes(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.errorOutput}. Allowed values: stdout, stderr`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.promptListPageSize) {
+                const num = Number(opts.value);
+                return !isNaN(num) && num > 0;
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.promptListPageSize}. The value has to be a number higher than 0.`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.helpMode) {
+                return cli.helpModes.includes(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.helpMode}. Allowed values: ${cli.helpModes.join(', ')}`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.authType) {
+                return Object.values(AuthType).map(String).includes(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.authType}. Allowed values: ${Object.values(AuthType).join(', ')}`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.helpTarget) {
+                return cli.helpTargets.includes(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.helpTarget}. Allowed values: ${cli.helpTargets.join(', ')}`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.clientId) {
+                return validation.isValidGuid(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.clientId}. The value has to be a valid GUID.`,
+            path: ['value']
+        })
+            .refine(opts => {
+            if (opts.key === settingsNames.tenantId) {
+                return opts.value === 'common' || validation.isValidGuid(opts.value);
+            }
+            return true;
+        }, {
+            error: `The value is not valid for the option ${settingsNames.tenantId}. The value has to be a valid GUID or 'common'.`,
+            path: ['value']
+        });
     }
     async commandAction(logger, args) {
         let value;
@@ -45,63 +119,5 @@ class CliConfigSetCommand extends AnonymousCommand {
         cli.getConfig().set(args.options.key, value);
     }
 }
-_a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        this.telemetryProperties[args.options.key] = args.options.value;
-    });
-}, _CliConfigSetCommand_initOptions = function _CliConfigSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-k, --key <key>',
-        autocomplete: _a.optionNames
-    }, {
-        option: '-v, --value <value>'
-    });
-}, _CliConfigSetCommand_initValidators = function _CliConfigSetCommand_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(', ')}`;
-        }
-        const allowedOutputs = ['text', 'json', 'csv', 'md', 'none'];
-        if (args.options.key === settingsNames.output &&
-            allowedOutputs.indexOf(args.options.value) === -1) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;
-        }
-        const allowedErrorOutputs = ['stdout', 'stderr'];
-        if (args.options.key === settingsNames.errorOutput &&
-            allowedErrorOutputs.indexOf(args.options.value) === -1) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedErrorOutputs.join(', ')}`;
-        }
-        if (args.options.key === settingsNames.promptListPageSize &&
-            typeof args.options.value !== 'number') {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. The value has to be a number.`;
-        }
-        if (args.options.key === settingsNames.promptListPageSize &&
-            args.options.value <= 0) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. The number has to be higher than 0.`;
-        }
-        if (args.options.key === settingsNames.helpMode &&
-            cli.helpModes.indexOf(args.options.value) === -1) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpModes.join(', ')}`;
-        }
-        if (args.options.key === settingsNames.authType &&
-            !Object.values(AuthType).map(String).includes(args.options.value)) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${Object.values(AuthType).join(', ')}`;
-        }
-        if (args.options.key === settingsNames.helpTarget &&
-            !cli.helpTargets.includes(args.options.value)) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpTargets.join(', ')}`;
-        }
-        if (args.options.key === settingsNames.clientId &&
-            !validation.isValidGuid(args.options.value)) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. The value has to be a valid GUID.`;
-        }
-        if (args.options.key === settingsNames.tenantId &&
-            !(args.options.value === 'common' || validation.isValidGuid(args.options.value))) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. The value has to be a valid GUID or 'common'.`;
-        }
-        return true;
-    });
-};
-CliConfigSetCommand.optionNames = Object.getOwnPropertyNames(settingsNames);
 export default new CliConfigSetCommand();
 //# sourceMappingURL=config-set.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/commands/request.js

@@ -1,15 +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 _RequestCommand_instances, _RequestCommand_initTelemetry, _RequestCommand_initOptions, _RequestCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
 import auth from '../../Auth.js';
-import Command from '../../Command.js';
+import Command, { globalOptionsZod } from '../../Command.js';
 import request from '../../request.js';
 import commands from './commands.js';
+const allowedMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    url: z.string().alias('u'),
+    method: z.enum(allowedMethods).default('get').alias('m'),
+    resource: z.string().optional().alias('r'),
+    body: z.string().optional().alias('b'),
+    filePath: z.string().optional().alias('p')
+});
 class RequestCommand extends Command {
     get name() {
         return commands.REQUEST;
@@ -17,16 +21,20 @@ class RequestCommand extends Command {
     get description() {
         return 'Executes the specified web request using CLI for Microsoft 365';
     }
-    allowUnknownOptions() {
-        return true;
+    get schema() {
+        return options;
     }
-    constructor() {
-        super();
-        _RequestCommand_instances.add(this);
-        this.allowedMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initValidators).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.body || (opts.method !== 'get'), {
+            error: 'Specify a different method when using body'
+        })
+            .refine(opts => !opts.body || opts['content-type'], {
+            error: 'Specify the content-type when using body'
+        })
+            .refine(opts => !opts.filePath || fs.existsSync(path.dirname(opts.filePath)), {
+            error: 'The location specified in the filePath does not exist'
+        });
     }
     async commandAction(logger, args) {
         if (this.debug) {
@@ -34,9 +42,9 @@ class RequestCommand extends Command {
         }
         try {
             const url = this.resolveUrlTokens(args.options.url);
-            const method = (args.options.method || 'get').toUpperCase();
+            const method = args.options.method.toUpperCase();
             const headers = {};
-            this.addUnknownOptionsToPayload(headers, args.options);
+            this.addUnknownOptionsToPayloadZod(headers, args.options);
             if (!headers.accept) {
                 headers.accept = 'application/json';
             }
@@ -99,47 +107,5 @@ class RequestCommand extends Command {
         return url;
     }
 }
-_RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            method: args.options.method || 'get',
-            resource: typeof args.options.resource !== 'undefined',
-            accept: args.options.accept || 'application/json',
-            body: typeof args.options.body !== 'undefined',
-            filePath: typeof args.options.filePath !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _RequestCommand_initOptions = function _RequestCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-m, --method [method]',
-        autocomplete: this.allowedMethods
-    }, {
-        option: '-r, --resource [resource]'
-    }, {
-        option: '-b, --body [body]'
-    }, {
-        option: '-p, --filePath [filePath]'
-    });
-}, _RequestCommand_initValidators = function _RequestCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const currentMethod = args.options.method || 'get';
-        if (this.allowedMethods.indexOf(currentMethod) === -1) {
-            return `${currentMethod} is not a valid value for method. Allowed values: ${this.allowedMethods.join(', ')}`;
-        }
-        if (args.options.body && (!args.options.method || args.options.method === 'get')) {
-            return 'Specify a different method when using body';
-        }
-        if (args.options.body && !args.options['content-type']) {
-            return 'Specify the content-type when using body';
-        }
-        if (args.options.filePath && !fs.existsSync(path.dirname(args.options.filePath))) {
-            return 'The location specified in the filePath does not exist';
-        }
-        return true;
-    });
-};
 export default new RequestCommand();
 //# sourceMappingURL=request.js.map

package/dist/m365/commands/search.js

@@ -1,12 +1,36 @@
-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 _SearchCommand_instances, _SearchCommand_initTelemetry, _SearchCommand_initOptions, _SearchCommand_initValidators;
+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';
+const allowedScopes = ['chatMessage', 'message', 'event', 'drive', 'driveItem', 'list', 'listItem', 'site', 'bookmark', 'acronym', 'person'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    queryText: z.string().optional().alias('q'),
+    scopes: z.string()
+        .refine(value => value.split(',').map(x => x.trim()).every(scope => allowedScopes.includes(scope)), {
+        error: e => {
+            const scopes = e.input.split(',').map(x => x.trim());
+            const invalidScope = scopes.find(scope => !allowedScopes.includes(scope));
+            return `'${invalidScope}' is not a valid scope. Allowed scopes are ${allowedScopes.join(', ')}.`;
+        }
+    }).alias('s'),
+    startIndex: z.number()
+        .refine(n => n >= 0, {
+        error: e => `'${e.input}' is not a valid value for option 'startIndex'. Start index must be greater or equal to 0.`
+    }).optional(),
+    pageSize: z.number()
+        .refine(n => n >= 1 && n <= 500, {
+        error: e => `'${e.input}' is not a valid value for option 'pageSize'. Page size must be between 1 and 500.`
+    }).optional(),
+    allResults: z.boolean().optional(),
+    resultsOnly: z.boolean().optional(),
+    enableTopResults: z.boolean().optional(),
+    select: z.string().optional(),
+    sortBy: z.string().optional(),
+    enableSpellingSuggestion: z.boolean().optional(),
+    enableSpellingModification: z.boolean().optional()
+});
 class SearchCommand extends GraphCommand {
     get name() {
         return commands.SEARCH;
@@ -14,13 +38,35 @@ class SearchCommand extends GraphCommand {
     get description() {
         return 'Uses the Microsoft Search to query Microsoft 365 data';
     }
-    constructor() {
-        super();
-        _SearchCommand_instances.add(this);
-        this.allowedScopes = ['chatMessage', 'message', 'event', 'drive', 'driveItem', 'list', 'listItem', 'site', 'bookmark', 'acronym', 'person'];
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SearchCommand_instances, "m", _SearchCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            if (opts.sortBy) {
+                const scopes = opts.scopes.split(',').map(x => x.trim());
+                return !scopes.some(scope => scope === 'message' || scope === 'event');
+            }
+            return true;
+        }, {
+            error: 'Sorting the results is not supported for messages and events.'
+        })
+            .refine(opts => {
+            if (opts.enableTopResults) {
+                const scopes = opts.scopes.split(',').map(x => x.trim());
+                if (scopes.length === 1) {
+                    return scopes[0] === 'message' || scopes[0] === 'chatMessage';
+                }
+                if (scopes.length === 2) {
+                    return scopes.includes('message') && scopes.includes('chatMessage');
+                }
+                return false;
+            }
+            return true;
+        }, {
+            error: 'Top results are only supported for messages and chat messages.'
+        });
     }
     async commandAction(logger, args) {
         let result;
@@ -108,69 +154,5 @@ class SearchCommand extends GraphCommand {
         return properties;
     }
 }
-_SearchCommand_instances = new WeakSet(), _SearchCommand_initTelemetry = function _SearchCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            queryText: typeof args.options.queryText !== 'undefined',
-            startIndex: typeof args.options.startIndex !== 'undefined',
-            pageSize: typeof args.options.pageSize !== 'undefined',
-            allResults: !!args.options.allResults,
-            resultsOnly: !!args.options.resultsOnly,
-            enableTopResults: !!args.options.enableTopResults,
-            select: typeof args.options.select !== 'undefined',
-            sortBy: typeof args.options.sortBy !== 'undefined',
-            enableSpellingSuggestion: !!args.options.enableSpellingSuggestion,
-            enableSpellingModification: !!args.options.enableSpellingModification
-        });
-    });
-}, _SearchCommand_initOptions = function _SearchCommand_initOptions() {
-    this.options.unshift({
-        option: '-q, --queryText [queryText]'
-    }, {
-        option: '-s, --scopes <scopes>',
-        autocomplete: this.allowedScopes
-    }, {
-        option: '--startIndex [startIndex]'
-    }, {
-        option: '--pageSize [pageSize]'
-    }, {
-        option: '--allResults'
-    }, {
-        option: '--resultsOnly'
-    }, {
-        option: '--enableTopResults'
-    }, {
-        option: '--select [select]'
-    }, {
-        option: '--sortBy [sortBy]'
-    }, {
-        option: '--enableSpellingSuggestion'
-    }, {
-        option: '--enableSpellingModification'
-    });
-}, _SearchCommand_initValidators = function _SearchCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const scopes = args.options.scopes.split(',').map(x => x.trim());
-        if (!scopes.every(scope => this.allowedScopes.indexOf(scope) > -1)) {
-            const invalidScope = scopes.find(scope => this.allowedScopes.indexOf(scope) === -1);
-            return `'${invalidScope}'' is not a valid scope. Allowed scopes are ${this.allowedScopes.join(', ')}.`;
-        }
-        if (args.options.startIndex !== undefined && args.options.startIndex < 0) {
-            return `'${args.options.startIndex}' is not a valid value for option 'startIndex'. Start index must be greater or equal to 0.`;
-        }
-        if (args.options.pageSize !== undefined && (args.options.pageSize < 1 || args.options.pageSize > 500)) {
-            return `'${args.options.pageSize}' is not a valid value for option 'pageSize'. Page size must be between 1 and 500.`;
-        }
-        if (args.options.sortBy && scopes.some(scope => scope === 'message' || scope === 'event')) {
-            return 'Sorting the results is not supported for messages and events.';
-        }
-        if (args.options.enableTopResults &&
-            ((scopes.length === 1 && scopes.indexOf('message') === -1 && scopes.indexOf('chatMessage') === -1) ||
-                (scopes.length === 2) && !(scopes.indexOf('message') > -1 && scopes.indexOf('chatMessage') > -1))) {
-            return 'Top results are only supported for messages and chat messages.';
-        }
-        return true;
-    });
-};
 export default new SearchCommand();
 //# sourceMappingURL=search.js.map

package/dist/m365/commands/setup.js

@@ -1,13 +1,9 @@
-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 _SetupCommand_instances, _SetupCommand_initTelemetry, _SetupCommand_initOptions, _SetupCommand_initValidators;
 import chalk from 'chalk';
 import os from 'os';
+import { z } from 'zod';
 import auth, { AuthType } from '../../Auth.js';
 import { cli } from '../../cli/cli.js';
+import { globalOptionsZod } from '../../Command.js';
 import config from '../../config.js';
 import { settingsNames } from '../../settingsNames.js';
 import { accessToken } from '../../utils/accessToken.js';
@@ -18,6 +14,12 @@ import { validation } from '../../utils/validation.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    interactive: z.boolean().optional(),
+    scripting: z.boolean().optional(),
+    skipApp: z.boolean().optional()
+});
 export var CliUsageMode;
 (function (CliUsageMode) {
     CliUsageMode["Interactively"] = "interactively";
@@ -51,12 +53,14 @@ class SetupCommand extends AnonymousCommand {
     get description() {
         return 'Sets up CLI for Microsoft 365 based on your preferences';
     }
-    constructor() {
-        super();
-        _SetupCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.interactive || !opts.scripting, {
+            error: 'Specify either interactive or scripting but not both'
+        });
     }
     async commandAction(logger, args) {
         let settings;
@@ -360,24 +364,5 @@ class SetupCommand extends AnonymousCommand {
         }
     }
 }
-_SetupCommand_instances = new WeakSet(), _SetupCommand_initTelemetry = function _SetupCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        const properties = {
-            interactive: !!args.options.interactive,
-            scripting: !!args.options.scripting,
-            skipApp: !!args.options.skipApp
-        };
-        Object.assign(this.telemetryProperties, properties);
-    });
-}, _SetupCommand_initOptions = function _SetupCommand_initOptions() {
-    this.options.unshift({ option: '--interactive' }, { option: '--scripting' }, { option: '--skipApp' });
-}, _SetupCommand_initValidators = function _SetupCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.interactive && args.options.scripting) {
-            return 'Specify either interactive or scripting but not both';
-        }
-        return true;
-    });
-};
 export default new SetupCommand();
 //# sourceMappingURL=setup.js.map

package/dist/m365/commands/version.js

@@ -1,6 +1,9 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../Command.js';
 import { app } from '../../utils/app.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class VersionCommand extends AnonymousCommand {
     get name() {
         return commands.VERSION;
@@ -8,6 +11,9 @@ class VersionCommand extends AnonymousCommand {
     get description() {
         return 'Shows CLI for Microsoft 365 version';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         await logger.log(`v${app.packageJson().version}`);
     }

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