@pnp/cli-microsoft365 12.0.0-beta.1752794 → 12.0.0-beta.235caf5

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

@@ -1,14 +1,61 @@
-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 _SpoCustomActionAddCommand_instances, _SpoCustomActionAddCommand_initTelemetry, _SpoCustomActionAddCommand_initOptions, _SpoCustomActionAddCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import { BasePermissions, PermissionKind } from '../../base-permissions.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+const permissionKinds = Object.entries(PermissionKind)
+    .filter(([, value]) => typeof value === 'number')
+    .map(([key]) => key);
+const permissionKindSet = new Set(permissionKinds);
+const registrationTypes = {
+    None: 'None',
+    List: 'List',
+    ContentType: 'ContentType',
+    ProgId: 'ProgId',
+    FileType: 'FileType'
+};
+const registrationTypeValues = Object.values(registrationTypes);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    name: z.string().alias('n'),
+    title: z.string().alias('t'),
+    location: z.string().alias('l'),
+    group: z.string().optional().alias('g'),
+    description: z.string().optional().alias('d'),
+    sequence: z.coerce.number().refine(val => val >= 0 && val <= 65536, {
+        message: 'Invalid option sequence. Expected value in range from 0 to 65536'
+    }).optional(),
+    actionUrl: z.string().optional(),
+    imageUrl: z.string().optional(),
+    commandUIExtension: z.string().optional().alias('e'),
+    registrationId: z.string().optional(),
+    registrationType: zod.coercedEnum(registrationTypes)
+        .optional()
+        .autocomplete(registrationTypeValues),
+    rights: z.string().refine(val => {
+        const items = val.split(',').map(item => item.trim());
+        return items.every(item => permissionKindSet.has(item));
+    }, {
+        error: e => {
+            const items = e.input.split(',').map(item => item.trim());
+            const invalid = items.find(item => !permissionKindSet.has(item));
+            return `Rights option '${invalid}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+        }
+    }).optional().autocomplete(permissionKinds),
+    scriptSrc: z.string().optional(),
+    scriptBlock: z.string().optional(),
+    scope: z.enum(['Site', 'Web']).optional().alias('s'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `ClientSideComponentId ${e.input} is not a valid GUID`
+    }).optional().alias('c'),
+    clientSideComponentProperties: z.string().optional().alias('p')
+});
 class SpoCustomActionAddCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_ADD;
@@ -16,25 +63,78 @@ class SpoCustomActionAddCommand extends SpoCommand {
     get description() {
         return 'Adds a user custom action for site or site collection';
     }
-    constructor() {
-        super();
-        _SpoCustomActionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
-    /**
-     * Maps the base PermissionsKind enum to string array so it can
-     * more easily be used in validation or descriptions.
-     */
-    get permissionsKindMap() {
-        const result = [];
-        for (const kind in PermissionKind) {
-            if (typeof PermissionKind[kind] === 'number') {
-                result.push(kind);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.registrationId || opts.registrationType, {
+            message: 'Option registrationId is specified, but registrationType is missing',
+            path: ['registrationType'],
+            params: { customCode: 'required' }
+        })
+            .refine(opts => !opts.registrationType || opts.registrationId, {
+            message: 'Option registrationType is specified, but registrationId is missing',
+            path: ['registrationId'],
+            params: { customCode: 'required' }
+        })
+            .refine(opts => {
+            if (!opts.location) {
+                return true;
             }
-        }
-        return result;
+            const location = opts.location.toLowerCase();
+            const locationsRequireGroup = [
+                'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
+                'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
+                'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
+                'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
+                'microsoft.sharepoint.sitesettings'
+            ];
+            return !locationsRequireGroup.includes(location) || !!opts.group;
+        }, {
+            message: 'The location specified requires the group option to be specified as well',
+            path: ['group'],
+            params: { customCode: 'required' }
+        })
+            .refine(opts => {
+            if (!opts.location) {
+                return true;
+            }
+            const location = opts.location.toLowerCase();
+            if (location === 'scriptlink') {
+                return !!opts.scriptSrc || !!opts.scriptBlock;
+            }
+            return true;
+        }, {
+            message: 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink',
+            params: {
+                customCode: 'optionSet',
+                options: ['scriptSrc', 'scriptBlock']
+            }
+        })
+            .refine(opts => {
+            if (!opts.location) {
+                return true;
+            }
+            const location = opts.location.toLowerCase();
+            if ((opts.scriptSrc || opts.scriptBlock) && location !== 'scriptlink') {
+                return false;
+            }
+            return true;
+        }, {
+            message: 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink'
+        })
+            .refine(opts => !(opts.scriptSrc && opts.scriptBlock), {
+            message: 'Either option scriptSrc or scriptBlock can be specified, but not both'
+        })
+            .refine(opts => !opts.clientSideComponentProperties || opts.clientSideComponentId, {
+            message: 'Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing',
+            path: ['clientSideComponentId'],
+            params: { customCode: 'required' }
+        });
+    }
+    get permissionsKindMap() {
+        return permissionKinds;
     }
     async commandAction(logger, args) {
         try {
@@ -91,7 +191,7 @@ class SpoCustomActionAddCommand extends SpoCommand {
         if (options.description) {
             requestBody.Description = options.description;
         }
-        if (options.sequence) {
+        if (options.sequence !== undefined) {
             requestBody.Sequence = options.sequence;
         }
         if (options.registrationType) {
@@ -149,126 +249,5 @@ class SpoCustomActionAddCommand extends SpoCommand {
         return 0; // None
     }
 }
-_SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand_initTelemetry = function _SpoCustomActionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            location: args.options.location,
-            scope: args.options.scope || 'Web',
-            group: (!(!args.options.group)).toString(),
-            description: (!(!args.options.description)).toString(),
-            sequence: (!(!args.options.sequence)).toString(),
-            actionUrl: (!(!args.options.actionUrl)).toString(),
-            imageUrl: (!(!args.options.imageUrl)).toString(),
-            commandUIExtension: (!(!args.options.commandUIExtension)).toString(),
-            registrationId: args.options.registrationId,
-            registrationType: args.options.registrationType,
-            rights: args.options.rights,
-            scriptSrc: (!(!args.options.scriptSrc)).toString(),
-            scriptBlock: (!(!args.options.scriptBlock)).toString(),
-            clientSideComponentId: (!(!args.options.clientSideComponentId)).toString(),
-            clientSideComponentProperties: (!(!args.options.clientSideComponentProperties)).toString()
-        });
-    });
-}, _SpoCustomActionAddCommand_initOptions = function _SpoCustomActionAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '-t, --title <title>'
-    }, {
-        option: '-l, --location <location>'
-    }, {
-        option: '-g, --group [group]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--sequence [sequence]'
-    }, {
-        option: '--actionUrl [actionUrl]'
-    }, {
-        option: '--imageUrl [imageUrl]'
-    }, {
-        option: '-e, --commandUIExtension [commandUIExtension]'
-    }, {
-        option: '--registrationId [registrationId]'
-    }, {
-        option: '--registrationType [registrationType]',
-        autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
-    }, {
-        option: '--rights [rights]',
-        autocomplete: this.permissionsKindMap
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web']
-    }, {
-        option: '--scriptBlock [scriptBlock]'
-    }, {
-        option: '--scriptSrc [scriptSrc]'
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    });
-}, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.registrationId && !args.options.registrationType) {
-            return 'Option registrationId is specified, but registrationType is missing';
-        }
-        if (args.options.registrationType && !args.options.registrationId) {
-            return 'Option registrationType is specified, but registrationId is missing';
-        }
-        const location = args.options.location.toLowerCase();
-        const locationsRequireGroup = [
-            'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
-            'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
-            'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
-            'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
-            'microsoft.sharepoint.sitesettings'
-        ];
-        if (locationsRequireGroup.indexOf(location) > -1 && !args.options.group) {
-            return `The location specified requires the group option to be specified as well`;
-        }
-        if (location === 'scriptlink' &&
-            !args.options.scriptSrc &&
-            !args.options.scriptBlock) {
-            return 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink';
-        }
-        if ((args.options.scriptSrc || args.options.scriptBlock) && location !== 'scriptlink') {
-            return 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink';
-        }
-        if (args.options.scriptSrc && args.options.scriptBlock) {
-            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
-        }
-        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
-            return 'Invalid option sequence. Expected value in range from 0 to 65536';
-        }
-        if (args.options.clientSideComponentId && validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {
-            return `Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing`;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web`;
-        }
-        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`;
-                }
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionAddCommand();
 //# sourceMappingURL=customaction-add.js.map

package/dist/m365/spo/commands/customaction/customaction-clear.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 _SpoCustomActionClearCommand_instances, _SpoCustomActionClearCommand_initTelemetry, _SpoCustomActionClearCommand_initOptions, _SpoCustomActionClearCommand_initValidators;
 import chalk from 'chalk';
 import { cli } from '../../../../cli/cli.js';
+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';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCustomActionClearCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_CLEAR;
@@ -17,12 +21,8 @@ class SpoCustomActionClearCommand extends SpoCommand {
     get description() {
         return 'Deletes all custom actions in the collection';
     }
-    constructor() {
-        super();
-        _SpoCustomActionClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const clearCustomActions = async () => {
@@ -69,36 +69,5 @@ class SpoCustomActionClearCommand extends SpoCommand {
         await this.clearScopedCustomActions(options);
     }
 }
-_SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCommand_initTelemetry = function _SpoCustomActionClearCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoCustomActionClearCommand_initOptions = function _SpoCustomActionClearCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web' &&
-            args.options.scope !== 'All') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionClearCommand();
 //# sourceMappingURL=customaction-clear.js.map

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

@@ -1,15 +1,25 @@
-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 _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.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';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not valid. Custom action id (Guid) expected.`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not a valid GUID.`
+    }).optional().alias('c'),
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s')
+});
 class SpoCustomActionGetCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_GET;
@@ -17,13 +27,18 @@ class SpoCustomActionGetCommand extends SpoCommand {
     get description() {
         return 'Gets details for the specified custom action';
     }
-    constructor() {
-        super();
-        _SpoCustomActionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.clientSideComponentId].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of id, title or clientSideComponentId',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'clientSideComponentId']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -97,51 +112,5 @@ class SpoCustomActionGetCommand extends SpoCommand {
         return `${scope}`;
     }
 }
-_SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand_initTelemetry = function _SpoCustomActionGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            scope: args.options.scope || 'All'
-        });
-    });
-}, _SpoCustomActionGetCommand_initOptions = function _SpoCustomActionGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    });
-}, _SpoCustomActionGetCommand_initValidators = function _SpoCustomActionGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action id (Guid) expected.`;
-        }
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web' &&
-                args.options.scope !== 'All') {
-                return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-            }
-        }
-        if (args.options.clientSideComponentId && validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `${args.options.clientSideComponentId} is not a valid GUID.`;
-        }
-        return true;
-    });
-}, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
-};
 export default new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map

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

