@asamuzakjp/dom-selector 6.5.0 → 6.5.2

package/README.md

@@ -172,14 +172,15 @@ const dom = new JSDOM('', {
 |Pattern|Supported|Note|
 |:--------|:-------:|:--------|
 |\*|✓| |
+|E|✓| |
 |ns\|E|✓| |
 |\*\|E|✓| |
 |\|E|✓| |
-|E|✓| |
-|E:not(s1, s2, …)|✓| |
-|E:is(s1, s2, …)|✓| |
-|E:where(s1, s2, …)|✓| |
-|E:has(rs1, rs2, …)|✓| |
+|E F|✓| |
+|E > F|✓| |
+|E + F|✓| |
+|E ~ F|✓| |
+|F \|\| E|Unsupported| |
 |E.warning|✓| |
 |E#myid|✓| |
 |E\[foo\]|✓| |
@@ -191,6 +192,10 @@ const dom = new JSDOM('', {
 |E\[foo$="bar"\]|✓| |
 |E\[foo*="bar"\]|✓| |
 |E\[foo\|="en"\]|✓| |
+|E:is(s1, s2, …)|✓| |
+|E:not(s1, s2, …)|✓| |
+|E:where(s1, s2, …)|✓| |
+|E:has(rs1, rs2, …)|✓| |
 |E:defined|Partially supported|Matching with MathML is not yet supported.|
 |E:dir(ltr)|✓| |
 |E:lang(en)|✓| |
@@ -201,25 +206,27 @@ const dom = new JSDOM('', {
 |E:target|✓| |
 |E:target‑within|✓| |
 |E:scope|✓| |
+|E:hover|✓| |
+|E:active|✓| |
+|E:focus|✓| |
+|E:focus‑visible|✓| |
+|E:focus‑within|✓| |
 |E:current|Unsupported| |
 |E:current(s)|Unsupported| |
 |E:past|Unsupported| |
 |E:future|Unsupported| |
-|E:active|✓| |
-|E:hover|✓| |
-|E:focus|✓| |
-|E:focus‑within|✓| |
-|E:focus‑visible|✓| |
 |E:open<br>E:closed|Partially supported|Matching with &lt;select&gt;, e.g. `select:open`, is not supported.|
+|E:popover-open|✓| |
 |E:enabled<br>E:disabled|✓| |
 |E:read&#8209;write<br>E:read&#8209;only|✓| |
 |E:placeholder&#8209;shown|✓| |
 |E:default|✓| |
 |E:checked|✓| |
 |E:indeterminate|✓| |
+|E:blank|Unsupported| |
 |E:valid<br>E:invalid|✓| |
+|E:in-range<br>E:out-of-range|✓| |
 |E:required<br>E:optional|✓| |
-|E:blank|Unsupported| |
 |E:user&#8209;valid<br>E:user&#8209;invalid|Unsupported| |
 |E:root|✓| |
 |E:empty|✓| |
@@ -233,21 +240,15 @@ const dom = new JSDOM('', {
 |E:first&#8209;of&#8209;type|✓| |
 |E:last&#8209;of&#8209;type|✓| |
 |E:only&#8209;of&#8209;type|✓| |
-|E&nbsp;F|✓| |
-|E > F|✓| |
-|E + F|✓| |
-|E ~ F|✓| |
-|F \|\| E|Unsupported| |
 |E:nth&#8209;col(n)|Unsupported| |
 |E:nth&#8209;last&#8209;col(n)|Unsupported| |
-|E:popover-open|✓| |
-|E:state(v)|✓|*1|
+|CE:state(v)|✓|*1|
 |:host|✓| |
 |:host(s)|✓| |
-|:host&#8209;context(s)|✓| |
 |:host(:state(v))|✓|*1|
 |:host:has(rs1, rs2, ...)|✓| |
 |:host(s):has(rs1, rs2, ...)|✓| |
+|:host&#8209;context(s)|✓| |
 |:host&#8209;context(s):has(rs1, rs2, ...)|✓| |
 |&amp;|✓|Only supports outermost `&`, i.e. equivalent to `:scope`|
 

package/dist/cjs/index.cjs

@@ -69,7 +69,6 @@ var BIT_32 = 32;
 var BIT_FFFF = 65535;
 var DUO = 2;
 var HEX = 16;
-var HYPHEN = 45;
 var TYPE_FROM = 8;
 var TYPE_TO = -1;
 var ELEMENT_NODE = 1;
@@ -79,7 +78,7 @@ var DOCUMENT_FRAGMENT_NODE = 11;
 var DOCUMENT_POSITION_PRECEDING = 2;
 var DOCUMENT_POSITION_CONTAINS = 8;
 var SHOW_ALL = 4294967295;
-var WALKER_FILTER = 1281;
+var SHOW_CONTAINER = 1281;
 var ALPHA_NUM = "[A-Z\\d]+";
 var CHILD_IDX = "(?:first|last|only)-(?:child|of-type)";
 var DIGIT = "(?:0|[1-9]\\d*)";
@@ -768,15 +767,8 @@ var preprocess = (...args) => {
       }
       const preHash = selector.substring(0, index + 1);
       let postHash = selector.substring(index + 1);
-      if (/^\d$/.test(postHash.substring(0, 1))) {
-        throw new DOMException(`Invalid selector ${selector}`, SYNTAX_ERR);
-      }
       const codePoint = postHash.codePointAt(0);
-      if (codePoint === HYPHEN) {
-        if (/^\d$/.test(postHash.substring(1, 2))) {
-          throw new DOMException(`Invalid selector ${selector}`, SYNTAX_ERR);
-        }
-      } else if (codePoint > BIT_FFFF) {
+      if (codePoint > BIT_FFFF) {
         const str = `\\${codePoint.toString(HEX)} `;
         if (postHash.length === DUO) {
           postHash = str;
@@ -792,7 +784,7 @@ var preprocess = (...args) => {
     selector = getType(selector).toLowerCase();
   } else if (Array.isArray(selector)) {
     selector = selector.join(",");
-  } else if (Object.prototype.hasOwnProperty.call(selector, "toString")) {
+  } else if (Object.hasOwn(selector, "toString")) {
     selector = selector.toString();
   } else {
     throw new DOMException(`Invalid selector ${selector}`, SYNTAX_ERR);
@@ -846,8 +838,22 @@ var walkAST = (ast = {}) => {
   const opt = {
     enter: (node) => {
       switch (node.type) {
-        case SELECTOR: {
-          branches.add(node.children);
+        case CLASS_SELECTOR: {
+          if (/^-?\d/.test(node.name)) {
+            throw new DOMException(
+              `Invalid selector .${node.name}`,
+              SYNTAX_ERR
+            );
+          }
+          break;
+        }
+        case ID_SELECTOR: {
+          if (/^-?\d/.test(node.name)) {
+            throw new DOMException(
+              `Invalid selector #${node.name}`,
+              SYNTAX_ERR
+            );
+          }
           break;
         }
         case PS_CLASS_SELECTOR: {
@@ -877,6 +883,10 @@ var walkAST = (ast = {}) => {
           }
           break;
         }
+        case SELECTOR: {
+          branches.add(node.children);
+          break;
+        }
         default:
       }
     }
@@ -1478,7 +1488,7 @@ var Finder = class {
           throw new this.#window.DOMException(e.message, e.name);
         }
       } else if (e.name in this.#window) {
-        throw new this.#window[e.name](e.message);
+        throw new this.#window[e.name](e.message, { cause: e });
       } else {
         throw e;
       }
@@ -1692,7 +1702,7 @@ var Finder = class {
    * @returns {object} - tree walker
    */
   _createTreeWalker(node, opt = {}) {
-    const { force = false, whatToShow = WALKER_FILTER } = opt;
+    const { force = false, whatToShow = SHOW_CONTAINER } = opt;
     let walker;
     if (force) {
       walker = this.#document.createTreeWalker(node, whatToShow);