@pnp/cli-microsoft365 11.0.0-beta.4abfd23 → 11.0.0-beta.677f8d3

package/dist/Command.js

@@ -359,10 +359,6 @@ class Command {
         const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
     }
-    addUnknownOptionsToPayloadZod(payload, options) {
-        const unknownOptions = optionsUtils.getUnknownOptions(options, zod.schemaToOptions(this.schema));
-        optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
-    }
     loadValuesFromAccessToken(args) {
         if (!auth.connection.accessTokens[auth.defaultResource]) {
             return;

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -15,7 +15,7 @@ export const options = globalOptionsZod
     card: z.string().optional(),
     cardData: z.string().optional()
 })
-    .passthrough();
+    .and(z.any());
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;

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

@@ -1,16 +1,12 @@
-import { z } from 'zod';
-import { globalOptionsZod } from '../../../../Command.js';
+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 _EntraAdministrativeUnitAddCommand_instances, _EntraAdministrativeUnitAddCommand_initTelemetry, _EntraAdministrativeUnitAddCommand_initOptions;
 import request from "../../../../request.js";
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-const options = globalOptionsZod
-    .extend({
-    displayName: zod.alias('n', z.string()),
-    description: zod.alias('d', z.string().optional()),
-    hiddenMembership: z.boolean().optional()
-})
-    .passthrough();
 class EntraAdministrativeUnitAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_ADD;
@@ -21,8 +17,11 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    get schema() {
-        return options;
+    constructor() {
+        super();
+        _EntraAdministrativeUnitAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
         const requestBody = {
@@ -30,7 +29,7 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
             displayName: args.options.displayName,
             visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
         };
-        this.addUnknownOptionsToPayloadZod(requestBody, args.options);
+        this.addUnknownOptionsToPayload(requestBody, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {
@@ -48,5 +47,20 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
         }
     }
 }
+_EntraAdministrativeUnitAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitAddCommand_initTelemetry = function _EntraAdministrativeUnitAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            hiddenMembership: !!args.options.hiddenMembership
+        });
+    });
+}, _EntraAdministrativeUnitAddCommand_initOptions = function _EntraAdministrativeUnitAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--hiddenMembership'
+    });
+};
 export default new EntraAdministrativeUnitAddCommand();
 //# sourceMappingURL=administrativeunit-add.js.map

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

@@ -1,17 +1,14 @@
-import { z } from 'zod';
+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 _EntraAdministrativeUnitGetCommand_instances, _EntraAdministrativeUnitGetCommand_initTelemetry, _EntraAdministrativeUnitGetCommand_initOptions, _EntraAdministrativeUnitGetCommand_initValidators, _EntraAdministrativeUnitGetCommand_initOptionSets, _EntraAdministrativeUnitGetCommand_initTypes;
+import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
-import { globalOptionsZod } from "../../../../Command.js";
-import { zod } from "../../../../utils/zod.js";
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().uuid().optional()),
-    displayName: zod.alias('n', z.string().optional()),
-    properties: zod.alias('p', z.string().optional())
-})
-    .strict();
 class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_GET;
@@ -19,14 +16,14 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about a specific administrative unit';
     }
-    get schema() {
-        return options;
-    }
-    getRefinedSchema(schema) {
-        return schema
-            .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
-            message: 'Specify either id or displayName'
-        });
+    constructor() {
+        super();
+        _EntraAdministrativeUnitGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         let administrativeUnit;
@@ -65,5 +62,33 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
         return await request.get(requestOptions);
     }
 }
+_EntraAdministrativeUnitGetCommand_instances = new WeakSet(), _EntraAdministrativeUnitGetCommand_initTelemetry = function _EntraAdministrativeUnitGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _EntraAdministrativeUnitGetCommand_initOptions = function _EntraAdministrativeUnitGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-p, --properties [properties]'
+    });
+}, _EntraAdministrativeUnitGetCommand_initValidators = function _EntraAdministrativeUnitGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _EntraAdministrativeUnitGetCommand_initOptionSets = function _EntraAdministrativeUnitGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraAdministrativeUnitGetCommand_initTypes = function _EntraAdministrativeUnitGetCommand_initTypes() {
+    this.types.string.push('displayName');
+};
 export default new EntraAdministrativeUnitGetCommand();
 //# sourceMappingURL=administrativeunit-get.js.map

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

@@ -1,13 +1,12 @@
-import { z } from 'zod';
-import { globalOptionsZod } from '../../../../Command.js';
+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 _EntraAdministrativeUnitListCommand_instances, _EntraAdministrativeUnitListCommand_initTelemetry, _EntraAdministrativeUnitListCommand_initOptions;
 import { odata } from '../../../../utils/odata.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    properties: zod.alias('p', z.string().optional())
