@bamboocss/vite 1.28.0 → 1.29.0

package/dist/index.cjs

@@ -1130,6 +1130,9 @@ const createRuntimeCss = (ctx) => {
 * every module in the build — not once per `foldSource`, which would price a whole token
 * table into each of the overwhelming majority of modules that call `token()` zero times.
 * Keyed weakly so a context that goes out of scope takes its table with it.
+*
+* Both halves of the generated entry are stored, because `token()` and `token.var()` read
+* different ones and building a second table would pay the same per-project cost twice.
 */
 const tokenValues = /* @__PURE__ */ new WeakMap();
 const tokenValuesFor = (ctx) => {
@@ -1138,16 +1141,29 @@ const tokenValuesFor = (ctx) => {
 	values = /* @__PURE__ */ new Map();
 	for (const token of ctx.tokens.allTokens) {
 		const { varRef, isVirtual, condition } = token.extensions;
-		values.set(token.name, isVirtual || condition !== "base" ? varRef : token.value);
+		values.set(token.name, {
+			value: ctx.tokens.view.get(token.name) ?? (isVirtual || condition !== "base" ? varRef : token.value),
+			variable: ctx.tokens.view.getVar(token.name) ?? varRef
+		});
 	}
 	tokenValues.set(ctx, values);
 	return values;
 };
-const createRuntimeToken = (ctx) => (path) => {
-	const value = tokenValuesFor(ctx).get(path);
+const createRuntimeTokenValue = (ctx) => (path) => {
+	const value = tokenValuesFor(ctx).get(path)?.value;
 	return typeof value === "string" ? value : void 0;
 };
 /**
+* The generated runtime's `token()`, rebuilt in-process.
+*
+* Reads the `variable` half of the same entry `token.value()` reads the `value` half of.
+* That half is `varRef` for every token regardless of condition, so unlike
+* `createRuntimeTokenValue` there is no split to get wrong and no non-string case to
+* decline: a `var()` reference is a string or the token does not exist. Which is what makes
+* the default form the trivially foldable one.
+*/
+const createRuntimeToken = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
+/**
 * Whether a slot's class is independent of the variant props.
 *
 * A scoped slot recipe delivers variants through `@scope` rules anchored on an enclosing
@@ -1612,6 +1628,7 @@ const foldSource = (options) => {
 	const runtimeRecipe = createRuntimeRecipe(ctx);
 	const isConstantSlot = createConstantSlotCheck(ctx);
 	const runtimeToken = createRuntimeToken(ctx);
+	const runtimeTokenValue = createRuntimeTokenValue(ctx);
 	/**
 	* Does this specifier name a module that exports the css API, exactly?
 	*
@@ -1800,7 +1817,7 @@ const foldSource = (options) => {
 		const name = item.name ?? type;
 		if (!item.box) continue;
 		const call = findCallExpression(item.box);
-		if (type === "token") {
+		if (type === "token" || type === "tokenValue") {
 			if (!call) {
 				skipped.push({
 					name,
@@ -1835,7 +1852,18 @@ const foldSource = (options) => {
 				continue;
 			}
 			const callee = ts_morph.Node.isCallExpression(call) ? call.getExpression() : void 0;
-			if (ts_morph.Node.isPropertyAccessExpression(callee) && !ctx.imports.matchers.tokens.match(callee.getNameNode().getText())) {
+			const propertyName = ts_morph.Node.isPropertyAccessExpression(callee) ? callee.getNameNode().getText() : void 0;
+			const wantsValue = type === "tokenValue";
+			if (wantsValue !== (propertyName === "value")) {
+				skipped.push({
+					name,
+					reason: "unsupported-kind",
+					start,
+					end
+				});
+				continue;
+			}
+			if (!wantsValue && propertyName !== void 0 && propertyName !== "var" && !ctx.imports.matchers.tokens.match(propertyName)) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1872,7 +1900,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			const value = runtimeToken(path);
+			const value = wantsValue ? runtimeTokenValue(path) : runtimeToken(path);
 			if (!value) {
 				skipped.push({
 					name,

package/dist/index.mjs

@@ -1103,6 +1103,9 @@ const createRuntimeCss = (ctx) => {
 * every module in the build — not once per `foldSource`, which would price a whole token
 * table into each of the overwhelming majority of modules that call `token()` zero times.
 * Keyed weakly so a context that goes out of scope takes its table with it.
+*
+* Both halves of the generated entry are stored, because `token()` and `token.var()` read
+* different ones and building a second table would pay the same per-project cost twice.
 */
 const tokenValues = /* @__PURE__ */ new WeakMap();
 const tokenValuesFor = (ctx) => {
@@ -1111,16 +1114,29 @@ const tokenValuesFor = (ctx) => {
 	values = /* @__PURE__ */ new Map();
 	for (const token of ctx.tokens.allTokens) {
 		const { varRef, isVirtual, condition } = token.extensions;
-		values.set(token.name, isVirtual || condition !== "base" ? varRef : token.value);
+		values.set(token.name, {
+			value: ctx.tokens.view.get(token.name) ?? (isVirtual || condition !== "base" ? varRef : token.value),
+			variable: ctx.tokens.view.getVar(token.name) ?? varRef
+		});
 	}
 	tokenValues.set(ctx, values);
 	return values;
 };
-const createRuntimeToken = (ctx) => (path) => {
-	const value = tokenValuesFor(ctx).get(path);
+const createRuntimeTokenValue = (ctx) => (path) => {
+	const value = tokenValuesFor(ctx).get(path)?.value;
 	return typeof value === "string" ? value : void 0;
 };
 /**
+* The generated runtime's `token()`, rebuilt in-process.
+*
+* Reads the `variable` half of the same entry `token.value()` reads the `value` half of.
+* That half is `varRef` for every token regardless of condition, so unlike
+* `createRuntimeTokenValue` there is no split to get wrong and no non-string case to
+* decline: a `var()` reference is a string or the token does not exist. Which is what makes
+* the default form the trivially foldable one.
+*/
+const createRuntimeToken = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
+/**
 * Whether a slot's class is independent of the variant props.
 *
 * A scoped slot recipe delivers variants through `@scope` rules anchored on an enclosing
@@ -1585,6 +1601,7 @@ const foldSource = (options) => {
 	const runtimeRecipe = createRuntimeRecipe(ctx);
 	const isConstantSlot = createConstantSlotCheck(ctx);
 	const runtimeToken = createRuntimeToken(ctx);
+	const runtimeTokenValue = createRuntimeTokenValue(ctx);
 	/**
 	* Does this specifier name a module that exports the css API, exactly?
 	*
@@ -1773,7 +1790,7 @@ const foldSource = (options) => {
 		const name = item.name ?? type;
 		if (!item.box) continue;
 		const call = findCallExpression(item.box);
-		if (type === "token") {
+		if (type === "token" || type === "tokenValue") {
 			if (!call) {
 				skipped.push({
 					name,
@@ -1808,7 +1825,18 @@ const foldSource = (options) => {
 				continue;
 			}
 			const callee = Node.isCallExpression(call) ? call.getExpression() : void 0;
-			if (Node.isPropertyAccessExpression(callee) && !ctx.imports.matchers.tokens.match(callee.getNameNode().getText())) {
+			const propertyName = Node.isPropertyAccessExpression(callee) ? callee.getNameNode().getText() : void 0;
+			const wantsValue = type === "tokenValue";
+			if (wantsValue !== (propertyName === "value")) {
+				skipped.push({
+					name,
+					reason: "unsupported-kind",
+					start,
+					end
+				});
+				continue;
+			}
+			if (!wantsValue && propertyName !== void 0 && propertyName !== "var" && !ctx.imports.matchers.tokens.match(propertyName)) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1845,7 +1873,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			const value = runtimeToken(path);
+			const value = wantsValue ? runtimeTokenValue(path) : runtimeToken(path);
 			if (!value) {
 				skipped.push({
 					name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/vite",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "Vite integration for Bamboo CSS",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -37,18 +37,18 @@
   "dependencies": {
     "magic-string": "0.30.21",
     "ts-morph": "28.0.0",
-    "@bamboocss/core": "1.28.0",
-    "@bamboocss/extractor": "1.28.0",
-    "@bamboocss/node": "1.28.0",
-    "@bamboocss/types": "1.28.0",
-    "@bamboocss/logger": "1.28.0",
-    "@bamboocss/shared": "1.28.0",
-    "@bamboocss/config": "1.28.0"
+    "@bamboocss/config": "1.29.0",
+    "@bamboocss/core": "1.29.0",
+    "@bamboocss/extractor": "1.29.0",
+    "@bamboocss/logger": "1.29.0",
+    "@bamboocss/node": "1.29.0",
+    "@bamboocss/types": "1.29.0",
+    "@bamboocss/shared": "1.29.0"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "vite": "7.2.6",
-    "@bamboocss/fixture": "1.28.0"
+    "@bamboocss/fixture": "1.29.0"
   },
   "peerDependencies": {
     "vite": ">=5"