@asamuzakjp/dom-selector 7.0.10 → 7.1.1

package/package.json

@@ -50,7 +50,7 @@
     "neostandard": "^0.13.0",
     "prettier": "^3.8.3",
     "sinon": "^21.1.2",
-    "typescript": "^6.0.2",
+    "typescript": "^6.0.3",
     "wpt-runner": "^7.0.0"
   },
   "overrides": {
@@ -67,7 +67,7 @@
     "bench:sizzle": "node benchmark/bench-sizzle.js",
     "build": "npm run tsc && npm run lint && npm test",
     "lint": "eslint --fix .",
-    "test": "c8 --reporter=text mocha --parallel --exit test/**/*.test.js",
+    "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "test:wpt": "node test/wpt/wpt-runner.js",
     "tsc": "node scripts/index clean --dir=types -i && npx tsc",
     "update:wpt": "git submodule update --init --recursive --remote"
@@ -75,5 +75,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.10"
+  "version": "7.1.1"
 }

package/src/index.js

@@ -8,6 +8,7 @@
 /* import */
 import { GenerationalCache } from '@asamuzakjp/generational-cache';
 import { Finder } from './js/finder.js';
+import { unescapeSelector, parseAstName } from './js/parser.js';
 import { filterSelector, getType, initNwsapi } from './js/utility.js';
 
 /* constants */
@@ -18,9 +19,13 @@ import {
   TARGET_ALL,
   TARGET_FIRST,
   TARGET_LINEAL,
-  TARGET_SELF
+  TARGET_SELF,
+  COMBINATOR,
+  ID_SELECTOR,
+  CLASS_SELECTOR,
+  TYPE_SELECTOR
 } from './js/constant.js';
