babel-plugin-jsx-dom-expressions 0.29.16 → 0.29.17

package/index.js

@@ -46,7 +46,6 @@ var config = {
 
 const booleans = [
   "allowfullscreen",
-  "allowpaymentrequest",
   "async",
   "autofocus",
   "autoplay",
@@ -56,8 +55,8 @@ const booleans = [
   "disabled",
   "formnovalidate",
   "hidden",
+  "indeterminate",
   "ismap",
-  "itemscope",
   "loop",
   "multiple",
   "muted",
@@ -69,13 +68,12 @@ const booleans = [
   "required",
   "reversed",
   "seamless",
-  "selected",
-  "truespeed"
+  "selected"
 ];
 
 const BooleanAttributes = new Set(booleans);
 
-const Properties = new Set(["className", "indeterminate", "value", "readOnly", ...booleans]);
+const Properties = new Set(["className", "value", "readOnly", "formNoValidate", "isMap", "noModule", "playsInline", ...booleans]);
 
 const ChildProperties = new Set(["innerHTML", "textContent", "innerText", "children"]);
 
@@ -87,6 +85,10 @@ const Aliases = {
 
 const PropAliases = {
   class: "className",
+  formnovalidate: "formNoValidate",
+  ismap: "isMap",
+  nomodule: "noModule",
+  playsinline: "playsInline",
   readonly: "readOnly"
 };
 
@@ -337,12 +339,11 @@ function getStaticExpression(path) {
 }
 
 // remove unnecessary JSX Text nodes
-function filterChildren(children, loose) {
+function filterChildren(children) {
   return children.filter(
     ({ node: child }) =>
       !(t__namespace.isJSXExpressionContainer(child) && t__namespace.isJSXEmptyExpression(child.expression)) &&
-      (!t__namespace.isJSXText(child) ||
-        (loose ? !/^[\r\n]\s*$/.test(child.extra.raw) : !/^\s*$/.test(child.extra.raw)))
+      (!t__namespace.isJSXText(child) || !/^[\r\n]\s*$/.test(child.extra.raw))
   );
 }
 
@@ -806,6 +807,10 @@ function transformAttributes$1(path, results) {
           !(t__namespace.isStringLiteral(value.expression) || t__namespace.isNumericLiteral(value.expression)))
       ) {
         if (key === "ref") {
+          // Normalize expressions for non-null and type-as
+          while (t__namespace.isTSNonNullExpression(value.expression) || t__namespace.isTSAsExpression(value.expression)) {
+            value.expression = value.expression.expression;
+          }
           if (t__namespace.isLVal(value.expression)) {
             const refIdentifier = path.scope.generateUidIdentifier("_ref$");
             results.exprs.unshift(
@@ -1049,7 +1054,7 @@ function transformChildren$1(path, results) {
     tagName = getTagName(path.node),
     nextPlaceholder,
     i = 0;
-  const filteredChildren = filterChildren(path.get("children"), true),
+  const filteredChildren = filterChildren(path.get("children")),
     childNodes = filteredChildren
       .map(
         (child, index) =>
@@ -1233,7 +1238,7 @@ function detectExpressions(children, index) {
         )
       )
         return true;
-      const nextChildren = filterChildren(children[i].get("children"), true);
+      const nextChildren = filterChildren(children[i].get("children"));
       if (nextChildren.length) if (detectExpressions(nextChildren, 0)) return true;
     }
   }
@@ -1463,7 +1468,6 @@ function setAttr(results, name, value, isSVG) {
   let parts;
   if ((parts = name.split(":")) && parts[1] && reservedNameSpaces.has(parts[0])) {
     name = parts[1];
-    parts[0];
   }
 
   name = toAttribute(name, isSVG);
@@ -1781,7 +1785,7 @@ function transformClasslistObject(path, expr, values, quasis) {
 function transformChildren(path, results) {
   const { hydratable } = config,
     doNotEscape = path.doNotEscape;
-  const filteredChildren = filterChildren(path.get("children"), true);
+  const filteredChildren = filterChildren(path.get("children"));
   filteredChildren.forEach(node => {
     const child = transformNode(node, { doNotEscape });
     appendToTemplate(results.template, child.template);
@@ -1883,6 +1887,10 @@ function transformComponent(path) {
         if (t__namespace.isJSXExpressionContainer(value))
           if (key === "ref") {
             if (config.generate === "ssr") return;
+            // Normalize expressions for non-null and type-as
+            while (t__namespace.isTSNonNullExpression(value.expression) || t__namespace.isTSAsExpression(value.expression)) {
+              value.expression = value.expression.expression;
+            }
             if (t__namespace.isLVal(value.expression)) {
               const refIdentifier = path.scope.generateUidIdentifier("_ref$");
               runningObject.push(
@@ -2013,18 +2021,20 @@ function transformComponentChildren(children) {
   if (!filteredChildren.length) return;
   let dynamic = false;
 
-  let transformedChildren = filteredChildren.map(path => {
+  let transformedChildren = filteredChildren.reduce((memo, path) => {
     if (t__namespace.isJSXText(path.node)) {
-      return t__namespace.stringLiteral(trimWhitespace(path.node.extra.rawValue));
+      const v = trimWhitespace(path.node.extra.rawValue);
+      if (v.length) memo.push(t__namespace.stringLiteral(v));
     } else {
       const child = transformNode(path, {
         topLevel: true,
         componentChild: true
       });
       dynamic = dynamic || child.dynamic;
-      return createTemplate$2(path, child, filteredChildren.length > 1);
+      memo.push(createTemplate$2(path, child, filteredChildren.length > 1));
     }
-  });
+    return memo;
+  }, []);
 
   if (filteredChildren.length === 1) {
     transformedChildren = transformedChildren[0];
@@ -2052,11 +2062,16 @@ function transformFragmentChildren(children, results) {
   const createTemplate$2 = config.generate === "ssr" ? createTemplate : createTemplate$1,
     filteredChildren = filterChildren(children),
     singleChild = filteredChildren.length === 1,
-    childNodes = filteredChildren.map(path => {
-      if (t__namespace.isJSXText(path.node)) return t__namespace.stringLiteral(trimWhitespace(path.node.extra.raw));
-      const child = transformNode(path, { topLevel: true, fragmentChild: true });
-      return createTemplate$2(path, child, !singleChild);
-    });
+    childNodes = filteredChildren.reduce((memo, path) => {
+      if (t__namespace.isJSXText(path.node)) {
+        const v = trimWhitespace(path.node.extra.raw);
+        if (v.length) memo.push(t__namespace.stringLiteral(v));
+      } else {
+        const child = transformNode(path, { topLevel: true, fragmentChild: true });
+        memo.push(createTemplate$2(path, child, !singleChild));
+      }
+      return memo;
+    }, []);
   results.exprs.push(singleChild ? childNodes[0] : t__namespace.arrayExpression(childNodes));
 }
 

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.29.16",
+  "version": "0.29.17",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -22,5 +22,5 @@
     "@babel/plugin-syntax-jsx": "^7.10.4",
     "@babel/types": "^7.11.5"
   },
-  "gitHead": "394e9b0081d5c6221a406ed18b4cd22329a32cc3"
+  "gitHead": "bdec422181ff938226a7a21b92ad4862b799f687"
 }