@bamboocss/vite 1.28.1 → 1.29.0

package/dist/index.cjs

@@ -1142,27 +1142,27 @@ const tokenValuesFor = (ctx) => {
 	for (const token of ctx.tokens.allTokens) {
 		const { varRef, isVirtual, condition } = token.extensions;
 		values.set(token.name, {
-			value: isVirtual || condition !== "base" ? varRef : token.value,
-			variable: varRef
+			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 createRuntimeTokenValue = (ctx) => (path) => {
 	const value = tokenValuesFor(ctx).get(path)?.value;
 	return typeof value === "string" ? value : void 0;
 };
 /**
-* The generated runtime's `token.var`, rebuilt in-process.
+* The generated runtime's `token()`, rebuilt in-process.
 *
-* Mirrors `tokenVar` in `generateTokenJs`, which reads the `variable` half of the same
-* entry `token()` reads the `value` half of. That half is `varRef` for every token
-* regardless of condition, so unlike `createRuntimeToken` 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 this the more foldable of the two.
+* 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 createRuntimeTokenVar = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
+const createRuntimeToken = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
 /**
 * Whether a slot's class is independent of the variant props.
 *
@@ -1628,7 +1628,7 @@ const foldSource = (options) => {
 	const runtimeRecipe = createRuntimeRecipe(ctx);
 	const isConstantSlot = createConstantSlotCheck(ctx);
 	const runtimeToken = createRuntimeToken(ctx);
-	const runtimeTokenVar = createRuntimeTokenVar(ctx);
+	const runtimeTokenValue = createRuntimeTokenValue(ctx);
 	/**
 	* Does this specifier name a module that exports the css API, exactly?
 	*
@@ -1817,7 +1817,7 @@ const foldSource = (options) => {
 		const name = item.name ?? type;
 		if (!item.box) continue;
 		const call = findCallExpression(item.box);
-		if (type === "token" || type === "tokenVar") {
+		if (type === "token" || type === "tokenValue") {
 			if (!call) {
 				skipped.push({
 					name,
@@ -1853,8 +1853,8 @@ const foldSource = (options) => {
 			}
 			const callee = ts_morph.Node.isCallExpression(call) ? call.getExpression() : void 0;
 			const propertyName = ts_morph.Node.isPropertyAccessExpression(callee) ? callee.getNameNode().getText() : void 0;
-			const wantsVar = type === "tokenVar";
-			if (wantsVar !== (propertyName === "var")) {
+			const wantsValue = type === "tokenValue";
+			if (wantsValue !== (propertyName === "value")) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1863,7 +1863,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			if (!wantsVar && propertyName !== void 0 && !ctx.imports.matchers.tokens.match(propertyName)) {
+			if (!wantsValue && propertyName !== void 0 && propertyName !== "var" && !ctx.imports.matchers.tokens.match(propertyName)) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1900,7 +1900,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			const value = wantsVar ? runtimeTokenVar(path) : runtimeToken(path);
+			const value = wantsValue ? runtimeTokenValue(path) : runtimeToken(path);
 			if (!value) {
 				skipped.push({
 					name,

package/dist/index.mjs

@@ -1115,27 +1115,27 @@ const tokenValuesFor = (ctx) => {
 	for (const token of ctx.tokens.allTokens) {
 		const { varRef, isVirtual, condition } = token.extensions;
 		values.set(token.name, {
-			value: isVirtual || condition !== "base" ? varRef : token.value,
-			variable: varRef
+			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 createRuntimeTokenValue = (ctx) => (path) => {
 	const value = tokenValuesFor(ctx).get(path)?.value;
 	return typeof value === "string" ? value : void 0;
 };
 /**
-* The generated runtime's `token.var`, rebuilt in-process.
+* The generated runtime's `token()`, rebuilt in-process.
 *
-* Mirrors `tokenVar` in `generateTokenJs`, which reads the `variable` half of the same
-* entry `token()` reads the `value` half of. That half is `varRef` for every token
-* regardless of condition, so unlike `createRuntimeToken` 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 this the more foldable of the two.
+* 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 createRuntimeTokenVar = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
+const createRuntimeToken = (ctx) => (path) => tokenValuesFor(ctx).get(path)?.variable || void 0;
 /**
 * Whether a slot's class is independent of the variant props.
 *
@@ -1601,7 +1601,7 @@ const foldSource = (options) => {
 	const runtimeRecipe = createRuntimeRecipe(ctx);
 	const isConstantSlot = createConstantSlotCheck(ctx);
 	const runtimeToken = createRuntimeToken(ctx);
-	const runtimeTokenVar = createRuntimeTokenVar(ctx);
+	const runtimeTokenValue = createRuntimeTokenValue(ctx);
 	/**
 	* Does this specifier name a module that exports the css API, exactly?
 	*
@@ -1790,7 +1790,7 @@ const foldSource = (options) => {
 		const name = item.name ?? type;
 		if (!item.box) continue;
 		const call = findCallExpression(item.box);
-		if (type === "token" || type === "tokenVar") {
+		if (type === "token" || type === "tokenValue") {
 			if (!call) {
 				skipped.push({
 					name,
@@ -1826,8 +1826,8 @@ const foldSource = (options) => {
 			}
 			const callee = Node.isCallExpression(call) ? call.getExpression() : void 0;
 			const propertyName = Node.isPropertyAccessExpression(callee) ? callee.getNameNode().getText() : void 0;
-			const wantsVar = type === "tokenVar";
-			if (wantsVar !== (propertyName === "var")) {
+			const wantsValue = type === "tokenValue";
+			if (wantsValue !== (propertyName === "value")) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1836,7 +1836,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			if (!wantsVar && propertyName !== void 0 && !ctx.imports.matchers.tokens.match(propertyName)) {
+			if (!wantsValue && propertyName !== void 0 && propertyName !== "var" && !ctx.imports.matchers.tokens.match(propertyName)) {
 				skipped.push({
 					name,
 					reason: "unsupported-kind",
@@ -1873,7 +1873,7 @@ const foldSource = (options) => {
 				});
 				continue;
 			}
-			const value = wantsVar ? runtimeTokenVar(path) : 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.1",
+  "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/config": "1.28.1",
-    "@bamboocss/core": "1.28.1",
-    "@bamboocss/logger": "1.28.1",
-    "@bamboocss/node": "1.28.1",
-    "@bamboocss/extractor": "1.28.1",
-    "@bamboocss/shared": "1.28.1",
-    "@bamboocss/types": "1.28.1"
+    "@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.1"
+    "@bamboocss/fixture": "1.29.0"
   },
   "peerDependencies": {
     "vite": ">=5"