@asamuzakjp/dom-selector 0.12.1 → 0.12.3

package/package.json

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

package/src/js/matcher.js

@@ -25,9 +25,9 @@ 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 REPLACE_CHAR = /[\0\uD800-\uDFFF]/g;
 const WHITESPACE = /^[\n\r\f]/;
 
 /**
@@ -94,7 +94,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';
@@ -104,12 +104,22 @@ const unescapeSelector = (selector = '') => {
           const [, hex] = hexExists;
           let str;
           try {
-            str = String.fromCodePoint(`0x${hex.trim()}`)
-              .replace(REPLACE_CHAR, '\uFFFD');
+            const low = parseInt('D800', 16);
+            const high = parseInt('DFFF', 16);
+            const deci = parseInt(hex, 16);
+            if (deci === 0 || (deci >= low && deci <= high)) {
+              str = '\uFFFD';
+            } else {
+              str = String.fromCodePoint(deci);
+            }
           } 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;
         }
@@ -150,7 +160,7 @@ const collectNthChild = (anb = {}, node = {}) => {
     }
     // :first-child, :last-child, :nth-child(0 of S)
     if (a === 0) {
-      if (b >= 0 && b < l) {
+      if (b > 0 && b <= l) {
         if (items.length) {
           let i = 0;
           while (i < l) {
@@ -162,7 +172,7 @@ const collectNthChild = (anb = {}, node = {}) => {
             i++;
           }
         } else {
-          const current = arr[b];
+          const current = arr[b - 1];
           matched.push(current);
         }
       }
@@ -225,14 +235,14 @@ const collectNthOfType = (anb = {}, node = {}) => {
     const l = arr.length;
     // :first-of-type, :last-of-type
     if (a === 0) {
-      if (b >= 0 && b < l) {
+      if (b > 0 && b <= l) {
         let i = 0;
         let j = 0;
         while (i < l) {
           const current = arr[i];
           const { localName: itemLocalName, prefix: itemPrefix } = current;
           if (itemLocalName === localName && itemPrefix === prefix) {
-            if (j === b) {
+            if (j === b - 1) {
               matched.push(current);
               break;
             }
@@ -457,6 +467,9 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
     const l = attributes.length;
     let { name: astAttrName } = astName;
     astAttrName = unescapeSelector(astAttrName);
+    if (caseInsensitive) {
+      astAttrName = astAttrName.toLowerCase();
+    }
     // namespaced
     if (/\|/.test(astAttrName)) {
       const [astAttrPrefix, astAttrLocalName] = astAttrName.split('|');
@@ -957,20 +970,21 @@ const matchPseudoClassSelector = (
           }
           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':
@@ -1018,7 +1032,7 @@ const matchPseudoClassSelector = (
         case 'first-of-type': {
           const [node1] = collectNthOfType({
             a: 0,
-            b: 0
+            b: 1
           }, node);
           if (node1) {
             matched.push(node1);
@@ -1028,7 +1042,7 @@ const matchPseudoClassSelector = (
         case 'last-of-type': {
           const [node1] = collectNthOfType({
             a: 0,
-            b: 0,
+            b: 1,
             reverse: true
           }, node);
           if (node1) {
@@ -1039,11 +1053,11 @@ const matchPseudoClassSelector = (
         case 'only-of-type': {
           const [node1] = collectNthOfType({
             a: 0,
-            b: 0
+            b: 1
           }, node);
           const [node2] = collectNthOfType({
             a: 0,
-            b: 0,
+            b: 1,
             reverse: true
           }, node);
           if (node1 === node && node2 === node) {

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;
 };
 
 /**
@@ -54,7 +54,11 @@ const parseSelector = selector => {
     });
     res = toPlainObject(ast);
   } catch (e) {
-    throw new DOMException(e.message, 'SyntaxError');
+    if (e.message === '"]" is expected' && !selector.endsWith(']')) {
+      res = parseSelector(`${selector}]`);
+    } else {
+      throw new DOMException(e.message, 'SyntaxError');
+    }
   }
   return res;
 };