@pnp/cli-microsoft365 12.0.0-beta.c9bd7f3 → 12.0.0-beta.d58fb77

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

package/dist/m365/spo/commands/commandset/commandset-set.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 _SpoCommandSetSetCommand_instances, _a, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_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,23 @@ 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'),
+    newClientSideComponentId: z.string().refine(validation.isValidGuid, { message: 'The value must be a valid GUID.' }).optional(),
+    newTitle: z.string().optional(),
+    description: z.string().optional(),
+    listType: z.enum(['List', 'Library', 'SitePages']).optional().alias('l'),
+    clientSideComponentProperties: z.string().optional(),
+    scope: z.enum(['All', 'Site', 'Web']).optional().alias('s'),
+    location: z.enum(['ContextMenu', 'CommandBar', 'Both']).optional()
+});
 class SpoCommandSetSetCommand extends SpoCommand {
     get name() {
         return commands.COMMANDSET_SET;
@@ -18,13 +30,18 @@ class SpoCommandSetSetCommand extends SpoCommand {
     get description() {
         return 'Updates a ListView Command Set on a site.';
     }
-    constructor() {
-        super();
-        _SpoCommandSetSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_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'] }
+        })
+            .refine(opts => !!opts.newTitle || opts.description !== undefined || !!opts.listType || !!opts.clientSideComponentProperties || !!opts.location || !!opts.newClientSideComponentId, {
+            message: 'Please specify option to be updated'
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -114,75 +131,5 @@ class SpoCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_a = SpoCommandSetSetCommand, _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_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',
-            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
-            newTitle: typeof args.options.newTitle !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            listType: typeof args.options.listType !== 'undefined',
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            location: typeof args.options.location !== 'undefined'
-        });
-    });
-}, _SpoCommandSetSetCommand_initOptions = function _SpoCommandSetSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-c, --clientSideComponentId  [clientSideComponentId]'
-    }, {
-        option: '--newClientSideComponentId  [newClientSideComponentId]'
-    }, {
-        option: '--newTitle [newTitle]'
-    }, {
-        option: '--description [description]'
-    }, {
-        option: '-l, --listType [listType]', autocomplete: _a.listTypes
-    }, {
-        option: '--clientSideComponentProperties  [clientSideComponentProperties]'
-    }, {
-        option: '-s, --scope [scope]', autocomplete: _a.scopes
-    }, {
-        option: '--location [location]', autocomplete: _a.locations
-    });
-}, _SpoCommandSetSetCommand_initValidators = function _SpoCommandSetSetCommand_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.newClientSideComponentId && !validation.isValidGuid(args.options.newClientSideComponentId)) {
-            return `${args.options.newClientSideComponentId} 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.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(', ')}`;
-        }
-        if (!args.options.newTitle && args.options.description === undefined && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
-            return `Please specify option to be updated`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoCommandSetSetCommand_initOptionSets = function _SpoCommandSetSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
-};
-SpoCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
-SpoCommandSetSetCommand.scopes = ['All', 'Site', 'Web'];
-SpoCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
 export default new SpoCommandSetSetCommand();
 //# sourceMappingURL=commandset-set.js.map

package/dist/m365/spo/commands/feature/feature-disable.js

@@ -1,13 +1,24 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFeatureDisableCommand_instances, _SpoFeatureDisableCommand_initTelemetry, _SpoFeatureDisableCommand_initOptions, _SpoFeatureDisableCommand_initValidators, _SpoFeatureDisableCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from "../../../../Command.js";
 import request from "../../../../request.js";
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from "../../../base/SpoCommand.js";
 import commands from "../../commands.js";
