Improve method signatures returning Node type

microsoft · Mar 27, 2017 · 386afc9 · 386afc9
1 parent c882947
commit 386afc9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -3208,7 +3208,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string | null;
-    adoptNode(source: Node): Node;
+    adoptNode<T extends Node>(source: T): T;
     captureEvents(): void;
     caretRangeFromPoint(x: number, y: number): Range;
     clear(): void;
@@ -3385,7 +3385,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Gets a value indicating whether the object currently has focus.
       */
     hasFocus(): boolean;
-    importNode(importedNode: Node, deep: boolean): Node;
+    importNode<T extends Node>(importedNode: T, deep: boolean): T;
     msElementsFromPoint(x: number, y: number): NodeListOf<Element>;
     msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf<Element>;
     /**
@@ -8249,20 +8249,20 @@ interface Node extends EventTarget {
     readonly previousSibling: Node | null;
     textContent: string | null;
     appendChild<T extends Node>(newChild: T): T;
-    cloneNode(deep?: boolean): Node;
+    cloneNode(deep?: boolean): this;
     compareDocumentPosition(other: Node): number;
     contains(child: Node): boolean;
     hasAttributes(): boolean;
     hasChildNodes(): boolean;
-    insertBefore(newChild: Node, refChild: Node | null): Node;
+    insertBefore<T extends Node>(newChild: T, refChild: Node | null): T;
     isDefaultNamespace(namespaceURI: string | null): boolean;
     isEqualNode(arg: Node): boolean;
     isSameNode(other: Node): boolean;
     lookupNamespaceURI(prefix: string | null): string | null;
     lookupPrefix(namespaceURI: string | null): string | null;
     normalize(): void;
-    removeChild(oldChild: Node): Node;
-    replaceChild(newChild: Node, oldChild: Node): Node;
+    removeChild<T extends Node>(oldChild: T): T;
+    replaceChild<T extends Node>(newChild: Node, oldChild: T): T;
     readonly ATTRIBUTE_NODE: number;
     readonly CDATA_SECTION_NODE: number;
     readonly COMMENT_NODE: number;

diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -10,18 +10,48 @@
         "name": "event",
         "type": "Event | undefined"
     },
+    {
+        "kind": "method",
+        "interface": "Document",
+        "name": "adoptNode",
+        "signatures": ["adoptNode<T extends Node>(source: T): T"]
+    },
+    {
+        "kind": "method",
+        "interface": "Document",
+        "name": "importNode",
+        "signatures": ["importNode<T extends Node>(importedNode: T, deep: boolean): T"]
+    },
     {
         "kind": "method",
         "interface": "Node",
-        "name": "insertBefore",
-        "signatures": ["insertBefore(newChild: Node, refChild: Node | null): Node"]
+        "name": "cloneNode",
+        "signatures": ["cloneNode(deep?: boolean): this"]
     },
     {
         "kind": "method",
         "interface": "Node",
         "name": "appendChild",
         "signatures": ["appendChild<T extends Node>(newChild: T): T"]
     },
+    {
+        "kind": "method",
+        "interface": "Node",
+        "name": "insertBefore",
+        "signatures": ["insertBefore<T extends Node>(newChild: T, refChild: Node | null): T"]
+    },
+    {
+        "kind": "method",
+        "interface": "Node",
+        "name": "removeChild",
+        "signatures": ["removeChild<T extends Node>(oldChild: T): T"]
+    },
+    {
+        "kind": "method",
+        "interface": "Node",
+        "name": "replaceChild",
+        "signatures": ["replaceChild<T extends Node>(newChild: Node, oldChild: T): T"]
+    },
     {
         "kind": "method",
         "interface": "HTMLCollection",