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

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.24.0.js

@@ -0,0 +1,19 @@
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+export default [
+    new FN001008_DEP_react({ supportedRange: '18' }),
+    new FN001009_DEP_react_dom({ supportedRange: '18' }),
+    new FN001035_DEP_fluentui_react({ supportedRange: '^8.106.4' }),
+    new FN002013_DEVDEP_types_webpack_env({ supportedRange: '~1.15.2' }),
+    new FN002015_DEVDEP_types_react({ supportedRange: '18' }),
+    new FN002016_DEVDEP_types_react_dom({ supportedRange: '18' }),
+    new FN002022_DEVDEP_typescript({ supportedRange: '~5.8.0' }),
+    new FN021001_PKG_spfx_deps_versions_match_project_version({ includeDevDeps: true })
+];
+//# sourceMappingURL=doctor-1.24.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -78,7 +78,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN012021_TSC_excludeDirectories.js

@@ -0,0 +1,43 @@
+import { JsonRule } from '../../JsonRule.js';
+export class FN012021_TSC_excludeDirectories extends JsonRule {
+    constructor(options) {
+        super();
+        this.directories = options.directories;
+    }
+    get id() {
+        return 'FN012021';
+    }
+    get title() {
+        return 'tsconfig.json watchOptions.excludeDirectories property';
+    }
+    get description() {
+        return `Update tsconfig.json watchOptions.excludeDirectories property`;
+    }
+    get resolution() {
+        return `{
+  "watchOptions": {
+    "excludeDirectories": ${JSON.stringify(this.directories)}
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './tsconfig.json';
+    }
+    visit(project, findings) {
+        if (!project.tsConfigJson) {
+            return;
+        }
+        if (!project.tsConfigJson.watchOptions?.excludeDirectories ||
+            JSON.stringify(project.tsConfigJson.watchOptions.excludeDirectories) !== JSON.stringify(this.directories)) {
+            const node = this.getAstNodeFromFile(project.tsConfigJson, 'watchOptions.excludeDirectories');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+//# sourceMappingURL=FN012021_TSC_excludeDirectories.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027002_OVERRIDES_qs.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027002_OVERRIDES_qs extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'qs', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027002';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027002) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027002_OVERRIDES_qs.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027003_OVERRIDES_uuid.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027003_OVERRIDES_uuid extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'uuid', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027003';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027003) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027003_OVERRIDES_uuid.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.24.0.js

@@ -0,0 +1,77 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_DEVDEP_microsoft_spfx_web_build_rig.js';
+import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
+import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DEVDEP_microsoft_spfx_heft_plugins.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN012021_TSC_excludeDirectories } from './rules/FN012021_TSC_excludeDirectories.js';
+import { FN020001_RES_types_react } from './rules/FN020001_RES_types_react.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
+import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
+import { FN027002_OVERRIDES_qs } from './rules/FN027002_OVERRIDES_qs.js';
+import { FN027003_OVERRIDES_uuid } from './rules/FN027003_OVERRIDES_uuid.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library({ packageVersion: '1.24.0' }),
+    new FN001002_DEP_microsoft_sp_lodash_subset({ packageVersion: '1.24.0' }),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core({ packageVersion: '1.24.0' }),
+    new FN001004_DEP_microsoft_sp_webpart_base({ packageVersion: '1.24.0' }),
+    new FN001008_DEP_react({ packageVersion: '18.3.1' }),
+    new FN001009_DEP_react_dom({ packageVersion: '18.3.1' }),
+    new FN001011_DEP_microsoft_sp_dialog({ packageVersion: '1.24.0' }),
+    new FN001012_DEP_microsoft_sp_application_base({ packageVersion: '1.24.0' }),
+    new FN001014_DEP_microsoft_sp_listview_extensibility({ packageVersion: '1.24.0' }),
+    new FN001021_DEP_microsoft_sp_property_pane({ packageVersion: '1.24.0' }),
+    new FN001023_DEP_microsoft_sp_component_base({ packageVersion: '1.24.0' }),
+    new FN001024_DEP_microsoft_sp_diagnostics({ packageVersion: '1.24.0' }),
+    new FN001025_DEP_microsoft_sp_dynamic_data({ packageVersion: '1.24.0' }),
+    new FN001026_DEP_microsoft_sp_extension_base({ packageVersion: '1.24.0' }),
+    new FN001027_DEP_microsoft_sp_http({ packageVersion: '1.24.0' }),
+    new FN001028_DEP_microsoft_sp_list_subscription({ packageVersion: '1.24.0' }),
+    new FN001029_DEP_microsoft_sp_loader({ packageVersion: '1.24.0' }),
+    new FN001030_DEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0' }),
+    new FN001031_DEP_microsoft_sp_odata_types({ packageVersion: '1.24.0' }),
+    new FN001032_DEP_microsoft_sp_page_context({ packageVersion: '1.24.0' }),
+    new FN001013_DEP_microsoft_decorators({ packageVersion: '1.24.0' }),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base({ packageVersion: '1.24.0' }),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0' }),
+    new FN002015_DEVDEP_types_react({ packageVersion: '18.2.79' }),
+    new FN002016_DEVDEP_types_react_dom({ packageVersion: '18.2.25' }),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx({ packageVersion: '1.24.0' }),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx({ packageVersion: '1.24.0' }),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig({ packageVersion: '1.24.0' }),
+    new FN002031_DEVDEP_rushstack_heft({ packageVersion: '1.3.2' }),
+    new FN002034_DEVDEP_microsoft_spfx_heft_plugins({ packageVersion: '1.24.0' }),
+    new FN010001_YORC_version({ version: '1.24.0' }),
+    new FN012021_TSC_excludeDirectories({ directories: ['**/teams', '**/temp/copilot'] }),
+    new FN020001_RES_types_react({ packageVersion: '18.2.79' }),
+    new FN021003_PKG_engines_node({ version: '>=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0' }),
+    new FN027001_OVERRIDES_rushstack_heft({ version: '1.3.2' }),
+    new FN027002_OVERRIDES_qs({ version: '>=6.15.2' }),
+    new FN027003_OVERRIDES_uuid({ version: '>=11.1.1' })
+];
+//# sourceMappingURL=upgrade-1.24.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -87,7 +87,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0'
         ];
     }
     async commandAction(logger, args) {

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

@@ -1,13 +1,22 @@
-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 _SpoCommandSetAddCommand_instances, _a, _SpoCommandSetAddCommand_initTelemetry, _SpoCommandSetAddCommand_initOptions, _SpoCommandSetAddCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import request from '../../../../request.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    title: z.string().alias('t'),
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    listType: z.enum(['List', 'Library', 'SitePages']).alias('l'),
+    clientSideComponentId: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).alias('i'),
+    description: z.string().optional(),
+    clientSideComponentProperties: z.string().optional(),
+    scope: z.enum(['Site', 'Web']).optional().alias('s'),
+    location: z.enum(['ContextMenu', 'CommandBar', 'Both']).optional()
+});
 class SpoCommandSetAddCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_ADD;
@@ -15,12 +24,8 @@ class SpoCommandSetAddCommand extends SpoCommand {
     get description() {
         return 'Adds a ListView Command Set to a site.';
     }
-    constructor() {
-        super();
-        _SpoCommandSetAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCommandSetAddCommand_instances, "m", _SpoCommandSetAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetAddCommand_instances, "m", _SpoCommandSetAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetAddCommand_instances, "m", _SpoCommandSetAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -79,52 +84,5 @@ class SpoCommandSetAddCommand extends SpoCommand {
         }
     }
 }
-_a = SpoCommandSetAddCommand, _SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_initTelemetry = function _SpoCommandSetAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            location: typeof args.options.location !== 'undefined'
-        });
-    });
-}, _SpoCommandSetAddCommand_initOptions = function _SpoCommandSetAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --title <title>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listType <listType>', autocomplete: _a.listTypes
-    }, {
-        option: '-i, --clientSideComponentId  <clientSideComponentId>'
-    }, {
-        option: '--description [description]'
-    }, {
-        option: '--clientSideComponentProperties  [clientSideComponentProperties]'
-    }, {
-        option: '-s, --scope [scope]', autocomplete: _a.scopes
-    }, {
-        option: '--location [location]', autocomplete: _a.locations
-    });
-}, _SpoCommandSetAddCommand_initValidators = function _SpoCommandSetAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.clientSideComponentId && !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.scope && _a.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.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 validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
-SpoCommandSetAddCommand.listTypes = ['List', 'Library', 'SitePages'];
-SpoCommandSetAddCommand.scopes = ['Site', 'Web'];
-SpoCommandSetAddCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
 export default new SpoCommandSetAddCommand();
 //# sourceMappingURL=commandset-add.js.map

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

@@ -1,15 +1,22 @@
-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 _SpoCommandSetGetCommand_instances, _a, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets, _SpoCommandSetGetCommand_initTypes;
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+import { z } from 'zod';
+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'),
+    title: z.string().optional().alias('t'),
+    id: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).optional().alias('i'),
+    clientSideComponentId: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).optional().alias('c'),
+    scope: z.enum(['All', 'Site', 'Web']).optional().alias('s'),
+    clientSideComponentProperties: z.boolean().optional().alias('p')
+});
 class SpoCommandSetGetCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_GET;
@@ -17,14 +24,14 @@ class SpoCommandSetGetCommand extends SpoCommand {
     get description() {
         return 'Gets a ListView Command Set that is added to a site.';
     }
-    constructor() {
-        super();
-        _SpoCommandSetGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCommandSetGetCommand_instances, "m", _SpoCommandSetGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetGetCommand_instances, "m", _SpoCommandSetGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetGetCommand_instances, "m", _SpoCommandSetGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetGetCommand_instances, "m", _SpoCommandSetGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetGetCommand_instances, "m", _SpoCommandSetGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.title, opts.id, opts.clientSideComponentId].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'title', 'id' or 'clientSideComponentId', but not multiple.`,
+            params: { customCode: 'optionSet', options: ['title', 'id', 'clientSideComponentId'] }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -37,7 +44,7 @@ class SpoCommandSetGetCommand extends SpoCommand {
                 if (customAction === undefined) {
                     throw `Command set with id ${args.options.id} can't be found.`;
                 }
-                else if (!_a.allowedCommandSetLocations.some(allowedLocation => allowedLocation === customAction.Location)) {
+                else if (!SpoCommandSetGetCommand.allowedCommandSetLocations.some(allowedLocation => allowedLocation === customAction.Location)) {
                     throw `Custom action with id ${args.options.id} is not a command set.`;
                 }
                 commandSet = customAction;
@@ -77,55 +84,10 @@ class SpoCommandSetGetCommand extends SpoCommand {
         }
     }
     getBaseFilter() {
-        return `startswith(Location,'${_a.baseLocation}') and`;
+        return `startswith(Location,'${SpoCommandSetGetCommand.baseLocation}') and`;
     }
 }
-_a = SpoCommandSetGetCommand, _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_initTelemetry = function _SpoCommandSetGetCommand_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',
-            scope: typeof args.options.scope !== 'undefined',
-            clientSideComponentProperties: !!args.options.clientSideComponentProperties
-        });
-    });
-}, _SpoCommandSetGetCommand_initOptions = function _SpoCommandSetGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.scopes
-    }, {
-        option: '-p, --clientSideComponentProperties'
-    });
-}, _SpoCommandSetGetCommand_initValidators = function _SpoCommandSetGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID.`;
-        }
-        if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID.`;
-        }
-        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoCommandSetGetCommand_initOptionSets = function _SpoCommandSetGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
-}, _SpoCommandSetGetCommand_initTypes = function _SpoCommandSetGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'title', 'id', 'clientSideComponentId', 'scope');
-    this.types.boolean.push('clientSideComponentProperties');
-};
-SpoCommandSetGetCommand.scopes = ['All', 'Site', 'Web'];
 SpoCommandSetGetCommand.baseLocation = 'ClientSideExtension.ListViewCommandSet';
