@pnp/cli-microsoft365 12.0.0-beta.feb621e → 12.1.0-beta.0c2915d

package/dist/Auth.js

@@ -212,7 +212,10 @@ export class Auth {
         };
         this.connection.active = true;
         this.connection.identityName = accessTokenUtil.accessToken.getUserNameFromAccessToken(response.accessToken);
-        this.connection.identityId = accessTokenUtil.accessToken.getUserIdFromAccessToken(response.accessToken);
+        // the oid claim is not available on app-only access tokens issued while
+        // the service principal hasn't been provisioned in the tenant yet. Fall
+        // back to the appId so that the connection still has a valid identity
+        this.connection.identityId = accessTokenUtil.accessToken.getUserIdFromAccessToken(response.accessToken) || this.connection.appId;
         this.connection.identityTenantId = accessTokenUtil.accessToken.getTenantIdFromAccessToken(response.accessToken);
         this.connection.name = this.connection.name || this.connection.identityId;
         try {
@@ -606,8 +609,22 @@ export class Auth {
             const federationToken = await this.getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId);
             return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
         }
+        else if (process.env.GITLAB_CI) {
+            if (debug) {
+                await logger.logToStderr('GITLAB_CI env variable found. The context is GitLab CI/CD...');
+            }
+            if (!process.env.GITLAB_OIDC_TOKEN) {
+                throw new CommandError('The `GITLAB_OIDC_TOKEN` environment variable is not available. Please add an id_tokens entry named GITLAB_OIDC_TOKEN with audience `api://AzureADTokenExchange` to the job.');
+            }
+            if (!this.connection.appId || this.connection.tenant === 'common') {
+                throw new CommandError('The appId and tenant parameters are required when using federated identity in GitLab CI/CD.');
+            }
+            // GitLab's id_tokens feature mints the OIDC JWT directly into the configured job variable, so no
+            // separate request to GitLab is needed to obtain the federation token before exchanging it with Entra ID.
+            return this.getAccessTokenWithFederatedToken(resource, process.env.GITLAB_OIDC_TOKEN, logger, debug);
+        }
         else {
-            throw new CommandError('Federated identity is currently only supported in GitHub Actions and Azure DevOps.');
+            throw new CommandError('Federated identity is currently only supported in GitHub Actions, Azure DevOps and GitLab.');
         }
     }
     async getFederationTokenFromGithub(logger, debug) {

package/dist/Command.js

@@ -424,7 +424,7 @@ class Command {
         if (this.schema) {
             const telemetryProperties = {};
             this.optionsInfo.forEach(o => {
-                if (o.required) {
+                if (o.required && !o.autocomplete) {
                     return;
                 }
                 if (typeof args.options[o.name] === 'undefined') {
@@ -432,23 +432,26 @@ class Command {
                 }
                 switch (o.type) {
                     case 'string':
-                        telemetryProperties[o.name] = o.autocomplete ? args.options[o.name] : typeof args.options[o.name] !== 'undefined';
+                        telemetryProperties[o.name] = o.autocomplete ? args.options[o.name] : true;
                         break;
                     case 'boolean':
                         telemetryProperties[o.name] = args.options[o.name];
                         break;
                     case 'number':
-                        telemetryProperties[o.name] = typeof args.options[o.name] !== 'undefined';
+                        telemetryProperties[o.name] = true;
                         break;
                 }
-                ;
             });
+            if (this.allowUnknownOptions()) {
+                const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
+                Object.keys(unknownOptions).forEach(optionName => {
+                    telemetryProperties[optionName] = true;
+                });
+            }
             return telemetryProperties;
         }
-        else {
-            this.telemetry.forEach(t => t(args));
-            return this.telemetryProperties;
-        }
+        this.telemetry.forEach(t => t(args));
+        return this.telemetryProperties;
     }
     async getTextOutput(logStatement) {
         // display object as a list of key-value pairs

package/dist/cli/cli.js

@@ -47,6 +47,21 @@ const yargsConfiguration = {
     'boolean-negation': true,
     'camel-case-expansion': false
 };
+function isMissingRequiredValueError(error, options) {
+    if (error.code !== 'invalid_type') {
+        return false;
+    }
+    let currentValue = options;
+    for (const pathSegment of error.path) {
+        if (currentValue === null ||
+            typeof currentValue !== 'object' ||
+            !Object.prototype.hasOwnProperty.call(currentValue, pathSegment)) {
+            return true;
+        }
+        currentValue = currentValue[pathSegment];
+    }
+    return false;
+}
 function getConfig() {
     if (!_config) {
         _config = new Configstore(config.configstoreName);
@@ -159,15 +174,14 @@ async function execute(rawArgs) {
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
                 if (!shouldPrompt) {
                     result.error.issues.forEach(e => {
-                        if (e.code === 'invalid_type' &&
-                            e.input === undefined) {
+                        if (isMissingRequiredValueError(e, cli.optionsFromArgs.options)) {
                             e.message = `Required option not specified`;
                         }
                     });
                     return cli.closeWithError(result.error, cli.optionsFromArgs, true);
                 }
                 const missingRequiredValuesErrors = result.error.issues
-                    .filter(e => (e.code === 'invalid_type' && e.input === undefined) ||
+                    .filter(e => isMissingRequiredValueError(e, cli.optionsFromArgs.options) ||
                     (e.code === 'custom' && e.params?.customCode === 'required'));
                 const optionSetErrors = result.error.issues
                     .filter(e => e.code === 'custom' && e.params?.customCode === 'optionSet');
@@ -191,12 +205,24 @@ async function execute(rawArgs) {
                             return cli.closeWithError(e.message, cli.optionsFromArgs, true);
                         }
                     }
+                    try {
+                        await cli.commandToExecute.command.processOptions(cli.optionsFromArgs.options);
+                    }
+                    catch (e) {
+                        return cli.closeWithError(e.message, cli.optionsFromArgs, false);
+                    }
                     continue;
                 }
                 if (optionSetErrors.length > 0) {
                     for (const error of optionSetErrors) {
                         await promptForOptionSetNameAndValue(cli.optionsFromArgs, error.params?.options);
                     }
+                    try {
+                        await cli.commandToExecute.command.processOptions(cli.optionsFromArgs.options);
+                    }
+                    catch (e) {
+                        return cli.closeWithError(e.message, cli.optionsFromArgs, false);
+                    }
                     continue;
                 }
             }
@@ -910,21 +936,11 @@ async function promptForOptionSetNameAndValue(args, options) {
     await cli.error(`🌶️  Please specify one of the following options:`);
     const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: options.map((choice) => { return { name: choice, value: choice }; }) });
     const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
-    let coercedValue = optionValue;
-    // Basic type coercion to align with how CLI arguments are typically parsed
-    if (typeof optionValue === 'string') {
-        const trimmed = optionValue.trim();
-        if (trimmed === 'true') {
-            coercedValue = true;
-        }
-        else if (trimmed === 'false') {
-            coercedValue = false;
-        }
-        else if (trimmed !== '' && !isNaN(Number(trimmed))) {
-            coercedValue = Number(trimmed);
-        }
-    }
-    args.options[selectedOptionName] = coercedValue;
+    const parsedOptions = getCommandOptionsFromArgs([`--${selectedOptionName}`, optionValue], cli.commandToExecute);
+    options
+        .filter(optionName => optionName !== selectedOptionName)
+        .forEach(optionName => args.options[optionName] = undefined);
+    args.options[selectedOptionName] = parsedOptions[selectedOptionName];
     await cli.error('');
 }
 export const cli = {

package/dist/config.js

@@ -3,6 +3,8 @@ export default {
     allScopes: [
         'https://management.azure.com/user_impersonation',
         'https://admin.services.crm.dynamics.com/user_impersonation',
+        'https://graph.microsoft.com/AgentIdentityBlueprint.Read.All',
+        'https://graph.microsoft.com/AgentIdentityBlueprintPrincipal.Read.All',
         'https://graph.microsoft.com/AppCatalog.ReadWrite.All',
         'https://graph.microsoft.com/AuditLog.Read.All',
         'https://graph.microsoft.com/Bookings.Read.All',

package/dist/m365/cli/commands/cli-consent.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
+import auth from '../../../Auth.js';
 import { cli } from '../../../cli/cli.js';
-import { globalOptionsZod } from '../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../Command.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
 export const options = z.strictObject({
@@ -22,9 +23,15 @@ class CliConsentCommand extends AnonymousCommand {
         if (args.options.service === 'VivaEngage') {
             scope = 'https://api.yammer.com/user_impersonation';
         }
-        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${cli.getTenant()}/oauth2/v2.0/authorize?client_id=${cli.getClientId()}&response_type=code&scope=${encodeURIComponent(scope)}`);
+        const appId = auth.connection.active ? auth.connection.appId : cli.getClientId();
+        if (!appId) {
+            throw new CommandError(`Unable to determine the client ID of the Microsoft Entra application used by the CLI. Log in to Microsoft 365 first or store the client ID using 'm365 cli config set --key clientId --value <appId>'.`);
+        }
+        const tenant = auth.connection.active ? auth.connection.tenant : cli.getTenant();
+        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${tenant}/oauth2/v2.0/authorize?client_id=${appId}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
     async action(logger, args) {
+        await auth.restoreAuth();
         await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }

package/dist/m365/entra/commands/agent/agent-blueprint-list.js

@@ -0,0 +1,52 @@
+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 { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    properties: z.string().optional().alias('p')
+});
+class EntraAgentBlueprintListCommand extends GraphCommand {
+    get name() {
+        return commands.AGENT_BLUEPRINT_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of templates defining the agent identity type';
+    }
+    get schema() {
+        return options;
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'appId'];
+    }
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        if (args.options.properties) {
+            const allProperties = args.options.properties
+                .split(',')
+                .map(prop => prop.trim())
+                .filter(prop => prop.length > 0);
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${formatting.encodeQueryParameter(selectProperties.join(','))}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        try {
+            if (this.verbose) {
+                await logger.logToStderr('Retrieving agent identity blueprints...');
+            }
+            const results = await odata.getAllItems(`${this.resource}/v1.0/applications/microsoft.graph.agentIdentityBlueprint${queryString}`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraAgentBlueprintListCommand();
+//# sourceMappingURL=agent-blueprint-list.js.map

package/dist/m365/entra/commands/agent/agent-blueprintprincipal-list.js

@@ -0,0 +1,56 @@
+import { z } from 'zod';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    properties: z.string().optional().alias('p')
+});
+class EntraAgentBlueprintPrincipalListCommand extends GraphCommand {
+    get name() {
+        return commands.AGENT_BLUEPRINTPRINCIPAL_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of agent blueprint principals';
+    }
+    get schema() {
+        return options;
+    }
+    defaultProperties() {
+        return ['id', 'appDisplayName', 'appId'];
+    }
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        if (args.options.properties) {
+            const allProperties = args.options.properties
+                .split(',')
+                .map(prop => prop.trim())
+                .filter(prop => prop.length > 0);
+            const selectProperties = [...new Set(allProperties.map(prop => prop.split('/')[0]))];
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties.map(property => formatting.encodeQueryParameter(property)).join(',')}`);
+                if (cli.commandToExecute) {
+                    cli.commandToExecute.defaultProperties = selectProperties;
+                }
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving a list of agent blueprint principals...`);
+            }
+            const results = await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals/microsoft.graph.agentIdentityBlueprintPrincipal${queryString}`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraAgentBlueprintPrincipalListCommand();
+//# sourceMappingURL=agent-blueprintprincipal-list.js.map

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

@@ -1,32 +1,69 @@
-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 _EntraM365GroupAddCommand_instances, _EntraM365GroupAddCommand_initTelemetry, _EntraM365GroupAddCommand_initOptions, _EntraM365GroupAddCommand_initTypes, _EntraM365GroupAddCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
+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';
+const VisibilityEnum = {
+    Private: 'Private',
+    Public: 'Public',
+    HiddenMembership: 'HiddenMembership'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().alias('n'),
+    mailNickname: z.string().alias('m'),
+    description: z.string().optional().alias('d'),
+    owners: z.string()
+        .refine(owners => owners.split(',').map(o => o.trim()).every(o => o.indexOf('@') > -1), {
+        error: e => `${e.input.split(',').map(o => o.trim()).find(o => o.indexOf('@') < 0)} is not a valid userPrincipalName`
+    }).optional(),
+    members: z.string()
+        .refine(members => members.split(',').map(m => m.trim()).every(m => m.indexOf('@') > -1), {
+        error: e => `${e.input.split(',').map(m => m.trim()).find(m => m.indexOf('@') < 0)} is not a valid userPrincipalName`
+    }).optional(),
+    visibility: zod.coercedEnum(VisibilityEnum).optional(),
+    logoPath: z.string()
+        .refine(logoPath => {
+        const fullPath = path.resolve(logoPath);
+        return fs.existsSync(fullPath) && !fs.lstatSync(fullPath).isDirectory();
+    }, {
+        error: e => {
+            const fullPath = path.resolve(e.input);
+            return fs.existsSync(fullPath) ? `Path '${fullPath}' points to a directory` : `File '${fullPath}' not found`;
+        }
+    })
+        .optional()
+        .alias('l'),
+    allowMembersToPost: z.boolean().optional(),
+    hideGroupInOutlook: z.boolean().optional(),
+    subscribeNewGroupMembers: z.boolean().optional(),
+    welcomeEmailDisabled: z.boolean().optional()
+});
 class EntraM365GroupAddCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 500;
+    }
     get name() {
         return commands.M365GROUP_ADD;
     }
     get description() {
         return 'Creates a Microsoft 365 Group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupAddCommand_instances.add(this);
-        this.pollingInterval = 500;
-        this.allowedVisibilities = ['Private', 'Public', 'HiddenMembership'];
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupAddCommand_instances, "m", _EntraM365GroupAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.mailNickname.indexOf(' ') === -1, {
+            error: 'The option mailNickname cannot contain spaces.',
+            path: ['mailNickname']
+        });
     }
     async commandAction(logger, args) {
         let group;
@@ -177,88 +214,6 @@ class EntraM365GroupAddCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupAddCommand_instances = new WeakSet(), _EntraM365GroupAddCommand_initTelemetry = function _EntraM365GroupAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: typeof args.options.description !== 'undefined',
-            owners: typeof args.options.owners !== 'undefined',
-            members: typeof args.options.members !== 'undefined',
-            logoPath: typeof args.options.logoPath !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined',
-            allowMembersToPost: !!args.options.allowMembersToPost,
-            hideGroupInOutlook: !!args.options.hideGroupInOutlook,
-            subscribeNewGroupMembers: !!args.options.subscribeNewGroupMembers,
-            welcomeEmailDisabled: !!args.options.welcomeEmailDisabled
-        });
-    });
-}, _EntraM365GroupAddCommand_initOptions = function _EntraM365GroupAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName <displayName>'
-    }, {
-        option: '-m, --mailNickname <mailNickname>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--owners [owners]'
-    }, {
-        option: '--members [members]'
-    }, {
-        option: '--visibility [visibility]',
-        autocomplete: this.allowedVisibilities
-    }, {
-        option: '--allowMembersToPost [allowMembersToPost]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--hideGroupInOutlook [hideGroupInOutlook]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--subscribeNewGroupMembers [subscribeNewGroupMembers]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--welcomeEmailDisabled [welcomeEmailDisabled]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-l, --logoPath [logoPath]'
-    });
-}, _EntraM365GroupAddCommand_initTypes = function _EntraM365GroupAddCommand_initTypes() {
-    this.types.string.push('displayName', 'mailNickname', 'description', 'owners', 'members', 'visibility', 'logoPath');
-    this.types.boolean.push('allowMembersToPost', 'hideGroupInOutlook', 'subscribeNewGroupMembers', 'welcomeEmailDisabled');
-}, _EntraM365GroupAddCommand_initValidators = function _EntraM365GroupAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.owners) {
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            for (let i = 0; i < owners.length; i++) {
-                if (owners[i].indexOf('@') < 0) {
-                    return `${owners[i]} is not a valid userPrincipalName`;
-                }
-            }
-        }
-        if (args.options.members) {
-            const members = args.options.members.split(',').map(m => m.trim());
-            for (let i = 0; i < members.length; i++) {
-                if (members[i].indexOf('@') < 0) {
-                    return `${members[i]} is not a valid userPrincipalName`;
-                }
-            }
-        }
-        if (args.options.mailNickname.indexOf(' ') !== -1) {
-            return 'The option mailNickname cannot contain spaces.';
-        }
-        if (args.options.logoPath) {
-            const fullPath = path.resolve(args.options.logoPath);
-            if (!fs.existsSync(fullPath)) {
-                return `File '${fullPath}' not found`;
-            }
-            if (fs.lstatSync(fullPath).isDirectory()) {
-                return `Path '${fullPath}' points to a directory`;
-            }
-        }
-        if (args.options.visibility && this.allowedVisibilities.map(x => x.toLowerCase()).indexOf(args.options.visibility.toLowerCase()) === -1) {
-            return `${args.options.visibility} is not a valid visibility. Allowed values are ${this.allowedVisibilities.join(', ')}`;
-        }
-        return true;
-    });
-};
 EntraM365GroupAddCommand.numRepeat = 15;
 export default new EntraM365GroupAddCommand();
 //# sourceMappingURL=m365group-add.js.map

