Merge pull request #319 from jthoms1/master

Add overrides for interface types and add CustomEvent types for testing.

Author: mhegazy

TS.fsx

@@ -779,6 +779,10 @@ module Emit =
         (DomTypeToNullableTsType m.Type m.Nullable.IsSome) = expectedMType &&
         m.Params.Length = 1 &&
         (DomTypeToTsType m.Params.[0].Type) = expectedParamType
+    let processInterfaceType iName =
+        match getOverriddenItems ItemKind.Interface Flavor.All |> Array.tryFind (matchInterface iName) with
+        | Some it -> iName + "<" + (it.TypeParameters |> String.concat ", ") + ">"
+        | _ -> iName
 
     /// Emit overloads for the createElement method
     let EmitCreateElementOverloads (m: Browser.Method) =
@@ -1160,9 +1164,9 @@ module Emit =
 
         let processedIName = processIName i.Name
         if processedIName <> i.Name then
-            Pt.PrintlToStack "interface %s extends %s {" i.Name processedIName
+            Pt.PrintlToStack "interface %s extends %s {" (processInterfaceType i.Name) processedIName
 
-        Pt.Printl "interface %s" processedIName
+        Pt.Printl "interface %s" (processInterfaceType processedIName)
         let finalExtends =
             let overridenExtendsFromJson =
                 InputJson.getOverriddenItemsByInterfaceName ItemKind.Extends Flavor.All i.Name
@@ -1387,10 +1391,11 @@ module Emit =
                 EmitConstructor flavor i
 
     let EmitDictionaries flavor =
+
         let emitDictionary (dict:Browser.Dictionary) =
             match dict.Extends with
-            | "Object" -> Pt.Printl "interface %s {" dict.Name
-            | _ -> Pt.Printl "interface %s extends %s {" dict.Name dict.Extends
+            | "Object" -> Pt.Printl "interface %s {" (processInterfaceType dict.Name)
+            | _ -> Pt.Printl "interface %s extends %s {" (processInterfaceType dict.Name) dict.Extends
 
             let emitJsonProperty (p: InputJsonType.Root) =
                 let readOnlyModifier =

baselines/dom.generated.d.ts

@@ -82,8 +82,8 @@ interface ConstrainVideoFacingModeParameters {
     ideal?: VideoFacingModeEnum | VideoFacingModeEnum[];
 }
 
-interface CustomEventInit extends EventInit {
-    detail?: any;
+interface CustomEventInit<T = any> extends EventInit {
+    detail?: T;
 }
 
 interface DeviceAccelerationDict {
@@ -2374,14 +2374,14 @@ declare var CSSSupportsRule: {
     new(): CSSSupportsRule;
 };
 
-interface CustomEvent extends Event {
-    readonly detail: any;
-    initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
+interface CustomEvent<T = any> extends Event {
+    readonly detail: T;
+    initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: T): void;
 }
 
 declare var CustomEvent: {
     prototype: CustomEvent;
-    new(typeArg: string, eventInitDict?: CustomEventInit): CustomEvent;
+    new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
 };
 
 interface DataCue extends TextTrackCue {

inputfiles/overridingTypes.json

@@ -1,4 +1,46 @@
 [
+    {
+        "kind": "interface",
+        "interface": "CustomEventInit",
+        "typeParameters": [
+            "T = any"
+        ]
+    },
+    {
+        "kind": "property",
+        "interface": "CustomEventInit",
+        "name": "detail?",
+        "type": "T"
+    },
+    {
+        "kind": "interface",
+        "interface": "CustomEvent",
+        "typeParameters": [
+            "T = any"
+        ]
+    },
+    {
+        "kind": "property",
+        "interface": "CustomEvent",
+        "readonly": true,
+        "name": "detail",
+        "type": "T"
+    },
+    {
+        "kind": "method",
+        "interface": "CustomEvent",
+        "name": "initCustomEvent",
+        "signatures": [
+            "initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: T): void"
+        ]
+    },
+    {
+        "kind": "constructor",
+        "interface": "CustomEvent",
+        "signatures": [
+            "new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>"
+        ]
+    },
     {
         "kind": "constructor",
         "interface": "Response",

inputfiles/sample.json

@@ -337,6 +337,13 @@
         "baseInterface": "ParentNode",
         "interface": "Document"
     },
+    {
+        "kind": "interface",
+        "interface": "CustomEventInit",
+        "typeParameters": [
+            "T = any"
+        ]
+    },
     {
         "kind": "interface", 
         "name": "ParentNode",