Merge pull request #175 from timreichen/fix-nodelist-type

fix: fix NodeList type inference

src/dom/document.ts

@@ -311,15 +311,17 @@ export class Document extends Node {
     return this._nwapi.first(selectors, this) as T;
   }
 
-  querySelectorAll<T = Element>(selectors: string): NodeList<T> {
+  querySelectorAll<T extends Element = Element>(
+    selectors: string,
+  ): NodeList<T> {
     const nodeList = new NodeList();
     const mutator = nodeList[nodeListMutatorSym]();
 
     for (const match of this._nwapi.select(selectors, this)) {
       mutator.push(match);
     }
 
-    return nodeList;
+    return nodeList as NodeList<T>;
   }
 
   // TODO: DRY!!!

src/dom/element.ts

@@ -904,7 +904,9 @@ export class Element extends Node {
     return this.ownerDocument!._nwapi.first(selectors, this) as T;
   }
 
-  querySelectorAll<T = Element>(selectors: string): NodeList<T> {
+  querySelectorAll<T extends Element = Element>(
+    selectors: string,
+  ): NodeList<T> {
     if (!this.ownerDocument) {
       throw new Error("Element must have an owner document");
     }
@@ -916,7 +918,7 @@ export class Element extends Node {
       mutator.push(match);
     }
 
-    return nodeList;
+    return nodeList as NodeList<T>;
   }
 
   matches(selectorString: string): boolean {

src/dom/node-list.ts

@@ -192,15 +192,15 @@ for (
   NodeListClass.prototype[instanceMethod] = undefined;
 }
 
-export interface NodeList<T = Node> {
+export interface NodeList<T extends Node = Node> {
   new (): NodeList;
-  readonly [index: number]: Node;
+  readonly [index: number]: T;
   readonly length: number;
-  [Symbol.iterator](): Generator<Node>;
+  [Symbol.iterator](): Generator<T>;
 
-  item(index: number): Node;
+  item(index: number): T;
   forEach(
-    cb: (node: Node, index: number, nodeList: Node[]) => void,
+    cb: (node: T, index: number, nodeList: T[]) => void,
     thisArg?: NodeList | undefined,
   ): void;
   [nodeListMutatorSym](): NodeListMutator;