From fa87168ffbb683aed495b7786a4d100510d29c04 Mon Sep 17 00:00:00 2001
From: Karsten Schmidt <k@postspectacular.com>
Date: Sat, 6 Mar 2021 15:56:38 +0000
Subject: [PATCH] feat(rstream): update PubSub

- update PubSub generics
- update .subscribeTopic() opts to use `TransformableOpts`
---
 packages/rstream/src/pubsub.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/rstream/src/pubsub.ts b/packages/rstream/src/pubsub.ts
index f56ffcaf37..e31de7ba03 100644
--- a/packages/rstream/src/pubsub.ts
+++ b/packages/rstream/src/pubsub.ts
@@ -4,10 +4,10 @@ import { unsupported } from "@thi.ng/errors";
 import type { Transducer } from "@thi.ng/transducers";
 import {
     CloseMode,
-    CommonOpts,
     ISubscriber,
     LOGGER,
     SubscriptionOpts,
+    TransformableOpts,
     WithErrorHandlerOpts,
 } from "./api";
 import { Subscription, subscription } from "./subscription";
@@ -62,13 +62,13 @@ export interface PubSubOpts<A, B, T> {
  *
  * @param opts -
  */
-export const pubsub = <A, B, T = any>(opts: PubSubOpts<A, B, T>) =>
+export const pubsub = <A, B = A, T = any>(opts: PubSubOpts<A, B, T>) =>
     new PubSub(opts);
 
 /**
  * @see {@link pubsub} for reference & examples.
  */
-export class PubSub<A, B, T = any> extends Subscription<A, B> {
+export class PubSub<A, B = A, T = any> extends Subscription<A, B> {
     topicfn: Fn<B, T>;
     topics: EquivMap<T, Subscription<B, B>>;
 
@@ -101,23 +101,23 @@ export class PubSub<A, B, T = any> extends Subscription<A, B> {
 
     subscribeTopic<C>(
         topicID: T,
-        opts?: Partial<CommonOpts>
+        opts?: Partial<TransformableOpts<B, C>>
     ): Subscription<B, C>;
-    subscribeTopic(
+    subscribeTopic<C>(
         topicID: T,
-        sub: ISubscriber<B>,
-        opts?: Partial<CommonOpts>
-    ): Subscription<B, B>;
+        sub: ISubscriber<C>,
+        opts?: Partial<TransformableOpts<B, C>>
+    ): Subscription<B, C>;
     subscribeTopic(
         topicID: T,
         sub: any,
-        opts?: Partial<CommonOpts>
+        opts?: Partial<TransformableOpts<any, any>>
     ): Subscription<any, any> {
         let t = this.topics.get(topicID);
         !t &&
             this.topics.set(
                 topicID,
-                (t = subscription<B, B>(undefined, {
+                (t = subscription(undefined, {
                     closeOut: CloseMode.NEVER,
                 }))
             );