Generating extension of generic event types by code instead of overriding JSON

Author: nscarcella

inputfiles/overridingTypes.jsonc

@@ -1729,55 +1729,7 @@
                     }
                 }
             },
-            "CompositionEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>"
-            },
-            "FocusEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>"                
-            },
-            "InputEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>"                
-            },
-            "KeyboardEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>"                
-            },
             "MouseEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>" ,
                 "methods": {
                     "method": {
                         "initMouseEvent": {
@@ -1789,46 +1741,6 @@
                     }
                 }
             },
-            "TouchEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "UIEvent<T>"                
-            },
-            "DragEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "MouseEvent<T>"                
-            },
-            "PointerEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "MouseEvent<T>"                
-            },
-            "WheelEvent": {
-                "typeParameters": [
-                    {
-                        "name": "T",
-                        "default": "EventTarget",
-                        "extends": "EventTarget"
-                    }
-                ],
-                "extends": "MouseEvent<T>"                
-            },
             "DOMException": {
                 "extends": "Error"
             },

src/build/emitter.ts

@@ -9,6 +9,7 @@ import {
   integerTypes,
   baseTypeConversionMap,
   assertUnique,
+  genericEventSupertypes,
 } from "./helpers.js";
 import { collectLegacyNamespaceTypes } from "./legacy-namespace.js";
 
@@ -1202,17 +1203,32 @@ export function emitWebIdl(
 
     emitComments(i, printer.printLine);
 
-    printer.print(
-      `interface ${getNameWithTypeParameter(i.typeParameters, processedIName)}`
-    );
-
     const finalExtends = [i.extends || "Object"]
       .concat(getImplementList(i.name))
       .filter((i) => i !== "Object")
       .map(processIName);
 
+    const extendedGenericEventSupertype = i.typeParameters
+      ? undefined
+      : finalExtends.find((name) => genericEventSupertypes.has(name));
+
+    printer.print(
+      `interface ${getNameWithTypeParameter(
+        extendedGenericEventSupertype
+          ? [{ name: "T", default: "EventTarget", extends: "EventTarget" }]
+          : i.typeParameters,
+        processedIName
+      )}`
+    );
+
     if (finalExtends.length) {
-      printer.print(` extends ${assertUnique(finalExtends).join(", ")}`);
+      printer.print(
+        ` extends ${assertUnique(
+          finalExtends.map((name) =>
+            name === extendedGenericEventSupertype ? `${name}<T>` : name
+          )
+        ).join(", ")}`
+      );
     }
     printer.print(" {");
     printer.endLine();

src/build/helpers.ts

@@ -62,6 +62,8 @@ export const baseTypeConversionMap = new Map<string, string>([
   ["EventHandler", "EventHandler"],
 ]);
 
+export const genericEventSupertypes = new Set(["UIEvent", "MouseEvent"]);
+
 export function deepFilter<T>(
   obj: T,
   fn: (o: any, n: string | undefined) => boolean