@asamuzakjp/dom-selector 0.15.5 → 0.15.7

package/package.json

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

package/src/js/matcher.js

@@ -73,14 +73,16 @@ const isNamespaceDeclared = (ns = '', node = {}) => {
   if (ns && typeof ns === 'string' && node.nodeType === ELEMENT_NODE) {
     const attr = `xmlns:${ns}`;
     const root = node.ownerDocument.documentElement;
-    while (node) {
-      if (node.hasAttribute(attr)) {
+    let parent = node;
+    while (parent) {
+      if (typeof parent.hasAttribute === 'function' &&
+          parent.hasAttribute(attr)) {
         res = true;
         break;
-      } else if (node === root) {
+      } else if (parent === root) {
         break;
       }
-      node = node.parentNode;
+      parent = parent.parentNode;
     }
   }
   return !!res;
@@ -600,54 +602,56 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
     flags: astFlags, matcher: astMatcher, name: astName, type: astType,
     value: astValue
   } = ast;
-  const { attributes, nodeType } = node;
+  if (typeof astFlags === 'string' && !/^[is]$/i.test(astFlags)) {
+    throw new DOMException('invalid attribute selector', 'SyntaxError');
+  }
+  const { attributes, nodeType, ownerDocument } = node;
   let res;
   if (astType === ATTRIBUTE_SELECTOR && nodeType === ELEMENT_NODE &&
       attributes?.length) {
-    if (typeof astFlags === 'string' && !/^[is]$/i.test(astFlags)) {
-      throw new DOMException('invalid attribute selector', 'SyntaxError');
-    }
-    const caseInsensitive =
-      !(typeof astFlags === 'string' && /^s$/i.test(astFlags));
-    const attrValues = [];
-    const l = attributes.length;
     let { name: astAttrName } = astName;
     astAttrName = unescapeSelector(astAttrName);
+    let caseInsensitive;
+    if (ownerDocument?.contentType === 'text/html') {
+      if (typeof astFlags === 'string' && /^s$/i.test(astFlags)) {
+        caseInsensitive = false;
+      } else {
+        caseInsensitive = true;
+      }
+    } else if (typeof astFlags === 'string' && /^i$/i.test(astFlags)) {
+      caseInsensitive = true;
+    } else {
+      caseInsensitive = false;
+    }
     if (caseInsensitive) {
       astAttrName = astAttrName.toLowerCase();
     }
+    const l = attributes.length;
+    const attrValues = [];
     // namespaced
     if (/\|/.test(astAttrName)) {
       const [astAttrPrefix, astAttrLocalName] = astAttrName.split('|');
       let i = 0;
       while (i < l) {
-        const { name: itemName, value: itemValue } = attributes.item(i);
+        let { name: itemName, value: itemValue } = attributes.item(i);
+        if (caseInsensitive) {
+          itemName = itemName.toLowerCase();
+          itemValue = itemValue.toLowerCase();
+        }
         switch (astAttrPrefix) {
           case '': {
             if (astAttrLocalName === itemName) {
-              if (caseInsensitive) {
-                attrValues.push(itemValue.toLowerCase());
-              } else {
-                attrValues.push(itemValue);
-              }
+              attrValues.push(itemValue);
             }
             break;
           }
           case '*': {
             if (/:/.test(itemName)) {
               if (itemName.endsWith(`:${astAttrLocalName}`)) {
-                if (caseInsensitive) {
-                  attrValues.push(itemValue.toLowerCase());
-                } else {
-                  attrValues.push(itemValue);
-                }
-              }
-            } else if (astAttrLocalName === itemName) {
-              if (caseInsensitive) {
-                attrValues.push(itemValue.toLowerCase());
-              } else {
                 attrValues.push(itemValue);
               }
+            } else if (astAttrLocalName === itemName) {
+              attrValues.push(itemValue);
             }
             break;
           }
@@ -656,11 +660,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
               const [itemNamePrefix, itemNameLocalName] = itemName.split(':');
               if (astAttrPrefix === itemNamePrefix &&
                   astAttrLocalName === itemNameLocalName) {
-                if (caseInsensitive) {
-                  attrValues.push(itemValue.toLowerCase());
-                } else {
-                  attrValues.push(itemValue);
-                }
+                attrValues.push(itemValue);
               }
             }
           }
@@ -670,22 +670,18 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
     } else {
       let i = 0;
       while (i < l) {
-        const { name: itemName, value: itemValue } = attributes.item(i);
+        let { name: itemName, value: itemValue } = attributes.item(i);
+        if (caseInsensitive) {
+          itemName = itemName.toLowerCase();
+          itemValue = itemValue.toLowerCase();
+        }
         if (/:/.test(itemName)) {
           const [, itemNameLocalName] = itemName.split(':');
           if (astAttrName === itemNameLocalName) {
-            if (caseInsensitive) {
-              attrValues.push(itemValue.toLowerCase());
-            } else {
-              attrValues.push(itemValue);
-            }
-          }
-        } else if (astAttrName === itemName) {
-          if (caseInsensitive) {
-            attrValues.push(itemValue.toLowerCase());
-          } else {
             attrValues.push(itemValue);
           }
+        } else if (astAttrName === itemName) {
+          attrValues.push(itemValue);
         }
         i++;
       }
@@ -722,7 +718,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           break;
         }
         case '~=': {
-          if (typeof attrValue === 'string') {
+          if (attrValue && typeof attrValue === 'string') {
             for (const item of attrValues) {
               const arr = item.split(/\s+/);
               if (arr.includes(attrValue)) {

package/src/js/parser.js

@@ -82,6 +82,8 @@ const parseSelector = selector => {
   } catch (e) {
     if (e.message === '"]" is expected' && !selector.endsWith(']')) {
       res = parseSelector(`${selector}]`);
+    } else if (e.message === '")" is expected' && !selector.endsWith(')')) {
+      res = parseSelector(`${selector})`);
     } else {
       throw new DOMException(e.message, 'SyntaxError');
     }