@pnp/cli-microsoft365 12.0.0-beta.4ac11a7 → 12.0.0-beta.8769a5e

package/dist/m365/spo/commands/tenant/tenant-commandset-add.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 _SpoTenantCommandSetAddCommand_instances, _a, _SpoTenantCommandSetAddCommand_initTelemetry, _SpoTenantCommandSetAddCommand_initOptions, _SpoTenantCommandSetAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
@@ -12,6 +8,17 @@ import commands from '../../commands.js';
 import spoListItemAddCommand from '../listitem/listitem-add.js';
 import spoListItemListCommand from '../listitem/listitem-list.js';
 import spoTenantAppCatalogUrlGetCommand from './tenant-appcatalogurl-get.js';
+const listTypes = ['List', 'Library', 'SitePages'];
+const locations = ['ContextMenu', 'CommandBar', 'Both'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    title: z.string().alias('t'),
+    listType: z.enum(listTypes).alias('l'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), { message: 'clientSideComponentId is not a valid GUID' }).alias('i'),
+    clientSideComponentProperties: z.string().optional().alias('p'),
+    webTemplate: z.string().optional().alias('w'),
+    location: z.enum(locations).optional()
+});
 class SpoTenantCommandSetAddCommand extends SpoCommand {
     get name() {
         return commands.TENANT_COMMANDSET_ADD;
@@ -19,12 +26,8 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
     get description() {
         return 'Adds a ListView Command Set as a tenant-wide extension.';
     }
-    constructor() {
-        super();
-        _SpoTenantCommandSetAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -111,6 +114,13 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
         }
+        const output = options.output === 'text' ||
+            options.output === 'csv' ||
+            options.output === 'json' ||
+            options.output === 'md' ||
+            options.output === 'none'
+            ? options.output
+            : undefined;
         const commandOptions = {
             webUrl: appCatalogUrl,
             listUrl: `${urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
@@ -124,7 +134,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
             TenantWideExtensionDisabled: false,
             verbose: this.verbose,
             debug: this.debug,
-            output: options.output
+            output: output
         };
         await cli.executeCommand(spoListItemAddCommand, { options: { ...commandOptions, _: [] } });
     }
@@ -149,46 +159,5 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         }
     }
 }
-_a = SpoTenantCommandSetAddCommand, _SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAddCommand_initTelemetry = function _SpoTenantCommandSetAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listType: args.options.listType,
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
-            webTemplate: typeof args.options.webTemplate !== 'undefined',
-            location: args.options.location
-        });
-    });
-}, _SpoTenantCommandSetAddCommand_initOptions = function _SpoTenantCommandSetAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title <title>'
-    }, {
-        option: '-l, --listType <listType>',
-        autocomplete: _a.listTypes
-    }, {
-        option: '-i, --clientSideComponentId <clientSideComponentId>'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    }, {
-        option: '-w, --webTemplate [webTemplate]'
-    }, {
-        option: '--location [location]',
-        autocomplete: _a.locations
-    });
-}, _SpoTenantCommandSetAddCommand_initValidators = function _SpoTenantCommandSetAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (_a.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
-        }
-        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
-        }
-        return true;
-    });
-};
-SpoTenantCommandSetAddCommand.listTypes = ['List', 'Library', 'SitePages'];
-SpoTenantCommandSetAddCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
 export default new SpoTenantCommandSetAddCommand();
 //# sourceMappingURL=tenant-commandset-add.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -1,11 +1,6 @@
-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 _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets, _SpoTenantCommandSetGetCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -13,6 +8,18 @@ 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,
+    title: z.string().optional().alias('t'),
+    id: z.string()
+        .refine(val => validation.isValidPositiveInteger(val), {
+        message: 'id is not a valid list item ID'
+    })
+        .optional()
+        .alias('i'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), { message: 'clientSideComponentId is not a valid GUID' }).optional().alias('c'),
+    tenantWideExtensionComponentProperties: z.boolean().optional().alias('p')
+});
 class SpoTenantCommandSetGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_COMMANDSET_GET;
@@ -20,14 +27,17 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
     get description() {
         return 'Gets a ListView Command Set that is installed tenant wide';
     }
-    constructor() {
-        super();
-        _SpoTenantCommandSetGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.title, opts.id, opts.clientSideComponentId].filter(v => v !== undefined).length === 1, {
+            error: `Specify exactly one of the following options: 'title', 'id', or 'clientSideComponentId'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['title', 'id', 'clientSideComponentId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
@@ -81,40 +91,5 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantCommandSetGetCommand_instances = new WeakSet(), _SpoTenantCommandSetGetCommand_initTelemetry = function _SpoTenantCommandSetGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            tenantWideExtensionComponentProperties: !!args.options.tenantWideExtensionComponentProperties
-        });
-    });
-}, _SpoTenantCommandSetGetCommand_initOptions = function _SpoTenantCommandSetGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title [title]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-c, --clientSideComponentId  [clientSideComponentId]'
-    }, {
-        option: '-p, --tenantWideExtensionComponentProperties'
-    });
-}, _SpoTenantCommandSetGetCommand_initValidators = function _SpoTenantCommandSetGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && isNaN(parseInt(args.options.id))) {
-            return `${args.options.id} is not a number`;
-        }
-        if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoTenantCommandSetGetCommand_initOptionSets = function _SpoTenantCommandSetGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
-}, _SpoTenantCommandSetGetCommand_initTypes = function _SpoTenantCommandSetGetCommand_initTypes() {
-    this.types.string.push('title', 'id', 'clientSideComponentId');
-    this.types.boolean.push('tenantWideExtensionComponentProperties');
-};
 export default new SpoTenantCommandSetGetCommand();
 //# sourceMappingURL=tenant-commandset-get.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-list.js

