v4.0.2

If a decorator is used within a partial but not in the calling template, the hash is not passed in. For now error on the side of always including as just assigning values has minimal overhead.

Fixes #1089

.eslintrc

@@ -0,0 +1,200 @@
+{
+  "globals": {
+    "self": false
+  },
+  "env": {
+    "node": true
+  },
+  "ecmaFeatures": {
+    // Enabling features that can be implemented without polyfills. Want to avoid polyfills at this time.
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "defaultParams": true,
+    "destructuring": true,
+    "modules": true,
+    "objectLiteralComputedProperties": true,
+    "objectLiteralDuplicateProperties": true,
+    "objectLiteralShorthandMethods": true,
+    "objectLiteralShorthandProperties": true,
+    "restParams": true,
+    "spread": true,
+    "templateStrings": true
+  },
+  "rules": {
+    // Possible Errors //
+    //-----------------//
+
+    "comma-dangle": [2, "never"],
+    "no-cond-assign": [2, "except-parens"],
+
+    // Allow for debugging
+    "no-console": 1,
+
+    "no-constant-condition": 2,
+    "no-control-regex": 2,
+
+    // Allow for debugging
+    "no-debugger": 1,
+
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-empty": 2,
+    "no-empty-character-class": 2,
+    "no-ex-assign": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-parens": 0,
+    "no-extra-semi": 2,
+    "no-func-assign": 0,
+
+    // Stylistic... might consider disallowing in the future
+    "no-inner-declarations": 0,
+
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-negated-in-lhs": 2,
+    "no-obj-calls": 2,
+    "no-regex-spaces": 2,
+    "quote-props": [2, "as-needed", {"keywords": true}],
+    "no-sparse-arrays": 0,
+
+    // Optimizer and coverage will handle/highlight this and can be useful for debugging
+    "no-unreachable": 1,
+
+    "use-isnan": 2,
+    "valid-jsdoc": 0,
+    "valid-typeof": 2,
+
+
+    // Best Practices //
+    //----------------//
+    "block-scoped-var": 0,
+    "complexity": 0,
+    "consistent-return": 0,
+    "curly": 2,
+    "default-case": 1,
+    "dot-notation": [2, {"allowKeywords": false}],
+    "eqeqeq": 0,
+    "guard-for-in": 1,
+    "no-alert": 2,
+    "no-caller": 2,
+    "no-div-regex": 1,
+    "no-else-return": 0,
+    "no-empty-label": 2,
+    "no-eq-null": 0,
+    "no-eval": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
+    "no-implied-eval": 2,
+    "no-iterator": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-loop-func": 2,
+    "no-multi-spaces": 2,
+    "no-multi-str": 1,
+    "no-native-reassign": 2,
+    "no-new": 2,
+    "no-new-func": 2,
+    "no-new-wrappers": 2,
+    "no-octal": 2,
+    "no-octal-escape": 2,
+    "no-param-reassign": 0,
+    "no-process-env": 2,
+    "no-proto": 2,
+    "no-redeclare": 2,
+    "no-return-assign": 2,
+    "no-script-url": 2,
+    "no-self-compare": 2,
+    "no-sequences": 2,
+    "no-throw-literal": 2,
+    "no-unused-expressions": 2,
+    "no-void": 0,
+    "no-warning-comments": 1,
+    "no-with": 2,
+    "radix": 2,
+    "vars-on-top": 0,
+    "wrap-iife": 2,
+    "yoda": 0,
+
+
+    // Strict //
+    //--------//
+    "strict": 0,
+
+
+    // Variables //
+    //-----------//
+    "no-catch-shadow": 2,
+    "no-delete-var": 2,
+    "no-label-var": 2,
+    "no-shadow": 0,
+    "no-shadow-restricted-names": 2,
+    "no-undef": 2,
+    "no-undef-init": 2,
+    "no-undefined": 0,
+    "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],    
+    "no-use-before-define": [2, "nofunc"],
+
+
+    // Node.js //
+    //---------//
+    // Others left to environment defaults
+    "no-mixed-requires": 0,
+
+
+    // Stylistic //
+    //-----------//
+    "indent": 0,
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
+    "camelcase": 2,
+    "comma-spacing": [2, {"before": false, "after": true}],
+    "comma-style": [2, "last"],
+    "consistent-this": [1, "self"],
+    "eol-last": 2,
+    "func-names": 0,
+    "func-style": [2, "declaration"],
+    "key-spacing": [2, {
+        "beforeColon": false,
+        "afterColon": true
+    }],
+    "max-nested-callbacks": 0,
+    "new-cap": 2,
+    "new-parens": 2,
+    "newline-after-var": 0,
+    "no-array-constructor": 2,
+    "no-continue": 0,
+    "no-inline-comments": 0,
+    "no-lonely-if": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multiple-empty-lines": 0,
+    "no-nested-ternary": 1,
+    "no-new-object": 2,
+    "no-spaced-func": 2,
+    "no-ternary": 0,
+    "no-trailing-spaces": 2,
+    "no-underscore-dangle": 0,
+    "no-extra-parens": [2, "functions"],
+    "one-var": 0,
+    "operator-assignment": 0,
+    "padded-blocks": 0,
+    "quote-props": 0,
+    "quotes": [2, "single", "avoid-escape"],
+    "semi": 2,
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "sort-vars": 0,
+    "space-after-keywords": [2, "always"],
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
+    "space-in-brackets": 0,
+    "space-in-parens": [2, "never"],
+    "space-infix-ops": 2,
+    "space-return-throw-case": 2,
+    "space-unary-ops": 2,
+    "spaced-comment": [2, "always", {"markers": [","]}],
+    "wrap-regex": 1,
+
+    "no-var": 1
+  }
+}

.jshintrc

@@ -1,51 +0,0 @@
-{
-    "predef": [
-        "console",
-        "require",
-        "suite",
-        "equal",
-        "equals",
-        "test",
-        "testBoth",
-        "raises",
-        "deepEqual",
-        "start",
-        "stop",
-        "ok",
-        "strictEqual",
-        "module",
-        "define",
-
-        "describe",
-        "it",
-        "afterEach",
-        "beforeEach"
-    ],
-
-    "node" : true,
-    "browser" : true,
-    "esnext": true,
-
-    "boss" : true,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "eqeqeq": false,
-    "eqnull": true,
-    "evil": true,
-    "forin": false,
-    "immed": false,
-    "laxbreak": true,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": false,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": true,
-    "strict": false,
-    "white": false
-}

.npmignore

@@ -1,7 +1,7 @@
 .DS_Store
 .gitignore
 .rvmrc
-.jshintrc
+.eslintrc
 .travis.yml
 .rspec
 Gemfile
@@ -10,9 +10,11 @@ Rakefile
 Gruntfile.js
 *.gemspec
 *.nuspec
+*.log
 bench/*
 configurations/*
 components/*
+coverage/*
 dist/cdnjs/*
 dist/components/*
 spec/*

.travis.yml

@@ -21,3 +21,6 @@ matrix:
 cache:
   directories:
   - node_modules
+
+git:
+  depth: 100

CONTRIBUTING.md

@@ -8,6 +8,8 @@ Should you run into other issues with the project, please don't hesitate to let
 
 Pull requests containing only failing thats demonstrating the issue are welcomed and this also helps ensure that your issue won't regress in the future once it's fixed.
 
+Documentation issues on the handlebarsjs.com site should be reported on [handlebars-site](https://github.com/wycats/handlebars-site).
+
 ## Pull Requests
 
 We also accept [pull requests][pull-request]!
@@ -26,6 +28,8 @@ To build Handlebars.js you'll need a few things installed.
 * Node.js
 * [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`.
+
 Project dependencies may be installed via `npm install`.
 
 To build Handlebars.js from scratch, you'll want to run `grunt`
@@ -61,7 +65,6 @@ A full release may be completed with the following:
 ```
 yo release
 npm publish
-yo release:publish cdnjs handlebars.js dist/cdnjs/
 yo release:publish components handlebars.js dist/components/
 
 cd dist/components/
@@ -74,4 +77,4 @@ After this point the handlebars site needs to be updated to point to the new ver
 [generator-release]: https://github.com/walmartlabs/generator-release
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master
 [issue]: https://github.com/wycats/handlebars.js/issues/new
-[jsfiddle]: http://jsfiddle.net/9D88g/11/
+[jsfiddle]: http://jsfiddle.net/9D88g/46/

FAQ.md

@@ -57,4 +57,4 @@
 
   The other option is to load the `handlebars.runtime.js` UMD build, which might not require path configuration and exposes the library as both the module root and the `default` field for compatibility. 
 
-  If not using ES6 transpilers or accessing submodules in the build the former option should be sufficent for most use cases.
+  If not using ES6 transpilers or accessing submodules in the build the former option should be sufficient for most use cases.

Gruntfile.js

@@ -1,16 +1,18 @@
-var childProcess = require('child_process');
-
+/* eslint-disable no-process-env */
 module.exports = function(grunt) {
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    jshint: {
+    eslint: {
       options: {
-        jshintrc: '.jshintrc'
       },
       files: [
-        'dist/cjs/**/!(*.min|parser).js'
+        '*.js',
+        'bench/**/*.js',
+        'tasks/**/*.js',
+        'lib/**/!(*.min|parser).js',
+        'spec/**/!(*.amd|json2|require).js'
       ]
     },
 
@@ -19,7 +21,7 @@ module.exports = function(grunt) {
     copy: {
       dist: {
         options: {
-          processContent: function(content, path) {
+          processContent: function(content) {
             return grunt.template.process('/*!\n\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n@license\n*/\n')
                 + content;
           }
@@ -41,21 +43,16 @@ module.exports = function(grunt) {
       }
     },
 
-    packager: {
-      global: {
-        type: 'umd',
-        export: 'Handlebars',
-        files: [{
-          cwd: 'lib/',
-          expand: true,
-          src: ['handlebars*.js'],
-          dest: 'dist/'
-        }]
+    babel: {
+      options: {
+        sourceMaps: 'inline',
+        loose: ['es6.modules'],
+        auxiliaryCommentBefore: 'istanbul ignore next'
       },
-
       amd: {
-        type: 'amd',
-        anonymous: true,
+        options: {
+          modules: 'amd'
+        },
         files: [{
           expand: true,
           cwd: 'lib/',
@@ -65,30 +62,61 @@ module.exports = function(grunt) {
       },
 
       cjs: {
-        type: 'cjs',
+        options: {
+          modules: 'common'
+        },
         files: [{
-          expand: true,
           cwd: 'lib/',
+          expand: true,
           src: '**/!(index).js',
           dest: 'dist/cjs/'
         }]
       }
     },
+    webpack: {
+      options: {
+        context: __dirname,
+        module: {
+          loaders: [
+            // the optional 'runtime' transformer tells babel to require the runtime instead of inlining it.
+            { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime&loose=es6.modules&auxiliaryCommentBefore=istanbul%20ignore%20next' }
+          ]
+        },
+        output: {
+          path: 'dist/',
+          library: 'Handlebars',
+          libraryTarget: 'umd'
+        }
+      },
+      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/"
+        optimize: 'none',
+        baseUrl: 'dist/amd/'
       },
       dist: {
         options: {
-          name: "handlebars",
-          out: "dist/handlebars.amd.js"
+          name: 'handlebars',
+          out: 'dist/handlebars.amd.js'
         }
       },
       runtime: {
         options: {
-          name: "handlebars.runtime",
-          out: "dist/handlebars.runtime.amd.js"
+          name: 'handlebars.runtime',
+          out: 'dist/handlebars.runtime.amd.js'
         }
       }
     },
@@ -134,10 +162,10 @@ module.exports = function(grunt) {
           build: process.env.TRAVIS_JOB_ID,
           urls: ['http://localhost:9999/spec/?headless=true', 'http://localhost:9999/spec/amd.html?headless=true'],
           detailedError: true,
-          concurrency: 2,
+          concurrency: 4,
           browsers: [
             {browserName: 'chrome'},
-            {browserName: 'firefox'},
+            {browserName: 'firefox', platform: 'Linux'},
             {browserName: 'safari', version: 7, platform: 'OS X 10.9'},
             {browserName: 'safari', version: 6, platform: 'OS X 10.8'},
             {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
@@ -172,18 +200,18 @@ module.exports = function(grunt) {
   });
 
   // Build a new version of the library
-  this.registerTask('build', "Builds a distributable version of the current project", [
+  this.registerTask('build', 'Builds a distributable version of the current project', [
+                    'eslint',
                     'parser',
                     'node',
-                    'globals',
-                    'jshint']);
+                    'globals']);
 
-  this.registerTask('amd', ['packager:amd', 'requirejs']);
-  this.registerTask('node', ['packager:cjs']);
-  this.registerTask('globals', ['packager:global']);
+  this.registerTask('amd', ['babel:amd', 'requirejs']);
+  this.registerTask('node', ['babel:cjs']);
+  this.registerTask('globals', ['webpack']);
   this.registerTask('tests', ['concat:tests']);
 
-  this.registerTask('release', 'Build final packages', ['amd', 'jshint', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
 
   // Load tasks from npm
   grunt.loadNpmTasks('grunt-contrib-clean');
@@ -191,11 +219,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-babel');
+  grunt.loadNpmTasks('grunt-eslint');
   grunt.loadNpmTasks('grunt-saucelabs');
-  grunt.loadNpmTasks('es6-module-packager');
+  grunt.loadNpmTasks('grunt-webpack');
 
   grunt.task.loadTasks('tasks');
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2014 by Yehuda Katz
+Copyright (C) 2011-2015 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

@@ -10,22 +10,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
-[http://www.handlebarsjs.com](http://www.handlebarsjs.com).
+[http://www.handlebarsjs.com](http://www.handlebarsjs.com) and the live demo at [http://tryhandlebarsjs.com/](http://tryhandlebarsjs.com/).
 
 Installing
 ----------
-Installing Handlebars is easy. Simply download the package [from the official site](http://handlebarsjs.com/) or the [bower repository][bower-repo] and add it to your web pages (you should usually use the most recent version).
 
-Alternatively, if you prefer having the latest version of handlebars from
-the 'master' branch, passing builds of the 'master' branch are automatically
-published to S3. You may download the latest passing master build by grabbing
-a `handlebars-latest.js` file from the [builds page][builds-page]. When the
-build is published, it is also available as a `handlebars-gitSHA.js` file on
-the builds page if you need a version to refer to others.
-`handlebars-runtime.js` builds are also available.
-
-**Note**: The S3 builds page is provided as a convenience for the community,
-but you should not use it for hosting Handlebars in production.
+See our [installation documentation](http://handlebarsjs.com/installation.html).
 
 Usage
 -----
@@ -55,266 +45,34 @@ var result = template(data);
 // </ul>
 ```
 
+Full documentation and more examples are at [handlebarsjs.com](http://handlebarsjs.com/).
 
-Registering Helpers
--------------------
-
-You can register helpers that Handlebars will use when evaluating your
-template. Here's an example, which assumes that your objects have a URL
-embedded in them, as well as the text for a link:
-
-```js
-Handlebars.registerHelper('link_to', function() {
-  return new Handlebars.SafeString("<a href='" + Handlebars.Utils.escapeExpression(this.url) + "'>" + Handlebars.Utils.escapeExpression(this.body) + "</a>");
-});
-
-var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
-var source = "<ul>{{#posts}}<li>{{link_to}}</li>{{/posts}}</ul>"
-
-var template = Handlebars.compile(source);
-template(context);
-
-// Would render:
-//
-// <ul>
-//   <li><a href='/hello-world'>Hello World!</a></li>
-// </ul>
-```
-
-Helpers take precedence over fields defined on the context. To access a field
-that is masked by a helper, a path reference may be used. In the example above
-a field named `link_to` on the `context` object would be referenced using:
-
-```
-{{./link_to}}
-```
-
-Escaping
---------
-
-By default, the `{{expression}}` syntax will escape its contents. This
-helps to protect you against accidental XSS problems caused by malicious
-data passed from the server as JSON.
-
-To explicitly *not* escape the contents, use the triple-mustache
-(`{{{}}}`). You have seen this used in the above example.
+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](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.
 
-### Paths
-
-Handlebars.js supports an extended expression syntax that we call paths.
-Paths are made up of typical expressions and . characters. Expressions
-allow you to not only display data from the current context, but to
-display data from contexts that are descendants and ancestors of the
-current context.
-
-To display data from descendant contexts, use the `.` character. So, for
-example, if your data were structured like:
-
-```js
-var data = {"person": { "name": "Alan" }, "company": {"name": "Rad, Inc." } };
-```
-
-You could display the person's name from the top-level context with the
-following expression:
-
-```
-{{person.name}}
-```
-
-You can backtrack using `../`. For example, if you've already traversed
-into the person object you could still display the company's name with
-an expression like `{{../company.name}}`, so:
-
-```
-{{#with person}}{{name}} - {{../company.name}}{{/person}}
-```
-
-would render:
-
-```
-Alan - Rad, Inc.
-```
-
-### Strings
-
-When calling a helper, you can pass paths or Strings as parameters. For
-instance:
-
-```js
-Handlebars.registerHelper('link_to', function(title, options) {
-  return "<a href='/posts" + this.url + "'>" + title + "!</a>"
-});
-
-var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
-var source = '<ul>{{#posts}}<li>{{{link_to "Post"}}}</li>{{/posts}}</ul>'
-
-var template = Handlebars.compile(source);
-template(context);
-
-// Would render:
-//
-// <ul>
-//   <li><a href='/posts/hello-world'>Post!</a></li>
-// </ul>
-```
-
-When you pass a String as a parameter to a helper, the literal String
-gets passed to the helper function.
-
-
-### Block Helpers
-
-Handlebars.js also adds the ability to define block helpers. Block
-helpers are functions that can be called from anywhere in the template.
-Here's an example:
-
-```js
-var source = "<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>";
-Handlebars.registerHelper('link', function(options) {
-  return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
-});
-var template = Handlebars.compile(source);
-
-var data = { "people": [
-    { "name": "Alan", "id": 1 },
-    { "name": "Yehuda", "id": 2 }
-  ]};
-template(data);
-
-// Should render:
-// <ul>
-//   <li><a href="/people/1">Alan</a></li>
-//   <li><a href="/people/2">Yehuda</a></li>
-// </ul>
-```
-
-Whenever the block helper is called it is given one or more parameters,
-any arguments that are passed in the helper in the call and an `options`
-object containing the `fn` function which executes the block's child.
-The block's current context may be accessed through `this`.
-
-Block helpers 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.
-
-### Partials
-
-You can register additional templates as partials, which will be used by
-Handlebars when it encounters a partial (`{{> partialName}}`). Partials
-can either be String templates or compiled template functions. Here's an
-example:
-
-```js
-var source = "<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>";
-
-Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>')
-var template = Handlebars.compile(source);
-
-var data = { "people": [
-    { "name": "Alan", "id": 1 },
-    { "name": "Yehuda", "id": 2 }
-  ]};
-
-template(data);
-
-// Should render:
-// <ul>
-//   <li><a href="/people/1">Alan</a></li>
-//   <li><a href="/people/2">Yehuda</a></li>
-// </ul>
-```
-
-### Comments
-
-You can add comments to your templates with the following syntax:
-
-```js
-{{! This is a comment }}
-```
-
-You can also use real html comments if you want them to end up in the output.
-
-```html
-<div>
-    {{! This comment will not end up in the output }}
-    <!-- This comment will show up in the output -->
-</div>
-```
+- [Nested Paths](http://handlebarsjs.com/#paths)
+- [Helpers](http://handlebarsjs.com/#helpers)
+- [Block Expressions](http://handlebarsjs.com/#block-expressions)
+- [Literal Values](http://handlebarsjs.com/#literals)
+- [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.
 
 ### Compatibility
 
 There are a few Mustache behaviors that Handlebars does not implement.
 - Handlebars deviates from Mustache slightly in that it does not perform recursive lookup by default. The compile time `compat` flag must be set to enable this functionality. Users should note that there is a performance cost for enabling this flag. The exact cost varies by template, but it's recommended that performance sensitive operations should avoid this mode and instead opt for explicit path references.
-- The optional Mustache-style lambdas are not supported. Instead Handlebars provides it's own lambda resolution that follows the behaviors of helpers.
-- Alternative delimeters are not supported.
+- The optional Mustache-style lambdas are not supported. Instead Handlebars provides its own lambda resolution that follows the behaviors of helpers.
+- Alternative delimiters are not supported.
 
 
-Precompiling Templates
-----------------------
-
-Handlebars allows templates to be precompiled and included as javascript
-code rather than the handlebars template allowing for faster startup time.
-
-### Installation
-The precompiler script may be installed via npm using the `npm install -g handlebars`
-command.
-
-### Usage
-
-<pre>
-Precompile handlebar templates.
-Usage: handlebars template...
-
-Options:
-  -a, --amd            Create an AMD format function (allows loading with RequireJS)          [boolean]
-  -f, --output         Output File                                                            [string]
-  -k, --known          Known helpers                                                          [string]
-  -o, --knownOnly      Known helpers only                                                     [boolean]
-  -m, --min            Minimize output                                                        [boolean]
-  -s, --simple         Output template function only.                                         [boolean]
-  -r, --root           Template root. Base value that will be stripped from template names.   [string]
-  -c, --commonjs       Exports CommonJS style, path to Handlebars module                      [string]
-  -h, --handlebarPath  Path to handlebar.js (only valid for amd-style)                        [string]
-  -n, --namespace      Template namespace                                                     [string]
-  -p, --partial        Compiling a partial template                                           [boolean]
-  -d, --data           Include data when compiling                                            [boolean]
-  -e, --extension      Template extension.                                                    [string]
-  -b, --bom            Removes the BOM (Byte Order Mark) from the beginning of the templates. [boolean]
-</pre>
-
-If using the precompiler's normal mode, the resulting templates will be
-stored to the `Handlebars.templates` object using the relative template
-name sans the extension. These templates may be executed in the same
-manner as templates.
-
-If using the simple mode the precompiler will generate a single
-javascript method. To execute this method it must be passed to
-the `Handlebars.template` method and the resulting object may be used as normal.
-
-### Optimizations
-
-- Rather than using the full _handlebars.js_ library, implementations that
-  do not need to compile templates at runtime may include _handlebars.runtime.js_
-  whose min+gzip size is approximately 1k.
-- If a helper is known to exist in the target environment they may be defined
-  using the `--known name` argument may be used to optimize accesses to these
-  helpers for size and speed.
-- When all helpers are known in advance the `--knownOnly` argument may be used
-  to optimize all block helper references.
-- Implementations that do not use `@data` variables can improve performance of
-  iteration centric templates by specifying `{data: false}` in the compiler options.
-
 Supported Environments
 ----------------------
 
@@ -364,6 +122,7 @@ Handlebars in the Wild
   and [@doowb](https://github.com/doowb), is a static site generator that uses Handlebars.js
   as its template engine.
 * [CoSchedule](http://coschedule.com) An editorial calendar for WordPress that uses Handlebars.js
+* [dashbars](https://github.com/pismute/dashbars) A modern helper library for Handlebars.js.
 * [Ember.js](http://www.emberjs.com) makes Handlebars.js the primary way to
   structure your views, also with automatic data binding support.
 * [Ghost](https://ghost.org/) Just a blogging platform.
@@ -371,6 +130,7 @@ Handlebars in the Wild
   from Les Hill (@leshill).
 * [handlebars-helpers](https://github.com/assemble/handlebars-helpers) is an extensive library
   with 100+ handlebars helpers.
+* [handlebars-layouts](https://github.com/shannonmoeller/handlebars-layouts) is a set of helpers which implement extendible and embeddable layout blocks as seen in other popular templating languages.
 * [hbs](http://github.com/donpark/hbs): An Express.js view engine adapter for Handlebars.js,
   from Don Park.
 * [koa-hbs](https://github.com/jwilm/koa-hbs): [koa](https://github.com/koajs/koa) generator based
@@ -381,6 +141,7 @@ Handlebars in the Wild
   Handlebars.js with [jQuery](http://jquery.com/).
 * [Lumbar](http://walmartlabs.github.io/lumbar) provides easy module-based template management for
   handlebars projects.
+* [Marionette.Handlebars](https://github.com/hashchange/marionette.handlebars) adds support for Handlebars and Mustache templates to Marionette.
 * [sammy.js](http://github.com/quirkey/sammy) by Aaron Quint, a.k.a. quirkey,
   supports Handlebars.js as one of its template plugins.
 * [SproutCore](http://www.sproutcore.com) uses Handlebars.js as its main
@@ -400,6 +161,4 @@ License
 -------
 Handlebars.js is released under the MIT license.
 
-[bower-repo]: https://github.com/components/handlebars.js
-[builds-page]: http://builds.handlebarsjs.com.s3.amazonaws.com/bucket-listing.html?sort=lastmod&sortdir=desc
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master

bench/.eslintrc

@@ -0,0 +1,14 @@
+{
+  "globals": {
+    "require": true
+  },
+  "rules": {
+    // Disabling for tests, for now.
+    "no-path-concat": 0,
+
+    "no-var": 0,
+    "no-shadow": 0,
+    "handle-callback-err": 0,
+    "no-console": 0
+  }
+}

bench/dist-size.js

@@ -1,5 +1,4 @@
-var _ = require('underscore'),
-    async = require('async'),
+var async = require('async'),
     fs = require('fs'),
     zlib = require('zlib');
 

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/templates/arguments.js

@@ -1,6 +1,6 @@
 module.exports = {
   helpers: {
-    foo: function(options) {
+    foo: function() {
       return '';
     }
   },

bench/templates/array-each.js

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

bench/templates/array-mustache.js

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

bench/templates/complex.js

@@ -3,13 +3,13 @@ var fs = require('fs');
 module.exports = {
   context: {
     header: function() {
-      return "Colors";
+      return 'Colors';
     },
     hasItems: true,   // To make things fairer in mustache land due to no `{{if}}` construct on arrays
     items: [
-      {name: "red", current: true, url: "#Red"},
-      {name: "green", current: false, url: "#Green"},
-      {name: "blue", current: false, url: "#Blue"}
+      {name: 'red', current: true, url: '#Red'},
+      {name: 'green', current: false, url: '#Green'},
+      {name: 'blue', current: false, url: '#Blue'}
     ]
   },
 

bench/templates/data.js

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

bench/templates/depth-1.js

@@ -1,6 +1,6 @@
 module.exports = {
-  context: { 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 %>"
+  context: { 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,6 +1,6 @@
 module.exports = {
-  context: { names: [{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: "<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>"
+  context: { names: [{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: '<% 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/object-mustache.js

@@ -1,4 +1,4 @@
 module.exports = {
-  context: { person: { name: "Larry", age: 45 } },
-  handlebars: "{{#person}}{{name}}{{age}}{{/person}}"
+  context: { person: { name: 'Larry', age: 45 } },
+  handlebars: '{{#person}}{{name}}{{age}}{{/person}}'
 };

bench/templates/object.js

@@ -1,7 +1,7 @@
 module.exports = {
-  context: { person: { name: "Larry", age: 45 } },
-  handlebars: "{{#with person}}{{name}}{{age}}{{/with}}",
-  dust: "{#person}{name}{age}{/person}",
-  eco: "<%= @person.name %><%= @person.age %>",
-  mustache: "{{#person}}{{name}}{{age}}{{/person}}"
+  context: { person: { name: 'Larry', age: 45 } },
+  handlebars: '{{#with person}}{{name}}{{age}}{{/with}}',
+  dust: '{#person}{name}{age}{/person}',
+  eco: '<%= @person.name %><%= @person.age %>',
+  mustache: '{{#person}}{{name}}{{age}}{{/person}}'
 };

bench/templates/partial-recursion.js

@@ -1,10 +1,10 @@
 module.exports = {
   context: { 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}}" }
+    mustache: { recursion: '{{name}}{{#kids}}{{>recursion}}{{/kids}}' },
+    handlebars: { recursion: '{{name}}{{#each kids}}{{>recursion}}{{/each}}' }
   },
-  handlebars: "{{name}}{{#each kids}}{{>recursion}}{{/each}}",
-  dust: "{name}{#kids}{>recursion:./}{/kids}",
-  mustache: "{{name}}{{#kids}}{{>recursion}}{{/kids}}"
+  handlebars: '{{name}}{{#each kids}}{{>recursion}}{{/each}}',
+  dust: '{name}{#kids}{>recursion:./}{/kids}',
+  mustache: '{{name}}{{#kids}}{{>recursion}}{{/kids}}'
 };

bench/templates/partial.js

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

bench/templates/paths.js

@@ -1,7 +1,7 @@
 module.exports = {
-  context: { person: { name: {bar: {baz: "Larry"}}, age: 45 } },
-  handlebars: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}",
-  dust: "{person.name.bar.baz}{person.age}{person.foo}{animal.age}",
-  eco: "<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>",
-  mustache: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}"
+  context: { person: { name: {bar: {baz: 'Larry'}}, age: 45 } },
+  handlebars: '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}',
+  dust: '{person.name.bar.baz}{person.age}{person.foo}{animal.age}',
+  eco: '<%= @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/string.js

@@ -1,7 +1,7 @@
 module.exports = {
   context: {},
-  handlebars: "Hello world",
-  dust: "Hello world",
-  mustache: "Hello world",
-  eco: "Hello world"
+  handlebars: 'Hello world',
+  dust: 'Hello world',
+  mustache: 'Hello world',
+  eco: 'Hello world'
 };

bench/templates/subexpression.js

@@ -4,11 +4,11 @@ module.exports = {
       return 'foo ' + value;
     },
     header: function() {
-      return "Colors";
+      return 'Colors';
     }
   },
-  handlebars: "{{echo (header)}}",
-  eco: "<%= @echo(@header()) %>"
+  handlebars: '{{echo (header)}}',
+  eco: '<%= @echo(@header()) %>'
 };
 
 module.exports.context = module.exports.helpers;

bench/templates/variables.js

@@ -1,8 +1,8 @@
 module.exports = {
-  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."
+  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,23 +1,22 @@
 var _ = require('underscore'),
     runner = require('./util/template-runner'),
-    templates = require('./templates'),
 
-    eco, dust, Handlebars, Mustache, eco;
+    eco, dust, Handlebars, Mustache;
 
 try {
-  dust = require("dustjs-linkedin");
+  dust = require('dustjs-linkedin');
 } catch (err) { /* NOP */ }
 
 try {
-  Mustache = require("mustache");
+  Mustache = require('mustache');
 } catch (err) { /* NOP */ }
 
 try {
-  eco = require("eco");
+  eco = require('eco');
 } catch (err) { /* NOP */ }
 
 function error() {
-  throw new Error("EWOT");
+  throw new Error('EWOT');
 }
 
 function makeSuite(bench, name, template, handlebarsOnly) {
@@ -34,19 +33,19 @@ function makeSuite(bench, name, template, handlebarsOnly) {
       mustacheOut;
 
   var handlebar = Handlebars.compile(template.handlebars, {data: false}),
-      compat =  Handlebars.compile(template.handlebars, {data: false, compat: true}),
+      compat = Handlebars.compile(template.handlebars, {data: false, compat: true}),
       options = {helpers: template.helpers};
-  _.each(template.partials && template.partials.handlebars, function(partial, name) {
-    Handlebars.registerPartial(name, 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);
-  bench("handlebars", function() {
+  bench('handlebars', function() {
     handlebar(context, options);
   });
 
   compatOut = compat(context, options);
-  bench("compat", function() {
+  bench('compat', function() {
     compat(context, options);
   });
 
@@ -61,8 +60,8 @@ function makeSuite(bench, name, template, handlebarsOnly) {
 
       dust.render(templateName, context, function(err, out) { dustOut = out; });
 
-      bench("dust", function() {
-        dust.render(templateName, context, function(err, out) { });
+      bench('dust', function() {
+        dust.render(templateName, context, function() {});
       });
     } else {
       bench('dust', error);
@@ -75,11 +74,11 @@ function makeSuite(bench, name, template, handlebarsOnly) {
 
       ecoOut = ecoTemplate(context);
 
-      bench("eco", function() {
+      bench('eco', function() {
         ecoTemplate(context);
       });
     } else {
-      bench("eco", error);
+      bench('eco', error);
     }
   }
 
@@ -90,11 +89,11 @@ function makeSuite(bench, name, template, handlebarsOnly) {
     if (mustacheSource) {
       mustacheOut = Mustache.to_html(mustacheSource, context, mustachePartials);
 
-      bench("mustache", function() {
+      bench('mustache', function() {
         Mustache.to_html(mustacheSource, context, mustachePartials);
       });
     } else {
-      bench("mustache", error);
+      bench('mustache', error);
     }
   }
 

bench/util/benchwarmer.js

@@ -1,7 +1,7 @@
 var _ = require('underscore'),
-    Benchmark = require("benchmark");
+    Benchmark = require('benchmark');
 
-var BenchWarmer = function(names) {
+function BenchWarmer() {
   this.benchmarks = [];
   this.currentBenches = [];
   this.names = [];
@@ -9,9 +9,9 @@ var BenchWarmer = function(names) {
   this.minimum = Infinity;
   this.maximum = -Infinity;
   this.errors = {};
-};
+}
 
-var print = require("sys").print;
+var print = require('sys').print;
 
 BenchWarmer.prototype = {
   winners: function(benches) {
@@ -29,7 +29,7 @@ BenchWarmer.prototype = {
     });
   },
   push: function(name, fn) {
-    if(this.names.indexOf(name) == -1) {
+    if (this.names.indexOf(name) == -1) {
       this.names.push(name);
     }
 
@@ -37,9 +37,9 @@ BenchWarmer.prototype = {
     this.first = false;
 
     var bench = new Benchmark(fn, {
-      name: this.suiteName + ": " + name,
+      name: this.suiteName + ': ' + name,
       onComplete: function() {
-        if(first) { self.startLine(suiteName); }
+        if (first) { self.startLine(suiteName); }
         self.writeBench(bench);
         self.currentBenches.push(bench);
       }, onError: function() {
@@ -58,7 +58,7 @@ BenchWarmer.prototype = {
     this.printHeader('ops/msec', true);
 
     Benchmark.invoke(this.benchmarks, {
-      name: "run",
+      name: 'run',
       onComplete: function() {
         self.scaleTimes();
 
@@ -76,7 +76,7 @@ BenchWarmer.prototype = {
         print('\n');
 
         var errors = false, prop, bench;
-        for(prop in self.errors) {
+        for (prop in self.errors) {
           if (self.errors.hasOwnProperty(prop)
               && self.errors[prop].error.message !== 'EWOT') {
             errors = true;
@@ -84,18 +84,18 @@ BenchWarmer.prototype = {
           }
         }
 
-        if(errors) {
-          print("\n\nErrors:\n");
-          for(prop in self.errors) {
+        if (errors) {
+          print('\n\nErrors:\n');
+          for (prop in self.errors) {
             if (self.errors.hasOwnProperty(prop)
                 && self.errors[prop].error.message !== 'EWOT') {
               bench = self.errors[prop];
-              print("\n" + bench.name + ":\n");
+              print('\n' + bench.name + ':\n');
               print(bench.error.message);
-              if(bench.error.stack) {
-                print(bench.error.stack.join("\n"));
+              if (bench.error.stack) {
+                print(bench.error.stack.join('\n'));
               }
-              print("\n");
+              print('\n');
             }
           }
         }
@@ -104,7 +104,7 @@ BenchWarmer.prototype = {
       }
     });
 
-    print("\n");
+    print('\n');
   },
 
   scaleTimes: function() {
@@ -121,10 +121,10 @@ BenchWarmer.prototype = {
   printHeader: function(title, winners) {
     var benchSize = 0, names = this.names, i, l;
 
-    for(i=0, l=names.length; i<l; i++) {
+    for (i = 0, l = names.length; i < l; i++) {
       var name = names[i];
 
-      if(benchSize < name.length) { benchSize = name.length; }
+      if (benchSize < name.length) { benchSize = name.length; }
     }
 
     this.nameSize = benchSize + 2;
@@ -133,28 +133,28 @@ BenchWarmer.prototype = {
 
     this.startLine(title);
     horSize = horSize + this.benchSize;
-    for(i=0, l=names.length; i<l; i++) {
+    for (i = 0, l = names.length; i < l; i++) {
       this.writeValue(names[i]);
       horSize = horSize + this.benchSize;
     }
 
     if (winners) {
-      print("WINNER(S)");
-      horSize = horSize + "WINNER(S)".length;
+      print('WINNER(S)');
+      horSize = horSize + 'WINNER(S)'.length;
     }
 
-    print("\n" + new Array(horSize + 1).join("-"));
+    print('\n' + new Array(horSize + 1).join('-'));
   },
 
   startLine: function(name) {
     var winners = Benchmark.map(this.winners(this.currentBenches), function(bench) {
-      return bench.name.split(": ")[1];
+      return bench.name.split(': ')[1];
     });
 
     this.currentBenches = [];
 
-    print(winners.join(", "));
-    print("\n");
+    print(winners.join(', '));
+    print('\n');
 
     if (name) {
       this.writeValue(name);
@@ -163,9 +163,9 @@ BenchWarmer.prototype = {
   writeBench: function(bench) {
     var out;
 
-    if(!bench.error) {
+    if (!bench.error) {
       var count = bench.hz,
-          moe   = count * bench.stats.rme / 100,
+          moe = count * bench.stats.rme / 100,
           minimum,
           maximum;
 
@@ -174,24 +174,22 @@ BenchWarmer.prototype = {
       minimum = count - moe;
       maximum = count + moe;
 
-      out = count + " ±" + moe + " (" + bench.cycles + ")";
+      out = count + ' ±' + moe + ' (' + bench.cycles + ')';
 
       this.times[bench.suiteName][bench.benchName] = count;
       this.minimum = Math.min(this.minimum, minimum);
       this.maximum = Math.max(this.maximum, maximum);
+    } else if (bench.error.message === 'EWOT') {
+      out = 'NA';
     } else {
-      if (bench.error.message === 'EWOT') {
-        out = 'NA';
-      } else {
-        out = 'E';
-      }
+      out = 'E';
     }
     this.writeValue(out);
   },
 
   writeValue: function(out) {
     var padding = this.benchSize - out.length + 1;
-    out = out + new Array(padding).join(" ");
+    out = out + new Array(padding).join(' ');
     print(out);
   }
 };

bench/util/template-runner.js

@@ -22,6 +22,8 @@ module.exports = function(grunt, makeSuite, callback) {
   });
 
   warmer.bench(function() {
-    callback && callback(warmer.times, warmer.scaled);
+    if (callback) {
+      callback(warmer.times, warmer.scaled);
+    }
   });
 };

bin/handlebars

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
 var optimist = require('optimist')
-    .usage('Precompile handlebar templates.\nUsage: $0 template...', {
+    .usage('Precompile handlebar templates.\nUsage: $0 [template|directory]...', {
       'f': {
         'type': 'string',
         'description': 'Output File',
         'alias': 'output'
       },
+      'map': {
+        'type': 'string',
+        'description': 'Source Map File'
+      },
       'a': {
         'type': 'boolean',
         'description': 'Exports amd style (require.js)',
@@ -22,7 +26,7 @@ var optimist = require('optimist')
         'type': 'string',
         'description': 'Path to handlebar.js (only valid for amd-style)',
         'alias': 'handlebarPath',
-  	    'default': ''
+        'default': ''
       },
       'k': {
         'type': 'string',
@@ -50,17 +54,27 @@ var optimist = require('optimist')
         'description': 'Output template function only.',
         'alias': 'simple'
       },
+      'N': {
+        'type': 'string',
+        'description': 'Name of passed string templates. Optional if running in a simple mode. Required when operating on multiple templates.',
+        'alias': 'name'
+      },
+      'i': {
+        'type': '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',
         'description': 'Template root. Base value that will be stripped from template names.',
         'alias': 'root'
       },
-      'p' : {
+      'p': {
         'type': 'boolean',
         'description': 'Compiling a partial template',
         'alias': 'partial'
       },
-      'd' : {
+      'd': {
         'type': 'boolean',
         'description': 'Include data when compiling',
         'alias': 'data'
@@ -80,16 +94,35 @@ var optimist = require('optimist')
         'type': 'boolean',
         'description': 'Prints the current compiler version',
         'alias': 'version'
+      },
+
+      'help': {
+        'type': 'boolean',
+        'description': 'Outputs this message'
       }
     })
 
+    .wrap(120)
     .check(function(argv) {
       if (argv.version) {
         return;
       }
     });
 
+
 var argv = optimist.argv;
-argv.templates = argv._;
+argv.files = argv._;
 delete argv._;
-return require('../lib/precompiler').cli(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)) {
+    optimist.showHelp();
+  } else {
+    Precompiler.cli(opts);
+  }
+});

components/bower.json

@@ -1,6 +1,7 @@
 {
   "name": "handlebars",
-  "version": "2.0.0-beta.1",
+  "version": "4.0.2",
   "main": "handlebars.js",
+  "license": "MIT",
   "dependencies": {}
 }

components/handlebars-source.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Handlebars.js source code wrapper for (pre)compilation gems.}
   gem.summary       = %q{Handlebars.js source code wrapper}
   gem.homepage      = "https://github.com/wycats/handlebars.js/"
-  gem.version       = package["version"]
+  gem.version       = package["version"].sub "-", "."
   gem.license       = "MIT"
 
   gem.files = [

components/handlebars.js.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>handlebars.js</id>
-		<version>2.0.0-beta.1</version>
+		<version>4.0.2</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>

docs/compiler-api.md

@@ -0,0 +1,316 @@
+# Handlebars Compiler APIs
+
+There are a number of formal APIs that tool implementors may interact with.
+
+## AST
+
+Other tools may interact with the formal AST as defined below. Any JSON structure matching this pattern may be used and passed into the `compile` and `precompile` methods in the same way as the text for a template.
+
+AST structures may be generated either with the `Handlebars.parse` method and then manipulated, via the `Handlebars.AST` objects of the same name, or constructed manually as a generic JavaScript object matching the structure defined below.
+
+```javascript
+var ast = Handlebars.parse(myTemplate);
+
+// Modify ast
+
+Handlebars.precompile(ast);
+```
+
+
+### Basic
+
+```java
+interface Node {
+    type: string;
+    loc: SourceLocation | null;
+}
+
+interface SourceLocation {
+    source: string | null;
+    start: Position;
+    end: Position;
+}
+
+interface Position {
+    line: uint >= 1;
+    column: uint >= 0;
+}
+```
+
+### Programs
+
+```java
+interface Program <: Node {
+    type: "Program";
+    body: [ Statement ];
+    
+    blockParams: [ string ];
+}
+```
+
+### Statements
+
+```java
+interface Statement <: Node { }
+
+interface MustacheStatement <: Statement {
+    type: "MustacheStatement";
+
+    path: PathExpression | Literal;
+    params: [ Expression ];
+    hash: Hash;
+
+    escaped: boolean;
+    strip: StripFlags | null;
+}
+
+interface BlockStatement <: Statement {
+    type: "BlockStatement";
+    path: PathExpression;
+    params: [ Expression ];
+    hash: Hash;
+
+    program: Program | null;
+    inverse: Program | null;
+
+    openStrip: StripFlags | null;
+    inverseStrip: StripFlags | null;
+    closeStrip: StripFlags | null;
+}
+
+interface PartialStatement <: Statement {
+    type: "PartialStatement";
+    name: PathExpression | SubExpression;
+    params: [ Expression ];
+    hash: Hash;
+
+    indent: string;
+    strip: StripFlags | null;
+}
+
+interface PartialBlockStatement <: Statement {
+    type: "PartialBlockStatement";
+    name: PathExpression | SubExpression;
+    params: [ Expression ];
+    hash: Hash;
+
+    program: Program | null;
+
+    indent: string;
+    openStrip: StripFlags | null;
+    closeStrip: StripFlags | null;
+}
+```
+
+`name` will be a `SubExpression` when tied to a dynamic partial, i.e. `{{> (foo) }}`, otherwise this is a path or literal whose `original` value is used to lookup the desired partial.
+
+
+```java
+interface ContentStatement <: Statement {
+    type: "ContentStatement";
+    value: string;
+    original: string;
+}
+
+interface CommentStatement <: Statement {
+    type: "CommentStatement";
+    value: string;
+
+    strip: StripFlags | null;
+}
+```
+
+
+```java
+interface Decorator <: Statement {
+    type: "Decorator";
+
+    path: PathExpression | Literal;
+    params: [ Expression ];
+    hash: Hash;
+
+    strip: StripFlags | null;
+}
+
+interface DecoratorBlock <: Statement {
+    type: "DecoratorBlock";
+    path: PathExpression | Literal;
+    params: [ Expression ];
+    hash: Hash;
+
+    program: Program | null;
+
+    openStrip: StripFlags | null;
+    closeStrip: StripFlags | null;
+}
+```
+
+Decorator paths only utilize the `path.original` value and as a consequence do not support depthed evaluation.
+
+### Expressions
+
+```java
+interface Expression <: Node { }
+```
+
+##### SubExpressions
+
+```java
+interface SubExpression <: Expression {
+    type: "SubExpression";
+    path: PathExpression;
+    params: [ Expression ];
+    hash: Hash;
+}
+```
+
+##### Paths
+
+```java
+interface PathExpression <: Expression {
+    type: "PathExpression";
+    data: boolean;
+    depth: uint >= 0;
+    parts: [ string ];
+    original: string;
+}
+```
+
+- `data` is true when the given expression is a `@data` reference.
+- `depth` is an integer representation of which context the expression references. `0` represents the current context, `1` would be `../`, etc.
+- `parts` is an array of the names in the path. `foo.bar` would be `['foo', 'bar']`. Scope references, `.`, `..`, and `this` should be omitted from this array.
+- `original` is the path as entered by the user. Separator and scope references are left untouched.
+
+
+##### Literals
+
+```java
+interface Literal <: Expression { }
+
+interface StringLiteral <: Literal {
+    type: "StringLiteral";
+    value: string;
+    original: string;
+}
+
+interface BooleanLiteral <: Literal {
+    type: "BooleanLiteral";
+    value: boolean;
+    original: boolean;
+}
+
+interface NumberLiteral <: Literal {
+    type: "NumberLiteral";
+    value: number;
+    original: number;
+}
+
+interface UndefinedLiteral <: Literal {
+    type: "UndefinedLiteral";
+}
+
+interface NullLiteral <: Literal {
+    type: "NullLiteral";
+}
+```
+
+
+### Miscellaneous
+
+```java
+interface Hash <: Node {
+    type: "Hash";
+    pairs: [ HashPair ];
+}
+
+interface HashPair <: Node {
+    type: "HashPair";
+    key: string;
+    value: Expression;
+}
+
+interface StripFlags {
+    open: boolean;
+    close: boolean;
+}
+```
+
+`StripFlags` are used to signify whitespace control character that may have been entered on a given statement.
+
+## AST Visitor
+
+`Handlebars.Visitor` is available as a base class for general interaction with AST structures. This will by default traverse the entire tree and individual methods may be overridden to provide specific responses to particular nodes.
+
+Recording all referenced partial names:
+
+```javascript
+var Visitor = Handlebars.Visitor;
+
+function ImportScanner() {
+  this.partials = [];
+}
+ImportScanner.prototype = new Visitor();
+
+ImportScanner.prototype.PartialStatement = function(partial) {
+  this.partials.push({request: partial.name.original});
+
+  Visitor.prototype.PartialStatement.call(this, partial);
+};
+
+var scanner = new ImportScanner();
+scanner.accept(ast);
+```
+
+The current node's ancestors will be maintained in the `parents` array, with the most recent parent listed first.
+
+The visitor may also be configured to operate in mutation mode by setting the `mutation` field to true. When in this mode, handler methods may return any valid AST node and it will replace the one they are currently operating on. Returning `false` will remove the given value (if valid) and returning `undefined` will leave the node in tact. This return structure only apply to mutation mode and non-mutation mode visitors are free to return whatever values they wish.
+
+Implementors that may need to support mutation mode are encouraged to utilize the `acceptKey`, `acceptRequired` and `acceptArray` helpers which provide the conditional overwrite behavior as well as implement sanity checks where pertinent.
+
+## JavaScript Compiler
+
+The `Handlebars.JavaScriptCompiler` object has a number of methods that may be customized to alter the output of the compiler:
+
+- `nameLookup(parent, name, type)`
+  Used to generate the code to resolve a give path component.
+
+  - `parent` is the existing code in the path resolution
+  - `name` is the current path component
+  - `type` is the type of name being evaluated. May be one of `context`, `data`, `helper`, `decorator`, or `partial`.
+
+  Note that this does not impact dynamic partials, which implementors need to be aware of. Overriding `VM.resolvePartial` may be required to support dynamic cases.
+
+- `depthedLookup(name)`
+  Used to generate code that resolves parameters within any context in the stack. Is only used in `compat` mode. 
+
+- `compilerInfo()`
+  Allows for custom compiler flags used in the runtime version checking logic.
+
+- `appendToBuffer(source, location, explicit)`
+    Allows for code buffer emitting code. Defaults behavior is string concatenation.
+
+    - `source` is the source code whose result is to be appending
+    - `location` is the location of the source in the source map.
+    - `explicit` is a flag signaling that the emit operation must occur, vs. the lazy evaled options otherwise.
+
+- `initializeBuffer()`
+    Allows for buffers other than the default string buffer to be used. Generally needs to be paired with a custom `appendToBuffer` implementation.
+
+```javascript
+function MyCompiler() {
+  Handlebars.JavaScriptCompiler.apply(this, arguments);
+}
+MyCompiler.prototype = Object.create(Handlebars.JavaScriptCompiler);
+
+MyCompiler.nameLookup = function(parent, name, type) {
+  if (type === 'partial') {
+    return 'MyPartialList[' + JSON.stringify(name) ']';
+  } else {
+    return Handlebars.JavaScriptCompiler.prototype.nameLookup.call(this, parent, name, type);
+  }
+};
+
+var env = Handlebars.create();
+env.JavaScriptCompiler = MyCompiler;
+env.compile('my template');
+```

docs/decorators-api.md

@@ -0,0 +1,19 @@
+# Decorators
+
+Decorators allow for blocks to be annotated with metadata or wrapped in functionality prior to execution of the block. This may be used to communicate with the containing helper or to setup a particular state in the system prior to running the block.
+
+Decorators are registered through similar methods as helpers, `registerDecorators` and `unregisterDecorators`. These can then be referenced via the friendly name in the template using the `{{* decorator}}` and `{{#* decorator}}{/decorator}}` syntaxes. These syntaxs are derivitives of the normal mustache syntax and as such have all of the same argument and whitespace behaviors.
+
+Decorators are executed when the block program is instantiated and are passed `(program, props, container, context, data, blockParams, depths)`
+
+- `program`: The block to wrap
+- `props`: Object used to set metadata on the final function. Any values set on this object will be set on the function, regardless of if the original function is replaced or not. Metadata should be applied using this object as values applied to `program` may be masked by subsequent decorators that may wrap `program`.
+- `container`: The current runtime container
+- `context`: The current context. Since the decorator is run before the block that contains it, this is the parent context.
+- `data`: The current `@data` values
+- `blockParams`: The current block parameters stack
+- `depths`: The current context stack
+
+Decorators may set values on `props` or return a modified function that wraps `program` in particular behaviors. If the decorator returns nothing, then `program` is left unaltered.
+
+The [inline partial](https://github.com/wycats/handlebars.js/blob/master/lib/handlebars/decorators/inline.js) implementation provides an example of decorators being used for both metadata and wrapping behaviors.

lib/handlebars.js

@@ -1,20 +1,22 @@
-/*globals Handlebars: true */
-import Handlebars from "./handlebars.runtime";
+import runtime from './handlebars.runtime';
 
 // Compiler imports
-import AST from "./handlebars/compiler/ast";
-import { parser as Parser, parse } from "./handlebars/compiler/base";
-import { Compiler, compile, precompile } from "./handlebars/compiler/compiler";
-import JavaScriptCompiler from "./handlebars/compiler/javascript-compiler";
+import AST from './handlebars/compiler/ast';
+import { parser as Parser, parse } 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';
 
-var _create = Handlebars.create;
-var create = function() {
-  var hb = _create();
+import noConflict from './handlebars/no-conflict';
+
+let _create = runtime.create;
+function create() {
+  let hb = _create();
 
   hb.compile = function(input, options) {
     return compile(input, options, hb);
   };
-  hb.precompile = function (input, options) {
+  hb.precompile = function(input, options) {
     return precompile(input, options, hb);
   };
 
@@ -25,11 +27,15 @@ var create = function() {
   hb.parse = parse;
 
   return hb;
-};
+}
 
-Handlebars = create();
-Handlebars.create = create;
+let inst = create();
+inst.create = create;
 
-Handlebars['default'] = Handlebars;
+noConflict(inst);
 
-export default Handlebars;
+inst.Visitor = Visitor;
+
+inst['default'] = inst;
+
+export default inst;

lib/handlebars.runtime.js

@@ -1,16 +1,17 @@
-/*globals Handlebars: true */
-module base from "./handlebars/base";
+import * as base from './handlebars/base';
 
 // Each of these augment the Handlebars object. No need to setup here.
 // (This is done to easily share code between commonjs and browse envs)
-import SafeString from "./handlebars/safe-string";
-import Exception from "./handlebars/exception";
-module Utils from "./handlebars/utils";
-module runtime from "./handlebars/runtime";
+import SafeString from './handlebars/safe-string';
+import Exception from './handlebars/exception';
+import * as Utils from './handlebars/utils';
+import * as runtime from './handlebars/runtime';
+
+import noConflict from './handlebars/no-conflict';
 
 // For compatibility and usage outside of module systems, make the Handlebars object a namespace
-var create = function() {
-  var hb = new base.HandlebarsEnvironment();
+function create() {
+  let hb = new base.HandlebarsEnvironment();
 
   Utils.extend(hb, base);
   hb.SafeString = SafeString;
@@ -24,11 +25,13 @@ var create = function() {
   };
 
   return hb;
-};
+}
 
-var Handlebars = create();
-Handlebars.create = create;
+let inst = create();
+inst.create = create;
 
-Handlebars['default'] = Handlebars;
+noConflict(inst);
 
-export default Handlebars;
+inst['default'] = inst;
+
+export default inst;

lib/handlebars/base.js

@@ -1,40 +1,43 @@
-module Utils from "./utils";
-import Exception from "./exception";
+import {createFrame, extend, toString} from './utils';
+import Exception from './exception';
+import {registerDefaultHelpers} from './helpers';
+import {registerDefaultDecorators} from './decorators';
+import logger from './logger';
 
-export var VERSION = "2.0.0-beta.1";
-export var COMPILER_REVISION = 6;
+export const VERSION = '4.0.2';
+export const COMPILER_REVISION = 7;
 
-export var REVISION_CHANGES = {
+export const REVISION_CHANGES = {
   1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
   2: '== 1.0.0-rc.3',
   3: '== 1.0.0-rc.4',
   4: '== 1.x.x',
   5: '== 2.0.0-alpha.x',
-  6: '>= 2.0.0-beta.1'
+  6: '>= 2.0.0-beta.1',
+  7: '>= 4.0.0'
 };
 
-var isArray = Utils.isArray,
-    isFunction = Utils.isFunction,
-    toString = Utils.toString,
-    objectType = '[object Object]';
+const objectType = '[object Object]';
 
-export function HandlebarsEnvironment(helpers, partials) {
+export function HandlebarsEnvironment(helpers, partials, decorators) {
   this.helpers = helpers || {};
   this.partials = partials || {};
+  this.decorators = decorators || {};
 
   registerDefaultHelpers(this);
+  registerDefaultDecorators(this);
 }
 
 HandlebarsEnvironment.prototype = {
   constructor: HandlebarsEnvironment,
 
   logger: logger,
-  log: log,
+  log: logger.log,
 
   registerHelper: function(name, fn) {
     if (toString.call(name) === objectType) {
       if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-      Utils.extend(this.helpers, name);
+      extend(this.helpers, name);
     } else {
       this.helpers[name] = fn;
     }
@@ -43,187 +46,33 @@ HandlebarsEnvironment.prototype = {
     delete this.helpers[name];
   },
 
-  registerPartial: function(name, str) {
+  registerPartial: function(name, partial) {
     if (toString.call(name) === objectType) {
-      Utils.extend(this.partials,  name);
+      extend(this.partials, name);
     } else {
-      this.partials[name] = str;
+      if (typeof partial === 'undefined') {
+        throw new Exception('Attempting to register a partial as undefined');
+      }
+      this.partials[name] = partial;
     }
   },
   unregisterPartial: function(name) {
     delete this.partials[name];
+  },
+
+  registerDecorator: function(name, fn) {
+    if (toString.call(name) === objectType) {
+      if (fn) { throw new Exception('Arg not supported with multiple decorators'); }
+      extend(this.decorators, name);
+    } else {
+      this.decorators[name] = fn;
+    }
+  },
+  unregisterDecorator: function(name) {
+    delete this.decorators[name];
   }
 };
 
-function registerDefaultHelpers(instance) {
-  instance.registerHelper('helperMissing', function(/* [args, ]options */) {
-    if(arguments.length === 1) {
-      // A missing field in a {{foo}} constuct.
-      return undefined;
-    } else {
-      // Someone is actually trying to call something, blow up.
-      throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
-    }
-  });
+export let log = logger.log;
 
-  instance.registerHelper('blockHelperMissing', function(context, options) {
-    var inverse = options.inverse,
-        fn = options.fn;
-
-    if(context === true) {
-      return fn(this);
-    } else if(context === false || context == null) {
-      return inverse(this);
-    } else if (isArray(context)) {
-      if(context.length > 0) {
-        if (options.ids) {
-          options.ids = [options.name];
-        }
-
-        return instance.helpers.each(context, options);
-      } else {
-        return inverse(this);
-      }
-    } else {
-      if (options.data && options.ids) {
-        var data = createFrame(options.data);
-        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
-        options = {data: data};
-      }
-
-      return fn(context, options);
-    }
-  });
-
-  instance.registerHelper('each', function(context, options) {
-    if (!options) {
-      throw new Exception('Must pass iterator to #each');
-    }
-
-    var fn = options.fn, inverse = options.inverse;
-    var i = 0, ret = "", data;
-
-    var contextPath;
-    if (options.data && options.ids) {
-      contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-    }
-
-    if (isFunction(context)) { context = context.call(this); }
-
-    if (options.data) {
-      data = createFrame(options.data);
-    }
-
-    if(context && typeof context === 'object') {
-      if (isArray(context)) {
-        for(var j = context.length; i<j; i++) {
-          if (data) {
-            data.index = i;
-            data.first = (i === 0);
-            data.last  = (i === (context.length-1));
-
-            if (contextPath) {
-              data.contextPath = contextPath + i;
-            }
-          }
-          ret = ret + fn(context[i], { data: data });
-        }
-      } else {
-        for(var key in context) {
-          if(context.hasOwnProperty(key)) {
-            if(data) {
-              data.key = key;
-              data.index = i;
-              data.first = (i === 0);
-
-              if (contextPath) {
-                data.contextPath = contextPath + key;
-              }
-            }
-            ret = ret + fn(context[key], {data: data});
-            i++;
-          }
-        }
-      }
-    }
-
-    if(i === 0){
-      ret = inverse(this);
-    }
-
-    return ret;
-  });
-
-  instance.registerHelper('if', function(conditional, options) {
-    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
-    // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-    if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
-      return options.inverse(this);
-    } else {
-      return options.fn(this);
-    }
-  });
-
-  instance.registerHelper('unless', function(conditional, options) {
-    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-  });
-
-  instance.registerHelper('with', function(context, options) {
-    if (isFunction(context)) { context = context.call(this); }
-
-    var fn = options.fn;
-
-    if (!Utils.isEmpty(context)) {
-      if (options.data && options.ids) {
-        var data = createFrame(options.data);
-        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
-        options = {data:data};
-      }
-
-      return fn(context, options);
-    } else {
-      return options.inverse(this);
-    }
-  });
-
-  instance.registerHelper('log', function(context, options) {
-    var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-    instance.log(level, context);
-  });
-
-  instance.registerHelper('lookup', function(obj, field) {
-    return obj && obj[field];
-  });
-}
-
-export var logger = {
-  methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
-
-  // State enum
-  DEBUG: 0,
-  INFO: 1,
-  WARN: 2,
-  ERROR: 3,
-  level: 3,
-
-  // can be overridden in the host environment
-  log: function(level, obj) {
-    if (logger.level <= level) {
-      var method = logger.methodMap[level];
-      if (typeof console !== 'undefined' && console[method]) {
-        console[method].call(console, obj);
-      }
-    }
-  }
-};
-
-export var log = logger.log;
-
-export var createFrame = function(object) {
-  var frame = Utils.extend({}, object);
-  frame._parent = object;
-  return frame;
-};
+export {createFrame, logger};

lib/handlebars/compiler/ast.js

@@ -1,213 +1,28 @@
-import Exception from "../exception";
-
-function LocationInfo(locInfo) {
-  locInfo = locInfo || {};
-  this.firstLine   = locInfo.first_line;
-  this.firstColumn = locInfo.first_column;
-  this.lastColumn  = locInfo.last_column;
-  this.lastLine    = locInfo.last_line;
-}
-
-var AST = {
-  ProgramNode: function(statements, strip, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "program";
-    this.statements = statements;
-    this.strip = strip;
-  },
-
-  MustacheNode: function(rawParams, hash, open, strip, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "mustache";
-    this.strip = strip;
-
-    // Open may be a string parsed from the parser or a passed boolean flag
-    if (open != null && open.charAt) {
-      // Must use charAt to support IE pre-10
-      var escapeFlag = open.charAt(3) || open.charAt(2);
-      this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
-    } else {
-      this.escaped = !!open;
-    }
-
-    if (rawParams instanceof AST.SexprNode) {
-      this.sexpr = rawParams;
-    } else {
-      // Support old AST API
-      this.sexpr = new AST.SexprNode(rawParams, hash);
-    }
-
-    // Support old AST API that stored this info in MustacheNode
-    this.id = this.sexpr.id;
-    this.params = this.sexpr.params;
-    this.hash = this.sexpr.hash;
-    this.eligibleHelper = this.sexpr.eligibleHelper;
-    this.isHelper = this.sexpr.isHelper;
-  },
-
-  SexprNode: function(rawParams, hash, locInfo) {
-    LocationInfo.call(this, locInfo);
-
-    this.type = "sexpr";
-    this.hash = hash;
-
-    var id = this.id = rawParams[0];
-    var params = this.params = rawParams.slice(1);
-
+let AST = {
+  // Public API used to evaluate derived attributes regarding AST nodes
+  helpers: {
     // a mustache is definitely a helper if:
     // * it is an eligible helper, and
     // * it has at least one parameter or hash segment
-    this.isHelper = !!(params.length || hash);
+    helperExpression: function(node) {
+      return (node.type === 'SubExpression')
+          || ((node.type === 'MustacheStatement' || node.type === 'BlockStatement')
+            && !!((node.params && node.params.length) || node.hash));
+    },
 
-    // a mustache is an eligible helper if:
-    // * its id is simple (a single part, not `this` or `..`)
-    this.eligibleHelper = this.isHelper || id.isSimple;
-
-    // if a mustache is an eligible helper but not a definite
-    // helper, it is ambiguous, and will be resolved in a later
-    // pass or at runtime.
-  },
-
-  PartialNode: function(partialName, context, hash, strip, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type         = "partial";
-    this.partialName  = partialName;
-    this.context      = context;
-    this.hash = hash;
-    this.strip = strip;
-
-    this.strip.inlineStandalone = true;
-  },
-
-  BlockNode: function(mustache, program, inverse, strip, locInfo) {
-    LocationInfo.call(this, locInfo);
-
-    this.type = 'block';
-    this.mustache = mustache;
-    this.program  = program;
-    this.inverse  = inverse;
-    this.strip = strip;
-
-    if (inverse && !program) {
-      this.isInverse = true;
-    }
-  },
-
-  RawBlockNode: function(mustache, content, close, locInfo) {
-    LocationInfo.call(this, locInfo);
-
-    if (mustache.sexpr.id.original !== close) {
-      throw new Exception(mustache.sexpr.id.original + " doesn't match " + close, this);
-    }
-
-    content = new AST.ContentNode(content, locInfo);
-
-    this.type = 'block';
-    this.mustache = mustache;
-    this.program = new AST.ProgramNode([content], {}, locInfo);
-  },
-
-  ContentNode: function(string, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "content";
-    this.original = this.string = string;
-  },
-
-  HashNode: function(pairs, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "hash";
-    this.pairs = pairs;
-  },
-
-  IdNode: function(parts, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "ID";
-
-    var original = "",
-        dig = [],
-        depth = 0,
-        depthString = '';
-
-    for(var i=0,l=parts.length; i<l; i++) {
-      var part = parts[i].part;
-      original += (parts[i].separator || '') + part;
-
-      if (part === ".." || part === "." || part === "this") {
-        if (dig.length > 0) {
-          throw new Exception("Invalid path: " + original, this);
-        } else if (part === "..") {
-          depth++;
-          depthString += '../';
-        } else {
-          this.isScoped = true;
-        }
-      } else {
-        dig.push(part);
-      }
-    }
-
-    this.original = original;
-    this.parts    = dig;
-    this.string   = dig.join('.');
-    this.depth    = depth;
-    this.idName   = depthString + this.string;
+    scopedId: function(path) {
+      return (/^\.|this\b/).test(path.original);
+    },
 
     // an ID is simple if it only has one part, and that part is not
     // `..` or `this`.
-    this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-    this.stringModeValue = this.string;
-  },
-
-  PartialNameNode: function(name, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "PARTIAL_NAME";
-    this.name = name.original;
-  },
-
-  DataNode: function(id, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "DATA";
-    this.id = id;
-    this.stringModeValue = id.stringModeValue;
-    this.idName = '@' + id.stringModeValue;
-  },
-
-  StringNode: function(string, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "STRING";
-    this.original =
-      this.string =
-      this.stringModeValue = string;
-  },
-
-  NumberNode: function(number, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "NUMBER";
-    this.original =
-      this.number = number;
-    this.stringModeValue = Number(number);
-  },
-
-  BooleanNode: function(bool, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "BOOLEAN";
-    this.bool = bool;
-    this.stringModeValue = bool === "true";
-  },
-
-  CommentNode: function(comment, locInfo) {
-    LocationInfo.call(this, locInfo);
-    this.type = "comment";
-    this.comment = comment;
-
-    this.strip = {
-      inlineStandalone: true
-    };
+    simpleId: function(path) {
+      return 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
-// most modify the object to operate properly.
+// must modify the object to operate properly.
 export default AST;

lib/handlebars/compiler/base.js

@@ -1,18 +1,24 @@
-import parser from "./parser";
-import AST from "./ast";
-module Helpers from "./helpers";
-import { extend } from "../utils";
+import parser from './parser';
+import WhitespaceControl from './whitespace-control';
+import * as Helpers from './helpers';
+import { extend } from '../utils';
 
 export { parser };
 
-var yy = {};
-extend(yy, Helpers, AST);
+let yy = {};
+extend(yy, Helpers);
 
-export function parse(input) {
-  // Just return if an already-compile AST was passed in.
-  if (input.constructor === AST.ProgramNode) { return input; }
+export function parse(input, options) {
+  // Just return if an already-compiled AST was passed in.
+  if (input.type === 'Program') { return input; }
 
   parser.yy = yy;
 
-  return parser.parse(input);
+  // Altering the shared object here, but this is ok as parser is a sync operation
+  yy.locInfo = function(locInfo) {
+    return new yy.SourceLocation(options && options.srcName, locInfo);
+  };
+
+  let strip = new WhitespaceControl(options);
+  return strip.accept(parser.parse(input));
 }

lib/handlebars/compiler/code-gen.js

@@ -0,0 +1,168 @@
+/* global define */
+import {isArray} from '../utils';
+
+let SourceNode;
+
+try {
+  /* istanbul ignore next */
+  if (typeof define !== 'function' || !define.amd) {
+    // We don't support this in AMD environments. For these environments, we asusme that
+    // 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 */
+}
+
+/* istanbul ignore if: tested but not covered in istanbul due to dist build  */
+if (!SourceNode) {
+  SourceNode = function(line, column, srcFile, chunks) {
+    this.src = '';
+    if (chunks) {
+      this.add(chunks);
+    }
+  };
+  /* istanbul ignore next */
+  SourceNode.prototype = {
+    add: function(chunks) {
+      if (isArray(chunks)) {
+        chunks = chunks.join('');
+      }
+      this.src += chunks;
+    },
+    prepend: function(chunks) {
+      if (isArray(chunks)) {
+        chunks = chunks.join('');
+      }
+      this.src = chunks + this.src;
+    },
+    toStringWithSourceMap: function() {
+      return {code: this.toString()};
+    },
+    toString: function() {
+      return this.src;
+    }
+  };
+}
+
+
+function castChunk(chunk, codeGen, loc) {
+  if (isArray(chunk)) {
+    let ret = [];
+
+    for (let i = 0, len = chunk.length; i < len; i++) {
+      ret.push(codeGen.wrap(chunk[i], loc));
+    }
+    return ret;
+  } else if (typeof chunk === 'boolean' || typeof chunk === 'number') {
+    // Handle primitives that the SourceNode will throw up on
+    return chunk + '';
+  }
+  return chunk;
+}
+
+
+function CodeGen(srcFile) {
+  this.srcFile = srcFile;
+  this.source = [];
+}
+
+CodeGen.prototype = {
+  isEmpty() {
+    return !this.source.length;
+  },
+  prepend: function(source, loc) {
+    this.source.unshift(this.wrap(source, loc));
+  },
+  push: function(source, loc) {
+    this.source.push(this.wrap(source, loc));
+  },
+
+  merge: function() {
+    let source = this.empty();
+    this.each(function(line) {
+      source.add(['  ', line, '\n']);
+    });
+    return source;
+  },
+
+  each: function(iter) {
+    for (let i = 0, len = this.source.length; i < len; i++) {
+      iter(this.source[i]);
+    }
+  },
+
+  empty: function() {
+    let loc = this.currentLocation || {start: {}};
+    return new SourceNode(loc.start.line, loc.start.column, this.srcFile);
+  },
+  wrap: function(chunk, loc = this.currentLocation || {start: {}}) {
+    if (chunk instanceof SourceNode) {
+      return chunk;
+    }
+
+    chunk = castChunk(chunk, this, loc);
+
+    return new SourceNode(loc.start.line, loc.start.column, this.srcFile, chunk);
+  },
+
+  functionCall: function(fn, type, params) {
+    params = this.generateList(params);
+    return this.wrap([fn, type ? '.' + type + '(' : '(', params, ')']);
+  },
+
+  quotedString: function(str) {
+    return '"' + (str + '')
+      .replace(/\\/g, '\\\\')
+      .replace(/"/g, '\\"')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
+      .replace(/\u2029/g, '\\u2029') + '"';
+  },
+
+  objectLiteral: function(obj) {
+    let pairs = [];
+
+    for (let key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        let value = castChunk(obj[key], this);
+        if (value !== 'undefined') {
+          pairs.push([this.quotedString(key), ':', value]);
+        }
+      }
+    }
+
+    let ret = this.generateList(pairs);
+    ret.prepend('{');
+    ret.add('}');
+    return ret;
+  },
+
+
+  generateList: function(entries) {
+    let ret = this.empty();
+
+    for (let i = 0, len = entries.length; i < len; i++) {
+      if (i) {
+        ret.add(',');
+      }
+
+      ret.add(castChunk(entries[i], this));
+    }
+
+    return ret;
+  },
+
+  generateArray: function(entries) {
+    let ret = this.generateList(entries);
+    ret.prepend('[');
+    ret.add(']');
+
+    return ret;
+  }
+};
+
+export default CodeGen;
+

lib/handlebars/compiler/compiler.js

@@ -1,7 +1,10 @@
-import Exception from "../exception";
-import {isArray} from "../utils";
+/* eslint-disable new-cap */
 
-var slice = [].slice;
+import Exception from '../exception';
+import {isArray, indexOf} from '../utils';
+import AST from './ast';
+
+const slice = [].slice;
 
 export function Compiler() {}
 
@@ -14,13 +17,13 @@ Compiler.prototype = {
   compiler: Compiler,
 
   equals: function(other) {
-    var len = this.opcodes.length;
+    let len = this.opcodes.length;
     if (other.opcodes.length !== len) {
       return false;
     }
 
-    for (var i = 0; i < len; i++) {
-      var opcode = this.opcodes[i],
+    for (let i = 0; i < len; i++) {
+      let opcode = this.opcodes[i],
           otherOpcode = other.opcodes[i];
       if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
         return false;
@@ -30,7 +33,7 @@ Compiler.prototype = {
     // We know that length is the same between the two arrays because they are directly tied
     // to the opcode behavior above.
     len = this.children.length;
-    for (i = 0; i < len; i++) {
+    for (let i = 0; i < len; i++) {
       if (!this.children[i].equals(other.children[i])) {
         return false;
       }
@@ -42,16 +45,18 @@ Compiler.prototype = {
   guid: 0,
 
   compile: function(program, options) {
+    this.sourceNode = [];
     this.opcodes = [];
     this.children = [];
-    this.depths = {list: []};
     this.options = options;
     this.stringParams = options.stringParams;
     this.trackIds = options.trackIds;
 
+    options.blockParams = options.blockParams || [];
+
     // These changes will propagate to the other compiler components
-    var knownHelpers = this.options.knownHelpers;
-    this.options.knownHelpers = {
+    let knownHelpers = options.knownHelpers;
+    options.knownHelpers = {
       'helperMissing': true,
       'blockHelperMissing': true,
       'each': true,
@@ -62,80 +67,83 @@ Compiler.prototype = {
       'lookup': true
     };
     if (knownHelpers) {
-      for (var name in knownHelpers) {
-        this.options.knownHelpers[name] = knownHelpers[name];
+      for (let name in knownHelpers) {
+        /* istanbul ignore else */
+        if (name in knownHelpers) {
+          options.knownHelpers[name] = knownHelpers[name];
+        }
       }
     }
 
     return this.accept(program);
   },
 
-  accept: function(node) {
-    return this[node.type](node);
-  },
-
-  program: function(program) {
-    var statements = program.statements;
-
-    for(var i=0, l=statements.length; i<l; i++) {
-      this.accept(statements[i]);
-    }
-    this.isSimple = l === 1;
-
-    this.depths.list = this.depths.list.sort(function(a, b) {
-      return a - b;
-    });
-
-    return this;
-  },
-
   compileProgram: function(program) {
-    var result = new this.compiler().compile(program, this.options);
-    var guid = this.guid++, depth;
+    let childCompiler = new this.compiler(), // eslint-disable-line new-cap
+        result = childCompiler.compile(program, this.options),
+        guid = this.guid++;
 
     this.usePartial = this.usePartial || result.usePartial;
 
     this.children[guid] = result;
-
-    for(var i=0, l=result.depths.list.length; i<l; i++) {
-      depth = result.depths.list[i];
-
-      if(depth < 2) { continue; }
-      else { this.addDepth(depth - 1); }
-    }
+    this.useDepths = this.useDepths || result.useDepths;
 
     return guid;
   },
 
-  block: function(block) {
-    var mustache = block.mustache,
-        program = block.program,
+  accept: function(node) {
+    /* istanbul ignore next: Sanity code */
+    if (!this[node.type]) {
+      throw new Exception('Unknown type: ' + node.type, node);
+    }
+
+    this.sourceNode.unshift(node);
+    let ret = this[node.type](node);
+    this.sourceNode.shift();
+    return ret;
+  },
+
+  Program: function(program) {
+    this.options.blockParams.unshift(program.blockParams);
+
+    let body = program.body,
+        bodyLength = body.length;
+    for (let i = 0; i < bodyLength; i++) {
+      this.accept(body[i]);
+    }
+
+    this.options.blockParams.shift();
+
+    this.isSimple = bodyLength === 1;
+    this.blockParams = program.blockParams ? program.blockParams.length : 0;
+
+    return this;
+  },
+
+  BlockStatement: function(block) {
+    transformLiteralToPath(block);
+
+    let program = block.program,
         inverse = block.inverse;
 
-    if (program) {
-      program = this.compileProgram(program);
-    }
+    program = program && this.compileProgram(program);
+    inverse = inverse && this.compileProgram(inverse);
 
-    if (inverse) {
-      inverse = this.compileProgram(inverse);
-    }
+    let type = this.classifySexpr(block);
 
-    var sexpr = mustache.sexpr;
-    var type = this.classifySexpr(sexpr);
-
-    if (type === "helper") {
-      this.helperSexpr(sexpr, program, inverse);
-    } else if (type === "simple") {
-      this.simpleSexpr(sexpr);
+    if (type === 'helper') {
+      this.helperSexpr(block, program, inverse);
+    } else if (type === 'simple') {
+      this.simpleSexpr(block);
 
       // now that the simple mustache is resolved, we need to
       // evaluate it by executing `blockHelperMissing`
       this.opcode('pushProgram', program);
       this.opcode('pushProgram', inverse);
       this.opcode('emptyHash');
-      this.opcode('blockValue', sexpr.id.original);
+      this.opcode('blockValue', block.path.original);
     } else {
-      this.ambiguousSexpr(sexpr, program, inverse);
+      this.ambiguousSexpr(block, program, inverse);
 
       // now that the simple mustache is resolved, we need to
       // evaluate it by executing `blockHelperMissing`
@@ -148,173 +156,219 @@ Compiler.prototype = {
     this.opcode('append');
   },
 
-  hash: function(hash) {
-    var pairs = hash.pairs, i, l;
+  DecoratorBlock(decorator) {
+    let program = decorator.program && this.compileProgram(decorator.program);
+    let params = this.setupFullMustacheParams(decorator, program, undefined),
+        path = decorator.path;
 
-    this.opcode('pushHash');
-
-    for(i=0, l=pairs.length; i<l; i++) {
-      this.pushParam(pairs[i][1]);
-    }
-    while(i--) {
-      this.opcode('assignToHash', pairs[i][0]);
-    }
-    this.opcode('popHash');
+    this.useDecorators = true;
+    this.opcode('registerDecorator', params.length, path.original);
   },
 
-  partial: function(partial) {
-    var partialName = partial.partialName;
+  PartialStatement: function(partial) {
     this.usePartial = true;
 
-    if (partial.hash) {
-      this.accept(partial.hash);
-    } else {
-      this.opcode('push', 'undefined');
+    let program = partial.program;
+    if (program) {
+      program = this.compileProgram(partial.program);
     }
 
-    if (partial.context) {
-      this.accept(partial.context);
-    } else {
-      this.opcode('getContext', 0);
-      this.opcode('pushContext');
+    let params = partial.params;
+    if (params.length > 1) {
+      throw new Exception('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});
+      }
     }
 
-    this.opcode('invokePartial', partialName.name, partial.indent || '');
+    let partialName = partial.name.original,
+        isDynamic = partial.name.type === 'SubExpression';
+    if (isDynamic) {
+      this.accept(partial.name);
+    }
+
+    this.setupFullMustacheParams(partial, program, undefined, true);
+
+    let indent = partial.indent || '';
+    if (this.options.preventIndent && indent) {
+      this.opcode('appendContent', indent);
+      indent = '';
+    }
+
+    this.opcode('invokePartial', isDynamic, partialName, indent);
     this.opcode('append');
   },
-
-  content: function(content) {
-    if (content.string) {
-      this.opcode('appendContent', content.string);
-    }
+  PartialBlockStatement: function(partialBlock) {
+    this.PartialStatement(partialBlock);
   },
 
-  mustache: function(mustache) {
-    this.sexpr(mustache.sexpr);
+  MustacheStatement: function(mustache) {
+    this.SubExpression(mustache);
 
-    if(mustache.escaped && !this.options.noEscape) {
+    if (mustache.escaped && !this.options.noEscape) {
       this.opcode('appendEscaped');
     } else {
       this.opcode('append');
     }
   },
-
-  ambiguousSexpr: function(sexpr, program, inverse) {
-    var id = sexpr.id,
-        name = id.parts[0],
-        isBlock = program != null || inverse != null;
-
-    this.opcode('getContext', id.depth);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    this.ID(id);
-
-    this.opcode('invokeAmbiguous', name, isBlock);
+  Decorator(decorator) {
+    this.DecoratorBlock(decorator);
   },
 
-  simpleSexpr: function(sexpr) {
-    var id = sexpr.id;
 
-    if (id.type === 'DATA') {
-      this.DATA(id);
-    } else if (id.parts.length) {
-      this.ID(id);
-    } else {
-      // Simplified ID for `this`
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-      this.opcode('pushContext');
-    }
-
-    this.opcode('resolvePossibleLambda');
-  },
-
-  helperSexpr: function(sexpr, program, inverse) {
-    var params = this.setupFullMustacheParams(sexpr, program, inverse),
-        id = sexpr.id,
-        name = id.parts[0];
-
-    if (this.options.knownHelpers[name]) {
-      this.opcode('invokeKnownHelper', params.length, name);
-    } else if (this.options.knownHelpersOnly) {
-      throw new Exception("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
-    } else {
-      id.falsy = true;
-
-      this.ID(id);
-      this.opcode('invokeHelper', params.length, id.original, id.isSimple);
+  ContentStatement: function(content) {
+    if (content.value) {
+      this.opcode('appendContent', content.value);
     }
   },
 
-  sexpr: function(sexpr) {
-    var type = this.classifySexpr(sexpr);
+  CommentStatement: function() {},
 
-    if (type === "simple") {
+  SubExpression: function(sexpr) {
+    transformLiteralToPath(sexpr);
+    let type = this.classifySexpr(sexpr);
+
+    if (type === 'simple') {
       this.simpleSexpr(sexpr);
-    } else if (type === "helper") {
+    } else if (type === 'helper') {
       this.helperSexpr(sexpr);
     } else {
       this.ambiguousSexpr(sexpr);
     }
   },
+  ambiguousSexpr: function(sexpr, program, inverse) {
+    let path = sexpr.path,
+        name = path.parts[0],
+        isBlock = program != null || inverse != null;
 
-  ID: function(id) {
-    this.addDepth(id.depth);
-    this.opcode('getContext', id.depth);
+    this.opcode('getContext', path.depth);
 
-    var name = id.parts[0];
-    if (!name) {
-      // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
-      this.opcode('pushContext');
+    this.opcode('pushProgram', program);
+    this.opcode('pushProgram', inverse);
+
+    path.strict = true;
+    this.accept(path);
+
+    this.opcode('invokeAmbiguous', name, isBlock);
+  },
+
+  simpleSexpr: function(sexpr) {
+    let path = sexpr.path;
+    path.strict = true;
+    this.accept(path);
+    this.opcode('resolvePossibleLambda');
+  },
+
+  helperSexpr: function(sexpr, program, inverse) {
+    let params = this.setupFullMustacheParams(sexpr, program, inverse),
+        path = sexpr.path,
+        name = path.parts[0];
+
+    if (this.options.knownHelpers[name]) {
+      this.opcode('invokeKnownHelper', params.length, name);
+    } else if (this.options.knownHelpersOnly) {
+      throw new Exception('You specified knownHelpersOnly, but used the unknown helper ' + name, sexpr);
     } else {
-      this.opcode('lookupOnContext', id.parts, id.falsy, id.isScoped);
+      path.strict = true;
+      path.falsy = true;
+
+      this.accept(path);
+      this.opcode('invokeHelper', params.length, path.original, AST.helpers.simpleId(path));
     }
   },
 
-  DATA: function(data) {
-    this.options.data = true;
-    this.opcode('lookupData', data.id.depth, data.id.parts);
+  PathExpression: function(path) {
+    this.addDepth(path.depth);
+    this.opcode('getContext', path.depth);
+
+    let name = path.parts[0],
+        scoped = AST.helpers.scopedId(path),
+        blockParamId = !path.depth && !scoped && this.blockParamIndex(name);
+
+    if (blockParamId) {
+      this.opcode('lookupBlockParam', blockParamId, path.parts);
+    } else if (!name) {
+      // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
+      this.opcode('pushContext');
+    } else if (path.data) {
+      this.options.data = true;
+      this.opcode('lookupData', path.depth, path.parts, path.strict);
+    } else {
+      this.opcode('lookupOnContext', path.parts, path.falsy, path.strict, scoped);
+    }
   },
 
-  STRING: function(string) {
-    this.opcode('pushString', string.string);
+  StringLiteral: function(string) {
+    this.opcode('pushString', string.value);
   },
 
-  NUMBER: function(number) {
-    this.opcode('pushLiteral', number.number);
+  NumberLiteral: function(number) {
+    this.opcode('pushLiteral', number.value);
   },
 
-  BOOLEAN: function(bool) {
-    this.opcode('pushLiteral', bool.bool);
+  BooleanLiteral: function(bool) {
+    this.opcode('pushLiteral', bool.value);
   },
 
-  comment: function() {},
+  UndefinedLiteral: function() {
+    this.opcode('pushLiteral', 'undefined');
+  },
+
+  NullLiteral: function() {
+    this.opcode('pushLiteral', 'null');
+  },
+
+  Hash: function(hash) {
+    let pairs = hash.pairs,
+        i = 0,
+        l = pairs.length;
+
+    this.opcode('pushHash');
+
+    for (; i < l; i++) {
+      this.pushParam(pairs[i].value);
+    }
+    while (i--) {
+      this.opcode('assignToHash', pairs[i].key);
+    }
+    this.opcode('popHash');
+  },
 
   // HELPERS
   opcode: function(name) {
-    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1) });
+    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
   },
 
   addDepth: function(depth) {
-    if(depth === 0) { return; }
-
-    if(!this.depths[depth]) {
-      this.depths[depth] = true;
-      this.depths.list.push(depth);
+    if (!depth) {
+      return;
     }
+
+    this.useDepths = true;
   },
 
   classifySexpr: function(sexpr) {
-    var isHelper   = sexpr.isHelper;
-    var isEligible = sexpr.eligibleHelper;
-    var options    = this.options;
+    let isSimple = AST.helpers.simpleId(sexpr.path);
+
+    let isBlockParam = isSimple && !!this.blockParamIndex(sexpr.path.parts[0]);
+
+    // a mustache is an eligible helper if:
+    // * its id is simple (a single part, not `this` or `..`)
+    let isHelper = !isBlockParam && AST.helpers.helperExpression(sexpr);
+
+    // if a mustache is an eligible helper but not a definite
+    // helper, it is ambiguous, and will be resolved in a later
+    // pass or at runtime.
+    let isEligible = !isBlockParam && (isHelper || isSimple);
 
     // if ambiguous, we can possibly resolve the ambiguity now
     // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
     if (isEligible && !isHelper) {
-      var name = sexpr.id.parts[0];
+      let name = sexpr.path.parts[0],
+          options = this.options;
 
       if (options.knownHelpers[name]) {
         isHelper = true;
@@ -323,58 +377,97 @@ Compiler.prototype = {
       }
     }
 
-    if (isHelper) { return "helper"; }
-    else if (isEligible) { return "ambiguous"; }
-    else { return "simple"; }
+    if (isHelper) {
+      return 'helper';
+    } else if (isEligible) {
+      return 'ambiguous';
+    } else {
+      return 'simple';
+    }
   },
 
   pushParams: function(params) {
-    for(var i=0, l=params.length; i<l; i++) {
+    for (let i = 0, l = params.length; i < l; i++) {
       this.pushParam(params[i]);
     }
   },
 
   pushParam: function(val) {
+    let value = val.value != null ? val.value : val.original || '';
+
     if (this.stringParams) {
-      if(val.depth) {
+      if (value.replace) {
+        value = value
+            .replace(/^(\.?\.\/)*/g, '')
+            .replace(/\//g, '.');
+      }
+
+      if (val.depth) {
         this.addDepth(val.depth);
       }
       this.opcode('getContext', val.depth || 0);
-      this.opcode('pushStringParam', val.stringModeValue, val.type);
+      this.opcode('pushStringParam', value, val.type);
 
-      if (val.type === 'sexpr') {
-        // Subexpressions get evaluated and passed in
+      if (val.type === 'SubExpression') {
+        // SubExpressions get evaluated and passed in
         // in string params mode.
-        this.sexpr(val);
+        this.accept(val);
       }
     } else {
       if (this.trackIds) {
-        this.opcode('pushId', val.type, val.idName || val.stringModeValue);
+        let blockParamIndex;
+        if (val.parts && !AST.helpers.scopedId(val) && !val.depth) {
+           blockParamIndex = this.blockParamIndex(val.parts[0]);
+        }
+        if (blockParamIndex) {
+          let blockParamChild = val.parts.slice(1).join('.');
+          this.opcode('pushId', 'BlockParam', blockParamIndex, blockParamChild);
+        } else {
+          value = val.original || value;
+          if (value.replace) {
+            value = value
+                .replace(/^this(?:\.|$)/, '')
+                .replace(/^\.\//, '')
+                .replace(/^\.$/, '');
+          }
+
+          this.opcode('pushId', val.type, value);
+        }
       }
       this.accept(val);
     }
   },
 
-  setupFullMustacheParams: function(sexpr, program, inverse) {
-    var params = sexpr.params;
+  setupFullMustacheParams: function(sexpr, program, inverse, omitEmpty) {
+    let params = sexpr.params;
     this.pushParams(params);
 
     this.opcode('pushProgram', program);
     this.opcode('pushProgram', inverse);
 
     if (sexpr.hash) {
-      this.hash(sexpr.hash);
+      this.accept(sexpr.hash);
     } else {
-      this.opcode('emptyHash');
+      this.opcode('emptyHash', omitEmpty);
     }
 
     return params;
+  },
+
+  blockParamIndex: function(name) {
+    for (let depth = 0, len = this.options.blockParams.length; depth < len; depth++) {
+      let blockParams = this.options.blockParams[depth],
+          param = blockParams && indexOf(blockParams, name);
+      if (blockParams && param >= 0) {
+        return [depth, param];
+      }
+    }
   }
 };
 
 export function precompile(input, options, env) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
-    throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
+  if (input == null || (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 || {};
@@ -385,18 +478,16 @@ export function precompile(input, options, env) {
     options.useDepths = true;
   }
 
-  var ast = env.parse(input);
-  var environment = new env.Compiler().compile(ast, options);
+  let ast = env.parse(input, options),
+      environment = new env.Compiler().compile(ast, options);
   return new env.JavaScriptCompiler().compile(environment, options);
 }
 
-export function compile(input, options, env) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
-    throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
+export function compile(input, options = {}, env) {
+  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
+    throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
   }
 
-  options = options || {};
-
   if (!('data' in options)) {
     options.data = true;
   }
@@ -404,33 +495,33 @@ export function compile(input, options, env) {
     options.useDepths = true;
   }
 
-  var compiled;
+  let compiled;
 
   function compileInput() {
-    var ast = env.parse(input);
-    var environment = new env.Compiler().compile(ast, options);
-    var templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
+    let ast = env.parse(input, options),
+        environment = new env.Compiler().compile(ast, options),
+        templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
     return env.template(templateSpec);
   }
 
   // Template is only compiled on first use and cached after that point.
-  var ret = function(context, options) {
+  function ret(context, execOptions) {
     if (!compiled) {
       compiled = compileInput();
     }
-    return compiled.call(this, context, options);
+    return compiled.call(this, context, execOptions);
+  }
+  ret._setup = function(setupOptions) {
+    if (!compiled) {
+      compiled = compileInput();
+    }
+    return compiled._setup(setupOptions);
   };
-  ret._setup = function(options) {
+  ret._child = function(i, data, blockParams, depths) {
     if (!compiled) {
       compiled = compileInput();
     }
-    return compiled._setup(options);
-  };
-  ret._child = function(i, data, depths) {
-    if (!compiled) {
-      compiled = compileInput();
-    }
-    return compiled._child(i, data, depths);
+    return compiled._child(i, data, blockParams, depths);
   };
   return ret;
 }
@@ -441,7 +532,7 @@ function argEquals(a, b) {
   }
 
   if (isArray(a) && isArray(b) && a.length === b.length) {
-    for (var i = 0; i < a.length; i++) {
+    for (let i = 0; i < a.length; i++) {
       if (!argEquals(a[i], b[i])) {
         return false;
       }
@@ -449,3 +540,19 @@ function argEquals(a, b) {
     return true;
   }
 }
+
+function transformLiteralToPath(sexpr) {
+  if (!sexpr.path.parts) {
+    let literal = sexpr.path;
+    // Casting to string here to make false and 0 literal values play nicely with the rest
+    // of the system.
+    sexpr.path = {
+      type: 'PathExpression',
+      data: false,
+      depth: 0,
+      parts: [literal.original + ''],
+      original: literal.original + '',
+      loc: literal.loc
+    };
+  }
+}

lib/handlebars/compiler/helpers.js

@@ -1,186 +1,212 @@
-import Exception from "../exception";
+import Exception from '../exception';
+
+function validateClose(open, close) {
+  close = close.path ? close.path.original : close;
+
+  if (open.path.original !== close) {
+    let errorNode = {loc: open.path.loc};
+
+    throw new Exception(open.path.original + " doesn't match " + close, errorNode);
+  }
+}
+
+export function SourceLocation(source, locInfo) {
+  this.source = source;
+  this.start = {
+    line: locInfo.first_line,
+    column: locInfo.first_column
+  };
+  this.end = {
+    line: locInfo.last_line,
+    column: locInfo.last_column
+  };
+}
+
+export function id(token) {
+  if (/^\[.*\]$/.test(token)) {
+    return token.substr(1, token.length - 2);
+  } else {
+    return token;
+  }
+}
 
 export function stripFlags(open, close) {
   return {
-    left: open.charAt(2) === '~',
-    right: close.charAt(close.length-3) === '~'
+    open: open.charAt(2) === '~',
+    close: close.charAt(close.length - 3) === '~'
   };
 }
 
+export function stripComment(comment) {
+  return comment.replace(/^\{\{~?\!-?-?/, '')
+                .replace(/-?-?~?\}\}$/, '');
+}
 
-export function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) {
-  /*jshint -W040 */
-  if (mustache.sexpr.id.original !== close.path.original) {
-    throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache);
+export function preparePath(data, parts, loc) {
+  loc = this.locInfo(loc);
+
+  let original = data ? '@' : '',
+      dig = [],
+      depth = 0,
+      depthString = '';
+
+  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,
+        // i.e. foo.[this] resolves to approximately context.foo['this']
+        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});
+      } else if (part === '..') {
+        depth++;
+        depthString += '../';
+      }
+    } else {
+      dig.push(part);
+    }
   }
 
-  var inverse = inverseAndProgram && inverseAndProgram.program;
+  return {
+    type: 'PathExpression',
+    data,
+    depth,
+    parts: dig,
+    original,
+    loc
+  };
+}
 
-  var strip = {
-    left: mustache.strip.left,
-    right: close.strip.right,
+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 !== '&';
 
-    // Determine the standalone candiacy. Basically flag our content as being possibly standalone
-    // so our parent can determine if we actually are standalone
-    openStandalone: isNextWhitespace(program.statements),
-    closeStandalone: isPrevWhitespace((inverse || program).statements)
+  let decorator = (/\*/.test(open));
+  return {
+    type: decorator ? 'Decorator' : 'MustacheStatement',
+    path,
+    params,
+    hash,
+    escaped,
+    strip,
+    loc: this.locInfo(locInfo)
+  };
+}
+
+export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
+  validateClose(openRawBlock, close);
+
+  locInfo = this.locInfo(locInfo);
+  let program = {
+    type: 'Program',
+    body: contents,
+    strip: {},
+    loc: locInfo
   };
 
-  if (mustache.strip.right) {
-    omitRight(program.statements, null, true);
+  return {
+    type: 'BlockStatement',
+    path: openRawBlock.path,
+    params: openRawBlock.params,
+    hash: openRawBlock.hash,
+    program,
+    openStrip: {},
+    inverseStrip: {},
+    closeStrip: {},
+    loc: locInfo
+  };
+}
+
+export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
+  if (close && close.path) {
+    validateClose(openBlock, close);
   }
 
-  if (inverse) {
-    var inverseStrip = inverseAndProgram.strip;
+  let decorator = (/\*/.test(openBlock.open));
 
-    if (inverseStrip.left) {
-      omitLeft(program.statements, null, true);
-    }
-    if (inverseStrip.right) {
-      omitRight(inverse.statements, null, true);
-    }
-    if (close.strip.left) {
-      omitLeft(inverse.statements, null, true);
+  program.blockParams = openBlock.blockParams;
+
+  let inverse,
+      inverseStrip;
+
+  if (inverseAndProgram) {
+    if (decorator) {
+      throw new Exception('Unexpected inverse block on decorator', inverseAndProgram);
     }
 
-    // Find standalone else statments
-    if (isPrevWhitespace(program.statements)
-        && isNextWhitespace(inverse.statements)) {
+    if (inverseAndProgram.chain) {
+      inverseAndProgram.program.body[0].closeStrip = close.strip;
+    }
 
-      omitLeft(program.statements);
-      omitRight(inverse.statements);
-    }
-  } else {
-    if (close.strip.left) {
-      omitLeft(program.statements, null, true);
-    }
+    inverseStrip = inverseAndProgram.strip;
+    inverse = inverseAndProgram.program;
   }
 
   if (inverted) {
-    return new this.BlockNode(mustache, inverse, program, strip, locInfo);
-  } else {
-    return new this.BlockNode(mustache, program, inverse, strip, locInfo);
+    inverted = inverse;
+    inverse = program;
+    program = inverted;
   }
+
+  return {
+    type: decorator ? 'DecoratorBlock' : 'BlockStatement',
+    path: openBlock.path,
+    params: openBlock.params,
+    hash: openBlock.hash,
+    program,
+    inverse,
+    openStrip: openBlock.strip,
+    inverseStrip,
+    closeStrip: close && close.strip,
+    loc: this.locInfo(locInfo)
+  };
 }
 
+export function prepareProgram(statements, loc) {
+  if (!loc && statements.length) {
+    const firstLoc = statements[0].loc,
+          lastLoc = statements[statements.length - 1].loc;
 
-export function prepareProgram(statements, isRoot) {
-  for (var i = 0, l = statements.length; i < l; i++) {
-    var current = statements[i],
-        strip = current.strip;
-
-    if (!strip) {
-      continue;
-    }
-
-    var _isPrevWhitespace = isPrevWhitespace(statements, i, isRoot, current.type === 'partial'),
-        _isNextWhitespace = isNextWhitespace(statements, i, isRoot),
-
-        openStandalone = strip.openStandalone && _isPrevWhitespace,
-        closeStandalone = strip.closeStandalone && _isNextWhitespace,
-        inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
-
-    if (strip.right) {
-      omitRight(statements, i, true);
-    }
-    if (strip.left) {
-      omitLeft(statements, i, true);
-    }
-
-    if (inlineStandalone) {
-      omitRight(statements, i);
-
-      if (omitLeft(statements, i)) {
-        // If we are on a standalone node, save the indent info for partials
-        if (current.type === 'partial') {
-          current.indent = (/([ \t]+$)/).exec(statements[i-1].original) ? RegExp.$1 : '';
+    /* istanbul ignore else */
+    if (firstLoc && lastLoc) {
+      loc = {
+        source: firstLoc.source,
+        start: {
+          line: firstLoc.start.line,
+          column: firstLoc.start.column
+        },
+        end: {
+          line: lastLoc.end.line,
+          column: lastLoc.end.column
         }
-      }
-    }
-    if (openStandalone) {
-      omitRight((current.program || current.inverse).statements);
-
-      // Strip out the previous content node if it's whitespace only
-      omitLeft(statements, i);
-    }
-    if (closeStandalone) {
-      // Always strip the next node
-      omitRight(statements, i);
-
-      omitLeft((current.inverse || current.program).statements);
+      };
     }
   }
 
-  return statements;
+  return {
+    type: 'Program',
+    body: statements,
+    strip: {},
+    loc: loc
+  };
 }
 
-function isPrevWhitespace(statements, i, isRoot) {
-  if (i === undefined) {
-    i = statements.length;
-  }
 
-  // Nodes that end with newlines are considered whitespace (but are special
-  // cased for strip operations)
-  var prev = statements[i-1],
-      sibling = statements[i-2];
-  if (!prev) {
-    return isRoot;
-  }
+export function preparePartialBlock(open, program, close, locInfo) {
+  validateClose(open, close);
 
-  if (prev.type === 'content') {
-    return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
-  }
-}
-function isNextWhitespace(statements, i, isRoot) {
-  if (i === undefined) {
-    i = -1;
-  }
-
-  var next = statements[i+1],
-      sibling = statements[i+2];
-  if (!next) {
-    return isRoot;
-  }
-
-  if (next.type === 'content') {
-    return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
-  }
+  return {
+    type: 'PartialBlockStatement',
+    name: open.path,
+    params: open.params,
+    hash: open.hash,
+    program,
+    openStrip: open.strip,
+    closeStrip: close && close.strip,
+    loc: this.locInfo(locInfo)
+  };
 }
 
-// Marks the node to the right of the position as omitted.
-// I.e. {{foo}}' ' will mark the ' ' node as omitted.
-//
-// If i is undefined, then the first child will be marked as such.
-//
-// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-// content is met.
-function omitRight(statements, i, multiple) {
-  var current = statements[i == null ? 0 : i + 1];
-  if (!current || current.type !== 'content' || (!multiple && current.rightStripped)) {
-    return;
-  }
-
-  var original = current.string;
-  current.string = current.string.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
-  current.rightStripped = current.string !== original;
-}
-
-// Marks the node to the left of the position as omitted.
-// I.e. ' '{{foo}} will mark the ' ' node as omitted.
-//
-// If i is undefined then the last child will be marked as such.
-//
-// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-// content is met.
-function omitLeft(statements, i, multiple) {
-  var current = statements[i == null ? statements.length - 1 : i - 1];
-  if (!current || current.type !== 'content' || (!multiple && current.leftStripped)) {
-    return;
-  }
-
-  // We omit the last node if it's whitespace only and not preceeded by a non-content node.
-  var original = current.string;
-  current.string = current.string.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
-  current.leftStripped = current.string !== original;
-  return current.leftStripped;
-}

lib/handlebars/compiler/printer.js

@@ -1,4 +1,5 @@
-import Visitor from "./visitor";
+/* eslint-disable new-cap */
+import Visitor from './visitor';
 
 export function print(ast) {
   return new PrintVisitor().accept(ast);
@@ -11,23 +12,32 @@ export function PrintVisitor() {
 PrintVisitor.prototype = new Visitor();
 
 PrintVisitor.prototype.pad = function(string) {
-  var out = "";
+  let out = '';
 
-  for(var i=0,l=this.padding; i<l; i++) {
-    out = out + "  ";
+  for (let i = 0, l = this.padding; i < l; i++) {
+    out += '  ';
   }
 
-  out = out + string + "\n";
+  out += string + '\n';
   return out;
 };
 
-PrintVisitor.prototype.program = function(program) {
-  var out = "",
-      statements = program.statements,
+PrintVisitor.prototype.Program = function(program) {
+  let out = '',
+      body = program.body,
       i, l;
 
-  for(i=0, l=statements.length; i<l; i++) {
-    out = out + this.accept(statements[i]);
+  if (program.blockParams) {
+    let blockParams = 'BLOCK PARAMS: [';
+    for (i = 0, l = program.blockParams.length; i < l; i++) {
+       blockParams += ' ' + program.blockParams[i];
+    }
+    blockParams += ' ]';
+    out += this.pad(blockParams);
+  }
+
+  for (i = 0, l = body.length; i < l; i++) {
+    out += this.accept(body[i]);
   }
 
   this.padding--;
@@ -35,23 +45,31 @@ PrintVisitor.prototype.program = function(program) {
   return out;
 };
 
-PrintVisitor.prototype.block = function(block) {
-  var out = "";
+PrintVisitor.prototype.MustacheStatement = function(mustache) {
+  return this.pad('{{ ' + this.SubExpression(mustache) + ' }}');
+};
+PrintVisitor.prototype.Decorator = function(mustache) {
+  return this.pad('{{ DIRECTIVE ' + this.SubExpression(mustache) + ' }}');
+};
 
-  out = out + this.pad("BLOCK:");
+PrintVisitor.prototype.BlockStatement =
+PrintVisitor.prototype.DecoratorBlock = function(block) {
+  let out = '';
+
+  out += this.pad((block.type === 'DecoratorBlock' ? 'DIRECTIVE ' : '') + 'BLOCK:');
   this.padding++;
-  out = out + this.accept(block.mustache);
+  out += this.pad(this.SubExpression(block));
   if (block.program) {
-    out = out + this.pad("PROGRAM:");
+    out += this.pad('PROGRAM:');
     this.padding++;
-    out = out + this.accept(block.program);
+    out += this.accept(block.program);
     this.padding--;
   }
   if (block.inverse) {
     if (block.program) { this.padding++; }
-    out = out + this.pad("{{^}}");
+    out += this.pad('{{^}}');
     this.padding++;
-    out = out + this.accept(block.inverse);
+    out += this.accept(block.inverse);
     this.padding--;
     if (block.program) { this.padding--; }
   }
@@ -60,82 +78,94 @@ PrintVisitor.prototype.block = function(block) {
   return out;
 };
 
-PrintVisitor.prototype.sexpr = function(sexpr) {
-  var params = sexpr.params, paramStrings = [], hash;
+PrintVisitor.prototype.PartialStatement = function(partial) {
+  let content = 'PARTIAL:' + partial.name.original;
+  if (partial.params[0]) {
+    content += ' ' + this.accept(partial.params[0]);
+  }
+  if (partial.hash) {
+    content += ' ' + this.accept(partial.hash);
+  }
+  return this.pad('{{> ' + content + ' }}');
+};
+PrintVisitor.prototype.PartialBlockStatement = function(partial) {
+  let content = 'PARTIAL BLOCK:' + partial.name.original;
+  if (partial.params[0]) {
+    content += ' ' + this.accept(partial.params[0]);
+  }
+  if (partial.hash) {
+    content += ' ' + this.accept(partial.hash);
+  }
 
-  for(var i=0, l=params.length; i<l; i++) {
+  content += ' ' + this.pad('PROGRAM:');
+  this.padding++;
+  content += this.accept(partial.program);
+  this.padding--;
+
+  return this.pad('{{> ' + content + ' }}');
+};
+
+PrintVisitor.prototype.ContentStatement = function(content) {
+  return this.pad("CONTENT[ '" + content.value + "' ]");
+};
+
+PrintVisitor.prototype.CommentStatement = function(comment) {
+  return this.pad("{{! '" + comment.value + "' }}");
+};
+
+PrintVisitor.prototype.SubExpression = function(sexpr) {
+  let params = sexpr.params,
+      paramStrings = [],
+      hash;
+
+  for (let i = 0, l = params.length; i < l; i++) {
     paramStrings.push(this.accept(params[i]));
   }
 
-  params = "[" + paramStrings.join(", ") + "]";
+  params = '[' + paramStrings.join(', ') + ']';
 
-  hash = sexpr.hash ? " " + this.accept(sexpr.hash) : "";
+  hash = sexpr.hash ? ' ' + this.accept(sexpr.hash) : '';
 
-  return this.accept(sexpr.id) + " " + params + hash;
+  return this.accept(sexpr.path) + ' ' + params + hash;
 };
 
-PrintVisitor.prototype.mustache = function(mustache) {
-  return this.pad("{{ " + this.accept(mustache.sexpr) + " }}");
+PrintVisitor.prototype.PathExpression = function(id) {
+  let path = id.parts.join('/');
+  return (id.data ? '@' : '') + 'PATH:' + path;
 };
 
-PrintVisitor.prototype.partial = function(partial) {
-  var content = this.accept(partial.partialName);
-  if(partial.context) {
-    content += " " + this.accept(partial.context);
-  }
-  if (partial.hash) {
-    content += " " + this.accept(partial.hash);
-  }
-  return this.pad("{{> " + content + " }}");
+
+PrintVisitor.prototype.StringLiteral = function(string) {
+  return '"' + string.value + '"';
 };
 
-PrintVisitor.prototype.hash = function(hash) {
-  var pairs = hash.pairs;
-  var joinedPairs = [], left, right;
+PrintVisitor.prototype.NumberLiteral = function(number) {
+  return 'NUMBER{' + number.value + '}';
+};
 
-  for(var i=0, l=pairs.length; i<l; i++) {
-    left = pairs[i][0];
-    right = this.accept(pairs[i][1]);
-    joinedPairs.push( left + "=" + right );
+PrintVisitor.prototype.BooleanLiteral = function(bool) {
+  return 'BOOLEAN{' + bool.value + '}';
+};
+
+PrintVisitor.prototype.UndefinedLiteral = function() {
+  return 'UNDEFINED';
+};
+
+PrintVisitor.prototype.NullLiteral = function() {
+  return 'NULL';
+};
+
+PrintVisitor.prototype.Hash = function(hash) {
+  let pairs = hash.pairs,
+      joinedPairs = [];
+
+  for (let i = 0, l = pairs.length; i < l; i++) {
+    joinedPairs.push(this.accept(pairs[i]));
   }
 
-  return "HASH{" + joinedPairs.join(", ") + "}";
+  return 'HASH{' + joinedPairs.join(', ') + '}';
 };
-
-PrintVisitor.prototype.STRING = function(string) {
-  return '"' + string.string + '"';
+PrintVisitor.prototype.HashPair = function(pair) {
+  return pair.key + '=' + this.accept(pair.value);
 };
-
-PrintVisitor.prototype.NUMBER = function(number) {
-  return "NUMBER{" + number.number + "}";
-};
-
-PrintVisitor.prototype.BOOLEAN = function(bool) {
-  return "BOOLEAN{" + bool.bool + "}";
-};
-
-PrintVisitor.prototype.ID = function(id) {
-  var path = id.parts.join("/");
-  if(id.parts.length > 1) {
-    return "PATH:" + path;
-  } else {
-    return "ID:" + path;
-  }
-};
-
-PrintVisitor.prototype.PARTIAL_NAME = function(partialName) {
-    return "PARTIAL:" + partialName.name;
-};
-
-PrintVisitor.prototype.DATA = function(data) {
-  return "@" + this.accept(data.id);
-};
-
-PrintVisitor.prototype.content = function(content) {
-  return this.pad("CONTENT[ '" + content.string + "' ]");
-};
-
-PrintVisitor.prototype.comment = function(comment) {
-  return this.pad("{{! '" + comment.comment + "' }}");
-};
-
+/* eslint-enable new-cap */

lib/handlebars/compiler/visitor.js

@@ -1,11 +1,129 @@
-function Visitor() {}
+import Exception from '../exception';
+
+function Visitor() {
+  this.parents = [];
+}
 
 Visitor.prototype = {
   constructor: Visitor,
+  mutating: false,
+
+  // Visits a given value. If mutating, will replace the value if necessary.
+  acceptKey: function(node, name) {
+    let value = this.accept(node[name]);
+    if (this.mutating) {
+      // 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('Unexpected node type "' + value.type + '" found when accepting ' + name + ' on ' + node.type);
+      }
+      node[name] = value;
+    }
+  },
+
+  // Performs an accept operation with added sanity check to ensure
+  // required keys are not removed.
+  acceptRequired: function(node, name) {
+    this.acceptKey(node, name);
+
+    if (!node[name]) {
+      throw new Exception(node.type + ' requires ' + name);
+    }
+  },
+
+  // Traverses a given array. If mutating, empty respnses will be removed
+  // for child elements.
+  acceptArray: function(array) {
+    for (let i = 0, l = array.length; i < l; i++) {
+      this.acceptKey(array, i);
+
+      if (!array[i]) {
+        array.splice(i, 1);
+        i--;
+        l--;
+      }
+    }
+  },
 
   accept: function(object) {
-    return this[object.type](object);
+    if (!object) {
+      return;
+    }
+
+    /* istanbul ignore next: Sanity code */
+    if (!this[object.type]) {
+      throw new Exception('Unknown type: ' + object.type, object);
+    }
+
+    if (this.current) {
+      this.parents.unshift(this.current);
+    }
+    this.current = object;
+
+    let ret = this[object.type](object);
+
+    this.current = this.parents.shift();
+
+    if (!this.mutating || ret) {
+      return ret;
+    } else if (ret !== false) {
+      return object;
+    }
+  },
+
+  Program: function(program) {
+    this.acceptArray(program.body);
+  },
+
+  MustacheStatement: visitSubExpression,
+  Decorator: visitSubExpression,
+
+  BlockStatement: visitBlock,
+  DecoratorBlock: visitBlock,
+
+  PartialStatement: visitPartial,
+  PartialBlockStatement: function(partial) {
+    visitPartial.call(this, partial);
+
+    this.acceptKey(partial, 'program');
+  },
+
+  ContentStatement: function(/* content */) {},
+  CommentStatement: function(/* comment */) {},
+
+  SubExpression: visitSubExpression,
+
+  PathExpression: function(/* path */) {},
+
+  StringLiteral: function(/* string */) {},
+  NumberLiteral: function(/* number */) {},
+  BooleanLiteral: function(/* bool */) {},
+  UndefinedLiteral: function(/* literal */) {},
+  NullLiteral: function(/* literal */) {},
+
+  Hash: function(hash) {
+    this.acceptArray(hash.pairs);
+  },
+  HashPair: function(pair) {
+    this.acceptRequired(pair, 'value');
   }
 };
 
+function visitSubExpression(mustache) {
+  this.acceptRequired(mustache, 'path');
+  this.acceptArray(mustache.params);
+  this.acceptKey(mustache, 'hash');
+}
+function visitBlock(block) {
+  visitSubExpression.call(this, block);
+
+  this.acceptKey(block, 'program');
+  this.acceptKey(block, 'inverse');
+}
+function visitPartial(partial) {
+  this.acceptRequired(partial, 'name');
+  this.acceptArray(partial.params);
+  this.acceptKey(partial, 'hash');
+}
+
 export default Visitor;

lib/handlebars/compiler/whitespace-control.js

@@ -0,0 +1,216 @@
+import Visitor from './visitor';
+
+function WhitespaceControl(options = {}) {
+  this.options = options;
+}
+WhitespaceControl.prototype = new Visitor();
+
+WhitespaceControl.prototype.Program = function(program) {
+  const doStandalone = !this.options.ignoreStandalone;
+
+  let isRoot = !this.isRootSeen;
+  this.isRootSeen = true;
+
+  let body = program.body;
+  for (let i = 0, l = body.length; i < l; i++) {
+    let current = body[i],
+        strip = this.accept(current);
+
+    if (!strip) {
+      continue;
+    }
+
+    let _isPrevWhitespace = isPrevWhitespace(body, i, isRoot),
+        _isNextWhitespace = isNextWhitespace(body, i, isRoot),
+
+        openStandalone = strip.openStandalone && _isPrevWhitespace,
+        closeStandalone = strip.closeStandalone && _isNextWhitespace,
+        inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
+
+    if (strip.close) {
+      omitRight(body, i, true);
+    }
+    if (strip.open) {
+      omitLeft(body, i, true);
+    }
+
+    if (doStandalone && inlineStandalone) {
+      omitRight(body, i);
+
+      if (omitLeft(body, i)) {
+        // 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];
+        }
+      }
+    }
+    if (doStandalone && openStandalone) {
+      omitRight((current.program || current.inverse).body);
+
+      // Strip out the previous content node if it's whitespace only
+      omitLeft(body, i);
+    }
+    if (doStandalone && closeStandalone) {
+      // Always strip the next node
+      omitRight(body, i);
+
+      omitLeft((current.inverse || current.program).body);
+    }
+  }
+
+  return program;
+};
+
+WhitespaceControl.prototype.BlockStatement =
+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,
+      firstInverse = inverse,
+      lastInverse = inverse;
+
+  if (inverse && inverse.chained) {
+    firstInverse = inverse.body[0].program;
+
+    // Walk the inverse chain to find the last inverse that is actually in the chain.
+    while (lastInverse.chained) {
+      lastInverse = lastInverse.body[lastInverse.body.length - 1].program;
+    }
+  }
+
+  let strip = {
+    open: block.openStrip.open,
+    close: block.closeStrip.close,
+
+    // Determine the standalone candiacy. Basically flag our content as being possibly standalone
+    // so our parent can determine if we actually are standalone
+    openStandalone: isNextWhitespace(program.body),
+    closeStandalone: isPrevWhitespace((firstInverse || program).body)
+  };
+
+  if (block.openStrip.close) {
+    omitRight(program.body, null, true);
+  }
+
+  if (inverse) {
+    let inverseStrip = block.inverseStrip;
+
+    if (inverseStrip.open) {
+      omitLeft(program.body, null, true);
+    }
+
+    if (inverseStrip.close) {
+      omitRight(firstInverse.body, null, true);
+    }
+    if (block.closeStrip.open) {
+      omitLeft(lastInverse.body, null, true);
+    }
+
+    // Find standalone else statments
+    if (!this.options.ignoreStandalone
+        && isPrevWhitespace(program.body)
+        && isNextWhitespace(firstInverse.body)) {
+      omitLeft(program.body);
+      omitRight(firstInverse.body);
+    }
+  } else if (block.closeStrip.open) {
+    omitLeft(program.body, null, true);
+  }
+
+  return strip;
+};
+
+WhitespaceControl.prototype.Decorator =
+WhitespaceControl.prototype.MustacheStatement = function(mustache) {
+  return mustache.strip;
+};
+
+WhitespaceControl.prototype.PartialStatement =
+    WhitespaceControl.prototype.CommentStatement = function(node) {
+  /* istanbul ignore next */
+  let strip = node.strip || {};
+  return {
+    inlineStandalone: true,
+    open: strip.open,
+    close: strip.close
+  };
+};
+
+
+function isPrevWhitespace(body, i, isRoot) {
+  if (i === undefined) {
+    i = body.length;
+  }
+
+  // Nodes that end with newlines are considered whitespace (but are special
+  // cased for strip operations)
+  let prev = body[i - 1],
+      sibling = body[i - 2];
+  if (!prev) {
+    return isRoot;
+  }
+
+  if (prev.type === 'ContentStatement') {
+    return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
+  }
+}
+function isNextWhitespace(body, i, isRoot) {
+  if (i === undefined) {
+    i = -1;
+  }
+
+  let next = body[i + 1],
+      sibling = body[i + 2];
+  if (!next) {
+    return isRoot;
+  }
+
+  if (next.type === 'ContentStatement') {
+    return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
+  }
+}
+
+// Marks the node to the right of the position as omitted.
+// I.e. {{foo}}' ' will mark the ' ' node as omitted.
+//
+// If i is undefined, then the first child will be marked as such.
+//
+// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+// content is met.
+function omitRight(body, i, multiple) {
+  let current = body[i == null ? 0 : i + 1];
+  if (!current || current.type !== 'ContentStatement' || (!multiple && current.rightStripped)) {
+    return;
+  }
+
+  let original = current.value;
+  current.value = current.value.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
+  current.rightStripped = current.value !== original;
+}
+
+// Marks the node to the left of the position as omitted.
+// I.e. ' '{{foo}} will mark the ' ' node as omitted.
+//
+// If i is undefined then the last child will be marked as such.
+//
+// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+// content is met.
+function omitLeft(body, i, multiple) {
+  let current = body[i == null ? body.length - 1 : i - 1];
+  if (!current || current.type !== 'ContentStatement' || (!multiple && current.leftStripped)) {
+    return;
+  }
+
+  // We omit the last node if it's whitespace only and not preceeded by a non-content node.
+  let original = current.value;
+  current.value = current.value.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
+  current.leftStripped = current.value !== original;
+  return current.leftStripped;
+}
+
+export default WhitespaceControl;

lib/handlebars/decorators.js

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

lib/handlebars/decorators/inline.js

@@ -0,0 +1,22 @@
+import {extend} from '../utils';
+
+export default function(instance) {
+  instance.registerDecorator('inline', function(fn, props, container, options) {
+    let ret = fn;
+    if (!props.partials) {
+      props.partials = {};
+      ret = function(context, options) {
+        // Create a new partials stack frame prior to exec.
+        let original = container.partials;
+        container.partials = extend({}, original, props.partials);
+        let ret = fn(context, options);
+        container.partials = original;
+        return ret;
+      };
+    }
+
+    props.partials[options.args[0]] = options.fn;
+
+    return ret;
+  });
+}

lib/handlebars/exception.js

@@ -1,24 +1,32 @@
 
-var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+const errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
 
 function Exception(message, node) {
-  var line;
-  if (node && node.firstLine) {
-    line = node.firstLine;
+  let loc = node && node.loc,
+      line,
+      column;
+  if (loc) {
+    line = loc.start.line;
+    column = loc.start.column;
 
-    message += ' - ' + line + ':' + node.firstColumn;
+    message += ' - ' + line + ':' + column;
   }
 
-  var tmp = Error.prototype.constructor.call(this, message);
+  let tmp = Error.prototype.constructor.call(this, message);
 
   // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-  for (var idx = 0; idx < errorProps.length; idx++) {
+  for (let idx = 0; idx < errorProps.length; idx++) {
     this[errorProps[idx]] = tmp[errorProps[idx]];
   }
 
-  if (line) {
+  /* istanbul ignore else */
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this, Exception);
+  }
+
+  if (loc) {
     this.lineNumber = line;
-    this.column = node.firstColumn;
+    this.column = column;
   }
 }
 

lib/handlebars/helpers.js

@@ -0,0 +1,17 @@
+import registerBlockHelperMissing from './helpers/block-helper-missing';
+import registerEach from './helpers/each';
+import registerHelperMissing from './helpers/helper-missing';
+import registerIf from './helpers/if';
+import registerLog from './helpers/log';
+import registerLookup from './helpers/lookup';
+import registerWith from './helpers/with';
+
+export function registerDefaultHelpers(instance) {
+  registerBlockHelperMissing(instance);
+  registerEach(instance);
+  registerHelperMissing(instance);
+  registerIf(instance);
+  registerLog(instance);
+  registerLookup(instance);
+  registerWith(instance);
+}

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

@@ -0,0 +1,32 @@
+import {appendContextPath, createFrame, isArray} from '../utils';
+
+export default function(instance) {
+  instance.registerHelper('blockHelperMissing', function(context, options) {
+    let inverse = options.inverse,
+        fn = options.fn;
+
+    if (context === true) {
+      return fn(this);
+    } else if (context === false || context == null) {
+      return inverse(this);
+    } else if (isArray(context)) {
+      if (context.length > 0) {
+        if (options.ids) {
+          options.ids = [options.name];
+        }
+
+        return instance.helpers.each(context, options);
+      } else {
+        return inverse(this);
+      }
+    } else {
+      if (options.data && options.ids) {
+        let data = createFrame(options.data);
+        data.contextPath = appendContextPath(options.data.contextPath, options.name);
+        options = {data: data};
+      }
+
+      return fn(context, options);
+    }
+  });
+}

lib/handlebars/helpers/each.js

@@ -0,0 +1,83 @@
+import {appendContextPath, blockParams, createFrame, isArray, isFunction} from '../utils';
+import Exception from '../exception';
+
+export default function(instance) {
+  instance.registerHelper('each', function(context, options) {
+    if (!options) {
+      throw new Exception('Must pass iterator to #each');
+    }
+
+    let fn = options.fn,
+        inverse = options.inverse,
+        i = 0,
+        ret = '',
+        data,
+        contextPath;
+
+    if (options.data && options.ids) {
+      contextPath = appendContextPath(options.data.contextPath, options.ids[0]) + '.';
+    }
+
+    if (isFunction(context)) { context = context.call(this); }
+
+    if (options.data) {
+      data = createFrame(options.data);
+    }
+
+    function execIteration(field, index, last) {
+      // Don't iterate over undefined values since we can't execute blocks against them
+      // in non-strict (js) mode.
+      if (context[field] == null) {
+        return;
+      }
+
+      if (data) {
+        data.key = field;
+        data.index = index;
+        data.first = index === 0;
+        data.last = !!last;
+
+        if (contextPath) {
+          data.contextPath = contextPath + field;
+        }
+      }
+
+      ret = ret + fn(context[field], {
+        data: data,
+        blockParams: blockParams([context[field], field], [contextPath + field, null])
+      });
+    }
+
+    if (context && typeof context === 'object') {
+      if (isArray(context)) {
+        for (let j = context.length; i < j; i++) {
+          execIteration(i, i, i === context.length - 1);
+        }
+      } else {
+        let priorKey;
+
+        for (let key in context) {
+          if (context.hasOwnProperty(key)) {
+            // We're running the iterations one step out of sync so we can detect
+            // the last iteration without have to scan the object twice and create
+            // an itermediate keys array.
+            if (priorKey !== undefined) {
+              execIteration(priorKey, i - 1);
+            }
+            priorKey = key;
+            i++;
+          }
+        }
+        if (priorKey !== undefined) {
+          execIteration(priorKey, i - 1, true);
+        }
+      }
+    }
+
+    if (i === 0) {
+      ret = inverse(this);
+    }
+
+    return ret;
+  });
+}

lib/handlebars/helpers/helper-missing.js

@@ -0,0 +1,13 @@
+import Exception from '../exception';
+
+export default function(instance) {
+  instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+    if (arguments.length === 1) {
+      // A missing field in a {{foo}} construct.
+      return undefined;
+    } else {
+      // Someone is actually trying to call something, blow up.
+      throw new Exception('Missing helper: "' + arguments[arguments.length - 1].name + '"');
+    }
+  });
+}

lib/handlebars/helpers/if.js

@@ -0,0 +1,20 @@
+import {isEmpty, isFunction} from '../utils';
+
+export default function(instance) {
+  instance.registerHelper('if', function(conditional, options) {
+    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
+    // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+    if ((!options.hash.includeZero && !conditional) || isEmpty(conditional)) {
+      return options.inverse(this);
+    } else {
+      return options.fn(this);
+    }
+  });
+
+  instance.registerHelper('unless', function(conditional, options) {
+    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+  });
+}

lib/handlebars/helpers/log.js

@@ -0,0 +1,19 @@
+export default function(instance) {
+  instance.registerHelper('log', function(/* message, options */) {
+    let args = [undefined],
+        options = arguments[arguments.length - 1];
+    for (let i = 0; i < arguments.length - 1; i++) {
+      args.push(arguments[i]);
+    }
+
+    let level = 1;
+    if (options.hash.level != null) {
+      level = options.hash.level;
+    } else if (options.data && options.data.level != null) {
+      level = options.data.level;
+    }
+    args[0] = level;
+
+    instance.log(... args);
+  });
+}

lib/handlebars/helpers/lookup.js

@@ -0,0 +1,5 @@
+export default function(instance) {
+  instance.registerHelper('lookup', function(obj, field) {
+    return obj && obj[field];
+  });
+}

lib/handlebars/helpers/with.js

@@ -0,0 +1,24 @@
+import {appendContextPath, blockParams, createFrame, isEmpty, isFunction} from '../utils';
+
+export default function(instance) {
+  instance.registerHelper('with', function(context, options) {
+    if (isFunction(context)) { context = context.call(this); }
+
+    let fn = options.fn;
+
+    if (!isEmpty(context)) {
+      let data = options.data;
+      if (options.data && options.ids) {
+        data = createFrame(options.data);
+        data.contextPath = appendContextPath(options.data.contextPath, options.ids[0]);
+      }
+
+      return fn(context, {
+        data: data,
+        blockParams: blockParams([context], [data && data.contextPath])
+      });
+    } else {
+      return options.inverse(this);
+    }
+  });
+}

lib/handlebars/logger.js

@@ -0,0 +1,33 @@
+let logger = {
+  methodMap: ['debug', 'info', 'warn', 'error'],
+  level: 'info',
+
+  // Maps a given level value to the `methodMap` indexes above.
+  lookupLevel: function(level) {
+    if (typeof level === 'string') {
+      let levelMap = logger.methodMap.indexOf(level.toLowerCase());
+      if (levelMap >= 0) {
+        level = levelMap;
+      } else {
+        level = parseInt(level, 10);
+      }
+    }
+
+    return level;
+  },
+
+  // Can be overridden in the host environment
+  log: function(level, ...message) {
+    level = logger.lookupLevel(level);
+
+    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
+      let method = logger.methodMap[level];
+      if (!console[method]) {   // eslint-disable-line no-console
+        method = 'log';
+      }
+      console[method](...message);    // eslint-disable-line no-console
+    }
+  }
+};
+
+export default logger;

lib/handlebars/no-conflict.js

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

lib/handlebars/runtime.js

@@ -1,75 +1,84 @@
-module Utils from "./utils";
-import Exception from "./exception";
-import { COMPILER_REVISION, REVISION_CHANGES, createFrame } from "./base";
+import * as Utils from './utils';
+import Exception from './exception';
+import { COMPILER_REVISION, REVISION_CHANGES, createFrame } from './base';
 
 export function checkRevision(compilerInfo) {
-  var compilerRevision = compilerInfo && compilerInfo[0] || 1,
-      currentRevision = COMPILER_REVISION;
+  const compilerRevision = compilerInfo && compilerInfo[0] || 1,
+        currentRevision = COMPILER_REVISION;
 
   if (compilerRevision !== currentRevision) {
     if (compilerRevision < currentRevision) {
-      var runtimeVersions = REVISION_CHANGES[currentRevision],
-          compilerVersions = REVISION_CHANGES[compilerRevision];
-      throw new Exception("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+").");
+      const runtimeVersions = REVISION_CHANGES[currentRevision],
+            compilerVersions = REVISION_CHANGES[compilerRevision];
+      throw new Exception('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 + ').');
     } else {
       // Use the embedded version info since the runtime doesn't know about this revision yet
-      throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
-            "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+      throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
+            'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
     }
   }
 }
 
-// TODO: Remove this line and break up compilePartial
-
 export function template(templateSpec, env) {
   /* istanbul ignore next */
   if (!env) {
-    throw new Exception("No environment passed to template");
+    throw new Exception('No environment passed to template');
   }
   if (!templateSpec || !templateSpec.main) {
     throw new Exception('Unknown template object: ' + typeof templateSpec);
   }
 
+  templateSpec.main.decorator = templateSpec.main_d;
+
   // Note: Using env.VM references rather than local var references throughout this section to allow
   // for external users to override these as psuedo-supported APIs.
   env.VM.checkRevision(templateSpec.compiler);
 
-  var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
-    if (hash) {
-      context = Utils.extend({}, context, hash);
+  function invokePartialWrapper(partial, context, options) {
+    if (options.hash) {
+      context = Utils.extend({}, context, options.hash);
+      if (options.ids) {
+        options.ids[0] = true;
+      }
     }
 
-    var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
+    partial = env.VM.resolvePartial.call(this, partial, context, options);
+    let result = env.VM.invokePartial.call(this, partial, context, options);
 
     if (result == null && env.compile) {
-      var options = { helpers: helpers, partials: partials, data: data, depths: depths };
-      partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
-      result = partials[name](context, options);
+      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
+      result = options.partials[options.name](context, options);
     }
     if (result != null) {
-      if (indent) {
-        var lines = result.split('\n');
-        for (var i = 0, l = lines.length; i < l; i++) {
+      if (options.indent) {
+        let lines = result.split('\n');
+        for (let i = 0, l = lines.length; i < l; i++) {
           if (!lines[i] && i + 1 === l) {
             break;
           }
 
-          lines[i] = indent + lines[i];
+          lines[i] = options.indent + lines[i];
         }
         result = lines.join('\n');
       }
       return result;
     } else {
-      throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
+      throw new Exception('The partial ' + options.name + ' could not be compiled when running in runtime-only mode');
     }
-  };
+  }
 
   // Just add water
-  var container = {
+  let container = {
+    strict: function(obj, name) {
+      if (!(name in obj)) {
+        throw new Exception('"' + name + '" not defined in ' + obj);
+      }
+      return obj[name];
+    },
     lookup: function(depths, name) {
-      var len = depths.length;
-      for (var i = 0; i < len; i++) {
+      const len = depths.length;
+      for (let i = 0; i < len; i++) {
         if (depths[i] && depths[i][name] != null) {
           return depths[i][name];
         }
@@ -83,56 +92,66 @@ export function template(templateSpec, env) {
     invokePartial: invokePartialWrapper,
 
     fn: function(i) {
-      return templateSpec[i];
+      let ret = templateSpec[i];
+      ret.decorator = templateSpec[i + '_d'];
+      return ret;
     },
 
     programs: [],
-    program: function(i, data, depths) {
-      var programWrapper = this.programs[i],
+    program: function(i, data, declaredBlockParams, blockParams, depths) {
+      let programWrapper = this.programs[i],
           fn = this.fn(i);
-      if (data || depths) {
-        programWrapper = program(this, i, fn, data, depths);
+      if (data || depths || blockParams || declaredBlockParams) {
+        programWrapper = wrapProgram(this, i, fn, data, declaredBlockParams, blockParams, depths);
       } else if (!programWrapper) {
-        programWrapper = this.programs[i] = program(this, i, fn);
+        programWrapper = this.programs[i] = wrapProgram(this, i, fn);
       }
       return programWrapper;
     },
 
-    data: function(data, depth) {
-      while (data && depth--) {
-        data = data._parent;
+    data: function(value, depth) {
+      while (value && depth--) {
+        value = value._parent;
       }
-      return data;
+      return value;
     },
     merge: function(param, common) {
-      var ret = param || common;
+      let obj = param || common;
 
       if (param && common && (param !== common)) {
-        ret = Utils.extend({}, common, param);
+        obj = Utils.extend({}, common, param);
       }
 
-      return ret;
+      return obj;
     },
 
     noop: env.VM.noop,
     compilerInfo: templateSpec.compiler
   };
 
-  var ret = function(context, options) {
-    options = options || {};
-    var data = options.data;
+  function ret(context, options = {}) {
+    let data = options.data;
 
     ret._setup(options);
     if (!options.partial && templateSpec.useData) {
       data = initData(context, data);
     }
-    var depths;
+    let depths,
+        blockParams = templateSpec.useBlockParams ? [] : undefined;
     if (templateSpec.useDepths) {
-      depths = options.depths ? [context].concat(options.depths) : [context];
+      if (options.depths) {
+        depths = context !== options.depths[0] ? [context].concat(options.depths) : options.depths;
+      } else {
+        depths = [context];
+      }
     }
 
-    return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
-  };
+    function main(context/*, options*/) {
+      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
+    }
+    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
+    return main(context, options);
+  }
   ret.isTop = true;
 
   ret._setup = function(options) {
@@ -142,44 +161,94 @@ export function template(templateSpec, env) {
       if (templateSpec.usePartial) {
         container.partials = container.merge(options.partials, env.partials);
       }
+      if (templateSpec.usePartial || templateSpec.useDecorators) {
+        container.decorators = container.merge(options.decorators, env.decorators);
+      }
     } else {
       container.helpers = options.helpers;
       container.partials = options.partials;
+      container.decorators = options.decorators;
     }
   };
 
-  ret._child = function(i, data, depths) {
+  ret._child = function(i, data, blockParams, depths) {
+    if (templateSpec.useBlockParams && !blockParams) {
+      throw new Exception('must pass block params');
+    }
     if (templateSpec.useDepths && !depths) {
       throw new Exception('must pass parent depths');
     }
 
-    return program(container, i, templateSpec[i], data, depths);
+    return wrapProgram(container, i, templateSpec[i], data, 0, blockParams, depths);
   };
   return ret;
 }
 
-export function program(container, i, fn, data, depths) {
-  var prog = function(context, options) {
-    options = options || {};
+export function wrapProgram(container, i, fn, data, declaredBlockParams, blockParams, depths) {
+  function prog(context, options = {}) {
+    let currentDepths = depths;
+    if (depths && context !== depths[0]) {
+      currentDepths = [context].concat(depths);
+    }
+
+    return fn(container,
+        context,
+        container.helpers, container.partials,
+        options.data || data,
+        blockParams && [options.blockParams].concat(blockParams),
+        currentDepths);
+  }
+
+  prog = executeDecorators(fn, prog, container, depths, data, blockParams);
 
-    return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
-  };
   prog.program = i;
   prog.depth = depths ? depths.length : 0;
+  prog.blockParams = declaredBlockParams || 0;
   return prog;
 }
 
-export function invokePartial(partial, name, context, helpers, partials, data, depths) {
-  var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
+export function resolvePartial(partial, context, options) {
+  if (!partial) {
+    if (options.name === '@partial-block') {
+      partial = options.data['partial-block'];
+    } else {
+      partial = options.partials[options.name];
+    }
+  } else if (!partial.call && !options.name) {
+    // This is a dynamic partial that returned a string
+    options.name = partial;
+    partial = options.partials[partial];
+  }
+  return partial;
+}
 
-  if(partial === undefined) {
-    throw new Exception("The partial " + name + " could not be found");
-  } else if(partial instanceof Function) {
+export function invokePartial(partial, context, options) {
+  options.partial = true;
+  if (options.ids) {
+    options.data.contextPath = options.ids[0] || options.data.contextPath;
+  }
+
+  let partialBlock;
+  if (options.fn && options.fn !== noop) {
+    partialBlock = options.data['partial-block'] = options.fn;
+
+    if (partialBlock.partials) {
+      options.partials = Utils.extend({}, options.partials, partialBlock.partials);
+    }
+  }
+
+  if (partial === undefined && partialBlock) {
+    partial = partialBlock;
+  }
+
+  if (partial === undefined) {
+    throw new Exception('The partial ' + options.name + ' could not be found');
+  } else if (partial instanceof Function) {
     return partial(context, options);
   }
 }
 
-export function noop() { return ""; }
+export function noop() { return ''; }
 
 function initData(context, data) {
   if (!data || !('root' in data)) {
@@ -188,3 +257,12 @@ function initData(context, data) {
   }
   return data;
 }
+
+function executeDecorators(fn, prog, container, depths, data, blockParams) {
+  if (fn.decorator) {
+    let props = {};
+    prog = fn.decorator(prog, props, container, depths && depths[0], data, blockParams, depths);
+    Utils.extend(prog, props);
+  }
+  return prog;
+}

lib/handlebars/safe-string.js

@@ -3,8 +3,8 @@ function SafeString(string) {
   this.string = string;
 }
 
-SafeString.prototype.toString = function() {
-  return "" + this.string;
+SafeString.prototype.toString = SafeString.prototype.toHTML = function() {
+  return '' + this.string;
 };
 
 export default SafeString;

lib/handlebars/utils.js

@@ -1,25 +1,23 @@
-/*jshint -W004 */
-import SafeString from "./safe-string";
-
-var escape = {
-  "&": "&",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#x27;",
-  "`": "&#x60;"
+const escape = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&#x27;',
+  '`': '&#x60;',
+  '=': '&#x3D;'
 };
 
-var badChars = /[&<>"'`]/g;
-var possible = /[&<>"'`]/;
+const badChars = /[&<>"'`=]/g,
+      possible = /[&<>"'`=]/;
 
 function escapeChar(chr) {
   return escape[chr];
 }
 
 export function extend(obj /* , ...source */) {
-  for (var i = 1; i < arguments.length; i++) {
-    for (var key in arguments[i]) {
+  for (let i = 1; i < arguments.length; i++) {
+    for (let key in arguments[i]) {
       if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
         obj[key] = arguments[i][key];
       }
@@ -29,11 +27,12 @@ export function extend(obj /* , ...source */) {
   return obj;
 }
 
-export var toString = Object.prototype.toString;
+export let toString = Object.prototype.toString;
 
 // Sourced from lodash
 // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
-var isFunction = function(value) {
+/* eslint-disable func-style */
+let isFunction = function(value) {
   return typeof value === 'function';
 };
 // fallback for older versions of Chrome and Safari
@@ -43,30 +42,43 @@ if (isFunction(/x/)) {
     return typeof value === 'function' && toString.call(value) === '[object Function]';
   };
 }
-export var isFunction;
+export {isFunction};
+/* eslint-enable func-style */
 
 /* istanbul ignore next */
-export var isArray = Array.isArray || function(value) {
+export const isArray = Array.isArray || 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) {
+  for (let i = 0, len = array.length; i < len; i++) {
+    if (array[i] === value) {
+      return i;
+    }
+  }
+  return -1;
+}
+
 
 export function escapeExpression(string) {
-  // don't escape SafeStrings, since they're already safe
-  if (string instanceof SafeString) {
-    return string.toString();
-  } else if (string == null) {
-    return "";
-  } else if (!string) {
-    return string + '';
+  if (typeof string !== 'string') {
+    // don't escape SafeStrings, since they're already safe
+    if (string && string.toHTML) {
+      return string.toHTML();
+    } else if (string == null) {
+      return '';
+    } else if (!string) {
+      return string + '';
+    }
+
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = '' + string;
   }
 
-  // Force a string conversion as this will be done by the append regardless and
-  // the regex test will do this transparently behind the scenes, causing issues if
-  // an object's to string has escaped characters in it.
-  string = "" + string;
-
-  if(!possible.test(string)) { return string; }
+  if (!possible.test(string)) { return string; }
   return string.replace(badChars, escapeChar);
 }
 
@@ -80,6 +92,17 @@ export function isEmpty(value) {
   }
 }
 
+export function createFrame(object) {
+  let frame = extend({}, object);
+  frame._parent = object;
+  return frame;
+}
+
+export function blockParams(params, ids) {
+  params.path = ids;
+  return params;
+}
+
 export function appendContextPath(contextPath, id) {
   return (contextPath ? contextPath + '.' : '') + id;
 }

lib/index.js

@@ -1,11 +1,10 @@
 // USAGE:
 // var handlebars = require('handlebars');
+/* eslint-disable no-var */
 
 // var local = handlebars.create();
 
-var handlebars = require('../dist/cjs/handlebars')["default"];
-
-handlebars.Visitor = require('../dist/cjs/handlebars/compiler/visitor')["default"];
+var handlebars = require('../dist/cjs/handlebars')['default'];
 
 var printer = require('../dist/cjs/handlebars/compiler/printer');
 handlebars.PrintVisitor = printer.PrintVisitor;
@@ -14,13 +13,13 @@ handlebars.print = printer.print;
 module.exports = handlebars;
 
 // Publish a Node.js require() handler for .handlebars and .hbs files
+function extension(module, filename) {
+  var fs = require('fs');
+  var templateString = fs.readFileSync(filename, 'utf8');
+  module.exports = handlebars.compile(templateString);
+}
 /* istanbul ignore else */
 if (typeof require !== 'undefined' && require.extensions) {
-  var extension = function(module, filename) {
-    var fs = require("fs");
-    var templateString = fs.readFileSync(filename, "utf8");
-    module.exports = handlebars.compile(templateString);
-  };
-  require.extensions[".handlebars"] = extension;
-  require.extensions[".hbs"] = extension;
+  require.extensions['.handlebars'] = extension;
+  require.extensions['.hbs'] = extension;
 }

lib/precompiler.js

@@ -1,8 +1,135 @@
+/* eslint-disable no-console */
+import Async from 'async';
+import fs from 'fs';
+import * as Handlebars from './handlebars';
+import {basename} from 'path';
+import {SourceMapConsumer, SourceNode} from 'source-map';
+import uglify from 'uglify-js';
 
-var fs = require('fs'),
-    Handlebars = require('./index'),
-    basename = require('path').basename,
-    uglify = require('uglify-js');
+module.exports.loadTemplates = function(opts, callback) {
+  loadStrings(opts, function(err, strings) {
+    if (err) {
+      callback(err);
+    } else {
+      loadFiles(opts, function(err, files) {
+        if (err) {
+          callback(err);
+        } else {
+          opts.templates = strings.concat(files);
+          callback(undefined, opts);
+        }
+      });
+    }
+  });
+};
+
+function loadStrings(opts, callback) {
+  let strings = arrayCast(opts.string),
+      names = arrayCast(opts.name);
+
+  if (names.length !== strings.length
+      && strings.length > 1) {
+    return callback(new Handlebars.Exception('Number of names did not match the number of string inputs'));
+  }
+
+  Async.map(strings, function(string, callback) {
+      if (string !== '-') {
+        callback(undefined, string);
+      } else {
+        // Load from stdin
+        let buffer = '';
+        process.stdin.setEncoding('utf8');
+
+        process.stdin.on('data', function(chunk) {
+          buffer += chunk;
+        });
+        process.stdin.on('end', function() {
+          callback(undefined, buffer);
+        });
+      }
+    },
+    function(err, strings) {
+      strings = strings.map((string, index) => ({
+        name: names[index],
+        path: names[index],
+        source: string
+      }));
+      callback(err, strings);
+    });
+}
+
+function loadFiles(opts, callback) {
+  // Build file extension pattern
+  let extension = (opts.extension || 'handlebars').replace(/[\\^$*+?.():=!|{}\-\[\]]/g, function(arg) { return '\\' + arg; });
+  extension = new RegExp('\\.' + extension + '$');
+
+  let ret = [],
+      queue = (opts.files || []).map((template) => ({template, root: opts.root}));
+  Async.whilst(() => queue.length, function(callback) {
+    let {template: path, root} = queue.shift();
+
+    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);
+    } else {
+      callback(undefined, ret);
+    }
+  });
+}
 
 module.exports.cli = function(opts) {
   if (opts.version) {
@@ -10,135 +137,140 @@ module.exports.cli = function(opts) {
     return;
   }
 
-  var template = [0];
-  if (!opts.templates.length) {
+  if (!opts.templates.length && !opts.hasDirectory) {
     throw new Handlebars.Exception('Must define at least one template or directory.');
   }
 
-  opts.templates.forEach(function(template) {
-    try {
-      fs.statSync(template);
-    } catch (err) {
-      throw new Handlebars.Exception('Unable to open template file "' + template + '"');
-    }
-  });
-
   if (opts.simple && opts.min) {
-    throw new Handlebars.Exception('Unable to minimze simple output');
+    throw new Handlebars.Exception('Unable to minimize simple output');
   }
-  if (opts.simple && (opts.templates.length !== 1 || fs.statSync(opts.templates[0]).isDirectory())) {
+
+  const multiple = opts.templates.length !== 1 || opts.hasDirectory;
+  if (opts.simple && multiple) {
     throw new Handlebars.Exception('Unable to output multiple templates in simple mode');
   }
 
+  // Force simple mode if we have only one template and it's unnamed.
+  if (!opts.amd && !opts.commonjs && opts.templates.length === 1
+      && !opts.templates[0].name) {
+    opts.simple = true;
+  }
+
   // Convert the known list into a hash
-  var known = {};
+  let known = {};
   if (opts.known && !Array.isArray(opts.known)) {
     opts.known = [opts.known];
   }
   if (opts.known) {
-    for (var i = 0, len = opts.known.length; i < len; i++) {
+    for (let i = 0, len = opts.known.length; i < len; i++) {
       known[opts.known[i]] = true;
     }
   }
 
-  // Build file extension pattern
-  var extension = opts.extension.replace(/[\\^$*+?.():=!|{}\-\[\]]/g, function(arg) { return '\\' + arg; });
-  extension = new RegExp('\\.' + extension + '$');
+  const objectName = opts.partial ? 'Handlebars.partials' : 'templates';
 
-  var output = [];
+  let output = new SourceNode();
   if (!opts.simple) {
     if (opts.amd) {
-      output.push('define([\'' + opts.handlebarPath + 'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];');
+      output.add('define([\'' + opts.handlebarPath + 'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];');
     } else if (opts.commonjs) {
-      output.push('var Handlebars = require("' + opts.commonjs + '");');
+      output.add('var Handlebars = require("' + opts.commonjs + '");');
     } else {
-      output.push('(function() {\n');
+      output.add('(function() {\n');
     }
-    output.push('  var template = Handlebars.template, templates = ');
-    output.push(opts.namespace);
-    output.push(' = ');
-    output.push(opts.namespace);
-    output.push(' || {};\n');
-  }
-  function processTemplate(template, root) {
-    var path = template,
-        stat = fs.statSync(path);
-    if (stat.isDirectory()) {
-      fs.readdirSync(template).map(function(file) {
-        var path = template + '/' + file;
-
-        if (extension.test(path) || fs.statSync(path).isDirectory()) {
-          processTemplate(path, root || template);
-        }
-      });
-    } else {
-      var data = fs.readFileSync(path, 'utf8');
-
-      if (opts.bom && data.indexOf('\uFEFF') === 0) {
-        data = data.substring(1);
-      }
-
-      var options = {
-        knownHelpers: known,
-        knownHelpersOnly: opts.o
-      };
-
-      if (opts.data) {
-        options.data = true;
-      }
-
-      // Clean the template name
-      if (!root) {
-        template = basename(template);
-      } else if (template.indexOf(root) === 0) {
-        template = template.substring(root.length+1);
-      }
-      template = template.replace(extension, '');
-
-      if (opts.simple) {
-        output.push(Handlebars.precompile(data, options) + '\n');
-      } else if (opts.partial) {
-        if(opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
-          output.push('return ');
-        }
-        output.push('Handlebars.partials[\'' + template + '\'] = template(' + Handlebars.precompile(data, options) + ');\n');
-      } else {
-        if(opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
-          output.push('return ');
-        }
-        output.push('templates[\'' + template + '\'] = template(' + Handlebars.precompile(data, options) + ');\n');
-      }
+    output.add('  var template = Handlebars.template, templates = ');
+    if (opts.namespace) {
+      output.add(opts.namespace);
+      output.add(' = ');
+      output.add(opts.namespace);
+      output.add(' || ');
     }
+    output.add('{};\n');
   }
 
   opts.templates.forEach(function(template) {
-    processTemplate(template, opts.root);
+    let options = {
+      knownHelpers: known,
+      knownHelpersOnly: opts.o
+    };
+
+    if (opts.map) {
+      options.srcName = template.path;
+    }
+    if (opts.data) {
+      options.data = true;
+    }
+
+    let precompiled = Handlebars.precompile(template.source, options);
+
+    // 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.code, consumer);
+    }
+
+    if (opts.simple) {
+      output.add([precompiled, '\n']);
+    } else {
+      if (!template.name) {
+        throw new Handlebars.Exception('Name missing for template');
+      }
+
+      if (opts.amd && !multiple) {
+        output.add('return ');
+      }
+      output.add([objectName, '[\'', template.name, '\'] = template(', precompiled, ');\n']);
+    }
   });
 
   // Output the content
   if (!opts.simple) {
     if (opts.amd) {
-      if(opts.templates.length > 1 || (opts.templates.length == 1 && fs.statSync(opts.templates[0]).isDirectory())) {
-        if(opts.partial){
-          output.push('return Handlebars.partials;\n');
-        } else {
-          output.push('return templates;\n');
-        }
+      if (multiple) {
+        output.add(['return ', objectName, ';\n']);
       }
-      output.push('});');
+      output.add('});');
     } else if (!opts.commonjs) {
-      output.push('})();');
+      output.add('})();');
     }
   }
-  output = output.join('');
+
+
+  if (opts.map) {
+    output.add('\n//# sourceMappingURL=' + opts.map + '\n');
+  }
+
+  output = output.toStringWithSourceMap();
+  output.map = output.map + '';
 
   if (opts.min) {
-    output = uglify.minify(output, {fromString: true}).code;
+    output = uglify.minify(output.code, {
+      fromString: true,
+
+      outSourceMap: opts.map,
+      inSourceMap: JSON.parse(output.map)
+    });
+    if (opts.map) {
+      output.code += '\n//# sourceMappingURL=' + opts.map + '\n';
+    }
   }
 
+  if (opts.map) {
+    fs.writeFileSync(opts.map, output.map, 'utf8');
+  }
+  output = output.code;
+
   if (opts.output) {
     fs.writeFileSync(opts.output, output, 'utf8');
   } else {
     console.log(output);
   }
 };
+
+function arrayCast(value) {
+  value = value != null ? value : [];
+  if (!Array.isArray(value)) {
+    value = [value];
+  }
+  return value;
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "2.0.0-beta.1",
+  "version": "4.0.2",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
   "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
@@ -21,36 +21,40 @@
     "node": ">=0.4.7"
   },
   "dependencies": {
-    "optimist": "~0.3"
+    "async": "^1.4.0",
+    "optimist": "^0.6.1",
+    "source-map": "^0.4.4"
   },
   "optionalDependencies": {
-    "uglify-js": "~2.3"
+    "uglify-js": "~2.4"
   },
   "devDependencies": {
-    "async": "~0.2.9",
-    "aws-sdk": "~1.5.0",
+    "aws-sdk": "^2.1.49",
+    "babel-loader": "^5.0.0",
+    "babel-runtime": "^5.1.10",
     "benchmark": "~1.0",
-    "dustjs-linkedin": "~2.0.2",
+    "dustjs-linkedin": "^2.0.2",
     "eco": "~1.1.0-rc-3",
-    "es6-module-packager": "1.x",
     "grunt": "~0.4.1",
+    "grunt-babel": "^5.0.0",
     "grunt-cli": "~0.1.10",
-    "grunt-contrib-clean": "~0.4.1",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "~0.5.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-jshint": "0.x",
-    "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-clean": "0.x",
+    "grunt-contrib-concat": "0.x",
+    "grunt-contrib-connect": "0.x",
+    "grunt-contrib-copy": "0.x",
+    "grunt-contrib-requirejs": "0.x",
+    "grunt-contrib-uglify": "0.x",
+    "grunt-contrib-watch": "0.x",
+    "grunt-eslint": "^17.1.0",
     "grunt-saucelabs": "8.x",
+    "grunt-webpack": "^1.0.8",
     "istanbul": "^0.3.0",
     "jison": "~0.3.0",
-    "keen.io": "0.0.3",
     "mocha": "~1.20.0",
-    "mustache": "~0.7.2",
-    "semver": "~2.1.0",
-    "underscore": "~1.5.1"
+    "mock-stdin": "^0.3.0",
+    "mustache": "^2.1.3",
+    "semver": "^5.0.1",
+    "underscore": "^1.5.1"
   },
   "main": "lib/index.js",
   "bin": {
@@ -58,5 +62,14 @@
   },
   "scripts": {
     "test": "grunt"
+  },
+  "jspm": {
+    "main": "handlebars",
+    "directories": {
+      "lib": "dist/amd"
+    },
+    "buildConfig": {
+      "minify": true
+    }
   }
 }

release-notes.md

@@ -2,7 +2,142 @@
 
 ## Development
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-beta.1...master)
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.2...master)
+
+## 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://api.github.com/users/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://api.github.com/users/kpdecker))
+- [#1076](https://github.com/wycats/handlebars.js/pull/1076) - Implement partial blocks ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#1087](https://github.com/wycats/handlebars.js/pull/1087) - Fix #each when last object entry has empty key ([@denniskuczynski](https://api.github.com/users/denniskuczynski))
+- [#1084](https://github.com/wycats/handlebars.js/pull/1084) - Bump uglify version to fix vulnerability ([@John-Steidley](https://api.github.com/users/John-Steidley))
+- [#1068](https://github.com/wycats/handlebars.js/pull/1068) - Fix typo ([@0xack13](https://api.github.com/users/0xack13))
+- [#1060](https://github.com/wycats/handlebars.js/pull/1060) - #1056 Fixed grammar for nested raw blocks ([@ericbn](https://api.github.com/users/ericbn))
+- [#1052](https://github.com/wycats/handlebars.js/pull/1052) - Updated year in License ([@maqnouch](https://api.github.com/users/maqnouch))
+- [#1037](https://github.com/wycats/handlebars.js/pull/1037) - Fix minor typos in README ([@tomxtobin](https://api.github.com/users/tomxtobin))
+- [#1032](https://github.com/wycats/handlebars.js/issues/1032) - Is it possible to render a partial without the parent scope? ([@aputinski](https://api.github.com/users/aputinski))
+- [#1019](https://github.com/wycats/handlebars.js/pull/1019) - Fixes typo in tests ([@aymerick](https://api.github.com/users/aymerick))
+- [#1016](https://github.com/wycats/handlebars.js/issues/1016) - Version mis-match ([@mayankdedhia](https://api.github.com/users/mayankdedhia))
+- [#1023](https://github.com/wycats/handlebars.js/issues/1023) - is it possible for nested custom helpers to communicate between each other?
+- [#893](https://github.com/wycats/handlebars.js/issues/893) - [Proposal] Section blocks.
+- [#792](https://github.com/wycats/handlebars.js/issues/792) - feature request: inline partial definitions
+- [#583](https://github.com/wycats/handlebars.js/issues/583) - Parent path continues to drill down depth with multiple conditionals
+- [#404](https://github.com/wycats/handlebars.js/issues/404) - Add named child helpers that can be referenced by block helpers
+- Escape = in HTML content - [83b8e84](https://github.com/wycats/handlebars.js/commit/83b8e84)
+- Drop AST constructors in favor of JSON - [95d84ba](https://github.com/wycats/handlebars.js/commit/95d84ba)
+- Pass container rather than exec as context - [9a2d1d6](https://github.com/wycats/handlebars.js/commit/9a2d1d6)
+- Add ignoreStandalone compiler option - [ea3a5a1](https://github.com/wycats/handlebars.js/commit/ea3a5a1)
+- Ignore empty when iterating on sparse arrays - [06d515a](https://github.com/wycats/handlebars.js/commit/06d515a)
+- Add support for string and stdin precompilation - [0de8dac](https://github.com/wycats/handlebars.js/commit/0de8dac)
+- Simplify object assignment generation logic - [77e6bfc](https://github.com/wycats/handlebars.js/commit/77e6bfc)
+- Bulletproof AST.helpers.helperExpression - [93b0760](https://github.com/wycats/handlebars.js/commit/93b0760)
+- Always return string responses - [8e868ab](https://github.com/wycats/handlebars.js/commit/8e868ab)
+- Pass undefined fields to helpers in strict mode - [5d4b8da](https://github.com/wycats/handlebars.js/commit/5d4b8da)
+- Avoid depth creation when context remains the same - [279e038](https://github.com/wycats/handlebars.js/commit/279e038)
+- Improve logging API - [9a49d35](https://github.com/wycats/handlebars.js/commit/9a49d35)
+- Fix with operator in no @data mode - [231a8d7](https://github.com/wycats/handlebars.js/commit/231a8d7)
+- Allow empty key name in each iteration - [1bb640b](https://github.com/wycats/handlebars.js/commit/1bb640b)
+- Add with block parameter support - [2a85106](https://github.com/wycats/handlebars.js/commit/2a85106)
+- Fix escaping of non-javascript identifiers - [410141c](https://github.com/wycats/handlebars.js/commit/410141c)
+- Fix location information for programs - [93faffa](https://github.com/wycats/handlebars.js/commit/93faffa)
+
+Compatibility notes:
+- Depthed paths are now conditional pushed on to the stack. If the helper uses the same context, then a new stack is not created. This leads to behavior the 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
+- The runtime version has been increased. Precompiled templates will need to use runtime of at least 4.0.0.
+
+[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://api.github.com/users/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://api.github.com/users/kpdecker))
+- [#994](https://github.com/wycats/handlebars.js/issues/994) - Access Handlebars.Visitor in browser ([@tamlyn](https://api.github.com/users/tamlyn))
+- [#990](https://github.com/wycats/handlebars.js/issues/990) - Allow passing null/undefined literals subexpressions ([@blimmer](https://api.github.com/users/blimmer))
+- [#989](https://github.com/wycats/handlebars.js/issues/989) - Source-map error with requirejs ([@SteppeEagle](https://api.github.com/users/SteppeEagle))
+- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property  ([@75lb](https://api.github.com/users/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://api.github.com/users/johneke))
+- [#973](https://github.com/wycats/handlebars.js/issues/973) - version 3 is slower than version 2 ([@elover](https://api.github.com/users/elover))
+- [#966](https://github.com/wycats/handlebars.js/issues/966) - "handlebars --version" does not work with v3.0.0 ([@abloomston](https://api.github.com/users/abloomston))
+- [#964](https://github.com/wycats/handlebars.js/pull/964) - default is a reserved word ([@grassick](https://api.github.com/users/grassick))
+- [#962](https://github.com/wycats/handlebars.js/pull/962) - Add dashbars' link on README. ([@pismute](https://api.github.com/users/pismute))
+
+[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://api.github.com/users/kpdecker))
+- [#940](https://github.com/wycats/handlebars.js/pull/940) - Add missing reserved words so compiler knows to use array syntax: ([@mattflaschen](https://api.github.com/users/mattflaschen))
+- [#938](https://github.com/wycats/handlebars.js/pull/938) - Fix example using #with helper ([@diwo](https://api.github.com/users/diwo))
+- [#930](https://github.com/wycats/handlebars.js/pull/930) - Add parent tracking and mutation to AST visitors ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#926](https://github.com/wycats/handlebars.js/issues/926) - Depthed lookups fail when program duplicator runs ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#918](https://github.com/wycats/handlebars.js/pull/918) - Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos ([@oneeman](https://api.github.com/users/oneeman))
+- [#915](https://github.com/wycats/handlebars.js/pull/915) - Ast update ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#910](https://github.com/wycats/handlebars.js/issues/910) - Different behavior of {{@last}} when {{#each}} in {{#each}} ([@zordius](https://api.github.com/users/zordius))
+- [#907](https://github.com/wycats/handlebars.js/issues/907) - Implement named helper variable references ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#906](https://github.com/wycats/handlebars.js/pull/906) - Add parser support for block params ([@mmun](https://api.github.com/users/mmun))
+- [#903](https://github.com/wycats/handlebars.js/issues/903) - Only provide aliases for multiple use calls ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#902](https://github.com/wycats/handlebars.js/pull/902) - Generate Source Maps ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#901](https://github.com/wycats/handlebars.js/issues/901) - Still escapes with noEscape enabled on isolated Handlebars environment ([@zedknight](https://api.github.com/users/zedknight))
+- [#896](https://github.com/wycats/handlebars.js/pull/896) - Simplify BlockNode by removing intermediate MustacheNode ([@mmun](https://api.github.com/users/mmun))
+- [#892](https://github.com/wycats/handlebars.js/pull/892) - Implement parser for else chaining of helpers ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#889](https://github.com/wycats/handlebars.js/issues/889) - Consider extensible parser API ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#887](https://github.com/wycats/handlebars.js/issues/887) - Handlebars.noConflict() option? ([@bradvogel](https://api.github.com/users/bradvogel))
+- [#886](https://github.com/wycats/handlebars.js/issues/886) - Add SafeString to context (or use duck-typing) ([@dominicbarnes](https://api.github.com/users/dominicbarnes))
+- [#870](https://github.com/wycats/handlebars.js/pull/870) - Registering undefined partial throws exception. ([@max-b](https://api.github.com/users/max-b))
+- [#866](https://github.com/wycats/handlebars.js/issues/866) - comments don't respect whitespace control ([@75lb](https://api.github.com/users/75lb))
+- [#863](https://github.com/wycats/handlebars.js/pull/863) - + jsDelivr CDN info ([@tomByrer](https://api.github.com/users/tomByrer))
+- [#858](https://github.com/wycats/handlebars.js/issues/858) - Disable new default auto-indent at included partials ([@majodev](https://api.github.com/users/majodev))
+- [#856](https://github.com/wycats/handlebars.js/pull/856) - jspm compatibility ([@MajorBreakfast](https://api.github.com/users/MajorBreakfast))
+- [#805](https://github.com/wycats/handlebars.js/issues/805) - Request: "strict" lookups ([@nzakas](https://api.github.com/users/nzakas))
+
+- Export the default object for handlebars/runtime - 5594416
+- 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
+  - The Visitor API has been expanded to support mutation and provide a base implementation
+- The `JavaScriptCompiler` APIs have been formalized and documented. As part of the sourcemap handling these should be updated to return arrays for concatenation.
+- `JavaScriptCompiler.namespace` has been removed as it was unused.
+- `SafeString` is now duck typed on `toHTML`
+
+New Features:
+- noConflict
+- Source Maps
+- Block Params
+- Strict Mode
+- @last and other each changes
+- Chained else blocks
+- @data methods can now have helper parameters passed to them
+- Dynamic partials
+
+[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
+
+[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://api.github.com/users/kpdecker))

runtime.js

@@ -1,3 +1,3 @@
 // Create a simple path alias to allow browserify to resolve
 // the runtime on a supported path.
-module.exports = require('./dist/cjs/handlebars.runtime');
+module.exports = require('./dist/cjs/handlebars.runtime')['default'];

spec/.eslintrc

@@ -0,0 +1,36 @@
+{
+  "globals": {
+    "CompilerContext": true,
+    "Handlebars": true,
+    "handlebarsEnv": true,
+
+    "shouldCompileTo": true,
+    "shouldCompileToWithPartials": true,
+    "shouldThrow": true,
+    "compileWithPartials": true,
+
+    "console": true,
+    "require": true,
+    "suite": true,
+    "equal": true,
+    "equals": true,
+    "test": true,
+    "testBoth": true,
+    "raises": true,
+    "deepEqual": true,
+    "start": true,
+    "stop": true,
+    "ok": true,
+    "strictEqual": true,
+    "define": true
+  },
+  "env": {
+    "mocha": true
+  },
+  "rules": {
+    // Disabling for tests, for now.
+    "no-path-concat": 0,
+
+    "no-var": 0
+  }
+}

spec/amd-runtime.html

@@ -28,11 +28,16 @@
 
     <script src="/spec/env/common.js"></script>
     <script>
+      var requireFailure;
+
       requirejs.config({
         paths: {
           'handlebars.runtime': '/dist/handlebars.runtime.amd'
         }
       });
+      requirejs.onError = function (err) {
+        requireFailure = err;
+      };
     </script>
     <script>
       onload = function(){
@@ -60,6 +65,17 @@
 
           runner.on('fail', logFailure);
 
+          // Inject any require initilizer failures into the first test so they are properly
+          // reported.
+          if (requireFailure) {
+            runner.on('hook end', function(hook){
+              if (requireFailure) {
+                runner.uncaught(requireFailure);
+                requireFailure = undefined;
+              }
+            });
+          }
+
           function logFailure(test, err){
 
             var flattenTitles = function(test){

spec/amd.html

@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
   <head>
     <title>Mocha</title>
@@ -28,12 +29,17 @@
 
     <script src="/spec/env/common.js"></script>
     <script>
+      var requireFailure;
+
       requirejs.config({
         paths: {
           handlebars: '/dist/handlebars.amd',
           tests: '/tmp/tests'
         }
       });
+      requirejs.onError = function (err) {
+        requireFailure = err;
+      };
 
       var CompilerContext = {
         compile: function(template, options) {
@@ -79,16 +85,26 @@
 
             runner.on('fail', logFailure);
 
-            function logFailure(test, err){
+            // Inject any require initilizer failures into the first test so they are properly
+            // reported.
+            if (requireFailure) {
+              runner.on('hook end', function(hook){
+                if (requireFailure) {
+                  runner.uncaught(requireFailure);
+                  requireFailure = undefined;
+                }
+              });
+            }
 
-              var flattenTitles = function(test){
+            function logFailure(test, err){
+              function flattenTitles(test){
                 var titles = [];
                 while (test.parent.title){
                   titles.push(test.parent.title);
                   test = test.parent;
                 }
                 return titles.reverse();
-              };
+              }
 
               failedTests.push({
                 name: test.title,
@@ -97,7 +113,7 @@
                 stack: err.stack,
                 titles: flattenTitles(test)
               });
-            };
+            }
           });
         });
       };

spec/artifacts/bom.handlebars

@@ -0,0 +1 @@
+a

spec/ast.js

@@ -1,371 +1,242 @@
-/*global Handlebars, handlebarsEnv, shouldThrow */
 describe('ast', function() {
   if (!Handlebars.AST) {
     return;
   }
 
-  var LOCATION_INFO = {
-    last_line: 0,
-    first_line: 0,
-    first_column: 0,
-    last_column: 0
-  };
+  var AST = Handlebars.AST;
 
-  function testLocationInfoStorage(node){
-    var properties = [ 'firstLine', 'lastLine', 'firstColumn', 'lastColumn' ],
-        property,
-        propertiesLen = properties.length,
-        i;
-
-    for (i = 0; i < propertiesLen; i++){
-      property = properties[0];
-      equals(node[property], 0);
-    }
-  }
-
-  describe('MustacheNode', function() {
-    function testEscape(open, expected) {
-      var mustache = new handlebarsEnv.AST.MustacheNode([{}], {}, open, false);
-      equals(mustache.escaped, expected);
-    }
-
-    it('should store args', function() {
-      var id = {isSimple: true},
-          hash = {},
-          mustache = new handlebarsEnv.AST.MustacheNode([id, 'param1'], hash, '', false, LOCATION_INFO);
-      equals(mustache.type, 'mustache');
-      equals(mustache.hash, hash);
-      equals(mustache.escaped, true);
-      equals(mustache.id, id);
-      equals(mustache.params.length, 1);
-      equals(mustache.params[0], 'param1');
-      equals(!!mustache.isHelper, true);
-      testLocationInfoStorage(mustache);
-    });
-    it('should accept token for escape', function() {
-      testEscape('{{', true);
-      testEscape('{{~', true);
-      testEscape('{{#', true);
-      testEscape('{{~#', true);
-      testEscape('{{/', true);
-      testEscape('{{~/', true);
-      testEscape('{{^', true);
-      testEscape('{{~^', true);
-      testEscape('{', true);
-      testEscape('{', true);
-
-      testEscape('{{&', false);
-      testEscape('{{~&', false);
-      testEscape('{{{', false);
-      testEscape('{{~{', false);
-    });
-    it('should accept boolean for escape', function() {
-      testEscape(true, true);
-      testEscape({}, true);
-
-      testEscape(false, false);
-      testEscape(undefined, false);
-    });
-  });
-  describe('BlockNode', function() {
+  describe('BlockStatement', function() {
     it('should throw on mustache mismatch', function() {
       shouldThrow(function() {
-        handlebarsEnv.parse("\n  {{#foo}}{{/bar}}");
-      }, Handlebars.Exception, "foo doesn't match bar - 2:2");
-    });
-
-    it('stores location info', function(){
-      var sexprNode = new handlebarsEnv.AST.SexprNode([{ original: 'foo'}], null);
-      var mustacheNode = new handlebarsEnv.AST.MustacheNode(sexprNode, null, '{{', {});
-      var block = new handlebarsEnv.AST.BlockNode(mustacheNode,
-                                                  {statements: [], strip: {}}, {statements: [], strip: {}},
-                                                  {
-                                                    strip: {},
-                                                    path: {original: 'foo'}
-                                                  },
-                                                  LOCATION_INFO);
-      testLocationInfoStorage(block);
-    });
-  });
-  describe('IdNode', function() {
-    it('should throw on invalid path', function() {
-      shouldThrow(function() {
-        new handlebarsEnv.AST.IdNode([
-          {part: 'foo'},
-          {part: '..'},
-          {part: 'bar'}
-        ], {first_line: 1, first_column: 1});
-      }, Handlebars.Exception, "Invalid path: foo.. - 1:1");
-      shouldThrow(function() {
-        new handlebarsEnv.AST.IdNode([
-          {part: 'foo'},
-          {part: '.'},
-          {part: 'bar'}
-        ], {first_line: 1, first_column: 1});
-      }, Handlebars.Exception, "Invalid path: foo. - 1:1");
-      shouldThrow(function() {
-        new handlebarsEnv.AST.IdNode([
-          {part: 'foo'},
-          {part: 'this'},
-          {part: 'bar'}
-        ], {first_line: 1, first_column: 1});
-      }, Handlebars.Exception, "Invalid path: foothis - 1:1");
-    });
-
-    it('stores location info', function(){
-      var idNode = new handlebarsEnv.AST.IdNode([], LOCATION_INFO);
-      testLocationInfoStorage(idNode);
+        handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
+      }, Handlebars.Exception, "foo doesn't match bar - 2:5");
     });
   });
 
-  describe("HashNode", function(){
+  describe('helpers', function() {
+    describe('#helperExpression', function() {
+      it('should handle mustache statements', function() {
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', 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(AST.helpers.helperExpression({type: 'BlockStatement', 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);
+      });
+      it('should work with non-helper nodes', function() {
+        equals(AST.helpers.helperExpression({type: 'Program'}), false);
 
-    it('stores location info', function(){
-      var hash = new handlebarsEnv.AST.HashNode([], LOCATION_INFO);
-      testLocationInfoStorage(hash);
+        equals(AST.helpers.helperExpression({type: 'PartialStatement'}), 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: 'StringLiteral'}), false);
+        equals(AST.helpers.helperExpression({type: 'NumberLiteral'}), false);
+        equals(AST.helpers.helperExpression({type: 'BooleanLiteral'}), false);
+        equals(AST.helpers.helperExpression({type: 'UndefinedLiteral'}), false);
+        equals(AST.helpers.helperExpression({type: 'NullLiteral'}), false);
+
+        equals(AST.helpers.helperExpression({type: 'Hash'}), false);
+        equals(AST.helpers.helperExpression({type: 'HashPair'}), false);
+      });
     });
   });
 
-  describe("ContentNode", function(){
+  describe('Line Numbers', function() {
+    var ast, body;
 
-    it('stores location info', function(){
-      var content = new handlebarsEnv.AST.ContentNode("HI", LOCATION_INFO);
-      testLocationInfoStorage(content);
-    });
-  });
-
-  describe("CommentNode", function(){
-
-    it('stores location info', function(){
-      var comment = new handlebarsEnv.AST.CommentNode("HI", LOCATION_INFO);
-      testLocationInfoStorage(comment);
-    });
-  });
-
-  describe("NumberNode", function(){
-
-    it('stores location info', function(){
-      var integer = new handlebarsEnv.AST.NumberNode("6", LOCATION_INFO);
-      testLocationInfoStorage(integer);
-    });
-  });
-
-  describe("StringNode", function(){
-
-    it('stores location info', function(){
-      var string = new handlebarsEnv.AST.StringNode("6", LOCATION_INFO);
-      testLocationInfoStorage(string);
-    });
-  });
-
-  describe("BooleanNode", function(){
-
-    it('stores location info', function(){
-      var bool = new handlebarsEnv.AST.BooleanNode("true", LOCATION_INFO);
-      testLocationInfoStorage(bool);
-    });
-  });
-
-  describe("DataNode", function(){
-
-    it('stores location info', function(){
-      var data = new handlebarsEnv.AST.DataNode("YES", LOCATION_INFO);
-      testLocationInfoStorage(data);
-    });
-  });
-
-  describe("PartialNameNode", function(){
-
-    it('stores location info', function(){
-      var pnn = new handlebarsEnv.AST.PartialNameNode({original: "YES"}, LOCATION_INFO);
-      testLocationInfoStorage(pnn);
-    });
-  });
-
-  describe("PartialNode", function(){
-
-    it('stores location info', function(){
-      var pn = new handlebarsEnv.AST.PartialNode("so_partial", {}, {}, {}, LOCATION_INFO);
-      testLocationInfoStorage(pn);
-    });
-  });
-
-  describe('ProgramNode', function(){
-    it('storing location info', function(){
-      var pn = new handlebarsEnv.AST.ProgramNode([], {}, LOCATION_INFO);
-      testLocationInfoStorage(pn);
-    });
-  });
-
-  describe("Line Numbers", function(){
-    var ast, statements;
-
-    function testColumns(node, firstLine, lastLine, firstColumn, lastColumn){
-      equals(node.firstLine, firstLine);
-      equals(node.lastLine, lastLine);
-      equals(node.firstColumn, firstColumn);
-      equals(node.lastColumn, lastColumn);
+    function testColumns(node, firstLine, lastLine, firstColumn, lastColumn) {
+      equals(node.loc.start.line, firstLine);
+      equals(node.loc.start.column, firstColumn);
+      equals(node.loc.end.line, lastLine);
+      equals(node.loc.end.column, lastColumn);
     }
 
-    ast = Handlebars.parse("line 1 {{line1Token}}\n line 2 {{line2token}}\n line 3 {{#blockHelperOnLine3}}\nline 4{{line4token}}\n" +
-                           "line5{{else}}\n{{line6Token}}\n{{/blockHelperOnLine3}}");
-    statements = ast.statements;
+    ast = Handlebars.parse(
+              'line 1 {{line1Token}}\n'             // 1
+            + ' line 2 {{line2token}}\n'            // 2
+            + ' line 3 {{#blockHelperOnLine3}}\n'   // 3
+            + 'line 4{{line4token}}\n'              // 4
+            + 'line5{{else}}\n'                     // 5
+            + '{{line6Token}}\n'                    // 6
+            + '{{/blockHelperOnLine3}}\n'           // 7
+            + '{{#open}}\n'                         // 8
+            + '{{else inverse}}\n'                  // 9
+            + '{{else}}\n'                          // 10
+            + '{{/open}}');                         // 11
+    body = ast.body;
 
-    it('gets ContentNode line numbers', function(){
-      var contentNode = statements[0];
+    it('gets ContentNode line numbers', function() {
+      var contentNode = body[0];
       testColumns(contentNode, 1, 1, 0, 7);
     });
 
-    it('gets MustacheNode line numbers', function(){
-      var mustacheNode = statements[1];
+    it('gets MustacheStatement line numbers', function() {
+      var mustacheNode = body[1];
       testColumns(mustacheNode, 1, 1, 7, 21);
     });
 
-    it('gets line numbers correct when newlines appear', function(){
-      testColumns(statements[2], 1, 2, 21, 8);
+    it('gets line numbers correct when newlines appear', function() {
+      testColumns(body[2], 1, 2, 21, 8);
     });
 
-    it('gets MustacheNode line numbers correct across newlines', function(){
-      var secondMustacheNode = statements[3];
-      testColumns(secondMustacheNode, 2, 2, 8, 22);
+    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(){
-       var blockHelperNode = statements[5];
+     it('gets the block helper information correct', function() {
+       var blockHelperNode = body[5];
        testColumns(blockHelperNode, 3, 7, 8, 23);
      });
 
-     it('correctly records the line numbers the program of a block helper', function(){
-       var blockHelperNode = statements[5],
+     it('correctly records the line numbers the program of a block helper', function() {
+       var blockHelperNode = body[5],
            program = blockHelperNode.program;
 
-       testColumns(program, 3, 5, 8, 5);
+       testColumns(program, 3, 5, 31, 5);
      });
 
-     it('correctly records the line numbers of an inverse of a block helper', function(){
-       var blockHelperNode = statements[5],
+     it('correctly records the line numbers of an inverse of a block helper', function() {
+       var blockHelperNode = body[5],
            inverse = blockHelperNode.inverse;
 
-       testColumns(inverse, 5, 7, 5, 0);
+       testColumns(inverse, 5, 7, 13, 0);
+     });
+
+     it('correctly records the line number of chained inverses', function() {
+       var chainInverseNode = body[7];
+
+       testColumns(chainInverseNode.program, 8, 9, 9, 0);
+       testColumns(chainInverseNode.inverse, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse.body[0].program, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse.body[0].inverse, 10, 11, 8, 0);
      });
   });
 
-  describe('standalone flags', function(){
+  describe('standalone flags', function() {
     describe('mustache', function() {
       it('does not mark mustaches as standalone', function() {
         var ast = Handlebars.parse('  {{comment}} ');
-        equals(!!ast.statements[0].string, true);
-        equals(!!ast.statements[2].string, true);
+        equals(!!ast.body[0].value, true);
+        equals(!!ast.body[2].value, true);
       });
     });
     describe('blocks', function() {
       it('marks block mustaches as standalone', function() {
         var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            block = ast.statements[1];
+            block = ast.body[1];
 
-        equals(ast.statements[0].string, '');
+        equals(ast.body[0].value, '');
 
-        equals(block.program.statements[0].string, 'foo\n');
-        equals(block.inverse.statements[0].string, '  bar \n');
+        equals(block.program.body[0].value, 'foo\n');
+        equals(block.inverse.body[0].value, '  bar \n');
 
-        equals(ast.statements[2].string, '');
+        equals(ast.body[2].value, '');
       });
       it('marks initial block mustaches as standalone', function() {
         var ast = Handlebars.parse('{{# comment}} \nfoo\n {{/comment}}'),
-            block = ast.statements[0];
+            block = ast.body[0];
 
-        equals(block.program.statements[0].string, 'foo\n');
+        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.statements[0];
+            block = ast.body[0];
 
-        equals(block.program.statements[0].string, '');
-        equals(block.program.statements[1].id.original, 'foo');
-        equals(block.program.statements[2].string, '\n');
+        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('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-            statements = ast.statements[0].program.statements,
-            block = statements[1];
+            body = ast.body[0].program.body,
+            block = body[1];
 
-        equals(statements[0].string, '');
+        equals(body[0].value, '');
 
-        equals(block.program.statements[0].string, 'foo\n');
-        equals(block.inverse.statements[0].string, '  bar \n');
+        equals(block.program.body[0].value, 'foo\n');
+        equals(block.inverse.body[0].value, '  bar \n');
 
-        equals(statements[0].string, '');
+        equals(body[0].value, '');
       });
       it('does not mark nested block mustaches as standalone', function() {
         var ast = Handlebars.parse('{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'),
-            statements = ast.statements[0].program.statements,
-            block = statements[1];
+            body = ast.body[0].program.body,
+            block = body[1];
 
-        equals(statements[0].omit, undefined);
+        equals(body[0].omit, undefined);
 
-        equals(block.program.statements[0].string, ' \nfoo\n');
-        equals(block.inverse.statements[0].string, '  bar \n  ');
+        equals(block.program.body[0].value, ' \nfoo\n');
+        equals(block.inverse.body[0].value, '  bar \n  ');
 
-        equals(statements[0].omit, undefined);
+        equals(body[0].omit, undefined);
       });
       it('does not mark nested initial block mustaches as standalone', function() {
         var ast = Handlebars.parse('{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'),
-            statements = ast.statements[0].program.statements,
-            block = statements[0];
+            body = ast.body[0].program.body,
+            block = body[0];
 
-        equals(block.program.statements[0].string, ' \nfoo\n');
-        equals(block.inverse.statements[0].string, '  bar \n  ');
+        equals(block.program.body[0].value, ' \nfoo\n');
+        equals(block.inverse.body[0].value, '  bar \n  ');
 
-        equals(statements[0].omit, undefined);
+        equals(body[0].omit, undefined);
       });
 
       it('marks column 0 block mustaches as standalone', function() {
         var ast = Handlebars.parse('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            block = ast.statements[1];
+            block = ast.body[1];
 
-        equals(ast.statements[0].omit, undefined);
+        equals(ast.body[0].omit, undefined);
 
-        equals(block.program.statements[0].string, 'foo\n');
-        equals(block.inverse.statements[0].string, '  bar \n');
+        equals(block.program.body[0].value, 'foo\n');
+        equals(block.inverse.body[0].value, '  bar \n');
 
-        equals(ast.statements[2].string, '');
+        equals(ast.body[2].value, '');
       });
     });
     describe('partials', function() {
       it('marks partial as standalone', function() {
         var ast = Handlebars.parse('{{> partial }} ');
-        equals(ast.statements[1].string, '');
+        equals(ast.body[1].value, '');
       });
       it('marks indented partial as standalone', function() {
         var ast = Handlebars.parse('  {{> partial }} ');
-        equals(ast.statements[0].string, '');
-        equals(ast.statements[1].indent, '  ');
-        equals(ast.statements[2].string, '');
+        equals(ast.body[0].value, '');
+        equals(ast.body[1].indent, '  ');
+        equals(ast.body[2].value, '');
       });
       it('marks those around content as not standalone', function() {
         var ast = Handlebars.parse('a{{> partial }}');
-        equals(ast.statements[0].omit, undefined);
+        equals(ast.body[0].omit, undefined);
 
         ast = Handlebars.parse('{{> partial }}a');
-        equals(ast.statements[1].omit, undefined);
+        equals(ast.body[1].omit, undefined);
       });
     });
     describe('comments', function() {
       it('marks comment as standalone', function() {
         var ast = Handlebars.parse('{{! comment }} ');
-        equals(ast.statements[1].string, '');
+        equals(ast.body[1].value, '');
       });
       it('marks indented comment as standalone', function() {
         var ast = Handlebars.parse('  {{! comment }} ');
-        equals(ast.statements[0].string, '');
-        equals(ast.statements[2].string, '');
+        equals(ast.body[0].value, '');
+        equals(ast.body[2].value, '');
       });
       it('marks those around content as not standalone', function() {
         var ast = Handlebars.parse('a{{! comment }}');
-        equals(ast.statements[0].omit, undefined);
+        equals(ast.body[0].omit, undefined);
 
         ast = Handlebars.parse('{{! comment }}a');
-        equals(ast.statements[1].omit, undefined);
+        equals(ast.body[1].omit, undefined);
       });
     });
   });

spec/basic.js

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

spec/blocks.js

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

spec/builtins.js

@@ -1,52 +1,66 @@
-/*global CompilerContext, shouldCompileTo, shouldThrow, compileWithPartials, handlebarsEnv */
 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!",
-                      "if with boolean argument shows the contents when true");
-      shouldCompileTo(string, {goodbye: "dummy", world: "world"}, "GOODBYE cruel world!",
-                      "if with string argument shows the contents");
-      shouldCompileTo(string, {goodbye: false, world: "world"}, "cruel world!",
-                      "if with boolean argument does not show the contents when false");
-      shouldCompileTo(string, {world: "world"}, "cruel world!",
-                      "if with undefined does not show the contents");
-      shouldCompileTo(string, {goodbye: ['foo'], world: "world"}, "GOODBYE cruel world!",
-                      "if with non-empty array shows the contents");
-      shouldCompileTo(string, {goodbye: [], world: "world"}, "cruel world!",
-                      "if with empty array does not show the contents");
-      shouldCompileTo(string, {goodbye: 0, world: "world"}, "cruel world!",
-                      "if with zero does not show the contents");
-      shouldCompileTo("{{#if goodbye includeZero=true}}GOODBYE {{/if}}cruel {{world}}!",
-                      {goodbye: 0, world: "world"}, "GOODBYE cruel world!",
-                      "if with zero does not show the contents");
+    it('if', function() {
+      var string = '{{#if goodbye}}GOODBYE {{/if}}cruel {{world}}!';
+      shouldCompileTo(string, {goodbye: true, world: 'world'}, 'GOODBYE cruel world!',
+                      'if with boolean argument shows the contents when true');
+      shouldCompileTo(string, {goodbye: 'dummy', world: 'world'}, 'GOODBYE cruel world!',
+                      'if with string argument shows the contents');
+      shouldCompileTo(string, {goodbye: false, world: 'world'}, 'cruel world!',
+                      'if with boolean argument does not show the contents when false');
+      shouldCompileTo(string, {world: 'world'}, 'cruel world!',
+                      'if with undefined does not show the contents');
+      shouldCompileTo(string, {goodbye: ['foo'], world: 'world'}, 'GOODBYE cruel world!',
+                      'if with non-empty array shows the contents');
+      shouldCompileTo(string, {goodbye: [], world: 'world'}, 'cruel world!',
+                      'if with empty array does not show the contents');
+      shouldCompileTo(string, {goodbye: 0, world: 'world'}, 'cruel world!',
+                      'if with zero does not show the contents');
+      shouldCompileTo('{{#if goodbye includeZero=true}}GOODBYE {{/if}}cruel {{world}}!',
+                      {goodbye: 0, world: 'world'}, 'GOODBYE cruel world!',
+                      'if with zero does not show the contents');
     });
 
-    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!",
-                      "if with function shows the contents when function returns true");
-      shouldCompileTo(string, {goodbye: function() {return this.world;}, world: "world"}, "GOODBYE cruel world!",
-                      "if with function shows the contents when function returns string");
-      shouldCompileTo(string, {goodbye: function() {return false;}, world: "world"}, "cruel world!",
-                      "if with function does not show the contents when returns false");
-      shouldCompileTo(string, {goodbye: function() {return this.foo;}, world: "world"}, "cruel world!",
-                      "if with function does not show the contents when returns undefined");
+    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!',
+                      'if with function shows the contents when function returns true');
+      shouldCompileTo(string, {goodbye: function() {return this.world; }, world: 'world'}, 'GOODBYE cruel world!',
+                      'if with function shows the contents when function returns string');
+      shouldCompileTo(string, {goodbye: function() {return false; }, world: 'world'}, 'cruel world!',
+                      'if with function does not show the contents when returns false');
+      shouldCompileTo(string, {goodbye: function() {return this.foo; }, world: 'world'}, 'cruel world!',
+                      'if with function does not show the contents when returns undefined');
+    });
+
+    it('should not change the depth list', function() {
+      var string = '{{#with foo}}{{#if goodbye}}GOODBYE cruel {{../world}}!{{/if}}{{/with}}';
+      shouldCompileTo(string, {foo: {goodbye: true}, world: 'world'}, 'GOODBYE cruel world!');
     });
   });
 
   describe('#with', function() {
-    it("with", function() {
-      var string = "{{#with person}}{{first}} {{last}}{{/with}}";
-      shouldCompileTo(string, {person: {first: "Alan", last: "Johnson"}}, "Alan Johnson");
+    it('with', function() {
+      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
+      shouldCompileTo(string, {person: {first: 'Alan', last: 'Johnson'}}, 'Alan Johnson');
     });
-    it("with with function argument", function() {
-      var string = "{{#with person}}{{first}} {{last}}{{/with}}";
-      shouldCompileTo(string, {person: function() { return {first: "Alan", last: "Johnson"};}}, "Alan Johnson");
+    it('with with function argument', function() {
+      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
+      shouldCompileTo(string, {person: function() { return {first: 'Alan', last: 'Johnson'}; }}, 'Alan Johnson');
     });
-    it("with with else", function() {
-      var string = "{{#with person}}Person is present{{else}}Person is not present{{/with}}";
-      shouldCompileTo(string, {}, "Person is not present");
+    it('with with else', function() {
+      var string = '{{#with person}}Person is present{{else}}Person is not present{{/with}}';
+      shouldCompileTo(string, {}, 'Person is not present');
+    });
+    it('with provides block parameter', function() {
+      var string = '{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}';
+      shouldCompileTo(string, {person: {first: 'Alan', last: 'Johnson'}}, 'Alan Johnson');
+    });
+    it('works when data is disabled', function() {
+      var template = CompilerContext.compile('{{#with person as |foo|}}{{foo.first}} {{last}}{{/with}}', {data: false});
+
+      var result = template({person: {first: 'Alan', last: 'Johnson'}});
+      equals(result, 'Alan Johnson');
     });
   });
 
@@ -57,143 +71,172 @@ 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"};
-      shouldCompileTo(string, hash, "goodbye! Goodbye! GOODBYE! cruel world!",
-                      "each with array argument iterates over the contents when not empty");
-      shouldCompileTo(string, {goodbyes: [], world: "world"}, "cruel world!",
-                      "each with array argument ignores the contents when empty");
+    it('each', function() {
+      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
+      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
+                      'each with array argument iterates over the contents when not empty');
+      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
+                      'each with array argument ignores the contents when empty');
     });
 
     it('each without data', function() {
-      var string   = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      var hash     = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      shouldCompileTo(string, [hash,,,,false], 'goodbye! Goodbye! GOODBYE! cruel world!');
+      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
+      shouldCompileTo(string, [hash,,,, false], 'goodbye! Goodbye! GOODBYE! cruel world!');
 
       hash = {goodbyes: 'cruel', world: 'world'};
-      shouldCompileTo('{{#each .}}{{.}}{{/each}}', [hash,,,,false], 'cruelworld');
+      shouldCompileTo('{{#each .}}{{.}}{{/each}}', [hash,,,, false], 'cruelworld');
     });
 
     it('each without context', function() {
-      var string   = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      shouldCompileTo(string, [,,,,], 'cruel !');
+      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
+      shouldCompileTo(string, [,,,, ], 'cruel !');
     });
 
-    it("each with an object and @key", function() {
-      var string   = "{{#each goodbyes}}{{@key}}. {{text}}! {{/each}}cruel {{world}}!";
+    it('each with an object and @key', function() {
+      var string = '{{#each goodbyes}}{{@key}}. {{text}}! {{/each}}cruel {{world}}!';
 
       function Clazz() {
         this['<b>#1</b>'] = {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 = "&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 expected1 = '&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!';
 
-      equals(actual === expected1 || actual === expected2, true, "each with object argument iterates over the contents when not empty");
-      shouldCompileTo(string, {goodbyes: [], world: "world"}, "cruel world!",
-                      "each with object argument ignores the contents when empty");
+      equals(actual === expected1 || actual === expected2, true, 'each with object argument iterates over the contents when not empty');
+      shouldCompileTo(string, {goodbyes: {}, world: 'world'}, 'cruel world!');
     });
 
-    it("each with @index", function() {
-      var string = "{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!";
-      var hash   = {goodbyes: [{text: "goodbye"}, {text: "Goodbye"}, {text: "GOODBYE"}], world: "world"};
+    it('each with @index', function() {
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!", "The @index variable is used");
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
     });
 
-    it("each with nested @index", function() {
-      var string = "{{#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"};
+    it('each with nested @index', function() {
+      var string = '{{#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'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      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");
+      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');
     });
 
-    it("each object with @index", function() {
-      var string = "{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!";
-      var hash   = {goodbyes: {'a': {text: "goodbye"}, b: {text: "Goodbye"}, c: {text: "GOODBYE"}}, world: "world"};
+    it('each with block params', function() {
+      var string = '{{#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'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!", "The @index variable is used");
+      equal(result, '0. goodbye!  0 0 0 1 After 0 1. Goodbye!  1 0 1 1 After 1 cruel world!');
     });
 
-
-    it("each with @first", function() {
-      var string = "{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!";
-      var hash   = {goodbyes: [{text: "goodbye"}, {text: "Goodbye"}, {text: "GOODBYE"}], world: "world"};
+    it('each object with @index', function() {
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
+      var hash = {goodbyes: {'a': {text: 'goodbye'}, b: {text: 'Goodbye'}, c: {text: 'GOODBYE'}}, world: 'world'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "goodbye! cruel world!", "The @first variable is used");
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
     });
 
-    it("each with nested @first", function() {
-      var string = "{{#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"};
+
+    it('each with @first', function() {
+      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "(goodbye! goodbye! goodbye!) (goodbye!) (goodbye!) cruel world!", "The @first variable is used");
+      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
     });
 
-    it("each object with @first", function() {
-      var string = "{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!";
-      var hash   = {goodbyes: {'foo': {text: "goodbye"}, bar: {text: "Goodbye"}}, world: "world"};
+    it('each with nested @first', function() {
+      var string = '{{#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'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "goodbye! cruel world!", "The @first variable is used");
+      equal(result, '(goodbye! goodbye! goodbye!) (goodbye!) (goodbye!) cruel world!', 'The @first variable is used');
     });
 
-    it("each with @last", function() {
-      var string = "{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!";
-      var hash   = {goodbyes: [{text: "goodbye"}, {text: "Goodbye"}, {text: "GOODBYE"}], world: "world"};
+    it('each object with @first', function() {
+      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
+      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "GOODBYE! cruel world!", "The @last variable is used");
+      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
     });
 
-    it("each with nested @last", function() {
-      var string = "{{#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"};
+    it('each with @last', function() {
+      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
+      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
 
-      equal(result, "(GOODBYE!) (GOODBYE!) (GOODBYE! GOODBYE! GOODBYE!) cruel world!", "The @last variable is used");
+      equal(result, 'GOODBYE! cruel world!', 'The @last variable is used');
     });
 
-    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"};
-      shouldCompileTo(string, hash, "goodbye! Goodbye! GOODBYE! cruel world!",
-                "each with array function argument iterates over the contents when not empty");
-      shouldCompileTo(string, {goodbyes: [], world: "world"}, "cruel world!",
-                "each with array function argument ignores the contents when empty");
+    it('each object with @last', function() {
+      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
+      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, 'Goodbye! cruel world!', 'The @last variable is used');
     });
 
-    it("data passed to helpers", function() {
-      var string = "{{#each letters}}{{this}}{{detectDataInsideEach}}{{/each}}";
+    it('each with nested @last', function() {
+      var string = '{{#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'};
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, '(GOODBYE!) (GOODBYE!) (GOODBYE! GOODBYE! GOODBYE!) cruel world!', 'The @last variable is used');
+    });
+
+    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'};
+      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
+                'each with array function argument iterates over the contents when not empty');
+      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
+                'each with array function argument ignores the contents when empty');
+    });
+
+    it('each object when last key is an empty string', function() {
+      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
+      var hash = {goodbyes: {'a': {text: 'goodbye'}, b: {text: 'Goodbye'}, '': {text: 'GOODBYE'}}, world: 'world'};
+
+      var template = CompilerContext.compile(string);
+      var result = template(hash);
+
+      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'Empty string key is not skipped');
+    });
+
+    it('data passed to helpers', function() {
+      var string = '{{#each letters}}{{this}}{{detectDataInsideEach}}{{/each}}';
       var hash = {letters: ['a', 'b', 'c']};
 
       var template = CompilerContext.compile(string);
@@ -205,96 +248,174 @@ describe('builtin helpers', function() {
       equal(result, 'a!b!c!', 'should output data');
     });
 
-    it("each on implicit context", function() {
+    it('each on implicit context', function() {
       shouldThrow(function() {
-        var template = CompilerContext.compile("{{#each}}{{text}}! {{/each}}cruel world!");
+        var template = CompilerContext.compile('{{#each}}{{text}}! {{/each}}cruel world!');
         template({});
       }, handlebarsEnv.Exception, 'Must pass iterator to #each');
     });
   });
 
-  describe("#log", function() {
+  describe('#log', function() {
+    /* eslint-disable no-console */
     if (typeof console === 'undefined') {
       return;
     }
 
-    var info,
-        error;
+    var $log,
+        $info,
+        $error;
     beforeEach(function() {
-      info = console.info;
-      error = console.error;
+      $log = console.log;
+      $info = console.info;
+      $error = console.error;
     });
     afterEach(function() {
-      console.info = info;
-      console.error = error;
+      console.log = $log;
+      console.info = $info;
+      console.error = $error;
     });
 
     it('should call logger at default level', function() {
-      var string = "{{log blah}}";
-      var hash   = { blah: "whee" };
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
 
       var levelArg, logArg;
-      handlebarsEnv.log = function(level, arg){
+      handlebarsEnv.log = function(level, arg) {
         levelArg = level;
         logArg = arg;
       };
 
-      shouldCompileTo(string, hash, "", "log should not display");
-      equals(1, levelArg, "should call log with 1");
-      equals("whee", logArg, "should call log with 'whee'");
+      shouldCompileTo(string, hash, '', 'log should not display');
+      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 string = '{{log blah}}';
+      var hash = { blah: 'whee' };
 
       var levelArg, logArg;
-      handlebarsEnv.log = function(level, arg){
+      handlebarsEnv.log = function(level, arg) {
         levelArg = level;
         logArg = arg;
       };
 
-      shouldCompileTo(string, [hash,,,,{level: '03'}], "");
-      equals(3, levelArg);
-      equals("whee", logArg);
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
+      equals('03', levelArg);
+      equals('whee', logArg);
     });
-    it('should not output to console', function() {
-      var string = "{{log blah}}";
-      var hash   = { blah: "whee" };
-
-      console.info = function() {
-        throw new Error();
-      };
-
-      shouldCompileTo(string, hash, "", "log should not display");
-    });
-    it('should log at data level', function() {
-      var string = "{{log blah}}";
-      var hash   = { blah: "whee" };
+    it('should output to info', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
       var called;
 
-      console.error = function(log) {
-        equals("whee", log);
+      console.info = function(info) {
+        equals('whee', info);
+        called = true;
+      };
+      console.log = function(log) {
+        equals('whee', log);
         called = true;
       };
 
-      shouldCompileTo(string, [hash,,,,{level: '03'}], "");
+      shouldCompileTo(string, hash, '');
+      equals(true, called);
+    });
+    it('should log at data level', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
+      var called;
+
+      console.error = function(log) {
+        equals('whee', log);
+        called = true;
+      };
+
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
       equals(true, called);
     });
     it('should handle missing logger', function() {
-      var string = "{{log blah}}";
-      var hash   = { blah: "whee" };
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' },
+          called = false;
 
       console.error = undefined;
+      console.log = function(log) {
+        equals('whee', log);
+        called = true;
+      };
 
-      shouldCompileTo(string, [hash,,,,{level: '03'}], "");
+      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
+      equals(true, called);
     });
+
+    it('should handle string log levels', function() {
+      var string = '{{log blah}}';
+      var hash = { blah: 'whee' };
+      var called;
+
+      console.error = function(log) {
+        equals('whee', log);
+        called = true;
+      };
+
+      shouldCompileTo(string, [hash,,,, {level: 'error'}], '');
+      equals(true, called);
+
+      called = false;
+
+      shouldCompileTo(string, [hash,,,, {level: 'ERROR'}], '');
+      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) {
+        equals('whee', log);
+        called = true;
+      };
+
+      shouldCompileTo(string, hash, '');
+      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(log) {
+        equals('whee', log);
+        called = true;
+      };
+
+      shouldCompileTo(string, hash, '');
+      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) {
+        equals('whee', log1);
+        equals('foo', log2);
+        equals(1, log3);
+        called = true;
+      };
+
+      shouldCompileTo(string, hash, '');
+      equals(true, called);
+    });
+    /* eslint-enable no-console */
   });
 
 
   describe('#lookup', function() {
     it('should lookup arbitrary content', function() {
       var string = '{{#each goodbyes}}{{lookup ../data .}}{{/each}}',
-          hash   = {goodbyes: [0, 1], data: ['foo', 'bar']};
+          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);
@@ -303,7 +424,7 @@ describe('builtin helpers', function() {
     });
     it('should not fail on undefined value', function() {
       var string = '{{#each goodbyes}}{{lookup ../bar .}}{{/each}}',
-          hash   = {goodbyes: [0, 1], data: ['foo', 'bar']};
+          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
 
       var template = CompilerContext.compile(string);
       var result = template(hash);

spec/compiler.js

@@ -1,5 +1,3 @@
-/*global Handlebars, shouldThrow */
-
 describe('compiler', function() {
   if (!Handlebars.compile) {
     return;
@@ -41,10 +39,13 @@ describe('compiler', function() {
     });
 
     it('can utilize AST instance', function() {
-      equal(Handlebars.compile(new Handlebars.AST.ProgramNode([ new Handlebars.AST.ContentNode("Hello")], {}))(), 'Hello');
+      equal(Handlebars.compile({
+        type: 'Program',
+        body: [ {type: 'ContentStatement', value: 'Hello'}]
+      })(), 'Hello');
     });
 
-    it("can pass through an empty string", function() {
+    it('can pass through an empty string', function() {
       equal(Handlebars.compile('')(), '');
     });
   });
@@ -60,10 +61,13 @@ describe('compiler', function() {
     });
 
     it('can utilize AST instance', function() {
-      equal(/return "Hello"/.test(Handlebars.precompile(new Handlebars.AST.ProgramNode([ new Handlebars.AST.ContentNode("Hello")]), {})), true);
+      equal(/return "Hello"/.test(Handlebars.precompile({
+        type: 'Program',
+        body: [ {type: 'ContentStatement', value: 'Hello'}]
+      })), true);
     });
 
-    it("can pass through an empty string", function() {
+    it('can pass through an empty string', function() {
       equal(/return ""/.test(Handlebars.precompile('')), true);
     });
   });

spec/data.js

@@ -1,25 +1,24 @@
-/*global CompilerContext, Handlebars, handlebarsEnv, shouldThrow */
 describe('data', function() {
-  it("passing in data to a compiled function that expects data - works with helpers", function() {
-    var template = CompilerContext.compile("{{hello}}", {data: true});
+  it('passing in data to a compiled function that expects data - works with helpers', function() {
+    var template = CompilerContext.compile('{{hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
-        return options.data.adjective + " "  + this.noun;
+        return options.data.adjective + ' ' + this.noun;
       }
     };
 
-    var result = template({noun: "cat"}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("happy cat", result, "Data output by helper");
+    var result = template({noun: 'cat'}, {helpers: helpers, data: {adjective: 'happy'}});
+    equals('happy cat', result, 'Data output by helper');
   });
 
-  it("data can be looked up via @foo", function() {
-    var template = CompilerContext.compile("{{@hello}}");
-    var result = template({}, { data: { hello: "hello" } });
-    equals("hello", result, "@foo retrieves template data");
+  it('data can be looked up via @foo', function() {
+    var template = CompilerContext.compile('{{@hello}}');
+    var result = template({}, { data: { hello: 'hello' } });
+    equals('hello', result, '@foo retrieves template data');
   });
 
-  it("deep @foo triggers automatic top-level data", function() {
+  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);
@@ -28,196 +27,211 @@ describe('data', function() {
       var frame = Handlebars.createFrame(options.data);
 
       for (var prop in options.hash) {
-        frame[prop] = options.hash[prop];
+        if (prop in options.hash) {
+          frame[prop] = options.hash[prop];
+        }
       }
       return options.fn(this, { data: frame });
     };
 
     var result = template({ foo: true }, { helpers: helpers });
-    equals("Hello world", result, "Automatic data was triggered");
+    equals('Hello world', result, 'Automatic data was triggered');
   });
 
-  it("parameter data can be looked up via @foo", function() {
-    var template = CompilerContext.compile("{{hello @world}}");
+  it('parameter data can be looked up via @foo', function() {
+    var template = CompilerContext.compile('{{hello @world}}');
     var helpers = {
       hello: function(noun) {
-        return "Hello " + noun;
+        return 'Hello ' + noun;
       }
     };
 
-    var result = template({}, { helpers: helpers, data: { world: "world" } });
-    equals("Hello world", result, "@foo as a parameter retrieves template data");
+    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() {
-    var template = CompilerContext.compile("{{hello noun=@world}}");
+  it('hash values can be looked up via @foo', function() {
+    var template = CompilerContext.compile('{{hello noun=@world}}');
     var helpers = {
       hello: function(options) {
-        return "Hello " + options.hash.noun;
+        return 'Hello ' + options.hash.noun;
       }
     };
 
-    var result = template({}, { helpers: helpers, data: { world: "world" } });
-    equals("Hello world", result, "@foo as a parameter retrieves template data");
+    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() {
-    var template = CompilerContext.compile("{{hello @world.bar}}");
+  it('nested parameter data can be looked up via @foo.bar', function() {
+    var template = CompilerContext.compile('{{hello @world.bar}}');
     var helpers = {
       hello: function(noun) {
-        return "Hello " + noun;
+        return 'Hello ' + noun;
       }
     };
 
-    var result = template({}, { helpers: helpers, data: { world: {bar: "world" } } });
-    equals("Hello world", result, "@foo as a parameter retrieves template data");
+    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() {
-    var template = CompilerContext.compile("{{hello @world.bar}}");
+  it('nested parameter data does not fail with @world.bar', function() {
+    var template = CompilerContext.compile('{{hello @world.bar}}');
     var helpers = {
       hello: function(noun) {
-        return "Hello " + noun;
+        return 'Hello ' + noun;
       }
     };
 
-    var result = template({}, { helpers: helpers, data: { foo: {bar: "world" } } });
-    equals("Hello undefined", result, "@foo as a parameter retrieves template data");
+    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() {
-    var string = "{{#goodbyes}}{{text}} cruel {{@foo/../name}}! {{/goodbyes}}";
+  it('parameter data throws when using complex scope references', function() {
+    var string = '{{#goodbyes}}{{text}} cruel {{@foo/../name}}! {{/goodbyes}}';
 
     shouldThrow(function() {
       CompilerContext.compile(string);
     }, Error);
   });
 
-  it("data is inherited downstream", function() {
-    var template = CompilerContext.compile("{{#let foo=1 bar=2}}{{#let foo=bar.baz}}{{@bar}}{{@foo}}{{/let}}{{@foo}}{{/let}}", { data: true });
+  it('data can be functions', function() {
+    var template = CompilerContext.compile('{{@hello}}');
+    var result = template({}, { data: { hello: function() { return 'hello'; } } });
+    equals('hello', result);
+  });
+  it('data can be functions with params', function() {
+    var template = CompilerContext.compile('{{@hello "hello"}}');
+    var result = template({}, { data: { hello: function(arg) { return arg; } } });
+    equals('hello', result);
+  });
+
+  it('data is inherited downstream', function() {
+    var template = CompilerContext.compile('{{#let foo=1 bar=2}}{{#let foo=bar.baz}}{{@bar}}{{@foo}}{{/let}}{{@foo}}{{/let}}', { data: true });
     var helpers = {
       let: function(options) {
         var frame = Handlebars.createFrame(options.data);
         for (var prop in options.hash) {
-          frame[prop] = options.hash[prop];
+          if (prop in options.hash) {
+            frame[prop] = options.hash[prop];
+          }
         }
         return options.fn(this, {data: frame});
       }
     };
 
-    var result = template({ bar: { baz: "hello world" } }, { helpers: helpers, data: {} });
-    equals("2hello world1", result, "data variables are inherited downstream");
+    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() {
-    var template = CompilerContext.compile("{{>my_partial}}", {data: true});
+  it('passing in data to a compiled function that expects data - works with helpers in partials', function() {
+    var template = CompilerContext.compile('{{>myPartial}}', {data: true});
 
     var partials = {
-      my_partial: CompilerContext.compile("{{hello}}", {data: true})
+      myPartial: CompilerContext.compile('{{hello}}', {data: true})
     };
 
     var helpers = {
       hello: function(options) {
-        return options.data.adjective + " "  + this.noun;
+        return options.data.adjective + ' ' + this.noun;
       }
     };
 
-    var result = template({noun: "cat"}, {helpers: helpers, partials: partials, data: {adjective: "happy"}});
-    equals("happy cat", result, "Data output by helper inside partial");
+    var result = template({noun: 'cat'}, {helpers: helpers, partials: partials, data: {adjective: 'happy'}});
+    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() {
-    var template = CompilerContext.compile("{{hello world}}", {data: true});
+  it('passing in data to a compiled function that expects data - works with helpers and parameters', function() {
+    var template = CompilerContext.compile('{{hello world}}', {data: true});
 
     var helpers = {
       hello: function(noun, options) {
-        return options.data.adjective + " "  + noun + (this.exclaim ? "!" : "");
+        return options.data.adjective + ' ' + noun + (this.exclaim ? '!' : '');
       }
     };
 
-    var result = template({exclaim: true, world: "world"}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("happy world!", result, "Data output by helper");
+    var result = template({exclaim: true, world: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
+    equals('happy world!', result, 'Data output by helper');
   });
 
-  it("passing in data to a compiled function that expects data - works with block helpers", function() {
-    var template = CompilerContext.compile("{{#hello}}{{world}}{{/hello}}", {data: true});
+  it('passing in data to a compiled function that expects data - works with block helpers', function() {
+    var template = CompilerContext.compile('{{#hello}}{{world}}{{/hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
         return options.fn(this);
       },
       world: function(options) {
-        return options.data.adjective + " world" + (this.exclaim ? "!" : "");
+        return options.data.adjective + ' world' + (this.exclaim ? '!' : '');
       }
     };
 
-    var result = template({exclaim: true}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("happy world!", result, "Data output by helper");
+    var result = template({exclaim: true}, {helpers: helpers, data: {adjective: 'happy'}});
+    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() {
-    var template = CompilerContext.compile("{{#hello}}{{world ../zomg}}{{/hello}}", {data: true});
+  it('passing in data to a compiled function that expects data - works with block helpers that use ..', function() {
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
-        return options.fn({exclaim: "?"});
+        return options.fn({exclaim: '?'});
       },
       world: function(thing, options) {
-        return options.data.adjective + " " + thing + (this.exclaim || "");
+        return options.data.adjective + ' ' + thing + (this.exclaim || '');
       }
     };
 
-    var result = template({exclaim: true, zomg: "world"}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("happy world?", result, "Data output by helper");
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
+    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() {
-    var template = CompilerContext.compile("{{#hello}}{{world ../zomg}}{{/hello}}", {data: true});
+  it('passing in data to a compiled function that expects data - data is passed to with block helpers where children use ..', function() {
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
-        return options.data.accessData + " " + options.fn({exclaim: "?"});
+        return options.data.accessData + ' ' + options.fn({exclaim: '?'});
       },
       world: function(thing, options) {
-        return options.data.adjective + " " + thing + (this.exclaim || "");
+        return options.data.adjective + ' ' + thing + (this.exclaim || '');
       }
     };
 
-    var result = template({exclaim: true, zomg: "world"}, {helpers: helpers, data: {adjective: "happy", accessData: "#win"}});
-    equals("#win happy world?", result, "Data output by helper");
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy', accessData: '#win'}});
+    equals('#win happy world?', result, 'Data output by helper');
   });
 
-  it("you can override inherited data when invoking a helper", function() {
-    var template = CompilerContext.compile("{{#hello}}{{world zomg}}{{/hello}}", {data: true});
+  it('you can override inherited data when invoking a helper', function() {
+    var template = CompilerContext.compile('{{#hello}}{{world zomg}}{{/hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
-        return options.fn({exclaim: "?", zomg: "world"}, { data: {adjective: "sad"} });
+        return options.fn({exclaim: '?', zomg: 'world'}, { data: {adjective: 'sad'} });
       },
       world: function(thing, options) {
-        return options.data.adjective + " " + thing + (this.exclaim || "");
+        return options.data.adjective + ' ' + thing + (this.exclaim || '');
       }
     };
 
-    var result = template({exclaim: true, zomg: "planet"}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("sad world?", result, "Overriden data output by helper");
+    var result = template({exclaim: true, zomg: 'planet'}, {helpers: helpers, data: {adjective: 'happy'}});
+    equals('sad world?', result, 'Overriden data output by helper');
   });
 
 
-  it("you can override inherited data when invoking a helper with depth", function() {
-    var template = CompilerContext.compile("{{#hello}}{{world ../zomg}}{{/hello}}", {data: true});
+  it('you can override inherited data when invoking a helper with depth', function() {
+    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
 
     var helpers = {
       hello: function(options) {
-        return options.fn({exclaim: "?"}, { data: {adjective: "sad"} });
+        return options.fn({exclaim: '?'}, { data: {adjective: 'sad'} });
       },
       world: function(thing, options) {
-        return options.data.adjective + " " + thing + (this.exclaim || "");
+        return options.data.adjective + ' ' + thing + (this.exclaim || '');
       }
     };
 
-    var result = template({exclaim: true, zomg: "world"}, {helpers: helpers, data: {adjective: "happy"}});
-    equals("sad world?", result, "Overriden data output by helper");
+    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
+    equals('sad world?', result, 'Overriden data output by helper');
   });
 
   describe('@root', function() {

spec/env/browser.js

@@ -1,14 +1,14 @@
-/*global handlebarsEnv */
 require('./common');
 
-var _ = require('underscore'),
-    fs = require('fs'),
+var fs = require('fs'),
     vm = require('vm');
 
-global.Handlebars = undefined;
+global.Handlebars = 'no-conflict';
 vm.runInThisContext(fs.readFileSync(__dirname + '/../../dist/handlebars.js'), 'dist/handlebars.js');
 
 global.CompilerContext = {
+  browser: true,
+
   compile: function(template, options) {
     var templateSpec = handlebarsEnv.precompile(template, options);
     return handlebarsEnv.template(safeEval(templateSpec));
@@ -19,10 +19,12 @@ global.CompilerContext = {
 };
 
 function safeEval(templateSpec) {
+  /* eslint-disable no-eval, no-console */
   try {
     return eval('(' + templateSpec + ')');
   } catch (err) {
     console.error(templateSpec);
     throw err;
   }
+  /* eslint-enable no-eval, no-console */
 }

spec/env/common.js

@@ -1,12 +1,27 @@
-/*global CompilerContext, compileWithPartials, shouldCompileToWithPartials */
+var AssertError;
+if (Error.captureStackTrace) {
+  AssertError = function AssertError(message, caller) {
+    Error.prototype.constructor.call(this, message);
+    this.message = message;
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, caller || AssertError);
+    }
+  };
+
+  AssertError.prototype = new Error();
+} else {
+  AssertError = Error;
+}
+
 global.shouldCompileTo = function(string, hashOrArray, expected, message) {
   shouldCompileToWithPartials(string, hashOrArray, false, expected, message);
 };
 
-global.shouldCompileToWithPartials = function(string, hashOrArray, partials, expected, message) {
+global.shouldCompileToWithPartials = function shouldCompileToWithPartials(string, hashOrArray, partials, expected, message) {
   var result = compileWithPartials(string, hashOrArray, partials);
   if (result !== expected) {
-    throw new Error("'" + result + "' should === '" + expected + "': " + message);
+    throw new AssertError("'" + result + "' should === '" + expected + "': " + message, shouldCompileToWithPartials);
   }
 };
 
@@ -14,11 +29,14 @@ global.compileWithPartials = function(string, hashOrArray, partials) {
   var template,
       ary,
       options;
-  if(Object.prototype.toString.call(hashOrArray) === "[object Array]") {
+  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]);
     ary.push({ helpers: hashOrArray[1], partials: hashOrArray[2] });
-    options = {compat: hashOrArray[3]};
+    options = typeof hashOrArray[3] === 'object' ? hashOrArray[3] : {compat: hashOrArray[3]};
     if (hashOrArray[4] != null) {
       options.data = !!hashOrArray[4];
       ary[1].data = hashOrArray[4];
@@ -32,9 +50,9 @@ global.compileWithPartials = function(string, hashOrArray, partials) {
 };
 
 
-global.equals = global.equal = function(a, b, msg) {
+global.equals = global.equal = function equals(a, b, msg) {
   if (a !== b) {
-    throw new Error("'" + a + "' should === '" + b + "'" + (msg ? ": " + msg : ''));
+    throw new AssertError("'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''), equals);
   }
 };
 
@@ -45,13 +63,13 @@ global.shouldThrow = function(callback, type, msg) {
     failed = true;
   } catch (err) {
     if (type && !(err instanceof type)) {
-      throw new Error('Type failure');
+      throw new AssertError('Type failure: ' + err);
     }
     if (msg && !(msg.test ? msg.test(err.message) : msg === err.message)) {
-      equal(msg, err.message);
+      throw new AssertError('Throw mismatch: Expected ' + err.message + ' to match ' + msg + '\n\n' + err.stack, shouldThrow);
     }
   }
   if (failed) {
-    throw new Error('It failed to throw');
+    throw new AssertError('It failed to throw', shouldThrow);
   }
 };

spec/env/node.js

@@ -1,4 +1,3 @@
-/*global handlebarsEnv */
 require('./common');
 
 global.Handlebars = require('../../lib');
@@ -14,10 +13,12 @@ global.CompilerContext = {
 };
 
 function safeEval(templateSpec) {
+  /* eslint-disable no-eval, no-console */
   try {
     return eval('(' + templateSpec + ')');
   } catch (err) {
     console.error(templateSpec);
     throw err;
   }
+  /* eslint-enable no-eval, no-console */
 }

spec/env/runner.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 var fs = require('fs'),
     Mocha = require('mocha'),
     path = require('path');
@@ -6,16 +7,16 @@ var errors = 0,
     testDir = path.dirname(__dirname),
     grep = process.argv[2];
 
-var files = [ testDir + "/basic.js" ];
-
 var files = fs.readdirSync(testDir)
       .filter(function(name) { return (/.*\.js$/).test(name); })
       .map(function(name) { return testDir + '/' + name; });
 
-run('./node', function() {
+run('./runtime', function() {
   run('./browser', function() {
-    run('./runtime', function() {
+    run('./node', function() {
+      /* eslint-disable no-process-exit */
       process.exit(errors);
+      /* eslint-enable no-process-exit */
     });
   });
 });

spec/env/runtime.js

@@ -1,22 +1,22 @@
-/*global handlebarsEnv */
 require('./common');
 
-var _ = require('underscore'),
-    fs = require('fs'),
+var fs = require('fs'),
     vm = require('vm');
 
-global.Handlebars = undefined;
+global.Handlebars = 'no-conflict';
 vm.runInThisContext(fs.readFileSync(__dirname + '/../../dist/handlebars.runtime.js'), 'dist/handlebars.runtime.js');
 
 var parse = require('../../dist/cjs/handlebars/compiler/base').parse;
 var compiler = require('../../dist/cjs/handlebars/compiler/compiler');
-var JavaScriptCompiler = require('../../dist/cjs/handlebars/compiler/javascript-compiler')['default'];
+var JavaScriptCompiler = require('../../dist/cjs/handlebars/compiler/javascript-compiler');
 
 global.CompilerContext = {
+  browser: true,
+
   compile: function(template, options) {
     // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.precompile = function(template, options) {
-      return compiler.precompile(template, options, handlebarsEnv);
+    handlebarsEnv.precompile = function(precompileTemplate, precompileOptions) {
+      return compiler.precompile(precompileTemplate, precompileOptions, handlebarsEnv);
     };
     handlebarsEnv.parse = parse;
     handlebarsEnv.Compiler = compiler.Compiler;
@@ -27,8 +27,8 @@ global.CompilerContext = {
   },
   compileWithPartial: function(template, options) {
     // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.compile = function(template, options) {
-      return compiler.compile(template, options, handlebarsEnv);
+    handlebarsEnv.compile = function(compileTemplate, compileOptions) {
+      return compiler.compile(compileTemplate, compileOptions, handlebarsEnv);
     };
     handlebarsEnv.parse = parse;
     handlebarsEnv.Compiler = compiler.Compiler;
@@ -39,10 +39,12 @@ global.CompilerContext = {
 };
 
 function safeEval(templateSpec) {
+  /* eslint-disable no-eval, no-console */
   try {
     return eval('(' + templateSpec + ')');
   } catch (err) {
     console.error(templateSpec);
     throw err;
   }
+  /* eslint-enable no-eval, no-console */
 }

spec/expected/empty.amd.js

@@ -1,6 +1,6 @@
 define(['handlebars.runtime'], function(Handlebars) {
   Handlebars = Handlebars["default"];  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-return templates['empty'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  return "";
+return templates['empty'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    return "";
 },"useData":true});
 });

spec/helpers.js

@@ -1,161 +1,187 @@
-/*global CompilerContext, Handlebars, shouldCompileTo, shouldCompileToWithPartials, shouldThrow, handlebarsEnv */
 describe('helpers', function() {
-  it("helper with complex lookup$", function() {
-    var string = "{{#goodbyes}}{{{link ../prefix}}}{{/goodbyes}}";
-    var hash = {prefix: "/root", goodbyes: [{text: "Goodbye", url: "goodbye"}]};
+  it('helper with complex lookup$', function() {
+    var string = '{{#goodbyes}}{{{link ../prefix}}}{{/goodbyes}}';
+    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
     var helpers = {link: function(prefix) {
-      return "<a href='" + prefix + "/" + this.url + "'>" + this.text + "</a>";
+      return '<a href="' + prefix + '/' + this.url + '">' + this.text + '</a>';
     }};
-    shouldCompileTo(string, [hash, helpers], "<a href='/root/goodbye'>Goodbye</a>");
+    shouldCompileTo(string, [hash, helpers], '<a href="/root/goodbye">Goodbye</a>');
   });
 
-  it("helper for raw block gets raw content", function() {
-    var string   = "{{{{raw}}}} {{test}} {{{{/raw}}}}";
-    var hash = { test: "hello" };
+  it('helper for raw block gets raw content', function() {
+    var string = '{{{{raw}}}} {{test}} {{{{/raw}}}}';
+    var hash = { test: 'hello' };
     var helpers = { raw: function(options) {
         return options.fn();
     } };
-    shouldCompileTo(string, [hash, helpers], " {{test}} ",
-                    "raw block helper gets raw content");
+    shouldCompileTo(string, [hash, helpers], ' {{test}} ',
+                    'raw block helper gets raw content');
   });
-  
-  it("helper for raw block gets parameters", function() {
-    var string   = "{{{{raw 1 2 3}}}} {{test}} {{{{/raw}}}}";
-    var hash = { test: "hello" };
+
+  it('helper for raw block gets parameters', function() {
+    var string = '{{{{raw 1 2 3}}}} {{test}} {{{{/raw}}}}';
+    var hash = { test: 'hello' };
     var helpers = { raw: function(a, b, c, options) {
         return options.fn() + a + b + c;
     } };
-    shouldCompileTo(string, [hash, helpers], " {{test}} 123",
-                    "raw block helper gets raw content");
+    shouldCompileTo(string, [hash, helpers], ' {{test}} 123',
+                    'raw block helper gets raw content');
   });
-  
-  it("helper block with complex lookup expression", function() {
-    var string = "{{#goodbyes}}{{../name}}{{/goodbyes}}";
-    var hash = {name: "Alan"};
+
+  it('helper for nested raw block gets raw content', function() {
+    var string = '{{{{a}}}} {{{{b}}}} {{{{/b}}}} {{{{/a}}}}';
+    var helpers = {
+        a: function(options) {
+          return options.fn();
+      }
+    };
+    shouldCompileTo(string, [{}, helpers], ' {{{{b}}}} {{{{/b}}}} ', 'raw block helper should get nested raw block as raw content');
+  });
+
+  it('helper block with identical context', function() {
+    var string = '{{#goodbyes}}{{name}}{{/goodbyes}}';
+    var hash = {name: 'Alan'};
     var helpers = {goodbyes: function(options) {
-      var out = "";
-      var byes = ["Goodbye", "goodbye", "GOODBYE"];
-      for (var i = 0,j = byes.length; i < j; i++) {
-        out += byes[i] + " " + options.fn(this) + "! ";
+      var out = '';
+      var byes = ['Goodbye', 'goodbye', 'GOODBYE'];
+      for (var i = 0, j = byes.length; i < j; i++) {
+        out += byes[i] + ' ' + options.fn(this) + '! ';
       }
       return out;
     }};
-    shouldCompileTo(string, [hash, helpers], "Goodbye Alan! goodbye Alan! GOODBYE Alan! ");
+    shouldCompileTo(string, [hash, helpers], 'Goodbye Alan! goodbye Alan! GOODBYE Alan! ');
   });
-
-  it("helper with complex lookup and nested template", function() {
-    var string = "{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}";
-    var hash = {prefix: '/root', goodbyes: [{text: "Goodbye", url: "goodbye"}]};
-    var helpers = {link: function (prefix, options) {
-        return "<a href='" + prefix + "/" + this.url + "'>" + options.fn(this) + "</a>";
+  it('helper block with complex lookup expression', function() {
+    var string = '{{#goodbyes}}{{../name}}{{/goodbyes}}';
+    var hash = {name: 'Alan'};
+    var helpers = {goodbyes: function(options) {
+      var out = '';
+      var byes = ['Goodbye', 'goodbye', 'GOODBYE'];
+      for (var i = 0, j = byes.length; i < j; i++) {
+        out += byes[i] + ' ' + options.fn({}) + '! ';
+      }
+      return out;
     }};
-    shouldCompileToWithPartials(string, [hash, helpers], false, "<a href='/root/goodbye'>Goodbye</a>");
+    shouldCompileTo(string, [hash, helpers], 'Goodbye Alan! goodbye Alan! GOODBYE Alan! ');
   });
 
-  it("helper with complex lookup and nested template in VM+Compiler", function() {
-    var string = "{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}";
-    var hash = {prefix: '/root', goodbyes: [{text: "Goodbye", url: "goodbye"}]};
-    var helpers = {link: function (prefix, options) {
-        return "<a href='" + prefix + "/" + this.url + "'>" + options.fn(this) + "</a>";
+  it('helper with complex lookup and nested template', function() {
+    var string = '{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}';
+    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
+    var helpers = {link: function(prefix, options) {
+        return '<a href="' + prefix + '/' + this.url + '">' + options.fn(this) + '</a>';
     }};
-    shouldCompileToWithPartials(string, [hash, helpers], true, "<a href='/root/goodbye'>Goodbye</a>");
+    shouldCompileToWithPartials(string, [hash, helpers], false, '<a href="/root/goodbye">Goodbye</a>');
   });
 
-  it("block helper", function() {
-    var string   = "{{#goodbyes}}{{text}}! {{/goodbyes}}cruel {{world}}!";
+  it('helper with complex lookup and nested template in VM+Compiler', function() {
+    var string = '{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}';
+    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
+    var helpers = {link: function(prefix, options) {
+        return '<a href="' + prefix + '/' + this.url + '">' + options.fn(this) + '</a>';
+    }};
+    shouldCompileToWithPartials(string, [hash, helpers], true, '<a href="/root/goodbye">Goodbye</a>');
+  });
+  it('helper returning undefined value', function() {
+    shouldCompileTo(' {{nothere}}', [{}, {nothere: function() {}}], ' ');
+    shouldCompileTo(' {{#nothere}}{{/nothere}}', [{}, {nothere: function() {}}], ' ');
+  });
+
+  it('block helper', function() {
+    var string = '{{#goodbyes}}{{text}}! {{/goodbyes}}cruel {{world}}!';
     var template = CompilerContext.compile(string);
 
-    var result = template({world: "world"}, { helpers: {goodbyes: function(options) { return options.fn({text: "GOODBYE"}); }}});
-    equal(result, "GOODBYE! cruel world!", "Block helper executed");
+    var result = template({world: 'world'}, { helpers: {goodbyes: function(options) { return options.fn({text: 'GOODBYE'}); }}});
+    equal(result, 'GOODBYE! cruel world!', 'Block helper executed');
   });
 
-  it("block helper staying in the same context", function() {
-    var string   = "{{#form}}<p>{{name}}</p>{{/form}}";
+  it('block helper staying in the same context', function() {
+    var string = '{{#form}}<p>{{name}}</p>{{/form}}';
     var template = CompilerContext.compile(string);
 
-    var result = template({name: "Yehuda"}, {helpers: {form: function(options) { return "<form>" + options.fn(this) + "</form>"; } }});
-    equal(result, "<form><p>Yehuda</p></form>", "Block helper executed with current context");
+    var result = template({name: 'Yehuda'}, {helpers: {form: function(options) { return '<form>' + options.fn(this) + '</form>'; } }});
+    equal(result, '<form><p>Yehuda</p></form>', 'Block helper executed with current context');
   });
 
-  it("block helper should have context in this", function() {
-    var source = "<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>";
-    var link = function(options) {
+  it('block helper should have context in this', function() {
+    var source = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
+    function link(options) {
       return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
-    };
-    var data = { "people": [
-      { "name": "Alan", "id": 1 },
-      { "name": "Yehuda", "id": 2 }
+    }
+    var data = { 'people': [
+      { 'name': 'Alan', 'id': 1 },
+      { 'name': 'Yehuda', 'id': 2 }
     ]};
 
-    shouldCompileTo(source, [data, {link: link}], "<ul><li><a href=\"/people/1\">Alan</a></li><li><a href=\"/people/2\">Yehuda</a></li></ul>");
+    shouldCompileTo(source, [data, {link: link}], '<ul><li><a href=\"/people/1\">Alan</a></li><li><a href=\"/people/2\">Yehuda</a></li></ul>');
   });
 
-  it("block helper for undefined value", function() {
-    shouldCompileTo("{{#empty}}shouldn't render{{/empty}}", {}, "");
+  it('block helper for undefined value', function() {
+    shouldCompileTo("{{#empty}}shouldn't render{{/empty}}", {}, '');
   });
 
-  it("block helper passing a new context", function() {
-    var string   = "{{#form yehuda}}<p>{{name}}</p>{{/form}}";
+  it('block helper passing a new context', function() {
+    var string = '{{#form yehuda}}<p>{{name}}</p>{{/form}}';
     var template = CompilerContext.compile(string);
 
-    var result = template({yehuda: {name: "Yehuda"}}, { helpers: {form: function(context, options) { return "<form>" + options.fn(context) + "</form>"; }}});
-    equal(result, "<form><p>Yehuda</p></form>", "Context variable resolved");
+    var result = template({yehuda: {name: 'Yehuda'}}, { helpers: {form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }}});
+    equal(result, '<form><p>Yehuda</p></form>', 'Context variable resolved');
   });
 
-  it("block helper passing a complex path context", function() {
-    var string   = "{{#form yehuda/cat}}<p>{{name}}</p>{{/form}}";
+  it('block helper passing a complex path context', function() {
+    var string = '{{#form yehuda/cat}}<p>{{name}}</p>{{/form}}';
     var template = CompilerContext.compile(string);
 
-    var result = template({yehuda: {name: "Yehuda", cat: {name: "Harold"}}}, { helpers: {form: function(context, options) { return "<form>" + options.fn(context) + "</form>"; }}});
-    equal(result, "<form><p>Harold</p></form>", "Complex path variable resolved");
+    var result = template({yehuda: {name: 'Yehuda', cat: {name: 'Harold'}}}, { helpers: {form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }}});
+    equal(result, '<form><p>Harold</p></form>', 'Complex path variable resolved');
   });
 
-  it("nested block helpers", function() {
-    var string   = "{{#form yehuda}}<p>{{name}}</p>{{#link}}Hello{{/link}}{{/form}}";
+  it('nested block helpers', function() {
+    var string = '{{#form yehuda}}<p>{{name}}</p>{{#link}}Hello{{/link}}{{/form}}';
     var template = CompilerContext.compile(string);
 
     var result = template({
-      yehuda: {name: "Yehuda" }
+      yehuda: {name: 'Yehuda' }
     }, {
       helpers: {
-        link: function(options) { return "<a href='" + this.name + "'>" + options.fn(this) + "</a>"; },
-        form: function(context, options) { return "<form>" + options.fn(context) + "</form>"; }
+        link: function(options) { return '<a href="' + this.name + '">' + options.fn(this) + '</a>'; },
+        form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }
       }
     });
-    equal(result, "<form><p>Yehuda</p><a href='Yehuda'>Hello</a></form>", "Both blocks executed");
+    equal(result, '<form><p>Yehuda</p><a href="Yehuda">Hello</a></form>', 'Both blocks executed');
   });
 
-  it("block helper inverted sections", function() {
-    var string = "{{#list people}}{{name}}{{^}}<em>Nobody's here</em>{{/list}}";
-    var list = function(context, options) {
+  it('block helper inverted sections', function() {
+    var string = '{{#list people}}{{name}}{{^}}<em>Nobody\'s here</em>{{/list}}';
+    function list(context, options) {
       if (context.length > 0) {
-        var out = "<ul>";
-        for(var i = 0,j=context.length; i < j; i++) {
-          out += "<li>";
+        var out = '<ul>';
+        for (var i = 0, j = context.length; i < j; i++) {
+          out += '<li>';
           out += options.fn(context[i]);
-          out += "</li>";
+          out += '</li>';
         }
-        out += "</ul>";
+        out += '</ul>';
         return out;
       } else {
-        return "<p>" + options.inverse(this) + "</p>";
+        return '<p>' + options.inverse(this) + '</p>';
       }
-    };
+    }
 
-    var hash = {people: [{name: "Alan"}, {name: "Yehuda"}]};
+    var hash = {people: [{name: 'Alan'}, {name: 'Yehuda'}]};
     var empty = {people: []};
     var rootMessage = {
       people: [],
-      message: "Nobody's here"
+      message: 'Nobody\'s here'
     };
 
-    var messageString = "{{#list people}}Hello{{^}}{{message}}{{/list}}";
+    var messageString = '{{#list people}}Hello{{^}}{{message}}{{/list}}';
 
     // the meaning here may be kind of hard to catch, but list.not is always called,
     // so we should see the output of both
-    shouldCompileTo(string, [hash, { list: list }], "<ul><li>Alan</li><li>Yehuda</li></ul>", "an inverse wrapper is passed in as a new context");
-    shouldCompileTo(string, [empty, { list: list }], "<p><em>Nobody's here</em></p>", "an inverse wrapper can be optionally called");
-    shouldCompileTo(messageString, [rootMessage, { list: list }], "<p>Nobody&#x27;s here</p>", "the context of an inverse is the parent of the block");
+    shouldCompileTo(string, [hash, { list: list }], '<ul><li>Alan</li><li>Yehuda</li></ul>', 'an inverse wrapper is passed in as a new context');
+    shouldCompileTo(string, [empty, { list: list }], '<p><em>Nobody\'s here</em></p>', 'an inverse wrapper can be optionally called');
+    shouldCompileTo(messageString, [rootMessage, { list: list }], '<p>Nobody&#x27;s here</p>', 'the context of an inverse is the parent of the block');
   });
 
   it('pathed lambas with parameters', function() {
@@ -174,43 +200,47 @@ describe('helpers', function() {
     shouldCompileTo('{{hash/helper 1}}', [hash, helpers], 'winning');
   });
 
-  describe("helpers hash", function() {
-    it("providing a helpers hash", function() {
-      shouldCompileTo("Goodbye {{cruel}} {{world}}!", [{cruel: "cruel"}, {world: function() { return "world"; }}], "Goodbye cruel world!",
-                      "helpers hash is available");
+  describe('helpers hash', function() {
+    it('providing a helpers hash', function() {
+      shouldCompileTo('Goodbye {{cruel}} {{world}}!', [{cruel: 'cruel'}, {world: function() { return 'world'; }}], 'Goodbye cruel world!',
+                      'helpers hash is available');
 
-      shouldCompileTo("Goodbye {{#iter}}{{cruel}} {{world}}{{/iter}}!", [{iter: [{cruel: "cruel"}]}, {world: function() { return "world"; }}],
-                      "Goodbye cruel world!", "helpers hash is available inside other blocks");
+      shouldCompileTo('Goodbye {{#iter}}{{cruel}} {{world}}{{/iter}}!', [{iter: [{cruel: 'cruel'}]}, {world: function() { return 'world'; }}],
+                      'Goodbye cruel world!', 'helpers hash is available inside other blocks');
     });
 
-    it("in cases of conflict, helpers win", function() {
-      shouldCompileTo("{{{lookup}}}", [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], "helpers",
-                      "helpers hash has precedence escaped expansion");
-      shouldCompileTo("{{lookup}}", [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], "helpers",
-                      "helpers hash has precedence simple expansion");
+    it('in cases of conflict, helpers win', function() {
+      shouldCompileTo('{{{lookup}}}', [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], 'helpers',
+                      'helpers hash has precedence escaped expansion');
+      shouldCompileTo('{{lookup}}', [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], 'helpers',
+                      'helpers hash has precedence simple expansion');
     });
 
-    it("the helpers hash is available is nested contexts", function() {
-      shouldCompileTo("{{#outer}}{{#inner}}{{helper}}{{/inner}}{{/outer}}",
-                    [{'outer': {'inner': {'unused':[]}}},  {'helper': function() { return 'helper'; }}], "helper",
-                    "helpers hash is available in nested contexts.");
+    it('the helpers hash is available is nested contexts', function() {
+      shouldCompileTo(
+        '{{#outer}}{{#inner}}{{helper}}{{/inner}}{{/outer}}',
+        [
+          {'outer': {'inner': {'unused': []}}},
+          {'helper': function() { return 'helper'; }}
+        ],
+        'helper',
+        'helpers hash is available in nested contexts.');
     });
 
-    it("the helper hash should augment the global hash", function() {
+    it('the helper hash should augment the global hash', function() {
       handlebarsEnv.registerHelper('test_helper', function() { return 'found it!'; });
 
       shouldCompileTo(
-        "{{test_helper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}", [
-          {cruel: "cruel"},
-          {world: function() { return "world!"; }}
+        '{{test_helper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}', [
+          {cruel: 'cruel'},
+          {world: function() { return 'world!'; }}
         ],
-        "found it! Goodbye cruel world!!");
+        'found it! Goodbye cruel world!!');
     });
   });
 
   describe('registration', function() {
     it('unregisters', function() {
-      var helpers = handlebarsEnv.helpers;
       handlebarsEnv.helpers = {};
 
       handlebarsEnv.registerHelper('foo', function() {
@@ -226,134 +256,128 @@ describe('helpers', function() {
 
       handlebarsEnv.registerHelper({
         'if': helpers['if'],
-        world: function() { return "world!"; },
-        test_helper: function() { return 'found it!'; }
+        world: function() { return 'world!'; },
+        testHelper: function() { return 'found it!'; }
       });
 
       shouldCompileTo(
-        "{{test_helper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}",
-        [{cruel: "cruel"}],
-        "found it! Goodbye cruel world!!");
+        '{{testHelper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}',
+        [{cruel: 'cruel'}],
+        'found it! Goodbye cruel world!!');
     });
     it('fails with multiple and args', function() {
       shouldThrow(function() {
         handlebarsEnv.registerHelper({
-          world: function() { return "world!"; },
-          test_helper: function() { return 'found it!'; }
+          world: function() { return 'world!'; },
+          testHelper: function() { return 'found it!'; }
         }, {});
       }, Error, 'Arg not supported with multiple helpers');
     });
   });
 
-  it("decimal number literals work", function() {
-    var string   = 'Message: {{hello -1.2 1.2}}';
-    var hash     = {};
-    var helpers  = {hello: function(times, times2) {
-      if(typeof times !== 'number') { times = "NaN"; }
-      if(typeof times2 !== 'number') { times2 = "NaN"; }
-      return "Hello " + times + " " + times2 + " times";
+  it('decimal number literals work', function() {
+    var string = 'Message: {{hello -1.2 1.2}}';
+    var helpers = {hello: function(times, times2) {
+      if (typeof times !== 'number') { times = 'NaN'; }
+      if (typeof times2 !== 'number') { times2 = 'NaN'; }
+      return 'Hello ' + times + ' ' + times2 + ' times';
     }};
-    shouldCompileTo(string, [hash, helpers], "Message: Hello -1.2 1.2 times", "template with a negative integer literal");
+    shouldCompileTo(string, [{}, helpers], 'Message: Hello -1.2 1.2 times', 'template with a negative integer literal');
   });
 
-  it("negative number literals work", function() {
-    var string   = 'Message: {{hello -12}}';
-    var hash     = {};
-    var helpers  = {hello: function(times) {
-      if(typeof times !== 'number') { times = "NaN"; }
-      return "Hello " + times + " times";
+  it('negative number literals work', function() {
+    var string = 'Message: {{hello -12}}';
+    var helpers = {hello: function(times) {
+      if (typeof times !== 'number') { times = 'NaN'; }
+      return 'Hello ' + times + ' times';
     }};
-    shouldCompileTo(string, [hash, helpers], "Message: Hello -12 times", "template with a negative integer literal");
+    shouldCompileTo(string, [{}, helpers], 'Message: Hello -12 times', 'template with a negative integer literal');
   });
 
-  describe("String literal parameters", function() {
-    it("simple literals work", function() {
-      var string   = 'Message: {{hello "world" 12 true false}}';
-      var hash     = {};
-      var helpers  = {hello: function(param, times, bool1, bool2) {
-        if(typeof times !== 'number') { times = "NaN"; }
-        if(typeof bool1 !== 'boolean') { bool1 = "NaB"; }
-        if(typeof bool2 !== 'boolean') { bool2 = "NaB"; }
-        return "Hello " + param + " " + times + " times: " + bool1 + " " + bool2;
+  describe('String literal parameters', function() {
+    it('simple literals work', function() {
+      var string = 'Message: {{hello "world" 12 true false}}';
+      var helpers = {hello: function(param, times, bool1, bool2) {
+        if (typeof times !== 'number') { times = 'NaN'; }
+        if (typeof bool1 !== 'boolean') { bool1 = 'NaB'; }
+        if (typeof bool2 !== 'boolean') { bool2 = 'NaB'; }
+        return 'Hello ' + param + ' ' + times + ' times: ' + bool1 + ' ' + bool2;
       }};
-      shouldCompileTo(string, [hash, helpers], "Message: Hello world 12 times: true false", "template with a simple String literal");
+      shouldCompileTo(string, [{}, helpers], 'Message: Hello world 12 times: true false', 'template with a simple String literal');
     });
 
-    it("using a quote in the middle of a parameter raises an error", function() {
-      var string   = 'Message: {{hello wo"rld"}}';
+    it('using a quote in the middle of a parameter raises an error', function() {
+      var string = 'Message: {{hello wo"rld"}}';
       shouldThrow(function() {
         CompilerContext.compile(string);
       }, Error);
     });
 
-    it("escaping a String is possible", function(){
-      var string   = 'Message: {{{hello "\\"world\\""}}}';
-      var hash     = {};
-      var helpers = {hello: function(param) { return "Hello " + param; }};
-      shouldCompileTo(string, [hash, helpers], "Message: Hello \"world\"", "template with an escaped String literal");
+    it('escaping a String is possible', function() {
+      var string = 'Message: {{{hello "\\"world\\""}}}';
+      var helpers = {hello: function(param) { return 'Hello ' + param; }};
+      shouldCompileTo(string, [{}, helpers], 'Message: Hello "world"', 'template with an escaped String literal');
     });
 
     it("it works with ' marks", function() {
-      var string   = 'Message: {{{hello "Alan\'s world"}}}';
-      var hash     = {};
-      var helpers = {hello: function(param) { return "Hello " + param; }};
-      shouldCompileTo(string, [hash, helpers], "Message: Hello Alan's world", "template with a ' mark");
+      var string = 'Message: {{{hello "Alan\'s world"}}}';
+      var helpers = {hello: function(param) { return 'Hello ' + param; }};
+      shouldCompileTo(string, [{}, helpers], "Message: Hello Alan's world", "template with a ' mark");
     });
   });
 
-  it("negative number literals work", function() {
-    var string   = 'Message: {{hello -12}}';
-    var hash     = {};
-    var helpers  = {hello: function(times) {
-      if(typeof times !== 'number') { times = "NaN"; }
-      return "Hello " + times + " times";
+  it('negative number literals work', function() {
+    var string = 'Message: {{hello -12}}';
+    var helpers = {hello: function(times) {
+      if (typeof times !== 'number') { times = 'NaN'; }
+      return 'Hello ' + times + ' times';
     }};
-    shouldCompileTo(string, [hash, helpers], "Message: Hello -12 times", "template with a negative integer literal");
+    shouldCompileTo(string, [{}, helpers], 'Message: Hello -12 times', 'template with a negative integer literal');
   });
 
-  describe("multiple parameters", function() {
-    it("simple multi-params work", function() {
-      var string   = 'Message: {{goodbye cruel world}}';
-      var hash     = {cruel: "cruel", world: "world"};
-      var helpers = {goodbye: function(cruel, world) { return "Goodbye " + cruel + " " + world; }};
-      shouldCompileTo(string, [hash, helpers], "Message: Goodbye cruel world", "regular helpers with multiple params");
+  describe('multiple parameters', function() {
+    it('simple multi-params work', function() {
+      var string = 'Message: {{goodbye cruel world}}';
+      var hash = {cruel: 'cruel', world: 'world'};
+      var helpers = {goodbye: function(cruel, world) { return 'Goodbye ' + cruel + ' ' + world; }};
+      shouldCompileTo(string, [hash, helpers], 'Message: Goodbye cruel world', 'regular helpers with multiple params');
     });
 
-    it("block multi-params work", function() {
-      var string   = 'Message: {{#goodbye cruel world}}{{greeting}} {{adj}} {{noun}}{{/goodbye}}';
-      var hash     = {cruel: "cruel", world: "world"};
+    it('block multi-params work', function() {
+      var string = 'Message: {{#goodbye cruel world}}{{greeting}} {{adj}} {{noun}}{{/goodbye}}';
+      var hash = {cruel: 'cruel', world: 'world'};
       var helpers = {goodbye: function(cruel, world, options) {
-        return options.fn({greeting: "Goodbye", adj: cruel, noun: world});
+        return options.fn({greeting: 'Goodbye', adj: cruel, noun: world});
       }};
-      shouldCompileTo(string, [hash, helpers], "Message: Goodbye cruel world", "block helpers with multiple params");
+      shouldCompileTo(string, [hash, helpers], 'Message: Goodbye cruel world', 'block helpers with multiple params');
     });
   });
 
   describe('hash', function() {
-    it("helpers can take an optional hash", function() {
+    it('helpers can take an optional hash', function() {
       var template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" times=12}}');
 
       var helpers = {
         goodbye: function(options) {
-          return "GOODBYE " + options.hash.cruel + " " + options.hash.world + " " + options.hash.times + " TIMES";
+          return 'GOODBYE ' + options.hash.cruel + ' ' + options.hash.world + ' ' + options.hash.times + ' TIMES';
         }
       };
 
       var context = {};
 
       var result = template(context, {helpers: helpers});
-      equals(result, "GOODBYE CRUEL WORLD 12 TIMES", "Helper output hash");
+      equals(result, 'GOODBYE CRUEL WORLD 12 TIMES', 'Helper output hash');
     });
 
-    it("helpers can take an optional hash with booleans", function() {
+    it('helpers can take an optional hash with booleans', function() {
       var helpers = {
         goodbye: function(options) {
           if (options.hash.print === true) {
-            return "GOODBYE " + options.hash.cruel + " " + options.hash.world;
+            return 'GOODBYE ' + options.hash.cruel + ' ' + options.hash.world;
           } else if (options.hash.print === false) {
-            return "NOT PRINTING";
+            return 'NOT PRINTING';
           } else {
-            return "THIS SHOULD NOT HAPPEN";
+            return 'THIS SHOULD NOT HAPPEN';
           }
         }
       };
@@ -362,161 +386,161 @@ describe('helpers', function() {
 
       var template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" print=true}}');
       var result = template(context, {helpers: helpers});
-      equals(result, "GOODBYE CRUEL WORLD", "Helper output hash");
+      equals(result, 'GOODBYE CRUEL WORLD', 'Helper output hash');
 
       template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" print=false}}');
       result = template(context, {helpers: helpers});
-      equals(result, "NOT PRINTING", "Boolean helper parameter honored");
+      equals(result, 'NOT PRINTING', 'Boolean helper parameter honored');
     });
 
-    it("block helpers can take an optional hash", function() {
+    it('block helpers can take an optional hash', function() {
       var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" times=12}}world{{/goodbye}}');
 
       var helpers = {
         goodbye: function(options) {
-          return "GOODBYE " + options.hash.cruel + " " + options.fn(this) + " " + options.hash.times + " TIMES";
+          return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this) + ' ' + options.hash.times + ' TIMES';
         }
       };
 
       var result = template({}, {helpers: helpers});
-      equals(result, "GOODBYE CRUEL world 12 TIMES", "Hash parameters output");
+      equals(result, 'GOODBYE CRUEL world 12 TIMES', 'Hash parameters output');
     });
 
-    it("block helpers can take an optional hash with single quoted stings", function() {
-      var template = CompilerContext.compile("{{#goodbye cruel='CRUEL' times=12}}world{{/goodbye}}");
+    it('block helpers can take an optional hash with single quoted stings', function() {
+      var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" times=12}}world{{/goodbye}}');
 
       var helpers = {
         goodbye: function(options) {
-          return "GOODBYE " + options.hash.cruel + " " + options.fn(this) + " " + options.hash.times + " TIMES";
+          return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this) + ' ' + options.hash.times + ' TIMES';
         }
       };
 
       var result = template({}, {helpers: helpers});
-      equals(result, "GOODBYE CRUEL world 12 TIMES", "Hash parameters output");
+      equals(result, 'GOODBYE CRUEL world 12 TIMES', 'Hash parameters output');
     });
 
-    it("block helpers can take an optional hash with booleans", function() {
+    it('block helpers can take an optional hash with booleans', function() {
       var helpers = {
         goodbye: function(options) {
           if (options.hash.print === true) {
-            return "GOODBYE " + options.hash.cruel + " " + options.fn(this);
+            return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this);
           } else if (options.hash.print === false) {
-            return "NOT PRINTING";
+            return 'NOT PRINTING';
           } else {
-            return "THIS SHOULD NOT HAPPEN";
+            return 'THIS SHOULD NOT HAPPEN';
           }
         }
       };
 
       var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" print=true}}world{{/goodbye}}');
       var result = template({}, {helpers: helpers});
-      equals(result, "GOODBYE CRUEL world", "Boolean hash parameter honored");
+      equals(result, 'GOODBYE CRUEL world', 'Boolean hash parameter honored');
 
       template = CompilerContext.compile('{{#goodbye cruel="CRUEL" print=false}}world{{/goodbye}}');
       result = template({}, {helpers: helpers});
-      equals(result, "NOT PRINTING", "Boolean hash parameter honored");
+      equals(result, 'NOT PRINTING', 'Boolean hash parameter honored');
     });
   });
 
-  describe("helperMissing", function() {
-    it("if a context is not found, helperMissing is used", function() {
+  describe('helperMissing', function() {
+    it('if a context is not found, helperMissing is used', function() {
       shouldThrow(function() {
-          var template = CompilerContext.compile("{{hello}} {{link_to world}}");
+          var template = CompilerContext.compile('{{hello}} {{link_to world}}');
           template({});
-      }, undefined, /Missing helper: 'link_to'/);
+      }, undefined, /Missing helper: "link_to"/);
     });
 
-    it("if a context is not found, custom helperMissing is used", function() {
-      var string = "{{hello}} {{link_to world}}";
-      var context = { hello: "Hello", world: "world" };
+    it('if a context is not found, custom helperMissing is used', function() {
+      var string = '{{hello}} {{link_to world}}';
+      var context = { hello: 'Hello', world: 'world' };
 
       var helpers = {
         helperMissing: function(mesg, options) {
-          if(options.name === "link_to") {
-            return new Handlebars.SafeString("<a>" + mesg + "</a>");
+          if (options.name === 'link_to') {
+            return new Handlebars.SafeString('<a>' + mesg + '</a>');
           }
         }
       };
 
-      shouldCompileTo(string, [context, helpers], "Hello <a>world</a>");
+      shouldCompileTo(string, [context, helpers], 'Hello <a>world</a>');
     });
 
-    it("if a value is not found, custom helperMissing is used", function() {
-      var string = "{{hello}} {{link_to}}";
-      var context = { hello: "Hello", world: "world" };
+    it('if a value is not found, custom helperMissing is used', function() {
+      var string = '{{hello}} {{link_to}}';
+      var context = { hello: 'Hello', world: 'world' };
 
       var helpers = {
         helperMissing: function(options) {
-          if(options.name === "link_to") {
-            return new Handlebars.SafeString("<a>winning</a>");
+          if (options.name === 'link_to') {
+            return new Handlebars.SafeString('<a>winning</a>');
           }
         }
       };
 
-      shouldCompileTo(string, [context, helpers], "Hello <a>winning</a>");
+      shouldCompileTo(string, [context, helpers], 'Hello <a>winning</a>');
     });
   });
 
-  describe("knownHelpers", function() {
-    it("Known helper should render helper", function() {
-      var template = CompilerContext.compile("{{hello}}", {knownHelpers: {"hello" : true}});
+  describe('knownHelpers', function() {
+    it('Known helper should render helper', function() {
+      var template = CompilerContext.compile('{{hello}}', {knownHelpers: {hello: true}});
 
-      var result = template({}, {helpers: {hello: function() { return "foo"; }}});
-      equal(result, "foo", "'foo' should === '" + result);
+      var result = template({}, {helpers: {hello: function() { return 'foo'; }}});
+      equal(result, 'foo', "'foo' should === '" + result);
     });
 
-    it("Unknown helper in knownHelpers only mode should be passed as undefined", function() {
-      var template = CompilerContext.compile("{{typeof hello}}", {knownHelpers: {'typeof': true}, knownHelpersOnly: true});
+    it('Unknown helper in knownHelpers only mode should be passed as undefined', function() {
+      var template = CompilerContext.compile('{{typeof hello}}', {knownHelpers: {'typeof': true}, knownHelpersOnly: true});
 
-      var result = template({}, {helpers: {'typeof': function(arg) { return typeof arg; }, hello: function() { return "foo"; }}});
-      equal(result, "undefined", "'undefined' should === '" + result);
+      var result = template({}, {helpers: {'typeof': function(arg) { return typeof arg; }, hello: function() { return 'foo'; }}});
+      equal(result, 'undefined', "'undefined' should === '" + result);
     });
-    it("Builtin helpers available in knownHelpers only mode", function() {
-      var template = CompilerContext.compile("{{#unless foo}}bar{{/unless}}", {knownHelpersOnly: true});
+    it('Builtin helpers available in knownHelpers only mode', function() {
+      var template = CompilerContext.compile('{{#unless foo}}bar{{/unless}}', {knownHelpersOnly: true});
 
       var result = template({});
-      equal(result, "bar", "'bar' should === '" + result);
+      equal(result, 'bar', "'bar' should === '" + result);
     });
-    it("Field lookup works in knownHelpers only mode", function() {
-      var template = CompilerContext.compile("{{foo}}", {knownHelpersOnly: true});
+    it('Field lookup works in knownHelpers only mode', function() {
+      var template = CompilerContext.compile('{{foo}}', {knownHelpersOnly: true});
 
       var result = template({foo: 'bar'});
-      equal(result, "bar", "'bar' should === '" + result);
+      equal(result, 'bar', "'bar' should === '" + result);
     });
-    it("Conditional blocks work in knownHelpers only mode", function() {
-      var template = CompilerContext.compile("{{#foo}}bar{{/foo}}", {knownHelpersOnly: true});
+    it('Conditional blocks work in knownHelpers only mode', function() {
+      var template = CompilerContext.compile('{{#foo}}bar{{/foo}}', {knownHelpersOnly: true});
 
       var result = template({foo: 'baz'});
-      equal(result, "bar", "'bar' should === '" + result);
+      equal(result, 'bar', "'bar' should === '" + result);
     });
-    it("Invert blocks work in knownHelpers only mode", function() {
-      var template = CompilerContext.compile("{{^foo}}bar{{/foo}}", {knownHelpersOnly: true});
+    it('Invert blocks work in knownHelpers only mode', function() {
+      var template = CompilerContext.compile('{{^foo}}bar{{/foo}}', {knownHelpersOnly: true});
 
       var result = template({foo: false});
-      equal(result, "bar", "'bar' should === '" + result);
+      equal(result, 'bar', "'bar' should === '" + result);
     });
-    it("Functions are bound to the context in knownHelpers only mode", function() {
-      var template = CompilerContext.compile("{{foo}}", {knownHelpersOnly: true});
+    it('Functions are bound to the context in knownHelpers only mode', function() {
+      var template = CompilerContext.compile('{{foo}}', {knownHelpersOnly: true});
       var result = template({foo: function() { return this.bar; }, bar: 'bar'});
-      equal(result, "bar", "'bar' should === '" + result);
+      equal(result, 'bar', "'bar' should === '" + result);
     });
-    it("Unknown helper call in knownHelpers only mode should throw", function() {
+    it('Unknown helper call in knownHelpers only mode should throw', function() {
       shouldThrow(function() {
-        CompilerContext.compile("{{typeof hello}}", {knownHelpersOnly: true});
+        CompilerContext.compile('{{typeof hello}}', {knownHelpersOnly: true});
       }, Error);
     });
   });
 
-  describe("blockHelperMissing", function() {
-    it("lambdas are resolved by blockHelperMissing, not handlebars proper", function() {
-      var string = "{{#truthy}}yep{{/truthy}}";
+  describe('blockHelperMissing', function() {
+    it('lambdas are resolved by blockHelperMissing, not handlebars proper', function() {
+      var string = '{{#truthy}}yep{{/truthy}}';
       var data = { truthy: function() { return true; } };
-      shouldCompileTo(string, data, "yep");
+      shouldCompileTo(string, data, 'yep');
     });
-    it("lambdas resolved by blockHelperMissing are bound to the context", function() {
-      var string = "{{#truthy}}yep{{/truthy}}";
+    it('lambdas resolved by blockHelperMissing are bound to the context', function() {
+      var string = '{{#truthy}}yep{{/truthy}}';
       var boundData = { truthy: function() { return this.truthiness(); }, truthiness: function() { return false; } };
-      shouldCompileTo(string, boundData, "");
+      shouldCompileTo(string, boundData, '');
     });
   });
 
@@ -524,13 +548,13 @@ describe('helpers', function() {
     var context = {};
     var helpers = {
       blockHelperMissing: function() {
-        return 'missing: ' + arguments[arguments.length-1].name;
+        return 'missing: ' + arguments[arguments.length - 1].name;
       },
       helperMissing: function() {
-        return 'helper missing: ' + arguments[arguments.length-1].name;
+        return 'helper missing: ' + arguments[arguments.length - 1].name;
       },
       helper: function() {
-        return 'ran: ' + arguments[arguments.length-1].name;
+        return 'ran: ' + arguments[arguments.length - 1].name;
       }
     };
 
@@ -550,7 +574,7 @@ describe('helpers', function() {
       shouldCompileTo('{{#helper 1}}{{/helper}}', [context, helpers], 'ran: helper');
     });
     it('should include in known helper calls', function() {
-      var template = CompilerContext.compile("{{helper}}", {knownHelpers: {'helper': true}, knownHelpersOnly: true});
+      var template = CompilerContext.compile('{{helper}}', {knownHelpers: {'helper': true}, knownHelpersOnly: true});
 
       equal(template({}, {helpers: helpers}), 'ran: helper');
     });
@@ -565,8 +589,8 @@ describe('helpers', function() {
   });
 
   describe('name conflicts', function() {
-    it("helpers take precedence over same-named context properties", function() {
-      var template = CompilerContext.compile("{{goodbye}} {{cruel world}}");
+    it('helpers take precedence over same-named context properties', function() {
+      var template = CompilerContext.compile('{{goodbye}} {{cruel world}}');
 
       var helpers = {
         goodbye: function() {
@@ -574,21 +598,21 @@ describe('helpers', function() {
         },
 
         cruel: function(world) {
-          return "cruel " + world.toUpperCase();
+          return 'cruel ' + world.toUpperCase();
         }
       };
 
       var context = {
-        goodbye: "goodbye",
-        world: "world"
+        goodbye: 'goodbye',
+        world: 'world'
       };
 
       var result = template(context, {helpers: helpers});
-      equals(result, "GOODBYE cruel WORLD", "Helper executed");
+      equals(result, 'GOODBYE cruel WORLD', 'Helper executed');
     });
 
-    it("helpers take precedence over same-named context properties$", function() {
-      var template = CompilerContext.compile("{{#goodbye}} {{cruel world}}{{/goodbye}}");
+    it('helpers take precedence over same-named context properties$', function() {
+      var template = CompilerContext.compile('{{#goodbye}} {{cruel world}}{{/goodbye}}');
 
       var helpers = {
         goodbye: function(options) {
@@ -596,21 +620,21 @@ describe('helpers', function() {
         },
 
         cruel: function(world) {
-          return "cruel " + world.toUpperCase();
+          return 'cruel ' + world.toUpperCase();
         }
       };
 
       var context = {
-        goodbye: "goodbye",
-        world: "world"
+        goodbye: 'goodbye',
+        world: 'world'
       };
 
       var result = template(context, {helpers: helpers});
-      equals(result, "GOODBYE cruel WORLD", "Helper executed");
+      equals(result, 'GOODBYE cruel WORLD', 'Helper executed');
     });
 
-    it("Scoped names take precedence over helpers", function() {
-      var template = CompilerContext.compile("{{this.goodbye}} {{cruel world}} {{cruel this.goodbye}}");
+    it('Scoped names take precedence over helpers', function() {
+      var template = CompilerContext.compile('{{this.goodbye}} {{cruel world}} {{cruel this.goodbye}}');
 
       var helpers = {
         goodbye: function() {
@@ -618,21 +642,21 @@ describe('helpers', function() {
         },
 
         cruel: function(world) {
-          return "cruel " + world.toUpperCase();
+          return 'cruel ' + world.toUpperCase();
         }
       };
 
       var context = {
-        goodbye: "goodbye",
-        world: "world"
+        goodbye: 'goodbye',
+        world: 'world'
       };
 
       var result = template(context, {helpers: helpers});
-      equals(result, "goodbye cruel WORLD cruel GOODBYE", "Helper not executed");
+      equals(result, 'goodbye cruel WORLD cruel GOODBYE', 'Helper not executed');
     });
 
-    it("Scoped names take precedence over block helpers", function() {
-      var template = CompilerContext.compile("{{#goodbye}} {{cruel world}}{{/goodbye}} {{this.goodbye}}");
+    it('Scoped names take precedence over block helpers', function() {
+      var template = CompilerContext.compile('{{#goodbye}} {{cruel world}}{{/goodbye}} {{this.goodbye}}');
 
       var helpers = {
         goodbye: function(options) {
@@ -640,17 +664,77 @@ describe('helpers', function() {
         },
 
         cruel: function(world) {
-          return "cruel " + world.toUpperCase();
+          return 'cruel ' + world.toUpperCase();
         }
       };
 
       var context = {
-        goodbye: "goodbye",
-        world: "world"
+        goodbye: 'goodbye',
+        world: 'world'
       };
 
       var result = template(context, {helpers: helpers});
-      equals(result, "GOODBYE cruel WORLD goodbye", "Helper executed");
+      equals(result, 'GOODBYE cruel WORLD goodbye', 'Helper executed');
+    });
+  });
+
+  describe('block params', function() {
+    it('should take presedence over context values', function() {
+      var hash = {value: 'foo'};
+      var helpers = {
+        goodbyes: function(options) {
+          equals(options.fn.blockParams, 1);
+          return options.fn({value: 'bar'}, {blockParams: [1, 2]});
+        }
+      };
+      shouldCompileTo('{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{value}}', [hash, helpers], '1foo');
+    });
+    it('should take presedence over helper values', function() {
+      var hash = {};
+      var helpers = {
+        value: function() {
+          return 'foo';
+        },
+        goodbyes: function(options) {
+          equals(options.fn.blockParams, 1);
+          return options.fn({}, {blockParams: [1, 2]});
+        }
+      };
+      shouldCompileTo('{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{value}}', [hash, helpers], '1foo');
+    });
+    it('should not take presedence over pathed values', function() {
+      var hash = {value: 'bar'};
+      var helpers = {
+        value: function() {
+          return 'foo';
+        },
+        goodbyes: function(options) {
+          equals(options.fn.blockParams, 1);
+          return options.fn(this, {blockParams: [1, 2]});
+        }
+      };
+      shouldCompileTo('{{#goodbyes as |value|}}{{./value}}{{/goodbyes}}{{value}}', [hash, helpers], 'barfoo');
+    });
+    it('should take presednece over parent block params', function() {
+      var hash = {value: 'foo'},
+          value = 1;
+      var helpers = {
+        goodbyes: function(options) {
+          return options.fn({value: 'bar'}, {blockParams: options.fn.blockParams === 1 ? [value++, value++] : undefined});
+        }
+      };
+      shouldCompileTo('{{#goodbyes as |value|}}{{#goodbyes}}{{value}}{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{/goodbyes}}{{/goodbyes}}{{value}}', [hash, helpers], '13foo');
+    });
+
+    it('should allow block params on chained helpers', function() {
+      var hash = {value: 'foo'};
+      var helpers = {
+        goodbyes: function(options) {
+          equals(options.fn.blockParams, 1);
+          return options.fn({value: 'bar'}, {blockParams: [1, 2]});
+        }
+      };
+      shouldCompileTo('{{#if bar}}{{else goodbyes as |value|}}{{value}}{{/if}}{{value}}', [hash, helpers], '1foo');
     });
   });
 });

spec/javascript-compiler.js

@@ -1,4 +1,3 @@
-/*global Handlebars, beforeEach, handlebarsEnv, shouldCompileTo */
 describe('javascript-compiler api', function() {
   if (!Handlebars.JavaScriptCompiler) {
     return;
@@ -17,7 +16,15 @@ describe('javascript-compiler api', function() {
       handlebarsEnv.JavaScriptCompiler.prototype.nameLookup = function(parent, name) {
         return parent + '.bar_' + name;
       };
-      shouldCompileTo("{{foo}}", { bar_foo: "food" }, "food");
+      /* eslint-disable camelcase */
+      shouldCompileTo('{{foo}}', { bar_foo: 'food' }, 'food');
+      /* eslint-enable camelcase */
+    });
+
+    // Tests nameLookup dot vs. bracket behavior.  Bracket is required in certain cases
+    // to avoid errors in older browsers.
+    it('should handle reserved words', function() {
+      shouldCompileTo('{{foo}} {{~null~}}', { foo: 'food' }, 'food');
     });
   });
   describe('#compilerInfo', function() {
@@ -39,7 +46,7 @@ describe('javascript-compiler api', function() {
           throw new Error('It didn\'t work');
         }
       };
-      shouldCompileTo("{{foo}} ", { foo: "food" }, "food ");
+      shouldCompileTo('{{foo}} ', { foo: 'food' }, 'food ');
     });
   });
   describe('buffer', function() {
@@ -59,13 +66,13 @@ describe('javascript-compiler api', function() {
       handlebarsEnv.JavaScriptCompiler.prototype.initializeBuffer = function() {
         return this.quotedString('foo_');
       };
-      shouldCompileTo("{{foo}} ", { foo: "food" }, "foo_food ");
+      shouldCompileTo('{{foo}} ', { foo: 'food' }, 'foo_food ');
     });
     it('should allow append buffer override', function() {
       handlebarsEnv.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
-        return $superAppend.call(this, string + ' + "_foo"');
+        return $superAppend.call(this, [string, ' + "_foo"']);
       };
-      shouldCompileTo("{{foo}}", { foo: "food" }, "food_foo");
+      shouldCompileTo('{{foo}}', { foo: 'food' }, 'food_foo');
     });
   });
 });

spec/parser.js

@@ -1,193 +1,287 @@
-/*global Handlebars, shouldThrow */
 describe('parser', function() {
   if (!Handlebars.print) {
     return;
   }
 
-  function ast_for(template) {
+  function astFor(template) {
     var ast = Handlebars.parse(template);
     return Handlebars.print(ast);
   }
 
   it('parses simple mustaches', function() {
-    equals(ast_for('{{foo}}'), "{{ ID:foo [] }}\n");
-    equals(ast_for('{{foo?}}'), "{{ ID:foo? [] }}\n");
-    equals(ast_for('{{foo_}}'), "{{ ID:foo_ [] }}\n");
-    equals(ast_for('{{foo-}}'), "{{ ID:foo- [] }}\n");
-    equals(ast_for('{{foo:}}'), "{{ ID:foo: [] }}\n");
+    equals(astFor('{{123}}'), '{{ NUMBER{123} [] }}\n');
+    equals(astFor('{{"foo"}}'), '{{ "foo" [] }}\n');
+    equals(astFor('{{false}}'), '{{ BOOLEAN{false} [] }}\n');
+    equals(astFor('{{true}}'), '{{ BOOLEAN{true} [] }}\n');
+    equals(astFor('{{foo}}'), '{{ PATH:foo [] }}\n');
+    equals(astFor('{{foo?}}'), '{{ PATH:foo? [] }}\n');
+    equals(astFor('{{foo_}}'), '{{ PATH:foo_ [] }}\n');
+    equals(astFor('{{foo-}}'), '{{ PATH:foo- [] }}\n');
+    equals(astFor('{{foo:}}'), '{{ PATH:foo: [] }}\n');
   });
 
   it('parses simple mustaches with data', function() {
-    equals(ast_for("{{@foo}}"), "{{ @ID:foo [] }}\n");
+    equals(astFor('{{@foo}}'), '{{ @PATH:foo [] }}\n');
   });
 
   it('parses simple mustaches with data paths', function() {
-    equals(ast_for("{{@../foo}}"), "{{ @ID:foo [] }}\n");
+    equals(astFor('{{@../foo}}'), '{{ @PATH:foo [] }}\n');
   });
 
   it('parses mustaches with paths', function() {
-    equals(ast_for("{{foo/bar}}"), "{{ PATH:foo/bar [] }}\n");
+    equals(astFor('{{foo/bar}}'), '{{ PATH:foo/bar [] }}\n');
   });
 
   it('parses mustaches with this/foo', function() {
-    equals(ast_for("{{this/foo}}"), "{{ ID:foo [] }}\n");
+    equals(astFor('{{this/foo}}'), '{{ PATH:foo [] }}\n');
   });
 
   it('parses mustaches with - in a path', function() {
-    equals(ast_for("{{foo-bar}}"), "{{ ID:foo-bar [] }}\n");
+    equals(astFor('{{foo-bar}}'), '{{ PATH:foo-bar [] }}\n');
   });
 
   it('parses mustaches with parameters', function() {
-    equals(ast_for("{{foo bar}}"), "{{ ID:foo [ID:bar] }}\n");
+    equals(astFor('{{foo bar}}'), '{{ PATH:foo [PATH:bar] }}\n');
   });
 
   it('parses mustaches with string parameters', function() {
-    equals(ast_for("{{foo bar \"baz\" }}"), '{{ ID:foo [ID:bar, "baz"] }}\n');
+    equals(astFor('{{foo bar \"baz\" }}'), '{{ PATH:foo [PATH:bar, "baz"] }}\n');
   });
 
   it('parses mustaches with NUMBER parameters', function() {
-    equals(ast_for("{{foo 1}}"), "{{ ID:foo [NUMBER{1}] }}\n");
+    equals(astFor('{{foo 1}}'), '{{ PATH:foo [NUMBER{1}] }}\n');
   });
 
   it('parses mustaches with BOOLEAN parameters', function() {
-    equals(ast_for("{{foo true}}"), "{{ ID:foo [BOOLEAN{true}] }}\n");
-    equals(ast_for("{{foo false}}"), "{{ ID:foo [BOOLEAN{false}] }}\n");
+    equals(astFor('{{foo true}}'), '{{ PATH:foo [BOOLEAN{true}] }}\n');
+    equals(astFor('{{foo false}}'), '{{ PATH:foo [BOOLEAN{false}] }}\n');
   });
 
-  it('parses mutaches with DATA parameters', function() {
-    equals(ast_for("{{foo @bar}}"), "{{ ID:foo [@ID:bar] }}\n");
+  it('parses mustaches with undefined and null paths', function() {
+    equals(astFor('{{undefined}}'), '{{ UNDEFINED [] }}\n');
+    equals(astFor('{{null}}'), '{{ NULL [] }}\n');
+  });
+  it('parses mustaches with undefined and null parameters', function() {
+    equals(astFor('{{foo undefined null}}'), '{{ PATH:foo [UNDEFINED, NULL] }}\n');
+  });
+
+  it('parses mustaches with DATA parameters', function() {
+    equals(astFor('{{foo @bar}}'), '{{ PATH:foo [@PATH:bar] }}\n');
   });
 
   it('parses mustaches with hash arguments', function() {
-    equals(ast_for("{{foo bar=baz}}"), "{{ ID:foo [] HASH{bar=ID:baz} }}\n");
-    equals(ast_for("{{foo bar=1}}"), "{{ ID:foo [] HASH{bar=NUMBER{1}} }}\n");
-    equals(ast_for("{{foo bar=true}}"), "{{ ID:foo [] HASH{bar=BOOLEAN{true}} }}\n");
-    equals(ast_for("{{foo bar=false}}"), "{{ ID:foo [] HASH{bar=BOOLEAN{false}} }}\n");
-    equals(ast_for("{{foo bar=@baz}}"), "{{ ID:foo [] HASH{bar=@ID:baz} }}\n");
+    equals(astFor('{{foo bar=baz}}'), '{{ PATH:foo [] HASH{bar=PATH:baz} }}\n');
+    equals(astFor('{{foo bar=1}}'), '{{ PATH:foo [] HASH{bar=NUMBER{1}} }}\n');
+    equals(astFor('{{foo bar=true}}'), '{{ PATH:foo [] HASH{bar=BOOLEAN{true}} }}\n');
+    equals(astFor('{{foo bar=false}}'), '{{ PATH:foo [] HASH{bar=BOOLEAN{false}} }}\n');
+    equals(astFor('{{foo bar=@baz}}'), '{{ PATH:foo [] HASH{bar=@PATH:baz} }}\n');
 
-    equals(ast_for("{{foo bar=baz bat=bam}}"), "{{ ID:foo [] HASH{bar=ID:baz, bat=ID:bam} }}\n");
-    equals(ast_for("{{foo bar=baz bat=\"bam\"}}"), '{{ ID:foo [] HASH{bar=ID:baz, bat="bam"} }}\n');
+    equals(astFor('{{foo bar=baz bat=bam}}'), '{{ PATH:foo [] HASH{bar=PATH:baz, bat=PATH:bam} }}\n');
+    equals(astFor('{{foo bar=baz bat="bam"}}'), '{{ PATH:foo [] HASH{bar=PATH:baz, bat="bam"} }}\n');
 
-    equals(ast_for("{{foo bat='bam'}}"), '{{ ID:foo [] HASH{bat="bam"} }}\n');
+    equals(astFor("{{foo bat='bam'}}"), '{{ PATH:foo [] HASH{bat="bam"} }}\n');
 
-    equals(ast_for("{{foo omg bar=baz bat=\"bam\"}}"), '{{ ID:foo [ID:omg] HASH{bar=ID:baz, bat="bam"} }}\n');
-    equals(ast_for("{{foo omg bar=baz bat=\"bam\" baz=1}}"), '{{ ID:foo [ID:omg] HASH{bar=ID:baz, bat="bam", baz=NUMBER{1}} }}\n');
-    equals(ast_for("{{foo omg bar=baz bat=\"bam\" baz=true}}"), '{{ ID:foo [ID:omg] HASH{bar=ID:baz, bat="bam", baz=BOOLEAN{true}} }}\n');
-    equals(ast_for("{{foo omg bar=baz bat=\"bam\" baz=false}}"), '{{ ID:foo [ID:omg] HASH{bar=ID:baz, bat="bam", baz=BOOLEAN{false}} }}\n');
+    equals(astFor('{{foo omg bar=baz bat=\"bam\"}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam"} }}\n');
+    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=1}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=NUMBER{1}} }}\n');
+    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=true}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=BOOLEAN{true}} }}\n');
+    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=false}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=BOOLEAN{false}} }}\n');
   });
 
   it('parses contents followed by a mustache', function() {
-    equals(ast_for("foo bar {{baz}}"), "CONTENT[ \'foo bar \' ]\n{{ ID:baz [] }}\n");
+    equals(astFor('foo bar {{baz}}'), 'CONTENT[ \'foo bar \' ]\n{{ PATH:baz [] }}\n');
   });
 
   it('parses a partial', function() {
-    equals(ast_for("{{> foo }}"), "{{> PARTIAL:foo }}\n");
+    equals(astFor('{{> foo }}'), '{{> PARTIAL:foo }}\n');
+    equals(astFor('{{> "foo" }}'), '{{> PARTIAL:foo }}\n');
+    equals(astFor('{{> 1 }}'), '{{> PARTIAL:1 }}\n');
   });
 
   it('parses a partial with context', function() {
-    equals(ast_for("{{> foo bar}}"), "{{> PARTIAL:foo ID:bar }}\n");
+    equals(astFor('{{> foo bar}}'), '{{> PARTIAL:foo PATH:bar }}\n');
   });
 
   it('parses a partial with hash', function() {
-    equals(ast_for("{{> foo bar=bat}}"), "{{> PARTIAL:foo HASH{bar=ID:bat} }}\n");
+    equals(astFor('{{> foo bar=bat}}'), '{{> PARTIAL:foo HASH{bar=PATH:bat} }}\n');
   });
 
   it('parses a partial with context and hash', function() {
-    equals(ast_for("{{> foo bar bat=baz}}"), "{{> PARTIAL:foo ID:bar HASH{bat=ID:baz} }}\n");
+    equals(astFor('{{> foo bar bat=baz}}'), '{{> PARTIAL:foo PATH:bar HASH{bat=PATH:baz} }}\n');
   });
 
   it('parses a partial with a complex name', function() {
-    equals(ast_for("{{> shared/partial?.bar}}"), "{{> PARTIAL:shared/partial?.bar }}\n");
+    equals(astFor('{{> shared/partial?.bar}}'), '{{> PARTIAL:shared/partial?.bar }}\n');
+  });
+
+  it('parsers partial blocks', function() {
+    equals(astFor('{{#> foo}}bar{{/foo}}'), '{{> PARTIAL BLOCK:foo PROGRAM:\n  CONTENT[ \'bar\' ]\n }}\n');
+  });
+  it('should handle parser block mismatch', function() {
+    shouldThrow(function() {
+      astFor('{{#> goodbyes}}{{/hellos}}');
+    }, Error, (/goodbyes doesn't match hellos/));
+  });
+  it('parsers partial blocks with arguments', function() {
+    equals(astFor('{{#> foo context hash=value}}bar{{/foo}}'), '{{> PARTIAL BLOCK:foo PATH:context HASH{hash=PATH:value} PROGRAM:\n  CONTENT[ \'bar\' ]\n }}\n');
   });
 
   it('parses a comment', function() {
-    equals(ast_for("{{! this is a comment }}"), "{{! ' this is a comment ' }}\n");
+    equals(astFor('{{! this is a comment }}'), "{{! ' this is a comment ' }}\n");
   });
 
   it('parses a multi-line comment', function() {
-    equals(ast_for("{{!\nthis is a multi-line comment\n}}"), "{{! \'\nthis is a multi-line comment\n\' }}\n");
+    equals(astFor('{{!\nthis is a multi-line comment\n}}'), "{{! \'\nthis is a multi-line comment\n\' }}\n");
   });
 
   it('parses an inverse section', function() {
-    equals(ast_for("{{#foo}} bar {{^}} baz {{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
+    equals(astFor('{{#foo}} bar {{^}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
   });
 
   it('parses an inverse (else-style) section', function() {
-    equals(ast_for("{{#foo}} bar {{else}} baz {{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
+    equals(astFor('{{#foo}} bar {{else}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
+  });
+
+  it('parses multiple inverse sections', function() {
+    equals(astFor('{{#foo}} bar {{else if bar}}{{else}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    BLOCK:\n      PATH:if [PATH:bar]\n      PROGRAM:\n      {{^}}\n        CONTENT[ ' baz ' ]\n");
   });
 
   it('parses empty blocks', function() {
-    equals(ast_for("{{#foo}}{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n");
+    equals(astFor('{{#foo}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n');
   });
 
   it('parses empty blocks with empty inverse section', function() {
-    equals(ast_for("{{#foo}}{{^}}{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n  {{^}}\n");
+    equals(astFor('{{#foo}}{{^}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n');
   });
 
   it('parses empty blocks with empty inverse (else-style) section', function() {
-    equals(ast_for("{{#foo}}{{else}}{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n  {{^}}\n");
+    equals(astFor('{{#foo}}{{else}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n');
   });
 
   it('parses non-empty blocks with empty inverse section', function() {
-    equals(ast_for("{{#foo}} bar {{^}}{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
+    equals(astFor('{{#foo}} bar {{^}}{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
   });
 
   it('parses non-empty blocks with empty inverse (else-style) section', function() {
-    equals(ast_for("{{#foo}} bar {{else}}{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
+    equals(astFor('{{#foo}} bar {{else}}{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
   });
 
   it('parses empty blocks with non-empty inverse section', function() {
-    equals(ast_for("{{#foo}}{{^}} bar {{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
+    equals(astFor('{{#foo}}{{^}} bar {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
   });
 
   it('parses empty blocks with non-empty inverse (else-style) section', function() {
-    equals(ast_for("{{#foo}}{{else}} bar {{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
+    equals(astFor('{{#foo}}{{else}} bar {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
   });
 
   it('parses a standalone inverse section', function() {
-    equals(ast_for("{{^foo}}bar{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  {{^}}\n    CONTENT[ 'bar' ]\n");
+    equals(astFor('{{^foo}}bar{{/foo}}'), "BLOCK:\n  PATH:foo []\n  {{^}}\n    CONTENT[ 'bar' ]\n");
   });
-  it('parses a standalone inverse section', function() {
-    equals(ast_for("{{else foo}}bar{{/foo}}"), "BLOCK:\n  {{ ID:foo [] }}\n  {{^}}\n    CONTENT[ 'bar' ]\n");
+  it('throws on old inverse section', function() {
+    shouldThrow(function() {
+      astFor('{{else foo}}bar{{/foo}}');
+    }, Error);
   });
 
-  it("raises if there's a Parse error", function() {
+  it('parses block with block params', function() {
+    equals(astFor('{{#foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    BLOCK PARAMS: [ bar baz ]\n    CONTENT[ 'content' ]\n");
+  });
+
+  it('parses inverse block with block params', function() {
+    equals(astFor('{{^foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  {{^}}\n    BLOCK PARAMS: [ bar baz ]\n    CONTENT[ 'content' ]\n");
+  });
+  it('parses chained inverse block with block params', function() {
+    equals(astFor('{{#foo}}{{else foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    BLOCK:\n      PATH:foo []\n      PROGRAM:\n        BLOCK PARAMS: [ bar baz ]\n        CONTENT[ 'content' ]\n");
+  });
+  it('raises if there\'s a Parse error', function() {
     shouldThrow(function() {
-      ast_for("foo{{^}}bar");
+      astFor('foo{{^}}bar');
     }, Error, /Parse error on line 1/);
     shouldThrow(function() {
-      ast_for("{{foo}");
+      astFor('{{foo}');
     }, Error, /Parse error on line 1/);
     shouldThrow(function() {
-      ast_for("{{foo &}}");
+      astFor('{{foo &}}');
     }, Error, /Parse error on line 1/);
     shouldThrow(function() {
-      ast_for("{{#goodbyes}}{{/hellos}}");
+      astFor('{{#goodbyes}}{{/hellos}}');
     }, Error, /goodbyes doesn't match hellos/);
 
     shouldThrow(function() {
-      ast_for("{{{{goodbyes}}}} {{{{/hellos}}}}");
+      astFor('{{{{goodbyes}}}} {{{{/hellos}}}}');
     }, Error, /goodbyes doesn't match hellos/);
   });
 
+  it('should handle invalid paths', function() {
+    shouldThrow(function() {
+      astFor('{{foo/../bar}}');
+    }, Error, /Invalid path: foo\/\.\. - 1:2/);
+    shouldThrow(function() {
+      astFor('{{foo/./bar}}');
+    }, Error, /Invalid path: foo\/\. - 1:2/);
+    shouldThrow(function() {
+      astFor('{{foo/this/bar}}');
+    }, Error, /Invalid path: foo\/this - 1:2/);
+  });
+
   it('knows how to report the correct line number in errors', function() {
     shouldThrow(function() {
-      ast_for("hello\nmy\n{{foo}");
+      astFor('hello\nmy\n{{foo}');
     }, Error, /Parse error on line 3/);
     shouldThrow(function() {
-      ast_for("hello\n\nmy\n\n{{foo}");
+      astFor('hello\n\nmy\n\n{{foo}');
     }, Error, /Parse error on line 5/);
   });
 
   it('knows how to report the correct line number in errors when the first character is a newline', function() {
     shouldThrow(function() {
-      ast_for("\n\nhello\n\nmy\n\n{{foo}");
+      astFor('\n\nhello\n\nmy\n\n{{foo}');
     }, Error, /Parse error on line 7/);
   });
 
   describe('externally compiled AST', function() {
     it('can pass through an already-compiled AST', function() {
-      equals(ast_for(new Handlebars.AST.ProgramNode([ new Handlebars.AST.ContentNode("Hello")])), "CONTENT[ \'Hello\' ]\n");
+      equals(astFor({
+        type: 'Program',
+        body: [ {type: 'ContentStatement', value: 'Hello'}]
+      }), 'CONTENT[ \'Hello\' ]\n');
     });
   });
+
+  describe('directives', function() {
+    it('should parse block directives', function() {
+      equals(astFor('{{#* foo}}{{/foo}}'), 'DIRECTIVE BLOCK:\n  PATH:foo []\n  PROGRAM:\n');
+    });
+    it('should parse directives', function() {
+      equals(astFor('{{* foo}}'), '{{ DIRECTIVE PATH:foo [] }}\n');
+    });
+    it('should fail if directives have inverse', function() {
+      shouldThrow(function() {
+        astFor('{{#* foo}}{{^}}{{/foo}}');
+      }, Error, /Unexpected inverse/);
+    });
+  });
+
+  it('GH1024 - should track program location properly', function() {
+    var p = Handlebars.parse('\n'
+      + '  {{#if foo}}\n'
+      + '    {{bar}}\n'
+      + '       {{else}}    {{baz}}\n'
+      + '\n'
+      + '     {{/if}}\n'
+      + '    ');
+
+    // We really need a deep equals but for now this should be stable...
+    equals(JSON.stringify(p.loc), JSON.stringify({
+      start: { line: 1, column: 0 },
+      end: { line: 7, column: 4 }
+    }));
+    equals(JSON.stringify(p.body[1].program.loc), JSON.stringify({
+      start: { line: 2, column: 13 },
+      end: { line: 4, column: 7 }
+    }));
+    equals(JSON.stringify(p.body[1].inverse.loc), JSON.stringify({
+      start: { line: 4, column: 15 },
+      end: { line: 6, column: 5 }
+    }));
+  });
 });

spec/partials.js

@@ -1,148 +1,208 @@
-/*global CompilerContext, Handlebars, handlebarsEnv, shouldCompileTo, shouldCompileToWithPartials, shouldThrow */
 describe('partials', function() {
   it('basic partials', function() {
     var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
     var partial = '{{name}} ({{url}}) ';
     var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
     shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial},,false], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial},, false], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
   });
 
-  it("partials with context", function() {
-    var string = "Dudes: {{>dude dudes}}";
-    var partial = "{{#this}}{{name}} ({{url}}) {{/this}}";
-    var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, "Dudes: Yehuda (http://yehuda) Alan (http://alan) ",
-                    "Partials can be passed a context");
+  it('dynamic partials', function() {
+    var string = 'Dudes: {{#dudes}}{{> (partial)}}{{/dudes}}';
+    var partial = '{{name}} ({{url}}) ';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    var helpers = {
+      partial: function() {
+        return 'dude';
+      }
+    };
+    shouldCompileToWithPartials(string, [hash, helpers, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
+    shouldCompileToWithPartials(string, [hash, helpers, {dude: partial},, false], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
+  });
+  it('failing dynamic partials', function() {
+    var string = 'Dudes: {{#dudes}}{{> (partial)}}{{/dudes}}';
+    var partial = '{{name}} ({{url}}) ';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    var helpers = {
+      partial: function() {
+        return 'missing';
+      }
+    };
+    shouldThrow(function() {
+      shouldCompileToWithPartials(string, [hash, helpers, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
+    }, Handlebars.Exception, 'The partial missing could not be found');
   });
 
-  it("partials with undefined context", function() {
-    var string = "Dudes: {{>dude dudes}}";
-    var partial = "{{foo}} Empty";
+  it('partials with context', function() {
+    var string = 'Dudes: {{>dude dudes}}';
+    var partial = '{{#this}}{{name}} ({{url}}) {{/this}}';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ',
+                    'Partials can be passed a context');
+  });
+
+  it('partials with no context', function() {
+    var partial = '{{name}} ({{url}}) ';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileToWithPartials(
+        'Dudes: {{#dudes}}{{>dude}}{{/dudes}}',
+        [hash, {}, {dude: partial}, {explicitPartialContext: true}],
+        true,
+        'Dudes:  ()  () ');
+    shouldCompileToWithPartials(
+        'Dudes: {{#dudes}}{{>dude name="foo"}}{{/dudes}}',
+        [hash, {}, {dude: partial}, {explicitPartialContext: true}],
+        true,
+        'Dudes: foo () foo () ');
+  });
+
+  it('partials with string context', function() {
+    var string = 'Dudes: {{>dude "dudes"}}';
+    var partial = '{{.}}';
     var hash = {};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, "Dudes:  Empty");
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: dudes');
   });
 
-  it("partials with parameters", function() {
-    var string = "Dudes: {{#dudes}}{{> dude others=..}}{{/dudes}}";
-    var partial = "{{others.foo}}{{name}} ({{url}}) ";
-    var hash = {foo: 'bar', dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, "Dudes: barYehuda (http://yehuda) barAlan (http://alan) ",
-                    "Basic partials output based on current context.");
+  it('partials with undefined context', function() {
+    var string = 'Dudes: {{>dude dudes}}';
+    var partial = '{{foo}} Empty';
+    var hash = {};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes:  Empty');
   });
 
-  it("partial in a partial", function() {
-    var string = "Dudes: {{#dudes}}{{>dude}}{{/dudes}}";
-    var dude = "{{name}} {{> url}} ";
-    var url = "<a href='{{url}}'>{{url}}</a>";
-    var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}], true, "Dudes: Yehuda <a href='http://yehuda'>http://yehuda</a> Alan <a href='http://alan'>http://alan</a> ", "Partials are rendered inside of other partials");
-  });
-
-  it("rendering undefined partial throws an exception", function() {
+  it('partials with duplicate parameters', function() {
     shouldThrow(function() {
-        var template = CompilerContext.compile("{{> whatever}}");
-        template();
-    }, Handlebars.Exception, 'The partial whatever could not be found');
+      CompilerContext.compile('Dudes: {{>dude dudes foo bar=baz}}');
+    }, Error, 'Unsupported number of partial arguments: 2 - 1:7');
   });
 
-  it("rendering template partial in vm mode throws an exception", function() {
+  it('partials with parameters', function() {
+    var string = 'Dudes: {{#dudes}}{{> dude others=..}}{{/dudes}}';
+    var partial = '{{others.foo}}{{name}} ({{url}}) ';
+    var hash = {foo: 'bar', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: barYehuda (http://yehuda) barAlan (http://alan) ',
+                    'Basic partials output based on current context.');
+  });
+
+  it('partial in a partial', function() {
+    var string = 'Dudes: {{#dudes}}{{>dude}}{{/dudes}}';
+    var dude = '{{name}} {{> url}} ';
+    var url = '<a href="{{url}}">{{url}}</a>';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}], true, 'Dudes: Yehuda <a href="http://yehuda">http://yehuda</a> Alan <a href="http://alan">http://alan</a> ', 'Partials are rendered inside of other partials');
+  });
+
+  it('rendering undefined partial throws an exception', function() {
     shouldThrow(function() {
-      var template = CompilerContext.compile("{{> whatever}}");
+      var template = CompilerContext.compile('{{> whatever}}');
       template();
     }, Handlebars.Exception, 'The partial whatever could not be found');
   });
 
-  it("rendering function partial in vm mode", function() {
-    var string = "Dudes: {{#dudes}}{{> dude}}{{/dudes}}";
-    var partial = function(context) {
+  it('registering undefined partial throws an exception', function() {
+    shouldThrow(function() {
+      var undef;
+      handlebarsEnv.registerPartial('undefined_test', undef);
+    }, Handlebars.Exception, 'Attempting to register a partial as undefined');
+  });
+
+  it('rendering template partial in vm mode throws an exception', function() {
+    shouldThrow(function() {
+      var template = CompilerContext.compile('{{> whatever}}');
+      template();
+    }, Handlebars.Exception, 'The partial whatever could not be found');
+  });
+
+  it('rendering function partial in vm mode', function() {
+    var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
+    function partial(context) {
       return context.name + ' (' + context.url + ') ';
-    };
-    var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-    shouldCompileTo(string, [hash, {}, {dude: partial}], "Dudes: Yehuda (http://yehuda) Alan (http://alan) ",
-                    "Function partials output based in VM.");
+    }
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileTo(string, [hash, {}, {dude: partial}], 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ',
+                    'Function partials output based in VM.');
   });
 
-  it("GH-14: a partial preceding a selector", function() {
-     var string = "Dudes: {{>dude}} {{another_dude}}";
-     var dude = "{{name}}";
-     var hash = {name:"Jeepers", another_dude:"Creepers"};
-     shouldCompileToWithPartials(string, [hash, {}, {dude:dude}], true, "Dudes: Jeepers Creepers", "Regular selectors can follow a partial");
+  it('GH-14: a partial preceding a selector', function() {
+    var string = 'Dudes: {{>dude}} {{anotherDude}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: dude}], true, 'Dudes: Jeepers Creepers', 'Regular selectors can follow a partial');
   });
 
-  it("Partials with slash paths", function() {
-    var string = "Dudes: {{> shared/dude}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude':dude}], true, "Dudes: Jeepers", "Partials can use literal paths");
+  it('Partials with slash paths', function() {
+    var string = 'Dudes: {{> shared/dude}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
   });
 
-  it("Partials with slash and point paths", function() {
-    var string = "Dudes: {{> shared/dude.thing}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude.thing':dude}], true, "Dudes: Jeepers", "Partials can use literal with points in paths");
+  it('Partials with slash and point paths', function() {
+    var string = 'Dudes: {{> shared/dude.thing}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude.thing': dude}], true, 'Dudes: Jeepers', 'Partials can use literal with points in paths');
   });
 
-  it("Global Partials", function() {
-    handlebarsEnv.registerPartial('global_test', '{{another_dude}}');
+  it('Global Partials', function() {
+    handlebarsEnv.registerPartial('globalTest', '{{anotherDude}}');
 
-    var string = "Dudes: {{> shared/dude}} {{> global_test}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude':dude}], true, "Dudes: Jeepers Creepers", "Partials can use globals or passed");
+    var string = 'Dudes: {{> shared/dude}} {{> globalTest}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude': dude}], true, 'Dudes: Jeepers Creepers', 'Partials can use globals or passed');
 
-    handlebarsEnv.unregisterPartial('global_test');
-    equals(handlebarsEnv.partials.global_test, undefined);
+    handlebarsEnv.unregisterPartial('globalTest');
+    equals(handlebarsEnv.partials.globalTest, undefined);
   });
 
-  it("Multiple partial registration", function() {
+  it('Multiple partial registration', function() {
     handlebarsEnv.registerPartial({
       'shared/dude': '{{name}}',
-      global_test: '{{another_dude}}'
+      globalTest: '{{anotherDude}}'
     });
 
-    var string = "Dudes: {{> shared/dude}} {{> global_test}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash], true, "Dudes: Jeepers Creepers", "Partials can use globals or passed");
+    var string = 'Dudes: {{> shared/dude}} {{> globalTest}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash], true, 'Dudes: Jeepers Creepers', 'Partials can use globals or passed');
   });
 
-  it("Partials with integer path", function() {
-    var string = "Dudes: {{> 404}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {404:dude}], true, "Dudes: Jeepers", "Partials can use literal paths");
+  it('Partials with integer path', function() {
+    var string = 'Dudes: {{> 404}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {404: dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
   });
 
-  it("Partials with complex path", function() {
-    var string = "Dudes: {{> 404/asdf?.bar}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'404/asdf?.bar':dude}], true, "Dudes: Jeepers", "Partials can use literal paths");
+  it('Partials with complex path', function() {
+    var string = 'Dudes: {{> 404/asdf?.bar}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
   });
 
-  it("Partials with escaped", function() {
-    var string = "Dudes: {{> [+404/asdf?.bar]}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar':dude}], true, "Dudes: Jeepers", "Partials can use literal paths");
+  it('Partials with escaped', function() {
+    var string = 'Dudes: {{> [+404/asdf?.bar]}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
   });
 
-  it("Partials with string", function() {
-    var string = "Dudes: {{> \"+404/asdf?.bar\"}}";
-    var dude = "{{name}}";
-    var hash = {name:"Jeepers", another_dude:"Creepers"};
-    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar':dude}], true, "Dudes: Jeepers", "Partials can use literal paths");
+  it('Partials with string', function() {
+    var string = 'Dudes: {{> \'+404/asdf?.bar\'}}';
+    var dude = '{{name}}';
+    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
+    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
   });
 
   it('should handle empty partial', function() {
-    var string = "Dudes: {{#dudes}}{{> dude}}{{/dudes}}";
-    var partial = "";
-    var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, "Dudes: ");
+    var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
+    var partial = '';
+    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: ');
   });
 
-  it("throw on missing partial", function() {
+  it('throw on missing partial', function() {
     var compile = handlebarsEnv.compile;
     handlebarsEnv.compile = undefined;
     shouldThrow(function() {
@@ -151,21 +211,138 @@ describe('partials', function() {
     handlebarsEnv.compile = compile;
   });
 
-  describe('standalone partials', function() {
-    it("indented partials", function() {
-      var string = "Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}";
-      var dude = "{{name}}\n";
-      var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: dude}], true,
-            "Dudes:\n  Yehuda\n  Alan\n");
+  describe('partial blocks', function() {
+    it('should render partial block as default', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}success{{/dude}}',
+        [{}, {}, {}],
+        true,
+        'success');
     });
-    it("nested indented partials", function() {
-      var string = "Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}";
-      var dude = "{{name}}\n {{> url}}";
-      var url = "{{url}}!\n";
-      var hash = {dudes: [{name: "Yehuda", url: "http://yehuda"}, {name: "Alan", url: "http://alan"}]};
+    it('should execute default block with proper context', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude context}}{{value}}{{/dude}}',
+        [{context: {value: 'success'}}, {}, {}],
+        true,
+        'success');
+    });
+    it('should propagate block parameters to default block', function() {
+      shouldCompileToWithPartials(
+        '{{#with context as |me|}}{{#> dude}}{{me.value}}{{/dude}}{{/with}}',
+        [{context: {value: 'success'}}, {}, {}],
+        true,
+        'success');
+    });
+
+    it('should not use partial block if partial exists', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}fail{{/dude}}',
+        [{}, {}, {dude: 'success'}],
+        true,
+        'success');
+    });
+
+    it('should render block from partial', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}success{{/dude}}',
+        [{}, {}, {dude: '{{> @partial-block }}'}],
+        true,
+        'success');
+    });
+    it('should render block from partial with context', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}{{value}}{{/dude}}',
+        [{context: {value: 'success'}}, {}, {dude: '{{#with context}}{{> @partial-block }}{{/with}}'}],
+        true,
+        'success');
+    });
+    it('should render block from partial with context', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}{{../context/value}}{{/dude}}',
+        [{context: {value: 'success'}}, {}, {dude: '{{#with context}}{{> @partial-block }}{{/with}}'}],
+        true,
+        'success');
+    });
+    it('should render block from partial with block params', function() {
+      shouldCompileToWithPartials(
+        '{{#with context as |me|}}{{#> dude}}{{me.value}}{{/dude}}{{/with}}',
+        [{context: {value: 'success'}}, {}, {dude: '{{> @partial-block }}'}],
+        true,
+        'success');
+    });
+  });
+
+  describe('inline partials', function() {
+    it('should define inline partials for template', function() {
+      shouldCompileTo('{{#*inline "myPartial"}}success{{/inline}}{{> myPartial}}', {}, 'success');
+    });
+    it('should overwrite multiple partials in the same template', function() {
+      shouldCompileTo('{{#*inline "myPartial"}}fail{{/inline}}{{#*inline "myPartial"}}success{{/inline}}{{> myPartial}}', {}, 'success');
+    });
+    it('should define inline partials for block', function() {
+      shouldCompileTo('{{#with .}}{{#*inline "myPartial"}}success{{/inline}}{{> myPartial}}{{/with}}', {}, 'success');
+      shouldThrow(function() {
+        shouldCompileTo('{{#with .}}{{#*inline "myPartial"}}success{{/inline}}{{/with}}{{> myPartial}}', {}, 'success');
+      }, Error, /myPartial could not/);
+    });
+    it('should override global partials', function() {
+      shouldCompileTo('{{#*inline "myPartial"}}success{{/inline}}{{> myPartial}}', {hash: {}, partials: {myPartial: function() { return 'fail'; }}}, 'success');
+    });
+    it('should override template partials', function() {
+      shouldCompileTo('{{#*inline "myPartial"}}fail{{/inline}}{{#with .}}{{#*inline "myPartial"}}success{{/inline}}{{> myPartial}}{{/with}}', {}, 'success');
+    });
+    it('should override partials down the entire stack', function() {
+      shouldCompileTo('{{#with .}}{{#*inline "myPartial"}}success{{/inline}}{{#with .}}{{#with .}}{{> myPartial}}{{/with}}{{/with}}{{/with}}', {}, 'success');
+    });
+
+    it('should define inline partials for partial call', function() {
+      shouldCompileToWithPartials(
+        '{{#*inline "myPartial"}}success{{/inline}}{{> dude}}',
+        [{}, {}, {dude: '{{> myPartial }}'}],
+        true,
+        'success');
+    });
+    it('should define inline partials in partial block call', function() {
+      shouldCompileToWithPartials(
+        '{{#> dude}}{{#*inline "myPartial"}}success{{/inline}}{{/dude}}',
+        [{}, {}, {dude: '{{> myPartial }}'}],
+        true,
+        'success');
+    });
+  });
+
+  it('should pass compiler flags', function() {
+    if (Handlebars.compile) {
+      var env = Handlebars.create();
+      env.registerPartial('partial', '{{foo}}');
+      var template = env.compile('{{foo}} {{> partial}}', {noEscape: true});
+      equal(template({foo: '<'}), '< <');
+    }
+  });
+
+  describe('standalone partials', function() {
+    it('indented partials', function() {
+      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
+      var dude = '{{name}}\n';
+      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+      shouldCompileToWithPartials(string, [hash, {}, {dude: dude}], true,
+            'Dudes:\n  Yehuda\n  Alan\n');
+    });
+    it('nested indented partials', function() {
+      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
+      var dude = '{{name}}\n {{> url}}';
+      var url = '{{url}}!\n';
+      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
       shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}], true,
-            "Dudes:\n  Yehuda\n   http://yehuda!\n  Alan\n   http://alan!\n");
+            'Dudes:\n  Yehuda\n   http://yehuda!\n  Alan\n   http://alan!\n');
+    });
+    it('prevent nested indented partials', function() {
+      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
+      var dude = '{{name}}\n {{> url}}';
+      var url = '{{url}}!\n';
+      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+      shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}, {preventIndent: true}], true,
+            'Dudes:\n  Yehuda\n http://yehuda!\n  Alan\n http://alan!\n');
     });
   });
 
@@ -176,6 +353,12 @@ describe('partials', function() {
       var hash = {root: 'yes', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
       shouldCompileToWithPartials(string, [hash, {}, {dude: partial}, true], true, 'Dudes: Yehuda (http://yehuda) yes Alan (http://alan) yes ');
     });
+    it('partials can access parents with custom context', function() {
+      var string = 'Dudes: {{#dudes}}{{> dude "test"}}{{/dudes}}';
+      var partial = '{{name}} ({{url}}) {{root}} ';
+      var hash = {root: 'yes', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
+      shouldCompileToWithPartials(string, [hash, {}, {dude: partial}, true], true, 'Dudes: Yehuda (http://yehuda) yes Alan (http://alan) yes ');
+    });
     it('partials can access parents without data', function() {
       var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
       var partial = '{{name}} ({{url}}) {{root}} ';

spec/precompiler.js

@@ -1,6 +1,4 @@
-/*global shouldThrow */
-
-
+/* eslint-disable no-console */
 describe('precompiler', function() {
   // NOP Under non-node environments
   if (typeof process === 'undefined') {
@@ -8,28 +6,45 @@ describe('precompiler', function() {
   }
 
   var Handlebars = require('../lib'),
-      Precompiler = require('../lib/precompiler'),
+      Precompiler = require('../dist/cjs/precompiler'),
+      fs = require('fs'),
       uglify = require('uglify-js');
 
   var log,
       logFunction,
 
       precompile,
-      minify;
+      minify,
+
+      emptyTemplate = {
+        path: __dirname + '/artifacts/empty.handlebars',
+        name: 'empty',
+        source: ''
+      },
+
+      file,
+      content,
+      writeFileSync;
 
   beforeEach(function() {
     precompile = Handlebars.precompile;
     minify = uglify.minify;
+    writeFileSync = fs.writeFileSync;
 
     logFunction = console.log;
     log = '';
     console.log = function() {
       log += Array.prototype.join.call(arguments, '');
     };
+    fs.writeFileSync = function(_file, _content) {
+      file = _file;
+      content = _content;
+    };
   });
   afterEach(function() {
     Handlebars.precompile = precompile;
     uglify.minify = minify;
+    fs.writeFileSync = writeFileSync;
     console.log = logFunction;
   });
 
@@ -42,89 +57,197 @@ describe('precompiler', function() {
       Precompiler.cli({templates: []});
     }, Handlebars.Exception, 'Must define at least one template or directory.');
   });
-  it('should throw on missing template', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: ['foo']});
-    }, Handlebars.Exception, 'Unable to open template file "foo"');
+  it('should handle empty/filtered directories', function() {
+    Precompiler.cli({hasDirectory: true, templates: []});
+    // Success is not throwing
   });
   it('should throw when combining simple and minimized', function() {
     shouldThrow(function() {
       Precompiler.cli({templates: [__dirname], simple: true, min: true});
-    }, Handlebars.Exception, 'Unable to minimze simple output');
+    }, Handlebars.Exception, 'Unable to minimize simple output');
   });
   it('should throw when combining simple and multiple templates', function() {
     shouldThrow(function() {
       Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars', __dirname + '/artifacts/empty.handlebars'], simple: true});
     }, Handlebars.Exception, 'Unable to output multiple templates in simple mode');
   });
+  it('should throw when missing name', function() {
+    shouldThrow(function() {
+      Precompiler.cli({templates: [{source: ''}], amd: true});
+    }, Handlebars.Exception, 'Name missing for template');
+  });
   it('should throw when combining simple and directories', function() {
     shouldThrow(function() {
-      Precompiler.cli({templates: [__dirname], simple: true});
+      Precompiler.cli({hasDirectory: true, templates: [1], simple: true});
     }, Handlebars.Exception, 'Unable to output multiple templates in simple mode');
   });
-  it('should enumerate directories by extension', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'hbs'});
-    equal(/'example_2'/.test(log), true);
-    log = '';
 
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'handlebars'});
-    equal(/'empty'/.test(log), true);
-    equal(/'example_1'/.test(log), true);
-  });
-  it('should protect from regexp patterns', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'hb(s'});
-    // Success is not throwing
-  });
   it('should output simple templates', function() {
     Handlebars.precompile = function() { return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate], simple: true});
+    equal(log, 'simple\n');
+  });
+  it('should default to simple templates', function() {
+    Handlebars.precompile = function() { return 'simple'; };
+    Precompiler.cli({templates: [{source: ''}]});
     equal(log, 'simple\n');
   });
   it('should output amd templates', function() {
     Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], amd: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate], amd: true});
     equal(/template\(amd\)/.test(log), true);
   });
   it('should output multiple amd', function() {
     Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts'], amd: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate, emptyTemplate], amd: true, namespace: 'foo'});
+    equal(/templates = foo = foo \|\|/.test(log), true);
     equal(/return templates/.test(log), true);
     equal(/template\(amd\)/.test(log), true);
   });
   it('should output amd partials', function() {
     Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], amd: true, partial: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate], amd: true, partial: true});
     equal(/return Handlebars\.partials\['empty'\]/.test(log), true);
     equal(/template\(amd\)/.test(log), true);
   });
   it('should output multiple amd partials', function() {
     Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts'], amd: true, partial: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate, emptyTemplate], amd: true, partial: true});
     equal(/return Handlebars\.partials\[/.test(log), false);
     equal(/template\(amd\)/.test(log), true);
   });
   it('should output commonjs templates', function() {
     Handlebars.precompile = function() { return 'commonjs'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], commonjs: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate], commonjs: true});
     equal(/template\(commonjs\)/.test(log), true);
   });
 
   it('should set data flag', function() {
     Handlebars.precompile = function(data, options) { equal(options.data, true); return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', data: true});
+    Precompiler.cli({templates: [emptyTemplate], simple: true, data: true});
     equal(log, 'simple\n');
   });
 
   it('should set known helpers', function() {
     Handlebars.precompile = function(data, options) { equal(options.knownHelpers.foo, true); return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', known: 'foo'});
+    Precompiler.cli({templates: [emptyTemplate], simple: true, known: 'foo'});
     equal(log, 'simple\n');
   });
+  it('should output to file system', function() {
+    Handlebars.precompile = function() { return 'simple'; };
+    Precompiler.cli({templates: [emptyTemplate], simple: true, output: 'file!'});
+    equal(file, 'file!');
+    equal(content, 'simple\n');
+    equal(log, '');
+  });
 
   it('should output minimized templates', function() {
     Handlebars.precompile = function() { return 'amd'; };
     uglify.minify = function() { return {code: 'min'}; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], min: true, extension: 'handlebars'});
+    Precompiler.cli({templates: [emptyTemplate], min: true});
     equal(log, 'min');
   });
+
+  it('should output map', function() {
+    Precompiler.cli({templates: [emptyTemplate], map: 'foo.js.map'});
+
+    equal(file, 'foo.js.map');
+    equal(/sourceMappingURL=/.test(log), true);
+  });
+
+  it('should output map', function() {
+    Precompiler.cli({templates: [emptyTemplate], min: true, map: 'foo.js.map'});
+
+    equal(file, 'foo.js.map');
+    equal(/sourceMappingURL=/.test(log), true);
+  });
+
+  describe('#loadTemplates', function() {
+    it('should throw on missing template', function(done) {
+      Precompiler.loadTemplates({files: ['foo']}, function(err) {
+        equal(err.message, 'Unable to open template file "foo"');
+        done();
+      });
+    });
+    it('should enumerate directories by extension', function(done) {
+      Precompiler.loadTemplates({files: [__dirname + '/artifacts'], extension: 'hbs'}, function(err, opts) {
+        equal(opts.templates.length, 1);
+        equal(opts.templates[0].name, 'example_2');
+        done(err);
+      });
+    });
+    it('should enumerate all templates by extension', function(done) {
+      Precompiler.loadTemplates({files: [__dirname + '/artifacts'], extension: 'handlebars'}, function(err, opts) {
+        equal(opts.templates.length, 3);
+        equal(opts.templates[0].name, 'bom');
+        equal(opts.templates[1].name, 'empty');
+        equal(opts.templates[2].name, 'example_1');
+        done(err);
+      });
+    });
+    it('should handle regular expression characters in extensions', function(done) {
+      Precompiler.loadTemplates({files: [__dirname + '/artifacts'], extension: 'hb(s'}, function(err) {
+        // Success is not throwing
+        done(err);
+      });
+    });
+    it('should handle BOM', function(done) {
+      var opts = {files: [__dirname + '/artifacts/bom.handlebars'], extension: 'handlebars', bom: true};
+      Precompiler.loadTemplates(opts, function(err, opts) {
+        equal(opts.templates[0].source, 'a');
+        done(err);
+      });
+    });
+
+    it('should handle different root', function(done) {
+      var opts = {files: [__dirname + '/artifacts/empty.handlebars'], simple: true, root: 'foo/'};
+      Precompiler.loadTemplates(opts, function(err, opts) {
+        equal(opts.templates[0].name, __dirname + '/artifacts/empty');
+        done(err);
+      });
+    });
+
+    it('should accept string inputs', function(done) {
+      var opts = {string: ''};
+      Precompiler.loadTemplates(opts, function(err, opts) {
+        equal(opts.templates[0].name, undefined);
+        equal(opts.templates[0].source, '');
+        done(err);
+      });
+    });
+    it('should accept string array inputs', function(done) {
+      var opts = {string: ['', 'bar'], name: ['beep', 'boop']};
+      Precompiler.loadTemplates(opts, function(err, opts) {
+        equal(opts.templates[0].name, 'beep');
+        equal(opts.templates[0].source, '');
+        equal(opts.templates[1].name, 'boop');
+        equal(opts.templates[1].source, 'bar');
+        done(err);
+      });
+    });
+    it('should accept stdin input', function(done) {
+      var stdin = require('mock-stdin').stdin();
+      Precompiler.loadTemplates({string: '-'}, function(err, opts) {
+        equal(opts.templates[0].source, 'foo');
+        done(err);
+      });
+      stdin.send('fo');
+      stdin.send('o');
+      stdin.end();
+    });
+    it('error on name missing', function(done) {
+      var opts = {string: ['', 'bar']};
+      Precompiler.loadTemplates(opts, function(err) {
+        equal(err.message, 'Number of names did not match the number of string inputs');
+        done();
+      });
+    });
+
+    it('should complete when no args are passed', function(done) {
+      Precompiler.loadTemplates({}, function(err, opts) {
+        equal(opts.templates.length, 0);
+        done(err);
+      });
+    });
+  });
 });

spec/regressions.js

@@ -1,26 +1,34 @@
-/*global CompilerContext, Handlebars, shouldCompileTo, shouldThrow */
 describe('Regressions', function() {
-  it("GH-94: Cannot read property of undefined", function() {
-    var data = {"books":[{"title":"The origin of species","author":{"name":"Charles Darwin"}},{"title":"Lazarillo de Tormes"}]};
-    var string = "{{#books}}{{title}}{{author.name}}{{/books}}";
-    shouldCompileTo(string, data, "The origin of speciesCharles DarwinLazarillo de Tormes",
-                    "Renders without an undefined property error");
+  it('GH-94: Cannot read property of undefined', function() {
+    var data = {
+      'books': [{
+        'title': 'The origin of species',
+        'author': {
+          'name': 'Charles Darwin'
+        }
+      }, {
+        'title': 'Lazarillo de Tormes'
+      }]
+    };
+    var string = '{{#books}}{{title}}{{author.name}}{{/books}}';
+    shouldCompileTo(string, data, 'The origin of speciesCharles DarwinLazarillo de Tormes',
+                    'Renders without an undefined property error');
   });
 
   it("GH-150: Inverted sections print when they shouldn't", function() {
-    var string = "{{^set}}not set{{/set}} :: {{#set}}set{{/set}}";
+    var string = '{{^set}}not set{{/set}} :: {{#set}}set{{/set}}';
 
-    shouldCompileTo(string, {}, "not set :: ", "inverted sections run when property isn't present in context");
-    shouldCompileTo(string, {set: undefined}, "not set :: ", "inverted sections run when property is undefined");
-    shouldCompileTo(string, {set: false}, "not set :: ", "inverted sections run when property is false");
-    shouldCompileTo(string, {set: true}, " :: set", "inverted sections don't run when property is true");
+    shouldCompileTo(string, {}, 'not set :: ', "inverted sections run when property isn't present in context");
+    shouldCompileTo(string, {set: undefined}, 'not set :: ', 'inverted sections run when property is undefined');
+    shouldCompileTo(string, {set: false}, 'not set :: ', 'inverted sections run when property is false');
+    shouldCompileTo(string, {set: true}, ' :: set', "inverted sections don't run when property is true");
   });
 
-  it("GH-158: Using array index twice, breaks the template", function() {
-    var string = "{{arr.[0]}}, {{arr.[1]}}";
-    var data = { "arr": [1,2] };
+  it('GH-158: Using array index twice, breaks the template', function() {
+    var string = '{{arr.[0]}}, {{arr.[1]}}';
+    var data = { 'arr': [1, 2] };
 
-    shouldCompileTo(string, data, "1, 2", "it works as expected");
+    shouldCompileTo(string, data, '1, 2', 'it works as expected');
   });
 
   it("bug reported by @fat where lambdas weren't being properly resolved", function() {
@@ -39,12 +47,12 @@ describe('Regressions', function() {
         + '{{/hasThings}}';
     var data = {
       thing: function() {
-        return "blah";
+        return 'blah';
       },
       things: [
-        {className: "one", word: "@fat"},
-        {className: "two", word: "@dhg"},
-        {className: "three", word:"@sayrer"}
+        {className: 'one', word: '@fat'},
+        {className: 'two', word: '@dhg'},
+        {className: 'three', word: '@sayrer'}
       ],
       hasThings: function() {
         return true;
@@ -63,14 +71,14 @@ describe('Regressions', function() {
 
   it('GH-408: Multiple loops fail', function() {
     var context = [
-      { name: "John Doe", location: { city: "Chicago" } },
-      { name: "Jane Doe", location: { city: "New York"} }
+      { name: 'John Doe', location: { city: 'Chicago' } },
+      { name: 'Jane Doe', location: { city: 'New York'} }
     ];
 
     var template = CompilerContext.compile('{{#.}}{{name}}{{/.}}{{#.}}{{name}}{{/.}}{{#.}}{{name}}{{/.}}');
 
     var result = template(context);
-    equals(result, "John DoeJane DoeJohn DoeJane DoeJohn DoeJane Doe", 'It should output multiple times');
+    equals(result, 'John DoeJane DoeJohn DoeJane DoeJohn DoeJane Doe', 'It should output multiple times');
   });
 
   it('GS-428: Nested if else rendering', function() {
@@ -95,11 +103,13 @@ describe('Regressions', function() {
   });
 
   it('GH-534: Object prototype aliases', function() {
+    /* eslint-disable no-extend-native */
     Object.prototype[0xD834] = true;
 
     shouldCompileTo('{{foo}}', { foo: 'bar' }, 'bar');
 
     delete Object.prototype[0xD834];
+    /* eslint-enable no-extend-native */
   });
 
   it('GH-437: Matching escaping', function() {
@@ -111,23 +121,23 @@ describe('Regressions', function() {
     }, Error);
   });
 
-  it("GH-676: Using array in escaping mustache fails", function() {
-    var string = "{{arr}}";
-    var data = { "arr": [1,2] };
+  it('GH-676: Using array in escaping mustache fails', function() {
+    var string = '{{arr}}';
+    var data = { 'arr': [1, 2] };
 
-    shouldCompileTo(string, data, data.arr.toString(), "it works as expected");
+    shouldCompileTo(string, data, data.arr.toString(), 'it works as expected');
   });
 
-  it("Mustache man page", function() {
-    var string = "Hello {{name}}. You have just won ${{value}}!{{#in_ca}} Well, ${{taxed_value}}, after taxes.{{/in_ca}}";
+  it('Mustache man page', function() {
+    var string = 'Hello {{name}}. You have just won ${{value}}!{{#in_ca}} Well, ${{taxed_value}}, after taxes.{{/in_ca}}';
     var data = {
-      "name": "Chris",
-      "value": 10000,
-      "taxed_value": 10000 - (10000 * 0.4),
-      "in_ca": true
+      'name': 'Chris',
+      'value': 10000,
+      'taxed_value': 10000 - (10000 * 0.4),
+      'in_ca': true
     };
 
-    shouldCompileTo(string, data, "Hello Chris. You have just won $10000! Well, $6000, after taxes.", "the hello world mustache example works");
+    shouldCompileTo(string, data, 'Hello Chris. You have just won $10000! Well, $6000, after taxes.', 'the hello world mustache example works');
   });
 
   it('GH-731: zero context rendering', function() {
@@ -145,4 +155,69 @@ describe('Regressions', function() {
 
     shouldCompileTo('{{str bar.baz}}', [{}, helpers], 'undefined');
   });
+
+  it('GH-926: Depths and de-dupe', function() {
+    var context = {
+      name: 'foo',
+      data: [
+        1
+      ],
+      notData: [
+        1
+      ]
+    };
+
+    var template = CompilerContext.compile('{{#if dater}}{{#each data}}{{../name}}{{/each}}{{else}}{{#each notData}}{{../name}}{{/each}}{{/if}}');
+
+    var result = template(context);
+    equals(result, 'foo');
+  });
+
+  it('GH-1021: Each empty string key', function() {
+    var data = {
+      '': 'foo',
+      'name': 'Chris',
+      'value': 10000
+    };
+
+    shouldCompileTo('{{#each data}}Key: {{@key}}\n{{/each}}', {data: data}, 'Key: \nKey: name\nKey: value\n');
+  });
+
+  it('GH-1054: Should handle simple safe string responses', function() {
+    var root = '{{#wrap}}{{>partial}}{{/wrap}}';
+    var partials = {
+      partial: '{{#wrap}}<partial>{{/wrap}}'
+    };
+    var helpers = {
+      wrap: function(options) {
+        return new Handlebars.SafeString(options.fn());
+      }
+    };
+
+    shouldCompileToWithPartials(root, [{}, helpers, partials], true, '<partial>');
+  });
+
+  it('GH-1065: Sparse arrays', function() {
+    var array = [];
+    array[1] = 'foo';
+    array[3] = 'bar';
+    shouldCompileTo('{{#each array}}{{@index}}{{.}}{{/each}}', {array: array}, '1foo3bar');
+  });
+
+  it('should support multiple levels of inline partials', function() {
+    var string = '{{#> layout}}{{#*inline "subcontent"}}subcontent{{/inline}}{{/layout}}';
+    var partials = {
+      doctype: 'doctype{{> content}}',
+      layout: '{{#> doctype}}{{#*inline "content"}}layout{{> subcontent}}{{/inline}}{{/doctype}}'
+    };
+    shouldCompileToWithPartials(string, [{}, {}, partials], true, 'doctypelayoutsubcontent');
+  });
+  it('GH-1089: should support failover content in multiple levels of inline partials', function() {
+    var string = '{{#> layout}}{{/layout}}';
+    var partials = {
+      doctype: 'doctype{{> content}}',
+      layout: '{{#> doctype}}{{#*inline "content"}}layout{{#> subcontent}}subcontent{{/subcontent}}{{/inline}}{{/doctype}}'
+    };
+    shouldCompileToWithPartials(string, [{}, {}, partials], true, 'doctypelayoutsubcontent');
+  });
 });

spec/require.js

@@ -1,21 +1,21 @@
-if (typeof(require) !== 'undefined' && require.extensions[".handlebars"]) {
+if (typeof require !== 'undefined' && require.extensions['.handlebars']) {
   describe('Require', function() {
     it('Load .handlebars files with require()', function() {
-      var template = require("./artifacts/example_1");
-      equal(template, require("./artifacts/example_1.handlebars"));
+      var template = require('./artifacts/example_1');
+      equal(template, require('./artifacts/example_1.handlebars'));
 
       var expected = 'foo\n';
-      var result = template({foo: "foo"});
+      var result = template({foo: 'foo'});
 
       equal(result, expected);
     });
 
     it('Load .hbs files with require()', function() {
-      var template = require("./artifacts/example_2");
-      equal(template, require("./artifacts/example_2.hbs"));
+      var template = require('./artifacts/example_2');
+      equal(template, require('./artifacts/example_2.hbs'));
 
       var expected = 'Hello, World!\n';
-      var result = template({name: "World"});
+      var result = template({name: 'World'});
 
       equal(result, expected);
     });

spec/runtime.js

@@ -1,5 +1,3 @@
-/*globals Handlebars, shouldThrow */
-
 describe('runtime', function() {
   describe('#template', function() {
     it('should throw on invalid templates', function() {
@@ -16,19 +14,19 @@ describe('runtime', function() {
     it('should throw on version mismatch', function() {
       shouldThrow(function() {
         Handlebars.template({
-          main: true,
+          main: {},
           compiler: [Handlebars.COMPILER_REVISION + 1]
         });
       }, Error, /Template was precompiled with a newer version of Handlebars than the current runtime/);
       shouldThrow(function() {
         Handlebars.template({
-          main: true,
+          main: {},
           compiler: [Handlebars.COMPILER_REVISION - 1]
         });
       }, Error, /Template was precompiled with an older version of Handlebars than the current runtime/);
       shouldThrow(function() {
         Handlebars.template({
-          main: true
+          main: {}
         });
       }, Error, /Template was precompiled with an older version of Handlebars than the current runtime/);
     });
@@ -48,6 +46,16 @@ describe('runtime', function() {
         template._child(1);
       }, Error, 'must pass parent depths');
     });
+
+    it('should throw for block param methods without params', function() {
+      shouldThrow(function() {
+        var template = Handlebars.compile('{{#foo as |foo|}}{{foo}}{{/foo}}');
+        // Calling twice to hit the non-compiled case.
+        template._setup({});
+        template._setup({});
+        template._child(1);
+      }, Error, 'must pass block params');
+    });
     it('should expose child template', function() {
       var template = Handlebars.compile('{{#foo}}bar{{/foo}}');
         // Calling twice to hit the non-compiled case.
@@ -57,7 +65,25 @@ describe('runtime', function() {
     it('should render depthed content', function() {
       var template = Handlebars.compile('{{#foo}}{{../bar}}{{/foo}}');
         // Calling twice to hit the non-compiled case.
-      equal(template._child(1, undefined, [{bar: 'baz'}])(), 'baz');
+      equal(template._child(1, undefined, [], [{bar: 'baz'}])(), 'baz');
+    });
+  });
+
+  describe('#noConflict', function() {
+    if (!CompilerContext.browser) {
+      return;
+    }
+
+    it('should reset on no conflict', function() {
+      var reset = Handlebars;
+      Handlebars.noConflict();
+      equal(Handlebars, 'no-conflict');
+
+      Handlebars = 'really, none';
+      reset.noConflict();
+      equal(Handlebars, 'really, none');
+
+      Handlebars = reset;
     });
   });
 });

spec/source-map.js

@@ -0,0 +1,50 @@
+try {
+  if (typeof define !== 'function' || !define.amd) {
+    var SourceMap = require('source-map'),
+         SourceMapConsumer = SourceMap.SourceMapConsumer;
+  }
+} catch (err) {
+  /* NOP for in browser */
+}
+
+describe('source-map', function() {
+  if (!Handlebars.precompile || !SourceMap) {
+    return;
+  }
+
+  it('should safely include source map info', function() {
+    var template = Handlebars.precompile('{{hello}}', {destName: 'dest.js', srcName: 'src.hbs'});
+
+    equal(!!template.code, true);
+    equal(!!template.map, !CompilerContext.browser);
+  });
+  it('should map source properly', function() {
+    var templateSource = '  b{{hello}}  \n  {{bar}}a {{#block arg hash=(subex 1 subval)}}{{/block}}',
+        template = Handlebars.precompile(templateSource, {destName: 'dest.js', srcName: 'src.hbs'});
+
+    if (template.map) {
+      var consumer = new SourceMapConsumer(template.map),
+          lines = template.code.split('\n'),
+          srcLines = templateSource.split('\n'),
+
+          generated = grepLine('"  b"', lines),
+          source = grepLine('  b', srcLines);
+
+      var mapped = consumer.originalPositionFor(generated);
+      equal(mapped.line, source.line);
+      equal(mapped.column, source.column);
+    }
+  });
+});
+
+function grepLine(token, lines) {
+  for (var i = 0; i < lines.length; i++) {
+    var column = lines[i].indexOf(token);
+    if (column >= 0) {
+      return {
+        line: i + 1,
+        column: column
+      };
+    }
+  }
+}

spec/spec.js

@@ -5,12 +5,11 @@ describe('spec', function() {
   }
 
   var _ = require('underscore'),
-      Handlebars = require('../lib'),
       fs = require('fs');
 
-  var specDir =__dirname + '/mustache/specs/';
+  var specDir = __dirname + '/mustache/specs/';
   var specs = _.filter(fs.readdirSync(specDir), function(name) {
-    return /.*\.json$/.test(name);
+    return (/.*\.json$/).test(name);
   });
 
   _.each(specs, function(name) {
@@ -26,8 +25,8 @@ describe('spec', function() {
           // We nest the entire response from partials, not just the literals
           || (name === 'partials.json' && test.name === 'Standalone Indentation')
 
-          || /\{\{\=/.test(test.template)
-          || _.any(test.partials, function(partial) { return /\{\{\=/.test(partial); })) {
+          || (/\{\{\=/).test(test.template)
+          || _.any(test.partials, function(partial) { return (/\{\{\=/).test(partial); })) {
         it.skip(name + ' - ' + test.name);
         return;
       }
@@ -35,7 +34,9 @@ describe('spec', function() {
       var data = _.clone(test.data);
       if (data.lambda) {
         // Blergh
+        /* eslint-disable no-eval */
         data.lambda = eval('(' + data.lambda.js + ')');
+        /* eslint-enable no-eval */
       }
       it(name + ' - ' + test.name, function() {
         if (test.partials) {

spec/strict.js

@@ -0,0 +1,140 @@
+var Exception = Handlebars.Exception;
+
+describe('strict', function() {
+  describe('strict mode', function() {
+    it('should error on missing property lookup', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello}}', {strict: true});
+
+        template({});
+      }, Exception, /"hello" not defined in/);
+    });
+    it('should error on missing child', function() {
+      var template = CompilerContext.compile('{{hello.bar}}', {strict: true});
+      equals(template({hello: {bar: 'foo'}}), 'foo');
+
+      shouldThrow(function() {
+        template({hello: {}});
+      }, Exception, /"bar" not defined in/);
+    });
+    it('should handle explicit undefined', function() {
+      var template = CompilerContext.compile('{{hello.bar}}', {strict: true});
+
+      equals(template({hello: {bar: undefined}}), '');
+    });
+    it('should error on missing property lookup in known helpers mode', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello}}', {strict: true, knownHelpersOnly: true});
+
+        template({});
+      }, Exception, /"hello" not defined in/);
+    });
+    it('should error on missing context', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello}}', {strict: true});
+
+        template();
+      }, Error);
+    });
+
+    it('should error on missing data lookup', function() {
+      var template = CompilerContext.compile('{{@hello}}', {strict: true});
+      equals(template(undefined, {data: {hello: 'foo'}}), 'foo');
+
+      shouldThrow(function() {
+        template();
+      }, Error);
+    });
+
+    it('should not run helperMissing for helper calls', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello foo}}', {strict: true});
+
+        template({foo: true});
+      }, Exception, /"hello" not defined in/);
+
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{#hello foo}}{{/hello}}', {strict: true});
+
+        template({foo: true});
+      }, Exception, /"hello" not defined in/);
+    });
+    it('should throw on ambiguous blocks', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{#hello}}{{/hello}}', {strict: true});
+
+        template({});
+      }, Exception, /"hello" not defined in/);
+
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{^hello}}{{/hello}}', {strict: true});
+
+        template({});
+      }, Exception, /"hello" not defined in/);
+
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{#hello.bar}}{{/hello.bar}}', {strict: true});
+
+        template({hello: {}});
+      }, Exception, /"bar" not defined in/);
+    });
+
+    it('should allow undefined parameters when passed to helpers', function() {
+      var template = CompilerContext.compile('{{#unless foo}}success{{/unless}}', {strict: true});
+      equals(template({}), 'success');
+    });
+
+    it('should allow undefined hash when passed to helpers', function() {
+      var template = CompilerContext.compile('{{helper value=@foo}}', {strict: true});
+      var helpers = {
+        helper: function(options) {
+          equals('value' in options.hash, true);
+          equals(options.hash.value, undefined);
+          return 'success';
+        }
+      };
+      equals(template({}, {helpers: helpers}), 'success');
+    });
+  });
+
+  describe('assume objects', function() {
+    it('should ignore missing property', function() {
+      var template = CompilerContext.compile('{{hello}}', {assumeObjects: true});
+
+      equal(template({}), '');
+    });
+    it('should ignore missing child', function() {
+      var template = CompilerContext.compile('{{hello.bar}}', {assumeObjects: true});
+
+      equal(template({hello: {}}), '');
+    });
+    it('should error on missing object', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello.bar}}', {assumeObjects: true});
+
+        template({});
+      }, Error);
+    });
+    it('should error on missing context', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{hello}}', {assumeObjects: true});
+
+        template();
+      }, Error);
+    });
+
+    it('should error on missing data lookup', function() {
+      shouldThrow(function() {
+        var template = CompilerContext.compile('{{@hello.bar}}', {assumeObjects: true});
+
+        template();
+      }, Error);
+    });
+
+    it('should execute blockHelperMissing', function() {
+      var template = CompilerContext.compile('{{^hello}}foo{{/hello}}', {assumeObjects: true});
+
+      equals(template({}), 'foo');
+    });
+  });
+});

spec/string-params.js

@@ -1,43 +1,43 @@
 describe('string params mode', function() {
-  it("arguments to helpers can be retrieved from options hash in string form", function() {
+  it('arguments to helpers can be retrieved from options hash in string form', function() {
     var template = CompilerContext.compile('{{wycats is.a slave.driver}}', {stringParams: true});
 
     var helpers = {
       wycats: function(passiveVoice, noun) {
-        return "HELP ME MY BOSS " + passiveVoice + ' ' + noun;
+        return 'HELP ME MY BOSS ' + passiveVoice + ' ' + noun;
       }
     };
 
     var result = template({}, {helpers: helpers});
 
-    equals(result, "HELP ME MY BOSS is.a slave.driver", "String parameters output");
+    equals(result, 'HELP ME MY BOSS is.a slave.driver', 'String parameters output');
   });
 
-  it("when using block form, arguments to helpers can be retrieved from options hash in string form", function() {
+  it('when using block form, arguments to helpers can be retrieved from options hash in string form', function() {
     var template = CompilerContext.compile('{{#wycats is.a slave.driver}}help :({{/wycats}}', {stringParams: true});
 
     var helpers = {
       wycats: function(passiveVoice, noun, options) {
-        return "HELP ME MY BOSS " + passiveVoice + ' ' +
+        return 'HELP ME MY BOSS ' + passiveVoice + ' ' +
                 noun + ': ' + options.fn(this);
       }
     };
 
     var result = template({}, {helpers: helpers});
 
-    equals(result, "HELP ME MY BOSS is.a slave.driver: help :(", "String parameters output");
+    equals(result, 'HELP ME MY BOSS is.a slave.driver: help :(', 'String parameters output');
   });
 
-  it("when inside a block in String mode, .. passes the appropriate context in the options hash", function() {
+  it('when inside a block in String mode, .. passes the appropriate context in the options hash', function() {
     var template = CompilerContext.compile('{{#with dale}}{{tomdale ../need dad.joke}}{{/with}}', {stringParams: true});
 
     var helpers = {
       tomdale: function(desire, noun, options) {
-        return "STOP ME FROM READING HACKER NEWS I " +
-                options.contexts[0][desire] + " " + noun;
+        return 'STOP ME FROM READING HACKER NEWS I ' +
+                options.contexts[0][desire] + ' ' + noun;
       },
 
-      "with": function(context, options) {
+      'with': function(context, options) {
         return options.fn(options.contexts[0][context]);
       }
     };
@@ -48,88 +48,88 @@ describe('string params mode', function() {
       need: 'need-a'
     }, {helpers: helpers});
 
-    equals(result, "STOP ME FROM READING HACKER NEWS I need-a dad.joke", "Proper context variable output");
+    equals(result, 'STOP ME FROM READING HACKER NEWS I need-a dad.joke', 'Proper context variable output');
   });
 
-  it("information about the types is passed along", function() {
-    var template = CompilerContext.compile('{{tomdale "need" dad.joke true false}}', { stringParams: true });
+  it('information about the types is passed along', function() {
+    var template = CompilerContext.compile("{{tomdale 'need' dad.joke true false}}", { stringParams: true });
 
     var helpers = {
       tomdale: function(desire, noun, trueBool, falseBool, options) {
-        equal(options.types[0], 'STRING', "the string type is passed");
-        equal(options.types[1], 'ID', "the expression type is passed");
-        equal(options.types[2], 'BOOLEAN', "the expression type is passed");
-        equal(desire, "need", "the string form is passed for strings");
-        equal(noun, "dad.joke", "the string form is passed for expressions");
-        equal(trueBool, true, "raw booleans are passed through");
-        equal(falseBool, false, "raw booleans are passed through");
-        return "Helper called";
+        equal(options.types[0], 'StringLiteral', 'the string type is passed');
+        equal(options.types[1], 'PathExpression', 'the expression type is passed');
+        equal(options.types[2], 'BooleanLiteral', 'the expression type is passed');
+        equal(desire, 'need', 'the string form is passed for strings');
+        equal(noun, 'dad.joke', 'the string form is passed for expressions');
+        equal(trueBool, true, 'raw booleans are passed through');
+        equal(falseBool, false, 'raw booleans are passed through');
+        return 'Helper called';
       }
     };
 
     var result = template({}, { helpers: helpers });
-    equal(result, "Helper called");
+    equal(result, 'Helper called');
   });
 
-  it("hash parameters get type information", function() {
-    var template = CompilerContext.compile('{{tomdale he.says desire="need" noun=dad.joke bool=true}}', { stringParams: true });
+  it('hash parameters get type information', function() {
+    var template = CompilerContext.compile("{{tomdale he.says desire='need' noun=dad.joke bool=true}}", { stringParams: true });
 
     var helpers = {
       tomdale: function(exclamation, options) {
-        equal(exclamation, "he.says");
-        equal(options.types[0], "ID");
+        equal(exclamation, 'he.says');
+        equal(options.types[0], 'PathExpression');
 
-        equal(options.hashTypes.desire, "STRING");
-        equal(options.hashTypes.noun, "ID");
-        equal(options.hashTypes.bool, "BOOLEAN");
-        equal(options.hash.desire, "need");
-        equal(options.hash.noun, "dad.joke");
+        equal(options.hashTypes.desire, 'StringLiteral');
+        equal(options.hashTypes.noun, 'PathExpression');
+        equal(options.hashTypes.bool, 'BooleanLiteral');
+        equal(options.hash.desire, 'need');
+        equal(options.hash.noun, 'dad.joke');
         equal(options.hash.bool, true);
-        return "Helper called";
+        return 'Helper called';
       }
     };
 
     var result = template({}, { helpers: helpers });
-    equal(result, "Helper called");
+    equal(result, 'Helper called');
   });
 
-  it("hash parameters get context information", function() {
-    var template = CompilerContext.compile('{{#with dale}}{{tomdale he.says desire="need" noun=../dad/joke bool=true}}{{/with}}', { stringParams: true });
+  it('hash parameters get context information', function() {
+    var template = CompilerContext.compile("{{#with dale}}{{tomdale he.says desire='need' noun=../dad/joke bool=true}}{{/with}}", { stringParams: true });
 
     var context = {dale: {}};
 
     var helpers = {
       tomdale: function(exclamation, options) {
-        equal(exclamation, "he.says");
-        equal(options.types[0], "ID");
+        equal(exclamation, 'he.says');
+        equal(options.types[0], 'PathExpression');
 
         equal(options.contexts.length, 1);
         equal(options.hashContexts.noun, context);
-        equal(options.hash.desire, "need");
-        equal(options.hash.noun, "dad.joke");
+        equal(options.hash.desire, 'need');
+        equal(options.hash.noun, 'dad.joke');
         equal(options.hash.bool, true);
-        return "Helper called";
+        return 'Helper called';
       },
-      "with": function(context, options) {
-        return options.fn(options.contexts[0][context]);
+      'with': function(withContext, options) {
+        return options.fn(options.contexts[0][withContext]);
       }
     };
 
     var result = template(context, { helpers: helpers });
-    equal(result, "Helper called");
+    equal(result, 'Helper called');
   });
 
-  it("when inside a block in String mode, .. passes the appropriate context in the options hash to a block helper", function() {
+  it('when inside a block in String mode, .. passes the appropriate context in the options hash to a block helper', function() {
     var template = CompilerContext.compile('{{#with dale}}{{#tomdale ../need dad.joke}}wot{{/tomdale}}{{/with}}', {stringParams: true});
 
     var helpers = {
       tomdale: function(desire, noun, options) {
-        return "STOP ME FROM READING HACKER NEWS I " +
-                options.contexts[0][desire] + " " + noun + " " +
+        return 'STOP ME FROM READING HACKER NEWS I ' +
+                options.contexts[0][desire] + ' ' + noun + ' ' +
                 options.fn(this);
       },
 
-      "with": function(context, options) {
+      'with': function(context, options) {
         return options.fn(options.contexts[0][context]);
       }
     };
@@ -140,23 +140,23 @@ describe('string params mode', function() {
       need: 'need-a'
     }, {helpers: helpers});
 
-    equals(result, "STOP ME FROM READING HACKER NEWS I need-a dad.joke wot", "Proper context variable output");
+    equals(result, 'STOP ME FROM READING HACKER NEWS I need-a dad.joke wot', 'Proper context variable output');
   });
 
-  it("with nested block ambiguous", function() {
+  it('with nested block ambiguous', function() {
     var template = CompilerContext.compile('{{#with content}}{{#view}}{{firstName}} {{lastName}}{{/view}}{{/with}}', {stringParams: true});
 
-    var helpers  = {
-      'with': function(options) {
-        return "WITH";
+    var helpers = {
+      'with': function() {
+        return 'WITH';
       },
       view: function() {
-        return "VIEW";
+        return 'VIEW';
       }
     };
 
     var result = template({}, {helpers: helpers});
-    equals(result, "WITH");
+    equals(result, 'WITH');
   });
 
   it('should handle DATA', function() {
@@ -164,8 +164,8 @@ describe('string params mode', function() {
 
     var helpers = {
       foo: function(bar, options) {
-        equal(bar, 'bar');
-        equal(options.types[0], 'DATA');
+        equal(bar, '@bar');
+        equal(options.types[0], 'PathExpression');
         return 'Foo!';
       }
     };

spec/subexpressions.js

@@ -1,183 +1,182 @@
-/*global CompilerContext, shouldCompileTo */
 describe('subexpressions', function() {
-  it("arg-less helper", function() {
-    var string   = "{{foo (bar)}}!";
-    var context  = {};
-    var helpers  = {
+  it('arg-less helper', function() {
+    var string = '{{foo (bar)}}!';
+    var context = {};
+    var helpers = {
       foo: function(val) {
-        return val+val;
+        return val + val;
       },
       bar: function() {
-        return "LOL";
+        return 'LOL';
       }
     };
-    shouldCompileTo(string, [context, helpers], "LOLLOL!");
+    shouldCompileTo(string, [context, helpers], 'LOLLOL!');
   });
 
-  it("helper w args", function() {
-    var string   = '{{blog (equal a b)}}';
+  it('helper w args', function() {
+    var string = '{{blog (equal a b)}}';
 
-    var context  = { bar: "LOL" };
-    var helpers  = {
+    var context = { bar: 'LOL' };
+    var helpers = {
       blog: function(val) {
-        return "val is " + val;
+        return 'val is ' + val;
       },
       equal: function(x, y) {
         return x === y;
       }
     };
-    shouldCompileTo(string, [context, helpers], "val is true");
+    shouldCompileTo(string, [context, helpers], 'val is true');
   });
 
-  it("mixed paths and helpers", function() {
-    var string   = '{{blog baz.bat (equal a b) baz.bar}}';
+  it('mixed paths and helpers', function() {
+    var string = '{{blog baz.bat (equal a b) baz.bar}}';
 
-    var context  = { bar: "LOL", baz: {bat: 'foo!', bar: 'bar!'} };
-    var helpers  = {
+    var context = { bar: 'LOL', baz: {bat: 'foo!', bar: 'bar!'} };
+    var helpers = {
       blog: function(val, that, theOther) {
-        return "val is " + val + ', ' + that + ' and ' + theOther;
+        return 'val is ' + val + ', ' + that + ' and ' + theOther;
       },
       equal: function(x, y) {
         return x === y;
       }
     };
-    shouldCompileTo(string, [context, helpers], "val is foo!, true and bar!");
+    shouldCompileTo(string, [context, helpers], 'val is foo!, true and bar!');
   });
 
-  it("supports much nesting", function() {
-    var string   = '{{blog (equal (equal true true) true)}}';
+  it('supports much nesting', function() {
+    var string = '{{blog (equal (equal true true) true)}}';
 
-    var context  = { bar: "LOL" };
-    var helpers  = {
+    var context = { bar: 'LOL' };
+    var helpers = {
       blog: function(val) {
-        return "val is " + val;
+        return 'val is ' + val;
       },
       equal: function(x, y) {
         return x === y;
       }
     };
-    shouldCompileTo(string, [context, helpers], "val is true");
+    shouldCompileTo(string, [context, helpers], 'val is true');
   });
 
   it('GH-800 : Complex subexpressions', function() {
-    var context  = {a: 'a', b:'b', c:{c:'c'}, d:'d', e: {e: 'e'}};
-    var helpers  = {
+    var context = {a: 'a', b: 'b', c: {c: 'c'}, d: 'd', e: {e: 'e'}};
+    var helpers = {
       dash: function(a, b) {
-        return a + "-" + b;
+        return a + '-' + b;
       },
       concat: function(a, b) {
         return a + b;
       }
     };
 
-    shouldCompileTo('{{dash "abc" (concat a b)}}', [context, helpers], 'abc-ab');
+    shouldCompileTo("{{dash 'abc' (concat a b)}}", [context, helpers], 'abc-ab');
     shouldCompileTo('{{dash d (concat a b)}}', [context, helpers], 'd-ab');
     shouldCompileTo('{{dash c.c (concat a b)}}', [context, helpers], 'c-ab');
     shouldCompileTo('{{dash (concat a b) c.c}}', [context, helpers], 'ab-c');
     shouldCompileTo('{{dash (concat a e.e) c.c}}', [context, helpers], 'ae-c');
   });
 
-  it("provides each nested helper invocation its own options hash", function() {
+  it('provides each nested helper invocation its own options hash', function() {
     var string = '{{equal (equal true true) true}}';
 
     var lastOptions = null;
-    var helpers  = {
+    var helpers = {
       equal: function(x, y, options) {
         if (!options || options === lastOptions) {
-          throw new Error("options hash was reused");
+          throw new Error('options hash was reused');
         }
         lastOptions = options;
         return x === y;
       }
     };
-    shouldCompileTo(string, [{}, helpers], "true");
+    shouldCompileTo(string, [{}, helpers], 'true');
   });
 
-  it("with hashes", function() {
-    var string   = '{{blog (equal (equal true true) true fun="yes")}}';
+  it('with hashes', function() {
+    var string = "{{blog (equal (equal true true) true fun='yes')}}";
 
-    var context  = { bar: "LOL" };
-    var helpers  = {
+    var context = { bar: 'LOL' };
+    var helpers = {
       blog: function(val) {
-        return "val is " + val;
+        return 'val is ' + val;
       },
       equal: function(x, y) {
         return x === y;
       }
     };
-    shouldCompileTo(string, [context, helpers], "val is true");
+    shouldCompileTo(string, [context, helpers], 'val is true');
   });
 
-  it("as hashes", function() {
-    var string   = '{{blog fun=(equal (blog fun=1) "val is 1")}}';
+  it('as hashes', function() {
+    var string = "{{blog fun=(equal (blog fun=1) 'val is 1')}}";
 
-    var helpers  = {
+    var helpers = {
       blog: function(options) {
-        return "val is " + options.hash.fun;
+        return 'val is ' + options.hash.fun;
       },
       equal: function(x, y) {
         return x === y;
       }
     };
-    shouldCompileTo(string, [{}, helpers], "val is true");
+    shouldCompileTo(string, [{}, helpers], 'val is true');
   });
 
-  it("multiple subexpressions in a hash", function() {
+  it('multiple subexpressions in a hash', function() {
     var string = '{{input aria-label=(t "Name") placeholder=(t "Example User")}}';
 
     var helpers = {
       input: function(options) {
-        var hash        = options.hash;
-        var ariaLabel   = Handlebars.Utils.escapeExpression(hash['aria-label']);
+        var hash = options.hash;
+        var ariaLabel = Handlebars.Utils.escapeExpression(hash['aria-label']);
         var placeholder = Handlebars.Utils.escapeExpression(hash.placeholder);
         return new Handlebars.SafeString('<input aria-label="' + ariaLabel + '" placeholder="' + placeholder + '" />');
       },
       t: function(defaultString) {
         return new Handlebars.SafeString(defaultString);
       }
-    }
+    };
     shouldCompileTo(string, [{}, helpers], '<input aria-label="Name" placeholder="Example User" />');
   });
 
-  it("multiple subexpressions in a hash with context", function() {
+  it('multiple subexpressions in a hash with context', function() {
     var string = '{{input aria-label=(t item.field) placeholder=(t item.placeholder)}}';
 
     var context = {
       item: {
-        field: "Name",
-        placeholder: "Example User"
-      } 
+        field: 'Name',
+        placeholder: 'Example User'
+      }
     };
 
     var helpers = {
       input: function(options) {
-        var hash        = options.hash;
-        var ariaLabel   = Handlebars.Utils.escapeExpression(hash['aria-label']);
+        var hash = options.hash;
+        var ariaLabel = Handlebars.Utils.escapeExpression(hash['aria-label']);
         var placeholder = Handlebars.Utils.escapeExpression(hash.placeholder);
         return new Handlebars.SafeString('<input aria-label="' + ariaLabel + '" placeholder="' + placeholder + '" />');
       },
       t: function(defaultString) {
         return new Handlebars.SafeString(defaultString);
       }
-    }
+    };
     shouldCompileTo(string, [context, helpers], '<input aria-label="Name" placeholder="Example User" />');
-  });  
+  });
 
-  it("in string params mode,", function() {
+  it('in string params mode,', function() {
     var template = CompilerContext.compile('{{snog (blorg foo x=y) yeah a=b}}', {stringParams: true});
 
     var helpers = {
       snog: function(a, b, options) {
         equals(a, 'foo');
-        equals(options.types.length, 2, "string params for outer helper processed correctly");
-        equals(options.types[0], 'sexpr', "string params for outer helper processed correctly");
-        equals(options.types[1], 'ID', "string params for outer helper processed correctly");
+        equals(options.types.length, 2, 'string params for outer helper processed correctly');
+        equals(options.types[0], 'SubExpression', 'string params for outer helper processed correctly');
+        equals(options.types[1], 'PathExpression', 'string params for outer helper processed correctly');
         return a + b;
       },
 
       blorg: function(a, options) {
-        equals(options.types.length, 1, "string params for inner helper processed correctly");
-        equals(options.types[0], 'ID', "string params for inner helper processed correctly");
+        equals(options.types.length, 1, 'string params for inner helper processed correctly');
+        equals(options.types[0], 'PathExpression', 'string params for inner helper processed correctly');
         return a;
       }
     };
@@ -187,54 +186,53 @@ describe('subexpressions', function() {
       yeah: {}
     }, {helpers: helpers});
 
-    equals(result, "fooyeah");
+    equals(result, 'fooyeah');
   });
 
-  it("as hashes in string params mode", function() {
-
+  it('as hashes in string params mode', function() {
     var template = CompilerContext.compile('{{blog fun=(bork)}}', {stringParams: true});
 
-    var helpers  = {
+    var helpers = {
       blog: function(options) {
-        equals(options.hashTypes.fun, 'sexpr');
-        return "val is " + options.hash.fun;
+        equals(options.hashTypes.fun, 'SubExpression');
+        return 'val is ' + options.hash.fun;
       },
       bork: function() {
-        return "BORK";
+        return 'BORK';
       }
     };
 
     var result = template({}, {helpers: helpers});
-    equals(result, "val is BORK");
+    equals(result, 'val is BORK');
   });
 
-  it("subexpression functions on the context", function() {
-    var string   = "{{foo (bar)}}!";
-    var context  = {
+  it('subexpression functions on the context', function() {
+    var string = '{{foo (bar)}}!';
+    var context = {
       bar: function() {
-        return "LOL";
+        return 'LOL';
       }
     };
-    var helpers  = {
+    var helpers = {
       foo: function(val) {
-        return val+val;
+        return val + val;
       }
     };
-    shouldCompileTo(string, [context, helpers], "LOLLOL!");
+    shouldCompileTo(string, [context, helpers], 'LOLLOL!');
   });
 
   it("subexpressions can't just be property lookups", function() {
-    var string   = "{{foo (bar)}}!";
-    var context  = {
-      bar: "LOL"
+    var string = '{{foo (bar)}}!';
+    var context = {
+      bar: 'LOL'
     };
-    var helpers  = {
+    var helpers = {
       foo: function(val) {
-        return val+val;
+        return val + val;
       }
     };
     shouldThrow(function() {
-      shouldCompileTo(string, [context, helpers], "LOLLOL!");
+      shouldCompileTo(string, [context, helpers], 'LOLLOL!');
     });
   });
 });

spec/tokenizer.js

@@ -21,7 +21,7 @@ describe('Tokenizer', function() {
     var out = [],
         token;
 
-    while (token = lexer.lex()) {
+    while ((token = lexer.lex())) {
       var result = parser.terminals_[token] || token;
       if (!result || result === 'EOF' || result === 'INVALID') {
         break;
@@ -33,370 +33,407 @@ describe('Tokenizer', function() {
   }
 
   it('tokenizes a simple mustache as "OPEN ID CLOSE"', function() {
-    var result = tokenize("{{foo}}");
+    var result = tokenize('{{foo}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'foo');
   });
 
   it('supports unescaping with &', function() {
-    var result = tokenize("{{&bar}}");
+    var result = tokenize('{{&bar}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[0], "OPEN", "{{&");
-    shouldBeToken(result[1], "ID", "bar");
+    shouldBeToken(result[0], 'OPEN', '{{&');
+    shouldBeToken(result[1], 'ID', 'bar');
   });
 
   it('supports unescaping with {{{', function() {
-    var result = tokenize("{{{bar}}}");
+    var result = tokenize('{{{bar}}}');
     shouldMatchTokens(result, ['OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED']);
 
-    shouldBeToken(result[1], "ID", "bar");
+    shouldBeToken(result[1], 'ID', 'bar');
   });
 
   it('supports escaping delimiters', function() {
-    var result = tokenize("{{foo}} \\{{bar}} {{baz}}");
+    var result = tokenize('{{foo}} \\{{bar}} {{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[3], "CONTENT", " ");
-    shouldBeToken(result[4], "CONTENT", "{{bar}} ");
+    shouldBeToken(result[3], 'CONTENT', ' ');
+    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
   });
 
   it('supports escaping multiple delimiters', function() {
-    var result = tokenize("{{foo}} \\{{bar}} \\{{baz}}");
+    var result = tokenize('{{foo}} \\{{bar}} \\{{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']);
 
-    shouldBeToken(result[3], "CONTENT", " ");
-    shouldBeToken(result[4], "CONTENT", "{{bar}} ");
-    shouldBeToken(result[5], "CONTENT", "{{baz}}");
+    shouldBeToken(result[3], 'CONTENT', ' ');
+    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
+    shouldBeToken(result[5], 'CONTENT', '{{baz}}');
   });
 
   it('supports escaping a triple stash', function() {
-    var result = tokenize("{{foo}} \\{{{bar}}} {{baz}}");
+    var result = tokenize('{{foo}} \\{{{bar}}} {{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[4], "CONTENT", "{{{bar}}} ");
+    shouldBeToken(result[4], 'CONTENT', '{{{bar}}} ');
   });
 
   it('supports escaping escape character', function() {
-    var result = tokenize("{{foo}} \\\\{{bar}} {{baz}}");
+    var result = tokenize('{{foo}} \\\\{{bar}} {{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[3], "CONTENT", " \\");
-    shouldBeToken(result[5], "ID", "bar");
+    shouldBeToken(result[3], 'CONTENT', ' \\');
+    shouldBeToken(result[5], 'ID', 'bar');
   });
 
   it('supports escaping multiple escape characters', function() {
-    var result = tokenize("{{foo}} \\\\{{bar}} \\\\{{baz}}");
+    var result = tokenize('{{foo}} \\\\{{bar}} \\\\{{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[3], "CONTENT", " \\");
-    shouldBeToken(result[5], "ID", "bar");
-    shouldBeToken(result[7], "CONTENT", " \\");
-    shouldBeToken(result[9], "ID", "baz");
+    shouldBeToken(result[3], 'CONTENT', ' \\');
+    shouldBeToken(result[5], 'ID', 'bar');
+    shouldBeToken(result[7], 'CONTENT', ' \\');
+    shouldBeToken(result[9], 'ID', 'baz');
   });
 
   it('supports escaped mustaches after escaped escape characters', function() {
-    var result = tokenize("{{foo}} \\\\{{bar}} \\{{baz}}");
+    var result = tokenize('{{foo}} \\\\{{bar}} \\{{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']);
 
-    shouldBeToken(result[3], "CONTENT", " \\");
-    shouldBeToken(result[4], "OPEN", "{{");
-    shouldBeToken(result[5], "ID", "bar");
-    shouldBeToken(result[7], "CONTENT", " ");
-    shouldBeToken(result[8], "CONTENT", "{{baz}}");
+    shouldBeToken(result[3], 'CONTENT', ' \\');
+    shouldBeToken(result[4], 'OPEN', '{{');
+    shouldBeToken(result[5], 'ID', 'bar');
+    shouldBeToken(result[7], 'CONTENT', ' ');
+    shouldBeToken(result[8], 'CONTENT', '{{baz}}');
   });
 
   it('supports escaped escape characters after escaped mustaches', function() {
-    var result = tokenize("{{foo}} \\{{bar}} \\\\{{baz}}");
+    var result = tokenize('{{foo}} \\{{bar}} \\\\{{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[4], "CONTENT", "{{bar}} ");
-    shouldBeToken(result[5], "CONTENT", "\\");
-    shouldBeToken(result[6], "OPEN", "{{");
-    shouldBeToken(result[7], "ID", "baz");
+    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
+    shouldBeToken(result[5], 'CONTENT', '\\');
+    shouldBeToken(result[6], 'OPEN', '{{');
+    shouldBeToken(result[7], 'ID', 'baz');
   });
 
   it('supports escaped escape character on a triple stash', function() {
-    var result = tokenize("{{foo}} \\\\{{{bar}}} {{baz}}");
+    var result = tokenize('{{foo}} \\\\{{{bar}}} {{baz}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
 
-    shouldBeToken(result[3], "CONTENT", " \\");
-    shouldBeToken(result[5], "ID", "bar");
+    shouldBeToken(result[3], 'CONTENT', ' \\');
+    shouldBeToken(result[5], 'ID', 'bar');
   });
 
   it('tokenizes a simple path', function() {
-    var result = tokenize("{{foo/bar}}");
+    var result = tokenize('{{foo/bar}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
   });
 
   it('allows dot notation', function() {
-    var result = tokenize("{{foo.bar}}");
+    var result = tokenize('{{foo.bar}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
 
-    shouldMatchTokens(tokenize("{{foo.bar.baz}}"), ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
+    shouldMatchTokens(tokenize('{{foo.bar.baz}}'), ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
   });
 
   it('allows path literals with []', function() {
-    var result = tokenize("{{foo.[bar]}}");
+    var result = tokenize('{{foo.[bar]}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
   });
 
   it('allows multiple path literals on a line with []', function() {
-    var result = tokenize("{{foo.[bar]}}{{foo.[baz]}}");
+    var result = tokenize('{{foo.[bar]}}{{foo.[baz]}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE', 'OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
   });
 
   it('tokenizes {{.}} as OPEN ID CLOSE', function() {
-    var result = tokenize("{{.}}");
+    var result = tokenize('{{.}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
   });
 
   it('tokenizes a path as "OPEN (ID SEP)* ID CLOSE"', function() {
-    var result = tokenize("{{../foo/bar}}");
+    var result = tokenize('{{../foo/bar}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "..");
+    shouldBeToken(result[1], 'ID', '..');
   });
 
   it('tokenizes a path with .. as a parent path', function() {
-    var result = tokenize("{{../foo.bar}}");
+    var result = tokenize('{{../foo.bar}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "..");
+    shouldBeToken(result[1], 'ID', '..');
   });
 
   it('tokenizes a path with this/foo as OPEN ID SEP ID CLOSE', function() {
-    var result = tokenize("{{this/foo}}");
+    var result = tokenize('{{this/foo}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "this");
-    shouldBeToken(result[3], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'this');
+    shouldBeToken(result[3], 'ID', 'foo');
   });
 
   it('tokenizes a simple mustache with spaces as "OPEN ID CLOSE"', function() {
-    var result = tokenize("{{  foo  }}");
+    var result = tokenize('{{  foo  }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'foo');
   });
 
   it('tokenizes a simple mustache with line breaks as "OPEN ID ID CLOSE"', function() {
-    var result = tokenize("{{  foo  \n   bar }}");
+    var result = tokenize('{{  foo  \n   bar }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'foo');
   });
 
   it('tokenizes raw content as "CONTENT"', function() {
-    var result = tokenize("foo {{ bar }} baz");
+    var result = tokenize('foo {{ bar }} baz');
     shouldMatchTokens(result, ['CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT']);
-    shouldBeToken(result[0], "CONTENT", "foo ");
-    shouldBeToken(result[4], "CONTENT", " baz");
+    shouldBeToken(result[0], 'CONTENT', 'foo ');
+    shouldBeToken(result[4], 'CONTENT', ' baz');
   });
 
   it('tokenizes a partial as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize("{{> foo}}");
+    var result = tokenize('{{> foo}}');
     shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
   });
 
   it('tokenizes a partial with context as "OPEN_PARTIAL ID ID CLOSE"', function() {
-    var result = tokenize("{{> foo bar }}");
+    var result = tokenize('{{> foo bar }}');
     shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'ID', 'CLOSE']);
   });
 
   it('tokenizes a partial without spaces as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize("{{>foo}}");
+    var result = tokenize('{{>foo}}');
     shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
   });
 
   it('tokenizes a partial space at the }); as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize("{{>foo  }}");
+    var result = tokenize('{{>foo  }}');
     shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
   });
 
   it('tokenizes a partial space at the }); as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize("{{>foo/bar.baz  }}");
+    var result = tokenize('{{>foo/bar.baz  }}');
     shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
   });
 
+  it('tokenizes partial block declarations', function() {
+    var result = tokenize('{{#> foo}}');
+    shouldMatchTokens(result, ['OPEN_PARTIAL_BLOCK', 'ID', 'CLOSE']);
+  });
   it('tokenizes a comment as "COMMENT"', function() {
-    var result = tokenize("foo {{! this is a comment }} bar {{ baz }}");
+    var result = tokenize('foo {{! this is a comment }} bar {{ baz }}');
     shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "COMMENT", " this is a comment ");
+    shouldBeToken(result[1], 'COMMENT', '{{! this is a comment }}');
   });
 
   it('tokenizes a block comment as "COMMENT"', function() {
-    var result = tokenize("foo {{!-- this is a {{comment}} --}} bar {{ baz }}");
+    var result = tokenize('foo {{!-- this is a {{comment}} --}} bar {{ baz }}');
     shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "COMMENT", " this is a {{comment}} ");
+    shouldBeToken(result[1], 'COMMENT', '{{!-- this is a {{comment}} --}}');
   });
 
   it('tokenizes a block comment with whitespace as "COMMENT"', function() {
-    var result = tokenize("foo {{!-- this is a\n{{comment}}\n--}} bar {{ baz }}");
+    var result = tokenize('foo {{!-- this is a\n{{comment}}\n--}} bar {{ baz }}');
     shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "COMMENT", " this is a\n{{comment}}\n");
+    shouldBeToken(result[1], 'COMMENT', '{{!-- this is a\n{{comment}}\n--}}');
   });
 
   it('tokenizes open and closing blocks as OPEN_BLOCK, ID, CLOSE ..., OPEN_ENDBLOCK ID CLOSE', function() {
-    var result = tokenize("{{#foo}}content{{/foo}}");
+    var result = tokenize('{{#foo}}content{{/foo}}');
     shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'CLOSE', 'CONTENT', 'OPEN_ENDBLOCK', 'ID', 'CLOSE']);
   });
 
+  it('tokenizes directives', function() {
+    shouldMatchTokens(
+        tokenize('{{#*foo}}content{{/foo}}'),
+        ['OPEN_BLOCK', 'ID', 'CLOSE', 'CONTENT', 'OPEN_ENDBLOCK', 'ID', 'CLOSE']);
+    shouldMatchTokens(
+        tokenize('{{*foo}}'),
+        ['OPEN', 'ID', 'CLOSE']);
+  });
+
   it('tokenizes inverse sections as "INVERSE"', function() {
-    shouldMatchTokens(tokenize("{{^}}"), ['INVERSE']);
-    shouldMatchTokens(tokenize("{{else}}"), ['INVERSE']);
-    shouldMatchTokens(tokenize("{{ else }}"), ['INVERSE']);
+    shouldMatchTokens(tokenize('{{^}}'), ['INVERSE']);
+    shouldMatchTokens(tokenize('{{else}}'), ['INVERSE']);
+    shouldMatchTokens(tokenize('{{ else }}'), ['INVERSE']);
   });
 
   it('tokenizes inverse sections with ID as "OPEN_INVERSE ID CLOSE"', function() {
-    var result = tokenize("{{^foo}}");
+    var result = tokenize('{{^foo}}');
     shouldMatchTokens(result, ['OPEN_INVERSE', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'foo');
   });
 
   it('tokenizes inverse sections with ID and spaces as "OPEN_INVERSE ID CLOSE"', function() {
-    var result = tokenize("{{^ foo  }}");
+    var result = tokenize('{{^ foo  }}');
     shouldMatchTokens(result, ['OPEN_INVERSE', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
+    shouldBeToken(result[1], 'ID', 'foo');
   });
 
   it('tokenizes mustaches with params as "OPEN ID ID ID CLOSE"', function() {
-    var result = tokenize("{{ foo bar baz }}");
+    var result = tokenize('{{ foo bar baz }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
-    shouldBeToken(result[2], "ID", "bar");
-    shouldBeToken(result[3], "ID", "baz");
+    shouldBeToken(result[1], 'ID', 'foo');
+    shouldBeToken(result[2], 'ID', 'bar');
+    shouldBeToken(result[3], 'ID', 'baz');
   });
 
   it('tokenizes mustaches with String params as "OPEN ID ID STRING CLOSE"', function() {
-    var result = tokenize("{{ foo bar \"baz\" }}");
+    var result = tokenize('{{ foo bar \"baz\" }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], "STRING", "baz");
+    shouldBeToken(result[3], 'STRING', 'baz');
   });
 
   it('tokenizes mustaches with String params using single quotes as "OPEN ID ID STRING CLOSE"', function() {
     var result = tokenize("{{ foo bar \'baz\' }}");
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], "STRING", "baz");
+    shouldBeToken(result[3], 'STRING', 'baz');
   });
 
   it('tokenizes String params with spaces inside as "STRING"', function() {
-    var result = tokenize("{{ foo bar \"baz bat\" }}");
+    var result = tokenize('{{ foo bar "baz bat" }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], "STRING", "baz bat");
+    shouldBeToken(result[3], 'STRING', 'baz bat');
   });
 
   it('tokenizes String params with escapes quotes as STRING', function() {
     var result = tokenize('{{ foo "bar\\"baz" }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], "STRING", 'bar"baz');
+    shouldBeToken(result[2], 'STRING', 'bar"baz');
   });
 
   it('tokenizes String params using single quotes with escapes quotes as STRING', function() {
     var result = tokenize("{{ foo 'bar\\'baz' }}");
     shouldMatchTokens(result, ['OPEN', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], "STRING", "bar'baz");
+    shouldBeToken(result[2], 'STRING', "bar'baz");
   });
 
   it('tokenizes numbers', function() {
     var result = tokenize('{{ foo 1 }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], "NUMBER", "1");
+    shouldBeToken(result[2], 'NUMBER', '1');
 
     result = tokenize('{{ foo 1.1 }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], "NUMBER", "1.1");
+    shouldBeToken(result[2], 'NUMBER', '1.1');
 
     result = tokenize('{{ foo -1 }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], "NUMBER", "-1");
+    shouldBeToken(result[2], 'NUMBER', '-1');
 
     result = tokenize('{{ foo -1.1 }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], "NUMBER", "-1.1");
+    shouldBeToken(result[2], 'NUMBER', '-1.1');
   });
 
   it('tokenizes booleans', function() {
     var result = tokenize('{{ foo true }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'BOOLEAN', 'CLOSE']);
-    shouldBeToken(result[2], "BOOLEAN", "true");
+    shouldBeToken(result[2], 'BOOLEAN', 'true');
 
     result = tokenize('{{ foo false }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'BOOLEAN', 'CLOSE']);
-    shouldBeToken(result[2], "BOOLEAN", "false");
+    shouldBeToken(result[2], 'BOOLEAN', 'false');
+  });
+
+  it('tokenizes undefined and null', function() {
+    var result = tokenize('{{ foo undefined null }}');
+    shouldMatchTokens(result, ['OPEN', 'ID', 'UNDEFINED', 'NULL', 'CLOSE']);
+    shouldBeToken(result[2], 'UNDEFINED', 'undefined');
+    shouldBeToken(result[3], 'NULL', 'null');
   });
 
   it('tokenizes hash arguments', function() {
-    var result = tokenize("{{ foo bar=baz }}");
+    var result = tokenize('{{ foo bar=baz }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=bat }}");
+    result = tokenize('{{ foo bar baz=bat }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=1 }}");
+    result = tokenize('{{ foo bar baz=1 }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'NUMBER', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=true }}");
+    result = tokenize('{{ foo bar baz=true }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'BOOLEAN', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=false }}");
+    result = tokenize('{{ foo bar baz=false }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'BOOLEAN', 'CLOSE']);
 
-    result = tokenize("{{ foo bar\n  baz=bat }}");
+    result = tokenize('{{ foo bar\n  baz=bat }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=\"bat\" }}");
+    result = tokenize('{{ foo bar baz=\"bat\" }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'STRING', 'CLOSE']);
 
-    result = tokenize("{{ foo bar baz=\"bat\" bam=wot }}");
+    result = tokenize('{{ foo bar baz=\"bat\" bam=wot }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'STRING', 'ID', 'EQUALS', 'ID', 'CLOSE']);
 
-    result = tokenize("{{foo omg bar=baz bat=\"bam\"}}");
+    result = tokenize('{{foo omg bar=baz bat=\"bam\"}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'ID', 'EQUALS', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], "ID", "omg");
+    shouldBeToken(result[2], 'ID', 'omg');
   });
 
   it('tokenizes special @ identifiers', function() {
-    var result = tokenize("{{ @foo }}");
+    var result = tokenize('{{ @foo }}');
     shouldMatchTokens(result, ['OPEN', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[2], "ID", "foo");
+    shouldBeToken(result[2], 'ID', 'foo');
 
-    result = tokenize("{{ foo @bar }}");
+    result = tokenize('{{ foo @bar }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[3], "ID", "bar");
+    shouldBeToken(result[3], 'ID', 'bar');
 
-    result = tokenize("{{ foo bar=@baz }}");
+    result = tokenize('{{ foo bar=@baz }}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'EQUALS', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[5], "ID", "baz");
+    shouldBeToken(result[5], 'ID', 'baz');
   });
 
   it('does not time out in a mustache with a single } followed by EOF', function() {
-    shouldMatchTokens(tokenize("{{foo}"), ['OPEN', 'ID']);
+    shouldMatchTokens(tokenize('{{foo}'), ['OPEN', 'ID']);
   });
 
   it('does not time out in a mustache when invalid ID characters are used', function() {
-    shouldMatchTokens(tokenize("{{foo & }}"), ['OPEN', 'ID']);
+    shouldMatchTokens(tokenize('{{foo & }}'), ['OPEN', 'ID']);
   });
 
   it('tokenizes subexpressions', function() {
-    var result = tokenize("{{foo (bar)}}");
+    var result = tokenize('{{foo (bar)}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
-    shouldBeToken(result[3], "ID", "bar");
+    shouldBeToken(result[1], 'ID', 'foo');
+    shouldBeToken(result[3], 'ID', 'bar');
 
-    result = tokenize("{{foo (a-x b-y)}}");
+    result = tokenize('{{foo (a-x b-y)}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[1], "ID", "foo");
-    shouldBeToken(result[3], "ID", "a-x");
-    shouldBeToken(result[4], "ID", "b-y");
+    shouldBeToken(result[1], 'ID', 'foo');
+    shouldBeToken(result[3], 'ID', 'a-x');
+    shouldBeToken(result[4], 'ID', 'b-y');
   });
 
   it('tokenizes nested subexpressions', function() {
-    var result = tokenize("{{foo (bar (lol rofl)) (baz)}}");
+    var result = tokenize('{{foo (bar (lol rofl)) (baz)}}');
     shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'OPEN_SEXPR', 'ID', 'ID', 'CLOSE_SEXPR', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[3],  "ID", "bar");
-    shouldBeToken(result[5],  "ID", "lol");
-    shouldBeToken(result[6],  "ID", "rofl");
-    shouldBeToken(result[10], "ID", "baz");
+    shouldBeToken(result[3], 'ID', 'bar');
+    shouldBeToken(result[5], 'ID', 'lol');
+    shouldBeToken(result[6], 'ID', 'rofl');
+    shouldBeToken(result[10], 'ID', 'baz');
   });
 
   it('tokenizes nested subexpressions: literals', function() {
     var result = tokenize("{{foo (bar (lol true) false) (baz 1) (blah 'b') (blorg \"c\")}}");
     shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'OPEN_SEXPR', 'ID', 'BOOLEAN', 'CLOSE_SEXPR', 'BOOLEAN', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'NUMBER', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'STRING', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'STRING', 'CLOSE_SEXPR', 'CLOSE']);
   });
+
+  it('tokenizes block params', function() {
+    var result = tokenize('{{#foo as |bar|}}');
+    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
+
+    result = tokenize('{{#foo as |bar baz|}}');
+    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
+
+    result = tokenize('{{#foo as | bar baz |}}');
+    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
+
+    result = tokenize('{{#foo as as | bar baz |}}');
+    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
+
+    result = tokenize('{{else foo as |bar baz|}}');
+    shouldMatchTokens(result, ['OPEN_INVERSE_CHAIN', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
+  });
 });