#7 the dollar character is not well supported (#8)

* #7 the dollar character is not well supported * #7 the dollar character is not well supported * #7 the dollar character is not well supported
ralphtheninja · Jun 21, 2018 · 7c3398b · 7c3398b
1 parent 9ea6b80
commit 7c3398b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -8,7 +8,8 @@ module.exports = function (opts) {
 
   return function (template, values) {
     Object.keys(values).forEach(function (key) {
-      template = template.replace(regExp(key), values[key])
+      var value = String(values[key]).replace(/\$/g, '$$$$')
+      template = template.replace(regExp(key), value)
     })
     return template
   }

diff --git a/test.js b/test.js
@@ -45,3 +45,23 @@ test('whitespace-insensitive', function (t) {
   }), 'FOOFOOFOO', 'expands one placeholder many times')
   t.end()
 })
+
+test('dollar escape', function (t) {
+  var expand = Expand()
+  t.equal(expand('before {foo} after', {
+    foo: '$'
+  }), 'before $ after')
+  t.equal(expand('before {foo} after', {
+    foo: '$&'
+  }), 'before $& after')
+  t.equal(expand('before {foo} after', {
+    foo: '$`'
+  }), 'before $` after')
+  t.equal(expand('before {foo} after', {
+    foo: '$\''
+  }), 'before $\' after')
+  t.equal(expand('before {foo} after', {
+    foo: '$0'
+  }), 'before $0 after')
+  t.end()
+})