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

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

@@ -1,14 +1,18 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAppPermissionListCommand_instances, _EntraAppPermissionListCommand_initTelemetry, _EntraAppPermissionListCommand_initOptions, _EntraAppPermissionListCommand_initValidators, _EntraAppPermissionListCommand_initOptionSets;
-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 { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { zod } from '../../../../utils/zod.js';
+const allowedTypes = { delegated: 'delegated', application: 'application', all: 'all' };
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional().alias('i'),
+    appName: z.string().optional().alias('n'),
+    appObjectId: z.guid().optional(),
+    type: zod.coercedEnum(allowedTypes).optional()
+});
 class EntraAppPermissionListCommand extends GraphCommand {
     get name() {
         return commands.APP_PERMISSION_LIST;
@@ -16,14 +20,18 @@ class EntraAppPermissionListCommand extends GraphCommand {
     get description() {
         return 'Lists the application and delegated permissions for a specified Entra Application Registration';
     }
-    constructor() {
-        super();
-        _EntraAppPermissionListCommand_instances.add(this);
-        this.allowedTypes = ['delegated', 'application', 'all'];
-        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_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']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -45,11 +53,11 @@ class EntraAppPermissionListCommand extends GraphCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
         }
         if (appId) {
-            const app = await entraApp.getAppRegistrationByAppId(appId, ["id"]);
+            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
             return app.id;
         }
         else {
-            const app = await entraApp.getAppRegistrationByAppName(appName, ["id"]);
+            const app = await entraApp.getAppRegistrationByAppName(appName, ['id']);
             return app.id;
         }
     }
@@ -152,32 +160,5 @@ class EntraAppPermissionListCommand extends GraphCommand {
         return servicePrincipal;
     }
 }
-_EntraAppPermissionListCommand_instances = new WeakSet(), _EntraAppPermissionListCommand_initTelemetry = function _EntraAppPermissionListCommand_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',
-            type: typeof args.options.type !== 'undefined'
-        });
-    });
-}, _EntraAppPermissionListCommand_initOptions = function _EntraAppPermissionListCommand_initOptions() {
-    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '-n, --appName [appName]' }, { option: '--appObjectId [appObjectId]' }, { option: '--type [type]', autocomplete: this.allowedTypes });
-}, _EntraAppPermissionListCommand_initValidators = function _EntraAppPermissionListCommand_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`;
-        }
-        if (args.options.type && this.allowedTypes.indexOf(args.options.type.toLowerCase()) === -1) {
-            return `${args.options.type} is not a valid type. Allowed types are ${this.allowedTypes.join(', ')}`;
-        }
-        return true;
-    });
-}, _EntraAppPermissionListCommand_initOptionSets = function _EntraAppPermissionListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appName', 'appObjectId'] });
-};
 export default new EntraAppPermissionListCommand();
 //# sourceMappingURL=app-permission-list.js.map

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

@@ -1,16 +1,28 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAppPermissionRemoveCommand_instances, _EntraAppPermissionRemoveCommand_initTelemetry, _EntraAppPermissionRemoveCommand_initOptions, _EntraAppPermissionRemoveCommand_initValidators, _EntraAppPermissionRemoveCommand_initOptionSets, _EntraAppPermissionRemoveCommand_initTypes;
-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 { cli } from "../../../../cli/cli.js";
-import { entraApp } from "../../../../utils/entraApp.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 { validation } from '../../../../utils/validation.js';
+import { cli } from '../../../../cli/cli.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional().alias('i'),
+    appObjectId: z.guid().optional(),
+    appName: z.string().optional().alias('n'),
+    applicationPermissions: z.string()
+        .refine(permissions => validation.isValidPermission(permissions) === true, {
+        error: e => `Application permission(s) ${validation.isValidPermission(e.input).join(', ')} are not fully-qualified`
+    }).optional().alias('a'),
+    delegatedPermissions: z.string()
+        .refine(permissions => validation.isValidPermission(permissions) === true, {
+        error: e => `Delegated permission(s) ${validation.isValidPermission(e.input).join(', ')} are not fully-qualified`
+    }).optional().alias('d'),
+    revokeAdminConsent: z.boolean().optional(),
+    force: z.boolean().optional()
+});
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -23,14 +35,25 @@ class EntraAppPermissionRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the specified application and/or delegated permissions from a specified Microsoft Entra app';
     }
-    constructor() {
-        super();
-        _EntraAppPermissionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionRemoveCommand_instances, "m", _EntraAppPermissionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionRemoveCommand_instances, "m", _EntraAppPermissionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionRemoveCommand_instances, "m", _EntraAppPermissionRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionRemoveCommand_instances, "m", _EntraAppPermissionRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraAppPermissionRemoveCommand_instances, "m", _EntraAppPermissionRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
+        })
+            .refine(options => options.applicationPermissions !== undefined || options.delegatedPermissions !== undefined, {
+            error: 'Specify either applicationPermissions or delegatedPermissions',
+            params: {
+                customCode: 'optionSet',
+                options: ['applicationPermissions', 'delegatedPermissions']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeAppPermissions = async () => {
@@ -237,66 +260,5 @@ class EntraAppPermissionRemoveCommand extends GraphCommand {
         });
     }
 }
-_EntraAppPermissionRemoveCommand_instances = new WeakSet(), _EntraAppPermissionRemoveCommand_initTelemetry = function _EntraAppPermissionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined',
-            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
-            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
-            revokeAdminConsent: !!args.options.revokeAdminConsent,
-            force: !!args.options.force
-        });
-    });
-}, _EntraAppPermissionRemoveCommand_initOptions = function _EntraAppPermissionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --appId [appId]'
-    }, {
-        option: '--appObjectId [appObjectId]'
-    }, {
-        option: '-n, --appName [appName]'
-    }, {
-        option: '-a, --applicationPermissions [applicationPermissions]'
-    }, {
-        option: '-d, --delegatedPermissions [delegatedPermissions]'
-    }, {
-        option: '--revokeAdminConsent'
-    }, {
-        option: '--force'
-    });
-}, _EntraAppPermissionRemoveCommand_initValidators = function _EntraAppPermissionRemoveCommand_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`;
-        }
-        if (args.options.delegatedPermissions) {
-            const invalidPermissions = validation.isValidPermission(args.options.delegatedPermissions);
-            if (Array.isArray(invalidPermissions)) {
-                return `Delegated permission(s) ${invalidPermissions.join(', ')} are not fully-qualified`;
-            }
-        }
-        if (args.options.applicationPermissions) {
-            const invalidPermissions = validation.isValidPermission(args.options.applicationPermissions);
-            if (Array.isArray(invalidPermissions)) {
-                return `Application permission(s) ${invalidPermissions.join(', ')} are not fully-qualified`;
-            }
-        }
-        return true;
-    });
-}, _EntraAppPermissionRemoveCommand_initOptionSets = function _EntraAppPermissionRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['appId', 'appObjectId', 'appName']
-    }, {
-        options: ['applicationPermissions', 'delegatedPermissions'],
-        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
-    });
-}, _EntraAppPermissionRemoveCommand_initTypes = function _EntraAppPermissionRemoveCommand_initTypes() {
-    this.types.string.push('appId', 'appObjectId', 'appName', 'applicationPermissions', 'delegatedPermissions');
-    this.types.boolean.push('revokeAdminConsent');
-};
 export default new EntraAppPermissionRemoveCommand();
 //# sourceMappingURL=app-permission-remove.js.map

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

