@asamuzakjp/dom-selector 0.15.9 → 0.15.12

package/package.json

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

package/src/js/matcher.js

@@ -100,7 +100,7 @@ const isAttached = (node = {}) => {
     const root = ownerDocument.documentElement;
     if (node === root) {
       res = true;
-    } else {
+    } else if (root) {
       const posBit =
         node.compareDocumentPosition(root) & DOCUMENT_POSITION_CONTAINS;
       res = posBit;
@@ -1099,7 +1099,8 @@ const matchPseudoClassSelector = (
           break;
         }
         case 'target': {
-          if (docURL.hash && node.id && docURL.hash === `#${node.id}`) {
+          if (isAttached(node) && docURL.hash &&
+              node.id && docURL.hash === `#${node.id}`) {
             matched.push(node);
           }
           break;
@@ -1760,17 +1761,30 @@ class Matcher {
         const [{ nodes }] = twig;
         matched.push(...nodes);
       } else if (l > 1) {
-        const { nodes } = twig.reduce((prevItem, nextItem) => {
+        const prevItem = twig[0];
+        let j = 1;
+        while (j < l) {
           const { combo: prevCombo, nodes: prevNodes } = prevItem;
-          const { combo: nextCombo, nodes: nextNodes } = nextItem;
-          const matchedNodes =
-            matchCombinator(prevCombo, [...prevNodes], [...nextNodes]);
-          return {
-            combo: nextCombo,
-            nodes: new Set(matchedNodes)
-          };
-        });
-        matched.push(...nodes);
+          const { combo: nextCombo, nodes: nextNodes } = twig[j];
+          if (prevCombo && prevNodes.size && nextNodes.size) {
+            const nodes =
+              matchCombinator(prevCombo, [...prevNodes], [...nextNodes]);
+            if (nodes.length) {
+              if (j === l - 1) {
+                matched.push(...new Set(nodes));
+                break;
+              } else {
+                prevItem.combo = nextCombo;
+                prevItem.nodes = new Set(nodes);
+              }
+            } else {
+              break;
+            }
+          } else {
+            break;
+          }
+          j++;
+        }
       }
     }
     return matched;
@@ -1864,9 +1878,21 @@ class Matcher {
   querySelector() {
     let res;
     try {
-      const arr = this._find(this.#ast, this.#node);
+      let node;
+      if (isAttached(this.#node)) {
+        node = this.#document;
+      } else {
+        node = this.#node;
+        while (node) {
+          if (!node.parentNode) {
+            break;
+          }
+          node = node.parentNode;
+        }
+      }
+      const arr = this._find(this.#ast, node);
       if (arr.length) {
-        const i = arr.findIndex(node => node === this.#node);
+        const i = arr.findIndex(n => n === this.#node);
         if (i >= 0) {
           arr.splice(i, 1);
         }
@@ -1902,9 +1928,21 @@ class Matcher {
   querySelectorAll() {
     const res = [];
     try {
-      const arr = this._find(this.#ast, this.#node);
+      let node;
+      if (isAttached(this.#node)) {
+        node = this.#document;
+      } else {
+        node = this.#node;
+        while (node) {
+          if (!node.parentNode) {
+            break;
+          }
+          node = node.parentNode;
+        }
+      }
+      const arr = this._find(this.#ast, node);
       if (arr.length) {
-        const i = arr.findIndex(node => node === this.#node);
+        const i = arr.findIndex(n => n === this.#node);
         if (i >= 0) {
           arr.splice(i, 1);
         }