@asamuzakjp/dom-selector 0.15.6 → 0.15.8

package/package.json

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

package/src/js/matcher.js

@@ -528,7 +528,7 @@ const matchTypeSelector = (ast = {}, node = {}) => {
         throw new DOMException(`invalid selector ${astName}`, 'SyntaxError');
       }
     } else {
-      astPrefix = '';
+      astPrefix = '*';
       astNodeName = astName;
     }
     if (ownerDocument?.contentType === 'text/html') {
@@ -542,12 +542,19 @@ const matchTypeSelector = (ast = {}, node = {}) => {
       nodePrefix = prefix || '';
       nodeName = localName;
     }
-    if (astName === '*' || astName === '*|*' || astName === nodeName ||
-        (astName === '|*' && !nodePrefix) ||
-        (astPrefix === '*' && astNodeName === nodeName) ||
-        ((astPrefix === nodePrefix || (astPrefix === '' && !nodePrefix)) &&
-         (astNodeName === '*' || astNodeName === nodeName))) {
-      res = node;
+    if (astPrefix === '' && nodePrefix === '') {
+      if (node.namespaceURI === null &&
+          (astNodeName === '*' || astNodeName === nodeName)) {
+        res = node;
+      }
+    } else if (astPrefix === '*') {
+      if (astNodeName === '*' || astNodeName === nodeName) {
+        res = node;
+      }
+    } else if (astPrefix === nodePrefix) {
+      if (astNodeName === '*' || astNodeName === nodeName) {
+        res = node;
+      }
     }
   }
   return res ?? null;
@@ -605,51 +612,53 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
   if (typeof astFlags === 'string' && !/^[is]$/i.test(astFlags)) {
     throw new DOMException('invalid attribute selector', 'SyntaxError');
   }
-  const { attributes, nodeType } = node;
+  const { attributes, nodeType, ownerDocument } = node;
   let res;
   if (astType === ATTRIBUTE_SELECTOR && nodeType === ELEMENT_NODE &&
       attributes?.length) {
-    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;
           }
@@ -658,11 +667,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);
               }
             }
           }
@@ -672,22 +677,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++;
       }
@@ -724,7 +725,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)) {
@@ -736,7 +737,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           break;
         }
         case '|=': {
-          if (typeof attrValue === 'string') {
+          if (attrValue && typeof attrValue === 'string') {
             const item = attrValues.find(v =>
               (v === attrValue || v.startsWith(`${attrValue}-`))
             );
@@ -747,7 +748,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           break;
         }
         case '^=': {
-          if (typeof attrValue === 'string') {
+          if (attrValue && typeof attrValue === 'string') {
             const item = attrValues.find(v => v.startsWith(`${attrValue}`));
             if (item) {
               res = node;
@@ -756,7 +757,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           break;
         }
         case '$=': {
-          if (typeof attrValue === 'string') {
+          if (attrValue && typeof attrValue === 'string') {
             const item = attrValues.find(v => v.endsWith(`${attrValue}`));
             if (item) {
               res = node;
@@ -765,7 +766,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           break;
         }
         case '*=': {
-          if (typeof attrValue === 'string') {
+          if (attrValue && typeof attrValue === 'string') {
             const item = attrValues.find(v => v.includes(`${attrValue}`));
             if (item) {
               res = node;

package/src/js/parser.js

@@ -107,7 +107,7 @@ const walkAST = (ast = {}) => {
   walk(ast, opt);
   findAll(ast, (node, item, list) => {
     if (node.type === PSEUDO_CLASS_SELECTOR && PSEUDO_FUNC.test(node.name) &&
-        item) {
+        list && list.length) {
       for (const i of list) {
         const { children, name, type } = i;
         if (type === PSEUDO_CLASS_SELECTOR && PSEUDO_FUNC.test(name) &&