package/dist/m365/entra/commands/m365group/m365group-conversation-list.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 _EntraM365GroupConversationListCommand_instances, _EntraM365GroupConversationListCommand_initOptions, _EntraM365GroupConversationListCommand_initValidators, _EntraM365GroupConversationListCommand_initOptionSets, _EntraM365GroupConversationListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
-import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional().alias('n')
+});
 class EntraM365GroupConversationListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_CONVERSATION_LIST;
@@ -19,13 +19,18 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
     defaultProperties() {
         return ['topic', 'lastDeliveredDateTime', 'id'];
     }
-    constructor() {
-        super();
-        _EntraM365GroupConversationListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId or groupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -48,23 +53,5 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupConversationListCommand_instances = new WeakSet(), _EntraM365GroupConversationListCommand_initOptions = function _EntraM365GroupConversationListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-n, --groupName [groupName]'
-    });
-}, _EntraM365GroupConversationListCommand_initValidators = function _EntraM365GroupConversationListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraM365GroupConversationListCommand_initOptionSets = function _EntraM365GroupConversationListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] });
-}, _EntraM365GroupConversationListCommand_initTypes = function _EntraM365GroupConversationListCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName');
-};
 export default new EntraM365GroupConversationListCommand();
 //# sourceMappingURL=m365group-conversation-list.js.map

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

