Merge pull request #10 from gastonrobledo/master

Update from master fork
gastonrobledo · Jul 10, 2019 · 0f1e1b3 · 0f1e1b3
2 parents ed80c4b + 14407f8
commit 0f1e1b3
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -1,3 +1,3 @@
 // Create a simple path alias to allow browserify to resolve
 // the runtime on a supported path.
-module.exports = require('./lib/handlebars').default
+module.exports = require('./lib/handlebars')
diff --git a/lib/handlebars.js b/lib/handlebars.js
@@ -10,8 +10,9 @@ const AST = require('./handlebars/compiler/ast'),
  { parse } = Parser,
  _create = runtime.create
 
-function create() {
+function create(stream) {
  const hb = _create()
+ hb.stream = stream
 
  hb.compile = function cmp(input, options, context) {
  return compile(input, options, hb, context)

diff --git a/lib/handlebars.runtime.js b/lib/handlebars.runtime.js
@@ -22,17 +22,15 @@ async function processResult(result, output) {
 }
 
 function wrapTemplate(env, compiledFuncTemplate) {
- return async(data, options) => {
+ return async(data) => {
  /* eslint-disable no-param-reassign */
- env.stream = options.stream || env.stream
  try {
- const dataParams = Object.assign(data, {
+ return await compiledFuncTemplate(data, {
  async callback(item) {
  const value = await processResult(item, env.stream)
  return value
  }
  })
- return await compiledFuncTemplate(dataParams)
  } catch (e) {
  if (env.stream) {
  env.stream.emit('error', e)

diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
@@ -38,7 +38,7 @@ JavaScriptCompiler.prototype = {
  }
  source = this.source.wrap(source, location)
  source.appendToBuffer = true
- return `r += await (data.root.discard ? ${source} : data.root.callback(await ${source}))`
+ return `r += await (data.root.discard ? ${source} : container.callback(await ${source}))`
 
  },
 
@@ -235,7 +235,7 @@ JavaScriptCompiler.prototype = {
  varDeclarations += `, r = ${(this.initializeBuffer())}; \n`
 
  if (!this.options.isPartial && !this.isChild) {
- this.source.push('await data.root.callback(null)')
+ this.source.push('await container.callback(null)')
  }
  if (varDeclarations) {
  this.source.prepend(`return (async () => { \nvar ${varDeclarations.substring(2)};\n`)

diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
@@ -24,7 +24,7 @@ function checkRevision(compilerInfo) {
  }
 }
 
-function template(templateSpec, env) {
+function template(templateSpec, env, callback) {
  /* istanbul ignore next */
  if (!env) {
  throw new Exception('No environment passed to template')
@@ -74,6 +74,7 @@ function template(templateSpec, env) {
 
  // Just add water
  const container = {
+ callback,
  strict(obj, name) {
  if (!(name in obj)) {
  throw new Exception(`"${name}" not defined in ${obj}`)
@@ -176,8 +177,12 @@ function template(templateSpec, env) {
  container.partials = options.partials
  container.decorators = options.decorators
  }
+ if (options.callback) {
+ container.callback = options.callback
+ }
  }
 
+
  return ret
 }
 

diff --git a/tests/test_helpers.js b/tests/test_helpers.js
@@ -6,7 +6,7 @@ class HandlebarsStream extends Transform {
 
  constructor(partials) {
  super()
- this.hbs = handlebars.create()
+ this.hbs = handlebars.create(this)
  if (partials && partials.length) {
  partials.forEach(p => this.hbs.registerPartial(p.name, p.content))
  }
@@ -17,7 +17,7 @@ class HandlebarsStream extends Transform {
  }
 
  compile(content, data) {
- this.result = this.hbs.compile(content)(data, { stream: this })
+ this.result = this.hbs.compile(content)(data)
  return this
  }
 
@@ -464,4 +464,56 @@ describe('Test stream results', () => {
  stream.write({ name: 'pedro' })
  stream.end()
  })
+
+ it('test multiple instances', (done) => {
+ const partial = {
+ name: 'test',
+ content: '<h3>{{name}}</h3>'
+ },
+ template = `<!DOCTYPE html>
+<html dir="ltr" lang="en-US">
+<body>
+ <div style="width: 100%">
+ {{#each names}}
+ {{> test}}
+ {{/each}}
+ </div>
+</div>
+</body>
+</html>`,
+ hbs = new HandlebarsStream([partial]),
+ hbs1 = new HandlebarsStream([partial]),
+ names = [{
+ name: 'Gaston'
+ }, {
+ name: 'Pedro'
+ }]
+ hbs.compile(template, { names })
+ hbs1.compile(template, { names })
+ const promises = []
+ promises.push(new Promise((resolve, reject) => {
+ let result = ''
+ hbs.on('data', (block) => {
+ result += block.toString()
+ }).once('error', e => reject(e))
+ .on('end', () => {
+ resolve(result)
+ })
+ }))
+ promises.push(new Promise((resolve, reject) => {
+ let result = ''
+ hbs1.on('data', (block) => {
+ result += block.toString()
+ }).once('error', e => reject(e))
+ .on('end', () => {
+ resolve(result)
+ })
+ }))
+
+ Promise.all(promises).then((results) => {
+ assert(results[0].trim() === results[1].trim(), 'results are not the same')
+ done()
+ }).catch(e => done(e))
+ })
+
 })