@asamuzakjp/dom-selector 7.0.3 → 7.0.5

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": "^28.1.0",
+    "jsdom": "^29.0.1",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
     "prettier": "^3.8.1",
-    "sinon": "^21.0.2",
-    "typescript": "^5.9.3",
-    "wpt-runner": "^6.1.0"
+    "sinon": "^21.0.3",
+    "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.3"
+  "version": "7.0.5"
 }

package/src/js/finder.js

@@ -368,6 +368,7 @@ export class Finder {
         ast = item.ast;
         this.#descendant = item.descendant;
         this.#invalidate = item.invalidate;
+        this.#selectorAST = item.selectorAST;
       }
     }
     if (ast) {
@@ -403,7 +404,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.

package/src/js/matcher.js

@@ -526,15 +526,17 @@ export const matchTypeSelector = (ast, node, opt = {}) => {
     astName,
     node
   );
+  const isHTML =
+    node.ownerDocument.contentType === 'text/html' &&
+    (!namespaceURI || namespaceURI === 'http://www.w3.org/1999/xhtml');
+  if (isHTML && localName === astLocalName && !astName.includes('|')) {
+    return true;
+  }
   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') &&
-    isAlphabet
-  ) {
+  if (isHTML && isAlphabet) {
     astPrefix = astPrefix.toLowerCase();
     astLocalName = astLocalName.toLowerCase();
   }

package/src/js/utility.js

@@ -32,6 +32,7 @@ import {
   RULE,
   SCOPE,
   SELECTOR_LIST,
+  TAG_TYPE,
   TARGET_ALL,
   TARGET_FIRST,
   TEXT_NODE,
@@ -58,7 +59,8 @@ 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_ATTR_SIMPLE = /^\[[A-Z\d-]{1,255}(?:="?[A-Z\d\s-]{1,255}"?)?\]$/i;
+const REG_TAG_SIMPLE = new RegExp(`^(?:${TAG_TYPE})$`);
 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');
@@ -1067,6 +1069,12 @@ export const filterSelector = (selector, target) => {
     }
     return false;
   }
+
+  // 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

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;

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;