babel-plugin-jsx-dom-expressions 0.37.13 → 0.37.17

package/index.js

@@ -554,10 +554,6 @@ 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 ? '"' : "<";
@@ -646,6 +642,24 @@ function getNumberedId(num) {
   return out;
 }
 
+function escapeStringForTemplate(str) {
+	return str.replace(/[{\\`\n\t\b\f\v\r\u2028\u2029]/g, ch => templateEscapes.get(ch))
+}
+
+const templateEscapes = new Map([
+	['{', '\\{'],
+	['`', '\\`'],
+	['\\', '\\\\'],
+	['\n', '\\n'],
+	['\t', '\\t'],
+	['\b', '\\b'],
+	['\f', '\\f'],
+	['\v', '\\v'],
+	['\r', '\\r'],
+	['\u2028', '\\u2028'],
+	['\u2029', '\\u2029']
+]);
+
 const InlineElements = [
   "a",
   "abbr",
@@ -1142,7 +1156,9 @@ function transformAttributes$2(path, results) {
           evaluated !== undefined &&
           ((type = typeof evaluated) === "string" || type === "number")
         ) {
-          value = t__namespace.stringLiteral(String(evaluated));
+          if (type === "number" && (Properties.has(key) || key.startsWith("prop:"))) {
+            value = t__namespace.jsxExpressionContainer(t__namespace.numericLiteral(evaluated));
+          } else value = t__namespace.stringLiteral(String(evaluated));
         }
       }
       if (
@@ -1464,10 +1480,10 @@ function transformAttributes$2(path, results) {
 
           if (needsQuoting) {
             needsSpacing = false;
-            results.template += `="${escapeBackticks(escapeHTML(text, true))}"`;
+            results.template += `="${escapeHTML(text, true)}"`;
           } else {
             needsSpacing = true;
-            results.template += `=${escapeBackticks(escapeHTML(text, true))}`;
+            results.template += `=${escapeHTML(text, true)}`;
           }
         }
       }
@@ -1845,7 +1861,7 @@ function appendTemplates$1(path, templates) {
   const declarators = templates.map(template => {
     const tmpl = {
       cooked: template.template,
-      raw: template.template
+      raw: escapeStringForTemplate(template.template)
     };
     return t__namespace.variableDeclarator(
       template.id,
@@ -2895,13 +2911,13 @@ function transformChildren(path, results) {
             t__namespace.variableDeclarator(
               child.id,
               t__namespace.callExpression(createTextNode, [
-                t__namespace.templateLiteral([t__namespace.templateElement({ raw: child.template })], [])
+                t__namespace.templateLiteral([t__namespace.templateElement({ raw: escapeStringForTemplate(child.template) })], [])
               ])
             )
           );
         } else
           insert = t__namespace.callExpression(createTextNode, [
-            t__namespace.templateLiteral([t__namespace.templateElement({ raw: child.template })], [])
+            t__namespace.templateLiteral([t__namespace.templateElement({ raw: escapeStringForTemplate(child.template) })], [])
           ]);
       }
       appends.push(t__namespace.expressionStatement(t__namespace.callExpression(insertNode, [results.id, insert])));
@@ -3466,7 +3482,7 @@ function transformThis(path) {
             path.node.closingElement.name = path.node.openingElement.name;
           }
         }
-      } 
+      }
     },
   });
   return node => {
@@ -3501,7 +3517,7 @@ function transformNode(path, info = {}) {
         : trimWhitespace(node.extra.raw);
     if (!text.length) return null;
     const results = {
-      template: config.generate === "ssr" ? text : escapeBackticks(text),
+      template: text,
       declarations: [],
       exprs: [],
       dynamics: [],

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.13",
+  "version": "0.37.17",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@babel/core": "^7.20.12"
   },
-  "gitHead": "ae2bc5ecd4f8dd61df0b2eb5c4ed0ae7589b6a6b"
+  "gitHead": "099d1eaa9d59a794a1c8cbe4e6a03d2e847c1081"
 }