@projectwallace/css-analyzer 9.6.0 → 9.6.2

package/dist/index.js

@@ -1,89 +1,10 @@
-import { n as isSupportsBrowserhack, t as isMediaBrowserhack } from "./atrules-CskmpIdJ.js";
+import { n as isSupportsBrowserhack, t as isMediaBrowserhack } from "./atrules-Bnb0wvNR.js";
 import { t as KeywordSet } from "./keyword-set-qSyAMR9o.js";
 import { n as unquote, t as endsWith } from "./string-utils-C97yyuqE.js";
-import { a as getComplexity, i as getCombinators, n as calculateForAST, o as isAccessibility, s as isPrefixed, t as calculate } from "./specificity-BKdu6JZr.js";
-import { a as colorKeywords, i as colorFunctions, n as isValueReset, o as namedColors, r as keywords, s as systemColors, t as isIe9Hack } from "./browserhacks-Ckz2JiOQ.js";
+import { a as getComplexity, i as getCombinators, n as calculateForAST, o as isAccessibility, s as isPrefixed, t as calculate } from "./specificity-DKo9lvB5.js";
+import { a as keywords, c as namedColors, i as isValueReset, l as systemColors, n as SYSTEM_FONTS, o as colorFunctions, r as destructure, s as colorKeywords, t as isIe9Hack } from "./browserhacks-BtVwVqdU.js";
 import { a as shorthand_properties, i as isHack, n as basename, r as border_radius_properties, t as SPACING_RESET_PROPERTIES } from "./property-utils-B3n9KkA9.js";
