@zdavison/matador 3.0.2 → 3.0.5

package/dist/pipeline/pipeline.test.js

@@ -690,7 +690,10 @@ describe('ProcessingPipeline', () => {
             const receipt = createReceipt({ sourceQueue: 'test-queue' });
             await pipeline.process(new Uint8Array(), receipt);
             const calls = sendMock.mock.calls;
-            const sentEnvelope = calls[0][1];
+            const firstCall = calls[0];
+            if (!firstCall)
+                throw new Error('expected sendMock to be called');
+            const sentEnvelope = firstCall[1];
             expect(sentEnvelope.docket.lastError).toBe('Test error message');
             expect(sentEnvelope.docket.firstError).toBe('Test error message');
         });
@@ -803,7 +806,10 @@ describe('ProcessingPipeline', () => {
             const receipt = createReceipt({ sourceQueue: 'original-queue' });
             await pipeline.process(new Uint8Array(), receipt);
             const calls = sendToDeadLetterMock.mock.calls;
-            const sentEnvelope = calls[0][2];
+            const firstCall = calls[0];
+            if (!firstCall)
+                throw new Error('expected sendToDeadLetter to be called');
+            const sentEnvelope = firstCall[2];
             expect(sentEnvelope.docket.originalQueue).toBe('original-queue');
         });
         it('should handle discard decision', async () => {
@@ -956,7 +962,10 @@ describe('ProcessingPipeline', () => {
             const receipt = createReceipt({ sourceQueue: 'test-queue' });
             await pipeline.process(new Uint8Array(), receipt);
             const calls = sendMock.mock.calls;
-            const sentEnvelope = calls[0][1];
+            const firstCall = calls[0];
+            if (!firstCall)
+                throw new Error('expected sendMock to be called');
+            const sentEnvelope = firstCall[1];
             expect(sentEnvelope.docket.firstError).toBe('First failure');
             expect(sentEnvelope.docket.lastError).toBe('First failure');
         });
@@ -994,7 +1003,10 @@ describe('ProcessingPipeline', () => {
             const receipt = createReceipt({ sourceQueue: 'test-queue' });
             await pipeline.process(new Uint8Array(), receipt);
             const calls = sendMock.mock.calls;
-            const sentEnvelope = calls[0][1];
+            const firstCall = calls[0];
+            if (!firstCall)
+                throw new Error('expected sendMock to be called');
+            const sentEnvelope = firstCall[1];
             expect(sentEnvelope.docket.firstError).toBe('Original error');
             expect(sentEnvelope.docket.lastError).toBe('Second failure');
         });

package/dist/schema/types.test.js

@@ -76,6 +76,8 @@ describe('installPlugins', () => {
         const schema = installPlugins(baseSchema, [{ subscriber: globalSub }]);
         // Check user.created has both subscribers
         const userEntry = schema[UserCreatedEvent.key];
+        if (!userEntry)
+            throw new Error('expected user.created entry');
         expect(isSchemaEntryTuple(userEntry)).toBe(true);
         const [, userSubs] = userEntry;
         expect(userSubs).toHaveLength(2);
@@ -183,6 +185,8 @@ describe('installPlugins', () => {
         };
         const schema = installPlugins(baseSchema, [{ subscriber: globalSub }]);
         const entry = schema[UserCreatedEvent.key];
+        if (!entry)
+            throw new Error('expected user.created entry');
         expect(isSchemaEntryTuple(entry)).toBe(true);
         const [eventClass, subs] = entry;
         expect(eventClass).toBe(UserCreatedEvent);

package/dist/topology/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/topology/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAWzD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAM,YAAW,cAAc;aASxD,MAAM,EAAE,SAAS,MAAM,EAAE;IAR3C,QAAQ,CAAC,WAAW,SAIuC;gBAGzD,OAAO,EAAE,MAAM,EACC,MAAM,EAAE,SAAS,MAAM,EAAE;CAK5C;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,KAAK,CAIX;IAEF;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKtC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAapD;;;OAGG;IACH,KAAK,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IACxC;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAWjD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAQvD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAS7C;;OAEG;IACH,YAAY,IAAI,IAAI;IAKpB;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;OAEG;IACH,QAAQ,IAAI,SAAS,MAAM,EAAE;IAuD7B;;;OAGG;IACH,KAAK,IAAI,QAAQ;CAgBlB"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/topology/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAWzD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAM,YAAW,cAAc;aASxD,MAAM,EAAE,SAAS,MAAM,EAAE;IAR3C,QAAQ,CAAC,WAAW,SAIuC;gBAGzD,OAAO,EAAE,MAAM,EACC,MAAM,EAAE,SAAS,MAAM,EAAE;CAK5C;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,KAAK,CAIX;IAEF;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKtC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAapD;;;OAGG;IACH,KAAK,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IACxC;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAWjD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAQvD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAS7C;;OAEG;IACH,YAAY,IAAI,IAAI;IAKpB;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;OAEG;IACH,QAAQ,IAAI,SAAS,MAAM,EAAE;IAQ7B;;;OAGG;IACH,KAAK,IAAI,QAAQ;CAgBlB"}

package/dist/topology/builder.js

@@ -104,47 +104,11 @@ export class TopologyBuilder {
      * Validates the topology configuration.
      */
     validate() {
-        const issues = [];
-        if (!this.namespace || this.namespace.trim() === '') {
-            issues.push('Namespace is required');
-        }
-        else if (!/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(this.namespace)) {
-            issues.push('Namespace must start with a letter and contain only alphanumeric characters, underscores, and hyphens');
-        }
-        if (this.queues.length === 0) {
-            issues.push('At least one queue is required');
-        }
-        const queueNames = new Set();
-        for (const queue of this.queues) {
-            if (!queue.name || queue.name.trim() === '') {
-                issues.push('Queue name cannot be empty');
-            }
-            else if (!queue.exact && !/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(queue.name)) {
-                // Skip pattern validation for exact queues (allows names like 'matador.shared.id-platform')
-                issues.push(`Queue name "${queue.name}" must start with a letter and contain only alphanumeric characters, underscores, and hyphens`);
-            }
-            else if (queueNames.has(queue.name)) {
-                issues.push(`Duplicate queue name: "${queue.name}"`);
-            }
-            else {
-                queueNames.add(queue.name);
-            }
-            if (queue.concurrency !== undefined && queue.concurrency < 1) {
-                issues.push(`Queue "${queue.name}" concurrency must be at least 1`);
-            }
-            if (queue.consumerTimeout !== undefined && queue.consumerTimeout < 0) {
-                issues.push(`Queue "${queue.name}" consumer timeout must be non-negative`);
-            }
-        }
-        if (this.retry.enabled) {
-            if (this.retry.defaultDelayMs < 0) {
-                issues.push('Default retry delay must be non-negative');
-            }
-            if (this.retry.maxDelayMs < this.retry.defaultDelayMs) {
-                issues.push('Max retry delay must be greater than or equal to default delay');
-            }
-        }
-        return issues;
+        return [
+            ...validateNamespace(this.namespace),
+            ...validateQueues(this.queues),
+            ...validateRetry(this.retry),
+        ];
     }
     /**
      * Builds the topology configuration.
@@ -163,3 +127,64 @@ export class TopologyBuilder {
         };
     }
 }
+const IDENTIFIER_PATTERN = /^[a-zA-Z][a-zA-Z0-9_-]*$/;
+function validateNamespace(namespace) {
+    if (!namespace || namespace.trim() === '') {
+        return ['Namespace is required'];
+    }
+    if (!IDENTIFIER_PATTERN.test(namespace)) {
+        return [
+            'Namespace must start with a letter and contain only alphanumeric characters, underscores, and hyphens',
+        ];
+    }
+    return [];
+}
+function validateQueueName(queue, seen) {
+    if (!queue.name || queue.name.trim() === '') {
+        return ['Queue name cannot be empty'];
+    }
+    if (!queue.exact && !IDENTIFIER_PATTERN.test(queue.name)) {
+        return [
+            `Queue name "${queue.name}" must start with a letter and contain only alphanumeric characters, underscores, and hyphens`,
+        ];
+    }
+    if (seen.has(queue.name)) {
+        return [`Duplicate queue name: "${queue.name}"`];
+    }
+    seen.add(queue.name);
+    return [];
+}
+function validateQueueLimits(queue) {
+    const issues = [];
+    if (queue.concurrency !== undefined && queue.concurrency < 1) {
+        issues.push(`Queue "${queue.name}" concurrency must be at least 1`);
+    }
+    if (queue.consumerTimeout !== undefined && queue.consumerTimeout < 0) {
+        issues.push(`Queue "${queue.name}" consumer timeout must be non-negative`);
+    }
+    return issues;
+}
+function validateQueues(queues) {
+    const issues = [];
+    if (queues.length === 0) {
+        issues.push('At least one queue is required');
+    }
+    const seen = new Set();
+    for (const queue of queues) {
+        issues.push(...validateQueueName(queue, seen));
+        issues.push(...validateQueueLimits(queue));
+    }
+    return issues;
+}
+function validateRetry(retry) {
+    if (!retry.enabled)
+        return [];
+    const issues = [];
+    if (retry.defaultDelayMs < 0) {
+        issues.push('Default retry delay must be non-negative');
+    }
+    if (retry.maxDelayMs < retry.defaultDelayMs) {
+        issues.push('Max retry delay must be greater than or equal to default delay');
+    }
+    return issues;
+}

package/dist/transport/local/local-transport.test.js

@@ -56,7 +56,8 @@ describe('LocalTransport', () => {
             const envelope = createTestEnvelope();
             await transport.send('test-queue', envelope);
             const received = await transport.receiveOne('test-queue');
-            expect(received).not.toBeNull();
+            if (!received)
+                throw new Error('expected received message');
             await transport.complete(received.receipt);
             expect(transport.getQueueSize('test-queue')).toBe(0);
             expect(transport.getCompleted()).toHaveLength(1);
@@ -112,7 +113,8 @@ describe('LocalTransport', () => {
             const envelope = createTestEnvelope();
             await transport.send('test-queue', envelope);
             const received = await transport.receiveOne('test-queue');
-            expect(received).not.toBeNull();
+            if (!received)
+                throw new Error('expected received message');
             await transport.sendToDeadLetter(received.receipt, 'dlq', envelope, 'test error');
             expect(transport.getQueueSize('test-queue')).toBe(0);
             expect(transport.getQueueSize('test-queue.dlq')).toBe(1);
@@ -145,6 +147,8 @@ describe('LocalTransport', () => {
             await transport.connect();
             await transport.send('test-queue', createTestEnvelope());
             const received = await transport.receiveOne('test-queue');
+            if (!received)
+                throw new Error('expected received message');
             await transport.complete(received.receipt);
             transport.clear();
             expect(transport.getQueueSize('test-queue')).toBe(0);

package/dist/transport/multi/multi-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/multi/multi-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACV,MAAM,iBAAiB,CAAC;AAgBzB;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAE1C;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MACzB,MAAM,GACN,SAAS,GACT,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,CAAC;CAC1E;AAmBD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAE5B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAE1C,2DAA2D;IAC3D,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,oBAAoB,EAAE,KAAK,GAAE,mBAAwB;IAcnE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,WAAW,IAAI,OAAO;IAKhB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,IAAI,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAyC7B;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IASnB,SAAS,CACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,YAAY,CAAC;IA0BlB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;CAOjB"}
+{"version":3,"file":"multi-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/multi/multi-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACV,MAAM,iBAAiB,CAAC;AAgBzB;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAE1C;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MACzB,MAAM,GACN,SAAS,GACT,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,IAAI,CAAC;CAC1E;AAmBD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAE5B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAE1C,2DAA2D;IAC3D,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,oBAAoB,EAAE,KAAK,GAAE,mBAAwB;IAcnE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,WAAW,IAAI,OAAO;IAKhB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,IAAI,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IA0C7B;;OAEG;YACW,eAAe;IAwB7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IASnB,SAAS,CACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,YAAY,CAAC;IA0BlB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;CAOjB"}

package/dist/transport/multi/multi-transport.js

@@ -91,6 +91,8 @@ export class MultiTransport {
         const errors = [];
         for (let i = 0; i < transportOrder.length; i++) {
             const transport = transportOrder[i];
+            if (!transport)
+                continue;
             try {
                 return await transport.send(queue, envelope, options);
             }

package/dist/transport/multi/multi-transport.test.js

@@ -120,6 +120,8 @@ describe('MultiTransport', () => {
             await transportWithCallback.send('test-queue', envelope);
             expect(fallbackContexts).toHaveLength(1);
             const ctx = fallbackContexts[0];
+            if (!ctx)
+                throw new Error('expected fallback context');
             expect(ctx.failedTransport).toBe('local');
             expect(ctx.nextTransport).toBe('local');
             expect(ctx.queue).toBe('test-queue');
@@ -206,7 +208,8 @@ describe('MultiTransport', () => {
         it('should complete using primary transport', async () => {
             await primary.send('test-queue', createTestEnvelope());
             const received = await primary.receiveOne('test-queue');
-            expect(received).not.toBeNull();
+            if (!received)
+                throw new Error('expected received message');
             await transport.complete(received.receipt);
             expect(primary.getCompleted()).toHaveLength(1);
         });
@@ -219,7 +222,8 @@ describe('MultiTransport', () => {
             const envelope = createTestEnvelope();
             await primary.send('test-queue', envelope);
             const received = await primary.receiveOne('test-queue');
-            expect(received).not.toBeNull();
+            if (!received)
+                throw new Error('expected received message');
             await transport.sendToDeadLetter(received.receipt, 'dlq', envelope, 'test error');
             expect(primary.getQueueSize('test-queue')).toBe(0);
             expect(primary.getQueueSize('test-queue.dlq')).toBe(1);

package/dist/transport/rabbitmq/rabbitmq-transport.d.ts

@@ -66,6 +66,7 @@ export declare class RabbitMQTransport implements Transport {
     private doConnect;
     private doDisconnect;
     private setupDelayedExchange;
+    private buildWorkQueueOptions;
     private assertWorkQueue;
     private assertRetryQueue;
     private assertDeadLetterQueues;

package/dist/transport/rabbitmq/rabbitmq-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/rabbitmq/rabbitmq-transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rabbitmq-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/rabbitmq/rabbitmq-transport.ts"],"names":[],"mappings":"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"}

package/dist/transport/rabbitmq/rabbitmq-transport.js

@@ -406,41 +406,34 @@ export class RabbitMQTransport {
             });
         });
     }
+    buildWorkQueueOptions(topology, queueDef) {
+        const queueOptions = {
+            durable: true,
+            arguments: {},
+        };
+        if (this.config.quorumQueues && !queueDef.exact) {
+            queueOptions.arguments['x-queue-type'] = 'quorum';
+        }
+        if (topology.deadLetter.unhandled.enabled ||
+            topology.deadLetter.undeliverable.enabled) {
+            queueOptions.arguments['x-dead-letter-exchange'] =
+                this.getDLXExchangeName(topology.namespace);
+        }
+        if (queueDef.priorities) {
+            queueOptions.arguments['x-max-priority'] = 10;
+        }
+        if (queueDef.consumerTimeout) {
+            queueOptions.arguments['x-consumer-timeout'] = queueDef.consumerTimeout;
+        }
+        return queueOptions;
+    }
     async assertWorkQueue(channel, topology, queueDef) {
         const queueName = queueDef.exact
             ? queueDef.name
             : `${topology.namespace}.${queueDef.name}`;
         const rabbitmqOptions = queueDef.transport?.rabbitmq?.options;
-        // If user provided exact RabbitMQ options, use them directly (replaces all defaults)
-        if (rabbitmqOptions) {
-            await channel.assertQueue(queueName, rabbitmqOptions);
-        }
-        else {
-            // Use computed defaults
-            const queueOptions = {
-                durable: true,
-                arguments: {},
-            };
-            // Use quorum queues for durability
-            if (this.config.quorumQueues && !queueDef.exact) {
-                queueOptions.arguments['x-queue-type'] = 'quorum';
-            }
-            // Set up dead-letter exchange routing
-            const dlxExchange = this.getDLXExchangeName(topology.namespace);
-            if (topology.deadLetter.unhandled.enabled ||
-                topology.deadLetter.undeliverable.enabled) {
-                queueOptions.arguments['x-dead-letter-exchange'] = dlxExchange;
-            }
-            // Enable priority if requested
-            if (queueDef.priorities) {
-                queueOptions.arguments['x-max-priority'] = 10;
-            }
-            // Set consumer timeout if specified
-            if (queueDef.consumerTimeout) {
-                queueOptions.arguments['x-consumer-timeout'] = queueDef.consumerTimeout;
-            }
-            await channel.assertQueue(queueName, queueOptions);
-        }
+        const queueOptions = rabbitmqOptions ?? this.buildWorkQueueOptions(topology, queueDef);
+        await channel.assertQueue(queueName, queueOptions);
         // Bind queue to main exchange
         const mainExchange = this.getMainExchangeName(topology.namespace);
         await channel.bindQueue(queueName, mainExchange, queueName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zdavison/matador",
-  "version": "3.0.2",
+  "version": "3.0.5",
   "description": "A batteries-included event system.",
   "type": "module",
   "main": "./dist/index.cjs",