Refine event on method types

derbyjs · Mar 18, 2024 · ea93285 · ea93285
1 parent 4f3c12a
commit ea93285
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/Model/EventMapTree.ts b/src/Model/EventMapTree.ts
@@ -85,7 +85,7 @@ export class EventMapTree {
       if (next) {
         node = next;
       } else {
-        node = new EventMapTree(node, segment);
+        node = new EventMapTree(node, segment.toString());
         children.set(segment, node);
       }
     }

diff --git a/src/Model/events.ts b/src/Model/events.ts
@@ -26,9 +26,9 @@ export interface ModelOnEventMap {
 }
 
 declare module './Model' {
-  interface Model {
+  interface Model<T> {
     addListener(event: string, listener: any, arg2?: any, arg3?: any): any;
-    eventContext(id: string): Model;
+    eventContext(id: string): ChildModel<T>;
 
     /**
      * Listen to Racer events matching a certain path or path pattern.
@@ -63,20 +63,32 @@ declare module './Model' {
       pathPattern: PathLike,
       options: { useEventObjects: true },
       listener: (event: ModelOnEventMap[T], captures: Array<string | string[]>) => void
-    ): Function;
+    ): () => void;
     on<T extends keyof ModelOnEventMap>(
       eventType: T,
       options: { useEventObjects: true },
       listener: (event: ModelOnEventMap[T], captures: Array<string | string[]>) => void
-    ): Function;
+    ): () => void;
+
+    // TODO review this calling w/o options if options useEventObjects should go away
+    // without any "legacy" events use case
+    on<T extends keyof ModelOnEventMap>(
+      eventType: T,
+      pathPattern: PathLike,
+      listener: (event: ModelOnEventMap[T], captures: Array<string | string[]>) => void
+    ): () => void;
+    on<T extends keyof ModelOnEventMap>(
+      eventType: T,
+      listener: (event: ModelOnEventMap[T], captures: Array<string | string[]>) => void
+    ): () => void;
     on(
       eventType: 'all',
       listener: (segments: string[], event: ModelOnEventMap[keyof ModelOnEventMap]) => void
-    ): Function;
+    ): () => void;
     on(
       eventType: 'error',
       listener: (error: Error) => void
-    ): Function;
+    ): () => void;
 
 
     /**