@pnp/cli-microsoft365 12.0.0-beta.4ac11a7 → 12.0.0-beta.8769a5e

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

@@ -1,15 +1,15 @@
-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 _SpoThemeGetCommand_instances, _SpoThemeGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n')
+});
 class SpoThemeGetCommand extends SpoCommand {
     get name() {
         return commands.THEME_GET;
@@ -17,10 +17,8 @@ class SpoThemeGetCommand extends SpoCommand {
     get description() {
         return 'Gets custom theme information';
     }
-    constructor() {
-        super();
-        _SpoThemeGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoThemeGetCommand_instances, "m", _SpoThemeGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -51,10 +49,5 @@ class SpoThemeGetCommand extends SpoCommand {
         }
     }
 }
-_SpoThemeGetCommand_instances = new WeakSet(), _SpoThemeGetCommand_initOptions = function _SpoThemeGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    });
-};
 export default new SpoThemeGetCommand();
 //# sourceMappingURL=theme-get.js.map

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

@@ -1,8 +1,13 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoThemeListCommand extends SpoCommand {
+    get schema() {
+        return options;
+    }
     get name() {
         return commands.THEME_LIST;
     }

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

@@ -1,14 +1,15 @@
-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 _SpoThemeRemoveCommand_instances, _SpoThemeRemoveCommand_initTelemetry, _SpoThemeRemoveCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoThemeRemoveCommand extends SpoCommand {
     get name() {
         return commands.THEME_REMOVE;
@@ -16,11 +17,8 @@ class SpoThemeRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes existing theme';
     }
-    constructor() {
-        super();
-        _SpoThemeRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoThemeRemoveCommand_instances, "m", _SpoThemeRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoThemeRemoveCommand_instances, "m", _SpoThemeRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -56,18 +54,5 @@ class SpoThemeRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoThemeRemoveCommand_instances = new WeakSet(), _SpoThemeRemoveCommand_initTelemetry = function _SpoThemeRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoThemeRemoveCommand_initOptions = function _SpoThemeRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new SpoThemeRemoveCommand();
 //# sourceMappingURL=theme-remove.js.map

package/dist/m365/spo/commands/theme/theme-set.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 _SpoThemeSetCommand_instances, _SpoThemeSetCommand_initTelemetry, _SpoThemeSetCommand_initOptions, _SpoThemeSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,14 @@ import { spo } from '../../../../utils/spo.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,
+    name: z.string().alias('n'),
+    theme: z.string().refine(val => validation.isValidTheme(val), {
+        message: 'The specified theme is not valid'
+    }).alias('t'),
+    isInverted: z.boolean().optional()
+});
 class SpoThemeSetCommand extends SpoCommand {
     get name() {
         return commands.THEME_SET;
@@ -18,12 +22,8 @@ class SpoThemeSetCommand extends SpoCommand {
     get description() {
         return 'Adds or updates a theme';
     }
-    constructor() {
-        super();
-        _SpoThemeSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoThemeSetCommand_instances, "m", _SpoThemeSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoThemeSetCommand_instances, "m", _SpoThemeSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoThemeSetCommand_instances, "m", _SpoThemeSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -55,27 +55,5 @@ class SpoThemeSetCommand extends SpoCommand {
         }
     }
 }
-_SpoThemeSetCommand_instances = new WeakSet(), _SpoThemeSetCommand_initTelemetry = function _SpoThemeSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            inverted: (!(!args.options.isInverted)).toString()
-        });
-    });
-}, _SpoThemeSetCommand_initOptions = function _SpoThemeSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-t, --theme <theme>'
-    }, {
-        option: '--isInverted'
-    });
-}, _SpoThemeSetCommand_initValidators = function _SpoThemeSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidTheme(args.options.theme)) {
-            return 'The specified theme is not valid';
-        }
-        return true;
-    });
-};
 export default new SpoThemeSetCommand();
 //# sourceMappingURL=theme-set.js.map

package/dist/m365/teams/commands/app/app-install.js

@@ -1,9 +1,3 @@
-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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -11,6 +5,22 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    teamId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    userId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional(),
+    userName: z.string().optional()
+});
 class TeamsAppInstallCommand extends GraphCommand {
     get name() {
         return commands.APP_INSTALL;
@@ -18,13 +28,25 @@ class TeamsAppInstallCommand extends GraphCommand {
     get description() {
         return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
-    constructor() {
-        super();
-        _TeamsAppInstallCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId, userId or userName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'userId', 'userName']
+            }
+        })
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -101,36 +123,5 @@ class TeamsAppInstallCommand extends GraphCommand {
         return app.id;
     }
 }
-_TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined'
-        });
-    });
-}, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
-}, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.teamId &&
-            !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.userId &&
-            !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

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

