babel-plugin-jsx-dom-expressions 0.32.8 → 0.32.11

package/index.js

@@ -286,6 +286,9 @@ function isDynamic(path, { checkMember, checkTags, checkCallExpressions = true,
   let dynamic;
   path.traverse({
     Function(p) {
+      if (t__namespace.isObjectMethod(p.node) && p.node.computed) {
+        dynamic = isDynamic(p.get("key"), { checkMember, checkTags, checkCallExpressions, native });
+      }
       p.skip();
     },
     CallExpression(p) {
@@ -774,7 +777,7 @@ function transformAttributes$2(path, results) {
         values.push(t__namespace.logicalExpression("||", attr.value.expression, t__namespace.stringLiteral("")));
         quasis.push(t__namespace.TemplateElement({ raw: isLast ? "" : " " }));
       }
-      i && attributes.splice(classAttributes[i].key, 1);
+      i && attributes.splice(attributes.indexOf(classAttributes[i]), 1);
     }
     if (values.length) first.value = t__namespace.JSXExpressionContainer(t__namespace.TemplateLiteral(quasis, values));
     else first.value = t__namespace.stringLiteral(quasis[0].value.raw);
@@ -1642,7 +1645,7 @@ function transformAttributes$1(path, results) {
         if (attr.name.name === "classList") {
           if (t__namespace.isObjectExpression(expr) && !expr.properties.some(p => t__namespace.isSpreadElement(p))) {
             transformClasslistObject(path, expr, values, quasis);
-            i && attributes.splice(attributes.indexOf(classAttributes[i].node), 1);
+            i && attributes.splice(attributes.indexOf(classAttributes[i]), 1);
             continue;
           }
           expr = t__namespace.callExpression(registerImportMethod(path, "ssrClassList"), [expr]);
@@ -1650,7 +1653,7 @@ function transformAttributes$1(path, results) {
         values.push(t__namespace.logicalExpression("||", expr, t__namespace.stringLiteral("")));
         quasis.push(t__namespace.TemplateElement({ raw: isLast ? "" : " " }));
       }
-      i && attributes.splice(attributes.indexOf(classAttributes[i].node), 1);
+      i && attributes.splice(attributes.indexOf(classAttributes[i]), 1);
     }
     first.value = t__namespace.JSXExpressionContainer(t__namespace.TemplateLiteral(quasis, values));
   }
@@ -2215,11 +2218,7 @@ function convertComponentIdentifier(node) {
   } else if (t__namespace.isJSXMemberExpression(node)) {
     const prop = convertComponentIdentifier(node.property);
     const computed = t__namespace.isStringLiteral(prop);
-    return t__namespace.memberExpression(
-      convertComponentIdentifier(node.object),
-      prop,
-      computed
-    );
+    return t__namespace.memberExpression(convertComponentIdentifier(node.object), prop, computed);
   }
 
   return node;
@@ -2272,7 +2271,10 @@ function transformComponent(path) {
           isDynamic(attribute.get("argument"), {
             checkMember: true
           }) && (dynamicSpread = true)
-            ? t__namespace.isCallExpression(node.argument) && !node.argument.arguments.length
+            ? t__namespace.isCallExpression(node.argument) &&
+              !node.argument.arguments.length &&
+              !t__namespace.isCallExpression(node.argument.callee) &&
+              !t__namespace.isMemberExpression(node.argument.callee)
               ? node.argument.callee
               : t__namespace.arrowFunctionExpression([], node.argument)
             : node.argument
@@ -2510,9 +2512,6 @@ function transformThis(path) {
     ThisExpression(path) {
       thisId || (thisId = path.scope.generateUidIdentifier("self$"));
       path.replaceWith(thisId);
-    },
-    Function(p) {
-      p.skip();
     }
   });
   return node => {

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.8",
+  "version": "0.32.11",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.16.0",
     "html-entities": "2.3.2"
   },
-  "gitHead": "eb04f05afe9f5509132b9734b19d804aed55562f"
+  "gitHead": "d4b76380fe65699d7d57b99df26247ddf56561f5"
 }