@message-queue-toolkit/core 24.2.0 → 25.0.0

package/README.md

@@ -8,6 +8,7 @@ Core library for message-queue-toolkit. Provides foundational abstractions, util
 - [Overview](#overview)
 - [Core Concepts](#core-concepts)
   - [Message Schemas](#message-schemas)
+  - [Message Type Resolution](#message-type-resolution)
   - [Handler Configuration](#handler-configuration)
   - [Pre-handlers and Barriers](#pre-handlers-and-barriers)
   - [Handler Spies](#handler-spies)
@@ -19,7 +20,6 @@ Core library for message-queue-toolkit. Provides foundational abstractions, util
   - [AbstractPublisherManager](#abstractpublishermanager)
   - [DomainEventEmitter](#domaineventemitter)
 - [Utilities](#utilities)
-  - [NO_MESSAGE_TYPE_FIELD](#no_message_type_field)
   - [Error Classes](#error-classes)
   - [Message Deduplication](#message-deduplication)
   - [Payload Offloading](#payload-offloading)
@@ -52,7 +52,7 @@ The core package provides the foundational building blocks used by all protocol-
 
 Messages are validated using Zod schemas. The library uses configurable field names:
 
-- **`messageTypeField`** (required): Field containing the message type discriminator (must be `z.literal()` for routing)
+- **`messageTypeResolver`**: Configuration for resolving the message type discriminator (see [Message Type Resolution](#message-type-resolution))
 - **`messageIdField`** (default: `'id'`): Field containing the message ID
 - **`messageTimestampField`** (default: `'timestamp'`): Field containing the timestamp
 
@@ -70,6 +70,304 @@ const UserCreatedSchema = z.object({
 type UserCreated = z.infer<typeof UserCreatedSchema>
 ```
 
+### Message Type Resolution
+
+#### What is Message Type?
+
+The **message type** is a discriminator field that identifies what kind of event or command a message represents. It's used for:
+
+1. **Routing**: Directing messages to the appropriate handler based on their type
+2. **Schema validation**: Selecting the correct Zod schema to validate the message
+3. **Observability**: Tracking metrics and logs per message type
+
+In a typical event-driven architecture, a single queue or topic may receive multiple types of messages. For example, a `user-events` queue might receive `user.created`, `user.updated`, and `user.deleted` events. The message type tells the consumer which handler should process each message.
+
+#### Configuration Options
+
+The `messageTypeResolver` configuration supports three modes:
+
+##### Mode 1: Field Path (Simple)
+
+Use when the message type is a field in the parsed message body. Supports dot notation for nested paths:
+
+```typescript
+{
+  messageTypeResolver: { messageTypePath: 'type' },  // Extracts from message.type
+}
+
+// Nested path example
+{
+  messageTypeResolver: { messageTypePath: 'metadata.eventType' },  // Extracts from message.metadata.eventType
+}
+```
+
+##### Mode 2: Literal (Constant)
+
+Use when all messages are of the same type:
+
+```typescript
+{
+  messageTypeResolver: { literal: 'order.created' },  // All messages treated as this type
+}
+```
+
+##### Mode 3: Custom Resolver (Flexible)
+
+Use for complex scenarios where the type needs to be extracted from message attributes, nested fields, or requires transformation:
+
+```typescript
+import type { MessageTypeResolverConfig } from '@message-queue-toolkit/core'
+
+const resolverConfig: MessageTypeResolverConfig = {
+  resolver: ({ messageData, messageAttributes }) => {
+    // Your custom logic here
+    return 'resolved.type'
+  },
+}
+```
+
+**Important:** The resolver function must always return a valid string. If the type cannot be determined, either return a default type or throw an error with a descriptive message.
+
+#### Real-World Examples by Platform
+
+##### AWS SQS (Plain)
+
+When publishing your own events directly to SQS, you control the message format:
+
+```typescript
+// Message format you control
+{
+  "id": "msg-123",
+  "type": "order.created",  // Your type field
+  "timestamp": "2024-01-15T10:30:00Z",
+  "payload": {
+    "orderId": "order-456",
+    "amount": 99.99
+  }
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'type' },
+}
+```
+
+##### AWS EventBridge → SQS
+
+EventBridge events have a specific structure with `detail-type`:
+
+```typescript
+// EventBridge event structure delivered to SQS
+{
+  "version": "0",
+  "id": "12345678-1234-1234-1234-123456789012",
+  "detail-type": "Order Created",  // EventBridge uses detail-type
+  "source": "com.myapp.orders",
+  "account": "123456789012",
+  "time": "2024-01-15T10:30:00Z",
+  "region": "us-east-1",
+  "detail": {
+    "orderId": "order-456",
+    "amount": 99.99
+  }
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'detail-type' },
+}
+
+// Or with resolver for normalization
+{
+  messageTypeResolver: {
+    resolver: ({ messageData }) => {
+      const data = messageData as { 'detail-type'?: string; source?: string }
+      const detailType = data['detail-type']
+      if (!detailType) throw new Error('detail-type is required')
+      // Optionally normalize: "Order Created" → "order.created"
+      return detailType.toLowerCase().replace(/ /g, '.')
+    },
+  },
+}
+```
+
+##### AWS SNS → SQS
+
+SNS messages wrapped in SQS have the actual payload in the `Message` field (handled automatically by the library after unwrapping):
+
+```typescript
+// After SNS envelope unwrapping, you get your original message
+{
+  "id": "msg-123",
+  "type": "user.signup.completed",
+  "userId": "user-789",
+  "email": "user@example.com"
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'type' },
+}
+```
+
+##### Apache Kafka
+
+Kafka typically uses topic-based routing, but you may still need message types within a topic:
+
+```typescript
+// Kafka message value (JSON)
+{
+  "eventType": "inventory.reserved",
+  "eventId": "evt-123",
+  "timestamp": 1705312200000,
+  "data": {
+    "sku": "PROD-001",
+    "quantity": 5
+  }
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'eventType' },
+}
+
+// Or using Kafka headers (via custom resolver)
+{
+  messageTypeResolver: {
+    resolver: ({ messageData, messageAttributes }) => {
+      // Kafka headers are passed as messageAttributes
+      if (messageAttributes?.['ce_type']) {
+        return messageAttributes['ce_type'] as string  // CloudEvents header
+      }
+      const data = messageData as { eventType?: string }
+      if (!data.eventType) throw new Error('eventType required')
+      return data.eventType
+    },
+  },
+}
+```
+
+##### Google Cloud Pub/Sub (Your Own Events)
+
+When you control the message format in Pub/Sub:
+
+```typescript
+// Your message (base64-decoded from data field)
+{
+  "type": "payment.processed",
+  "paymentId": "pay-123",
+  "amount": 150.00,
+  "currency": "USD"
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'type' },
+}
+```
+
+##### Google Cloud Pub/Sub (Cloud Storage Notifications)
+
+Cloud Storage notifications put the event type in message **attributes**, not the data payload:
+
+```typescript
+// Pub/Sub message structure for Cloud Storage notifications
+{
+  "data": "eyJraW5kIjoic3RvcmFnZSMgb2JqZWN0In0=",  // Base64-encoded object metadata
+  "attributes": {
+    "eventType": "OBJECT_FINALIZE",  // Type is HERE, not in data!
+    "bucketId": "my-bucket",
+    "objectId": "path/to/file.jpg",
+    "objectGeneration": "1705312200000"
+  },
+  "messageId": "123456789",
+  "publishTime": "2024-01-15T10:30:00Z"
+}
+
+// Configuration - must use resolver to access attributes
+{
+  messageTypeResolver: {
+    resolver: ({ messageAttributes }) => {
+      const eventType = messageAttributes?.eventType as string
+      if (!eventType) {
+        throw new Error('eventType attribute required for Cloud Storage notifications')
+      }
+      // Map GCS event types to your internal types
+      const typeMap: Record<string, string> = {
+        'OBJECT_FINALIZE': 'storage.object.created',
+        'OBJECT_DELETE': 'storage.object.deleted',
+        'OBJECT_ARCHIVE': 'storage.object.archived',
+        'OBJECT_METADATA_UPDATE': 'storage.object.metadataUpdated',
+      }
+      return typeMap[eventType] ?? eventType
+    },
+  },
+}
+```
+
+##### Google Cloud Pub/Sub (Eventarc / CloudEvents)
+
+Eventarc delivers events in CloudEvents format:
+
+```typescript
+// CloudEvents structured format
+{
+  "specversion": "1.0",
+  "type": "google.cloud.storage.object.v1.finalized",  // CloudEvents type
+  "source": "//storage.googleapis.com/projects/_/buckets/my-bucket",
+  "id": "1234567890",
+  "time": "2024-01-15T10:30:00Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "bucket": "my-bucket",
+    "name": "path/to/file.jpg",
+    "contentType": "image/jpeg"
+  }
+}
+
+// Configuration
+{
+  messageTypeResolver: { messageTypePath: 'type' },  // CloudEvents type is at root level
+}
+
+// Or with mapping to simpler types
+{
+  messageTypeResolver: {
+    resolver: ({ messageData }) => {
+      const data = messageData as { type?: string }
+      const ceType = data.type
+      if (!ceType) throw new Error('CloudEvents type required')
+      // Map verbose CloudEvents types to simpler names
+      if (ceType.includes('storage.object') && ceType.includes('finalized')) {
+        return 'storage.object.created'
+      }
+      if (ceType.includes('storage.object') && ceType.includes('deleted')) {
+        return 'storage.object.deleted'
+      }
+      return ceType
+    },
+  },
+}
+```
+
+##### Single-Type Queues (Any Platform)
+
+When a queue/subscription only ever receives one type of message, use `literal`:
+
+```typescript
+// Dedicated queue for order.created events only
+{
+  messageTypeResolver: {
+    literal: 'order.created',
+  },
+}
+```
+
+This is useful for:
+- Dedicated queues/subscriptions filtered to a single event type
+- Legacy systems where messages don't have a type field
+- Simple integrations where you know exactly what you're receiving
+
 ### Handler Configuration
 
 Use `MessageHandlerConfigBuilder` to configure handlers for different message types:
@@ -167,6 +465,56 @@ const handlers = new MessageHandlerConfigBuilder<
   .build()
 ```
 
+#### Handler Configuration Options
+
+The third parameter to `addConfig` accepts these options:
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `messageType` | `string` | Explicit message type for routing. Required when using custom resolver. |
+| `messageLogFormatter` | `(message) => unknown` | Custom formatter for logging |
+| `preHandlers` | `Prehandler[]` | Middleware functions run before the handler |
+| `preHandlerBarrier` | `BarrierCallback` | Barrier function for out-of-order message handling |
+
+#### Explicit Message Type
+
+When using a custom resolver function (`messageTypeResolver: { resolver: fn }`), the message type cannot be automatically extracted from schemas at registration time. You must provide an explicit `messageType` for each handler:
+
+```typescript
+const handlers = new MessageHandlerConfigBuilder<SupportedMessages, Context>()
+  .addConfig(
+    STORAGE_OBJECT_SCHEMA,
+    handleObjectCreated,
+    { messageType: 'storage.object.created' }  // Required for custom resolver
+  )
+  .addConfig(
+    STORAGE_DELETE_SCHEMA,
+    handleObjectDeleted,
+    { messageType: 'storage.object.deleted' }  // Required for custom resolver
+  )
+  .build()
+
+const container = new HandlerContainer({
+  messageHandlers: handlers,
+  messageTypeResolver: {
+    resolver: ({ messageAttributes }) => {
+      // Map external event types to your internal types
+      const eventType = messageAttributes?.eventType as string
+      if (eventType === 'OBJECT_FINALIZE') return 'storage.object.created'
+      if (eventType === 'OBJECT_DELETE') return 'storage.object.deleted'
+      throw new Error(`Unknown event type: ${eventType}`)
+    },
+  },
+})
+```
+
+**Priority for determining handler message type:**
+1. Explicit `messageType` in handler options (highest priority)
+2. Literal type from `messageTypeResolver: { literal: 'type' }`
+3. Extract from schema's literal field using `messageTypePath`
+
+If the message type cannot be determined, an error is thrown during container construction.
+
 ### HandlerContainer
 
 Routes messages to appropriate handlers based on message type:
@@ -176,7 +524,7 @@ import { HandlerContainer } from '@message-queue-toolkit/core'
 
 const container = new HandlerContainer({
   messageHandlers: handlers,
-  messageTypeField: 'type',
+  messageTypeResolver: { messageTypePath: 'type' },
 })
 
 const handler = container.resolveHandler(message.type)
@@ -190,11 +538,17 @@ Manages Zod schemas and validates messages:
 import { MessageSchemaContainer } from '@message-queue-toolkit/core'
 
 const container = new MessageSchemaContainer({
-  messageSchemas: [Schema1, Schema2],
-  messageTypeField: 'type',
+  messageSchemas: [{ schema: Schema1 }, { schema: Schema2 }],
+  messageDefinitions: [],
+  messageTypeResolver: { messageTypePath: 'type' },
 })
 
-const schema = container.resolveSchema(message.type)
+const result = container.resolveSchema(message)
+if ('error' in result) {
+  // Handle error
+} else {
+  const schema = result.result
+}
 ```
 
 ### AbstractPublisherManager
@@ -229,25 +583,6 @@ await emitter.emit('user.created', { userId: 'user-123' })
 
 ## Utilities
 
-### NO_MESSAGE_TYPE_FIELD
-
-Use this constant when your consumer should accept all message types without routing:
-
-```typescript
-import { NO_MESSAGE_TYPE_FIELD } from '@message-queue-toolkit/core'
-
-// Consumer will use a single handler for all messages
-{
-  messageTypeField: NO_MESSAGE_TYPE_FIELD,
-  handlers: new MessageHandlerConfigBuilder()
-    .addConfig(PassthroughSchema, async (message) => {
-      // Handles any message type
-      return { result: 'success' }
-    })
-    .build(),
-}
-```
-
 ### Error Classes
 
 ```typescript
@@ -327,6 +662,21 @@ type BarrierCallback<Message, Context, PrehandlerOutput, BarrierOutput> = (
 type BarrierResult<Output> =
   | { isPassing: true; output: Output }
   | { isPassing: false; output?: never }
+
+// Message type resolver context
+type MessageTypeResolverContext = {
+  messageData: unknown
+  messageAttributes?: Record<string, unknown>
+}
+
+// Message type resolver function
+type MessageTypeResolverFn = (context: MessageTypeResolverContext) => string
+
+// Message type resolver configuration
+type MessageTypeResolverConfig =
+  | { messageTypePath: string }  // Extract from field at root of message data
+  | { literal: string }          // Constant type for all messages
+  | { resolver: MessageTypeResolverFn }  // Custom resolver function
 ```
 
 ### Utility Functions

package/dist/events/DomainEventEmitter.js

@@ -100,7 +100,7 @@ export class DomainEventEmitter {
             this._handlerSpy.addProcessedMessage({
                 message: event,
                 processingResult: { status: 'consumed' },
-            }, event.id);
+            }, event.id, event.type);
         });
         this.inProgressBackgroundHandlerByEventId.set(event.id, bgPromise);
     }

package/dist/events/DomainEventEmitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DomainEventEmitter.js","sourceRoot":"","sources":["../../lib/events/DomainEventEmitter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DomainEventEmitter.js","sourceRoot":"","sources":["../../lib/events/DomainEventEmitter.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -16,10 +16,12 @@ export { createMultiStoreConfig, isMultiPayloadStoreConfig, } from './payload-st
 export * from './queues/AbstractPublisherManager.ts';
 export { AbstractQueueService, type Deserializer, type ResolvedMessage, } from './queues/AbstractQueueService.ts';
 export type { BarrierCallback, BarrierResult, BarrierResultNegative, BarrierResultPositive, Handler, HandlerContainerOptions, PreHandlingOutputs, Prehandler, } from './queues/HandlerContainer.ts';
-export { HandlerContainer, MessageHandlerConfig, MessageHandlerConfigBuilder, NO_MESSAGE_TYPE_FIELD, type PrehandlerResult, } from './queues/HandlerContainer.ts';
-export { HandlerSpy, type HandlerSpyParams, type PublicHandlerSpy, resolveHandlerSpy, type SpyResultInput, } from './queues/HandlerSpy.ts';
-export type { MessageSchemaContainerOptions } from './queues/MessageSchemaContainer.ts';
+export { HandlerContainer, MessageHandlerConfig, MessageHandlerConfigBuilder, type PrehandlerResult, } from './queues/HandlerContainer.ts';
+export { ANY_MESSAGE_TYPE, HandlerSpy, type HandlerSpyParams, type PublicHandlerSpy, resolveHandlerSpy, type SpyResultInput, TYPE_NOT_RESOLVED, } from './queues/HandlerSpy.ts';
+export type { DefinitionEntry, MessageSchemaContainerOptions, SchemaEntry, } from './queues/MessageSchemaContainer.ts';
 export { MessageSchemaContainer } from './queues/MessageSchemaContainer.ts';
+export type { MessageTypeResolverConfig, MessageTypeResolverContext, MessageTypeResolverFn, } from './queues/MessageTypeResolver.ts';
+export { extractMessageTypeFromSchema, isMessageTypeLiteralConfig, isMessageTypePathConfig, isMessageTypeResolverFnConfig, resolveMessageType, } from './queues/MessageTypeResolver.ts';
 export type { AsyncPublisher, ExtraParams, MessageProcessingResult, QueueConsumer, SchemaMap, SyncPublisher, TransactionObservabilityManager, } from './types/MessageQueueTypes.ts';
 export * from './types/queueOptionsTypes.ts';
 export { isRetryDateExceeded } from './utils/dateUtils.ts';

package/dist/index.js

@@ -14,9 +14,10 @@ export { isOffloadedPayloadPointerPayload, OFFLOADED_PAYLOAD_POINTER_PAYLOAD_SCH
 export { createMultiStoreConfig, isMultiPayloadStoreConfig, } from "./payload-store/payloadStoreTypes.js";
 export * from "./queues/AbstractPublisherManager.js";
 export { AbstractQueueService, } from "./queues/AbstractQueueService.js";
-export { HandlerContainer, MessageHandlerConfig, MessageHandlerConfigBuilder, NO_MESSAGE_TYPE_FIELD, } from "./queues/HandlerContainer.js";
-export { HandlerSpy, resolveHandlerSpy, } from "./queues/HandlerSpy.js";
+export { HandlerContainer, MessageHandlerConfig, MessageHandlerConfigBuilder, } from "./queues/HandlerContainer.js";
+export { ANY_MESSAGE_TYPE, HandlerSpy, resolveHandlerSpy, TYPE_NOT_RESOLVED, } from "./queues/HandlerSpy.js";
 export { MessageSchemaContainer } from "./queues/MessageSchemaContainer.js";
+export { extractMessageTypeFromSchema, isMessageTypeLiteralConfig, isMessageTypePathConfig, isMessageTypeResolverFnConfig, resolveMessageType, } from "./queues/MessageTypeResolver.js";
 export * from "./types/queueOptionsTypes.js";
 export { isRetryDateExceeded } from "./utils/dateUtils.js";
 export { isProduction, reloadConfig } from "./utils/envUtils.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EACL,cAAc,EACd,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAA;AAC3E,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,cAAc,wBAAwB,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,cAAc,oDAAoD,CAAA;AAClE,OAAO,EAGL,0BAA0B,EAG1B,kBAAkB,GAEnB,MAAM,sDAAsD,CAAA;AAC7D,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EACL,gCAAgC,EAChC,wCAAwC,EAExC,kBAAkB,GAEnB,MAAM,mDAAmD,CAAA;AAS1D,OAAO,EACL,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,sCAAsC,CAAA;AAC7C,cAAc,sCAAsC,CAAA;AACpD,OAAO,EACL,oBAAoB,GAGrB,MAAM,kCAAkC,CAAA;AAWzC,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,GAEtB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACL,UAAU,EAGV,iBAAiB,GAElB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAA;AAU3E,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAA2B,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EACL,cAAc,EACd,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAA;AAC3E,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,cAAc,wBAAwB,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,cAAc,oDAAoD,CAAA;AAClE,OAAO,EAGL,0BAA0B,EAG1B,kBAAkB,GAEnB,MAAM,sDAAsD,CAAA;AAC7D,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EACL,gCAAgC,EAChC,wCAAwC,EAExC,kBAAkB,GAEnB,MAAM,mDAAmD,CAAA;AAS1D,OAAO,EACL,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,sCAAsC,CAAA;AAC7C,cAAc,sCAAsC,CAAA;AACpD,OAAO,EACL,oBAAoB,GAGrB,MAAM,kCAAkC,CAAA;AAWzC,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,2BAA2B,GAE5B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACL,gBAAgB,EAChB,UAAU,EAGV,iBAAiB,EAEjB,iBAAiB,GAClB,MAAM,wBAAwB,CAAA;AAM/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAA;AAM3E,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,EAC1B,uBAAuB,EACvB,6BAA6B,EAC7B,kBAAkB,GACnB,MAAM,iCAAiC,CAAA;AAUxC,cAAc,8BAA8B,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAA2B,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/queues/AbstractQueueService.d.ts

@@ -11,6 +11,7 @@ import type { DeletionConfig, MessageMetricsManager, QueueDependencies, QueueOpt
 import type { BarrierCallback, BarrierResult, MessageHandlerConfig, PreHandlingOutputs, Prehandler, PrehandlerResult } from './HandlerContainer.ts';
 import type { HandlerSpy, PublicHandlerSpy } from './HandlerSpy.ts';
 import { MessageSchemaContainer } from './MessageSchemaContainer.ts';
+import { type MessageTypeResolverConfig } from './MessageTypeResolver.ts';
 export type Deserializer<MessagePayloadType extends object> = (message: unknown, type: ZodType<MessagePayloadType>, errorProcessor: ErrorResolver) => Either<MessageInvalidFormatError | MessageValidationError, MessagePayloadType>;
 type CommonQueueLocator = {
     queueName: string;
@@ -41,7 +42,10 @@ export declare abstract class AbstractQueueService<MessagePayloadSchemas extends
     protected readonly errorReporter: ErrorReporter;
     readonly logger: CommonLogger;
     protected readonly messageIdField: string;
-    protected readonly messageTypeField: string;
+    /**
+     * Configuration for resolving message types.
+     */
+    protected readonly messageTypeResolver?: MessageTypeResolverConfig;
     protected readonly logMessages: boolean;
     protected readonly creationConfig?: QueueConfiguration;
     protected readonly locatorConfig?: QueueLocatorType;
@@ -55,12 +59,20 @@ export declare abstract class AbstractQueueService<MessagePayloadSchemas extends
     constructor({ errorReporter, logger, messageMetricsManager }: DependenciesType, options: OptionsType);
     protected resolveConsumerMessageSchemaContainer(options: {
         handlers: MessageHandlerConfig<MessagePayloadSchemas, ExecutionContext, PrehandlerOutput>[];
-        messageTypeField: string;
+        messageTypeResolver?: MessageTypeResolverConfig;
     }): MessageSchemaContainer<MessagePayloadSchemas>;
     protected resolvePublisherMessageSchemaContainer(options: {
         messageSchemas: readonly ZodSchema<MessagePayloadSchemas>[];
-        messageTypeField: string;
+        messageTypeResolver?: MessageTypeResolverConfig;
     }): MessageSchemaContainer<MessagePayloadSchemas>;
+    /**
+     * Resolves message type from message data and optional attributes using messageTypeResolver.
+     *
+     * @param messageData - The parsed message data
+     * @param messageAttributes - Optional message-level attributes (e.g., PubSub attributes)
+     * @returns The resolved message type, or undefined if not configured
+     */
+    protected resolveMessageTypeFromMessage(messageData: unknown, messageAttributes?: Record<string, unknown>): string | undefined;
     protected abstract resolveSchema(message: MessagePayloadSchemas): Either<Error, ZodSchema<MessagePayloadSchemas>>;
     protected abstract resolveMessage(message: MessageEnvelopeType): Either<MessageInvalidFormatError | MessageValidationError, ResolvedMessage>;
     /**