@asamuzakjp/dom-selector 7.1.1 → 8.0.0-a.2

package/package.json

@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "@asamuzakjp/generational-cache": "^1.0.1",
-    "@asamuzakjp/nwsapi": "^2.3.9",
     "bidi-js": "^1.0.3",
     "css-tree": "^3.2.1",
     "is-potential-custom-element-name": "^1.0.1"
@@ -33,7 +32,6 @@
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
     "@types/node": "^25.6.0",
-    "benchmark": "^2.1.4",
     "c8": "^11.0.0",
     "chai": "^6.2.2",
     "commander": "^14.0.3",
@@ -44,12 +42,13 @@
     "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-unicorn": "^64.0.0",
     "globals": "^17.5.0",
-    "jsdom": "^29.0.2",
+    "jsdom": "^29.1.0",
     "mitata": "^1.0.34",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
     "prettier": "^3.8.3",
     "sinon": "^21.1.2",
+    "tinybench": "^6.0.1",
     "typescript": "^6.0.3",
     "wpt-runner": "^7.0.0"
   },
@@ -64,6 +63,7 @@
     "bench": "node benchmark/bench.js",
     "bench:cache": "node benchmark/bench-cache.js",
     "bench:cacheMonster": "node benchmark/bench-cache-monster.js",
+    "bench:nwsapi": "node benchmark/bench-nwsapi.js",
     "bench:sizzle": "node benchmark/bench-sizzle.js",
     "build": "npm run tsc && npm run lint && npm test",
     "lint": "eslint --fix .",
@@ -73,7 +73,7 @@
     "update:wpt": "git submodule update --init --recursive --remote"
   },
   "engines": {
-    "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+    "node": "^20.19.0 || ^22.13.0 || >=24.0.0"
   },
-  "version": "7.1.1"
+  "version": "8.0.0-a.2"
 }

package/src/index.js

