@pnp/cli-microsoft365 12.0.0-beta.1752794 → 12.0.0-beta.445fe0a

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);

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

@@ -1,15 +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 _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_initTypes;
+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';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    enabled: z.string()
+        .pipe(z.enum(['true', 'false']))
+        .transform(v => v === 'true')
+        .autocomplete(['true', 'false'])
+        .alias('e'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoServicePrincipalSetCommand extends SpoCommand {
     get name() {
         return commands.SERVICEPRINCIPAL_SET;
@@ -17,12 +22,8 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
     get description() {
         return 'Enables or disables the service principal';
     }
-    constructor() {
-        super();
-        _SpoServicePrincipalSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     alias() {
         return [commands.SP_SET];
@@ -66,22 +67,12 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
-}
-_SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSetCommand_initTelemetry = function _SpoServicePrincipalSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
+    getTelemetryProperties(args) {
+        return {
+            ...super.getTelemetryProperties(args),
             enabled: args.options.enabled
-        });
-    });
-}, _SpoServicePrincipalSetCommand_initOptions = function _SpoServicePrincipalSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --enabled <enabled>',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoServicePrincipalSetCommand_initTypes = function _SpoServicePrincipalSetCommand_initTypes() {
-    this.types.boolean.push('enabled');
-};
+        };
+    }
+}
 export default new SpoServicePrincipalSetCommand();
 //# sourceMappingURL=serviceprincipal-set.js.map

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

@@ -1,14 +1,30 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoSiteDesignAddCommand_instances, _SpoSiteDesignAddCommand_initTelemetry, _SpoSiteDesignAddCommand_initOptions, _SpoSiteDesignAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    title: z.string().alias('t'),
+    webTemplate: z.string().pipe(z.enum(['TeamSite', 'CommunicationSite'])).alias('w'),
+    siteScripts: z.string().superRefine((val, ctx) => {
+        const items = val.split(',').map(s => s.trim());
+        const invalid = items.filter(item => !validation.isValidGuid(item));
+        if (invalid.length > 0) {
+            ctx.addIssue({
+                code: 'custom',
+                message: `The following values are not valid GUIDs: ${invalid.join(', ')}`
+            });
+        }
+    }).alias('s'),
+    description: z.string().optional().alias('d'),
+    previewImageUrl: z.string().optional().alias('m'),
+    previewImageAltText: z.string().optional().alias('a'),
+    thumbnailUrl: z.string().optional(),
+    isDefault: z.boolean().optional()
+});
 class SpoSiteDesignAddCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_ADD;
