npm - @amqp-contract/contract - Versions diffs - 0.13.0 → 0.15.0 - Mend

@amqp-contract/contract 0.13.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/docs/index.md CHANGED Viewed

@@ -12,7 +12,7 @@
 type AnySchema = StandardSchemaV1;
 ```
-Defined in: [types.ts:12](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L12)
+Defined in: [types.ts:12](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L12)
 Any schema that conforms to Standard Schema v1.
@@ -29,25 +29,31 @@ https://github.com/standard-schema/standard-schema
 ### BaseExchangeDefinition
 ```ts
-type BaseExchangeDefinition = object;
+type BaseExchangeDefinition<TName> = object;
 ```
-Defined in: [types.ts:376](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L376)
+Defined in: [types.ts:376](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L376)
 Base definition of an AMQP exchange.
 An exchange receives messages from publishers and routes them to queues based on the exchange
 type and routing rules. This type contains properties common to all exchange types.
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 #### Properties
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="arguments"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. Common arguments include alternate-exchange for handling unroutable messages. | [types.ts:405](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L405) |
-| <a id="autodelete"></a> `autoDelete?` | `boolean` | If true, the exchange is deleted when all queues have finished using it. **Default** `false` | [types.ts:392](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L392) |
-| <a id="durable"></a> `durable?` | `boolean` | If true, the exchange survives broker restarts. Durable exchanges are persisted to disk. **Default** `false` | [types.ts:386](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L386) |
-| <a id="internal"></a> `internal?` | `boolean` | If true, the exchange cannot be directly published to by clients. It can only receive messages from other exchanges via exchange-to-exchange bindings. **Default** `false` | [types.ts:399](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L399) |
-| <a id="name"></a> `name` | `string` | The name of the exchange. Must be unique within the RabbitMQ virtual host. | [types.ts:380](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L380) |
+| <a id="arguments"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. Common arguments include alternate-exchange for handling unroutable messages. | [types.ts:405](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L405) |
+| <a id="autodelete"></a> `autoDelete?` | `boolean` | If true, the exchange is deleted when all queues have finished using it. **Default** `false` | [types.ts:392](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L392) |
+| <a id="durable"></a> `durable?` | `boolean` | If true, the exchange survives broker restarts. Durable exchanges are persisted to disk. **Default** `false` | [types.ts:386](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L386) |
+| <a id="internal"></a> `internal?` | `boolean` | If true, the exchange cannot be directly published to by clients. It can only receive messages from other exchanges via exchange-to-exchange bindings. **Default** `false` | [types.ts:399](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L399) |
+| <a id="name"></a> `name` | `TName` | The name of the exchange. Must be unique within the RabbitMQ virtual host. | [types.ts:380](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L380) |
 ***
@@ -59,7 +65,7 @@ type BindingDefinition =
   | ExchangeBindingDefinition;
 ```
-Defined in: [types.ts:815](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L815)
+Defined in: [types.ts:831](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L831)
 Union type of all binding definitions.
@@ -75,7 +81,7 @@ A binding can be either:
 type BindingPattern<S> = S extends "" ? never : S;
 ```
-Defined in: [builder/routing-types.ts:52](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/routing-types.ts#L52)
+Defined in: [builder/routing-types.ts:52](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/routing-types.ts#L52)
 Type-safe binding pattern that validates basic format and wildcards.
@@ -107,10 +113,10 @@ type Invalid = BindingPattern<"">; // never (empty string)
 ### ClassicQueueDefinition
 ```ts
-type ClassicQueueDefinition = BaseQueueDefinition & object;
+type ClassicQueueDefinition<TName> = BaseQueueDefinition<TName> & object;
 ```
-Defined in: [types.ts:592](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L592)
+Defined in: [types.ts:595](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L595)
 Definition of a classic queue.
@@ -121,10 +127,16 @@ specific features not supported by quorum queues (e.g., exclusive queues, priori
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `deliveryLimit?` | `never` | Classic queues do not support delivery limits. Use type: 'quorum' if you need native retry with delivery limits. | [types.ts:602](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L602) |
-| `exclusive?` | `boolean` | If true, the queue can only be used by the declaring connection and is deleted when that connection closes. Exclusive queues are private to the connection. **Default** `false` | [types.ts:609](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L609) |
-| `retry` | `ResolvedTtlBackoffRetryOptions` | Retry configuration for handling failed message processing. Classic queues only support TTL-backoff retry mode (default). When the queue is created, defaults are applied. | [types.ts:617](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L617) |
-| `type` | `"classic"` | Queue type discriminator: classic queue. | [types.ts:596](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L596) |
+| `deliveryLimit?` | `never` | Classic queues do not support delivery limits. Use type: 'quorum' if you need native retry with delivery limits. | [types.ts:605](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L605) |
+| `exclusive?` | `boolean` | If true, the queue can only be used by the declaring connection and is deleted when that connection closes. Exclusive queues are private to the connection. **Default** `false` | [types.ts:612](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L612) |
+| `retry` | `ResolvedTtlBackoffRetryOptions` | Retry configuration for handling failed message processing. Classic queues only support TTL-backoff retry mode (default). When the queue is created, defaults are applied. | [types.ts:620](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L620) |
+| `type` | `"classic"` | Queue type discriminator: classic queue. | [types.ts:599](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L599) |
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 ***
@@ -134,7 +146,7 @@ specific features not supported by quorum queues (e.g., exclusive queues, priori
 type ClassicQueueOptions = BaseQueueOptions & object;
 ```
-Defined in: [types.ts:318](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L318)
+Defined in: [types.ts:318](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L318)
 Options for creating a classic queue.