-}).strict();
 class EntraAdministrativeUnitListCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_LIST;
@@ -15,12 +14,15 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of administrative units';
     }
-    get schema() {
-        return options;
-    }
     defaultProperties() {
         return ['id', 'displayName', 'visibility'];
     }
+    constructor() {
+        super();
+        _EntraAdministrativeUnitListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initOptions).call(this);
+    }
     async commandAction(logger, args) {
         const queryParameters = [];
         if (args.options.properties) {
@@ -42,5 +44,14 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
         }
     }
 }
+_EntraAdministrativeUnitListCommand_instances = new WeakSet(), _EntraAdministrativeUnitListCommand_initTelemetry = function _EntraAdministrativeUnitListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _EntraAdministrativeUnitListCommand_initOptions = function _EntraAdministrativeUnitListCommand_initOptions() {
+    this.options.unshift({ option: '-p, --properties [properties]' });
+};
 export default new EntraAdministrativeUnitListCommand();
 //# sourceMappingURL=administrativeunit-list.js.map

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

@@ -1,18 +1,15 @@
-import { z } from 'zod';
-import { cli } from '../../../../cli/cli.js';
-import { globalOptionsZod } from '../../../../Command.js';
-import request from '../../../../request.js';
+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 _EntraAdministrativeUnitRemoveCommand_instances, _EntraAdministrativeUnitRemoveCommand_initTelemetry, _EntraAdministrativeUnitRemoveCommand_initOptions, _EntraAdministrativeUnitRemoveCommand_initOptionSets, _EntraAdministrativeUnitRemoveCommand_initValidators, _EntraAdministrativeUnitRemoveCommand_initTypes;
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
-import { zod } from '../../../../utils/zod.js';
-import GraphCommand from '../../../base/GraphCommand.js';
-import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().uuid().optional()),
-    displayName: zod.alias('n', z.string().optional()),
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+import { validation } from "../../../../utils/validation.js";
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import { cli } from "../../../../cli/cli.js";
 class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
@@ -20,17 +17,14 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes an administrative unit';
     }
-    get schema() {
-        return options;
-    }
-    getRefinedSchema(schema) {
-        return schema
-            .refine(options => options.id || options.displayName, {
-            message: 'Specify either id or displayName'
-        })
-            .refine(options => !(options.id && options.displayName), {
-            message: 'Specify either id or displayName but not both'
-        });
+    constructor() {
+        super();
+        _EntraAdministrativeUnitRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeAdministrativeUnit = async () => {
@@ -63,5 +57,35 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
         }
     }
 }
+_EntraAdministrativeUnitRemoveCommand_instances = new WeakSet(), _EntraAdministrativeUnitRemoveCommand_initTelemetry = function _EntraAdministrativeUnitRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: args.options.id !== 'undefined',
+            displayName: args.options.displayName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _EntraAdministrativeUnitRemoveCommand_initOptions = function _EntraAdministrativeUnitRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _EntraAdministrativeUnitRemoveCommand_initOptionSets = function _EntraAdministrativeUnitRemoveCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'displayName']
+    });
+}, _EntraAdministrativeUnitRemoveCommand_initValidators = function _EntraAdministrativeUnitRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
+        return true;
+    });
+}, _EntraAdministrativeUnitRemoveCommand_initTypes = function _EntraAdministrativeUnitRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
+};
 export default new EntraAdministrativeUnitRemoveCommand();
 //# sourceMappingURL=administrativeunit-remove.js.map

package/dist/m365/entra/commands/group/group-member-add.js

