@pnp/cli-microsoft365 12.1.0-beta.79db3d9 → 12.1.0-beta.81e442d

package/dist/cli/cli.js

@@ -48,7 +48,7 @@ const yargsConfiguration = {
     'camel-case-expansion': false
 };
 function isMissingRequiredValueError(error, options) {
-    if (error.code !== 'invalid_type') {
+    if (error.code !== 'invalid_type' && error.code !== 'invalid_value') {
         return false;
     }
     let currentValue = options;
@@ -173,12 +173,17 @@ async function execute(rawArgs) {
             else {
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
                 if (!shouldPrompt) {
-                    result.error.issues.forEach(e => {
-                        if (isMissingRequiredValueError(e, cli.optionsFromArgs.options)) {
-                            e.message = `Required option not specified`;
-                        }
-                    });
-                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                    const errorMessage = result.error.issues
+                        .map(issue => {
+                        const message = isMissingRequiredValueError(issue, cli.optionsFromArgs.options)
+                            ? 'Required option not specified'
+                            : issue.message;
+                        return issue.path.length > 0
+                            ? `${issue.path.join('.')}: ${message}`
+                            : message;
+                    })
+                        .join(os.EOL);
+                    return cli.closeWithError(errorMessage, cli.optionsFromArgs, true);
                 }
                 const missingRequiredValuesErrors = result.error.issues
                     .filter(e => isMissingRequiredValueError(e, cli.optionsFromArgs.options) ||

package/dist/m365/entra/commands/app/app-add.js

@@ -1,19 +1,47 @@
-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 _EntraAppAddCommand_instances, _a, _EntraAppAddCommand_initTelemetry, _EntraAppAddCommand_initOptions, _EntraAppAddCommand_initValidators, _EntraAppAddCommand_initOptionSets;
 import fs from 'fs';
 import { v4 } from 'uuid';
+import { z } from 'zod';
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { optionsUtils } from '../../../../utils/optionsUtils.js';
+const entraApplicationPlatform = ['spa', 'web', 'publicClient', 'apple', 'android'];
+const entraAppScopeConsentBy = ['admins', 'adminsAndUsers'];
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    name: z.string().optional().alias('n'),
+    multitenant: z.boolean().optional(),
+    redirectUris: z.string().optional().alias('r'),
+    platform: z.enum(entraApplicationPlatform).optional().alias('p'),
+    implicitFlow: z.boolean().optional(),
+    withSecret: z.boolean().optional().alias('s'),
+    apisDelegated: z.string().optional(),
+    apisApplication: z.string().optional(),
+    uri: z.string().optional().alias('u'),
+    scopeName: z.string().optional(),
+    scopeConsentBy: z.enum(entraAppScopeConsentBy).optional(),
+    scopeAdminConsentDisplayName: z.string().optional(),
+    scopeAdminConsentDescription: z.string().optional(),
+    certificateFile: z.string().optional(),
+    certificateBase64Encoded: z.string().optional(),
+    certificateDisplayName: z.string().optional(),
+    manifest: z.string().optional(),
+    bundleId: z.string().optional(),
+    signatureHash: z.string().optional(),
+    save: z.boolean().optional(),
+    grantAdminConsent: z.boolean().optional(),
+    allowPublicClientFlows: z.boolean().optional()
+});
 class EntraAppAddCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.appName = '';
+    }
     get name() {
         return commands.APP_ADD;
     }
@@ -23,31 +51,90 @@ class EntraAppAddCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraAppAddCommand_instances.add(this);
-        this.appName = '';
-        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.name, options.manifest].filter(x => x !== undefined).length === 1, {
+            error: 'Specify either name or manifest, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'manifest']
+            }
+        })
+            .refine(options => !options.redirectUris || !!options.platform, {
+            error: 'When you specify redirectUris you also need to specify platform'
+        })
+            .refine(options => !options.platform || !['spa', 'web', 'publicClient'].includes(options.platform) || !!options.redirectUris, {
+            error: `When you use platform spa, web or publicClient, you'll need to specify redirectUris`
+        })
+            .refine(options => !(options.certificateFile && options.certificateBase64Encoded), {
+            error: 'Specify either certificateFile or certificateBase64Encoded but not both'
+        })
+            .refine(options => !options.certificateDisplayName || !!options.certificateFile || !!options.certificateBase64Encoded, {
+            error: 'When you specify certificateDisplayName you also need to specify certificateFile or certificateBase64Encoded'
+        })
+            .refine(options => !options.certificateFile || fs.existsSync(options.certificateFile), {
+            error: 'Certificate file not found'
+        })
+            .refine(options => !options.scopeName || !!options.uri, {
+            error: 'When you specify scopeName you also need to specify uri'
+        })
+            .refine(options => !options.scopeName || !!options.scopeAdminConsentDescription, {
+            error: 'When you specify scopeName you also need to specify scopeAdminConsentDescription'
+        })
+            .refine(options => !options.scopeName || !!options.scopeAdminConsentDisplayName, {
+            error: 'When you specify scopeName you also need to specify scopeAdminConsentDisplayName'
+        })
+            .refine(options => {
+            if (!options.manifest) {
+                return true;
+            }
+            try {
+                const manifest = JSON.parse(options.manifest);
+                return !!options.name || !!manifest.name;
+            }
+            catch {
+                return false;
+            }
+        }, {
+            error: e => {
+                try {
+                    JSON.parse(e.input.manifest);
+                    return `Specify the name of the app to create either through the 'name' option or the 'name' property in the manifest`;
+                }
+                catch (err) {
+                    return `Error while parsing the specified manifest: ${err}`;
+                }
+            }
+        })
+            .refine(options => options.platform !== 'apple' || !!options.bundleId, {
+            error: `When you use platform apple, you'll need to specify bundleId`
+        })
+            .refine(options => options.platform !== 'android' || (!!options.bundleId && !!options.signatureHash), {
+            error: `When you use platform android, you'll need to specify bundleId and signatureHash`
+        });
     }
     async commandAction(logger, args) {
-        if (!args.options.name && this.manifest) {
-            args.options.name = this.manifest.name;
+        const manifest = args.options.manifest
+            ? JSON.parse(args.options.manifest)
+            : undefined;
+        if (!args.options.name && manifest) {
+            args.options.name = manifest.name;
         }
         this.appName = args.options.name;
         try {
             const apis = await entraApp.resolveApis({
                 options: args.options,
-                manifest: this.manifest,
+                manifest,
                 logger,
                 verbose: this.verbose,
                 debug: this.debug
             });
             let appInfo = await entraApp.createAppRegistration({
                 options: args.options,
-                unknownOptions: optionsUtils.getUnknownOptions(args.options, this.options),
+                unknownOptions: optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema)),
                 apis,
                 logger,
                 verbose: this.verbose,
@@ -407,136 +494,5 @@ class EntraAppAddCommand extends GraphCommand {
         return platform.charAt(0).toUpperCase() + platform.substring(1);
     }
 }
-_a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAppAddCommand_initTelemetry = function _EntraAppAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            apis: typeof args.options.apisDelegated !== 'undefined',
-            implicitFlow: args.options.implicitFlow,
-            multitenant: args.options.multitenant,
-            platform: args.options.platform,
-            redirectUris: typeof args.options.redirectUris !== 'undefined',
-            scopeAdminConsentDescription: typeof args.options.scopeAdminConsentDescription !== 'undefined',
-            scopeAdminConsentDisplayName: typeof args.options.scopeAdminConsentDisplayName !== 'undefined',
-            scopeConsentBy: args.options.scopeConsentBy,
-            scopeName: typeof args.options.scopeName !== 'undefined',
-            uri: typeof args.options.uri !== 'undefined',
-            withSecret: args.options.withSecret,
-            certificateFile: typeof args.options.certificateFile !== 'undefined',
-            certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
-            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
-            grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined',
-            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined',
-            bundleId: typeof args.options.bundleId !== 'undefined',
-            signatureHash: typeof args.options.signatureHash !== 'undefined'
-        });
-    });
-}, _EntraAppAddCommand_initOptions = function _EntraAppAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '--multitenant'
-    }, {
-        option: '-r, --redirectUris [redirectUris]'
-    }, {
-        option: '-p, --platform [platform]',
-        autocomplete: _a.entraApplicationPlatform
-    }, {
-        option: '--implicitFlow'
-    }, {
-        option: '-s, --withSecret'
-    }, {
-        option: '--apisDelegated [apisDelegated]'
-    }, {
-        option: '--apisApplication [apisApplication]'
-    }, {
-        option: '-u, --uri [uri]'
-    }, {
-        option: '--scopeName [scopeName]'
-    }, {
-        option: '--scopeConsentBy [scopeConsentBy]',
-        autocomplete: _a.entraAppScopeConsentBy
-    }, {
-        option: '--scopeAdminConsentDisplayName [scopeAdminConsentDisplayName]'
-    }, {
-        option: '--scopeAdminConsentDescription [scopeAdminConsentDescription]'
-    }, {
-        option: '--certificateFile [certificateFile]'
-    }, {
-        option: '--certificateBase64Encoded [certificateBase64Encoded]'
-    }, {
-        option: '--certificateDisplayName [certificateDisplayName]'
-    }, {
-        option: '--manifest [manifest]'
-    }, {
-        option: '--bundleId [bundleId]'
-    }, {
-        option: '--signatureHash [signatureHash]'
-    }, {
-        option: '--save'
-    }, {
-        option: '--grantAdminConsent'
-    }, {
-        option: '--allowPublicClientFlows'
-    });
-}, _EntraAppAddCommand_initValidators = function _EntraAppAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.platform &&
-            _a.entraApplicationPlatform.indexOf(args.options.platform) < 0) {
-            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.entraApplicationPlatform.join(', ')}`;
-        }
-        if (args.options.redirectUris && !args.options.platform) {
-            return `When you specify redirectUris you also need to specify platform`;
-        }
-        if (args.options.platform && ['spa', 'web', 'publicClient'].indexOf(args.options.platform) > -1 && !args.options.redirectUris) {
-            return `When you use platform spa, web or publicClient, you'll need to specify redirectUris`;
-        }
-        if (args.options.certificateFile && args.options.certificateBase64Encoded) {
-            return 'Specify either certificateFile or certificateBase64Encoded but not both';
-        }
-        if (args.options.certificateDisplayName && !args.options.certificateFile && !args.options.certificateBase64Encoded) {
-            return 'When you specify certificateDisplayName you also need to specify certificateFile or certificateBase64Encoded';
-        }
-        if (args.options.certificateFile && !fs.existsSync(args.options.certificateFile)) {
-            return 'Certificate file not found';
-        }
-        if (args.options.scopeName) {
-            if (!args.options.uri) {
-                return `When you specify scopeName you also need to specify uri`;
-            }
-            if (!args.options.scopeAdminConsentDescription) {
-                return `When you specify scopeName you also need to specify scopeAdminConsentDescription`;
-            }
-            if (!args.options.scopeAdminConsentDisplayName) {
-                return `When you specify scopeName you also need to specify scopeAdminConsentDisplayName`;
-            }
-        }
-        if (args.options.scopeConsentBy &&
-            _a.entraAppScopeConsentBy.indexOf(args.options.scopeConsentBy) < 0) {
-            return `${args.options.scopeConsentBy} is not a valid value for scopeConsentBy. Allowed values are ${_a.entraAppScopeConsentBy.join(', ')}`;
-        }
-        if (args.options.manifest) {
-            try {
-                this.manifest = JSON.parse(args.options.manifest);
-                if (!args.options.name && !this.manifest.name) {
-                    return `Specify the name of the app to create either through the 'name' option or the 'name' property in the manifest`;
-                }
-            }
-            catch (e) {
-                return `Error while parsing the specified manifest: ${e}`;
-            }
-        }
-        if (args.options.platform === 'apple' && !args.options.bundleId) {
-            return `When you use platform apple, you'll need to specify bundleId`;
-        }
-        if (args.options.platform === 'android' && (!args.options.bundleId || !args.options.signatureHash)) {
-            return `When you use platform android, you'll need to specify bundleId and signatureHash`;
-        }
-        return true;
-    });
-}, _EntraAppAddCommand_initOptionSets = function _EntraAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['name', 'manifest'] });
-};
-EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient', 'apple', 'android'];
-EntraAppAddCommand.entraAppScopeConsentBy = ['admins', 'adminsAndUsers'];
 export default new EntraAppAddCommand();
 //# sourceMappingURL=app-add.js.map

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

