@pnp/cli-microsoft365 10.8.0-beta.cdb5c81 → 10.9.0-beta.3261443

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

@@ -1,6 +1,6 @@
-import AppCommand from '../../base/AppCommand.js';
-import commands from '../commands.js';
 import { entraApp } from '../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
+import commands from '../commands.js';
 class AppGetCommand extends AppCommand {
     get name() {
         return commands.GET;
@@ -8,6 +8,9 @@ class AppGetCommand extends AppCommand {
     get description() {
         return 'Retrieves information about the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger, args) {
         try {
             const app = await entraApp.getAppRegistrationByAppId(args.options.appId);

package/dist/m365/app/commands/app-open.js

@@ -1,14 +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 _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
-import AppCommand from '../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
 import commands from '../commands.js';
+const options = appCommandOptions
+    .extend({
+    preview: z.boolean().optional().default(false)
+})
+    .strict();
 class AppOpenCommand extends AppCommand {
     get name() {
         return commands.OPEN;
@@ -16,11 +16,8 @@ class AppOpenCommand extends AppCommand {
     get description() {
         return 'Opens Microsoft Entra app in the Microsoft Entra ID portal';
     }
-    constructor() {
-        super();
-        _AppOpenCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -41,15 +38,5 @@ class AppOpenCommand extends AppCommand {
         await browserUtil.open(url);
     }
 }
-_AppOpenCommand_instances = new WeakSet(), _AppOpenCommand_initTelemetry = function _AppOpenCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            preview: typeof args.options.preview !== 'undefined'
-        });
-    });
-}, _AppOpenCommand_initOptions = function _AppOpenCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--preview' });
-};
 export default new AppOpenCommand();
 //# sourceMappingURL=app-open.js.map

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

@@ -1,14 +1,16 @@
-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 _AppPermissionAddCommand_instances, _AppPermissionAddCommand_initTelemetry, _AppPermissionAddCommand_initOptions, _AppPermissionAddCommand_initOptionSets;
+import { z } from 'zod';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
-import AppCommand from '../../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+const options = appCommandOptions
+    .extend({
+    applicationPermissions: z.string().optional(),
+    delegatedPermissions: z.string().optional(),
+    grantAdminConsent: z.boolean().optional()
+})
+    .strict();
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -21,12 +23,15 @@ class AppPermissionAddCommand extends AppCommand {
     get description() {
         return 'Adds the specified application and/or delegated permissions to the current Microsoft Entra app API permissions';
     }
-    constructor() {
-        super();
-        _AppPermissionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.applicationPermissions || options.delegatedPermissions, {
+            message: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
+            path: ['delegatedPermissions']
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -194,22 +199,5 @@ class AppPermissionAddCommand extends AppCommand {
         return request.post(requestOptions);
     }
 }
-_AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_initTelemetry = function _AppPermissionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
-            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
-            grantAdminConsent: !!args.options.grantAdminConsent
-        });
-    });
-}, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
-}, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['applicationPermissions', 'delegatedPermissions'],
-        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
-    });
-};
 export default new AppPermissionAddCommand();
 //# sourceMappingURL=permission-add.js.map

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

@@ -1,7 +1,7 @@
 import request from '../../../../request.js';
-import AppCommand from '../../../base/AppCommand.js';
-import commands from '../../commands.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
+import commands from '../../commands.js';
 var GetServicePrincipal;
 (function (GetServicePrincipal) {
     GetServicePrincipal[GetServicePrincipal["withPermissions"] = 0] = "withPermissions";
@@ -14,6 +14,9 @@ class AppPermissionListCommand extends AppCommand {
     get description() {
         return 'Lists API permissions for the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger) {
         try {
             const servicePrincipal = await this.getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions);

package/dist/m365/base/AppCommand.js

@@ -1,23 +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 _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../cli/cli.js';
-import Command, { CommandError } from '../../Command.js';
-import { validation } from '../../utils/validation.js';
+import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
-class AppCommand extends Command {
+export const appCommandOptions = globalOptionsZod
+    .extend({
+    appId: z.string().uuid().optional()
+});
+export default class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
     }
-    constructor() {
-        super();
-        _AppCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initValidators).call(this);
+    get schema() {
+        return appCommandOptions;
     }
     async action(logger, args) {
         const m365rcJsonPath = '.m365rc.json';
@@ -63,15 +58,4 @@ class AppCommand extends Command {
         }
     }
 }
-_AppCommand_instances = new WeakSet(), _AppCommand_initOptions = function _AppCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' });
-}, _AppCommand_initValidators = function _AppCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
-export default AppCommand;
 //# sourceMappingURL=AppCommand.js.map

package/dist/m365/booking/commands/business/business-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 _BookingBusinessGetCommand_instances, _BookingBusinessGetCommand_initTelemetry, _BookingBusinessGetCommand_initOptions, _BookingBusinessGetCommand_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 { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().optional()),
+    name: zod.alias('n', z.string().optional())
+})
+    .strict();
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -16,12 +19,14 @@ class BookingBusinessGetCommand extends GraphCommand {
     get description() {
         return 'Retrieve the specified Microsoft Bookings business.';
     }
-    constructor() {
-        super();
-        _BookingBusinessGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            message: 'Specify either id or name'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -65,17 +70,5 @@ class BookingBusinessGetCommand extends GraphCommand {
         return bookingBusinesses[0].id;
     }
 }
-_BookingBusinessGetCommand_instances = new WeakSet(), _BookingBusinessGetCommand_initTelemetry = function _BookingBusinessGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _BookingBusinessGetCommand_initOptions = function _BookingBusinessGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' });
-}, _BookingBusinessGetCommand_initOptionSets = function _BookingBusinessGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new BookingBusinessGetCommand();
 //# sourceMappingURL=business-get.js.map