-SpoCommandSetGetCommand.allowedCommandSetLocations = [_a.baseLocation, `${_a.baseLocation}.CommandBar`, `${_a.baseLocation}.ContextMenu`];
+SpoCommandSetGetCommand.allowedCommandSetLocations = [SpoCommandSetGetCommand.baseLocation, `${SpoCommandSetGetCommand.baseLocation}.CommandBar`, `${SpoCommandSetGetCommand.baseLocation}.ContextMenu`];
 export default new SpoCommandSetGetCommand();
 //# sourceMappingURL=commandset-get.js.map

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

@@ -1,13 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoCommandSetListCommand_instances, _a, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['All', 'Site', 'Web']).optional().alias('s')
+});
 class SpoCommandSetListCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_LIST;
@@ -18,12 +21,8 @@ class SpoCommandSetListCommand extends SpoCommand {
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
-    constructor() {
-        super();
-        _SpoCommandSetListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCommandSetListCommand_instances, "m", _SpoCommandSetListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetListCommand_instances, "m", _SpoCommandSetListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetListCommand_instances, "m", _SpoCommandSetListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -38,27 +37,5 @@ class SpoCommandSetListCommand extends SpoCommand {
         }
     }
 }
-_a = SpoCommandSetListCommand, _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All'
-        });
-    });
-}, _SpoCommandSetListCommand_initOptions = function _SpoCommandSetListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.scopes
-    });
-}, _SpoCommandSetListCommand_initValidators = function _SpoCommandSetListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
-SpoCommandSetListCommand.scopes = ['All', 'Site', 'Web'];
 export default new SpoCommandSetListCommand();
 //# sourceMappingURL=commandset-list.js.map

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

