types(compile): compile's return value takes a Node

fb55 · Apr 16, 2021 · 1419455 · 1419455
1 parent a757a4a
commit 1419455
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/compile.ts b/src/compile.ts
@@ -21,7 +21,7 @@ export function compile<Node, ElementNode extends Node>(
     selector: string | Selector[][],
     options: InternalOptions<Node, ElementNode>,
     context?: Node[] | Node
-): CompiledQuery<ElementNode> {
+): CompiledQuery<Node> {
     const next = compileUnsafe(selector, options, context);
     return ensureIsTag(next, options.adapter);
 }

diff --git a/src/index.ts b/src/index.ts
@@ -39,18 +39,18 @@ function convertOptionFormats<Node, ElementNode extends Node>(
     return opts as InternalOptions<Node, ElementNode>;
 }
 
-function wrapCompile<Selector, Node, ElementNode extends Node>(
+function wrapCompile<Selector, Node, ElementNode extends Node, R extends Node>(
     func: (
         selector: Selector,
         options: InternalOptions<Node, ElementNode>,
         context?: Node[] | Node
-    ) => CompiledQuery<ElementNode>
+    ) => CompiledQuery<R>
 ) {
     return function addAdapter(
         selector: Selector,
         options?: Options<Node, ElementNode>,
         context?: Node[] | Node
-    ) {
+    ): CompiledQuery<R> {
         const opts = convertOptionFormats(options);
 
         return func(selector, opts, context);

diff --git a/src/pseudo-selectors/subselects.ts b/src/pseudo-selectors/subselects.ts
@@ -10,8 +10,8 @@ export const PLACEHOLDER_ELEMENT = {};
 export function ensureIsTag<Node, ElementNode extends Node>(
     next: CompiledQuery<ElementNode>,
     adapter: Adapter<Node, ElementNode>
-): CompiledQuery<ElementNode> {
-    if (next === falseFunc) return next;
+): CompiledQuery<Node> {
+    if (next === falseFunc) return falseFunc;
     return (elem: Node) => adapter.isTag(elem) && next(elem);
 }