@pnp/cli-microsoft365 11.9.0-beta.f8dc984 → 11.10.0-beta.6474466

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

@@ -1,13 +1,14 @@
-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 _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().optional().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class PaAppListCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_LIST;
@@ -18,12 +19,17 @@ class PaAppListCommand extends PowerAppsCommand {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    constructor() {
-        super();
-        _PaAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppListCommand_instances, "m", _PaAppListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.asAdmin || opts.environmentName, {
+            message: 'When specifying the asAdmin option the environment option is required as well.'
+        })
+            .refine(opts => !opts.environmentName || opts.asAdmin, {
+            message: 'When specifying the environment option the asAdmin option is required as well.'
+        });
     }
     async commandAction(logger, args) {
         const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environmentName ? '/environments/' + formatting.encodeQueryParameter(args.options.environmentName) : ''}/apps?api-version=2017-08-01`;
@@ -41,29 +47,5 @@ class PaAppListCommand extends PowerAppsCommand {
         }
     }
 }
-_PaAppListCommand_instances = new WeakSet(), _PaAppListCommand_initTelemetry = function _PaAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: args.options.asAdmin === true,
-            environmentName: typeof args.options.environmentName !== 'undefined'
-        });
-    });
-}, _PaAppListCommand_initOptions = function _PaAppListCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName [environmentName]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PaAppListCommand_initValidators = function _PaAppListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.asAdmin && !args.options.environmentName) {
-            return 'When specifying the asAdmin option the environment option is required as well';
-        }
-        if (args.options.environmentName && !args.options.asAdmin) {
-            return 'When specifying the environment option the asAdmin option is required as well';
-        }
-        return true;
-    });
-};
 export default new PaAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/pa/commands/app/app-owner-set.js

@@ -1,14 +1,29 @@
-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 _PaAppOwnerSetCommand_instances, _a, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    appName: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for appName.'
+    }),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for userId.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value is not a valid UPN for userName.'
+    })
+        .optional(),
+    roleForOldAppOwner: z.enum(['CanView', 'CanEdit']).optional()
+});
 class PaAppOwnerSetCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_OWNER_SET;
@@ -16,13 +31,18 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
     get description() {
         return 'Sets a new owner for a Power Apps app';
     }
-    constructor() {
-        super();
-        _PaAppOwnerSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'userId' or 'userName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -55,46 +75,5 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
         return entraUser.getUserIdByUpn(options.userName);
     }
 }
-_a = PaAppOwnerSetCommand, _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            roleForOldAppOwner: typeof args.options.roleForOldAppOwner !== 'undefined'
-        });
-    });
-}, _PaAppOwnerSetCommand_initOptions = function _PaAppOwnerSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--appName <appName>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--roleForOldAppOwner [roleForOldAppOwner]',
-        autocomplete: _a.roleForOldAppOwner
-    });
-}, _PaAppOwnerSetCommand_initValidators = function _PaAppOwnerSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.appName)) {
-            return `${args.options.appName} is not a valid GUID for appName`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for userId`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid UPN for userName`;
-        }
-        if (args.options.roleForOldAppOwner && _a.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
-            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${_a.roleForOldAppOwner.join(', ')}`;
-        }
-        return true;
-    });
-}, _PaAppOwnerSetCommand_initOptionSets = function _PaAppOwnerSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName'] });
-};
-PaAppOwnerSetCommand.roleForOldAppOwner = ['CanView', 'CanEdit'];
 export default new PaAppOwnerSetCommand();
 //# sourceMappingURL=app-owner-set.js.map

package/dist/m365/pa/commands/app/app-permission-ensure.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 _PaAppPermissionEnsureCommand_instances, _a, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import Auth from '../../../../Auth.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
@@ -12,6 +8,34 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appName: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for appName.'
+    }),
+    roleName: z.enum(['CanEdit', 'CanView']),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for userId.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value is not a valid user principal name (UPN) for userName.'
+    })
+        .optional(),
+    groupId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for groupId.'
+    })
+        .optional(),
+    groupName: z.string().optional(),
+    tenant: z.boolean().optional(),
+    environmentName: z.string().optional().alias('e'),
+    sendInvitationMail: z.boolean().optional(),
+    asAdmin: z.boolean().optional()
+});
 class PaAppPermissionEnsureCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_PERMISSION_ENSURE;
