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

package/dist/m365/spo/commands/customaction/customaction-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 _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_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(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s')
+});
 class SpoCustomActionListCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_LIST;
@@ -15,16 +18,12 @@ class SpoCustomActionListCommand extends SpoCommand {
     get description() {
         return 'Lists all user custom actions at the given scope';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
-    constructor() {
-        super();
-        _SpoCustomActionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initValidators).call(this);
-    }
     async commandAction(logger, args) {
         try {
             const scope = args.options.scope ? args.options.scope : 'All';
@@ -52,34 +51,5 @@ class SpoCustomActionListCommand extends SpoCommand {
         return `${scope}`;
     }
 }
-_SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListCommand_initTelemetry = function _SpoCustomActionListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All'
-        });
-    });
-}, _SpoCustomActionListCommand_initOptions = function _SpoCustomActionListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    });
-}, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web' &&
-                args.options.scope !== 'All') {
-                return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionListCommand();
 //# sourceMappingURL=customaction-list.js.map

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

@@ -1,16 +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 _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initTelemetry, _SpoCustomActionRemoveCommand_initOptions, _SpoCustomActionRemoveCommand_initValidators, _SpoCustomActionRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not valid. Custom action Id (GUID) expected.`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCustomActionRemoveCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_REMOVE;
@@ -18,13 +26,18 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified custom action';
     }
-    constructor() {
-        super();
-        _SpoCustomActionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionRemoveCommand_instances, "m", _SpoCustomActionRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of id or title',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeCustomAction = async () => {
@@ -99,46 +112,5 @@ class SpoCustomActionRemoveCommand extends SpoCommand {
         return siteResult;
     }
 }
-_SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveCommand_initTelemetry = function _SpoCustomActionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'All',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoCustomActionRemoveCommand_initOptions = function _SpoCustomActionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
-        }
-        const isValidUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (typeof isValidUrl === 'string') {
-            return isValidUrl;
-        }
-        if (args.options.scope) {
-            if (args.options.scope !== 'Site' &&
-                args.options.scope !== 'Web' &&
-                args.options.scope !== 'All') {
-                return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-            }
-        }
-        return true;
-    });
-}, _SpoCustomActionRemoveCommand_initOptionSets = function _SpoCustomActionRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
-};
 export default new SpoCustomActionRemoveCommand();
 //# sourceMappingURL=customaction-remove.js.map

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

@@ -1,15 +1,65 @@
-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 _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import { BasePermissions, PermissionKind } from '../../base-permissions.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+const permissionKinds = Object.entries(PermissionKind)
+    .filter(([, value]) => typeof value === 'number')
+    .map(([key]) => key);
+const permissionKindSet = new Set(permissionKinds);
+const registrationTypes = {
+    None: 'None',
+    List: 'List',
+    ContentType: 'ContentType',
+    ProgId: 'ProgId',
+    FileType: 'FileType'
+};
+const registrationTypeValues = Object.values(registrationTypes);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(val => validation.isValidSharePointUrl(val) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `${e.input} is not valid. Custom action id (Guid) expected`
+    }).alias('i'),
+    name: z.string().optional().alias('n'),
+    title: z.string().optional().alias('t'),
+    location: z.string().optional().alias('l'),
+    group: z.string().optional().alias('g'),
+    description: z.string().optional().alias('d'),
+    sequence: z.coerce.number().refine(val => val >= 0 && val <= 65536, {
+        message: 'Invalid option sequence. Expected value in range from 0 to 65536'
+    }).optional(),
+    actionUrl: z.string().optional(),
+    imageUrl: z.string().optional(),
+    commandUIExtension: z.string().optional().alias('e'),
+    registrationId: z.string().optional(),
+    registrationType: zod.coercedEnum(registrationTypes)
+        .optional()
+        .autocomplete(registrationTypeValues),
+    rights: z.string().refine(val => {
+        const items = val.split(',').map(item => item.trim());
+        return items.every(item => permissionKindSet.has(item));
+    }, {
+        error: e => {
+            const items = e.input.split(',').map(item => item.trim());
+            const invalid = items.find(item => !permissionKindSet.has(item));
+            return `Rights option '${invalid}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+        }
+    }).optional().autocomplete(permissionKinds),
+    scriptSrc: z.string().optional(),
+    scriptBlock: z.string().optional(),
+    scope: z.enum(['Site', 'Web', 'All']).optional().alias('s'),
+    clientSideComponentId: z.string().refine(val => validation.isValidGuid(val), {
+        error: e => `ClientSideComponentId ${e.input} is not a valid GUID`
+    }).optional().alias('c'),
+    clientSideComponentProperties: z.string().optional().alias('p')
+});
 class SpoCustomActionSetCommand extends SpoCommand {
     get name() {
         return commands.CUSTOMACTION_SET;
@@ -17,25 +67,25 @@ class SpoCustomActionSetCommand extends SpoCommand {
     get description() {
         return 'Updates a user custom action for site or site collection';
     }
-    /**
-     * Maps the base PermissionsKind enum to string array so it can
-     * more easily be used in validation or descriptions.
-     */
-    get permissionsKindMap() {
-        const result = [];
-        for (const kind in PermissionKind) {
-            if (typeof PermissionKind[kind] === 'number') {
-                result.push(kind);
-            }
-        }
-        return result;
+    get schema() {
+        return options;
     }
-    constructor() {
-        super();
-        _SpoCustomActionSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initValidators).call(this);
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.title || opts.name || opts.location ||
+            opts.actionUrl || opts.clientSideComponentId || opts.clientSideComponentProperties ||
+            opts.commandUIExtension || opts.group || opts.imageUrl ||
+            opts.description || opts.registrationId || opts.registrationType ||
+            opts.rights || opts.scriptBlock || opts.scriptSrc ||
+            opts.sequence !== undefined, {
+            message: 'Please specify option to be updated'
+        })
+            .refine(opts => !(opts.scriptSrc && opts.scriptBlock), {
+            message: 'Either option scriptSrc or scriptBlock can be specified, but not both'
+        });
+    }
+    get permissionsKindMap() {
+        return permissionKinds;
     }
     async commandAction(logger, args) {
         try {
@@ -104,7 +154,7 @@ class SpoCustomActionSetCommand extends SpoCommand {
         if (options.description) {
             requestBody.Description = options.description;
         }
-        if (options.sequence) {
+        if (options.sequence !== undefined) {
             requestBody.Sequence = options.sequence;
         }
         if (options.registrationType) {
@@ -162,112 +212,5 @@ class SpoCustomActionSetCommand extends SpoCommand {
         return 0; // None
     }
 }
-_SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand_initTelemetry = function _SpoCustomActionSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            location: args.options.location,
-            scope: args.options.scope || 'Web',
-            group: (!(!args.options.group)).toString(),
-            description: (!(!args.options.description)).toString(),
-            sequence: (!(!args.options.sequence)).toString(),
-            actionUrl: (!(!args.options.actionUrl)).toString(),
-            imageUrl: (!(!args.options.imageUrl)).toString(),
-            commandUIExtension: (!(!args.options.commandUIExtension)).toString(),
-            registrationId: args.options.registrationId,
-            registrationType: args.options.registrationType,
-            rights: args.options.rights,
-            scriptSrc: (!(!args.options.scriptSrc)).toString(),
-            scriptBlock: (!(!args.options.scriptBlock)).toString(),
-            clientSideComponentId: (!(!args.options.clientSideComponentId)).toString(),
-            clientSideComponentProperties: (!(!args.options.clientSideComponentProperties)).toString()
-        });
-    });
-}, _SpoCustomActionSetCommand_initOptions = function _SpoCustomActionSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-l, --location [location]'
-    }, {
-        option: '-g, --group [group]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--sequence [sequence]'
-    }, {
-        option: '--actionUrl [actionUrl]'
-    }, {
-        option: '--imageUrl [imageUrl]'
-    }, {
-        option: '-e, --commandUIExtension [commandUIExtension]'
-    }, {
-        option: '--registrationId [registrationId]'
-    }, {
-        option: '--registrationType [registrationType]',
-        autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
-    }, {
-        option: '--rights [rights]',
-        autocomplete: this.permissionsKindMap
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: ['Site', 'Web', 'All']
-    }, {
-        option: '--scriptBlock [scriptBlock]'
-    }, {
-        option: '--scriptSrc [scriptSrc]'
-    }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
-    }, {
-        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-    });
-}, _SpoCustomActionSetCommand_initValidators = function _SpoCustomActionSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action id (Guid) expected`;
-        }
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!args.options.title && !args.options.name && !args.options.location &&
-            !args.options.actionUrl && !args.options.clientSideComponentId && !args.options.clientSideComponentProperties &&
-            !args.options.commandUIExtension && !args.options.group && !args.options.imageUrl &&
-            !args.options.description && !args.options.registrationId && !args.options.registrationType &&
-            !args.options.rights && !args.options.scriptBlock && !args.options.scriptSrc &&
-            !args.options.sequence) {
-            return 'Please specify option to be updated';
-        }
-        if (args.options.scriptSrc && args.options.scriptBlock) {
-            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
-        }
-        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
-            return 'Invalid option sequence. Expected value in range from 0 to 65536';
-        }
-        if (args.options.clientSideComponentId && validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web' &&
-            args.options.scope !== 'All') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-        }
-        if (args.options.rights) {
-            const rights = args.options.rights.split(',');
-            for (const item of rights) {
-                const kind = PermissionKind[item.trim()];
-                if (!kind) {
-                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive`;
-                }
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCustomActionSetCommand();
 //# sourceMappingURL=customaction-set.js.map

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

@@ -57,20 +57,11 @@ class SpoExternalUserListCommand extends SpoCommand {
             }
             else {
                 const results = json.pop();
-                if (results.TotalUserCount > 0) {
-                    await logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
-                        delete e._ObjectType_;
-                        const dateChunks = e.WhenCreated
-                            .replace('/Date(', '')
-                            .replace(')/', '')
-                            .split(',')
-                            .map(c => {
-                            return parseInt(c);
-                        });
-                        e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
-                        return e;
-                    }));
-                }
+                await logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
+                    delete e._ObjectType_;
+                    e.WhenCreated = formatting.extractCsomDate(e.WhenCreated);
+                    return e;
+                }));
             }
         }
         catch (err) {

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