@@ -1,15 +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 _EntraM365GroupConversationPostListCommand_instances, _EntraM365GroupConversationPostListCommand_initTelemetry, _EntraM365GroupConversationPostListCommand_initOptions, _EntraM365GroupConversationPostListCommand_initValidators, _EntraM365GroupConversationPostListCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.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,
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional().alias('d'),
+    threadId: z.string().alias('t')
+});
 class EntraM365GroupConversationPostListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_CONVERSATION_POST_LIST;
@@ -17,13 +18,18 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
     get description() {
         return 'Lists conversation posts of a Microsoft 365 group';
     }
-    constructor() {
-        super();
-        _EntraM365GroupConversationPostListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupConversationPostListCommand_instances, "m", _EntraM365GroupConversationPostListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId or groupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
+        });
     }
     defaultProperties() {
         return ['receivedDateTime', 'id'];
@@ -50,30 +56,5 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         return group.id;
     }
 }
-_EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365GroupConversationPostListCommand_initTelemetry = function _EntraM365GroupConversationPostListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined'
-        });
-    });
-}, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '-d, --groupName [groupName]'
-    }, {
-        option: '-t, --threadId <threadId>'
-    });
-}, _EntraM365GroupConversationPostListCommand_initValidators = function _EntraM365GroupConversationPostListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] });
-};
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map