@asamuzakjp/dom-selector 0.12.2 → 0.12.5

package/package.json

@@ -42,5 +42,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.12.2"
+  "version": "0.12.5"
 }

package/src/js/matcher.js

@@ -19,12 +19,17 @@ const FILTER_ACCEPT = 1;
 const FILTER_REJECT = 2;
 const FILTER_SHOW_ELEMENT = 1;
 const TEXT_NODE = 3;
+const UNIVERSAL_SELECTOR = {
+  name: '*',
+  type: TYPE_SELECTOR
+};
 
 /* regexp */
 const HEX_CAPTURE = /^([\da-f]{1,6}\s?)/i;
 const HTML_FORM_INPUT = /^(?:(?:inpu|selec)t|textarea)$/;
 const HTML_FORM_PARTS = /^(?:button|fieldset|opt(?:group|ion))$/;
 const HTML_INTERACT = /^d(?:etails|ialog)$/;
+const INPUT_TYPE_BARRED = /^(?:(?:butto|hidde)n|reset)$/;
 const PSEUDO_FUNC = /^(?:(?:ha|i)s|not|where)$/;
 const PSEUDO_NTH = /^nth-(?:last-)?(?:child|of-type)$/;
 const WHITESPACE = /^[\n\r\f]/;
@@ -93,7 +98,7 @@ const unescapeSelector = (selector = '') => {
       selector.indexOf(String.fromCharCode(0x5c), 0) >= 0) {
     const arr = selector.split('\\');
     const l = arr.length;
-    for (let i = 0; i < l; i++) {
+    for (let i = 1; i < l; i++) {
       let item = arr[i];
       if (i === l - 1 && item === '') {
         item = '\uFFFD';
@@ -114,7 +119,11 @@ const unescapeSelector = (selector = '') => {
           } catch (e) {
             str = '\uFFFD';
           }
-          item = item.replace(`${hex}`, str);
+          let postStr = '';
+          if (item.length > hex.length) {
+            postStr = item.substring(hex.length);
+          }
+          item = `${str}${postStr}`;
         } else if (WHITESPACE.test(item)) {
           item = '\\' + item;
         }
@@ -950,7 +959,7 @@ const matchPseudoClassSelector = (
           break;
         case 'valid':
           if (HTML_FORM_INPUT.test(localName) ||
-              /^(?:f(?:ieldset|orm)|button|output)$/.test(localName)) {
+              /^(?:f(?:ieldset|orm)|button)$/.test(localName)) {
             if (node.checkValidity()) {
               matched.push(node);
             }
@@ -958,27 +967,28 @@ const matchPseudoClassSelector = (
           break;
         case 'invalid':
           if (HTML_FORM_INPUT.test(localName) ||
-              /^(?:f(?:ieldset|orm)|button|output)$/.test(localName)) {
+              /^(?:f(?:ieldset|orm)|button)$/.test(localName)) {
             if (!node.checkValidity()) {
               matched.push(node);
             }
           }
           break;
         case 'in-range':
-          if (localName === 'input' &&
-              node.hasAttribute('min') && node.hasAttribute('max')) {
-            if (!(node.validity.rangeUnderflow ||
-                  node.validity.rangeOverflow)) {
-              matched.push(node);
-            }
+          if (localName === 'input' && !node.readonly &&
+              !(node.hasAttribute('type') &&
+                INPUT_TYPE_BARRED.test(node.getAttribute('type'))) &&
+              node.hasAttribute('min') && node.hasAttribute('max') &&
+              !(node.validity.rangeUnderflow || node.validity.rangeOverflow)) {
+            matched.push(node);
           }
           break;
         case 'out-of-range':
-          if (localName === 'input' &&
-              node.hasAttribute('min') && node.hasAttribute('max')) {
-            if (node.validity.rangeUnderflow || node.validity.rangeOverflow) {
-              matched.push(node);
-            }
+          if (localName === 'input' && !node.readonly &&
+              !(node.hasAttribute('type') &&
+                INPUT_TYPE_BARRED.test(node.getAttribute('type'))) &&
+              node.hasAttribute('min') && node.hasAttribute('max') &&
+              (node.validity.rangeUnderflow || node.validity.rangeOverflow)) {
+            matched.push(node);
           }
           break;
         case 'required':
@@ -1451,10 +1461,7 @@ class Matcher {
       if (firstChild.type === PSEUDO_CLASS_SELECTOR &&
           PSEUDO_FUNC.test(unescapeSelector(firstChild.name)) &&
           node.nodeType === ELEMENT_NODE) {
-        const iteratorLeaf = {
-          name: '*',
-          type: TYPE_SELECTOR
-        };
+        const iteratorLeaf = UNIVERSAL_SELECTOR;
         const iterator = this._createIterator(iteratorLeaf, node);
         let nextNode = iterator.nextNode();
         while (nextNode) {
@@ -1469,10 +1476,7 @@ class Matcher {
         if (firstChild.type === COMBINATOR ||
             (firstChild.type === PSEUDO_CLASS_SELECTOR &&
              PSEUDO_NTH.test(unescapeSelector(firstChild.name)))) {
-          iteratorLeaf = {
-            name: '*',
-            type: TYPE_SELECTOR
-          };
+          iteratorLeaf = UNIVERSAL_SELECTOR;
         } else {
           iteratorLeaf = children.shift();
         }
@@ -1530,6 +1534,9 @@ class Matcher {
                         leaves.push(items.shift());
                       }
                     }
+                    if (leaves.length === 1) {
+                      leaves.push(UNIVERSAL_SELECTOR);
+                    }
                     const arr = this._matchCombinator(leaves, nextNode);
                     if (!arr.length || arr.length === 1) {
                       [nextNode] = arr;

package/src/js/parser.js

@@ -23,16 +23,16 @@ const preprocess = (...args) => {
     throw new TypeError('1 argument required, but only 0 present');
   }
   let [selector] = args;
-  if (typeof selector !== 'string') {
-    if (selector === undefined || selector === null) {
-      selector = Object.prototype.toString.call(selector)
-        .slice(TYPE_FROM, TYPE_TO).toLowerCase();
-    } else {
-      throw new DOMException(`invalid selector ${selector}`, 'SyntaxError');
-    }
+  if (typeof selector === 'string') {
+    selector = selector.replace(/\f|\r\n?/g, '\n')
+      .replace(/[\0\uD800-\uDFFF]|\\$/g, '\uFFFD').trim();
+  } else if (selector === undefined || selector === null) {
+    selector = Object.prototype.toString.call(selector)
+      .slice(TYPE_FROM, TYPE_TO).toLowerCase();
+  } else {
+    throw new DOMException(`invalid selector ${selector}`, 'SyntaxError');
   }
-  return selector.replace(/\f|\r\n?/g, '\n')
-    .replace(/[\0\uD800-\uDFFF]/g, '\uFFFD').trim();
+  return selector;
 };
 
 /**