babel-plugin-jsx-dom-expressions 0.30.5 → 0.30.9

package/index.js

@@ -319,12 +319,13 @@ function isDynamic(path, { checkMember, checkTags, checkCallExpressions = true,
 
 function getStaticExpression(path) {
   const node = path.node;
-  let value;
+  let value, type;
   return (
     t__namespace.isJSXExpressionContainer(node) &&
     t__namespace.isJSXElement(path.parent) &&
     !isComponent(getTagName(path.parent)) &&
     (value = path.get("expression").evaluate().value) !== undefined &&
+    ((type = typeof value) === "string" || type === "number") &&
     value
   );
 }
@@ -392,12 +393,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 +408,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 +437,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(
@@ -2322,12 +2331,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",
@@ -2445,7 +2450,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;
     }, []);
@@ -2547,7 +2552,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.5",
+  "version": "0.30.9",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.11.5",
     "html-entities": "2.3.2"
   },
-  "gitHead": "a8b08272aaaffe70374ad9bd2703f4b730b34706"
+  "gitHead": "a31ebd7b178840291107cb7156157f6df74524b2"
 }