@@ -16,12 +32,8 @@ class SpoSiteDesignAddCommand extends SpoCommand {
     get description() {
         return 'Adds site design for creating modern sites';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -65,52 +77,5 @@ class SpoSiteDesignAddCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_initTelemetry = function _SpoSiteDesignAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webTemplate: args.options.webTemplate,
-            numSiteScripts: args.options.siteScripts.split(',').length,
-            description: (!(!args.options.description)).toString(),
-            previewImageUrl: (!(!args.options.previewImageUrl)).toString(),
-            previewImageAltText: (!(!args.options.previewImageAltText)).toString(),
-            thumbnailUrl: (!(!args.options.thumbnailUrl)).toString(),
-            isDefault: args.options.isDefault || false
-        });
-    });
-}, _SpoSiteDesignAddCommand_initOptions = function _SpoSiteDesignAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title <title>'
-    }, {
-        option: '-w, --webTemplate <webTemplate>',
-        autocomplete: ['TeamSite', 'CommunicationSite']
-    }, {
-        option: '-s, --siteScripts <siteScripts>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-m, --previewImageUrl [previewImageUrl]'
-    }, {
-        option: '-a, --previewImageAltText [previewImageAltText]'
-    }, {
-        option: '--thumbnailUrl [thumbnailUrl]'
-    }, {
-        option: '--isDefault'
-    });
-}, _SpoSiteDesignAddCommand_initValidators = function _SpoSiteDesignAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webTemplate !== 'TeamSite' &&
-            args.options.webTemplate !== 'CommunicationSite') {
-            return `${args.options.webTemplate} is not a valid web template type. Allowed values TeamSite|CommunicationSite`;
-        }
-        const siteScripts = args.options.siteScripts.split(',');
-        for (let i = 0; i < siteScripts.length; i++) {
-            const trimmedId = siteScripts[i].trim();
-            if (!validation.isValidGuid(trimmedId)) {
-                return `${trimmedId} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoSiteDesignAddCommand();
 //# sourceMappingURL=sitedesign-add.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-apply.js

@@ -1,14 +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 _SpoSiteDesignApplyCommand_instances, _SpoSiteDesignApplyCommand_initTelemetry, _SpoSiteDesignApplyCommand_initOptions, _SpoSiteDesignApplyCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    id: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i'),
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint Online site URL.' }).alias('u'),
+    asTask: z.boolean().optional()
+});
 class SpoSiteDesignApplyCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_APPLY;
@@ -16,12 +18,8 @@ class SpoSiteDesignApplyCommand extends SpoCommand {
     get description() {
         return 'Applies a site design to an existing site collection';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignApplyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -52,27 +50,5 @@ class SpoSiteDesignApplyCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignApplyCommand_instances = new WeakSet(), _SpoSiteDesignApplyCommand_initTelemetry = function _SpoSiteDesignApplyCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asTask: args.options.asTask || false
-        });
-    });
-}, _SpoSiteDesignApplyCommand_initOptions = function _SpoSiteDesignApplyCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--asTask'
-    });
-}, _SpoSiteDesignApplyCommand_initValidators = function _SpoSiteDesignApplyCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoSiteDesignApplyCommand();
 //# sourceMappingURL=sitedesign-apply.js.map

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

@@ -1,16 +1,17 @@
-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 _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { 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 must be a valid GUID.' }).optional().alias('i'),
+    title: z.string().optional()
+});
 class SpoSiteDesignGetCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_GET;
@@ -18,13 +19,18 @@ class SpoSiteDesignGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified site design';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_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 either id or title, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async getSiteDesignId(args, spoUrl) {
         if (args.options.id) {
@@ -70,28 +76,5 @@ class SpoSiteDesignGetCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_initTelemetry = function _SpoSiteDesignGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
-        });
-    });
-}, _SpoSiteDesignGetCommand_initOptions = function _SpoSiteDesignGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '--title [title]'
-    });
-}, _SpoSiteDesignGetCommand_initValidators = function _SpoSiteDesignGetCommand_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;
-    });
-}, _SpoSiteDesignGetCommand_initOptionSets = function _SpoSiteDesignGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-};
 export default new SpoSiteDesignGetCommand();
 //# sourceMappingURL=sitedesign-get.js.map

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

@@ -1,7 +1,12 @@
+import { z } from 'zod';
+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
+});
 class SpoSiteDesignListCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_LIST;
@@ -9,6 +14,9 @@ class SpoSiteDesignListCommand extends SpoCommand {
     get description() {
         return 'Lists available site designs for creating modern sites';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Id', 'IsDefault', 'Title', 'Version', 'WebTemplate'];
     }

package/dist/m365/spo/commands/sitedesign/sitedesign-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 _SpoSiteDesignRemoveCommand_instances, _SpoSiteDesignRemoveCommand_initTelemetry, _SpoSiteDesignRemoveCommand_initOptions, _SpoSiteDesignRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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,
+    id: z.string().refine(val => validation.isValidGuid(val), { message: 'The value must be a valid GUID.' }).alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoSiteDesignRemoveCommand extends SpoCommand {
     get name() {
         return commands.SITEDESIGN_REMOVE;
@@ -17,12 +18,8 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified site design';
     }
-    constructor() {
-        super();
-        _SpoSiteDesignRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRemoveCommand_instances, "m", _SpoSiteDesignRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRemoveCommand_instances, "m", _SpoSiteDesignRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteDesignRemoveCommand_instances, "m", _SpoSiteDesignRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -56,25 +53,5 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteDesignRemoveCommand_instances = new WeakSet(), _SpoSiteDesignRemoveCommand_initTelemetry = function _SpoSiteDesignRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoSiteDesignRemoveCommand_initOptions = function _SpoSiteDesignRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoSiteDesignRemoveCommand_initValidators = function _SpoSiteDesignRemoveCommand_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 SpoSiteDesignRemoveCommand();
 //# sourceMappingURL=sitedesign-remove.js.map