@asamuzakjp/dom-selector 7.0.1 → 7.0.3

package/package.json

@@ -23,13 +23,12 @@
     },
     "./package.json": "./package.json"
   },
-  "types": "types/index.d.ts",
   "dependencies": {
     "@asamuzakjp/nwsapi": "^2.3.9",
     "bidi-js": "^1.0.3",
-    "css-tree": "^3.1.0",
+    "css-tree": "^3.2.1",
     "is-potential-custom-element-name": "^1.0.1",
-    "lru-cache": "^11.2.6"
+    "lru-cache": "^11.2.7"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
@@ -37,18 +36,18 @@
     "c8": "^11.0.0",
     "chai": "^6.2.2",
     "commander": "^14.0.3",
-    "eslint": "^9.39.3",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^62.7.1",
+    "eslint-plugin-jsdoc": "^62.8.0",
     "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-regexp": "^3.0.0",
+    "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-unicorn": "^63.0.0",
     "globals": "^17.4.0",
     "jsdom": "^28.1.0",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
     "prettier": "^3.8.1",
-    "sinon": "^21.0.1",
+    "sinon": "^21.0.2",
     "typescript": "^5.9.3",
     "wpt-runner": "^6.1.0"
   },
@@ -72,5 +71,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.1"
+  "version": "7.0.3"
 }

package/src/index.js

@@ -125,9 +125,7 @@ export class DOMSelector {
     opt.check = true;
     opt.noexcept = true;
     opt.warn = false;
-    this.#finder.setup(selector, node, opt);
-    const res = this.#finder.find(TARGET_SELF);
-    return res;
+    return this.#finder.setup(selector, node, opt).find(TARGET_SELF);
   };
 
   /**
@@ -163,8 +161,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.match(selector, n);
-          return res;
+          return this.#nwsapi.match(selector, n);
         } catch (e) {
           // fall through
         }
@@ -175,8 +172,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_SELF);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_SELF);
       res = nodes.size;
     } catch (e) {
       this.#finder.onError(e, opt);
@@ -217,8 +213,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.closest(selector, n);
-          return res;
+          return this.#nwsapi.closest(selector, n);
         } catch (e) {
           // fall through
         }
@@ -229,8 +224,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_LINEAL);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_LINEAL);
       if (nodes.size) {
         let refNode = node;
         while (refNode) {
@@ -259,13 +253,37 @@ export class DOMSelector {
       const e = new this.#window.TypeError(`Unexpected type ${getType(node)}`);
       return this.#finder.onError(e, opt);
     }
+    const document =
+      node.nodeType === DOCUMENT_NODE ? node : node.ownerDocument;
+    if (
+      document === this.#document &&
+      document.contentType === 'text/html' &&
+      document.documentElement &&
+      (node.nodeType !== DOCUMENT_FRAGMENT_NODE || !node.host)
+    ) {
+      const cacheKey = `querySelector_${selector}`;
+      let filterMatches = false;
+      if (this.#cache.has(cacheKey)) {
+        filterMatches = this.#cache.get(cacheKey);
+      } else {
+        filterMatches = filterSelector(selector, TARGET_FIRST);
+        this.#cache.set(cacheKey, filterMatches);
+      }
+      if (filterMatches) {
+        try {
+          const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
+          return this.#nwsapi.first(selector, n);
+        } catch (e) {
+          // fall through
+        }
+      }
+    }
     let res;
     try {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_FIRST);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_FIRST);
       if (nodes.size) {
         [res] = [...nodes];
       }
@@ -307,8 +325,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.select(selector, n);
-          return res;
+          return this.#nwsapi.select(selector, n);
         } catch (e) {
           // fall through
         }
@@ -319,8 +336,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_ALL);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_ALL);
       if (nodes.size) {
         res = [...nodes];
       }

package/src/js/finder.js

@@ -275,17 +275,18 @@ export class Finder {
    * @returns {Array.<void>} An array of return values from addEventListener.
    */
   _registerEventListeners = () => {
-    const opt = {
-      capture: true,
-      passive: true
-    };
     const func = [];
     for (const eventHandler of this.#eventHandlers) {
       const { keys, handler } = eventHandler;
       const l = keys.length;
       for (let i = 0; i < l; i++) {
         const key = keys[i];
-        func.push(this.#window.addEventListener(key, handler, opt));
+        func.push(
+          this.#window.addEventListener(key, handler, {
+            capture: true,
+            passive: true
+          })
+        );
       }
     }
     return func;
@@ -454,10 +455,10 @@ export class Finder {
    * @private
    * @param {object} parentNode - The parent element.
    * @param {Array.<Array.<object>>} selectorBranches - The selector branches.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Array.<object>} An array of child nodes.
    */
