@pnp/cli-microsoft365 12.0.0 → 12.1.0-beta.79db3d9

package/dist/cli/cli.js

@@ -47,6 +47,21 @@ const yargsConfiguration = {
     'boolean-negation': true,
     'camel-case-expansion': false
 };
+function isMissingRequiredValueError(error, options) {
+    if (error.code !== 'invalid_type') {
+        return false;
+    }
+    let currentValue = options;
+    for (const pathSegment of error.path) {
+        if (currentValue === null ||
+            typeof currentValue !== 'object' ||
+            !Object.prototype.hasOwnProperty.call(currentValue, pathSegment)) {
+            return true;
+        }
+        currentValue = currentValue[pathSegment];
+    }
+    return false;
+}
 function getConfig() {
     if (!_config) {
         _config = new Configstore(config.configstoreName);
@@ -159,15 +174,14 @@ async function execute(rawArgs) {
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
                 if (!shouldPrompt) {
                     result.error.issues.forEach(e => {
-                        if (e.code === 'invalid_type' &&
-                            e.input === undefined) {
+                        if (isMissingRequiredValueError(e, cli.optionsFromArgs.options)) {
                             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) ||
+                    .filter(e => isMissingRequiredValueError(e, cli.optionsFromArgs.options) ||
                     (e.code === 'custom' && e.params?.customCode === 'required'));
                 const optionSetErrors = result.error.issues
                     .filter(e => e.code === 'custom' && e.params?.customCode === 'optionSet');
@@ -922,24 +936,11 @@ 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);
-        }
-    }
+    const parsedOptions = getCommandOptionsFromArgs([`--${selectedOptionName}`, optionValue], cli.commandToExecute);
     options
         .filter(optionName => optionName !== selectedOptionName)
         .forEach(optionName => args.options[optionName] = undefined);
-    args.options[selectedOptionName] = coercedValue;
+    args.options[selectedOptionName] = parsedOptions[selectedOptionName];
     await cli.error('');
 }
 export const cli = {

package/dist/m365/spo/commands/eventreceiver/eventreceiver-get.js

@@ -1,16 +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 _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    scope: z.enum(['web', 'site']).optional().alias('s')
+});
 class SpoEventreceiverGetCommand extends SpoCommand {
     get name() {
         return commands.EVENTRECEIVER_GET;
@@ -18,13 +30,27 @@ class SpoEventreceiverGetCommand extends SpoCommand {
     get description() {
         return 'Gets a specific event receiver attached to the web, site or list (if any of the list options are filled in) by receiver name of id';
     }
-    constructor() {
-        super();
-        _SpoEventreceiverGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(opts => {
+            const listOptions = [opts.listId, opts.listTitle, opts.listUrl];
+            return !(listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1);
+        }, {
+            message: `Specify either list id or title or list url`
+        })
+            .refine(opts => !(opts.scope === 'site' && (opts.listId || opts.listUrl || opts.listTitle)), {
+            message: 'Scope cannot be set to site when retrieving list event receivers.'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -83,57 +109,5 @@ class SpoEventreceiverGetCommand extends SpoCommand {
         }
     }
 }
-_SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetCommand_initTelemetry = function _SpoEventreceiverGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _SpoEventreceiverGetCommand_initOptions = function _SpoEventreceiverGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listId  [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['web', 'site']
-    });
-}, _SpoEventreceiverGetCommand_initValidators = function _SpoEventreceiverGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
-        }
-        if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {
-            return `${args.options.scope} is not a valid type value. Allowed values web|site.`;
-        }
-        if (args.options.scope && args.options.scope === 'site' && (args.options.listId || args.options.listUrl || args.options.listTitle)) {
-            return 'Scope cannot be set to site when retrieving list event receivers.';
-        }
-        return true;
-    });
-}, _SpoEventreceiverGetCommand_initOptionSets = function _SpoEventreceiverGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['name', 'id'] });
-};
 export default new SpoEventreceiverGetCommand();
 //# sourceMappingURL=eventreceiver-get.js.map

package/dist/m365/spo/commands/eventreceiver/eventreceiver-list.js