@@ -1,13 +1,16 @@
-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 _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s')
+});
 class SpoCustomActionListCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_LIST;
@@ -15,16 +18,12 @@ class SpoCustomActionListCommand extends SpoCommand {
     get description() {
         return 'Lists all user custom actions at the given scope';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
-    constructor() {
-        super();
-        _SpoCustomActionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initValidators).call(this);
-    }
     async commandAction(logger, args) {
         try {
             const scope = args.options.scope ? args.options.scope : 'All';
@@ -52,34 +51,5 @@ class SpoCustomActionListCommand extends SpoCommand {
         return `${scope}`;
     }
 }
-_SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListCommand_initTelemetry = function _SpoCustomActionListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All'
-        });
-    });
-}, _SpoCustomActionListCommand_initOptions = function _SpoCustomActionListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    });
-}, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web' &&
-                args.options.scope !== 'All') {
-                return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionListCommand();
 //# sourceMappingURL=customaction-list.js.map

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

@@ -1,16 +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 _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initTelemetry, _SpoCustomActionRemoveCommand_initOptions, _SpoCustomActionRemoveCommand_initValidators, _SpoCustomActionRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.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';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not valid. Custom action Id (GUID) expected.`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCustomActionRemoveCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_REMOVE;
@@ -18,13 +26,18 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified custom action';
     }
-    constructor() {
-        super();
-        _SpoCustomActionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of id or title',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeCustomAction = async () => {
@@ -99,46 +112,5 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
         return siteResult;
     }
 }
-_SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveCommand_initTelemetry = function _SpoCustomActionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoCustomActionRemoveCommand_initOptions = function _SpoCustomActionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
-        }
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web' &&
-                args.options.scope !== 'All') {
-                return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-            }
-        }
-        return true;
-    });
-}, _SpoCustomActionRemoveCommand_initOptionSets = function _SpoCustomActionRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-};
 export default new SpoCustomActionRemoveCommand();
 //# sourceMappingURL=customaction-remove.js.map