fix: improve lib.dom.d.ts type definitions

so that it does not conflict with lib.dom.iterable.d.ts definitions.

Merge branch 'fix-30'

closes #30

Author: uhyo

generated/lib.dom.d.ts

@@ -2517,11 +2517,17 @@ declare var AudioParam: {
 };
 
 interface AudioParamMap {
-  forEach(
-    callbackfn: (value: AudioParam, key: string, parent: AudioParamMap) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: AudioParam,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
   ): void;
 }
+//     forEach(callbackfn: (value: AudioParam, key: string, parent: AudioParamMap) => void, thisArg?: any): void;
 
 declare var AudioParamMap: {
   prototype: AudioParamMap;
@@ -5951,11 +5957,12 @@ declare var Event: {
 };
 
 interface EventCounts {
-  forEach(
-    callbackfn: (value: number, key: string, parent: EventCounts) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (this: This, value: number, key: string, parent: this) => void,
+    thisArg?: This
   ): void;
 }
+//     forEach(callbackfn: (value: number, key: string, parent: EventCounts) => void, thisArg?: any): void;
 
 declare var EventCounts: {
   prototype: EventCounts;
@@ -6331,9 +6338,14 @@ interface FontFaceSet extends EventTarget {
   readonly status: FontFaceSetLoadStatus;
   check(font: string, text?: string): boolean;
   load(font: string, text?: string): Promise<FontFace[]>;
-  forEach(
-    callbackfn: (value: FontFace, key: FontFace, parent: FontFaceSet) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: FontFace,
+      key: FontFace,
+      parent: this
+    ) => void,
+    thisArg?: This
   ): void;
   addEventListener<K extends keyof FontFaceSetEventMap>(
     type: K,
@@ -6356,6 +6368,7 @@ interface FontFaceSet extends EventTarget {
     options?: boolean | EventListenerOptions
   ): void;
 }
+//     forEach(callbackfn: (value: FontFace, key: FontFace, parent: FontFaceSet) => void, thisArg?: any): void;
 
 declare var FontFaceSet: {
   prototype: FontFaceSet;
@@ -11692,11 +11705,17 @@ declare var MIDIInput: {
 
 /** Available only in secure contexts. */
 interface MIDIInputMap {
-  forEach(
-    callbackfn: (value: MIDIInput, key: string, parent: MIDIInputMap) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: MIDIInput,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
   ): void;
 }
+//     forEach(callbackfn: (value: MIDIInput, key: string, parent: MIDIInputMap) => void, thisArg?: any): void;
 
 declare var MIDIInputMap: {
   prototype: MIDIInputMap;
@@ -11745,11 +11764,17 @@ declare var MIDIOutput: {
 
 /** Available only in secure contexts. */
 interface MIDIOutputMap {
-  forEach(
-    callbackfn: (value: MIDIOutput, key: string, parent: MIDIOutputMap) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: MIDIOutput,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
   ): void;
 }
+//     forEach(callbackfn: (value: MIDIOutput, key: string, parent: MIDIOutputMap) => void, thisArg?: any): void;
 
 declare var MIDIOutputMap: {
   prototype: MIDIOutputMap;
@@ -14683,11 +14708,12 @@ declare var RTCSessionDescription: {
 };
 
 interface RTCStatsReport {
-  forEach(
-    callbackfn: (value: any, key: string, parent: RTCStatsReport) => void,
-    thisArg?: any
+  forEach<This = undefined>(
+    callbackfn: (this: This, value: unknown, key: string, parent: this) => void,
+    thisArg?: This
   ): void;
 }
+//     forEach(callbackfn: (value: any, key: string, parent: RTCStatsReport) => void, thisArg?: any): void;
 
 declare var RTCStatsReport: {
   prototype: RTCStatsReport;

lib/lib.dom.d.ts

@@ -1,3 +1,67 @@
 interface Body {
   json(): Promise<JSONValue>;
 }
+
+interface AudioParamMap {
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: AudioParam,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
+  ): void;
+}
+
+interface EventCounts {
+  forEach<This = undefined>(
+    callbackfn: (this: This, value: number, key: string, parent: this) => void,
+    thisArg?: This
+  ): void;
+}
+
+/** Available only in secure contexts. */
+interface MIDIInputMap {
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: MIDIInput,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
+  ): void;
+}
+
+/** Available only in secure contexts. */
+interface MIDIOutputMap {
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: MIDIOutput,
+      key: string,
+      parent: this
+    ) => void,
+    thisArg?: This
+  ): void;
+}
+
+interface RTCStatsReport {
+  forEach<This = undefined>(
+    callbackfn: (this: This, value: unknown, key: string, parent: this) => void,
+    thisArg?: This
+  ): void;
+}
+
+interface FontFaceSet extends EventTarget {
+  forEach<This = undefined>(
+    callbackfn: (
+      this: This,
+      value: FontFace,
+      key: FontFace,
+      parent: this
+    ) => void,
+    thisArg?: This
+  ): void;
+}

tests/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "lib": ["esnext", "dom"],
+    "lib": ["esnext", "dom", "dom.iterable"],
     "module": "esnext",
     "moduleResolution": "node",
     "noEmit": true,