@@ -1,15 +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 _EntraAppRemoveCommand_instances, _EntraAppRemoveCommand_initTelemetry, _EntraAppRemoveCommand_initOptions, _EntraAppRemoveCommand_initValidators, _EntraAppRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraApp } from '../../../../utils/entraApp.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional(),
+    objectId: z.guid().optional(),
+    name: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_REMOVE;
@@ -17,13 +19,18 @@ class EntraAppRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes an Entra app registration';
     }
-    constructor() {
-        super();
-        _EntraAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_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) {
         const deleteApp = async () => {
@@ -73,29 +80,5 @@ class EntraAppRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraAppRemoveCommand_instances = new WeakSet(), _EntraAppRemoveCommand_initTelemetry = function _EntraAppRemoveCommand_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',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _EntraAppRemoveCommand_initOptions = function _EntraAppRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '-f, --force' });
-}, _EntraAppRemoveCommand_initValidators = function _EntraAppRemoveCommand_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;
-    });
-}, _EntraAppRemoveCommand_initOptionSets = function _EntraAppRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
-};
 export default new EntraAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

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

@@ -1,14 +1,28 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAppRoleAddCommand_instances, _a, _EntraAppRoleAddCommand_initTelemetry, _EntraAppRoleAddCommand_initOptions, _EntraAppRoleAddCommand_initValidators, _EntraAppRoleAddCommand_initOptionSets;
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.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(),
+    appObjectId: z.guid().optional(),
+    appName: z.string().optional(),
+    name: z.string().alias('n'),
+    description: z.string().alias('d'),
+    allowedMembers: z.enum(['usersGroups', 'applications', 'both']).alias('m'),
+    claim: z.string()
+        .max(120, `Claim must not be longer than 120 characters`)
+        .refine(claim => !claim.startsWith('.'), {
+        error: 'Claim must not begin with .'
+    })
+        .refine(claim => /^[\w:!#$%&'()*+,-./:;<=>?@[\]^+_`{|}~]+$/.test(claim), {
+        error: `Claim can contain only the following characters a-z, A-Z, 0-9, :!#$%&'()*+,-./:;<=>?@[]^+_\`{|}~]+`
+    })
+        .alias('c')
+});
 class EntraAppRoleAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_ADD;
