Merge pull request #38 from lightning-js/fix/single-quote-escape

fixed single quote escaping for all browsers
lightning-js · Jan 30, 2024 · 27ba505 · 27ba505
2 parents 390f263 + 114fcea
commit 27ba505
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lib/codegenerator/generator.js b/src/lib/codegenerator/generator.js
@@ -326,8 +326,12 @@ const cast = (val = '', key = false, component = 'component.') => {
     if (val.startsWith('$')) {
       castedValue = `${component}${val.replace('$', '')}`
     } else {
-      // unescaped single quotes must be escaped
-      castedValue = `'${parseInlineContent(val.replace(/(?<!\\)'/g, "\\'"), component)}'`
+      // unescaped single quotes must be escaped while preserving escaped backslashes
+      const escapedVal = val
+        .replace(/\\\\/g, '__DOUBLE_BACKSLASH__')
+        .replace(/(^|[^\\])'/g, "$1\\'")
+        .replace(/__DOUBLE_BACKSLASH__/g, '\\\\')
+      castedValue = `'${parseInlineContent(escapedVal, component)}'`
     }
   }
   // numeric