@@ -29,8 +29,14 @@ class EntraGroupMemberAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.groupDisplayName) {
+                await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
+            }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.userIds || args.options.userNames || args.options.subgroupIds || args.options.subgroupNames} to group ${args.options.groupId || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames || args.options.subgroupIds || args.options.subgroupNames} to group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const objectIds = await this.getObjectIds(logger, args.options);
@@ -77,17 +83,20 @@ class EntraGroupMemberAddCommand extends GraphCommand {
             return options.groupId;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving ID of group ${options.groupName}...`);
+            await logger.logToStderr(`Retrieving ID of group ${options.groupDisplayName || options.groupName}...`);
         }
-        return entraGroup.getGroupIdByDisplayName(options.groupName);
+        return entraGroup.getGroupIdByDisplayName(options.groupDisplayName || options.groupName);
     }
     async getObjectIds(logger, options) {
-        if (options.userIds || options.userNames) {
+        if (options.ids || options.userIds || options.userNames) {
             return this.getUserIds(logger, options);
         }
         return this.getGroupIds(logger, options);
     }
     async getUserIds(logger, options) {
+        if (options.ids) {
+            return options.ids.split(',').map(i => i.trim());
+        }
         if (options.userIds) {
             return options.userIds.split(',').map(i => i.trim());
         }
@@ -110,7 +119,9 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
             userNames: typeof args.options.userNames !== 'undefined',
             subgroupIds: typeof args.options.subgroupIds !== 'undefined',
@@ -120,8 +131,12 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
 }, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
+    }, {
+        option: '--groupDisplayName [groupDisplayName]'
     }, {
         option: '-n, --groupName [groupName]'
+    }, {
+        option: '--ids [ids]'
     }, {
         option: '--userIds [userIds]'
     }, {
@@ -139,6 +154,12 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
         }
+        if (args.options.ids) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
+            }
+        }
         if (args.options.userIds) {
             const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
             if (isValidGUIDArrayResult !== true) {
@@ -166,9 +187,9 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
         return true;
     });
 }, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
 }, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
 };
 export default new EntraGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/entra/commands/group/group-member-set.js

@@ -29,8 +29,14 @@ class EntraGroupMemberSetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.groupDisplayName) {
+                await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
+            }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.userIds || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -49,11 +55,14 @@ class EntraGroupMemberSetCommand extends GraphCommand {
             return options.groupId;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving ID of group ${options.groupName}...`);
+            await logger.logToStderr(`Retrieving ID of group ${options.groupDisplayName || options.groupName}...`);
         }
-        return entraGroup.getGroupIdByDisplayName(options.groupName);
+        return entraGroup.getGroupIdByDisplayName(options.groupDisplayName || options.groupName);
     }
     async getUserIds(logger, options) {
+        if (options.ids) {
+            return options.ids.split(',').map(i => i.trim());
+        }
         if (options.userIds) {
             return options.userIds.split(',').map(i => i.trim());
         }
@@ -157,7 +166,9 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
             userNames: typeof args.options.userNames !== 'undefined'
         });
@@ -165,8 +176,12 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
 }, _EntraGroupMemberSetCommand_initOptions = function _EntraGroupMemberSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
+    }, {
+        option: '--groupDisplayName [groupDisplayName]'
     }, {
         option: '-n, --groupName [groupName]'
+    }, {
+        option: '--ids [ids]'
     }, {
         option: '--userIds [userIds]'
     }, {
@@ -180,6 +195,12 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
         }
+        if (args.options.ids) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `'${isValidGUIDArrayResult}' is not a valid GUID for option 'ids'.`;
+            }
+        }
         if (args.options.userIds) {
             const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
             if (isValidGUIDArrayResult !== true) {
@@ -198,9 +219,9 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         return true;
     });
 }, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userIds', 'userNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames'] });
 }, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'userIds', 'userNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'role');
 };
 export default new EntraGroupMemberSetCommand();
 //# sourceMappingURL=group-member-set.js.map

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

@@ -26,6 +26,9 @@ class EntraM365GroupGetCommand extends GraphCommand {
         __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) {
@@ -47,7 +50,7 @@ class EntraM365GroupGetCommand extends GraphCommand {
             };
             const groupExtended = await request.get(requestExtendedOptions);
             group = { ...group, ...groupExtended };
-            if (args.options.withSiteUrl) {
+            if (args.options.includeSiteUrl || args.options.withSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
                     headers: {
@@ -68,6 +71,7 @@ class EntraM365GroupGetCommand extends GraphCommand {
 _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
         });
     });
@@ -76,6 +80,8 @@ _EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_i
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '--includeSiteUrl'
     }, {
         option: '--withSiteUrl'
     });

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.withSiteUrl) {
+            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++) {
@@ -81,6 +84,7 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined',
+            includeSiteUrl: args.options.includeSiteUrl,
             withSiteUrl: !!args.options.withSiteUrl,
             orphaned: !!args.options.orphaned
         });
@@ -90,6 +94,8 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
         option: '-d, --displayName [displayName]'
     }, {
         option: '-m, --mailNickname [displayName]'
+    }, {
+        option: '--includeSiteUrl'
     }, {
         option: '--withSiteUrl'
     }, {

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.withPrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -86,6 +89,7 @@ _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,
             withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
@@ -98,6 +102,8 @@ _EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraP
         option: '--groupId [groupId]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--includePrincipalDetails'
     }, {
         option: '--withPrincipalDetails'
     });

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.withPrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -82,6 +85,7 @@ _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,
             withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
@@ -96,6 +100,8 @@ _EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssig
         option: "--groupName [groupName]"
     }, {
         option: "-s, --startDateTime [startDateTime]"
+    }, {
+        option: "--includePrincipalDetails"
     }, {
         option: "--withPrincipalDetails"
     });