-  _getFilteredChildren = (parentNode, selectorBranches, opt = {}) => {
+  _getFilteredChildren = (parentNode, selectorBranches, opt) => {
     const children = [];
     const walker = this._createTreeWalker(parentNode, { force: true });
     let childNode = walker.firstChild();
@@ -496,10 +497,10 @@ export class Finder {
    * @param {boolean} [anb.reverse] - If true, reverses the order.
    * @param {object} [anb.selector] - The AST.
    * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _collectNthChild = (anb, node, opt = {}) => {
+  _collectNthChild = (anb, node, opt) => {
     const { a, b, selector } = anb;
     const { parentNode } = node;
     if (!parentNode) {
@@ -574,10 +575,10 @@ export class Finder {
    * @param {object} ast - The AST.
    * @param {object} node - The Element node.
    * @param {string} nthName - The name of the nth pseudo-class.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _matchAnPlusB = (ast, node, nthName, opt = {}) => {
+  _matchAnPlusB = (ast, node, nthName, opt) => {
     const {
       nth: { a, b, name: nthIdentName },
       selector
@@ -662,8 +663,8 @@ export class Finder {
         leaves: twigLeaves
       };
       opt.dir = DIR_NEXT;
-      const nodes = this._matchCombinator(twig, node, opt);
-      if (nodes.size) {
+      const nodes = this._collectCombinatorMatches(twig, node, opt, []);
+      if (nodes.length) {
         if (leaves.length) {
           let bool = false;
           for (const nextNode of nodes) {
@@ -688,7 +689,7 @@ export class Finder {
    * @param {object} [opt] - Options.
    * @returns {?object} The matched node.
    */
-  _evaluateHasPseudo = (astData, node, opt) => {
+  _evaluateHasPseudo = (astData, node, opt = {}) => {
     const { branches } = astData;
     let bool = false;
     const l = branches.length;
@@ -763,10 +764,7 @@ export class Finder {
           const arr = [];
           opt.dir = DIR_PREV;
           for (const nextNode of nextNodes) {
-            const m = this._matchCombinator(twig, nextNode, opt);
-            if (m.size) {
-              arr.push(...m);
-            }
+            this._collectCombinatorMatches(twig, nextNode, opt, arr);
           }
           if (arr.length) {
             if (j === 0) {
@@ -802,6 +800,8 @@ export class Finder {
    * @param {object} ast - The AST.
    * @param {object} node - The Element node.
    * @param {object} [opt] - Options.
+   * @param {boolean} [opt.forgive] - Ignores unknown or invalid selectors.
+   * @param {boolean} [opt.warn] - If true, console warnings are enabled.
    * @returns {Set.<object>} A collection of matched nodes.
    */
   _matchPseudoClassSelector(ast, node, opt = {}) {
@@ -1851,10 +1851,10 @@ export class Finder {
    * @private
    * @param {object} ast - The AST.
    * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _matchSelectorForElement = (ast, node, opt = {}) => {
+  _matchSelectorForElement = (ast, node, opt) => {
     const { type: astType } = ast;
     const astName = unescapeSelector(ast.name);
     const matched = new Set();
@@ -1889,7 +1889,7 @@ export class Finder {
       // PS_ELEMENT_SELECTOR is handled by default.
       default: {
         try {
-          if (opt.check) {
+          if (this.#check) {
             const css = generateCSS(ast);
             this.#pseudoElement.push(css);
             matched.add(node);
@@ -1934,10 +1934,10 @@ export class Finder {
    * @private
    * @param {object} ast - The AST.
    * @param {object} node - The Document, DocumentFragment, or Element node.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _matchSelector = (ast, node, opt = {}) => {
+  _matchSelector = (ast, node, opt) => {
     if (node.nodeType === ELEMENT_NODE) {
       return this._matchSelectorForElement(ast, node, opt);
     }
@@ -1956,10 +1956,10 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves.
    * @param {object} node - The node.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {boolean} The result.
    */
-  _matchLeaves = (leaves, node, opt = {}) => {
+  _matchLeaves = (leaves, node, opt) => {
     const results = this.#invalidate ? this.#invalidateResults : this.#results;
     let result = results.get(leaves);
     if (result && result.has(node)) {
@@ -2012,10 +2012,10 @@ export class Finder {
    * @private
    * @param {object} baseNode - The base Element node or Element.shadowRoot.
    * @param {Array.<object>} leaves - The AST leaves.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _traverseAllDescendants = (baseNode, leaves, opt = {}) => {
+  _traverseAllDescendants = (baseNode, leaves, opt) => {
     const walker = this._createTreeWalker(baseNode);
     traverseNode(baseNode, walker);
     let currentNode = walker.firstChild();
@@ -2034,10 +2034,10 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves.
    * @param {object} baseNode - The base Element node or Element.shadowRoot.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _findDescendantNodes = (leaves, baseNode, opt = {}) => {
+  _findDescendantNodes = (leaves, baseNode, opt) => {
     const [leaf, ...filterLeaves] = leaves;
     const { type: leafType } = leaf;
     switch (leafType) {
@@ -2080,108 +2080,85 @@ export class Finder {
   };
 
   /**
-   * Matches the descendant combinator ' '.
+   * Collects combinator matches into an array without creating intermediate sets.
    * @private
    * @param {object} twig - The twig object.
    * @param {object} node - The Element node.
    * @param {object} [opt] - Options.
-   * @returns {Set.<object>} A collection of matched nodes.
+   * @param {string} [opt.dir] - The find direction.
+   * @param {Array.<object>} matched - The collector array.
+   * @returns {Array.<object>} The collector array.
    */
-  _matchDescendantCombinator = (twig, node, opt = {}) => {
-    const { leaves } = twig;
-    const { parentNode } = node;
+  _collectCombinatorMatches = (twig, node, opt = {}, matched = []) => {
+    const {
+      combo: { name: comboName },
+      leaves
+    } = twig;
     const { dir } = opt;
-    if (dir === DIR_NEXT) {
-      return this._findDescendantNodes(leaves, node, opt);
-    }
-    // DIR_PREV
-    const ancestors = [];
-    let refNode = parentNode;
-    while (refNode) {
-      if (this._matchLeaves(leaves, refNode, opt)) {
-        ancestors.push(refNode);
+    switch (comboName) {
+      case '+': {
+        const refNode =
+          dir === DIR_NEXT
+            ? node.nextElementSibling
+            : node.previousElementSibling;
+        if (refNode && this._matchLeaves(leaves, refNode, opt)) {
+          matched.push(refNode);
+        }
+        break;
       }
-      refNode = refNode.parentNode;
-    }
-    if (ancestors.length) {
-      // Reverse to maintain document order.
-      return new Set(ancestors.reverse());
-    }
-    return new Set();
-  };
-
-  /**
-   * Matches the child combinator '>'.
-   * @private
-   * @param {object} twig - The twig object.
-   * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
-   * @returns {Set.<object>} A collection of matched nodes.
-   */
-  _matchChildCombinator = (twig, node, opt = {}) => {
-    const { leaves } = twig;
-    const { dir } = opt;
-    const { parentNode } = node;
-    const matched = new Set();
-    if (dir === DIR_NEXT) {
-      let refNode = node.firstElementChild;
-      while (refNode) {
-        if (this._matchLeaves(leaves, refNode, opt)) {
-          matched.add(refNode);
+      case '~': {
+        let refNode =
+          dir === DIR_NEXT
+            ? node.nextElementSibling
+            : node.previousElementSibling;
+        while (refNode) {
+          if (this._matchLeaves(leaves, refNode, opt)) {
+            matched.push(refNode);
+          }
+          refNode =
+            dir === DIR_NEXT
+              ? refNode.nextElementSibling
+              : refNode.previousElementSibling;
         }
-        refNode = refNode.nextElementSibling;
+        break;
       }
-    } else {
-      // DIR_PREV
-      if (parentNode && this._matchLeaves(leaves, parentNode, opt)) {
-        matched.add(parentNode);
+      case '>': {
+        if (dir === DIR_NEXT) {
+          let refNode = node.firstElementChild;
+          while (refNode) {
+            if (this._matchLeaves(leaves, refNode, opt)) {
+              matched.push(refNode);
+            }
+            refNode = refNode.nextElementSibling;
+          }
+        } else {
+          const { parentNode } = node;
+          if (parentNode && this._matchLeaves(leaves, parentNode, opt)) {
+            matched.push(parentNode);
+          }
+        }
+        break;
       }
-    }
-    return matched;
-  };
-
-  /**
-   * Matches the adjacent sibling combinator '+'.
-   * @private
-   * @param {object} twig - The twig object.
-   * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
-   * @returns {Set.<object>} A collection of matched nodes.
-   */
-  _matchAdjacentSiblingCombinator = (twig, node, opt = {}) => {
-    const { leaves } = twig;
-    const { dir } = opt;
-    const matched = new Set();
-    const refNode =
-      dir === DIR_NEXT ? node.nextElementSibling : node.previousElementSibling;
-    if (refNode && this._matchLeaves(leaves, refNode, opt)) {
-      matched.add(refNode);
-    }
-    return matched;
-  };
-
-  /**
-   * Matches the general sibling combinator '~'.
-   * @private
-   * @param {object} twig - The twig object.
-   * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
-   * @returns {Set.<object>} A collection of matched nodes.
-   */
-  _matchGeneralSiblingCombinator = (twig, node, opt = {}) => {
-    const { leaves } = twig;
-    const { dir } = opt;
-    const matched = new Set();
-    let refNode =
-      dir === DIR_NEXT ? node.nextElementSibling : node.previousElementSibling;
-    while (refNode) {
-      if (this._matchLeaves(leaves, refNode, opt)) {
-        matched.add(refNode);
+      case ' ':
+      default: {
+        if (dir === DIR_NEXT) {
+          for (const refNode of this._findDescendantNodes(leaves, node, opt)) {
+            matched.push(refNode);
+          }
+        } else {
+          const ancestors = [];
+          let refNode = node.parentNode;
+          while (refNode) {
+            if (this._matchLeaves(leaves, refNode, opt)) {
+              ancestors.push(refNode);
+            }
+            refNode = refNode.parentNode;
+          }
+          if (ancestors.length) {
+            matched.push(...ancestors.reverse());
+          }
+        }
       }
-      refNode =
-        dir === DIR_NEXT
-          ? refNode.nextElementSibling
-          : refNode.previousElementSibling;
     }
     return matched;
   };
@@ -2191,44 +2168,26 @@ export class Finder {
    * @private
    * @param {object} twig - The twig object.
    * @param {object} node - The Element node.
-   * @param {object} [opt] - Options.
+   * @param {object} opt - Options.
    * @returns {Set.<object>} A collection of matched nodes.
    */
-  _matchCombinator = (twig, node, opt = {}) => {
-    const {
-      combo: { name: comboName }
-    } = twig;
-    switch (comboName) {
-      case '+': {
-        return this._matchAdjacentSiblingCombinator(twig, node, opt);
-      }
-      case '~': {
-        return this._matchGeneralSiblingCombinator(twig, node, opt);
-      }
-      case '>': {
-        return this._matchChildCombinator(twig, node, opt);
-      }
-      case ' ':
-      default: {
-        return this._matchDescendantCombinator(twig, node, opt);
-      }
-    }
-  };
+  _matchCombinator = (twig, node, opt) =>
+    new Set(this._collectCombinatorMatches(twig, node, opt));
 
   /**
    * Traverses with a TreeWalker and collects nodes matching the leaves.
    * @private
    * @param {TreeWalker} walker - The TreeWalker instance to use.
    * @param {Array} leaves - The AST leaves to match against.
-   * @param {object} options - Traversal options.
-   * @param {Node} options.startNode - The node to start traversal from.
-   * @param {string} options.targetType - The type of target ('all' or 'first').
-   * @param {Node} [options.boundaryNode] - The node to stop traversal at.
-   * @param {boolean} [options.force] - Force traversal to the next node.
+   * @param {object} [opt] - Traversal options.
+   * @param {Node} [opt.boundaryNode] - The node to stop traversal at.
+   * @param {boolean} [opt.force] - Force traversal to the next node.
+   * @param {Node} [opt.startNode] - The node to start traversal from.
+   * @param {string} [opt.targetType] - The type of target ('all' or 'first').
    * @returns {Array.<Node>} An array of matched nodes.
    */
-  _traverseAndCollectNodes = (walker, leaves, options) => {
-    const { boundaryNode, force, startNode, targetType } = options;
+  _traverseAndCollectNodes = (walker, leaves, opt = {}) => {
+    const { boundaryNode, force, startNode, targetType } = opt;
     const collectedNodes = [];
     let currentNode = traverseNode(startNode, walker, !!force);
     if (!currentNode) {
@@ -2275,7 +2234,7 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves.
    * @param {object} node - The node to start from.
-   * @param {object} opt - Options.
+   * @param {object} [opt] - Options.
    * @param {boolean} [opt.force] - If true, traverses only to the next node.
    * @param {string} [opt.targetType] - The target type.
    * @returns {Array.<object>} A collection of matched nodes.
@@ -2298,7 +2257,7 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves.
    * @param {object} node - The node to start from.
-   * @param {object} opt - Options.
+   * @param {object} [opt] - Options.
    * @param {boolean} [opt.precede] - If true, finds preceding nodes.
    * @returns {Array.<object>} A collection of matched nodes.
    */
@@ -2323,12 +2282,13 @@ export class Finder {
    * Matches the node itself.
    * @private
    * @param {Array} leaves - The AST leaves.
-   * @param {boolean} check - Indicates if running in internal check().
    * @returns {Array} An array containing [nodes, filtered, pseudoElement].
    */
-  _matchSelf = (leaves, check = false) => {
-    const options = { check, warn: this.#warn };
-    const matched = this._matchLeaves(leaves, this.#node, options);
+  _matchSelf = leaves => {
+    const matched = this._matchLeaves(leaves, this.#node, {
+      check: this.#check,
+      warn: this.#warn
+    });
     const nodes = matched ? [this.#node] : [];
     return [nodes, matched, this.#pseudoElement];
   };
@@ -2337,21 +2297,22 @@ export class Finder {
    * Finds lineal nodes (self and ancestors).
    * @private
    * @param {Array} leaves - The AST leaves.
-   * @param {object} opt - Options.
+   * @param {object} [opt] - Options.
+   * @param {boolean} [opt.complex] - If true, the selector is complex.
    * @returns {Array} An array containing [nodes, filtered].
    */
-  _findLineal = (leaves, opt) => {
+  _findLineal = (leaves, opt = {}) => {
     const { complex } = opt;
     const nodes = [];
-    const options = { warn: this.#warn };
-    const selfMatched = this._matchLeaves(leaves, this.#node, options);
+    const matchOpts = { warn: this.#warn };
+    const selfMatched = this._matchLeaves(leaves, this.#node, matchOpts);
     if (selfMatched) {
       nodes.push(this.#node);
     }
     if (!selfMatched || complex) {
       let currentNode = this.#node.parentNode;
       while (currentNode) {
-        if (this._matchLeaves(leaves, currentNode, options)) {
+        if (this._matchLeaves(leaves, currentNode, matchOpts)) {
           nodes.push(currentNode);
         }
         currentNode = currentNode.parentNode;
@@ -2376,7 +2337,7 @@ export class Finder {
       const css = generateCSS(leaf);
       this.#pseudoElement.push(css);
       if (filterLeaves.length) {
-        [nodes, filtered] = this._matchSelf(filterLeaves, this.#check);
+        [nodes, filtered] = this._matchSelf(filterLeaves);
       } else {
         nodes.push(this.#node);
         filtered = true;
@@ -2392,17 +2353,19 @@ export class Finder {
    * @private
    * @param {object} twig - The current twig from the AST branch.
    * @param {string} targetType - The type of target to find.
-   * @param {object} opt - Additional options for finding nodes.
+   * @param {object} [opt] - Options.
+   * @param {boolean} [opt.complex] - If true, the selector is complex.
+   * @param {boolean} [opt.precede] - If true, finds preceding nodes.
    * @returns {object} The result { nodes, filtered, pending }.
    */
-  _findEntryNodesForId = (twig, targetType, opt) => {
+  _findEntryNodesForId = (twig, targetType, opt = {}) => {
     const { leaves } = twig;
     const [leaf, ...filterLeaves] = leaves;
     const { complex, precede } = opt;
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves, this.#check);
+      [nodes, filtered] = this._matchSelf(leaves);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else if (
@@ -2433,15 +2396,17 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves for the selector.
    * @param {string} targetType - The type of target to find.
-   * @param {object} opt - Additional options for finding nodes.
+   * @param {object} [opt] - Options.
+   * @param {boolean} [opt.complex] - If true, the selector is complex.
+   * @param {boolean} [opt.precede] - If true, finds preceding nodes.
    * @returns {object} The result { nodes, filtered, pending }.
    */
-  _findEntryNodesForClass = (leaves, targetType, opt) => {
+  _findEntryNodesForClass = (leaves, targetType, opt = {}) => {
     const { complex, precede } = opt;
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves, this.#check);
+      [nodes, filtered] = this._matchSelf(leaves);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else {
@@ -2456,15 +2421,17 @@ export class Finder {
    * @private
    * @param {Array.<object>} leaves - The AST leaves for the selector.
    * @param {string} targetType - The type of target to find.
-   * @param {object} opt - Additional options for finding nodes.
+   * @param {object} [opt] - Options.
+   * @param {boolean} [opt.complex] - If true, the selector is complex.
+   * @param {boolean} [opt.precede] - If true, finds preceding nodes.
    * @returns {object} The result { nodes, filtered, pending }.
    */
-  _findEntryNodesForType = (leaves, targetType, opt) => {
+  _findEntryNodesForType = (leaves, targetType, opt = {}) => {
     const { complex, precede } = opt;
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves, this.#check);
+      [nodes, filtered] = this._matchSelf(leaves);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else {
@@ -2479,10 +2446,12 @@ export class Finder {
    * @private
    * @param {object} twig - The current twig from the AST branch.
    * @param {string} targetType - The type of target to find.
-   * @param {object} opt - Additional options for finding nodes.
+   * @param {object} [opt] - Options.
+   * @param {boolean} [opt.complex] - If true, the selector is complex.
+   * @param {boolean} [opt.precede] - If true, finds preceding nodes.
    * @returns {object} The result { nodes, filtered, pending }.
    */
-  _findEntryNodesForOther = (twig, targetType, opt) => {
+  _findEntryNodesForOther = (twig, targetType, opt = {}) => {
     const { leaves } = twig;
     const [leaf, ...filterLeaves] = leaves;
     const { complex, precede } = opt;
@@ -2536,7 +2505,7 @@ export class Finder {
         }
       }
     } else if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves, this.#check);
+      [nodes, filtered] = this._matchSelf(leaves);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else if (targetType === TARGET_FIRST) {
@@ -2792,15 +2761,13 @@ export class Finder {
    */
   _getCombinedNodes = (twig, nodes, dir) => {
     const arr = [];
-    const options = {
-      dir,
-      warn: this.#warn
-    };
     for (const node of nodes) {
-      const matched = this._matchCombinator(twig, node, options);
-      if (matched.size) {
-        arr.push(...matched);
-      }
+      this._collectCombinatorMatches(
+        twig,
+        node,
+        { dir, warn: this.#warn },
+        arr
+      );
     }
     return arr;
   };
@@ -2810,21 +2777,24 @@ export class Finder {
    * @private
    * @param {Array} branch - The branch.
    * @param {Set.<object>} nodes - A collection of Element nodes.
-   * @param {object} opt - Options.
-   * @param {object} opt.combo - The combo object.
-   * @param {number} opt.index - The index.
+   * @param {object} [opt] - Options.
+   * @param {object} [opt.combo] - The combo object.
+   * @param {number} [opt.index] - The index.
    * @returns {?object} The matched node.
    */
-  _matchNodeNext = (branch, nodes, opt) => {
+  _matchNodeNext = (branch, nodes, opt = {}) => {
     const { combo, index } = opt;
     const { combo: nextCombo, leaves } = branch[index];
     const twig = {
       combo,
       leaves
     };
-    const nextNodes = new Set(this._getCombinedNodes(twig, nodes, DIR_NEXT));
-    if (nextNodes.size) {
+    const nextNodes = this._getCombinedNodes(twig, nodes, DIR_NEXT);
+    if (nextNodes.length) {
       if (index === branch.length - 1) {
+        if (nextNodes.length === 1) {
+          return nextNodes[0];
+        }
         const [nextNode] = sortNodes(nextNodes);
         return nextNode;
       }
@@ -2841,16 +2811,15 @@ export class Finder {
    * @private
    * @param {Array} branch - The branch.
    * @param {object} node - The Element node.
-   * @param {object} opt - Options.
-   * @param {number} opt.index - The index.
+   * @param {object} [opt] - Options.
+   * @param {number} [opt.index] - The index.
    * @returns {?object} The node.
    */
-  _matchNodePrev = (branch, node, opt) => {
+  _matchNodePrev = (branch, node, opt = {}) => {
     const { index } = opt;
     const twig = branch[index];
-    const nodes = new Set([node]);
-    const nextNodes = new Set(this._getCombinedNodes(twig, nodes, DIR_PREV));
-    if (nextNodes.size) {
+    const nextNodes = this._getCombinedNodes(twig, [node], DIR_PREV);
+    if (nextNodes.length) {
       if (index === 0) {
         return node;
       }
@@ -2887,7 +2856,7 @@ export class Finder {
       const { combo: firstCombo } = branch[0];
       for (const node of entryNodes) {
         let combo = firstCombo;
-        let nextNodes = new Set([node]);
+        let nextNodes = [node];
         for (let j = 1; j < branchLen; j++) {
           const { combo: nextCombo, leaves } = branch[j];
           const twig = { combo, leaves };
@@ -2899,10 +2868,8 @@ export class Finder {
               }
             }
             combo = nextCombo;
-            nextNodes = new Set(nodesArr);
+            nextNodes = nodesArr;
           } else {
-            // No further matches down this path.
-            nextNodes.clear();
             break;
           }
         }
@@ -2910,7 +2877,7 @@ export class Finder {
       // DIR_PREV
     } else {
       for (const node of entryNodes) {
-        let nextNodes = new Set([node]);
+        let nextNodes = [node];
         for (let j = lastIndex - 1; j >= 0; j--) {
           const twig = branch[j];
           const nodesArr = this._getCombinedNodes(twig, nextNodes, dir);
@@ -2919,10 +2886,8 @@ export class Finder {
             if (j === 0) {
               matchedNodes.add(node);
             }
-            nextNodes = new Set(nodesArr);
+            nextNodes = nodesArr;
           } else {
-            // No further matches down this path.
-            nextNodes.clear();
             break;
           }
         }
@@ -3152,7 +3117,6 @@ export class Finder {
    * @returns {object} The AST for the selector.
    */
   getAST = selector => {
-    // TBD: get cached AST if possible.
     return parseSelector(selector);
   };
 }

package/src/js/matcher.js

@@ -34,7 +34,6 @@ const KEYS_FORM_PS_DISABLED = new Set([
 ]);
 const KEYS_INPUT_EDIT = new Set(INPUT_EDIT);
 const REG_LANG_VALID = new RegExp(`^(?:\\*-)?${ALPHA_NUM}${LANG_PART}$`, 'i');
-const REG_TAG_NAME = /[A-Z][\\w-]*/i;
 
 /**
  * Validates a pseudo-element selector.
@@ -315,9 +314,8 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
     return false;
   }
   // Determine case sensitivity based on document type and flags.
-  const contentType = node.ownerDocument.contentType;
   let caseInsensitive;
-  if (contentType === 'text/html') {
+  if (node.ownerDocument.contentType === 'text/html') {
     if (typeof astFlags === 'string' && /^s$/i.test(astFlags)) {
       caseInsensitive = false;
     } else {
@@ -345,6 +343,7 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
         itemName = itemName.toLowerCase();
         itemValue = itemValue.toLowerCase();
       }
+      const colonIdx = itemName.indexOf(':');
       switch (astPrefix) {
         case '': {
           if (astLocalName === itemName) {
@@ -353,9 +352,10 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
           break;
         }
         case '*': {
-          if (itemName.indexOf(':') > -1) {
-            const [, ...restItemName] = itemName.split(':');
-            const itemLocalName = restItemName.join(':').replace(/^:/, '');
+          if (colonIdx > -1) {
+            const itemLocalName = itemName
+              .substring(colonIdx + 1)
+              .replace(/^:/, '');
             if (itemLocalName === astLocalName) {
               attrValues.add(itemValue);
             }
@@ -376,9 +376,11 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
               globalObject
             );
           }
-          if (itemName.indexOf(':') > -1) {
-            const [itemPrefix, ...restItemName] = itemName.split(':');
-            const itemLocalName = restItemName.join(':').replace(/^:/, '');
+          if (colonIdx > -1) {
+            const itemPrefix = itemName.substring(0, colonIdx);
+            const itemLocalName = itemName
+              .substring(colonIdx + 1)
+              .replace(/^:/, '');
             // Ignore the 'xml:lang' attribute.
             if (itemPrefix === 'xml' && itemLocalName === 'lang') {
               continue;
@@ -402,9 +404,12 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
         itemName = itemName.toLowerCase();
         itemValue = itemValue.toLowerCase();
       }
-      if (itemName.indexOf(':') > -1) {
-        const [itemPrefix, ...restItemName] = itemName.split(':');
-        const itemLocalName = restItemName.join(':').replace(/^:/, '');
+      const colonIdx = itemName.indexOf(':');
+      if (colonIdx > -1) {
+        const itemPrefix = itemName.substring(0, colonIdx);
+        const itemLocalName = itemName
+          .substring(colonIdx + 1)
+          .replace(/^:/, '');
         // The attribute is starting with ':'.
         if (!itemPrefix && astAttrName === `:${itemLocalName}`) {
           attrValues.add(itemValue);
@@ -427,15 +432,15 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
   let attrValue;
   if (astIdentValue) {
     if (caseInsensitive) {
-      attrValue = astIdentValue.toLowerCase();
+      attrValue = astIdentValue.toLowerCase().replace(/\\(?!\\)/g, '');
     } else {
-      attrValue = astIdentValue;
+      attrValue = astIdentValue.replace(/\\(?!\\)/g, '');
     }
   } else if (astStringValue) {
     if (caseInsensitive) {
-      attrValue = astStringValue.toLowerCase();
+      attrValue = astStringValue.toLowerCase().replace(/\\(?!\\)/g, '');
     } else {
-      attrValue = astStringValue;
+      attrValue = astStringValue.replace(/\\(?!\\)/g, '');
     }
   } else if (astStringValue === '') {
     attrValue = astStringValue;
@@ -521,39 +526,39 @@ export const matchTypeSelector = (ast, node, opt = {}) => {
     astName,
     node
   );
+  const firstChar = localName.charCodeAt(0);
+  const isAlphabet =
+    (firstChar >= 65 && firstChar <= 90) ||
+    (firstChar >= 97 && firstChar <= 122);
   if (
     node.ownerDocument.contentType === 'text/html' &&
     (!namespaceURI || namespaceURI === 'http://www.w3.org/1999/xhtml') &&
-    REG_TAG_NAME.test(localName)
+    isAlphabet
   ) {
     astPrefix = astPrefix.toLowerCase();
     astLocalName = astLocalName.toLowerCase();
   }
   let nodePrefix;
   let nodeLocalName;
-  // just in case that the namespaced content is parsed as text/html
-  if (localName.indexOf(':') > -1) {
-    [nodePrefix, nodeLocalName] = localName.split(':');
+  const colonIdx = localName.indexOf(':');
+  if (colonIdx > -1) {
+    nodePrefix = localName.substring(0, colonIdx);
+    nodeLocalName = localName.substring(colonIdx + 1);
   } else {
     nodePrefix = prefix || '';
     nodeLocalName = localName;
   }
+  const isUniversal = astLocalName === '*';
   switch (astPrefix) {
     case '': {
-      if (
+      return (
         !nodePrefix &&
         !namespaceURI &&
-        (astLocalName === '*' || astLocalName === nodeLocalName)
-      ) {
-        return true;
-      }
-      return false;
+        (isUniversal || astLocalName === nodeLocalName)
+      );
     }
     case '*': {
-      if (astLocalName === '*' || astLocalName === nodeLocalName) {
-        return true;
-      }
-      return false;
+      return isUniversal || astLocalName === nodeLocalName;
     }
     default: {
       if (!check) {
@@ -570,10 +575,7 @@ export const matchTypeSelector = (ast, node, opt = {}) => {
       const astNS = node.lookupNamespaceURI(astPrefix);
       const nodeNS = node.lookupNamespaceURI(nodePrefix);
       if (astNS === nodeNS && astPrefix === nodePrefix) {
-        if (astLocalName === '*' || astLocalName === nodeLocalName) {
-          return true;
-        }
-        return false;
+        return isUniversal || astLocalName === nodeLocalName;
       } else if (!forgive && !astNS) {
         throw generateException(
           `Undeclared namespace ${astPrefix}`,

package/src/js/parser.js

@@ -170,8 +170,7 @@ export const parseSelector = sel => {
   }
   try {
     return cssTree.parse(selector, {
-      context: 'selectorList',
-      parseCustomProperty: true
+      context: 'selectorList'
     });
   } catch (e) {
     const { message } = e;

package/src/js/utility.js

@@ -32,7 +32,6 @@ import {
   RULE,
   SCOPE,
   SELECTOR_LIST,
-  SIBLING,
   TARGET_ALL,
   TARGET_FIRST,
   TEXT_NODE,
@@ -59,11 +58,11 @@ const KEYS_NODE_FOCUSABLE_SVG = new Set([
   'symbol',
   'title'
 ]);
+const REG_ATTR_SIMPLE = /^\[[A-Z\d-]{1,255}="?[A-Z\d\s-]{1,255}"?\]$/i;
 const REG_EXCLUDE_BASIC =
   /[|\\]|::|[^\u0021-\u007F\s]|\[\s*[\w$*=^|~-]+(?:(?:"[\w$*=^|~\s'-]+"|'[\w$*=^|~\s"-]+')?(?:\s+[\w$*=^|~-]+)+|"[^"\]]{1,255}|'[^'\]]{1,255})\s*\]|:(?:is|where)\(\s*\)/;
 const REG_COMPLEX = new RegExp(`${COMPOUND_I}${COMBO}${COMPOUND_I}`, 'i');
 const REG_DESCEND = new RegExp(`${COMPOUND_I}${DESCEND}${COMPOUND_I}`, 'i');
-const REG_SIBLING = new RegExp(`${COMPOUND_I}${SIBLING}${COMPOUND_I}`, 'i');
 const REG_LOGIC_COMPLEX = new RegExp(
   `:(?!${PSEUDO_CLASS}|${N_TH}|${LOGIC_COMPLEX})`
 );
@@ -1045,7 +1044,7 @@ export const initNwsapi = (window, document) => {
  * @returns {boolean} - True if the selector is valid for nwsapi.
  */
 export const filterSelector = (selector, target) => {
-  const isQuerySelectorType = target === TARGET_FIRST || target === TARGET_ALL;
+  const isQuerySelectorAll = target === TARGET_ALL;
   if (
     !selector ||
     typeof selector !== 'string' ||
@@ -1061,6 +1060,13 @@ export const filterSelector = (selector, target) => {
       return false;
     }
   }
+  // Match only simple attribute selector for TARGET_FIRST.
+  if (target === TARGET_FIRST) {
+    if (REG_ATTR_SIMPLE.test(selector)) {
+      return true;
+    }
+    return false;
+  }
   // Exclude various complex or unsupported selectors.
   // - selectors containing '/'
   // - namespaced selectors
@@ -1076,17 +1082,11 @@ export const filterSelector = (selector, target) => {
   }
   // Include pseudo-classes that are known to work correctly.
   if (selector.includes(':')) {
-    let complex = false;
-    if (target !== isQuerySelectorType) {
-      complex = REG_COMPLEX.test(selector);
-    }
-    if (
-      isQuerySelectorType &&
-      REG_DESCEND.test(selector) &&
-      !REG_SIBLING.test(selector)
-    ) {
+    if (isQuerySelectorAll && REG_DESCEND.test(selector)) {
       return false;
-    } else if (!isQuerySelectorType && /:has\(/.test(selector)) {
+    }
+    const complex = isQuerySelectorAll ? false : REG_COMPLEX.test(selector);
+    if (!isQuerySelectorAll && /:has\(/.test(selector)) {
       if (!complex || REG_LOGIC_HAS_COMPOUND.test(selector)) {
         return false;
       }

package/types/js/finder.d.ts

@@ -34,10 +34,7 @@ export class Finder {
     private _matchLeaves;
     private _traverseAllDescendants;
     private _findDescendantNodes;
-    private _matchDescendantCombinator;
-    private _matchChildCombinator;
-    private _matchAdjacentSiblingCombinator;
-    private _matchGeneralSiblingCombinator;
+    private _collectCombinatorMatches;
     private _matchCombinator;
     private _traverseAndCollectNodes;
     private _findPrecede;