@asamuzakjp/dom-selector 4.2.2 → 4.3.0

package/package.json

@@ -32,15 +32,15 @@
     "@types/css-tree": "^2.3.7",
     "benchmark": "^2.1.4",
     "c8": "^9.1.0",
-    "chai": "^5.1.0",
+    "chai": "^5.1.1",
     "commander": "^12.0.0",
-    "esbuild": "^0.21.0",
+    "esbuild": "^0.21.1",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-jsdoc": "^48.2.4",
     "eslint-plugin-regexp": "^2.5.0",
-    "eslint-plugin-unicorn": "^52.0.0",
+    "eslint-plugin-unicorn": "^53.0.0",
     "happy-dom": "^14.10.1",
     "jsdom": "^24.0.0",
     "linkedom": "^0.16.11",
@@ -60,5 +60,5 @@
     "tsc": "node scripts/index clean --dir=types -i && npx tsc",
     "update-wpt": "git submodule update --init --recursive --remote"
   },
-  "version": "4.2.2"
+  "version": "4.3.0"
 }

package/src/js/constant.js

@@ -54,7 +54,7 @@ export const SHOW_ELEMENT = 1;
 export const WALKER_FILTER = 0x501;
 
 /* regexp */
-export const REG_LOGICAL_PSEUDO = /^(?:(?:ha|i)s|not|where)$/;
+export const REG_LOGICAL_PSEUDO = /^(?:has|is|not|where)$/;
 export const REG_SHADOW_HOST = /^host(?:-context)?$/;
 export const REG_SHADOW_MODE = /^(?:close|open)$/;
 export const REG_SHADOW_PSEUDO = /^part|slotted$/;

package/src/js/dom-util.js