package/dist/m365/context/commands/context-remove.js

@@ -1,14 +1,15 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ContextRemoveCommand_instances, _ContextRemoveCommand_initTelemetry, _ContextRemoveCommand_initOptions;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
-import { CommandError } from '../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../Command.js';
+import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+const options = globalOptionsZod
+    .extend({
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class ContextRemoveCommand extends AnonymousCommand {
     get name() {
         return commands.REMOVE;
@@ -16,20 +17,17 @@ class ContextRemoveCommand extends AnonymousCommand {
     get description() {
         return 'Removes the CLI for Microsoft 365 context in the current working folder';
     }
-    constructor() {
-        super();
-        _ContextRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ContextRemoveCommand_instances, "m", _ContextRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ContextRemoveCommand_instances, "m", _ContextRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
-            await this.removeContext();
+            this.removeContext();
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
             if (result) {
-                await this.removeContext();
+                this.removeContext();
             }
         }
     }
@@ -70,16 +68,5 @@ class ContextRemoveCommand extends AnonymousCommand {
         }
     }
 }
-_ContextRemoveCommand_instances = new WeakSet(), _ContextRemoveCommand_initTelemetry = function _ContextRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _ContextRemoveCommand_initOptions = function _ContextRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new ContextRemoveCommand();
 //# sourceMappingURL=context-remove.js.map

package/dist/m365/context/commands/option/option-remove.js

@@ -1,14 +1,16 @@
-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 _ContextOptionRemoveCommand_instances, _ContextOptionRemoveCommand_initTelemetry, _ContextOptionRemoveCommand_initOptions;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
 import ContextCommand from '../../../base/ContextCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class ContextOptionRemoveCommand extends ContextCommand {
     get name() {
         return commands.OPTION_REMOVE;
@@ -16,11 +18,8 @@ class ContextOptionRemoveCommand extends ContextCommand {
     get description() {
         return 'Removes an already available name from local context file.';
     }
-    constructor() {
-        super();
-        _ContextOptionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ContextOptionRemoveCommand_instances, "m", _ContextOptionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ContextOptionRemoveCommand_instances, "m", _ContextOptionRemoveCommand_initTelemetry).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -70,18 +69,5 @@ class ContextOptionRemoveCommand extends ContextCommand {
         }
     }
 }
-_ContextOptionRemoveCommand_instances = new WeakSet(), _ContextOptionRemoveCommand_initTelemetry = function _ContextOptionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _ContextOptionRemoveCommand_initOptions = function _ContextOptionRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-f, --force'
-    });
-};
 export default new ContextOptionRemoveCommand();
 //# sourceMappingURL=option-remove.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_initTypes;
+var _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initTelemetry, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -19,12 +19,16 @@ class EntraM365GroupGetCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeSiteUrl) {
+            await this.warn(logger, `Parameter 'includeSiteUrl' is deprecated. Please use 'withSiteUrl' instead`);
+        }
         let group;
         try {
             if (args.options.id) {
@@ -46,7 +50,7 @@ class EntraM365GroupGetCommand extends GraphCommand {
             };
             const groupExtended = await request.get(requestExtendedOptions);
             group = { ...group, ...groupExtended };
-            if (args.options.includeSiteUrl) {
+            if (args.options.includeSiteUrl || args.options.withSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
                     headers: {
@@ -64,13 +68,22 @@ class EntraM365GroupGetCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
+_EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initTelemetry = function _EntraM365GroupGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeSiteUrl: !!args.options.includeSiteUrl,
+            withSiteUrl: !!args.options.withSiteUrl
+        });
+    });
+}, _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
     }, {
         option: '--includeSiteUrl'
+    }, {
+        option: '--withSiteUrl'
     });
 }, _EntraM365GroupGetCommand_initValidators = function _EntraM365GroupGetCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-list.js

