@asamuzakjp/dom-selector 7.0.4 → 7.0.6

package/package.json

@@ -32,24 +32,25 @@
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
+    "@types/node": "^25.5.2",
     "benchmark": "^2.1.4",
     "c8": "^11.0.0",
     "chai": "^6.2.2",
     "commander": "^14.0.3",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^62.8.0",
+    "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-regexp": "^3.1.0",
-    "eslint-plugin-unicorn": "^63.0.0",
+    "eslint-plugin-unicorn": "^64.0.0",
     "globals": "^17.4.0",
     "jsdom": "^29.0.1",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
     "prettier": "^3.8.1",
     "sinon": "^21.0.3",
-    "typescript": "^5.9.3",
-    "wpt-runner": "^6.1.0"
+    "typescript": "^6.0.2",
+    "wpt-runner": "^7.0.0"
   },
   "overrides": {
     "c8": {
@@ -71,5 +72,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.4"
+  "version": "7.0.6"
 }

package/src/js/finder.js

@@ -114,6 +114,7 @@ export class Finder {
   #documentURL;
   #event;
   #eventHandlers;
+  #filterLeavesCache;
   #focus;
   #invalidate;
   #invalidateResults;
@@ -160,6 +161,7 @@ export class Finder {
         handler: this._handleMouseEvent
       }
     ]);
+    this.#filterLeavesCache = new WeakMap();
     this._registerEventListeners();
     this.clearResults(true);
   }
@@ -233,6 +235,7 @@ export class Finder {
     this.#invalidateResults = new WeakMap();
     if (all) {
       this.#results = new WeakMap();
+      this.#filterLeavesCache = new WeakMap();
     }
   };
 