@@ -139,9 +139,9 @@ export const getDirectionality = (node = {}) => {
       let text;
       switch (localName) {
         case 'input': {
-          if (!node.type || /^(?:(?:butto|hidde)n|(?:emai|te|ur)l|(?:rese|submi|tex)t|password|search)$/.test(node.type)) {
+          if (!node.type || /^(?:button|email|hidden|password|reset|search|submit|tel|text|url)$/.test(node.type)) {
             text = node.value;
-          } else if (/^(?:(?:ima|ran)ge|(?:dat|tim)e|c(?:olor|heckbox)|number|radio)$/.test(node.type)) {
+          } else if (/^(?:checkbox|color|date|image|number|radio|range|time)$/.test(node.type)) {
             res = 'ltr';
           }
           break;
@@ -164,7 +164,7 @@ export const getDirectionality = (node = {}) => {
             if (itemNodeType === TEXT_NODE) {
               text = itemTextContent.trim();
             } else if (itemNodeType === ELEMENT_NODE) {
-              if (!/^(?:bdi|s(?:cript|tyle)|textarea)$/.test(itemLocalName) &&
+              if (!/^(?:bdi|script|style|textarea)$/.test(itemLocalName) &&
                   (!itemDir || !regDir.test(itemDir))) {
                 if (itemLocalName === 'slot') {
                   text = getSlottedTextContent(item);

package/src/js/finder.js

@@ -15,8 +15,8 @@ import {
 
 /* constants */
 import {
-  COMBINATOR, DOCUMENT_FRAGMENT_NODE, DOCUMENT_NODE, ELEMENT_NODE, EMPTY,
-  NOT_SUPPORTED_ERR, REG_LOGICAL_PSEUDO, REG_SHADOW_HOST, SELECTOR_CLASS,
+  BIT_01, COMBINATOR, DOCUMENT_FRAGMENT_NODE, DOCUMENT_NODE, ELEMENT_NODE,
+  EMPTY, NOT_SUPPORTED_ERR, REG_LOGICAL_PSEUDO, REG_SHADOW_HOST, SELECTOR_CLASS,
   SELECTOR_ID, SELECTOR_PSEUDO_CLASS, SELECTOR_PSEUDO_ELEMENT, SELECTOR_TYPE,
   SHOW_ALL, SYNTAX_ERR, TEXT_NODE, WALKER_FILTER
 } from './constant.js';
@@ -58,6 +58,7 @@ export class Finder {
   #content;
   #descendant;
   #document;
+  #event;
   #node;
   #nodes;
   #noexcept;
@@ -120,14 +121,16 @@ export class Finder {
    * @param {string} selector - CSS selector
    * @param {object} node - Document, DocumentFragment, Element node
    * @param {object} opt - options
+   * @param {object} [opt.event] - MouseEvent, KeyboardEvent
    * @param {boolean} [opt.noexcept] - no exception
    * @param {boolean} [opt.warn] - console warn
    * @returns {object} - node
    */
   _setup(selector, node, opt = {}) {
-    const { noexcept, warn } = opt;
+    const { event, noexcept, warn } = opt;
     this.#noexcept = !!noexcept;
     this.#warn = !!warn;
+    this.#event = this._setEvent(event);
     this.#node = node;
     [this.#content, this.#root, this.#walker] = resolveContent(node);
     this.#shadow = isInShadowTree(node);
@@ -136,6 +139,19 @@ export class Finder {
     return node;
   }
 
+  /**
+   * set event
+   * @private
+   * @param {object} event - instance of MouseEvent, KeyboardEvent
+   * @returns {object} - result
+   */
+  _setEvent(event) {
+    return (event instanceof this.#window.MouseEvent ||
+            event instanceof this.#window.KeyboardEvent)
+      ? event
+      : null;
+  }
+
   /**
    * correspond ast and nodes
    * @private
@@ -898,14 +914,14 @@ export class Finder {
     } else {
       const regAnchor = /^a(?:rea)?$/;
       const regFormCtrl =
-        /^(?:(?:fieldse|inpu|selec)t|button|opt(?:group|ion)|textarea)$/;
-      const regFormValidity = /^(?:(?:inpu|selec)t|button|form|textarea)$/;
-      const regInteract = /^d(?:etails|ialog)$/;
+        /^(?:button|fieldset|input|optgroup|option|select|textarea)$/;
+      const regFormValidity = /^(?:button|form|input|select|textarea)$/;
+      const regInteract = /^(?:details|dialog)$/;
       const regTypeCheck = /^(?:checkbox|radio)$/;
       const regTypeDate = /^(?:date(?:time-local)?|month|time|week)$/;
       const regTypeRange =
-        /(?:(?:rang|tim)e|date(?:time-local)?|month|number|week)$/;
-      const regTypeText = /^(?:(?:emai|te|ur)l|number|password|search|text)$/;
+        /(?:date(?:time-local)?|month|number|range|time|week)$/;
+      const regTypeText = /^(?:email|number|password|search|tel|text|url)$/;
       switch (astName) {
         case 'any-link':
         case 'link': {
@@ -928,6 +944,22 @@ export class Finder {
           // prevent fingerprinting
           break;
         }
+        case 'hover': {
+          const { target, type } = this.#event ?? {};
+          if ((type === 'mouseover' || type === 'pointerover') &&
+              node.contains(target)) {
+            matched.add(node);
+          }
+          break;
+        }
+        case 'active': {
+          const { buttons, target, type } = this.#event ?? {};
+          if ((type === 'mousedown' || type === 'pointerdown') &&
+              buttons & BIT_01 && node.contains(target)) {
+            matched.add(node);
+          }
+          break;
+        }
         case 'target': {
           const { hash } = new URL(this.#content.URL);
           if (node.id && hash === `#${node.id}` &&
@@ -961,8 +993,12 @@ export class Finder {
           }
           break;
         }
-        case 'focus': {
-          if (node === this.#content.activeElement && node.tabIndex >= 0) {
+        case 'focus':
+        case 'focus-visible': {
+          const { target, type } = this.#event ?? {};
+          if (node === this.#content.activeElement && node.tabIndex >= 0 &&
+              (astName === 'focus' ||
+               (type === 'keydown' && node.contains(target)))) {
             let refNode = node;
             let focus = true;
             while (refNode) {
@@ -1527,15 +1563,13 @@ export class Finder {
           }
           break;
         }
-        case 'active':
+        // not supported
         case 'autofill':
         case 'blank':
         case 'buffering':
         case 'current':
-        case 'focus-visible':
         case 'fullscreen':
         case 'future':
-        case 'hover':
         case 'modal':
         case 'muted':
         case 'past':

package/types/js/finder.d.ts

@@ -2,6 +2,7 @@ export class Finder {
     constructor(window: object);
     private _onError;
     private _setup;
+    private _setEvent;
     private _correspond;
     private _createTreeWalker;
     private _prepareQuerySelectorWalker;