some minor refactorings

- compatible to older-babel versions with broken default exports
- otherwise "import * as Handlebars from 'handlebars'" will not work.

.eslintignore

@@ -1,25 +1,2 @@
-.rvmrc
+dist
-.DS_Store
-/tmp/
-*.sublime-project
-*.sublime-workspace
-npm-debug.log
-sauce_connect.log*
-.idea
-yarn-error.log
 node_modules
-/handlebars-release.tgz
-.nyc_output
-
-# Generated files
-lib/handlebars/compiler/parser.js
-/coverage/
-/dist/
-/integration-testing/*/dist/
-
-# Third-party or files that must remain unchanged
-/spec/expected/
-/spec/vendor
-
-# JS-Snippets
-src/*.js

.eslintrc.js

@@ -1,66 +1,119 @@
 module.exports = {
-  extends: ['eslint:recommended', 'plugin:compat/recommended', 'prettier'],
+  "extends": ["eslint:recommended","plugin:compat/recommended"],
-  globals: {
+  "globals": {
-    self: false
+    "self": false,
+    "SOURCE_MAPS": true
   },
-  env: {
+  "env": {
-    node: true,
+    "node": true,
-    es6: true
+    "es6": true
   },
-  rules: {
+  "rules": {
-    'no-console': 'warn',
+    // overrides eslint:recommended defaults
+    "no-sparse-arrays": "off",
+    "no-func-assign": "off",
+    "no-console": "warn",
+    "no-debugger": "warn",
+    "no-unreachable": "warn",
+
+    // Possible Errors //
+    //-----------------//
+    "no-unsafe-negation": "error",
 
-    // temporarily disabled until the violating places are fixed.
-    'no-func-assign': 'off',
-    'no-sparse-arrays': 'off',
 
     // Best Practices //
     //----------------//
-    'default-case': 'warn',
+    "curly": "error",
-    'guard-for-in': 'warn',
+    "default-case": "warn",
-    'no-alert': 'error',
+    "dot-notation": ["error", { "allowKeywords": false }],
-    'no-caller': 'error',
+    "guard-for-in": "warn",
-    'no-div-regex': 'warn',
+    "no-alert": "error",
-    'no-eval': 'error',
+    "no-caller": "error",
-    'no-extend-native': 'error',
+    "no-div-regex": "warn",
-    'no-extra-bind': 'error',
+    "no-eval": "error",
-    'no-floating-decimal': 'error',
+    "no-extend-native": "error",
-    'no-implied-eval': 'error',
+    "no-extra-bind": "error",
-    'no-iterator': 'error',
+    "no-floating-decimal": "error",
-    'no-labels': 'error',
+    "no-implied-eval": "error",
-    'no-lone-blocks': 'error',
+    "no-iterator": "error",
-    'no-loop-func': 'error',
+    "no-labels": "error",
-    'no-multi-str': 'warn',
+    "no-lone-blocks": "error",
-    'no-global-assign': 'error',
+    "no-loop-func": "error",
-    'no-new': 'error',
+    "no-multi-spaces": "error",
-    'no-new-func': 'error',
+    "no-multi-str": "warn",
-    'no-new-wrappers': 'error',
+    "no-global-assign": "error",
-    'no-octal-escape': 'error',
+    "no-new": "error",
-    'no-process-env': 'error',
+    "no-new-func": "error",
-    'no-proto': 'error',
+    "no-new-wrappers": "error",
-    'no-return-assign': 'error',
+    "no-octal-escape": "error",
-    'no-script-url': 'error',
+    "no-process-env": "error",
-    'no-self-compare': 'error',
+    "no-proto": "error",
-    'no-sequences': 'error',
+    "no-return-assign": "error",
-    'no-throw-literal': 'error',
+    "no-script-url": "error",
-    'no-unused-expressions': 'error',
+    "no-self-compare": "error",
-    'no-warning-comments': 'warn',
+    "no-sequences": "error",
-    'no-with': 'error',
+    "no-throw-literal": "error",
-    radix: 'error',
+    "no-unused-expressions": "error",
+    "no-warning-comments": "warn",
+    "no-with": "error",
+    "radix": "error",
+    "wrap-iife": "error",
+    "no-prototype-builtins": "error",
+
 
     // Variables //
     //-----------//
-    'no-label-var': 'error',
+    "no-catch-shadow": "error",
-    'no-undef-init': 'error',
+    "no-label-var": "error",
-    'no-use-before-define': ['error', 'nofunc'],
+    "no-shadow-restricted-names": "error",
+    "no-undef-init": "error",
+    "no-use-before-define": ["error", "nofunc"],
+
+
+    // Stylistic Issues //
+    //------------------//
+    "comma-dangle": ["error", "never"],
+    "quote-props": ["error", "as-needed", { "keywords": true, "unnecessary": false }],
+    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+    "camelcase": "error",
+    "comma-spacing": ["error", { "before": false, "after": true }],
+    "comma-style": ["error", "last"],
+    "consistent-this": ["warn", "self"],
+    "eol-last": "error",
+    "func-style": ["error", "declaration"],
+    "key-spacing": ["error", {
+      "beforeColon": false,
+      "afterColon": true
+    }],
+    "new-cap": "error",
+    "new-parens": "error",
+    "no-array-constructor": "error",
+    "no-lonely-if": "error",
+    "no-mixed-spaces-and-tabs": "error",
+    "no-nested-ternary": "warn",
+    "no-new-object": "error",
+    "no-spaced-func": "error",
+    "no-trailing-spaces": "error",
+    "no-extra-parens": ["error", "functions"],
+    "quotes": ["error", "single", "avoid-escape"],
+    "semi": "error",
+    "semi-spacing": ["error", { "before": false, "after": true }],
+    "keyword-spacing": "error",
+    "space-before-blocks": ["error", "always"],
+    "space-before-function-paren": ["error", { "anonymous": "never", "named": "never" }],
+    "space-in-parens": ["error", "never"],
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": ["error", "always", { "markers": [","] }],
+    "wrap-regex": "warn",
 
     // ECMAScript 6 //
     //--------------//
-    'no-var': 'error'
+    "no-var": "warn"
   },
-  parserOptions: {
+  "parserOptions": {
-    sourceType: 'module',
+    "sourceType": "module",
-    ecmaVersion: 6,
+    "ecmaVersion": 6,
-    ecmaFeatures: {}
+    "ecmaFeatures": {}
   }
 };

.gitignore

@@ -1,20 +1,15 @@
+vendor
 .rvmrc
 .DS_Store
+lib/handlebars/compiler/parser.js
+/dist/
 /tmp/
+/coverage/
+node_modules
 *.sublime-project
 *.sublime-workspace
 npm-debug.log
 sauce_connect.log*
 .idea
-/yarn-error.log
+yarn-error.log
-/yarn.lock
-node_modules
 /handlebars-release.tgz
-.nyc_output
-
-# Generated files
-lib/handlebars/compiler/parser.js
-/coverage/
-/dist/
-/integration-testing/*/dist/
-/spec/tmp/*

.istanbul.yml

@@ -0,0 +1,2 @@
+instrumentation:
+    excludes: ['**/spec/**', '**/handlebars/compiler/parser.js']

.prettierignore