@@ -1,14 +1,17 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAppGetCommand_instances, _EntraAppGetCommand_initTelemetry, _EntraAppGetCommand_initOptions, _EntraAppGetCommand_initValidators, _EntraAppGetCommand_initOptionSets;
 import fs from 'fs';
-import { validation } from '../../../../utils/validation.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional(),
+    objectId: z.guid().optional(),
+    name: z.string().optional(),
+    save: z.boolean().optional(),
+    properties: z.string().optional().alias('p')
+});
 class EntraAppGetCommand extends GraphCommand {
     get name() {
         return commands.APP_GET;
@@ -16,13 +19,18 @@ class EntraAppGetCommand extends GraphCommand {
     get description() {
         return 'Gets an Entra app registration';
     }
-    constructor() {
-        super();
-        _EntraAppGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.objectId, options.name].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, objectId, or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'objectId', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -92,29 +100,5 @@ class EntraAppGetCommand extends GraphCommand {
         return appInfo;
     }
 }
-_EntraAppGetCommand_instances = new WeakSet(), _EntraAppGetCommand_initTelemetry = function _EntraAppGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraAppGetCommand_initOptions = function _EntraAppGetCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' }, { option: '-p, --properties [properties]' });
-}, _EntraAppGetCommand_initValidators = function _EntraAppGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppGetCommand_initOptionSets = function _EntraAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
-};
 export default new EntraAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/entra/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 _EntraAppListCommand_instances, _EntraAppListCommand_initTelemetry, _EntraAppListCommand_initOptions;
