add escapes

kbrsh · Apr 28, 2018 · 6eb47d2 · 6eb47d2
1 parent 71f1472
commit 6eb47d2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/dist/moon.js b/dist/moon.js
@@ -23,6 +23,18 @@
     }
   };
 
+  var escapeRE = /(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g;
+  var escapeMap = {
+    "&amp;": '&',
+    "&gt;": '>',
+    "&lt;": '<',
+    "&nbsp;": ' ',
+    "&quot;": "\\\"",
+    '\\': "\\\\",
+    '"': "\\\"",
+    '\n': "\\n"
+  };
+
   var parseIndex;
 
   var pushChild = function (child, stack) {
@@ -102,7 +114,7 @@
     pushChild({
       index: parseIndex++,
       type: "m-text",
-      content: content
+      content: content.replace(escapeRE, function (match) { return escapeMap[match]; })
     }, stack);
 
     return index;

diff --git a/dist/moon.min.js b/dist/moon.min.js
diff --git a/src/compiler/parser.js b/src/compiler/parser.js
@@ -1,6 +1,18 @@
 import { error } from "../util/util";
 
-const WHITESPACE_RE = /\s/;
+const whitespaceRE = /\s/;
+const escapeRE = /(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g;
+const escapeMap = {
+  "&amp;": '&',
+  "&gt;": '>',
+  "&lt;": '<',
+  "&nbsp;": ' ',
+  "&quot;": "\\\"",
+  '\\': "\\\\",
+  '"': "\\\"",
+  '\n': "\\n"
+};
+
 let parseIndex;
 
 const pushChild = (child, stack) => {
@@ -80,7 +92,7 @@ const parseText = (index, input, length, stack) => {
   pushChild({
     index: parseIndex++,
     type: "m-text",
-    content: content
+    content: content.replace(escapeRE, (match) => escapeMap[match])
   }, stack);
 
   return index;