babel-plugin-jsx-dom-expressions 0.32.17 → 0.33.0

package/index.js

@@ -594,7 +594,7 @@ function setAttr$2(path, elem, name, value, { isSVG, dynamic, prevId, isCE }) {
   }
 
   if (!isSVG && name === "class") {
-    return t__namespace.assignmentExpression("=", t__namespace.memberExpression(elem, t__namespace.identifier("className")), value);
+    return t__namespace.callExpression(registerImportMethod(path, "className", getRendererConfig(path, "dom").moduleName), [elem, value]);
   }
 
   if (name === "classList") {
@@ -1557,7 +1557,7 @@ function toAttribute(key, isSVG) {
   return key;
 }
 
-function setAttr$1(results, name, value, isSVG) {
+function setAttr$1(attribute, results, name, value, isSVG) {
   // strip out namespaces for now, everything at this point is an attribute
   let parts;
   if ((parts = name.split(":")) && parts[1] && reservedNameSpaces.has(parts[0])) {
@@ -1565,9 +1565,18 @@ function setAttr$1(results, name, value, isSVG) {
   }
 
   name = toAttribute(name, isSVG);
-  appendToTemplate(results.template, ` ${name}="`);
-  results.template.push(`"`);
-  results.templateValues.push(value);
+  const attr = t__namespace.callExpression(registerImportMethod(attribute, "ssrAttribute"), [
+    t__namespace.stringLiteral(name),
+    value,
+    t__namespace.booleanLiteral(false)
+  ]);
+  if (results.template[results.template.length - 1].length) {
+    results.template.push("");
+    results.templateValues.push(attr);
+  } else {
+    const last = results.templateValues.length - 1;
+    results.templateValues[last] = t__namespace.binaryExpression("+", results.templateValues[last], attr);
+  }
 }
 
 function escapeExpression(path, expression, attr) {
@@ -1754,23 +1763,15 @@ function transformAttributes$1(path, results) {
         children = value;
         if (key === "innerHTML") path.doNotEscape = true;
       } else {
-        let dynamic = false,
-          doEscape = true;
-        if (
-          isDynamic(attribute.get("value").get("expression"), {
-            checkMember: true,
-            native: true
-          })
-        )
-          dynamic = true;
-
+        let doEscape = true;
         if (BooleanAttributes.has(key)) {
           results.template.push("");
-          const fn = t__namespace.callExpression(registerImportMethod(attribute, "ssrBoolean"), [
+          const fn = t__namespace.callExpression(registerImportMethod(attribute, "ssrAttribute"), [
             t__namespace.stringLiteral(key),
-            value.expression
+            value.expression,
+            t__namespace.booleanLiteral(true)
           ]);
-          results.templateValues.push(dynamic ? t__namespace.arrowFunctionExpression([], fn) : fn);
+          results.templateValues.push(fn);
           return;
         }
         if (key === "style") {
@@ -1829,13 +1830,15 @@ function transformAttributes$1(path, results) {
           key = "class";
           doEscape = false;
         }
-        if (dynamic)
-          value.expression = t__namespace.arrowFunctionExpression(
-            [],
-            doEscape ? escapeExpression(path, value.expression, true) : value.expression
-          );
-        else if (doEscape) value.expression = escapeExpression(path, value.expression, true);
-        setAttr$1(results, key, value.expression, isSVG);
+        if (doEscape)
+          value.expression = escapeExpression(path, value.expression, true);
+
+        if (!doEscape || t__namespace.isLiteral(value.expression) || t__namespace.isBinaryExpression(value.expression)) {
+          key = toAttribute(key, isSVG);
+          appendToTemplate(results.template, ` ${key}="`);
+          results.template.push(`"`);
+          results.templateValues.push(value.expression);
+        } else setAttr$1(attribute, results, key, value.expression, isSVG);
       }
     } else {
       if (key === "$ServerOnly") return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-jsx-dom-expressions",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "0.32.17",
+  "version": "0.33.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.16.0",
     "html-entities": "2.3.2"
   },
-  "gitHead": "44833242fc589628431ee04aa8d319f424ba4845"
+  "gitHead": "1f388eacd1601e06e84689837a5363f13ae5ffe7"
 }