@@ -1,10 +1,11 @@
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoTenantCommandSetListCommand extends SpoCommand {
     get name() {
         return commands.TENANT_COMMANDSET_LIST;
@@ -12,6 +13,9 @@ class SpoTenantCommandSetListCommand extends SpoCommand {
     get description() {
         return 'Retrieves a list of ListView Command Sets that are installed tenant-wide';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Title', 'TenantWideExtensionComponentId', 'TenantWideExtensionListTemplate'];
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -1,10 +1,6 @@
-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 _SpoTenantCommandSetRemoveCommand_instances, _SpoTenantCommandSetRemoveCommand_initTelemetry, _SpoTenantCommandSetRemoveCommand_initOptions, _SpoTenantCommandSetRemoveCommand_initValidators, _SpoTenantCommandSetRemoveCommand_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 { odata } from '../../../../utils/odata.js';
@@ -13,6 +9,18 @@ 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,
+    title: z.string().optional().alias('t'),
+    id: z.string()
+        .refine(val => validation.isValidPositiveInteger(val), {
+        message: 'id is not a valid list item ID'
+    })
+        .optional()
+        .alias('i'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), { message: 'clientSideComponentId is not a valid GUID' }).optional().alias('c'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoTenantCommandSetRemoveCommand extends SpoCommand {
     get name() {
         return commands.TENANT_COMMANDSET_REMOVE;
@@ -20,13 +28,17 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a ListView Command Set that is installed tenant wide.';
     }
-    constructor() {
-        super();
-        _SpoTenantCommandSetRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.title, opts.id, opts.clientSideComponentId].filter(v => v !== undefined).length === 1, {
+            error: `Specify exactly one of the following options: 'title', 'id', or 'clientSideComponentId'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['title', 'id', 'clientSideComponentId']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -92,41 +104,5 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
         return listItemInstances[0].Id;
     }
 }
-_SpoTenantCommandSetRemoveCommand_instances = new WeakSet(), _SpoTenantCommandSetRemoveCommand_initTelemetry = function _SpoTenantCommandSetRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SpoTenantCommandSetRemoveCommand_initOptions = function _SpoTenantCommandSetRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title [title]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-c, --clientSideComponentId  [clientSideComponentId]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoTenantCommandSetRemoveCommand_initValidators = function _SpoTenantCommandSetRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id) {
-            const id = parseInt(args.options.id);
-            if (isNaN(id)) {
-                return `${args.options.id} is not a valid list item ID`;
-            }
-        }
-        if (args.options.clientSideComponentId &&
-            !validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoTenantCommandSetRemoveCommand_initOptionSets = function _SpoTenantCommandSetRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
-};
 export default new SpoTenantCommandSetRemoveCommand();
 //# sourceMappingURL=tenant-commandset-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-set.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 _SpoTenantCommandSetSetCommand_instances, _a, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -11,6 +7,22 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const listTypes = ['List', 'Library', 'SitePages'];
+const locations = ['ContextMenu', 'CommandBar', 'Both'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(val => validation.isValidPositiveInteger(val), {
+        message: 'id is not a valid list item ID'
+    })
+        .alias('i'),
+    newTitle: z.string().optional().alias('t'),
+    listType: z.enum(listTypes).optional().alias('l'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), { message: 'clientSideComponentId is not a valid GUID' }).optional().alias('c'),
+    clientSideComponentProperties: z.string().optional().alias('p'),
+    webTemplate: z.string().optional().alias('w'),
+    location: z.enum(locations).optional()
+});
 class SpoTenantCommandSetSetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_COMMANDSET_SET;
@@ -18,12 +30,29 @@ class SpoTenantCommandSetSetCommand extends SpoCommand {
     get description() {
         return 'Updates a ListView Command Set that is installed tenant wide.';
     }
-    constructor() {
-        super();
-        _SpoTenantCommandSetSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => opts.newTitle !== undefined ||
+            opts.listType !== undefined ||
+            opts.clientSideComponentId !== undefined ||
+            opts.clientSideComponentProperties !== undefined ||
+            opts.webTemplate !== undefined ||
+            opts.location !== undefined, {
+            error: 'Specify at least one property to update',
+            params: {
+                customCode: 'optionSet',
+                options: [
+                    'newTitle',
+                    'listType',
+                    'clientSideComponentId',
+                    'clientSideComponentProperties',
+                    'webTemplate',
+                    'location'
+                ]
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -129,58 +158,5 @@ class SpoTenantCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_a = SpoTenantCommandSetSetCommand, _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            newTitle: typeof args.options.newTitle !== 'undefined',
-            listType: args.options.listType,
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
-            webTemplate: typeof args.options.webTemplate !== 'undefined',
-            location: args.options.location
-        });
-    });
-}, _SpoTenantCommandSetSetCommand_initOptions = function _SpoTenantCommandSetSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-t, --newTitle [newTitle]'
-    }, {
-        option: '-l, --listType [listType]',
-        autocomplete: _a.listTypes
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    }, {
-        option: '-w, --webTemplate [webTemplate]'
-    }, {
-        option: '--location [location]',
-        autocomplete: _a.locations
-    });
-}, _SpoTenantCommandSetSetCommand_initValidators = function _SpoTenantCommandSetSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.newTitle &&
-            !args.options.listType &&
-            !args.options.clientSideComponentId &&
-            !args.options.clientSideComponentProperties &&
-            !args.options.webTemplate &&
-            !args.options.location) {
-            return 'Specify at least one property to update';
-        }
-        if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.listType && _a.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
-        }
-        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
-        }
-        return true;
-    });
-};
-SpoTenantCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
-SpoTenantCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
 export default new SpoTenantCommandSetSetCommand();
 //# sourceMappingURL=tenant-commandset-set.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-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 SpoTenantRecycleBinItemListCommand extends SpoCommand {
     get name() {
         return commands.TENANT_RECYCLEBINITEM_LIST;
@@ -10,6 +12,9 @@ class SpoTenantRecycleBinItemListCommand extends SpoCommand {
     get description() {
         return 'Returns all modern and classic site collections in the tenant scoped recycle bin';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['DaysRemaining', 'DeletionTime', 'Url'];
     }

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -1,11 +1,7 @@
-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 _SpoTenantRecycleBinItemRemoveCommand_instances, _SpoTenantRecycleBinItemRemoveCommand_initTelemetry, _SpoTenantRecycleBinItemRemoveCommand_initOptions, _SpoTenantRecycleBinItemRemoveCommand_initValidators;
+import { z } from 'zod';
 import { setTimeout } from 'timers/promises';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -13,6 +9,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,
+    siteUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint site URL.' }).alias('u'),
+    wait: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
     get name() {
         return commands.TENANT_RECYCLEBINITEM_REMOVE;
@@ -20,12 +22,8 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified deleted site collection from tenant recycle bin';
     }
-    constructor() {
-        super();
-        _SpoTenantRecycleBinItemRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRemoveCommand_instances, "m", _SpoTenantRecycleBinItemRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRemoveCommand_instances, "m", _SpoTenantRecycleBinItemRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRemoveCommand_instances, "m", _SpoTenantRecycleBinItemRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -78,23 +76,5 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRemoveCommand_initTelemetry = function _SpoTenantRecycleBinItemRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            wait: typeof args.options.wait !== 'undefined',
-            force: typeof args.options.force !== 'undefined'
-        });
-    });
-}, _SpoTenantRecycleBinItemRemoveCommand_initOptions = function _SpoTenantRecycleBinItemRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '--wait'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
-};
 export default new SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.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 _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -12,6 +8,10 @@ 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,
+    siteUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, { message: 'The value is not a valid SharePoint site URL.' }).alias('u')
+});
 class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     get name() {
         return commands.TENANT_RECYCLEBINITEM_RESTORE;
@@ -19,12 +19,8 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     get description() {
         return 'Restores the specified deleted site collection from tenant recycle bin';
     }
-    constructor() {
-        super();
-        _SpoTenantRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -68,14 +64,5 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
         return sites[0].GroupId;
     }
 }
-_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    });
-}, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
-}, _SpoTenantRecycleBinItemRestoreCommand_initTypes = function _SpoTenantRecycleBinItemRestoreCommand_initTypes() {
-    this.types.string.push('siteUrl');
-};
 export default new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/dist/m365/spo/commands/tenant/tenant-settings-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 SpoTenantSettingsListCommand extends SpoCommand {
     get name() {
         return commands.TENANT_SETTINGS_LIST;
@@ -10,6 +12,9 @@ class SpoTenantSettingsListCommand extends SpoCommand {
     get description() {
         return 'Lists the global tenant settings';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);