boss-css 0.0.7 → 0.0.9

package/dist/prop/bosswind/server.cjs

@@ -89,7 +89,7 @@ const onPropTree = async (api, { tree, parser }) => {
 	const { tree: next, usedBosswind, usedText } = require_shared.rewriteBosswindTree(api, tree, {
 		defaults,
 		fontSizeKeys
-	}, resolvedTokens);
+	}, resolvedTokens, parser);
 	if (usedBosswind && parser === "jsx") needsRuntime = true;
 	Object.keys(tree).forEach((key) => delete tree[key]);
 	Object.assign(tree, next);

package/dist/prop/bosswind/server.mjs

@@ -89,7 +89,7 @@ const onPropTree = async (api, { tree, parser }) => {
 	const { tree: next, usedBosswind, usedText } = rewriteBosswindTree(api, tree, {
 		defaults,
 		fontSizeKeys
-	}, resolvedTokens);
+	}, resolvedTokens, parser);
 	if (usedBosswind && parser === "jsx") needsRuntime = true;
 	Object.keys(tree).forEach((key) => delete tree[key]);
 	Object.assign(tree, next);

package/dist/prop/bosswind/shared.cjs

@@ -221,6 +221,20 @@ const resolveBorderTarget = (value, config, tokens) => {
 		value
 	};
 };
+const resolveBorderToken = (value, tokens) => {
+	if (readTokenGroup(value)?.group === "color") return {
+		prop: "borderColor",
+		value
+	};
+	if (typeof value === "string" && tokens?.color) {
+		const normalized = toTokenPath(value, tokens.color);
+		if (normalized !== value) return {
+			prop: "borderColor",
+			value: normalized
+		};
+	}
+	return null;
+};
 const resolveShadowValue = (value, config) => {
 	if (value === null || value === true) return config.defaults?.boxShadow ?? value;
 	return value;
@@ -605,7 +619,7 @@ const applyAxisPairsToTree = (entries, node, output, used) => {
 		used.set(`__emit:${pair.emitIndex}:${pair.prop}`, true);
 	}
 };
