@zdavison/matador 2.0.7 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zdavison/matador",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "A batteries-included event system.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -34,7 +34,8 @@
     "send-test-event": "bun ./cli.ts ./examples/config.ts ./examples/event.ts"
   },
   "dependencies": {
-    "amqplib": "^0.10.4"
+    "amqplib": "^0.10.4",
+    "type-fest": "^5.3.1"
   },
   "devDependencies": {
     "@testcontainers/rabbitmq": "^10.16.0",

package/src/hooks/safe-hooks.ts

@@ -116,22 +116,6 @@ export class SafeHooks {
     }
   }
 
-  async getQueueConcurrency(queueName: string): Promise<number | undefined> {
-    if (!this.hooks.getQueueConcurrency) {
-      return undefined;
-    }
-
-    try {
-      return await this.hooks.getQueueConcurrency(queueName);
-    } catch (error) {
-      this.logger.warn(
-        '[Matador] 🟡 Hook getQueueConcurrency threw an error',
-        error,
-      );
-      return undefined;
-    }
-  }
-
   async getRetryDelay(
     envelope: Envelope,
     attemptNumber: number,

package/src/hooks/types.ts

@@ -176,13 +176,6 @@ export interface MatadorHooks {
     | Record<string, unknown>
     | Promise<Record<string, unknown>>;
 
-  /**
-   * Dynamic queue concurrency lookup.
-   */
-  getQueueConcurrency?(
-    queueName: string,
-  ): number | undefined | Promise<number | undefined>;
-
   /**
    * Dynamic retry delay lookup.
    */

package/src/index.ts

@@ -124,6 +124,7 @@ export { CodecDecodeError, JsonCodec, RabbitMQCodec } from './codec/index.js';
 export type {
   MatadorSchema,
   RegisterOptions,
+  RuntimeSchemaEntryTuple,
   SchemaEntry,
   SchemaEntryTuple,
   SchemaIssue,

package/src/types/event.ts

@@ -1,25 +1,19 @@
+import type { Jsonifiable } from 'type-fest';
+
 /**
  * Unique event routing key type alias.
  */
 export type EventKey = string;
 
-/**
- * JSON-serializable primitive types.
- */
-export type JsonPrimitive = string | number | boolean | null;
-
-/**
- * JSON-serializable value (recursive type for objects and arrays).
- */
-export type JsonValue =
-  | JsonPrimitive
-  | JsonValue[]
-  | { [key: string]: JsonValue };
-
 /**
  * JSON-serializable record type for metadata.
+ * Uses type-fest's Jsonifiable which accepts:
+ * - Primitives (string, number, boolean, null)
+ * - Arrays of Jsonifiable values
+ * - Objects with Jsonifiable values
+ * - Objects with a toJSON() method
  */
-export type JsonRecord = Record<string, JsonValue>;
+export type JsonRecord = Record<string, Jsonifiable>;
 
 /**
  * Static properties required on Event classes for schema registration.

package/src/types/index.ts

@@ -24,12 +24,13 @@ export type {
   EventKey,
   EventOptions,
   EventStatic,
-  JsonPrimitive,
   JsonRecord,
-  JsonValue,
 } from './event.js';
 export { MatadorEvent } from './event.js';
 
+// Re-export Jsonifiable from type-fest for convenience
+export type { Jsonifiable } from 'type-fest';
+
 export type {
   AnySubscriber,
   BaseSubscriberOptions,

package/dist/checkpoint/context.d.ts

@@ -1,59 +0,0 @@
-import type { Envelope, SubscriberDefinition } from '../types/index.js';
-import type { Checkpoint, CheckpointHitContext, CheckpointMissContext, CheckpointStore, JsonSerializable, SubscriberContext } from './types.js';
-/**
- * Hooks for observability during context operations.
- */
-export interface ResumableContextHooks {
-    onCheckpointHit?(context: CheckpointHitContext): void | Promise<void>;
-    onCheckpointMiss?(context: CheckpointMissContext): void | Promise<void>;
-}
-/**
- * Configuration for creating a ResumableContext.
- */
-export interface ResumableContextConfig {
-    readonly store: CheckpointStore;
-    readonly envelope: Envelope;
-    readonly subscriber: SubscriberDefinition;
-    readonly existingCheckpoint?: Checkpoint | undefined;
-    readonly hooks?: ResumableContextHooks | undefined;
-}
-/**
- * Implementation of SubscriberContext that provides io() caching.
- *
- * On first execution, io() calls execute their lambdas and cache results.
- * On retry (when existingCheckpoint is provided), cached results are returned
- * without re-executing the lambda.
- */
-export declare class ResumableContext implements SubscriberContext {
-    private checkpoint;
-    private readonly usedKeys;
-    private readonly store;
-    private readonly envelope;
-    private readonly subscriber;
-    private readonly hooks;
-    constructor(config: ResumableContextConfig);
-    get attempt(): number;
-    get isRetry(): boolean;
-    io<T extends JsonSerializable>(key: string, fn: () => Promise<T> | T): Promise<T>;
-    all<T extends readonly [
-        string,
-        () => Promise<JsonSerializable> | JsonSerializable
-    ][]>(ops: T): Promise<{
-        [K in keyof T]: T[K] extends [string, () => Promise<infer R> | infer R] ? R : never;
-    }>;
-    /**
-     * Clears the checkpoint from storage.
-     * Called after successful completion or dead-letter.
-     */
-    clear(): Promise<void>;
-    /**
-     * Gets the current checkpoint state.
-     * Useful for debugging and testing.
-     */
-    getCheckpoint(): Checkpoint;
-    /**
-     * Gets the number of cached steps.
-     */
-    get cachedStepCount(): number;
-}
-//# sourceMappingURL=context.d.ts.map

package/dist/checkpoint/context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/checkpoint/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EACV,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,gBAAgB,CAAC,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACpD;AAED;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;gBAE9C,MAAM,EAAE,sBAAsB;IAa1C,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAEK,EAAE,CAAC,CAAC,SAAS,gBAAgB,EACjC,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GACvB,OAAO,CAAC,CAAC,CAAC;IA0CP,GAAG,CACP,CAAC,SAAS,SAAS;QACjB,MAAM;QACN,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB;KACnD,EAAE,EAEH,GAAG,EAAE,CAAC,GACL,OAAO,CAAC;SACR,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GACnE,CAAC,GACD,KAAK;KACV,CAAC;IAoEF;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;OAGG;IACH,aAAa,IAAI,UAAU;IAI3B;;OAEG;IACH,IAAI,eAAe,IAAI,MAAM,CAE5B;CACF"}

package/dist/checkpoint/context.js

@@ -1,140 +0,0 @@
-import { DuplicateIoKeyError } from '../errors/index.js';
-/**
- * Implementation of SubscriberContext that provides io() caching.
- *
- * On first execution, io() calls execute their lambdas and cache results.
- * On retry (when existingCheckpoint is provided), cached results are returned
- * without re-executing the lambda.
- */
-export class ResumableContext {
-    checkpoint;
-    usedKeys = new Set();
-    store;
-    envelope;
-    subscriber;
-    hooks;
-    constructor(config) {
-        this.store = config.store;
-        this.envelope = config.envelope;
-        this.subscriber = config.subscriber;
-        this.hooks = config.hooks;
-        this.checkpoint = config.existingCheckpoint ?? {
-            envelopeId: config.envelope.id,
-            subscriberName: config.subscriber.name,
-            completedSteps: {},
-        };
-    }
-    get attempt() {
-        return this.envelope.docket.attempts;
-    }
-    get isRetry() {
-        return this.attempt > 1;
-    }
-    async io(key, fn) {
-        // Validate key uniqueness within this execution
-        if (this.usedKeys.has(key)) {
-            throw new DuplicateIoKeyError(key, this.subscriber.name);
-        }
-        this.usedKeys.add(key);
-        // Check cache first
-        if (key in this.checkpoint.completedSteps) {
-            await this.hooks?.onCheckpointHit?.({
-                envelope: this.envelope,
-                subscriber: this.subscriber,
-                stepKey: key,
-            });
-            return this.checkpoint.completedSteps[key];
-        }
-        // Notify cache miss
-        await this.hooks?.onCheckpointMiss?.({
-            envelope: this.envelope,
-            subscriber: this.subscriber,
-            stepKey: key,
-        });
-        // Execute the function - errors propagate, no caching on failure
-        const result = await fn();
-        // Cache the result
-        this.checkpoint = {
-            ...this.checkpoint,
-            completedSteps: {
-                ...this.checkpoint.completedSteps,
-                [key]: result,
-            },
-        };
-        // Persist checkpoint immediately (incremental persistence)
-        await this.store.set(this.envelope.id, this.checkpoint);
-        return result;
-    }
-    async all(ops) {
-        // First, check for duplicates within this all() call
-        const keysInThisCall = new Set();
-        for (const [key] of ops) {
-            if (keysInThisCall.has(key)) {
-                throw new DuplicateIoKeyError(key, this.subscriber.name);
-            }
-            keysInThisCall.add(key);
-        }
-        // Then validate against previously used keys
-        for (const [key] of ops) {
-            if (this.usedKeys.has(key)) {
-                throw new DuplicateIoKeyError(key, this.subscriber.name);
-            }
-        }
-        // Mark all keys as used
-        for (const [key] of ops) {
-            this.usedKeys.add(key);
-        }
-        // Execute all operations in parallel
-        const results = await Promise.all(ops.map(async ([key, fn]) => {
-            // Check cache first
-            if (key in this.checkpoint.completedSteps) {
-                await this.hooks?.onCheckpointHit?.({
-                    envelope: this.envelope,
-                    subscriber: this.subscriber,
-                    stepKey: key,
-                });
-                return this.checkpoint.completedSteps[key];
-            }
-            // Notify cache miss
-            await this.hooks?.onCheckpointMiss?.({
-                envelope: this.envelope,
-                subscriber: this.subscriber,
-                stepKey: key,
-            });
-            // Execute - errors propagate
-            const result = await fn();
-            // Cache individually (in local state, will persist after Promise.all)
-            this.checkpoint = {
-                ...this.checkpoint,
-                completedSteps: {
-                    ...this.checkpoint.completedSteps,
-                    [key]: result,
-                },
-            };
-            return result;
-        }));
-        // Persist after all parallel operations complete
-        await this.store.set(this.envelope.id, this.checkpoint);
-        return results;
-    }
-    /**
-     * Clears the checkpoint from storage.
-     * Called after successful completion or dead-letter.
-     */
-    async clear() {
-        await this.store.delete(this.envelope.id);
-    }
-    /**
-     * Gets the current checkpoint state.
-     * Useful for debugging and testing.
-     */
-    getCheckpoint() {
-        return this.checkpoint;
-    }
-    /**
-     * Gets the number of cached steps.
-     */
-    get cachedStepCount() {
-        return Object.keys(this.checkpoint.completedSteps).length;
-    }
-}

package/dist/checkpoint/context.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=context.test.d.ts.map

package/dist/checkpoint/context.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context.test.d.ts","sourceRoot":"","sources":["../../src/checkpoint/context.test.ts"],"names":[],"mappings":""}