@homebound/truss 2.11.0 → 2.11.2

package/build/plugin/index.js

@@ -2848,7 +2848,7 @@ function hasExistingAttribute(path, attrName) {
 var traverse2 = _traverse2.default ?? _traverse2;
 var generate2 = _generate2.default ?? _generate2;
 function transformTruss(code, filename, mapping, options = {}) {
-  if (!code.includes("Css")) return null;
+  if (!code.includes("Css") && !code.includes("css=")) return null;
   const ast = parse(code, {
     sourceType: "module",
     plugins: ["typescript", "jsx"],
@@ -2856,14 +2856,15 @@ function transformTruss(code, filename, mapping, options = {}) {
   });
   const cssImportBinding = findCssImportBinding(ast);
   const cssBindingName = cssImportBinding ?? findCssBuilderBinding(ast);
-  if (!cssBindingName) return null;
   const cssIsImported = cssImportBinding !== null;
   const sites = [];
   const errorMessages = [];
   let hasCssPropsCall = false;
+  let hasJsxCssAttribute = false;
   traverse2(ast, {
     // -- Css.*.$  chain collection --
     MemberExpression(path) {
+      if (!cssBindingName) return;
       if (!t4.isIdentifier(path.node.property, { name: "$" })) return;
       if (path.node.computed) return;
       const chain = extractChain(path.node.object, cssBindingName);
@@ -2881,14 +2882,21 @@ function transformTruss(code, filename, mapping, options = {}) {
     },
     // -- Css.props() detection (so we don't bail early when there are no Css.*.$ sites) --
     CallExpression(path) {
-      if (hasCssPropsCall) return;
+      if (!cssBindingName || hasCssPropsCall) return;
       const callee = path.node.callee;
       if (t4.isMemberExpression(callee) && !callee.computed && t4.isIdentifier(callee.object, { name: cssBindingName }) && t4.isIdentifier(callee.property, { name: "props" })) {
         hasCssPropsCall = true;
       }
+    },
+    // -- JSX css={...} attribute detection (so we don't bail when there are only css props) --
+    JSXAttribute(path) {
+      if (hasJsxCssAttribute) return;
+      if (t4.isJSXIdentifier(path.node.name, { name: "css" })) {
+        hasJsxCssAttribute = true;
+      }
     }
   });
-  if (sites.length === 0 && !hasCssPropsCall) return null;
+  if (sites.length === 0 && !hasCssPropsCall && !hasJsxCssAttribute) return null;
   const chains = sites.map((s) => s.resolvedChain);
   const { rules, needsMaybeInc } = collectAtomicRules(chains, mapping);
   const cssText = generateCssText(rules);
@@ -2911,7 +2919,7 @@ function transformTruss(code, filename, mapping, options = {}) {
   rewriteExpressionSites({
     ast,
     sites,
-    cssBindingName,
+    cssBindingName: cssBindingName ?? "",
     filename: basename(filename),
     debug: options.debug ?? false,
     mapping,
@@ -2939,9 +2947,9 @@ function transformTruss(code, filename, mapping, options = {}) {
   }
   let reusedCssImportLine = false;
   if (cssIsImported) {
-    reusedCssImportLine = runtimeImports.length > 0 && findImportDeclaration(ast, "@homebound/truss/runtime") === null && replaceCssImportWithNamedImports(ast, cssBindingName, "@homebound/truss/runtime", runtimeImports);
+    reusedCssImportLine = runtimeImports.length > 0 && findImportDeclaration(ast, "@homebound/truss/runtime") === null && replaceCssImportWithNamedImports(ast, cssImportBinding, "@homebound/truss/runtime", runtimeImports);
     if (!reusedCssImportLine) {
-      removeCssImport(ast, cssBindingName);
+      removeCssImport(ast, cssImportBinding);
     }
   }
   if (runtimeImports.length > 0 && !reusedCssImportLine) {