@asamuzakjp/dom-selector 0.15.8 → 0.15.10

package/package.json

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

package/src/js/matcher.js

@@ -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;
@@ -1864,14 +1865,36 @@ 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);
         }
+        const nodes = new Set(arr);
+        const iterator =
+          this.#document.createNodeIterator(this.#node, FILTER_SHOW_ELEMENT);
+        let nextNode = iterator.nextNode();
+        while (nextNode) {
+          if (nodes.has(nextNode)) {
+            res = nextNode;
+            break;
+          }
+          nextNode = iterator.nextNode();
+        }
       }
-      [res] = arr;
     } catch (e) {
       if (e instanceof DOMException && e.name === 'NotSupportedError') {
         if (this.#warn) {
@@ -1892,15 +1915,39 @@ 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);
         }
+        const nodes = new Set(arr);
+        const iterator =
+          this.#document.createNodeIterator(this.#node, FILTER_SHOW_ELEMENT);
+        let nextNode = iterator.nextNode();
+        while (nextNode) {
+          if (nodes.has(nextNode)) {
+            res.push(nextNode);
+            nodes.delete(nextNode);
+          }
+          if (!nodes.size) {
+            break;
+          }
+          nextNode = iterator.nextNode();
+        }
       }
-      const a = new Set(arr);
-      res.push(...a);
     } catch (e) {
       if (e instanceof DOMException && e.name === 'NotSupportedError') {
         if (this.#warn) {