@asamuzakjp/dom-selector 8.1.1 → 8.1.2

package/package.json

@@ -86,5 +86,5 @@
   "engines": {
     "node": "^22.13.0 || >=24.0.0"
   },
-  "version": "8.1.1"
+  "version": "8.1.2"
 }

package/src/js/constant.js

@@ -81,7 +81,6 @@ export const TAG_TYPE = `\\*|${TAG_TYPE_WO_UNIVERSAL}`;
 export const TAG_TYPE_I = '\\*|[A-Z][\\w-]*';
 export const COMPOUND = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE})+)`;
 export const COMPOUND_L = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE}|${LOGIC_IS})+)`;
-export const COMPOUND_L_I = `(?:(?:${TAG_TYPE_I})?(?:${SUB_TYPE}|${LOGIC_IS})+)`;
 export const COMPOUND_I = `(?:${TAG_TYPE_I}|(?:${TAG_TYPE_I})?(?:${SUB_TYPE})+)`;
 export const COMPOUND_WO_PSEUDO = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE_WO_PSEUDO})+)`;
 export const COMPLEX = `${COMPOUND}(?:${COMBO}${COMPOUND})*`;

package/src/js/selector.js

@@ -11,7 +11,6 @@ import {
   COMBINATOR,
   COMBO,
   COMPOUND_I,
-  COMPOUND_L_I,
   DESCEND,
   HAS_COMPOUND,
   KEYS_LOGICAL,
@@ -30,9 +29,11 @@ import {
 /* regexp */
 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_EXCLUDE_QSA = new RegExp(
+  `(?:^(?:[A-Z]|\\.)[\\w-]*$|${COMPOUND_I}${DESCEND}${COMPOUND_I})`,
+  'i'
+);
 const REG_COMPLEX = new RegExp(`${COMPOUND_I}${COMBO}${COMPOUND_I}`, 'i');
-const REG_COMPOUND = new RegExp(`^${COMPOUND_L_I}$`, 'i');
-const REG_DESCEND = new RegExp(`${COMPOUND_I}${DESCEND}${COMPOUND_I}`, 'i');
 const REG_LOGIC_COMPLEX = new RegExp(
   `:(?!${PSEUDO_CLASS}|${N_TH}|${LOGIC_COMPLEX})`
 );
@@ -264,7 +265,6 @@ export const extractSubjectsRegExp = (selector, caseSensitive) => {
  * @returns {boolean} - True if the selector is valid for nwsapi.
  */
 export const filterSelector = (selector, target) => {
-  const isQuerySelectorAll = target === TARGET_ALL;
   // Basic validation and fast-fail for null/undefined/non-string values.
   if (
     !selector ||
@@ -277,6 +277,10 @@ export const filterSelector = (selector, target) => {
   if (REG_INVALID_SYNTAX.test(selector)) {
     return false;
   }
+  // Target-specific early exits.
+  if (target === TARGET_ALL && REG_EXCLUDE_QSA.test(selector)) {
+    return false;
+  }
   // Exclude various complex or unsupported selectors early.
   // i.e. non-ASCII, escaped selectors, namespaced selectors, pseudo-elements.
   if (selector.includes('/') || REG_EXCLUDE_BASIC.test(selector)) {
@@ -289,18 +293,11 @@ export const filterSelector = (selector, target) => {
       return false;
     }
   }
-  // Target-specific early exits.
-  if (target === TARGET_ALL && !REG_COMPOUND.test(selector)) {
-    return false;
-  }
   // Logic for pseudo-classes.
   if (selector.includes(':')) {
-    // Exclude descendant combinators in logical selectors for querySelectorAll.
-    if (isQuerySelectorAll && REG_DESCEND.test(selector)) {
-      return false;
-    }
     // Determine if the selector has complex logical structures.
-    const isComplex = isQuerySelectorAll ? false : REG_COMPLEX.test(selector);
+    const isComplex =
+      target === TARGET_ALL ? false : REG_COMPLEX.test(selector);
     // Handle :has() specifically.
     if (selector.includes(':has(')) {
       if (!isComplex || REG_LOGIC_HAS_COMPOUND.test(selector)) {

package/types/js/constant.d.ts

@@ -62,7 +62,6 @@ export const TAG_TYPE: "\\*|[A-Za-z][\\w-]*";
 export const TAG_TYPE_I: "\\*|[A-Z][\\w-]*";
 export const COMPOUND: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)";
 export const COMPOUND_L: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+|:is\\(\\s*[^)]+\\s*\\))+)";
-export const COMPOUND_L_I: "(?:(?:\\*|[A-Z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+|:is\\(\\s*[^)]+\\s*\\))+)";
 export const COMPOUND_I: "(?:\\*|[A-Z][\\w-]*|(?:\\*|[A-Z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)";
 export const COMPOUND_WO_PSEUDO: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.][\\w-]+)+)";
 export const COMPLEX: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)(?:\\s?[\\s>~+]\\s?(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+))*";