@asamuzakjp/dom-selector 0.21.0 → 0.21.1

package/package.json

@@ -50,5 +50,5 @@
     "update": "npm-run-all -s update-*",
     "update-wpt": "git submodule update --init --recursive"
   },
-  "version": "0.21.0"
+  "version": "0.21.1"
 }

package/src/js/matcher.js

@@ -28,6 +28,7 @@ const TARGET_SELF = 'self';
 const DIR_VALUE = /^(?:auto|ltr|rtl)$/;
 const HTML_FORM_INPUT = /^(?:(?:inpu|selec)t|textarea)$/;
 const HTML_FORM_PARTS = /^(?:button|fieldset|opt(?:group|ion))$/;
+const HTML_FORM_VALIDITY = /^(?:(?:(?:in|out)pu|selec)t|button|form|textarea)$/;
 const HTML_INTERACT = /^d(?:etails|ialog)$/;
 const INPUT_RANGE = /(?:(?:rang|tim)e|date(?:time-local)?|month|number|week)$/;
 const INPUT_TEXT = /^(?:(?:emai|te|ur)l|password|search|text)$/;
@@ -1122,20 +1123,58 @@ export class Matcher {
           break;
         }
         case 'valid': {
-          if (HTML_FORM_INPUT.test(localName) ||
-              /^(?:f(?:ieldset|orm)|button)$/.test(localName)) {
+          if (HTML_FORM_VALIDITY.test(localName)) {
             if (node.checkValidity()) {
               matched.add(node);
             }
+          } else if (/^fieldset$/.test(localName)) {
+            const { document } = this.#root;
+            const iterator = document.createNodeIterator(node, SHOW_ELEMENT);
+            let refNode = iterator.nextNode();
+            if (refNode === node) {
+              refNode = iterator.nextNode();
+            }
+            let bool;
+            while (refNode) {
+              if (HTML_FORM_VALIDITY.test(refNode.localName)) {
+                bool = refNode.checkValidity();
+                if (!bool) {
+                  break;
+                }
+              }
+              refNode = iterator.nextNode();
+            }
+            if (bool) {
+              matched.add(node);
+            }
           }
           break;
         }
         case 'invalid': {
-          if (HTML_FORM_INPUT.test(localName) ||
-              /^(?:f(?:ieldset|orm)|button)$/.test(localName)) {
+          if (HTML_FORM_VALIDITY.test(localName)) {
             if (!node.checkValidity()) {
               matched.add(node);
             }
+          } else if (/^fieldset$/.test(localName)) {
+            const { document } = this.#root;
+            const iterator = document.createNodeIterator(node, SHOW_ELEMENT);
+            let refNode = iterator.nextNode();
+            if (refNode === node) {
+              refNode = iterator.nextNode();
+            }
+            let bool;
+            while (refNode) {
+              if (HTML_FORM_VALIDITY.test(refNode.localName)) {
+                bool = refNode.checkValidity();
+                if (!bool) {
+                  break;
+                }
+              }
+              refNode = iterator.nextNode();
+            }
+            if (!bool) {
+              matched.add(node);
+            }
           }
           break;
         }

package/types/js/matcher.d.ts

@@ -7,6 +7,7 @@ export class Matcher {
     _getRoot(node?: object): object;
     _sortLeaves(leaves: Array<object>): Array<object>;
     _prepare(selector?: string): Array<Array<object | undefined>>;
+    _throwOnPseudoElementSelector(astName: object): void;
     _collectNthChild(anb: {
         a: number;
         b: number;
@@ -27,11 +28,10 @@ export class Matcher {
     _matchAttributeSelector(ast: object, node: object): object | null;
     _matchClassSelector(ast: object, node: object): object | null;
     _matchIDSelector(ast: object, node: object): object | null;
-    _matchPseudoElementSelector(ast: object, node: object): void;
     _matchTypeSelector(ast: object, node: object): object | null;
     _matchSelector(ast: object, node: object): object;
     _matchLeaves(leaves: Array<object>, node: object): boolean;
-    _findDescendantNodes(leaves: Array<object>, refNode: object): object;
+    _findDescendantNodes(leaves: Array<object>, baseNode: object): object;
     _matchCombinator(twig: object, node: object, opt?: {
         find?: string;
     }): object;