@@ -19,14 +43,27 @@ class PaAppPermissionEnsureCommand extends PowerAppsCommand {
     get description() {
         return 'Assigns/updates permissions to a Power Apps app';
     }
-    constructor() {
-        super();
-        _PaAppPermissionEnsureCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.userId, opts.userName, opts.groupId, opts.groupName, opts.tenant].filter(x => x !== undefined).length === 1, {
+            error: `Specify exactly one of the following options: 'userId', 'userName', 'groupId', 'groupName' or 'tenant'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName', 'tenant']
+            }
+        })
+            .refine(opts => !opts.environmentName || opts.asAdmin, {
+            message: 'Specifying environmentName is only allowed when using asAdmin.'
+        })
+            .refine(opts => !opts.asAdmin || opts.environmentName, {
+            message: 'Specifying asAdmin is only allowed when using environmentName.'
+        })
+            .refine(opts => !opts.tenant || opts.roleName === 'CanView', {
+            message: 'Sharing with the entire tenant is only supported with CanView role.'
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -88,75 +125,5 @@ class PaAppPermissionEnsureCommand extends PowerAppsCommand {
         return accessToken.getTenantIdFromAccessToken(Auth.connection.accessTokens[Auth.defaultResource].accessToken);
     }
 }
-_a = PaAppPermissionEnsureCommand, _PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            tenant: !!args.options.tenant,
-            sendInvitationMail: !!args.options.sendInvitationMail,
-            environmentName: typeof args.options.environmentName !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PaAppPermissionEnsureCommand_initOptions = function _PaAppPermissionEnsureCommand_initOptions() {
-    this.options.unshift({
-        option: '--appName <appName>'
-    }, {
-        option: '--roleName <roleName>',
-        autocomplete: _a.roleNames
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--tenant'
-    }, {
-        option: '-e, --environmentName [environmentName]'
-    }, {
-        option: '--sendInvitationMail'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PaAppPermissionEnsureCommand_initValidators = function _PaAppPermissionEnsureCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.appName)) {
-            return `${args.options.appName} is not a valid GUID for appName.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for userId.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID for groupId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
-        }
-        if (_a.roleNames.indexOf(args.options.roleName) < 0) {
-            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${_a.roleNames.join(', ')}.`;
-        }
-        if (args.options.environmentName && !args.options.asAdmin) {
-            return 'Specifying environmentName is only allowed when using asAdmin.';
-        }
-        if (args.options.asAdmin && !args.options.environmentName) {
-            return 'Specifying asAdmin is only allowed when using environmentName.';
-        }
-        if (args.options.tenant && args.options.roleName !== 'CanView') {
-            return 'Sharing with the entire tenant is only supported with CanView role.';
-        }
-        return true;
-    });
-}, _PaAppPermissionEnsureCommand_initOptionSets = function _PaAppPermissionEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
-}, _PaAppPermissionEnsureCommand_initTypes = function _PaAppPermissionEnsureCommand_initTypes() {
-    this.types.string.push('appName', 'roleName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
-};
-PaAppPermissionEnsureCommand.roleNames = ['CanEdit', 'CanView'];
 export default new PaAppPermissionEnsureCommand();
 //# sourceMappingURL=app-permission-ensure.js.map

package/dist/m365/pa/commands/app/app-permission-list.js

@@ -1,14 +1,20 @@
-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 _PaAppPermissionListCommand_instances, _PaAppPermissionListCommand_initTelemetry, _PaAppPermissionListCommand_initOptions, _PaAppPermissionListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appName: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for appName.'
+    }),
+    asAdmin: z.boolean().optional(),
+    environmentName: z.string().optional().alias('e'),
+    roleName: z.enum(['Owner', 'CanEdit', 'CanView']).optional()
+});
 class PaAppPermissionListCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_PERMISSION_LIST;
@@ -19,13 +25,17 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
     defaultProperties() {
         return ['roleName', 'principalId', 'principalType'];
     }
-    constructor() {
-        super();
-        _PaAppPermissionListCommand_instances.add(this);
-        this.allowedRoleNames = ['Owner', 'CanEdit', 'CanView'];
-        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.asAdmin || opts.environmentName, {
+            message: 'Specifying the environmentName is required when using asAdmin.'
+        })
+            .refine(opts => !opts.environmentName || opts.asAdmin, {
+            message: 'Specifying environmentName is only allowed when using asAdmin.'
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -51,41 +61,5 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
         }
     }
 }
-_PaAppPermissionListCommand_instances = new WeakSet(), _PaAppPermissionListCommand_initTelemetry = function _PaAppPermissionListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin,
-            environmentName: typeof args.options.environmentName !== 'undefined',
-            roleName: typeof args.options.roleName !== 'undefined'
-        });
-    });
-}, _PaAppPermissionListCommand_initOptions = function _PaAppPermissionListCommand_initOptions() {
-    this.options.unshift({
-        option: '--appName <appName>'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-e, --environmentName [environmentName]'
-    }, {
-        option: '--roleName [roleName]',
-        autocomplete: this.allowedRoleNames
-    });
-}, _PaAppPermissionListCommand_initValidators = function _PaAppPermissionListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.appName)) {
-            return `${args.options.appName} is not a valid GUID for appName.`;
-        }
-        if (args.options.roleName && !this.allowedRoleNames.includes(args.options.roleName)) {
-            return `${args.options.roleName} is not a valid roleName. Allowed values are ${this.allowedRoleNames.join(',')}`;
-        }
-        if (args.options.asAdmin && !args.options.environmentName) {
-            return 'Specifying the environmentName is required when using asAdmin';
-        }
-        if (!args.options.asAdmin && args.options.environmentName) {
-            return 'Specifying environmentName is only allowed when using asAdmin';
-        }
-        return true;
-    });
-};
 export default new PaAppPermissionListCommand();
 //# sourceMappingURL=app-permission-list.js.map

package/dist/m365/pa/commands/app/app-permission-remove.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 _PaAppPermissionRemoveCommand_instances, _PaAppPermissionRemoveCommand_initTelemetry, _PaAppPermissionRemoveCommand_initOptions, _PaAppPermissionRemoveCommand_initValidators, _PaAppPermissionRemoveCommand_initOptionSets, _PaAppPermissionRemoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import Auth from '../../../../Auth.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
@@ -13,6 +9,33 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appName: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for appName.'
+    }),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for userId.'
+    })
+        .optional(),
+    userName: z.string()
+        .refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value is not a valid user principal name (UPN) for userName.'
+    })
+        .optional(),
+    groupId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for groupId.'
+    })
+        .optional(),
+    groupName: z.string().optional(),
+    tenant: z.boolean().optional(),
+    asAdmin: z.boolean().optional(),
+    environmentName: z.string().optional().alias('e'),
+    force: z.boolean().optional().alias('f')
+});
 class PaAppPermissionRemoveCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_PERMISSION_REMOVE;
@@ -20,14 +43,24 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand {
     get description() {
         return 'Removes permissions to a Power Apps app';
     }
-    constructor() {
-        super();
-        _PaAppPermissionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.userId, opts.userName, opts.groupId, opts.groupName, opts.tenant].filter(x => x !== undefined).length === 1, {
+            error: `Specify exactly one of the following options: 'userId', 'userName', 'groupId', 'groupName' or 'tenant'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'groupId', 'groupName', 'tenant']
+            }
+        })
+            .refine(opts => !opts.environmentName || opts.asAdmin, {
+            message: 'Specifying environmentName is only allowed when using asAdmin.'
+        })
+            .refine(opts => !opts.asAdmin || opts.environmentName, {
+            message: 'Specifying asAdmin is only allowed when using environmentName.'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -84,65 +117,5 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand {
         return `tenant-${accessToken.getTenantIdFromAccessToken(Auth.connection.accessTokens[Auth.defaultResource].accessToken)}`;
     }
 }
-_PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveCommand_initTelemetry = function _PaAppPermissionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            tenant: !!args.options.tenant,
-            asAdmin: !!args.options.asAdmin,
-            environmentName: typeof args.options.environmentName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _PaAppPermissionRemoveCommand_initOptions = function _PaAppPermissionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--appName <appName>'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--tenant'
-    }, {
-        option: '--asAdmin'
-    }, {
-        option: '-e, --environmentName [environmentName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _PaAppPermissionRemoveCommand_initValidators = function _PaAppPermissionRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.appName)) {
-            return `${args.options.appName} is not a valid GUID for appName.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for userId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID for groupId.`;
-        }
-        if (args.options.environmentName && !args.options.asAdmin) {
-            return 'Specifying environmentName is only allowed when using asAdmin';
-        }
-        if (args.options.asAdmin && !args.options.environmentName) {
-            return 'Specifying asAdmin is only allowed when using environmentName';
-        }
-        return true;
-    });
-}, _PaAppPermissionRemoveCommand_initOptionSets = function _PaAppPermissionRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
-}, _PaAppPermissionRemoveCommand_initTypes = function _PaAppPermissionRemoveCommand_initTypes() {
-    this.types.string.push('appName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
-};
 export default new PaAppPermissionRemoveCommand();
 //# sourceMappingURL=app-permission-remove.js.map