@@ -1,15 +1,23 @@
-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 _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    scope: z.enum(['web', 'site']).optional().alias('s')
+});
 class SpoEventreceiverListCommand extends SpoCommand {
     get name() {
         return commands.EVENTRECEIVER_LIST;
@@ -20,12 +28,20 @@ class SpoEventreceiverListCommand extends SpoCommand {
     defaultProperties() {
         return ['ReceiverId', 'ReceiverName'];
     }
-    constructor() {
-        super();
-        _SpoEventreceiverListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverListCommand_instances, "m", _SpoEventreceiverListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => {
+            const listOptions = [opts.listId, opts.listTitle, opts.listUrl];
+            return !(listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1);
+        }, {
+            message: `Specify either list id or title or list url`
+        })
+            .refine(opts => !(opts.scope === 'site' && (opts.listId || opts.listUrl || opts.listTitle)), {
+            message: 'Scope cannot be set to site when retrieving list event receivers.'
+        });
     }
     async commandAction(logger, args) {
         let requestUrl = `${args.options.webUrl}/_api/`;
@@ -55,49 +71,5 @@ class SpoEventreceiverListCommand extends SpoCommand {
         }
     }
 }
-_SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCommand_initTelemetry = function _SpoEventreceiverListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined'
-        });
-    });
-}, _SpoEventreceiverListCommand_initOptions = function _SpoEventreceiverListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listId  [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['web', 'site']
-    });
-}, _SpoEventreceiverListCommand_initValidators = function _SpoEventreceiverListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
-        }
-        if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {
-            return `${args.options.scope} is not a valid type value. Allowed values web|site.`;
-        }
-        if (args.options.scope && args.options.scope === 'site' && (args.options.listId || args.options.listUrl || args.options.listTitle)) {
-            return 'Scope cannot be set to site when retrieving list event receivers.';
-        }
-        return true;
-    });
-};
 export default new SpoEventreceiverListCommand();
 //# sourceMappingURL=eventreceiver-list.js.map

package/dist/m365/spo/commands/eventreceiver/eventreceiver-remove.js

@@ -1,10 +1,6 @@
-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 _SpoEventreceiverRemoveCommand_instances, _SpoEventreceiverRemoveCommand_initTelemetry, _SpoEventreceiverRemoveCommand_initOptions, _SpoEventreceiverRemoveCommand_initValidators, _SpoEventreceiverRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -12,6 +8,23 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import getCommand from './eventreceiver-get.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    scope: z.enum(['web', 'site']).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoEventreceiverRemoveCommand extends SpoCommand {
     get name() {
         return commands.EVENTRECEIVER_REMOVE;
@@ -19,13 +32,27 @@ class SpoEventreceiverRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes event receivers for the specified web, site, or list.';
     }
-    constructor() {
-        super();
-        _SpoEventreceiverRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(opts => {
+            const listOptions = [opts.listId, opts.listTitle, opts.listUrl];
+            return !(listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1);
+        }, {
+            message: `Specify either list id or title or list url`
+        })
+            .refine(opts => !(opts.scope === 'site' && (opts.listId || opts.listUrl || opts.listTitle)), {
+            message: 'Scope cannot be set to site when retrieving list event receivers.'
+        });
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -86,60 +113,5 @@ class SpoEventreceiverRemoveCommand extends SpoCommand {
         return eventReceiver.ReceiverId;
     }
 }
-_SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemoveCommand_initTelemetry = function _SpoEventreceiverRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: args.options.scope || 'web',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listId  [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['web', 'site']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoEventreceiverRemoveCommand_initValidators = function _SpoEventreceiverRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
-        }
-        if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {
-            return `${args.options.scope} is not a valid type value. Allowed values web|site.`;
-        }
-        if (args.options.scope && args.options.scope === 'site' && (args.options.listId || args.options.listUrl || args.options.listTitle)) {
-            return 'Scope cannot be set to site when retrieving list event receivers.';
-        }
-        return true;
-    });
-}, _SpoEventreceiverRemoveCommand_initOptionSets = function _SpoEventreceiverRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['name', 'id'] });
-};
 export default new SpoEventreceiverRemoveCommand();
 //# sourceMappingURL=eventreceiver-remove.js.map

package/dist/m365/spo/commands/externaluser/externaluser-list.js