@@ -368,6 +371,7 @@ export class Finder {
         ast = item.ast;
         this.#descendant = item.descendant;
         this.#invalidate = item.invalidate;
+        this.#selectorAST = item.selectorAST;
       }
     }
     if (ast) {
@@ -403,7 +407,8 @@ export class Finder {
       cachedItem.set(`${selector}`, {
         ast,
         descendant: this.#descendant,
-        invalidate: this.#invalidate
+        invalidate: this.#invalidate,
+        selectorAST: this.#selectorAST
       });
       this.#documentCache.set(this.#document, cachedItem);
       // Initialize nodes array for each branch.
@@ -460,8 +465,7 @@ export class Finder {
    */
   _getFilteredChildren = (parentNode, selectorBranches, opt) => {
     const children = [];
-    const walker = this._createTreeWalker(parentNode, { force: true });
-    let childNode = walker.firstChild();
+    let childNode = parentNode.firstElementChild;
     while (childNode) {
       if (selectorBranches) {
         let isMatch = false;
@@ -483,7 +487,7 @@ export class Finder {
       } else {
         children.push(childNode);
       }
-      childNode = walker.nextSibling();
+      childNode = childNode.nextElementSibling;
     }
     return children;
   };
@@ -553,8 +557,7 @@ export class Finder {
       return new Set();
     }
     const typedSiblings = [];
-    const walker = this._createTreeWalker(parentNode, { force: true });
-    let sibling = walker.firstChild();
+    let sibling = parentNode.firstElementChild;
     while (sibling) {
       if (
         sibling.localName === node.localName &&
@@ -563,7 +566,7 @@ export class Finder {
       ) {
         typedSiblings.push(sibling);
       }
-      sibling = walker.nextSibling();
+      sibling = sibling.nextElementSibling;
     }
     const matchedNodes = filterNodesByAnB(typedSiblings, anb);
     return new Set(matchedNodes);
@@ -2007,6 +2010,21 @@ export class Finder {
     return bool;
   };
 
+  /**
+   * Returns a cached slice of the leaves array (excluding the first item).
+   * @private
+   * @param {Array.<object>} leaves - The original AST leaves array.
+   * @returns {Array.<object>} The filtered leaves.
+   */
+  _getFilterLeaves = leaves => {
+    if (this.#filterLeavesCache.has(leaves)) {
+      return this.#filterLeavesCache.get(leaves);
+    }
+    const filterLeaves = leaves.slice(1);
+    this.#filterLeavesCache.set(leaves, filterLeaves);
+    return filterLeaves;
+  };
+
   /**
    * Traverses all descendant nodes and collects matches.
    * @private
@@ -2038,7 +2056,8 @@ export class Finder {
    * @returns {Set.<object>} A collection of matched nodes.
    */
   _findDescendantNodes = (leaves, baseNode, opt) => {
-    const [leaf, ...filterLeaves] = leaves;
+    const [leaf] = leaves;
+    const filterLeaves = this._getFilterLeaves(leaves);
     const { type: leafType } = leaf;
     switch (leafType) {
       case ID_SELECTOR: {
@@ -2360,7 +2379,8 @@ export class Finder {
    */
   _findEntryNodesForId = (twig, targetType, opt = {}) => {
     const { leaves } = twig;
-    const [leaf, ...filterLeaves] = leaves;
+    const [leaf] = leaves;
+    const filterLeaves = this._getFilterLeaves(leaves);
     const { complex, precede } = opt;
     let nodes = [];
     let filtered = false;
@@ -2453,7 +2473,8 @@ export class Finder {
    */
   _findEntryNodesForOther = (twig, targetType, opt = {}) => {
     const { leaves } = twig;
-    const [leaf, ...filterLeaves] = leaves;
+    const [leaf] = leaves;
+    const filterLeaves = this._getFilterLeaves(leaves);
     const { complex, precede } = opt;
     let nodes = [];
     let filtered = false;
@@ -2529,7 +2550,8 @@ export class Finder {
    */
   _findEntryNodes = (twig, targetType, opt = {}) => {
     const { leaves } = twig;
-    const [leaf, ...filterLeaves] = leaves;
+    const [leaf] = leaves;
+    const filterLeaves = this._getFilterLeaves(leaves);
     const { complex = false, dir = DIR_PREV } = opt;
     const precede =
       dir === DIR_NEXT &&

package/src/js/matcher.js

@@ -136,6 +136,22 @@ export const matchDirectionPseudoClass = (ast, node) => {
  * @returns {boolean} - True if the language matches, otherwise false.
  */
 export const matchLanguagePseudoClass = (ast, node) => {
+  // Get the effective language attribute for the current node.
+  const elementLang = getLanguageAttribute(node);
+  // If the element has no language, it cannot match a specific pattern.
+  if (elementLang === null) {
+    return false;
+  }
+  // Use cached regex.
+  if (ast._langRegex !== undefined) {
+    if (ast._langPattern === '*') {
+      return elementLang !== '';
+    }
+    if (ast._langRegex === null) {
+      return false;
+    }
+    return ast._langRegex.test(elementLang);
+  }
   const { name, type, value } = ast;
   let langPattern;
   // Determine the language pattern from the AST.
@@ -144,35 +160,31 @@ export const matchLanguagePseudoClass = (ast, node) => {
   } else if (type === IDENT && name) {
     langPattern = unescapeSelector(name);
   }
+  // Cache lang pattern.
+  ast._langPattern = langPattern;
   // If no valid language pattern is provided, it cannot match.
   if (typeof langPattern !== 'string') {
-    return false;
-  }
-  // Get the effective language attribute for the current node.
-  const elementLang = getLanguageAttribute(node);
-  // If the element has no language, it cannot match a specific pattern.
-  if (elementLang === null) {
+    ast._langRegex = null;
     return false;
   }
   // Handle the universal selector '*' for :lang.
   if (langPattern === '*') {
-    // It matches any language unless attribute is not empty.
+    ast._langRegex = null;
     return elementLang !== '';
   }
   // Validate the provided language pattern structure.
   if (!REG_LANG_VALID.test(langPattern)) {
+    ast._langRegex = null;
     return false;
   }
   // Build a regex for extended language range matching.
   let matcherRegex;
   if (langPattern.indexOf('-') > -1) {
-    // Handle complex patterns with wildcards and sub-tags (e.g., '*-US').
     const [langMain, langSub, ...langRest] = langPattern.split('-');
     const extendedMain =
       langMain === '*' ? `${ALPHA_NUM}${LANG_PART}` : `${langMain}${LANG_PART}`;
     const extendedSub = `-${langSub}${LANG_PART}`;
     let extendedRest = '';
-    // Use a standard for loop for performance as per the rules.
     for (let i = 0; i < langRest.length; i++) {
       extendedRest += `-${langRest[i]}${LANG_PART}`;
     }
@@ -181,9 +193,9 @@ export const matchLanguagePseudoClass = (ast, node) => {
       'i'
     );
   } else {
-    // Handle simple language patterns (e.g., 'en').
     matcherRegex = new RegExp(`^${langPattern}${LANG_PART}$`, 'i');
   }
+  ast._langRegex = matcherRegex;
   // Test the element's language against the constructed regex.
   return matcherRegex.test(elementLang);
 };
@@ -452,9 +464,15 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
     }
     case '~=': {
       if (attrValue && typeof attrValue === 'string') {
+        if (/\s/.test(attrValue)) {
+          return false;
+        }
+        if (ast._tildeTarget === undefined) {
+          ast._tildeTarget = ` ${attrValue} `;
+        }
+        const target = ast._tildeTarget;
         for (const value of attrValues) {
-          const item = new Set(value.split(/\s+/));
-          if (item.has(attrValue)) {
+          if (` ${value.replace(/[\t\r\n\f]/g, ' ')} `.includes(target)) {
             return true;
           }
         }

package/types/js/finder.d.ts

@@ -1,12 +1,12 @@
 export class Finder {
     constructor(window: object);
     onError: (e: Error, opt?: {
-        noexcept?: boolean;
+        noexcept?: boolean | undefined;
     }) => void;
     setup: (selector: string, node: object, opt?: {
-        check?: boolean;
-        noexcept?: boolean;
-        warn?: boolean;
+        check?: boolean | undefined;
+        noexcept?: boolean | undefined;
+        warn?: boolean | undefined;
     }) => object;
     clearResults: (all?: boolean) => void;
     private _handleFocusEvent;
@@ -32,6 +32,7 @@ export class Finder {
     private _matchSelectorForShadowRoot;
     private _matchSelector;
     private _matchLeaves;
+    private _getFilterLeaves;
     private _traverseAllDescendants;
     private _findDescendantNodes;
     private _collectCombinatorMatches;

package/types/js/matcher.d.ts

@@ -1,16 +1,16 @@
 export function matchPseudoElementSelector(astName: string, astType: string, opt?: {
-    forgive?: boolean;
-    warn?: boolean;
+    forgive?: boolean | undefined;
+    warn?: boolean | undefined;
 }): void;
 export function matchDirectionPseudoClass(ast: object, node: object): boolean;
 export function matchLanguagePseudoClass(ast: object, node: object): boolean;
 export function matchDisabledPseudoClass(astName: string, node: object): boolean;
 export function matchReadOnlyPseudoClass(astName: string, node: object): boolean;
 export function matchAttributeSelector(ast: object, node: object, opt?: {
-    check?: boolean;
-    forgive?: boolean;
+    check?: boolean | undefined;
+    forgive?: boolean | undefined;
 }): boolean;
 export function matchTypeSelector(ast: object, node: object, opt?: {
-    check?: boolean;
-    forgive?: boolean;
+    check?: boolean | undefined;
+    forgive?: boolean | undefined;
 }): boolean;

package/types/js/utility.d.ts

@@ -6,7 +6,7 @@ export function findLogicalWithNestedHas(leaf: object): object | null;
 export function filterNodesByAnB(nodes: Array<object>, anb: {
     a: number;
     b: number;
-    reverse?: boolean;
+    reverse?: boolean | undefined;
 }): Array<object>;
 export function resolveContent(node: object): Array<object | boolean>;
 export function traverseNode(node: object, walker: object, force?: boolean): object | null;