@homebound/truss 2.3.2 → 2.3.4

package/build/plugin/index.js

@@ -1869,16 +1869,6 @@ function findCssBuilderBinding(ast) {
   }
   return null;
 }
-function hasCssMethodCall(ast, binding, method) {
-  let found = false;
-  t2.traverseFast(ast, (node) => {
-    if (found) return;
-    if (t2.isCallExpression(node) && t2.isMemberExpression(node.callee) && !node.callee.computed && t2.isIdentifier(node.callee.object, { name: binding }) && t2.isIdentifier(node.callee.property, { name: method })) {
-      found = true;
-    }
-  });
-  return found;
-}
 function removeCssImport(ast, cssBinding) {
   for (let i = 0; i < ast.program.body.length; i++) {
     const node = ast.program.body[i];
@@ -2018,8 +2008,7 @@ function rewriteExpressionSites(options) {
       site.path.replaceWith(styleHash);
     }
   }
-  rewriteCssPropsCalls(options);
-  rewriteCssAttributeExpressions(options);
+  rewriteCssPropsAndCssAttributes(options);
 }
 function getCssAttributePath(path) {
   const parentPath = path.parentPath;
@@ -2284,13 +2273,13 @@ function removeExistingAttribute(path, attrName) {
   }
   return null;
 }
-function rewriteCssPropsCalls(options) {
+function rewriteCssPropsAndCssAttributes(options) {
   traverse(options.ast, {
+    // -- Css.props(expr) → trussProps(expr) or mergeProps(...) --
     CallExpression(path) {
       if (!isCssPropsCall(path.node, options.cssBindingName)) return;
       const arg = path.node.arguments[0];
       if (!arg || t3.isSpreadElement(arg) || !t3.isExpression(arg) || path.node.arguments.length !== 1) return;
-      const line = path.node.loc?.start.line ?? null;
       options.needsTrussPropsHelper.current = true;
       const classNameExpr = extractSiblingClassName(path);
       if (classNameExpr) {
@@ -2301,18 +2290,15 @@ function rewriteCssPropsCalls(options) {
       } else {
         path.replaceWith(t3.callExpression(t3.identifier(options.trussPropsHelperName), [arg]));
       }
-    }
-  });
-}
-function rewriteCssAttributeExpressions(options) {
-  traverse(options.ast, {
+    },
+    // -- Remaining css={expr} JSX attributes → {...trussProps(expr)} spreads --
+    // I.e. css={someVariable}, css={{ ...a, ...b }}, css={cond ? a : b}
     JSXAttribute(path) {
       if (!t3.isJSXIdentifier(path.node.name, { name: "css" })) return;
       const value = path.node.value;
       if (!t3.isJSXExpressionContainer(value)) return;
       if (!t3.isExpression(value.expression)) return;
       const expr = value.expression;
-      const line = path.node.loc?.start.line ?? null;
       const existingClassNameExpr = removeExistingAttribute(path, "className");
       const existingStyleExpr = removeExistingAttribute(path, "style");
       if (existingClassNameExpr || existingStyleExpr) {
@@ -2373,7 +2359,9 @@ function transformTruss(code, filename, mapping, options = {}) {
   const cssIsImported = cssImportBinding !== null;
   const sites = [];
   const errorMessages = [];
+  let hasCssPropsCall = false;
   traverse2(ast, {
+    // -- Css.*.$  chain collection --
     MemberExpression(path) {
       if (!t4.isIdentifier(path.node.property, { name: "$" })) return;
       if (path.node.computed) return;
@@ -2389,9 +2377,16 @@ function transformTruss(code, filename, mapping, options = {}) {
       for (const err of resolvedChain.errors) {
         errorMessages.push({ message: err, line });
       }
+    },
+    // -- Css.props() detection (so we don't bail early when there are no Css.*.$ sites) --
+    CallExpression(path) {
+      if (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;
+      }
     }
   });
-  const hasCssPropsCall = hasCssMethodCall(ast, cssBindingName, "props");
   if (sites.length === 0 && !hasCssPropsCall) return null;
   const chains = sites.map((s) => s.resolvedChain);
   const { rules, needsMaybeInc } = collectAtomicRules(chains, mapping);
@@ -2429,13 +2424,13 @@ function transformTruss(code, filename, mapping, options = {}) {
     runtimeLookupNames
   });
   const runtimeImports = [];
-  if (needsTrussPropsHelper.current) {
+  if (needsTrussPropsHelper.current && !existingTrussPropsHelperName) {
     runtimeImports.push({ importedName: "trussProps", localName: trussPropsHelperName });
   }
-  if (needsMergePropsHelper.current) {
+  if (needsMergePropsHelper.current && !existingMergePropsHelperName) {
     runtimeImports.push({ importedName: "mergeProps", localName: mergePropsHelperName });
   }
-  if (needsTrussDebugInfo.current) {
+  if (needsTrussDebugInfo.current && !existingTrussDebugInfoName) {
     runtimeImports.push({ importedName: "TrussDebugInfo", localName: trussDebugInfoName });
   }
   if (options.injectCss) {