@@ -26,6 +26,9 @@ class EntraM365GroupListCommand extends GraphCommand {
         return ['id', 'displayName', 'mailNickname', 'siteUrl'];
     }
     async commandAction(logger, args) {
+        if (args.options.includeSiteUrl) {
+            await this.warn(logger, `Parameter 'includeSiteUrl' is deprecated. Please use 'withSiteUrl' instead`);
+        }
         const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.displayName)}')` : '';
         const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.mailNickname)}')` : '';
@@ -43,7 +46,7 @@ class EntraM365GroupListCommand extends GraphCommand {
                 });
                 groups = orphanedGroups;
             }
-            if (args.options.includeSiteUrl) {
+            if (args.options.includeSiteUrl || args.options.withSiteUrl) {
                 const res = await Promise.all(groups.map(g => this.getGroupSiteUrl(g.id)));
                 res.forEach(r => {
                     for (let i = 0; i < groups.length; i++) {
@@ -82,6 +85,7 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
             displayName: typeof args.options.displayName !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined',
             includeSiteUrl: args.options.includeSiteUrl,
+            withSiteUrl: !!args.options.withSiteUrl,
             orphaned: !!args.options.orphaned
         });
     });
@@ -92,6 +96,8 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
         option: '-m, --mailNickname [displayName]'
     }, {
         option: '--includeSiteUrl'
+    }, {
+        option: '--withSiteUrl'
     }, {
         option: '--orphaned'
     });

package/dist/m365/entra/commands/pim/pim-role-assignment-eligibility-list.js

@@ -29,6 +29,9 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includePrincipalDetails) {
+            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of eligible roles for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -40,7 +43,7 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
                 queryParameters.push(`$filter=principalId eq '${principalId}'`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -86,7 +89,8 @@ _EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraP
             userName: typeof args.options.userName !== 'undefined',
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleAssignmentEligibilityListCommand_initOptions = function _EntraPimRoleAssignmentEligibilityListCommand_initOptions() {
@@ -99,7 +103,9 @@ _EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraP
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--includePrincipalDetails [includePrincipalDetails]'
+        option: '--includePrincipalDetails'
+    }, {
+        option: '--withPrincipalDetails'
     });
 }, _EntraPimRoleAssignmentEligibilityListCommand_initValidators = function _EntraPimRoleAssignmentEligibilityListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/pim/pim-role-assignment-list.js

@@ -30,6 +30,9 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
         const filters = [];
         const expands = [];
         try {
+            if (args.options.includePrincipalDetails) {
+                await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+            }
             const principalId = await this.getPrincipalId(logger, args.options);
             if (principalId) {
                 filters.push(`principalId eq '${principalId}'`);
@@ -41,7 +44,7 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -82,7 +85,8 @@ _EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssig
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             startDateTime: typeof args.options.startDateTime !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleAssignmentListCommand_initOptions = function _EntraPimRoleAssignmentListCommand_initOptions() {
@@ -97,7 +101,9 @@ _EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssig
     }, {
         option: "-s, --startDateTime [startDateTime]"
     }, {
-        option: "--includePrincipalDetails [includePrincipalDetails]"
+        option: "--includePrincipalDetails"
+    }, {
+        option: "--withPrincipalDetails"
     });
 }, _EntraPimRoleAssignmentListCommand_initValidators = function _EntraPimRoleAssignmentListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/pim/pim-role-request-list.js

@@ -30,6 +30,9 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includePrincipalDetails) {
+            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of PIM roles requests for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -51,7 +54,7 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -100,7 +103,8 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
             groupName: typeof args.options.groupName !== 'undefined',
             createdDateTime: typeof args.options.createdDateTime !== 'undefined',
             status: typeof args.options.status !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleRequestListCommand_initOptions = function _EntraPimRoleRequestListCommand_initOptions() {
@@ -118,7 +122,9 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
         option: '-s, --status [status]',
         autocomplete: this.allowedStatuses
     }, {
-        option: '--includePrincipalDetails [includePrincipalDetails]'
+        option: '--includePrincipalDetails'
+    }, {
+        option: '--withPrincipalDetails'
     });
 }, _EntraPimRoleRequestListCommand_initValidators = function _EntraPimRoleRequestListCommand_initValidators() {
     this.validators.push(async (args) => {