+var FeatureScope;
+(function (FeatureScope) {
+    FeatureScope["Site"] = "Site";
+    FeatureScope["Web"] = "Web";
+})(FeatureScope || (FeatureScope = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().alias('u'),
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID for option id.`
+    }).alias('i'),
+    scope: zod.coercedEnum(FeatureScope).optional().alias('s'),
+    force: z.boolean().optional()
+});
 class SpoFeatureDisableCommand extends SpoCommand {
     get name() {
         return commands.FEATURE_DISABLE;
@@ -15,20 +26,12 @@ class SpoFeatureDisableCommand extends SpoCommand {
     get description() {
         return 'Disables feature for the specified site or web';
     }
-    constructor() {
-        super();
-        _SpoFeatureDisableCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureDisableCommand_instances, "m", _SpoFeatureDisableCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
-        let scope = args.options.scope;
+        const scope = args.options.scope ?? 'Web';
         const force = !!args.options.force;
-        if (!scope) {
-            scope = "web";
-        }
         if (this.verbose) {
             await logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
@@ -48,38 +51,5 @@ class SpoFeatureDisableCommand extends SpoCommand {
         }
     }
 }
-_SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_initTelemetry = function _SpoFeatureDisableCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'web',
-            force: args.options.force || false
-        });
-    });
-}, _SpoFeatureDisableCommand_initOptions = function _SpoFeatureDisableCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web']
-    }, {
-        option: '--force'
-    });
-}, _SpoFeatureDisableCommand_initValidators = function _SpoFeatureDisableCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option id.`;
-        }
-        if (args.options.scope) {
-            if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
-                return `${args.options.scope} is not a valid Feature scope. Allowed values are: Site, Web.`;
-            }
-        }
-        return true;
-    });
-}, _SpoFeatureDisableCommand_initTypes = function _SpoFeatureDisableCommand_initTypes() {
-    this.types.string.push('scope', 's');
-};
 export default new SpoFeatureDisableCommand();
 //# sourceMappingURL=feature-disable.js.map

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -1,13 +1,26 @@
-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 _SpoFeatureEnableCommand_instances, _SpoFeatureEnableCommand_initTelemetry, _SpoFeatureEnableCommand_initOptions, _SpoFeatureEnableCommand_initValidators, _SpoFeatureEnableCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var FeatureScope;
+(function (FeatureScope) {
+    FeatureScope["Site"] = "Site";
+    FeatureScope["Web"] = "Web";
+})(FeatureScope || (FeatureScope = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID for option id.`
+    }).alias('i'),
+    scope: zod.coercedEnum(FeatureScope).optional().alias('s'),
+    force: z.boolean().optional()
+});
 class SpoFeatureEnableCommand extends SpoCommand {
     get name() {
         return commands.FEATURE_ENABLE;
@@ -15,20 +28,12 @@ class SpoFeatureEnableCommand extends SpoCommand {
     get description() {
         return 'Enables feature for the specified site or web';
     }
-    constructor() {
-        super();
-        _SpoFeatureEnableCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureEnableCommand_instances, "m", _SpoFeatureEnableCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
-        let scope = args.options.scope;
+        const scope = args.options.scope ?? 'Web';
         const force = !!args.options.force;
-        if (!scope) {
-            scope = "web";
-        }
         if (this.verbose) {
             await logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
@@ -48,38 +53,5 @@ class SpoFeatureEnableCommand extends SpoCommand {
         }
     }
 }
-_SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_initTelemetry = function _SpoFeatureEnableCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'web',
-            force: args.options.force || false
-        });
-    });
-}, _SpoFeatureEnableCommand_initOptions = function _SpoFeatureEnableCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web']
-    }, {
-        option: '--force'
-    });
-}, _SpoFeatureEnableCommand_initValidators = function _SpoFeatureEnableCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option id.`;
-        }
-        if (args.options.scope) {
-            if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
-                return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
-            }
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
-    this.types.string.push('scope', 's');
-};
 export default new SpoFeatureEnableCommand();
 //# sourceMappingURL=feature-enable.js.map

package/dist/m365/spo/commands/feature/feature-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 _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web']).optional().alias('s')
+});
 class SpoFeatureListCommand extends SpoCommand {
     get name() {
         return commands.FEATURE_LIST;
@@ -15,12 +18,8 @@ class SpoFeatureListCommand extends SpoCommand {
     get description() {
         return 'Lists Features activated in the specified site or site collection';
     }
-    constructor() {
-        super();
-        _SpoFeatureListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
@@ -33,29 +32,5 @@ class SpoFeatureListCommand extends SpoCommand {
         }
     }
 }
-_SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTelemetry = function _SpoFeatureListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'Web'
-        });
-    });
-}, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web']
-    });
-}, _SpoFeatureListCommand_initValidators = function _SpoFeatureListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web') {
-                return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
-            }
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoFeatureListCommand();
 //# sourceMappingURL=feature-list.js.map