@@ -1,22 +0,0 @@
-.rvmrc
-.DS_Store
-/tmp/
-*.sublime-project
-*.sublime-workspace
-npm-debug.log
-sauce_connect.log*
-.idea
-yarn-error.log
-node_modules
-/handlebars-release.tgz
-.nyc_output
-
-# Generated files
-lib/handlebars/compiler/parser.js
-/coverage/
-/dist/
-/integration-testing/*/dist/
-
-# Third-party or files that must remain unchanged
-/spec/expected/
-/spec/vendor

.travis.yml

@@ -1,39 +1,26 @@
 language: node_js
-jobs:
+before_install:
-  include:
+- npm install -g grunt-cli
-  - stage: test
+script:
-    name: check javascript (eslint)
+- grunt --stack travis
-    node_js: lts/*
-    script: npm run lint
-  - stage: test
-    name: check formatting (prettier)
-    node_js: lts/*
-    script: npm run check-format
-  - stage: test
-    name: check typescript definitions (dtslint)
-    node_js: lts/*
-    script: npm run dtslint
-  - stage: test
-    name: extensive tests and publish to aws
-    script: npm run extensive-tests-and-publish-to-aws
-    env:
-    - S3_BUCKET_NAME=builds.handlebarsjs.com
-    - secure: ckyEe5dzjdFDjmZ6wIrhGm0CFBEnKq8c1dYptfgVV/Q5/nJFGzu8T0yTjouS/ERxzdT2H327/63VCxhFnLCRHrsh4rlW/rCy4XI3O/0TeMLgFPa4TXkO8359qZ4CB44TBb3NsJyQXNMYdJpPLTCVTMpuiqqkFFOr+6OeggR7ufA=
-    - secure: Nm4AgSfsgNB21kgKrF9Tl7qVZU8YYREhouQunFracTcZZh2NZ2XH5aHuSiXCj88B13Cr/jGbJKsZ4T3QS3wWYtz6lkyVOx3H3iI+TMtqhD9RM3a7A4O+4vVN8IioB2YjhEu0OKjwgX5gp+0uF+pLEi7Hpj6fupD3AbbL5uYcKg8=
-    - SAUCE_USERNAME=handlebars
-    - secure: 1VkLQhbsEug4ZMQ52tTOus/WLvW3Etqe7GbCzZfzsI8d2ygJPjFfzU8fNm4pVVwoTI21MaM5AQq7SVPu8DWN1YbDjJycMdY1zO3DsB9aZBxTal98fIB7ZIUce9r5z2EP6mETrsbYjZkeckzIBI0A4UVa+F2BO4KbRDXP1Db3u3I=
-    node_js: '10'
-  - stage: test
-    name: test with latest nodejs-lts
-    node_js: lts/*
-    script: npm run test
-  - stage: test
-    name: test with active nodejs
-    node_js: node
-    script: npm run test
-cache: npm
 email:
   on_failure: change
   on_success: never
+env:
+  global:
+  - S3_BUCKET_NAME=builds.handlebarsjs.com
+  - secure: ckyEe5dzjdFDjmZ6wIrhGm0CFBEnKq8c1dYptfgVV/Q5/nJFGzu8T0yTjouS/ERxzdT2H327/63VCxhFnLCRHrsh4rlW/rCy4XI3O/0TeMLgFPa4TXkO8359qZ4CB44TBb3NsJyQXNMYdJpPLTCVTMpuiqqkFFOr+6OeggR7ufA=
+  - secure: Nm4AgSfsgNB21kgKrF9Tl7qVZU8YYREhouQunFracTcZZh2NZ2XH5aHuSiXCj88B13Cr/jGbJKsZ4T3QS3wWYtz6lkyVOx3H3iI+TMtqhD9RM3a7A4O+4vVN8IioB2YjhEu0OKjwgX5gp+0uF+pLEi7Hpj6fupD3AbbL5uYcKg8=
+matrix:
+  include:
+  - node_js: '10'
+    env:
+    - PUBLISH=true
+    - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw=
+    - secure: yERYCf7AwL11D9uMtacly/THGV8BlzsMmrt+iQVvGA3GaY6QMmfYqf6P6cCH98sH5etd1Y+1e6YrPeMjqI6lyRllT7FptoyOdHulazQe86VQN4sc0EpqMlH088kB7gGjTut9Z+X9ViooT5XEh9WA5jXEI9pXhQJNoIHkWPuwGuY=
+cache:
+  directories:
+  - node_modules
+
 git:
   depth: 100

CONTRIBUTING.md

@@ -12,8 +12,8 @@ Documentation issues on the handlebarsjs.com site should be reported on [handleb
 
 ## Branches
 
-- The branch `4.x` contains the currently released version. Bugfixes should be made in this branch.
+* The branch `4.x` contains the currently released version. Bugfixes should be made in this branch.
-- The branch `master` contains the next version. A release date is not yet specified. Maintainers
+* The branch `master` contains the next version. A release date is not yet specified. Maintainers
   should merge the branch `4.x` into the master branch regularly.
 
 ## Pull Requests
@@ -21,7 +21,6 @@ Documentation issues on the handlebarsjs.com site should be reported on [handleb
 We also accept [pull requests][pull-request]!
 
 Generally we like to see pull requests that
-
 - Maintain the existing code style
 - Are focused on a single change (i.e. avoid large refactoring or style adjustments in untouched code if not the primary goal of the pull request)
 - Have [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
@@ -32,8 +31,8 @@ Generally we like to see pull requests that
 
 To build Handlebars.js you'll need a few things installed.
 
-- Node.js
+* Node.js
-- [Grunt](http://gruntjs.com/getting-started)
+* [Grunt](http://gruntjs.com/getting-started)
 
 Before building, you need to make sure that the Git submodule `spec/mustache` is included (i.e. the directory `spec/mustache` should not be empty). To include it, if using Git version 1.6.5 or newer, use `git clone --recursive` rather than `git clone`. Or, if you already cloned without `--recursive`, use `git submodule update --init`.
 
@@ -52,13 +51,11 @@ If you notice any problems, please report them to the GitHub issue tracker at
 ##Running Tests
 
 To run tests locally, first install all dependencies.
-
 ```sh
 npm install
 ```
 
 Clone the mustache specs into the spec/mustache folder.
-
 ```sh
 cd spec
 rm -r mustache
@@ -66,40 +63,27 @@ git clone https://github.com/mustache/spec.git mustache
 ```
 
 From the root directory, run the tests.
-
 ```sh
 npm test
 ```
 
-## Linting and Formatting
+## Ember testing
 
-Handlebars uses `eslint` to enforce best-practices and `prettier` to auto-format files.
+The current ember distribution should be tested as part of the handlebars release process. This requires building the `handlebars-source` gem locally and then executing the ember test script.
-We do linting and formatting in two phases:
 
-- Committed files are linted and formatted in a pre-commit hook. In this stage eslint-errors are forbidden,
+```sh
-  while warnings are allowed.
+npm link
-- The travis-ci job also lints all files and checks if they are formatted correctly. In this stage, warnings
+grunt build release
-  are forbidden.
+cp dist/*.js $emberRepoDir/bower_components/handlebars/
 
-You can use the following scripts to make sure that the travis-job does not fail:
+cd $emberRepoDir
-
+npm link handlebars
-- **npm run lint** will run `eslint` and fail on warnings
+npm test
-- **npm run format** will run `prettier` on all files
+```
-- **npm run check-before-pull-request** will perform all most checks that travis does in its build-job, excluding the "integration-test".
-- **npm run integration-test** will run integration tests (using old NodeJS versions and integrations with webpack, babel and so on)
-  These tests only work on a Linux-machine with `nvm` installed (for running tests in multiple versions of NodeJS).
 
 ## Releasing the latest version
 
-Before attempting the release Handlebars, please make sure that you have the following authorizations:
+*When releasing a previous version of Handlebars, please look into the CONTRIBUNG.md in the corresponding branch.*
-
-- Push-access to `wycats/handlebars.js`
-- Publishing rights on npmjs.com for the `handlebars` package
-- Publishing rights on gemfury for the `handlebars-source` package
-- Push-access to the repo for legacy package managers: `components/handlebars`
-- Push-access to the production-repo of the handlebars site: `handlebars-lang/handlebarsjs.com-github-pages`
-
-_When releasing a previous version of Handlebars, please look into the CONTRIBUNG.md in the corresponding branch._
 
 Handlebars utilizes the [release yeoman generator][generator-release] to perform most release tasks.
 
@@ -119,18 +103,12 @@ gem push handlebars-source-*.gem
 After the release, you should check that all places have really been updated. Especially verify that the `latest`-tags
 in those places still point to the latest version
 
-- [The npm-package](https://www.npmjs.com/package/handlebars) (check latest-tag)
+* [The npm-package](https://www.npmjs.com/package/handlebars) (check latest-tag)
-- [The bower package](https://github.com/components/handlebars.js) (check the package.json)
+* [The bower package](https://github.com/components/handlebars.js) (check the package.json)
-- [The AWS S3 Bucket](https://s3.amazonaws.com/builds.handlebarsjs.com) (check latest-tag)
+* [The AWS S3 Bucket](https://s3.amazonaws.com/builds.handlebarsjs.com) (check latest-tag)
-- [RubyGems](https://rubygems.org/gems/handlebars-source)
+* [RubyGems](https://rubygems.org/gems/handlebars-source)
 
-When everything is OK, the **handlebars site** needs to be updated.
+When everything is OK, the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
-
-Go to the master branch of the repo [handlebars-lang/handlebarsjs.com-github-pages](https://github.com/handlebars-lang/handlebarsjs.com-github-pages/tree/master)
-and make a minimal change to the README. This will invoke a github-action that redeploys
-the site, fetching the latest version-number from the npm-registry.
-(note that the default-branch of this repo is not the master and regular changes are done
-in the `handlebars-lang/docs`-repo).
 
 [generator-release]: https://github.com/walmartlabs/generator-release
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master

Gruntfile.js

@@ -1,151 +1,82 @@
 /* eslint-disable no-process-env */
 module.exports = function(grunt) {
+
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    clean: [
+    eslint: {
-      'tmp',
+      files: [
-      'dist',
+        '*.js',
-      'lib/handlebars/compiler/parser.js',
+        'bench/**/*.js',
-      'integration-testing/**/node_modules'
+        'tasks/**/*.js',
-    ],
+        'lib/**/!(*.min|parser).js',
+        'spec/**/!(*.amd|json2|require).js',
+        'integration-testing/multi-nodejs-test/*.js',
+        'integration-testing/webpack-test/*.js',
+        'integration-testing/webpack-test/src/*.js'
+      ]
+    },
+
+    clean: ['tmp', 'dist', 'lib/handlebars/compiler/parser.js', 'integration-testing/**/node_modules'],
 
     copy: {
       dist: {
         options: {
           processContent: function(content) {
-            return (
+            return grunt.template.process('/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n')
-              grunt.template.process(
+                + content;
-                '/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n'
-              ) + content
-            );
           }
         },
-        files: [{ expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/' }]
+        files: [
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/'}
+        ]
       },
       cdnjs: {
         files: [
-          { expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/cdnjs' }
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/cdnjs'}
         ]
       },
       components: {
         files: [
-          {
+          {expand: true, cwd: 'components/', src: ['**'], dest: 'dist/components'},
-            expand: true,
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/components'}
-            cwd: 'components/',
-            src: ['**'],
-            dest: 'dist/components'
-          },
-          { expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/components' }
-        ]
-      }
-    },
-
-    babel: {
-      options: {
-        sourceMaps: 'inline',
-        loose: ['es6.modules'],
-        auxiliaryCommentBefore: 'istanbul ignore next'
-      },
-      amd: {
-        options: {
-          modules: 'amd'
-        },
-        files: [
-          {
-            expand: true,
-            cwd: 'lib/',
-            src: '**/!(index).js',
-            dest: 'dist/amd/'
-          }
-        ]
-      },
-
-      cjs: {
-        options: {
-          modules: 'common'
-        },
-        files: [
-          {
-            cwd: 'lib/',
-            expand: true,
-            src: '**/!(index).js',
-            dest: 'dist/cjs/'
-          }
         ]
       }
     },
     webpack: {
+      build: require('./webpack.config')
+    },
+    babel: {
       options: {
-        context: __dirname,
+        sourceMaps: 'inline',
-        module: {
+        auxiliaryCommentBefore: 'istanbul ignore next'
-          loaders: [
+      },
-            // the optional 'runtime' transformer tells babel to require the runtime instead of inlining it.
+      amd: {
-            {
+        options: {
-              test: /\.jsx?$/,
+          plugins: ['@babel/plugin-transform-modules-amd']
-              exclude: /node_modules/,
+        },
-              loader:
+        files: [{
-                'babel-loader?optional=runtime&loose=es6.modules&auxiliaryCommentBefore=istanbul%20ignore%20next'
+          expand: true,
-            }
+          cwd: 'lib/',
+          src: '**/!(index).js',
+          dest: 'dist/amd/'
+        }]
+      },
+
+      cjs: {
+        options: {
+          plugins: [
+            '@babel/plugin-transform-modules-commonjs',
+            // support "import * as Handlebars" for backward-compatibility
+            'babel-plugin-add-module-exports'
           ]
         },
-        output: {
+        files: [{
-          path: 'dist/',
+          cwd: 'lib/',
-          library: 'Handlebars',
+          expand: true,
-          libraryTarget: 'umd'
+          src: '**/!(index).js',
-        }
+          dest: 'dist/cjs/'
-      },
+        }]
-      handlebars: {
-        entry: './lib/handlebars.js',
-        output: {
-          filename: 'handlebars.js'
-        }
-      },
-      runtime: {
-        entry: './lib/handlebars.runtime.js',
-        output: {
-          filename: 'handlebars.runtime.js'
-        }
-      }
-    },
-
-    requirejs: {
-      options: {
-        optimize: 'none',
-        baseUrl: 'dist/amd/'
-      },
-      dist: {
-        options: {
-          name: 'handlebars',
-          out: 'dist/handlebars.amd.js'
-        }
-      },
-      runtime: {
-        options: {
-          name: 'handlebars.runtime',
-          out: 'dist/handlebars.runtime.amd.js'
-        }
-      }
-    },
-
-    uglify: {
-      options: {
-        mangle: true,
-        compress: true,
-        preserveComments: /(?:^!|@(?:license|preserve|cc_on))/
-      },
-      dist: {
-        files: [
-          {
-            cwd: 'dist/',
-            expand: true,
-            src: ['handlebars*.js', '!*.min.js'],
-            dest: 'dist/',
-            rename: function(dest, src) {
-              return dest + src.replace(/\.js$/, '.min.js');
-            }
-          }
-        ]
       }
     },
 
@@ -169,51 +100,44 @@ module.exports = function(grunt) {
       all: {
         options: {
           build: process.env.TRAVIS_JOB_ID,
-          urls: [
+          urls: ['http://localhost:9999/spec/?headless=true', 'http://localhost:9999/spec/amd.html?headless=true'],
-            'http://localhost:9999/spec/?headless=true',
-            'http://localhost:9999/spec/amd.html?headless=true'
-          ],
           detailedError: true,
           concurrency: 4,
           browsers: [
-            { browserName: 'chrome' },
+            {browserName: 'chrome'},
-            { browserName: 'firefox', platform: 'Linux' }
+            {browserName: 'firefox', platform: 'Linux'},
             // {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
             // {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
-            // {
+            {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
-            //   browserName: 'internet explorer',
+            {browserName: 'internet explorer', version: 10, platform: 'Windows 8'}
-            //   version: 11,
-            //   platform: 'Windows 8.1'
-            // },
-            // {
-            //   browserName: 'internet explorer',
-            //   version: 10,
-            //   platform: 'Windows 8'
-            // }
           ]
         }
       },
       sanity: {
         options: {
           build: process.env.TRAVIS_JOB_ID,
-          urls: [
+          urls: ['http://localhost:9999/spec/umd.html?headless=true', 'http://localhost:9999/spec/amd-runtime.html?headless=true', 'http://localhost:9999/spec/umd-runtime.html?headless=true'],
-            'http://localhost:9999/spec/umd.html?headless=true',
-            'http://localhost:9999/spec/amd-runtime.html?headless=true',
-            'http://localhost:9999/spec/umd-runtime.html?headless=true'
-          ],
           detailedError: true,
           concurrency: 2,
-          browsers: [{ browserName: 'chrome' }]
+          browsers: [
+            {browserName: 'chrome'}
+          ]
         }
       }
     },
 
     bgShell: {
+      checkTypes: {
+        cmd: 'npm run checkTypes',
+        bg: false,
+        fail: true
+      },
       integrationTests: {
         cmd: './integration-testing/run-integration-tests.sh',
         bg: false,
         fail: true
       }
+
     },
 
     watch: {
@@ -223,76 +147,46 @@ module.exports = function(grunt) {
         },
 
         files: ['src/*', 'lib/**/*.js', 'spec/**/*.js'],
-        tasks: ['on-file-change']
+        tasks: ['build', 'amd', 'tests', 'test']
       }
     }
   });
 
+  // Build a new version of the library
+  this.registerTask('build', 'Builds a distributable version of the current project', [
+                    'eslint',
+                    'bgShell:checkTypes',
+                    'parser',
+                    'node',
+                    'globals']);
+
+  this.registerTask('amd', ['babel:amd']);
+  this.registerTask('node', ['babel:cjs']);
+  this.registerTask('globals', ['webpack']);
+  this.registerTask('tests', ['concat:tests']);
+
+  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+
   // Load tasks from npm
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-babel');
   grunt.loadNpmTasks('grunt-bg-shell');
+  grunt.loadNpmTasks('grunt-eslint');
   grunt.loadNpmTasks('@knappi/grunt-saucelabs');
   grunt.loadNpmTasks('grunt-webpack');
 
   grunt.task.loadTasks('tasks');
 
-  this.registerTask(
-    'build',
-    'Builds a distributable version of the current project',
-    ['parser', 'node', 'globals']
-  );
-
-  this.registerTask('node', ['babel:cjs']);
-  this.registerTask('globals', ['webpack']);
-
-  this.registerTask('release', 'Build final packages', [
-    'amd',
-    'uglify',
-    'test:min',
-    'copy:dist',
-    'copy:components',
-    'copy:cdnjs'
-  ]);
-
-  this.registerTask('amd', ['babel:amd', 'requirejs']);
-
-  this.registerTask('test', ['test:bin', 'test:cov']);
-
   grunt.registerTask('bench', ['metrics']);
+  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : []);
 
-  if (process.env.SAUCE_ACCESS_KEY) {
+  grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'bgShell:integrationTests', 'sauce', 'metrics', 'publish:latest'] : ['default']);
-    grunt.registerTask('sauce', ['concat:tests', 'connect', 'saucelabs-mocha']);
-  } else {
-    grunt.registerTask('sauce', []);
-  }
 
-  // Requires secret properties (saucelabs-credentials etc.) from .travis.yaml
-  grunt.registerTask('extensive-tests-and-publish-to-aws', [
-    'default',
-    'bgShell:integrationTests',
-    'sauce',
-    'metrics',
-    'publish-to-aws'
-  ]);
-  grunt.registerTask('on-file-change', [
-    'build',
-    'amd',
-    'concat:tests',
-    'test'
-  ]);
-
-  // === Primary tasks ===
   grunt.registerTask('dev', ['clean', 'connect', 'watch']);
   grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-  grunt.registerTask('integration-tests', [
+  grunt.registerTask('integration-tests', ['default', 'bgShell:integrationTests']);
-    'default',
-    'bgShell:integrationTests'
-  ]);
 };

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2019 by Yehuda Katz
+Copyright (C) 2011-2017 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.markdown

@@ -11,12 +11,12 @@ Handlebars.js and Mustache are both logicless templating languages that
 keep the view and the code separated like we all know they should be.
 
 Checkout the official Handlebars docs site at
-[https://handlebarsjs.com/](https://handlebarsjs.com) and the live demo at [http://tryhandlebarsjs.com/](http://tryhandlebarsjs.com/).
+[http://www.handlebarsjs.com](http://www.handlebarsjs.com) and the live demo at [http://tryhandlebarsjs.com/](http://tryhandlebarsjs.com/).
 
 Installing
 ----------
 
-See our [installation documentation](https://handlebarsjs.com/installation/).
+See our [installation documentation](http://handlebarsjs.com/installation.html).
 
 Usage
 -----
@@ -46,23 +46,23 @@ var result = template(data);
 // </ul>
 ```
 
-Full documentation and more examples are at [handlebarsjs.com](https://handlebarsjs.com/).
+Full documentation and more examples are at [handlebarsjs.com](http://handlebarsjs.com/).
 
 Precompiling Templates
 ----------------------
 
-Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](https://handlebarsjs.com/installation/precompilation.html).
+Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](http://handlebarsjs.com/precompilation.html).
 
 Differences Between Handlebars.js and Mustache
 ----------------------------------------------
 Handlebars.js adds a couple of additional features to make writing
 templates easier and also changes a tiny detail of how partials work.
 
-- [Nested Paths](https://handlebarsjs.com/guide/expressions.html#path-expressions)
+- [Nested Paths](http://handlebarsjs.com/#paths)
-- [Helpers](https://handlebarsjs.com/guide/expressions.html#helpers)
+- [Helpers](http://handlebarsjs.com/#helpers)
-- [Block Expressions](https://handlebarsjs.com/guide/block-helpers.html#basic-blocks)
+- [Block Expressions](http://handlebarsjs.com/#block-expressions)
-- [Literal Values](https://handlebarsjs.com/guide/expressions.html#literal-segments)
+- [Literal Values](http://handlebarsjs.com/#literals)
-- [Delimited Comments](https://handlebarsjs.com/guide/#template-comments)
+- [Delimited Comments](http://handlebarsjs.com/#comments)
 
 Block expressions have the same syntax as mustache sections but should not be confused with one another. Sections are akin to an implicit `each` or `with` statement depending on the input data and helpers are explicit pieces of code that are free to implement whatever behavior they like. The [mustache spec](http://mustache.github.io/mustache.5.html) defines the exact behavior of sections. In the case of name conflicts, helpers are given priority.
 

appveyor.yml

@@ -13,7 +13,8 @@ install:
   # Clone submodules (mustache spec)
   - cmd: git submodule update --init --recursive
   # Install modules
-  - cmd: npm ci
+  - cmd: npm install
+  - cmd: npm install -g grunt-cli
 
 
 # Post-install test scripts
@@ -22,7 +23,7 @@ test_script:
   - cmd: node --version
   - cmd: npm --version
   # Run tests
-  - cmd: npm run test
+  - cmd: grunt --stack travis
 
 # Don't actually build
 build: off

babel.config.js

@@ -0,0 +1,7 @@
+module.exports = function(api) {
+  api.cache(false);
+  return {
+    presets: ['@babel/preset-env'],
+    plugins: ['@babel/plugin-transform-runtime']
+  };
+};

bench/.eslintrc

@@ -1,5 +1,4 @@
 {
-  "extends": "prettier",
   "globals": {
     "require": true
   },

bench/dist-size.js

@@ -1,14 +1,12 @@
 var async = require('neo-async'),
-  fs = require('fs'),
+    fs = require('fs'),
-  zlib = require('zlib');
+    zlib = require('zlib');
 
 module.exports = function(grunt, callback) {
   var distFiles = fs.readdirSync('dist'),
-    distSizes = {};
+      distSizes = {};
 
-  async.each(
+  async.each(distFiles, function(file, callback) {
-    distFiles,
-    function(file, callback) {
       var content;
       try {
         content = fs.readFileSync('dist/' + file);
@@ -34,10 +32,7 @@ module.exports = function(grunt, callback) {
       });
     },
     function() {
-      grunt.log.writeln(
+      grunt.log.writeln('Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2));
-        'Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2)
-      );
       callback([distSizes]);
-    }
+    });
-  );
 };

bench/index.js

@@ -2,7 +2,7 @@ var fs = require('fs');
 
 var metrics = fs.readdirSync(__dirname);
 metrics.forEach(function(metric) {
-  if (metric === 'index.js' || !/(.*)\.js$/.test(metric)) {
+  if (metric === 'index.js' || !(/(.*)\.js$/.test(metric))) {
     return;
   }
 

bench/precompile-size.js

@@ -1,5 +1,5 @@
 var _ = require('underscore'),
-  templates = require('./templates');
+    templates = require('./templates');
 
 module.exports = function(grunt, callback) {
   // Deferring to here in case we have a build for parser, etc as part of this grunt exec
@@ -8,17 +8,12 @@ module.exports = function(grunt, callback) {
   var templateSizes = {};
   _.each(templates, function(info, template) {
     var src = info.handlebars,
-      compiled = Handlebars.precompile(src, {}),
+        compiled = Handlebars.precompile(src, {}),
-      knownHelpers = Handlebars.precompile(src, {
+        knownHelpers = Handlebars.precompile(src, {knownHelpersOnly: true, knownHelpers: info.helpers});
-        knownHelpersOnly: true,
-        knownHelpers: info.helpers
-      });
 
     templateSizes[template] = compiled.length;
     templateSizes['knownOnly_' + template] = knownHelpers.length;
   });
-  grunt.log.writeln(
+  grunt.log.writeln('Precompiled sizes: ' + JSON.stringify(templateSizes, undefined, 2));
-    'Precompiled sizes: ' + JSON.stringify(templateSizes, undefined, 2)
-  );
   callback([templateSizes]);
 };

bench/templates/arguments.js

@@ -8,6 +8,5 @@ module.exports = {
     bar: true
   },
 
-  handlebars:
+  handlebars: '{{foo person "person" 1 true foo=bar foo="person" foo=1 foo=true}}'
-    '{{foo person "person" 1 true foo=bar foo="person" foo=1 foo=true}}'
 };

bench/templates/array-each.js

@@ -1,12 +1,5 @@
 module.exports = {
-  context: {
+  context: { names: [{name: 'Moe'}, {name: 'Larry'}, {name: 'Curly'}, {name: 'Shemp'}] },
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' }
-    ]
-  },
   handlebars: '{{#each names}}{{name}}{{/each}}',
   dust: '{#names}{name}{/names}',
   mustache: '{{#names}}{{name}}{{/names}}',

bench/templates/array-mustache.js

@@ -1,11 +1,4 @@
 module.exports = {
-  context: {
+  context: { names: [{name: 'Moe'}, {name: 'Larry'}, {name: 'Curly'}, {name: 'Shemp'}] },
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' }
-    ]
-  },
   handlebars: '{{#names}}{{name}}{{/names}}'
 };

bench/templates/complex.js

@@ -7,9 +7,9 @@ module.exports = {
     },
     hasItems: true, // To make things fairer in mustache land due to no `{{if}}` construct on arrays
     items: [
-      { name: 'red', current: true, url: '#Red' },
+      {name: 'red', current: true, url: '#Red'},
-      { name: 'green', current: false, url: '#Green' },
+      {name: 'green', current: false, url: '#Green'},
-      { name: 'blue', current: false, url: '#Blue' }
+      {name: 'blue', current: false, url: '#Blue'}
     ]
   },
 

bench/templates/data.js

@@ -1,11 +1,4 @@
 module.exports = {
-  context: {
+  context: { names: [{name: 'Moe'}, {name: 'Larry'}, {name: 'Curly'}, {name: 'Shemp'}] },
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' }
-    ]
-  },
   handlebars: '{{#each names}}{{@index}}{{name}}{{/each}}'
 };

bench/templates/depth-1.js

@@ -1,13 +1,5 @@
 module.exports = {
-  context: {
+  context: { names: [{name: 'Moe'}, {name: 'Larry'}, {name: 'Curly'}, {name: 'Shemp'}], foo: 'bar' },
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' }
-    ],
-    foo: 'bar'
-  },
   handlebars: '{{#each names}}{{../foo}}{{/each}}',
   mustache: '{{#names}}{{foo}}{{/names}}',
   eco: '<% for item in @names: %><%= @foo %><% end %>'

bench/templates/depth-2.js

@@ -1,16 +1,6 @@
 module.exports = {
-  context: {
+  context: { names: [{bat: 'foo', name: ['Moe']}, {bat: 'foo', name: ['Larry']}, {bat: 'foo', name: ['Curly']}, {bat: 'foo', name: ['Shemp']}], foo: 'bar' },
-    names: [
+  handlebars: '{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}',
-      { bat: 'foo', name: ['Moe'] },
-      { bat: 'foo', name: ['Larry'] },
-      { bat: 'foo', name: ['Curly'] },
-      { bat: 'foo', name: ['Shemp'] }
-    ],
-    foo: 'bar'
-  },
-  handlebars:
-    '{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}',
   mustache: '{{#names}}{{#name}}{{bat}}{{foo}}{{/name}}{{/names}}',
-  eco:
+  eco: '<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>'
-    '<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>'
 };

bench/templates/index.js

@@ -2,7 +2,7 @@ var fs = require('fs');
 
 var templates = fs.readdirSync(__dirname);
 templates.forEach(function(template) {
-  if (template === 'index.js' || !/(.*)\.js$/.test(template)) {
+  if (template === 'index.js' || !(/(.*)\.js$/.test(template))) {
     return;
   }
   module.exports[RegExp.$1] = require('./' + RegExp.$1);

bench/templates/partial-recursion.js

@@ -1,8 +1,5 @@
 module.exports = {
-  context: {
+  context: { name: '1', kids: [{ name: '1.1', kids: [{name: '1.1.1', kids: []}] }] },
-    name: '1',
-    kids: [{ name: '1.1', kids: [{ name: '1.1.1', kids: [] }] }]
-  },
   partials: {
     mustache: { recursion: '{{name}}{{#kids}}{{>recursion}}{{/kids}}' },
     handlebars: { recursion: '{{name}}{{#each kids}}{{>recursion}}{{/each}}' }

bench/templates/partial.js

@@ -1,16 +1,8 @@
 module.exports = {
-  context: {
+  context: { peeps: [{name: 'Moe', count: 15}, {name: 'Larry', count: 5}, {name: 'Curly', count: 1}] },
-    peeps: [
-      { name: 'Moe', count: 15 },
-      { name: 'Larry', count: 5 },
-      { name: 'Curly', count: 1 }
-    ]
-  },
   partials: {
     mustache: { variables: 'Hello {{name}}! You have {{count}} new messages.' },
-    handlebars: {
+    handlebars: { variables: 'Hello {{name}}! You have {{count}} new messages.' }
-      variables: 'Hello {{name}}! You have {{count}} new messages.'
-    }
   },
 
   handlebars: '{{#each peeps}}{{>variables}}{{/each}}',

bench/templates/paths.js

@@ -1,9 +1,7 @@
 module.exports = {
-  context: { person: { name: { bar: { baz: 'Larry' } }, age: 45 } },
+  context: { person: { name: {bar: {baz: 'Larry'}}, age: 45 } },
-  handlebars:
+  handlebars: '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}',
-    '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}',
   dust: '{person.name.bar.baz}{person.age}{person.foo}{animal.age}',
-  eco:
+  eco: '<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>',
-    '<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>',
   mustache: '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}'
 };

bench/templates/variables.js

@@ -1,7 +1,8 @@
 module.exports = {
-  context: { name: 'Mick', count: 30 },
+  context: {name: 'Mick', count: 30},
   handlebars: 'Hello {{name}}! You have {{count}} new messages.',
   dust: 'Hello {name}! You have {count} new messages.',
   mustache: 'Hello {{name}}! You have {{count}} new messages.',
   eco: 'Hello <%= @name %>! You have <%= @count %> new messages.'
 };
+

bench/throughput.js

@@ -1,27 +1,19 @@
 var _ = require('underscore'),
-  runner = require('./util/template-runner'),
+    runner = require('./util/template-runner'),
-  eco,
+
-  dust,
+    eco, dust, Handlebars, Mustache;
-  Handlebars,
-  Mustache;
 
 try {
   dust = require('dustjs-linkedin');
-} catch (err) {
+} catch (err) { /* NOP */ }
-  /* NOP */
-}
 
 try {
   Mustache = require('mustache');
-} catch (err) {
+} catch (err) { /* NOP */ }
-  /* NOP */
-}
 
 try {
   eco = require('eco');
-} catch (err) {
+} catch (err) { /* NOP */ }
-  /* NOP */
-}
 
 function error() {
   throw new Error('EWOT');
@@ -30,28 +22,21 @@ function error() {
 function makeSuite(bench, name, template, handlebarsOnly) {
   // Create aliases to minimize any impact from having to walk up the closure tree.
   var templateName = name,
-    context = template.context,
-    partials = template.partials,
-    handlebarsOut,
-    compatOut,
-    dustOut,
-    ecoOut,
-    mustacheOut;
 
-  var handlebar = Handlebars.compile(template.handlebars, { data: false }),
+      context = template.context,
-    compat = Handlebars.compile(template.handlebars, {
+      partials = template.partials,
-      data: false,
+
-      compat: true
+      handlebarsOut,
-    }),
+      compatOut,
-    options = { helpers: template.helpers };
+      dustOut,
-  _.each(template.partials && template.partials.handlebars, function(
+      ecoOut,
-    partial,
+      mustacheOut;
-    partialName
+
-  ) {
+  var handlebar = Handlebars.compile(template.handlebars, {data: false}),
-    Handlebars.registerPartial(
+      compat = Handlebars.compile(template.handlebars, {data: false, compat: true}),
-      partialName,
+      options = {helpers: template.helpers};
-      Handlebars.compile(partial, { data: false })
+  _.each(template.partials && template.partials.handlebars, function(partial, partialName) {
-    );
+    Handlebars.registerPartial(partialName, Handlebars.compile(partial, {data: false}));
   });
 
   handlebarsOut = handlebar(context, options);
@@ -73,9 +58,7 @@ function makeSuite(bench, name, template, handlebarsOnly) {
       dustOut = false;
       dust.loadSource(dust.compile(template.dust, templateName));
 
-      dust.render(templateName, context, function(err, out) {
+      dust.render(templateName, context, function(err, out) { dustOut = out; });
-        dustOut = out;
-      });
 
       bench('dust', function() {
         dust.render(templateName, context, function() {});
@@ -101,7 +84,7 @@ function makeSuite(bench, name, template, handlebarsOnly) {
 
   if (Mustache) {
     var mustacheSource = template.mustache,
-      mustachePartials = partials && partials.mustache;
+        mustachePartials = partials && partials.mustache;
 
     if (mustacheSource) {
       mustacheOut = Mustache.to_html(mustacheSource, context, mustachePartials);
@@ -124,16 +107,9 @@ function makeSuite(bench, name, template, handlebarsOnly) {
     b = b.replace(/\s/g, '');
 
     if (handlebarsOut !== b) {
-      throw new Error(
+      throw new Error('Template output mismatch: ' + name
-        'Template output mismatch: ' +
+            + '\n\nHandlebars: ' + handlebarsOut
-          name +
+            + '\n\n' + lang + ': ' + b);
-          '\n\nHandlebars: ' +
-          handlebarsOut +
-          '\n\n' +
-          lang +
-          ': ' +
-          b
-      );
     }
   }
 

bench/util/benchwarmer.js

@@ -1,5 +1,5 @@
 var _ = require('underscore'),
-  Benchmark = require('benchmark');
+    Benchmark = require('benchmark');
 
 function BenchWarmer() {
   this.benchmarks = [];
@@ -33,21 +33,16 @@ BenchWarmer.prototype = {
       this.names.push(name);
     }
 
-    var first = this.first,
+    var first = this.first, suiteName = this.suiteName, self = this;
-      suiteName = this.suiteName,
-      self = this;
     this.first = false;
 
     var bench = new Benchmark(fn, {
       name: this.suiteName + ': ' + name,
       onComplete: function() {
-        if (first) {
+        if (first) { self.startLine(suiteName); }
-          self.startLine(suiteName);
-        }
         self.writeBench(bench);
         self.currentBenches.push(bench);
-      },
+      }, onError: function() {
-      onError: function() {
         self.errors[this.name] = this;
       }
     });
@@ -80,14 +75,10 @@ BenchWarmer.prototype = {
         });
         print('\n');
 
-        var errors = false,
+        var errors = false, prop, bench;
-          prop,
-          bench;
         for (prop in self.errors) {
-          if (
+          if (Object.prototype.hasOwnProperty.call(self, prop)
-            Object.prototype.hasOwnProperty.call(self, prop) &&
+              && self.errors[prop].error.message !== 'EWOT') {
-            self.errors[prop].error.message !== 'EWOT'
-          ) {
             errors = true;
             break;
           }
@@ -116,39 +107,23 @@ BenchWarmer.prototype = {
   },
 
   scaleTimes: function() {
-    var scaled = (this.scaled = {});
+    var scaled = this.scaled = {};
-    _.each(
+    _.each(this.times, function(times, name) {
-      this.times,
+      var output = scaled[name] = {};
-      function(times, name) {
-        var output = (scaled[name] = {});
 
-        _.each(
+      _.each(times, function(time, lang) {
-          times,
+        output[lang] = ((time - this.minimum) / (this.maximum - this.minimum) * 100).toFixed(2);
-          function(time, lang) {
+      }, this);
-            output[lang] = (
+    }, this);
-              ((time - this.minimum) / (this.maximum - this.minimum)) *
-              100
-            ).toFixed(2);
-          },
-          this
-        );
-      },
-      this
-    );
   },
 
   printHeader: function(title, winners) {
-    var benchSize = 0,
+    var benchSize = 0, names = this.names, i, l;
-      names = this.names,
-      i,
-      l;
 
     for (i = 0, l = names.length; i < l; i++) {
       var name = names[i];
 
-      if (benchSize < name.length) {
+      if (benchSize < name.length) { benchSize = name.length; }
-        benchSize = name.length;
-      }
     }
 
     this.nameSize = benchSize + 2;
@@ -171,9 +146,7 @@ BenchWarmer.prototype = {
   },
 
   startLine: function(name) {
-    var winners = Benchmark.map(this.winners(this.currentBenches), function(
+    var winners = Benchmark.map(this.winners(this.currentBenches), function(bench) {
-      bench
-    ) {
       return bench.name.split(': ')[1];
     });
 
@@ -191,9 +164,9 @@ BenchWarmer.prototype = {
 
     if (!bench.error) {
       var count = bench.hz,
-        moe = (count * bench.stats.rme) / 100,
+          moe = count * bench.stats.rme / 100,
-        minimum,
+          minimum,
-        maximum;
+          maximum;
 
       count = Math.round(count / 1000);
       moe = Math.round(moe / 1000);

bench/util/template-runner.js

@@ -1,12 +1,12 @@
 var _ = require('underscore'),
-  BenchWarmer = require('./benchwarmer'),
+    BenchWarmer = require('./benchwarmer'),
-  templates = require('../templates');
+    templates = require('../templates');
 
 module.exports = function(grunt, makeSuite, callback) {
   var warmer = new BenchWarmer();
 
   var handlebarsOnly = grunt.option('handlebars-only'),
-    grep = grunt.option('grep');
+      grep = grunt.option('grep');
   if (grep) {
     grep = new RegExp(grep);
   }

bin/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  rules: {
-    'no-console': 0,
-    'no-var': 0
-  }
-};

bin/handlebars

@@ -1,176 +1,128 @@
 #!/usr/bin/env node
 
-var argv = parseArgs({
+var optimist = require('optimist')
-  'f': {
+    .usage('Precompile handlebar templates.\nUsage: $0 [template|directory]...', {
-    'type': 'string',
+      'f': {
-    'description': 'Output File',
+        'type': 'string',
-    'alias': 'output'
+        'description': 'Output File',
-  },
+        'alias': 'output'
-  'map': {
+      },
-    'type': 'string',
+      'map': {
-    'description': 'Source Map File'
+        'type': 'string',
-  },
+        'description': 'Source Map File'
-  'a': {
+      },
-    'type': 'boolean',
+      'a': {
-    'description': 'Exports amd style (require.js)',
+        'type': 'boolean',
-    'alias': 'amd'
+        'description': 'Exports amd style (require.js)',
-  },
+        'alias': 'amd'
-  'c': {
+      },
-    'type': 'string',
+      'c': {
-    'description': 'Exports CommonJS style, path to Handlebars module',
+        'type': 'string',
-    'alias': 'commonjs',
+        'description': 'Exports CommonJS style, path to Handlebars module',
-    'default': null
+        'alias': 'commonjs',
-  },
+        'default': null
-  'h': {
+      },
-    'type': 'string',
+      'h': {
-    'description': 'Path to handlebar.js (only valid for amd-style)',
+        'type': 'string',
-    'alias': 'handlebarPath',
+        'description': 'Path to handlebar.js (only valid for amd-style)',
-    'default': ''
+        'alias': 'handlebarPath',
-  },
+        'default': ''
-  'k': {
+      },
-    'type': 'string',
+      'k': {
-    'description': 'Known helpers',
+        'type': 'string',
-    'alias': 'known'
+        'description': 'Known helpers',
-  },
+        'alias': 'known'
-  'o': {
+      },
-    'type': 'boolean',
+      'o': {
-    'description': 'Known helpers only',
+        'type': 'boolean',
-    'alias': 'knownOnly'
+        'description': 'Known helpers only',
-  },
+        'alias': 'knownOnly'
-  'm': {
+      },
-    'type': 'boolean',
+      'm': {
-    'description': 'Minimize output',
+        'type': 'boolean',
-    'alias': 'min'
+        'description': 'Minimize output',
-  },
+        'alias': 'min'
-  'n': {
+      },
-    'type': 'string',
+      'n': {
-    'description': 'Template namespace',
+        'type': 'string',
-    'alias': 'namespace',
+        'description': 'Template namespace',
-    'default': 'Handlebars.templates'
+        'alias': 'namespace',
-  },
+        'default': 'Handlebars.templates'
-  's': {
+      },
-    'type': 'boolean',
+      's': {
-    'description': 'Output template function only.',
+        'type': 'boolean',
-    'alias': 'simple'
+        'description': 'Output template function only.',
-  },
+        'alias': 'simple'
-  'N': {
+      },
-    'type': 'string',
+      'N': {
-    'description': 'Name of passed string templates. Optional if running in a simple mode. Required when operating on multiple templates.',
+        'type': 'string',
-    'alias': 'name'
+        'description': 'Name of passed string templates. Optional if running in a simple mode. Required when operating on multiple templates.',
-  },
+        'alias': 'name'
-  'i': {
+      },
-    'type': 'string',
+      'i': {
-    'description': 'Generates a template from the passed CLI argument.\n"-" is treated as a special value and causes stdin to be read for the template value.',
+        'type': 'string',
-    'alias': 'string'
+        'description': 'Generates a template from the passed CLI argument.\n"-" is treated as a special value and causes stdin to be read for the template value.',
-  },
+        'alias': 'string'
-  'r': {
+      },
-    'type': 'string',
+      'r': {
-    'description': 'Template root. Base value that will be stripped from template names.',
+        'type': 'string',
-    'alias': 'root'
+        'description': 'Template root. Base value that will be stripped from template names.',
-  },
+        'alias': 'root'
-  'p': {
+      },
-    'type': 'boolean',
+      'p': {
-    'description': 'Compiling a partial template',
+        'type': 'boolean',
-    'alias': 'partial'
+        'description': 'Compiling a partial template',
-  },
+        'alias': 'partial'
-  'd': {
+      },
-    'type': 'boolean',
+      'd': {
-    'description': 'Include data when compiling',
+        'type': 'boolean',
-    'alias': 'data'
+        'description': 'Include data when compiling',
-  },
+        'alias': 'data'
-  'e': {
+      },
-    'type': 'string',
+      'e': {
-    'description': 'Template extension.',
+        'type': 'string',
-    'alias': 'extension',
+        'description': 'Template extension.',
-    'default': 'handlebars'
+        'alias': 'extension',
-  },
+        'default': 'handlebars'
-  'b': {
+      },
-    'type': 'boolean',
+      'b': {
-    'description': 'Removes the BOM (Byte Order Mark) from the beginning of the templates.',
+        'type': 'boolean',
-    'alias': 'bom'
+        'description': 'Removes the BOM (Byte Order Mark) from the beginning of the templates.',
-  },
+        'alias': 'bom'
-  'v': {
+      },
-    'type': 'boolean',
+      'v': {
-    'description': 'Prints the current compiler version',
+        'type': 'boolean',
-    'alias': 'version'
+        'description': 'Prints the current compiler version',
-  },
+        'alias': 'version'
-  'help': {
+      },
-    'type': 'boolean',
-    'description': 'Outputs this message'
-  }
-});
 
+      'help': {
+        'type': 'boolean',
+        'description': 'Outputs this message'
+      }
+    })
+
+    .wrap(120)
+    .check(function(argv) {
+      if (argv.version) {
+        return;
+      }
+    });
+
+
+var argv = optimist.argv;
 argv.files = argv._;
 delete argv._;
 
 var Precompiler = require('../dist/cjs/precompiler');
 Precompiler.loadTemplates(argv, function(err, opts) {
-
   if (err) {
     throw err;
   }
 
   if (opts.help || (!opts.templates.length && !opts.version)) {
-    printUsage(argv._spec, 120);
+    optimist.showHelp();
   } else {
     Precompiler.cli(opts);
   }
 });
-
-function pad(n) {
-  var str = '';
-  while (str.length < n) {
-    str += ' ';
-  }
-  return str;
-}
-
-function parseArgs(spec) {
-  var opts = { alias: {}, boolean: [], default: {}, string: [] };
-
-  Object.keys(spec).forEach(function (arg) {
-    var opt = spec[arg];
-    opts[opt.type].push(arg);
-    if ('alias' in opt) opts.alias[arg] = opt.alias;
-    if ('default' in opt) opts.default[arg] = opt.default;
-  });
-
-  var argv = require('minimist')(process.argv.slice(2), opts);
-  argv._spec = spec;
-  return argv;
-}
-
-function printUsage(spec, wrap) {
-  var wordwrap = require('wordwrap');
-
-  console.log('Precompile handlebar templates.');
-  console.log('Usage: handlebars [template|directory]...');
-
-  var opts = [];
-  var width = 0;
-  Object.keys(spec).forEach(function (arg) {
-    var opt = spec[arg];
-
-    var name = (arg.length === 1 ? '-' : '--') + arg;
-    if ('alias' in opt) name += ', --' + opt.alias;
-
-    var meta = '[' + opt.type + ']';
-    if ('default' in opt) meta += ' [default: ' + JSON.stringify(opt.default) + ']';
-
-    opts.push({ name: name, desc: opt.description, meta: meta });
-    if (name.length > width) width = name.length;
-  });
-
-  console.log('Options:');
-  opts.forEach(function (opt) {
-    var desc = wordwrap(width + 4, wrap + 1)(opt.desc);
-
-    console.log('  %s%s%s%s%s',
-      opt.name,
-      pad(width - opt.name.length + 2),
-      desc.slice(width + 4),
-      pad(wrap - opt.meta.length - desc.split(/\n/).pop().length),
-      opt.meta
-      );
-  });
-}

components/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.7.7",
+  "version": "4.5.3",
   "main": "handlebars.js",
   "license": "MIT",
   "dependencies": {}

components/handlebars.js.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>handlebars.js</id>
-		<version>4.7.7</version>
+		<version>4.5.3</version>
 		<authors>handlebars.js Authors</authors>
 		<licenseUrl>https://github.com/wycats/handlebars.js/blob/master/LICENSE</licenseUrl>
 		<projectUrl>https://github.com/wycats/handlebars.js/</projectUrl>

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.7.7",
+  "version": "4.5.3",
   "license": "MIT",
   "jspm": {
     "main": "handlebars",

integration-testing/multi-nodejs-test/.eslintrc.js

@@ -1,13 +1,12 @@
 module.exports = {
-  extends: ['eslint:recommended', 'plugin:es5/no-es2015', 'prettier'],
+  "extends": "eslint:recommended",
-  globals: {
+  "globals": {
-    self: false
+    "self": false
   },
-  env: {
+  "env": {
-    node: true
+    "node": true
   },
-  rules: {
+  "rules": {
-    'no-console': 'off',
+    'no-console': 'off'
-    'no-var': 'off'
   }
-};
+}

integration-testing/multi-nodejs-test/run-handlebars.js

@@ -5,7 +5,7 @@ var Handlebars = require('handlebars');
 console.log('Testing built Handlebars with Node version ' + process.version);
 
 var template = Handlebars.compile('Author: {{author}}');
-var output = template({ author: 'Yehuda' });
+var output = template({author: 'Yehuda'});
 assert.strictEqual(output, 'Author: Yehuda');
 
 console.log('Success');

integration-testing/multi-nodejs-test/test.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
 # shellcheck disable=SC1090
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
@@ -12,20 +10,17 @@ cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
 # However, the built distribution should work with older NodeJS versions as well.
 # This test is simple by design. It merely ensures, that calling Handlebars does not fail with old versions.
 # It does (almost) not test for correctness, because that is already done in the mocha-tests.
-# And it does not use any NodeJS based testing framework to make this part independent of the Node version.
+# And it does not use any NodeJS based testing framwork to make this part independent of the Node version.
-
-unset npm_config_prefix
 
+# A list of NodeJS versions is expected as cli-args
 echo "Handlebars should be able to run in various versions of NodeJS"
-for node_version_to_test in 0.10 0.12 4 5 6 7 8 9 10 11 12 13 14 15; do
+for i in  0.10 0.12 4 5 6 7 8 9 10 11 ; do
-
     rm target node_modules package-lock.json -rf
     mkdir target
-
+    nvm install "$i"
-    nvm install "$node_version_to_test"
+    nvm exec "$i" npm install
-    nvm exec "$node_version_to_test" npm install
+    nvm exec "$i" npm run test || exit 1
-    nvm exec "$node_version_to_test" npm run test
+    nvm exec "$i" npm run test-precompile || exit 1
-    nvm exec "$node_version_to_test" npm run test-precompile
 
     echo Success
 done

integration-testing/run-integration-tests.sh

@@ -1,15 +1,13 @@
 #!/bin/bash
 
-set -e
+cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
-
-cd "$( dirname "$( readlink -f "$0" )" )"
 
 for i in */test.sh ; do
   (
     echo "----------------------------------------"
     echo "-- Running integration test: $i"
     echo "----------------------------------------"
-    cd "$( dirname "$i" )"
+    cd "$( dirname "$i" )" || exit 1
-    ./test.sh
+    ./test.sh || exit 1
   )
 done

integration-testing/webpack-babel-test/src/handlebars-inline-precompile-test.js

@@ -1,12 +1,12 @@
 import * as Handlebars from 'handlebars/runtime';
 import hbs from 'handlebars-inline-precompile';
-import { assertEquals } from '../../webpack-test/src/lib/assert';
+import {assertEquals} from '../../webpack-test/src/lib/assert';
 
 Handlebars.registerHelper('loud', function(text) {
-  return text.toUpperCase();
+    return text.toUpperCase();
 });
 
 const template = hbs`{{loud name}}`;
-const output = template({ name: 'yehuda' });
+const output = template({name: 'yehuda'});
 
 assertEquals(output, 'YEHUDA');

integration-testing/webpack-babel-test/src/lib/assert.js

@@ -1,5 +1,5 @@
 export function assertEquals(actual, expected) {
-  if (actual !== expected) {
+    if (actual !== expected) {
-    throw new Error(`Expected "${actual}" to equal "${expected}"`);
+        throw new Error(`Expected "${actual}" to equal "${expected}"`);
-  }
+    }
 }

integration-testing/webpack-babel-test/webpack.config.js

@@ -3,30 +3,31 @@ const fs = require('fs');
 const testFiles = fs.readdirSync('src');
 const entryPoints = {};
 testFiles
-  .filter(file => file.match(/-test.js$/))
+    .filter(file => file.match(/-test.js$/))
-  .forEach(file => {
+    .forEach(file => {
-    entryPoints[file] = `./src/${file}`;
+        entryPoints[file] = `./src/${file}`;
-  });
+    });
 
 module.exports = {
-  entry: entryPoints,
+    entry: entryPoints,
-  output: {
+    mode: 'production',
-    filename: '[name]',
+    output: {
-    path: __dirname + '/dist'
+        filename: '[name]',
-  },
+        path: __dirname + '/dist'
-  module: {
+    },
-    rules: [
+    module: {
-      {
+        rules: [
-        test: /\.js?$/,
+            {
-        exclude: /node_modules/,
+                test: /\.js?$/,
-        use: {
+                exclude: /node_modules/,
-          loader: 'babel-loader',
+                use: {
-          options: { cacheDirectory: false }
+                    loader: 'babel-loader',
-        }
+                    options: { cacheDirectory: false },
-      }
+                }
-    ]
+            }
-  },
+        ]
-  optimization: {
+    },
-    minimize: false
+    optimization: {
-  }
+        minimize: false
+    }
 };

integration-testing/webpack-test/src/handlebars-default-import-pre-4.2-test.js

@@ -1,6 +1,6 @@
 import Handlebars from 'handlebars/dist/handlebars';
 
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
 
 const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda');
+assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-default-import-test.js

@@ -1,5 +1,6 @@
 import Handlebars from 'handlebars';
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
+
 
 const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda');
+assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-loader-test.js

@@ -1,10 +1,8 @@
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
 
 import testTemplate from './test-template.handlebars';
-assertEquals(testTemplate({ author: 'Yehuda' }).trim(), 'Author: Yehuda');
+assertEquals(testTemplate({author: 'Yehuda'}).trim(), 'Author: Yehuda');
+
 
 const testTemplateRequire = require('./test-template.handlebars');
-assertEquals(
+assertEquals(testTemplateRequire({author: 'Yehuda'}).trim(), 'Author: Yehuda');
-  testTemplateRequire({ author: 'Yehuda' }).trim(),
-  'Author: Yehuda'
-);

integration-testing/webpack-test/src/handlebars-require-vs-import-test.js

@@ -1,10 +1,10 @@
 import * as HandlebarsViaImport from 'handlebars';
 const HandlebarsViaRequire = require('handlebars');
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
 
 HandlebarsViaImport.registerHelper('loud', function(text) {
-  return text.toUpperCase();
+    return text.toUpperCase();
 });
 
 const template = HandlebarsViaRequire.compile('Author: {{loud author}}');
-assertEquals(template({ author: 'Yehuda' }), 'Author: YEHUDA');
+assertEquals(template({author: 'Yehuda'}), 'Author: YEHUDA');

integration-testing/webpack-test/src/handlebars-wildcard-import-pre-4.2-test.js

@@ -1,6 +1,6 @@
 import * as Handlebars from 'handlebars/dist/handlebars';
 
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
 
 const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda');
+assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-wildcard-import-test.js

@@ -1,5 +1,5 @@
 import * as Handlebars from 'handlebars';
-import { assertEquals } from './lib/assert';
+import {assertEquals} from './lib/assert';
 
 const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda');
+assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/lib/assert.js

@@ -1,5 +1,5 @@
 export function assertEquals(actual, expected) {
-  if (actual !== expected) {
+    if (actual !== expected) {
-    throw new Error(`Expected "${actual}" to equal "${expected}"`);
+        throw new Error(`Expected "${actual}" to equal "${expected}"`);
-  }
+    }
 }

integration-testing/webpack-test/webpack.config.js

@@ -3,18 +3,20 @@ const fs = require('fs');
 const testFiles = fs.readdirSync('src');
 const entryPoints = {};
 testFiles
-  .filter(file => file.match(/-test.js$/))
+    .filter(file => file.match(/-test.js$/))
-  .forEach(file => {
+    .forEach(file => {
-    entryPoints[file] = `./src/${file}`;
+        entryPoints[file] = `./src/${file}`;
-  });
+    });
 
 module.exports = {
-  entry: entryPoints,
+    entry: entryPoints,
-  output: {
+    output: {
-    filename: '[name]',
+        filename: '[name]',
-    path: __dirname + '/dist'
+        path: __dirname + '/dist'
-  },
+    },
-  module: {
+    module: {
-    rules: [{ test: /\.handlebars$/, loader: 'handlebars-loader' }]
+        rules: [
-  }
+            {test: /\.handlebars$/, loader: 'handlebars-loader'}
+        ]
+    }
 };

lib/handlebars.js

@@ -2,21 +2,16 @@ import runtime from './handlebars.runtime';
 
 // Compiler imports
 import AST from './handlebars/compiler/ast';
-import {
+import { parser as Parser, parse, parseWithoutProcessing } from './handlebars/compiler/base';
-  parser as Parser,
-  parse,
-  parseWithoutProcessing
-} from './handlebars/compiler/base';
 import { Compiler, compile, precompile } from './handlebars/compiler/compiler';
 import JavaScriptCompiler from './handlebars/compiler/javascript-compiler';
 import Visitor from './handlebars/compiler/visitor';
 
 import noConflict from './handlebars/no-conflict';
 
-let _create = runtime.create;
 function create() {
-  let hb = _create();
+  let hb = runtime.create();
-
+  hb.create = create;
   hb.compile = function(input, options) {
     return compile(input, options, hb);
   };
@@ -35,8 +30,6 @@ function create() {
 }
 
 let inst = create();
-inst.create = create;
-
 noConflict(inst);
 
 inst.Visitor = Visitor;

lib/handlebars.runtime.js

@@ -4,31 +4,52 @@ import * as base from './handlebars/base';
 // (This is done to easily share code between commonjs and browse envs)
 import SafeString from './handlebars/safe-string';
 import Exception from './handlebars/exception';
-import * as Utils from './handlebars/utils';
+import {
-import * as runtime from './handlebars/runtime';
+  extend,
+  toString,
+  isFunction,
+  isArray,
+  indexOf,
+  escapeExpression,
+  isEmpty,
+  createFrame,
+  blockParams,
+  appendContextPath
+} from './handlebars/utils';
+import {checkRevision, template, wrapProgram, resolvePartial, invokePartial, noop} from './handlebars/runtime';
 
 import noConflict from './handlebars/no-conflict';
 
 // For compatibility and usage outside of module systems, make the Handlebars object a namespace
-function create() {
+export function create() {
   let hb = new base.HandlebarsEnvironment();
 
-  Utils.extend(hb, base);
+  extend(hb, base);
   hb.SafeString = SafeString;
   hb.Exception = Exception;
-  hb.Utils = Utils;
+  hb.Utils = {
-  hb.escapeExpression = Utils.escapeExpression;
+    extend,
-
+    toString,
-  hb.VM = runtime;
+    isFunction,
+    isArray,
+    indexOf,
+    escapeExpression,
+    isEmpty,
+    createFrame,
+    blockParams,
+    appendContextPath
+  };
+  hb.escapeExpression = escapeExpression;
+  hb.create = create;
+  hb.VM = {checkRevision, template, wrapProgram, resolvePartial, invokePartial, noop};
   hb.template = function(spec) {
-    return runtime.template(spec, hb);
+    return template(spec, hb);
   };
 
   return hb;
 }
 
 let inst = create();
-inst.create = create;
 
 noConflict(inst);
 

lib/handlebars/base.js

@@ -1,11 +1,10 @@
-import { createFrame, extend, toString } from './utils';
+import {createFrame, extend, toString} from './utils';
 import Exception from './exception';
-import { registerDefaultHelpers } from './helpers';
+import {registerDefaultHelpers} from './helpers';
-import { registerDefaultDecorators } from './decorators';
+import {registerDefaultDecorators} from './decorators';
 import logger from './logger';
-import { resetLoggedProperties } from './internal/proto-access';
 
-export const VERSION = '4.7.7';
+export const VERSION = '4.5.3';
 export const COMPILER_REVISION = 8;
 export const LAST_COMPATIBLE_COMPILER_REVISION = 7;
 
@@ -39,9 +38,7 @@ HandlebarsEnvironment.prototype = {
 
   registerHelper: function(name, fn) {
     if (toString.call(name) === objectType) {
-      if (fn) {
+      if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-        throw new Exception('Arg not supported with multiple helpers');
-      }
       extend(this.helpers, name);
     } else {
       this.helpers[name] = fn;
@@ -56,9 +53,7 @@ HandlebarsEnvironment.prototype = {
       extend(this.partials, name);
     } else {
       if (typeof partial === 'undefined') {
-        throw new Exception(
+        throw new Exception(`Attempting to register a partial called "${name}" as undefined`);
-          `Attempting to register a partial called "${name}" as undefined`
-        );
       }
       this.partials[name] = partial;
     }
@@ -69,9 +64,7 @@ HandlebarsEnvironment.prototype = {
 
   registerDecorator: function(name, fn) {
     if (toString.call(name) === objectType) {
-      if (fn) {
+      if (fn) { throw new Exception('Arg not supported with multiple decorators'); }
-        throw new Exception('Arg not supported with multiple decorators');
-      }
       extend(this.decorators, name);
     } else {
       this.decorators[name] = fn;
@@ -79,16 +72,9 @@ HandlebarsEnvironment.prototype = {
   },
   unregisterDecorator: function(name) {
     delete this.decorators[name];
-  },
-  /**
-   * Reset the memory of illegal property accesses that have already been logged.
-   * @deprecated should only be used in handlebars test-cases
-   */
-  resetLoggedPropertyAccesses() {
-    resetLoggedProperties();
   }
 };
 
 export let log = logger.log;
 
-export { createFrame, logger };
+export {createFrame, logger};

lib/handlebars/compiler/ast.js

@@ -5,28 +5,24 @@ let AST = {
     // * it is an eligible helper, and
     // * it has at least one parameter or hash segment
     helperExpression: function(node) {
-      return (
+      return (node.type === 'SubExpression')
-        node.type === 'SubExpression' ||
+          || ((node.type === 'MustacheStatement' || node.type === 'BlockStatement')
-        ((node.type === 'MustacheStatement' ||
+            && !!((node.params && node.params.length) || node.hash));
-          node.type === 'BlockStatement') &&
-          !!((node.params && node.params.length) || node.hash))
-      );
     },
 
     scopedId: function(path) {
-      return /^\.|this\b/.test(path.original);
+      return (/^\.|this\b/).test(path.original);
     },
 
     // an ID is simple if it only has one part, and that part is not
     // `..` or `this`.
     simpleId: function(path) {
-      return (
+      return path.parts.length === 1 && !AST.helpers.scopedId(path) && !path.depth;
-        path.parts.length === 1 && !AST.helpers.scopedId(path) && !path.depth
-      );
     }
   }
 };
 
+
 // Must be exported as an object rather than the root of the module as the jison lexer
 // must modify the object to operate properly.
 export default AST;

lib/handlebars/compiler/base.js

@@ -10,9 +10,7 @@ extend(yy, Helpers);
 
 export function parseWithoutProcessing(input, options) {
   // Just return if an already-compiled AST was passed in.
-  if (input.type === 'Program') {
+  if (input.type === 'Program') { return input; }
-    return input;
-  }
 
   parser.yy = yy;
 

lib/handlebars/compiler/code-gen.js

@@ -1,16 +1,11 @@
-/* global define */
+import {isArray} from '../utils';
-import { isArray } from '../utils';
 
 let SourceNode;
 
 try {
-  /* istanbul ignore next */
+  // the 'source-map' map package is ignored in 'umd' and 'amd' builds (via webpack-config)
-  if (typeof define !== 'function' || !define.amd) {
+  let SourceMap = require('source-map');
-    // We don't support this in AMD environments. For these environments, we asusme that
+  SourceNode = SourceMap.SourceNode;
-    // they are running on the browser and thus have no need for the source-map library.
-    let SourceMap = require('source-map');
-    SourceNode = SourceMap.SourceNode;
-  }
 } catch (err) {
   /* NOP */
 }
@@ -38,7 +33,7 @@ if (!SourceNode) {
       this.src = chunks + this.src;
     },
     toStringWithSourceMap: function() {
-      return { code: this.toString() };
+      return {code: this.toString()};
     },
     toString: function() {
       return this.src;
@@ -46,6 +41,7 @@ if (!SourceNode) {
   };
 }
 
+
 function castChunk(chunk, codeGen, loc) {
   if (isArray(chunk)) {
     let ret = [];
@@ -61,6 +57,7 @@ function castChunk(chunk, codeGen, loc) {
   return chunk;
 }
 
+
 function CodeGen(srcFile) {
   this.srcFile = srcFile;
   this.source = [];
@@ -92,22 +89,17 @@ CodeGen.prototype = {
   },
 
   empty: function() {
-    let loc = this.currentLocation || { start: {} };
+    let loc = this.currentLocation || {start: {}};
     return new SourceNode(loc.start.line, loc.start.column, this.srcFile);
   },
-  wrap: function(chunk, loc = this.currentLocation || { start: {} }) {
+  wrap: function(chunk, loc = this.currentLocation || {start: {}}) {
     if (chunk instanceof SourceNode) {
       return chunk;
     }
 
     chunk = castChunk(chunk, this, loc);
 
-    return new SourceNode(
+    return new SourceNode(loc.start.line, loc.start.column, this.srcFile, chunk);
-      loc.start.line,
-      loc.start.column,
-      this.srcFile,
-      chunk
-    );
   },
 
   functionCall: function(fn, type, params) {
@@ -116,17 +108,13 @@ CodeGen.prototype = {
   },
 
   quotedString: function(str) {
-    return (
+    return '"' + (str + '')
-      '"' +
+      .replace(/\\/g, '\\\\')
-      (str + '')
+      .replace(/"/g, '\\"')
-        .replace(/\\/g, '\\\\')
+      .replace(/\n/g, '\\n')
-        .replace(/"/g, '\\"')
+      .replace(/\r/g, '\\r')
-        .replace(/\n/g, '\\n')
+      .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\r/g, '\\r')
+      .replace(/\u2029/g, '\\u2029') + '"';
-        .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\u2029/g, '\\u2029') +
-      '"'
-    );
   },
 
   objectLiteral: function(obj) {
@@ -145,6 +133,7 @@ CodeGen.prototype = {
     return ret;
   },
 
+
   generateList: function(entries) {
     let ret = this.empty();
 
@@ -169,3 +158,4 @@ CodeGen.prototype = {
 };
 
 export default CodeGen;
+

lib/handlebars/compiler/compiler.js

@@ -1,7 +1,7 @@
 /* eslint-disable new-cap */
 
 import Exception from '../exception';
-import { isArray, indexOf, extend } from '../utils';
+import {isArray, indexOf, extend} from '../utils';
 import AST from './ast';
 
 const slice = [].slice;
@@ -24,11 +24,8 @@ Compiler.prototype = {
 
     for (let i = 0; i < len; i++) {
       let opcode = this.opcodes[i],
-        otherOpcode = other.opcodes[i];
+          otherOpcode = other.opcodes[i];
-      if (
+      if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
-        opcode.opcode !== otherOpcode.opcode ||
-        !argEquals(opcode.args, otherOpcode.args)
-      ) {
         return false;
       }
     }
@@ -57,28 +54,24 @@ Compiler.prototype = {
 
     options.blockParams = options.blockParams || [];
 
-    options.knownHelpers = extend(
+    options.knownHelpers = extend(Object.create(null), {
-      Object.create(null),
+      'helperMissing': true,
-      {
+      'blockHelperMissing': true,
-        helperMissing: true,
+      'each': true,
-        blockHelperMissing: true,
+      'if': true,
-        each: true,
+      'unless': true,
-        if: true,
+      'with': true,
-        unless: true,
+      'log': true,
-        with: true,
+      'lookup': true
-        log: true,
+    }, options.knownHelpers);
-        lookup: true
-      },
-      options.knownHelpers
-    );
 
     return this.accept(program);
   },
 
   compileProgram: function(program) {
     let childCompiler = new this.compiler(), // eslint-disable-line new-cap
-      result = childCompiler.compile(program, this.options),
+        result = childCompiler.compile(program, this.options),
-      guid = this.guid++;
+        guid = this.guid++;
 
     this.usePartial = this.usePartial || result.usePartial;
 
@@ -104,7 +97,7 @@ Compiler.prototype = {
     this.options.blockParams.unshift(program.blockParams);
 
     let body = program.body,
-      bodyLength = body.length;
+        bodyLength = body.length;
     for (let i = 0; i < bodyLength; i++) {
       this.accept(body[i]);
     }
@@ -121,7 +114,7 @@ Compiler.prototype = {
     transformLiteralToPath(block);
 
     let program = block.program,
-      inverse = block.inverse;
+        inverse = block.inverse;
 
     program = program && this.compileProgram(program);
     inverse = inverse && this.compileProgram(inverse);
@@ -156,7 +149,7 @@ Compiler.prototype = {
   DecoratorBlock(decorator) {
     let program = decorator.program && this.compileProgram(decorator.program);
     let params = this.setupFullMustacheParams(decorator, program, undefined),
-      path = decorator.path;
+        path = decorator.path;
 
     this.useDecorators = true;
     this.opcode('registerDecorator', params.length, path.original);
@@ -172,20 +165,17 @@ Compiler.prototype = {
 
     let params = partial.params;
     if (params.length > 1) {
-      throw new Exception(
+      throw new Exception('Unsupported number of partial arguments: ' + params.length, partial);
-        'Unsupported number of partial arguments: ' + params.length,
-        partial
-      );
     } else if (!params.length) {
       if (this.options.explicitPartialContext) {
         this.opcode('pushLiteral', 'undefined');
       } else {
-        params.push({ type: 'PathExpression', parts: [], depth: 0 });
+        params.push({type: 'PathExpression', parts: [], depth: 0});
       }
     }
 
     let partialName = partial.name.original,
-      isDynamic = partial.name.type === 'SubExpression';
+        isDynamic = partial.name.type === 'SubExpression';
     if (isDynamic) {
       this.accept(partial.name);
     }
@@ -218,6 +208,7 @@ Compiler.prototype = {
     this.DecoratorBlock(decorator);
   },
 
+
   ContentStatement: function(content) {
     if (content.value) {
       this.opcode('appendContent', content.value);
@@ -240,8 +231,8 @@ Compiler.prototype = {
   },
   ambiguousSexpr: function(sexpr, program, inverse) {
     let path = sexpr.path,
-      name = path.parts[0],
+        name = path.parts[0],
-      isBlock = program != null || inverse != null;
+        isBlock = program != null || inverse != null;
 
     this.opcode('getContext', path.depth);
 
@@ -263,27 +254,19 @@ Compiler.prototype = {
 
   helperSexpr: function(sexpr, program, inverse) {
     let params = this.setupFullMustacheParams(sexpr, program, inverse),
-      path = sexpr.path,
+        path = sexpr.path,
-      name = path.parts[0];
+        name = path.parts[0];
 
     if (this.options.knownHelpers[name]) {
       this.opcode('invokeKnownHelper', params.length, name);
     } else if (this.options.knownHelpersOnly) {
-      throw new Exception(
+      throw new Exception('You specified knownHelpersOnly, but used the unknown helper ' + name, sexpr);
-        'You specified knownHelpersOnly, but used the unknown helper ' + name,
-        sexpr
-      );
     } else {
       path.strict = true;
       path.falsy = true;
 
       this.accept(path);
-      this.opcode(
+      this.opcode('invokeHelper', params.length, path.original, AST.helpers.simpleId(path));
-        'invokeHelper',
-        params.length,
-        path.original,
-        AST.helpers.simpleId(path)
-      );
     }
   },
 
@@ -292,8 +275,8 @@ Compiler.prototype = {
     this.opcode('getContext', path.depth);
 
     let name = path.parts[0],
-      scoped = AST.helpers.scopedId(path),
+        scoped = AST.helpers.scopedId(path),
-      blockParamId = !path.depth && !scoped && this.blockParamIndex(name);
+        blockParamId = !path.depth && !scoped && this.blockParamIndex(name);
 
     if (blockParamId) {
       this.opcode('lookupBlockParam', blockParamId, path.parts);
@@ -304,13 +287,7 @@ Compiler.prototype = {
       this.options.data = true;
       this.opcode('lookupData', path.depth, path.parts, path.strict);
     } else {
-      this.opcode(
+      this.opcode('lookupOnContext', path.parts, path.falsy, path.strict, scoped);
-        'lookupOnContext',
-        path.parts,
-        path.falsy,
-        path.strict,
-        scoped
-      );
     }
   },
 
@@ -336,8 +313,8 @@ Compiler.prototype = {
 
   Hash: function(hash) {
     let pairs = hash.pairs,
-      i = 0,
+        i = 0,
-      l = pairs.length;
+        l = pairs.length;
 
     this.opcode('pushHash');
 
@@ -352,11 +329,7 @@ Compiler.prototype = {
 
   // HELPERS
   opcode: function(name) {
-    this.opcodes.push({
+    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
-      opcode: name,
-      args: slice.call(arguments, 1),
-      loc: this.sourceNode[0].loc
-    });
   },
 
   addDepth: function(depth) {
@@ -385,7 +358,7 @@ Compiler.prototype = {
     // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
     if (isEligible && !isHelper) {
       let name = sexpr.path.parts[0],
-        options = this.options;
+          options = this.options;
       if (options.knownHelpers[name]) {
         isHelper = true;
       } else if (options.knownHelpersOnly) {
@@ -413,7 +386,9 @@ Compiler.prototype = {
 
     if (this.stringParams) {
       if (value.replace) {
-        value = value.replace(/^(\.?\.\/)*/g, '').replace(/\//g, '.');
+        value = value
+            .replace(/^(\.?\.\/)*/g, '')
+            .replace(/\//g, '.');
       }
 
       if (val.depth) {
@@ -431,7 +406,7 @@ Compiler.prototype = {
       if (this.trackIds) {
         let blockParamIndex;
         if (val.parts && !AST.helpers.scopedId(val) && !val.depth) {
-          blockParamIndex = this.blockParamIndex(val.parts[0]);
+           blockParamIndex = this.blockParamIndex(val.parts[0]);
         }
         if (blockParamIndex) {
           let blockParamChild = val.parts.slice(1).join('.');
@@ -440,9 +415,9 @@ Compiler.prototype = {
           value = val.original || value;
           if (value.replace) {
             value = value
-              .replace(/^this(?:\.|$)/, '')
+                .replace(/^this(?:\.|$)/, '')
-              .replace(/^\.\//, '')
+                .replace(/^\.\//, '')
-              .replace(/^\.$/, '');
+                .replace(/^\.$/, '');
           }
 
           this.opcode('pushId', val.type, value);
@@ -469,13 +444,9 @@ Compiler.prototype = {
   },
 
   blockParamIndex: function(name) {
-    for (
+    for (let depth = 0, len = this.options.blockParams.length; depth < len; depth++) {
-      let depth = 0, len = this.options.blockParams.length;
-      depth < len;
-      depth++
-    ) {
       let blockParams = this.options.blockParams[depth],
-        param = blockParams && indexOf(blockParams, name);
+          param = blockParams && indexOf(blockParams, name);
       if (blockParams && param >= 0) {
         return [depth, param];
       }
@@ -484,14 +455,8 @@ Compiler.prototype = {
 };
 
 export function precompile(input, options, env) {
-  if (
+  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    input == null ||
+    throw new Exception('You must pass a string or Handlebars AST to Handlebars.precompile. You passed ' + input);
-    (typeof input !== 'string' && input.type !== 'Program')
-  ) {
-    throw new Exception(
-      'You must pass a string or Handlebars AST to Handlebars.precompile. You passed ' +
-        input
-    );
   }
 
   options = options || {};
@@ -503,19 +468,13 @@ export function precompile(input, options, env) {
   }
 
   let ast = env.parse(input, options),
-    environment = new env.Compiler().compile(ast, options);
+      environment = new env.Compiler().compile(ast, options);
   return new env.JavaScriptCompiler().compile(environment, options);
 }
 
 export function compile(input, options = {}, env) {
-  if (
+  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    input == null ||
+    throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
-    (typeof input !== 'string' && input.type !== 'Program')
-  ) {
-    throw new Exception(
-      'You must pass a string or Handlebars AST to Handlebars.compile. You passed ' +
-        input
-    );
   }
 
   options = extend({}, options);
@@ -530,13 +489,8 @@ export function compile(input, options = {}, env) {
 
   function compileInput() {
     let ast = env.parse(input, options),
-      environment = new env.Compiler().compile(ast, options),
+        environment = new env.Compiler().compile(ast, options),
-      templateSpec = new env.JavaScriptCompiler().compile(
+        templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
-        environment,
-        options,
-        undefined,
-        true
-      );
     return env.template(templateSpec);
   }
 

lib/handlebars/compiler/helpers.js

@@ -4,12 +4,9 @@ function validateClose(open, close) {
   close = close.path ? close.path.original : close;
 
   if (open.path.original !== close) {
-    let errorNode = { loc: open.path.loc };
+    let errorNode = {loc: open.path.loc};
 
-    throw new Exception(
+    throw new Exception(open.path.original + " doesn't match " + close, errorNode);
-      open.path.original + " doesn't match " + close,
-      errorNode
-    );
   }
 }
 
@@ -41,26 +38,27 @@ export function stripFlags(open, close) {
 }
 
 export function stripComment(comment) {
-  return comment.replace(/^\{\{~?!-?-?/, '').replace(/-?-?~?\}\}$/, '');
+  return comment.replace(/^\{\{~?!-?-?/, '')
+                .replace(/-?-?~?\}\}$/, '');
 }
 
 export function preparePath(data, parts, loc) {
   loc = this.locInfo(loc);
 
   let original = data ? '@' : '',
-    dig = [],
+      dig = [],
-    depth = 0;
+      depth = 0;
 
   for (let i = 0, l = parts.length; i < l; i++) {
     let part = parts[i].part,
-      // If we have [] syntax then we do not treat path references as operators,
+        // If we have [] syntax then we do not treat path references as operators,
-      // i.e. foo.[this] resolves to approximately context.foo['this']
+        // i.e. foo.[this] resolves to approximately context.foo['this']
-      isLiteral = parts[i].original !== part;
+        isLiteral = parts[i].original !== part;
     original += (parts[i].separator || '') + part;
 
     if (!isLiteral && (part === '..' || part === '.' || part === 'this')) {
       if (dig.length > 0) {
-        throw new Exception('Invalid path: ' + original, { loc });
+        throw new Exception('Invalid path: ' + original, {loc});
       } else if (part === '..') {
         depth++;
       }
@@ -82,9 +80,9 @@ export function preparePath(data, parts, loc) {
 export function prepareMustache(path, params, hash, open, strip, locInfo) {
   // Must use charAt to support IE pre-10
   let escapeFlag = open.charAt(3) || open.charAt(2),
-    escaped = escapeFlag !== '{' && escapeFlag !== '&';
+      escaped = escapeFlag !== '{' && escapeFlag !== '&';
 
-  let decorator = /\*/.test(open);
+  let decorator = (/\*/.test(open));
   return {
     type: decorator ? 'Decorator' : 'MustacheStatement',
     path,
@@ -120,30 +118,21 @@ export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
   };
 }
 
-export function prepareBlock(
+export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
-  openBlock,
-  program,
-  inverseAndProgram,
-  close,
-  inverted,
-  locInfo
-) {
   if (close && close.path) {
     validateClose(openBlock, close);
   }
 
-  let decorator = /\*/.test(openBlock.open);
+  let decorator = (/\*/.test(openBlock.open));
 
   program.blockParams = openBlock.blockParams;
 
-  let inverse, inverseStrip;
+  let inverse,
+      inverseStrip;
 
   if (inverseAndProgram) {
     if (decorator) {
-      throw new Exception(
+      throw new Exception('Unexpected inverse block on decorator', inverseAndProgram);
-        'Unexpected inverse block on decorator',
-        inverseAndProgram
-      );
     }
 
     if (inverseAndProgram.chain) {
@@ -177,7 +166,7 @@ export function prepareBlock(
 export function prepareProgram(statements, loc) {
   if (!loc && statements.length) {
     const firstLoc = statements[0].loc,
-      lastLoc = statements[statements.length - 1].loc;
+          lastLoc = statements[statements.length - 1].loc;
 
     /* istanbul ignore else */
     if (firstLoc && lastLoc) {
@@ -203,6 +192,7 @@ export function prepareProgram(statements, loc) {
   };
 }
 
+
 export function preparePartialBlock(open, program, close, locInfo) {
   validateClose(open, close);
 
@@ -217,3 +207,4 @@ export function preparePartialBlock(open, program, close, locInfo) {
     loc: this.locInfo(locInfo)
   };
 }
+

lib/handlebars/compiler/javascript-compiler.js

@@ -1,7 +1,8 @@
 import { COMPILER_REVISION, REVISION_CHANGES } from '../base';
 import Exception from '../exception';
-import { isArray } from '../utils';
+import {isArray} from '../utils';
 import CodeGen from './code-gen';
+import {dangerousPropertyRegex} from '../helpers/lookup';
 
 function Literal(value) {
   this.value = value;
@@ -12,21 +13,28 @@ function JavaScriptCompiler() {}
 JavaScriptCompiler.prototype = {
   // PUBLIC API: You can override these methods in a subclass to provide
   // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /*,  type */) {
+  nameLookup: function(parent, name/* , type*/) {
-    return this.internalNameLookup(parent, name);
+    if (dangerousPropertyRegex.test(name)) {
+      const isEnumerable = [ this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',', JSON.stringify(name), ')'];
+      return ['(', isEnumerable, '?', _actualLookup(), ' : undefined)'];
+    }
+    return _actualLookup();
+
+    function _actualLookup() {
+      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+        return [parent, '.', name];
+      } else {
+        return [parent, '[', JSON.stringify(name), ']'];
+      }
+    }
   },
   depthedLookup: function(name) {
-    return [
+    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
-      this.aliasable('container.lookup'),
-      '(depths, ',
-      JSON.stringify(name),
-      ')'
-    ];
   },
 
   compilerInfo: function() {
     const revision = COMPILER_REVISION,
-      versions = REVISION_CHANGES[revision];
+          versions = REVISION_CHANGES[revision];
     return [revision, versions];
   },
 
@@ -54,12 +62,6 @@ JavaScriptCompiler.prototype = {
     return this.quotedString('');
   },
   // END PUBLIC API
-  internalNameLookup: function(parent, name) {
-    this.lookupPropertyFunctionIsUsed = true;
-    return ['lookupProperty(', parent, ',', JSON.stringify(name), ')'];
-  },
-
-  lookupPropertyFunctionIsUsed: false,
 
   compile: function(environment, options, context, asObject) {
     this.environment = environment;
@@ -89,18 +91,14 @@ JavaScriptCompiler.prototype = {
 
     this.compileChildren(environment, options);
 
-    this.useDepths =
+    this.useDepths = this.useDepths || environment.useDepths || environment.useDecorators || this.options.compat;
-      this.useDepths ||
-      environment.useDepths ||
-      environment.useDecorators ||
-      this.options.compat;
     this.useBlockParams = this.useBlockParams || environment.useBlockParams;
 
     let opcodes = environment.opcodes,
-      opcode,
+        opcode,
-      firstLoc,
+        firstLoc,
-      i,
+        i,
-      l;
+        l;
 
     for (i = 0, l = opcodes.length; i < l; i++) {
       opcode = opcodes[i];
@@ -122,28 +120,13 @@ JavaScriptCompiler.prototype = {
     if (!this.decorators.isEmpty()) {
       this.useDecorators = true;
 
-      this.decorators.prepend([
+      this.decorators.prepend('var decorators = container.decorators;\n');
-        'var decorators = container.decorators, ',
-        this.lookupPropertyFunctionVarDeclaration(),
-        ';\n'
-      ]);
       this.decorators.push('return fn;');
 
       if (asObject) {
-        this.decorators = Function.apply(this, [
+        this.decorators = Function.apply(this, ['fn', 'props', 'container', 'depth0', 'data', 'blockParams', 'depths', this.decorators.merge()]);
-          'fn',
-          'props',
-          'container',
-          'depth0',
-          'data',
-          'blockParams',
-          'depths',
-          this.decorators.merge()
-        ]);
       } else {
-        this.decorators.prepend(
+        this.decorators.prepend('function(fn, props, container, depth0, data, blockParams, depths) {\n');
-          'function(fn, props, container, depth0, data, blockParams, depths) {\n'
-        );
         this.decorators.push('}\n');
         this.decorators = this.decorators.merge();
       }
@@ -163,7 +146,7 @@ JavaScriptCompiler.prototype = {
         ret.useDecorators = true;
       }
 
-      let { programs, decorators } = this.context;
+      let {programs, decorators} = this.context;
       for (i = 0, l = programs.length; i < l; i++) {
         if (programs[i]) {
           ret[i] = programs[i];
@@ -193,11 +176,11 @@ JavaScriptCompiler.prototype = {
       if (!asObject) {
         ret.compiler = JSON.stringify(ret.compiler);
 
-        this.source.currentLocation = { start: { line: 1, column: 0 } };
+        this.source.currentLocation = {start: {line: 1, column: 0}};
         ret = this.objectLiteral(ret);
 
         if (options.srcName) {
-          ret = ret.toStringWithSourceMap({ file: options.destName });
+          ret = ret.toStringWithSourceMap({file: options.destName});
           ret.map = ret.map && ret.map.toString();
         } else {
           ret = ret.toString();
@@ -238,15 +221,11 @@ JavaScriptCompiler.prototype = {
     Object.keys(this.aliases).forEach(alias => {
       let node = this.aliases[alias];
       if (node.children && node.referenceCount > 1) {
-        varDeclarations += ', alias' + ++aliasCount + '=' + alias;
+        varDeclarations += ', alias' + (++aliasCount) + '=' + alias;
         node.children[0] = 'alias' + aliasCount;
       }
     });
 
-    if (this.lookupPropertyFunctionIsUsed) {
-      varDeclarations += ', ' + this.lookupPropertyFunctionVarDeclaration();
-    }
-
     let params = ['container', 'depth0', 'helpers', 'partials', 'data'];
 
     if (this.useBlockParams || this.useDepths) {
@@ -264,23 +243,18 @@ JavaScriptCompiler.prototype = {
 
       return Function.apply(this, params);
     } else {
-      return this.source.wrap([
+      return this.source.wrap(['function(', params.join(','), ') {\n  ', source, '}']);
-        'function(',
-        params.join(','),
-        ') {\n  ',
-        source,
-        '}'
-      ]);
     }
   },
   mergeSource: function(varDeclarations) {
     let isSimple = this.environment.isSimple,
-      appendOnly = !this.forceBuffer,
+        appendOnly = !this.forceBuffer,
-      appendFirst,
+        appendFirst,
-      sourceSeen,
+
-      bufferStart,
+        sourceSeen,
-      bufferEnd;
+        bufferStart,
-    this.source.each(line => {
+        bufferEnd;
+    this.source.each((line) => {
       if (line.appendToBuffer) {
         if (bufferStart) {
           line.prepend('  + ');
@@ -306,6 +280,7 @@ JavaScriptCompiler.prototype = {
       }
     });
 
+
     if (appendOnly) {
       if (bufferStart) {
         bufferStart.prepend('return ');
@@ -314,8 +289,7 @@ JavaScriptCompiler.prototype = {
         this.source.push('return "";');
       }
     } else {
-      varDeclarations +=
+      varDeclarations += ', buffer = ' + (appendFirst ? '' : this.initializeBuffer());
-        ', buffer = ' + (appendFirst ? '' : this.initializeBuffer());
 
       if (bufferStart) {
         bufferStart.prepend('return buffer + ');
@@ -326,25 +300,12 @@ JavaScriptCompiler.prototype = {
     }
 
     if (varDeclarations) {
-      this.source.prepend(
+      this.source.prepend('var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n'));
-        'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n')
-      );
     }
 
     return this.source.merge();
   },
 
-  lookupPropertyFunctionVarDeclaration: function() {
-    return `
-      lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    }
-    `.trim();
-  },
-
   // [blockValue]
   //
   // On stack, before: hash, inverse, program, value
@@ -355,10 +316,8 @@ JavaScriptCompiler.prototype = {
   // replace it on the stack with the result of properly
   // invoking blockHelperMissing.
   blockValue: function(name) {
-    let blockHelperMissing = this.aliasable(
+    let blockHelperMissing = this.aliasable('container.hooks.blockHelperMissing'),
-        'container.hooks.blockHelperMissing'
+        params = [this.contextName(0)];
-      ),
-      params = [this.contextName(0)];
     this.setupHelperArgs(name, 0, params);
 
     let blockName = this.popStack();
@@ -375,10 +334,8 @@ JavaScriptCompiler.prototype = {
   // On stack, after, if lastHelper: value
   ambiguousBlockValue: function() {
     // We're being a bit cheeky and reusing the options value from the prior exec
-    let blockHelperMissing = this.aliasable(
+    let blockHelperMissing = this.aliasable('container.hooks.blockHelperMissing'),
-        'container.hooks.blockHelperMissing'
+        params = [this.contextName(0)];
-      ),
-      params = [this.contextName(0)];
     this.setupHelperArgs('', 0, params, true);
 
     this.flushInline();
@@ -387,14 +344,9 @@ JavaScriptCompiler.prototype = {
     params.splice(1, 0, current);
 
     this.pushSource([
-      'if (!',
+      'if (!', this.lastHelper, ') { ',
-      this.lastHelper,
+      current, ' = ', this.source.functionCall(blockHelperMissing, 'call', params),
-      ') { ',
+      '}']);
-      current,
-      ' = ',
-      this.source.functionCall(blockHelperMissing, 'call', params),
-      '}'
-    ]);
   },
 
   // [appendContent]
@@ -424,24 +376,14 @@ JavaScriptCompiler.prototype = {
   // Otherwise, the empty string is appended
   append: function() {
     if (this.isInline()) {
-      this.replaceStack(current => [' != null ? ', current, ' : ""']);
+      this.replaceStack((current) => [' != null ? ', current, ' : ""']);
 
       this.pushSource(this.appendToBuffer(this.popStack()));
     } else {
       let local = this.popStack();
-      this.pushSource([
+      this.pushSource(['if (', local, ' != null) { ', this.appendToBuffer(local, undefined, true), ' }']);
-        'if (',
-        local,
-        ' != null) { ',
-        this.appendToBuffer(local, undefined, true),
-        ' }'
-      ]);
       if (this.environment.isSimple) {
-        this.pushSource([
+        this.pushSource(['else { ', this.appendToBuffer("''", undefined, true), ' }']);
-          'else { ',
-          this.appendToBuffer("''", undefined, true),
-          ' }'
-        ]);
       }
     }
   },
@@ -453,14 +395,8 @@ JavaScriptCompiler.prototype = {
   //
   // Escape `value` and append it to the buffer
   appendEscaped: function() {
-    this.pushSource(
+    this.pushSource(this.appendToBuffer(
-      this.appendToBuffer([
+        [this.aliasable('container.escapeExpression'), '(', this.popStack(), ')']));
-        this.aliasable('container.escapeExpression'),
-        '(',
-        this.popStack(),
-        ')'
-      ])
-    );
   },
 
   // [getContext]
@@ -544,7 +480,7 @@ JavaScriptCompiler.prototype = {
     let len = parts.length;
     for (; i < len; i++) {
       /* eslint-disable no-loop-func */
-      this.replaceStack(current => {
+      this.replaceStack((current) => {
         let lookup = this.nameLookup(current, parts[i], type);
         // We want to ensure that zero and false are handled properly if the context (falsy flag)
         // needs to have the special handling for these values.
@@ -567,14 +503,7 @@ JavaScriptCompiler.prototype = {
   // If the `value` is a lambda, replace it on the stack by
   // the return value of the lambda
   resolvePossibleLambda: function() {
-    this.push([
+    this.push([this.aliasable('container.lambda'), '(', this.popStack(), ', ', this.contextName(0), ')']);
-      this.aliasable('container.lambda'),
-      '(',
-      this.popStack(),
-      ', ',
-      this.contextName(0),
-      ')'
-    ]);
   },
 
   // [pushStringParam]
@@ -614,7 +543,7 @@ JavaScriptCompiler.prototype = {
     if (this.hash) {
       this.hashes.push(this.hash);
     }
-    this.hash = { values: {}, types: [], contexts: [], ids: [] };
+    this.hash = {values: {}, types: [], contexts: [], ids: []};
   },
   popHash: function() {
     let hash = this.hash;
@@ -678,16 +607,11 @@ JavaScriptCompiler.prototype = {
   // and inserts the decorator into the decorators list.
   registerDecorator(paramSize, name) {
     let foundDecorator = this.nameLookup('decorators', name, 'decorator'),
-      options = this.setupHelperArgs(name, paramSize);
+        options = this.setupHelperArgs(name, paramSize);
 
     this.decorators.push([
       'fn = ',
-      this.decorators.functionCall(foundDecorator, '', [
+      this.decorators.functionCall(foundDecorator, '', ['fn', 'props', 'container', options]),
-        'fn',
-        'props',
-        'container',
-        options
-      ]),
       ' || fn;'
     ]);
   },
@@ -703,32 +627,21 @@ JavaScriptCompiler.prototype = {
   // If the helper is not found, `helperMissing` is called.
   invokeHelper: function(paramSize, name, isSimple) {
     let nonHelper = this.popStack(),
-      helper = this.setupHelper(paramSize, name);
+        helper = this.setupHelper(paramSize, name);
 
     let possibleFunctionCalls = [];
 
-    if (isSimple) {
+    if (isSimple) { // direct call to helper
-      // direct call to helper
       possibleFunctionCalls.push(helper.name);
     }
     // call a function from the input object
     possibleFunctionCalls.push(nonHelper);
     if (!this.options.strict) {
-      possibleFunctionCalls.push(
+      possibleFunctionCalls.push(this.aliasable('container.hooks.helperMissing'));
-        this.aliasable('container.hooks.helperMissing')
-      );
     }
 
-    let functionLookupCode = [
+    let functionLookupCode = ['(', this.itemsSeparatedBy(possibleFunctionCalls, '||'), ')'];
-      '(',
+    let functionCall = this.source.functionCall(functionLookupCode, 'call', helper.callParams);
-      this.itemsSeparatedBy(possibleFunctionCalls, '||'),
-      ')'
-    ];
-    let functionCall = this.source.functionCall(
-      functionLookupCode,
-      'call',
-      helper.callParams
-    );
     this.push(functionCall);
   },
 
@@ -772,31 +685,22 @@ JavaScriptCompiler.prototype = {
     this.emptyHash();
     let helper = this.setupHelper(0, name, helperCall);
 
-    let helperName = (this.lastHelper = this.nameLookup(
+    let helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-      'helpers',
-      name,
-      'helper'
-    ));
 
     let lookup = ['(', '(helper = ', helperName, ' || ', nonHelper, ')'];
     if (!this.options.strict) {
       lookup[0] = '(helper = ';
       lookup.push(
-        ' != null ? helper : ',
+          ' != null ? helper : ',
-        this.aliasable('container.hooks.helperMissing')
+          this.aliasable('container.hooks.helperMissing')
       );
     }
 
     this.push([
-      '(',
+      '(', lookup,
-      lookup,
+      (helper.paramsInit ? ['),(', helper.paramsInit] : []), '),',
-      helper.paramsInit ? ['),(', helper.paramsInit] : [],
+      '(typeof helper === ', this.aliasable('"function"'), ' ? ',
-      '),',
+      this.source.functionCall('helper', 'call', helper.callParams), ' : helper))'
-      '(typeof helper === ',
-      this.aliasable('"function"'),
-      ' ? ',
-      this.source.functionCall('helper', 'call', helper.callParams),
-      ' : helper))'
     ]);
   },
 
@@ -809,7 +713,7 @@ JavaScriptCompiler.prototype = {
   // and pushes the result of the invocation back.
   invokePartial: function(isDynamic, name, indent) {
     let params = [],
-      options = this.setupParams(name, 1, params);
+        options = this.setupParams(name, 1, params);
 
     if (isDynamic) {
       name = this.popStack();
@@ -846,9 +750,9 @@ JavaScriptCompiler.prototype = {
   // Pops a value off the stack and assigns it to the current hash
   assignToHash: function(key) {
     let value = this.popStack(),
-      context,
+        context,
-      type,
+        type,
-      id;
+        id;
 
     if (this.trackIds) {
       id = this.popStack();
@@ -874,13 +778,8 @@ JavaScriptCompiler.prototype = {
   pushId: function(type, name, child) {
     if (type === 'BlockParam') {
       this.pushStackLiteral(
-        'blockParams[' +
+          'blockParams[' + name[0] + '].path[' + name[1] + ']'
-          name[0] +
+          + (child ? ' + ' + JSON.stringify('.' + child) : ''));
-          '].path[' +
-          name[1] +
-          ']' +
-          (child ? ' + ' + JSON.stringify('.' + child) : '')
-      );
     } else if (type === 'PathExpression') {
       this.pushString(name);
     } else if (type === 'SubExpression') {
@@ -895,9 +794,7 @@ JavaScriptCompiler.prototype = {
   compiler: JavaScriptCompiler,
 
   compileChildren: function(environment, options) {
-    let children = environment.children,
+    let children = environment.children, child, compiler;
-      child,
-      compiler;
 
     for (let i = 0, l = children.length; i < l; i++) {
       child = children[i];
@@ -910,12 +807,7 @@ JavaScriptCompiler.prototype = {
         let index = this.context.programs.length;
         child.index = index;
         child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(
+        this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
-          child,
-          options,
-          this.context,
-          !this.precompile
-        );
         this.context.decorators[index] = compiler.decorators;
         this.context.environments[index] = child;
 
@@ -943,7 +835,7 @@ JavaScriptCompiler.prototype = {
 
   programExpression: function(guid) {
     let child = this.environment.children[guid],
-      programParams = [child.index, 'data', child.blockParams];
+        programParams = [child.index, 'data', child.blockParams];
 
     if (this.useBlockParams || this.useDepths) {
       programParams.push('blockParams');
@@ -978,11 +870,7 @@ JavaScriptCompiler.prototype = {
   pushSource: function(source) {
     if (this.pendingContent) {
       this.source.push(
-        this.appendToBuffer(
+          this.appendToBuffer(this.source.quotedString(this.pendingContent), this.pendingLocation));
-          this.source.quotedString(this.pendingContent),
-          this.pendingLocation
-        )
-      );
       this.pendingContent = undefined;
     }
 
@@ -993,9 +881,9 @@ JavaScriptCompiler.prototype = {
 
   replaceStack: function(callback) {
     let prefix = ['('],
-      stack,
+        stack,
-      createdStack,
+        createdStack,
-      usedLiteral;
+        usedLiteral;
 
     /* istanbul ignore next */
     if (!this.isInline()) {
@@ -1032,9 +920,7 @@ JavaScriptCompiler.prototype = {
 
   incrStack: function() {
     this.stackSlot++;
-    if (this.stackSlot > this.stackVars.length) {
+    if (this.stackSlot > this.stackVars.length) { this.stackVars.push('stack' + this.stackSlot); }
-      this.stackVars.push('stack' + this.stackSlot);
-    }
     return this.topStackName();
   },
   topStackName: function() {
@@ -1061,9 +947,9 @@ JavaScriptCompiler.prototype = {
 
   popStack: function(wrapped) {
     let inline = this.isInline(),
-      item = (inline ? this.inlineStack : this.compileStack).pop();
+        item = (inline ? this.inlineStack : this.compileStack).pop();
 
-    if (!wrapped && item instanceof Literal) {
+    if (!wrapped && (item instanceof Literal)) {
       return item.value;
     } else {
       if (!inline) {
@@ -1078,8 +964,8 @@ JavaScriptCompiler.prototype = {
   },
 
   topStack: function() {
-    let stack = this.isInline() ? this.inlineStack : this.compileStack,
+    let stack = (this.isInline() ? this.inlineStack : this.compileStack),
-      item = stack[stack.length - 1];
+        item = stack[stack.length - 1];
 
     /* istanbul ignore if */
     if (item instanceof Literal) {
@@ -1121,13 +1007,9 @@ JavaScriptCompiler.prototype = {
 
   setupHelper: function(paramSize, name, blockHelper) {
     let params = [],
-      paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
+        paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
     let foundHelper = this.nameLookup('helpers', name, 'helper'),
-      callContext = this.aliasable(
+        callContext = this.aliasable(`${this.contextName(0)} != null ? ${this.contextName(0)} : (container.nullContext || {})`);
-        `${this.contextName(0)} != null ? ${this.contextName(
-          0
-        )} : (container.nullContext || {})`
-      );
 
     return {
       params: params,
@@ -1139,11 +1021,11 @@ JavaScriptCompiler.prototype = {
 
   setupParams: function(helper, paramSize, params) {
     let options = {},
-      contexts = [],
+        contexts = [],
-      types = [],
+        types = [],
-      ids = [],
+        ids = [],
-      objectArgs = !params,
+        objectArgs = !params,
-      param;
+        param;
 
     if (objectArgs) {
       params = [];
@@ -1161,7 +1043,7 @@ JavaScriptCompiler.prototype = {
     }
 
     let inverse = this.popStack(),
-      program = this.popStack();
+        program = this.popStack();
 
     // Avoid setting fn and inverse if neither are set. This allows
     // helpers to do a check for `if (options.fn)`
@@ -1224,6 +1106,7 @@ JavaScriptCompiler.prototype = {
   }
 };
 
+
 (function() {
   const reservedWords = (
     'break else new var' +
@@ -1244,27 +1127,21 @@ JavaScriptCompiler.prototype = {
     ' null true false'
   ).split(' ');
 
-  const compilerWords = (JavaScriptCompiler.RESERVED_WORDS = {});
+  const compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
 
   for (let i = 0, l = reservedWords.length; i < l; i++) {
     compilerWords[reservedWords[i]] = true;
   }
-})();
+}());
 
-/**
- * @deprecated May be removed in the next major version
- */
 JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  return (
+  return !JavaScriptCompiler.RESERVED_WORDS[name] && (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/).test(name);
-    !JavaScriptCompiler.RESERVED_WORDS[name] &&
-    /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)
-  );
 };
 
 function strictLookup(requireTerminal, compiler, parts, type) {
   let stack = compiler.popStack(),
-    i = 0,
+      i = 0,
-    len = parts.length;
+      len = parts.length;
   if (requireTerminal) {
     len--;
   }
@@ -1274,16 +1151,7 @@ function strictLookup(requireTerminal, compiler, parts, type) {
   }
 
   if (requireTerminal) {
-    return [
+    return [compiler.aliasable('container.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ', ', JSON.stringify(compiler.source.currentLocation), ' )'];
-      compiler.aliasable('container.strict'),
-      '(',
-      stack,
-      ', ',
-      compiler.quotedString(parts[i]),
-      ', ',
-      JSON.stringify(compiler.source.currentLocation),
-      ' )'
-    ];
   } else {
     return stack;
   }

lib/handlebars/compiler/printer.js

@@ -24,14 +24,13 @@ PrintVisitor.prototype.pad = function(string) {
 
 PrintVisitor.prototype.Program = function(program) {
   let out = '',
-    body = program.body,
+      body = program.body,
-    i,
+      i, l;
-    l;
 
   if (program.blockParams) {
     let blockParams = 'BLOCK PARAMS: [';
     for (i = 0, l = program.blockParams.length; i < l; i++) {
-      blockParams += ' ' + program.blockParams[i];
+       blockParams += ' ' + program.blockParams[i];
     }
     blockParams += ' ]';
     out += this.pad(blockParams);
@@ -53,14 +52,11 @@ PrintVisitor.prototype.Decorator = function(mustache) {
   return this.pad('{{ DIRECTIVE ' + this.SubExpression(mustache) + ' }}');
 };
 
-PrintVisitor.prototype.BlockStatement = PrintVisitor.prototype.DecoratorBlock = function(
+PrintVisitor.prototype.BlockStatement =
-  block
+PrintVisitor.prototype.DecoratorBlock = function(block) {
-) {
   let out = '';
 
-  out += this.pad(
+  out += this.pad((block.type === 'DecoratorBlock' ? 'DIRECTIVE ' : '') + 'BLOCK:');
-    (block.type === 'DecoratorBlock' ? 'DIRECTIVE ' : '') + 'BLOCK:'
-  );
   this.padding++;
   out += this.pad(this.SubExpression(block));
   if (block.program) {
@@ -70,16 +66,12 @@ PrintVisitor.prototype.BlockStatement = PrintVisitor.prototype.DecoratorBlock =
     this.padding--;
   }
   if (block.inverse) {
-    if (block.program) {
+    if (block.program) { this.padding++; }
-      this.padding++;
-    }
     out += this.pad('{{^}}');
     this.padding++;
     out += this.accept(block.inverse);
     this.padding--;
-    if (block.program) {
+    if (block.program) { this.padding--; }
-      this.padding--;
-    }
   }
   this.padding--;
 
@@ -123,8 +115,8 @@ PrintVisitor.prototype.CommentStatement = function(comment) {
 
 PrintVisitor.prototype.SubExpression = function(sexpr) {
   let params = sexpr.params,
-    paramStrings = [],
+      paramStrings = [],
-    hash;
+      hash;
 
   for (let i = 0, l = params.length; i < l; i++) {
     paramStrings.push(this.accept(params[i]));
@@ -142,6 +134,7 @@ PrintVisitor.prototype.PathExpression = function(id) {
   return (id.data ? '@' : '') + 'PATH:' + path;
 };
 
+
 PrintVisitor.prototype.StringLiteral = function(string) {
   return '"' + string.value + '"';
 };
@@ -164,7 +157,7 @@ PrintVisitor.prototype.NullLiteral = function() {
 
 PrintVisitor.prototype.Hash = function(hash) {
   let pairs = hash.pairs,
-    joinedPairs = [];
+      joinedPairs = [];
 
   for (let i = 0, l = pairs.length; i < l; i++) {
     joinedPairs.push(this.accept(pairs[i]));

lib/handlebars/compiler/visitor.js

@@ -15,14 +15,7 @@ Visitor.prototype = {
       // Hacky sanity check: This may have a few false positives for type for the helper
       // methods but will generally do the right thing without a lot of overhead.
       if (value && !Visitor.prototype[value.type]) {
-        throw new Exception(
+        throw new Exception('Unexpected node type "' + value.type + '" found when accepting ' + name + ' on ' + node.type);
-          'Unexpected node type "' +
-            value.type +
-            '" found when accepting ' +
-            name +
-            ' on ' +
-            node.type
-        );
       }
       node[name] = value;
     }

lib/handlebars/compiler/whitespace-control.js

@@ -14,18 +14,18 @@ WhitespaceControl.prototype.Program = function(program) {
   let body = program.body;
   for (let i = 0, l = body.length; i < l; i++) {
     let current = body[i],
-      strip = this.accept(current);
+        strip = this.accept(current);
 
     if (!strip) {
       continue;
     }
 
     let _isPrevWhitespace = isPrevWhitespace(body, i, isRoot),
-      _isNextWhitespace = isNextWhitespace(body, i, isRoot),
+        _isNextWhitespace = isNextWhitespace(body, i, isRoot),
-      openStandalone = strip.openStandalone && _isPrevWhitespace,
+
-      closeStandalone = strip.closeStandalone && _isNextWhitespace,
+        openStandalone = strip.openStandalone && _isPrevWhitespace,
-      inlineStandalone =
+        closeStandalone = strip.closeStandalone && _isNextWhitespace,
-        strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
+        inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
 
     if (strip.close) {
       omitRight(body, i, true);
@@ -41,7 +41,7 @@ WhitespaceControl.prototype.Program = function(program) {
         // If we are on a standalone node, save the indent info for partials
         if (current.type === 'PartialStatement') {
           // Pull out the whitespace from the final line
-          current.indent = /([ \t]+$)/.exec(body[i - 1].original)[1];
+          current.indent = (/([ \t]+$)/).exec(body[i - 1].original)[1];
         }
       }
     }
@@ -62,17 +62,17 @@ WhitespaceControl.prototype.Program = function(program) {
   return program;
 };
 
-WhitespaceControl.prototype.BlockStatement = WhitespaceControl.prototype.DecoratorBlock = WhitespaceControl.prototype.PartialBlockStatement = function(
+WhitespaceControl.prototype.BlockStatement =
-  block
+WhitespaceControl.prototype.DecoratorBlock =
-) {
+WhitespaceControl.prototype.PartialBlockStatement = function(block) {
   this.accept(block.program);
   this.accept(block.inverse);
 
   // Find the inverse program that is involed with whitespace stripping.
   let program = block.program || block.inverse,
-    inverse = block.program && block.inverse,
+      inverse = block.program && block.inverse,
-    firstInverse = inverse,
+      firstInverse = inverse,
-    lastInverse = inverse;
+      lastInverse = inverse;
 
   if (inverse && inverse.chained) {
     firstInverse = inverse.body[0].program;
@@ -112,11 +112,9 @@ WhitespaceControl.prototype.BlockStatement = WhitespaceControl.prototype.Decorat
     }
 
     // Find standalone else statments
-    if (
+    if (!this.options.ignoreStandalone
-      !this.options.ignoreStandalone &&
+        && isPrevWhitespace(program.body)
-      isPrevWhitespace(program.body) &&
+        && isNextWhitespace(firstInverse.body)) {
-      isNextWhitespace(firstInverse.body)
-    ) {
       omitLeft(program.body);
       omitRight(firstInverse.body);
     }
@@ -127,15 +125,13 @@ WhitespaceControl.prototype.BlockStatement = WhitespaceControl.prototype.Decorat
   return strip;
 };
 
-WhitespaceControl.prototype.Decorator = WhitespaceControl.prototype.MustacheStatement = function(
+WhitespaceControl.prototype.Decorator =
-  mustache
+WhitespaceControl.prototype.MustacheStatement = function(mustache) {
-) {
   return mustache.strip;
 };
 
-WhitespaceControl.prototype.PartialStatement = WhitespaceControl.prototype.CommentStatement = function(
+WhitespaceControl.prototype.PartialStatement =
-  node
+    WhitespaceControl.prototype.CommentStatement = function(node) {
-) {
   /* istanbul ignore next */
   let strip = node.strip || {};
   return {
@@ -145,6 +141,7 @@ WhitespaceControl.prototype.PartialStatement = WhitespaceControl.prototype.Comme
   };
 };
 
+
 function isPrevWhitespace(body, i, isRoot) {
   if (i === undefined) {
     i = body.length;
@@ -153,15 +150,13 @@ function isPrevWhitespace(body, i, isRoot) {
   // Nodes that end with newlines are considered whitespace (but are special
   // cased for strip operations)
   let prev = body[i - 1],
-    sibling = body[i - 2];
+      sibling = body[i - 2];
   if (!prev) {
     return isRoot;
   }
 
   if (prev.type === 'ContentStatement') {
-    return (sibling || !isRoot ? /\r?\n\s*?$/ : /(^|\r?\n)\s*?$/).test(
+    return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
-      prev.original
-    );
   }
 }
 function isNextWhitespace(body, i, isRoot) {
@@ -170,15 +165,13 @@ function isNextWhitespace(body, i, isRoot) {
   }
 
   let next = body[i + 1],
-    sibling = body[i + 2];
+      sibling = body[i + 2];
   if (!next) {
     return isRoot;
   }
 
   if (next.type === 'ContentStatement') {
-    return (sibling || !isRoot ? /^\s*?\r?\n/ : /^\s*?(\r?\n|$)/).test(
+    return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
-      next.original
-    );
   }
 }
 
@@ -191,19 +184,12 @@ function isNextWhitespace(body, i, isRoot) {
 // content is met.
 function omitRight(body, i, multiple) {
   let current = body[i == null ? 0 : i + 1];
-  if (
+  if (!current || current.type !== 'ContentStatement' || (!multiple && current.rightStripped)) {
-    !current ||
-    current.type !== 'ContentStatement' ||
-    (!multiple && current.rightStripped)
-  ) {
     return;
   }
 
   let original = current.value;
-  current.value = current.value.replace(
+  current.value = current.value.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
-    multiple ? /^\s+/ : /^[ \t]*\r?\n?/,
-    ''
-  );
   current.rightStripped = current.value !== original;
 }
 
@@ -216,17 +202,13 @@ function omitRight(body, i, multiple) {
 // content is met.
 function omitLeft(body, i, multiple) {
   let current = body[i == null ? body.length - 1 : i - 1];
-  if (
+  if (!current || current.type !== 'ContentStatement' || (!multiple && current.leftStripped)) {
-    !current ||
-    current.type !== 'ContentStatement' ||
-    (!multiple && current.leftStripped)
-  ) {
     return;
   }
 
   // We omit the last node if it's whitespace only and not preceded by a non-content node.
   let original = current.value;
-  current.value = current.value.replace(multiple ? /\s+$/ : /[ \t]+$/, '');
+  current.value = current.value.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
   current.leftStripped = current.value !== original;
   return current.leftStripped;
 }

lib/handlebars/decorators.js

@@ -3,3 +3,4 @@ import registerInline from './decorators/inline';
 export function registerDefaultDecorators(instance) {
   registerInline(instance);
 }
+

lib/handlebars/decorators/inline.js

@@ -1,4 +1,4 @@
-import { extend } from '../utils';
+import {extend} from '../utils';
 
 export default function(instance) {
   instance.registerDecorator('inline', function(fn, props, container, options) {

lib/handlebars/exception.js

@@ -1,20 +1,12 @@
-const errorProps = [
+
-  'description',
+const errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
-  'fileName',
-  'lineNumber',
-  'endLineNumber',
-  'message',
-  'name',
-  'number',
-  'stack'
-];
 
 function Exception(message, node) {
   let loc = node && node.loc,
-    line,
+      line,
-    endLineNumber,
+      endLineNumber,
-    column,
+      column,
-    endColumn;
+      endColumn;
 
   if (loc) {
     line = loc.start.line;

lib/handlebars/helpers/block-helper-missing.js

@@ -1,9 +1,9 @@
-import { appendContextPath, createFrame, isArray } from '../utils';
+import {appendContextPath, createFrame, isArray} from '../utils';
 
 export default function(instance) {
   instance.registerHelper('blockHelperMissing', function(context, options) {
     let inverse = options.inverse,
-      fn = options.fn;
+        fn = options.fn;
 
     if (context === true) {
       return fn(this);
@@ -22,11 +22,8 @@ export default function(instance) {
     } else {
       if (options.data && options.ids) {
         let data = createFrame(options.data);
-        data.contextPath = appendContextPath(
+        data.contextPath = appendContextPath(options.data.contextPath, options.name);
-          options.data.contextPath,
+        options = {data: data};
-          options.name
-        );
-        options = { data: data };
       }
 
       return fn(context, options);

lib/handlebars/helpers/each.js

@@ -1,10 +1,4 @@
-import {
+import {appendContextPath, blockParams, createFrame, isArray, isFunction} from '../utils';
-  appendContextPath,
-  blockParams,
-  createFrame,
-  isArray,
-  isFunction
-} from '../utils';
 import Exception from '../exception';
 
 export default function(instance) {
@@ -14,20 +8,17 @@ export default function(instance) {
     }
 
     let fn = options.fn,
-      inverse = options.inverse,
+        inverse = options.inverse,
-      i = 0,
+        i = 0,
-      ret = '',
+        ret = '',
-      data,
+        data,
-      contextPath;
+        contextPath;
 
     if (options.data && options.ids) {
-      contextPath =
+      contextPath = appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-        appendContextPath(options.data.contextPath, options.ids[0]) + '.';
     }
 
-    if (isFunction(context)) {
+    if (isFunction(context)) { context = context.call(this); }
-      context = context.call(this);
-    }
 
     if (options.data) {
       data = createFrame(options.data);
@@ -45,15 +36,10 @@ export default function(instance) {
         }
       }
 
-      ret =
+      ret = ret + fn(context[field], {
-        ret +
+        data: data,
-        fn(context[field], {
+        blockParams: blockParams([context[field], field], [contextPath + field, null])
-          data: data,
+      });
-          blockParams: blockParams(
-            [context[field], field],
-            [contextPath + field, null]
-          )
-        });
     }
 
     if (context && typeof context === 'object') {

lib/handlebars/helpers/helper-missing.js

@@ -7,9 +7,7 @@ export default function(instance) {
       return undefined;
     } else {
       // Someone is actually trying to call something, blow up.
-      throw new Exception(
+      throw new Exception('Missing helper: "' + arguments[arguments.length - 1].name + '"');
-        'Missing helper: "' + arguments[arguments.length - 1].name + '"'
-      );
     }
   });
 }

lib/handlebars/helpers/if.js

@@ -3,12 +3,8 @@ import Exception from '../exception';
 
 export default function(instance) {
   instance.registerHelper('if', function(conditional, options) {
-    if (arguments.length != 2) {
+    if (arguments.length != 2) { throw new Exception('#if requires exactly one argument');}
-      throw new Exception('#if requires exactly one argument');
+    if (isFunction(conditional)) { conditional = conditional.call(this); }
-    }
-    if (isFunction(conditional)) {
-      conditional = conditional.call(this);
-    }
 
     // Default behavior is to render the positive path if the value is truthy and not empty.
     // The `includeZero` option may be set to treat the condtional as purely not empty based on the
@@ -21,13 +17,7 @@ export default function(instance) {
   });
 
   instance.registerHelper('unless', function(conditional, options) {
-    if (arguments.length != 2) {
+    if (arguments.length != 2) { throw new Exception('#unless requires exactly one argument');}
-      throw new Exception('#unless requires exactly one argument');
+    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-    }
-    return instance.helpers['if'].call(this, conditional, {
-      fn: options.inverse,
-      inverse: options.fn,
-      hash: options.hash
-    });
   });
 }

lib/handlebars/helpers/log.js

@@ -1,7 +1,7 @@
 export default function(instance) {
   instance.registerHelper('log', function(/* message, options */) {
     let args = [undefined],
-      options = arguments[arguments.length - 1];
+        options = arguments[arguments.length - 1];
     for (let i = 0; i < arguments.length - 1; i++) {
       args.push(arguments[i]);
     }
@@ -14,6 +14,6 @@ export default function(instance) {
     }
     args[0] = level;
 
-    instance.log(...args);
+    instance.log(... args);
   });
 }

lib/handlebars/helpers/lookup.js

@@ -1,9 +1,13 @@
+export const dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
+
 export default function(instance) {
-  instance.registerHelper('lookup', function(obj, field, options) {
+  instance.registerHelper('lookup', function(obj, field) {
     if (!obj) {
-      // Note for 5.0: Change to "obj == null" in 5.0
       return obj;
     }
-    return options.lookupProperty(obj, field);
+    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
+      return undefined;
+    }
+    return obj[field];
   });
 }

lib/handlebars/helpers/with.js

@@ -1,20 +1,10 @@
-import {
+import { appendContextPath, blockParams, createFrame, isEmpty, isFunction } from '../utils';
-  appendContextPath,
-  blockParams,
-  createFrame,
-  isEmpty,
-  isFunction
-} from '../utils';
 import Exception from '../exception';
 
 export default function(instance) {
   instance.registerHelper('with', function(context, options) {
-    if (arguments.length != 2) {
+    if (arguments.length != 2) { throw new Exception('#with requires exactly one argument');}
-      throw new Exception('#with requires exactly one argument');
+    if (isFunction(context)) { context = context.call(this); }
-    }
-    if (isFunction(context)) {
-      context = context.call(this);
-    }
 
     let fn = options.fn;
 
@@ -22,10 +12,7 @@ export default function(instance) {
       let data = options.data;
       if (options.data && options.ids) {
         data = createFrame(options.data);
-        data.contextPath = appendContextPath(
+        data.contextPath = appendContextPath(options.data.contextPath, options.ids[0]);
-          options.data.contextPath,
-          options.ids[0]
-        );
       }
 
       return fn(context, {

lib/handlebars/internal/create-new-lookup-object.js

@@ -1,11 +0,0 @@
-import { extend } from '../utils';
-
-/**
- * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
- * The resulting object can be used with "object[property]" to check if a property exists
- * @param {...object} sources a varargs parameter of source objects that will be merged
- * @returns {object}
- */
-export function createNewLookupObject(...sources) {
-  return extend(Object.create(null), ...sources);
-}

lib/handlebars/internal/proto-access.js

@@ -1,70 +0,0 @@
-import { createNewLookupObject } from './create-new-lookup-object';
-import * as logger from '../logger';
-
-const loggedProperties = Object.create(null);
-
-export function createProtoAccessControl(runtimeOptions) {
-  let defaultMethodWhiteList = Object.create(null);
-  defaultMethodWhiteList['constructor'] = false;
-  defaultMethodWhiteList['__defineGetter__'] = false;
-  defaultMethodWhiteList['__defineSetter__'] = false;
-  defaultMethodWhiteList['__lookupGetter__'] = false;
-
-  let defaultPropertyWhiteList = Object.create(null);
-  // eslint-disable-next-line no-proto
-  defaultPropertyWhiteList['__proto__'] = false;
-
-  return {
-    properties: {
-      whitelist: createNewLookupObject(
-        defaultPropertyWhiteList,
-        runtimeOptions.allowedProtoProperties
-      ),
-      defaultValue: runtimeOptions.allowProtoPropertiesByDefault
-    },
-    methods: {
-      whitelist: createNewLookupObject(
-        defaultMethodWhiteList,
-        runtimeOptions.allowedProtoMethods
-      ),
-      defaultValue: runtimeOptions.allowProtoMethodsByDefault
-    }
-  };
-}
-
-export function resultIsAllowed(result, protoAccessControl, propertyName) {
-  if (typeof result === 'function') {
-    return checkWhiteList(protoAccessControl.methods, propertyName);
-  } else {
-    return checkWhiteList(protoAccessControl.properties, propertyName);
-  }
-}
-
-function checkWhiteList(protoAccessControlForType, propertyName) {
-  if (protoAccessControlForType.whitelist[propertyName] !== undefined) {
-    return protoAccessControlForType.whitelist[propertyName] === true;
-  }
-  if (protoAccessControlForType.defaultValue !== undefined) {
-    return protoAccessControlForType.defaultValue;
-  }
-  logUnexpecedPropertyAccessOnce(propertyName);
-  return false;
-}
-
-function logUnexpecedPropertyAccessOnce(propertyName) {
-  if (loggedProperties[propertyName] !== true) {
-    loggedProperties[propertyName] = true;
-    logger.log(
-      'error',
-      `Handlebars: Access has been denied to resolve the property "${propertyName}" because it is not an "own property" of its parent.\n` +
-        `You can add a runtime option to disable the check or this warning:\n` +
-        `See https://handlebarsjs.com/api-reference/runtime-options.html#options-to-control-prototype-access for details`
-    );
-  }
-}
-
-export function resetLoggedProperties() {
-  Object.keys(loggedProperties).forEach(propertyName => {
-    delete loggedProperties[propertyName];
-  });
-}

lib/handlebars/internal/wrapHelper.js

@@ -1,13 +0,0 @@
-export function wrapHelper(helper, transformOptionsFn) {
-  if (typeof helper !== 'function') {
-    // This should not happen, but apparently it does in https://github.com/wycats/handlebars.js/issues/1639
-    // We try to make the wrapper least-invasive by not wrapping it, if the helper is not a function.
-    return helper;
-  }
-  let wrapper = function(/* dynamic arguments */) {
-    const options = arguments[arguments.length - 1];
-    arguments[arguments.length - 1] = transformOptionsFn(options);
-    return helper.apply(this, arguments);
-  };
-  return wrapper;
-}

lib/handlebars/logger.js

@@ -1,4 +1,4 @@
-import { indexOf } from './utils';
+import {indexOf} from './utils';
 
 let logger = {
   methodMap: ['debug', 'info', 'warn', 'error'],
@@ -22,13 +22,9 @@ let logger = {
   log: function(level, ...message) {
     level = logger.lookupLevel(level);
 
-    if (
+    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
-      typeof console !== 'undefined' &&
-      logger.lookupLevel(logger.level) <= level
-    ) {
       let method = logger.methodMap[level];
-      // eslint-disable-next-line no-console
+      if (!console[method]) { // eslint-disable-line no-console
-      if (!console[method]) {
         method = 'log';
       }
       console[method](...message); // eslint-disable-line no-console

lib/handlebars/no-conflict.js

@@ -1,7 +1,8 @@
+/* global window */
 export default function(Handlebars) {
   /* istanbul ignore next */
   let root = typeof global !== 'undefined' ? global : window,
-    $Handlebars = root.Handlebars;
+      $Handlebars = root.Handlebars;
   /* istanbul ignore next */
   Handlebars.noConflict = function() {
     if (root.Handlebars === Handlebars) {

lib/handlebars/runtime.js

@@ -1,52 +1,30 @@
-import * as Utils from './utils';
+import {extend, escapeExpression} from './utils';
 import Exception from './exception';
-import {
+import {COMPILER_REVISION, createFrame, LAST_COMPATIBLE_COMPILER_REVISION, REVISION_CHANGES} from './base';
-  COMPILER_REVISION,
+import {moveHelperToHooks} from './helpers';
-  createFrame,
-  LAST_COMPATIBLE_COMPILER_REVISION,
-  REVISION_CHANGES
-} from './base';
-import { moveHelperToHooks } from './helpers';
-import { wrapHelper } from './internal/wrapHelper';
-import {
-  createProtoAccessControl,
-  resultIsAllowed
-} from './internal/proto-access';
 
 export function checkRevision(compilerInfo) {
-  const compilerRevision = (compilerInfo && compilerInfo[0]) || 1,
+  const compilerRevision = compilerInfo && compilerInfo[0] || 1,
-    currentRevision = COMPILER_REVISION;
+        currentRevision = COMPILER_REVISION;
 
-  if (
+  if (compilerRevision >= LAST_COMPATIBLE_COMPILER_REVISION && compilerRevision <= COMPILER_REVISION) {
-    compilerRevision >= LAST_COMPATIBLE_COMPILER_REVISION &&
-    compilerRevision <= COMPILER_REVISION
-  ) {
     return;
   }
 
   if (compilerRevision < LAST_COMPATIBLE_COMPILER_REVISION) {
     const runtimeVersions = REVISION_CHANGES[currentRevision],
-      compilerVersions = REVISION_CHANGES[compilerRevision];
+          compilerVersions = REVISION_CHANGES[compilerRevision];
-    throw new Exception(
+    throw new Exception('Template was precompiled with an older version of Handlebars than the current runtime. ' +
-      'Template was precompiled with an older version of Handlebars than the current runtime. ' +
+          'Please update your precompiler to a newer version (' + runtimeVersions + ') or downgrade your runtime to an older version (' + compilerVersions + ').');
-        'Please update your precompiler to a newer version (' +
-        runtimeVersions +
-        ') or downgrade your runtime to an older version (' +
-        compilerVersions +
-        ').'
-    );
   } else {
     // Use the embedded version info since the runtime doesn't know about this revision yet
-    throw new Exception(
+    throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
-      'Template was precompiled with a newer version of Handlebars than the current runtime. ' +
+          'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
-        'Please update your runtime to a newer version (' +
-        compilerInfo[1] +
-        ').'
-    );
   }
 }
 
 export function template(templateSpec, env) {
+
   /* istanbul ignore next */
   if (!env) {
     throw new Exception('No environment passed to template');
@@ -62,37 +40,24 @@ export function template(templateSpec, env) {
   env.VM.checkRevision(templateSpec.compiler);
 
   // backwards compatibility for precompiled templates with compiler-version 7 (<4.3.0)
-  const templateWasPrecompiledWithCompilerV7 =
+  const templateWasPrecompiledWithCompilerV7 = templateSpec.compiler && templateSpec.compiler[0] === 7;
-    templateSpec.compiler && templateSpec.compiler[0] === 7;
 
   function invokePartialWrapper(partial, context, options) {
     if (options.hash) {
-      context = Utils.extend({}, context, options.hash);
+      context = extend({}, context, options.hash);
       if (options.ids) {
         options.ids[0] = true;
       }
     }
     partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-    let extendedOptions = Utils.extend({}, options, {
+    let optionsWithHooks = extend({}, options, {hooks: this.hooks});
-      hooks: this.hooks,
-      protoAccessControl: this.protoAccessControl
-    });
 
-    let result = env.VM.invokePartial.call(
+    let result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
-      this,
-      partial,
-      context,
-      extendedOptions
-    );
 
     if (result == null && env.compile) {
-      options.partials[options.name] = env.compile(
+      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-        partial,
+      result = options.partials[options.name](context, optionsWithHooks);
-        templateSpec.compilerOptions,
-        env
-      );
-      result = options.partials[options.name](context, extendedOptions);
     }
     if (result != null) {
       if (options.indent) {
@@ -108,11 +73,7 @@ export function template(templateSpec, env) {
       }
       return result;
     } else {
-      throw new Exception(
+      throw new Exception('The partial ' + options.name + ' could not be compiled when running in runtime-only mode');
-        'The partial ' +
-          options.name +
-          ' could not be compiled when running in runtime-only mode'
-      );
     }
   }
 
@@ -120,31 +81,14 @@ export function template(templateSpec, env) {
   let container = {
     strict: function(obj, name, loc) {
       if (!obj || !(name in obj)) {
-        throw new Exception('"' + name + '" not defined in ' + obj, {
+        throw new Exception('"' + name + '" not defined in ' + obj, { loc: loc });
-          loc: loc
-        });
       }
-      return container.lookupProperty(obj, name);
+      return obj[name];
-    },
-    lookupProperty: function(parent, propertyName) {
-      let result = parent[propertyName];
-      if (result == null) {
-        return result;
-      }
-      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-        return result;
-      }
-
-      if (resultIsAllowed(result, container.protoAccessControl, propertyName)) {
-        return result;
-      }
-      return undefined;
     },
     lookup: function(depths, name) {
       const len = depths.length;
       for (let i = 0; i < len; i++) {
-        let result = depths[i] && container.lookupProperty(depths[i], name);
+        if (depths[i] && depths[i][name] != null) {
-        if (result != null) {
           return depths[i][name];
         }
       }
@@ -153,7 +97,7 @@ export function template(templateSpec, env) {
       return typeof current === 'function' ? current.call(context) : current;
     },
 
-    escapeExpression: Utils.escapeExpression,
+    escapeExpression: escapeExpression,
     invokePartial: invokePartialWrapper,
 
     fn: function(i) {
@@ -165,17 +109,9 @@ export function template(templateSpec, env) {
     programs: [],
     program: function(i, data, declaredBlockParams, blockParams, depths) {
       let programWrapper = this.programs[i],
-        fn = this.fn(i);
+          fn = this.fn(i);
       if (data || depths || blockParams || declaredBlockParams) {
-        programWrapper = wrapProgram(
+        programWrapper = wrapProgram(this, i, fn, data, declaredBlockParams, blockParams, depths);
-          this,
-          i,
-          fn,
-          data,
-          declaredBlockParams,
-          blockParams,
-          depths
-        );
       } else if (!programWrapper) {
         programWrapper = this.programs[i] = wrapProgram(this, i, fn);
       }
@@ -188,15 +124,6 @@ export function template(templateSpec, env) {
       }
       return value;
     },
-    mergeIfNeeded: function(param, common) {
-      let obj = param || common;
-
-      if (param && common && param !== common) {
-        obj = Utils.extend({}, common, param);
-      }
-
-      return obj;
-    },
     // An empty object to use as replacement for null-contexts
     nullContext: Object.seal({}),
 
@@ -212,82 +139,47 @@ export function template(templateSpec, env) {
       data = initData(context, data);
     }
     let depths,
-      blockParams = templateSpec.useBlockParams ? [] : undefined;
+        blockParams = templateSpec.useBlockParams ? [] : undefined;
     if (templateSpec.useDepths) {
       if (options.depths) {
-        depths =
+        depths = context != options.depths[0] ? [context].concat(options.depths) : options.depths;
-          context != options.depths[0]
-            ? [context].concat(options.depths)
-            : options.depths;
       } else {
         depths = [context];
       }
     }
 
-    function main(context /*, options*/) {
+    function main(context/*, options*/) {
-      return (
+      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
-        '' +
-        templateSpec.main(
-          container,
-          context,
-          container.helpers,
-          container.partials,
-          data,
-          blockParams,
-          depths
-        )
-      );
     }
-
+    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
-    main = executeDecorators(
-      templateSpec.main,
-      main,
-      container,
-      options.depths || [],
-      data,
-      blockParams
-    );
     return main(context, options);
   }
-
   ret.isTop = true;
 
   ret._setup = function(options) {
     if (!options.partial) {
-      let mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
+      container.helpers = extend({}, env.helpers, options.helpers);
-      wrapHelpersToPassLookupProperty(mergedHelpers, container);
-      container.helpers = mergedHelpers;
 
       if (templateSpec.usePartial) {
-        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+        container.partials = extend({}, env.partials, options.partials);
-        container.partials = container.mergeIfNeeded(
-          options.partials,
-          env.partials
-        );
       }
       if (templateSpec.usePartial || templateSpec.useDecorators) {
-        container.decorators = Utils.extend(
+        container.decorators = extend({}, env.decorators, options.decorators);
-          {},
-          env.decorators,
-          options.decorators
-        );
       }
 
       container.hooks = {};
-      container.protoAccessControl = createProtoAccessControl(options);
 
-      let keepHelperInHelpers =
+      let keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
-        options.allowCallsToHelperMissing ||
-        templateWasPrecompiledWithCompilerV7;
       moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
       moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
+
     } else {
-      container.protoAccessControl = options.protoAccessControl; // internal option
       container.helpers = options.helpers;
       container.partials = options.partials;
       container.decorators = options.decorators;
       container.hooks = options.hooks;
     }
+
   };
 
   ret._child = function(i, data, blockParams, depths) {
@@ -298,47 +190,24 @@ export function template(templateSpec, env) {
       throw new Exception('must pass parent depths');
     }
 
-    return wrapProgram(
+    return wrapProgram(container, i, templateSpec[i], data, 0, blockParams, depths);
-      container,
-      i,
-      templateSpec[i],
-      data,
-      0,
-      blockParams,
-      depths
-    );
   };
   return ret;
 }
 
-export function wrapProgram(
+export function wrapProgram(container, i, fn, data, declaredBlockParams, blockParams, depths) {
-  container,
-  i,
-  fn,
-  data,
-  declaredBlockParams,
-  blockParams,
-  depths
-) {
   function prog(context, options = {}) {
     let currentDepths = depths;
-    if (
+    if (depths && context != depths[0] && !(context === container.nullContext && depths[0] === null)) {
-      depths &&
-      context != depths[0] &&
-      !(context === container.nullContext && depths[0] === null)
-    ) {
       currentDepths = [context].concat(depths);
     }
 
-    return fn(
+    return fn(container,
-      container,
+        context,
-      context,
+        container.helpers, container.partials,
-      container.helpers,
+        options.data || data,
-      container.partials,
+        blockParams && [options.blockParams].concat(blockParams),
-      options.data || data,
+        currentDepths);
-      blockParams && [options.blockParams].concat(blockParams),
-      currentDepths
-    );
   }
 
   prog = executeDecorators(fn, prog, container, depths, data, blockParams);
@@ -380,10 +249,8 @@ export function invokePartial(partial, context, options) {
     options.data = createFrame(options.data);
     // Wrapper function to get access to currentPartialBlock from the closure
     let fn = options.fn;
-    partialBlock = options.data['partial-block'] = function partialBlockWrapper(
+    partialBlock = options.data['partial-block'] = function partialBlockWrapper(context, options = {}) {
-      context,
+
-      options = {}
-    ) {
       // Restore the partial-block from the closure for the execution of the block
       // i.e. the part inside the block of the partial call.
       options.data = createFrame(options.data);
@@ -391,7 +258,7 @@ export function invokePartial(partial, context, options) {
       return fn(context, options);
     };
     if (fn.partials) {
-      options.partials = Utils.extend({}, options.partials, fn.partials);
+      options.partials = extend({}, options.partials, fn.partials);
     }
   }
 
@@ -406,9 +273,7 @@ export function invokePartial(partial, context, options) {
   }
 }
 
-export function noop() {
+export function noop() { return ''; }
-  return '';
-}
 
 function initData(context, data) {
   if (!data || !('root' in data)) {
@@ -421,30 +286,8 @@ function initData(context, data) {
 function executeDecorators(fn, prog, container, depths, data, blockParams) {
   if (fn.decorator) {
     let props = {};
-    prog = fn.decorator(
+    prog = fn.decorator(prog, props, container, depths && depths[0], data, blockParams, depths);
-      prog,
+    extend(prog, props);
-      props,
-      container,
-      depths && depths[0],
-      data,
-      blockParams,
-      depths
-    );
-    Utils.extend(prog, props);
   }
   return prog;
 }
-
-function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
-  Object.keys(mergedHelpers).forEach(helperName => {
-    let helper = mergedHelpers[helperName];
-    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
-  });
-}
-
-function passLookupPropertyOption(helper, container) {
-  const lookupProperty = container.lookupProperty;
-  return wrapHelper(helper, options => {
-    return Utils.extend({ lookupProperty }, options);
-  });
-}

lib/handlebars/utils.js

@@ -1,3 +1,4 @@
+
 const escape = {
   '&': '&',
   '<': '&lt;',
@@ -9,13 +10,13 @@ const escape = {
 };
 
 const badChars = /[&<>"'`=]/g,
-  possible = /[&<>"'`=]/;
+      possible = /[&<>"'`=]/;
 
 function escapeChar(chr) {
   return escape[chr];
 }
 
-export function extend(obj /* , ...source */) {
+export function extend(obj/* , ...source */) {
   for (let i = 1; i < arguments.length; i++) {
     for (let key in arguments[i]) {
       if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
@@ -32,30 +33,28 @@ export let toString = Object.prototype.toString;
 // Sourced from lodash
 // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
 /* eslint-disable func-style */
-let isFunction = function(value) {
+export const isFunction = createIsFunction();
-  return typeof value === 'function';
+
-};
+
-// fallback for older versions of Chrome and Safari
+function createIsFunction() {
-/* istanbul ignore next */
+  // istanbul ignore next
-if (isFunction(/x/)) {
+  // eslint-disable-next-line no-constant-condition
-  isFunction = function(value) {
+  if (typeof /x/ === 'function') {
-    return (
+    // fallback for older chrome/firefox versions
-      typeof value === 'function' &&
+    return function isFunction(value) {
-      toString.call(value) === '[object Function]'
+      return typeof value === 'function' && toString.call(value) === '[object Function]';
-    );
+    };
+  }
+  return function isFunction(value) {
+    return typeof value === 'function';
   };
 }
-export { isFunction };
+
-/* eslint-enable func-style */
 
 /* istanbul ignore next */
-export const isArray =
+export const isArray = Array.isArray || function(value) {
-  Array.isArray ||
+  return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
-  function(value) {
+};
-    return value && typeof value === 'object'
-      ? toString.call(value) === '[object Array]'
-      : false;
-  };
 
 // Older IE versions do not directly support indexOf so we must implement our own, sadly.
 export function indexOf(array, value) {
@@ -67,6 +66,8 @@ export function indexOf(array, value) {
   return -1;
 }
 
+
+
 export function escapeExpression(string) {
   if (typeof string !== 'string') {
     // don't escape SafeStrings, since they're already safe
@@ -84,12 +85,11 @@ export function escapeExpression(string) {
     string = '' + string;
   }
 
-  if (!possible.test(string)) {
+  if (!possible.test(string)) { return string; }
-    return string;
-  }
   return string.replace(badChars, escapeChar);
 }
 
+
 export function isEmpty(value) {
   if (!value && value !== 0) {
     return true;

lib/precompiler.js

@@ -1,9 +1,10 @@
 /* eslint-disable no-console */
 import Async from 'neo-async';
 import fs from 'fs';
-import * as Handlebars from './handlebars';
+import Handlebars from './handlebars';
-import { basename } from 'path';
+import {basename} from 'path';
-import { SourceMapConsumer, SourceNode } from 'source-map';
+import {SourceMapConsumer, SourceNode} from 'source-map';
+
 
 module.exports.loadTemplates = function(opts, callback) {
   loadStrings(opts, function(err, strings) {
@@ -24,19 +25,14 @@ module.exports.loadTemplates = function(opts, callback) {
 
 function loadStrings(opts, callback) {
   let strings = arrayCast(opts.string),
-    names = arrayCast(opts.name);
+      names = arrayCast(opts.name);
 
-  if (names.length !== strings.length && strings.length > 1) {
+  if (names.length !== strings.length
-    return callback(
+      && strings.length > 1) {
-      new Handlebars.Exception(
+    return callback(new Handlebars.Exception('Number of names did not match the number of string inputs'));
-        'Number of names did not match the number of string inputs'
-      )
-    );
   }
 
-  Async.map(
+  Async.map(strings, function(string, callback) {
-    strings,
-    function(string, callback) {
       if (string !== '-') {
         callback(undefined, string);
       } else {
@@ -59,94 +55,80 @@ function loadStrings(opts, callback) {
         source: string
       }));
       callback(err, strings);
-    }
+    });
-  );
 }
 
 function loadFiles(opts, callback) {
   // Build file extension pattern
-  let extension = (opts.extension || 'handlebars').replace(
+  let extension = (opts.extension || 'handlebars').replace(/[\\^$*+?.():=!|{}\-[\]]/g, function(arg) { return '\\' + arg; });
-    /[\\^$*+?.():=!|{}\-[\]]/g,
-    function(arg) {
-      return '\\' + arg;
-    }
-  );
   extension = new RegExp('\\.' + extension + '$');
 
   let ret = [],
-    queue = (opts.files || []).map(template => ({ template, root: opts.root }));
+      queue = (opts.files || []).map((template) => ({template, root: opts.root}));
-  Async.whilst(
+  Async.whilst(() => queue.length, function(callback) {
-    () => queue.length,
+    let {template: path, root} = queue.shift();
-    function(callback) {
-      let { template: path, root } = queue.shift();
 
-      fs.stat(path, function(err, stat) {
+    fs.stat(path, function(err, stat) {
-        if (err) {
-          return callback(
-            new Handlebars.Exception(`Unable to open template file "${path}"`)
-          );
-        }
-
-        if (stat.isDirectory()) {
-          opts.hasDirectory = true;
-
-          fs.readdir(path, function(err, children) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
-            if (err) {
-              return callback(err);
-            }
-            children.forEach(function(file) {
-              let childPath = path + '/' + file;
-
-              if (
-                extension.test(childPath) ||
-                fs.statSync(childPath).isDirectory()
-              ) {
-                queue.push({ template: childPath, root: root || path });
-              }
-            });
-
-            callback();
-          });
-        } else {
-          fs.readFile(path, 'utf8', function(err, data) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
-            if (err) {
-              return callback(err);
-            }
-
-            if (opts.bom && data.indexOf('\uFEFF') === 0) {
-              data = data.substring(1);
-            }
-
-            // Clean the template name
-            let name = path;
-            if (!root) {
-              name = basename(name);
-            } else if (name.indexOf(root) === 0) {
-              name = name.substring(root.length + 1);
-            }
-            name = name.replace(extension, '');
-
-            ret.push({
-              path: path,
-              name: name,
-              source: data
-            });
-
-            callback();
-          });
-        }
-      });
-    },
-    function(err) {
       if (err) {
-        callback(err);
+        return callback(new Handlebars.Exception(`Unable to open template file "${path}"`));
-      } else {
-        callback(undefined, ret);
       }
+
+      if (stat.isDirectory()) {
+        opts.hasDirectory = true;
+
+        fs.readdir(path, function(err, children) {
+          /* istanbul ignore next : Race condition that being too lazy to test */
+          if (err) {
+            return callback(err);
+          }
+          children.forEach(function(file) {
+            let childPath = path + '/' + file;
+
+            if (extension.test(childPath) || fs.statSync(childPath).isDirectory()) {
+              queue.push({template: childPath, root: root || path});
+            }
+          });
+
+          callback();
+        });
+      } else {
+        fs.readFile(path, 'utf8', function(err, data) {
+          /* istanbul ignore next : Race condition that being too lazy to test */
+          if (err) {
+            return callback(err);
+          }
+
+          if (opts.bom && data.indexOf('\uFEFF') === 0) {
+            data = data.substring(1);
+          }
+
+          // Clean the template name
+          let name = path;
+          if (!root) {
+            name = basename(name);
+          } else if (name.indexOf(root) === 0) {
+            name = name.substring(root.length + 1);
+          }
+          name = name.replace(extension, '');
+
+          ret.push({
+            path: path,
+            name: name,
+            source: data
+          });
+
+          callback();
+        });
+      }
+    });
+  },
+  function(err) {
+    if (err) {
+      callback(err);
+    } else {
+      callback(undefined, ret);
     }
-  );
+  });
 }
 
 module.exports.cli = function(opts) {
@@ -156,9 +138,7 @@ module.exports.cli = function(opts) {
   }
 
   if (!opts.templates.length && !opts.hasDirectory) {
-    throw new Handlebars.Exception(
+    throw new Handlebars.Exception('Must define at least one template or directory.');
-      'Must define at least one template or directory.'
-    );
   }
 
   if (opts.simple && opts.min) {
@@ -167,18 +147,12 @@ module.exports.cli = function(opts) {
 
   const multiple = opts.templates.length !== 1 || opts.hasDirectory;
   if (opts.simple && multiple) {
-    throw new Handlebars.Exception(
+    throw new Handlebars.Exception('Unable to output multiple templates in simple mode');
-      'Unable to output multiple templates in simple mode'
-    );
   }
 
   // Force simple mode if we have only one template and it's unnamed.
-  if (
+  if (!opts.amd && !opts.commonjs && opts.templates.length === 1
-    !opts.amd &&
+      && !opts.templates[0].name) {
-    !opts.commonjs &&
-    opts.templates.length === 1 &&
-    !opts.templates[0].name
-  ) {
     opts.simple = true;
   }
 
@@ -198,11 +172,7 @@ module.exports.cli = function(opts) {
   let output = new SourceNode();
   if (!opts.simple) {
     if (opts.amd) {
-      output.add(
+      output.add('define([\'' + opts.handlebarPath + 'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];');
-        "define(['" +
-          opts.handlebarPath +
-          'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];'
-      );
     } else if (opts.commonjs) {
       output.add('var Handlebars = require("' + opts.commonjs + '");');
     } else {
@@ -236,10 +206,7 @@ module.exports.cli = function(opts) {
     // If we are generating a source map, we have to reconstruct the SourceNode object
     if (opts.map) {
       let consumer = new SourceMapConsumer(precompiled.map);
-      precompiled = SourceNode.fromStringWithSourceMap(
+      precompiled = SourceNode.fromStringWithSourceMap(precompiled.code, consumer);
-        precompiled.code,
-        consumer
-      );
     }
 
     if (opts.simple) {
@@ -252,14 +219,7 @@ module.exports.cli = function(opts) {
       if (opts.amd && !multiple) {
         output.add('return ');
       }
-      output.add([
+      output.add([objectName, '[\'', template.name, '\'] = template(', precompiled, ');\n']);
-        objectName,
-        "['",
-        template.name,
-        "'] = template(",
-        precompiled,
-        ');\n'
-      ]);
     }
   });
 
@@ -326,9 +286,7 @@ function minify(output, sourceMapFile) {
       throw e;
     }
     // it does not exist!
-    console.error(
+    console.error('Code minimization is disabled due to missing uglify-js dependency');
-      'Code minimization is disabled due to missing uglify-js dependency'
-    );
     return output;
   }
   return require('uglify-js').minify(output.code, {

nyc.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-  'check-coverage': true,
-  branches: 100,
-  lines: 100,
-  functions: 100,
-  statements: 100,
-  exclude: ['**/spec/**', '**/handlebars/compiler/parser.js'],
-  reporter: 'html'
-};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "4.7.7",
+  "version": "4.5.3",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
   "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
@@ -21,58 +21,54 @@
     "node": ">=0.4.7"
   },
   "dependencies": {
-    "minimist": "^1.2.5",
     "neo-async": "^2.6.0",
-    "source-map": "^0.6.1",
+    "optimist": "^0.6.1",
-    "wordwrap": "^1.0.0"
+    "source-map": "^0.6.1"
   },
   "optionalDependencies": {
     "uglify-js": "^3.1.4"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.4",
+    "@babel/plugin-transform-modules-amd": "^7.7.4",
+    "@babel/plugin-transform-modules-commonjs": "^7.7.4",
+    "@babel/plugin-transform-runtime": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
+    "@babel/runtime": "^7.7.4",
     "@knappi/grunt-saucelabs": "^9.0.2",
     "aws-sdk": "^2.1.49",
-    "babel-loader": "^5.0.0",
+    "babel-loader": "^8.0.6",
-    "babel-runtime": "^5.1.10",
+    "babel-plugin-add-module-exports": "^1.0.2",
     "benchmark": "~1.0",
     "chai": "^4.2.0",
-    "chai-diff": "^1.0.1",
-    "concurrently": "^5.0.0",
     "dirty-chai": "^2.0.1",
     "dtslint": "^0.5.5",
     "dustjs-linkedin": "^2.0.2",
     "eco": "~1.1.0-rc-3",
-    "eslint": "^6.7.2",
-    "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-compat": "^3.3.0",
     "eslint-plugin-es5": "^1.4.1",
-    "fs-extra": "^8.1.0",
     "grunt": "^1.0.4",
-    "grunt-babel": "^5.0.0",
+    "grunt-babel": "^8.0.0",
     "grunt-bg-shell": "^2.3.3",
     "grunt-cli": "^1",
     "grunt-contrib-clean": "^1",
     "grunt-contrib-concat": "^1",
     "grunt-contrib-connect": "^1",
     "grunt-contrib-copy": "^1",
-    "grunt-contrib-requirejs": "^1",
-    "grunt-contrib-uglify": "^1",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-webpack": "^1.0.8",
+    "grunt-eslint": "^20.1.0",
-    "husky": "^3.1.0",
+    "grunt-webpack": "^3.1.3",
+    "istanbul": "^0.3.0",
     "jison": "~0.3.0",
-    "lint-staged": "^9.5.0",
     "mocha": "^5",
     "mock-stdin": "^0.3.0",
     "mustache": "^2.1.3",
-    "nyc": "^14.1.1",
-    "prettier": "^1.19.1",
     "semver": "^5.0.1",
     "sinon": "^7.5.0",
     "typescript": "^3.4.3",
     "underscore": "^1.5.1",
-    "webpack": "^1.12.6",
+    "webpack": "^4.41.2",
-    "webpack-dev-server": "^1.12.1"
+    "webpack-dev-server": "^3.9.0"
   },
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -84,15 +80,8 @@
     "handlebars": "bin/handlebars"
   },
   "scripts": {
-    "format": "prettier --write '**/*.js' && eslint --fix .",
+    "checkTypes": "dtslint types",
-    "check-format": "prettier --check '**/*.js'",
+    "test": "grunt"
-    "lint": "eslint --max-warnings 0 .",
-    "dtslint": "dtslint types",
-    "test": "grunt",
-    "extensive-tests-and-publish-to-aws": "npx mocha tasks/task-tests/ && grunt --stack extensive-tests-and-publish-to-aws",
-    "integration-test": "grunt integration-tests",
-    "--- combined tasks ---": "",
-    "check-before-pull-request": "concurrently --kill-others-on-fail npm:lint npm:dtslint npm:check-format npm:test"
   },
   "jspm": {
     "main": "handlebars",
@@ -112,22 +101,6 @@
     "print-script",
     "release-notes.md",
     "runtime.js",
-    "types/*.d.ts",
+    "types/*.d.ts"
-    "runtime.d.ts"
+  ]
-  ],
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,css,json,md}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.js": [
-      "eslint --fix",
-      "git add"
-    ]
-  }
 }

prettier.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  tabWidth: 2,
-  semi: true,
-  singleQuote: true
-};

release-notes.md

@@ -2,173 +2,18 @@
 
 ## Development
 
-[Commits](https://github.com/handlebars-lang/handlebars.js/compare/v4.7.7...master)
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...master)
-
-## v4.7.7 - February 15th, 2021
-
-- fix weird error in integration tests - eb860c0
-- fix: check prototype property access in strict-mode (#1736) - b6d3de7
-- fix: escape property names in compat mode (#1736) - f058970
-- refactor: In spec tests, use expectTemplate over equals and shouldThrow (#1683) - 77825f8
-- chore: start testing on Node.js 12 and 13 - 3789a30
-
-(POSSIBLY) BREAKING CHANGES:
-
-- the changes from version [4.6.0](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md#v460---january-8th-2020) now also apply
-  in when using the compile-option "strict: true". Access to prototype properties is forbidden completely by default, specific properties or methods
-  can be allowed via runtime-options. See #1633 for details. If you are using Handlebars as documented, you should not be accessing prototype properties
-  from your template anyway, so the changes should not be a problem for you. Only the use of undocumented features can break your build.
-
-That is why we only bump the patch version despite mentioning breaking changes.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)
-
-## v4.7.6 - April 3rd, 2020
-
-Chore/Housekeeping:
-
-- [#1672](https://github.com/wycats/handlebars.js/issues/1672) - Switch cmd parser to latest minimist ([@dougwilson](https://api.github.com/users/dougwilson)
-
-Compatibility notes:
-
-- Restored Node.js compatibility
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.5...v4.7.6)
-
-## v4.7.5 - April 2nd, 2020
-
-Chore/Housekeeping:
-
-- ~Node.js version support has been changed to v6+~ Reverted in 4.7.6
-
-Compatibility notes:
-
-- ~Node.js < v6 is no longer supported~ Reverted in 4.7.6
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.4...v4.7.5)
-
-## v4.7.4 - April 1st, 2020
-
-Chore/Housekeeping:
-
-- [#1666](https://github.com/wycats/handlebars.js/issues/1666) - Replaced minimist with yargs for handlebars CLI ([@aorinevo](https://api.github.com/users/aorinevo), [@AviVahl](https://api.github.com/users/AviVahl) & [@fabb](https://api.github.com/users/fabb))
-
-Compatibility notes:
-
-- No incompatibilities are to be expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.3...v4.7.4)
-
-## v4.7.3 - February 5th, 2020
-
-Chore/Housekeeping:
-
-- [#1644](https://github.com/wycats/handlebars.js/issues/1644) - Download links to aws broken on handlebarsjs.com - access denied ([@Tea56](https://api.github.com/users/Tea56))
-- Fix spelling and punctuation in changelog - d78cc73
-
-Bugfixes:
-
-- Add Type Definition for Handlebars.VERSION, Fixes #1647 - 4de51fe
-- Include Type Definition for runtime.js in Package - a32d05f
-
-Compatibility notes:
-
-- No incompatibilities are to be expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.2...v4.7.3)
-
-## v4.7.2 - January 13th, 2020
-
-Bugfixes:
-
-- fix: don't wrap helpers that are not functions - 9d5aa36, #1639
-
-Chore/Build:
-
-- chore: execute saucelabs-task only if access-key exists - a4fd391
-
-Compatibility notes:
-
-- No breaking changes are to be expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.1...v4.7.2)
-
-## v4.7.1 - January 12th, 2020
-
-Bugfixes:
-
-- fix: fix log output in case of illegal property access - f152dfc
-- fix: log error for illegal property access only once per property - 3c1e252
-
-Compatibility notes:
-
-- no incompatibilities are to be expected.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.7.0...v4.7.1)
-
-## v4.7.0 - January 10th, 2020
-
-Features:
-
-- feat: default options for controlling proto access - 7af1c12, #1635
-  - This makes it possible to disable the prototype access restrictions added in 4.6.0
-  - an error is logged in the console, if access to prototype properties is attempted and denied
-    and no explicit configuration has taken place.
-
-Compatibility notes:
-
-- no compatibilities are expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.6.0...v4.7.0)
-
-## v4.6.0 - January 8th, 2020
-
-Features:
-
-- feat: access control to prototype properties via whitelist (#1633)- d03b6ec
-
-Bugfixes:
-
-- fix(runtime.js): partials compile not caching (#1600) - 23d58e7
-
-Chores, docs:
-
-- various refactorings and improvements to tests - d7f0dcf, 187d611, d337f40
-- modernize the build-setup
-  - use prettier to format and eslint to verify - c40d9f3, 8901c28, e97685e, 1f61f21
-  - use nyc instead of istanbul to collect coverage - 164b7ff, 1ebce2b
-  - update build code to use modern javascript and make it cleaner - 14b621c, 1ec1737, 3a5b65e, dde108e, 04b1984, 587e7a3
-  - restructur build commands - e913dc5,
-- eslint rule changes - ac4655e, dc54952
-- Update (C) year in the LICENSE file - d1fb07b
-- chore: try to fix saucelabs credentials (#1627) -
-- Update readme.md with updated links (#1620) - edcc84f
-
-BREAKING CHANGES:
-
-- access to prototype properties is forbidden completely by default,
-  specific properties or methods can be allowed via runtime-options.
-  See #1633 for details.
-  If you are using Handlebars as documented, you should not be accessing prototype
-  properties from your template anyway, so the changes should not be a problem
-  for you. Only the use of undocumented features can break your build.
-
-  That is why we only bump the minor version despite mentioning breaking changes.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...v4.6.0)
 
 ## v4.5.3 - November 18th, 2019
-
 Bugfixes:
 
 - fix: add "no-prototype-builtins" eslint-rule and fix all occurences - f7f05d7
 - fix: add more properties required to be enumerable - 1988878
 
 Chores / Build:
-
 - fix: use !== 0 instead of != 0 - c02b05f
 - add chai and dirty-chai and sinon, for cleaner test-assertions and spies, 
-  deprecate old assertion-methods - 93e284e, 886ba86, 0817dad, 93516a0
+  deprecate old assertion-methods  - 93e284e, 886ba86, 0817dad, 93516a0
 
 Security:
 
@@ -184,11 +29,11 @@ Compatibility notes:
 - Due to the security-fixes. The semantics of the templates using
   `__proto__`, `__defineGetter__`, `__defineSetter__` and `__lookupGetter__` in the respect that those expression now return 
   `undefined` rather than their actual value from the proto.
-- The semantics have not changed in cases where the properties are enumerable, as in:
+- The semantics have not changed in cases where the properties are  enumerable, as in:
 
 ```js
 {
-  __proto__: 'some string';
+  __proto__: 'some string'
 }
 ```
 
@@ -197,145 +42,133 @@ Compatibility notes:
   are not intended, undocumented and far less important than fixing
   Remote-Code-Execution exploits on existing systems.
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3)
 
 ## v4.5.2 - November 13th, 2019
-
 # Bugfixes
 
 - fix: use String(field) in lookup when checking for "constructor" - d541378
 - test: add fluent API for testing Handlebars - c2ac79c
 
 Compatibility notes:
-
 - no incompatibility are to be expected
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.5.2)
 
 ## v4.5.1 - October 29th, 2019
-
 Bugfixs
 
 - fix: move "eslint-plugin-compat" to devDependencies - 5e9d17f (#1589)
 
 Compatibility notes:
-
 - No compatibility issues are to be expected
 
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.0...v4.5.1)
 
 ## v4.5.0 - October 28th, 2019
-
 Features / Improvements
-
 - Add method Handlebars.parseWithoutProcessing (#1584) - 62ed3c2
 - add guard to if & unless helpers (#1549)
 - show source location for the strict lookup exceptions - feb60f8
 
 Bugfixes:
-
 - Use objects for hash value tracking - 7fcf9d2
 
 Chore:
-
 - Resolve deprecation warning message from eslint while running eslint (#1586) - 7052e88
 - chore: add eslint-plugin-compat and eslint-plugin-es5 - 088e618
 
 Compatibility notes:
-
 - No compatibility issues are to be expected
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.5...v4.5.0)
 
 ## v4.4.5 - October 20th, 2019
-
 Bugfixes: 
 
 - Contents of raw-blocks must be matched with non-eager regex-matching - 8d5530e, #1579
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.4...v4.4.5)
 
 ## v4.4.4 - October 20th, 2019
-
 Bugfixes:
-
 - fix: prevent zero length tokens in raw-blocks (#1577, #1578) - f1752fe
 
 Chore: 
-
 - chore: link to s3 bucket with https, add "npm ci" to build instructions - 0b593bf
 
 Compatibility notes:
-
 - no compatibility issues are expected
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.3...v4.4.4)
 
 ## v4.4.3 - October 8th, 2019
-
 Bugfixes
 
 Typings:
-
 - add missing type fields to AST typings and add tests for them - 0440af2
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.2...v4.4.3)
 
 ## v4.4.2 - October 2nd, 2019
-
 - chore: fix grunt-saucelabs dependency - b7eada0
 
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.1...v4.4.2)
 
 ## v4.4.1 - October 2nd, 2019
-
 - [#1562](https://github.com/wycats/handlebars.js/issues/1562) - Error message for syntax error missing location in 4.2.1+
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.1)
 
 ## v4.4.0 - September 29th, 2019
-
 - Added support for iterable objects in {{#each}} helper (#1557) - cf7545e
 
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.4...v4.4.0)
 
 ## v4.3.4 - September 28th, 2019
-
 - fix: harden "propertyIsEnumerable"-check - ff4d827
 
 Compatibility notes:
-
 - No incompatibilities are known.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.3...v4.3.4)
 
 ## v4.3.3 - September 27th, 2019
+ - fix test case for browsers that do not support __defineGetter__ - 8742bde
 
-- fix test case for browsers that do not support **defineGetter** - 8742bde
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.2...v4.3.3)
 
 ## v4.3.2 - September 26th, 2019
-
 - Use Object.prototype.propertyIsEnumerable to check for constructors - 213c0bb, #1563
 
 Compatibility notes:
-
 - There are no breaking changes
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.1...v4.3.2)
 
 ## v4.3.1 - September 25th, 2019
-
 Fixes:
 
 - do not break on precompiled templates from Handlebars >=4.0.0 <4.3.0 - 1266838, #1561
 - Ensure allowCallsToHelperMissing runtime option is optional in typings - 93444c5, 64ecb9e, #1560
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.0...v4.3.1)
 
 ## v4.3.0 - September 24th, 2019
-
 Fixes:
 
 - Security: Disallow calling "helperMissing" and "blockHelperMissing" directly - 2078c72
@@ -348,9 +181,7 @@ Features:
 Breaking changes:
 
 Compatibility notes:
-
 - Compiler revision increased - 06b7224
-
   - This means that template compiled with versions prior to 4.3.0 will not work with runtimes >= 4.3.0
     The increase was done because the "helperMissing" and "blockHelperMissing" are now moved from the helpers
     to the internal "container.hooks" object, so old templates will not be able to call them anymore. We suggest
@@ -359,9 +190,9 @@ Compatibility notes:
 - Disallow calling "helperMissing" and "blockHelperMissing" directly - 2078c72
   - Calling "helperMissing" and "blockHelperMissing" directly from a template (like in `{{blockHelperMissing}}` was 
     never intended and was part of the exploits that have been revealed early in 2019 
-    (see https://github.com/wycats/handlebars.js/issues/1495). _It is also part of a new exploit that
+    (see https://github.com/wycats/handlebars.js/issues/1495). *It is also part of a new exploit that 
-    is not captured by the earlier fix._ In order to harden Handlebars against such exploits, calling thos helpers
+    is not captured by the earlier fix.* In order to harden Handlebars against such exploits, calling thos helpers 
-    is now not possible anymore. _Overriding_ those helpers is still possible.
+    is now not possible anymore. *Overriding* those helpers is still possible.
   - If you really need this behavior, you can set the runtime option `allowCallsToHelperMissing` to `true` and the
     calls will again be possible
 
@@ -369,64 +200,57 @@ Both bullet points imly that Handlebars is not 100% percent compatible to 4.2.0,
 
 We consider it more important to resolve a major security issue than to maintain 100% compatibility.
 
+    
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.3.0)
 
 ## v4.2.1 - September 20th, 2019
-
 Bugfixes: 
 
 - The "browser" property in the package.json has been updated to use the common-js builds instead of the minified UMD - c55a7be, #1553
 
 Compatibility notes:
-
 - No compatibility issues should arise
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1)
 
 ## v4.2.0 - September 3rd, 2019
-
 Chore/Test:
-
 - Use custom `grunt-saucelab` with current sauce-connect proxy - f119497
 - Add framework for various integration tests - f9cce4d
 - Add integration test for webpack - a57b682
 
-Bugfixes:
 
+Bugfixes:
 - [#1544](https://github.com/wycats/handlebars.js/issues/1544) - Typescript types: `knownHelpers` doesnt allow for custom helpers ([@NickCis](https://api.github.com/users/NickCis))
 - [#1534](https://github.com/wycats/handlebars.js/pull/1534) - Add typings for "Handlebars.VM.resolvePartial ([@AndrewLeedham](https://api.github.com/users/AndrewLeedham))
 
 Features:
-
 - [#1540](https://github.com/wycats/handlebars.js/pull/1540) - added "browser"-property to package.json, resolves #1102 ([@ouijan](https://api.github.com/users/ouijan))
 
 Compatibility notes:
-
 - The new "browser"-property should not break anything, but you can never be sure. The integration test for webpack 
   shows that it works, but if it doesn't please open an issue.
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2-0...v4.2.0)
 
 ## v4.1.2-0 - August 25th, 2019
-
 [#1540](https://github.com/wycats/handlebars.js/pull/1540) - added browser to package.json, resolves #1102 ([@ouijan](https://api.github.com/users/ouijan))
 
 Compatibility notes:
-
 - We are not sure if imports via webpack are still working, which is why this release is a pre-release
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.1.2-0)
 
 ## v4.1.2 - April 13th, 2019
-
 Chore/Test:
-
 - [#1515](https://github.com/wycats/handlebars.js/pull/1515) - Port over linting and test for typings ([@zimmi88](https://api.github.com/users/zimmi88))
 - chore: add missing typescript dependency, add package-lock.json - 594f1e3
 - test: remove safari from saucelabs - 871accc
 
 Bugfixes: 
-
 - fix: prevent RCE through the "lookup"-helper - cd38583
 
 Compatibility notes:
@@ -442,24 +266,20 @@ and the issue may not be resolved on many systems).
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.1...v4.1.2)
 
 ## v4.1.1 - March 16th, 2019
-
 Bugfixes:
-
 - fix: add "runtime.d.ts" to allow "require('handlebars/runtime')" in TypeScript - 5cedd62
 
 Refactorings:
-
 - replace "async" with "neo-async" - 048f2ce
 - use "substring"-function instead of "substr" - 445ae12
 
 Compatibility notes:
-
 - This is a bugfix release. There are no breaking change and no new features.
 
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.1)
 
 ## v4.1.0 - February 7th, 2019
-
 New Features
 
 - import TypeScript typings - 27ac1ee
@@ -492,10 +312,11 @@ document.getElementById('output').innerHTML = template(new SomeClass());
 
 This kind of access is not the intended use of Handlebars and leads to the vulnerability described in #1495. We will **not** increase the major version, because such use is not intended or documented, and because of the potential impact of the issue (we fear that most people won't use a new major version and the issue may not be resolved on many systems).
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.1.0)
 
 ## v4.0.12 - September 4th, 2018
-
 New features:
 
 - none
@@ -520,27 +341,25 @@ Removed obsolete code:
 - Update jsfiddle to 4.0.11 - 8947dd0
 
 Compatibility notes:
-
 - No compatibility issues are to be expected
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.11...v4.0.12)
 
 ## v4.0.11 - October 17th, 2017
-
 - [#1391](https://github.com/wycats/handlebars.js/issues/1391) - `uglify-js` is unconditionally imported, but only listed as optional dependency ([@Turbo87](https://github.com/Turbo87))
 - [#1233](https://github.com/wycats/handlebars.js/issues/1233) - Unable to build under windows - error at test:bin task ([@blikblum](https://github.com/blikblum))
 - Update (C) year in the LICENSE file - 21386b6
 
 Compatibility notes:
-
 - This is a bugfix release. There are no breaking change and no new features.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.10...v4.0.11)
 
 ## v4.0.10 - May 21st, 2017
-
 - Fix regression in 4.0.9: Replace "Object.assign" (not support in IE) by "util/extend" - 0e953d1
 
+
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.9...v4.0.10)
 
 ## v4.0.9 - May 21st, 2017
@@ -548,44 +367,39 @@ Compatibility notes:
 - [#1327](https://github.com/wycats/handlebars.js/issues/1327) Handlebars.compile() does not modify "options" anymore
 - pending [#1331](https://github.com/wycats/handlebars.js/issues/1331) Attempts to build Handlebars in a Windows environment
   - Fix build in windows - cc554a5
-  - Ensure LF line-edings in handlebars-template fixtures (\*.hbs) - ed879a6
+  - Ensure LF line-edings in handlebars-template fixtures (*.hbs) - ed879a6
   - Run integration test with `node handlebars -a ...` on Windows - 2e21e2b
-  - Ensure LF line-edings in lexer-files (\*.l) - bdfdbea
+  - Ensure LF line-edings in lexer-files (*.l) - bdfdbea
   - Force LF line-endings for spec/artifacts - b50ef03
   - Use istanbul/lib/cli.js instead of node_modules/.bin/istanbul - 6e6269f
 - TravisCI: Publish valid semver tags independently of the branch - 7378f85
 
 Compatibility notes:
-
 - No compatibility issues are expected.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.8...v4.0.9)
 
 ## v4.0.8 - May 2nd, 2017
-
 - [#1341](https://github.com/wycats/handlebars.js/issues/1341) [#1342](https://github.com/wycats/handlebars.js/issues/1342) Allow partial-blocks to be executed without "options" ([@nknapp](https://github.com/nknapp)) - a00c598
 
 Compatibility notes:
-
 - No breaking changes
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.7...v4.0.8)
 
 ## v4.0.7 - April 29th, 2017
-
 - [#1319](https://github.com/wycats/handlebars.js/issues/1319): Fix context-stack when calling block-helpers on null values ([@nknapp](https://github.com/nknapp)) - c8f4b57
 - [#1315](https://github.com/wycats/handlebars.js/pull/1315) Parser: Change suffix to use ES6 default module export ([@Turbo87](https://github.com/Turbo87))- b617375
-- [#1290](https://github.com/wycats/handlebars.js/pull/1290) [#1252](https://github.com/wycats/handlebars.js/issue/1290) Add more tests for partial-blocks and inline partials ([@nknapp](https://github.com/nknapp)) - 63a8e0c
+- [#1290](https://github.com/wycats/handlebars.js/pull/1290) [#1252](https://github.com/wycats/handlebars.js/issue/1290) Add more tests for partial-blocks and inline partials ([@nknapp](https://github.com/nknapp)) -  63a8e0c
 - [#1252](https://github.com/wycats/handlebars.js/issue/1290) Using @partial-block twice in a template not possible ([@nknapp](https://github.com/nknapp)) - 5a164d0
 - [#1310](https://github.com/wycats/handlebars.js/pull/1310) Avoid duplicate "sourceMappingURL=" lines. ([@joonas-lahtinen](https://github.com/joonas-lahtinen)) - 01b0f65
 - [#1275](https://github.com/wycats/handlebars.js/pull/1275) require('sys') is deprecated, using 'util' instead ([@travnels](https://github.com/travnels)) - 406f2ee
 - [#1285](https://github.com/wycats/handlebars.js/pull/1285) [#1284](https://github.com/wycats/handlebars.js/issues/1284) Make "column"-property of Errors enumerable ([@nknapp](https://github.com/nknapp)) - a023cb4
 - [#1285](https://github.com/wycats/handlebars.js/pull/1285) Testcase to verify that compile-errors have a column-property ([@nknapp](https://github.com/nknapp)) - c7dc353
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.6...v4.0.7)
+[Commits](https://github.com/lawnsea/handlebars.js/compare/v4.0.6...v4.0.7)
 
 ## v4.0.6 - November 12th, 2016
-
 - [#1243](https://github.com/wycats/handlebars.js/pull/1243) - Walk up data frames for nested @partial-block ([@lawnsea](https://github.com/lawnsea))
 - [#1210](https://github.com/wycats/handlebars.js/pull/1210) - Add a new lightweight package based on handlebars in the README ([@kabirbaidhya](https://github.com/kabirbaidhya))
 - [#1187](https://github.com/wycats/handlebars.js/pull/1187) - Ensure that existing blockParams and depths are respected on dupe programs ([@charleso](https://github.com/charleso))
@@ -593,7 +407,7 @@ Compatibility notes:
 - [#1177](https://github.com/wycats/handlebars.js/pull/1177) - Preserve License info in Closure Compiler ([@gennadiylitvinyuk](https://github.com/gennadiylitvinyuk))
 - [#1171](https://github.com/wycats/handlebars.js/pull/1171) - Contributing doc fix: failing thats -> failing tests ([@paulfalgout](https://github.com/paulfalgout))
 - [#1166](https://github.com/wycats/handlebars.js/pull/1166) - Update license date ([@timwangdev](https://github.com/timwangdev))
-- Update jsfiddle to point to latest - 959ee55 (originally dfc7554 by [@kpdecker](https://github.com/kpdecker))
+-  Update jsfiddle to point to latest - 959ee55 (originally dfc7554 by [@kpdecker](https://github.com/kpdecker))
 - [#1163](https://github.com/wycats/handlebars.js/pull/1163) - Fix typos on decorators-api.md. ([@adjohnson916](https://github.com/adjohnson916))
 - Drop extra Error params - 8c19874 (originally 63fdb92 by [@kpdecker](https://github.com/kpdecker))
 - [#1153](https://github.com/wycats/handlebars.js/pull/1153) - Add documentation for running tests to contributing.md ([@ryanmurakami](https://github.com/ryanmurakami))
@@ -607,7 +421,6 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.5...v4.0.6)
 
 ## v4.0.5 - November 19th, 2015
-
 - [#1132](https://github.com/wycats/handlebars.js/pull/1132) - Update uglify-js to avoid vulnerability ([@plynchnlm](https://github.com/plynchnlm))
 - [#1129](https://github.com/wycats/handlebars.js/issues/1129) - Minified lib returns an empty string ([@bricss](https://github.com/bricss))
 - Return current handlebars instance from noConflict - 685cf92
@@ -620,14 +433,12 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.4...v4.0.5)
 
 ## v4.0.4 - October 29th, 2015
-
 - [#1121](https://github.com/wycats/handlebars.js/pull/1121) - Include partial name in 'undefined partial' exception message ([@shinypb](https://github.com/shinypb))
 - [#1125](https://github.com/wycats/handlebars.js/pull/1125) - Add promised-handlebars to "in-the-wild"-list ([@nknapp](https://github.com/nknapp))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.3...v4.0.4)
 
 ## v4.0.3 - September 23rd, 2015
-
 - [#1099](https://github.com/wycats/handlebars.js/issues/1099) - @partial-block is overridden ([@btmorex](https://github.com/btmorex))
 - [#1093](https://github.com/wycats/handlebars.js/issues/1093) - #each skips iteration on undefined values ([@florianpilz](https://github.com/florianpilz))
 - [#1092](https://github.com/wycats/handlebars.js/issues/1092) - Square braces in key name ([@distantnative](https://github.com/distantnative))
@@ -635,26 +446,22 @@ Compatibility notes:
 - [#1090](https://github.com/wycats/handlebars.js/pull/1090) - grammar fixes in 4.0.0 release notes ([@nikolas](https://github.com/nikolas))
 
 Compatibility notes:
-
 - `each` iteration with `undefined` values has been restored to the 3.0 behaviors. Helper calls with undefined context values will now execute against an arbitrary empty object to avoid executing against global object in non-strict mode.
 - `]` can now be included in `[]` wrapped identifiers by escaping with `\`. Any `[]` identifiers that include `\` will now have to properly escape these values.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.2...v4.0.3)
 
 ## v4.0.2 - September 4th, 2015
-
 - [#1089](https://github.com/wycats/handlebars.js/issues/1089) - "Failover content" not working in multiple levels of inline partials ([@michaellopez](https://github.com/michaellopez))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.1...v4.0.2)
 
 ## v4.0.1 - September 2nd, 2015
-
 - Fix failure when using decorators in partials - 05b82a2
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.0...v4.0.1)
 
 ## v4.0.0 - September 1st, 2015
-
 - [#1082](https://github.com/wycats/handlebars.js/pull/1082) - Decorators and Inline Partials ([@kpdecker](https://github.com/kpdecker))
 - [#1076](https://github.com/wycats/handlebars.js/pull/1076) - Implement partial blocks ([@kpdecker](https://github.com/kpdecker))
 - [#1087](https://github.com/wycats/handlebars.js/pull/1087) - Fix #each when last object entry has empty key ([@denniskuczynski](https://github.com/denniskuczynski))
@@ -690,7 +497,6 @@ Compatibility notes:
 - Fix location information for programs - [93faffa](https://github.com/wycats/handlebars.js/commit/93faffa)
 
 Compatibility notes:
-
 - Depthed paths are now conditionally pushed on to the stack. If the helper uses the same context, then a new stack is not created. This leads to behavior that better matches expectations for helpers like `if` that do not seem to alter the context. Any instances of `../` in templates will need to be checked for the correct behavior under 4.0.0. In general templates will either reduce the number of `../` instances or leave them as is. See [#1028](https://github.com/wycats/handlebars.js/issues/1028).
 - The `=` character is now HTML escaped. This closes a potential exploit case when using unquoted attributes, i.e. `<div foo={{bar}}>`. In general it's recommended that attributes always be quoted when their values are generated from a mustache to avoid any potential exploit surfaces.
 - AST constructors have been dropped in favor of plain old javascript objects
@@ -699,25 +505,22 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.3...v4.0.0)
 
 ## v3.0.3 - April 28th, 2015
-
 - [#1004](https://github.com/wycats/handlebars.js/issues/1004) - Latest version breaks with RequireJS (global is undefined) ([@boskee](https://github.com/boskee))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.2...v3.0.3)
 
 ## v3.0.2 - April 20th, 2015
-
 - [#998](https://github.com/wycats/handlebars.js/pull/998) - Add full support for es6 ([@kpdecker](https://github.com/kpdecker))
 - [#994](https://github.com/wycats/handlebars.js/issues/994) - Access Handlebars.Visitor in browser ([@tamlyn](https://github.com/tamlyn))
 - [#990](https://github.com/wycats/handlebars.js/issues/990) - Allow passing null/undefined literals subexpressions ([@blimmer](https://github.com/blimmer))
 - [#989](https://github.com/wycats/handlebars.js/issues/989) - Source-map error with requirejs ([@SteppeEagle](https://github.com/SteppeEagle))
-- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property ([@75lb](https://github.com/75lb))
+- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property  ([@75lb](https://github.com/75lb))
 - Use captureStackTrace for error handler - a009a97
 - Ignore branches tested without coverage monitoring - 37a664b
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.1...v3.0.2)
 
 ## v3.0.1 - March 24th, 2015
-
 - [#984](https://github.com/wycats/handlebars.js/pull/984) - Adding documentation for passing arguments into partials ([@johneke](https://github.com/johneke))
 - [#973](https://github.com/wycats/handlebars.js/issues/973) - version 3 is slower than version 2 ([@elover](https://github.com/elover))
 - [#966](https://github.com/wycats/handlebars.js/issues/966) - "handlebars --version" does not work with v3.0.0 ([@abloomston](https://github.com/abloomston))
@@ -727,7 +530,6 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.0...v3.0.1)
 
 ## v3.0.0 - February 10th, 2015
-
 - [#941](https://github.com/wycats/handlebars.js/pull/941) - Add support for dynamic partial names ([@kpdecker](https://github.com/kpdecker))
 - [#940](https://github.com/wycats/handlebars.js/pull/940) - Add missing reserved words so compiler knows to use array syntax: ([@mattflaschen](https://github.com/mattflaschen))
 - [#938](https://github.com/wycats/handlebars.js/pull/938) - Fix example using #with helper ([@diwo](https://github.com/diwo))
@@ -757,7 +559,6 @@ Compatibility notes:
 - Lookup partials when undefined - 617dd57
 
 Compatibility notes:
-
 - Runtime breaking changes. Must match 3.x runtime and precompiler.
 - The AST has been upgraded to a public API.
   - There are a number of changes to this, but the format is now documented in docs/compiler-api.md
@@ -767,7 +568,6 @@ Compatibility notes:
 - `SafeString` is now duck typed on `toHTML`
 
 New Features:
-
 - noConflict
 - Source Maps
 - Block Params
@@ -780,7 +580,6 @@ New Features:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0...v3.0.0)
 
 ## v2.0.0 - September 1st, 2014
-
 - Update jsfiddle to 2.0.0-beta.1 - 0670f65
 - Add contrib note regarding handlebarsjs.com docs - 4d17e3c
 - Play nice with gemspec version numbers - 64d5481
@@ -788,7 +587,6 @@ New Features:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-beta.1...v2.0.0)
 
 ## v2.0.0-beta.1 - August 26th, 2014
-
 - [#787](https://github.com/wycats/handlebars.js/pull/787) - Remove whitespace surrounding standalone statements ([@kpdecker](https://github.com/kpdecker))
 - [#827](https://github.com/wycats/handlebars.js/issues/827) - Render false literal as “false” ([@scoot557](https://github.com/scoot557))
 - [#767](https://github.com/wycats/handlebars.js/issues/767) - Subexpressions bug with hash and context ([@evensoul](https://github.com/evensoul))
@@ -798,7 +596,7 @@ New Features:
   - [#837](https://github.com/wycats/handlebars.js/issues/837) - Strange input for custom helper ( foo.bar == false when foo is undefined ) ([@zordius](https://github.com/zordius))
 - [#819](https://github.com/wycats/handlebars.js/pull/819) - Implement recursive field lookup ([@kpdecker](https://github.com/kpdecker))
 - [#764](https://github.com/wycats/handlebars.js/issues/764) - This reference not working for helpers ([@kpdecker](https://github.com/kpdecker))
-- [#773](https://github.com/wycats/handlebars.js/issues/773) - Implicit parameters in {{#each}} introduces a peculiarity in helpers calling convention ([@Bertrand](https://github.com/Bertrand))
+- [#773](https://github.com/wycats/handlebars.js/issues/773) - Implicit parameters in {{#each}} introduces a peculiarity in helpers calling convention  ([@Bertrand](https://github.com/Bertrand))
 - [#783](https://github.com/wycats/handlebars.js/issues/783) - helperMissing and consistency for different expression types ([@ErisDS](https://github.com/ErisDS))
 - [#795](https://github.com/wycats/handlebars.js/pull/795) - Turn the precompile script into a wrapper around a module. ([@jwietelmann](https://github.com/jwietelmann))
 - [#823](https://github.com/wycats/handlebars.js/pull/823) - Support inverse sections on the with helper ([@dan-manges](https://github.com/dan-manges))
@@ -811,7 +609,6 @@ New Features:
 - Fix compiler program de-duping - 9e3f824
 
 Compatibility notes:
-
 - The default build now outputs a generic UMD wrapper. This should be transparent change but may cause issues in some environments.
 - Runtime compatibility breaks in both directions. Ensure that both compiler and client are upgraded to 2.0.0-beta.1 or higher at the same time.
   - `programWithDepth` has been removed an instead an array of context values is passed to fields needing depth lookups.
@@ -833,13 +630,11 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.4...v2.0.0-beta.1)
 
 ## v2.0.0-alpha.4 - May 19th, 2014
-
 - Expose setup wrappers for compiled templates - 3638874
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.3...v2.0.0-alpha.4)
 
 ## v2.0.0-alpha.3 - May 19th, 2014
-
 - [#797](https://github.com/wycats/handlebars.js/pull/797) - Pass full helper ID to helperMissing when options are provided ([@tomdale](https://github.com/tomdale))
 - [#793](https://github.com/wycats/handlebars.js/pull/793) - Ensure isHelper is coerced to a boolean ([@mmun](https://github.com/mmun))
 - Refactor template init logic - 085e5e1
@@ -847,7 +642,6 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.2...v2.0.0-alpha.3)
 
 ## v2.0.0-alpha.2 - March 6th, 2014
-
 - [#756](https://github.com/wycats/handlebars.js/pull/756) - fix bug in IE<=8 (no Array::map), closes #751 ([@jenseng](https://github.com/jenseng))
 - [#749](https://github.com/wycats/handlebars.js/pull/749) - properly handle multiple subexpressions in the same hash, fixes #748 ([@jenseng](https://github.com/jenseng))
 - [#743](https://github.com/wycats/handlebars.js/issues/743) - subexpression confusion/problem? ([@waynedpj](https://github.com/waynedpj))
@@ -857,13 +651,11 @@ Compatibility notes:
 - Temporarily kill the AWS publish CI step - 8347ee2
 
 Compatibility notes:
-
 - A JSON polyfill is required to run the compiler under IE8 and below. It's recommended that the precompiler be used in lieu of running the compiler on these legacy environments.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.1...v2.0.0-alpha.2)
 
 ## v2.0.0-alpha.1 - February 10th, 2014
-
 - [#182](https://github.com/wycats/handlebars.js/pull/182) - Allow passing hash parameters to partials ([@kpdecker](https://github.com/kpdecker))
 - [#392](https://github.com/wycats/handlebars.js/pull/392) - Access to root context in partials and helpers ([@kpdecker](https://github.com/kpdecker))
 - [#472](https://github.com/wycats/handlebars.js/issues/472) - Helpers cannot have decimal parameters ([@kayleg](https://github.com/kayleg))
@@ -886,7 +678,6 @@ Compatibility notes:
 - [#704](https://github.com/wycats/handlebars.js/pull/704) - JavaScript Compiler Cleanup ([@blakeembrey](https://github.com/blakeembrey))
 
 Compatibility notes:
-
 - `helperMissing` helper no longer has the indexed name argument. Helper name is now available via `options.name`.
 - Precompiler output has changed, which breaks compatibility with prior versions of the runtime and precompiled output.
 - `JavaScriptCompiler.compilerInfo` now returns generic objects rather than javascript source.
@@ -899,7 +690,6 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.3.0...v2.0.0-alpha.1)
 
 ## v1.3.0 - January 1st, 2014
-
 - [#690](https://github.com/wycats/handlebars.js/pull/690) - Added support for subexpressions ([@machty](https://github.com/machty))
 - [#696](https://github.com/wycats/handlebars.js/pull/696) - Fix for reserved keyword "default" ([@nateirwin](https://github.com/nateirwin))
 - [#692](https://github.com/wycats/handlebars.js/pull/692) - add line numbers to nodes when parsing ([@fivetanley](https://github.com/fivetanley))
@@ -914,14 +704,12 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.2.1...v1.3.0)
 
 ## v1.2.1 - December 26th, 2013
-
 - [#684](https://github.com/wycats/handlebars.js/pull/684) - Allow any number of trailing characters for valid JavaScript variable ([@blakeembrey](https://github.com/blakeembrey))
 - [#686](https://github.com/wycats/handlebars.js/pull/686) - Falsy AMD module names in version 1.2.0 ([@kpdecker](https://github.com/kpdecker))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.2.0...v1.2.1)
 
 ## v1.2.0 - December 23rd, 2013
-
 - [#675](https://github.com/wycats/handlebars.js/issues/675) - Cannot compile empty template for partial ([@erwinw](https://github.com/erwinw))
 - [#677](https://github.com/wycats/handlebars.js/issues/677) - Triple brace statements fail under IE ([@hamzaCM](https://github.com/hamzaCM))
 - [#655](https://github.com/wycats/handlebars.js/issues/655) - Loading Handlebars using bower ([@niki4810](https://github.com/niki4810))
@@ -941,7 +729,6 @@ Compatibility notes:
 - Fix handling of boolean escape in MustacheNode - b4968bb
 
 Compatibility notes:
-
 - `@index` and `@first` are now supported for `each` iteration on objects
 - `Handlebars.VM.checkRevision` and `Handlebars.JavaScriptCompiler.prototype.compilerInfo` now available to modify the version checking behavior.
 - Browserify users may link to the runtime library via `require('handlebars/runtime')`
@@ -983,8 +770,8 @@ Compatibility notes:
 - [#571](https://github.com/wycats/handlebars.js/issues/571) - uglify upgrade breaks compatibility with older versions of node
 - [#587](https://github.com/wycats/handlebars.js/issues/587) - Partial inside partial breaks?
 
-Compatibility notes:
 
+Compatibility notes:
 - The project now includes separate artifacts for AMD, CommonJS, and global objects. 
   - AMD: Users may load the bundled `handlebars.amd.js` or `handlebars.runtime.amd.js` files or load individual modules directly. AMD users should also note that the handlebars object is exposed via the `default` field on the imported object. This [gist](https://gist.github.com/wycats/7417be0dc361a69d5916) provides some discussion of possible compatibility shims.
   - CommonJS/Node: Node loading occurs as normal via `require`
@@ -992,6 +779,7 @@ Compatibility notes:
 - Build artifacts have been removed from the repository. [npm][npm], [components/handlebars.js][components], [cdnjs][cdnjs], or the [builds page][builds-page] should now be used as the source of built artifacts. 
 - Context-stored helpers are now always passed the `options` hash. Previously no-argument helpers did not have this argument.
 
+
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.0.12...v1.1.0)
 
 ## v1.0.12 / 1.0.0 - May 31 2013
@@ -1009,7 +797,6 @@ Compatibility notes:
 - Docs updates
 
 Compatibility notes:
-
 - The parser is now stricter on `{{{`, requiring that the end token be `}}}`. Templates that do not
   follow this convention should add the additional brace value.
 - Code that relies on global the namespace being muted when custom helpers or partials are passed will need to explicitly pass an `undefined` value for any helpers that should not be available.
@@ -1076,13 +863,13 @@ changed.
 Instead of:
 
 ```js
-template(context, helpers, partials, [data]);
+template(context, helpers, partials, [data])
 ```
 
 Use:
 
 ```js
-template(context, { helpers: helpers, partials: partials, data: data });
+template(context, {helpers: helpers, partials: partials, data: data})
 ```
 
 [builds-page]: http://builds.handlebarsjs.com.s3.amazonaws.com/index.html

spec/.eslintrc

@@ -1,8 +1,7 @@
 {
   "extends": [
     "../.eslintrc.js",
-    "plugin:es5/no-es2015",
+    "plugin:es5/no-es2015"
-    "prettier"
   ],
   "plugins": [
     "es5"

spec/amd-runtime.html

@@ -26,8 +26,7 @@
       window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
-    <script src="/spec/vendor/json2.js"></script>
+    <script src="/spec/env/require.js"></script>
-    <script src="/spec/vendor/require.js"></script>
 
     <script src="/spec/env/common.js"></script>
     <script>

spec/amd.html

@@ -27,9 +27,7 @@
       window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
-    <script src="/spec/vendor/json2.js"></script>
+    <script src="/spec/env/require.js"></script>
-    <script src="/spec/vendor/require.js"></script>
-
     <script src="/spec/env/common.js"></script>
     <script>
       var requireFailure;

spec/artifacts/known.helpers.handlebars

@@ -1,6 +0,0 @@
-{{#someHelper true}}
- <div>Some known helper</div>
-    {{#anotherHelper true}}
-    <div>Another known helper</div>
-    {{/anotherHelper}}
-{{/someHelper}}

spec/artifacts/non.default.extension.hbs

@@ -1 +0,0 @@
-<div>This is a test</div>

spec/artifacts/partial.template.handlebars

@@ -1 +0,0 @@
-<div>Test Partial</div>

spec/ast.js

@@ -7,102 +7,44 @@ describe('ast', function() {
 
   describe('BlockStatement', function() {
     it('should throw on mustache mismatch', function() {
-      shouldThrow(
+      shouldThrow(function() {
-        function() {
+        handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
-          handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
+      }, Handlebars.Exception, "foo doesn't match bar - 2:5");
-        },
-        Handlebars.Exception,
-        "foo doesn't match bar - 2:5"
-      );
     });
   });
 
   describe('helpers', function() {
     describe('#helperExpression', function() {
       it('should handle mustache statements', function() {
-        equals(
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [], hash: undefined}), false);
-          AST.helpers.helperExpression({
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [1], hash: undefined}), true);
-            type: 'MustacheStatement',
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [], hash: {}}), true);
-            params: [],
-            hash: undefined
-          }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'MustacheStatement',
-            params: [1],
-            hash: undefined
-          }),
-          true
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'MustacheStatement',
-            params: [],
-            hash: {}
-          }),
-          true
-        );
       });
       it('should handle block statements', function() {
-        equals(
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [], hash: undefined}), false);
-          AST.helpers.helperExpression({
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [1], hash: undefined}), true);
-            type: 'BlockStatement',
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [], hash: {}}), true);
-            params: [],
-            hash: undefined
-          }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'BlockStatement',
-            params: [1],
-            hash: undefined
-          }),
-          true
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'BlockStatement',
-            params: [],
-            hash: {}
-          }),
-          true
-        );
       });
       it('should handle subexpressions', function() {
-        equals(AST.helpers.helperExpression({ type: 'SubExpression' }), true);
+        equals(AST.helpers.helperExpression({type: 'SubExpression'}), true);
       });
       it('should work with non-helper nodes', function() {
-        equals(AST.helpers.helperExpression({ type: 'Program' }), false);
+        equals(AST.helpers.helperExpression({type: 'Program'}), false);
 
-        equals(
+        equals(AST.helpers.helperExpression({type: 'PartialStatement'}), false);
-          AST.helpers.helperExpression({ type: 'PartialStatement' }),
+        equals(AST.helpers.helperExpression({type: 'ContentStatement'}), false);
-          false
+        equals(AST.helpers.helperExpression({type: 'CommentStatement'}), false);
-        );
-        equals(
-          AST.helpers.helperExpression({ type: 'ContentStatement' }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({ type: 'CommentStatement' }),
-          false
-        );
 
-        equals(AST.helpers.helperExpression({ type: 'PathExpression' }), false);
+        equals(AST.helpers.helperExpression({type: 'PathExpression'}), false);
 
-        equals(AST.helpers.helperExpression({ type: 'StringLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'StringLiteral'}), false);
-        equals(AST.helpers.helperExpression({ type: 'NumberLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'NumberLiteral'}), false);
-        equals(AST.helpers.helperExpression({ type: 'BooleanLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'BooleanLiteral'}), false);
-        equals(
+        equals(AST.helpers.helperExpression({type: 'UndefinedLiteral'}), false);
-          AST.helpers.helperExpression({ type: 'UndefinedLiteral' }),
+        equals(AST.helpers.helperExpression({type: 'NullLiteral'}), false);
-          false
-        );
-        equals(AST.helpers.helperExpression({ type: 'NullLiteral' }), false);
 
-        equals(AST.helpers.helperExpression({ type: 'Hash' }), false);
+        equals(AST.helpers.helperExpression({type: 'Hash'}), false);
-        equals(AST.helpers.helperExpression({ type: 'HashPair' }), false);
+        equals(AST.helpers.helperExpression({type: 'HashPair'}), false);
       });
     });
   });
@@ -119,18 +61,17 @@ describe('ast', function() {
 
     /* eslint-disable no-multi-spaces */
     ast = Handlebars.parse(
-      'line 1 {{line1Token}}\n' + // 1
+              'line 1 {{line1Token}}\n'             // 1
-      ' line 2 {{line2token}}\n' + // 2
+            + ' line 2 {{line2token}}\n'            // 2
-      ' line 3 {{#blockHelperOnLine3}}\n' + // 3
+            + ' line 3 {{#blockHelperOnLine3}}\n'   // 3
-      'line 4{{line4token}}\n' + // 4
+            + 'line 4{{line4token}}\n'              // 4
-      'line5{{else}}\n' + // 5
+            + 'line5{{else}}\n'                     // 5
-      '{{line6Token}}\n' + // 6
+            + '{{line6Token}}\n'                    // 6
-      '{{/blockHelperOnLine3}}\n' + // 7
+            + '{{/blockHelperOnLine3}}\n'           // 7
-      '{{#open}}\n' + // 8
+            + '{{#open}}\n'                         // 8
-      '{{else inverse}}\n' + // 9
+            + '{{else inverse}}\n'                  // 9
-      '{{else}}\n' + // 10
+            + '{{else}}\n'                          // 10
-        '{{/open}}'
+            + '{{/open}}');                         // 11
-    ); // 11
     /* eslint-enable no-multi-spaces */
     body = ast.body;
 
@@ -151,35 +92,35 @@ describe('ast', function() {
     it('gets MustacheStatement line numbers correct across newlines', function() {
       var secondMustacheStatement = body[3];
       testColumns(secondMustacheStatement, 2, 2, 8, 22);
-    });
+     });
 
-    it('gets the block helper information correct', function() {
+     it('gets the block helper information correct', function() {
-      var blockHelperNode = body[5];
+       var blockHelperNode = body[5];
-      testColumns(blockHelperNode, 3, 7, 8, 23);
+       testColumns(blockHelperNode, 3, 7, 8, 23);
-    });
+     });
 
-    it('correctly records the line numbers the program of a block helper', function() {
+     it('correctly records the line numbers the program of a block helper', function() {
-      var blockHelperNode = body[5],
+       var blockHelperNode = body[5],
-        program = blockHelperNode.program;
+           program = blockHelperNode.program;
 
-      testColumns(program, 3, 5, 31, 5);
+       testColumns(program, 3, 5, 31, 5);
-    });
+     });
 
-    it('correctly records the line numbers of an inverse of a block helper', function() {
+     it('correctly records the line numbers of an inverse of a block helper', function() {
-      var blockHelperNode = body[5],
+       var blockHelperNode = body[5],
-        inverse = blockHelperNode.inverse;
+           inverse = blockHelperNode.inverse;
 
-      testColumns(inverse, 5, 7, 13, 0);
+       testColumns(inverse, 5, 7, 13, 0);
-    });
+     });
 
-    it('correctly records the line number of chained inverses', function() {
+     it('correctly records the line number of chained inverses', function() {
-      var chainInverseNode = body[7];
+       var chainInverseNode = body[7];
 
-      testColumns(chainInverseNode.program, 8, 9, 9, 0);
+       testColumns(chainInverseNode.program, 8, 9, 9, 0);
-      testColumns(chainInverseNode.inverse, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse, 9, 10, 16, 0);
-      testColumns(chainInverseNode.inverse.body[0].program, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse.body[0].program, 9, 10, 16, 0);
-      testColumns(chainInverseNode.inverse.body[0].inverse, 10, 11, 8, 0);
+       testColumns(chainInverseNode.inverse.body[0].inverse, 10, 11, 8, 0);
-    });
+     });
   });
 
   describe('whitespace control', function() {
@@ -208,9 +149,7 @@ describe('ast', function() {
       });
 
       it('block statements', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing(' {{# comment~}} \nfoo\n {{~/comment}}');
-          ' {{# comment~}} \nfoo\n {{~/comment}}'
-        );
 
         equals(ast.body[0].value, ' ');
         equals(ast.body[1].program.body[0].value, ' \nfoo\n ');
@@ -228,9 +167,7 @@ describe('ast', function() {
     });
     describe('blocks - parseWithoutProcessing', function() {
       it('block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            ' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
-          ),
           block = ast.body[1];
 
         equals(ast.body[0].value, ' ');
@@ -241,17 +178,13 @@ describe('ast', function() {
         equals(ast.body[2].value, ' ');
       });
       it('initial block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing('{{# comment}} \nfoo\n {{/comment}}'),
-            '{{# comment}} \nfoo\n {{/comment}}'
-          ),
           block = ast.body[0];
 
         equals(block.program.body[0].value, ' \nfoo\n ');
       });
       it('mustaches with children', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing('{{# comment}} \n{{foo}}\n {{/comment}}'),
-            '{{# comment}} \n{{foo}}\n {{/comment}}'
-          ),
           block = ast.body[0];
 
         equals(block.program.body[0].value, ' \n');
@@ -259,9 +192,7 @@ describe('ast', function() {
         equals(block.program.body[2].value, '\n ');
       });
       it('nested block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-            '{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'
-          ),
           body = ast.body[0].program.body,
           block = body[1];
 
@@ -271,10 +202,8 @@ describe('ast', function() {
         equals(block.inverse.body[0].value, ' \n  bar \n  ');
       });
       it('column 0 block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
+        var ast = Handlebars.parseWithoutProcessing('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            'test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
+            block = ast.body[1];
-          ),
-          block = ast.body[1];
 
         equals(ast.body[0].omit, undefined);
 
@@ -286,10 +215,8 @@ describe('ast', function() {
     });
     describe('blocks', function() {
       it('marks block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            ' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
+            block = ast.body[1];
-          ),
-          block = ast.body[1];
 
         equals(ast.body[0].value, '');
 
@@ -300,24 +227,22 @@ describe('ast', function() {
       });
       it('marks initial block mustaches as standalone', function() {
         var ast = Handlebars.parse('{{# comment}} \nfoo\n {{/comment}}'),
-          block = ast.body[0];
+            block = ast.body[0];
 
         equals(block.program.body[0].value, 'foo\n');
       });
       it('marks mustaches with children as standalone', function() {
         var ast = Handlebars.parse('{{# comment}} \n{{foo}}\n {{/comment}}'),
-          block = ast.body[0];
+            block = ast.body[0];
 
         equals(block.program.body[0].value, '');
         equals(block.program.body[1].path.original, 'foo');
         equals(block.program.body[2].value, '\n');
       });
       it('marks nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-            '{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[1];
-          body = ast.body[0].program.body,
-          block = body[1];
 
         equals(body[0].value, '');
 
@@ -327,11 +252,9 @@ describe('ast', function() {
         equals(body[0].value, '');
       });
       it('does not mark nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'),
-            '{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[1];
-          body = ast.body[0].program.body,
-          block = body[1];
 
         equals(body[0].omit, undefined);
 
@@ -341,11 +264,9 @@ describe('ast', function() {
         equals(body[0].omit, undefined);
       });
       it('does not mark nested initial block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'),
-            '{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[0];
-          body = ast.body[0].program.body,
-          block = body[0];
 
         equals(block.program.body[0].value, ' \nfoo\n');
         equals(block.inverse.body[0].value, '  bar \n  ');
@@ -354,10 +275,8 @@ describe('ast', function() {
       });
 
       it('marks column 0 block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            'test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
+            block = ast.body[1];
-          ),
-          block = ast.body[1];
 
         equals(ast.body[0].omit, undefined);
 
@@ -429,3 +348,4 @@ describe('ast', function() {
     });
   });
 });
+

spec/basic.js

@@ -6,591 +6,300 @@ beforeEach(function() {
 
 describe('basic context', function() {
   it('most basic', function() {
-    expectTemplate('{{foo}}')
+    shouldCompileTo('{{foo}}', { foo: 'foo' }, 'foo');
-      .withInput({ foo: 'foo' })
-      .toCompileTo('foo');
   });
 
   it('escaping', function() {
-    expectTemplate('\\{{foo}}')
+    shouldCompileTo('\\{{foo}}', { foo: 'food' }, '{{foo}}');
-      .withInput({ foo: 'food' })
+    shouldCompileTo('content \\{{foo}}', { foo: 'food' }, 'content {{foo}}');
-      .toCompileTo('{{foo}}');
+    shouldCompileTo('\\\\{{foo}}', { foo: 'food' }, '\\food');
-
+    shouldCompileTo('content \\\\{{foo}}', { foo: 'food' }, 'content \\food');
-    expectTemplate('content \\{{foo}}')
+    shouldCompileTo('\\\\ {{foo}}', { foo: 'food' }, '\\\\ food');
-      .withInput({ foo: 'food' })
-      .toCompileTo('content {{foo}}');
-
-    expectTemplate('\\\\{{foo}}')
-      .withInput({ foo: 'food' })
-      .toCompileTo('\\food');
-
-    expectTemplate('content \\\\{{foo}}')
-      .withInput({ foo: 'food' })
-      .toCompileTo('content \\food');
-
-    expectTemplate('\\\\ {{foo}}')
-      .withInput({ foo: 'food' })
-      .toCompileTo('\\\\ food');
   });
 
   it('compiling with a basic context', function() {
-    expectTemplate('Goodbye\n{{cruel}}\n{{world}}!')
+    shouldCompileTo('Goodbye\n{{cruel}}\n{{world}}!', {cruel: 'cruel', world: 'world'}, 'Goodbye\ncruel\nworld!',
-      .withInput({
+                    'It works if all the required keys are provided');
-        cruel: 'cruel',
-        world: 'world'
-      })
-      .withMessage('It works if all the required keys are provided')
-      .toCompileTo('Goodbye\ncruel\nworld!');
   });
 
   it('compiling with a string context', function() {
-    expectTemplate('{{.}}{{length}}')
+    shouldCompileTo('{{.}}{{length}}', 'bye', 'bye3');
-      .withInput('bye')
-      .toCompileTo('bye3');
   });
 
   it('compiling with an undefined context', function() {
-    expectTemplate('Goodbye\n{{cruel}}\n{{world.bar}}!')
+    shouldCompileTo('Goodbye\n{{cruel}}\n{{world.bar}}!', undefined, 'Goodbye\n\n!');
-      .withInput(undefined)
-      .toCompileTo('Goodbye\n\n!');
 
-    expectTemplate('{{#unless foo}}Goodbye{{../test}}{{test2}}{{/unless}}')
+    shouldCompileTo('{{#unless foo}}Goodbye{{../test}}{{test2}}{{/unless}}', undefined, 'Goodbye');
-      .withInput(undefined)
-      .toCompileTo('Goodbye');
   });
 
   it('comments', function() {
-    expectTemplate('{{! Goodbye}}Goodbye\n{{cruel}}\n{{world}}!')
+    shouldCompileTo('{{! Goodbye}}Goodbye\n{{cruel}}\n{{world}}!',
-      .withInput({
+      {cruel: 'cruel', world: 'world'}, 'Goodbye\ncruel\nworld!',
-        cruel: 'cruel',
+      'comments are ignored');
-        world: 'world'
-      })
-      .withMessage('comments are ignored')
-      .toCompileTo('Goodbye\ncruel\nworld!');
 
-    expectTemplate('    {{~! comment ~}}      blah').toCompileTo('blah');
+    shouldCompileTo('    {{~! comment ~}}      blah', {}, 'blah');
-
+    shouldCompileTo('    {{~!-- long-comment --~}}      blah', {}, 'blah');
-    expectTemplate('    {{~!-- long-comment --~}}      blah').toCompileTo(
+    shouldCompileTo('    {{! comment ~}}      blah', {}, '    blah');
-      'blah'
+    shouldCompileTo('    {{!-- long-comment --~}}      blah', {}, '    blah');
-    );
+    shouldCompileTo('    {{~! comment}}      blah', {}, '      blah');
-
+    shouldCompileTo('    {{~!-- long-comment --}}      blah', {}, '      blah');
-    expectTemplate('    {{! comment ~}}      blah').toCompileTo('    blah');
-
-    expectTemplate('    {{!-- long-comment --~}}      blah').toCompileTo(
-      '    blah'
-    );
-
-    expectTemplate('    {{~! comment}}      blah').toCompileTo('      blah');
-
-    expectTemplate('    {{~!-- long-comment --}}      blah').toCompileTo(
-      '      blah'
-    );
   });
 
   it('boolean', function() {
     var string = '{{#goodbye}}GOODBYE {{/goodbye}}cruel {{world}}!';
-    expectTemplate(string)
+    shouldCompileTo(string, {goodbye: true, world: 'world'}, 'GOODBYE cruel world!',
-      .withInput({
+                    'booleans show the contents when true');
-        goodbye: true,
-        world: 'world'
-      })
-      .withMessage('booleans show the contents when true')
-      .toCompileTo('GOODBYE cruel world!');
 
-    expectTemplate(string)
+    shouldCompileTo(string, {goodbye: false, world: 'world'}, 'cruel world!',
-      .withInput({
+                    'booleans do not show the contents when false');
-        goodbye: false,
-        world: 'world'
-      })
-      .withMessage('booleans do not show the contents when false')
-      .toCompileTo('cruel world!');
   });
 
   it('zeros', function() {
-    expectTemplate('num1: {{num1}}, num2: {{num2}}')
+    shouldCompileTo('num1: {{num1}}, num2: {{num2}}', {num1: 42, num2: 0},
-      .withInput({
+        'num1: 42, num2: 0');
-        num1: 42,
+    shouldCompileTo('num: {{.}}', 0, 'num: 0');
-        num2: 0
+    shouldCompileTo('num: {{num1/num2}}', {num1: {num2: 0}}, 'num: 0');
-      })
-      .toCompileTo('num1: 42, num2: 0');
-
-    expectTemplate('num: {{.}}')
-      .withInput(0)
-      .toCompileTo('num: 0');
-
-    expectTemplate('num: {{num1/num2}}')
-      .withInput({ num1: { num2: 0 } })
-      .toCompileTo('num: 0');
   });
-
   it('false', function() {
     /* eslint-disable no-new-wrappers */
-    expectTemplate('val1: {{val1}}, val2: {{val2}}')
+    shouldCompileTo('val1: {{val1}}, val2: {{val2}}', {val1: false, val2: new Boolean(false)}, 'val1: false, val2: false');
-      .withInput({
+    shouldCompileTo('val: {{.}}', false, 'val: false');
-        val1: false,
+    shouldCompileTo('val: {{val1/val2}}', {val1: {val2: false}}, 'val: false');
-        val2: new Boolean(false)
-      })
-      .toCompileTo('val1: false, val2: false');
 
-    expectTemplate('val: {{.}}')
+    shouldCompileTo('val1: {{{val1}}}, val2: {{{val2}}}', {val1: false, val2: new Boolean(false)}, 'val1: false, val2: false');
-      .withInput(false)
+    shouldCompileTo('val: {{{val1/val2}}}', {val1: {val2: false}}, 'val: false');
-      .toCompileTo('val: false');
-
-    expectTemplate('val: {{val1/val2}}')
-      .withInput({ val1: { val2: false } })
-      .toCompileTo('val: false');
-
-    expectTemplate('val1: {{{val1}}}, val2: {{{val2}}}')
-      .withInput({
-        val1: false,
-        val2: new Boolean(false)
-      })
-      .toCompileTo('val1: false, val2: false');
-
-    expectTemplate('val: {{{val1/val2}}}')
-      .withInput({ val1: { val2: false } })
-      .toCompileTo('val: false');
     /* eslint-enable */
   });
 
   it('should handle undefined and null', function() {
-    expectTemplate('{{awesome undefined null}}')
+    shouldCompileTo('{{awesome undefined null}}',
-      .withInput({
+        {
-        awesome: function(_undefined, _null, options) {
+          awesome: function(_undefined, _null, options) {
-          return (
+            return (_undefined === undefined) + ' ' + (_null === null) + ' ' + (typeof options);
-            (_undefined === undefined) +
+          }
-            ' ' +
+        },
-            (_null === null) +
+        'true true object');
-            ' ' +
+    shouldCompileTo('{{undefined}}',
-            typeof options
+        {
-          );
+          'undefined': function() {
-        }
+            return 'undefined!';
-      })
+          }
-      .toCompileTo('true true object');
+        },
-
+        'undefined!');
-    expectTemplate('{{undefined}}')
+    shouldCompileTo('{{null}}',
-      .withInput({
+        {
-        undefined: function() {
+          'null': function() {
-          return 'undefined!';
+            return 'null!';
-        }
+          }
-      })
+        },
-      .toCompileTo('undefined!');
+        'null!');
-
-    expectTemplate('{{null}}')
-      .withInput({
-        null: function() {
-          return 'null!';
-        }
-      })
-      .toCompileTo('null!');
   });
 
   it('newlines', function() {
-    expectTemplate("Alan's\nTest").toCompileTo("Alan's\nTest");
+      shouldCompileTo("Alan's\nTest", {}, "Alan's\nTest");
-
+      shouldCompileTo("Alan's\rTest", {}, "Alan's\rTest");
-    expectTemplate("Alan's\rTest").toCompileTo("Alan's\rTest");
   });
 
   it('escaping text', function() {
-    expectTemplate("Awesome's")
+    shouldCompileTo("Awesome's", {}, "Awesome's", "text is escaped so that it doesn't get caught on single quotes");
-      .withMessage(
+    shouldCompileTo('Awesome\\', {}, 'Awesome\\', "text is escaped so that the closing quote can't be ignored");
-        "text is escaped so that it doesn't get caught on single quotes"
+    shouldCompileTo('Awesome\\\\ foo', {}, 'Awesome\\\\ foo', "text is escaped so that it doesn't mess up backslashes");
-      )
+    shouldCompileTo('Awesome {{foo}}', {foo: '\\'}, 'Awesome \\', "text is escaped so that it doesn't mess up backslashes");
-      .toCompileTo("Awesome's");
+    shouldCompileTo(" ' ' ", {}, " ' ' ", 'double quotes never produce invalid javascript');
-
-    expectTemplate('Awesome\\')
-      .withMessage("text is escaped so that the closing quote can't be ignored")
-      .toCompileTo('Awesome\\');
-
-    expectTemplate('Awesome\\\\ foo')
-      .withMessage("text is escaped so that it doesn't mess up backslashes")
-      .toCompileTo('Awesome\\\\ foo');
-
-    expectTemplate('Awesome {{foo}}')
-      .withInput({ foo: '\\' })
-      .withMessage("text is escaped so that it doesn't mess up backslashes")
-      .toCompileTo('Awesome \\');
-
-    expectTemplate(" ' ' ")
-      .withMessage('double quotes never produce invalid javascript')
-      .toCompileTo(" ' ' ");
   });
 
   it('escaping expressions', function() {
-    expectTemplate('{{{awesome}}}')
+   shouldCompileTo('{{{awesome}}}', {awesome: '&\'\\<>'}, '&\'\\<>',
-      .withInput({ awesome: "&'\\<>" })
+          "expressions with 3 handlebars aren't escaped");
-      .withMessage("expressions with 3 handlebars aren't escaped")
-      .toCompileTo("&'\\<>");
 
-    expectTemplate('{{&awesome}}')
+   shouldCompileTo('{{&awesome}}', {awesome: '&\'\\<>'}, '&\'\\<>',
-      .withInput({ awesome: "&'\\<>" })
+          "expressions with {{& handlebars aren't escaped");
-      .withMessage("expressions with {{& handlebars aren't escaped")
-      .toCompileTo("&'\\<>");
 
-    expectTemplate('{{awesome}}')
+   shouldCompileTo('{{awesome}}', {awesome: "&\"'`\\<>"}, '&amp;&quot;&#x27;&#x60;\\&lt;&gt;',
-      .withInput({ awesome: '&"\'`\\<>' })
+          'by default expressions should be escaped');
-      .withMessage('by default expressions should be escaped')
-      .toCompileTo('&amp;&quot;&#x27;&#x60;\\&lt;&gt;');
 
-    expectTemplate('{{awesome}}')
+   shouldCompileTo('{{awesome}}', {awesome: 'Escaped, <b> looks like: &lt;b&gt;'}, 'Escaped, &lt;b&gt; looks like: &amp;lt;b&amp;gt;',
-      .withInput({ awesome: 'Escaped, <b> looks like: &lt;b&gt;' })
+          'escaping should properly handle amperstands');
-      .withMessage('escaping should properly handle amperstands')
-      .toCompileTo('Escaped, &lt;b&gt; looks like: &amp;lt;b&amp;gt;');
   });
 
   it("functions returning safestrings shouldn't be escaped", function() {
-    expectTemplate('{{awesome}}')
+    var hash = {awesome: function() { return new Handlebars.SafeString('&\'\\<>'); }};
-      .withInput({
+    shouldCompileTo('{{awesome}}', hash, '&\'\\<>',
-        awesome: function() {
+        "functions returning safestrings aren't escaped");
-          return new Handlebars.SafeString("&'\\<>");
-        }
-      })
-      .withMessage("functions returning safestrings aren't escaped")
-      .toCompileTo("&'\\<>");
   });
 
   it('functions', function() {
-    expectTemplate('{{awesome}}')
+    shouldCompileTo('{{awesome}}', {awesome: function() { return 'Awesome'; }}, 'Awesome',
-      .withInput({
+                    'functions are called and render their output');
-        awesome: function() {
+    shouldCompileTo('{{awesome}}', {awesome: function() { return this.more; }, more: 'More awesome'}, 'More awesome',
-          return 'Awesome';
+                    'functions are bound to the context');
-        }
-      })
-      .withMessage('functions are called and render their output')
-      .toCompileTo('Awesome');
-
-    expectTemplate('{{awesome}}')
-      .withInput({
-        awesome: function() {
-          return this.more;
-        },
-        more: 'More awesome'
-      })
-      .withMessage('functions are bound to the context')
-      .toCompileTo('More awesome');
   });
 
   it('functions with context argument', function() {
-    expectTemplate('{{awesome frank}}')
+    shouldCompileTo('{{awesome frank}}',
-      .withInput({
+        {awesome: function(context) { return context; },
-        awesome: function(context) {
+          frank: 'Frank'},
-          return context;
+        'Frank', 'functions are called with context arguments');
-        },
-        frank: 'Frank'
-      })
-      .withMessage('functions are called with context arguments')
-      .toCompileTo('Frank');
   });
-
   it('pathed functions with context argument', function() {
-    expectTemplate('{{bar.awesome frank}}')
+    shouldCompileTo('{{bar.awesome frank}}',
-      .withInput({
+        {bar: {awesome: function(context) { return context; }},
-        bar: {
+          frank: 'Frank'},
-          awesome: function(context) {
+        'Frank', 'functions are called with context arguments');
-            return context;
-          }
-        },
-        frank: 'Frank'
-      })
-      .withMessage('functions are called with context arguments')
-      .toCompileTo('Frank');
   });
-
   it('depthed functions with context argument', function() {
-    expectTemplate('{{#with frank}}{{../awesome .}}{{/with}}')
+    shouldCompileTo('{{#with frank}}{{../awesome .}}{{/with}}',
-      .withInput({
+        {awesome: function(context) { return context; },
-        awesome: function(context) {
+          frank: 'Frank'},
-          return context;
+        'Frank', 'functions are called with context arguments');
-        },
-        frank: 'Frank'
-      })
-      .withMessage('functions are called with context arguments')
-      .toCompileTo('Frank');
   });
 
   it('block functions with context argument', function() {
-    expectTemplate('{{#awesome 1}}inner {{.}}{{/awesome}}')
+    shouldCompileTo('{{#awesome 1}}inner {{.}}{{/awesome}}',
-      .withInput({
+        {awesome: function(context, options) { return options.fn(context); }},
-        awesome: function(context, options) {
+        'inner 1', 'block functions are called with context and options');
-          return options.fn(context);
-        }
-      })
-      .withMessage('block functions are called with context and options')
-      .toCompileTo('inner 1');
   });
 
   it('depthed block functions with context argument', function() {
-    expectTemplate(
+    shouldCompileTo('{{#with value}}{{#../awesome 1}}inner {{.}}{{/../awesome}}{{/with}}',
-      '{{#with value}}{{#../awesome 1}}inner {{.}}{{/../awesome}}{{/with}}'
+        {value: true, awesome: function(context, options) { return options.fn(context); }},
-    )
+        'inner 1', 'block functions are called with context and options');
-      .withInput({
-        value: true,
-        awesome: function(context, options) {
-          return options.fn(context);
-        }
-      })
-      .withMessage('block functions are called with context and options')
-      .toCompileTo('inner 1');
   });
 
   it('block functions without context argument', function() {
-    expectTemplate('{{#awesome}}inner{{/awesome}}')
+    shouldCompileTo('{{#awesome}}inner{{/awesome}}',
-      .withInput({
+        {awesome: function(options) { return options.fn(this); }},
-        awesome: function(options) {
+        'inner', 'block functions are called with options');
-          return options.fn(this);
-        }
-      })
-      .withMessage('block functions are called with options')
-      .toCompileTo('inner');
   });
-
   it('pathed block functions without context argument', function() {
-    expectTemplate('{{#foo.awesome}}inner{{/foo.awesome}}')
+    shouldCompileTo('{{#foo.awesome}}inner{{/foo.awesome}}',
-      .withInput({
+        {foo: {awesome: function() { return this; }}},
-        foo: {
+        'inner', 'block functions are called with options');
-          awesome: function() {
+  });
-            return this;
+  it('depthed block functions without context argument', function() {
-          }
+    shouldCompileTo('{{#with value}}{{#../awesome}}inner{{/../awesome}}{{/with}}',
-        }
+        {value: true, awesome: function() { return this; }},
-      })
+        'inner', 'block functions are called with options');
-      .withMessage('block functions are called with options')
-      .toCompileTo('inner');
   });
 
-  it('depthed block functions without context argument', function() {
-    expectTemplate(
-      '{{#with value}}{{#../awesome}}inner{{/../awesome}}{{/with}}'
-    )
-      .withInput({
-        value: true,
-        awesome: function() {
-          return this;
-        }
-      })
-      .withMessage('block functions are called with options')
-      .toCompileTo('inner');
-  });
 
   it('paths with hyphens', function() {
-    expectTemplate('{{foo-bar}}')
+    shouldCompileTo('{{foo-bar}}', {'foo-bar': 'baz'}, 'baz', 'Paths can contain hyphens (-)');
-      .withInput({ 'foo-bar': 'baz' })
+    shouldCompileTo('{{foo.foo-bar}}', {foo: {'foo-bar': 'baz'}}, 'baz', 'Paths can contain hyphens (-)');
-      .withMessage('Paths can contain hyphens (-)')
+    shouldCompileTo('{{foo/foo-bar}}', {foo: {'foo-bar': 'baz'}}, 'baz', 'Paths can contain hyphens (-)');
-      .toCompileTo('baz');
-
-    expectTemplate('{{foo.foo-bar}}')
-      .withInput({ foo: { 'foo-bar': 'baz' } })
-      .withMessage('Paths can contain hyphens (-)')
-      .toCompileTo('baz');
-
-    expectTemplate('{{foo/foo-bar}}')
-      .withInput({ foo: { 'foo-bar': 'baz' } })
-      .withMessage('Paths can contain hyphens (-)')
-      .toCompileTo('baz');
   });
 
   it('nested paths', function() {
-    expectTemplate('Goodbye {{alan/expression}} world!')
+    shouldCompileTo('Goodbye {{alan/expression}} world!', {alan: {expression: 'beautiful'}},
-      .withInput({ alan: { expression: 'beautiful' } })
+                    'Goodbye beautiful world!', 'Nested paths access nested objects');
-      .withMessage('Nested paths access nested objects')
-      .toCompileTo('Goodbye beautiful world!');
   });
 
   it('nested paths with empty string value', function() {
-    expectTemplate('Goodbye {{alan/expression}} world!')
+    shouldCompileTo('Goodbye {{alan/expression}} world!', {alan: {expression: ''}},
-      .withInput({ alan: { expression: '' } })
+                    'Goodbye  world!', 'Nested paths access nested objects with empty string');
-      .withMessage('Nested paths access nested objects with empty string')
-      .toCompileTo('Goodbye  world!');
   });
 
   it('literal paths', function() {
-    expectTemplate('Goodbye {{[@alan]/expression}} world!')
+    shouldCompileTo('Goodbye {{[@alan]/expression}} world!', {'@alan': {expression: 'beautiful'}},
-      .withInput({ '@alan': { expression: 'beautiful' } })
+        'Goodbye beautiful world!', 'Literal paths can be used');
-      .withMessage('Literal paths can be used')
+    shouldCompileTo('Goodbye {{[foo bar]/expression}} world!', {'foo bar': {expression: 'beautiful'}},
-      .toCompileTo('Goodbye beautiful world!');
+        'Goodbye beautiful world!', 'Literal paths can be used');
-
-    expectTemplate('Goodbye {{[foo bar]/expression}} world!')
-      .withInput({ 'foo bar': { expression: 'beautiful' } })
-      .withMessage('Literal paths can be used')
-      .toCompileTo('Goodbye beautiful world!');
   });
 
   it('literal references', function() {
-    expectTemplate('Goodbye {{[foo bar]}} world!')
+    shouldCompileTo('Goodbye {{[foo bar]}} world!', {'foo bar': 'beautiful'}, 'Goodbye beautiful world!');
-      .withInput({ 'foo bar': 'beautiful' })
+    shouldCompileTo('Goodbye {{"foo bar"}} world!', {'foo bar': 'beautiful'}, 'Goodbye beautiful world!');
-      .toCompileTo('Goodbye beautiful world!');
+    shouldCompileTo("Goodbye {{'foo bar'}} world!", {'foo bar': 'beautiful'}, 'Goodbye beautiful world!');
-
+    shouldCompileTo('Goodbye {{"foo[bar"}} world!', {'foo[bar': 'beautiful'}, 'Goodbye beautiful world!');
-    expectTemplate('Goodbye {{"foo bar"}} world!')
+    shouldCompileTo('Goodbye {{"foo\'bar"}} world!', {"foo'bar": 'beautiful'}, 'Goodbye beautiful world!');
-      .withInput({ 'foo bar': 'beautiful' })
+    shouldCompileTo("Goodbye {{'foo\"bar'}} world!", {'foo"bar': 'beautiful'}, 'Goodbye beautiful world!');
-      .toCompileTo('Goodbye beautiful world!');
-
-    expectTemplate("Goodbye {{'foo bar'}} world!")
-      .withInput({ 'foo bar': 'beautiful' })
-      .toCompileTo('Goodbye beautiful world!');
-
-    expectTemplate('Goodbye {{"foo[bar"}} world!')
-      .withInput({ 'foo[bar': 'beautiful' })
-      .toCompileTo('Goodbye beautiful world!');
-
-    expectTemplate('Goodbye {{"foo\'bar"}} world!')
-      .withInput({ "foo'bar": 'beautiful' })
-      .toCompileTo('Goodbye beautiful world!');
-
-    expectTemplate("Goodbye {{'foo\"bar'}} world!")
-      .withInput({ 'foo"bar': 'beautiful' })
-      .toCompileTo('Goodbye beautiful world!');
   });
 
   it("that current context path ({{.}}) doesn't hit helpers", function() {
-    expectTemplate('test: {{.}}')
+    shouldCompileTo('test: {{.}}', [null, {helper: 'awesome'}], 'test: ');
-      .withInput(null)
-      .withHelpers({ helper: 'awesome' })
-      .toCompileTo('test: ');
   });
 
   it('complex but empty paths', function() {
-    expectTemplate('{{person/name}}')
+    shouldCompileTo('{{person/name}}', {person: {name: null}}, '');
-      .withInput({ person: { name: null } })
+    shouldCompileTo('{{person/name}}', {person: {}}, '');
-      .toCompileTo('');
-
-    expectTemplate('{{person/name}}')
-      .withInput({ person: {} })
-      .toCompileTo('');
   });
 
   it('this keyword in paths', function() {
-    expectTemplate('{{#goodbyes}}{{this}}{{/goodbyes}}')
+    var string = '{{#goodbyes}}{{this}}{{/goodbyes}}';
-      .withInput({ goodbyes: ['goodbye', 'Goodbye', 'GOODBYE'] })
+    var hash = {goodbyes: ['goodbye', 'Goodbye', 'GOODBYE']};
-      .withMessage('This keyword in paths evaluates to current context')
+    shouldCompileTo(string, hash, 'goodbyeGoodbyeGOODBYE',
-      .toCompileTo('goodbyeGoodbyeGOODBYE');
+      'This keyword in paths evaluates to current context');
 
-    expectTemplate('{{#hellos}}{{this/text}}{{/hellos}}')
+    string = '{{#hellos}}{{this/text}}{{/hellos}}';
-      .withInput({
+    hash = {hellos: [{text: 'hello'}, {text: 'Hello'}, {text: 'HELLO'}]};
-        hellos: [{ text: 'hello' }, { text: 'Hello' }, { text: 'HELLO' }]
+    shouldCompileTo(string, hash, 'helloHelloHELLO', 'This keyword evaluates in more complex paths');
-      })
-      .withMessage('This keyword evaluates in more complex paths')
-      .toCompileTo('helloHelloHELLO');
   });
 
   it('this keyword nested inside path', function() {
-    expectTemplate('{{#hellos}}{{text/this/foo}}{{/hellos}}').toThrow(
+    shouldThrow(function() {
-      Error,
+      CompilerContext.compile('{{#hellos}}{{text/this/foo}}{{/hellos}}');
-      'Invalid path: text/this - 1:13'
+    }, Error, 'Invalid path: text/this - 1:13');
-    );
 
-    expectTemplate('{{[this]}}')
+    shouldCompileTo('{{[this]}}', {'this': 'bar'}, 'bar');
-      .withInput({ this: 'bar' })
+    shouldCompileTo('{{text/[this]}}', {text: {'this': 'bar'}}, 'bar');
-      .toCompileTo('bar');
-
-    expectTemplate('{{text/[this]}}')
-      .withInput({ text: { this: 'bar' } })
-      .toCompileTo('bar');
   });
 
   it('this keyword in helpers', function() {
-    var helpers = {
+    var helpers = {foo: function(value) {
-      foo: function(value) {
         return 'bar ' + value;
-      }
+    }};
-    };
+    var string = '{{#goodbyes}}{{foo this}}{{/goodbyes}}';
+    var hash = {goodbyes: ['goodbye', 'Goodbye', 'GOODBYE']};
+    shouldCompileTo(string, [hash, helpers], 'bar goodbyebar Goodbyebar GOODBYE',
+      'This keyword in paths evaluates to current context');
 
-    expectTemplate('{{#goodbyes}}{{foo this}}{{/goodbyes}}')
+    string = '{{#hellos}}{{foo this/text}}{{/hellos}}';
-      .withInput({ goodbyes: ['goodbye', 'Goodbye', 'GOODBYE'] })
+    hash = {hellos: [{text: 'hello'}, {text: 'Hello'}, {text: 'HELLO'}]};
-      .withHelpers(helpers)
+    shouldCompileTo(string, [hash, helpers], 'bar hellobar Hellobar HELLO', 'This keyword evaluates in more complex paths');
-      .withMessage('This keyword in paths evaluates to current context')
-      .toCompileTo('bar goodbyebar Goodbyebar GOODBYE');
-
-    expectTemplate('{{#hellos}}{{foo this/text}}{{/hellos}}')
-      .withInput({
-        hellos: [{ text: 'hello' }, { text: 'Hello' }, { text: 'HELLO' }]
-      })
-      .withHelpers(helpers)
-      .withMessage('This keyword evaluates in more complex paths')
-      .toCompileTo('bar hellobar Hellobar HELLO');
   });
 
   it('this keyword nested inside helpers param', function() {
-    expectTemplate('{{#hellos}}{{foo text/this/foo}}{{/hellos}}').toThrow(
+    var string = '{{#hellos}}{{foo text/this/foo}}{{/hellos}}';
-      Error,
+    shouldThrow(function() {
-      'Invalid path: text/this - 1:17'
+      CompilerContext.compile(string);
-    );
+    }, Error, 'Invalid path: text/this - 1:17');
 
-    expectTemplate('{{foo [this]}}')
+    shouldCompileTo(
-      .withInput({
+        '{{foo [this]}}',
-        foo: function(value) {
+        {foo: function(value) { return value; }, 'this': 'bar'},
-          return value;
+        'bar');
-        },
+    shouldCompileTo(
-        this: 'bar'
+        '{{foo text/[this]}}',
-      })
+        {foo: function(value) { return value; }, text: {'this': 'bar'}},
-      .toCompileTo('bar');
+        'bar');
-
-    expectTemplate('{{foo text/[this]}}')
-      .withInput({
-        foo: function(value) {
-          return value;
-        },
-        text: { this: 'bar' }
-      })
-      .toCompileTo('bar');
   });
 
   it('pass string literals', function() {
-    expectTemplate('{{"foo"}}').toCompileTo('');
+    shouldCompileTo('{{"foo"}}', {}, '');
-
+    shouldCompileTo('{{"foo"}}', { foo: 'bar' }, 'bar');
-    expectTemplate('{{"foo"}}')
+    shouldCompileTo('{{#"foo"}}{{.}}{{/"foo"}}', { foo: ['bar', 'baz'] }, 'barbaz');
-      .withInput({ foo: 'bar' })
-      .toCompileTo('bar');
-
-    expectTemplate('{{#"foo"}}{{.}}{{/"foo"}}')
-      .withInput({
-        foo: ['bar', 'baz']
-      })
-      .toCompileTo('barbaz');
   });
 
   it('pass number literals', function() {
-    expectTemplate('{{12}}').toCompileTo('');
+    shouldCompileTo('{{12}}', {}, '');
-
+    shouldCompileTo('{{12}}', { '12': 'bar' }, 'bar');
-    expectTemplate('{{12}}')
+    shouldCompileTo('{{12.34}}', {}, '');
-      .withInput({ '12': 'bar' })
+    shouldCompileTo('{{12.34}}', { '12.34': 'bar' }, 'bar');
-      .toCompileTo('bar');
+    shouldCompileTo('{{12.34 1}}', { '12.34': function(arg) { return 'bar' + arg; } }, 'bar1');
-
-    expectTemplate('{{12.34}}').toCompileTo('');
-
-    expectTemplate('{{12.34}}')
-      .withInput({ '12.34': 'bar' })
-      .toCompileTo('bar');
-
-    expectTemplate('{{12.34 1}}')
-      .withInput({
-        '12.34': function(arg) {
-          return 'bar' + arg;
-        }
-      })
-      .toCompileTo('bar1');
   });
 
   it('pass boolean literals', function() {
-    expectTemplate('{{true}}').toCompileTo('');
+    shouldCompileTo('{{true}}', {}, '');
-
+    shouldCompileTo('{{true}}', { '': 'foo' }, '');
-    expectTemplate('{{true}}')
+    shouldCompileTo('{{false}}', { 'false': 'foo' }, 'foo');
-      .withInput({ '': 'foo' })
-      .toCompileTo('');
-
-    expectTemplate('{{false}}')
-      .withInput({ false: 'foo' })
-      .toCompileTo('foo');
   });
 
   it('should handle literals in subexpression', function() {
-    expectTemplate('{{foo (false)}}')
+    var helpers = {
-      .withInput({
+      foo: function(arg) {
-        false: function() {
-          return 'bar';
-        }
-      })
-      .withHelper('foo', function(arg) {
         return arg;
-      })
+      }
-      .toCompileTo('bar');
+    };
+    shouldCompileTo('{{foo (false)}}', [{ 'false': function() { return 'bar'; } }, helpers], 'bar');
   });
 });

spec/blocks.js

@@ -1,405 +1,308 @@
 describe('blocks', function() {
   it('array', function() {
     var string = '{{#goodbyes}}{{text}}! {{/goodbyes}}cruel {{world}}!';
+    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
+    shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
+                    'Arrays iterate over the contents when not empty');
 
-    expectTemplate(string)
+    shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-      .withInput({
+                    'Arrays ignore the contents when empty');
-        goodbyes: [
-          { text: 'goodbye' },
-          { text: 'Goodbye' },
-          { text: 'GOODBYE' }
-        ],
-        world: 'world'
-      })
-      .withMessage('Arrays iterate over the contents when not empty')
-      .toCompileTo('goodbye! Goodbye! GOODBYE! cruel world!');
-
-    expectTemplate(string)
-      .withInput({
-        goodbyes: [],
-        world: 'world'
-      })
-      .withMessage('Arrays ignore the contents when empty')
-      .toCompileTo('cruel world!');
   });
 
   it('array without data', function() {
-    expectTemplate(
+    var string = '{{#goodbyes}}{{text}}{{/goodbyes}} {{#goodbyes}}{{text}}{{/goodbyes}}';
-      '{{#goodbyes}}{{text}}{{/goodbyes}} {{#goodbyes}}{{text}}{{/goodbyes}}'
+    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-    )
+    shouldCompileTo(string, [hash,,, false], 'goodbyeGoodbyeGOODBYE goodbyeGoodbyeGOODBYE');
-      .withInput({
-        goodbyes: [
-          { text: 'goodbye' },
-          { text: 'Goodbye' },
-          { text: 'GOODBYE' }
-        ],
-        world: 'world'
-      })
-      .withCompileOptions({ compat: false })
-      .toCompileTo('goodbyeGoodbyeGOODBYE goodbyeGoodbyeGOODBYE');
   });
 
   it('array with @index', function() {
-    expectTemplate(
+    var string = '{{#goodbyes}}{{@index}}. {{text}}! {{/goodbyes}}cruel {{world}}!';
-      '{{#goodbyes}}{{@index}}. {{text}}! {{/goodbyes}}cruel {{world}}!'
+    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-    )
+
-      .withInput({
+    var template = CompilerContext.compile(string);
-        goodbyes: [
+    var result = template(hash);
-          { text: 'goodbye' },
+
-          { text: 'Goodbye' },
+    equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-          { text: 'GOODBYE' }
-        ],
-        world: 'world'
-      })
-      .withMessage('The @index variable is used')
-      .toCompileTo('0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!');
   });
 
   it('empty block', function() {
     var string = '{{#goodbyes}}{{/goodbyes}}cruel {{world}}!';
+    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
+    shouldCompileTo(string, hash, 'cruel world!',
+                    'Arrays iterate over the contents when not empty');
 
-    expectTemplate(string)
+    shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-      .withInput({
+                    'Arrays ignore the contents when empty');
-        goodbyes: [
-          { text: 'goodbye' },
-          { text: 'Goodbye' },
-          { text: 'GOODBYE' }
-        ],
-        world: 'world'
-      })
-      .withMessage('Arrays iterate over the contents when not empty')
-      .toCompileTo('cruel world!');
-
-    expectTemplate(string)
-      .withInput({
-        goodbyes: [],
-        world: 'world'
-      })
-      .withMessage('Arrays ignore the contents when empty')
-      .toCompileTo('cruel world!');
   });
 
   it('block with complex lookup', function() {
-    expectTemplate('{{#goodbyes}}{{text}} cruel {{../name}}! {{/goodbyes}}')
+    var string = '{{#goodbyes}}{{text}} cruel {{../name}}! {{/goodbyes}}';
-      .withInput({
+    var hash = {name: 'Alan', goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]};
-        name: 'Alan',
+
-        goodbyes: [
+    shouldCompileTo(string, hash, 'goodbye cruel Alan! Goodbye cruel Alan! GOODBYE cruel Alan! ',
-          { text: 'goodbye' },
+                    'Templates can access variables in contexts up the stack with relative path syntax');
-          { text: 'Goodbye' },
-          { text: 'GOODBYE' }
-        ]
-      })
-      .withMessage(
-        'Templates can access variables in contexts up the stack with relative path syntax'
-      )
-      .toCompileTo(
-        'goodbye cruel Alan! Goodbye cruel Alan! GOODBYE cruel Alan! '
-      );
   });
 
   it('multiple blocks with complex lookup', function() {
-    expectTemplate('{{#goodbyes}}{{../name}}{{../name}}{{/goodbyes}}')
+    var string = '{{#goodbyes}}{{../name}}{{../name}}{{/goodbyes}}';
-      .withInput({
+    var hash = {name: 'Alan', goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]};
-        name: 'Alan',
+
-        goodbyes: [
+    shouldCompileTo(string, hash, 'AlanAlanAlanAlanAlanAlan');
-          { text: 'goodbye' },
-          { text: 'Goodbye' },
-          { text: 'GOODBYE' }
-        ]
-      })
-      .toCompileTo('AlanAlanAlanAlanAlanAlan');
   });
 
   it('block with complex lookup using nested context', function() {
-    expectTemplate(
+    var string = '{{#goodbyes}}{{text}} cruel {{foo/../name}}! {{/goodbyes}}';
-      '{{#goodbyes}}{{text}} cruel {{foo/../name}}! {{/goodbyes}}'
+
-    ).toThrow(Error);
+    shouldThrow(function() {
+      CompilerContext.compile(string);
+    }, Error);
   });
 
   it('block with deep nested complex lookup', function() {
-    expectTemplate(
+    var string = '{{#outer}}Goodbye {{#inner}}cruel {{../sibling}} {{../../omg}}{{/inner}}{{/outer}}';
-      '{{#outer}}Goodbye {{#inner}}cruel {{../sibling}} {{../../omg}}{{/inner}}{{/outer}}'
+    var hash = {omg: 'OMG!', outer: [{ sibling: 'sad', inner: [{ text: 'goodbye' }] }] };
-    )
+
-      .withInput({
+    shouldCompileTo(string, hash, 'Goodbye cruel sad OMG!');
-        omg: 'OMG!',
-        outer: [{ sibling: 'sad', inner: [{ text: 'goodbye' }] }]
-      })
-      .toCompileTo('Goodbye cruel sad OMG!');
   });
 
   it('works with cached blocks', function() {
-    expectTemplate(
+    var template = CompilerContext.compile('{{#each person}}{{#with .}}{{first}} {{last}}{{/with}}{{/each}}', {data: false});
-      '{{#each person}}{{#with .}}{{first}} {{last}}{{/with}}{{/each}}'
+
-    )
+    var result = template({person: [{first: 'Alan', last: 'Johnson'}, {first: 'Alan', last: 'Johnson'}]});
-      .withCompileOptions({ data: false })
+    equals(result, 'Alan JohnsonAlan Johnson');
-      .withInput({
-        person: [
-          { first: 'Alan', last: 'Johnson' },
-          { first: 'Alan', last: 'Johnson' }
-        ]
-      })
-      .toCompileTo('Alan JohnsonAlan Johnson');
   });
 
   describe('inverted sections', function() {
     it('inverted sections with unset value', function() {
-      expectTemplate(
+      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-        '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}'
+      var hash = {};
-      )
+      shouldCompileTo(string, hash, 'Right On!', "Inverted section rendered when value isn't set.");
-        .withMessage("Inverted section rendered when value isn't set.")
-        .toCompileTo('Right On!');
     });
 
     it('inverted section with false value', function() {
-      expectTemplate(
+      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-        '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}'
+      var hash = {goodbyes: false};
-      )
+      shouldCompileTo(string, hash, 'Right On!', 'Inverted section rendered when value is false.');
-        .withInput({ goodbyes: false })
-        .withMessage('Inverted section rendered when value is false.')
-        .toCompileTo('Right On!');
     });
 
     it('inverted section with empty set', function() {
-      expectTemplate(
+      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-        '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}'
+      var hash = {goodbyes: []};
-      )
+      shouldCompileTo(string, hash, 'Right On!', 'Inverted section rendered when value is empty set.');
-        .withInput({ goodbyes: [] })
-        .withMessage('Inverted section rendered when value is empty set.')
-        .toCompileTo('Right On!');
     });
 
     it('block inverted sections', function() {
-      expectTemplate('{{#people}}{{name}}{{^}}{{none}}{{/people}}')
+      shouldCompileTo('{{#people}}{{name}}{{^}}{{none}}{{/people}}', {none: 'No people'},
-        .withInput({ none: 'No people' })
+        'No people');
-        .toCompileTo('No people');
     });
-
     it('chained inverted sections', function() {
-      expectTemplate('{{#people}}{{name}}{{else if none}}{{none}}{{/people}}')
+      shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{/people}}', {none: 'No people'},
-        .withInput({ none: 'No people' })
+        'No people');
-        .toCompileTo('No people');
+      shouldCompileTo('{{#people}}{{name}}{{else if nothere}}fail{{else unless nothere}}{{none}}{{/people}}', {none: 'No people'},
-
+        'No people');
-      expectTemplate(
+      shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{else}}fail{{/people}}', {none: 'No people'},
-        '{{#people}}{{name}}{{else if nothere}}fail{{else unless nothere}}{{none}}{{/people}}'
+        'No people');
-      )
-        .withInput({ none: 'No people' })
-        .toCompileTo('No people');
-
-      expectTemplate(
-        '{{#people}}{{name}}{{else if none}}{{none}}{{else}}fail{{/people}}'
-      )
-        .withInput({ none: 'No people' })
-        .toCompileTo('No people');
     });
-
     it('chained inverted sections with mismatch', function() {
-      expectTemplate(
+      shouldThrow(function() {
-        '{{#people}}{{name}}{{else if none}}{{none}}{{/if}}'
+        shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{/if}}', {none: 'No people'},
-      ).toThrow(Error);
+          'No people');
+      }, Error);
     });
 
     it('block inverted sections with empty arrays', function() {
-      expectTemplate('{{#people}}{{name}}{{^}}{{none}}{{/people}}')
+      shouldCompileTo('{{#people}}{{name}}{{^}}{{none}}{{/people}}', {none: 'No people', people: []},
-        .withInput({
+        'No people');
-          none: 'No people',
-          people: []
-        })
-        .toCompileTo('No people');
     });
   });
 
   describe('standalone sections', function() {
     it('block standalone else sections', function() {
-      expectTemplate('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n')
+      shouldCompileTo('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        .withInput({ none: 'No people' })
+        'No people\n');
-        .toCompileTo('No people\n');
+      shouldCompileTo('{{#none}}\n{{.}}\n{{^}}\n{{none}}\n{{/none}}\n', {none: 'No people'},
-
+        'No people\n');
-      expectTemplate('{{#none}}\n{{.}}\n{{^}}\n{{none}}\n{{/none}}\n')
+      shouldCompileTo('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        .withInput({ none: 'No people' })
+        'No people\n');
-        .toCompileTo('No people\n');
-
-      expectTemplate('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n')
-        .withInput({ none: 'No people' })
-        .toCompileTo('No people\n');
     });
-
     it('block standalone else sections can be disabled', function() {
-      expectTemplate('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n')
+      shouldCompileTo(
-        .withInput({ none: 'No people' })
+        '{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n',
-        .withCompileOptions({ ignoreStandalone: true })
+        [{none: 'No people'}, {}, {}, {ignoreStandalone: true}],
-        .toCompileTo('\nNo people\n\n');
+        '\nNo people\n\n');
-
+      shouldCompileTo(
-      expectTemplate('{{#none}}\n{{.}}\n{{^}}\nFail\n{{/none}}\n')
+        '{{#none}}\n{{.}}\n{{^}}\nFail\n{{/none}}\n',
-        .withInput({ none: 'No people' })
+        [{none: 'No people'}, {}, {}, {ignoreStandalone: true}],
-        .withCompileOptions({ ignoreStandalone: true })
+        '\nNo people\n\n');
-        .toCompileTo('\nNo people\n\n');
     });
-
     it('block standalone chained else sections', function() {
-      expectTemplate(
+      shouldCompileTo('{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        '{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{/people}}\n'
+        'No people\n');
-      )
+      shouldCompileTo('{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{^}}\n{{/people}}\n', {none: 'No people'},
-        .withInput({ none: 'No people' })
+        'No people\n');
-        .toCompileTo('No people\n');
-
-      expectTemplate(
-        '{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{^}}\n{{/people}}\n'
-      )
-        .withInput({ none: 'No people' })
-        .toCompileTo('No people\n');
     });
-
     it('should handle nesting', function() {
-      expectTemplate('{{#data}}\n{{#if true}}\n{{.}}\n{{/if}}\n{{/data}}\nOK.')
+      shouldCompileTo('{{#data}}\n{{#if true}}\n{{.}}\n{{/if}}\n{{/data}}\nOK.', {data: [1, 3, 5]}, '1\n3\n5\nOK.');
-        .withInput({
-          data: [1, 3, 5]
-        })
-        .toCompileTo('1\n3\n5\nOK.');
     });
   });
 
   describe('compat mode', function() {
     it('block with deep recursive lookup lookup', function() {
-      expectTemplate(
+      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg}}{{/inner}}{{/outer}}';
-        '{{#outer}}Goodbye {{#inner}}cruel {{omg}}{{/inner}}{{/outer}}'
+      var hash = {omg: 'OMG!', outer: [{ inner: [{ text: 'goodbye' }] }] };
-      )
-        .withInput({ omg: 'OMG!', outer: [{ inner: [{ text: 'goodbye' }] }] })
-        .withCompileOptions({ compat: true })
-        .toCompileTo('Goodbye cruel OMG!');
-    });
 
+      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel OMG!');
+    });
     it('block with deep recursive pathed lookup', function() {
-      expectTemplate(
+      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}';
-        '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}'
+      var hash = {omg: {yes: 'OMG!'}, outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }] };
-      )
-        .withInput({
-          omg: { yes: 'OMG!' },
-          outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }]
-        })
-        .withCompileOptions({ compat: true })
-        .toCompileTo('Goodbye cruel OMG!');
-    });
 
+      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel OMG!');
+    });
     it('block with missed recursive lookup', function() {
-      expectTemplate(
+      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}';
-        '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}'
+      var hash = {omg: {no: 'OMG!'}, outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }] };
-      )
+
-        .withInput({
+      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel ');
-          omg: { no: 'OMG!' },
-          outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }]
-        })
-        .withCompileOptions({ compat: true })
-        .toCompileTo('Goodbye cruel ');
     });
   });
 
   describe('decorators', function() {
     it('should apply mustache decorators', function() {
-      expectTemplate('{{#helper}}{{*decorator}}{{/helper}}')
+      var helpers = {
-        .withHelper('helper', function(options) {
+        helper: function(options) {
           return options.fn.run;
-        })
+        }
-        .withDecorator('decorator', function(fn) {
+      };
+      var decorators = {
+        decorator: function(fn) {
           fn.run = 'success';
           return fn;
-        })
+        }
-        .toCompileTo('success');
+      };
+      shouldCompileTo(
+          '{{#helper}}{{*decorator}}{{/helper}}',
+          {hash: {}, helpers: helpers, decorators: decorators},
+          'success');
     });
-
     it('should apply allow undefined return', function() {
-      expectTemplate('{{#helper}}{{*decorator}}suc{{/helper}}')
+      var helpers = {
-        .withHelper('helper', function(options) {
+        helper: function(options) {
           return options.fn() + options.fn.run;
-        })
+        }
-        .withDecorator('decorator', function(fn) {
+      };
+      var decorators = {
+        decorator: function(fn) {
           fn.run = 'cess';
-        })
+        }
-        .toCompileTo('success');
+      };
+      shouldCompileTo(
+          '{{#helper}}{{*decorator}}suc{{/helper}}',
+          {hash: {}, helpers: helpers, decorators: decorators},
+          'success');
     });
 
     it('should apply block decorators', function() {
-      expectTemplate(
+      var helpers = {
-        '{{#helper}}{{#*decorator}}success{{/decorator}}{{/helper}}'
+        helper: function(options) {
-      )
-        .withHelper('helper', function(options) {
           return options.fn.run;
-        })
+        }
-        .withDecorator('decorator', function(fn, props, container, options) {
+      };
+      var decorators = {
+        decorator: function(fn, props, container, options) {
           fn.run = options.fn();
           return fn;
-        })
+        }
-        .toCompileTo('success');
+      };
+      shouldCompileTo(
+          '{{#helper}}{{#*decorator}}success{{/decorator}}{{/helper}}',
+          {hash: {}, helpers: helpers, decorators: decorators},
+          'success');
     });
-
     it('should support nested decorators', function() {
-      expectTemplate(
+      var helpers = {
-        '{{#helper}}{{#*decorator}}{{#*nested}}suc{{/nested}}cess{{/decorator}}{{/helper}}'
+        helper: function(options) {
-      )
-        .withHelper('helper', function(options) {
           return options.fn.run;
-        })
+        }
-        .withDecorators({
+      };
-          decorator: function(fn, props, container, options) {
+      var decorators = {
-            fn.run = options.fn.nested + options.fn();
+        decorator: function(fn, props, container, options) {
-            return fn;
+          fn.run = options.fn.nested + options.fn();
-          },
+          return fn;
-          nested: function(fn, props, container, options) {
+        },
-            props.nested = options.fn();
+        nested: function(fn, props, container, options) {
-          }
+          props.nested = options.fn();
-        })
+        }
-        .toCompileTo('success');
+      };
+      shouldCompileTo(
+          '{{#helper}}{{#*decorator}}{{#*nested}}suc{{/nested}}cess{{/decorator}}{{/helper}}',
+          {hash: {}, helpers: helpers, decorators: decorators},
+          'success');
     });
 
     it('should apply multiple decorators', function() {
-      expectTemplate(
+      var helpers = {
-        '{{#helper}}{{#*decorator}}suc{{/decorator}}{{#*decorator}}cess{{/decorator}}{{/helper}}'
+        helper: function(options) {
-      )
-        .withHelper('helper', function(options) {
           return options.fn.run;
-        })
+        }
-        .withDecorator('decorator', function(fn, props, container, options) {
+      };
+      var decorators = {
+        decorator: function(fn, props, container, options) {
           fn.run = (fn.run || '') + options.fn();
           return fn;
-        })
+        }
-        .toCompileTo('success');
+      };
+      shouldCompileTo(
+          '{{#helper}}{{#*decorator}}suc{{/decorator}}{{#*decorator}}cess{{/decorator}}{{/helper}}',
+          {hash: {}, helpers: helpers, decorators: decorators},
+          'success');
     });
 
     it('should access parent variables', function() {
-      expectTemplate('{{#helper}}{{*decorator foo}}{{/helper}}')
+      var helpers = {
-        .withHelper('helper', function(options) {
+        helper: function(options) {
           return options.fn.run;
-        })
+        }
-        .withDecorator('decorator', function(fn, props, container, options) {
+      };
+      var decorators = {
+        decorator: function(fn, props, container, options) {
           fn.run = options.args;
           return fn;
-        })
+        }
-        .withInput({ foo: 'success' })
+      };
-        .toCompileTo('success');
+      shouldCompileTo(
+          '{{#helper}}{{*decorator foo}}{{/helper}}',
+          {hash: {'foo': 'success'}, helpers: helpers, decorators: decorators},
+          'success');
     });
-
     it('should work with root program', function() {
       var run;
-      expectTemplate('{{*decorator "success"}}')
+      var decorators = {
-        .withDecorator('decorator', function(fn, props, container, options) {
+        decorator: function(fn, props, container, options) {
           equals(options.args[0], 'success');
           run = true;
           return fn;
-        })
+        }
-        .withInput({ foo: 'success' })
+      };
-        .toCompileTo('');
+      shouldCompileTo(
+          '{{*decorator "success"}}',
+          {hash: {'foo': 'success'}, decorators: decorators},
+          '');
       equals(run, true);
     });
-
     it('should fail when accessing variables from root', function() {
       var run;
-      expectTemplate('{{*decorator foo}}')
+      var decorators = {
-        .withDecorator('decorator', function(fn, props, container, options) {
+        decorator: function(fn, props, container, options) {
           equals(options.args[0], undefined);
           run = true;
           return fn;
-        })
+        }
-        .withInput({ foo: 'fail' })
+      };
-        .toCompileTo('');
+      shouldCompileTo(
+          '{{*decorator foo}}',
+          {hash: {'foo': 'fail'}, decorators: decorators},
+          '');
       equals(run, true);
     });
 
@@ -431,25 +334,13 @@ describe('blocks', function() {
         equals(handlebarsEnv.decorators.foo, undefined);
         equals(handlebarsEnv.decorators.bar, undefined);
       });
-
       it('fails with multiple and args', function() {
-        shouldThrow(
+        shouldThrow(function() {
-          function() {
+          handlebarsEnv.registerDecorator({
-            handlebarsEnv.registerDecorator(
+            world: function() { return 'world!'; },
-              {
+            testHelper: function() { return 'found it!'; }
-                world: function() {
+          }, {});
-                  return 'world!';
+        }, Error, 'Arg not supported with multiple decorators');
-                },
-                testHelper: function() {
-                  return 'found it!';
-                }
-              },
-              {}
-            );
-          },
-          Error,
-          'Arg not supported with multiple decorators'
-        );
       });
     });
   });

spec/builtins.js

@@ -2,184 +2,65 @@ describe('builtin helpers', function() {
   describe('#if', function() {
     it('if', function() {
       var string = '{{#if goodbye}}GOODBYE {{/if}}cruel {{world}}!';
-
+      shouldCompileTo(string, {goodbye: true, world: 'world'}, 'GOODBYE cruel world!',
-      expectTemplate(string)
+                      'if with boolean argument shows the contents when true');
-        .withInput({
+      shouldCompileTo(string, {goodbye: 'dummy', world: 'world'}, 'GOODBYE cruel world!',
-          goodbye: true,
+                      'if with string argument shows the contents');
-          world: 'world'
+      shouldCompileTo(string, {goodbye: false, world: 'world'}, 'cruel world!',
-        })
+                      'if with boolean argument does not show the contents when false');
-        .withMessage('if with boolean argument shows the contents when true')
+      shouldCompileTo(string, {world: 'world'}, 'cruel world!',
-        .toCompileTo('GOODBYE cruel world!');
+                      'if with undefined does not show the contents');
-
+      shouldCompileTo(string, {goodbye: ['foo'], world: 'world'}, 'GOODBYE cruel world!',
-      expectTemplate(string)
+                      'if with non-empty array shows the contents');
-        .withInput({
+      shouldCompileTo(string, {goodbye: [], world: 'world'}, 'cruel world!',
-          goodbye: 'dummy',
+                      'if with empty array does not show the contents');
-          world: 'world'
+      shouldCompileTo(string, {goodbye: 0, world: 'world'}, 'cruel world!',
-        })
+                      'if with zero does not show the contents');
-        .withMessage('if with string argument shows the contents')
+      shouldCompileTo('{{#if goodbye includeZero=true}}GOODBYE {{/if}}cruel {{world}}!',
-        .toCompileTo('GOODBYE cruel world!');
+                      {goodbye: 0, world: 'world'}, 'GOODBYE cruel world!',
-
+                      'if with zero does not show the contents');
-      expectTemplate(string)
-        .withInput({
-          goodbye: false,
-          world: 'world'
-        })
-        .withMessage(
-          'if with boolean argument does not show the contents when false'
-        )
-        .toCompileTo('cruel world!');
-
-      expectTemplate(string)
-        .withInput({ world: 'world' })
-        .withMessage('if with undefined does not show the contents')
-        .toCompileTo('cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: ['foo'],
-          world: 'world'
-        })
-        .withMessage('if with non-empty array shows the contents')
-        .toCompileTo('GOODBYE cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: [],
-          world: 'world'
-        })
-        .withMessage('if with empty array does not show the contents')
-        .toCompileTo('cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: 0,
-          world: 'world'
-        })
-        .withMessage('if with zero does not show the contents')
-        .toCompileTo('cruel world!');
-
-      expectTemplate(
-        '{{#if goodbye includeZero=true}}GOODBYE {{/if}}cruel {{world}}!'
-      )
-        .withInput({
-          goodbye: 0,
-          world: 'world'
-        })
-        .withMessage('if with zero does not show the contents')
-        .toCompileTo('GOODBYE cruel world!');
     });
 
     it('if with function argument', function() {
       var string = '{{#if goodbye}}GOODBYE {{/if}}cruel {{world}}!';
-
+      shouldCompileTo(string, {goodbye: function() {return true; }, world: 'world'}, 'GOODBYE cruel world!',
-      expectTemplate(string)
+                      'if with function shows the contents when function returns true');
-        .withInput({
+      shouldCompileTo(string, {goodbye: function() {return this.world; }, world: 'world'}, 'GOODBYE cruel world!',
-          goodbye: function() {
+                      'if with function shows the contents when function returns string');
-            return true;
+      shouldCompileTo(string, {goodbye: function() {return false; }, world: 'world'}, 'cruel world!',
-          },
+                      'if with function does not show the contents when returns false');
-          world: 'world'
+      shouldCompileTo(string, {goodbye: function() {return this.foo; }, world: 'world'}, 'cruel world!',
-        })
+                      'if with function does not show the contents when returns undefined');
-        .withMessage(
-          'if with function shows the contents when function returns true'
-        )
-        .toCompileTo('GOODBYE cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: function() {
-            return this.world;
-          },
-          world: 'world'
-        })
-        .withMessage(
-          'if with function shows the contents when function returns string'
-        )
-        .toCompileTo('GOODBYE cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: function() {
-            return false;
-          },
-          world: 'world'
-        })
-        .withMessage(
-          'if with function does not show the contents when returns false'
-        )
-        .toCompileTo('cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbye: function() {
-            return this.foo;
-          },
-          world: 'world'
-        })
-        .withMessage(
-          'if with function does not show the contents when returns undefined'
-        )
-        .toCompileTo('cruel world!');
     });
 
     it('should not change the depth list', function() {
-      expectTemplate(
+      var string = '{{#with foo}}{{#if goodbye}}GOODBYE cruel {{../world}}!{{/if}}{{/with}}';
-        '{{#with foo}}{{#if goodbye}}GOODBYE cruel {{../world}}!{{/if}}{{/with}}'
+      shouldCompileTo(string, {foo: {goodbye: true}, world: 'world'}, 'GOODBYE cruel world!');
-      )
-        .withInput({
-          foo: { goodbye: true },
-          world: 'world'
-        })
-        .toCompileTo('GOODBYE cruel world!');
     });
   });
 
   describe('#with', function() {
     it('with', function() {
-      expectTemplate('{{#with person}}{{first}} {{last}}{{/with}}')
+      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
-        .withInput({
+      shouldCompileTo(string, {person: {first: 'Alan', last: 'Johnson'}}, 'Alan Johnson');
-          person: {
-            first: 'Alan',
-            last: 'Johnson'
-          }
-        })
-        .toCompileTo('Alan Johnson');
     });
-
     it('with with function argument', function() {
-      expectTemplate('{{#with person}}{{first}} {{last}}{{/with}}')
+      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
-        .withInput({
+      shouldCompileTo(string, {person: function() { return {first: 'Alan', last: 'Johnson'}; }}, 'Alan Johnson');
-          person: function() {
-            return {
-              first: 'Alan',
-              last: 'Johnson'
-            };
-          }
-        })
-        .toCompileTo('Alan Johnson');
     });
-
     it('with with else', function() {
-      expectTemplate(
+      var string = '{{#with person}}Person is present{{else}}Person is not present{{/with}}';
-        '{{#with person}}Person is present{{else}}Person is not present{{/with}}'
+      shouldCompileTo(string, {}, 'Person is not present');
-      ).toCompileTo('Person is not present');
     });
-
     it('with provides block parameter', function() {
-      expectTemplate('{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}')
+      var string = '{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}';
-        .withInput({
+      shouldCompileTo(string, {person: {first: 'Alan', last: 'Johnson'}}, 'Alan Johnson');
-          person: {
-            first: 'Alan',
-            last: 'Johnson'
-          }
-        })
-        .toCompileTo('Alan Johnson');
     });
-
     it('works when data is disabled', function() {
-      expectTemplate('{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}')
+      var template = CompilerContext.compile('{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}', {data: false});
-        .withInput({ person: { first: 'Alan', last: 'Johnson' } })
+
-        .withCompileOptions({ data: false })
+      var result = template({person: {first: 'Alan', last: 'Johnson'}});
-        .toCompileTo('Alan Johnson');
+      equals(result, 'Alan Johnson');
     });
   });
 
@@ -192,311 +73,186 @@ describe('builtin helpers', function() {
 
     it('each', function() {
       var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      expectTemplate(string)
+      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-        .withInput({
+                      'each with array argument iterates over the contents when not empty');
-          goodbyes: [
+      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-            { text: 'goodbye' },
+                      'each with array argument ignores the contents when empty');
-            { text: 'Goodbye' },
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage(
-          'each with array argument iterates over the contents when not empty'
-        )
-        .toCompileTo('goodbye! Goodbye! GOODBYE! cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbyes: [],
-          world: 'world'
-        })
-        .withMessage('each with array argument ignores the contents when empty')
-        .toCompileTo('cruel world!');
     });
 
     it('each without data', function() {
-      expectTemplate('{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!')
+      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-        .withInput({
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-          goodbyes: [
+      shouldCompileTo(string, [hash,,,, false], 'goodbye! Goodbye! GOODBYE! cruel world!');
-            { text: 'goodbye' },
-            { text: 'Goodbye' },
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withRuntimeOptions({ data: false })
-        .withCompileOptions({ data: false })
-        .toCompileTo('goodbye! Goodbye! GOODBYE! cruel world!');
 
-      expectTemplate('{{#each .}}{{.}}{{/each}}')
+      hash = {goodbyes: 'cruel', world: 'world'};
-        .withInput({ goodbyes: 'cruel', world: 'world' })
+      shouldCompileTo('{{#each .}}{{.}}{{/each}}', [hash,,,, false], 'cruelworld');
-        .withRuntimeOptions({ data: false })
-        .withCompileOptions({ data: false })
-        .toCompileTo('cruelworld');
     });
 
     it('each without context', function() {
-      expectTemplate('{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!')
+      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-        .withInput(undefined)
+      shouldCompileTo(string, [,,,, ], 'cruel !');
-        .toCompileTo('cruel !');
     });
 
     it('each with an object and @key', function() {
-      var string =
+      var string = '{{#each goodbyes}}{{@key}}. {{text}}! {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{@key}}. {{text}}! {{/each}}cruel {{world}}!';
 
       function Clazz() {
-        this['<b>#1</b>'] = { text: 'goodbye' };
+        this['<b>#1</b>'] = {text: 'goodbye'};
-        this[2] = { text: 'GOODBYE' };
+        this[2] = {text: 'GOODBYE'};
       }
       Clazz.prototype.foo = 'fail';
-      var hash = { goodbyes: new Clazz(), world: 'world' };
+      var hash = {goodbyes: new Clazz(), world: 'world'};
 
       // Object property iteration order is undefined according to ECMA spec,
       // so we need to check both possible orders
       // @see http://stackoverflow.com/questions/280713/elements-order-in-a-for-in-loop
       var actual = compileWithPartials(string, hash);
-      var expected1 =
+      var expected1 = '&lt;b&gt;#1&lt;/b&gt;. goodbye! 2. GOODBYE! cruel world!';
-        '&lt;b&gt;#1&lt;/b&gt;. goodbye! 2. GOODBYE! cruel world!';
+      var expected2 = '2. GOODBYE! &lt;b&gt;#1&lt;/b&gt;. goodbye! cruel world!';
-      var expected2 =
-        '2. GOODBYE! &lt;b&gt;#1&lt;/b&gt;. goodbye! cruel world!';
 
-      equals(
+      equals(actual === expected1 || actual === expected2, true, 'each with object argument iterates over the contents when not empty');
-        actual === expected1 || actual === expected2,
+      shouldCompileTo(string, {goodbyes: {}, world: 'world'}, 'cruel world!');
-        true,
-        'each with object argument iterates over the contents when not empty'
-      );
-
-      expectTemplate(string)
-        .withInput({
-          goodbyes: {},
-          world: 'world'
-        })
-        .toCompileTo('cruel world!');
     });
 
     it('each with @index', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @index variable is used')
-        .toCompileTo('0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!');
     });
 
     it('each with nested @index', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{#each ../goodbyes}}{{@index}} {{/each}}After {{@index}} {{/each}}{{@index}}cruel {{world}}!';
-        '{{#each goodbyes}}{{@index}}. {{text}}! {{#each ../goodbyes}}{{@index}} {{/each}}After {{@index}} {{/each}}{{@index}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, '0. goodbye! 0 1 2 After 0 1. Goodbye! 0 1 2 After 1 2. GOODBYE! 0 1 2 After 2 cruel world!', 'The @index variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @index variable is used')
-        .toCompileTo(
-          '0. goodbye! 0 1 2 After 0 1. Goodbye! 0 1 2 After 1 2. GOODBYE! 0 1 2 After 2 cruel world!'
-        );
     });
 
     it('each with block params', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes as |value index|}}{{index}}. {{value.text}}! {{#each ../goodbyes as |childValue childIndex|}} {{index}} {{childIndex}}{{/each}} After {{index}} {{/each}}{{index}}cruel {{world}}!';
-        '{{#each goodbyes as |value index|}}{{index}}. {{value.text}}! {{#each ../goodbyes as |childValue childIndex|}} {{index}} {{childIndex}}{{/each}} After {{index}} {{/each}}{{index}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [{ text: 'goodbye' }, { text: 'Goodbye' }],
+      var result = template(hash);
-          world: 'world'
+
-        })
+      equal(result, '0. goodbye!  0 0 0 1 After 0 1. Goodbye!  1 0 1 1 After 1 cruel world!');
-        .toCompileTo(
-          '0. goodbye!  0 0 0 1 After 0 1. Goodbye!  1 0 1 1 After 1 cruel world!'
-        );
     });
 
     it('each object with @index', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!'
+      var hash = {goodbyes: {'a': {text: 'goodbye'}, b: {text: 'Goodbye'}, c: {text: 'GOODBYE'}}, world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: {
+      var result = template(hash);
-            a: { text: 'goodbye' },
+
-            b: { text: 'Goodbye' },
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-            c: { text: 'GOODBYE' }
-          },
-          world: 'world'
-        })
-        .withMessage('The @index variable is used')
-        .toCompileTo('0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!');
     });
 
+
     it('each with @first', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @first variable is used')
-        .toCompileTo('goodbye! cruel world!');
     });
 
     it('each with nested @first', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}({{#if @first}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @first}}{{text}}!{{/if}}{{/each}}{{#if @first}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}({{#if @first}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @first}}{{text}}!{{/if}}{{/each}}{{#if @first}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, '(goodbye! goodbye! goodbye!) (goodbye!) (goodbye!) cruel world!', 'The @first variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @first variable is used')
-        .toCompileTo(
-          '(goodbye! goodbye! goodbye!) (goodbye!) (goodbye!) cruel world!'
-        );
     });
 
     it('each object with @first', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!'
+      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: { foo: { text: 'goodbye' }, bar: { text: 'Goodbye' } },
+      var result = template(hash);
-          world: 'world'
+
-        })
+      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
-        .withMessage('The @first variable is used')
-        .toCompileTo('goodbye! cruel world!');
     });
 
     it('each with @last', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, 'GOODBYE! cruel world!', 'The @last variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @last variable is used')
-        .toCompileTo('GOODBYE! cruel world!');
     });
 
     it('each object with @last', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!'
+      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: { foo: { text: 'goodbye' }, bar: { text: 'Goodbye' } },
+      var result = template(hash);
-          world: 'world'
+
-        })
+      equal(result, 'Goodbye! cruel world!', 'The @last variable is used');
-        .withMessage('The @last variable is used')
-        .toCompileTo('Goodbye! cruel world!');
     });
 
     it('each with nested @last', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}({{#if @last}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @last}}{{text}}!{{/if}}{{/each}}{{#if @last}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}({{#if @last}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @last}}{{text}}!{{/if}}{{/each}}{{#if @last}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!'
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: [
+      var result = template(hash);
-            { text: 'goodbye' },
+
-            { text: 'Goodbye' },
+      equal(result, '(GOODBYE!) (GOODBYE!) (GOODBYE! GOODBYE! GOODBYE!) cruel world!', 'The @last variable is used');
-            { text: 'GOODBYE' }
-          ],
-          world: 'world'
-        })
-        .withMessage('The @last variable is used')
-        .toCompileTo(
-          '(GOODBYE!) (GOODBYE!) (GOODBYE! GOODBYE! GOODBYE!) cruel world!'
-        );
     });
 
     it('each with function argument', function() {
       var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-
+      var hash = {goodbyes: function() { return [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]; }, world: 'world'};
-      expectTemplate(string)
+      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-        .withInput({
+                'each with array function argument iterates over the contents when not empty');
-          goodbyes: function() {
+      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-            return [
+                'each with array function argument ignores the contents when empty');
-              { text: 'goodbye' },
-              { text: 'Goodbye' },
-              { text: 'GOODBYE' }
-            ];
-          },
-          world: 'world'
-        })
-        .withMessage(
-          'each with array function argument iterates over the contents when not empty'
-        )
-        .toCompileTo('goodbye! Goodbye! GOODBYE! cruel world!');
-
-      expectTemplate(string)
-        .withInput({
-          goodbyes: [],
-          world: 'world'
-        })
-        .withMessage(
-          'each with array function argument ignores the contents when empty'
-        )
-        .toCompileTo('cruel world!');
     });
 
     it('each object when last key is an empty string', function() {
-      expectTemplate(
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
-        '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!'
+      var hash = {goodbyes: {'a': {text: 'goodbye'}, b: {text: 'Goodbye'}, '': {text: 'GOODBYE'}}, world: 'world'};
-      )
+
-        .withInput({
+      var template = CompilerContext.compile(string);
-          goodbyes: {
+      var result = template(hash);
-            a: { text: 'goodbye' },
+
-            b: { text: 'Goodbye' },
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'Empty string key is not skipped');
-            '': { text: 'GOODBYE' }
-          },
-          world: 'world'
-        })
-        .withMessage('Empty string key is not skipped')
-        .toCompileTo('0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!');
     });
 
     it('data passed to helpers', function() {
-      expectTemplate(
+      var string = '{{#each letters}}{{this}}{{detectDataInsideEach}}{{/each}}';
-        '{{#each letters}}{{this}}{{detectDataInsideEach}}{{/each}}'
+      var hash = {letters: ['a', 'b', 'c']};
-      )
+
-        .withInput({ letters: ['a', 'b', 'c'] })
+      var template = CompilerContext.compile(string);
-        .withMessage('should output data')
+      var result = template(hash, {
-        .withRuntimeOptions({
+        data: {
-          data: {
+          exclaim: '!'
-            exclaim: '!'
+        }
-          }
+      });
-        })
+      equal(result, 'a!b!c!', 'should output data');
-        .toCompileTo('a!b!c!');
     });
 
     it('each on implicit context', function() {
-      expectTemplate('{{#each}}{{text}}! {{/each}}cruel world!').toThrow(
+      shouldThrow(function() {
-        handlebarsEnv.Exception,
+        var template = CompilerContext.compile('{{#each}}{{text}}! {{/each}}cruel world!');
-        'Must pass iterator to #each'
+        template({});
-      );
+      }, handlebarsEnv.Exception, 'Must pass iterator to #each');
     });
 
     if (global.Symbol && global.Symbol.iterator) {
@@ -520,30 +276,13 @@ describe('builtin helpers', function() {
           return new Iterator(this.arr);
         };
         var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-
+        var goodbyes = new Iterable([{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]);
-        expectTemplate(string)
+        var goodbyesEmpty = new Iterable([]);
-          .withInput({
+        var hash = {goodbyes: goodbyes, world: 'world'};
-            goodbyes: new Iterable([
+        shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-              { text: 'goodbye' },
+          'each with array argument iterates over the contents when not empty');
-              { text: 'Goodbye' },
+        shouldCompileTo(string, {goodbyes: goodbyesEmpty, world: 'world'}, 'cruel world!',
-              { text: 'GOODBYE' }
+          'each with array argument ignores the contents when empty');
-            ]),
-            world: 'world'
-          })
-          .withMessage(
-            'each with array argument iterates over the contents when not empty'
-          )
-          .toCompileTo('goodbye! Goodbye! GOODBYE! cruel world!');
-
-        expectTemplate(string)
-          .withInput({
-            goodbyes: new Iterable([]),
-            world: 'world'
-          })
-          .withMessage(
-            'each with array argument ignores the contents when empty'
-          )
-          .toCompileTo('cruel world!');
       });
     }
   });
@@ -554,7 +293,9 @@ describe('builtin helpers', function() {
       return;
     }
 
-    var $log, $info, $error;
+    var $log,
+        $info,
+        $error;
     beforeEach(function() {
       $log = console.log;
       $info = console.info;
@@ -567,37 +308,36 @@ describe('builtin helpers', function() {
     });
 
     it('should call logger at default level', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
+
       var levelArg, logArg;
       handlebarsEnv.log = function(level, arg) {
         levelArg = level;
         logArg = arg;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, hash, '', 'log should not display');
-        .withInput({ blah: 'whee' })
-        .withMessage('log should not display')
-        .toCompileTo('');
       equals(1, levelArg, 'should call log with 1');
       equals('whee', logArg, "should call log with 'whee'");
     });
-
     it('should call logger at data level', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
+
       var levelArg, logArg;
       handlebarsEnv.log = function(level, arg) {
         levelArg = level;
         logArg = arg;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-        .withInput({ blah: 'whee' })
-        .withRuntimeOptions({ data: { level: '03' } })
-        .withCompileOptions({ data: true })
-        .toCompileTo('');
       equals('03', levelArg);
       equals('whee', logArg);
     });
-
     it('should output to info', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
       var called;
 
       console.info = function(info) {
@@ -613,13 +353,12 @@ describe('builtin helpers', function() {
         console.log = $log;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, hash, '');
-        .withInput({ blah: 'whee' })
-        .toCompileTo('');
       equals(true, called);
     });
-
     it('should log at data level', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
       var called;
 
       console.error = function(log) {
@@ -628,16 +367,13 @@ describe('builtin helpers', function() {
         console.error = $error;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-        .withInput({ blah: 'whee' })
-        .withRuntimeOptions({ data: { level: '03' } })
-        .withCompileOptions({ data: true })
-        .toCompileTo('');
       equals(true, called);
     });
-
     it('should handle missing logger', function() {
-      var called = false;
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' },
+          called = false;
 
       console.error = undefined;
       console.log = function(log) {
@@ -646,15 +382,13 @@ describe('builtin helpers', function() {
         console.log = $log;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-        .withInput({ blah: 'whee' })
-        .withRuntimeOptions({ data: { level: '03' } })
-        .withCompileOptions({ data: true })
-        .toCompileTo('');
       equals(true, called);
     });
 
     it('should handle string log levels', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
       var called;
 
       console.error = function(log) {
@@ -662,24 +396,17 @@ describe('builtin helpers', function() {
         called = true;
       };
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, [hash,,,, {level: 'error'}], '');
-        .withInput({ blah: 'whee' })
-        .withRuntimeOptions({ data: { level: 'error' } })
-        .withCompileOptions({ data: true })
-        .toCompileTo('');
       equals(true, called);
 
       called = false;
 
-      expectTemplate('{{log blah}}')
+      shouldCompileTo(string, [hash,,,, {level: 'ERROR'}], '');
-        .withInput({ blah: 'whee' })
-        .withRuntimeOptions({ data: { level: 'ERROR' } })
-        .withCompileOptions({ data: true })
-        .toCompileTo('');
       equals(true, called);
     });
-
     it('should handle hash log levels', function() {
+      var string = '{{log blah level="error"}}';
+      var hash = { blah: 'whee' };
       var called;
 
       console.error = function(log) {
@@ -687,13 +414,12 @@ describe('builtin helpers', function() {
         called = true;
       };
 
-      expectTemplate('{{log blah level="error"}}')
+      shouldCompileTo(string, hash, '');
-        .withInput({ blah: 'whee' })
-        .toCompileTo('');
       equals(true, called);
     });
-
     it('should handle hash log levels', function() {
+      var string = '{{log blah level="debug"}}';
+      var hash = { blah: 'whee' };
       var called = false;
 
       console.info = console.log = console.error = console.debug = function() {
@@ -701,13 +427,12 @@ describe('builtin helpers', function() {
         console.info = console.log = console.error = console.debug = $log;
       };
 
-      expectTemplate('{{log blah level="debug"}}')
+      shouldCompileTo(string, hash, '');
-        .withInput({ blah: 'whee' })
-        .toCompileTo('');
       equals(false, called);
     });
-
     it('should pass multiple log arguments', function() {
+      var string = '{{log blah "foo" 1}}';
+      var hash = { blah: 'whee' };
       var called;
 
       console.info = console.log = function(log1, log2, log3) {
@@ -718,40 +443,31 @@ describe('builtin helpers', function() {
         console.log = $log;
       };
 
-      expectTemplate('{{log blah "foo" 1}}')
+      shouldCompileTo(string, hash, '');
-        .withInput({ blah: 'whee' })
-        .toCompileTo('');
       equals(true, called);
     });
-
-    it('should pass zero log arguments', function() {
-      var called;
-
-      console.info = console.log = function() {
-        expect(arguments.length).to.equal(0);
-        called = true;
-        console.log = $log;
-      };
-
-      expectTemplate('{{log}}')
-        .withInput({ blah: 'whee' })
-        .toCompileTo('');
-      expect(called).to.be.true();
-    });
     /* eslint-enable no-console */
   });
 
+
   describe('#lookup', function() {
     it('should lookup arbitrary content', function() {
-      expectTemplate('{{#each goodbyes}}{{lookup ../data .}}{{/each}}')
+      var string = '{{#each goodbyes}}{{lookup ../data .}}{{/each}}',
-        .withInput({ goodbyes: [0, 1], data: ['foo', 'bar'] })
+          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
-        .toCompileTo('foobar');
-    });
 
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, 'foobar');
+    });
     it('should not fail on undefined value', function() {
-      expectTemplate('{{#each goodbyes}}{{lookup ../bar .}}{{/each}}')
+      var string = '{{#each goodbyes}}{{lookup ../bar .}}{{/each}}',
-        .withInput({ goodbyes: [0, 1], data: ['foo', 'bar'] })
+          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
-        .toCompileTo('');
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, '');
     });
   });
 });

spec/compiler.js

@@ -13,84 +13,37 @@ describe('compiler', function() {
       equal(compile('foo').equals(compile('foo')), true);
       equal(compile('{{foo}}').equals(compile('{{foo}}')), true);
       equal(compile('{{foo.bar}}').equals(compile('{{foo.bar}}')), true);
-      equal(
+      equal(compile('{{foo.bar baz "foo" true false bat=1}}').equals(compile('{{foo.bar baz "foo" true false bat=1}}')), true);
-        compile('{{foo.bar baz "foo" true false bat=1}}').equals(
+      equal(compile('{{foo.bar (baz bat=1)}}').equals(compile('{{foo.bar (baz bat=1)}}')), true);
-          compile('{{foo.bar baz "foo" true false bat=1}}')
+      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{/foo}}')), true);
-        ),
-        true
-      );
-      equal(
-        compile('{{foo.bar (baz bat=1)}}').equals(
-          compile('{{foo.bar (baz bat=1)}}')
-        ),
-        true
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{/foo}}')),
-        true
-      );
     });
     it('should treat as not equal', function() {
       equal(compile('foo').equals(compile('bar')), false);
       equal(compile('{{foo}}').equals(compile('{{bar}}')), false);
       equal(compile('{{foo.bar}}').equals(compile('{{bar.bar}}')), false);
-      equal(
+      equal(compile('{{foo.bar baz bat=1}}').equals(compile('{{foo.bar bar bat=1}}')), false);
-        compile('{{foo.bar baz bat=1}}').equals(
+      equal(compile('{{foo.bar (baz bat=1)}}').equals(compile('{{foo.bar (bar bat=1)}}')), false);
-          compile('{{foo.bar bar bat=1}}')
+      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#bar}} {{/bar}}')), false);
-        ),
+      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{foo}}{{/foo}}')), false);
-        false
-      );
-      equal(
-        compile('{{foo.bar (baz bat=1)}}').equals(
-          compile('{{foo.bar (bar bat=1)}}')
-        ),
-        false
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(compile('{{#bar}} {{/bar}}')),
-        false
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(
-          compile('{{#foo}} {{foo}}{{/foo}}')
-        ),
-        false
-      );
     });
   });
 
   describe('#compile', function() {
     it('should fail with invalid input', function() {
-      shouldThrow(
+      shouldThrow(function() {
-        function() {
+        Handlebars.compile(null);
-          Handlebars.compile(null);
+      }, Error, 'You must pass a string or Handlebars AST to Handlebars.compile. You passed null');
-        },
+      shouldThrow(function() {
-        Error,
+        Handlebars.compile({});
-        'You must pass a string or Handlebars AST to Handlebars.compile. You passed null'
+      }, Error, 'You must pass a string or Handlebars AST to Handlebars.compile. You passed [object Object]');
-      );
-      shouldThrow(
-        function() {
-          Handlebars.compile({});
-        },
-        Error,
-        'You must pass a string or Handlebars AST to Handlebars.compile. You passed [object Object]'
-      );
     });
 
     it('should include the location in the error (row and column)', function() {
       try {
         Handlebars.compile(' \n  {{#if}}\n{{/def}}')();
-        equal(
+        equal(true, false, 'Statement must throw exception. This line should not be executed.');
-          true,
-          false,
-          'Statement must throw exception. This line should not be executed.'
-        );
       } catch (err) {
-        equal(
+        equal(err.message, 'if doesn\'t match def - 2:5', 'Checking error message');
-          err.message,
-          "if doesn't match def - 2:5",
-          'Checking error message'
-        );
         if (Object.getOwnPropertyDescriptor(err, 'column').writable) {
           // In Safari 8, the column-property is read-only. This means that even if it is set with defineProperty,
           // its value won't change (https://github.com/jquery/esprima/issues/1290#issuecomment-132455482)
@@ -104,28 +57,17 @@ describe('compiler', function() {
     it('should include the location as enumerable property', function() {
       try {
         Handlebars.compile(' \n  {{#if}}\n{{/def}}')();
-        equal(
+        equal(true, false, 'Statement must throw exception. This line should not be executed.');
-          true,
-          false,
-          'Statement must throw exception. This line should not be executed.'
-        );
       } catch (err) {
-        equal(
+        equal(Object.prototype.propertyIsEnumerable.call(err, 'column'), true, 'Checking error column');
-          Object.prototype.propertyIsEnumerable.call(err, 'column'),
-          true,
-          'Checking error column'
-        );
       }
     });
 
     it('can utilize AST instance', function() {
-      equal(
+      equal(Handlebars.compile({
-        Handlebars.compile({
+        type: 'Program',
-          type: 'Program',
+        body: [ {type: 'ContentStatement', value: 'Hello'}]
-          body: [{ type: 'ContentStatement', value: 'Hello' }]
+      })(), 'Hello');
-        })(),
-        'Hello'
-      );
     });
 
     it('can pass through an empty string', function() {
@@ -133,52 +75,33 @@ describe('compiler', function() {
     });
 
     it('should not modify the options.data property(GH-1327)', function() {
-      var options = { data: [{ a: 'foo' }, { a: 'bar' }] };
+      var options = {data: [{a: 'foo'}, {a: 'bar'}]};
       Handlebars.compile('{{#each data}}{{@index}}:{{a}} {{/each}}', options)();
-      equal(
+      equal(JSON.stringify(options, 0, 2), JSON.stringify({data: [{a: 'foo'}, {a: 'bar'}]}, 0, 2));
-        JSON.stringify(options, 0, 2),
-        JSON.stringify({ data: [{ a: 'foo' }, { a: 'bar' }] }, 0, 2)
-      );
     });
 
     it('should not modify the options.knownHelpers property(GH-1327)', function() {
-      var options = { knownHelpers: {} };
+      var options = {knownHelpers: {}};
       Handlebars.compile('{{#each data}}{{@index}}:{{a}} {{/each}}', options)();
-      equal(
+      equal(JSON.stringify(options, 0, 2), JSON.stringify({knownHelpers: {}}, 0, 2));
-        JSON.stringify(options, 0, 2),
-        JSON.stringify({ knownHelpers: {} }, 0, 2)
-      );
     });
   });
 
   describe('#precompile', function() {
     it('should fail with invalid input', function() {
-      shouldThrow(
+      shouldThrow(function() {
-        function() {
+        Handlebars.precompile(null);
-          Handlebars.precompile(null);
+      }, Error, 'You must pass a string or Handlebars AST to Handlebars.precompile. You passed null');
-        },
+      shouldThrow(function() {
-        Error,
+        Handlebars.precompile({});
-        'You must pass a string or Handlebars AST to Handlebars.precompile. You passed null'
+      }, Error, 'You must pass a string or Handlebars AST to Handlebars.precompile. You passed [object Object]');
-      );
-      shouldThrow(
-        function() {
-          Handlebars.precompile({});
-        },
-        Error,
-        'You must pass a string or Handlebars AST to Handlebars.precompile. You passed [object Object]'
-      );
     });
 
     it('can utilize AST instance', function() {
-      equal(
+      equal(/return "Hello"/.test(Handlebars.precompile({
-        /return "Hello"/.test(
+        type: 'Program',
-          Handlebars.precompile({
+        body: [ {type: 'ContentStatement', value: 'Hello'}]
-            type: 'Program',
+      })), true);
-            body: [{ type: 'ContentStatement', value: 'Hello' }]
-          })
-        ),
-        true
-      );
     });
 
     it('can pass through an empty string', function() {

spec/data.js

@@ -1,24 +1,26 @@
 describe('data', function() {
   it('passing in data to a compiled function that expects data - works with helpers', function() {
-    expectTemplate('{{hello}}')
+    var template = CompilerContext.compile('{{hello}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(options) {
+    var helpers = {
+      hello: function(options) {
         return options.data.adjective + ' ' + this.noun;
-      })
+      }
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+    };
-      .withInput({ noun: 'cat' })
+
-      .withMessage('Data output by helper')
+    var result = template({noun: 'cat'}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('happy cat');
+    equals('happy cat', result, 'Data output by helper');
   });
 
   it('data can be looked up via @foo', function() {
-    expectTemplate('{{@hello}}')
+    var template = CompilerContext.compile('{{@hello}}');
-      .withRuntimeOptions({ data: { hello: 'hello' } })
+    var result = template({}, { data: { hello: 'hello' } });
-      .withMessage('@foo retrieves template data')
+    equals('hello', result, '@foo retrieves template data');
-      .toCompileTo('hello');
   });
 
   it('deep @foo triggers automatic top-level data', function() {
+    var template = CompilerContext.compile('{{#let world="world"}}{{#if foo}}{{#if foo}}Hello {{@world}}{{/if}}{{/if}}{{/let}}');
+
     var helpers = Handlebars.createFrame(handlebarsEnv.helpers);
 
     helpers.let = function(options) {
@@ -32,247 +34,238 @@ describe('data', function() {
       return options.fn(this, { data: frame });
     };
 
-    expectTemplate(
+    var result = template({ foo: true }, { helpers: helpers });
-      '{{#let world="world"}}{{#if foo}}{{#if foo}}Hello {{@world}}{{/if}}{{/if}}{{/let}}'
+    equals('Hello world', result, 'Automatic data was triggered');
-    )
-      .withInput({ foo: true })
-      .withHelpers(helpers)
-      .withMessage('Automatic data was triggered')
-      .toCompileTo('Hello world');
   });
 
   it('parameter data can be looked up via @foo', function() {
-    expectTemplate('{{hello @world}}')
+    var template = CompilerContext.compile('{{hello @world}}');
-      .withRuntimeOptions({ data: { world: 'world' } })
+    var helpers = {
-      .withHelper('hello', function(noun) {
+      hello: function(noun) {
         return 'Hello ' + noun;
-      })
+      }
-      .withMessage('@foo as a parameter retrieves template data')
+    };
-      .toCompileTo('Hello world');
+
+    var result = template({}, { helpers: helpers, data: { world: 'world' } });
+    equals('Hello world', result, '@foo as a parameter retrieves template data');
   });
 
   it('hash values can be looked up via @foo', function() {
-    expectTemplate('{{hello noun=@world}}')
+    var template = CompilerContext.compile('{{hello noun=@world}}');
-      .withRuntimeOptions({ data: { world: 'world' } })
+    var helpers = {
-      .withHelper('hello', function(options) {
+      hello: function(options) {
         return 'Hello ' + options.hash.noun;
-      })
+      }
-      .withMessage('@foo as a parameter retrieves template data')
+    };
-      .toCompileTo('Hello world');
+
+    var result = template({}, { helpers: helpers, data: { world: 'world' } });
+    equals('Hello world', result, '@foo as a parameter retrieves template data');
   });
 
   it('nested parameter data can be looked up via @foo.bar', function() {
-    expectTemplate('{{hello @world.bar}}')
+    var template = CompilerContext.compile('{{hello @world.bar}}');
-      .withRuntimeOptions({ data: { world: { bar: 'world' } } })
+    var helpers = {
-      .withHelper('hello', function(noun) {
+      hello: function(noun) {
         return 'Hello ' + noun;
-      })
+      }
-      .withMessage('@foo as a parameter retrieves template data')
+    };
-      .toCompileTo('Hello world');
+
+    var result = template({}, { helpers: helpers, data: { world: {bar: 'world' } } });
+    equals('Hello world', result, '@foo as a parameter retrieves template data');
   });
 
   it('nested parameter data does not fail with @world.bar', function() {
-    expectTemplate('{{hello @world.bar}}')
+    var template = CompilerContext.compile('{{hello @world.bar}}');
-      .withRuntimeOptions({ data: { foo: { bar: 'world' } } })
+    var helpers = {
-      .withHelper('hello', function(noun) {
+      hello: function(noun) {
         return 'Hello ' + noun;
-      })
+      }
-      .withMessage('@foo as a parameter retrieves template data')
+    };
-      .toCompileTo('Hello undefined');
+
+    var result = template({}, { helpers: helpers, data: { foo: {bar: 'world' } } });
+    equals('Hello undefined', result, '@foo as a parameter retrieves template data');
   });
 
   it('parameter data throws when using complex scope references', function() {
-    expectTemplate(
+    var string = '{{#goodbyes}}{{text}} cruel {{@foo/../name}}! {{/goodbyes}}';
-      '{{#goodbyes}}{{text}} cruel {{@foo/../name}}! {{/goodbyes}}'
+
-    ).toThrow(Error);
+    shouldThrow(function() {
+      CompilerContext.compile(string);
+    }, Error);
   });
 
   it('data can be functions', function() {
-    expectTemplate('{{@hello}}')
+    var template = CompilerContext.compile('{{@hello}}');
-      .withRuntimeOptions({
+    var result = template({}, { data: { hello: function() { return 'hello'; } } });
-        data: {
+    equals('hello', result);
-          hello: function() {
-            return 'hello';
-          }
-        }
-      })
-      .toCompileTo('hello');
   });
-
   it('data can be functions with params', function() {
-    expectTemplate('{{@hello "hello"}}')
+    var template = CompilerContext.compile('{{@hello "hello"}}');
-      .withRuntimeOptions({
+    var result = template({}, { data: { hello: function(arg) { return arg; } } });
-        data: {
+    equals('hello', result);
-          hello: function(arg) {
-            return arg;
-          }
-        }
-      })
-      .toCompileTo('hello');
   });
 
   it('data is inherited downstream', function() {
-    expectTemplate(
+    var template = CompilerContext.compile('{{#let foo=1 bar=2}}{{#let foo=bar.baz}}{{@bar}}{{@foo}}{{/let}}{{@foo}}{{/let}}', { data: true });
-      '{{#let foo=1 bar=2}}{{#let foo=bar.baz}}{{@bar}}{{@foo}}{{/let}}{{@foo}}{{/let}}'
+    var helpers = {
-    )
+      let: function(options) {
-      .withInput({ bar: { baz: 'hello world' } })
-      .withCompileOptions({ data: true })
-      .withHelper('let', function(options) {
         var frame = Handlebars.createFrame(options.data);
         for (var prop in options.hash) {
           if (prop in options.hash) {
             frame[prop] = options.hash[prop];
           }
         }
-        return options.fn(this, { data: frame });
+        return options.fn(this, {data: frame});
-      })
+      }
-      .withRuntimeOptions({ data: {} })
+    };
-      .withMessage('data variables are inherited downstream')
+
-      .toCompileTo('2hello world1');
+    var result = template({ bar: { baz: 'hello world' } }, { helpers: helpers, data: {} });
+    equals('2hello world1', result, 'data variables are inherited downstream');
   });
 
   it('passing in data to a compiled function that expects data - works with helpers in partials', function() {
-    expectTemplate('{{>myPartial}}')
+    var template = CompilerContext.compile('{{>myPartial}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withPartial('myPartial', '{{hello}}')
+    var partials = {
-      .withHelper('hello', function(options) {
+      myPartial: CompilerContext.compile('{{hello}}', {data: true})
+    };
+
+    var helpers = {
+      hello: function(options) {
         return options.data.adjective + ' ' + this.noun;
-      })
+      }
-      .withInput({ noun: 'cat' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Data output by helper inside partial')
+    var result = template({noun: 'cat'}, {helpers: helpers, partials: partials, data: {adjective: 'happy'}});
-      .toCompileTo('happy cat');
+    equals('happy cat', result, 'Data output by helper inside partial');
   });
 
   it('passing in data to a compiled function that expects data - works with helpers and parameters', function() {
-    expectTemplate('{{hello world}}')
+    var template = CompilerContext.compile('{{hello world}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(noun, options) {
+    var helpers = {
+      hello: function(noun, options) {
         return options.data.adjective + ' ' + noun + (this.exclaim ? '!' : '');
-      })
+      }
-      .withInput({ exclaim: true, world: 'world' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Data output by helper')
+    var result = template({exclaim: true, world: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('happy world!');
+    equals('happy world!', result, 'Data output by helper');
   });
 
   it('passing in data to a compiled function that expects data - works with block helpers', function() {
-    expectTemplate('{{#hello}}{{world}}{{/hello}}')
+    var template = CompilerContext.compile('{{#hello}}{{world}}{{/hello}}', {data: true});
-      .withCompileOptions({
+
-        data: true
+    var helpers = {
-      })
+      hello: function(options) {
-      .withHelper('hello', function(options) {
         return options.fn(this);
-      })
+      },
-      .withHelper('world', function(options) {
+      world: function(options) {
         return options.data.adjective + ' world' + (this.exclaim ? '!' : '');
-      })
+      }
-      .withInput({ exclaim: true })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Data output by helper')
+    var result = template({exclaim: true}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('happy world!');
+    equals('happy world!', result, 'Data output by helper');
   });
 
   it('passing in data to a compiled function that expects data - works with block helpers that use ..', function() {
-    expectTemplate('{{#hello}}{{world ../zomg}}{{/hello}}')
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(options) {
+    var helpers = {
-        return options.fn({ exclaim: '?' });
+      hello: function(options) {
-      })
+        return options.fn({exclaim: '?'});
-      .withHelper('world', function(thing, options) {
+      },
+      world: function(thing, options) {
         return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      })
+      }
-      .withInput({ exclaim: true, zomg: 'world' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Data output by helper')
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('happy world?');
+    equals('happy world?', result, 'Data output by helper');
   });
 
   it('passing in data to a compiled function that expects data - data is passed to with block helpers where children use ..', function() {
-    expectTemplate('{{#hello}}{{world ../zomg}}{{/hello}}')
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(options) {
+    var helpers = {
-        return options.data.accessData + ' ' + options.fn({ exclaim: '?' });
+      hello: function(options) {
-      })
+        return options.data.accessData + ' ' + options.fn({exclaim: '?'});
-      .withHelper('world', function(thing, options) {
+      },
+      world: function(thing, options) {
         return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      })
+      }
-      .withInput({ exclaim: true, zomg: 'world' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy', accessData: '#win' } })
+
-      .withMessage('Data output by helper')
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy', accessData: '#win'}});
-      .toCompileTo('#win happy world?');
+    equals('#win happy world?', result, 'Data output by helper');
   });
 
   it('you can override inherited data when invoking a helper', function() {
-    expectTemplate('{{#hello}}{{world zomg}}{{/hello}}')
+    var template = CompilerContext.compile('{{#hello}}{{world zomg}}{{/hello}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(options) {
+    var helpers = {
-        return options.fn(
+      hello: function(options) {
-          { exclaim: '?', zomg: 'world' },
+        return options.fn({exclaim: '?', zomg: 'world'}, { data: {adjective: 'sad'} });
-          { data: { adjective: 'sad' } }
+      },
-        );
+      world: function(thing, options) {
-      })
-      .withHelper('world', function(thing, options) {
         return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      })
+      }
-      .withInput({ exclaim: true, zomg: 'planet' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Overriden data output by helper')
+    var result = template({exclaim: true, zomg: 'planet'}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('sad world?');
+    equals('sad world?', result, 'Overriden data output by helper');
   });
 
+
   it('you can override inherited data when invoking a helper with depth', function() {
-    expectTemplate('{{#hello}}{{world ../zomg}}{{/hello}}')
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-      .withCompileOptions({ data: true })
+
-      .withHelper('hello', function(options) {
+    var helpers = {
-        return options.fn({ exclaim: '?' }, { data: { adjective: 'sad' } });
+      hello: function(options) {
-      })
+        return options.fn({exclaim: '?'}, { data: {adjective: 'sad'} });
-      .withHelper('world', function(thing, options) {
+      },
+      world: function(thing, options) {
         return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      })
+      }
-      .withInput({ exclaim: true, zomg: 'world' })
+    };
-      .withRuntimeOptions({ data: { adjective: 'happy' } })
+
-      .withMessage('Overriden data output by helper')
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-      .toCompileTo('sad world?');
+    equals('sad world?', result, 'Overriden data output by helper');
   });
 
   describe('@root', function() {
     it('the root context can be looked up via @root', function() {
-      expectTemplate('{{@root.foo}}')
+      var template = CompilerContext.compile('{{@root.foo}}');
-        .withInput({ foo: 'hello' })
+      var result = template({foo: 'hello'}, { data: {} });
-        .withRuntimeOptions({ data: {} })
+      equals('hello', result);
-        .toCompileTo('hello');
 
-      expectTemplate('{{@root.foo}}')
+      result = template({foo: 'hello'}, {});
-        .withInput({ foo: 'hello' })
+      equals('hello', result);
-        .toCompileTo('hello');
     });
-
     it('passed root values take priority', function() {
-      expectTemplate('{{@root.foo}}')
+      var template = CompilerContext.compile('{{@root.foo}}');
-        .withInput({ foo: 'should not be used' })
+      var result = template({}, { data: {root: {foo: 'hello'} } });
-        .withRuntimeOptions({ data: { root: { foo: 'hello' } } })
+      equals('hello', result);
-        .toCompileTo('hello');
     });
   });
 
   describe('nesting', function() {
     it('the root context can be looked up via @root', function() {
-      expectTemplate(
+      var template = CompilerContext.compile('{{#helper}}{{#helper}}{{@./depth}} {{@../depth}} {{@../../depth}}{{/helper}}{{/helper}}');
-        '{{#helper}}{{#helper}}{{@./depth}} {{@../depth}} {{@../../depth}}{{/helper}}{{/helper}}'
+      var result = template({foo: 'hello'}, {
-      )
+        helpers: {
-        .withInput({ foo: 'hello' })
+          helper: function(options) {
-        .withHelper('helper', function(options) {
+            var frame = Handlebars.createFrame(options.data);
-          var frame = Handlebars.createFrame(options.data);
+            frame.depth = options.data.depth + 1;
-          frame.depth = options.data.depth + 1;
+            return options.fn(this, {data: frame});
-          return options.fn(this, { data: frame });
-        })
-        .withRuntimeOptions({
-          data: {
-            depth: 0
           }
-        })
+        },
-        .toCompileTo('2 1 0');
+        data: {
+          depth: 0
+        }
+      });
+      equals('2 1 0', result);
     });
   });
 });

spec/env/browser.js

@@ -1,11 +1,12 @@
 require('./common');
 
 var fs = require('fs'),
-  vm = require('vm');
+    vm = require('vm');
 
 var chai = require('chai');
 var dirtyChai = require('dirty-chai');
 
+
 chai.use(dirtyChai);
 global.expect = chai.expect;
 
@@ -17,10 +18,7 @@ var filename = 'dist/handlebars.js';
 if (global.minimizedTest) {
   filename = 'dist/handlebars.min.js';
 }
-var distHandlebars = fs.readFileSync(
+var distHandlebars = fs.readFileSync(require.resolve('../../' + filename), 'utf-8');
-  require.resolve('../../' + filename),
-  'utf-8'
-);
 vm.runInThisContext(distHandlebars, filename);
 
 global.CompilerContext = {

spec/env/common.js

@@ -1,6 +1,6 @@
 var global = (function() {
   return this;
-})();
+}());
 
 var AssertError;
 if (Error.captureStackTrace) {
@@ -28,19 +28,10 @@ global.shouldCompileTo = function(string, hashOrArray, expected, message) {
 /**
  * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
  */
-global.shouldCompileToWithPartials = function shouldCompileToWithPartials(
+global.shouldCompileToWithPartials = function shouldCompileToWithPartials(string, hashOrArray, partials, expected, message) {
-  string,
-  hashOrArray,
-  partials,
-  expected,
-  message
-) {
   var result = compileWithPartials(string, hashOrArray, partials);
   if (result !== expected) {
-    throw new AssertError(
+    throw new AssertError("'" + result + "' should === '" + expected + "': " + message, shouldCompileToWithPartials);
-      "'" + result + "' should === '" + expected + "': " + message,
-      shouldCompileToWithPartials
-    );
   }
 };
 
@@ -48,18 +39,17 @@ global.shouldCompileToWithPartials = function shouldCompileToWithPartials(
  * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
  */
 global.compileWithPartials = function(string, hashOrArray, partials) {
-  var template, ary, options;
+  var template,
+      ary,
+      options;
   if (hashOrArray && hashOrArray.hash) {
     ary = [hashOrArray.hash, hashOrArray];
     delete hashOrArray.hash;
   } else if (Object.prototype.toString.call(hashOrArray) === '[object Array]') {
     ary = [];
     ary.push(hashOrArray[0]); // input
-    ary.push({ helpers: hashOrArray[1], partials: hashOrArray[2] });
+    ary.push({helpers: hashOrArray[1], partials: hashOrArray[2]});
-    options =
+    options = typeof hashOrArray[3] === 'object' ? hashOrArray[3] : {compat: hashOrArray[3]};
-      typeof hashOrArray[3] === 'object'
-        ? hashOrArray[3]
-        : { compat: hashOrArray[3] };
     if (hashOrArray[4] != null) {
       options.data = !!hashOrArray[4];
       ary[1].data = hashOrArray[4];
@@ -68,23 +58,18 @@ global.compileWithPartials = function(string, hashOrArray, partials) {
     ary = [hashOrArray];
   }
 
-  template = CompilerContext[partials ? 'compileWithPartial' : 'compile'](
+  template = CompilerContext[partials ? 'compileWithPartial' : 'compile'](string, options);
-    string,
-    options
-  );
   return template.apply(this, ary);
 };
 
+
 /**
  * @deprecated Use chai's expect-style API instead (`expect(actualValue).to.equal(expectedValue)`)
  * @see https://www.chaijs.com/api/bdd/
  */
 global.equals = global.equal = function equals(a, b, msg) {
   if (a !== b) {
-    throw new AssertError(
+    throw new AssertError("'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''), equals);
-      "'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''),
-      equals
-    );
   }
 };
 
@@ -101,19 +86,8 @@ global.shouldThrow = function(callback, type, msg) {
     if (type && !(caught instanceof type)) {
       throw new AssertError('Type failure: ' + caught);
     }
-    if (
+    if (msg && !(msg.test ? msg.test(caught.message) : msg === caught.message)) {
-      msg &&
+      throw new AssertError('Throw mismatch: Expected ' + caught.message + ' to match ' + msg + '\n\n' + caught.stack, shouldThrow);
-      !(msg.test ? msg.test(caught.message) : msg === caught.message)
-    ) {
-      throw new AssertError(
-        'Throw mismatch: Expected ' +
-          caught.message +
-          ' to match ' +
-          msg +
-          '\n\n' +
-          caught.stack,
-        shouldThrow
-      );
     }
   }
   if (failed) {
@@ -121,18 +95,18 @@ global.shouldThrow = function(callback, type, msg) {
   }
 };
 
+
 global.expectTemplate = function(templateAsString) {
   return new HandlebarsTestBench(templateAsString);
 };
 
+
 function HandlebarsTestBench(templateAsString) {
   this.templateAsString = templateAsString;
   this.helpers = {};
   this.partials = {};
-  this.decorators = {};
   this.input = {};
-  this.message =
+  this.message = 'Template' + templateAsString + ' does not evaluate to expected output';
-    'Template' + templateAsString + ' does not evaluate to expected output';
   this.compileOptions = {};
   this.runtimeOptions = {};
 }
@@ -147,43 +121,11 @@ HandlebarsTestBench.prototype.withHelper = function(name, helperFunction) {
   return this;
 };
 
-HandlebarsTestBench.prototype.withHelpers = function(helperFunctions) {
-  var self = this;
-  Object.keys(helperFunctions).forEach(function(name) {
-    self.withHelper(name, helperFunctions[name]);
-  });
-  return this;
-};
-
 HandlebarsTestBench.prototype.withPartial = function(name, partialAsString) {
   this.partials[name] = partialAsString;
   return this;
 };
 
-HandlebarsTestBench.prototype.withPartials = function(partials) {
-  var self = this;
-  Object.keys(partials).forEach(function(name) {
-    self.withPartial(name, partials[name]);
-  });
-  return this;
-};
-
-HandlebarsTestBench.prototype.withDecorator = function(
-  name,
-  decoratorFunction
-) {
-  this.decorators[name] = decoratorFunction;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withDecorators = function(decorators) {
-  var self = this;
-  Object.keys(decorators).forEach(function(name) {
-    self.withDecorator(name, decorators[name]);
-  });
-  return this;
-};
-
 HandlebarsTestBench.prototype.withCompileOptions = function(compileOptions) {
   this.compileOptions = compileOptions;
   return this;
@@ -200,23 +142,19 @@ HandlebarsTestBench.prototype.withMessage = function(message) {
 };
 
 HandlebarsTestBench.prototype.toCompileTo = function(expectedOutputAsString) {
-  expect(this._compileAndExecute()).to.equal(
+  expect(this._compileAndExeute()).to.equal(expectedOutputAsString);
-    expectedOutputAsString,
-    this.message
-  );
 };
 
 // see chai "to.throw" (https://www.chaijs.com/api/bdd/#method_throw)
-HandlebarsTestBench.prototype.toThrow = function(errorLike, errMsgMatcher) {
+HandlebarsTestBench.prototype.toThrow = function(errorLike, errMsgMatcher, msg) {
   var self = this;
   expect(function() {
-    self._compileAndExecute();
+    self._compileAndExeute();
-  }).to.throw(errorLike, errMsgMatcher, this.message);
+  }).to.throw(errorLike, errMsgMatcher, msg);
 };
 
-HandlebarsTestBench.prototype._compileAndExecute = function() {
+HandlebarsTestBench.prototype._compileAndExeute = function() {
-  var compile =
+  var compile = Object.keys(this.partials).length > 0
-    Object.keys(this.partials).length > 0
       ? CompilerContext.compileWithPartial
       : CompilerContext.compile;
 
@@ -234,6 +172,5 @@ HandlebarsTestBench.prototype._combineRuntimeOptions = function() {
   });
   combinedRuntimeOptions.helpers = this.helpers;
   combinedRuntimeOptions.partials = this.partials;
-  combinedRuntimeOptions.decorators = this.decorators;
   return combinedRuntimeOptions;
 };