@pnp/cli-microsoft365 12.0.0-beta.bf446c8 → 12.0.0-beta.d0b29c1

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -1,11 +1,7 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoAppTeamsPackageDownloadCommand_instances, _SpoAppTeamsPackageDownloadCommand_initTelemetry, _SpoAppTeamsPackageDownloadCommand_initOptions, _SpoAppTeamsPackageDownloadCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -13,6 +9,27 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appItemId: z.number().optional(),
+    appItemUniqueId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    })
+        .optional(),
+    appName: z.string().optional(),
+    fileName: z.string()
+        .refine(fileName => !fs.existsSync(fileName), {
+        error: e => `File ${e.input} already exists`
+    })
+        .optional(),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u')
+});
 class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_TEAMSPACKAGE_DOWNLOAD;
@@ -20,12 +37,18 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand {
     get description() {
         return 'Downloads Teams app package for an SPFx solution deployed to tenant app catalog';
     }
-    constructor() {
-        super();
-        _SpoAppTeamsPackageDownloadCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.appItemUniqueId, opts.appItemId, opts.appName].filter(x => x !== undefined).length === 1, {
+            error: 'Specify appItemUniqueId, appItemId or appName but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appItemUniqueId', 'appItemId', 'appName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -125,47 +148,5 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand {
         this.appCatalogUrl = appCatalogUrl;
     }
 }
-_SpoAppTeamsPackageDownloadCommand_instances = new WeakSet(), _SpoAppTeamsPackageDownloadCommand_initTelemetry = function _SpoAppTeamsPackageDownloadCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined',
-            appItemUniqueId: typeof args.options.appItemUniqueId !== 'undefined',
-            appItemId: typeof args.options.appItemId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined',
-            fileName: typeof args.options.fileName !== 'undefined'
-        });
-    });
-}, _SpoAppTeamsPackageDownloadCommand_initOptions = function _SpoAppTeamsPackageDownloadCommand_initOptions() {
-    this.options.unshift({ option: '--appItemId [appItemId]' }, { option: '--appItemUniqueId [appItemUniqueId]' }, { option: '--appName [appName]' }, { option: '--fileName [fileName]' }, { option: '-u, --appCatalogUrl [appCatalogUrl]' });
-}, _SpoAppTeamsPackageDownloadCommand_initValidators = function _SpoAppTeamsPackageDownloadCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.appItemUniqueId &&
-            !args.options.appItemId &&
-            !args.options.appName) {
-            return `Specify appItemUniqueId, appItemId or appName`;
-        }
-        if ((args.options.appItemUniqueId && args.options.appItemId) ||
-            (args.options.appItemUniqueId && args.options.appName) ||
-            (args.options.appItemId && args.options.appName)) {
-            return `Specify appItemUniqueId, appItemId or appName but not multiple`;
-        }
-        if (args.options.appItemUniqueId &&
-            !validation.isValidGuid(args.options.appItemUniqueId)) {
-            return `${args.options.appItemUniqueId} is not a valid GUID`;
-        }
-        if (args.options.appItemId &&
-            isNaN(args.options.appItemId)) {
-            return `${args.options.appItemId} is not a number`;
-        }
-        if (args.options.fileName &&
-            fs.existsSync(args.options.fileName)) {
-            return `File ${args.options.fileName} already exists`;
-        }
-        if (args.options.appCatalogUrl) {
-            return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-        }
-        return true;
-    });
-};
 export default new SpoAppTeamsPackageDownloadCommand();
 //# sourceMappingURL=app-teamspackage-download.js.map

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -1,15 +1,28 @@
-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 _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _SpoAppUninstallCommand_initOptions, _SpoAppUninstallCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const appCatalogScopeOptions = { tenant: 'tenant', sitecollection: 'sitecollection' };
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    })
+        .alias('i'),
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('s'),
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoAppUninstallCommand extends SpoCommand {
     get name() {
         return commands.APP_UNINSTALL;
@@ -17,12 +30,8 @@ class SpoAppUninstallCommand extends SpoCommand {
     get description() {
         return 'Uninstalls an app from the site';
     }
-    constructor() {
-        super();
-        _SpoAppUninstallCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const uninstallApp = async () => {
@@ -54,37 +63,5 @@ class SpoAppUninstallCommand extends SpoCommand {
         }
     }
 }
-_SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initTelemetry = function _SpoAppUninstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString(),
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppUninstallCommand_initOptions = function _SpoAppUninstallCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --siteUrl <siteUrl>'
-    }, {
-        option: '--appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoAppUninstallCommand_initValidators = function _SpoAppUninstallCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
-            }
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-};
 export default new SpoAppUninstallCommand();
 //# sourceMappingURL=app-uninstall.js.map

package/dist/m365/spo/commands/app/app-upgrade.js

@@ -1,14 +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 _SpoAppUpgradeCommand_instances, _SpoAppUpgradeCommand_initTelemetry, _SpoAppUpgradeCommand_initOptions, _SpoAppUpgradeCommand_initValidators;
+import { z } from 'zod';
+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 commands from '../../commands.js';
+const appCatalogScopeOptions = { tenant: 'tenant', sitecollection: 'sitecollection' };
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    })
+        .alias('i'),
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('s'),
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional()
+});
 class SpoAppUpgradeCommand extends SpoCommand {
     get name() {
         return commands.APP_UPGRADE;
@@ -16,12 +28,8 @@ class SpoAppUpgradeCommand extends SpoCommand {
     get description() {
         return 'Upgrades app in the specified site';
     }
-    constructor() {
-        super();
-        _SpoAppUpgradeCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppUpgradeCommand_instances, "m", _SpoAppUpgradeCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppUpgradeCommand_instances, "m", _SpoAppUpgradeCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppUpgradeCommand_instances, "m", _SpoAppUpgradeCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
@@ -42,34 +50,5 @@ class SpoAppUpgradeCommand extends SpoCommand {
         }
     }
 }
-_SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelemetry = function _SpoAppUpgradeCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppUpgradeCommand_initOptions = function _SpoAppUpgradeCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --siteUrl <siteUrl>'
-    }, {
-        option: '--appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    });
-}, _SpoAppUpgradeCommand_initValidators = function _SpoAppUpgradeCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
-            }
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.siteUrl);
-    });
-};
 export default new SpoAppUpgradeCommand();
 //# sourceMappingURL=app-upgrade.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

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

