@amqp-contract/contract 0.17.0 → 0.19.0

package/dist/index.mjs

@@ -65,10 +65,9 @@ function defineMessage(payload, options) {
 }
 
 //#endregion
-//#region src/builder/binding.ts
+//#region src/builder/queue-utils.ts
 /**
 * Type guard to check if a queue entry is a QueueWithTtlBackoffInfrastructure.
-* Duplicated here to avoid circular dependency with queue.ts.
 * @internal
 */
 function isQueueWithTtlBackoffInfrastructure$1(entry) {
@@ -76,13 +75,15 @@ function isQueueWithTtlBackoffInfrastructure$1(entry) {
 }
 /**
 * Extract the plain QueueDefinition from a QueueEntry.
-* Duplicated here to avoid circular dependency with queue.ts.
 * @internal
 */
-function extractQueueInternal(entry) {
+function extractQueueFromEntry(entry) {
 	if (isQueueWithTtlBackoffInfrastructure$1(entry)) return entry.queue;
 	return entry;
 }
+
+//#endregion
+//#region src/builder/binding.ts
 /**
 * Define a binding between a queue and an exchange.
 *
@@ -95,7 +96,7 @@ function extractQueueInternal(entry) {
 * @internal
 */
 function defineQueueBinding(queue, exchange, options) {
-	const queueDef = extractQueueInternal(queue);
+	const queueDef = extractQueueFromEntry(queue);
 	if (exchange.type === "fanout") return {
 		type: "queue",
 		queue: queueDef,
@@ -196,7 +197,7 @@ function resolveTtlBackoffOptions(options) {
 * ```
 */
 function isQueueWithTtlBackoffInfrastructure(entry) {
-	return typeof entry === "object" && entry !== null && "__brand" in entry && entry.__brand === "QueueWithTtlBackoffInfrastructure";
+	return isQueueWithTtlBackoffInfrastructure$1(entry);
 }
 /**
 * Extract the plain QueueDefinition from a QueueEntry.
@@ -247,14 +248,13 @@ function isQueueWithTtlBackoffInfrastructure(entry) {
 * @see defineTtlBackoffQueue - Creates queues with TTL-backoff infrastructure
 */
 function extractQueue(entry) {
-	if (isQueueWithTtlBackoffInfrastructure(entry)) return entry.queue;
-	return entry;
+	return extractQueueFromEntry(entry);
 }
 /**
-* Wrap a queue definition with TTL-backoff retry infrastructure.
+* Create TTL-backoff retry infrastructure (wait queue + bindings) for a queue.
 * @internal
 */
-function wrapWithTtlBackoffInfrastructure(queue) {
+function createTtlBackoffInfrastructure(queue) {
 	if (!queue.deadLetter) throw new Error(`Queue "${queue.name}" does not have a dead letter exchange configured. TTL-backoff retry requires deadLetter to be set on the queue.`);
 	const dlx = queue.deadLetter.exchange;
 	const waitQueueName = `${queue.name}-wait`;
@@ -268,15 +268,23 @@ function wrapWithTtlBackoffInfrastructure(queue) {
 		},
 		retry: resolveTtlBackoffOptions(void 0)
 	};
-	const waitQueueBinding = defineQueueBindingInternal(waitQueue, dlx, { routingKey: waitQueueName });
-	const mainQueueRetryBinding = defineQueueBindingInternal(queue, dlx, { routingKey: queue.name });
+	return {
+		waitQueue,
+		waitQueueBinding: defineQueueBindingInternal(waitQueue, dlx, { routingKey: waitQueueName }),
+		mainQueueRetryBinding: defineQueueBindingInternal(queue, dlx, { routingKey: queue.name })
+	};
+}
+/**
+* Wrap a queue definition with TTL-backoff retry infrastructure.
+* @internal
+*/
+function wrapWithTtlBackoffInfrastructure(queue) {
+	const infra = createTtlBackoffInfrastructure(queue);
 	return {
 		__brand: "QueueWithTtlBackoffInfrastructure",
 		queue,
 		deadLetter: queue.deadLetter,
-		waitQueue,
-		waitQueueBinding,
-		mainQueueRetryBinding
+		...infra
 	};
 }
 function defineQueue(name, options) {
@@ -608,21 +616,41 @@ function defineEventPublisher(exchange, message, options) {
 * @internal
 */
 function defineEventConsumer(eventPublisher, queue, options) {
-	const { exchange, message, routingKey: publisherRoutingKey } = eventPublisher;
+	const { exchange: sourceExchange, message, routingKey: publisherRoutingKey } = eventPublisher;
 	const bindingRoutingKey = options?.routingKey ?? publisherRoutingKey;
 	const bindingOptions = {};
 	if (bindingRoutingKey !== void 0) bindingOptions.routingKey = bindingRoutingKey;
 	const bindingArguments = options?.arguments ?? eventPublisher.arguments;
 	if (bindingArguments !== void 0) bindingOptions.arguments = bindingArguments;
-	const binding = defineQueueBindingInternal(queue, exchange, bindingOptions);
+	const bridgeExchange = options?.bridgeExchange;
+	if (bridgeExchange) {
+		const binding = defineQueueBindingInternal(queue, bridgeExchange, bindingOptions);
+		const consumer = defineConsumer(queue, message);
+		const exchangeBindingOptions = {};
+		if (bindingRoutingKey !== void 0) exchangeBindingOptions.routingKey = bindingRoutingKey;
+		const e2eBinding = sourceExchange.type === "fanout" ? defineExchangeBinding(bridgeExchange, sourceExchange) : defineExchangeBinding(bridgeExchange, sourceExchange, exchangeBindingOptions);
+		return {
+			__brand: "EventConsumerResult",
+			consumer,
+			binding,
+			exchange: sourceExchange,
+			queue: consumer.queue,
+			deadLetterExchange: consumer.queue.deadLetter?.exchange,
+			exchangeBinding: e2eBinding,
+			bridgeExchange
+		};
+	}
+	const binding = defineQueueBindingInternal(queue, sourceExchange, bindingOptions);
 	const consumer = defineConsumer(queue, message);
 	return {
 		__brand: "EventConsumerResult",
 		consumer,
 		binding,
-		exchange,
+		exchange: sourceExchange,
 		queue: consumer.queue,
-		deadLetterExchange: consumer.queue.deadLetter?.exchange
+		deadLetterExchange: consumer.queue.deadLetter?.exchange,
+		exchangeBinding: void 0,
+		bridgeExchange: void 0
 	};
 }
 /**
@@ -668,11 +696,26 @@ function defineCommandConsumer(queue, exchange, message, options) {
 * @internal
 */
 function defineCommandPublisher(commandConsumer, options) {
-	const { exchange, message, routingKey: consumerRoutingKey } = commandConsumer;
+	const { exchange: targetExchange, message, routingKey: consumerRoutingKey } = commandConsumer;
 	const publisherRoutingKey = options?.routingKey ?? consumerRoutingKey;
+	const bridgeExchange = options?.bridgeExchange;
+	if (bridgeExchange) {
+		const publisherOptions = {};
+		if (publisherRoutingKey !== void 0) publisherOptions.routingKey = publisherRoutingKey;
+		const publisher = definePublisherInternal(bridgeExchange, message, publisherOptions);
+		const e2eBindingOptions = {};
+		if (publisherRoutingKey !== void 0) e2eBindingOptions.routingKey = publisherRoutingKey;
+		return {
+			__brand: "BridgedPublisherConfig",
+			publisher,
+			exchangeBinding: bridgeExchange.type === "fanout" ? defineExchangeBinding(targetExchange, bridgeExchange) : defineExchangeBinding(targetExchange, bridgeExchange, e2eBindingOptions),
+			bridgeExchange,
+			targetExchange
+		};
+	}
 	const publisherOptions = {};
 	if (publisherRoutingKey !== void 0) publisherOptions.routingKey = publisherRoutingKey;
-	return definePublisherInternal(exchange, message, publisherOptions);
+	return definePublisherInternal(targetExchange, message, publisherOptions);
 }
 /**
 * Type guard to check if a value is a CommandConsumerConfig.
@@ -683,6 +726,15 @@ function defineCommandPublisher(commandConsumer, options) {
 function isCommandConsumerConfig(value) {
 	return typeof value === "object" && value !== null && "__brand" in value && value.__brand === "CommandConsumerConfig";
 }
+/**
+* Type guard to check if a value is a BridgedPublisherConfig.
+*
+* @param value - The value to check
+* @returns True if the value is a BridgedPublisherConfig
+*/
+function isBridgedPublisherConfig(value) {
+	return typeof value === "object" && value !== null && "__brand" in value && value.__brand === "BridgedPublisherConfig";
+}
 
 //#endregion
 //#region src/builder/contract.ts
@@ -764,7 +816,13 @@ function defineContract(definition) {
 	if (inputPublishers && Object.keys(inputPublishers).length > 0) {
 		const processedPublishers = {};
 		const exchanges = {};
-		for (const [name, entry] of Object.entries(inputPublishers)) if (isEventPublisherConfig(entry)) {
+		const publisherBindings = {};
+		for (const [name, entry] of Object.entries(inputPublishers)) if (isBridgedPublisherConfig(entry)) {
+			exchanges[entry.bridgeExchange.name] = entry.bridgeExchange;
+			exchanges[entry.targetExchange.name] = entry.targetExchange;
+			publisherBindings[`${name}ExchangeBinding`] = entry.exchangeBinding;
+			processedPublishers[name] = entry.publisher;
+		} else if (isEventPublisherConfig(entry)) {
 			exchanges[entry.exchange.name] = entry.exchange;
 			const publisherOptions = {};
 			if (entry.routingKey !== void 0) publisherOptions.routingKey = entry.routingKey;
@@ -779,6 +837,10 @@ function defineContract(definition) {
 			...result.exchanges,
 			...exchanges
 		};
+		result.bindings = {
+			...result.bindings,
+			...publisherBindings
+		};
 	}
 	if (inputConsumers && Object.keys(inputConsumers).length > 0) {
 		const processedConsumers = {};
@@ -792,6 +854,9 @@ function defineContract(definition) {
 			queues[queueEntry.name] = queueEntry;
 			exchanges[entry.binding.exchange.name] = entry.binding.exchange;
 			if (queueEntry.deadLetter?.exchange) exchanges[queueEntry.deadLetter.exchange.name] = queueEntry.deadLetter.exchange;
+			if (entry.exchangeBinding) consumerBindings[`${name}ExchangeBinding`] = entry.exchangeBinding;
+			if (entry.bridgeExchange) exchanges[entry.bridgeExchange.name] = entry.bridgeExchange;
+			if (entry.exchange) exchanges[entry.exchange.name] = entry.exchange;
 		} else if (isCommandConsumerConfig(entry)) {
 			processedConsumers[name] = entry.consumer;
 			consumerBindings[`${name}Binding`] = entry.binding;
@@ -807,22 +872,11 @@ function defineContract(definition) {
 			if (queueEntry.deadLetter?.exchange) exchanges[queueEntry.deadLetter.exchange.name] = queueEntry.deadLetter.exchange;
 		}
 		for (const queue of Object.values(queues)) if (queue.retry?.mode === "ttl-backoff" && queue.deadLetter) {
-			const dlx = queue.deadLetter.exchange;
-			const waitQueueName = `${queue.name}-wait`;
-			const waitQueue = {
-				name: waitQueueName,
-				type: "quorum",
-				durable: queue.durable ?? true,
-				deadLetter: {
-					exchange: dlx,
-					routingKey: queue.name
-				},
-				retry: resolveTtlBackoffOptions(void 0)
-			};
-			queues[waitQueueName] = waitQueue;
-			consumerBindings[`${queue.name}WaitBinding`] = defineQueueBindingInternal(waitQueue, dlx, { routingKey: waitQueueName });
-			consumerBindings[`${queue.name}RetryBinding`] = defineQueueBindingInternal(queue, dlx, { routingKey: queue.name });
-			exchanges[dlx.name] = dlx;
+			const infra = createTtlBackoffInfrastructure(queue);
+			queues[infra.waitQueue.name] = infra.waitQueue;
+			consumerBindings[`${queue.name}WaitBinding`] = infra.waitQueueBinding;
+			consumerBindings[`${queue.name}RetryBinding`] = infra.mainQueueRetryBinding;
+			exchanges[queue.deadLetter.exchange.name] = queue.deadLetter.exchange;
 		}
 		result.consumers = processedConsumers;
 		result.bindings = {
@@ -886,25 +940,11 @@ function defineContract(definition) {
 * ```
 */
 function defineTtlBackoffRetryInfrastructure(queueEntry, options) {
-	const queue = extractQueue(queueEntry);
-	if (!queue.deadLetter) throw new Error(`Queue "${queue.name}" does not have a dead letter exchange configured. TTL-backoff retry requires deadLetter to be set on the queue.`);
-	const dlx = queue.deadLetter.exchange;
-	const waitQueueName = `${queue.name}-wait`;
-	const waitQueue = defineQueue(waitQueueName, {
-		type: "quorum",
-		durable: options?.waitQueueDurable ?? queue.durable ?? true,
-		deadLetter: {
-			exchange: dlx,
-			routingKey: queue.name
-		}
-	});
-	return {
-		waitQueue,
-		waitQueueBinding: defineQueueBindingInternal(waitQueue, dlx, { routingKey: waitQueueName }),
-		mainQueueRetryBinding: defineQueueBindingInternal(queue, dlx, { routingKey: queue.name })
-	};
+	const infra = createTtlBackoffInfrastructure(extractQueue(queueEntry));
+	if (options?.waitQueueDurable !== void 0) infra.waitQueue.durable = options.waitQueueDurable;
+	return infra;
 }
 
 //#endregion
-export { defineCommandConsumer, defineCommandPublisher, defineConsumer, defineContract, defineEventConsumer, defineEventPublisher, defineExchange, defineExchangeBinding, defineMessage, definePublisher, defineQueue, defineQueueBinding, defineQuorumQueue, defineTtlBackoffQueue, defineTtlBackoffRetryInfrastructure, extractConsumer, extractQueue, isCommandConsumerConfig, isEventConsumerResult, isEventPublisherConfig, isQueueWithTtlBackoffInfrastructure };
+export { defineCommandConsumer, defineCommandPublisher, defineConsumer, defineContract, defineEventConsumer, defineEventPublisher, defineExchange, defineExchangeBinding, defineMessage, definePublisher, defineQueue, defineQueueBinding, defineQuorumQueue, defineTtlBackoffQueue, defineTtlBackoffRetryInfrastructure, extractConsumer, extractQueue, isBridgedPublisherConfig, isCommandConsumerConfig, isEventConsumerResult, isEventPublisherConfig, isQueueWithTtlBackoffInfrastructure };
 //# sourceMappingURL=index.mjs.map