@@ -8,8 +8,13 @@
 /* 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';
+import { Nwsapi } from './js/nwsapi.js';
+import { extractSubjectsAst } from './js/parser.js';
+import {
+  filterSelector,
+  getType,
+  extractSubjectsRegExp
+} from './js/utility.js';
 
 /* constants */
 import {
@@ -19,14 +24,13 @@ import {
   TARGET_ALL,
   TARGET_FIRST,
   TARGET_LINEAL,
-  TARGET_SELF,
-  COMBINATOR,
-  ID_SELECTOR,
-  CLASS_SELECTOR,
-  TYPE_SELECTOR
+  TARGET_SELF
 } from './js/constant.js';
 const CACHE_SIZE = 2048;
 
+/* regexp */
+const REG_SELECTOR = /[[\]():\\"'`]/;
+
 /**
  * @typedef {object} CheckResult
  * @property {boolean} match - The match result.
@@ -54,10 +58,10 @@ export class DOMSelector {
     const { cacheSize, idlUtils } = opt;
     this.#window = window;
     this.#document = document ?? window.document;
-    this.#finder = new Finder(window);
     this.#idlUtils = idlUtils;
-    this.#nwsapi = initNwsapi(window, document);
     this.#cache = new GenerationalCache(cacheSize ?? CACHE_SIZE);
+    this.#finder = new Finder(this.#window);
+    this.#nwsapi = new Nwsapi(this.#window, this.#document);
   }
 
   /**
@@ -71,48 +75,28 @@ export class DOMSelector {
   /**
    * Parses a selector and extracts the rightmost subject keys (Id, Class, Tag).
    * @param {string} selector - The CSS selector to parse.
+   * @param {boolean} caseSensitive - True if tag key should be case sensitive.
    * @returns {Array<{id: string|null, className: string|null, tag: string|null}>} The list of extracted keys for each selector group.
    */
-  extractSubjects = selector => {
+  extractSubjects = (selector, caseSensitive = false) => {
     if (!selector || typeof selector !== 'string') {
       return [{ id: null, className: null, tag: null }];
     }
-    const cacheKey = `extract_${selector}`;
+    const cacheKey = `extract_${selector}_${caseSensitive}`;
     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 });
-        }
+    if (!REG_SELECTOR.test(selector)) {
+      subjects = extractSubjectsRegExp(selector, caseSensitive);
+    } else {
+      try {
+        const ast = this.#finder.getAST(selector);
+        subjects = extractSubjectsAst(ast);
+      } catch (e) {
+        // fall through
       }
-    } catch (e) {
-      // fall through
     }
     if (!subjects.length) {
       subjects.push({ id: null, className: null, tag: null });

package/src/js/matcher.js

@@ -41,12 +41,16 @@ const REG_LANG_VALID = new RegExp(`^(?:\\*-)?${ALPHA_NUM}${LANG_PART}$`, 'i');
  * @param {string} astType - The type of the selector from the AST.
  * @param {object} [opt] - Optional parameters.
  * @param {boolean} [opt.forgive] - If true, ignores unknown pseudo-elements.
+ * @param {object} [opt.globalObject] - The global object.
  * @param {boolean} [opt.warn] - If true, throws an error for unsupported ones.
  * @throws {DOMException} If the selector is invalid or unsupported.
  * @returns {void}
  */
-export const matchPseudoElementSelector = (astName, astType, opt = {}) => {
-  const { forgive, globalObject, warn } = opt;
+export const matchPseudoElementSelector = (
+  astName,
+  astType,
+  { forgive, globalObject, warn } = {}
+) => {
   if (astType !== PS_ELEMENT_SELECTOR) {
     // Ensure the AST node is a pseudo-element selector.
     throw new TypeError(`Unexpected ast type ${getType(astType)}`);
@@ -96,8 +100,8 @@ export const matchPseudoElementSelector = (astName, astType, opt = {}) => {
             globalObject
           );
         }
-        // Throw an error for unknown pseudo-elements if not forgiven.
       } else if (!forgive) {
+        // Throw an error for unknown pseudo-elements if not forgiven.
         throw generateException(
           `Unknown pseudo-element ::${astName}`,
           SYNTAX_ERR,
@@ -301,16 +305,20 @@ export const matchReadOnlyPseudoClass = (astName, node) => {
  * @param {object} [opt] - Optional parameters.
  * @param {boolean} [opt.check] - True if running in an internal check.
  * @param {boolean} [opt.forgive] - True to forgive certain syntax errors.
+ * @param {object} [opt.globalObject] - The global object.
  * @returns {boolean} - True if the attribute selector matches, otherwise false.
  */
-export const matchAttributeSelector = (ast, node, opt = {}) => {
+export const matchAttributeSelector = (
+  ast,
+  node,
+  { check, forgive, globalObject } = {}
+) => {
   const {
     flags: astFlags,
     matcher: astMatcher,
     name: astName,
     value: astValue
   } = ast;
-  const { check, forgive, globalObject } = opt;
   // Validate selector flags ('i' or 's').
   if (typeof astFlags === 'string' && !/^[is]$/i.test(astFlags) && !forgive) {
     const css = generateCSS(ast);
@@ -409,8 +417,8 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
         }
       }
     }
-    // Handle non-namespaced attribute names.
   } else {
+    // Handle non-namespaced attribute names.
     for (let { name: itemName, value: itemValue } of attributes) {
       if (caseInsensitive) {
         itemName = itemName.toLowerCase();
@@ -425,8 +433,8 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
         // The attribute is starting with ':'.
         if (!itemPrefix && astAttrName === `:${itemLocalName}`) {
           attrValues.add(itemValue);
-          // Ignore the 'xml:lang' attribute.
         } else if (itemPrefix === 'xml' && itemLocalName === 'lang') {
+          // Ignore the 'xml:lang' attribute.
           continue;
         } else if (astAttrName === itemLocalName) {
           attrValues.add(itemValue);
@@ -537,12 +545,16 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
  * @param {object} [opt] - options
  * @param {boolean} [opt.check] - running in internal check()
  * @param {boolean} [opt.forgive] - forgive undeclared namespace
+ * @param {object} [opt.globalObject] - The global object.
  * @returns {boolean} - result
  */
-export const matchTypeSelector = (ast, node, opt = {}) => {
+export const matchTypeSelector = (
+  ast,
+  node,
+  { check, forgive, globalObject } = {}
+) => {
   const astName = unescapeSelector(ast.name);
   const { localName, namespaceURI, prefix } = node;
-  const { check, forgive, globalObject } = opt;
   let { prefix: astPrefix, localName: astLocalName } = parseAstName(
     astName,
     node