@@ -1,9 +1,4 @@
-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 _SpoCommandSetRemoveCommand_instances, _a, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
+import { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -11,6 +6,18 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { cli } from '../../../../cli/cli.js';
+import { z } from 'zod';
+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'),
+    title: z.string().optional().alias('t'),
+    id: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).optional().alias('i'),
+    clientSideComponentId: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).optional().alias('c'),
+    scope: z.enum(['All', 'Site', 'Web']).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCommandSetRemoveCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_REMOVE;
@@ -18,13 +25,14 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a ListView Command Set that is added to a site.';
     }
-    constructor() {
-        super();
-        _SpoCommandSetRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.title, opts.id, opts.clientSideComponentId].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'title', 'id' or 'clientSideComponentId', but not multiple.`,
+            params: { customCode: 'optionSet', options: ['title', 'id', 'clientSideComponentId'] }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -83,46 +91,5 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
         }
     }
 }
-_a = SpoCommandSetRemoveCommand, _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_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',
-            scope: typeof args.options.scope !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SpoCommandSetRemoveCommand_initOptions = function _SpoCommandSetRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-c, --clientSideComponentId  [clientSideComponentId]'
-    }, {
-        option: '-s, --scope [scope]', autocomplete: _a.scopes
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCommandSetRemoveCommand_initValidators = function _SpoCommandSetRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
-            return `${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoCommandSetRemoveCommand_initOptionSets = function _SpoCommandSetRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
-};
-SpoCommandSetRemoveCommand.scopes = ['All', 'Site', 'Web'];
 export default new SpoCommandSetRemoveCommand();
 //# sourceMappingURL=commandset-remove.js.map