@@ -16,13 +30,18 @@ class EntraAppRoleAddCommand extends GraphCommand {
     get description() {
         return 'Adds role to the specified Entra app registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAddCommand_instances, "m", _EntraAppRoleAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAddCommand_instances, "m", _EntraAppRoleAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAddCommand_instances, "m", _EntraAppRoleAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleAddCommand_instances, "m", _EntraAppRoleAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -80,38 +99,5 @@ class EntraAppRoleAddCommand extends GraphCommand {
         }
     }
 }
-_a = EntraAppRoleAddCommand, _EntraAppRoleAddCommand_instances = new WeakSet(), _EntraAppRoleAddCommand_initTelemetry = function _EntraAppRoleAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined'
-        });
-    });
-}, _EntraAppRoleAddCommand_initOptions = function _EntraAppRoleAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name <name>' }, { option: '-d, --description <description>' }, {
-        option: '-m, --allowedMembers <allowedMembers>', autocomplete: _a.allowedMembers
-    }, { option: '-c, --claim <claim>' });
-}, _EntraAppRoleAddCommand_initValidators = function _EntraAppRoleAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const { allowedMembers, claim } = args.options;
-        if (_a.allowedMembers.indexOf(allowedMembers) < 0) {
-            return `${allowedMembers} is not a valid value for allowedMembers. Valid values are ${_a.allowedMembers.join(', ')}`;
-        }
-        if (claim.length > 120) {
-            return `Claim must not be longer than 120 characters`;
-        }
-        if (claim.startsWith('.')) {
-            return 'Claim must not begin with .';
-        }
-        if (!/^[\w:!#$%&'()*+,-./:;<=>?@[\]^+_`{|}~]+$/.test(claim)) {
-            return `Claim can contain only the following characters a-z, A-Z, 0-9, :!#$%&'()*+,-./:;<=>?@[]^+_\`{|}~]+`;
-        }
-        return true;
-    });
-}, _EntraAppRoleAddCommand_initOptionSets = function _EntraAppRoleAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] });
-};
-EntraAppRoleAddCommand.allowedMembers = ['usersGroups', 'applications', 'both'];
 export default new EntraAppRoleAddCommand();
 //# sourceMappingURL=app-role-add.js.map

package/dist/m365/entra/commands/app/app-role-list.js