-const CACHE_SIZE = 1024;
+const CACHE_SIZE = 2048;
 
 /**
  * @typedef {object} CheckResult
@@ -63,6 +68,59 @@ export class DOMSelector {
     this.#finder.clearResults(true);
   };
 
+  /**
+   * Parses a selector and extracts the rightmost subject keys (Id, Class, Tag).
+   * @param {string} selector - The CSS selector to parse.
+   * @returns {Array<{id: string|null, className: string|null, tag: string|null}>} The list of extracted keys for each selector group.
+   */
+  extractSubjects = selector => {
+    if (!selector || typeof selector !== 'string') {
+      return [{ id: null, className: null, tag: null }];
+    }
+    const cacheKey = `extract_${selector}`;
+    let subjects = this.#cache.get(cacheKey);
+    if (subjects !== undefined) {
+      return subjects;
+    }
+    subjects = [];
+    try {
+      const ast = this.#finder.getAST(selector);
+      if (ast?.type === 'SelectorList') {
+        for (const selectorNode of ast.children) {
+          let idKey = null;
+          let classKey = null;
+          let tagKey = null;
+          let current = selectorNode.children.tail;
+          while (current) {
+            const node = current.data;
+            if (node.type === COMBINATOR) {
+              break;
+            }
+            if (node.type === ID_SELECTOR) {
+              idKey = idKey ?? unescapeSelector(node.name);
+            } else if (node.type === CLASS_SELECTOR) {
+              classKey = classKey ?? unescapeSelector(node.name);
+            } else if (node.type === TYPE_SELECTOR) {
+              const { localName } = parseAstName(unescapeSelector(node.name));
+              if (localName !== '*') {
+                tagKey = tagKey ?? localName.toLowerCase();
+              }
+            }
+            current = current.prev;
+          }
+          subjects.push({ id: idKey, className: classKey, tag: tagKey });
+        }
+      }
+    } catch (e) {
+      // fall through
+    }
+    if (!subjects.length) {
+      subjects.push({ id: null, className: null, tag: null });
+    }
+    this.#cache.set(cacheKey, subjects);
+    return subjects;
+  };
+
   /**
    * Checks if an element matches a CSS selector.
    * @param {string} selector - The CSS selector to check against.

package/src/js/finder.js

@@ -1133,6 +1133,7 @@ export class Finder {
           const { target, type } = this.#event ?? {};
           if (
             /^(?:click|mouse(?:down|over|up))$/.test(type) &&
+            target?.nodeType === ELEMENT_NODE &&
             node.contains(target)
           ) {
             matched.add(node);
@@ -1141,7 +1142,12 @@ export class Finder {
         }
         case 'active': {
           const { buttons, target, type } = this.#event ?? {};
-          if (type === 'mousedown' && buttons & 1 && node.contains(target)) {
+          if (
+            type === 'mousedown' &&
+            buttons & 1 &&
+            target?.nodeType === ELEMENT_NODE &&
+            node.contains(target)
+          ) {
             matched.add(node);
           }
           break;

package/src/js/utility.js

@@ -1047,6 +1047,7 @@ export const initNwsapi = (window, document) => {
  */
 export const filterSelector = (selector, target) => {
   const isQuerySelectorAll = target === TARGET_ALL;
+  // Basic validation and fast-fail for null/undefined/non-string values
   if (
     !selector ||
     typeof selector !== 'string' ||
@@ -1054,59 +1055,54 @@ export const filterSelector = (selector, target) => {
   ) {
     return false;
   }
-  // Exclude missing close square bracket.
+  // Exclude various complex or unsupported selectors early
+  // i.e. non-ASCII, escaped selectors, namespaced selectors and pseudo-elements
+  if (selector.includes('/') || REG_EXCLUDE_BASIC.test(selector)) {
+    return false;
+  }
+  // Validate attribute selector integrity
   if (selector.includes('[')) {
     const index = selector.lastIndexOf('[');
-    const sel = selector.substring(index);
-    if (sel.indexOf(']') < 0) {
+    if (selector.indexOf(']', index) === -1) {
       return false;
     }
   }
-  // Match only simple attribute selector for TARGET_FIRST.
+  // Target-specific early exits
   if (target === TARGET_FIRST) {
-    if (REG_ATTR_SIMPLE.test(selector)) {
-      return true;
-    }
-    return false;
+    return REG_ATTR_SIMPLE.test(selector);
   }
-
-  // Exclude simple tag selector for TARGET_ALL
   if (target === TARGET_ALL && REG_TAG_SIMPLE.test(selector)) {
     return false;
   }
-
-  // Exclude various complex or unsupported selectors.
-  // - selectors containing '/'
-  // - namespaced selectors
-  // - escaped selectors
-  // - pseudo-element selectors
-  // - selectors containing non-ASCII
-  // - selectors containing control character other than whitespace
-  // - attribute selectors with case flag, e.g. [attr i]
-  // - attribute selectors with unclosed quotes
-  // - empty :is() or :where()
-  if (selector.includes('/') || REG_EXCLUDE_BASIC.test(selector)) {
-    return false;
-  }
-  // Include pseudo-classes that are known to work correctly.
+  // Logic for pseudo-classes
   if (selector.includes(':')) {
+    // Exclude descendant combinators in logical selectors for querySelectorAll
     if (isQuerySelectorAll && REG_DESCEND.test(selector)) {
       return false;
     }
-    const complex = isQuerySelectorAll ? false : REG_COMPLEX.test(selector);
-    if (!isQuerySelectorAll && /:has\(/.test(selector)) {
-      if (!complex || REG_LOGIC_HAS_COMPOUND.test(selector)) {
+    // Determine if the selector has complex logical structures
+    const isComplex = isQuerySelectorAll ? false : REG_COMPLEX.test(selector);
+    // Handle :has() specifically
+    if (selector.includes(':has(')) {
+      if (isQuerySelectorAll) {
+        return false;
+      }
+      if (!isComplex || REG_LOGIC_HAS_COMPOUND.test(selector)) {
         return false;
       }
       return REG_END_WITH_HAS.test(selector);
-    } else if (/:(?:is|not)\(/.test(selector)) {
-      if (complex) {
+    }
+    // Handle :is() and :not()
+    if (/(?:is|not)\(/.test(selector)) {
+      if (isComplex) {
         return !REG_LOGIC_COMPLEX.test(selector);
       } else {
         return !REG_LOGIC_COMPOUND.test(selector);
       }
-    } else {
-      return !REG_WO_LOGICAL.test(selector);
+    }
+    // Default check for other pseudo-classes against known list
+    if (REG_WO_LOGICAL.test(selector)) {
+      return false;
     }
   }
   return true;

package/types/index.d.ts

@@ -1,6 +1,11 @@
 export class DOMSelector {
     constructor(window: Window, document: Document, opt?: object);
     clear: () => void;
+    extractSubjects: (selector: string) => Array<{
+        id: string | null;
+        className: string | null;
+        tag: string | null;
+    }>;
     check: (selector: string, node: Element, opt?: object) => CheckResult;
     matches: (selector: string, node: Element, opt?: object) => boolean;
     closest: (selector: string, node: Element, opt?: object) => Element | null;