@bamboocss/vite 1.23.0 → 1.24.0

package/dist/index.cjs

@@ -881,7 +881,7 @@ const ensureRecipeHelperImport = (call, isBambooCssModule, isGeneratedCssModule,
 * an unresolved variant does not merely omit a class, it can change which of several the
 * recipe applies — so a partially-known selection is not foldable at all.
 */
-const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
+const lowerRecipeCall = (call, entry, ctx, isInert, resolvedSelection) => {
 	if (!entry || entry === AMBIGUOUS) return {
 		kind: "decline",
 		reason: "unknown-recipe"
@@ -907,6 +907,13 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 	const selection = {};
 	/** Variant → the source expression selecting it, for axes that stay runtime decisions. */
 	const dynamicAxes = /* @__PURE__ */ new Map();
+	/**
+	* Variants whose expression could run something, in the order the source evaluates them.
+	*
+	* The text is kept, not just the key: a later property writing the same key replaces the
+	* entry in `dynamicAxes`, and the expression recorded here would then never be emitted.
+	*/
+	const effectful = [];
 	if (args.length === 1) {
 		const arg = args[0];
 		if (!arg || !ts_morph.Node.isObjectLiteralExpression(arg)) return {
@@ -937,14 +944,27 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 				kind: "decline",
 				reason: "dynamic"
 			};
-			const literal = literalValue(property.getInitializer());
+			const initializer = property.getInitializer();
+			if (initializer && !isInert(initializer)) {
+				if (!Object.hasOwn(config.variants ?? {}, key)) return {
+					kind: "decline",
+					reason: "dynamic"
+				};
+				effectful.push({
+					key,
+					text: initializer.getText()
+				});
+				dynamicAxes.set(key, initializer.getText());
+				delete selection[key];
+				continue;
+			}
+			const literal = literalValue(initializer);
 			if (literal !== void 0) {
 				selection[key] = literal;
 				dynamicAxes.delete(key);
 				continue;
 			}
 			if (!resolvedSelection || !Object.hasOwn(resolvedSelection, key)) {
-				const initializer = property.getInitializer();
 				if (!initializer) return {
 					kind: "decline",
 					reason: "dynamic"
@@ -962,24 +982,47 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 			dynamicAxes.delete(key);
 		}
 	}
+	/**
+	* Every expression that could run something has to reach the output carrying its own text.
+	*
+	* A later property writing the same key replaces it in `dynamicAxes` — `badge({ tone: a(),
+	* tone: 'b' })` is last-wins for the *value*, but `a()` still runs, and emitting only the
+	* literal would delete it. Duplicate keys are a type error in TypeScript; the fold does not
+	* typecheck and does transform `.js`, so this is reachable.
+	*/
+	const everyEffectSurvives = () => effectful.every(({ key, text }) => dynamicAxes.get(key) === text);
 	const merged = {
 		...config.defaultVariants ?? {},
 		...(0, _bamboocss_shared.compact)(selection)
 	};
 	const format = (0, _bamboocss_core.classFormatter)(ctx);
-	if (dynamicAxes.size === 0) return {
-		kind: "class",
-		className: (0, _bamboocss_shared.getRecipeClassNames)(name, config.variants, merged, ctx.utility.separator, format)
-	};
-	for (const key of [...dynamicAxes.keys()]) if (!config.variants?.[key]) dynamicAxes.delete(key);
 	if (dynamicAxes.size === 0) {
-		const staticOnly = { ...merged };
-		for (const key of dynamicAxes.keys()) delete staticOnly[key];
+		if (!everyEffectSurvives()) return {
+			kind: "decline",
+			reason: "dynamic"
+		};
 		return {
 			kind: "class",
-			className: (0, _bamboocss_shared.getRecipeClassNames)(name, config.variants, staticOnly, ctx.utility.separator, format)
+			className: (0, _bamboocss_shared.getRecipeClassNames)(name, config.variants, merged, ctx.utility.separator, format)
+		};
+	}
+	if (!everyEffectSurvives()) return {
+		kind: "decline",
+		reason: "dynamic"
+	};
+	if (effectful.length > 1) {
+		const variantOrder = Object.keys(config.variants ?? {});
+		const keys = effectful.map((entry) => entry.key);
+		if ([...keys].sort((a, b) => variantOrder.indexOf(a) - variantOrder.indexOf(b)).join("\0") !== keys.join("\0")) return {
+			kind: "decline",
+			reason: "dynamic"
 		};
 	}
+	for (const key of [...dynamicAxes.keys()]) if (!Object.hasOwn(config.variants ?? {}, key)) dynamicAxes.delete(key);
+	if (dynamicAxes.size === 0) return {
+		kind: "class",
+		className: (0, _bamboocss_shared.getRecipeClassNames)(name, config.variants, merged, ctx.utility.separator, format)
+	};
 	const ownClass = format(name);
 	const parts = [JSON.stringify(ownClass)];
 	const classNames = [ownClass];
@@ -988,7 +1031,8 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 		if (expression === void 0) {
 			const value = merged[key];
 			if (value == null) continue;
-			if (config.variants?.[key]?.[value] == null) continue;
+			const declared = config.variants?.[key];
+			if (!declared || !Object.hasOwn(declared, value) || declared[value] == null) continue;
 			const className = format(`${name}--${key}${ctx.utility.separator}${(0, _bamboocss_shared.withoutSpace)(value)}`);
 			parts.push(JSON.stringify(` ${className}`));
 			classNames.push(className);
@@ -1635,10 +1679,7 @@ const foldSource = (options) => {
 					recipeCalls.set(name, tally);
 					const resolvedSelection = item.data?.length === 1 ? item.data[0] : void 0;
 					const entry = recipeConfigs.get(name);
-					const lowered = ts_morph.Node.isCallExpression(call) && call.getArguments().every(isInertExpression) ? lowerRecipeCall(call, entry, ctx, resolvedSelection) : {
-						kind: "decline",
-						reason: "dynamic"
-					};
+					const lowered = lowerRecipeCall(call, entry, ctx, isInertExpression, resolvedSelection);
 					if (lowered.kind === "expression") {
 						const helper = ensureRecipeHelperImport(call, isBambooCssModule, isGeneratedCssModule, isShadowed);
 						if (helper) {

package/dist/index.d.cts

@@ -2,7 +2,6 @@ import { Plugin } from "vite";
 import { Context } from "@bamboocss/core";
 import { Dict, ParserResultInterface } from "@bamboocss/types";
 import MagicString from "magic-string";
-
 //#region src/css.d.ts
 /**
  * What a project imports to get the stylesheet.

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import MagicString from "magic-string";
+import { Node } from "ts-morph";
 import { Context } from "@bamboocss/core";
 import { Plugin } from "vite";
 import { Dict, ParserResultInterface } from "@bamboocss/types";

package/dist/index.mjs

@@ -854,7 +854,7 @@ const ensureRecipeHelperImport = (call, isBambooCssModule, isGeneratedCssModule,
 * an unresolved variant does not merely omit a class, it can change which of several the
 * recipe applies — so a partially-known selection is not foldable at all.
 */
-const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
+const lowerRecipeCall = (call, entry, ctx, isInert, resolvedSelection) => {
 	if (!entry || entry === AMBIGUOUS) return {
 		kind: "decline",
 		reason: "unknown-recipe"
@@ -880,6 +880,13 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 	const selection = {};
 	/** Variant → the source expression selecting it, for axes that stay runtime decisions. */
 	const dynamicAxes = /* @__PURE__ */ new Map();
+	/**
+	* Variants whose expression could run something, in the order the source evaluates them.
+	*
+	* The text is kept, not just the key: a later property writing the same key replaces the
+	* entry in `dynamicAxes`, and the expression recorded here would then never be emitted.
+	*/
+	const effectful = [];
 	if (args.length === 1) {
 		const arg = args[0];
 		if (!arg || !Node.isObjectLiteralExpression(arg)) return {
@@ -910,14 +917,27 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 				kind: "decline",
 				reason: "dynamic"
 			};
-			const literal = literalValue(property.getInitializer());
+			const initializer = property.getInitializer();
+			if (initializer && !isInert(initializer)) {
+				if (!Object.hasOwn(config.variants ?? {}, key)) return {
+					kind: "decline",
+					reason: "dynamic"
+				};
+				effectful.push({
+					key,
+					text: initializer.getText()
+				});
+				dynamicAxes.set(key, initializer.getText());
+				delete selection[key];
+				continue;
+			}
+			const literal = literalValue(initializer);
 			if (literal !== void 0) {
 				selection[key] = literal;
 				dynamicAxes.delete(key);
 				continue;
 			}
 			if (!resolvedSelection || !Object.hasOwn(resolvedSelection, key)) {
-				const initializer = property.getInitializer();
 				if (!initializer) return {
 					kind: "decline",
 					reason: "dynamic"
@@ -935,24 +955,47 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 			dynamicAxes.delete(key);
 		}
 	}
+	/**
+	* Every expression that could run something has to reach the output carrying its own text.
+	*
+	* A later property writing the same key replaces it in `dynamicAxes` — `badge({ tone: a(),
+	* tone: 'b' })` is last-wins for the *value*, but `a()` still runs, and emitting only the
+	* literal would delete it. Duplicate keys are a type error in TypeScript; the fold does not
+	* typecheck and does transform `.js`, so this is reachable.
+	*/
+	const everyEffectSurvives = () => effectful.every(({ key, text }) => dynamicAxes.get(key) === text);
 	const merged = {
 		...config.defaultVariants ?? {},
 		...compact(selection)
 	};
 	const format = classFormatter(ctx);
-	if (dynamicAxes.size === 0) return {
-		kind: "class",
-		className: getRecipeClassNames(name, config.variants, merged, ctx.utility.separator, format)
-	};
-	for (const key of [...dynamicAxes.keys()]) if (!config.variants?.[key]) dynamicAxes.delete(key);
 	if (dynamicAxes.size === 0) {
-		const staticOnly = { ...merged };
-		for (const key of dynamicAxes.keys()) delete staticOnly[key];
+		if (!everyEffectSurvives()) return {
+			kind: "decline",
+			reason: "dynamic"
+		};
 		return {
 			kind: "class",
-			className: getRecipeClassNames(name, config.variants, staticOnly, ctx.utility.separator, format)
+			className: getRecipeClassNames(name, config.variants, merged, ctx.utility.separator, format)
+		};
+	}
+	if (!everyEffectSurvives()) return {
+		kind: "decline",
+		reason: "dynamic"
+	};
+	if (effectful.length > 1) {
+		const variantOrder = Object.keys(config.variants ?? {});
+		const keys = effectful.map((entry) => entry.key);
+		if ([...keys].sort((a, b) => variantOrder.indexOf(a) - variantOrder.indexOf(b)).join("\0") !== keys.join("\0")) return {
+			kind: "decline",
+			reason: "dynamic"
 		};
 	}
+	for (const key of [...dynamicAxes.keys()]) if (!Object.hasOwn(config.variants ?? {}, key)) dynamicAxes.delete(key);
+	if (dynamicAxes.size === 0) return {
+		kind: "class",
+		className: getRecipeClassNames(name, config.variants, merged, ctx.utility.separator, format)
+	};
 	const ownClass = format(name);
 	const parts = [JSON.stringify(ownClass)];
 	const classNames = [ownClass];
@@ -961,7 +1004,8 @@ const lowerRecipeCall = (call, entry, ctx, resolvedSelection) => {
 		if (expression === void 0) {
 			const value = merged[key];
 			if (value == null) continue;
-			if (config.variants?.[key]?.[value] == null) continue;
+			const declared = config.variants?.[key];
+			if (!declared || !Object.hasOwn(declared, value) || declared[value] == null) continue;
 			const className = format(`${name}--${key}${ctx.utility.separator}${withoutSpace(value)}`);
 			parts.push(JSON.stringify(` ${className}`));
 			classNames.push(className);
@@ -1608,10 +1652,7 @@ const foldSource = (options) => {
 					recipeCalls.set(name, tally);
 					const resolvedSelection = item.data?.length === 1 ? item.data[0] : void 0;
 					const entry = recipeConfigs.get(name);
-					const lowered = Node.isCallExpression(call) && call.getArguments().every(isInertExpression) ? lowerRecipeCall(call, entry, ctx, resolvedSelection) : {
-						kind: "decline",
-						reason: "dynamic"
-					};
+					const lowered = lowerRecipeCall(call, entry, ctx, isInertExpression, resolvedSelection);
 					if (lowered.kind === "expression") {
 						const helper = ensureRecipeHelperImport(call, isBambooCssModule, isGeneratedCssModule, isShadowed);
 						if (helper) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/vite",
-  "version": "1.23.0",
+  "version": "1.24.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.23.0",
-    "@bamboocss/extractor": "1.23.0",
-    "@bamboocss/config": "1.23.0",
-    "@bamboocss/node": "1.23.0",
-    "@bamboocss/logger": "1.23.0",
-    "@bamboocss/shared": "1.23.0",
-    "@bamboocss/types": "1.23.0"
+    "@bamboocss/config": "1.24.0",
+    "@bamboocss/core": "1.24.0",
+    "@bamboocss/extractor": "1.24.0",
+    "@bamboocss/logger": "1.24.0",
+    "@bamboocss/node": "1.24.0",
+    "@bamboocss/shared": "1.24.0",
+    "@bamboocss/types": "1.24.0"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "vite": "7.2.6",
-    "@bamboocss/fixture": "1.23.0"
+    "@bamboocss/fixture": "1.24.0"
   },
   "peerDependencies": {
     "vite": ">=5"