@projectwallace/css-design-tokens 0.11.2 → 0.11.4

package/dist/index.js

@@ -2,8 +2,8 @@ import { analyze, colorFunctions, colorKeywords, cssKeywords, namedColors, syste
 import { convert } from "css-time-sort";
 import { convert as convert$1 } from "color-sorter";
 import { parse_value } from "@projectwallace/css-parser/parse-value";
+import { DIMENSION, FUNCTION, HASH, IDENTIFIER, NUMBER, OPERATOR } from "@projectwallace/css-parser/nodes";
 import { A98RGB, A98RGB_Linear, ColorSpace, HSL, HSV, HWB, LCH, Lab, Lab_D65, OKLCH, OKLab, OKLrab, P3, P3_Linear, ProPhoto, ProPhoto_Linear, REC_2020, REC_2020_Linear, XYZ_ABS_D65, XYZ_D50, XYZ_D65, sRGB, sRGB_Linear, tryColor } from "colorjs.io/fn";
-import { parse_value as parse_value$1 } from "@projectwallace/css-parser";
 //#region src/group-colors.ts
 const white = 0;
 const black = 1;
@@ -126,16 +126,16 @@ function destructure_box_shadow(value) {
 	let ast = parse_value(value);
 	let current_shadow = create_destructured();
 	let destructured = [current_shadow];
-	if (ast.children.length < 2) return null;
-	for (let node of ast.children) if (node.type_name === "Identifier") {
+	if (ast.child_count < 2) return null;
+	for (let node of ast) if (node.type === IDENTIFIER) {
 		if (node.name.toLowerCase() === "inset") current_shadow.inset = true;
-		else if (namedColors.has(node.name) || systemColors.has(node.name)) {
+		else if (node.name && (namedColors.has(node.name) || systemColors.has(node.name))) {
 			let color_token = color_to_token(node.name);
 			if (color_token === null) continue;
 			current_shadow.color = color_token;
 		}
-	} else if (node.type_name === "Dimension" || node.type_name === "Number" && node.value === 0) {
-		let length = node.type_name === "Dimension" ? {
+	} else if (node.type === DIMENSION || node.type === NUMBER && node.value === 0) {
+		let length = node.type === DIMENSION ? {
 			value: Number(node.value),
 			unit: node.unit
 		} : {
@@ -146,21 +146,21 @@ function destructure_box_shadow(value) {
 		else if (!current_shadow.offsetY) current_shadow.offsetY = length;
 		else if (!current_shadow.blur) current_shadow.blur = length;
 		else if (!current_shadow.spread) current_shadow.spread = length;
-	} else if (node.type_name === "Function") {
+	} else if (node.type === FUNCTION) {
 		if (colorFunctions.has(node.name)) {
 			let color_token = color_to_token(node.text);
 			if (color_token === null) continue;
 			current_shadow.color = color_token;
-		} else if (node.name?.toLowerCase() === "var" && !current_shadow.color) {
+		} else if (node.name.toLowerCase() === "var" && !current_shadow.color) {
 			let color_token = color_to_token(node.text);
 			if (color_token === null) continue;
 			current_shadow.color = color_token;
 		}
-	} else if (node.type_name === "Hash") {
+	} else if (node.type === HASH) {
 		let color_token = color_to_token(node.text);
 		if (color_token === null) continue;
 		current_shadow.color = color_token;
-	} else if (node.type_name === "Operator" && node.value === ",") {
+	} else if (node.type === OPERATOR && node.value === ",") {
 		complete_shadow_token(current_shadow);
 		current_shadow = create_destructured();
 		destructured.push(current_shadow);
@@ -245,15 +245,15 @@ function destructure_font_family(value) {
 	let family_buffer = "";
 	let prev_type;
 	for (let node of children) {
-		if (node.type_name === "Operator" && node.value === ",") {
+		if (node.type === OPERATOR && node.value === ",") {
 			families.push(unquote(family_buffer));
 			family_buffer = "";
-			prev_type = node.type_name;
+			prev_type = node.type;
 			continue;
 		}
-		if (prev_type === "Identifier" && node.type_name === "Identifier") family_buffer += " ";
+		if (prev_type === IDENTIFIER && node.type === IDENTIFIER) family_buffer += " ";
 		family_buffer += node.text;
-		prev_type = node.type_name;
+		prev_type = node.type;
 	}
 	families.push(unquote(family_buffer));
 	return families;
@@ -283,12 +283,12 @@ const ALLOWED_UNITS = new Set(["px", "rem"]);
 * - the keyword `normal`.
 */
 function destructure_line_height(value) {
-	let ast = parse_value$1(value);
+	let ast = parse_value(value);
 	if (!ast.has_children) return null;
-	if (ast.children.length !== 1) return null;
+	if (ast.child_count !== 1) return null;
 	let maybe_dimension = ast.first_child;
-	switch (maybe_dimension.type_name) {
-		case "Dimension": {
+	switch (maybe_dimension.type) {
+		case DIMENSION: {
 			let { value, unit } = maybe_dimension;
 			if (value === 0) return 0;
 			if (unit === "%") return Number(value) / 100;
@@ -299,8 +299,8 @@ function destructure_line_height(value) {
 			};
 			return null;
 		}
-		case "Number": return Number(maybe_dimension.value);
-		case "Identifier": if (maybe_dimension.name?.toLowerCase() === "normal") return 1.2;
+		case NUMBER: return Number(maybe_dimension.value);
+		case IDENTIFIER: if (maybe_dimension.name.toLowerCase() === "normal") return 1.2;
 	}
 	return null;
 }
@@ -324,11 +324,11 @@ let absolute_size_map = new Map([
 * - the keyword `normal`.
 */
 function parse_length(value) {
-	let ast = parse_value$1(value);
-	if (!ast.has_children || ast.children.length !== 1) return null;
+	let ast = parse_value(value);
+	if (!ast.has_children || ast.child_count !== 1) return null;
 	let maybe_length = ast.first_child;
-	switch (maybe_length.type_name) {
-		case "Dimension": {
+	switch (maybe_length.type) {
+		case DIMENSION: {
 			let unit = maybe_length.unit.toLowerCase();
 			if (unit === "px" || unit === "rem") {
 				let value = Number(maybe_length.value);
@@ -343,7 +343,7 @@ function parse_length(value) {
 			}
 			break;
 		}
-		case "Identifier": {
+		case IDENTIFIER: {
 			let name = maybe_length.name.toLowerCase();
 			if (absolute_size_map.has(name)) return {
 				value: absolute_size_map.get(name),
@@ -351,7 +351,7 @@ function parse_length(value) {
 			};
 			break;
 		}
-		case "Number":
+		case NUMBER:
 			if (Number(maybe_length.value) === 0) return {
 				value: 0,
 				unit: "px"
@@ -452,15 +452,14 @@ function analysis_to_tokens(analysis) {
 			let unique = get_unique(analysis.values.fontFamilies);
 			for (let font_family in unique) {
 				let parsed = destructure_font_family(font_family);
-				let name = `fontFamily-${hash(font_family)}`;
+				if (!parsed) continue;
+				let [main] = parsed;
+				let name = `fontFamily-${hash(main)}`;
 				let extensions = {
 					[EXTENSION_AUTHORED_AS]: font_family,
 					[EXTENSION_USAGE_COUNT]: get_count(unique[font_family])
 				};
-				if (parsed === void 0) families[name] = {
-					$value: font_family,
-					$extensions: extensions
-				};
+				if (families[name]) families[name].$extensions[EXTENSION_USAGE_COUNT] += extensions[EXTENSION_USAGE_COUNT];
 				else families[name] = {
 					$type: "fontFamily",
 					$value: parsed,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@projectwallace/css-design-tokens",
-	"version": "0.11.2",
+	"version": "0.11.4",
 	"description": "Generate spec-compliant Design Tokens from CSS.",
 	"keywords": [
 		"color",
@@ -34,21 +34,21 @@
 		"lint": "oxlint; oxfmt --check"
 	},
 	"dependencies": {
-		"@projectwallace/css-analyzer": "^9.3.0",
-		"@projectwallace/css-parser": "^0.13.6",
-		"color-sorter": "^7.0.2",
+		"@projectwallace/css-analyzer": "^9.6.3",
+		"@projectwallace/css-parser": "^0.14.10",
+		"color-sorter": "^8.0.0",
 		"colorjs.io": "^0.6.1",
 		"css-time-sort": "^3.0.1"
 	},
 	"devDependencies": {
-		"@codecov/rollup-plugin": "^1.9.1",
-		"@vitest/coverage-v8": "^4.0.18",
-		"oxfmt": "^0.37.0",
-		"oxlint": "^1.52.0",
+		"@codecov/rollup-plugin": "^2.0.1",
+		"@vitest/coverage-v8": "^4.1.4",
+		"oxfmt": "^0.46.0",
+		"oxlint": "^1.61.0",
 		"publint": "^0.3.18",
-		"tsdown": "^0.21.1",
-		"typescript": "^5.9.3",
-		"vitest": "^4.0.18"
+		"tsdown": "^0.21.9",
+		"typescript": "^6.0.3",
+		"vitest": "^4.1.4"
 	},
 	"engines": {
 		"node": ">=22"