@markuplint/selector 4.1.0 → 4.2.0

package/lib/compare-specificity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compare-specificity.d.ts","sourceRoot":"","sources":["../src/compare-specificity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,cAehE"}

package/lib/create-selector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-selector.d.ts","sourceRoot":"","sources":["../src/create-selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,QAAQ,YAkBhE"}

package/lib/debug.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,eAAO,MAAM,GAAG,gBAAoB,CAAC;AAErC,wBAAgB,WAAW,SAU1B"}

package/lib/extended-selector/aria-pseudo-class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aria-pseudo-class.d.ts","sourceRoot":"","sources":["../../src/extended-selector/aria-pseudo-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD;;GAEG;AACH,wBAAgB,eAAe,cACb,MAAM,UAGjB,OAAO,KACT,cAAc,CAkClB"}

package/lib/extended-selector/aria-role-pseudo-class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aria-role-pseudo-class.d.ts","sourceRoot":"","sources":["../../src/extended-selector/aria-role-pseudo-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAIjE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,aACjC,MAAM,UAGjB,OAAO,KACT,cAAc,CAmBlB"}

package/lib/extended-selector/content-model-pseudo-class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-model-pseudo-class.d.ts","sourceRoot":"","sources":["../../src/extended-selector/content-model-pseudo-class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM9D,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,QAAQ,cACpC,MAAM,UAGlB,OAAO,KACT,cAAc,CAoDlB"}

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,cAAc,YAAY,CAAC"}

package/lib/invalid-selector-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"invalid-selector-error.d.ts","sourceRoot":"","sources":["../src/invalid-selector-error.ts"],"names":[],"mappings":"AAAA,qBAAa,oBAAqB,SAAQ,KAAK;IAC9C,IAAI,SAA0B;IAC9B,QAAQ,EAAE,MAAM,CAAC;gBACL,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAI9C"}

package/lib/is.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is.d.ts","sourceRoot":"","sources":["../src/is.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAExB,IAAI,EAAE,IAAI,GACR,IAAI,IAAI,OAAO,CAEjB;AAED,wBAAgB,0BAA0B,CAEzC,IAAI,EAAE,IAAI,GACR,IAAI,IAAI,OAAO,GAAG,aAAa,CAEjC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAEhC,EAAE,EAAE,OAAO,WAGX"}

package/lib/match-selector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"match-selector.d.ts","sourceRoot":"","sources":["../src/match-selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAA4D,MAAM,YAAY,CAAC;AAOvH,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAElE,KAAK,eAAe,GAAG;IACtB,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACxB,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;CACxB,CAAC;AAEF,wBAAgB,aAAa,CAE5B,EAAE,EAAE,IAAI,EACR,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,GAC1C,eAAe,CAuBjB"}

package/lib/regex-selector-matches.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"regex-selector-matches.d.ts","sourceRoot":"","sources":["../src/regex-selector-matches.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;;SAiB7F"}

package/lib/selector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../src/selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAcrF,KAAK,mBAAmB,GAAG,QAAQ,CAClC,MAAM,CACL,MAAM,EACN,CAAC,OAAO,EAAE,MAAM,KAAK,CAEpB,EAAE,EAAE,OAAO,KACP,cAAc,CACnB,CACD,CAAC;AAEF,qBAAa,QAAQ;;gBAGR,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,mBAAwB;IAIhE,KAAK,CAEJ,EAAE,EAAE,IAAI,EAER,KAAK,CAAC,EAAE,UAAU,GAAG,IAAI,GACvB,WAAW,GAAG,KAAK;IAWtB,MAAM,CAEL,EAAE,EAAE,IAAI,EAER,KAAK,CAAC,EAAE,UAAU,GAAG,IAAI;CAK1B"}

package/lib/selector.js

@@ -80,11 +80,17 @@ class Ruleset {
     el, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     scope) {
-        coreLog('<%s> (%s)', isElement(el) ? el.localName : el.nodeName, scope ? (isElement(scope) ? scope.localName : scope.nodeName) : null);
+        if (coreLog.enabled) {
+            coreLog('<%s> (%s)', isElement(el) ? el.localName : el.nodeName, scope ? (isElement(scope) ? scope.localName : scope.nodeName) : null);
+        }
         return __classPrivateFieldGet(this, _Ruleset_selectorGroup, "f").map(selector => {
-            selLog('"%s"', selector.selector);
+            if (selLog.enabled) {
+                selLog('"%s"', selector.selector);
+            }
             const res = selector.match(el, scope);
-            resLog('%s "%s" => %o', isElement(el) ? el.localName : el.nodeName, selector.selector, res);
+            if (resLog.enabled) {
+                resLog('%s "%s" => %o', isElement(el) ? el.localName : el.nodeName, selector.selector, res);
+            }
             return res;
         });
     }
