@pnp/cli-microsoft365 12.0.0-beta.e4f7675 → 12.0.0-beta.feb621e

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

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