@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.4ac11a7

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

@@ -1,15 +1,30 @@
-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 _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
+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';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.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`
+    })
+        .optional()
+        .alias('i'),
+    name: z.string().optional().alias('n'),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional().alias('s')
+});
 class SpoAppGetCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_GET;
@@ -17,13 +32,25 @@ class SpoAppGetCommand extends SpoAppBaseCommand {
     get description() {
         return 'Gets information about the specific app from the specified app catalog';
     }
-    constructor() {
-        super();
-        _SpoAppGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(opts => opts.appCatalogScope !== 'sitecollection' || opts.appCatalogUrl !== undefined, {
+            error: 'You must specify appCatalogUrl when the appCatalogScope is sitecollection',
+            path: ['appCatalogUrl'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -66,48 +93,5 @@ class SpoAppGetCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = function _SpoAppGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            name: (!(!args.options.name)).toString(),
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppGetCommand_initOptions = function _SpoAppGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-u, --appCatalogUrl [appCatalogUrl]'
-    }, {
-        option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    });
-}, _SpoAppGetCommand_initValidators = function _SpoAppGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
-            }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
-            }
-        }
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.appCatalogUrl) {
-            return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-        }
-        return true;
-    });
-}, _SpoAppGetCommand_initOptionSets = function _SpoAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/spo/commands/app/app-install.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 _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_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 SpoAppInstallCommand extends SpoCommand {
     get name() {
         return commands.APP_INSTALL;
@@ -16,12 +28,8 @@ class SpoAppInstallCommand extends SpoCommand {
     get description() {
         return 'Installs an app from the specified app catalog in the site';
     }
-    constructor() {
-        super();
-        _SpoAppInstallCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppInstallCommand_instances, "m", _SpoAppInstallCommand_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 SpoAppInstallCommand extends SpoCommand {
         }
     }
 }
-_SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppInstallCommand_initOptions = function _SpoAppInstallCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-s, --siteUrl <siteUrl>'
-    }, {
-        option: '--appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    });
-}, _SpoAppInstallCommand_initValidators = function _SpoAppInstallCommand_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 SpoAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -1,13 +1,17 @@
-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 _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u')
+});
 class SpoAppInStanceListCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_INSTANCE_LIST;
@@ -18,11 +22,8 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand {
     defaultProperties() {
         return [`Title`, `AppId`];
     }
-    constructor() {
-        super();
-        _SpoAppInStanceListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppInStanceListCommand_instances, "m", _SpoAppInStanceListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppInStanceListCommand_instances, "m", _SpoAppInStanceListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -37,18 +38,5 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand_initOptions = function _SpoAppInStanceListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    });
-}, _SpoAppInStanceListCommand_initValidators = function _SpoAppInStanceListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.siteUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        return true;
-    });
-};
 export default new SpoAppInStanceListCommand();
 //# sourceMappingURL=app-instance-list.js.map

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

@@ -1,14 +1,22 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoAppListCommand_instances, _SpoAppListCommand_initTelemetry, _SpoAppListCommand_initOptions, _SpoAppListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
+const appCatalogScopeOptions = { tenant: 'tenant', sitecollection: 'sitecollection' };
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional().alias('s'),
+    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 SpoAppListCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_LIST;
@@ -19,12 +27,18 @@ class SpoAppListCommand extends SpoAppBaseCommand {
     defaultProperties() {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
-    constructor() {
-        super();
-        _SpoAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppListCommand_instances, "m", _SpoAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppListCommand_instances, "m", _SpoAppListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppListCommand_instances, "m", _SpoAppListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.appCatalogScope !== 'sitecollection' || opts.appCatalogUrl !== undefined, {
+            error: 'You must specify appCatalogUrl when the appCatalogScope is sitecollection',
+            path: ['appCatalogUrl'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
@@ -42,37 +56,5 @@ class SpoAppListCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry = function _SpoAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppListCommand_initOptions = function _SpoAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    }, {
-        option: '-u, --appCatalogUrl [appCatalogUrl]'
-    });
-}, _SpoAppListCommand_initValidators = function _SpoAppListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
-            }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
-            }
-            if (args.options.appCatalogUrl) {
-                return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-            }
-        }
-        return true;
-    });
-};
 export default new SpoAppListCommand();
 //# sourceMappingURL=app-list.js.map

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

@@ -1,16 +1,30 @@
-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 _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppRemoveCommand_initOptions, _SpoAppRemoveCommand_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 { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.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'),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoAppRemoveCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_REMOVE;
@@ -18,12 +32,18 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand {
     get description() {
         return 'Removes the specified app from the specified app catalog';
     }
-    constructor() {
-        super();
-        _SpoAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppRemoveCommand_instances, "m", _SpoAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppRemoveCommand_instances, "m", _SpoAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppRemoveCommand_instances, "m", _SpoAppRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.appCatalogScope !== 'sitecollection' || opts.appCatalogUrl !== undefined, {
+            error: 'You must specify appCatalogUrl when the appCatalogScope is sitecollection',
+            path: ['appCatalogUrl'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
@@ -57,45 +77,5 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemetry = function _SpoAppRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            force: (!(!args.options.force)).toString(),
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppRemoveCommand_initOptions = function _SpoAppRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-u, --appCatalogUrl [appCatalogUrl]'
-    }, {
-        option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoAppRemoveCommand_initValidators = function _SpoAppRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
-        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 (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
-            }
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.appCatalogUrl) {
-            return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-        }
-        return true;
-    });
-};
 export default new SpoAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

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

@@ -1,16 +1,30 @@
-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 _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_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 { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.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'),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    appCatalogScope: zod.coercedEnum(appCatalogScopeOptions).optional().alias('s'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoAppRetractCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_RETRACT;
@@ -18,12 +32,18 @@ class SpoAppRetractCommand extends SpoAppBaseCommand {
     get description() {
         return 'Retracts the specified app from the specified app catalog';
     }
-    constructor() {
-        super();
-        _SpoAppRetractCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.appCatalogScope !== 'sitecollection' || opts.appCatalogUrl !== undefined, {
+            error: 'You must specify appCatalogUrl when the appCatalogScope is sitecollection',
+            path: ['appCatalogUrl'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
@@ -57,44 +77,5 @@ class SpoAppRetractCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelemetry = function _SpoAppRetractCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            force: (!(!args.options.force)).toString(),
-            appCatalogScope: args.options.appCatalogScope || 'tenant'
-        });
-    });
-}, _SpoAppRetractCommand_initOptions = function _SpoAppRetractCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-u, --appCatalogUrl [appCatalogUrl]'
-    }, {
-        option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoAppRetractCommand_initValidators = function _SpoAppRetractCommand_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 (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
-            }
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.appCatalogUrl) {
-            return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-        }
-        return true;
-    });
-};
 export default new SpoAppRetractCommand();
 //# sourceMappingURL=app-retract.js.map