@homebound/truss 2.3.0 → 2.3.2

package/build/plugin/index.js

@@ -602,13 +602,13 @@ var RELATIONSHIP_SHORT = {
   siblingBefore: "sibB",
   anySibling: "anyS"
 };
-var DEFAULT_MARKER_CLASS = "__truss_m";
+var DEFAULT_MARKER_CLASS = "_mrk";
 function markerClassName(markerNode) {
   if (!markerNode) return DEFAULT_MARKER_CLASS;
   if (markerNode.type === "Identifier" && markerNode.name) {
-    return `__truss_m_${markerNode.name}`;
+    return `_${markerNode.name}_mrk`;
   }
-  return `${DEFAULT_MARKER_CLASS}_marker`;
+  return "_marker_mrk";
 }
 function whenPrefix(whenPseudo) {
   const rel = RELATIONSHIP_SHORT[whenPseudo.relationship ?? "ancestor"] ?? "anc";
@@ -1615,10 +1615,10 @@ function resolveWhenMarker(node) {
   if (node.type === "Identifier") {
     return node;
   }
-  throw new UnsupportedPatternError(`when() marker must be a marker variable or defaultMarker`);
+  throw new UnsupportedPatternError(`when() marker must be a marker variable or marker`);
 }
 function isDefaultMarkerNode(node) {
-  if (node.type === "Identifier" && node.name === "defaultMarker") {
+  if (node.type === "Identifier" && (node.name === "marker" || node.name === "defaultMarker")) {
     return true;
   }
   return isLegacyDefaultMarkerExpression(node);
@@ -1858,6 +1858,17 @@ function findCssImportBinding(ast) {
   }
   return null;
 }
+function findCssBuilderBinding(ast) {
+  for (const node of ast.program.body) {
+    if (!t2.isVariableDeclaration(node)) continue;
+    for (const decl of node.declarations) {
+      if (t2.isIdentifier(decl.id) && decl.init && t2.isNewExpression(decl.init) && t2.isIdentifier(decl.init.callee, { name: "CssBuilder" })) {
+        return decl.id.name;
+      }
+    }
+  }
+  return null;
+}
 function hasCssMethodCall(ast, binding, method) {
   let found = false;
   t2.traverseFast(ast, (node) => {
@@ -2356,8 +2367,10 @@ function transformTruss(code, filename, mapping, options = {}) {
     plugins: ["typescript", "jsx"],
     sourceFilename: filename
   });
-  const cssBindingName = findCssImportBinding(ast);
+  const cssImportBinding = findCssImportBinding(ast);
+  const cssBindingName = cssImportBinding ?? findCssBuilderBinding(ast);
   if (!cssBindingName) return null;
+  const cssIsImported = cssImportBinding !== null;
   const sites = [];
   const errorMessages = [];
   traverse2(ast, {
@@ -2428,15 +2441,16 @@ function transformTruss(code, filename, mapping, options = {}) {
   if (options.injectCss) {
     runtimeImports.push({ importedName: "__injectTrussCSS", localName: "__injectTrussCSS" });
   }
-  const reusedCssImportLine = runtimeImports.length > 0 && findImportDeclaration(ast, "@homebound/truss/runtime") === null && replaceCssImportWithNamedImports(ast, cssBindingName, "@homebound/truss/runtime", runtimeImports);
-  if (!reusedCssImportLine) {
-    removeCssImport(ast, cssBindingName);
-  }
-  if (runtimeImports.length > 0) {
+  let reusedCssImportLine = false;
+  if (cssIsImported) {
+    reusedCssImportLine = runtimeImports.length > 0 && findImportDeclaration(ast, "@homebound/truss/runtime") === null && replaceCssImportWithNamedImports(ast, cssBindingName, "@homebound/truss/runtime", runtimeImports);
     if (!reusedCssImportLine) {
-      upsertNamedImports(ast, "@homebound/truss/runtime", runtimeImports);
+      removeCssImport(ast, cssBindingName);
     }
   }
+  if (runtimeImports.length > 0 && !reusedCssImportLine) {
+    upsertNamedImports(ast, "@homebound/truss/runtime", runtimeImports);
+  }
   const declarationsToInsert = [];
   if (maybeIncHelperName) {
     declarationsToInsert.push(buildMaybeIncDeclaration(maybeIncHelperName, mapping.increment));