babel-plugin-jsx-dom-expressions 0.37.7 → 0.37.9

package/index.js

@@ -36,6 +36,7 @@ const booleans = [
   "formnovalidate",
   "hidden",
   "indeterminate",
+  "inert",
   "ismap",
   "loop",
   "multiple",
@@ -321,16 +322,50 @@ function isDynamic(path, { checkMember, checkTags, checkCallExpressions = true,
     expr.leadingComments.shift();
     return false;
   }
+
   if (
-    (checkCallExpressions && (t__namespace.isCallExpression(expr) || t__namespace.isOptionalCallExpression(expr))) ||
-    (checkMember &&
-      (t__namespace.isMemberExpression(expr) ||
-        t__namespace.isOptionalMemberExpression(expr) ||
-        t__namespace.isSpreadElement(expr) ||
-        (t__namespace.isBinaryExpression(expr) && expr.operator === "in"))) ||
-    (checkTags && (t__namespace.isJSXElement(expr) || t__namespace.isJSXFragment(expr)))
-  )
+    checkCallExpressions &&
+    (t__namespace.isCallExpression(expr) || t__namespace.isOptionalCallExpression(expr))
+  ) {
     return true;
+  }
+
+  if (checkMember && t__namespace.isMemberExpression(expr)) {
+    // Do not assume property access on namespaced imports as dynamic.
+    const object = path.get("object").node;
+
+    if (
+      t__namespace.isIdentifier(object) &&
+      (!expr.computed ||
+        !isDynamic(path.get("property"), {
+          checkMember,
+          checkTags,
+          checkCallExpressions,
+          native,
+        }))
+    ) {
+      const binding = path.scope.getBinding(object.name);
+
+      if (binding && binding.path.isImportNamespaceSpecifier()) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  if (
+    checkMember &&
+    (t__namespace.isOptionalMemberExpression(expr) ||
+      t__namespace.isSpreadElement(expr) ||
+      (t__namespace.isBinaryExpression(expr) && expr.operator === "in"))
+  ) {
+    return true;
+  }
+
+  if (checkTags && (t__namespace.isJSXElement(expr) || t__namespace.isJSXFragment(expr))) {
+    return true;
+  }
 
   let dynamic;
   path.traverse({
@@ -2378,7 +2413,7 @@ function transformAttributes$1(path, results, info) {
       if (t__namespace.isJSXExpressionContainer(value)) value = value.expression;
       key = toAttribute(key, isSVG);
       const isBoolean = BooleanAttributes.has(key);
-      if (isBoolean && value.value !== "" && !value.value) return;
+      if (isBoolean && value && value.value !== "" && !value.value) return;
       appendToTemplate(results.template, ` ${key}`);
       if (!value) return;
       let text = isBoolean ? "" : value.value;
@@ -3054,6 +3089,7 @@ function wrapDynamics(path, dynamics) {
 
 function convertComponentIdentifier(node) {
   if (t__namespace.isJSXIdentifier(node)) {
+    if (node.name === 'this') return t__namespace.thisExpression();
     if (t__namespace.isValidIdentifier(node.name)) node.type = "Identifier";
     else return t__namespace.stringLiteral(node.name);
   } else if (t__namespace.isJSXMemberExpression(node)) {
@@ -3352,21 +3388,50 @@ function transformJSX(path) {
   path.replaceWith(replace(template(path, result, false)));
 }
 
+function getTargetFunctionParent(path, parent) {
+  let current = path.scope.getFunctionParent();
+  while (current !== parent && current.path.isArrowFunctionExpression()) {
+    current = current.path.parentPath.scope.getFunctionParent();
+  }
+  return current;
+}
+
 function transformThis(path) {
+  const parent = path.scope.getFunctionParent();
   let thisId;
   path.traverse({
     ThisExpression(path) {
-      thisId || (thisId = path.scope.generateUidIdentifier("self$"));
-      path.replaceWith(thisId);
-    }
+      const current = getTargetFunctionParent(path, parent);
+      if (current === parent) {
+        thisId || (thisId = path.scope.generateUidIdentifier("self$"));
+        path.replaceWith(thisId);
+      }
+    },
+    JSXElement(path) {
+      let source = path.get('openingElement').get('name');
+      while (source.isJSXMemberExpression()) {
+        source = source.get('object');
+      }
+      if (source.isJSXIdentifier() && source.node.name === 'this') {
+        const current = getTargetFunctionParent(path, parent);
+        if (current === parent) {
+          thisId || (thisId = path.scope.generateUidIdentifier("self$"));
+          source.replaceWith(t__namespace.jsxIdentifier(thisId.name));
+
+          if (path.node.closingElement) {
+            path.node.closingElement.name = path.node.openingElement.name;
+          }
+        }
+      } 
+    },
   });
   return node => {
     if (thisId) {
-      let parent = path.getStatementParent();
-      const decl = t__namespace.variableDeclaration("const", [
-        t__namespace.variableDeclarator(thisId, t__namespace.thisExpression())
-      ]);
-      parent.insertBefore(decl);
+      parent.push({
+        id: thisId,
+        init: t__namespace.thisExpression(),
+        kind: 'const',
+      });
     }
     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.37.7",
+  "version": "0.37.9",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@babel/core": "^7.20.12"
   },
-  "gitHead": "5a6904fe67f815157f00496c23a538f4b8218ad0"
+  "gitHead": "2079bbeb5908166253370dd02ba1ce99afb2a2d4"
 }