@asamuzakjp/dom-selector 0.19.3 → 0.19.4

package/package.json

@@ -20,24 +20,27 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "css-tree": "^2.3.1",
-    "is-potential-custom-element-name": "^1.0.1"
+    "is-potential-custom-element-name": "^1.0.1",
+    "xpath": "^0.0.32"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.1",
     "benchmark": "^2.1.4",
     "c8": "^8.0.0",
     "chai": "^4.3.7",
-    "eslint": "^8.43.0",
+    "css2xpath": "^0.0.3",
+    "eslint": "^8.44.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-jsdoc": "^46.3.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsdoc": "^46.4.3",
     "eslint-plugin-regexp": "^1.15.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "jsdom": "^22.1.0",
     "linkedom": "^0.14.26",
     "mocha": "^10.2.0",
-    "nwsapi": "^2.2.5",
+    "nwsapi": "^2.2.7",
     "sinon": "^15.2.0",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "bench": "node benchmark/benchmark.js",
@@ -46,5 +49,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.19.3"
+  "version": "0.19.4"
 }

package/src/js/matcher.js

@@ -4,6 +4,7 @@
 
 /* import */
 import isCustomElementName from 'is-potential-custom-element-name';
+import xpath from 'xpath';
 import { generateCSS, parseSelector, walkAST } from './parser.js';
 
 /* constants */
@@ -1875,12 +1876,12 @@ export class Matcher {
           while (refNode) {
             const bool = this._matchLeaves(leaves, refNode);
             if (bool) {
-              arr.unshift(refNode);
+              arr.push(refNode);
             }
             refNode = refNode.previousElementSibling;
           }
           if (arr.length) {
-            matched = new Set(arr);
+            matched = new Set(arr.reverse());
           }
           break;
         }
@@ -1901,12 +1902,66 @@ export class Matcher {
           while (refNode) {
             const bool = this._matchLeaves(leaves, refNode);
             if (bool) {
-              arr.unshift(refNode);
+              arr.push(refNode);
             }
             refNode = refNode.parentNode;
           }
           if (arr.length) {
-            matched = new Set(arr);
+            matched = new Set(arr.reverse());
+          }
+        }
+      }
+    }
+    return matched;
+  }
+
+  /**
+   * match combinator
+   * @param {object} combo - combinator
+   * @param {object} prevNodes - collection of Element nodes
+   * @param {object} nextNodes - collection of Element nodes
+   * @returns {object} - collection of matched nodes
+   */
+  _matchCombo(combo, prevNodes, nextNodes) {
+    const { name: comboName } = combo;
+    const matched = new Set();
+    for (const node of nextNodes) {
+      const { parentNode, previousElementSibling } = node;
+      switch (comboName) {
+        case '+': {
+          const refNode = previousElementSibling;
+          if (refNode && prevNodes.has(refNode)) {
+            matched.add(node);
+          }
+          break;
+        }
+        case '~': {
+          let refNode = previousElementSibling;
+          while (refNode) {
+            if (refNode && prevNodes.has(refNode)) {
+              matched.add(node);
+              break;
+            }
+            refNode = refNode.previousElementSibling;
+          }
+          break;
+        }
+        case '>': {
+          const refNode = parentNode;
+          if (refNode && prevNodes.has(refNode)) {
+            matched.add(node);
+          }
+          break;
+        }
+        case ' ':
+        default: {
+          let refNode = parentNode;
+          while (refNode) {
+            if (refNode && prevNodes.has(refNode)) {
+              matched.add(node);
+              break;
+            }
+            refNode = refNode.parentNode;
           }
         }
       }
@@ -2041,6 +2096,9 @@ export class Matcher {
                 break;
               }
             }
+          } else if (root.nodeType === DOCUMENT_NODE) {
+            const a = xpath.select(`//*[local-name()='${tagName}']`, root);
+            arr.push(...a);
           } else if (root.nodeType === DOCUMENT_FRAGMENT_NODE) {
             const walker = document.createTreeWalker(root, FILTER_SHOW_ELEMENT);
             let nextNode = walker.firstChild();
@@ -2210,60 +2268,6 @@ export class Matcher {
     ];
   }
 
-  /**
-   * match combinator
-   * @param {object} combo - combinator
-   * @param {object} prevNodes - collection of Element nodes
-   * @param {object} nextNodes - collection of Element nodes
-   * @returns {object} - collection of matched nodes
-   */
-  _matchCombo(combo, prevNodes, nextNodes) {
-    const { name: comboName } = combo;
-    const matched = new Set();
-    for (const node of nextNodes) {
-      const { parentNode, previousElementSibling } = node;
-      switch (comboName) {
-        case '+': {
-          const refNode = previousElementSibling;
-          if (refNode && prevNodes.has(refNode)) {
-            matched.add(node);
-          }
-          break;
-        }
-        case '~': {
-          let refNode = previousElementSibling;
-          while (refNode) {
-            if (refNode && prevNodes.has(refNode)) {
-              matched.add(node);
-              break;
-            }
-            refNode = refNode.previousElementSibling;
-          }
-          break;
-        }
-        case '>': {
-          const refNode = parentNode;
-          if (refNode && prevNodes.has(refNode)) {
-            matched.add(node);
-          }
-          break;
-        }
-        case ' ':
-        default: {
-          let refNode = parentNode;
-          while (refNode) {
-            if (refNode && prevNodes.has(refNode)) {
-              matched.add(node);
-              break;
-            }
-            refNode = refNode.parentNode;
-          }
-        }
-      }
-    }
-    return matched;
-  }
-
   /**
    * match nodes
    * @param {string} range - target range

package/types/js/matcher.d.ts

@@ -38,9 +38,9 @@ export class Matcher {
     _matchTwig(twig: object, node: object, opt?: {
         find?: string;
     }): object;
+    _matchCombo(combo: object, prevNodes: object, nextNodes: object): object;
     _findNodes(twig: object, range: string): object;
     _collectNodes(range: string): any[];
-    _matchCombo(combo: object, prevNodes: object, nextNodes: object): object;
     _matchNodes(range: string): object;
     _find(range: string): object;
     _sortNodes(nodes: object): any[];