fix: some d.ts error

liriliri · Jul 16, 2024 · b00f667 · b00f667
1 parent 447d363
commit b00f667
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 18 deletions.
diff --git a/eruda.d.ts b/eruda.d.ts
@@ -50,7 +50,15 @@ declare module 'eruda' {
     y: number
   }
 
-  export interface Emitter {}
+  type AnyFn = (...args: any[]) => any
+
+  export interface Emitter {
+    on(event: string, listener: AnyFn): Emitter
+    off(event: string, listener: AnyFn): Emitter
+    once(event: string, listener: AnyFn): Emitter
+    emit(event: string, ...args: any[]): Emitter
+    removeAllListeners(event?: string): Emitter
+  }
 
   /**
    * Eruda Plugin
@@ -165,11 +173,16 @@ declare module 'eruda' {
   }
 
   export interface Elements extends Tool {
-    set<K extends keyof ElementsConfig>(name: K, value: ElementsConfig[K]): void
+    config: {
+      set<K extends keyof ElementsConfig>(
+        name: K,
+        value: ElementsConfig[K]
+      ): void
+    }
     /**
      * Element to display
      */
-    html(el: HTMLElement): void
+    select(el: HTMLElement): void
   }
 
   export interface ElementsConstructor {
@@ -205,10 +218,12 @@ declare module 'eruda' {
   }
 
   export interface Resources extends Tool {
-    set<K extends keyof ResourcesConfig>(
-      name: K,
-      value: ResourcesConfig[K]
-    ): void
+    config: {
+      set<K extends keyof ResourcesConfig>(
+        name: K,
+        value: ResourcesConfig[K]
+      ): void
+    }
   }
 
   export interface ResourcesConstructor {
@@ -232,7 +247,9 @@ declare module 'eruda' {
   }
 
   export interface Sources extends Tool {
-    set<K extends keyof SourcesConfig>(name: K, value: SourcesConfig[K]): void
+    config: {
+      set<K extends keyof SourcesConfig>(name: K, value: SourcesConfig[K]): void
+    }
   }
 
   export interface SourcesConstructor {
@@ -402,6 +419,18 @@ declare module 'eruda' {
     getTheme(): string
   }
 
+  interface IToolNameMap {
+    console: InstanceType<ErudaConsoleConstructor>
+    elements: InstanceType<ElementsConstructor>
+    info: InstanceType<InfoConstructor>
+    network: InstanceType<NetworkConstructor>
+    resources: InstanceType<ResourcesConstructor>
+    settings: InstanceType<SettingsConstructor>
+    snippets: InstanceType<SnippetsConstructor>
+    sources: InstanceType<SourcesConstructor>
+    entryBtn: InstanceType<EntryBtnConstructor>
+  }
+
   /**
    * Eruda APIs
    * @see https://eruda.liriliri.io/docs/api.html
@@ -430,13 +459,9 @@ declare module 'eruda' {
     /**
      * Get tool, eg. console, elements panels.
      */
+    get<K extends keyof IToolNameMap>(name: K): IToolNameMap[K]
     get<T extends ToolConstructor>(name: string): InstanceType<T> | undefined
-    get(
-      name: string
-    ):
-      | InstanceType<EntryBtnConstructor>
-      | InstanceType<DevToolsConstructor>
-      | undefined
+    get(): InstanceType<DevToolsConstructor>
     /**
      * Add tool.
      */

diff --git a/src/Elements/Elements.js b/src/Elements/Elements.js
@@ -67,10 +67,6 @@ export default class Elements extends Tool {
 
     chobitsu.domain('Overlay').hideHighlight()
   }
-  // To be removed in 3.0.0
-  set(node) {
-    return this.select(node)
-  }
   select(node) {
     this._domViewer.select(node)
     this._setNode(node)