@asamuzakjp/dom-selector 0.15.10 → 0.15.13

package/package.json

@@ -24,11 +24,11 @@
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.1",
-    "c8": "^7.13.0",
+    "c8": "^7.14.0",
     "chai": "^4.3.7",
     "eslint": "^8.41.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-jsdoc": "^44.2.7",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-jsdoc": "^46.0.0",
     "eslint-plugin-regexp": "^1.15.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "jsdom": "^22.1.0",
@@ -42,5 +42,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.15.10"
+  "version": "0.15.13"
 }

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;
@@ -1735,43 +1735,68 @@ class Matcher {
    * @returns {Array.<object|undefined>} - collection of matched nodes
    */
   _getMatchedNodes(branch = [], node = {}) {
-    const matched = [];
     const twig = groupASTLeaves(branch);
     const l = twig.length;
+    const matched = [];
     if (l) {
+      const lastIndex = l - 1;
       const iterator =
         this.#document.createNodeIterator(node, FILTER_SHOW_ELEMENT);
       let nextNode = iterator.nextNode();
       while (nextNode) {
         let i = 0;
-        while (i < l) {
-          const { leaves } = twig[i];
+        if (nextNode.children.length === 0) {
+          const { leaves } = twig[lastIndex];
           const bool = leaves.every(leaf => {
             const arr = this._match(leaf, nextNode);
             return arr.includes(nextNode);
           });
           if (bool) {
-            twig[i].nodes.add(nextNode);
+            twig[lastIndex].nodes.add(nextNode);
+          }
+        } else {
+          while (i < l) {
+            const { leaves } = twig[i];
+            const bool = leaves.every(leaf => {
+              const arr = this._match(leaf, nextNode);
+              return arr.includes(nextNode);
+            });
+            if (bool) {
+              twig[i].nodes.add(nextNode);
+            }
+            i++;
           }
-          i++;
         }
         nextNode = iterator.nextNode();
       }
-      if (l === 1) {
+      if (lastIndex === 0) {
         const [{ nodes }] = twig;
         matched.push(...nodes);
-      } else if (l > 1) {
-        const { nodes } = twig.reduce((prevItem, nextItem) => {
+      } else if (lastIndex) {
+        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 === lastIndex) {
+                matched.push(...new Set(nodes));
+                break;
+              } else {
+                prevItem.combo = nextCombo;
+                prevItem.nodes = new Set(nodes);
+              }
+            } else {
+              break;
+            }
+          } else {
+            break;
+          }
+          j++;
+        }
       }
     }
     return matched;