@@ -147,10 +159,10 @@ Classic queues support all traditional RabbitMQ features including:
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `exclusive?` | `boolean` | If true, the queue can only be used by the declaring connection and is deleted when that connection closes. Exclusive queues are private to the connection. **Default** `false` | [types.ts:329](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L329) |
-| `maxPriority?` | `number` | Maximum priority level for priority queue (1-255, recommended: 1-10). Sets x-max-priority argument. Only supported with classic queues. | [types.ts:336](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L336) |
-| `retry?` | [`TtlBackoffRetryOptions`](#ttlbackoffretryoptions) | Retry configuration for handling failed message processing. Classic queues only support TTL-backoff retry mode, which uses wait queues with exponential backoff. For quorum-native retry, use quorum queues instead. **Example** `const orderQueue = defineQueue('order-processing', { type: 'classic', durable: true, deadLetter: { exchange: dlx }, retry: { maxRetries: 5, initialDelayMs: 1000, maxDelayMs: 30000, }, });` | [types.ts:358](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L358) |
-| `type` | `"classic"` | Queue type: classic (for special cases) | [types.ts:322](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L322) |
+| `exclusive?` | `boolean` | If true, the queue can only be used by the declaring connection and is deleted when that connection closes. Exclusive queues are private to the connection. **Default** `false` | [types.ts:329](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L329) |
+| `maxPriority?` | `number` | Maximum priority level for priority queue (1-255, recommended: 1-10). Sets x-max-priority argument. Only supported with classic queues. | [types.ts:336](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L336) |
+| `retry?` | [`TtlBackoffRetryOptions`](#ttlbackoffretryoptions) | Retry configuration for handling failed message processing. Classic queues only support TTL-backoff retry mode, which uses wait queues with exponential backoff. For quorum-native retry, use quorum queues instead. **Example** `const orderQueue = defineQueue('order-processing', { type: 'classic', durable: true, deadLetter: { exchange: dlx }, retry: { maxRetries: 5, initialDelayMs: 1000, maxDelayMs: 30000, }, });` | [types.ts:358](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L358) |
+| `type` | `"classic"` | Queue type: classic (for special cases) | [types.ts:322](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L322) |
 #### Example
@@ -167,10 +179,10 @@ const priorityQueue = defineQueue('tasks', {
 ### CommandConsumerConfig
 ```ts
-type CommandConsumerConfig<TMessage, TExchange, TRoutingKey> = object;
+type CommandConsumerConfig<TMessage, TExchange, TRoutingKey, TQueue, TDlxExchange> = object;
 ```
-Defined in: [builder/command.ts:27](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L27)
+Defined in: [builder/command.ts:30](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L30)
 Configuration for a command consumer.
@@ -184,17 +196,21 @@ The consumer "owns" the queue, and publishers send commands to it.
 | `TMessage` *extends* [`MessageDefinition`](#messagedefinition) | - | The message definition |
 | `TExchange` *extends* [`ExchangeDefinition`](#exchangedefinition) | - | The exchange definition |
 | `TRoutingKey` *extends* `string` \| `undefined` | `undefined` | The routing key type (undefined for fanout) |
+| `TQueue` *extends* [`QueueDefinition`](#queuedefinition) | [`QueueDefinition`](#queuedefinition) | - |
+| `TDlxExchange` *extends* [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | - |
 #### Properties
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="__brand"></a> `__brand` | `"CommandConsumerConfig"` | Discriminator to identify this as a command consumer config | [builder/command.ts:33](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L33) |
-| <a id="binding"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | The binding connecting the queue to the exchange | [builder/command.ts:37](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L37) |
-| <a id="consumer"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition)&lt;`TMessage`&gt; | The consumer definition for processing commands | [builder/command.ts:35](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L35) |
-| <a id="exchange"></a> `exchange` | `TExchange` | The exchange that receives commands | [builder/command.ts:39](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L39) |
-| <a id="message"></a> `message` | `TMessage` | The message definition | [builder/command.ts:41](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L41) |
-| <a id="routingkey"></a> `routingKey` | `TRoutingKey` | The routing key pattern for the binding | [builder/command.ts:43](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L43) |
+| <a id="__brand"></a> `__brand` | `"CommandConsumerConfig"` | Discriminator to identify this as a command consumer config | [builder/command.ts:38](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L38) |
+| <a id="binding"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | The binding connecting the queue to the exchange | [builder/command.ts:42](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L42) |
+| <a id="consumer"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition)&lt;`TMessage`&gt; | The consumer definition for processing commands | [builder/command.ts:40](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L40) |
+| <a id="deadletterexchange"></a> `deadLetterExchange` | `TDlxExchange` | The dead letter exchange from the queue, if configured | [builder/command.ts:48](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L48) |
+| <a id="exchange"></a> `exchange` | `TExchange` | The exchange that receives commands | [builder/command.ts:44](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L44) |
+| <a id="message"></a> `message` | `TMessage` | The message definition | [builder/command.ts:50](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L50) |
+| <a id="queue"></a> `queue` | `TQueue` | The queue this consumer reads from | [builder/command.ts:46](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L46) |
+| <a id="routingkey"></a> `routingKey` | `TRoutingKey` | The routing key pattern for the binding | [builder/command.ts:52](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L52) |
 ***
@@ -204,7 +220,7 @@ The consumer "owns" the queue, and publishers send commands to it.
 type CommandConsumerConfigBase = object;
 ```
-Defined in: [types.ts:912](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L912)
+Defined in: [types.ts:928](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L928)
 Base type for command consumer configuration.
@@ -219,12 +235,14 @@ defineCommandConsumer for creating command consumers
 | Property | Type | Defined in |
 | ------ | ------ | ------ |
-| <a id="__brand-1"></a> `__brand` | `"CommandConsumerConfig"` | [types.ts:913](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L913) |
-| <a id="binding-1"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | [types.ts:915](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L915) |
-| <a id="consumer-1"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition) | [types.ts:914](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L914) |
-| <a id="exchange-1"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | [types.ts:916](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L916) |
-| <a id="message-1"></a> `message` | [`MessageDefinition`](#messagedefinition) | [types.ts:917](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L917) |
-| <a id="routingkey-1"></a> `routingKey` | `string` \| `undefined` | [types.ts:918](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L918) |
+| <a id="__brand-1"></a> `__brand` | `"CommandConsumerConfig"` | [types.ts:929](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L929) |
+| <a id="binding-1"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | [types.ts:931](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L931) |
+| <a id="consumer-1"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition) | [types.ts:930](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L930) |
+| <a id="deadletterexchange-1"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | [types.ts:934](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L934) |
+| <a id="exchange-1"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | [types.ts:932](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L932) |
+| <a id="message-1"></a> `message` | [`MessageDefinition`](#messagedefinition) | [types.ts:935](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L935) |
+| <a id="queue-1"></a> `queue` | [`QueueDefinition`](#queuedefinition) | [types.ts:933](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L933) |
+| <a id="routingkey-1"></a> `routingKey` | `string` \| `undefined` | [types.ts:936](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L936) |
 ***
@@ -234,7 +252,7 @@ defineCommandConsumer for creating command consumers
 type CompressionAlgorithm = "gzip" | "deflate";
 ```
-Defined in: [types.ts:134](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L134)
+Defined in: [types.ts:134](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L134)
 Supported compression algorithms for message payloads.
@@ -272,7 +290,7 @@ await client.publish("orderCreated", payload, {
 type ConsumerDefinition<TMessage> = object;
 ```
-Defined in: [types.ts:876](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L876)
+Defined in: [types.ts:892](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L892)
 Definition of a message consumer.
@@ -300,8 +318,8 @@ const consumer: ConsumerDefinition = {
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="message-2"></a> `message` | `TMessage` | The message definition including the payload schema | [types.ts:881](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L881) |
-| <a id="queue"></a> `queue` | [`QueueDefinition`](#queuedefinition) | The queue to consume messages from | [types.ts:878](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L878) |
+| <a id="message-2"></a> `message` | `TMessage` | The message definition including the payload schema | [types.ts:897](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L897) |
+| <a id="queue-2"></a> `queue` | [`QueueDefinition`](#queuedefinition) | The queue to consume messages from | [types.ts:894](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L894) |
 ***
@@ -314,7 +332,7 @@ type ConsumerEntry =
   | CommandConsumerConfigBase;
 ```
-Defined in: [types.ts:1022](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1022)
+Defined in: [types.ts:1043](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1043)
 Consumer entry that can be passed to defineContract's consumers section.
@@ -331,7 +349,7 @@ Can be either:
 type ContractDefinition = object;
 ```
-Defined in: [types.ts:968](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L968)
+Defined in: [types.ts:989](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L989)
 Complete AMQP contract definition (output type).
@@ -370,41 +388,31 @@ const contract: ContractDefinition = {
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="bindings"></a> `bindings?` | `Record`&lt;`string`, [`BindingDefinition`](#bindingdefinition)&gt; | Named binding definitions. Bindings can be queue-to-exchange or exchange-to-exchange. | [types.ts:988](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L988) |
-| <a id="consumers"></a> `consumers?` | `Record`&lt;`string`, [`ConsumerDefinition`](#consumerdefinition)&gt; | Named consumer definitions. Each key requires a corresponding handler in the TypedAmqpWorker. The handler will be fully typed based on the message schema. | [types.ts:1002](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1002) |
-| <a id="exchanges"></a> `exchanges?` | `Record`&lt;`string`, [`ExchangeDefinition`](#exchangedefinition)&gt; | Named exchange definitions. Each key becomes available as a named resource in the contract. | [types.ts:973](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L973) |
-| <a id="publishers"></a> `publishers?` | `Record`&lt;`string`, [`PublisherDefinition`](#publisherdefinition)&gt; | Named publisher definitions. Each key becomes a method on the TypedAmqpClient for publishing messages. The method will be fully typed based on the message schema. | [types.ts:995](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L995) |
-| <a id="queues"></a> `queues?` | `Record`&lt;`string`, [`QueueEntry`](#queueentry)&gt; | Named queue definitions. Each key becomes available as a named resource in the contract. When a queue has TTL-backoff retry configured, pass the `QueueWithTtlBackoffInfrastructure` object returned by `defineQueue`. The wait queue and bindings will be automatically added. | [types.ts:982](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L982) |
+| <a id="bindings"></a> `bindings?` | `Record`&lt;`string`, [`BindingDefinition`](#bindingdefinition)&gt; | Named binding definitions. Bindings can be queue-to-exchange or exchange-to-exchange. | [types.ts:1009](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1009) |
+| <a id="consumers"></a> `consumers?` | `Record`&lt;`string`, [`ConsumerDefinition`](#consumerdefinition)&gt; | Named consumer definitions. Each key requires a corresponding handler in the TypedAmqpWorker. The handler will be fully typed based on the message schema. | [types.ts:1023](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1023) |
+| <a id="exchanges"></a> `exchanges?` | `Record`&lt;`string`, [`ExchangeDefinition`](#exchangedefinition)&gt; | Named exchange definitions. Each key becomes available as a named resource in the contract. | [types.ts:994](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L994) |
+| <a id="publishers"></a> `publishers?` | `Record`&lt;`string`, [`PublisherDefinition`](#publisherdefinition)&gt; | Named publisher definitions. Each key becomes a method on the TypedAmqpClient for publishing messages. The method will be fully typed based on the message schema. | [types.ts:1016](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1016) |
+| <a id="queues"></a> `queues?` | `Record`&lt;`string`, [`QueueEntry`](#queueentry)&gt; | Named queue definitions. Each key becomes available as a named resource in the contract. When a queue has TTL-backoff retry configured, pass the `QueueWithTtlBackoffInfrastructure` object returned by `defineQueue`. The wait queue and bindings will be automatically added. | [types.ts:1003](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1003) |
 ***
 ### ContractDefinitionInput
 ```ts
-type ContractDefinitionInput = Omit<ContractDefinition, "publishers" | "consumers"> & object;
+type ContractDefinitionInput = object;
 ```
-Defined in: [types.ts:1054](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1054)
+Defined in: [types.ts:1072](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1072)
 Contract definition input type with automatic extraction of event/command patterns.
-This type allows passing event and command configs directly to the publishers
-and consumers sections. `defineContract` will automatically extract the appropriate
-definitions and generate bindings.
-#### Type Declaration
-| Name | Type | Description | Defined in |
-| ------ | ------ | ------ | ------ |
-| `consumers?` | `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; | Named consumer definitions. Can accept: - ConsumerDefinition from defineConsumer - EventConsumerResult from defineEventConsumer (binding auto-extracted) - CommandConsumerConfig from defineCommandConsumer (binding auto-extracted) | [types.ts:1072](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1072) |
-| `publishers?` | `Record`&lt;`string`, [`PublisherEntry`](#publisherentry)&gt; | Named publisher definitions. Can accept: - PublisherDefinition from definePublisher - EventPublisherConfig from defineEventPublisher (auto-extracted to publisher) | [types.ts:1062](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1062) |
+Users only define publishers and consumers. Exchanges, queues, and bindings are
+automatically extracted from these definitions.
 #### Example
 ```typescript
 const contract = defineContract({
-  exchanges: { orders: ordersExchange },
-  queues: { processing: processingQueue },
   publishers: {
     // EventPublisherConfig → auto-extracted to publisher
     orderCreated: defineEventPublisher(ordersExchange, orderMessage, { routingKey: "order.created" }),
@@ -422,6 +430,48 @@ const contract = defineContract({
 defineContract - Processes this input and returns a ContractDefinition
+#### Properties
+| Property | Type | Description | Defined in |
+| ------ | ------ | ------ | ------ |
+| <a id="consumers-1"></a> `consumers?` | `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; | Named consumer definitions. Can accept: - ConsumerDefinition from defineConsumer - EventConsumerResult from defineEventConsumer (binding auto-extracted) - CommandConsumerConfig from defineCommandConsumer (binding auto-extracted) | [types.ts:1090](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1090) |
+| <a id="publishers-1"></a> `publishers?` | `Record`&lt;`string`, [`PublisherEntry`](#publisherentry)&gt; | Named publisher definitions. Can accept: - PublisherDefinition from definePublisher - EventPublisherConfig from defineEventPublisher (auto-extracted to publisher) | [types.ts:1080](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1080) |
+***
+### ContractOutput
+```ts
+type ContractOutput<TContract> = object;
+```
+Defined in: [types.ts:1299](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1299)
+Contract output type with all resources extracted and properly typed.
+This type represents the fully expanded contract with:
+- exchanges: Extracted from publishers and consumer bindings
+- queues: Extracted from consumers
+- bindings: Extracted from event/command consumers
+- publishers: Normalized publisher definitions
+- consumers: Normalized consumer definitions
+#### Type Parameters
+| Type Parameter |
+| ------ |
+| `TContract` *extends* [`ContractDefinitionInput`](#contractdefinitioninput) |
+#### Properties
+| Property | Type | Defined in |
+| ------ | ------ | ------ |
+| <a id="bindings-1"></a> `bindings` | `TContract`\[`"consumers"`\] *extends* `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; ? `ExtractBindingsFromConsumers`&lt;`TContract`\[`"consumers"`\]&gt; : `object` | [types.ts:1312](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1312) |
+| <a id="consumers-2"></a> `consumers` | `TContract`\[`"consumers"`\] *extends* `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; ? `ExtractConsumerDefinitions`&lt;`TContract`\[`"consumers"`\]&gt; : `object` | [types.ts:1318](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1318) |
+| <a id="exchanges-1"></a> `exchanges` | `TContract`\[`"publishers"`\] *extends* `Record`&lt;`string`, [`PublisherEntry`](#publisherentry)&gt; ? `ExtractExchangesFromPublishers`&lt;`TContract`\[`"publishers"`\]&gt; : `object` & `TContract`\[`"consumers"`\] *extends* `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; ? `ExtractExchangesFromConsumers`&lt;`TContract`\[`"consumers"`\]&gt; : `object` & `TContract`\[`"consumers"`\] *extends* `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; ? `ExtractDeadLetterExchangesFromConsumers`&lt;`TContract`\[`"consumers"`\]&gt; : `object` | [types.ts:1300](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1300) |
+| <a id="publishers-2"></a> `publishers` | `TContract`\[`"publishers"`\] *extends* `Record`&lt;`string`, [`PublisherEntry`](#publisherentry)&gt; ? `ExtractPublisherDefinitions`&lt;`TContract`\[`"publishers"`\]&gt; : `object` | [types.ts:1315](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1315) |
+| <a id="queues-1"></a> `queues` | `TContract`\[`"consumers"`\] *extends* `Record`&lt;`string`, [`ConsumerEntry`](#consumerentry)&gt; ? `ExtractQueuesFromConsumers`&lt;`TContract`\[`"consumers"`\]&gt; : `object` | [types.ts:1309](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1309) |
 ***
 ### DeadLetterConfig
@@ -430,7 +480,7 @@ defineContract - Processes this input and returns a ContractDefinition
 type DeadLetterConfig = object;
 ```
-Defined in: [types.ts:480](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L480)
+Defined in: [types.ts:483](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L483)
 Configuration for dead letter exchange (DLX) on a queue.
@@ -442,8 +492,8 @@ or storage.
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="exchange-2"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | The exchange to send dead-lettered messages to. This exchange must be declared in the contract. | [types.ts:485](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L485) |
-| <a id="routingkey-2"></a> `routingKey?` | `string` | Optional routing key to use when forwarding messages to the dead letter exchange. If not specified, the original message routing key is used. | [types.ts:491](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L491) |
+| <a id="exchange-2"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | The exchange to send dead-lettered messages to. This exchange must be declared in the contract. | [types.ts:488](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L488) |
+| <a id="routingkey-2"></a> `routingKey?` | `string` | Optional routing key to use when forwarding messages to the dead letter exchange. If not specified, the original message routing key is used. | [types.ts:494](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L494) |
 ***
@@ -455,7 +505,7 @@ type DefineQueueOptions =
   | ClassicQueueOptions;
 ```
-Defined in: [types.ts:368](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L368)
+Defined in: [types.ts:368](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L368)
 Options for defining a queue. Uses a discriminated union based on the `type` property
 to enforce quorum queue constraints at compile time.
@@ -471,7 +521,7 @@ to enforce quorum queue constraints at compile time.
 type DefineQuorumQueueOptions = object;
 ```
-Defined in: [builder/queue.ts:376](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L376)
+Defined in: [builder/queue.ts:390](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L390)
 Options for creating a quorum queue with quorum-native retry.
@@ -483,11 +533,11 @@ This simplified helper enforces the required configuration for quorum-native ret
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="arguments-1"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. | [builder/queue.ts:403](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L403) |
-| <a id="autodelete-1"></a> `autoDelete?` | `boolean` | If true, the queue is deleted when the last consumer unsubscribes. **Default** `false` | [builder/queue.ts:398](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L398) |
-| <a id="deadletterexchange"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) | Dead letter configuration - required for retry support. Failed messages will be sent to this exchange. | [builder/queue.ts:381](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L381) |
-| <a id="deadletterroutingkey"></a> `deadLetterRoutingKey?` | `string` | Optional routing key for dead-lettered messages. | [builder/queue.ts:386](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L386) |
-| <a id="deliverylimit"></a> `deliveryLimit` | `number` | Maximum number of delivery attempts before dead-lettering. **Minimum** 1 | [builder/queue.ts:392](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L392) |
+| <a id="arguments-1"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. | [builder/queue.ts:417](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L417) |
+| <a id="autodelete-1"></a> `autoDelete?` | `boolean` | If true, the queue is deleted when the last consumer unsubscribes. **Default** `false` | [builder/queue.ts:412](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L412) |
+| <a id="deadletterexchange-2"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) | Dead letter configuration - required for retry support. Failed messages will be sent to this exchange. | [builder/queue.ts:395](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L395) |
+| <a id="deadletterroutingkey"></a> `deadLetterRoutingKey?` | `string` | Optional routing key for dead-lettered messages. | [builder/queue.ts:400](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L400) |
+| <a id="deliverylimit"></a> `deliveryLimit` | `number` | Maximum number of delivery attempts before dead-lettering. **Minimum** 1 | [builder/queue.ts:406](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L406) |
 ***
@@ -497,7 +547,7 @@ This simplified helper enforces the required configuration for quorum-native ret
 type DefineTtlBackoffQueueOptions = object;
 ```
-Defined in: [builder/queue.ts:478](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L478)
+Defined in: [builder/queue.ts:492](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L492)
 Options for creating a queue with TTL-backoff retry.
@@ -509,25 +559,25 @@ This simplified helper enforces the required configuration for TTL-backoff retry
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="arguments-2"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. | [builder/queue.ts:529](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L529) |
-| <a id="autodelete-2"></a> `autoDelete?` | `boolean` | If true, the queue is deleted when the last consumer unsubscribes. **Default** `false` | [builder/queue.ts:524](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L524) |
-| <a id="backoffmultiplier"></a> `backoffMultiplier?` | `number` | Exponential backoff multiplier. **Default** `2` | [builder/queue.ts:512](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L512) |
-| <a id="deadletterexchange-1"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) | Dead letter exchange - required for TTL-backoff retry. Used for routing messages to the wait queue and back. | [builder/queue.ts:483](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L483) |
-| <a id="deadletterroutingkey-1"></a> `deadLetterRoutingKey?` | `string` | Optional routing key for dead-lettered messages. | [builder/queue.ts:488](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L488) |
-| <a id="initialdelayms"></a> `initialDelayMs?` | `number` | Initial delay in ms before first retry. **Default** `1000` | [builder/queue.ts:500](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L500) |
-| <a id="jitter"></a> `jitter?` | `boolean` | Add jitter to prevent thundering herd. **Default** `true` | [builder/queue.ts:518](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L518) |
-| <a id="maxdelayms"></a> `maxDelayMs?` | `number` | Maximum delay in ms between retries. **Default** `30000` | [builder/queue.ts:506](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L506) |
-| <a id="maxretries"></a> `maxRetries?` | `number` | Maximum retry attempts before sending to DLQ. **Default** `3` | [builder/queue.ts:494](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L494) |
+| <a id="arguments-2"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for advanced configuration. | [builder/queue.ts:543](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L543) |
+| <a id="autodelete-2"></a> `autoDelete?` | `boolean` | If true, the queue is deleted when the last consumer unsubscribes. **Default** `false` | [builder/queue.ts:538](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L538) |
+| <a id="backoffmultiplier"></a> `backoffMultiplier?` | `number` | Exponential backoff multiplier. **Default** `2` | [builder/queue.ts:526](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L526) |
+| <a id="deadletterexchange-3"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) | Dead letter exchange - required for TTL-backoff retry. Used for routing messages to the wait queue and back. | [builder/queue.ts:497](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L497) |
+| <a id="deadletterroutingkey-1"></a> `deadLetterRoutingKey?` | `string` | Optional routing key for dead-lettered messages. | [builder/queue.ts:502](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L502) |
+| <a id="initialdelayms"></a> `initialDelayMs?` | `number` | Initial delay in ms before first retry. **Default** `1000` | [builder/queue.ts:514](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L514) |
+| <a id="jitter"></a> `jitter?` | `boolean` | Add jitter to prevent thundering herd. **Default** `true` | [builder/queue.ts:532](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L532) |
+| <a id="maxdelayms"></a> `maxDelayMs?` | `number` | Maximum delay in ms between retries. **Default** `30000` | [builder/queue.ts:520](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L520) |
+| <a id="maxretries"></a> `maxRetries?` | `number` | Maximum retry attempts before sending to DLQ. **Default** `3` | [builder/queue.ts:508](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L508) |
 ***
 ### DirectExchangeDefinition
 ```ts
-type DirectExchangeDefinition = BaseExchangeDefinition & object;
+type DirectExchangeDefinition<TName> = BaseExchangeDefinition<TName> & object;
 ```
-Defined in: [types.ts:438](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L438)
+Defined in: [types.ts:439](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L439)
 A direct exchange definition.
@@ -538,7 +588,13 @@ This is ideal for point-to-point messaging where each message should go to speci
 | Name | Type | Defined in |
 | ------ | ------ | ------ |
-| `type` | `"direct"` | [types.ts:439](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L439) |
+| `type` | `"direct"` | [types.ts:441](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L441) |
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 #### Example
@@ -553,10 +609,10 @@ const tasksExchange: DirectExchangeDefinition = defineExchange('tasks', 'direct'
 ### EventConsumerResult
 ```ts
-type EventConsumerResult<TMessage> = object;
+type EventConsumerResult<TMessage, TExchange, TQueue, TDlxExchange> = object;
 ```
-Defined in: [builder/event.ts:52](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L52)
+Defined in: [builder/event.ts:55](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L55)
 Result from defineEventConsumer.
@@ -566,17 +622,23 @@ will be automatically extracted.
 #### Type Parameters
-| Type Parameter | Description |
-| ------ | ------ |
-| `TMessage` *extends* [`MessageDefinition`](#messagedefinition) | The message definition |
+| Type Parameter | Default type | Description |
+| ------ | ------ | ------ |
+| `TMessage` *extends* [`MessageDefinition`](#messagedefinition) | - | The message definition |
+| `TExchange` *extends* [`ExchangeDefinition`](#exchangedefinition) | [`ExchangeDefinition`](#exchangedefinition) | - |
+| `TQueue` *extends* [`QueueDefinition`](#queuedefinition) | [`QueueDefinition`](#queuedefinition) | - |
+| `TDlxExchange` *extends* [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | - |
 #### Properties
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="__brand-2"></a> `__brand` | `"EventConsumerResult"` | Discriminator to identify this as an event consumer result | [builder/event.ts:54](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L54) |
-| <a id="binding-2"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | The binding connecting the queue to the exchange | [builder/event.ts:58](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L58) |
-| <a id="consumer-2"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition)&lt;`TMessage`&gt; | The consumer definition for processing messages | [builder/event.ts:56](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L56) |
+| <a id="__brand-2"></a> `__brand` | `"EventConsumerResult"` | Discriminator to identify this as an event consumer result | [builder/event.ts:62](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L62) |
+| <a id="binding-2"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | The binding connecting the queue to the exchange | [builder/event.ts:66](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L66) |
+| <a id="consumer-2"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition)&lt;`TMessage`&gt; | The consumer definition for processing messages | [builder/event.ts:64](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L64) |
+| <a id="deadletterexchange-4"></a> `deadLetterExchange` | `TDlxExchange` | The dead letter exchange from the queue, if configured | [builder/event.ts:72](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L72) |
+| <a id="exchange-3"></a> `exchange` | `TExchange` | The exchange this consumer subscribes to | [builder/event.ts:68](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L68) |
+| <a id="queue-3"></a> `queue` | `TQueue` | The queue this consumer reads from | [builder/event.ts:70](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L70) |
 ***
@@ -586,7 +648,7 @@ will be automatically extracted.
 type EventConsumerResultBase = object;
 ```
-Defined in: [types.ts:929](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L929)
+Defined in: [types.ts:947](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L947)
 Base type for event consumer result.
@@ -601,9 +663,12 @@ defineEventConsumer for creating event consumers
 | Property | Type | Defined in |
 | ------ | ------ | ------ |
-| <a id="__brand-3"></a> `__brand` | `"EventConsumerResult"` | [types.ts:930](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L930) |
-| <a id="binding-3"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | [types.ts:932](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L932) |
-| <a id="consumer-3"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition) | [types.ts:931](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L931) |
+| <a id="__brand-3"></a> `__brand` | `"EventConsumerResult"` | [types.ts:948](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L948) |
+| <a id="binding-3"></a> `binding` | [`QueueBindingDefinition`](#queuebindingdefinition) | [types.ts:950](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L950) |
+| <a id="consumer-3"></a> `consumer` | [`ConsumerDefinition`](#consumerdefinition) | [types.ts:949](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L949) |
+| <a id="deadletterexchange-5"></a> `deadLetterExchange` | [`ExchangeDefinition`](#exchangedefinition) \| `undefined` | [types.ts:953](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L953) |
+| <a id="exchange-4"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | [types.ts:951](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L951) |
+| <a id="queue-4"></a> `queue` | [`QueueDefinition`](#queuedefinition) | [types.ts:952](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L952) |
 ***
@@ -613,7 +678,7 @@ defineEventConsumer for creating event consumers
 type EventPublisherConfig<TMessage, TExchange, TRoutingKey> = object;
 ```
-Defined in: [builder/event.ts:26](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L26)
+Defined in: [builder/event.ts:29](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L29)
 Configuration for an event publisher.
@@ -633,11 +698,11 @@ publishers broadcast events and consumers subscribe to receive them.
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="__brand-4"></a> `__brand` | `"EventPublisherConfig"` | Discriminator to identify this as an event publisher config | [builder/event.ts:32](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L32) |
-| <a id="arguments-3"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments | [builder/event.ts:40](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L40) |
-| <a id="exchange-3"></a> `exchange` | `TExchange` | The exchange to publish to | [builder/event.ts:34](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L34) |
-| <a id="message-3"></a> `message` | `TMessage` | The message definition | [builder/event.ts:36](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L36) |
-| <a id="routingkey-3"></a> `routingKey` | `TRoutingKey` | The routing key for direct/topic exchanges | [builder/event.ts:38](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L38) |
+| <a id="__brand-4"></a> `__brand` | `"EventPublisherConfig"` | Discriminator to identify this as an event publisher config | [builder/event.ts:35](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L35) |
+| <a id="arguments-3"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments | [builder/event.ts:43](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L43) |
+| <a id="exchange-5"></a> `exchange` | `TExchange` | The exchange to publish to | [builder/event.ts:37](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L37) |
+| <a id="message-3"></a> `message` | `TMessage` | The message definition | [builder/event.ts:39](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L39) |
+| <a id="routingkey-3"></a> `routingKey` | `TRoutingKey` | The routing key for direct/topic exchanges | [builder/event.ts:41](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L41) |
 ***
@@ -647,7 +712,7 @@ publishers broadcast events and consumers subscribe to receive them.
 type EventPublisherConfigBase = object;
 ```
-Defined in: [types.ts:896](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L896)
+Defined in: [types.ts:912](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L912)
 Base type for event publisher configuration.
@@ -662,11 +727,11 @@ defineEventPublisher for creating event publishers
 | Property | Type | Defined in |
 | ------ | ------ | ------ |
-| <a id="__brand-5"></a> `__brand` | `"EventPublisherConfig"` | [types.ts:897](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L897) |
-| <a id="arguments-4"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | [types.ts:901](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L901) |
-| <a id="exchange-4"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | [types.ts:898](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L898) |
-| <a id="message-4"></a> `message` | [`MessageDefinition`](#messagedefinition) | [types.ts:899](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L899) |
-| <a id="routingkey-4"></a> `routingKey` | `string` \| `undefined` | [types.ts:900](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L900) |
+| <a id="__brand-5"></a> `__brand` | `"EventPublisherConfig"` | [types.ts:913](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L913) |
+| <a id="arguments-4"></a> `arguments?` | `Record`&lt;`string`, `unknown`&gt; | [types.ts:917](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L917) |
+| <a id="exchange-6"></a> `exchange` | [`ExchangeDefinition`](#exchangedefinition) | [types.ts:914](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L914) |
+| <a id="message-4"></a> `message` | [`MessageDefinition`](#messagedefinition) | [types.ts:915](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L915) |
+| <a id="routingkey-4"></a> `routingKey` | `string` \| `undefined` | [types.ts:916](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L916) |
 ***
@@ -685,7 +750,7 @@ type ExchangeBindingDefinition = object &
 };
 ```
-Defined in: [types.ts:779](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L779)
+Defined in: [types.ts:795](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L795)
 Binding between two exchanges (exchange-to-exchange routing).
@@ -696,9 +761,9 @@ This allows for more complex routing topologies.
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for the binding. | [types.ts:789](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L789) |
-| `destination` | [`ExchangeDefinition`](#exchangedefinition) | The destination exchange that will receive forwarded messages | [types.ts:784](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L784) |
-| `type` | `"exchange"` | Discriminator indicating this is an exchange-to-exchange binding | [types.ts:781](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L781) |
+| `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for the binding. | [types.ts:805](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L805) |
+| `destination` | [`ExchangeDefinition`](#exchangedefinition) | The destination exchange that will receive forwarded messages | [types.ts:800](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L800) |
+| `type` | `"exchange"` | Discriminator indicating this is an exchange-to-exchange binding | [types.ts:797](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L797) |
 #### Example
@@ -717,27 +782,33 @@ const binding: ExchangeBindingDefinition = {
 ### ExchangeDefinition
 ```ts
-type ExchangeDefinition =
-  | FanoutExchangeDefinition
-  | DirectExchangeDefinition
-  | TopicExchangeDefinition;
+type ExchangeDefinition<TName> =
+  | FanoutExchangeDefinition<TName>
+  | DirectExchangeDefinition<TName>
+  | TopicExchangeDefinition<TName>;
 ```
-Defined in: [types.ts:468](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L468)
+Defined in: [types.ts:471](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L471)
 Union type of all exchange definitions.
 Represents any type of AMQP exchange: fanout, direct, or topic.
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 ***
 ### FanoutExchangeDefinition
 ```ts
-type FanoutExchangeDefinition = BaseExchangeDefinition & object;
+type FanoutExchangeDefinition<TName> = BaseExchangeDefinition<TName> & object;
 ```
-Defined in: [types.ts:421](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L421)
+Defined in: [types.ts:421](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L421)
 A fanout exchange definition.
@@ -748,7 +819,13 @@ This is the simplest exchange type for pub/sub messaging patterns.
 | Name | Type | Defined in |
 | ------ | ------ | ------ |
-| `type` | `"fanout"` | [types.ts:422](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L422) |
+| `type` | `"fanout"` | [types.ts:423](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L423) |
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 #### Example
@@ -766,7 +843,7 @@ const logsExchange: FanoutExchangeDefinition = defineExchange('logs', 'fanout',
 type InferConsumerNames<TContract> = TContract["consumers"] extends Record<string, unknown> ? keyof TContract["consumers"] : never;
 ```
-Defined in: [types.ts:1108](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1108)
+Defined in: [types.ts:1356](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1356)
 Extract consumer names from a contract.
@@ -798,7 +875,7 @@ type ConsumerNames = InferConsumerNames<typeof myContract>;
 type InferPublisherNames<TContract> = TContract["publishers"] extends Record<string, unknown> ? keyof TContract["publishers"] : never;
 ```
-Defined in: [types.ts:1090](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1090)
+Defined in: [types.ts:1338](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1338)
 Extract publisher names from a contract.
@@ -830,7 +907,7 @@ type PublisherNames = InferPublisherNames<typeof myContract>;
 type MatchingRoutingKey<Pattern, Key> = RoutingKey<Key> extends never ? never : BindingPattern<Pattern> extends never ? never : MatchesPattern<Key, Pattern> extends true ? Key : never;
 ```
-Defined in: [builder/routing-types.ts:114](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/routing-types.ts#L114)
+Defined in: [builder/routing-types.ts:114](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/routing-types.ts#L114)
 Validate that a routing key matches a binding pattern.
@@ -862,7 +939,7 @@ type InvalidKey = MatchingRoutingKey<"order.*", "user.created">; // never
 type MessageDefinition<TPayload, THeaders> = object;
 ```
-Defined in: [types.ts:695](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L695)
+Defined in: [types.ts:711](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L711)
 Definition of a message with typed payload and optional headers.
@@ -877,10 +954,10 @@ Definition of a message with typed payload and optional headers.
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="description"></a> `description?` | `string` | Detailed description of the message for documentation purposes. Used in AsyncAPI specification generation. | [types.ts:721](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L721) |
-| <a id="headers"></a> `headers?` | `THeaders` | Optional headers schema for validating message metadata. Must be a Standard Schema v1 compatible schema. | [types.ts:709](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L709) |
-| <a id="payload"></a> `payload` | `TPayload` | The payload schema for validating message content. Must be a Standard Schema v1 compatible schema (Zod, Valibot, ArkType, etc.). | [types.ts:703](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L703) |
-| <a id="summary"></a> `summary?` | `string` | Brief description of the message for documentation purposes. Used in AsyncAPI specification generation. | [types.ts:715](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L715) |
+| <a id="description"></a> `description?` | `string` | Detailed description of the message for documentation purposes. Used in AsyncAPI specification generation. | [types.ts:737](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L737) |
+| <a id="headers"></a> `headers?` | `THeaders` | Optional headers schema for validating message metadata. Must be a Standard Schema v1 compatible schema. | [types.ts:725](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L725) |
+| <a id="payload"></a> `payload` | `TPayload` | The payload schema for validating message content. Must be a Standard Schema v1 compatible schema (Zod, Valibot, ArkType, etc.). | [types.ts:719](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L719) |
+| <a id="summary"></a> `summary?` | `string` | Brief description of the message for documentation purposes. Used in AsyncAPI specification generation. | [types.ts:731](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L731) |
 ***
@@ -899,7 +976,7 @@ type PublisherDefinition<TMessage> = object &
 };
 ```
-Defined in: [types.ts:837](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L837)
+Defined in: [types.ts:853](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L853)
 Definition of a message publisher.
@@ -913,7 +990,7 @@ algorithm when calling the publish method.
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `message` | `TMessage` | The message definition including the payload schema | [types.ts:839](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L839) |
+| `message` | `TMessage` | The message definition including the payload schema | [types.ts:855](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L855) |
 #### Type Parameters
@@ -941,7 +1018,7 @@ type PublisherEntry =
   | EventPublisherConfigBase;
 ```
-Defined in: [types.ts:1012](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L1012)
+Defined in: [types.ts:1033](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L1033)
 Publisher entry that can be passed to defineContract's publishers section.
@@ -966,7 +1043,7 @@ type QueueBindingDefinition = object &
 };
 ```
-Defined in: [types.ts:731](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L731)
+Defined in: [types.ts:747](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L747)
 Binding between a queue and an exchange.
@@ -978,21 +1055,21 @@ For fanout exchanges, no routing key is needed as all messages are broadcast.
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for the binding. Can be used for advanced routing scenarios with the headers exchange type. | [types.ts:742](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L742) |
-| `queue` | [`QueueDefinition`](#queuedefinition) | The queue that will receive messages | [types.ts:736](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L736) |
-| `type` | `"queue"` | Discriminator indicating this is a queue-to-exchange binding | [types.ts:733](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L733) |
+| `arguments?` | `Record`&lt;`string`, `unknown`&gt; | Additional AMQP arguments for the binding. Can be used for advanced routing scenarios with the headers exchange type. | [types.ts:758](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L758) |
+| `queue` | [`QueueDefinition`](#queuedefinition) | The queue that will receive messages | [types.ts:752](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L752) |
+| `type` | `"queue"` | Discriminator indicating this is a queue-to-exchange binding | [types.ts:749](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L749) |
 ***
 ### QueueDefinition
 ```ts
-type QueueDefinition =
-  | QuorumQueueDefinition
-  | ClassicQueueDefinition;
+type QueueDefinition<TName> =
+  | QuorumQueueDefinition<TName>
+  | ClassicQueueDefinition<TName>;
 ```
-Defined in: [types.ts:629](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L629)
+Defined in: [types.ts:632](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L632)
 Definition of an AMQP queue.
@@ -1002,22 +1079,34 @@ A discriminated union based on queue type:
 Use `queue.type` as the discriminator to narrow the type.
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 ***
 ### QueueEntry
 ```ts
-type QueueEntry =
-  | QueueDefinition
-  | QueueWithTtlBackoffInfrastructure;
+type QueueEntry<TName> =
+  | QueueDefinition<TName>
+  | QueueWithTtlBackoffInfrastructure<TName>;
 ```
-Defined in: [types.ts:687](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L687)
+Defined in: [types.ts:701](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L701)
 A queue entry that can be passed to `defineContract`.
 Can be either a plain queue definition or a queue with TTL-backoff infrastructure.
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 ***
 ### QueueType
@@ -1026,7 +1115,7 @@ Can be either a plain queue definition or a queue with TTL-backoff infrastructur
 type QueueType = "quorum" | "classic";
 ```
-Defined in: [types.ts:163](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L163)
+Defined in: [types.ts:163](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L163)
 Supported queue types in RabbitMQ.
@@ -1062,10 +1151,10 @@ const tempQueue = defineQueue('temp-queue', {
 ### QueueWithTtlBackoffInfrastructure
 ```ts
-type QueueWithTtlBackoffInfrastructure = object;
+type QueueWithTtlBackoffInfrastructure<TName> = object;
 ```
-Defined in: [types.ts:654](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L654)
+Defined in: [types.ts:662](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L662)
 A queue with automatically generated TTL-backoff retry infrastructure.
@@ -1077,27 +1166,37 @@ and bindings are automatically added to the contract.
 ```typescript
 const dlx = defineExchange('orders-dlx', 'direct', { durable: true });
+const exchange = defineExchange('orders', 'topic', { durable: true });
 const queue = defineQueue('order-processing', {
   deadLetter: { exchange: dlx },
   retry: { mode: 'ttl-backoff', maxRetries: 5 },
 });
 // queue is QueueWithTtlBackoffInfrastructure
+const message = defineMessage(z.object({ orderId: z.string() }));
+const orderCreated = defineEventPublisher(exchange, message, { routingKey: 'order.created' });
+// Wait queue, bindings, and DLX exchange are automatically extracted
 const contract = defineContract({
-  exchanges: { dlx },
-  queues: { orderProcessing: queue }, // Automatically adds wait queue
-  // ... bindings are automatically generated
+  publishers: { orderCreated },
+  consumers: { processOrder: defineEventConsumer(orderCreated, extractQueue(queue)) },
 });
 ```
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 #### Properties
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="mainqueueretrybinding"></a> `mainQueueRetryBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes retried messages back to the main queue. | [types.ts:679](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L679) |
-| <a id="queue-1"></a> `queue` | [`QueueDefinition`](#queuedefinition) | The main queue definition. | [types.ts:664](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L664) |
-| <a id="waitqueue"></a> `waitQueue` | [`QueueDefinition`](#queuedefinition) | The wait queue for holding messages during backoff delay. | [types.ts:669](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L669) |
-| <a id="waitqueuebinding"></a> `waitQueueBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes failed messages to the wait queue. | [types.ts:674](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L674) |
+| <a id="deadletter"></a> `deadLetter` | [`DeadLetterConfig`](#deadletterconfig) | Dead letter configuration from the main queue. Always present since TTL-backoff infrastructure requires a dead letter exchange. | [types.ts:678](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L678) |
+| <a id="mainqueueretrybinding"></a> `mainQueueRetryBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes retried messages back to the main queue. | [types.ts:693](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L693) |
+| <a id="queue-5"></a> `queue` | [`QueueDefinition`](#queuedefinition)&lt;`TName`&gt; | The main queue definition. | [types.ts:672](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L672) |
+| <a id="waitqueue"></a> `waitQueue` | [`QueueDefinition`](#queuedefinition) | The wait queue for holding messages during backoff delay. | [types.ts:683](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L683) |
+| <a id="waitqueuebinding"></a> `waitQueueBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes failed messages to the wait queue. | [types.ts:688](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L688) |
 ***
@@ -1107,7 +1206,7 @@ const contract = defineContract({
 type QuorumNativeRetryOptions = object;
 ```
-Defined in: [types.ts:72](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L72)
+Defined in: [types.ts:72](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L72)
 Quorum-Native retry options using RabbitMQ's native delivery limit feature.
@@ -1127,17 +1226,17 @@ https://www.rabbitmq.com/docs/quorum-queues#poison-message-handling
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="mode"></a> `mode` | `"quorum-native"` | Quorum-Native mode uses RabbitMQ's native delivery limit feature. Requires the queue to be a quorum queue with `deliveryLimit` configured. | [types.ts:77](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L77) |
+| <a id="mode"></a> `mode` | `"quorum-native"` | Quorum-Native mode uses RabbitMQ's native delivery limit feature. Requires the queue to be a quorum queue with `deliveryLimit` configured. | [types.ts:77](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L77) |
 ***
 ### QuorumQueueDefinition
 ```ts
-type QuorumQueueDefinition = BaseQueueDefinition & object;
+type QuorumQueueDefinition<TName> = BaseQueueDefinition<TName> & object;
 ```
-Defined in: [types.ts:542](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L542)
+Defined in: [types.ts:545](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L545)
 Definition of a quorum queue.
@@ -1148,11 +1247,17 @@ They support native retry handling via `deliveryLimit` and both TTL-backoff and
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `deliveryLimit?` | `number` | Maximum number of delivery attempts before the message is dead-lettered. This is a quorum queue-specific feature. When a message is rejected (nacked) and requeued, RabbitMQ increments the `x-delivery-count` header. When this count reaches the delivery limit, the message is automatically dead-lettered (if DLX is configured) or dropped. **Minimum** 1 - Must be a positive integer (1 or greater) **See** https://www.rabbitmq.com/docs/quorum-queues#poison-message-handling | [types.ts:572](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L572) |
-| `exclusive?` | `never` | Quorum queues do not support exclusive mode. Use type: 'classic' if you need exclusive queues. | [types.ts:552](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L552) |
-| `maxPriority?` | `never` | Quorum queues do not support priority queues. Use type: 'classic' if you need priority queues. | [types.ts:558](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L558) |
-| `retry` | [`ResolvedRetryOptions`](#resolvedretryoptions) | Retry configuration for handling failed message processing. Quorum queues support both: - `ttl-backoff`: Uses wait queues with exponential backoff (default) - `quorum-native`: Uses RabbitMQ's native delivery limit feature When the queue is created, defaults are applied for TTL-backoff options. | [types.ts:583](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L583) |
-| `type` | `"quorum"` | Queue type discriminator: quorum queue. | [types.ts:546](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L546) |
+| `deliveryLimit?` | `number` | Maximum number of delivery attempts before the message is dead-lettered. This is a quorum queue-specific feature. When a message is rejected (nacked) and requeued, RabbitMQ increments the `x-delivery-count` header. When this count reaches the delivery limit, the message is automatically dead-lettered (if DLX is configured) or dropped. **Minimum** 1 - Must be a positive integer (1 or greater) **See** https://www.rabbitmq.com/docs/quorum-queues#poison-message-handling | [types.ts:575](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L575) |
+| `exclusive?` | `never` | Quorum queues do not support exclusive mode. Use type: 'classic' if you need exclusive queues. | [types.ts:555](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L555) |
+| `maxPriority?` | `never` | Quorum queues do not support priority queues. Use type: 'classic' if you need priority queues. | [types.ts:561](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L561) |
+| `retry` | [`ResolvedRetryOptions`](#resolvedretryoptions) | Retry configuration for handling failed message processing. Quorum queues support both: - `ttl-backoff`: Uses wait queues with exponential backoff (default) - `quorum-native`: Uses RabbitMQ's native delivery limit feature When the queue is created, defaults are applied for TTL-backoff options. | [types.ts:586](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L586) |
+| `type` | `"quorum"` | Queue type discriminator: quorum queue. | [types.ts:549](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L549) |
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 ***
@@ -1162,7 +1267,7 @@ They support native retry handling via `deliveryLimit` and both TTL-backoff and
 type QuorumQueueOptions = BaseQueueOptions & object;
 ```
-Defined in: [types.ts:214](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L214)
+Defined in: [types.ts:214](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L214)
 Options for creating a quorum queue.
@@ -1179,11 +1284,11 @@ Quorum queues provide native retry support via `deliveryLimit`:
 | Name | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| `deliveryLimit?` | `number` | Maximum number of delivery attempts before the message is dead-lettered. When a message is rejected (nacked) and requeued, RabbitMQ increments the `x-delivery-count` header. When this count reaches the delivery limit, the message is automatically dead-lettered (if DLX is configured) or dropped. This is a quorum queue-specific feature that provides native retry handling without the complexity of TTL-based wait queues. **Benefits over TTL-based retry:** - Simpler architecture (no wait queues needed) - No head-of-queue blocking issues (TTL only works at queue head) - Native RabbitMQ feature with atomic guarantees **Minimum** 1 - Must be a positive integer (1 or greater) **See** https://www.rabbitmq.com/docs/quorum-queues#poison-message-handling **Example** `const orderQueue = defineQueue('order-processing', { type: 'quorum', deliveryLimit: 5, // Allow up to 5 delivery attempts deadLetter: { exchange: dlx, routingKey: 'order.failed', }, });` | [types.ts:263](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L263) |
-| `exclusive?` | `never` | Quorum queues do not support exclusive mode. Use type: 'classic' if you need exclusive queues. | [types.ts:224](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L224) |
-| `maxPriority?` | `never` | Quorum queues do not support priority queues. Use type: 'classic' if you need priority queues. | [types.ts:230](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L230) |
-| `retry?` | \| [`TtlBackoffRetryOptions`](#ttlbackoffretryoptions) \| [`QuorumNativeRetryOptions`](#quorumnativeretryoptions) | Retry configuration for handling failed message processing. Determines how the worker handles retries for consumers using this queue: - `"ttl-backoff"` (default): Uses wait queues with exponential backoff - `"quorum-native"`: Uses RabbitMQ's native delivery limit feature When using `"ttl-backoff"` mode, the core package will automatically create a wait queue (`{queueName}-wait`) and the necessary bindings. **Example** `// TTL-backoff mode with custom options const orderQueue = defineQueue('order-processing', { type: 'quorum', deadLetter: { exchange: dlx }, retry: { mode: 'ttl-backoff', maxRetries: 5, initialDelayMs: 1000, maxDelayMs: 30000, }, }); // Quorum-native mode const orderQueue = defineQueue('order-processing', { type: 'quorum', deliveryLimit: 5, deadLetter: { exchange: dlx }, retry: { mode: 'quorum-native' }, });` | [types.ts:298](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L298) |
-| `type?` | `"quorum"` | Queue type: quorum (default, recommended) | [types.ts:218](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L218) |
+| `deliveryLimit?` | `number` | Maximum number of delivery attempts before the message is dead-lettered. When a message is rejected (nacked) and requeued, RabbitMQ increments the `x-delivery-count` header. When this count reaches the delivery limit, the message is automatically dead-lettered (if DLX is configured) or dropped. This is a quorum queue-specific feature that provides native retry handling without the complexity of TTL-based wait queues. **Benefits over TTL-based retry:** - Simpler architecture (no wait queues needed) - No head-of-queue blocking issues (TTL only works at queue head) - Native RabbitMQ feature with atomic guarantees **Minimum** 1 - Must be a positive integer (1 or greater) **See** https://www.rabbitmq.com/docs/quorum-queues#poison-message-handling **Example** `const orderQueue = defineQueue('order-processing', { type: 'quorum', deliveryLimit: 5, // Allow up to 5 delivery attempts deadLetter: { exchange: dlx, routingKey: 'order.failed', }, });` | [types.ts:263](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L263) |
+| `exclusive?` | `never` | Quorum queues do not support exclusive mode. Use type: 'classic' if you need exclusive queues. | [types.ts:224](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L224) |
+| `maxPriority?` | `never` | Quorum queues do not support priority queues. Use type: 'classic' if you need priority queues. | [types.ts:230](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L230) |
+| `retry?` | \| [`TtlBackoffRetryOptions`](#ttlbackoffretryoptions) \| [`QuorumNativeRetryOptions`](#quorumnativeretryoptions) | Retry configuration for handling failed message processing. Determines how the worker handles retries for consumers using this queue: - `"ttl-backoff"` (default): Uses wait queues with exponential backoff - `"quorum-native"`: Uses RabbitMQ's native delivery limit feature When using `"ttl-backoff"` mode, the core package will automatically create a wait queue (`{queueName}-wait`) and the necessary bindings. **Example** `// TTL-backoff mode with custom options const orderQueue = defineQueue('order-processing', { type: 'quorum', deadLetter: { exchange: dlx }, retry: { mode: 'ttl-backoff', maxRetries: 5, initialDelayMs: 1000, maxDelayMs: 30000, }, }); // Quorum-native mode const orderQueue = defineQueue('order-processing', { type: 'quorum', deliveryLimit: 5, deadLetter: { exchange: dlx }, retry: { mode: 'quorum-native' }, });` | [types.ts:298](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L298) |
+| `type?` | `"quorum"` | Queue type: quorum (default, recommended) | [types.ts:218](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L218) |
 #### Example
@@ -1205,7 +1310,7 @@ type ResolvedRetryOptions =
   | QuorumNativeRetryOptions;
 ```
-Defined in: [types.ts:104](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L104)
+Defined in: [types.ts:104](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L104)
 Resolved retry configuration stored in queue definitions.
@@ -1221,7 +1326,7 @@ This is a discriminated union based on the `mode` field:
 type RoutingKey<S> = S extends "" ? never : S extends `${string}*${string}` | `${string}#${string}` ? never : S;
 ```
-Defined in: [builder/routing-types.ts:25](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/routing-types.ts#L25)
+Defined in: [builder/routing-types.ts:25](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/routing-types.ts#L25)
 Type-safe routing key that validates basic format.
@@ -1252,10 +1357,10 @@ type Invalid2 = RoutingKey<"">; // never (empty string)
 ### TopicExchangeDefinition
 ```ts
-type TopicExchangeDefinition = BaseExchangeDefinition & object;
+type TopicExchangeDefinition<TName> = BaseExchangeDefinition<TName> & object;
 ```
-Defined in: [types.ts:459](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L459)
+Defined in: [types.ts:461](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L461)
 A topic exchange definition.
@@ -1269,7 +1374,13 @@ Words are separated by dots (e.g., `order.created.high-value`).
 | Name | Type | Defined in |
 | ------ | ------ | ------ |
-| `type` | `"topic"` | [types.ts:460](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L460) |
+| `type` | `"topic"` | [types.ts:463](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L463) |
+#### Type Parameters
+| Type Parameter | Default type |
+| ------ | ------ |
+| `TName` *extends* `string` | `string` |
 #### Example
@@ -1288,7 +1399,7 @@ const ordersExchange: TopicExchangeDefinition = defineExchange('orders', 'topic'
 type TtlBackoffRetryInfrastructure = object;
 ```
-Defined in: [builder/ttl-backoff.ts:10](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/ttl-backoff.ts#L10)
+Defined in: [builder/ttl-backoff.ts:10](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/ttl-backoff.ts#L10)
 Result type for TTL-backoff retry infrastructure builder.
@@ -1298,9 +1409,9 @@ Contains the wait queue and bindings needed for TTL-backoff retry.
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="mainqueueretrybinding-1"></a> `mainQueueRetryBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes retried messages back to the main queue. | [builder/ttl-backoff.ts:23](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/ttl-backoff.ts#L23) |
-| <a id="waitqueue-1"></a> `waitQueue` | [`QueueDefinition`](#queuedefinition) | The wait queue for holding messages during backoff delay. This is a classic queue with a dead letter exchange pointing back to the main queue. | [builder/ttl-backoff.ts:15](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/ttl-backoff.ts#L15) |
-| <a id="waitqueuebinding-1"></a> `waitQueueBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes failed messages to the wait queue. | [builder/ttl-backoff.ts:19](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/ttl-backoff.ts#L19) |
+| <a id="mainqueueretrybinding-1"></a> `mainQueueRetryBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes retried messages back to the main queue. | [builder/ttl-backoff.ts:23](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/ttl-backoff.ts#L23) |
+| <a id="waitqueue-1"></a> `waitQueue` | [`QueueDefinition`](#queuedefinition) | The wait queue for holding messages during backoff delay. This is a classic queue with a dead letter exchange pointing back to the main queue. | [builder/ttl-backoff.ts:15](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/ttl-backoff.ts#L15) |
+| <a id="waitqueuebinding-1"></a> `waitQueueBinding` | [`QueueBindingDefinition`](#queuebindingdefinition) | Binding that routes failed messages to the wait queue. | [builder/ttl-backoff.ts:19](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/ttl-backoff.ts#L19) |
 ***
@@ -1310,7 +1421,7 @@ Contains the wait queue and bindings needed for TTL-backoff retry.
 type TtlBackoffRetryOptions = object;
 ```
-Defined in: [types.ts:27](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L27)
+Defined in: [types.ts:27](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L27)
 TTL-Backoff retry options for exponential backoff with configurable delays.
@@ -1324,12 +1435,12 @@ per-message TTL, then dead-lettered back to the main queue after the TTL expires
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="backoffmultiplier-1"></a> `backoffMultiplier?` | `number` | Exponential backoff multiplier. **Default** `2` | [types.ts:51](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L51) |
-| <a id="initialdelayms-1"></a> `initialDelayMs?` | `number` | Initial delay in ms before first retry. **Default** `1000` | [types.ts:41](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L41) |
-| <a id="jitter-1"></a> `jitter?` | `boolean` | Add jitter to prevent thundering herd. **Default** `true` | [types.ts:56](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L56) |
-| <a id="maxdelayms-1"></a> `maxDelayMs?` | `number` | Maximum delay in ms between retries. **Default** `30000` | [types.ts:46](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L46) |
-| <a id="maxretries-1"></a> `maxRetries?` | `number` | Maximum retry attempts before sending to DLQ. **Default** `3` | [types.ts:36](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L36) |
-| <a id="mode-1"></a> `mode` | `"ttl-backoff"` | TTL-Backoff mode uses wait queues with per-message TTL for exponential backoff. | [types.ts:31](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/types.ts#L31) |
+| <a id="backoffmultiplier-1"></a> `backoffMultiplier?` | `number` | Exponential backoff multiplier. **Default** `2` | [types.ts:51](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L51) |
+| <a id="initialdelayms-1"></a> `initialDelayMs?` | `number` | Initial delay in ms before first retry. **Default** `1000` | [types.ts:41](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L41) |
+| <a id="jitter-1"></a> `jitter?` | `boolean` | Add jitter to prevent thundering herd. **Default** `true` | [types.ts:56](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L56) |
+| <a id="maxdelayms-1"></a> `maxDelayMs?` | `number` | Maximum delay in ms between retries. **Default** `30000` | [types.ts:46](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L46) |
+| <a id="maxretries-1"></a> `maxRetries?` | `number` | Maximum retry attempts before sending to DLQ. **Default** `3` | [types.ts:36](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L36) |
+| <a id="mode-1"></a> `mode` | `"ttl-backoff"` | TTL-Backoff mode uses wait queues with per-message TTL for exponential backoff. | [types.ts:31](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/types.ts#L31) |
 ## Functions
@@ -1342,7 +1453,7 @@ function defineConsumer<TMessage>(
    options?): ConsumerDefinition<TMessage>;
 ```
-Defined in: [builder/consumer.ts:62](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/consumer.ts#L62)
+Defined in: [builder/consumer.ts:121](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/consumer.ts#L121)
 Define a message consumer.
@@ -1424,15 +1535,16 @@ const processOrderConsumer = defineConsumer(orderQueue, orderMessage);
 ### defineContract()
 ```ts
-function defineContract<TContract>(definition): TContract;
+function defineContract<TContract>(definition): ContractOutput<TContract>;
 ```
-Defined in: [builder/contract.ts:90](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/contract.ts#L90)
+Defined in: [builder/contract.ts:84](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/contract.ts#L84)
 Define an AMQP contract.
 A contract is the central definition of your AMQP messaging topology. It brings together
-all exchanges, queues, bindings, publishers, and consumers in a single, type-safe definition.
+publishers and consumers in a single, type-safe definition. Exchanges, queues, and bindings
+are automatically extracted from publishers and consumers.
 The contract is used by both clients (for publishing) and workers (for consuming) to ensure
 type safety throughout your messaging infrastructure. TypeScript will infer all message types
@@ -1448,13 +1560,13 @@ and publisher/consumer names from the contract.
 | Parameter | Type | Description |
 | ------ | ------ | ------ |
-| `definition` | `TContract` | The contract definition containing all AMQP resources |
+| `definition` | `TContract` | The contract definition containing publishers and consumers |
 #### Returns
-`TContract`
+[`ContractOutput`](#contractoutput)&lt;`TContract`&gt;
-The same contract definition with full type inference
+The contract definition with fully inferred exchanges, queues, bindings, publishers, and consumers
 #### Example
@@ -1463,16 +1575,20 @@ import {
   defineContract,
   defineExchange,
   defineQueue,
-  defineQueueBinding,
-  definePublisher,
-  defineConsumer,
+  defineEventPublisher,
+  defineEventConsumer,
   defineMessage,
 } from '@amqp-contract/contract';
 import { z } from 'zod';
 // Define resources
 const ordersExchange = defineExchange('orders', 'topic', { durable: true });
-const orderQueue = defineQueue('order-processing', { durable: true });
+const dlx = defineExchange('orders-dlx', 'direct', { durable: true });
+const orderQueue = defineQueue('order-processing', {
+  deadLetter: { exchange: dlx },
+  retry: { mode: 'quorum-native' },
+  deliveryLimit: 3,
+});
 const orderMessage = defineMessage(
   z.object({
     orderId: z.string(),
@@ -1480,32 +1596,27 @@ const orderMessage = defineMessage(
   })
 );
-// Compose contract
+// Define event publisher
+const orderCreatedEvent = defineEventPublisher(ordersExchange, orderMessage, {
+  routingKey: 'order.created',
+});
+// Compose contract - exchanges, queues, bindings are auto-extracted
 export const contract = defineContract({
-  exchanges: {
-    orders: ordersExchange,
-  },
-  queues: {
-    orderProcessing: orderQueue,
-  },
-  bindings: {
-    orderBinding: defineQueueBinding(orderQueue, ordersExchange, {
-      routingKey: 'order.created',
-    }),
-  },
   publishers: {
-    orderCreated: definePublisher(ordersExchange, orderMessage, {
-      routingKey: 'order.created',
-    }),
+    orderCreated: orderCreatedEvent,
   },
   consumers: {
-    processOrder: defineConsumer(orderQueue, orderMessage),
+    processOrder: defineEventConsumer(orderCreatedEvent, orderQueue),
   },
 });
 // TypeScript now knows:
+// - contract.exchanges.orders, contract.exchanges['orders-dlx']
+// - contract.queues['order-processing']
+// - contract.bindings.processOrderBinding
 // - client.publish('orderCreated', { orderId: string, amount: number })
-// - handler: async (message: { orderId: string, amount: number }) => void
+// - handler: (message: { orderId: string, amount: number }) => Future<Result<void, HandlerError>>
 ```
 ***
@@ -1516,7 +1627,7 @@ export const contract = defineContract({
 function defineMessage<TPayload, THeaders>(payload, options?): MessageDefinition<TPayload, THeaders>;
 ```
-Defined in: [builder/message.ts:39](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/message.ts#L39)
+Defined in: [builder/message.ts:39](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/message.ts#L39)
 Define a message definition with payload and optional headers/metadata.
@@ -1573,13 +1684,13 @@ const orderMessage = defineMessage(
 ### defineQueue()
+#### Call Signature
 ```ts
-function defineQueue(name, options?):
-  | QueueDefinition
-  | QueueWithTtlBackoffInfrastructure;
+function defineQueue<TName, TDlx>(name, options): QueueDefinition<TName> | QueueWithTtlBackoffInfrastructure<TName> & object;
 ```
-Defined in: [builder/queue.ts:244](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L244)
+Defined in: [builder/queue.ts:246](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L246)
 Define an AMQP queue.
@@ -1590,21 +1701,108 @@ By default, queues are created as quorum queues which provide better durability
 high-availability. Use `type: 'classic'` for special cases like non-durable queues
 or priority queues.
-#### Parameters
+##### Type Parameters
+| Type Parameter |
+| ------ |
+| `TName` *extends* `string` |
+| `TDlx` *extends* [`ExchangeDefinition`](#exchangedefinition) |
+##### Parameters
 | Parameter | Type | Description |
 | ------ | ------ | ------ |
-| `name` | `string` | The name of the queue |
+| `name` | `TName` | The name of the queue |
+| `options` | [`DefineQueueOptions`](#definequeueoptions) & `object` | Optional queue configuration |
+##### Returns
+QueueDefinition\<TName\> \| QueueWithTtlBackoffInfrastructure\<TName\> & `object`
+A queue definition
+##### Example
+```typescript
+// Quorum queue (default, recommended for production)
+const orderQueue = defineQueue('order-processing');
+// Explicit quorum queue with dead letter exchange
+const dlx = defineExchange('orders-dlx', 'topic', { durable: true });
+const orderQueueWithDLX = defineQueue('order-processing', {
+  type: 'quorum',
+  deadLetter: {
+    exchange: dlx,
+    routingKey: 'order.failed'
+  },
+  arguments: {
+    'x-message-ttl': 86400000, // 24 hours
+  }
+});
+// Classic queue (for special cases)
+const tempQueue = defineQueue('temp-queue', {
+  type: 'classic',
+  durable: false,
+  autoDelete: true,
+});
+// Priority queue (requires classic type)
+const taskQueue = defineQueue('urgent-tasks', {
+  type: 'classic',
+  durable: true,
+  maxPriority: 10,
+});
+// Queue with TTL-backoff retry (returns infrastructure automatically)
+const dlx = defineExchange('orders-dlx', 'direct', { durable: true });
+const orderQueue = defineQueue('order-processing', {
+  deadLetter: { exchange: dlx },
+  retry: { mode: 'ttl-backoff', maxRetries: 5 },
+});
+// orderQueue is QueueWithTtlBackoffInfrastructure, pass directly to defineContract
+```
+#### Call Signature
+```ts
+function defineQueue<TName>(name, options?):
+  | QueueDefinition<TName>
+  | QueueWithTtlBackoffInfrastructure<TName>;
+```
+Defined in: [builder/queue.ts:253](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L253)
+Define an AMQP queue.
+A queue stores messages until they are consumed by workers. Queues can be bound to exchanges
+to receive messages based on routing rules.
+By default, queues are created as quorum queues which provide better durability and
+high-availability. Use `type: 'classic'` for special cases like non-durable queues
+or priority queues.
+##### Type Parameters
+| Type Parameter |
+| ------ |
+| `TName` *extends* `string` |
+##### Parameters
+| Parameter | Type | Description |
+| ------ | ------ | ------ |
+| `name` | `TName` | The name of the queue |
 | `options?` | [`DefineQueueOptions`](#definequeueoptions) | Optional queue configuration |
-#### Returns
+##### Returns
-  \| [`QueueDefinition`](#queuedefinition)
-  \| [`QueueWithTtlBackoffInfrastructure`](#queuewithttlbackoffinfrastructure)
+  \| [`QueueDefinition`](#queuedefinition)&lt;`TName`&gt;
+  \| [`QueueWithTtlBackoffInfrastructure`](#queuewithttlbackoffinfrastructure)&lt;`TName`&gt;
 A queue definition
-#### Example
+##### Example
 ```typescript
 // Quorum queue (default, recommended for production)
@@ -1651,10 +1849,10 @@ const orderQueue = defineQueue('order-processing', {
 ### defineQuorumQueue()
 ```ts
-function defineQuorumQueue(name, options): QuorumQueueDefinition;
+function defineQuorumQueue<TName>(name, options): QuorumQueueDefinition<TName>;
 ```
-Defined in: [builder/queue.ts:442](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L442)
+Defined in: [builder/queue.ts:456](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L456)
 Create a quorum queue with quorum-native retry.
@@ -1668,16 +1866,22 @@ This is a simplified helper that enforces best practices:
 - You don't need configurable delays between retries
 - You want the simplest retry configuration
+#### Type Parameters
+| Type Parameter |
+| ------ |
+| `TName` *extends* `string` |
 #### Parameters
 | Parameter | Type | Description |
 | ------ | ------ | ------ |
-| `name` | `string` | The queue name |
+| `name` | `TName` | The queue name |
 | `options` | [`DefineQuorumQueueOptions`](#definequorumqueueoptions) | Configuration options |
 #### Returns
-[`QuorumQueueDefinition`](#quorumqueuedefinition)
+[`QuorumQueueDefinition`](#quorumqueuedefinition)&lt;`TName`&gt;
 A quorum queue definition with quorum-native retry
@@ -1691,10 +1895,10 @@ const orderQueue = defineQuorumQueue('order-processing', {
   deliveryLimit: 3, // Retry up to 3 times
 });
+// Use in a contract — exchanges, queues, and bindings are auto-extracted
 const contract = defineContract({
-  exchanges: { dlx },
-  queues: { orderProcessing: orderQueue },
-  // ...
+  publishers: { ... },
+  consumers: { processOrder: defineEventConsumer(event, orderQueue) },
 });
 ```
@@ -1708,10 +1912,10 @@ const contract = defineContract({
 ### defineTtlBackoffQueue()
 ```ts
-function defineTtlBackoffQueue(name, options): QueueWithTtlBackoffInfrastructure;
+function defineTtlBackoffQueue<TName>(name, options): QueueWithTtlBackoffInfrastructure<TName>;
 ```
-Defined in: [builder/queue.ts:580](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L580)
+Defined in: [builder/queue.ts:594](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L594)
 Create a queue with TTL-backoff retry (exponential backoff).
@@ -1730,16 +1934,22 @@ This is a simplified helper that enforces best practices:
 main queue, wait queue, and bindings. Pass this directly to `defineContract`
 and it will be expanded automatically.
+#### Type Parameters
+| Type Parameter |
+| ------ |
+| `TName` *extends* `string` |
 #### Parameters
 | Parameter | Type | Description |
 | ------ | ------ | ------ |
-| `name` | `string` | The queue name |
+| `name` | `TName` | The queue name |
 | `options` | [`DefineTtlBackoffQueueOptions`](#definettlbackoffqueueoptions) | Configuration options |
 #### Returns
-[`QueueWithTtlBackoffInfrastructure`](#queuewithttlbackoffinfrastructure)
+[`QueueWithTtlBackoffInfrastructure`](#queuewithttlbackoffinfrastructure)&lt;`TName`&gt;
 A queue with TTL-backoff infrastructure
@@ -1755,10 +1965,10 @@ const orderQueue = defineTtlBackoffQueue('order-processing', {
   maxDelayMs: 30000,     // Cap at 30s
 });
+// Use in a contract — wait queue, bindings, and DLX are auto-extracted
 const contract = defineContract({
-  exchanges: { dlx },
-  queues: { orderProcessing: orderQueue }, // Wait queue auto-added
-  // ... bindings auto-generated
+  publishers: { ... },
+  consumers: { processOrder: defineEventConsumer(event, extractQueue(orderQueue)) },
 });
 // To access the underlying queue definition (e.g., for the queue name):
@@ -1780,7 +1990,7 @@ const queueName = extractQueue(orderQueue).name;
 function defineTtlBackoffRetryInfrastructure(queueEntry, options?): TtlBackoffRetryInfrastructure;
 ```
-Defined in: [builder/ttl-backoff.ts:76](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/ttl-backoff.ts#L76)
+Defined in: [builder/ttl-backoff.ts:68](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/ttl-backoff.ts#L68)
 Create TTL-backoff retry infrastructure for a queue.
@@ -1825,23 +2035,64 @@ const orderQueue = defineQueue('order-processing', {
   },
 });
-// Generate TTL-backoff infrastructure
-const retryInfra = defineTtlBackoffRetryInfrastructure(orderQueue);
-// Spread into contract
+// Infrastructure is auto-extracted when using defineContract:
 const contract = defineContract({
-  exchanges: { dlx },
-  queues: {
-    orderProcessing: orderQueue,
-    orderProcessingWait: retryInfra.waitQueue,
-  },
-  bindings: {
-    ...// your other bindings
-    orderWaitBinding: retryInfra.waitQueueBinding,
-    orderRetryBinding: retryInfra.mainQueueRetryBinding,
-  },
-  // ... publishers and consumers
+  publishers: { ... },
+  consumers: { processOrder: defineEventConsumer(event, extractQueue(orderQueue)) },
 });
+// contract.queues includes the wait queue, contract.bindings includes retry bindings
+// Or generate manually for advanced use cases:
+const retryInfra = defineTtlBackoffRetryInfrastructure(orderQueue);
+```
+***
+### extractConsumer()
+```ts
+function extractConsumer(entry): ConsumerDefinition;
+```
+Defined in: [builder/consumer.ts:55](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/consumer.ts#L55)
+Extract the ConsumerDefinition from any ConsumerEntry type.
+Handles the following entry types:
+- ConsumerDefinition: returned as-is
+- EventConsumerResult: returns the nested `.consumer` property
+- CommandConsumerConfig: returns the nested `.consumer` property
+Use this function when you need to access the underlying ConsumerDefinition
+from a consumer entry that may have been created with defineEventConsumer
+or defineCommandConsumer.
+#### Parameters
+| Parameter | Type | Description |
+| ------ | ------ | ------ |
+| `entry` | [`ConsumerEntry`](#consumerentry) | The consumer entry to extract from |
+#### Returns
+[`ConsumerDefinition`](#consumerdefinition)
+The underlying ConsumerDefinition
+#### Example
+```typescript
+// Works with plain ConsumerDefinition
+const consumer1 = defineConsumer(queue, message);
+extractConsumer(consumer1).queue.name; // "my-queue"
+// Works with EventConsumerResult
+const consumer2 = defineEventConsumer(eventPublisher, queue);
+extractConsumer(consumer2).queue.name; // "my-queue"
+// Works with CommandConsumerConfig
+const consumer3 = defineCommandConsumer(queue, exchange, message, { routingKey: "cmd" });
+extractConsumer(consumer3).queue.name; // "my-queue"
 ```
 ***
@@ -1849,10 +2100,10 @@ const contract = defineContract({
 ### extractQueue()
 ```ts
-function extractQueue(entry): QueueDefinition;
+function extractQueue<T>(entry): ExtractQueueFromEntry<T>;
 ```
-Defined in: [builder/queue.ts:126](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L126)
+Defined in: [builder/queue.ts:127](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L127)
 Extract the plain QueueDefinition from a QueueEntry.
@@ -1871,15 +2122,21 @@ queue definition so you can access properties like `name`, `type`, etc.
 - If the entry is a `QueueWithTtlBackoffInfrastructure`, returns `entry.queue`
 - Otherwise, returns the entry as-is (it's already a plain QueueDefinition)
+#### Type Parameters
+| Type Parameter |
+| ------ |
+| `T` *extends* [`QueueEntry`](#queueentry) |
 #### Parameters
 | Parameter | Type | Description |
 | ------ | ------ | ------ |
-| `entry` | [`QueueEntry`](#queueentry) | The queue entry (either plain QueueDefinition or QueueWithTtlBackoffInfrastructure) |
+| `entry` | `T` | The queue entry (either plain QueueDefinition or QueueWithTtlBackoffInfrastructure) |
 #### Returns
-[`QueueDefinition`](#queuedefinition)
+`ExtractQueueFromEntry`&lt;`T`&gt;
 The plain QueueDefinition
@@ -1918,10 +2175,10 @@ console.log(queueDef.deadLetter); // { exchange: dlx, ... }
 ### isCommandConsumerConfig()
 ```ts
-function isCommandConsumerConfig(value): value is CommandConsumerConfig<MessageDefinition, ExchangeDefinition, string | undefined>;
+function isCommandConsumerConfig(value): value is CommandConsumerConfig<MessageDefinition, ExchangeDefinition, string | undefined, QueueDefinition, ExchangeDefinition | undefined>;
 ```
-Defined in: [builder/command.ts:279](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/command.ts#L279)
+Defined in: [builder/command.ts:316](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/command.ts#L316)
 Type guard to check if a value is a CommandConsumerConfig.
@@ -1933,7 +2190,7 @@ Type guard to check if a value is a CommandConsumerConfig.
 #### Returns
-value is CommandConsumerConfig\<MessageDefinition, ExchangeDefinition, string \| undefined\>
+value is CommandConsumerConfig\<MessageDefinition, ExchangeDefinition, string \| undefined, QueueDefinition, ExchangeDefinition \| undefined\>
 True if the value is a CommandConsumerConfig
@@ -1942,10 +2199,10 @@ True if the value is a CommandConsumerConfig
 ### isEventConsumerResult()
 ```ts
-function isEventConsumerResult(value): value is EventConsumerResult<MessageDefinition>;
+function isEventConsumerResult(value): value is EventConsumerResult<MessageDefinition, ExchangeDefinition, QueueDefinition, ExchangeDefinition | undefined>;
 ```
-Defined in: [builder/event.ts:338](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L338)
+Defined in: [builder/event.ts:383](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L383)
 Type guard to check if a value is an EventConsumerResult.
@@ -1957,7 +2214,7 @@ Type guard to check if a value is an EventConsumerResult.
 #### Returns
-`value is EventConsumerResult<MessageDefinition>`
+value is EventConsumerResult\<MessageDefinition, ExchangeDefinition, QueueDefinition, ExchangeDefinition \| undefined\>
 True if the value is an EventConsumerResult
@@ -1969,7 +2226,7 @@ True if the value is an EventConsumerResult
 function isEventPublisherConfig(value): value is EventPublisherConfig<MessageDefinition, ExchangeDefinition, string | undefined>;
 ```
-Defined in: [builder/event.ts:321](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/event.ts#L321)
+Defined in: [builder/event.ts:366](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/event.ts#L366)
 Type guard to check if a value is an EventPublisherConfig.
@@ -1993,7 +2250,7 @@ True if the value is an EventPublisherConfig
 function isQueueWithTtlBackoffInfrastructure(entry): entry is QueueWithTtlBackoffInfrastructure;
 ```
-Defined in: [builder/queue.ts:67](https://github.com/btravers/amqp-contract/blob/69a6467d137997be809af2ea5c4332c378579b49/packages/contract/src/builder/queue.ts#L67)
+Defined in: [builder/queue.ts:68](https://github.com/btravers/amqp-contract/blob/a7c4b48f76ed6c3c5c7a9d457229c7ba475af3b1/packages/contract/src/builder/queue.ts#L68)
 Type guard to check if a queue entry is a QueueWithTtlBackoffInfrastructure.