@bamboocss/extractor 1.28.0 → 1.29.0

package/dist/index.cjs

@@ -756,24 +756,23 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (ctx.tokens) {
 			const expr = node.getExpression();
 			let fnName = "";
-			let isVarMethod = false;
+			let isValueMethod = false;
 			if (ts_morph.Node.isIdentifier(expr)) fnName = expr.getText();
 			else if (ts_morph.Node.isPropertyAccessExpression(expr)) {
-				const exprName = expr.getExpression();
 				const propertyName = expr.getName();
-				if (ts_morph.Node.isIdentifier(exprName)) {
-					fnName = exprName.getText();
-					isVarMethod = propertyName === "var";
-				}
+				if (propertyName === "var" || propertyName === "value") {
+					isValueMethod = propertyName === "value";
+					fnName = expr.getExpression().getText();
+				} else fnName = expr.getText();
 			}
 			if (ctx.tokens.isTokenFn ? ctx.tokens.isTokenFn(fnName) : fnName === "token") {
 				const args = node.getArguments();
 				const tokenPathArg = args[0];
-				if (tokenPathArg && ts_morph.Node.isStringLiteral(tokenPathArg)) {
-					const tokenPath = tokenPathArg.getLiteralValue();
+				const tokenPath = tokenPathArg ? literalStringOf(tokenPathArg, stack, ctx) : void 0;
+				if (tokenPath !== void 0) {
 					const fallbackArg = args[1];
-					const fallbackValue = fallbackArg && ts_morph.Node.isStringLiteral(fallbackArg) ? fallbackArg.getLiteralValue() : void 0;
-					const resolvedValue = isVarMethod ? ctx.tokens.view.getVar(tokenPath, fallbackValue) : ctx.tokens.view.get(tokenPath, fallbackValue);
+					const fallbackValue = fallbackArg ? literalStringOf(fallbackArg, stack, ctx) : void 0;
+					const resolvedValue = isValueMethod ? ctx.tokens.view.get(tokenPath, fallbackValue) : ctx.tokens.view.getVar(tokenPath, fallbackValue);
 					if (resolvedValue) return cache(box.literal(resolvedValue, node, stack));
 				}
 			}
@@ -800,6 +799,19 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (isOperationSyntax(operatorKind)) return cache(box.literal(safeEvaluateNode(node, stack, ctx), node, stack));
 	}
 }
+/**
+* An argument's value, when it resolves to a string.
+*
+* A string literal is the common case and answered without recursing. Anything else goes back
+* through `maybeBoxNode`, which is what follows a constant, a template literal or an imported
+* value to its literal — the same resolution every other extracted value already gets.
+* Returning `undefined` leaves the call unresolved, exactly as before.
+*/
+function literalStringOf(node, stack, ctx) {
+	if (ts_morph.Node.isStringLiteral(node)) return node.getLiteralValue();
+	const resolved = onlyStringLiteral(maybeBoxNode(node, stack, ctx));
+	return resolved && typeof resolved.value === "string" ? resolved.value : void 0;
+}
 const onlyStringLiteral = (boxNode) => {
 	if (!boxNode) return;
 	if (isBoxNode(boxNode) && box.isLiteral(boxNode) && typeof boxNode.value === "string") return boxNode;

package/dist/index.mjs

@@ -755,24 +755,23 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (ctx.tokens) {
 			const expr = node.getExpression();
 			let fnName = "";
-			let isVarMethod = false;
+			let isValueMethod = false;
 			if (Node.isIdentifier(expr)) fnName = expr.getText();
 			else if (Node.isPropertyAccessExpression(expr)) {
-				const exprName = expr.getExpression();
 				const propertyName = expr.getName();
-				if (Node.isIdentifier(exprName)) {
-					fnName = exprName.getText();
-					isVarMethod = propertyName === "var";
-				}
+				if (propertyName === "var" || propertyName === "value") {
+					isValueMethod = propertyName === "value";
+					fnName = expr.getExpression().getText();
+				} else fnName = expr.getText();
 			}
 			if (ctx.tokens.isTokenFn ? ctx.tokens.isTokenFn(fnName) : fnName === "token") {
 				const args = node.getArguments();
 				const tokenPathArg = args[0];
-				if (tokenPathArg && Node.isStringLiteral(tokenPathArg)) {
-					const tokenPath = tokenPathArg.getLiteralValue();
+				const tokenPath = tokenPathArg ? literalStringOf(tokenPathArg, stack, ctx) : void 0;
+				if (tokenPath !== void 0) {
 					const fallbackArg = args[1];
-					const fallbackValue = fallbackArg && Node.isStringLiteral(fallbackArg) ? fallbackArg.getLiteralValue() : void 0;
-					const resolvedValue = isVarMethod ? ctx.tokens.view.getVar(tokenPath, fallbackValue) : ctx.tokens.view.get(tokenPath, fallbackValue);
+					const fallbackValue = fallbackArg ? literalStringOf(fallbackArg, stack, ctx) : void 0;
+					const resolvedValue = isValueMethod ? ctx.tokens.view.get(tokenPath, fallbackValue) : ctx.tokens.view.getVar(tokenPath, fallbackValue);
 					if (resolvedValue) return cache(box.literal(resolvedValue, node, stack));
 				}
 			}
@@ -799,6 +798,19 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (isOperationSyntax(operatorKind)) return cache(box.literal(safeEvaluateNode(node, stack, ctx), node, stack));
 	}
 }
+/**
+* An argument's value, when it resolves to a string.
+*
+* A string literal is the common case and answered without recursing. Anything else goes back
+* through `maybeBoxNode`, which is what follows a constant, a template literal or an imported
+* value to its literal — the same resolution every other extracted value already gets.
+* Returning `undefined` leaves the call unresolved, exactly as before.
+*/
+function literalStringOf(node, stack, ctx) {
+	if (Node.isStringLiteral(node)) return node.getLiteralValue();
+	const resolved = onlyStringLiteral(maybeBoxNode(node, stack, ctx));
+	return resolved && typeof resolved.value === "string" ? resolved.value : void 0;
+}
 const onlyStringLiteral = (boxNode) => {
 	if (!boxNode) return;
 	if (isBoxNode(boxNode) && box.isLiteral(boxNode) && typeof boxNode.value === "string") return boxNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/extractor",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "The css extractor for css bamboo",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -35,7 +35,7 @@
   "dependencies": {
     "ts-evaluator": "2.0.0",
     "ts-morph": "28.0.0",
-    "@bamboocss/shared": "1.28.0"
+    "@bamboocss/shared": "1.29.0"
   },
   "scripts": {
     "build": "tsdown src/index.ts --format=cjs,esm --shims --dts",