@asamuzakjp/dom-selector 0.16.2 → 0.16.4

package/package.json

@@ -34,6 +34,7 @@
     "eslint-plugin-unicorn": "^47.0.0",
     "jsdom": "^22.1.0",
     "mocha": "^10.2.0",
+    "nwsapi": "^2.2.5",
     "sinon": "^15.1.0",
     "typescript": "^5.1.3"
   },
@@ -44,5 +45,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.16.2"
+  "version": "0.16.4"
 }

package/src/js/matcher.js

@@ -116,20 +116,20 @@ const isDescendant = (node = {}, root = {}) => {
 };
 
 /**
- * factorial
+ * sum of series
  * @param {number} n - number
- * @returns {number} - n!
+ * @returns {?number} - sum
  */
-const factorial = n => {
-  let f;
+const sumSeries = n => {
+  let s;
   if (Number.isInteger(n) && n >= 0) {
-    f = 1;
-    for (let i = n; i > 0; i--) {
-      f *= i;
+    s = 0;
+    for (let i = 1; i <= n; i++) {
+      s += i;
     }
   }
-  return f ?? null;
-};
+  return s ?? null;
+}
 
 /**
  * unescape selector
@@ -1682,11 +1682,19 @@ class Matcher {
   #warn;
 
   /**
-   * #list[{ branch[], skip }, { branch[], skip }]
-   * branch[twig{}, twig{}]
-   * twig{combo{}, leaves[]}
-   * leaves[leaf{}, leaf{}, leaf{}]
-   * #matrix[
+   * NOTE: #list[i] corresponds to #matrix[i]
+   * #list: [
+   *  { branch: branch[], skip: boolean },
+   *  { branch: branch[], skip: boolean }
+   * ]
+   * branch[]: [twig{}, twig{}]
+   * twig{}: {
+   *   combo: leaf{}|null,
+   *   leaves: leaves[]
+   * }
+   * leaves[]: [leaf{}, leaf{}, leaf{}]
+   * leaf{}: AST leaf
+   * #matrix: [
    *   [
    *     Set([node, node]),
    *     Set([node, node, node, node]),
@@ -1697,7 +1705,7 @@ class Matcher {
    *     Set([node, node])
    *   ]
    * ]
-   * matrix[i] maps to list[i]
+   * node: Element node
    */
 
   /**
@@ -2126,7 +2134,7 @@ class Matcher {
             } else if (matched.size) {
               const { combo: nextCombo } = branch[j];
               prevCombo = nextCombo;
-              prevNodes = nextNodes;
+              prevNodes = matched;
             } else {
               break;
             }
@@ -2168,13 +2176,13 @@ class Matcher {
     } else {
       n += document.getElementsByTagName('*').length;
     }
-    const f = factorial(nodes.size);
+    const s = sumSeries(nodes.size);
     const sorted = new Set();
-    if (f < n) {
+    if (s < n) {
       const items = [...nodes];
       let [node] = items;
       let l = items.length;
-      let pos = 0;
+      let index = 0;
       while (node) {
         if (node) {
           if (l === 1) {
@@ -2187,15 +2195,15 @@ class Matcher {
               if (posBit & DOCUMENT_POSITION_PRECEDING ||
                   posBit & DOCUMENT_POSITION_CONTAINS) {
                 node = nextNode;
-                pos = i;
+                index = i;
               }
             }
             sorted.add(node);
             if (range === 'all') {
-              items.splice(pos, 1);
+              items.splice(index, 1);
               [node] = items;
               l = items.length;
-              pos = 0;
+              index = 0;
             } else {
               break;
             }
@@ -2323,7 +2331,6 @@ module.exports = {
   collectNthChild,
   collectNthOfType,
   createSelectorForNode,
-  factorial,
   isContentEditable,
   isDescendant,
   isNamespaceDeclared,
@@ -2339,5 +2346,6 @@ module.exports = {
   matchPseudoElementSelector,
   matchTypeSelector,
   parseASTName,
+  sumSeries,
   unescapeSelector
 };