Merge pull request #91 from posthtml/escape-delimiters

fix: escape custom delimiters when ignoring expressions
posthtml · Jun 30, 2020 · c50750a · c50750a
2 parents d23bf91 + 53c901e
commit c50750a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/escape.js b/lib/escape.js
@@ -11,7 +11,7 @@
  */
 function escapeRegexpString (input) {
   // match Operators
-  const match = /[|\\{}()[\]^$+*?.]/
+  const match = /[|\\{}()[\]^$+*?.]/g
 
   return input.replace(match, '\\$&')
 }

diff --git a/lib/index.js b/lib/index.js
@@ -148,8 +148,8 @@ module.exports = function postHTMLExpressions (options) {
     delimitersSettings[1] = delimiters[0]
   }
 
-  delimitersReplace = new RegExp(`@${delimitersSettings[1].text[0]}`, 'g')
-  unescapeDelimitersReplace = new RegExp(`@${delimitersSettings[0].text[0]}`, 'g')
+  delimitersReplace = new RegExp(`@${escapeRegexpString(delimitersSettings[1].text[0])}`, 'g')
+  unescapeDelimitersReplace = new RegExp(`@${escapeRegexpString(delimitersSettings[0].text[0])}`, 'g')
 
   // kick off the parsing
   return function (tree) {

diff --git a/test/fixtures/custom_delimiters.html b/test/fixtures/custom_delimiters.html
@@ -1,3 +1,3 @@
-x {% test %} x {% 1 + 1 %} x
-<p class="x {% test %} x">x {% test %} x</p>
-{{% 'x&x' %}}
+x %[ test ]% x %[ 1 + 1 ]% x
+<p class="x %[ test ]% x">x %[ test ]% x</p>
+%[[ 'x&x' ]]%
diff --git a/test/test-core.js b/test/test-core.js
@@ -54,8 +54,8 @@ test('Unescaped', (t) => {
 
 test('Delimiters', (t) => {
   return process(t, 'custom_delimiters', {
-    delimiters: ['{%', '%}'],
-    unescapeDelimiters: ['{{%', '%}}'],
+    delimiters: ['%[', ']%'],
+    unescapeDelimiters: ['%[[', ']]%'],
     locals: { test: 'wow' }
   })
 })