@asamuzakjp/dom-selector 0.6.1 → 0.7.0

package/package.json

@@ -40,5 +40,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.6.1"
+  "version": "0.7.0"
 }

package/src/js/matcher.js

@@ -433,18 +433,20 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
         } else {
           attrValue = astAttrStringValue;
         }
+      } else if (astAttrStringValue === '') {
+        attrValue = astAttrStringValue;
       }
       switch (astMatcher) {
         case null:
           res = node;
           break;
         case '=':
-          if (attrValue && attrValues.includes(attrValue)) {
+          if (typeof attrValue === 'string' && attrValues.includes(attrValue)) {
             res = node;
           }
           break;
         case '~=':
-          if (attrValue) {
+          if (typeof attrValue === 'string') {
             for (const item of attrValues) {
               const arr = item.split(/\s+/);
               if (arr.includes(attrValue)) {
@@ -455,7 +457,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           }
           break;
         case '|=':
-          if (attrValue) {
+          if (typeof attrValue === 'string') {
             const item = attrValues.find(v =>
               (v === attrValue || v.startsWith(`${attrValue}-`))
             );
@@ -465,7 +467,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           }
           break;
         case '^=':
-          if (attrValue) {
+          if (typeof attrValue === 'string') {
             const item = attrValues.find(v => v.startsWith(`${attrValue}`));
             if (item) {
               res = node;
@@ -473,7 +475,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           }
           break;
         case '$=':
-          if (attrValue) {
+          if (typeof attrValue === 'string') {
             const item = attrValues.find(v => v.endsWith(`${attrValue}`));
             if (item) {
               res = node;
@@ -481,7 +483,7 @@ const matchAttributeSelector = (ast = {}, node = {}) => {
           }
           break;
         case '*=':
-          if (attrValue) {
+          if (typeof attrValue === 'string') {
             const item = attrValues.find(v => v.includes(`${attrValue}`));
             if (item) {
               res = node;
@@ -766,6 +768,11 @@ const matchPseudoClassSelector = (
             matched.push(node);
           }
           break;
+        case 'empty':
+          if (!node.hasChildNodes()) {
+            matched.push(node);
+          }
+          break;
         case 'first-child':
           if (node === node.parentNode.firstElementChild) {
             matched.push(node);
@@ -823,7 +830,6 @@ const matchPseudoClassSelector = (
         case 'blank':
         case 'buffering':
         case 'current':
-        case 'empty':
         case 'focus-visible':
         case 'fullscreen':
         case 'future':
@@ -1248,7 +1254,7 @@ class Matcher {
           if (nextNode) {
             matched.push(nextNode);
           }
-          nextNode = nextNode.nextElementSibling;
+          nextNode = nextNode?.nextElementSibling;
         }
       }
     }
@@ -1337,15 +1343,13 @@ class Matcher {
    */
   querySelector() {
     const arr = this._match(this.#ast, this.#node);
-    let res;
     if (arr.length) {
-      const [i, j] = arr;
-      if (i !== this.#node && i.nodeType === ELEMENT_NODE) {
-        res = i;
-      } else if (j) {
-        res = j;
+      const i = arr.findIndex(node => node === this.#node);
+      if (i >= 0) {
+        arr.splice(i, 1);
       }
     }
+    const [res] = arr;
     return res || null;
   }