@@ -1,9 +1,5 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFieldAddCommand_instances, _SpoFieldAddCommand_initTelemetry, _SpoFieldAddCommand_initOptions, _SpoFieldAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -11,6 +7,29 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const fieldOptions = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];
+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'),
+    listTitle: z.string().optional().alias('l'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option listId is not a valid GUID`
+    }).optional(),
+    listUrl: z.string().optional(),
+    xml: z.string().alias('x'),
+    options: z.string().refine(val => {
+        const items = val.split(',').map(o => o.trim());
+        return items.every(item => fieldOptions.indexOf(item) !== -1);
+    }, {
+        error: e => {
+            const items = e.input.split(',').map((o) => o.trim());
+            const invalid = items.find((item) => fieldOptions.indexOf(item) === -1);
+            return `${invalid} is not a valid value for the options argument. Allowed values are ${fieldOptions.join('|')}`;
+        }
+    }).optional()
+});
 class SpoFieldAddCommand extends SpoCommand {
     get name() {
         return commands.FIELD_ADD;
@@ -18,12 +37,14 @@ class SpoFieldAddCommand extends SpoCommand {
     get description() {
         return 'Adds a new list or site column using the CAML field definition';
     }
-    constructor() {
-        super();
-        _SpoFieldAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(o => o !== undefined).length <= 1, {
+            error: 'Specify either list id or title or list url, but not multiple'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -94,55 +115,5 @@ class SpoFieldAddCommand extends SpoCommand {
         return optionsValue;
     }
 }
-_SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry = function _SpoFieldAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listId: typeof args.options.listId !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            options: typeof args.options.options !== 'undefined'
-        });
-    });
-}, _SpoFieldAddCommand_initOptions = function _SpoFieldAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-x, --xml <xml>'
-    }, {
-        option: '--options [options]'
-    });
-}, _SpoFieldAddCommand_initValidators = function _SpoFieldAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url, but not multiple`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        if (args.options.options) {
-            let optionsError = true;
-            const options = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];
-            args.options.options.split(',').forEach(o => {
-                o = o.trim();
-                if (options.indexOf(o) < 0) {
-                    optionsError = `${o} is not a valid value for the options argument. Allowed values are DefaultValue|AddToDefaultContentType|AddToNoContentType|AddToAllContentTypes|AddFieldInternalNameHint|AddFieldToDefaultView|AddFieldCheckDisplayName`;
-                }
-            });
-            return optionsError;
-        }
-        return true;
-    });
-};
 export default new SpoFieldAddCommand();
 //# sourceMappingURL=field-add.js.map