-import { odata } from "../../../../utils/odata.js";
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    properties: z.string().optional().alias('p')
+});
 class EntraAppListCommand extends GraphCommand {
     get name() {
         return commands.APP_LIST;
@@ -14,14 +14,11 @@ class EntraAppListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of Entra app registrations';
     }
-    constructor() {
-        super();
-        _EntraAppListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppListCommand_instances, "m", _EntraAppListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppListCommand_instances, "m", _EntraAppListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     defaultProperties() {
-        return ['appId', 'id', 'displayName', "signInAudience"];
+        return ['appId', 'id', 'displayName', 'signInAudience'];
     }
     async commandAction(logger, args) {
         const queryParameters = [];
@@ -44,14 +41,5 @@ class EntraAppListCommand extends GraphCommand {
         }
     }
 }
-_EntraAppListCommand_instances = new WeakSet(), _EntraAppListCommand_initTelemetry = function _EntraAppListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraAppListCommand_initOptions = function _EntraAppListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' });
-};
 export default new EntraAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -1,16 +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 _EntraAppPermissionAddCommand_instances, _EntraAppPermissionAddCommand_initTelemetry, _EntraAppPermissionAddCommand_initOptions, _EntraAppPermissionAddCommand_initValidators, _EntraAppPermissionAddCommand_initOptionSets;
