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

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

@@ -1,15 +1,30 @@
-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 _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initTypes, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import entraUserGetCommand from '../../../entra/commands/user/user-get.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'),
+    id: z.coerce.number().int().positive().optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    newName: z.string().optional(),
+    description: z.string().optional(),
+    allowMembersEditMembership: z.boolean().optional(),
+    onlyAllowMembersViewMembership: z.boolean().optional(),
+    allowRequestToJoinLeave: z.boolean().optional(),
+    autoAcceptRequestToJoinLeave: z.boolean().optional(),
+    requestToJoinLeaveEmailSetting: z.string().optional(),
+    ownerEmail: z.string().optional(),
+    ownerUserName: z.string().optional()
+});
 class SpoGroupSetCommand extends SpoCommand {
     get name() {
         return commands.GROUP_SET;
@@ -17,14 +32,21 @@ class SpoGroupSetCommand extends SpoCommand {
     get description() {
         return 'Updates a group in the specified site';
     }
-    constructor() {
-        super();
-        _SpoGroupSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => [o.id, o.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(o => [o.ownerEmail, o.ownerUserName].filter(x => x !== undefined).length <= 1, {
+            error: `Specify either 'ownerEmail' or 'ownerUserName', but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -91,70 +113,5 @@ class SpoGroupSetCommand extends SpoCommand {
         return response.Id;
     }
 }
-_SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry = function _SpoGroupSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            newName: typeof args.options.newName !== 'undefined',
-            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',
-            ownerEmail: typeof args.options.ownerEmail !== 'undefined',
-            ownerUserName: typeof args.options.ownerUserName !== 'undefined'
-        });
-    });
-}, _SpoGroupSetCommand_initOptions = function _SpoGroupSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '--newName [newName]'
-    }, {
-        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]'
-    }, {
-        option: '--ownerEmail [ownerEmail]'
-    }, {
-        option: '--ownerUserName [ownerUserName]'
-    });
-}, _SpoGroupSetCommand_initTypes = function _SpoGroupSetCommand_initTypes() {
-    this.types.boolean.push('allowMembersEditMembership', 'onlyAllowMembersViewMembership', 'allowRequestToJoinLeave', 'autoAcceptRequestToJoinLeave');
-}, _SpoGroupSetCommand_initValidators = function _SpoGroupSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && isNaN(args.options.id)) {
-            return `Specified id ${args.options.id} is not a number`;
-        }
-        if (args.options.ownerEmail && args.options.ownerUserName) {
-            return 'Specify either ownerEmail or ownerUserName but not both';
-        }
-        return true;
-    });
-}, _SpoGroupSetCommand_initOptionSets = function _SpoGroupSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoGroupSetCommand();
 //# sourceMappingURL=group-set.js.map

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

@@ -1,13 +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 _SpoPropertyBagGetCommand_instances, _SpoPropertyBagGetCommand_initTelemetry, _SpoPropertyBagGetCommand_initOptions, _SpoPropertyBagGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoPropertyBagBaseCommand } from './propertybag-base.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'),
+    key: z.string().alias('k'),
+    folder: z.string().optional()
+});
 class SpoPropertyBagGetCommand extends SpoPropertyBagBaseCommand {
     get name() {
         return commands.PROPERTYBAG_GET;
@@ -15,12 +21,8 @@ class SpoPropertyBagGetCommand extends SpoPropertyBagBaseCommand {
     get description() {
         return 'Gets the value of the specified property from the property bag';
     }
-    constructor() {
-        super();
-        _SpoPropertyBagGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -61,22 +63,5 @@ class SpoPropertyBagGetCommand extends SpoPropertyBagBaseCommand {
         return null;
     }
 }
-_SpoPropertyBagGetCommand_instances = new WeakSet(), _SpoPropertyBagGetCommand_initTelemetry = function _SpoPropertyBagGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            folder: typeof args.options.folder !== 'undefined'
-        });
-    });
-}, _SpoPropertyBagGetCommand_initOptions = function _SpoPropertyBagGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '--folder [folder]'
-    });
-}, _SpoPropertyBagGetCommand_initValidators = function _SpoPropertyBagGetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoPropertyBagGetCommand();
 //# sourceMappingURL=propertybag-get.js.map

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

@@ -1,13 +1,18 @@
-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 _SpoPropertyBagListCommand_instances, _SpoPropertyBagListCommand_initTelemetry, _SpoPropertyBagListCommand_initOptions, _SpoPropertyBagListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoPropertyBagBaseCommand } from './propertybag-base.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'),
+    folder: z.string().optional()
+});
 class SpoPropertyBagListCommand extends SpoPropertyBagBaseCommand {
     get name() {
         return commands.PROPERTYBAG_LIST;
@@ -15,12 +20,8 @@ class SpoPropertyBagListCommand extends SpoPropertyBagBaseCommand {
     get description() {
         return 'Gets property bag values';
     }
-    constructor() {
-        super();
-        _SpoPropertyBagListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -61,20 +62,5 @@ class SpoPropertyBagListCommand extends SpoPropertyBagBaseCommand {
         return result;
     }
 }
-_SpoPropertyBagListCommand_instances = new WeakSet(), _SpoPropertyBagListCommand_initTelemetry = function _SpoPropertyBagListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            folder: typeof args.options.folder !== 'undefined'
-        });
-    });
-}, _SpoPropertyBagListCommand_initOptions = function _SpoPropertyBagListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--folder [folder]'
-    });
-}, _SpoPropertyBagListCommand_initValidators = function _SpoPropertyBagListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoPropertyBagListCommand();
 //# sourceMappingURL=propertybag-list.js.map

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

@@ -1,17 +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 _SpoPropertyBagRemoveCommand_instances, _SpoPropertyBagRemoveCommand_initTelemetry, _SpoPropertyBagRemoveCommand_initOptions, _SpoPropertyBagRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 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 commands from '../../commands.js';
 import { SpoPropertyBagBaseCommand } from './propertybag-base.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'),
+    key: z.string().alias('k'),
+    folder: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
     get name() {
         return commands.PROPERTYBAG_REMOVE;
@@ -19,12 +26,8 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
     get description() {
         return 'Removes specified property from the property bag';
     }
-    constructor() {
-        super();
-        _SpoPropertyBagRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -76,25 +79,5 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
         }
     }
 }
-_SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCommand_initTelemetry = function _SpoPropertyBagRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            folder: (!(!args.options.folder)).toString(),
-            force: args.options.force === true
-        });
-    });
-}, _SpoPropertyBagRemoveCommand_initOptions = function _SpoPropertyBagRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '--folder [folder]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoPropertyBagRemoveCommand_initValidators = function _SpoPropertyBagRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoPropertyBagRemoveCommand();
 //# sourceMappingURL=propertybag-remove.js.map

package/dist/m365/spo/commands/propertybag/propertybag-set.js

@@ -1,13 +1,20 @@
-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 _SpoPropertyBagSetCommand_instances, _SpoPropertyBagSetCommand_initTelemetry, _SpoPropertyBagSetCommand_initOptions, _SpoPropertyBagSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoPropertyBagBaseCommand } from './propertybag-base.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'),
+    key: z.string().alias('k'),
+    value: z.string().alias('v'),
+    folder: z.string().optional()
+});
 class SpoPropertyBagSetCommand extends SpoPropertyBagBaseCommand {
     get name() {
         return commands.PROPERTYBAG_SET;
@@ -15,12 +22,8 @@ class SpoPropertyBagSetCommand extends SpoPropertyBagBaseCommand {
     get description() {
         return 'Sets the value of the specified property in the property bag. Adds the property if it does not exist';
     }
-    constructor() {
-        super();
-        _SpoPropertyBagSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -46,24 +49,5 @@ class SpoPropertyBagSetCommand extends SpoPropertyBagBaseCommand {
         return SpoPropertyBagBaseCommand.setProperty(options.key, options.value, options.webUrl, this.formDigestValue, identityResp, logger, this.debug, options.folder);
     }
 }
-_SpoPropertyBagSetCommand_instances = new WeakSet(), _SpoPropertyBagSetCommand_initTelemetry = function _SpoPropertyBagSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            folder: typeof args.options.folder !== 'undefined'
-        });
-    });
-}, _SpoPropertyBagSetCommand_initOptions = function _SpoPropertyBagSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '-v, --value <value>'
-    }, {
-        option: '--folder [folder]'
-    });
-}, _SpoPropertyBagSetCommand_initValidators = function _SpoPropertyBagSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoPropertyBagSetCommand();
 //# sourceMappingURL=propertybag-set.js.map

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

@@ -1,14 +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 _SpoRoleDefinitionAddCommand_instances, _SpoRoleDefinitionAddCommand_initTelemetry, _SpoRoleDefinitionAddCommand_initOptions, _SpoRoleDefinitionAddCommand_initValidators;
+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 { BasePermissions, PermissionKind } from '../../base-permissions.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().alias('d'),
+    rights: z.string()
+        .optional()
+        .autocomplete(Object.keys(PermissionKind)
+        .filter(kind => typeof PermissionKind[kind] === 'number'))
+});
 class SpoRoleDefinitionAddCommand extends SpoCommand {
     get name() {
         return commands.ROLEDEFINITION_ADD;
@@ -16,6 +26,9 @@ class SpoRoleDefinitionAddCommand extends SpoCommand {
     get description() {
         return 'Adds a new roledefinition to web';
     }
+    get schema() {
+        return options;
+    }
     get permissionsKindMap() {
         const result = [];
         for (const kind in PermissionKind) {
@@ -25,12 +38,32 @@ class SpoRoleDefinitionAddCommand extends SpoCommand {
         }
         return result;
     }
-    constructor() {
-        super();
-        _SpoRoleDefinitionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initValidators).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine((opts) => {
+            if (!opts.rights) {
+                return true;
+            }
+            const rights = opts.rights.split(',');
+            for (const item of rights) {
+                const kind = PermissionKind[item.trim()];
+                if (!kind) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            error: (e) => {
+                const rights = e.input.rights.split(',');
+                const invalid = rights.filter((item) => {
+                    const kind = PermissionKind[item.trim()];
+                    return !kind;
+                });
+                return {
+                    message: `Rights option '${invalid[0]}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive. Allowed values are ${this.permissionsKindMap.join('|')}.`
+                };
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -68,37 +101,5 @@ class SpoRoleDefinitionAddCommand extends SpoCommand {
         }
     }
 }
-_SpoRoleDefinitionAddCommand_instances = new WeakSet(), _SpoRoleDefinitionAddCommand_initTelemetry = function _SpoRoleDefinitionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            rights: args.options.rights,
-            description: (!(!args.options.description)).toString()
-        });
-    });
-}, _SpoRoleDefinitionAddCommand_initOptions = function _SpoRoleDefinitionAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--rights [rights]',
-        autocomplete: this.permissionsKindMap
-    });
-}, _SpoRoleDefinitionAddCommand_initValidators = function _SpoRoleDefinitionAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.rights) {
-            const rights = args.options.rights.split(',');
-            for (const item of rights) {
-                const kind = PermissionKind[item.trim()];
-                if (!kind) {
-                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive. Allowed values are ${this.permissionsKindMap.join('|')}.`;
-                }
-            }
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoRoleDefinitionAddCommand();
 //# sourceMappingURL=roledefinition-add.js.map

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

@@ -1,15 +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 _SpoRoleDefinitionGetCommand_instances, _SpoRoleDefinitionGetCommand_initOptions, _SpoRoleDefinitionGetCommand_initValidators;
+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 { BasePermissions } from '../../base-permissions.js';
 import commands from '../../commands.js';
 import { RoleType } from './RoleType.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'),
+    id: z.coerce.number()
+        .alias('i')
+});
 class SpoRoleDefinitionGetCommand extends SpoCommand {
     get name() {
         return commands.ROLEDEFINITION_GET;
@@ -17,11 +23,8 @@ class SpoRoleDefinitionGetCommand extends SpoCommand {
     get description() {
         return 'Gets specified role definition from web by id';
     }
-    constructor() {
-        super();
-        _SpoRoleDefinitionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -48,19 +51,5 @@ class SpoRoleDefinitionGetCommand extends SpoCommand {
         }
     }
 }
-_SpoRoleDefinitionGetCommand_instances = new WeakSet(), _SpoRoleDefinitionGetCommand_initOptions = function _SpoRoleDefinitionGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    });
-}, _SpoRoleDefinitionGetCommand_initValidators = function _SpoRoleDefinitionGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (isNaN(args.options.id)) {
-            return `${args.options.id} is not a number`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoRoleDefinitionGetCommand();
 //# sourceMappingURL=roledefinition-get.js.map

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

@@ -1,14 +1,18 @@
-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 _SpoRoleDefinitionListCommand_instances, _SpoRoleDefinitionListCommand_initOptions, _SpoRoleDefinitionListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import 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')
+});
 class SpoRoleDefinitionListCommand extends SpoCommand {
     get name() {
         return commands.ROLEDEFINITION_LIST;
@@ -19,11 +23,8 @@ class SpoRoleDefinitionListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Name'];
     }
-    constructor() {
-        super();
-        _SpoRoleDefinitionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -39,12 +40,5 @@ class SpoRoleDefinitionListCommand extends SpoCommand {
         }
     }
 }
-_SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoRoleDefinitionListCommand_initValidators = function _SpoRoleDefinitionListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoRoleDefinitionListCommand();
 //# sourceMappingURL=roledefinition-list.js.map