adding changes to handle escapeExpression and remove fixed noEscape

Author: gastonrobledo

index.js

@@ -1,5 +1,7 @@
 const { registerCoreHelpers } = require('./helpers')
 
+const isPromise = (obj) => !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function'
+
 function asyncHelpers(hbs) {
 
   const handlebars = hbs.create(),
@@ -40,18 +42,27 @@ function asyncHelpers(hbs) {
   handlebars.JavaScriptCompiler = asyncCompiler
 
   const _compile = handlebars.compile,
-        _template = handlebars.VM.template
+        _template = handlebars.VM.template,
+        _escapeExpression = handlebars.escapeExpression,
+        escapeExpression = function(value) {
+          if(isPromise(value)) {
+            return value.then((v) => _escapeExpression(v))
+          }
+          return _escapeExpression(value)
+        }
+
   handlebars.template = function(spec) {
     spec.main_d = (prog, props, container, depth, data, blockParams, depths) => async(context) => {
       // const main = await spec.main
+      container.escapeExpression = escapeExpression
       const v = spec.main(container, context, container.helpers, container.partials, data, blockParams, depths)
       return v
     }
     return _template(spec, handlebars)
   }
 
   handlebars.compile = function(template, options) {
-    const compiled = _compile.apply(handlebars, [template, { ...options, noEscape: true }])
+    const compiled = _compile.apply(handlebars, [template, { ...options }])
 
     return function(context, execOptions) {
       context = context || {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars-async-helpers",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Adding async function support to handlebars helpers",
   "main": "index.js",
   "scripts": {

test/test.js

@@ -305,4 +305,16 @@ describe('Test async helpers', () => {
           result = await compiled()
         should.equal(result, expected)
     })
+
+    it('Test custom helper without noEscape', async () => {
+        const hbs = asyncHelpers(Handlebars),
+          template = '<div>Value: {{toUpperAsync "my text"}}</div>',
+          expected = '<div>Value: MY TEXT</div>'
+        hbs.registerHelper('toUpperAsync', async (value) => {
+            return Promise.resolve(value.toUpperCase())
+        })
+        const compiled = hbs.compile(template),
+          result = await compiled()
+        should.equal(result, expected)
+    })
 })