@@ -1,13 +1,15 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _EntraAppRoleListCommand_instances, _EntraAppRoleListCommand_initTelemetry, _EntraAppRoleListCommand_initOptions, _EntraAppRoleListCommand_initOptionSets;
+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 { entraApp } from '../../../../utils/entraApp.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional(),
+    appObjectId: z.guid().optional(),
+    appName: z.string().optional()
+});
 class EntraAppRoleListCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_LIST;
@@ -15,12 +17,18 @@ class EntraAppRoleListCommand extends GraphCommand {
     get description() {
         return 'Gets Entra app registration roles';
     }
-    constructor() {
-        super();
-        _EntraAppRoleListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleListCommand_instances, "m", _EntraAppRoleListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleListCommand_instances, "m", _EntraAppRoleListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleListCommand_instances, "m", _EntraAppRoleListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
+        });
     }
     defaultProperties() {
         return ['displayName', 'description', 'id'];
@@ -53,18 +61,5 @@ class EntraAppRoleListCommand extends GraphCommand {
         }
     }
 }
-_EntraAppRoleListCommand_instances = new WeakSet(), _EntraAppRoleListCommand_initTelemetry = function _EntraAppRoleListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined'
-        });
-    });
-}, _EntraAppRoleListCommand_initOptions = function _EntraAppRoleListCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' });
-}, _EntraAppRoleListCommand_initOptionSets = function _EntraAppRoleListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] });
-};
 export default new EntraAppRoleListCommand();
 //# sourceMappingURL=app-role-list.js.map

package/dist/m365/entra/commands/app/app-role-remove.js

@@ -1,16 +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 _EntraAppRoleRemoveCommand_instances, _EntraAppRoleRemoveCommand_initTelemetry, _EntraAppRoleRemoveCommand_initOptions, _EntraAppRoleRemoveCommand_initValidators, _EntraAppRoleRemoveCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { formatting } from "../../../../utils/formatting.js";
-import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { entraApp } from "../../../../utils/entraApp.js";
+import { entraApp } from '../../../../utils/entraApp.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional(),
+    appObjectId: z.guid().optional(),
+    appName: z.string().optional(),
+    claim: z.string().optional().alias('c'),
+    name: z.string().optional().alias('n'),
+    id: z.guid().optional().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAppRoleRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_REMOVE;
@@ -18,13 +23,25 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes role from the specified Entra app registration';
     }
-    constructor() {
-        super();
-        _EntraAppRoleRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppRoleRemoveCommand_instances, "m", _EntraAppRoleRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleRemoveCommand_instances, "m", _EntraAppRoleRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleRemoveCommand_instances, "m", _EntraAppRoleRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppRoleRemoveCommand_instances, "m", _EntraAppRoleRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.appObjectId, options.appName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, appObjectId, or appName',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
+        })
+            .refine(options => [options.name, options.claim, options.id].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either name, claim, or id',
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'claim', 'id']
+            }
+        });
     }
     async commandAction(logger, args) {
         const deleteAppRole = async () => {
@@ -124,30 +141,5 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraAppRoleRemoveCommand_instances = new WeakSet(), _EntraAppRoleRemoveCommand_initTelemetry = function _EntraAppRoleRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            appObjectId: typeof args.options.appObjectId !== 'undefined',
-            appName: typeof args.options.appName !== 'undefined',
-            claim: typeof args.options.claim !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
-        });
-    });
-}, _EntraAppRoleRemoveCommand_initOptions = function _EntraAppRoleRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name [name]' }, { option: '-i, --id [id]' }, { option: '-c, --claim [claim]' }, { option: '-f, --force' });
-}, _EntraAppRoleRemoveCommand_initValidators = function _EntraAppRoleRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-}, _EntraAppRoleRemoveCommand_initOptionSets = function _EntraAppRoleRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] }, { options: ['name', 'claim', 'id'] });
-};
 export default new EntraAppRoleRemoveCommand();
 //# sourceMappingURL=app-role-remove.js.map