babel-plugin-jsx-dom-expressions 0.31.1 → 0.31.11

package/index.js

@@ -1150,26 +1150,7 @@ function transformChildren$2(path, results, config) {
           t__namespace.expressionStatement(
             t__namespace.callExpression(
               insert,
-              config.hydratable
-                ? [
-                    results.id,
-                    child.exprs[0],
-                    t__namespace.identifier("undefined"),
-                    t__namespace.callExpression(
-                      t__namespace.memberExpression(
-                        t__namespace.memberExpression(
-                          t__namespace.memberExpression(t__namespace.identifier("Array"), t__namespace.identifier("prototype")),
-                          t__namespace.identifier("slice")
-                        ),
-                        t__namespace.identifier("call")
-                      ),
-                      [
-                        t__namespace.memberExpression(results.id, t__namespace.identifier("childNodes")),
-                        t__namespace.numericLiteral(0)
-                      ]
-                    )
-                  ]
-                : [results.id, child.exprs[0]]
+              [results.id, child.exprs[0]]
             )
           )
         );
@@ -1498,12 +1479,14 @@ function transformElement$1(path, info) {
     };
   if (info.topLevel && config.hydratable) {
     results.template.push("");
-    results.templateValues.push(t__namespace.callExpression(registerImportMethod(path, "ssrHydrationKey"), []));
+    results.templateValues.push(
+      t__namespace.callExpression(registerImportMethod(path, "ssrHydrationKey"), [])
+    );
   }
   transformAttributes$1(path, results);
   appendToTemplate(results.template, ">");
   if (!voidTag) {
-    transformChildren$1(path, results, {...config, ...info});
+    transformChildren$1(path, results, { ...config, ...info });
     appendToTemplate(results.template, `</${tagName}>`);
   }
   return results;
@@ -1577,7 +1560,7 @@ function transformToObject(attrName, attributes, selectedAttributes) {
     const attr = selectedAttributes[i].node;
     const computed = !t__namespace.isValidIdentifier(attr.name.name.name);
     if (!computed) {
-      attr.name.name.type = 'Identifier';
+      attr.name.name.type = "Identifier";
     }
     properties.push(
       t__namespace.objectProperty(
@@ -1749,7 +1732,10 @@ function transformAttributes$1(path, results) {
                   ? p.value
                   : t__namespace.isTemplateLiteral(p.value) && p.value.expressions.length === 0
                   ? t__namespace.stringLiteral(escapeHTML(p.value.quasis[0].value.raw))
-                  : t__namespace.callExpression(registerImportMethod(path, "escape"), [p.value, t__namespace.booleanLiteral(true)])
+                  : t__namespace.callExpression(registerImportMethod(path, "escape"), [
+                      p.value,
+                      t__namespace.booleanLiteral(true)
+                    ])
               )
             );
             let res = props[0];
@@ -1758,7 +1744,9 @@ function transformAttributes$1(path, results) {
             }
             value.expression = res;
           } else {
-            value.expression = t__namespace.callExpression(registerImportMethod(path, "ssrStyle"), [value.expression]);
+            value.expression = t__namespace.callExpression(registerImportMethod(path, "ssrStyle"), [
+              value.expression
+            ]);
           }
           doEscape = false;
         }
@@ -1775,7 +1763,9 @@ function transformAttributes$1(path, results) {
               value.expression = values[0];
             } else value.expression = t__namespace.templateLiteral(quasis, values);
           } else {
-            value.expression = t__namespace.callExpression(registerImportMethod(path, "ssrClassList"), [value.expression]);
+            value.expression = t__namespace.callExpression(registerImportMethod(path, "ssrClassList"), [
+              value.expression
+            ]);
           }
           key = "class";
           doEscape = false;
