babel-plugin-jsx-dom-expressions 0.30.3 → 0.30.8

package/index.js

@@ -392,12 +392,10 @@ function wrappedByText(list, startIndex) {
   return false;
 }
 
-function transformCondition(path, deep) {
+function transformCondition(path, inline, deep) {
   const config = getConfig(path);
   const expr = path.node;
-  if (config.memoWrapper) {
-    registerImportMethod(path, config.memoWrapper);
-  }
+  registerImportMethod(path, config.memoWrapper);
   let dTest, cond, id;
   if (
     t__namespace.isConditionalExpression(expr) &&
@@ -409,15 +407,20 @@ function transformCondition(path, deep) {
     dTest = isDynamic(path.get("test"), { checkMember: true });
     if (dTest) {
       cond = expr.test;
-      id = path.scope.generateUidIdentifier("_c$");
       if (!t__namespace.isBinaryExpression(cond))
         cond = t__namespace.unaryExpression("!", t__namespace.unaryExpression("!", cond, true), true);
+      id = inline
+        ? t__namespace.callExpression(t__namespace.identifier(`_$${config.memoWrapper}`), [
+            t__namespace.arrowFunctionExpression([], cond),
+            t__namespace.booleanLiteral(true)
+          ])
+        : path.scope.generateUidIdentifier("_c$");
       expr.test = t__namespace.callExpression(id, []);
       if (t__namespace.isConditionalExpression(expr.consequent) || t__namespace.isLogicalExpression(expr.consequent)) {
-        expr.consequent = transformCondition(path.get("consequent"), true);
+        expr.consequent = transformCondition(path.get("consequent"), inline, true);
       }
       if (t__namespace.isConditionalExpression(expr.alternate) || t__namespace.isLogicalExpression(expr.alternate)) {
-        expr.alternate = transformCondition(path.get("alternate"), true);
+        expr.alternate = transformCondition(path.get("alternate"), inline, true);
       }
     }
   } else if (t__namespace.isLogicalExpression(expr)) {
@@ -433,13 +436,18 @@ function transformCondition(path, deep) {
       }));
     if (dTest) {
       cond = nextPath.node.left;
-      id = path.scope.generateUidIdentifier("_c$");
       if (!t__namespace.isBinaryExpression(cond))
         cond = t__namespace.unaryExpression("!", t__namespace.unaryExpression("!", cond, true), true);
+      id = inline
+        ? t__namespace.callExpression(t__namespace.identifier(`_$${config.memoWrapper}`), [
+            t__namespace.arrowFunctionExpression([], cond),
+            t__namespace.booleanLiteral(true)
+          ])
+        : path.scope.generateUidIdentifier("_c$");
       nextPath.node.left = t__namespace.callExpression(id, []);
     }
   }
-  if (dTest) {
+  if (dTest && !inline) {
     const statements = [
       t__namespace.variableDeclaration("const", [
         t__namespace.variableDeclarator(
@@ -813,6 +821,16 @@ function transformAttributes$2(path, results) {
           : node.name.name,
         reservedNameSpace =
           t__namespace.isJSXNamespacedName(node.name) && reservedNameSpaces.has(node.name.namespace.name);
+      if (t__namespace.isJSXExpressionContainer(value)) {
+        const evaluated = attribute.get("value").get("expression").evaluate().value;
+        let type;
+        if (
+          evaluated !== undefined &&
+          ((type = typeof evaluated) === "string" || type === "number")
+        ) {
+          value = t__namespace.stringLiteral(String(evaluated));
+        }
+      }
       if (
         t__namespace.isJSXNamespacedName(node.name) &&
         reservedNameSpace &&
@@ -2199,6 +2217,7 @@ function transformComponent(path) {
     tagName = getTagName(path.node),
     props = [],
     runningObject = [],
+    dynamicSpread = false,
     hasChildren = path.node.children.length > 0;
 
   if (config.builtIns.indexOf(tagName) > -1 && !path.scope.hasBinding(tagName)) {
@@ -2219,7 +2238,7 @@ function transformComponent(path) {
         props.push(
           isDynamic(attribute.get("argument"), {
             checkMember: true
-          })
+          }) && (dynamicSpread = true)
             ? t__namespace.isCallExpression(node.argument) && !node.argument.arguments.length
               ? node.argument.callee
               : t__namespace.arrowFunctionExpression([], node.argument)
@@ -2311,12 +2330,8 @@ function transformComponent(path) {
               config.generate !== "ssr" &&
               (t__namespace.isLogicalExpression(value.expression) ||
                 t__namespace.isConditionalExpression(value.expression))
-                ? transformCondition(attribute.get("value").get("expression"))
+                ? transformCondition(attribute.get("value").get("expression"), true)
                 : t__namespace.arrowFunctionExpression([], value.expression);
-            if (expr.length > 1) {
-              exprs.push(expr[0]);
-              expr = expr[1];
-            }
             runningObject.push(
               t__namespace.objectMethod(
                 "get",
@@ -2350,7 +2365,7 @@ function transformComponent(path) {
   }
   if (runningObject.length || !props.length) props.push(t__namespace.objectExpression(runningObject));
 
-  if (props.length > 1) {
+  if (props.length > 1 || dynamicSpread) {
     registerImportMethod(path, "mergeProps");
     props = [t__namespace.callExpression(t__namespace.identifier("_$mergeProps"), props)];
   }
@@ -2434,7 +2449,7 @@ function transformFragmentChildren(children, results, config) {
         if (v.length) memo.push(t__namespace.stringLiteral(v));
       } else {
         const child = transformNode(path, { topLevel: true, fragmentChild: true });
-        memo.push(createTemplate$3(path, child, !singleChild));
+        memo.push(createTemplate$3(path, child, true));
       }
       return memo;
     }, []);
@@ -2536,7 +2551,7 @@ function transformNode(path, info = {}) {
       config.wrapConditionals &&
       config.generate !== "ssr" &&
       (t__namespace.isLogicalExpression(node.expression) || t__namespace.isConditionalExpression(node.expression))
-        ? transformCondition(path.get("expression"))
+        ? transformCondition(path.get("expression"), info.componentChild)
         : !info.componentChild &&
           (config.generate !== "ssr" || info.fragmentChild) &&
           t__namespace.isCallExpression(node.expression) &&

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.30.3",
+  "version": "0.30.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.11.5",
     "html-entities": "2.3.2"
   },
-  "gitHead": "4eb94a2d860cb1b1fa09cce9b47c52e72f2e6648"
+  "gitHead": "b8381ac126158615afb3438a31c8c35204a0cfaf"
 }