@asamuzakjp/dom-selector 0.3.0 → 0.4.2

package/README.md

@@ -23,7 +23,7 @@ npm i @asamuzakjp/dom-selector
 ```javascript
 const {
   matches, closest, querySelector, querySelectorAll
-} = require('dom-selector');
+} = require('@asamuzakjp/dom-selector');
 ```
 
 <!-- Generated by documentation.js. Update this documentation by updating the source code. -->

package/package.json

@@ -19,7 +19,6 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "@types/css-tree": "^2.3.1",
-    "@types/node": "^20.1.0",
     "css-tree": "^2.3.1"
   },
   "devDependencies": {
@@ -27,8 +26,8 @@
     "chai": "^4.3.7",
     "eslint": "^8.40.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-jsdoc": "^43.2.0",
-    "eslint-plugin-regexp": "^1.14.0",
+    "eslint-plugin-jsdoc": "^44.2.0",
+    "eslint-plugin-regexp": "^1.15.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "jsdom": "^22.0.0",
     "mocha": "^10.2.0",
@@ -41,5 +40,5 @@
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
     "tsc": "npx tsc"
   },
-  "version": "0.3.0"
+  "version": "0.4.2"
 }

package/src/js/matcher.js

@@ -49,14 +49,16 @@ const collectNthChild = (node = {}, opt = {}) => {
           nth += (++n * a);
         }
       }
-      let i = 0;
-      while (i < l && nth < l) {
-        if (i === nth) {
-          const item = arr[i];
-          res.add(item);
-          nth += a;
+      if (nth >= 0) {
+        let i = 0;
+        while (i < l && nth < l) {
+          if (i === nth) {
+            const item = arr[i];
+            res.add(item);
+            nth += a;
+          }
+          i++;
         }
-        i++;
       }
     }
   }
@@ -109,19 +111,21 @@ const collectNthOfType = (node = {}, opt = {}) => {
           nth += a;
         }
       }
-      let i = 0;
-      let j = 0;
-      while (i < l && nth < l) {
-        const item = arr[i];
-        const { localName: itemLocalName, prefix: itemPrefix } = item;
-        if (itemLocalName === localName && itemPrefix === prefix) {
-          if (j === nth) {
-            res.add(item);
-            nth += a;
+      if (nth >= 0) {
+        let i = 0;
+        let j = 0;
+        while (i < l && nth < l) {
+          const item = arr[i];
+          const { localName: itemLocalName, prefix: itemPrefix } = item;
+          if (itemLocalName === localName && itemPrefix === prefix) {
+            if (j === nth) {
+              res.add(item);
+              nth += a;
+            }
+            j++;
           }
-          j++;
+          i++;
         }
-        i++;
       }
     }
   }
@@ -161,9 +165,7 @@ const matchTypeSelector = (ast = {}, node = {}) => {
     if (astName === '*' || astName === '*|*' || astName === nodeName ||
         (astName === '|*' && !nodePrefix) ||
         (astPrefix === '*' && astNodeName === nodeName) ||
-        (astPrefix === '' && !nodePrefix &&
-         (astNodeName === '*' || astNodeName === nodeName)) ||
-        (astPrefix === nodePrefix &&
+        ((astPrefix === nodePrefix || (astPrefix === '' && !nodePrefix)) &&
          (astNodeName === '*' || astNodeName === nodeName))) {
       res = node;
     }
@@ -999,6 +1001,11 @@ class Matcher {
               firstItem = items.shift();
               itemLeaves.push(item, firstItem);
             }
+            if (firstItem.type === PSEUDO_CLASS_SELECTOR &&
+                firstItem.name === 'has') {
+              matched = false;
+              break;
+            }
             const arr = this._matchCombinator(itemLeaves, node);
             if (arr.length) {
               matched = true;
@@ -1019,6 +1026,12 @@ class Matcher {
           let matched;
           for (const items of ast) {
             const item = items.shift();
+            // NOTE: according to MDN, :not() can not contain :not()
+            // but spec says nothing about that?
+            if (item.type === PSEUDO_CLASS_SELECTOR && item.name === 'not') {
+              matched = true;
+              break;
+            }
             const arr = this._matchArgumentLeaf(item, node);
             if (arr.length) {
               matched = true;