@pnp/cli-microsoft365 11.9.0-beta.9bd71dd → 11.9.0

package/dist/m365/outlook/commands/report/report-mailboxusagestorage.js

@@ -1,5 +1,6 @@
-import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import PeriodBasedReport, { periodBasedReportOptions } from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
+export const options = periodBasedReportOptions;
 class OutlookReportMailboxUsageStorageCommand extends PeriodBasedReport {
     get name() {
         return commands.REPORT_MAILBOXUSAGESTORAGE;

package/dist/m365/outlook/commands/room/room-list.js

@@ -12,7 +12,7 @@ class OutlookRoomListCommand extends GraphCommand {
         return commands.ROOM_LIST;
     }
     get description() {
-        return 'Get a collection of all available rooms';
+        return 'Gets a collection of all available rooms';
     }
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -9,7 +9,7 @@ class OutlookRoomListListCommand extends GraphCommand {
         return commands.ROOMLIST_LIST;
     }
     get description() {
-        return 'Get a collection of available roomlists';
+        return 'Gets a collection of available roomlists';
     }
     get schema() {
         return options;

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

@@ -1,14 +1,21 @@
-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 _PaAppConsentSetCommand_instances, _PaAppConsentSetCommand_initOptions, _PaAppConsentSetCommand_initValidators, _PaAppConsentSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.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'),
+    name: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .alias('n'),
+    bypass: z.boolean().alias('b'),
+    force: z.boolean().optional().alias('f')
+});
 class PaAppConsentSetCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_CONSENT_SET;
@@ -16,12 +23,8 @@ class PaAppConsentSetCommand extends PowerAppsCommand {
     get description() {
         return 'Configures if users can bypass the API Consent window for the selected canvas app';
     }
-    constructor() {
-        super();
-        _PaAppConsentSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppConsentSetCommand_instances, "m", _PaAppConsentSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppConsentSetCommand_instances, "m", _PaAppConsentSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppConsentSetCommand_instances, "m", _PaAppConsentSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -56,26 +59,5 @@ class PaAppConsentSetCommand extends PowerAppsCommand {
         }
     }
 }
-_PaAppConsentSetCommand_instances = new WeakSet(), _PaAppConsentSetCommand_initOptions = function _PaAppConsentSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '-b, --bypass <bypass>',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-f, --force'
-    });
-}, _PaAppConsentSetCommand_initValidators = function _PaAppConsentSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _PaAppConsentSetCommand_initTypes = function _PaAppConsentSetCommand_initTypes() {
-    this.types.boolean.push('bypass');
-};
 export default new PaAppConsentSetCommand();
 //# sourceMappingURL=app-consent-set.js.map

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

@@ -1,32 +1,44 @@
-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 _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators, _PaAppExportCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
 import { setTimeout } from 'timers/promises';
+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 PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID for option name.'
+    })
+        .alias('n'),
+    environmentName: z.string().alias('e'),
+    packageDisplayName: z.string().optional(),
+    packageDescription: z.string().optional().alias('d'),
+    packageCreatedBy: z.string().optional().alias('c'),
+    packageSourceEnvironment: z.string().optional().alias('s'),
+    path: z.string().optional()
+        .refine(val => !val || fs.existsSync(path.dirname(val)), {
+        message: 'Specified path where to save the file does not exist.'
+    })
+        .alias('p')
+});
 class PaAppExportCommand extends PowerPlatformCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 5000;
+    }
     get name() {
         return commands.APP_EXPORT;
     }
     get description() {
         return 'Exports the specified Power App';
     }
-    constructor() {
-        super();
-        _PaAppExportCommand_instances.add(this);
-        this.pollingInterval = 5000;
-        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -141,43 +153,5 @@ class PaAppExportCommand extends PowerPlatformCommand {
         return link;
     }
 }
-_PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry = function _PaAppExportCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            packageDescription: typeof args.options.packageDescription !== 'undefined',
-            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
-            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
-            path: typeof args.options.path !== 'undefined'
-        });
-    });
-}, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--packageDisplayName [packageDisplayName]'
-    }, {
-        option: '-d, --packageDescription [packageDescription]'
-    }, {
-        option: '-c, --packageCreatedBy [packageCreatedBy]'
-    }, {
-        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
-    }, {
-        option: '-p, --path [path]'
-    });
-}, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID for option name`;
-        }
-        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
-            return 'Specified path where to save the file does not exist';
-        }
-        return true;
-    });
-}, _PaAppExportCommand_initTypes = function _PaAppExportCommand_initTypes() {
-    this.types.string.push('name', 'environmentName', 'packageDisplayName', 'packageDescription', 'packageCreatedBy', 'packageSourceEnvironment', 'path');
-};
 export default new PaAppExportCommand();
 //# sourceMappingURL=app-export.js.map

package/dist/m365/pa/commands/app/app-get.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 _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +7,18 @@ import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
 import paAppListCommand from '../app/app-list.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value is not a valid GUID.'
+    })
+        .optional()
+        .alias('n'),
+    displayName: z.string().optional().alias('d'),
+    environmentName: z.string().optional().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class PaAppGetCommand extends PowerAppsCommand {
     get name() {
         return commands.APP_GET;
@@ -18,13 +26,24 @@ class PaAppGetCommand extends PowerAppsCommand {
     get description() {
         return 'Gets information about the specified Microsoft Power App';
     }
-    constructor() {
-        super();
-        _PaAppGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.name, opts.displayName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'name' or 'displayName', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'displayName']
+            }
+        })
+            .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) {
         try {
@@ -94,40 +113,5 @@ class PaAppGetCommand extends PowerAppsCommand {
         return app;
     }
 }
-_PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = function _PaAppGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            asAdmin: !!args.options.asAdmin,
-            environmentName: typeof args.options.environmentName !== 'undefined'
-        });
-    });
-}, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '-d, --displayName [displayName]'
-    }, {
-        option: '-e, --environmentName [environmentName]'
-    }, {
-        option: '--asAdmin'
-    });
-}, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.name && !validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID`;
-        }
-        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;
-    });
-}, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['name', 'displayName'] });
-};
 export default new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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