@@ -1807,7 +1797,10 @@ function transformClasslistObject(path, expr, values, quasis) {
     let key = prop.key;
     if (t__namespace.isIdentifier(prop.key) && !prop.computed) key = t__namespace.stringLiteral(key.name);
     else if (prop.computed) {
-      key = t__namespace.callExpression(registerImportMethod(path, "escape"), [prop.key, t__namespace.booleanLiteral(true)]);
+      key = t__namespace.callExpression(registerImportMethod(path, "escape"), [
+        prop.key,
+        t__namespace.booleanLiteral(true)
+      ]);
     } else key = t__namespace.stringLiteral(escapeHTML(prop.key.value));
     if (t__namespace.isBooleanLiteral(prop.value)) {
       if (prop.value.value === true) {
@@ -1835,7 +1828,7 @@ function transformChildren$1(path, results, { hydratable }) {
   const doNotEscape = path.doNotEscape;
   const filteredChildren = filterChildren(path.get("children"));
   filteredChildren.forEach(node => {
-    if (t__namespace.isJSXElement(node.node) && (getTagName(node.node) === "head")) {
+    if (t__namespace.isJSXElement(node.node) && getTagName(node.node) === "head") {
       const child = transformNode(node, { doNotEscape, hydratable: false });
       registerImportMethod(path, "NoHydration");
       results.template.push("");
@@ -1854,6 +1847,7 @@ function transformChildren$1(path, results, { hydratable }) {
       return;
     }
     const child = transformNode(node, { doNotEscape });
+    if (!child) return;
     appendToTemplate(results.template, child.template);
     results.templateValues.push.apply(results.templateValues, child.templateValues || []);
     if (child.exprs.length) {
@@ -2203,21 +2197,24 @@ function wrapDynamics(path, dynamics) {
 
 function convertComponentIdentifier(node) {
   if (t__namespace.isJSXIdentifier(node)) {
-    node.type = "Identifier";
+    if (t__namespace.isValidIdentifier(node.name)) node.type = "Identifier";
+    else return t__namespace.stringLiteral(node.name);
   } else if (t__namespace.isJSXMemberExpression(node)) {
+    const prop = convertComponentIdentifier(node.property);
+    const computed = t__namespace.isStringLiteral(prop);
     return t__namespace.memberExpression(
       convertComponentIdentifier(node.object),
-      convertComponentIdentifier(node.property),
+      prop,
+      computed
     );
   }
 
   return node;
 }
 
-
 function convertJSXIdentifier(node) {
   if (t__namespace.isJSXIdentifier(node)) {
-    if (t__namespace.isValidIdentifier(node.name, false)) {
+    if (t__namespace.isValidIdentifier(node.name)) {
       node.type = "Identifier";
     } else {
       return t__namespace.stringLiteral(node.name);
@@ -2225,7 +2222,7 @@ function convertJSXIdentifier(node) {
   } else if (t__namespace.isJSXMemberExpression(node)) {
     return t__namespace.memberExpression(
       convertJSXIdentifier(node.object),
-      convertJSXIdentifier(node.property),
+      convertJSXIdentifier(node.property)
     );
   } else if (t__namespace.isJSXNamespacedName(node)) {
     return t__namespace.stringLiteral(`${node.namespace.name}:${node.name.name}`);
@@ -2431,7 +2428,7 @@ function transformComponentChildren(children, config) {
     return memo;
   }, []);
 
-  if (filteredChildren.length === 1) {
+  if (transformedChildren.length === 1) {
     transformedChildren = transformedChildren[0];
     if (
       !t__namespace.isJSXExpressionContainer(filteredChildren[0]) &&
@@ -2461,7 +2458,6 @@ function transformFragmentChildren(children, results, config) {
         ? createTemplate$1
         : createTemplate$2,
     filteredChildren = filterChildren(children),
-    singleChild = filteredChildren.length === 1,
     childNodes = filteredChildren.reduce((memo, path) => {
       if (t__namespace.isJSXText(path.node)) {
         const v =  htmlEntities.decode(trimWhitespace(path.node.extra.raw));
@@ -2472,7 +2468,7 @@ function transformFragmentChildren(children, results, config) {
       }
       return memo;
     }, []);
-  results.exprs.push(singleChild ? childNodes[0] : t__namespace.arrayExpression(childNodes));
+  results.exprs.push(childNodes.length === 1 ? childNodes[0] : t__namespace.arrayExpression(childNodes));
 }
 
 function transformJSX(path) {
@@ -2645,8 +2641,8 @@ var config = {
 };
 
 var preprocess = (path, { opts })  => {
-  path.hub.file.metadata.config = Object.assign({}, config, opts);
-  const lib = config.requireImportSource;
+  const merged = path.hub.file.metadata.config = Object.assign({}, config, opts);
+  const lib = merged.requireImportSource;
   if (lib) {
     const comments = path.hub.file.ast.comments;
     for(let i = 0; i < comments.length; i++) {

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.31.1",
+  "version": "0.31.11",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.16.0",
     "html-entities": "2.3.2"
   },
-  "gitHead": "4fbd532602dabd832935f53a936d42438b78b0bd"
+  "gitHead": "fd496194eaf6d4155f2fc27bf4a90bc3ed44b1ac"
 }