-const rewriteBosswindTree = (api, tree, config, tokens) => {
+const rewriteBosswindTree = (api, tree, config, tokens, parser) => {
 	let usedBosswind = false;
 	let usedText = false;
 	const rewriteNode = (node) => {
@@ -693,6 +707,15 @@ const rewriteBosswindTree = (api, tree, config, tokens) => {
 			}
 			if (name === borderAlias) {
 				usedBosswind = true;
+				if (parser === "jsx") {
+					const resolvedToken = resolveBorderToken(value, tokens);
+					if (resolvedToken) {
+						output[resolvedToken.prop] = cloneProp(prop, resolvedToken.value);
+						return;
+					}
+					output[name] = prop;
+					return;
+				}
 				const resolved = resolveBorderTarget(value, config, tokens);
 				if (!resolved) {
 					output[name] = prop;
@@ -820,12 +843,12 @@ const rewriteBosswindInput = (api, input, config) => {
 			return;
 		}
 		if (name === borderAlias) {
-			const resolved = resolveBorderTarget(value, config, void 0);
-			if (!resolved) {
-				output[name] = value;
+			const resolvedToken = resolveBorderToken(value, api.tokens);
+			if (resolvedToken) {
+				output[resolvedToken.prop] = resolvedToken.value;
 				return;
 			}
-			output[resolved.prop] = resolved.value;
+			output[name] = value;
 			return;
 		}
 		if (name === "shadow") {

package/dist/prop/bosswind/shared.mjs

@@ -220,6 +220,20 @@ const resolveBorderTarget = (value, config, tokens) => {
 		value
 	};
 };
+const resolveBorderToken = (value, tokens) => {
+	if (readTokenGroup(value)?.group === "color") return {
+		prop: "borderColor",
+		value
+	};
+	if (typeof value === "string" && tokens?.color) {
+		const normalized = toTokenPath(value, tokens.color);
+		if (normalized !== value) return {
+			prop: "borderColor",
+			value: normalized
+		};
+	}
+	return null;
+};
 const resolveShadowValue = (value, config) => {
 	if (value === null || value === true) return config.defaults?.boxShadow ?? value;
 	return value;
@@ -604,7 +618,7 @@ const applyAxisPairsToTree = (entries, node, output, used) => {
 		used.set(`__emit:${pair.emitIndex}:${pair.prop}`, true);
 	}
 };
-const rewriteBosswindTree = (api, tree, config, tokens) => {
+const rewriteBosswindTree = (api, tree, config, tokens, parser) => {
 	let usedBosswind = false;
 	let usedText = false;
 	const rewriteNode = (node) => {
@@ -692,6 +706,15 @@ const rewriteBosswindTree = (api, tree, config, tokens) => {
 			}
 			if (name === borderAlias) {
 				usedBosswind = true;
+				if (parser === "jsx") {
+					const resolvedToken = resolveBorderToken(value, tokens);
+					if (resolvedToken) {
+						output[resolvedToken.prop] = cloneProp(prop, resolvedToken.value);
+						return;
+					}
+					output[name] = prop;
+					return;
+				}
 				const resolved = resolveBorderTarget(value, config, tokens);
 				if (!resolved) {
 					output[name] = prop;
@@ -819,12 +842,12 @@ const rewriteBosswindInput = (api, input, config) => {
 			return;
 		}
 		if (name === borderAlias) {
-			const resolved = resolveBorderTarget(value, config, void 0);
-			if (!resolved) {
-				output[name] = value;
+			const resolvedToken = resolveBorderToken(value, api.tokens);
+			if (resolvedToken) {
+				output[resolvedToken.prop] = resolvedToken.value;
 				return;
 			}
-			output[resolved.prop] = resolved.value;
+			output[name] = value;
 			return;
 		}
 		if (name === "shadow") {

package/dist/strategy/inline-first/browser.cjs

@@ -45,7 +45,7 @@ const onBrowserObjectStart = (api, { input, output = {}, tag, contexts = [] }) =
 			output: outputRecord,
 			contexts
 		});
-		else if (!descriptor && !contexts.length && (0, _boss_css_is_css_prop.default)(tag, resolvedName)) outputRecord.style[resolvedName] = api.dictionary.toValue(value, resolvedName);
+		else if (!contexts.length && (0, _boss_css_is_css_prop.default)(tag, resolvedName)) outputRecord.style[resolvedName] = api.dictionary.toValue(value, resolvedName);
 		else {
 			const className = api.contextToClassName(resolvedName, null, contexts, false, api.selectorPrefix);
 			const cssVarName = api.contextToCSSVariable(resolvedName, null, contexts, api.selectorPrefix);

package/dist/strategy/inline-first/browser.mjs

@@ -43,7 +43,7 @@ const onBrowserObjectStart = (api, { input, output = {}, tag, contexts = [] }) =
 			output: outputRecord,
 			contexts
 		});
-		else if (!descriptor && !contexts.length && isCSSProp(tag, resolvedName)) outputRecord.style[resolvedName] = api.dictionary.toValue(value, resolvedName);
+		else if (!contexts.length && isCSSProp(tag, resolvedName)) outputRecord.style[resolvedName] = api.dictionary.toValue(value, resolvedName);
 		else {
 			const className = api.contextToClassName(resolvedName, null, contexts, false, api.selectorPrefix);
 			const cssVarName = api.contextToCSSVariable(resolvedName, null, contexts, api.selectorPrefix);

package/dist/use/token/browser.cjs

@@ -61,10 +61,16 @@ const onBrowserObjectStart = (api, { input }) => {
 			if (isClassnameFirst) mutableInput[prop] = path.split(".").slice(1).join(".");
 			else mutableInput[prop] = `var(--${path.replace(/\./g, "-")})`;
 		} else if (typeof prop === "string") {
-			const groupName = require_propMap.getTokenGroupForProp(prop) ?? require_propMap.getTokenGroupForProp(api.camelCaseToDash?.(prop) ?? prop);
-			if (groupName && tokenPaths.has(`${groupName}.${mutableInput[prop]}`)) {
-				if (!isClassnameFirst) mutableInput[prop] = `var(--${groupName}-${String(mutableInput[prop]).replace("$$.token.", "").replace(/\./g, "-")})`;
-			}
+			const rawValue = mutableInput[prop];
+			if (typeof rawValue !== "string") continue;
+			const dashProp = api.camelCaseToDash?.(prop) ?? prop;
+			const groupName = [
+				require_propMap.getTokenGroupForProp(prop),
+				require_propMap.getTokenGroupForProp(dashProp),
+				prop,
+				dashProp
+			].filter(Boolean).find((group) => tokenPaths.has(`${group}.${rawValue}`));
+			if (groupName && !isClassnameFirst) mutableInput[prop] = `var(--${groupName}-${rawValue.replace("$$.token.", "").replace(/\./g, "-")})`;
 		}
 	}
 };

package/dist/use/token/browser.mjs

@@ -61,10 +61,16 @@ const onBrowserObjectStart = (api, { input }) => {
 			if (isClassnameFirst) mutableInput[prop] = path.split(".").slice(1).join(".");
 			else mutableInput[prop] = `var(--${path.replace(/\./g, "-")})`;
 		} else if (typeof prop === "string") {
-			const groupName = getTokenGroupForProp(prop) ?? getTokenGroupForProp(api.camelCaseToDash?.(prop) ?? prop);
-			if (groupName && tokenPaths.has(`${groupName}.${mutableInput[prop]}`)) {
-				if (!isClassnameFirst) mutableInput[prop] = `var(--${groupName}-${String(mutableInput[prop]).replace("$$.token.", "").replace(/\./g, "-")})`;
-			}
+			const rawValue = mutableInput[prop];
+			if (typeof rawValue !== "string") continue;
+			const dashProp = api.camelCaseToDash?.(prop) ?? prop;
+			const groupName = [
+				getTokenGroupForProp(prop),
+				getTokenGroupForProp(dashProp),
+				prop,
+				dashProp
+			].filter(Boolean).find((group) => tokenPaths.has(`${group}.${rawValue}`));
+			if (groupName && !isClassnameFirst) mutableInput[prop] = `var(--${groupName}-${rawValue.replace("$$.token.", "").replace(/\./g, "-")})`;
 		}
 	}
 };

package/dist/use/token/runtime-only.cjs

@@ -111,10 +111,24 @@ const getTokenPath = (api, prop, value) => {
 		source: "group"
 	};
 	if (typeof value !== "string") return null;
-	const { byProp } = getTokenState(api);
+	const { byProp, groups } = getTokenState(api);
 	const dashProp = api?.camelCaseToDash ? api.camelCaseToDash(prop) : prop;
-	const groupName = require_propMap.getTokenGroupForProp(prop) ?? require_propMap.getTokenGroupForProp(dashProp) ?? prop;
-	const values = byProp.get(prop) ?? byProp.get(dashProp);
+	const groupCandidates = [
+		require_propMap.getTokenGroupForProp(prop),
+		require_propMap.getTokenGroupForProp(dashProp),
+		prop,
+		dashProp
+	].filter(Boolean);
+	let groupName = groupCandidates[0] ?? prop;
+	let values = byProp.get(prop) ?? byProp.get(dashProp);
+	if (!values) for (const candidate of groupCandidates) {
+		const groupValues = groups?.[candidate];
+		if (groupValues) {
+			groupName = candidate;
+			values = groupValues;
+			break;
+		}
+	}
 	if (!values) return null;
 	if (typeof value === "string") {
 		const tokenAlpha = parseTokenAlphaValue(value);

package/dist/use/token/runtime-only.mjs

@@ -111,10 +111,24 @@ const getTokenPath = (api, prop, value) => {
 		source: "group"
 	};
 	if (typeof value !== "string") return null;
-	const { byProp } = getTokenState(api);
+	const { byProp, groups } = getTokenState(api);
 	const dashProp = api?.camelCaseToDash ? api.camelCaseToDash(prop) : prop;
-	const groupName = getTokenGroupForProp(prop) ?? getTokenGroupForProp(dashProp) ?? prop;
-	const values = byProp.get(prop) ?? byProp.get(dashProp);
+	const groupCandidates = [
+		getTokenGroupForProp(prop),
+		getTokenGroupForProp(dashProp),
+		prop,
+		dashProp
+	].filter(Boolean);
+	let groupName = groupCandidates[0] ?? prop;
+	let values = byProp.get(prop) ?? byProp.get(dashProp);
+	if (!values) for (const candidate of groupCandidates) {
+		const groupValues = groups?.[candidate];
+		if (groupValues) {
+			groupName = candidate;
+			values = groupValues;
+			break;
+		}
+	}
 	if (!values) return null;
 	if (typeof value === "string") {
 		const tokenAlpha = parseTokenAlphaValue(value);

package/dist/use/token/server.cjs

@@ -258,9 +258,13 @@ const onPropTree = async (api, { tree, parser }) => {
 		const groupForProp = typeof name === "string" ? require_propMap.getTokenGroupForProp(name) : null;
 		const resolvedGroupName = isExplicitToken ? tokenGroupName : groupForProp ?? tokenGroupName;
 		const { aliases } = descriptor;
-		const valuesByGroupName = valueMap.get(tokenGroupName);
+		const valuesByGroupName = valueMap.get(resolvedGroupName) ?? valueMap.get(tokenGroupName);
 		const values = aliases.reduce((acc, alias) => {
-			return acc || valueMap.get(alias) || null;
+			if (acc) return acc;
+			const direct = valueMap.get(alias);
+			if (direct) return direct;
+			const dashed = api.camelCaseToDash(alias);
+			return valueMap.get(dashed) || null;
 		}, null) || valuesByGroupName;
 		if (!values) return;
 		const rawValue = prop.value;

package/dist/use/token/server.mjs

@@ -258,9 +258,13 @@ const onPropTree = async (api, { tree, parser }) => {
 		const groupForProp = typeof name === "string" ? getTokenGroupForProp(name) : null;
 		const resolvedGroupName = isExplicitToken ? tokenGroupName : groupForProp ?? tokenGroupName;
 		const { aliases } = descriptor;
-		const valuesByGroupName = valueMap.get(tokenGroupName);
+		const valuesByGroupName = valueMap.get(resolvedGroupName) ?? valueMap.get(tokenGroupName);
 		const values = aliases.reduce((acc, alias) => {
-			return acc || valueMap.get(alias) || null;
+			if (acc) return acc;
+			const direct = valueMap.get(alias);
+			if (direct) return direct;
+			const dashed = api.camelCaseToDash(alias);
+			return valueMap.get(dashed) || null;
 		}, null) || valuesByGroupName;
 		if (!values) return;
 		const rawValue = prop.value;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "boss-css",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "",
     "bin": {
         "boss": "./dist/cli/index.cjs",