-import { odata } from "../../../../utils/odata.js";
-import GraphCommand from "../../../base/GraphCommand.js";
-import commands from "../../commands.js";
-import request from "../../../../request.js";
-import { validation } from "../../../../utils/validation.js";
-import { entraApp } from "../../../../utils/entraApp.js";
-import { entraServicePrincipal } from "../../../../utils/entraServicePrincipal.js";
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional().alias('i'),
+    appName: z.string().optional().alias('n'),
+    appObjectId: z.guid().optional(),
+    applicationPermissions: z.string().optional().alias('a'),
+    delegatedPermissions: z.string().optional().alias('d'),
+    grantAdminConsent: z.boolean().optional()
+});
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -23,13 +27,25 @@ class EntraAppPermissionAddCommand extends GraphCommand {
     get description() {
         return 'Adds the specified application and/or delegated permissions to a specified Microsoft Entra app';
     }
-    constructor() {
-        super();
-        _EntraAppPermissionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appName, options.appObjectId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appName, or appObjectId',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appName', 'appObjectId']
+            }
+        })
+            .refine(options => options.applicationPermissions !== undefined || options.delegatedPermissions !== undefined, {
+            error: 'Specify either applicationPermissions or delegatedPermissions',
+            params: {
+                customCode: 'optionSet',
+                options: ['applicationPermissions', 'delegatedPermissions']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -214,35 +230,5 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         });
     }
 }
-_EntraAppPermissionAddCommand_instances = new WeakSet(), _EntraAppPermissionAddCommand_initTelemetry = function _EntraAppPermissionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
-            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
-            grantAdminConsent: !!args.options.grantAdminConsent
-        });
-    });
-}, _EntraAppPermissionAddCommand_initOptions = function _EntraAppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '-n, --appName [appName]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
-}, _EntraAppPermissionAddCommand_initValidators = function _EntraAppPermissionAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAppPermissionAddCommand_initOptionSets = function _EntraAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appName', 'appObjectId'] });
-    this.optionSets.push({
-        options: ['applicationPermissions', 'delegatedPermissions'],
-        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
-    });
-};
 export default new EntraAppPermissionAddCommand();
 //# sourceMappingURL=app-permission-add.js.map