@@ -1,16 +1,32 @@
-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 _SpoExternalUserListCommand_instances, _SpoExternalUserListCommand_initTelemetry, _SpoExternalUserListCommand_initOptions, _SpoExternalUserListCommand_initValidators;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    filter: z.string().optional(),
+    pageSize: z.string().refine(val => {
+        const num = parseInt(val);
+        return !isNaN(num) && num >= 1 && num <= 50;
+    }, {
+        error: e => `pageSize must be between 1 and 50. The specified value ${e.input} is not valid.`
+    }).optional().alias('p'),
+    position: z.string().refine(val => {
+        const num = parseInt(val);
+        return !isNaN(num) && num >= 0;
+    }, {
+        error: e => `position must be greater than or equal to 0. The specified value ${e.input} is not valid.`
+    }).optional().alias('i'),
+    sortOrder: z.enum(['asc', 'desc']).optional().alias('s'),
+    siteUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).optional().alias('u')
+});
 class SpoExternalUserListCommand extends SpoCommand {
     get name() {
         return commands.EXTERNALUSER_LIST;
@@ -18,12 +34,8 @@ class SpoExternalUserListCommand extends SpoCommand {
     get description() {
         return 'Lists external users in the tenant';
     }
-    constructor() {
-        super();
-        _SpoExternalUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoExternalUserListCommand_instances, "m", _SpoExternalUserListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -69,59 +81,5 @@ class SpoExternalUserListCommand extends SpoCommand {
         }
     }
 }
-_SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListCommand_initTelemetry = function _SpoExternalUserListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            filter: (!(!args.options.filter)).toString(),
-            pageSize: (!(!args.options.pageSize)).toString(),
-            position: (!(!args.options.position)).toString(),
-            sortOrder: (!(!args.options.sortOrder)).toString(),
-            siteUrl: (!(!args.options.siteUrl)).toString()
-        });
-    });
-}, _SpoExternalUserListCommand_initOptions = function _SpoExternalUserListCommand_initOptions() {
-    this.options.unshift({
-        option: '--filter [filter]'
-    }, {
-        option: '-p, --pageSize [pageSize]'
-    }, {
-        option: '-i, --position [position]'
-    }, {
-        option: '-s, --sortOrder [sortOrder]',
-        autocomplete: ['asc', 'desc']
-    }, {
-        option: '-u, --siteUrl [siteUrl]'
-    });
-}, _SpoExternalUserListCommand_initValidators = function _SpoExternalUserListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.pageSize) {
-            const pageSize = parseInt(args.options.pageSize);
-            if (isNaN(pageSize)) {
-                return `${args.options.pageSize} is not a valid number`;
-            }
-            if (pageSize < 1 || pageSize > 50) {
-                return 'pageSize must be between 1 and 50';
-            }
-        }
-        if (args.options.position) {
-            const position = parseInt(args.options.position);
-            if (isNaN(position)) {
-                return `${args.options.position} is not a valid number`;
-            }
-            if (position < 0) {
-                return 'position must be greater than or 0';
-            }
-        }
-        if (args.options.sortOrder &&
-            args.options.sortOrder !== 'asc' &&
-            args.options.sortOrder !== 'desc') {
-            return `${args.options.sortOrder} is not a valid sortOrder value. Allowed values asc|desc`;
-        }
-        if (args.options.siteUrl) {
-            return validation.isValidSharePointUrl(args.options.siteUrl);
-        }
-        return true;
-    });
-};
 export default new SpoExternalUserListCommand();
 //# sourceMappingURL=externaluser-list.js.map

package/dist/m365/spo/commands/group/group-add.js

@@ -1,13 +1,24 @@
-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 _SpoGroupAddCommand_instances, _SpoGroupAddCommand_initTelemetry, _SpoGroupAddCommand_initOptions, _SpoGroupAddCommand_initTypes, _SpoGroupAddCommand_initValidators, _SpoGroupAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    name: z.string().alias('n'),
+    description: z.string().optional(),
+    allowMembersEditMembership: z.boolean().optional(),
+    onlyAllowMembersViewMembership: z.boolean().optional(),
+    allowRequestToJoinLeave: z.boolean().optional(),
+    autoAcceptRequestToJoinLeave: z.boolean().optional(),
+    requestToJoinLeaveEmailSetting: z.string().optional()
+});
 class SpoGroupAddCommand extends SpoCommand {
     get name() {
         return commands.GROUP_ADD;
@@ -15,14 +26,8 @@ class SpoGroupAddCommand extends SpoCommand {
     get description() {
         return 'Creates group in the specified site';
     }
-    constructor() {
-        super();
-        _SpoGroupAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const requestOptions = {
@@ -50,51 +55,5 @@ class SpoGroupAddCommand extends SpoCommand {
         }
     }
 }
-_SpoGroupAddCommand_instances = new WeakSet(), _SpoGroupAddCommand_initTelemetry = function _SpoGroupAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            allowMembersEditMembership: args.options.allowMembersEditMembership,
-            onlyAllowMembersViewMembership: args.options.onlyAllowMembersViewMembership,
-            allowRequestToJoinLeave: args.options.allowRequestToJoinLeave,
-            autoAcceptRequestToJoinLeave: args.options.autoAcceptRequestToJoinLeave,
-            requestToJoinLeaveEmailSetting: typeof args.options.requestToJoinLeaveEmailSetting !== 'undefined'
-        });
-    });
-}, _SpoGroupAddCommand_initOptions = function _SpoGroupAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '--description [description]'
-    }, {
-        option: '--allowMembersEditMembership [allowMembersEditMembership]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
-    });
-}, _SpoGroupAddCommand_initTypes = function _SpoGroupAddCommand_initTypes() {
-    this.types.boolean.push('allowMembersEditMembership', 'onlyAllowMembersViewMembership', 'allowRequestToJoinLeave', 'autoAcceptRequestToJoinLeave');
-}, _SpoGroupAddCommand_initValidators = function _SpoGroupAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        return true;
-    });
-}, _SpoGroupAddCommand_initOptionSets = function _SpoGroupAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoGroupAddCommand();
 //# sourceMappingURL=group-add.js.map