@pnp/cli-microsoft365 12.0.0-beta.792164a → 12.0.0-beta.8769a5e

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

@@ -1,8 +1,10 @@
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.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 SpoOrgAssetsLibraryListCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_LIST;
@@ -10,6 +12,9 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand {
     get description() {
         return 'Lists all libraries that are assigned as asset library';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
@@ -30,7 +35,7 @@ class SpoOrgAssetsLibraryListCommand extends SpoCommand {
             else {
                 const orgAssetsResponse = json[json.length - 1];
                 if (orgAssetsResponse === null || orgAssetsResponse.OrgAssetsLibraries === undefined) {
-                    await logger.log("No libraries in Organization Assets");
+                    await logger.log([]);
                 }
                 else {
                     const orgAssets = {

package/dist/m365/spo/commands/orgassetslibrary/orgassetslibrary-remove.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 _SpoOrgAssetsLibraryRemoveCommand_instances, _SpoOrgAssetsLibraryRemoveCommand_initOptions;
+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 { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    libraryUrl: z.string(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
     get name() {
         return commands.ORGASSETSLIBRARY_REMOVE;
@@ -17,10 +18,8 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a library that was designated as a central location for organization assets across the tenant.';
     }
-    constructor() {
-        super();
-        _SpoOrgAssetsLibraryRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgAssetsLibraryRemoveCommand_instances, "m", _SpoOrgAssetsLibraryRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -59,12 +58,5 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgAssetsLibraryRemoveCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryRemoveCommand_initOptions = function _SpoOrgAssetsLibraryRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--libraryUrl <libraryUrl>'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new SpoOrgAssetsLibraryRemoveCommand();
 //# sourceMappingURL=orgassetslibrary-remove.js.map

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

@@ -1,8 +1,10 @@
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.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 SpoOrgNewsSiteListCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_LIST;
@@ -10,6 +12,9 @@ class SpoOrgNewsSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all organizational news sites';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);

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

@@ -1,17 +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 _SpoOrgNewsSiteRemoveCommand_instances, _SpoOrgNewsSiteRemoveCommand_initTelemetry, _SpoOrgNewsSiteRemoveCommand_initOptions, _SpoOrgNewsSiteRemoveCommand_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 SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the url is not a valid SharePoint Online site URL.'
+    }).alias('u'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_REMOVE;
@@ -19,12 +22,8 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a site from the list of organizational news sites';
     }
-    constructor() {
-        super();
-        _SpoOrgNewsSiteRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteRemoveCommand_instances, "m", _SpoOrgNewsSiteRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -60,20 +59,5 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCommand_initTelemetry = function _SpoOrgNewsSiteRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoOrgNewsSiteRemoveCommand_initOptions = function _SpoOrgNewsSiteRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoOrgNewsSiteRemoveCommand_initValidators = function _SpoOrgNewsSiteRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoOrgNewsSiteRemoveCommand();
 //# sourceMappingURL=orgnewssite-remove.js.map

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

@@ -1,16 +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 _SpoOrgNewsSiteSetCommand_instances, _SpoOrgNewsSiteSetCommand_initOptions, _SpoOrgNewsSiteSetCommand_initValidators;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        message: 'The value of the url is not a valid SharePoint Online site URL.'
+    }).alias('u')
+});
 class SpoOrgNewsSiteSetCommand extends SpoCommand {
     get name() {
         return commands.ORGNEWSSITE_SET;
@@ -18,11 +20,8 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand {
     get description() {
         return 'Marks site as an organizational news site';
     }
-    constructor() {
-        super();
-        _SpoOrgNewsSiteSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteSetCommand_instances, "m", _SpoOrgNewsSiteSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoOrgNewsSiteSetCommand_instances, "m", _SpoOrgNewsSiteSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -47,12 +46,5 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand {
         }
     }
 }
-_SpoOrgNewsSiteSetCommand_instances = new WeakSet(), _SpoOrgNewsSiteSetCommand_initOptions = function _SpoOrgNewsSiteSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoOrgNewsSiteSetCommand_initValidators = function _SpoOrgNewsSiteSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoOrgNewsSiteSetCommand();
 //# sourceMappingURL=orgnewssite-set.js.map

package/dist/m365/spo/commands/page/page-column-list.js

@@ -27,14 +27,13 @@ class SpoPageColumnListCommand extends SpoCommand {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
-            if (sections.length) {
-                const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
-                await logger.log(sections[0].columns.map(c => {
-                    const column = Page.getColumnsInformation(c, isJSONOutput);
-                    column.controls = c.controls.length;
-                    return column;
-                }));
-            }
+            const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
+            const columns = sections[0]?.columns ?? [];
+            await logger.log(columns.map(c => {
+                const column = Page.getColumnsInformation(c, isJSONOutput);
+                column.controls = c.controls.length;
+                return column;
+            }));
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/page/page-section-list.js

@@ -27,23 +27,21 @@ class SpoPageSectionListCommand extends SpoCommand {
             const clientSidePage = await Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
             const sections = clientSidePage.sections;
             const isJSONOutput = !cli.shouldTrimOutput(args.options.output);
-            if (sections.length) {
-                const output = sections.map(section => Page.getSectionInformation(section, isJSONOutput));
-                if (isJSONOutput) {
-                    await logger.log(output);
-                }
-                else {
-                    await logger.log(output.map(s => {
-                        const sectionOutput = {
-                            order: s.order,
-                            columns: s.columns.length
-                        };
-                        if (s.isVertical) {
-                            sectionOutput.isVertical = s.isVertical;
-                        }
-                        return sectionOutput;
-                    }));
-                }
+            const output = sections.map(section => Page.getSectionInformation(section, isJSONOutput));
+            if (isJSONOutput) {
+                await logger.log(output);
+            }
+            else {
+                await logger.log(output.map(s => {
+                    const sectionOutput = {
+                        order: s.order,
+                        columns: s.columns.length
+                    };
+                    if (s.isVertical) {
+                        sectionOutput.isVertical = s.isVertical;
+                    }
+                    return sectionOutput;
+                }));
             }
         }
         catch (err) {

package/dist/m365/spo/commands/page/page-unpublish.js

@@ -0,0 +1,53 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    name: z.string().alias('n')
+});
+class SpoPageUnpublishCommand extends SpoCommand {
+    get name() {
+        return commands.PAGE_UNPUBLISH;
+    }
+    get description() {
+        return 'Unpublishes a modern page';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
+                pageName += '.aspx';
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Unpublishing page ${pageName}...`);
+            }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')/UnPublish`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoPageUnpublishCommand();
+//# sourceMappingURL=page-unpublish.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);