@@ -1,12 +1,12 @@
-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 _TeamsAppListCommand_instances, _a, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    distributionMethod: z.enum(['store', 'organization', 'sideloaded']).optional()
+});
 class TeamsAppListCommand extends GraphCommand {
     get name() {
         return commands.APP_LIST;
@@ -17,12 +17,8 @@ class TeamsAppListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'distributionMethod'];
     }
-    constructor() {
-        super();
-        _TeamsAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppListCommand_instances, "m", _TeamsAppListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -38,26 +34,5 @@ class TeamsAppListCommand extends GraphCommand {
         }
     }
 }
-_a = TeamsAppListCommand, _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            distributionMethod: args.options.distributionMethod || false
-        });
-    });
-}, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '--distributionMethod [distributionMethod]',
-        autocomplete: _a.allowedDistributionMethods
-    });
-}, _TeamsAppListCommand_initValidators = function _TeamsAppListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.distributionMethod &&
-            _a.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
-            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${_a.allowedDistributionMethods.join(', ')}`;
-        }
-        return true;
-    });
-};
-TeamsAppListCommand.allowedDistributionMethods = ['store', 'organization', 'sideloaded'];
 export default new TeamsAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/teams/commands/app/app-publish.js

@@ -1,14 +1,27 @@
-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 _TeamsAppPublishCommand_instances, _TeamsAppPublishCommand_initOptions, _TeamsAppPublishCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    filePath: z.string()
+        .refine(val => {
+        const fullPath = path.resolve(val);
+        if (!fs.existsSync(fullPath)) {
+            return false;
+        }
+        if (fs.lstatSync(fullPath).isDirectory()) {
+            return false;
+        }
+        return true;
+    }, {
+        message: 'Specified file does not exist or points to a directory.'
+    })
+        .alias('p')
+});
 class TeamsAppPublishCommand extends GraphCommand {
     get name() {
         return commands.APP_PUBLISH;
@@ -16,11 +29,8 @@ class TeamsAppPublishCommand extends GraphCommand {
     get description() {
         return 'Publishes Teams app to the organization\'s app catalog';
     }
-    constructor() {
-        super();
-        _TeamsAppPublishCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppPublishCommand_instances, "m", _TeamsAppPublishCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppPublishCommand_instances, "m", _TeamsAppPublishCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,21 +55,5 @@ class TeamsAppPublishCommand extends GraphCommand {
         }
     }
 }
-_TeamsAppPublishCommand_instances = new WeakSet(), _TeamsAppPublishCommand_initOptions = function _TeamsAppPublishCommand_initOptions() {
-    this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    });
-}, _TeamsAppPublishCommand_initValidators = function _TeamsAppPublishCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const fullPath = path.resolve(args.options.filePath);
-        if (!fs.existsSync(fullPath)) {
-            return `File '${fullPath}' not found`;
-        }
-        if (fs.lstatSync(fullPath).isDirectory()) {
-            return `Path '${fullPath}' points to a directory`;
-        }
-        return true;
-    });
-};
 export default new TeamsAppPublishCommand();
 //# sourceMappingURL=app-publish.js.map

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

@@ -1,15 +1,19 @@
-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 _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }).optional().alias('i'),
+    name: z.string().optional().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_REMOVE;
@@ -17,13 +21,18 @@ class TeamsAppRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a Teams app from the organization\'s app catalog';
     }
-    constructor() {
-        super();
-        _TeamsAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeApp = async () => {
@@ -81,31 +90,5 @@ class TeamsAppRemoveCommand extends GraphCommand {
         return app.id;
     }
 }
-_TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString(),
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _TeamsAppRemoveCommand_initOptions = function _TeamsAppRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsAppRemoveCommand_initOptionSets = function _TeamsAppRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new TeamsAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

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

@@ -1,14 +1,18 @@
-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 _TeamsAppUninstallCommand_instances, _TeamsAppUninstallCommand_initTelemetry, _TeamsAppUninstallCommand_initOptions, _TeamsAppUninstallCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string(),
+    teamId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    }),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsAppUninstallCommand extends GraphCommand {
     get name() {
         return commands.APP_UNINSTALL;
@@ -16,12 +20,8 @@ class TeamsAppUninstallCommand extends GraphCommand {
     get description() {
         return 'Uninstalls an app from a Microsoft Team team';
     }
-    constructor() {
-        super();
-        _TeamsAppUninstallCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsAppUninstallCommand_instances, "m", _TeamsAppUninstallCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const uninstallApp = async () => {
@@ -52,27 +52,5 @@ class TeamsAppUninstallCommand extends GraphCommand {
         }
     }
 }
-_TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    }, {
-        option: '--teamId <teamId>'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsAppUninstallCommand_initValidators = function _TeamsAppUninstallCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new TeamsAppUninstallCommand();
 //# sourceMappingURL=app-uninstall.js.map