@pnp/cli-microsoft365 12.0.0-beta.feb621e → 12.1.0-beta.0c2915d

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

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

@@ -1,14 +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 _SpoRoleDefinitionRemoveCommand_instances, _SpoRoleDefinitionRemoveCommand_initTelemetry, _SpoRoleDefinitionRemoveCommand_initOptions, _SpoRoleDefinitionRemoveCommand_initValidators;
+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 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()
+        .alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoRoleDefinitionRemoveCommand extends SpoCommand {
     get name() {
         return commands.ROLEDEFINITION_REMOVE;
@@ -16,12 +23,8 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the role definition from the specified site';
     }
-    constructor() {
-        super();
-        _SpoRoleDefinitionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -56,28 +59,5 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoRoleDefinitionRemoveCommand_initOptions = function _SpoRoleDefinitionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoRoleDefinitionRemoveCommand_initValidators = function _SpoRoleDefinitionRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const id = parseInt(args.options.id);
-        if (isNaN(id)) {
-            return `${args.options.id} is not a valid role definition ID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoRoleDefinitionRemoveCommand();
 //# sourceMappingURL=roledefinition-remove.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.js

@@ -1,15 +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 _SpoServicePrincipalGrantAddCommand_instances, _SpoServicePrincipalGrantAddCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    scope: z.string().alias('s')
+});
 class SpoServicePrincipalGrantAddCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_GRANT_ADD;
@@ -20,10 +21,8 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand {
     alias() {
         return [commands.SP_GRANT_ADD];
     }
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantAddCommand_instances, "m", _SpoServicePrincipalGrantAddCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -56,12 +55,5 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand {
         }
     }
 }
-_SpoServicePrincipalGrantAddCommand_instances = new WeakSet(), _SpoServicePrincipalGrantAddCommand_initOptions = function _SpoServicePrincipalGrantAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '-s, --scope <scope>'
-    });
-};
 export default new SpoServicePrincipalGrantAddCommand();
 //# sourceMappingURL=serviceprincipal-grant-add.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoServicePrincipalGrantListCommand extends GraphCommand {
     constructor() {
         super(...arguments);
@@ -15,6 +17,9 @@ class SpoServicePrincipalGrantListCommand extends GraphCommand {
     alias() {
         return [commands.SP_GRANT_LIST];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             if (this.verbose) {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -1,15 +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 _SpoServicePrincipalGrantRevokeCommand_instances, _SpoServicePrincipalGrantRevokeCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    scope: z.string().optional().alias('s')
+});
 class SpoServicePrincipalGrantRevokeCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_GRANT_REVOKE;
@@ -20,10 +21,8 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand {
     alias() {
         return [commands.SP_GRANT_REVOKE];
     }
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantRevokeCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantRevokeCommand_instances, "m", _SpoServicePrincipalGrantRevokeCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -86,12 +85,5 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand {
         }
     }
 }
-_SpoServicePrincipalGrantRevokeCommand_instances = new WeakSet(), _SpoServicePrincipalGrantRevokeCommand_initOptions = function _SpoServicePrincipalGrantRevokeCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --scope [scope]'
-    });
-};
 export default new SpoServicePrincipalGrantRevokeCommand();
 //# sourceMappingURL=serviceprincipal-grant-revoke.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -1,9 +1,5 @@
-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 _SpoServicePrincipalPermissionRequestApproveCommand_instances, _SpoServicePrincipalPermissionRequestApproveCommand_initOptions, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators, _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry, _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -13,6 +9,12 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import spoServicePrincipalPermissionRequestListCommand from './serviceprincipal-permissionrequest-list.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    all: z.boolean().optional(),
+    resource: z.string().optional()
+});
 class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_PERMISSIONREQUEST_APPROVE;
@@ -23,13 +25,27 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand {
     alias() {
         return [commands.SP_PERMISSIONREQUEST_APPROVE];
     }
-    constructor() {
-        super();
-        _SpoServicePrincipalPermissionRequestApproveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.all, opts.resource].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of id, all, or resource',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'all', 'resource']
+            }
+        })
+            .superRefine((opts, ctx) => {
+            if (opts.id && !validation.isValidGuid(opts.id)) {
+                ctx.addIssue({
+                    code: 'custom',
+                    message: `The value '${opts.id}' is not a valid GUID.`,
+                    path: ['id']
+                });
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -89,31 +105,5 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand {
         }
     }
 }
-_SpoServicePrincipalPermissionRequestApproveCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestApproveCommand_initOptions = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '--all'
-    }, {
-        option: '--resource [resource]'
-    });
-}, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators = function _SpoServicePrincipalPermissionRequestApproveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry = function _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            resource: typeof args.options.resource !== 'undefined',
-            all: !!args.options.all
-        });
-    });
-}, _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'all', 'resource'] });
-};
 export default new SpoServicePrincipalPermissionRequestApproveCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-approve.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-deny.js

@@ -1,9 +1,5 @@
-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 _SpoServicePrincipalPermissionRequestDenyCommand_instances, _SpoServicePrincipalPermissionRequestDenyCommand_initOptions, _SpoServicePrincipalPermissionRequestDenyCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,12 @@ 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,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    }).alias('i')
+});
 class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_PERMISSIONREQUEST_DENY;
@@ -21,11 +23,8 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand {
     get description() {
         return 'Denies the specified permission request';
     }
-    constructor() {
-        super();
-        _SpoServicePrincipalPermissionRequestDenyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -53,17 +52,5 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand {
         }
     }
 }
-_SpoServicePrincipalPermissionRequestDenyCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestDenyCommand_initOptions = function _SpoServicePrincipalPermissionRequestDenyCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _SpoServicePrincipalPermissionRequestDenyCommand_initValidators = function _SpoServicePrincipalPermissionRequestDenyCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new SpoServicePrincipalPermissionRequestDenyCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-deny.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -1,8 +1,10 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_PERMISSIONREQUEST_LIST;
@@ -13,6 +15,9 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
     alias() {
         return [commands.SP_PERMISSIONREQUEST_LIST];
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);