Duplicate Model on signatures in RootModel to handle overrides

derbyjs · Apr 25, 2024 · 255213e · 255213e
1 parent a4ae98c
commit 255213e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Model/events.ts b/src/Model/events.ts
@@ -33,6 +33,18 @@ type EventObjectCaptures = string[];
 
 declare module './Model' {
   interface RootModel {
+    // duplicated w on signatures below due to how TS handles overrides
+    on<T extends keyof ModelOnEventMap>(
+      eventType: T,
+      pathPattern: PathLike,
+      options: { useEventObjects: true },
+      listener: (event: ModelOnEventMap[T], captures: EventObjectCaptures) => void
+    ): () => void;
+    on<T extends keyof ModelOnEventMap>(
+      eventType: T,
+      options: { useEventObjects: true },
+      listener: (event: ModelOnEventMap[T], captures: EventObjectCaptures) => void
+    ): () => void;
     on(
       eventType: 'all',
       listener: (pathSegments: string[], event: ModelOnEventMap[keyof ModelOnEventMap]) => void
@@ -145,7 +157,7 @@ declare module './Model' {
   }
 }
 
-Model.INITS.push(function(model: Model) {
+Model.INITS.push(function(model) {
   var root = model.root;
   EventEmitter.call(root);
 

diff --git a/src/Model/filter.ts b/src/Model/filter.ts
@@ -1,5 +1,5 @@
 var util = require('../util');
-import { Model } from './Model';
+import { Model, RootModel } from './Model';
 import { type Segments } from './types';
 import * as defaultFns from './defaultFns';
 import type { Path, PathLike } from '../types';
@@ -89,7 +89,7 @@ declare module './Model' {
   }
 }
 
-Model.INITS.push(function(model: Model) {
+Model.INITS.push(function(model) {
   model.root._filters = new Filters(model);
   model.on('all', filterListener);
   function filterListener(segments, event) {