RegExp-escape tags and prefixes, and allow multi-char prefixes

eta-dev · May 15, 2020 · 58d8a4d · 58d8a4d
1 parent ab0106e
commit 58d8a4d
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 25 deletions.
diff --git a/dist/browser/eta.dev.js b/dist/browser/eta.dev.js
diff --git a/dist/browser/eta.dev.js.map b/dist/browser/eta.dev.js.map
diff --git a/dist/browser/eta.min.js b/dist/browser/eta.min.js
diff --git a/dist/browser/eta.min.js.map b/dist/browser/eta.min.js.map
diff --git a/dist/eta.cjs.js b/dist/eta.cjs.js
diff --git a/dist/eta.cjs.js.map b/dist/eta.cjs.js.map
diff --git a/dist/eta.es.js b/dist/eta.es.js
diff --git a/dist/eta.es.js.map b/dist/eta.es.js.map
diff --git a/src/parse.ts b/src/parse.ts
@@ -22,6 +22,11 @@ var singleQuoteReg = /'(?:\\[\s\w"'\\`]|[^\n\r'\\])*?'/g
 
 var doubleQuoteReg = /"(?:\\[\s\w"'\\`]|[^\n\r"\\])*?"/g
 
+function escapeRegExp (string: string) {
+  // From MDN
+  return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
+}
+
 export default function parse (str: string, env: EtaConfig): Array<AstObject> {
   var buffer: Array<AstObject> = []
   var trimLeftOfNextStr: string | false = false
@@ -66,12 +71,18 @@ export default function parse (str: string, env: EtaConfig): Array<AstObject> {
     }
   }
 
-  var prefixes = (parseOptions.exec + parseOptions.interpolate + parseOptions.raw)
-    .split('')
-    .join('|')
+  var prefixes = parseOptions.exec + parseOptions.interpolate + parseOptions.raw
+
+  prefixes = prefixes.split('').reduce(function (accumulator, currentValue) {
+    return accumulator + '|' + escapeRegExp(currentValue)
+  })
+
+  var parseOpenReg = new RegExp(
+    '([^]*?)' + escapeRegExp(env.tags[0]) + '(-|_)?\\s*(' + prefixes + ')?\\s*',
+    'g'
+  )
 
-  var parseOpenReg = new RegExp('([^]*?)' + env.tags[0] + '(-|_)?\\s*(' + prefixes + ')?\\s*', 'g')
-  var parseCloseReg = new RegExp('\'|"|`|\\/\\*|(\\s*(-|_)?' + env.tags[1] + ')', 'g')
+  var parseCloseReg = new RegExp('\'|"|`|\\/\\*|(\\s*(-|_)?' + escapeRegExp(env.tags[1]) + ')', 'g')
   // TODO: benchmark having the \s* on either side vs using str.trim()
 
   var m