@markuplint/selector 4.0.0-dev.28 → 4.0.0-rc.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2024 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/match-selector.js

@@ -186,42 +186,34 @@ el, selector) {
         tagSelector = el.localName;
         specificity[2] = 1;
     }
-    if (selector.attrName) {
-        const selectorAttrName = selector.attrName;
-        const matchedAttrNameList = [...el.attributes].map(attr => {
-            const attrName = attr.name;
-            const matchedAttrName = regexSelectorMatches(selectorAttrName, attrName, isPureHTMLElement(el));
+    const isPure = isPureHTMLElement(el);
+    if (selector.attrName || selector.attrValue) {
+        const matchedAttrList = [...el.attributes]
+            .map(attr => {
+            const matchedAttrName = regexSelectorMatches(selector.attrName, attr.name, isPure);
+            if (selector.attrName && !matchedAttrName) {
+                return null;
+            }
+            const matchedAttrValue = regexSelectorMatches(selector.attrValue, attr.value, isPure);
+            if (selector.attrValue && !matchedAttrValue) {
+                return null;
+            }
             if (matchedAttrName) {
                 delete matchedAttrName.$0;
-                data = {
-                    ...data,
-                    ...matchedAttrName,
-                };
-                specifiedAttr.set(attrName, '');
             }
-            return matchedAttrName;
-        });
-        if (!matchedAttrNameList.some(_ => !!_)) {
-            matched = false;
-        }
-    }
-    if (selector.attrValue) {
-        const selectorAttrValue = selector.attrValue;
-        const matchedAttrValueList = [...el.attributes].map(attr => {
-            const attrName = attr.name;
-            const attrValue = attr.value;
-            const matchedAttrValue = regexSelectorMatches(selectorAttrValue, attrValue, isPureHTMLElement(el));
             if (matchedAttrValue) {
                 delete matchedAttrValue.$0;
-                data = {
-                    ...data,
-                    ...matchedAttrValue,
-                };
-                specifiedAttr.set(attrName, attrValue);
             }
-            return matchedAttrValue;
-        });
-        if (!matchedAttrValueList.some(_ => !!_)) {
+            data = {
+                ...data,
+                ...matchedAttrName,
+                ...matchedAttrValue,
+            };
+            specifiedAttr.set(attr.name, matchedAttrValue ? attr.value : '');
+            return matchedAttrValue ?? matchedAttrName ?? null;
+        })
+            .filter((a) => !!a);
+        if (matchedAttrList.length === 0) {
             matched = false;
         }
     }

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

@@ -1,3 +1,3 @@
-export declare function regexSelectorMatches(reg: string, raw: string, ignoreCase: boolean): {
+export declare function regexSelectorMatches(reg: string | undefined, raw: string, ignoreCase: boolean): {
     [x: string]: string;
 } | null;

package/lib/regex-selector-matches.js

@@ -1,4 +1,7 @@
 export function regexSelectorMatches(reg, raw, ignoreCase) {
+    if (!reg) {
+        return null;
+    }
     const res = {};
     const pattern = toRegexp(reg);
     const regex = new RegExp(pattern instanceof RegExp ? pattern : `^${pattern.trim()}$`, ignoreCase ? 'i' : undefined);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "4.0.0-dev.28+0131de5e",
+	"version": "4.0.0-rc.0",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,15 +25,15 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "4.0.0-dev.28+0131de5e",
-		"@types/debug": "^4.1.10",
+		"@markuplint/ml-spec": "4.0.0-rc.0",
+		"@types/debug": "^4.1.12",
 		"debug": "^4.3.4",
-		"postcss-selector-parser": "^6.0.13",
-		"type-fest": "^4.5.0"
+		"postcss-selector-parser": "^6.0.15",
+		"type-fest": "^4.10.2"
 	},
 	"devDependencies": {
-		"@types/jsdom": "21.1.4",
-		"jsdom": "22.1.0"
+		"@types/jsdom": "21.1.6",
+		"jsdom": "24.0.0"
 	},
-	"gitHead": "0131de5ea9dd6d3fd5472d7b414b66644c758881"
+	"gitHead": "3fdeb45cb69ed52b3a215a7520cea1181601443f"
 }