-import { ATTRIBUTE_SELECTOR, AT_RULE, BLOCK, CONTAINER_QUERY, DECLARATION, DIMENSION, FUNCTION, HASH, IDENTIFIER, LAYER_NAME, MEDIA_FEATURE, NUMBER, OPERATOR, PSEUDO_CLASS_SELECTOR, PSEUDO_ELEMENT_SELECTOR, SELECTOR, SELECTOR_LIST, SKIP, STYLE_RULE, SUPPORTS_QUERY, TYPE_SELECTOR, URL, is_custom, is_vendor_prefixed, parse, str_starts_with, walk } from "@projectwallace/css-parser";
-//#region src/values/destructure-font-shorthand.ts
-const SYSTEM_FONTS = new KeywordSet([
-	"caption",
-	"icon",
-	"menu",
-	"message-box",
-	"small-caption",
-	"status-bar"
-]);
-const SIZE_KEYWORDS = new KeywordSet([
-	"xx-small",
-	"x-small",
-	"small",
-	"medium",
-	"large",
-	"x-large",
-	"xx-large",
-	"xxx-large",
-	"smaller",
-	"larger"
-]);
-const COMMA = 44;
-const SLASH = 47;
-function destructure(value, cb) {
-	let font_family = [void 0, void 0];
-	let font_size;
-	let line_height;
-	if (value.first_child.type === FUNCTION && value.first_child.name?.toLowerCase() === "var") return null;
-	let prev;
-	for (let node of value.children) {
-		let next = node.next_sibling;
-		if (node.type === IDENTIFIER && keywords.has(node.name)) cb({
-			type: "keyword",
-			value: node.name
-		});
-		if (next && next.type === OPERATOR && next.text.charCodeAt(0) === SLASH) {
-			font_size = node.text;
-			prev = node;
-			continue;
-		}
-		if (prev?.type === OPERATOR && prev.text.charCodeAt(0) === SLASH) {
-			line_height = node.text;
-			prev = node;
-			continue;
-		}
-		if (next?.type === OPERATOR && next.text.charCodeAt(0) === COMMA && !font_family[0]) {
-			font_family[0] = node;
-			if (!font_size && prev) font_size = prev.text;
-			prev = node;
-			continue;
-		}
-		if (node.next_sibling === null) {
-			font_family[1] = node;
-			if (!font_size && !font_family[0] && prev) font_size = prev.text;
-			prev = node;
-			continue;
-		}
-		if (node.type === NUMBER) {
-			prev = node;
-			continue;
-		}
-		if (node.type === IDENTIFIER) {
-			let name = node.name;
-			if (name && SIZE_KEYWORDS.has(name)) {
-				font_size = name;
-				prev = node;
-				continue;
-			}
-		}
-		prev = node;
-	}
-	let family = font_family[0] || font_family[1] ? value.text.substring((font_family?.[0] || font_family?.[1] || { start: value.start }).start - value.start, font_family[1] ? font_family[1].end - value.start : value.text.length) : null;
-	return {
-		font_size,
-		line_height,
-		font_family: family
-	};
-}
-//#endregion
+import { SKIP, is_atrule, is_atrule_prelude, is_attribute_selector, is_container_query, is_custom, is_declaration, is_dimension, is_function, is_hash, is_identifier, is_layer_name, is_media_feature, is_operator, is_pseudo_class_selector, is_pseudo_element_selector, is_raw, is_rule, is_selector, is_selector_list, is_supports_query, is_type_selector, is_url, is_vendor_prefixed, parse, str_starts_with, walk } from "@projectwallace/css-parser";
 //#region src/values/animations.ts
 const TIMING_KEYWORDS = new KeywordSet([
 	"linear",
@@ -95,38 +16,35 @@ const TIMING_KEYWORDS = new KeywordSet([
 	"step-end"
 ]);
 const TIMING_FUNCTION_VALUES = new KeywordSet(["cubic-bezier", "steps"]);
-function analyzeAnimation(children, cb) {
+function analyzeAnimation(value, cb) {
 	let durationFound = false;
-	for (let child of children) {
-		let type = child.type;
-		let name = child.name;
-		if (type === OPERATOR) durationFound = false;
-		else if (type === DIMENSION && durationFound === false) {
-			durationFound = true;
-			cb({
-				type: "duration",
-				value: child
-			});
-		} else if (type === IDENTIFIER && name) {
-			if (TIMING_KEYWORDS.has(name)) cb({
-				type: "fn",
-				value: child
-			});
-			else if (keywords.has(name)) cb({
-				type: "keyword",
-				value: child
-			});
-		} else if (type === FUNCTION && name && TIMING_FUNCTION_VALUES.has(name)) cb({
+	for (let node of value) if (is_operator(node)) durationFound = false;
+	else if (is_dimension(node) && durationFound === false) {
+		durationFound = true;
+		cb({
+			type: "duration",
+			value: node
+		});
+	} else if (is_identifier(node)) {
+		if (TIMING_KEYWORDS.has(node.name)) cb({
 			type: "fn",
-			value: child
+			value: node
 		});
-	}
+		else if (keywords.has(node.name)) cb({
+			type: "keyword",
+			value: node
+		});
+	} else if (is_function(node) && TIMING_FUNCTION_VALUES.has(node.name)) cb({
+		type: "fn",
+		value: node
+	});
 }
 //#endregion
 //#region src/values/vendor-prefix.ts
-function isValuePrefixed(node, on_value) {
-	walk(node, function(child) {
-		if (child.is_vendor_prefixed) on_value(child.name || child.text);
+function isValuePrefixed(value, on_value) {
+	walk(value, function(node) {
+		if (node.is_vendor_prefixed) if (is_identifier(node) || is_function(node)) on_value(node.name);
+		else on_value(node.text);
 	});
 }
 //#endregion
@@ -320,7 +238,7 @@ function getEmbedType(embed) {
 //#region src/vendor-prefix.ts
 /**
 * Kept for backwards compatibility
-* @deprecated
+* @deprecated Will be removed in next major version
 * */
 function hasVendorPrefix(keyword) {
 	return is_vendor_prefixed(keyword);
@@ -449,7 +367,7 @@ function analyzeInternal(css, options, useLocations) {
 	walk(ast, (node, depth) => {
 		if (keyframesDepth >= 0 && depth <= keyframesDepth) keyframesDepth = -1;
 		let inKeyframes = keyframesDepth >= 0 && depth > keyframesDepth;
-		if (node.type === AT_RULE) {
+		if (is_atrule(node)) {
 			let atruleLoc = toLoc(node);
 			atruleNesting.push(depth);
 			uniqueAtruleNesting.p(depth, atruleLoc);
@@ -458,12 +376,12 @@ function analyzeInternal(css, options, useLocations) {
 			if (normalized_name === "font-face") {
 				let descriptors = Object.create(null);
 				if (useLocations) fontfaces_with_loc.p(node.start, toLoc(node));
-				let block = node.children.find((child) => child.type === BLOCK);
-				for (let descriptor of block?.children || []) if (descriptor.type === DECLARATION && descriptor.value) descriptors[descriptor.property] = descriptor.value.text;
+				let block = node.block;
+				for (let descriptor of block?.children || []) if (is_declaration(descriptor) && descriptor.value) descriptors[descriptor.property] = descriptor.value.text;
 				atRuleComplexities.push(1);
 				fontfaces.push(descriptors);
 			}
-			if (node.prelude === null || node.prelude === void 0) {
+			if (!node.has_prelude) {
 				if (normalized_name === "layer") {
 					layers.p("<anonymous>", toLoc(node));
 					atRuleComplexities.push(2);
@@ -493,14 +411,16 @@ function analyzeInternal(css, options, useLocations) {
 				} else if (normalized_name === "layer") for (let layer of node.prelude.text.split(",").map((s) => s.trim())) layers.p(layer, toLoc(node));
 				else if (normalized_name === "import") {
 					imports.p(node.prelude.text, toLoc(node));
-					if (node.prelude.has_children) {
-						for (let child of node.prelude) if (child.type === SUPPORTS_QUERY && typeof child.value === "string") supports.p(child.value, toLoc(child));
-						else if (child.type === LAYER_NAME && typeof child.value === "string") layers.p(child.value, toLoc(child));
+					if (is_atrule_prelude(node.prelude) && node.prelude.has_children) {
+						for (let child of node.prelude) if (is_supports_query(child)) supports.p(child.value, toLoc(child));
+						else if (is_layer_name(child) && child.value) layers.p(child.value, toLoc(child));
 					}
 				} else if (normalized_name === "container") {
-					containers.p(node.prelude.text, toLoc(node));
-					if (node.prelude.first_child?.type === CONTAINER_QUERY) {
-						if (node.prelude.first_child.first_child?.type === IDENTIFIER) containerNames.p(node.prelude.first_child.first_child.text, toLoc(node));
+					let { prelude } = node;
+					containers.p(prelude.text, toLoc(node));
+					if (is_atrule_prelude(prelude) && is_container_query(prelude.first_child)) {
+						let container_name = prelude.first_child.first_child;
+						if (container_name && is_identifier(container_name)) containerNames.p(container_name.text, toLoc(node));
 					}
 				} else if (normalized_name === "property") registeredProperties.p(node.prelude.text, toLoc(node));
 				else if (normalized_name === "function") {
@@ -511,19 +431,19 @@ function analyzeInternal(css, options, useLocations) {
 				else if (normalized_name === "scope") scopes.p(node.prelude.text, toLoc(node));
 				atRuleComplexities.push(complexity);
 			}
-		} else if (node.type === STYLE_RULE) if (inKeyframes && node.prelude) {
-			if (node.prelude.type === SELECTOR_LIST && node.prelude.children.length > 0) for (let keyframe_selector of node.prelude.children) keyframeSelectors.p(keyframe_selector.text, toLoc(keyframe_selector));
+		} else if (is_rule(node)) if (inKeyframes && node.has_prelude) {
+			if (is_selector_list(node.prelude) && node.prelude.child_count > 0) for (let keyframe_selector of node.prelude) keyframeSelectors.p(keyframe_selector.text, toLoc(keyframe_selector));
 		} else {
 			totalRules++;
 			if (node.block?.is_empty) emptyRules++;
 			let numSelectors = 0;
 			let numDeclarations = 0;
 			let loc = toLoc(node);
-			if (node.prelude) {
-				for (const selector of node.prelude.children) if (selector.type === SELECTOR) numSelectors++;
+			if (node.has_prelude && is_selector_list(node.prelude)) {
+				for (const selector of node.prelude) if (is_selector(selector)) numSelectors++;
 			}
 			if (node.block) {
-				for (const declaration of node.block.children) if (declaration.type === DECLARATION) numDeclarations++;
+				for (const declaration of node.block) if (is_declaration(declaration)) numDeclarations++;
 			}
 			ruleSizes.push(numSelectors + numDeclarations);
 			uniqueRuleSize.p(numSelectors + numDeclarations, loc);
@@ -534,7 +454,7 @@ function analyzeInternal(css, options, useLocations) {
 			ruleNesting.push(depth);
 			uniqueRuleNesting.p(depth, loc);
 		}
-		else if (node.type === SELECTOR) {
+		else if (is_selector(node)) {
 			if (inKeyframes) return SKIP;
 			let loc = toLoc(node);
 			selectorNesting.push(depth > 0 ? depth - 1 : 0);
@@ -550,10 +470,10 @@ function analyzeInternal(css, options, useLocations) {
 				a11y.p(a11y_selector, loc);
 			});
 			walk(node, (child) => {
-				if (child.type === ATTRIBUTE_SELECTOR) attributeSelectors.p(child.name?.toLowerCase() ?? "", loc);
-				else if (child.type === TYPE_SELECTOR && child.name?.includes("-")) customElementSelectors.p(child.name.toLowerCase(), loc);
-				else if (child.type === PSEUDO_CLASS_SELECTOR) pseudoClasses.p(child.name?.toLowerCase() ?? "", loc);
-				else if (child.type === PSEUDO_ELEMENT_SELECTOR) pseudoElements.p(child.name?.toLowerCase() ?? "", loc);
+				if (is_attribute_selector(child)) attributeSelectors.p(child.name.toLowerCase(), loc);
+				else if (is_type_selector(child) && !child.name.startsWith("--") && child.name.includes("-")) customElementSelectors.p(child.name.toLowerCase(), loc);
+				else if (is_pseudo_class_selector(child)) pseudoClasses.p(child.name.toLowerCase(), loc);
+				else if (is_pseudo_element_selector(child)) pseudoElements.p(child.name.toLowerCase(), loc);
 			});
 			getCombinators(node, (combinator) => {
 				let name = combinator.name.trim() === "" ? " " : combinator.name;
@@ -572,9 +492,10 @@ function analyzeInternal(css, options, useLocations) {
 			specificities.push(specificity);
 			if (sa > 0) ids.p(node.text, loc);
 			return SKIP;
-		} else if (node.type === DECLARATION) {
+		} else if (is_declaration(node)) {
 			totalDeclarations++;
-			uniqueDeclarations.add(node.text);
+			let declaration = node.text;
+			uniqueDeclarations.add(declaration);
 			let loc = toLoc(node);
 			let declarationDepth = depth > 0 ? depth - 1 : 0;
 			declarationNesting.push(declarationDepth);
@@ -582,7 +503,7 @@ function analyzeInternal(css, options, useLocations) {
 			let complexity = 1;
 			if (node.is_important) {
 				complexity++;
-				if (!node.text.toLowerCase().includes("!important")) valueBrowserhacks.p("!ie", toLoc(node.value));
+				if (!declaration.toLowerCase().includes("!important")) valueBrowserhacks.p("!ie", toLoc(node.value));
 				if (inKeyframes) {
 					importantsInKeyframes++;
 					complexity++;
@@ -610,6 +531,8 @@ function analyzeInternal(css, options, useLocations) {
 			if (shorthand_properties.has(normalizedProperty)) shorthands.p(property, propertyLoc);
 			{
 				let value = node.value;
+				if (!value) return;
+				if (is_raw(value)) return;
 				let { text } = value;
 				let valueLoc = toLoc(value);
 				let complexity = 1;
@@ -638,8 +561,8 @@ function analyzeInternal(css, options, useLocations) {
 					return SKIP;
 				} else if (normalizedProperty === "font") {
 					if (!SYSTEM_FONTS.has(text)) {
-						let result = destructure(value, function(item) {
-							if (item.type === "keyword") valueKeywords.p(item.value.toLowerCase(), valueLoc);
+						let result = destructure(value, function(keyword) {
+							valueKeywords.p(keyword.toLowerCase(), valueLoc);
 						});
 						if (!result) return SKIP;
 						let { font_size, line_height, font_family } = result;
@@ -661,91 +584,86 @@ function analyzeInternal(css, options, useLocations) {
 					if (normalized.includes("var(")) lineHeights.p(text, valueLoc);
 					else lineHeights.p(normalized, valueLoc);
 				} else if (normalizedProperty === "transition" || normalizedProperty === "animation") {
-					analyzeAnimation(value.children, function(item) {
+					analyzeAnimation(value, function(item) {
 						if (item.type === "fn") timingFunctions.p(item.value.text.toLowerCase(), valueLoc);
 						else if (item.type === "duration") durations.p(item.value.text.toLowerCase(), valueLoc);
 						else if (item.type === "keyword") valueKeywords.p(item.value.text.toLowerCase(), valueLoc);
 					});
 					return SKIP;
 				} else if (normalizedProperty === "animation-duration" || normalizedProperty === "transition-duration") {
-					for (let child of value.children) if (child.type !== OPERATOR) {
+					for (let child of value.children) if (!is_operator(child)) {
 						let text = child.text;
 						if (/var\(/i.test(text)) durations.p(text, valueLoc);
 						else durations.p(text.toLowerCase(), valueLoc);
 					}
 				} else if (normalizedProperty === "transition-timing-function" || normalizedProperty === "animation-timing-function") {
-					for (let child of value.children) if (child.type !== OPERATOR) timingFunctions.p(child.text, valueLoc);
+					for (let child of value.children) if (!is_operator(child)) timingFunctions.p(child.text, valueLoc);
 				} else if (normalizedProperty === "container-name") containerNames.p(text, valueLoc);
 				else if (normalizedProperty === "container") {
-					if (value.first_child?.type === IDENTIFIER) containerNames.p(value.first_child.text, valueLoc);
+					if (value.first_child && is_identifier(value.first_child)) containerNames.p(value.first_child.text, valueLoc);
 				} else if (border_radius_properties.has(normalizedProperty)) borderRadiuses.push(text, property, valueLoc);
 				else if (normalizedProperty === "text-shadow") textShadows.p(text, valueLoc);
 				else if (normalizedProperty === "box-shadow") boxShadows.p(text, valueLoc);
 				let valueHasIe9Hack = isIe9Hack(value);
 				walk(value, (valueNode) => {
-					switch (valueNode.type) {
-						case DIMENSION: {
-							let unit = valueNode.unit?.toLowerCase() ?? "";
-							let loc = toLoc(valueNode);
-							units.push(unit, property, loc);
-							return SKIP;
+					if (is_dimension(valueNode)) {
+						let unit = valueNode.unit.toLowerCase();
+						let loc = toLoc(valueNode);
+						units.push(unit, property, loc);
+						return SKIP;
+					}
+					if (is_hash(valueNode)) {
+						let hashText = valueNode.text;
+						if (!hashText || !hashText.startsWith("#")) return SKIP;
+						let hashValue = hashText.toLowerCase();
+						if (valueHasIe9Hack && !hashValue.endsWith("\\9")) hashValue = hashValue + "\\9";
+						let hexLength = hashValue.length - 1;
+						if (endsWith("\\9", hashValue)) hexLength = hexLength - 2;
+						let hashLoc = toLoc(valueNode);
+						colors.push(hashValue, property, hashLoc);
+						colorFormats.p(`hex` + hexLength, hashLoc);
+						return SKIP;
+					}
+					if (is_identifier(valueNode)) {
+						let identifierText = valueNode.text;
+						let identifierLoc = toLoc(valueNode);
+						if (normalizedProperty === "font" || normalizedProperty === "font-family") return SKIP;
+						if (keywords.has(identifierText)) valueKeywords.p(identifierText.toLowerCase(), identifierLoc);
+						let nodeLen = identifierText.length;
+						if (nodeLen > 20 || nodeLen < 3) return SKIP;
+						if (colorKeywords.has(identifierText)) {
+							let colorKeyword = identifierText.toLowerCase();
+							colors.push(colorKeyword, property, identifierLoc);
+							colorFormats.p(colorKeyword, identifierLoc);
+							return;
 						}
-						case HASH: {
-							let hashText = valueNode.text;
-							if (!hashText || !hashText.startsWith("#")) return SKIP;
-							let hashValue = hashText.toLowerCase();
-							if (valueHasIe9Hack && !hashValue.endsWith("\\9")) hashValue = hashValue + "\\9";
-							let hexLength = hashValue.length - 1;
-							if (endsWith("\\9", hashValue)) hexLength = hexLength - 2;
-							let hashLoc = toLoc(valueNode);
-							colors.push(hashValue, property, hashLoc);
-							colorFormats.p(`hex` + hexLength, hashLoc);
-							return SKIP;
+						if (namedColors.has(identifierText)) {
+							colors.push(identifierText.toLowerCase(), property, identifierLoc);
+							colorFormats.p("named", identifierLoc);
+							return;
 						}
-						case IDENTIFIER: {
-							let identifierText = valueNode.text;
-							let identifierLoc = toLoc(valueNode);
-							if (normalizedProperty === "font" || normalizedProperty === "font-family") return SKIP;
-							if (keywords.has(identifierText)) valueKeywords.p(identifierText.toLowerCase(), identifierLoc);
-							let nodeLen = identifierText.length;
-							if (nodeLen > 20 || nodeLen < 3) return SKIP;
-							if (colorKeywords.has(identifierText)) {
-								let colorKeyword = identifierText.toLowerCase();
-								colors.push(colorKeyword, property, identifierLoc);
-								colorFormats.p(colorKeyword, identifierLoc);
-								return;
-							}
-							if (namedColors.has(identifierText)) {
-								colors.push(identifierText.toLowerCase(), property, identifierLoc);
-								colorFormats.p("named", identifierLoc);
-								return;
-							}
-							if (systemColors.has(identifierText)) {
-								colors.push(identifierText.toLowerCase(), property, identifierLoc);
-								colorFormats.p("system", identifierLoc);
-								return;
-							}
-							return SKIP;
+						if (systemColors.has(identifierText)) {
+							colors.push(identifierText.toLowerCase(), property, identifierLoc);
+							colorFormats.p("system", identifierLoc);
+							return;
 						}
-						case FUNCTION: {
-							let funcName = valueNode.name;
-							let funcLoc = toLoc(valueNode);
-							if (colorFunctions.has(funcName)) {
-								colors.push(valueNode.text, property, funcLoc);
-								colorFormats.p(funcName.toLowerCase(), funcLoc);
-								return;
-							}
-							if (endsWith("gradient", funcName)) {
-								gradients.p(valueNode.text, funcLoc);
-								return;
-							}
+						return SKIP;
+					}
+					if (is_function(valueNode)) {
+						let funcName = valueNode.name;
+						let funcLoc = toLoc(valueNode);
+						if (colorFunctions.has(funcName)) {
+							colors.push(valueNode.text, property, funcLoc);
+							colorFormats.p(funcName.toLowerCase(), funcLoc);
+							return;
 						}
+						if (endsWith("gradient", funcName)) gradients.p(valueNode.text, funcLoc);
 					}
 				});
 			}
-		} else if (node.type === URL) {
+		} else if (is_url(node)) {
 			let { value } = node;
-			let embed = unquote(value || "");
+			let embed = unquote(value ?? "");
 			if (str_starts_with(embed, "data:")) {
 				let size = embed.length;
 				let type = getEmbedType(embed);
@@ -772,8 +690,8 @@ function analyzeInternal(css, options, useLocations) {
 					embedTypes.unique.set(type, item);
 				}
 			}
-		} else if (node.type === MEDIA_FEATURE) {
-			if (node.property) mediaFeatures.p(node.property.toLowerCase(), toLoc(node));
+		} else if (is_media_feature(node)) {
+			mediaFeatures.p(node.property?.toLowerCase(), toLoc(node));
 			return SKIP;
 		}
 	});

package/dist/selectors/index.d.ts

@@ -1,2 +1,2 @@
-import { a as calculate, i as isPrefixed, n as getComplexity, o as calculateForAST, r as isAccessibility, s as compare, t as getCombinators } from "../utils-DJb_IpTO.js";
+import { a as calculate, i as isPrefixed, n as getComplexity, o as calculateForAST, r as isAccessibility, s as compare, t as getCombinators } from "../utils-yIUD7vGy.js";
 export { compare as compareSpecificity, getCombinators, getComplexity, calculate as getSpecificity, calculateForAST as getSpecificityForAST, isAccessibility, isPrefixed };

package/dist/selectors/index.js

@@ -1,3 +1,2 @@
-import "../string-utils-C97yyuqE.js";
-import { a as getComplexity, i as getCombinators, n as calculateForAST, o as isAccessibility, r as compare, s as isPrefixed, t as calculate } from "../specificity-BKdu6JZr.js";
+import { a as getComplexity, i as getCombinators, n as calculateForAST, o as isAccessibility, r as compare, s as isPrefixed, t as calculate } from "../specificity-DKo9lvB5.js";
 export { compare as compareSpecificity, getCombinators, getComplexity, calculate as getSpecificity, calculateForAST as getSpecificityForAST, isAccessibility, isPrefixed };

package/dist/{specificity-BKdu6JZr.js → specificity-DKo9lvB5.js}

@@ -1,6 +1,6 @@
 import { t as KeywordSet } from "./keyword-set-qSyAMR9o.js";
 import { n as unquote } from "./string-utils-C97yyuqE.js";
-import { ATTRIBUTE_SELECTOR, CLASS_SELECTOR, COMBINATOR, ID_SELECTOR, NTH_OF_SELECTOR, NTH_SELECTOR, PSEUDO_CLASS_SELECTOR, PSEUDO_ELEMENT_SELECTOR, SELECTOR, SELECTOR_LIST, SKIP, TYPE_SELECTOR, str_equals, str_starts_with, walk } from "@projectwallace/css-parser";
+import { ATTRIBUTE_SELECTOR, CLASS_SELECTOR, ID_SELECTOR, PSEUDO_CLASS_SELECTOR, PSEUDO_ELEMENT_SELECTOR, SKIP, TYPE_SELECTOR, is_attribute_selector, is_combinator, is_nth_of_selector, is_nth_selector, is_pseudo_class_selector, is_pseudo_element_selector, is_selector, is_selector_list, is_type_selector, str_equals, str_starts_with, walk } from "@projectwallace/css-parser";
 import { parse_selector } from "@projectwallace/css-parser/parse-selector";
 //#region src/selectors/utils.ts
 const PSEUDO_FUNCTIONS = new KeywordSet([
@@ -16,12 +16,12 @@ const PSEUDO_FUNCTIONS = new KeywordSet([
 ]);
 function isPrefixed(selector, on_selector) {
 	walk(selector, function(node) {
-		if (node.type === PSEUDO_ELEMENT_SELECTOR || node.type === PSEUDO_CLASS_SELECTOR || node.type === TYPE_SELECTOR) {
+		if (is_pseudo_element_selector(node) || is_pseudo_class_selector(node) || is_type_selector(node)) {
 			if (node.is_vendor_prefixed) {
 				let prefix = "";
-				if (node.type === PSEUDO_CLASS_SELECTOR) prefix = ":";
-				else if (node.type === PSEUDO_ELEMENT_SELECTOR) prefix = "::";
-				on_selector(prefix + (node.name || node.text));
+				if (is_pseudo_class_selector(node)) prefix = ":";
+				else if (is_pseudo_element_selector(node)) prefix = "::";
+				on_selector(prefix + node.name);
 			}
 		}
 	});
@@ -36,7 +36,7 @@ function isAccessibility(selector, on_selector) {
 		return "[" + clone.name?.toLowerCase() + "]";
 	}
 	walk(selector, function(node) {
-		if (node.type === ATTRIBUTE_SELECTOR) {
+		if (is_attribute_selector(node)) {
 			const name = node.name || "";
 			if (str_equals("role", name) || str_starts_with(name, "aria-")) on_selector(normalize(node));
 		}
@@ -49,31 +49,31 @@ function isAccessibility(selector, on_selector) {
 */
 function getComplexity(selector) {
 	let complexity = 0;
-	function findSelectors(node, complexities) {
-		walk(node, function(n) {
-			if (n.type === SELECTOR) complexities.push(getComplexity(n));
+	function findSelectors(tree, complexities) {
+		walk(tree, function(node) {
+			if (is_selector(node)) complexities.push(getComplexity(node));
 		});
 	}
 	walk(selector, function(node) {
-		const type = node.type;
-		if (type === SELECTOR) return;
-		if (type === NTH_SELECTOR) {
-			if (node.text && node.text.trim()) complexity++;
+		node.type;
+		if (is_selector(node)) return;
+		if (is_nth_selector(node)) {
+			if (node.text.trim()) complexity++;
 			return;
 		}
 		complexity++;
-		if (type === PSEUDO_ELEMENT_SELECTOR || type === TYPE_SELECTOR || type === PSEUDO_CLASS_SELECTOR) {
+		if (is_pseudo_class_selector(node) || is_type_selector(node) || is_pseudo_element_selector(node)) {
 			if (node.is_vendor_prefixed) complexity++;
 		}
-		if (type === ATTRIBUTE_SELECTOR) {
+		if (is_attribute_selector(node)) {
 			if (node.value) complexity++;
 			return SKIP;
 		}
-		if (type === PSEUDO_CLASS_SELECTOR) {
-			const name = node.name || "";
+		if (is_pseudo_class_selector(node)) {
+			const name = node.name;
 			if (PSEUDO_FUNCTIONS.has(name.toLowerCase())) {
 				const childComplexities = [];
-				if (node.has_children) for (const child of node) if (child.type === SELECTOR) childComplexities.push(getComplexity(child));
+				if (node.has_children) for (const child of node) if (is_selector(child)) childComplexities.push(getComplexity(child));
 				else findSelectors(child, childComplexities);
 				if (childComplexities.length > 0) {
 					for (const c of childComplexities) complexity += c;
@@ -89,8 +89,8 @@ function getComplexity(selector) {
 */
 function getCombinators(selector, onMatch) {
 	walk(selector, function(node) {
-		if (node.type === COMBINATOR) onMatch({
-			name: node.name?.trim() === "" ? " " : node.name,
+		if (is_combinator(node)) onMatch({
+			name: node.name.trim() === "" ? " " : node.name,
 			loc: {
 				offset: node.start,
 				line: node.line,
@@ -130,7 +130,7 @@ const calculateForAST = (selectorAST) => {
 				b += 1;
 				break;
 			case PSEUDO_CLASS_SELECTOR:
-				switch (current.name?.toLowerCase()) {
+				switch (current.name.toLowerCase()) {
 					case "where": break;
 					case "-webkit-any":
 					case "any":
@@ -143,7 +143,7 @@ const calculateForAST = (selectorAST) => {
 					case "has":
 						if (current.has_children) {
 							const childSelectorList = current.first_child;
-							if (childSelectorList?.type === SELECTOR_LIST) {
+							if (is_selector_list(childSelectorList)) {
 								const max1 = max(calculate(childSelectorList));
 								a += max1[0];
 								b += max1[1];
@@ -155,7 +155,7 @@ const calculateForAST = (selectorAST) => {
 					case "nth-last-child":
 						b += 1;
 						const nthOf = current.first_child;
-						if (nthOf?.type === NTH_OF_SELECTOR && nthOf.selector) {
+						if (is_nth_of_selector(nthOf) && nthOf.selector) {
 							const max2 = max(calculate(nthOf.selector));
 							a += max2[0];
 							b += max2[1];
@@ -165,11 +165,11 @@ const calculateForAST = (selectorAST) => {
 					case "host-context":
 					case "host":
 						b += 1;
-						const childSelector = current.first_child?.first_child;
-						if (childSelector?.type === SELECTOR) {
+						const childSelector = current.first_child.first_child;
+						if (childSelector && is_selector(childSelector)) {
 							let childPart = childSelector.first_child;
 							while (childPart) {
-								if (childPart.type === COMBINATOR) break;
+								if (is_combinator(childPart)) break;
 								const partSpecificity = calculateForAST({
 									type_name: "Selector",
 									first_child: childPart,
@@ -194,14 +194,14 @@ const calculateForAST = (selectorAST) => {
 				}
 				break;
 			case PSEUDO_ELEMENT_SELECTOR:
-				switch (current.name?.toLowerCase()) {
+				switch (current.name.toLowerCase()) {
 					case "slotted":
 						c += 1;
-						const childSelector = current.first_child?.first_child;
-						if (childSelector?.type === SELECTOR) {
+						const childSelector = current.first_child.first_child;
+						if (is_selector(childSelector)) {
 							let childPart = childSelector.first_child;
 							while (childPart) {
-								if (childPart.type === COMBINATOR) break;
+								if (is_combinator(childPart)) break;
 								const partSpecificity = calculateForAST({
 									type_name: "Selector",
 									first_child: childPart,
@@ -249,20 +249,16 @@ const convertToAST = (source) => {
 		throw new TypeError(`Could not convert passed in source '${source}' to SelectorList: ${message}`);
 	}
 	if (source instanceof Object) {
-		if (source.type === SELECTOR_LIST) return source;
+		if (is_selector_list(source)) return source;
 		throw new TypeError(`Passed in source is an Object but no AST / AST of the type SelectorList`);
 	}
 	throw new TypeError(`Passed in source is not a String nor an Object. I don't know what to do with it.`);
 };
 const calculate = (selector) => {
 	if (!selector) return [];
-	const ast = convertToAST(selector);
+	const selector_list = convertToAST(selector);
 	const specificities = [];
-	let selectorNode = ast.first_child;
-	while (selectorNode) {
-		specificities.push(calculateForAST(selectorNode));
-		selectorNode = selectorNode.next_sibling;
-	}
+	for (const selector_node of selector_list) specificities.push(calculateForAST(selector_node));
 	return specificities;
 };
 //#endregion

package/dist/{utils-DJb_IpTO.d.ts → utils-yIUD7vGy.d.ts}

@@ -1,4 +1,4 @@
-import { CSSNode } from "@projectwallace/css-parser";
+import { CSSNode, Selector } from "@projectwallace/css-parser";
 
 //#region src/collection.d.ts
 type Location = {
@@ -25,7 +25,7 @@ type Specificity = [number, number, number];
  * @returns 0 if s1 equals s2, a negative number if s1 is lower than s2, or a positive number if s1 higher than s2
  */
 declare function compare(s1: Specificity, s2: Specificity): number;
-declare const calculateForAST: (selectorAST: CSSNode) => Specificity;
+declare const calculateForAST: (selectorAST: Selector) => Specificity;
 declare const calculate: (selector: string | CSSNode) => Specificity[];
 //#endregion
 //#region src/selectors/utils.d.ts