babel-plugin-jsx-dom-expressions 0.31.0-beta.9 → 0.31.5

package/index.js

@@ -225,15 +225,15 @@ function getConfig(path) {
 function registerImportMethod(path, name) {
   const imports =
     path.scope.getProgramParent().data.imports ||
-    (path.scope.getProgramParent().data.imports = new Map());
+    (path.scope.getProgramParent().data.imports = new Set());
+  const identifier = t__namespace.identifier(`_$${name}`);
   if (!imports.has(name)) {
-    const identifier = helperModuleImports.addNamed(path, name, getConfig(path).moduleName, {
+    helperModuleImports.addNamed(path, name, getConfig(path).moduleName, {
       nameHint: `_$${name}`
     });
-    imports.set(name, identifier);
-    return identifier;
+    imports.add(name);
   }
-  return imports.get(name);
+  return identifier;
 }
 
 function jsxElementNameToString(node) {
@@ -465,6 +465,10 @@ function transformCondition(path, inline, deep) {
   return deep ? expr : t__namespace.arrowFunctionExpression([], expr);
 }
 
+function escapeBackticks(value) {
+  return value.replace(/`/g, "\\`");
+}
+
 function escapeHTML(s, attr) {
   if (typeof s !== "string") return s;
   const delim = attr ? '"' : "<";
@@ -1042,7 +1046,7 @@ function transformAttributes$2(path, results) {
         } else {
           !isSVG && (key = key.toLowerCase());
           results.template += ` ${key}`;
-          results.template += value ? `="${value.value}"` : "";
+          results.template += value ? `="${escapeBackticks(value.value)}"` : "";
         }
       }
     });
@@ -1494,12 +1498,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;
@@ -1573,7 +1579,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(
@@ -1745,7 +1751,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];
@@ -1754,7 +1763,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;
         }
@@ -1771,7 +1782,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;
@@ -1803,7 +1816,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) {
@@ -1831,7 +1847,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("");
@@ -1850,6 +1866,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) {
@@ -2213,7 +2230,7 @@ function convertComponentIdentifier(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);
@@ -2541,7 +2558,7 @@ function transformNode(path, info = {}) {
         : trimWhitespace(node.extra.raw);
     if (!text.length) return null;
     const results = {
-      template: text,
+      template: config.generate === "dom" ? escapeBackticks(text) : text,
       decl: [],
       exprs: [],
       dynamics: [],
@@ -2641,8 +2658,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.0-beta.9",
+  "version": "0.31.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.16.0",
     "html-entities": "2.3.2"
   },
-  "gitHead": "2c421965e1f194d4ff7fae88ae278c0a50baa161"
+  "gitHead": "4ef6930208d91931a87074733a134b0fcbebe428"
 }