Merge 7a71632 into b9df809

Author: fb55

package-lock.json

@@ -23,8 +23,8 @@
     "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.1.0",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
         "nth-check": "^2.0.1"
     },
     "devDependencies": {
@@ -36,7 +36,7 @@
         "cheerio-soupselect": "^0.1.1",
         "eslint": "^8.13.0",
         "eslint-config-prettier": "^8.5.0",
-        "htmlparser2": "^7.2.0",
+        "htmlparser2": "^8.0.0",
         "jest": "^27.5.1",
         "prettier": "^2.6.2",
         "ts-jest": "^27.1.4",

package.json

@@ -1,13 +1,25 @@
 import { attributeRules } from "./attributes";
 import { compilePseudoSelector } from "./pseudo-selectors";
 import type {
+    Adapter,
     CompiledQuery,
     InternalOptions,
     InternalSelector,
     CompileToken,
 } from "./types";
 import { SelectorType } from "css-what";
 
+function getElementParent<Node, ElementNode extends Node>(
+    node: ElementNode,
+    adapter: Adapter<Node, ElementNode>
+): ElementNode | null {
+    const parent = adapter.getParent(node);
+    if (parent && adapter.isTag(parent)) {
+        return parent;
+    }
+    return null;
+}
+
 /*
  * All available rules
  */
@@ -79,8 +91,8 @@ export function compileGeneralSelector<Node, ElementNode extends Node>(
                 return function descendant(elem: ElementNode): boolean {
                     let current: ElementNode | null = elem;
 
-                    while ((current = adapter.getParent(current))) {
-                        if (adapter.isTag(current) && next(current)) {
+                    while ((current = getElementParent(current, adapter))) {
+                        if (next(current)) {
                             return true;
                         }
                     }
@@ -94,7 +106,7 @@ export function compileGeneralSelector<Node, ElementNode extends Node>(
             return function cachedDescendant(elem: ElementNode): boolean {
                 let current: ElementNode | null = elem;
 
-                while ((current = adapter.getParent(current))) {
+                while ((current = getElementParent(current, adapter))) {
                     if (!isFalseCache.has(current)) {
                         if (adapter.isTag(current) && next(current)) {
                             return true;
@@ -112,8 +124,8 @@ export function compileGeneralSelector<Node, ElementNode extends Node>(
                 let current: ElementNode | null = elem;
 
                 do {
-                    if (adapter.isTag(current) && next(current)) return true;
-                } while ((current = adapter.getParent(current)));
+                    if (next(current)) return true;
+                } while ((current = getElementParent(current, adapter)));
 
                 return false;
             };

src/general.ts

@@ -1,7 +1,7 @@
 import * as DomUtils from "domutils";
 import { falseFunc } from "boolbase";
 import type {
-    Node as DomHandlerNode,
+    AnyNode as DomHandlerNode,
     Element as DomHandlerElement,
 } from "domhandler";
 import { compile as compileRaw, compileUnsafe, compileToken } from "./compile";

src/index.ts

@@ -32,7 +32,7 @@ export interface Adapter<Node, ElementNode extends Node> {
     /**
      * Get the parent of the node
      */
-    getParent: (node: ElementNode) => ElementNode | null;
+    getParent: (node: ElementNode) => Node | null;
 
     /**
      * Get the siblings of the node. Note that unlike jQuery's `siblings` method,

src/types.ts

@@ -2,9 +2,8 @@ import * as CSSselect from "../src";
 import { parseDOM, parseDocument } from "htmlparser2";
 import { trueFunc, falseFunc } from "boolbase";
 import * as DomUtils from "domutils";
-import type { Node, Element } from "domhandler";
+import type { Element } from "domhandler";
 import { SelectorType, AttributeAction } from "css-what";
-import { Adapter } from "../src/types";
 
 const [dom] = parseDOM("<div id=foo><p>foo</p></div>") as Element[];
 const [xmlDom] = parseDOM("<DiV id=foo><P>foo</P></DiV>", {
@@ -71,7 +70,7 @@ describe("API", () => {
             ) as Element[];
             const a = CSSselect.selectAll(".foo:has(+.bar)", dom);
             expect(a).toHaveLength(1);
-            expect(a[0]).toStrictEqual(dom.children[0] as Element);
+            expect(a[0]).toStrictEqual(dom.children[0]);
         });
 
         it("should accept document root nodes", () => {
@@ -317,7 +316,7 @@ describe("API", () => {
 
     describe("optional adapter methods", () => {
         it("should support prevElementSibling", () => {
-            const adapter: Adapter<Node, Element> = {
+            const adapter = {
                 ...DomUtils,
                 prevElementSibling: undefined,
             };
@@ -334,9 +333,9 @@ describe("API", () => {
         it("should support isHovered", () => {
             const dom = parseDOM(`${"<p>foo".repeat(10)}`) as Element[];
 
-            const adapter: Adapter<Node, Element> = {
+            const adapter = {
                 ...DomUtils,
-                isHovered: (el) => el === dom[dom.length - 1],
+                isHovered: (el: Element) => el === dom[dom.length - 1],
             };
 
             const selection = CSSselect.selectAll("p:hover", dom, { adapter });