@bloqz/relay 1.2.0 → 2.0.0

package/dist/create.d.ts

@@ -1,6 +1,6 @@
-import { Relay } from "./index.js";
+import { Relay, RelayEvent } from "./models.js";
 /**
  * Factory function to create a new Relay instance using RxJS.
  * @returns A new Relay instance.
  */
-export declare function createRelay(): Relay;
+export declare function createRelay<Events extends RelayEvent = any>(): Relay<Events>;

package/dist/create.js

@@ -7,69 +7,25 @@ import { filter } from "rxjs/operators";
 export function createRelay() {
     // The single, central stream for all events.
     const eventStream$ = new Subject();
-    /**
-     * Parses a pattern and checks if it matches a given topic and event.
-     * (This helper function remains the same)
-     */
-    const matchesPattern = (pattern, topic, event) => {
-        if (pattern === "*")
-            return true;
-        // Helper to split by '|' but ignore it inside '{}'
-        const splitSubPatterns = (p) => {
-            const patterns = [];
-            let lastSplit = 0;
-            let braceDepth = 0;
-            for (let i = 0; i < p.length; i++) {
-                if (p[i] === "{")
-                    braceDepth++;
-                else if (p[i] === "}")
-                    braceDepth--;
-                else if (p[i] === "|" && braceDepth === 0) {
-                    patterns.push(p.substring(lastSplit, i));
-                    lastSplit = i + 1;
-                }
-            }
-            patterns.push(p.substring(lastSplit));
-            return patterns;
-        };
-        const subPatterns = splitSubPatterns(pattern);
-        return subPatterns.some((subPattern) => {
-            const [topicPattern, typePattern] = subPattern.split(".");
-            if (topicPattern !== "*" && topicPattern !== topic)
-                return false;
-            if (!typePattern)
-                return true;
-            if (typePattern === "*")
-                return true;
-            if (typePattern.startsWith("{") && typePattern.endsWith("}")) {
-                const types = typePattern.slice(1, -1).split("|");
-                return types.includes(event.type);
-            }
-            return typePattern === event.type;
-        });
-    };
     return {
         emit(topic, event) {
             // Simply push the new event into the stream.
-            eventStream$.next({ topic, event });
+            eventStream$.next({ topic: topic, event });
         },
-        on(patternOrPredicate, callback) {
-            // Create the filter predicate once, before subscribing.
-            const filterFn = ({ topic, event, }) => {
-                if (typeof patternOrPredicate === "string") {
-                    return matchesPattern(patternOrPredicate, topic, event);
-                }
-                // For predicates, just execute them.
-                return patternOrPredicate(topic, event);
-            };
+        on(topicOrPattern, callback) {
             // Create a new subscription to the main stream.
             const subscription = eventStream$
                 .pipe(
-            // Use the pre-built filter function. This is more efficient.
-            filter(filterFn))
+            // Filter by topic or allow all if wildcard.
+            filter(({ topic }) => topicOrPattern === "*" || topic === topicOrPattern))
                 .subscribe(({ topic, event }) => {
                 // When an event passes the filter, call the user's handler.
-                callback(topic, event);
+                if (topicOrPattern === "*") {
+                    callback(topic, event);
+                }
+                else {
+                    callback(event);
+                }
             });
             // Return a function that tears down this specific subscription.
             return () => subscription.unsubscribe();

package/dist/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AASxC;;;GAGG;AACH,MAAM,UAAU,WAAW;IACzB,6CAA6C;IAC7C,MAAM,YAAY,GAAG,IAAI,OAAO,EAAwC,CAAC;IAEzE,OAAO;QACL,IAAI,CAAyB,KAAQ,EAAE,KAAgB;YACrD,6CAA6C;YAC7C,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAe,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,EAAE,CACA,cAAuB,EACvB,QAAyE;YAEzE,gDAAgD;YAChD,MAAM,YAAY,GAAG,YAAY;iBAC9B,IAAI;YACH,4CAA4C;YAC5C,MAAM,CACJ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,cAAc,KAAK,GAAG,IAAI,KAAK,KAAK,cAAc,CAClE,CACF;iBACA,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC9B,4DAA4D;gBAC5D,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;oBAC1B,QAAkD,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACL,QAAoC,CAAC,KAAkB,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC,CAAC,CAAC;YAEL,gEAAgE;YAChE,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAC1C,CAAC;QACD,OAAO;YACL,wEAAwE;YACxE,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export type { RelayEvent, RelayHandler, RelayPredicate, Relay } from "./models.js";
+export type { RelayEventsMap, RelayEvent, RelayHandler, RelayPredicate, Relay, } from "./models.js";
 export { createRelay } from "./create.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}

package/dist/models.d.ts

@@ -1,3 +1,10 @@
+/**
+ * A map of event topics to their corresponding event payloads.
+ * This is used to provide type safety for relay operations.
+ */
+export type RelayEventsMap = {
+    readonly [topic: string]: RelayEvent;
+};
 /**
  * The standard shape for any event payload passed through the relay.
  * It must include a `type` string to allow for pattern-based filtering.
@@ -16,7 +23,13 @@ export type RelayEvent = {
  * @param topic The topic the event was emitted on (e.g., 'user', 'cart').
  * @param event The event payload.
  */
-export type RelayHandler = (topic: string, event: RelayEvent) => void;
+export type RelayTopicHandler<T, E> = (topic: T, event: E) => void;
+/**
+ * A handler function that receives the event for a matched subscription.
+ *
+ * @param event The event payload.
+ */
+export type RelayHandler<E> = (event: E) => void;
 /**
  * A predicate function used for advanced event filtering. It receives the full
  * event context and returns `true` if the handler should be called.
@@ -25,13 +38,13 @@ export type RelayHandler = (topic: string, event: RelayEvent) => void;
  * @param event The event payload.
  * @returns `true` if the subscription handler should be invoked.
  */
-export type RelayPredicate = (topic: string, event: RelayEvent) => boolean;
+export type RelayPredicate<T, E> = (topic: T, event: E) => boolean;
 /**
  * A non-generic, RxJS-powered event bus that supports pattern-based
  * and predicate-based subscriptions. It serves as a central hub for
  * cross-cutting communication, such as between Blocs.
  */
-export interface Relay {
+export interface Relay<Events extends RelayEventsMap> {
     /**
      * Emits an event to a specific topic. All active subscriptions will be
      * evaluated against the event, and matching handlers will be invoked.
@@ -40,7 +53,7 @@ export interface Relay {
      * @param event The event payload, which MUST include a `type` property
      * (e.g., `{ type: 'login', userId: '123' }`).
      */
-    emit(topic: string, event: RelayEvent): void;
+    emit<T extends keyof Events>(topic: T, event: Events[T]): void;
     /**
      * Disposes of the relay, completing its internal event stream and
      * unsubscribing all listeners. After disposal, the relay can no longer
@@ -48,34 +61,23 @@ export interface Relay {
      */
     dispose(): void;
     /**
-     * Registers a callback for events matching a specific string pattern.
-     * The pattern allows for filtering by topic and event type.
+     * Registers a callback for events matching a specific topic.
      *
-     * @param pattern A string pattern to match against topics and event types.
-     *   - `*`: Wildcard, matches any topic and event.
-     *   - `topic.*`: Matches any event on a specific topic.
-     *   - `*.{type1|type2}`: Matches specific event types on any topic.
-     *   - `topic.{type1|type2}`: Matches specific event types on a specific topic.
-     *   - `topic1|topic2`: Matches any event on a list of topics.
+     * @param topic The topic to listen to.
      * @param callback The callback to execute when a matching event is emitted.
      * @returns A function to unregister the callback and unsubscribe.
      *
      * @example
-     * on('user.{login|logout}', (topic, event) => { ... });
-     * on('cart', (topic, event) => { ... }); // same as cart.*
+     * on('user', (event) => { ... });
      * on('*', (topic, event) => { ... });
      */
-    on(pattern: string, callback: RelayHandler): () => void;
+    on<T extends keyof Events>(topic: T, callback: RelayHandler<Events[T]>): () => void;
     /**
-     * Registers a callback for events that pass a custom predicate function.
-     * This allows for more complex filtering logic than string patterns.
+     * Registers a callback for all events emitted on the relay.
      *
-     * @param predicate A function that returns `true` for events to listen to.
-     * @param callback The callback to execute for events that pass the predicate.
+     * @param topic The wildcard pattern '*'.
+     * @param callback The callback to execute when any event is emitted.
      * @returns A function to unregister the callback and unsubscribe.
-     *
-     * @example
-     * on((topic, event) => topic === 'user' && event.type === 'login', callback);
      */
-    on(predicate: RelayPredicate, callback: RelayHandler): () => void;
+    on(topic: "*", callback: RelayTopicHandler<string, RelayEvent>): () => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloqz/relay",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "A package for enabling inter-bloc communication using an event relay system.",
   "keywords": [
     "bloc",
@@ -39,7 +39,7 @@
     "rxjs": "^7.8.2"
   },
   "peerDependencies": {
-    "@bloqz/core": "^1.2.0"
+    "@bloqz/core": "^1.2.1"
   },
   "devDependencies": {},
   "scripts": {