Refactor nunjucks utils and add additional nested test case

MarkBind · Feb 24, 2020 · be7d653 · be7d653
1 parent 30cffe0
commit be7d653
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/Page.js b/src/Page.js
@@ -1043,6 +1043,7 @@ class Page {
           isDynamic: true,
           dynamicSource: source,
         }))
+        .then(result => nunjuckUtils.removeNunjucksEscapes(result))
         .then(result => fs.outputFileAsync(tempPath, result))
         .then(() => markbinder.renderFile(tempPath, {
           baseUrlMap: this.baseUrlMap,

diff --git a/src/lib/markbind/nunjuckUtils.js b/src/lib/markbind/nunjuckUtils.js
@@ -1,18 +1,17 @@
 const START_ESCAPE_STR = '{% raw %}';
 const END_ESCAPE_STR = '{% endraw %}';
-const regex = new RegExp('({%( *)raw( *)%})(.*?)({%( *)endraw( *)%})', 'gs');
+const REGEX = new RegExp('{% *raw *%}(.*?){% *endraw *%}', 'gs'); // eslint-disable-line no-useless-escape
 
 function addEscapeTags(match) {
-  return START_ESCAPE_STR + match + END_ESCAPE_STR;
+  return `${START_ESCAPE_STR}${match}${END_ESCAPE_STR}`;
 }
 
-function removeEscapeTags(match, p1, p2, p3, p4) {
-  return p4;
+function removeEscapeTags(_, p1) {
+  return p1;
 }
 
 function preEscapeRawTags(pageData) {
-  const replaced = pageData.replace(regex, addEscapeTags);
-  return replaced;
+  return pageData.replace(REGEX, addEscapeTags);
 }
 
 module.exports = {
@@ -22,7 +21,6 @@ module.exports = {
   },
 
   removeNunjucksEscapes(pageData) {
-    const replaced = pageData.replace(regex, removeEscapeTags);
-    return replaced;
+    return pageData.replace(REGEX, removeEscapeTags);
   },
 };
diff --git a/test/unit/nunjuckUtils.test.js b/test/unit/nunjuckUtils.test.js
@@ -22,6 +22,12 @@ test('Escaping multiple nunjucks raw tags', () => {
   expect(escapedContent).toBe(escapedString);
 });
 
+test('Escaping nested nunjucks raw tags', () => {
+  const escapedString = 'Nested escaped data: {% raw %} {% raw %} CONTENT {% endraw %}{% endraw %}';
+  const escapedContent = nunjuckUtils.renderEscaped(nunjucks, escapedString);
+  expect(escapedContent).toBe(escapedString);
+});
+
 test('Removing Nunjucks Raw Tags', () => {
   const escapedString = 'This is a content with escaped data {%raw%} CONTENT {%endraw%}';
   const removedEscapedString = nunjuckUtils.removeNunjucksEscapes(escapedString);