@@ -423,6 +429,14 @@ class SelectorTarget {
             }
         }
     }
+    /**
+     * Matching is executed in this order: ID > tag name > classes > attributes > pseudo-elements.
+     * If any of the selectors are unmatched, the rest of the selectors is skipped for better performance.
+     *
+     * @param el
+     * @param scope
+     * @private
+     */
     _matchWithoutCombineChecking(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     el, 
@@ -464,32 +478,11 @@ class SelectorTarget {
         if (!__classPrivateFieldGet(this, _SelectorTarget_isAdded, "f") && !isScope(el, scope)) {
             matched = false;
         }
-        if (!this.id.every(id => id.value === el.id)) {
+        if (matched && !this.id.every(id => id.value === el.id)) {
             matched = false;
         }
         specificity[0] += this.id.length;
-        if (!this.class.every(className => el.classList.contains(className.value))) {
-            matched = false;
-        }
-        specificity[1] += this.class.length;
-        if (!this.attr.every(attr => attrMatch(attr, el))) {
-            matched = false;
-        }
-        specificity[1] += this.attr.length;
-        for (const pseudo of this.pseudo) {
-            const pseudoRes = pseudoMatch(pseudo, el, scope, __classPrivateFieldGet(this, _SelectorTarget_extended, "f"), this.depth);
-            specificity[0] += pseudoRes.specificity[0];
-            specificity[1] += pseudoRes.specificity[1];
-            specificity[2] += pseudoRes.specificity[2];
-            if (pseudoRes.matched) {
-                has.push(...pseudoRes.has);
-            }
-            else {
-                not.push(...(pseudoRes.not ?? []));
-                matched = false;
-            }
-        }
-        if (this.tag && this.tag.type === 'tag') {
+        if (matched && this.tag && this.tag.type === 'tag') {
             specificity[2] += 1;
             let a = this.tag.value;
             let b = el.localName;
@@ -501,6 +494,29 @@ class SelectorTarget {
                 matched = false;
             }
         }
+        if (matched && !this.class.every(className => el.classList.contains(className.value))) {
+            matched = false;
+        }
+        specificity[1] += this.class.length;
+        if (matched && !this.attr.every(attr => attrMatch(attr, el))) {
+            matched = false;
+        }
+        specificity[1] += this.attr.length;
+        if (matched) {
+            for (const pseudo of this.pseudo) {
+                const pseudoRes = pseudoMatch(pseudo, el, scope, __classPrivateFieldGet(this, _SelectorTarget_extended, "f"), this.depth);
+                specificity[0] += pseudoRes.specificity[0];
+                specificity[1] += pseudoRes.specificity[1];
+                specificity[2] += pseudoRes.specificity[2];
+                if (pseudoRes.matched) {
+                    has.push(...pseudoRes.has);
+                }
+                else {
+                    not.push(...(pseudoRes.not ?? []));
+                    matched = false;
+                }
+            }
+        }
         if (matched) {
             return {
                 specificity,

package/lib/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,uBAAuB,CAAC;AAE7E,MAAM,MAAM,qBAAqB,GAAG;IACnC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IAC5C,QAAQ,CAAC,GAAG,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,+BAA+B,GAAG;IAC7D,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtB,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;KAC7C,GAAG,aAAa,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpF,MAAM,MAAM,+BAA+B,GAAG;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "4.1.0",
+	"version": "4.2.0",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,7 +25,7 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "4.0.1",
+		"@markuplint/ml-spec": "4.1.0",
 		"@types/debug": "^4.1.12",
 		"debug": "^4.3.4",
 		"postcss-selector-parser": "^6.0.15",
@@ -35,5 +35,5 @@
 		"@types/jsdom": "21.1.6",
 		"jsdom": "24.0.0"
 	},
-	"gitHead": "b9817c30c2df71faa866e3b3fe286afa499deede"
+	"gitHead": "d5d99c5d84b676f8b2bb84684533ed74cf2f1da6"
 }