Added tests for multiple partial-block calls with inline partials

- nested inline partials with partial-blocks on different nesting levels
- nested inline partials (twice at each level)

.editorconfig

@@ -1,11 +0,0 @@
-root = true
-
-[*.js]
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.yml]
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true

.eslintignore

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

.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
+  }
+}

.eslintrc.js

@@ -1,66 +0,0 @@
-module.exports = {
-  extends: ['eslint:recommended', 'plugin:compat/recommended', 'prettier'],
-  globals: {
-    self: false
-  },
-  env: {
-    node: true,
-    es6: true
-  },
-  rules: {
-    'no-console': 'warn',
-
-    // temporarily disabled until the violating places are fixed.
-    'no-func-assign': 'off',
-    'no-sparse-arrays': 'off',
-
-    // Best Practices //
-    //----------------//
-    'default-case': 'warn',
-    'guard-for-in': 'warn',
-    'no-alert': 'error',
-    'no-caller': 'error',
-    'no-div-regex': 'warn',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'error',
-    'no-floating-decimal': 'error',
-    'no-implied-eval': 'error',
-    'no-iterator': 'error',
-    'no-labels': 'error',
-    'no-lone-blocks': 'error',
-    'no-loop-func': 'error',
-    'no-multi-str': 'warn',
-    'no-global-assign': 'error',
-    'no-new': 'error',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal-escape': 'error',
-    'no-process-env': 'error',
-    'no-proto': 'error',
-    'no-return-assign': 'error',
-    'no-script-url': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'error',
-    'no-throw-literal': 'error',
-    'no-unused-expressions': 'error',
-    'no-warning-comments': 'warn',
-    'no-with': 'error',
-    radix: 'error',
-
-    // Variables //
-    //-----------//
-    'no-label-var': 'error',
-    'no-undef-init': 'error',
-    'no-use-before-define': ['error', 'nofunc'],
-
-    // ECMAScript 6 //
-    //--------------//
-    'no-var': 'error'
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 6,
-    ecmaFeatures: {}
-  }
-};

.gitattributes

@@ -1,6 +0,0 @@
-# Handlebars-template fixtures in test cases need deterministic eol
-*.handlebars text eol=lf
-*.hbs text eol=lf
-
-# Lexer files as well
-*.l text eol=lf

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: "/"
-    open-pull-requests-limit: 0
-    schedule:
-      interval: weekly
-    allow:
-      - dependency-type: production

.github/workflows/ci.yml

@@ -1,89 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request: {}
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '16'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
-
-  test:
-    name: Test (Node)
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: ['ubuntu-latest', 'windows-latest']
-        # https://nodejs.org/en/about/releases/
-        node-version: ['16', '18', '20', '22']
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Test
-        run: npm run test
-
-      - name: Test (Integration)
-        # https://github.com/webpack/webpack/issues/14532
-        if: ${{ matrix.node-version == '16' }}
-        run: |
-          cd ./tests/integration/rollup-test && ./test.sh && cd -
-          cd ./tests/integration/webpack-babel-test && ./test.sh && cd -
-          cd ./tests/integration/webpack-test && ./test.sh && cd -
-
-  browser:
-    name: Test (Browser)
-    runs-on: 'ubuntu-22.04'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '16'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Install Playwright
-        run: |
-          npx playwright install-deps
-          npx playwright install
-
-      - name: Build
-        run: npx grunt prepare
-
-      - name: Test
-        run: npm run test:browser

.github/workflows/release.yml

@@ -1,38 +0,0 @@
-name: Release
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-
-jobs:
-  publish-aws-s3:
-    name: Publish to AWS S3
-    runs-on: 'ubuntu-latest'
-    environment: 'builds.handlebarsjs.com.s3.amazonaws.com'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Publish
-        run: |
-          git config --global user.email "release@handlebarsjs.com"
-          git config --global user.name "handlebars-lang"
-          npm run publish:aws
-        env:
-          S3_BUCKET_NAME: "builds.handlebarsjs.com"
-          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

.gitignore

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

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spec/mustache"]
 	path = spec/mustache
-	url = https://github.com/mustache/spec.git
+	url = git://github.com/mustache/spec.git

.istanbul.yml

@@ -0,0 +1,2 @@
+instrumentation:
+    excludes: ['**/spec/**']

.npmignore

@@ -0,0 +1,25 @@
+.DS_Store
+.gitignore
+.rvmrc
+.eslintrc
+.travis.yml
+.rspec
+Gemfile
+Gemfile.lock
+Rakefile
+Gruntfile.js
+*.gemspec
+*.nuspec
+*.log
+bench/*
+configurations/*
+components/*
+coverage/*
+dist/cdnjs/*
+dist/components/*
+spec/*
+src/*
+tasks/*
+tmp/*
+publish/*
+vendor/*

.prettierignore

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

.travis.yml

@@ -0,0 +1,27 @@
+language: node_js
+before_install:
+- npm install -g grunt-cli
+script:
+- grunt --stack travis
+email:
+  on_failure: change
+  on_success: never
+env:
+  global:
+  - S3_BUCKET_NAME=builds.handlebarsjs.com
+  - secure: ckyEe5dzjdFDjmZ6wIrhGm0CFBEnKq8c1dYptfgVV/Q5/nJFGzu8T0yTjouS/ERxzdT2H327/63VCxhFnLCRHrsh4rlW/rCy4XI3O/0TeMLgFPa4TXkO8359qZ4CB44TBb3NsJyQXNMYdJpPLTCVTMpuiqqkFFOr+6OeggR7ufA=
+  - secure: Nm4AgSfsgNB21kgKrF9Tl7qVZU8YYREhouQunFracTcZZh2NZ2XH5aHuSiXCj88B13Cr/jGbJKsZ4T3QS3wWYtz6lkyVOx3H3iI+TMtqhD9RM3a7A4O+4vVN8IioB2YjhEu0OKjwgX5gp+0uF+pLEi7Hpj6fupD3AbbL5uYcKg8=
+matrix:
+  include:
+  - node_js: '5'
+    env:
+    - PUBLISH=true
+    - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw=
+    - secure: yERYCf7AwL11D9uMtacly/THGV8BlzsMmrt+iQVvGA3GaY6QMmfYqf6P6cCH98sH5etd1Y+1e6YrPeMjqI6lyRllT7FptoyOdHulazQe86VQN4sc0EpqMlH088kB7gGjTut9Z+X9ViooT5XEh9WA5jXEI9pXhQJNoIHkWPuwGuY=
+  - node_js: '4'
+cache:
+  directories:
+  - node_modules
+
+git:
+  depth: 100

CONTRIBUTING.md

@@ -2,26 +2,19 @@
 
 ## Reporting Issues
 
-Please see our [FAQ](https://github.com/handlebars-lang/handlebars.js/blob/master/FAQ.md) for common issues that people run into.
+Please see our [FAQ](https://github.com/wycats/handlebars.js/blob/master/FAQ.md) for common issues that people run into.
 
 Should you run into other issues with the project, please don't hesitate to let us know by filing an [issue][issue]! In general we are going to ask for an example of the problem failing, which can be as simple as a jsfiddle/jsbin/etc. We've put together a jsfiddle [template][jsfiddle] to ease this. (We will keep this link up to date as new releases occur, so feel free to check back here)
 
 Pull requests containing only failing tests 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](https://handlebarsjs.com) site should be reported on [handlebars-lang/docs](https://github.com/handlebars-lang/docs).
+Documentation issues on the handlebarsjs.com site should be reported on [handlebars-site](https://github.com/wycats/handlebars-site).
-
-## Branches
-
-- The branch `4.x` contains the currently released version. Bugfixes should be made in this branch.
-- The branch `master` contains the next version. A release date is not yet specified. Maintainers
-  should merge the branch `4.x` into the master branch regularly.
 
 ## Pull Requests
 
 We also accept [pull requests][pull-request]!
 
 Generally we like to see pull requests that
-
 - Maintain the existing code style
 - Are focused on a single change (i.e. avoid large refactoring or style adjustments in untouched code if not the primary goal of the pull request)
 - Have [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
@@ -32,8 +25,8 @@ Generally we like to see pull requests that
 
 To build Handlebars.js you'll need a few things installed.
 
-- Node.js
+* Node.js
-- [Grunt](http://gruntjs.com/getting-started)
+* [Grunt](http://gruntjs.com/getting-started)
 
 Before building, you need to make sure that the Git submodule `spec/mustache` is included (i.e. the directory `spec/mustache` should not be empty). To include it, if using Git version 1.6.5 or newer, use `git clone --recursive` rather than `git clone`. Or, if you already cloned without `--recursive`, use `git submodule update --init`.
 
@@ -47,18 +40,16 @@ You can also run our set of benchmarks with `grunt bench`.
 The `grunt dev` implements watching for tests and allows for in browser testing at `http://localhost:9999/spec/`.
 
 If you notice any problems, please report them to the GitHub issue tracker at
-[http://github.com/handlebars-lang/handlebars.js/issues](http://github.com/handlebars-lang/handlebars.js/issues).
+[http://github.com/wycats/handlebars.js/issues](http://github.com/wycats/handlebars.js/issues).
 
-## Running Tests
+##Running Tests
 
 To run tests locally, first install all dependencies.
-
 ```sh
 npm install
 ```
 
 Clone the mustache specs into the spec/mustache folder.
-
 ```sh
 cd spec
 rm -r mustache
@@ -66,141 +57,43 @@ git clone https://github.com/mustache/spec.git mustache
 ```
 
 From the root directory, run the tests.
-
 ```sh
 npm test
 ```
 
-## Linting and Formatting
+## Ember testing
 
-Handlebars uses `eslint` to enforce best-practices and `prettier` to auto-format files.
+The current ember distribution should be tested as part of the handlebars release process. This requires building the `handlebars-source` gem locally and then executing the ember test script.
-We do linting and formatting in two phases:
 
-- Committed files are linted and formatted in a pre-commit hook. In this stage eslint-errors are forbidden,
+```sh
-  while warnings are allowed.
+npm link
-- The GitHub CI job also lints all files and checks if they are formatted correctly. In this stage, warnings
+grunt build release
-  are forbidden.
+cp dist/*.js $emberRepoDir/bower_components/handlebars/
 
-You can use the following scripts to make sure that the CI job does not fail:
+cd $emberRepoDir
+npm link handlebars
+npm test
+```
 
-- **npm run lint** will run `eslint` and fail on warnings
+## Releasing
-- **npm run format** will run `prettier` on all files
-- **npm run check-before-pull-request** will perform all most checks that our CI job does in its build-job, excluding the "integration-test".
-- **npm run test:integration** will run integration tests (using old NodeJS versions and integrations with webpack, babel and so on)
-  These tests only work on a Linux-machine with `nvm` installed (for running tests in multiple versions of NodeJS).
 
-## Releasing the latest version
+Handlebars utilizes the [release yeoman generator][generator-release] to perform most release tasks.
 
-Before attempting the release Handlebars, please make sure that you have the following authorizations:
+A full release may be completed with the following:
 
-- Push-access to [handlebars-lang/handlebars.js](https://github.com/handlebars-lang/handlebars.js/)
+```
-- Publishing rights on npmjs.com for the [handlebars](https://www.npmjs.com/package/handlebars) package
+yo release
-- Publishing rights on rubygems for the [handlebars-source](https://rubygems.org/gems/handlebars-source) package
+npm publish
-- Push-access to the repo for legacy package managers: [components/handlebars.js](https://github.com/components/handlebars.js)
+yo release:publish components handlebars.js dist/components/
-- Push-access to the production-repo of the handlebars site: [handlebars-lang/docs](https://github.com/handlebars-lang/docs)
 
-_When releasing a previous version of Handlebars, please look into the CONTRIBUNG.md in the corresponding branch._
+cd dist/components/
+gem build handlebars-source.gemspec
+gem push handlebars-source-*.gem
+```
 
-A full release via Docker may be completed with the following:
+After this point the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
-
-1. Create a `Dockerfile` in this folder for releasing
-    ```Dockerfile
-    FROM node:10-slim
-    
-    ENV EDITOR=vim
-    
-    # Update stretch repositories
-    RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
-    -e 's|security.debian.org|archive.debian.org/|g' \
-    -e '/stretch-updates/d' /etc/apt/sources.list
-    
-    # Install release dependencies
-    RUN apt-get update
-    RUN apt-get install -y git vim
-    
-    # Work around deprecated npm dependency install via unauthenticated git-protocol:
-    # https://github.com/kpdecker/generator-release/blob/87aab9b84c9f083635c3fcc822f18acce1f48736/package.json#L31
-    RUN git config --system url."https://github.com/".insteadOf git://github.com/
-    
-    # Configure git
-    RUN git config --system user.email "release@handlebarsjs.com"
-    RUN git config --system user.name "handlebars-lang"
-    
-    RUN mkdir /home/node/.config
-    RUN mkdir /home/node/.ssh
-    RUN mkdir /home/node/tmp
-    
-    # Generate config for yo generator-release:
-    # https://github.com/kpdecker/generator-release#example
-    # You have to add a valid GitHub access token! (Used for reading issues and pull requests.)
-    RUN echo "module.exports = {\n  auth: 'oauth',\n  token: 'GitHub personal access token'\n};" > /home/node/.config/generator-release
-    RUN chown -R node:node /home/node/.config
-    RUN chown -R node:node /home/node/.ssh
-    RUN chown -R node:node /home/node/tmp
-    
-    # Add the generated key to GitHub: https://github.com/settings/keys
-    RUN ssh-keygen -q -t ed25519 -N '' -f /home/node/.ssh/id_ed25519 -C "release@handlebarsjs.com"
-    RUN chmod 0600 /home/node/.ssh/id_ed25519*
-    RUN chown node:node /home/node/.ssh/id_ed25519*
-    ```
-2. Build and run the Docker image
-    ```bash
-    docker build --tag handlebars:release .
-    docker run --rm --interactive --tty \
-      --volume $PWD:/app \
-      --workdir /app \
-      --user $(id -u):$(id -g) \
-      --env NPM_CONFIG_PREFIX=/home/node/.npm-global \
-      handlebars:release bash -c 'export PATH=$PATH:/home/node/.npm-global/bin; bash'
-    ```
-   * Add SSH key to GitHub: `cat /home/node/.ssh/id_ed25519.pub` (https://github.com/settings/keys)
-   * Add GitHub API token: `vi /home/node/.config/generator-release`
-   * Execute the following steps:
-     ```bash
-     npm install
-     npm install -g yo@1 grunt@1 generator-release
-     npm run release
-     # Warning! This step will collect data from GitHub, bump the version,
-     # create a new commit, create a new tag and push it to GitHub.
-     # https://github.com/kpdecker/generator-release?tab=readme-ov-file#usage
-     yo release
-     npm login
-     npm publish
-     yo release:publish components handlebars.js dist/components/
-     ```
-6. Publish Ruby `handlebars-source` gem:
-    ```bash
-    docker run --rm --interactive --tty \
-     --volume $PWD:/app \
-     --workdir /app \
-     ruby:3.2-slim bash
-    ```
-   * Execute the following steps:
-     ```bash
-     cd dist/components/
-     gem build handlebars-source.gemspec
-     gem push handlebars-source-*.gem
-     ```
-
-### After the release
-
-After the release, you should check that all places have really been updated. Especially verify that the `latest`-tags
-in those places still point to the latest version
-
-- [The npm-package](https://www.npmjs.com/package/handlebars) (check latest-tag)
-- [The bower package](https://github.com/components/handlebars.js) (check the package.json)
-- [The AWS S3 Bucket](https://s3.amazonaws.com/builds.handlebarsjs.com) (check latest-tag)
-- [RubyGems](https://rubygems.org/gems/handlebars-source)
-
-When everything is OK, the **handlebars site** needs to be updated.
-
-Go to the master branch of the repo [handlebars-lang/docs](https://github.com/handlebars-lang/docs/tree/master)
-and make a minimal change to the README. This will invoke a github-action that redeploys
-the site, fetching the latest version-number from the npm-registry.
-(note that the default-branch of this repo is not the master and regular changes are done
-in the `handlebars-lang/docs`-repo).
 
 [generator-release]: https://github.com/walmartlabs/generator-release
-[pull-request]: https://github.com/handlebars-lang/handlebars.js/pull/new/master
+[pull-request]: https://github.com/wycats/handlebars.js/pull/new/master
-[issue]: https://github.com/handlebars-lang/handlebars.js/issues/new
+[issue]: https://github.com/wycats/handlebars.js/issues/new
-[jsfiddle]: https://jsfiddle.net/9D88g/180/
+[jsfiddle]: https://jsfiddle.net/9D88g/47/

FAQ.md

@@ -2,11 +2,11 @@
 
 1. How can I file a bug report:
 
-  See our guidelines on [reporting issues](https://github.com/handlebars-lang/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
+  See our guidelines on [reporting issues](https://github.com/wycats/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
 
 1. Why isn't my Mustache template working?
 
-  Handlebars deviates from Mustache slightly on a few behaviors. These variations are documented in our [readme](https://github.com/handlebars-lang/handlebars.js#differences-between-handlebarsjs-and-mustache).
+  Handlebars deviates from Mustache slightly on a few behaviors. These variations are documented in our [readme](https://github.com/wycats/handlebars.js#differences-between-handlebarsjs-and-mustache).
 
 1. Why is it slower when compiling?
 
@@ -36,18 +36,16 @@
   ```sh
   handlebars --version
   ```
-
   If using the integrated precompiler and
 
   ```javascript
   console.log(Handlebars.VERSION);
   ```
-
   On the client side.
 
   We include the built client libraries in the npm package for those who want to be certain that they are using the same client libraries as the compiler.
 
-  Should these match, please file an issue with us, per our [issue filing guidelines](https://github.com/handlebars-lang/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
+  Should these match, please file an issue with us, per our [issue filing guidelines](https://github.com/wycats/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
 
 1. Why doesn't IE like the `default` name in the AMD module?
 
@@ -55,7 +53,7 @@
 
 1. How do I load the runtime library when using AMD?
 
-  There are two options for loading under AMD environments. The first is to use the `handlebars.runtime.amd.js` file. This may require a [path mapping](https://github.com/handlebars-lang/handlebars.js/blob/master/spec/amd-runtime.html#L31) as well as access via the `default` field.
+  There are two options for loading under AMD environments. The first is to use the `handlebars.runtime.amd.js` file. This may require a [path mapping](https://github.com/wycats/handlebars.js/blob/master/spec/amd-runtime.html#L31) as well as access via the `default` field.
 
   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. 
 

Gruntfile.js

@@ -1,42 +1,44 @@
 /* eslint-disable no-process-env */
 module.exports = function(grunt) {
+
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    clean: [
+    eslint: {
-      'tmp',
+      options: {
-      'dist',
+      },
-      'lib/handlebars/compiler/parser.js',
+      files: [
-      '/tests/integration/**/node_modules'
+        '*.js',
-    ],
+        'bench/**/*.js',
+        'tasks/**/*.js',
+        'lib/**/!(*.min|parser).js',
+        'spec/**/!(*.amd|json2|require).js'
+      ]
+    },
+
+    clean: ['tmp', 'dist', 'lib/handlebars/compiler/parser.js'],
 
     copy: {
       dist: {
         options: {
           processContent: function(content) {
-            return (
+            return grunt.template.process('/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n')
-              grunt.template.process(
+                + content;
-                '/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n'
-              ) + content
-            );
           }
         },
-        files: [{ expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/' }]
+        files: [
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/'}
+        ]
       },
       cdnjs: {
         files: [
-          { expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/cdnjs' }
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/cdnjs'}
         ]
       },
       components: {
         files: [
-          {
+          {expand: true, cwd: 'components/', src: ['**'], dest: 'dist/components'},
-            expand: true,
+          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/components'}
-            cwd: 'components/',
-            src: ['**'],
-            dest: 'dist/components'
-          },
-          { expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/components' }
         ]
       }
     },
@@ -51,28 +53,24 @@ module.exports = function(grunt) {
         options: {
           modules: 'amd'
         },
-        files: [
+        files: [{
-          {
+          expand: true,
-            expand: true,
+          cwd: 'lib/',
-            cwd: 'lib/',
+          src: '**/!(index).js',
-            src: '**/!(index).js',
+          dest: 'dist/amd/'
-            dest: 'dist/amd/'
+        }]
-          }
-        ]
       },
 
       cjs: {
         options: {
           modules: 'common'
         },
-        files: [
+        files: [{
-          {
+          cwd: 'lib/',
-            cwd: 'lib/',
+          expand: true,
-            expand: true,
+          src: '**/!(index).js',
-            src: '**/!(index).js',
+          dest: 'dist/cjs/'
-            dest: 'dist/cjs/'
+        }]
-          }
-        ]
       }
     },
     webpack: {
@@ -81,12 +79,7 @@ module.exports = function(grunt) {
         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' }
-              test: /\.jsx?$/,
-              exclude: /node_modules/,
-              loader:
-                'babel-loader?optional=runtime&loose=es6.modules&auxiliaryCommentBefore=istanbul%20ignore%20next'
-            }
           ]
         },
         output: {
@@ -135,17 +128,15 @@ module.exports = function(grunt) {
         preserveComments: /(?:^!|@(?:license|preserve|cc_on))/
       },
       dist: {
-        files: [
+        files: [{
-          {
+          cwd: 'dist/',
-            cwd: 'dist/',
+          expand: true,
-            expand: true,
+          src: ['handlebars*.js', '!*.min.js'],
-            src: ['handlebars*.js', '!*.min.js'],
+          dest: 'dist/',
-            dest: 'dist/',
+          rename: function(dest, src) {
-            rename: function(dest, src) {
+            return dest + src.replace(/\.js$/, '.min.js');
-              return dest + src.replace(/\.js$/, '.min.js');
-            }
           }
-        ]
+        }]
       }
     },
 
@@ -165,10 +156,33 @@ module.exports = function(grunt) {
         }
       }
     },
-
+    'saucelabs-mocha': {
-    shell: {
+      all: {
-      integrationTests: {
+        options: {
-        command: './tests/integration/run-integration-tests.sh'
+          build: process.env.TRAVIS_JOB_ID,
+          urls: ['http://localhost:9999/spec/?headless=true', 'http://localhost:9999/spec/amd.html?headless=true'],
+          detailedError: true,
+          concurrency: 4,
+          browsers: [
+            {browserName: 'chrome'},
+            {browserName: 'firefox', platform: 'Linux'},
+            {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
+            {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
+            {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
+            {browserName: 'internet explorer', version: 10, platform: 'Windows 8'}
+          ]
+        }
+      },
+      sanity: {
+        options: {
+          build: process.env.TRAVIS_JOB_ID,
+          urls: ['http://localhost:9999/spec/umd.html?headless=true', 'http://localhost:9999/spec/amd-runtime.html?headless=true', 'http://localhost:9999/spec/umd-runtime.html?headless=true'],
+          detailedError: true,
+          concurrency: 2,
+          browsers: [
+            {browserName: 'chrome'}
+          ]
+        }
       }
     },
 
@@ -179,11 +193,25 @@ module.exports = function(grunt) {
         },
 
         files: ['src/*', 'lib/**/*.js', 'spec/**/*.js'],
-        tasks: ['on-file-change']
+        tasks: ['build', 'amd', 'tests', 'test']
       }
     }
   });
 
+  // Build a new version of the library
+  this.registerTask('build', 'Builds a distributable version of the current project', [
+                    'eslint',
+                    'parser',
+                    'node',
+                    'globals']);
+
+  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', ['eslint', 'amd', 'uglify', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+
   // Load tasks from npm
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
@@ -193,45 +221,17 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-babel');
-  grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-eslint');
+  grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-webpack');
 
   grunt.task.loadTasks('tasks');
 
-  grunt.registerTask('node', ['babel:cjs']);
+  grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('amd', ['babel:amd', 'requirejs']);
+  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : []);
-  grunt.registerTask('globals', ['webpack']);
-  grunt.registerTask('release', 'Build final packages', [
-    'uglify',
-    'test:min',
-    'copy:dist',
-    'copy:components',
-    'copy:cdnjs'
-  ]);
 
-  // Requires secret properties from .travis.yaml
+  grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'sauce', 'metrics', 'publish:latest'] : ['default']);
-  grunt.registerTask('extensive-tests-and-publish-to-aws', [
-    'default',
-    'shell:integrationTests',
-    'metrics',
-    'publish-to-aws'
-  ]);
 
-  grunt.registerTask('on-file-change', ['build', 'concat:tests', 'test']);
-
-  // === Primary tasks ===
   grunt.registerTask('dev', ['clean', 'connect', 'watch']);
   grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-  grunt.registerTask('test', ['test:bin', 'test:cov']);
-  grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('prepare', ['build', 'concat:tests']);
-  grunt.registerTask(
-    'build',
-    'Builds a distributable version of the current project',
-    ['parser', 'node', 'amd', 'globals']
-  );
-  grunt.registerTask('integration-tests', [
-    'default',
-    'shell:integrationTests'
-  ]);
 };

LICENSE

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

@@ -1,29 +1,27 @@
-[![CI Build Status](https://github.com/handlebars-lang/handlebars.js/actions/workflows/ci.yml/badge.svg)](https://github.com/handlebars-lang/handlebars.js/actions/workflows/ci.yml)
+[![Travis Build Status](https://img.shields.io/travis/wycats/handlebars.js/master.svg)](https://travis-ci.org/wycats/handlebars.js)
-[![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/handlebars/badge?style=rounded)](https://www.jsdelivr.com/package/npm/handlebars)
+[![Selenium Test Status](https://saucelabs.com/buildstatus/handlebars)](https://saucelabs.com/u/handlebars)
-[![npm downloads](https://badgen.net/npm/dm/handlebars)](https://www.npmjs.com/package/handlebars)
-[![npm version](https://badgen.net/npm/v/handlebars)](https://www.npmjs.com/package/handlebars)
-[![Bundle size](https://badgen.net/bundlephobia/minzip/handlebars?label=minified%20%2B%20gzipped)](https://bundlephobia.com/package/handlebars)
-[![Install size](https://packagephobia.com/badge?p=handlebars)](https://packagephobia.com/result?p=handlebars)
 
 Handlebars.js
 =============
 
-Handlebars provides the power necessary to let you build **semantic templates** effectively with no frustration.
+Handlebars.js is an extension to the [Mustache templating
-Handlebars is largely compatible with Mustache templates. In most cases it is possible to swap out Mustache with Handlebars and continue using your current templates.
+language](http://mustache.github.com/) created by Chris Wanstrath.
+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
-[handlebarsjs.com](https://handlebarsjs.com) and try our [live demo](https://handlebarsjs.com/playground.html).
+[http://www.handlebarsjs.com](http://www.handlebarsjs.com) and the live demo at [http://tryhandlebarsjs.com/](http://tryhandlebarsjs.com/).
 
 Installing
 ----------
 
-See our [installation documentation](https://handlebarsjs.com/installation/).
+See our [installation documentation](http://handlebarsjs.com/installation.html).
 
 Usage
 -----
 In general, the syntax of Handlebars.js templates is a superset
 of Mustache templates. For basic syntax, check out the [Mustache
-manpage](https://mustache.github.io/mustache.5.html).
+manpage](http://mustache.github.com/mustache.5.html).
 
 Once you have a template, use the `Handlebars.compile` method to compile
 the template into a function. The generated function takes a context
@@ -47,25 +45,25 @@ var result = template(data);
 // </ul>
 ```
 
-Full documentation and more examples are at [handlebarsjs.com](https://handlebarsjs.com/).
+Full documentation and more examples are at [handlebarsjs.com](http://handlebarsjs.com/).
 
 Precompiling Templates
 ----------------------
 
-Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](https://handlebarsjs.com/installation/precompilation.html).
+Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](http://handlebarsjs.com/precompilation.html).
 
 Differences Between Handlebars.js and Mustache
 ----------------------------------------------
 Handlebars.js adds a couple of additional features to make writing
 templates easier and also changes a tiny detail of how partials work.
 
-- [Nested Paths](https://handlebarsjs.com/guide/expressions.html#path-expressions)
+- [Nested Paths](http://handlebarsjs.com/#paths)
-- [Helpers](https://handlebarsjs.com/guide/expressions.html#helpers)
+- [Helpers](http://handlebarsjs.com/#helpers)
-- [Block Expressions](https://handlebarsjs.com/guide/block-helpers.html#basic-blocks)
+- [Block Expressions](http://handlebarsjs.com/#block-expressions)
-- [Literal Values](https://handlebarsjs.com/guide/expressions.html#literal-segments)
+- [Literal Values](http://handlebarsjs.com/#literals)
-- [Delimited Comments](https://handlebarsjs.com/guide/#template-comments)
+- [Delimited Comments](http://handlebarsjs.com/#comments)
 
-Block expressions have the same syntax as mustache sections but should not be confused with one another. Sections are akin to an implicit `each` or `with` statement depending on the input data and helpers are explicit pieces of code that are free to implement whatever behavior they like. The [mustache spec](https://mustache.github.io/mustache.5.html) defines the exact behavior of sections. In the case of name conflicts, helpers are given priority.
+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
 
@@ -90,6 +88,8 @@ Handlebars has been designed to work in any ECMAScript 3 environment. This inclu
 Older versions and other runtimes are likely to work but have not been formally
 tested. The compiler requires `JSON.stringify` to be implemented natively or via a polyfill. If using the precompiler this is not necessary.
 
+[![Selenium Test Status](https://saucelabs.com/browser-matrix/handlebars.svg)](https://saucelabs.com/u/handlebars)
+
 Performance
 -----------
 
@@ -101,18 +101,18 @@ does have some big performance advantages. Justin Marney, a.k.a.
 [gotascii](http://github.com/gotascii), confirmed that with an
 [independent test](http://sorescode.com/2010/09/12/benchmarks.html). The
 rewritten Handlebars (current version) is faster than the old version,
-with many performance tests being 5 to 7 times faster than the Mustache equivalent.
+with many [performance tests](https://travis-ci.org/wycats/handlebars.js/builds/33392182#L538) being 5 to 7 times faster than the Mustache equivalent.
 
 
 Upgrading
 ---------
 
-See [release-notes.md](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md) for upgrade notes.
+See [release-notes.md](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) for upgrade notes.
 
 Known Issues
 ------------
 
-See [FAQ.md](https://github.com/handlebars-lang/handlebars.js/blob/master/FAQ.md) for known issues and common pitfalls.
+See [FAQ.md](https://github.com/wycats/handlebars.js/blob/master/FAQ.md) for known issues and common pitfalls.
 
 
 Handlebars in the Wild
@@ -164,4 +164,4 @@ License
 -------
 Handlebars.js is released under the MIT license.
 
-[pull-request]: https://github.com/handlebars-lang/handlebars.js/pull/new/master
+[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,14 +1,12 @@
-var async = require('neo-async'),
+var async = require('async'),
-  fs = require('fs'),
+    fs = require('fs'),
-  zlib = require('zlib');
+    zlib = require('zlib');
 
 module.exports = function(grunt, callback) {
   var distFiles = fs.readdirSync('dist'),
-    distSizes = {};
+      distSizes = {};
 
-  async.each(
+  async.each(distFiles, function(file, callback) {
-    distFiles,
-    function(file, callback) {
       var content;
       try {
         content = fs.readFileSync('dist/' + file);
@@ -34,10 +32,7 @@ module.exports = function(grunt, callback) {
       });
     },
     function() {
-      grunt.log.writeln(
+      grunt.log.writeln('Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2));
-        'Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2)
-      );
       callback([distSizes]);
-    }
+    });
-  );
 };

bench/index.js

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

bench/precompile-size.js

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

bench/templates/arguments.js

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

bench/templates/array-each.js

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

bench/templates/array-mustache.js

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

bench/templates/complex.js

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

bench/templates/data.js

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

bench/templates/depth-1.js

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

bench/templates/depth-2.js

@@ -0,0 +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 %>'
+};

bench/templates/index.js

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

bench/templates/partial-recursion.js

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

bench/templates/partial.js

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

bench/templates/paths.js

@@ -0,0 +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}}'
+};

bench/templates/variables.js

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

bench/throughput.js

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

bench/util/benchwarmer.js

@@ -1,5 +1,5 @@
 var _ = require('underscore'),
-  Benchmark = require('benchmark');
+    Benchmark = require('benchmark');
 
 function BenchWarmer() {
   this.benchmarks = [];
@@ -11,6 +11,8 @@ function BenchWarmer() {
   this.errors = {};
 }
 
+var print = require('sys').print;
+
 BenchWarmer.prototype = {
   winners: function(benches) {
     return Benchmark.filter(benches, 'fastest');
@@ -27,25 +29,20 @@ BenchWarmer.prototype = {
     });
   },
   push: function(name, fn) {
-    if (this.names.indexOf(name) === -1) {
+    if (this.names.indexOf(name) == -1) {
       this.names.push(name);
     }
 
-    var first = this.first,
+    var first = this.first, suiteName = this.suiteName, self = this;
-      suiteName = this.suiteName,
-      self = this;
     this.first = false;
 
     var bench = new Benchmark(fn, {
       name: this.suiteName + ': ' + name,
       onComplete: function() {
-        if (first) {
+        if (first) { self.startLine(suiteName); }
-          self.startLine(suiteName);
-        }
         self.writeBench(bench);
         self.currentBenches.push(bench);
-      },
+      }, onError: function() {
-      onError: function() {
         self.errors[this.name] = this;
       }
     });
@@ -67,7 +64,7 @@ BenchWarmer.prototype = {
 
         self.startLine('');
 
-        console.log('\n');
+        print('\n');
         self.printHeader('scaled');
         _.each(self.scaled, function(value, name) {
           self.startLine(name);
@@ -76,77 +73,58 @@ BenchWarmer.prototype = {
             self.writeValue(value[lang] || '');
           });
         });
-        console.log('\n');
+        print('\n');
 
-        var errors = false,
+        var errors = false, prop, bench;
-          prop,
-          bench;
         for (prop in self.errors) {
-          if (
+          if (self.errors.hasOwnProperty(prop)
-            Object.prototype.hasOwnProperty.call(self, prop) &&
+              && self.errors[prop].error.message !== 'EWOT') {
-            self.errors[prop].error.message !== 'EWOT'
-          ) {
             errors = true;
             break;
           }
         }
 
         if (errors) {
-          console.log('\n\nErrors:\n');
+          print('\n\nErrors:\n');
-          Object.keys(self.errors).forEach(function(prop) {
+          for (prop in self.errors) {
-            if (self.errors[prop].error.message !== 'EWOT') {
+            if (self.errors.hasOwnProperty(prop)
+                && self.errors[prop].error.message !== 'EWOT') {
               bench = self.errors[prop];
-              console.log('\n' + bench.name + ':\n');
+              print('\n' + bench.name + ':\n');
-              console.log(bench.error.message);
+              print(bench.error.message);
               if (bench.error.stack) {
-                console.log(bench.error.stack.join('\n'));
+                print(bench.error.stack.join('\n'));
               }
-              console.log('\n');
+              print('\n');
             }
-          });
+          }
         }
 
         callback();
       }
     });
 
-    console.log('\n');
+    print('\n');
   },
 
   scaleTimes: function() {
-    var scaled = (this.scaled = {});
+    var scaled = this.scaled = {};
-    _.each(
+    _.each(this.times, function(times, name) {
-      this.times,
+      var output = scaled[name] = {};
-      function(times, name) {
-        var output = (scaled[name] = {});
 
-        _.each(
+      _.each(times, function(time, lang) {
-          times,
+        output[lang] = ((time - this.minimum) / (this.maximum - this.minimum) * 100).toFixed(2);
-          function(time, lang) {
+      }, this);
-            output[lang] = (
+    }, this);
-              ((time - this.minimum) / (this.maximum - this.minimum)) *
-              100
-            ).toFixed(2);
-          },
-          this
-        );
-      },
-      this
-    );
   },
 
   printHeader: function(title, winners) {
-    var benchSize = 0,
+    var benchSize = 0, names = this.names, i, l;
-      names = this.names,
-      i,
-      l;
 
     for (i = 0, l = names.length; i < l; i++) {
       var name = names[i];
 
-      if (benchSize < name.length) {
+      if (benchSize < name.length) { benchSize = name.length; }
-        benchSize = name.length;
-      }
     }
 
     this.nameSize = benchSize + 2;
@@ -161,24 +139,22 @@ BenchWarmer.prototype = {
     }
 
     if (winners) {
-      console.log('WINNER(S)');
+      print('WINNER(S)');
       horSize = horSize + 'WINNER(S)'.length;
     }
 
-    console.log('\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(
+    var winners = Benchmark.map(this.winners(this.currentBenches), function(bench) {
-      bench
-    ) {
       return bench.name.split(': ')[1];
     });
 
     this.currentBenches = [];
 
-    console.log(winners.join(', '));
+    print(winners.join(', '));
-    console.log('\n');
+    print('\n');
 
     if (name) {
       this.writeValue(name);
@@ -189,9 +165,9 @@ BenchWarmer.prototype = {
 
     if (!bench.error) {
       var count = bench.hz,
-        moe = (count * bench.stats.rme) / 100,
+          moe = count * bench.stats.rme / 100,
-        minimum,
+          minimum,
-        maximum;
+          maximum;
 
       count = Math.round(count / 1000);
       moe = Math.round(moe / 1000);
@@ -214,7 +190,7 @@ BenchWarmer.prototype = {
   writeValue: function(out) {
     var padding = this.benchSize - out.length + 1;
     out = out + new Array(padding).join(' ');
-    console.log(out);
+    print(out);
   }
 };
 

bench/util/template-runner.js

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

bin/.eslintrc.js

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

bin/handlebars

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

components/bower.json

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

components/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "components/handlebars.js",
     "description": "Handlebars.js and Mustache are both logicless templating languages that keep the view and the code separated like we all know they should be.",
-    "homepage": "https://handlebarsjs.com",
+    "homepage": "http://handlebarsjs.com",
     "license": "MIT",
     "type": "component",
     "keywords": [
@@ -11,9 +11,13 @@
     ],
     "authors": [
         {
-            "name": "Chris Wanstrath"
+            "name": "Chris Wanstrath",
+            "homepage": "http://chriswanstrath.com"
         }
     ],
+    "require": {
+        "robloach/component-installer": "*"
+    },
     "extra": {
         "component": {
             "name": "handlebars",

components/handlebars-source.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.date          = Time.now.strftime("%Y-%m-%d")
   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/handlebars-lang/handlebars.js/"
+  gem.homepage      = "https://github.com/wycats/handlebars.js/"
   gem.version       = package["version"].sub "-", "."
   gem.license       = "MIT"
 

components/handlebars.js.nuspec

@@ -2,10 +2,10 @@
 <package>
 	<metadata>
 		<id>handlebars.js</id>
-		<version>4.7.9</version>
+		<version>4.0.6</version>
 		<authors>handlebars.js Authors</authors>
-		<licenseUrl>https://github.com/handlebars-lang/handlebars.js/blob/master/LICENSE</licenseUrl>
+		<licenseUrl>https://github.com/wycats/handlebars.js/blob/master/LICENSE</licenseUrl>
-		<projectUrl>https://github.com/handlebars-lang/handlebars.js/</projectUrl>
+		<projectUrl>https://github.com/wycats/handlebars.js/</projectUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Extension of the Mustache logicless template language</description>
 		<releaseNotes></releaseNotes>

components/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "handlebars",
-  "version": "4.7.9",
-  "license": "MIT",
-  "jspm": {
-    "main": "handlebars",
-    "shim": {
-      "handlebars": {
-        "exports": "Handlebars"
-      }
-    },
-    "files": [
-      "handlebars.js",
-      "handlebars.runtime.js"
-    ],
-    "buildConfig": {
-      "minify": true
-    }
-  }
-}

docs/compiler-api.md

@@ -16,34 +16,6 @@ var ast = Handlebars.parse(myTemplate);
 Handlebars.precompile(ast);
 ```
 
-### Parsing
-
-There are two primary APIs that are used to parse an existing template into the AST:
-
-#### parseWithoutProcessing
-
-`Handlebars.parseWithoutProcessing` is the primary mechanism to turn a raw template string into the Handlebars AST described in this document. No processing is done on the resulting AST which makes this ideal for codemod (for source to source transformation) tooling.
-
-Example:
-
-```js
-let ast = Handlebars.parseWithoutProcessing(myTemplate);
-```
-
-#### parse
-
-`Handlebars.parse` will parse the template with `parseWithoutProcessing` (see above) then it will update the AST to strip extraneous whitespace. The whitespace stripping functionality handles two distinct situations:
-
-* Removes whitespace around dynamic statements that are on a line by themselves (aka "stand alone")
-* Applies "whitespace control" characters (i.e. `~`) by truncating the `ContentStatement` `value` property appropriately (e.g. `\n\n{{~foo}}` would have a `ContentStatement` with a `value` of `''`)
-
-`Handlebars.parse` is used internally by `Handlebars.precompile` and `Handlebars.compile`.
-
-Example:
-
-```js
-let ast = Handlebars.parse(myTemplate);
-```
 
 ### Basic
 
@@ -94,7 +66,7 @@ interface MustacheStatement <: Statement {
 
 interface BlockStatement <: Statement {
     type: "BlockStatement";
-    path: PathExpression | Literal;
+    path: PathExpression;
     params: [ Expression ];
     hash: Hash;
 
@@ -324,43 +296,21 @@ The `Handlebars.JavaScriptCompiler` object has a number of methods that may be c
 - `initializeBuffer()`
     Allows for buffers other than the default string buffer to be used. Generally needs to be paired with a custom `appendToBuffer` implementation.
 
-### Example for the compiler api.
-
-This example changes all lookups of properties are performed by a helper (`lookupLowerCase`) which looks for `test` if `{{Test}}` occurs in the template. This is just to illustrate how compiler behavior can be change.
-
-There is also [a jsfiddle with this code](https://jsfiddle.net/9D88g/162/) if you want to play around with it.
-
-
 ```javascript
 function MyCompiler() {
   Handlebars.JavaScriptCompiler.apply(this, arguments);
 }
-MyCompiler.prototype = new Handlebars.JavaScriptCompiler();
+MyCompiler.prototype = Object.create(Handlebars.JavaScriptCompiler);
 
-// Use this compile to compile BlockStatment-Blocks
+MyCompiler.nameLookup = function(parent, name, type) {
-MyCompiler.prototype.compiler = MyCompiler
+  if (type === 'partial') {
-
+    return 'MyPartialList[' + JSON.stringify(name) ']';
-MyCompiler.prototype.nameLookup = function(parent, name, type) {
-  if (type === 'context') {
-    return this.source.functionCall('helpers.lookupLowerCase', '', [parent, JSON.stringify(name)])
   } else {
     return Handlebars.JavaScriptCompiler.prototype.nameLookup.call(this, parent, name, type);
   }
-}
+};
 
 var env = Handlebars.create();
-env.registerHelper('lookupLowerCase', function(parent, name) {
-  return parent[name.toLowerCase()]
-})
-
 env.JavaScriptCompiler = MyCompiler;
-
+env.compile('my template');
-var template = env.compile('{{#each Test}} ({{Value}}) {{/each}}');
-console.log(template({
-  test: [ 
-    {value: 'a'},
-    {value: 'b'},
-    {value: 'c'}
-    ]
-}));
 ```

docs/decorators-api.md

@@ -16,4 +16,4 @@ Decorators are executed when the block program is instantiated and are passed `(
 
 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/handlebars-lang/handlebars.js/blob/master/lib/handlebars/decorators/inline.js) implementation provides an example of decorators being used for both metadata and wrapping behaviors.
+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/.eslintrc.js

@@ -1,8 +0,0 @@
-module.exports = {
-  env: {
-    // Handlebars should not use node or browser-specific APIs
-    'shared-node-browser': true,
-    node: false,
-    browser: false
-  }
-};

lib/handlebars.js

@@ -2,11 +2,7 @@ import runtime from './handlebars.runtime';
 
 // Compiler imports
 import AST from './handlebars/compiler/ast';
-import {
+import { parser as Parser, parse } from './handlebars/compiler/base';
-  parser as Parser,
-  parse,
-  parseWithoutProcessing
-} from './handlebars/compiler/base';
 import { Compiler, compile, precompile } from './handlebars/compiler/compiler';
 import JavaScriptCompiler from './handlebars/compiler/javascript-compiler';
 import Visitor from './handlebars/compiler/visitor';
@@ -29,7 +25,6 @@ function create() {
   hb.JavaScriptCompiler = JavaScriptCompiler;
   hb.Parser = Parser;
   hb.parse = parse;
-  hb.parseWithoutProcessing = parseWithoutProcessing;
 
   return hb;
 }

lib/handlebars/base.js

@@ -1,13 +1,11 @@
-import { createFrame, extend, toString } from './utils';
+import {createFrame, extend, toString} from './utils';
 import Exception from './exception';
-import { registerDefaultHelpers } from './helpers';
+import {registerDefaultHelpers} from './helpers';
-import { registerDefaultDecorators } from './decorators';
+import {registerDefaultDecorators} from './decorators';
 import logger from './logger';
-import { resetLoggedProperties } from './internal/proto-access';
 
-export const VERSION = '4.7.9';
+export const VERSION = '4.0.6';
-export const COMPILER_REVISION = 8;
+export const COMPILER_REVISION = 7;
-export const LAST_COMPATIBLE_COMPILER_REVISION = 7;
 
 export const REVISION_CHANGES = {
   1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
@@ -16,8 +14,7 @@ export const REVISION_CHANGES = {
   4: '== 1.x.x',
   5: '== 2.0.0-alpha.x',
   6: '>= 2.0.0-beta.1',
-  7: '>= 4.0.0 <4.3.0',
+  7: '>= 4.0.0'
-  8: '>= 4.3.0'
 };
 
 const objectType = '[object Object]';
@@ -39,9 +36,7 @@ HandlebarsEnvironment.prototype = {
 
   registerHelper: function(name, fn) {
     if (toString.call(name) === objectType) {
-      if (fn) {
+      if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-        throw new Exception('Arg not supported with multiple helpers');
-      }
       extend(this.helpers, name);
     } else {
       this.helpers[name] = fn;
@@ -56,9 +51,7 @@ HandlebarsEnvironment.prototype = {
       extend(this.partials, name);
     } else {
       if (typeof partial === 'undefined') {
-        throw new Exception(
+        throw new Exception(`Attempting to register a partial called "${name}" as undefined`);
-          `Attempting to register a partial called "${name}" as undefined`
-        );
       }
       this.partials[name] = partial;
     }
@@ -69,9 +62,7 @@ HandlebarsEnvironment.prototype = {
 
   registerDecorator: function(name, fn) {
     if (toString.call(name) === objectType) {
-      if (fn) {
+      if (fn) { throw new Exception('Arg not supported with multiple decorators'); }
-        throw new Exception('Arg not supported with multiple decorators');
-      }
       extend(this.decorators, name);
     } else {
       this.decorators[name] = fn;
@@ -79,16 +70,9 @@ HandlebarsEnvironment.prototype = {
   },
   unregisterDecorator: function(name) {
     delete this.decorators[name];
-  },
-  /**
-   * Reset the memory of illegal property accesses that have already been logged.
-   * @deprecated should only be used in handlebars test-cases
-   */
-  resetLoggedPropertyAccesses() {
-    resetLoggedProperties();
   }
 };
 
 export let log = logger.log;
 
-export { createFrame, logger };
+export {createFrame, logger};

lib/handlebars/compiler/ast.js

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

lib/handlebars/compiler/base.js

@@ -8,11 +8,9 @@ export { parser };
 let yy = {};
 extend(yy, Helpers);
 
-export function parseWithoutProcessing(input, options) {
+export function parse(input, options) {
   // Just return if an already-compiled AST was passed in.
-  if (input.type === 'Program') {
+  if (input.type === 'Program') { return input; }
-    return input;
-  }
 
   parser.yy = yy;
 
@@ -21,14 +19,6 @@ export function parseWithoutProcessing(input, options) {
     return new yy.SourceLocation(options && options.srcName, locInfo);
   };
 
-  let ast = parser.parse(input);
-
-  return ast;
-}
-
-export function parse(input, options) {
-  let ast = parseWithoutProcessing(input, options);
   let strip = new WhitespaceControl(options);
-
+  return strip.accept(parser.parse(input));
-  return strip.accept(ast);
 }

lib/handlebars/compiler/code-gen.js

@@ -1,12 +1,12 @@
-/* global define, require */
+/* global define */
-import { isArray } from '../utils';
+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 assume that
+    // 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;
@@ -38,7 +38,7 @@ if (!SourceNode) {
       this.src = chunks + this.src;
     },
     toStringWithSourceMap: function() {
-      return { code: this.toString() };
+      return {code: this.toString()};
     },
     toString: function() {
       return this.src;
@@ -46,6 +46,7 @@ if (!SourceNode) {
   };
 }
 
+
 function castChunk(chunk, codeGen, loc) {
   if (isArray(chunk)) {
     let ret = [];
@@ -61,6 +62,7 @@ function castChunk(chunk, codeGen, loc) {
   return chunk;
 }
 
+
 function CodeGen(srcFile) {
   this.srcFile = srcFile;
   this.source = [];
@@ -92,22 +94,17 @@ CodeGen.prototype = {
   },
 
   empty: function() {
-    let loc = this.currentLocation || { start: {} };
+    let loc = this.currentLocation || {start: {}};
     return new SourceNode(loc.start.line, loc.start.column, this.srcFile);
   },
-  wrap: function(chunk, loc = this.currentLocation || { start: {} }) {
+  wrap: function(chunk, loc = this.currentLocation || {start: {}}) {
     if (chunk instanceof SourceNode) {
       return chunk;
     }
 
     chunk = castChunk(chunk, this, loc);
 
-    return new SourceNode(
+    return new SourceNode(loc.start.line, loc.start.column, this.srcFile, chunk);
-      loc.start.line,
-      loc.start.column,
-      this.srcFile,
-      chunk
-    );
   },
 
   functionCall: function(fn, type, params) {
@@ -116,28 +113,26 @@ CodeGen.prototype = {
   },
 
   quotedString: function(str) {
-    return (
+    return '"' + (str + '')
-      '"' +
+      .replace(/\\/g, '\\\\')
-      (str + '')
+      .replace(/"/g, '\\"')
-        .replace(/\\/g, '\\\\')
+      .replace(/\n/g, '\\n')
-        .replace(/"/g, '\\"')
+      .replace(/\r/g, '\\r')
-        .replace(/\n/g, '\\n')
+      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\r/g, '\\r')
+      .replace(/\u2029/g, '\\u2029') + '"';
-        .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\u2029/g, '\\u2029') +
-      '"'
-    );
   },
 
   objectLiteral: function(obj) {
     let pairs = [];
 
-    Object.keys(obj).forEach(key => {
+    for (let key in obj) {
-      let value = castChunk(obj[key], this);
+      if (obj.hasOwnProperty(key)) {
-      if (value !== 'undefined') {
+        let value = castChunk(obj[key], this);
-        pairs.push([this.quotedString(key), ':', value]);
+        if (value !== 'undefined') {
+          pairs.push([this.quotedString(key), ':', value]);
+        }
       }
-    });
+    }
 
     let ret = this.generateList(pairs);
     ret.prepend('{');
@@ -145,6 +140,7 @@ CodeGen.prototype = {
     return ret;
   },
 
+
   generateList: function(entries) {
     let ret = this.empty();
 
@@ -169,3 +165,4 @@ CodeGen.prototype = {
 };
 
 export default CodeGen;
+

lib/handlebars/compiler/compiler.js

@@ -1,13 +1,7 @@
 /* eslint-disable new-cap */
 
 import Exception from '../exception';
-import {
+import {isArray, indexOf} from '../utils';
-  isArray,
-  indexOf,
-  extend,
-  sanitizeDepth,
-  sanitizeParts
-} from '../utils';
 import AST from './ast';
 
 const slice = [].slice;
@@ -30,11 +24,8 @@ Compiler.prototype = {
 
     for (let i = 0; i < len; i++) {
       let opcode = this.opcodes[i],
-        otherOpcode = other.opcodes[i];
+          otherOpcode = other.opcodes[i];
-      if (
+      if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
-        opcode.opcode !== otherOpcode.opcode ||
-        !argEquals(opcode.args, otherOpcode.args)
-      ) {
         return false;
       }
     }
@@ -63,28 +54,34 @@ Compiler.prototype = {
 
     options.blockParams = options.blockParams || [];
 
-    options.knownHelpers = extend(
+    // These changes will propagate to the other compiler components
-      Object.create(null),
+    let knownHelpers = options.knownHelpers;
-      {
+    options.knownHelpers = {
-        helperMissing: true,
+      'helperMissing': true,
-        blockHelperMissing: true,
+      'blockHelperMissing': true,
-        each: true,
+      'each': true,
-        if: true,
+      'if': true,
-        unless: true,
+      'unless': true,
-        with: true,
+      'with': true,
-        log: true,
+      'log': true,
-        lookup: true
+      'lookup': true
-      },
+    };
-      options.knownHelpers
+    if (knownHelpers) {
-    );
+      for (let name in knownHelpers) {
+        /* istanbul ignore else */
+        if (name in knownHelpers) {
+          options.knownHelpers[name] = knownHelpers[name];
+        }
+      }
+    }
 
     return this.accept(program);
   },
 
   compileProgram: function(program) {
     let childCompiler = new this.compiler(), // eslint-disable-line new-cap
-      result = childCompiler.compile(program, this.options),
+        result = childCompiler.compile(program, this.options),
-      guid = this.guid++;
+        guid = this.guid++;
 
     this.usePartial = this.usePartial || result.usePartial;
 
@@ -110,7 +107,7 @@ Compiler.prototype = {
     this.options.blockParams.unshift(program.blockParams);
 
     let body = program.body,
-      bodyLength = body.length;
+        bodyLength = body.length;
     for (let i = 0; i < bodyLength; i++) {
       this.accept(body[i]);
     }
@@ -127,7 +124,7 @@ Compiler.prototype = {
     transformLiteralToPath(block);
 
     let program = block.program,
-      inverse = block.inverse;
+        inverse = block.inverse;
 
     program = program && this.compileProgram(program);
     inverse = inverse && this.compileProgram(inverse);
@@ -162,7 +159,7 @@ Compiler.prototype = {
   DecoratorBlock(decorator) {
     let program = decorator.program && this.compileProgram(decorator.program);
     let params = this.setupFullMustacheParams(decorator, program, undefined),
-      path = decorator.path;
+        path = decorator.path;
 
     this.useDecorators = true;
     this.opcode('registerDecorator', params.length, path.original);
@@ -178,20 +175,17 @@ Compiler.prototype = {
 
     let params = partial.params;
     if (params.length > 1) {
-      throw new Exception(
+      throw new Exception('Unsupported number of partial arguments: ' + params.length, partial);
-        'Unsupported number of partial arguments: ' + params.length,
-        partial
-      );
     } else if (!params.length) {
       if (this.options.explicitPartialContext) {
         this.opcode('pushLiteral', 'undefined');
       } else {
-        params.push({ type: 'PathExpression', parts: [], depth: 0 });
+        params.push({type: 'PathExpression', parts: [], depth: 0});
       }
     }
 
     let partialName = partial.name.original,
-      isDynamic = partial.name.type === 'SubExpression';
+        isDynamic = partial.name.type === 'SubExpression';
     if (isDynamic) {
       this.accept(partial.name);
     }
@@ -224,6 +218,7 @@ Compiler.prototype = {
     this.DecoratorBlock(decorator);
   },
 
+
   ContentStatement: function(content) {
     if (content.value) {
       this.opcode('appendContent', content.value);
@@ -246,10 +241,10 @@ Compiler.prototype = {
   },
   ambiguousSexpr: function(sexpr, program, inverse) {
     let path = sexpr.path,
-      name = path.parts[0],
+        name = path.parts[0],
-      isBlock = program != null || inverse != null;
+        isBlock = program != null || inverse != null;
 
-    this.opcode('getContext', sanitizeDepth(path.depth));
+    this.opcode('getContext', path.depth);
 
     this.opcode('pushProgram', program);
     this.opcode('pushProgram', inverse);
@@ -269,57 +264,40 @@ Compiler.prototype = {
 
   helperSexpr: function(sexpr, program, inverse) {
     let params = this.setupFullMustacheParams(sexpr, program, inverse),
-      path = sexpr.path,
+        path = sexpr.path,
-      name = path.parts[0];
+        name = path.parts[0];
 
     if (this.options.knownHelpers[name]) {
       this.opcode('invokeKnownHelper', params.length, name);
     } else if (this.options.knownHelpersOnly) {
-      throw new Exception(
+      throw new Exception('You specified knownHelpersOnly, but used the unknown helper ' + name, sexpr);
-        'You specified knownHelpersOnly, but used the unknown helper ' + name,
-        sexpr
-      );
     } else {
       path.strict = true;
       path.falsy = true;
 
       this.accept(path);
-      this.opcode(
+      this.opcode('invokeHelper', params.length, path.original, AST.helpers.simpleId(path));
-        'invokeHelper',
-        params.length,
-        path.original,
-        AST.helpers.simpleId(path)
-      );
     }
   },
 
   PathExpression: function(path) {
-    // Sanitize untrusted AST values at the compiler boundary.
+    this.addDepth(path.depth);
-    // javascript-compiler.js trusts all opcode arguments to be safe.
+    this.opcode('getContext', path.depth);
-    const depth = sanitizeDepth(path.depth);
-    const parts = sanitizeParts(path.parts);
 
-    this.addDepth(depth);
+    let name = path.parts[0],
-    this.opcode('getContext', depth);
+        scoped = AST.helpers.scopedId(path),
-
+        blockParamId = !path.depth && !scoped && this.blockParamIndex(name);
-    let name = parts[0],
-      scoped = AST.helpers.scopedId(path),
-      blockParamId = !depth && !scoped && this.blockParamIndex(name);
 
     if (blockParamId) {
-      this.opcode(
+      this.opcode('lookupBlockParam', blockParamId, path.parts);
-        'lookupBlockParam',
-        [Number(blockParamId[0]), Number(blockParamId[1])],
-        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', depth, parts, path.strict);
+      this.opcode('lookupData', path.depth, path.parts, path.strict);
     } else {
-      this.opcode('lookupOnContext', parts, path.falsy, path.strict, scoped);
+      this.opcode('lookupOnContext', path.parts, path.falsy, path.strict, scoped);
     }
   },
 
@@ -328,11 +306,11 @@ Compiler.prototype = {
   },
 
   NumberLiteral: function(number) {
-    this.opcode('pushLiteral', Number(number.value));
+    this.opcode('pushLiteral', number.value);
   },
 
   BooleanLiteral: function(bool) {
-    this.opcode('pushLiteral', bool.value === true ? 'true' : 'false');
+    this.opcode('pushLiteral', bool.value);
   },
 
   UndefinedLiteral: function() {
@@ -345,8 +323,8 @@ Compiler.prototype = {
 
   Hash: function(hash) {
     let pairs = hash.pairs,
-      i = 0,
+        i = 0,
-      l = pairs.length;
+        l = pairs.length;
 
     this.opcode('pushHash');
 
@@ -361,11 +339,7 @@ Compiler.prototype = {
 
   // HELPERS
   opcode: function(name) {
-    this.opcodes.push({
+    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
-      opcode: name,
-      args: slice.call(arguments, 1),
-      loc: this.sourceNode[0].loc
-    });
   },
 
   addDepth: function(depth) {
@@ -394,7 +368,8 @@ Compiler.prototype = {
     // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
     if (isEligible && !isHelper) {
       let name = sexpr.path.parts[0],
-        options = this.options;
+          options = this.options;
+
       if (options.knownHelpers[name]) {
         isHelper = true;
       } else if (options.knownHelpersOnly) {
@@ -419,16 +394,18 @@ Compiler.prototype = {
 
   pushParam: function(val) {
     let value = val.value != null ? val.value : val.original || '';
-    let depth = sanitizeDepth(val.depth);
 
     if (this.stringParams) {
       if (value.replace) {
-        value = value.replace(/^(\.?\.\/)*/g, '').replace(/\//g, '.');
+        value = value
+            .replace(/^(\.?\.\/)*/g, '')
+            .replace(/\//g, '.');
       }
-      if (depth) {
+
-        this.addDepth(depth);
+      if (val.depth) {
+        this.addDepth(val.depth);
       }
-      this.opcode('getContext', depth);
+      this.opcode('getContext', val.depth || 0);
       this.opcode('pushStringParam', value, val.type);
 
       if (val.type === 'SubExpression') {
@@ -440,7 +417,7 @@ Compiler.prototype = {
       if (this.trackIds) {
         let blockParamIndex;
         if (val.parts && !AST.helpers.scopedId(val) && !val.depth) {
-          blockParamIndex = this.blockParamIndex(val.parts[0]);
+           blockParamIndex = this.blockParamIndex(val.parts[0]);
         }
         if (blockParamIndex) {
           let blockParamChild = val.parts.slice(1).join('.');
@@ -449,9 +426,9 @@ Compiler.prototype = {
           value = val.original || value;
           if (value.replace) {
             value = value
-              .replace(/^this(?:\.|$)/, '')
+                .replace(/^this(?:\.|$)/, '')
-              .replace(/^\.\//, '')
+                .replace(/^\.\//, '')
-              .replace(/^\.$/, '');
+                .replace(/^\.$/, '');
           }
 
           this.opcode('pushId', val.type, value);
@@ -478,13 +455,9 @@ Compiler.prototype = {
   },
 
   blockParamIndex: function(name) {
-    for (
+    for (let depth = 0, len = this.options.blockParams.length; depth < len; depth++) {
-      let depth = 0, len = this.options.blockParams.length;
-      depth < len;
-      depth++
-    ) {
       let blockParams = this.options.blockParams[depth],
-        param = blockParams && indexOf(blockParams, name);
+          param = blockParams && indexOf(blockParams, name);
       if (blockParams && param >= 0) {
         return [depth, param];
       }
@@ -493,14 +466,8 @@ Compiler.prototype = {
 };
 
 export function precompile(input, options, env) {
-  if (
+  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    input == null ||
+    throw new Exception('You must pass a string or Handlebars AST to Handlebars.precompile. You passed ' + input);
-    (typeof input !== 'string' && input.type !== 'Program')
-  ) {
-    throw new Exception(
-      'You must pass a string or Handlebars AST to Handlebars.precompile. You passed ' +
-        input
-    );
   }
 
   options = options || {};
@@ -512,22 +479,15 @@ export function precompile(input, options, env) {
   }
 
   let ast = env.parse(input, options),
-    environment = new env.Compiler().compile(ast, options);
+      environment = new env.Compiler().compile(ast, options);
   return new env.JavaScriptCompiler().compile(environment, options);
 }
 
 export function compile(input, options = {}, env) {
-  if (
+  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    input == null ||
+    throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
-    (typeof input !== 'string' && input.type !== 'Program')
-  ) {
-    throw new Exception(
-      'You must pass a string or Handlebars AST to Handlebars.compile. You passed ' +
-        input
-    );
   }
 
-  options = extend({}, options);
   if (!('data' in options)) {
     options.data = true;
   }
@@ -539,13 +499,8 @@ export function compile(input, options = {}, env) {
 
   function compileInput() {
     let ast = env.parse(input, options),
-      environment = new env.Compiler().compile(ast, options),
+        environment = new env.Compiler().compile(ast, options),
-      templateSpec = new env.JavaScriptCompiler().compile(
+        templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
-        environment,
-        options,
-        undefined,
-        true
-      );
     return env.template(templateSpec);
   }
 

lib/handlebars/compiler/helpers.js

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

lib/handlebars/compiler/javascript-compiler.js

@@ -1,6 +1,6 @@
 import { COMPILER_REVISION, REVISION_CHANGES } from '../base';
 import Exception from '../exception';
-import { isArray } from '../utils';
+import {isArray} from '../utils';
 import CodeGen from './code-gen';
 
 function Literal(value) {
@@ -12,21 +12,20 @@ function JavaScriptCompiler() {}
 JavaScriptCompiler.prototype = {
   // PUBLIC API: You can override these methods in a subclass to provide
   // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /*,  type */) {
+  nameLookup: function(parent, name/* , type*/) {
-    return this.internalNameLookup(parent, name);
+    if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+      return [parent, '.', name];
+    } else {
+      return [parent, '[', JSON.stringify(name), ']'];
+    }
   },
   depthedLookup: function(name) {
-    return [
+    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
-      this.aliasable('container.lookup'),
-      '(depths, ',
-      JSON.stringify(name),
-      ')'
-    ];
   },
 
   compilerInfo: function() {
     const revision = COMPILER_REVISION,
-      versions = REVISION_CHANGES[revision];
+          versions = REVISION_CHANGES[revision];
     return [revision, versions];
   },
 
@@ -54,12 +53,6 @@ JavaScriptCompiler.prototype = {
     return this.quotedString('');
   },
   // END PUBLIC API
-  internalNameLookup: function(parent, name) {
-    this.lookupPropertyFunctionIsUsed = true;
-    return ['lookupProperty(', parent, ',', JSON.stringify(name), ')'];
-  },
-
-  lookupPropertyFunctionIsUsed: false,
 
   compile: function(environment, options, context, asObject) {
     this.environment = environment;
@@ -89,18 +82,14 @@ JavaScriptCompiler.prototype = {
 
     this.compileChildren(environment, options);
 
-    this.useDepths =
+    this.useDepths = this.useDepths || environment.useDepths || environment.useDecorators || this.options.compat;
-      this.useDepths ||
-      environment.useDepths ||
-      environment.useDecorators ||
-      this.options.compat;
     this.useBlockParams = this.useBlockParams || environment.useBlockParams;
 
     let opcodes = environment.opcodes,
-      opcode,
+        opcode,
-      firstLoc,
+        firstLoc,
-      i,
+        i,
-      l;
+        l;
 
     for (i = 0, l = opcodes.length; i < l; i++) {
       opcode = opcodes[i];
@@ -122,28 +111,13 @@ JavaScriptCompiler.prototype = {
     if (!this.decorators.isEmpty()) {
       this.useDecorators = true;
 
-      this.decorators.prepend([
+      this.decorators.prepend('var decorators = container.decorators;\n');
-        'var decorators = container.decorators, ',
-        this.lookupPropertyFunctionVarDeclaration(),
-        ';\n'
-      ]);
       this.decorators.push('return fn;');
 
       if (asObject) {
-        this.decorators = Function.apply(this, [
+        this.decorators = Function.apply(this, ['fn', 'props', 'container', 'depth0', 'data', 'blockParams', 'depths', this.decorators.merge()]);
-          'fn',
-          'props',
-          'container',
-          'depth0',
-          'data',
-          'blockParams',
-          'depths',
-          this.decorators.merge()
-        ]);
       } else {
-        this.decorators.prepend(
+        this.decorators.prepend('function(fn, props, container, depth0, data, blockParams, depths) {\n');
-          'function(fn, props, container, depth0, data, blockParams, depths) {\n'
-        );
         this.decorators.push('}\n');
         this.decorators = this.decorators.merge();
       }
@@ -159,16 +133,18 @@ JavaScriptCompiler.prototype = {
       };
 
       if (this.decorators) {
-        ret.main_d = this.decorators; // eslint-disable-line camelcase
+        ret.main_d = this.decorators;   // eslint-disable-line camelcase
         ret.useDecorators = true;
       }
 
-      let { programs, decorators } = this.context;
+      let {programs, decorators} = this.context;
       for (i = 0, l = programs.length; i < l; i++) {
-        ret[i] = programs[i];
+        if (programs[i]) {
-        if (decorators[i]) {
+          ret[i] = programs[i];
-          ret[i + '_d'] = decorators[i];
+          if (decorators[i]) {
-          ret.useDecorators = true;
+            ret[i + '_d'] = decorators[i];
+            ret.useDecorators = true;
+          }
         }
       }
 
@@ -191,11 +167,11 @@ JavaScriptCompiler.prototype = {
       if (!asObject) {
         ret.compiler = JSON.stringify(ret.compiler);
 
-        this.source.currentLocation = { start: { line: 1, column: 0 } };
+        this.source.currentLocation = {start: {line: 1, column: 0}};
         ret = this.objectLiteral(ret);
 
         if (options.srcName) {
-          ret = ret.toStringWithSourceMap({ file: options.destName });
+          ret = ret.toStringWithSourceMap({file: options.destName});
           ret.map = ret.map && ret.map.toString();
         } else {
           ret = ret.toString();
@@ -233,16 +209,13 @@ JavaScriptCompiler.prototype = {
     // aliases will not be used, but this case is already being run on the client and
     // we aren't concern about minimizing the template size.
     let aliasCount = 0;
-    Object.keys(this.aliases).forEach(alias => {
+    for (let alias in this.aliases) {    // eslint-disable-line guard-for-in
       let node = this.aliases[alias];
-      if (node.children && node.referenceCount > 1) {
+
-        varDeclarations += ', alias' + ++aliasCount + '=' + alias;
+      if (this.aliases.hasOwnProperty(alias) && node.children && node.referenceCount > 1) {
+        varDeclarations += ', alias' + (++aliasCount) + '=' + alias;
         node.children[0] = 'alias' + aliasCount;
       }
-    });
-
-    if (this.lookupPropertyFunctionIsUsed) {
-      varDeclarations += ', ' + this.lookupPropertyFunctionVarDeclaration();
     }
 
     let params = ['container', 'depth0', 'helpers', 'partials', 'data'];
@@ -262,23 +235,18 @@ JavaScriptCompiler.prototype = {
 
       return Function.apply(this, params);
     } else {
-      return this.source.wrap([
+      return this.source.wrap(['function(', params.join(','), ') {\n  ', source, '}']);
-        'function(',
-        params.join(','),
-        ') {\n  ',
-        source,
-        '}'
-      ]);
     }
   },
   mergeSource: function(varDeclarations) {
     let isSimple = this.environment.isSimple,
-      appendOnly = !this.forceBuffer,
+        appendOnly = !this.forceBuffer,
-      appendFirst,
+        appendFirst,
-      sourceSeen,
+
-      bufferStart,
+        sourceSeen,
-      bufferEnd;
+        bufferStart,
-    this.source.each(line => {
+        bufferEnd;
+    this.source.each((line) => {
       if (line.appendToBuffer) {
         if (bufferStart) {
           line.prepend('  + ');
@@ -304,6 +272,7 @@ JavaScriptCompiler.prototype = {
       }
     });
 
+
     if (appendOnly) {
       if (bufferStart) {
         bufferStart.prepend('return ');
@@ -312,8 +281,7 @@ JavaScriptCompiler.prototype = {
         this.source.push('return "";');
       }
     } else {
-      varDeclarations +=
+      varDeclarations += ', buffer = ' + (appendFirst ? '' : this.initializeBuffer());
-        ', buffer = ' + (appendFirst ? '' : this.initializeBuffer());
 
       if (bufferStart) {
         bufferStart.prepend('return buffer + ');
@@ -324,25 +292,12 @@ JavaScriptCompiler.prototype = {
     }
 
     if (varDeclarations) {
-      this.source.prepend(
+      this.source.prepend('var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n'));
-        'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n')
-      );
     }
 
     return this.source.merge();
   },
 
-  lookupPropertyFunctionVarDeclaration: function() {
-    return `
-      lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    }
-    `.trim();
-  },
-
   // [blockValue]
   //
   // On stack, before: hash, inverse, program, value
@@ -353,10 +308,8 @@ JavaScriptCompiler.prototype = {
   // replace it on the stack with the result of properly
   // invoking blockHelperMissing.
   blockValue: function(name) {
-    let blockHelperMissing = this.aliasable(
+    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
-        'container.hooks.blockHelperMissing'
+        params = [this.contextName(0)];
-      ),
-      params = [this.contextName(0)];
     this.setupHelperArgs(name, 0, params);
 
     let blockName = this.popStack();
@@ -373,10 +326,8 @@ JavaScriptCompiler.prototype = {
   // On stack, after, if lastHelper: value
   ambiguousBlockValue: function() {
     // We're being a bit cheeky and reusing the options value from the prior exec
-    let blockHelperMissing = this.aliasable(
+    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
-        'container.hooks.blockHelperMissing'
+        params = [this.contextName(0)];
-      ),
-      params = [this.contextName(0)];
     this.setupHelperArgs('', 0, params, true);
 
     this.flushInline();
@@ -385,14 +336,9 @@ JavaScriptCompiler.prototype = {
     params.splice(1, 0, current);
 
     this.pushSource([
-      'if (!',
+        'if (!', this.lastHelper, ') { ',
-      this.lastHelper,
+          current, ' = ', this.source.functionCall(blockHelperMissing, 'call', params),
-      ') { ',
+        '}']);
-      current,
-      ' = ',
-      this.source.functionCall(blockHelperMissing, 'call', params),
-      '}'
-    ]);
   },
 
   // [appendContent]
@@ -422,24 +368,14 @@ JavaScriptCompiler.prototype = {
   // Otherwise, the empty string is appended
   append: function() {
     if (this.isInline()) {
-      this.replaceStack(current => [' != null ? ', current, ' : ""']);
+      this.replaceStack((current) => [' != null ? ', current, ' : ""']);
 
       this.pushSource(this.appendToBuffer(this.popStack()));
     } else {
       let local = this.popStack();
-      this.pushSource([
+      this.pushSource(['if (', local, ' != null) { ', this.appendToBuffer(local, undefined, true), ' }']);
-        'if (',
-        local,
-        ' != null) { ',
-        this.appendToBuffer(local, undefined, true),
-        ' }'
-      ]);
       if (this.environment.isSimple) {
-        this.pushSource([
+        this.pushSource(['else { ', this.appendToBuffer("''", undefined, true), ' }']);
-          'else { ',
-          this.appendToBuffer("''", undefined, true),
-          ' }'
-        ]);
       }
     }
   },
@@ -451,14 +387,8 @@ JavaScriptCompiler.prototype = {
   //
   // Escape `value` and append it to the buffer
   appendEscaped: function() {
-    this.pushSource(
+    this.pushSource(this.appendToBuffer(
-      this.appendToBuffer([
+        [this.aliasable('container.escapeExpression'), '(', this.popStack(), ')']));
-        this.aliasable('container.escapeExpression'),
-        '(',
-        this.popStack(),
-        ')'
-      ])
-    );
   },
 
   // [getContext]
@@ -533,24 +463,16 @@ JavaScriptCompiler.prototype = {
     this.resolvePath('data', parts, 0, true, strict);
   },
 
-  resolvePath: function(type, parts, startPartIndex, falsy, strict) {
+  resolvePath: function(type, parts, i, falsy, strict) {
     if (this.options.strict || this.options.assumeObjects) {
-      this.push(
+      this.push(strictLookup(this.options.strict && strict, this, parts, type));
-        strictLookup(
-          this.options.strict && strict,
-          this,
-          parts,
-          startPartIndex,
-          type
-        )
-      );
       return;
     }
 
     let len = parts.length;
-    for (let i = startPartIndex; i < len; i++) {
+    for (; i < len; i++) {
       /* eslint-disable no-loop-func */
-      this.replaceStack(current => {
+      this.replaceStack((current) => {
         let lookup = this.nameLookup(current, parts[i], type);
         // We want to ensure that zero and false are handled properly if the context (falsy flag)
         // needs to have the special handling for these values.
@@ -573,14 +495,7 @@ JavaScriptCompiler.prototype = {
   // If the `value` is a lambda, replace it on the stack by
   // the return value of the lambda
   resolvePossibleLambda: function() {
-    this.push([
+    this.push([this.aliasable('container.lambda'), '(', this.popStack(), ', ', this.contextName(0), ')']);
-      this.aliasable('container.lambda'),
-      '(',
-      this.popStack(),
-      ', ',
-      this.contextName(0),
-      ')'
-    ]);
   },
 
   // [pushStringParam]
@@ -620,7 +535,7 @@ JavaScriptCompiler.prototype = {
     if (this.hash) {
       this.hashes.push(this.hash);
     }
-    this.hash = { values: {}, types: [], contexts: [], ids: [] };
+    this.hash = {values: [], types: [], contexts: [], ids: []};
   },
   popHash: function() {
     let hash = this.hash;
@@ -684,25 +599,11 @@ JavaScriptCompiler.prototype = {
   // and inserts the decorator into the decorators list.
   registerDecorator(paramSize, name) {
     let foundDecorator = this.nameLookup('decorators', name, 'decorator'),
-      options = this.setupHelperArgs(name, paramSize);
+        options = this.setupHelperArgs(name, paramSize);
 
-    // Store the resolved decorator in a variable and verify it is a function before
-    // calling it. Without this, unregistered decorators can cause an unhandled TypeError
-    // (calling undefined), which crashes the process — enabling Denial of Service.
-    this.decorators.push(['var decorator = ', foundDecorator, ';']);
-    this.decorators.push([
-      'if (typeof decorator !== "function") { throw new Error(',
-      this.quotedString('Missing decorator: "' + name + '"'),
-      '); }'
-    ]);
     this.decorators.push([
       'fn = ',
-      this.decorators.functionCall('decorator', '', [
+      this.decorators.functionCall(foundDecorator, '', ['fn', 'props', 'container', options]),
-        'fn',
-        'props',
-        'container',
-        options
-      ]),
       ' || fn;'
     ]);
   },
@@ -718,43 +619,18 @@ JavaScriptCompiler.prototype = {
   // If the helper is not found, `helperMissing` is called.
   invokeHelper: function(paramSize, name, isSimple) {
     let nonHelper = this.popStack(),
-      helper = this.setupHelper(paramSize, name);
+        helper = this.setupHelper(paramSize, name),
+        simple = isSimple ? [helper.name, ' || '] : '';
 
-    let possibleFunctionCalls = [];
+    let lookup = ['('].concat(simple, nonHelper);
-
-    if (isSimple) {
-      // direct call to helper
-      possibleFunctionCalls.push(helper.name);
-    }
-    // call a function from the input object
-    possibleFunctionCalls.push(nonHelper);
     if (!this.options.strict) {
-      possibleFunctionCalls.push(
+      lookup.push(' || ', this.aliasable('helpers.helperMissing'));
-        this.aliasable('container.hooks.helperMissing')
-      );
     }
+    lookup.push(')');
 
-    let functionLookupCode = [
+    this.push(this.source.functionCall(lookup, 'call', helper.callParams));
-      '(',
-      this.itemsSeparatedBy(possibleFunctionCalls, '||'),
-      ')'
-    ];
-    let functionCall = this.source.functionCall(
-      functionLookupCode,
-      'call',
-      helper.callParams
-    );
-    this.push(functionCall);
   },
 
-  itemsSeparatedBy: function(items, separator) {
-    let result = [];
-    result.push(items[0]);
-    for (let i = 1; i < items.length; i++) {
-      result.push(separator, items[i]);
-    }
-    return result;
-  },
   // [invokeKnownHelper]
   //
   // On stack, before: hash, inverse, program, params..., ...
@@ -787,31 +663,22 @@ JavaScriptCompiler.prototype = {
     this.emptyHash();
     let helper = this.setupHelper(0, name, helperCall);
 
-    let helperName = (this.lastHelper = this.nameLookup(
+    let helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-      'helpers',
-      name,
-      'helper'
-    ));
 
     let lookup = ['(', '(helper = ', helperName, ' || ', nonHelper, ')'];
     if (!this.options.strict) {
       lookup[0] = '(helper = ';
       lookup.push(
         ' != null ? helper : ',
-        this.aliasable('container.hooks.helperMissing')
+        this.aliasable('helpers.helperMissing')
       );
     }
 
     this.push([
-      '(',
+        '(', lookup,
-      lookup,
+        (helper.paramsInit ? ['),(', helper.paramsInit] : []), '),',
-      helper.paramsInit ? ['),(', helper.paramsInit] : [],
+        '(typeof helper === ', this.aliasable('"function"'), ' ? ',
-      '),',
+        this.source.functionCall('helper', 'call', helper.callParams), ' : helper))'
-      '(typeof helper === ',
-      this.aliasable('"function"'),
-      ' ? ',
-      this.source.functionCall('helper', 'call', helper.callParams),
-      ' : helper))'
     ]);
   },
 
@@ -824,7 +691,7 @@ JavaScriptCompiler.prototype = {
   // and pushes the result of the invocation back.
   invokePartial: function(isDynamic, name, indent) {
     let params = [],
-      options = this.setupParams(name, 1, params);
+        options = this.setupParams(name, 1, params);
 
     if (isDynamic) {
       name = this.popStack();
@@ -861,9 +728,9 @@ JavaScriptCompiler.prototype = {
   // Pops a value off the stack and assigns it to the current hash
   assignToHash: function(key) {
     let value = this.popStack(),
-      context,
+        context,
-      type,
+        type,
-      id;
+        id;
 
     if (this.trackIds) {
       id = this.popStack();
@@ -889,13 +756,8 @@ JavaScriptCompiler.prototype = {
   pushId: function(type, name, child) {
     if (type === 'BlockParam') {
       this.pushStackLiteral(
-        'blockParams[' +
+          'blockParams[' + name[0] + '].path[' + name[1] + ']'
-          name[0] +
+          + (child ? ' + ' + JSON.stringify('.' + child) : ''));
-          '].path[' +
-          name[1] +
-          ']' +
-          (child ? ' + ' + JSON.stringify('.' + child) : '')
-      );
     } else if (type === 'PathExpression') {
       this.pushString(name);
     } else if (type === 'SubExpression') {
@@ -910,27 +772,20 @@ JavaScriptCompiler.prototype = {
   compiler: JavaScriptCompiler,
 
   compileChildren: function(environment, options) {
-    let children = environment.children,
+    let children = environment.children, child, compiler;
-      child,
-      compiler;
 
     for (let i = 0, l = children.length; i < l; i++) {
       child = children[i];
-      compiler = new this.compiler(); // eslint-disable-line new-cap
+      compiler = new this.compiler();    // eslint-disable-line new-cap
 
       let existing = this.matchExistingProgram(child);
 
       if (existing == null) {
-        // Placeholder to prevent name conflicts for nested children
+        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-        let index = this.context.programs.push('') - 1;
+        let index = this.context.programs.length;
         child.index = index;
         child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(
+        this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
-          child,
-          options,
-          this.context,
-          !this.precompile
-        );
         this.context.decorators[index] = compiler.decorators;
         this.context.environments[index] = child;
 
@@ -958,7 +813,7 @@ JavaScriptCompiler.prototype = {
 
   programExpression: function(guid) {
     let child = this.environment.children[guid],
-      programParams = [child.index, 'data', child.blockParams];
+        programParams = [child.index, 'data', child.blockParams];
 
     if (this.useBlockParams || this.useDepths) {
       programParams.push('blockParams');
@@ -993,11 +848,7 @@ JavaScriptCompiler.prototype = {
   pushSource: function(source) {
     if (this.pendingContent) {
       this.source.push(
-        this.appendToBuffer(
+          this.appendToBuffer(this.source.quotedString(this.pendingContent), this.pendingLocation));
-          this.source.quotedString(this.pendingContent),
-          this.pendingLocation
-        )
-      );
       this.pendingContent = undefined;
     }
 
@@ -1008,9 +859,9 @@ JavaScriptCompiler.prototype = {
 
   replaceStack: function(callback) {
     let prefix = ['('],
-      stack,
+        stack,
-      createdStack,
+        createdStack,
-      usedLiteral;
+        usedLiteral;
 
     /* istanbul ignore next */
     if (!this.isInline()) {
@@ -1047,9 +898,7 @@ JavaScriptCompiler.prototype = {
 
   incrStack: function() {
     this.stackSlot++;
-    if (this.stackSlot > this.stackVars.length) {
+    if (this.stackSlot > this.stackVars.length) { this.stackVars.push('stack' + this.stackSlot); }
-      this.stackVars.push('stack' + this.stackSlot);
-    }
     return this.topStackName();
   },
   topStackName: function() {
@@ -1076,9 +925,9 @@ JavaScriptCompiler.prototype = {
 
   popStack: function(wrapped) {
     let inline = this.isInline(),
-      item = (inline ? this.inlineStack : this.compileStack).pop();
+        item = (inline ? this.inlineStack : this.compileStack).pop();
 
-    if (!wrapped && item instanceof Literal) {
+    if (!wrapped && (item instanceof Literal)) {
       return item.value;
     } else {
       if (!inline) {
@@ -1093,8 +942,8 @@ JavaScriptCompiler.prototype = {
   },
 
   topStack: function() {
-    let stack = this.isInline() ? this.inlineStack : this.compileStack,
+    let stack = (this.isInline() ? this.inlineStack : this.compileStack),
-      item = stack[stack.length - 1];
+        item = stack[stack.length - 1];
 
     /* istanbul ignore if */
     if (item instanceof Literal) {
@@ -1136,13 +985,9 @@ JavaScriptCompiler.prototype = {
 
   setupHelper: function(paramSize, name, blockHelper) {
     let params = [],
-      paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
+        paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
     let foundHelper = this.nameLookup('helpers', name, 'helper'),
-      callContext = this.aliasable(
+        callContext = this.aliasable(`${this.contextName(0)} != null ? ${this.contextName(0)} : {}`);
-        `${this.contextName(0)} != null ? ${this.contextName(
-          0
-        )} : (container.nullContext || {})`
-      );
 
     return {
       params: params,
@@ -1154,11 +999,11 @@ JavaScriptCompiler.prototype = {
 
   setupParams: function(helper, paramSize, params) {
     let options = {},
-      contexts = [],
+        contexts = [],
-      types = [],
+        types = [],
-      ids = [],
+        ids = [],
-      objectArgs = !params,
+        objectArgs = !params,
-      param;
+        param;
 
     if (objectArgs) {
       params = [];
@@ -1176,7 +1021,7 @@ JavaScriptCompiler.prototype = {
     }
 
     let inverse = this.popStack(),
-      program = this.popStack();
+        program = this.popStack();
 
     // Avoid setting fn and inverse if neither are set. This allows
     // helpers to do a check for `if (options.fn)`
@@ -1224,7 +1069,6 @@ JavaScriptCompiler.prototype = {
 
   setupHelperArgs: function(helper, paramSize, params, useRegister) {
     let options = this.setupParams(helper, paramSize, params);
-    options.loc = JSON.stringify(this.source.currentLocation);
     options = this.objectLiteral(options);
     if (useRegister) {
       this.useRegister('options');
@@ -1239,6 +1083,7 @@ JavaScriptCompiler.prototype = {
   }
 };
 
+
 (function() {
   const reservedWords = (
     'break else new var' +
@@ -1259,45 +1104,31 @@ JavaScriptCompiler.prototype = {
     ' null true false'
   ).split(' ');
 
-  const compilerWords = (JavaScriptCompiler.RESERVED_WORDS = {});
+  const compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
 
   for (let i = 0, l = reservedWords.length; i < l; i++) {
     compilerWords[reservedWords[i]] = true;
   }
-})();
+}());
 
-/**
- * @deprecated May be removed in the next major version
- */
 JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  return (
+  return !JavaScriptCompiler.RESERVED_WORDS[name] && (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/).test(name);
-    !JavaScriptCompiler.RESERVED_WORDS[name] &&
-    /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)
-  );
 };
 
-function strictLookup(requireTerminal, compiler, parts, startPartIndex, type) {
+function strictLookup(requireTerminal, compiler, parts, type) {
   let stack = compiler.popStack(),
-    len = parts.length;
+      i = 0,
+      len = parts.length;
   if (requireTerminal) {
     len--;
   }
 
-  for (let i = startPartIndex; i < len; i++) {
+  for (; i < len; i++) {
     stack = compiler.nameLookup(stack, parts[i], type);
   }
 
   if (requireTerminal) {
-    return [
+    return [compiler.aliasable('container.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ')'];
-      compiler.aliasable('container.strict'),
-      '(',
-      stack,
-      ', ',
-      compiler.quotedString(parts[len]),
-      ', ',
-      JSON.stringify(compiler.source.currentLocation),
-      ' )'
-    ];
   } else {
     return stack;
   }

lib/handlebars/compiler/printer.js

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

lib/handlebars/compiler/visitor.js

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

lib/handlebars/compiler/whitespace-control.js

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

lib/handlebars/decorators.js

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

lib/handlebars/decorators/inline.js

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

lib/handlebars/exception.js

@@ -1,26 +1,13 @@
-const errorProps = [
+
-  'description',
+const errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-  'fileName',
-  'lineNumber',
-  'endLineNumber',
-  'message',
-  'name',
-  'number',
-  'stack'
-];
 
 function Exception(message, node) {
   let loc = node && node.loc,
-    line,
+      line,
-    endLineNumber,
+      column;
-    column,
-    endColumn;
-
   if (loc) {
     line = loc.start.line;
-    endLineNumber = loc.end.line;
     column = loc.start.column;
-    endColumn = loc.end.column;
 
     message += ' - ' + line + ':' + column;
   }
@@ -40,7 +27,6 @@ function Exception(message, node) {
   try {
     if (loc) {
       this.lineNumber = line;
-      this.endLineNumber = endLineNumber;
 
       // Work around issue under safari where we can't directly set the column value
       /* istanbul ignore next */
@@ -49,13 +35,8 @@ function Exception(message, node) {
           value: column,
           enumerable: true
         });
-        Object.defineProperty(this, 'endColumn', {
-          value: endColumn,
-          enumerable: true
-        });
       } else {
         this.column = column;
-        this.endColumn = endColumn;
       }
     }
   } catch (nop) {

lib/handlebars/helpers.js

@@ -15,13 +15,3 @@ export function registerDefaultHelpers(instance) {
   registerLookup(instance);
   registerWith(instance);
 }
-
-export function moveHelperToHooks(instance, helperName, keepHelper) {
-  if (instance.helpers[helperName]) {
-    instance.hooks[helperName] = instance.helpers[helperName];
-    if (!keepHelper) {
-      // Using delete is slow
-      instance.helpers[helperName] = undefined;
-    }
-  }
-}

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

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

lib/handlebars/helpers/each.js

@@ -1,10 +1,4 @@
-import {
+import {appendContextPath, blockParams, createFrame, isArray, isFunction} from '../utils';
-  appendContextPath,
-  blockParams,
-  createFrame,
-  isArray,
-  isFunction
-} from '../utils';
 import Exception from '../exception';
 
 export default function(instance) {
@@ -14,20 +8,17 @@ export default function(instance) {
     }
 
     let fn = options.fn,
-      inverse = options.inverse,
+        inverse = options.inverse,
-      i = 0,
+        i = 0,
-      ret = '',
+        ret = '',
-      data,
+        data,
-      contextPath;
+        contextPath;
 
     if (options.data && options.ids) {
-      contextPath =
+      contextPath = appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-        appendContextPath(options.data.contextPath, options.ids[0]) + '.';
     }
 
-    if (isFunction(context)) {
+    if (isFunction(context)) { context = context.call(this); }
-      context = context.call(this);
-    }
 
     if (options.data) {
       data = createFrame(options.data);
@@ -45,15 +36,10 @@ export default function(instance) {
         }
       }
 
-      ret =
+      ret = ret + fn(context[field], {
-        ret +
+        data: data,
-        fn(context[field], {
+        blockParams: blockParams([context[field], field], [contextPath + field, null])
-          data: data,
+      });
-          blockParams: blockParams(
-            [context[field], field],
-            [contextPath + field, null]
-          )
-        });
     }
 
     if (context && typeof context === 'object') {
@@ -63,29 +49,21 @@ export default function(instance) {
             execIteration(i, i, i === context.length - 1);
           }
         }
-      } else if (typeof Symbol === 'function' && context[Symbol.iterator]) {
-        const newContext = [];
-        const iterator = context[Symbol.iterator]();
-        for (let it = iterator.next(); !it.done; it = iterator.next()) {
-          newContext.push(it.value);
-        }
-        context = newContext;
-        for (let j = context.length; i < j; i++) {
-          execIteration(i, i, i === context.length - 1);
-        }
       } else {
         let priorKey;
 
-        Object.keys(context).forEach(key => {
+        for (let key in context) {
-          // We're running the iterations one step out of sync so we can detect
+          if (context.hasOwnProperty(key)) {
-          // the last iteration without have to scan the object twice and create
+            // We're running the iterations one step out of sync so we can detect
-          // an itermediate keys array.
+            // the last iteration without have to scan the object twice and create
-          if (priorKey !== undefined) {
+            // an itermediate keys array.
-            execIteration(priorKey, i - 1);
+            if (priorKey !== undefined) {
+              execIteration(priorKey, i - 1);
+            }
+            priorKey = key;
+            i++;
           }
-          priorKey = key;
+        }
-          i++;
-        });
         if (priorKey !== undefined) {
           execIteration(priorKey, i - 1, true);
         }

lib/handlebars/helpers/helper-missing.js

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

lib/handlebars/helpers/if.js

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

lib/handlebars/helpers/log.js

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

lib/handlebars/helpers/lookup.js

@@ -1,9 +1,5 @@
 export default function(instance) {
-  instance.registerHelper('lookup', function(obj, field, options) {
+  instance.registerHelper('lookup', function(obj, field) {
-    if (!obj) {
+    return obj && obj[field];
-      // Note for 5.0: Change to "obj == null" in 5.0
-      return obj;
-    }
-    return options.lookupProperty(obj, field);
   });
 }

lib/handlebars/helpers/with.js

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

lib/handlebars/internal/proto-access.js

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

lib/handlebars/internal/wrapHelper.js

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

lib/handlebars/logger.js

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

lib/handlebars/no-conflict.js

@@ -1,22 +1,12 @@
-/* global globalThis */
+/* global window */
 export default function(Handlebars) {
   /* istanbul ignore next */
-  // https://mathiasbynens.be/notes/globalthis
+  let root = typeof global !== 'undefined' ? global : window,
-  (function() {
+      $Handlebars = root.Handlebars;
-    if (typeof globalThis === 'object') return;
-    Object.prototype.__defineGetter__('__magic__', function() {
-      return this;
-    });
-    __magic__.globalThis = __magic__; // eslint-disable-line no-undef
-    delete Object.prototype.__magic__;
-  })();
-
-  const $Handlebars = globalThis.Handlebars;
-
   /* istanbul ignore next */
   Handlebars.noConflict = function() {
-    if (globalThis.Handlebars === Handlebars) {
+    if (root.Handlebars === Handlebars) {
-      globalThis.Handlebars = $Handlebars;
+      root.Handlebars = $Handlebars;
     }
     return Handlebars;
   };

lib/handlebars/runtime.js

@@ -1,48 +1,22 @@
 import * as Utils from './utils';
 import Exception from './exception';
-import {
+import { COMPILER_REVISION, REVISION_CHANGES, createFrame } from './base';
-  COMPILER_REVISION,
-  createFrame,
-  LAST_COMPATIBLE_COMPILER_REVISION,
-  REVISION_CHANGES
-} from './base';
-import { moveHelperToHooks } from './helpers';
-import { wrapHelper } from './internal/wrapHelper';
-import {
-  createProtoAccessControl,
-  resultIsAllowed
-} from './internal/proto-access';
 
 export function checkRevision(compilerInfo) {
-  const compilerRevision = (compilerInfo && compilerInfo[0]) || 1,
+  const compilerRevision = compilerInfo && compilerInfo[0] || 1,
-    currentRevision = COMPILER_REVISION;
+        currentRevision = COMPILER_REVISION;
 
-  if (
+  if (compilerRevision !== currentRevision) {
-    compilerRevision >= LAST_COMPATIBLE_COMPILER_REVISION &&
+    if (compilerRevision < currentRevision) {
-    compilerRevision <= COMPILER_REVISION
+      const runtimeVersions = REVISION_CHANGES[currentRevision],
-  ) {
+            compilerVersions = REVISION_CHANGES[compilerRevision];
-    return;
+      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 {
-  if (compilerRevision < LAST_COMPATIBLE_COMPILER_REVISION) {
+      // Use the embedded version info since the runtime doesn't know about this revision yet
-    const runtimeVersions = REVISION_CHANGES[currentRevision],
+      throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
-      compilerVersions = REVISION_CHANGES[compilerRevision];
+            'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
-    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] +
-        ').'
-    );
   }
 }
 
@@ -58,13 +32,9 @@ export function template(templateSpec, env) {
   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 pseudo-supported APIs.
+  // for external users to override these as psuedo-supported APIs.
   env.VM.checkRevision(templateSpec.compiler);
 
-  // backwards compatibility for precompiled templates with compiler-version 7 (<4.3.0)
-  const templateWasPrecompiledWithCompilerV7 =
-    templateSpec.compiler && templateSpec.compiler[0] === 7;
-
   function invokePartialWrapper(partial, context, options) {
     if (options.hash) {
       context = Utils.extend({}, context, options.hash);
@@ -72,19 +42,12 @@ export function template(templateSpec, env) {
         options.ids[0] = true;
       }
     }
+
     partial = env.VM.resolvePartial.call(this, partial, context, options);
-
-    options.hooks = this.hooks;
-    options.protoAccessControl = this.protoAccessControl;
-
     let result = env.VM.invokePartial.call(this, partial, context, options);
 
     if (result == null && env.compile) {
-      options.partials[options.name] = env.compile(
+      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-        partial,
-        templateSpec.compilerOptions,
-        env
-      );
       result = options.partials[options.name](context, options);
     }
     if (result != null) {
@@ -101,44 +64,23 @@ export function template(templateSpec, env) {
       }
       return result;
     } else {
-      throw new Exception(
+      throw new Exception('The partial ' + options.name + ' could not be compiled when running in runtime-only mode');
-        'The partial ' +
-          options.name +
-          ' could not be compiled when running in runtime-only mode'
-      );
     }
   }
 
   // Just add water
   let container = {
-    strict: function(obj, name, loc) {
+    strict: function(obj, name) {
-      if (!obj || !(name in obj)) {
+      if (!(name in obj)) {
-        throw new Exception('"' + name + '" not defined in ' + obj, {
+        throw new Exception('"' + name + '" not defined in ' + obj);
-          loc: loc
-        });
       }
-      return container.lookupProperty(obj, name);
+      return obj[name];
-    },
-    lookupProperty: function(parent, propertyName) {
-      let result = parent[propertyName];
-      if (result == null) {
-        return result;
-      }
-      if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-        return result;
-      }
-
-      if (resultIsAllowed(result, container.protoAccessControl, propertyName)) {
-        return result;
-      }
-      return undefined;
     },
     lookup: function(depths, name) {
       const len = depths.length;
       for (let i = 0; i < len; i++) {
-        let result = depths[i] && container.lookupProperty(depths[i], name);
+        if (depths[i] && depths[i][name] != null) {
-        if (result != null) {
+          return depths[i][name];
-          return result;
         }
       }
     },
@@ -158,17 +100,9 @@ export function template(templateSpec, env) {
     programs: [],
     program: function(i, data, declaredBlockParams, blockParams, depths) {
       let programWrapper = this.programs[i],
-        fn = this.fn(i);
+          fn = this.fn(i);
       if (data || depths || blockParams || declaredBlockParams) {
-        programWrapper = wrapProgram(
+        programWrapper = wrapProgram(this, i, fn, data, declaredBlockParams, blockParams, depths);
-          this,
-          i,
-          fn,
-          data,
-          declaredBlockParams,
-          blockParams,
-          depths
-        );
       } else if (!programWrapper) {
         programWrapper = this.programs[i] = wrapProgram(this, i, fn);
       }
@@ -181,17 +115,15 @@ export function template(templateSpec, env) {
       }
       return value;
     },
-    mergeIfNeeded: function(param, common) {
+    merge: function(param, common) {
       let obj = param || common;
 
-      if (param && common && param !== common) {
+      if (param && common && (param !== common)) {
         obj = Utils.extend({}, common, param);
       }
 
       return obj;
     },
-    // An empty object to use as replacement for null-contexts
-    nullContext: Object.seal({}),
 
     noop: env.VM.noop,
     compilerInfo: templateSpec.compiler
@@ -205,82 +137,37 @@ export function template(templateSpec, env) {
       data = initData(context, data);
     }
     let depths,
-      blockParams = templateSpec.useBlockParams ? [] : undefined;
+        blockParams = templateSpec.useBlockParams ? [] : undefined;
     if (templateSpec.useDepths) {
       if (options.depths) {
-        depths =
+        depths = context != options.depths[0] ? [context].concat(options.depths) : options.depths;
-          context != options.depths[0]
-            ? [context].concat(options.depths)
-            : options.depths;
       } else {
         depths = [context];
       }
     }
 
-    function main(context /*, options*/) {
+    function main(context/*, options*/) {
-      return (
+      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
-        '' +
-        templateSpec.main(
-          container,
-          context,
-          container.helpers,
-          container.partials,
-          data,
-          blockParams,
-          depths
-        )
-      );
     }
-
+    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
-    main = executeDecorators(
-      templateSpec.main,
-      main,
-      container,
-      options.depths || [],
-      data,
-      blockParams
-    );
     return main(context, options);
   }
-
   ret.isTop = true;
 
   ret._setup = function(options) {
     if (!options.partial) {
-      let mergedHelpers = {};
+      container.helpers = container.merge(options.helpers, env.helpers);
-      addHelpers(mergedHelpers, env.helpers, container);
-      addHelpers(mergedHelpers, options.helpers, container);
-      container.helpers = mergedHelpers;
 
       if (templateSpec.usePartial) {
-        // Use mergeIfNeeded here to prevent compiling global partials multiple times
+        container.partials = container.merge(options.partials, env.partials);
-        container.partials = container.mergeIfNeeded(
-          options.partials,
-          env.partials
-        );
       }
       if (templateSpec.usePartial || templateSpec.useDecorators) {
-        container.decorators = Utils.extend(
+        container.decorators = container.merge(options.decorators, env.decorators);
-          {},
-          env.decorators,
-          options.decorators
-        );
       }
-
-      container.hooks = {};
-      container.protoAccessControl = createProtoAccessControl(options);
-
-      let keepHelperInHelpers =
-        options.allowCallsToHelperMissing ||
-        templateWasPrecompiledWithCompilerV7;
-      moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
-      moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
     } else {
-      container.protoAccessControl = options.protoAccessControl; // internal option
       container.helpers = options.helpers;
       container.partials = options.partials;
       container.decorators = options.decorators;
-      container.hooks = options.hooks;
     }
   };
 
@@ -292,47 +179,24 @@ export function template(templateSpec, env) {
       throw new Exception('must pass parent depths');
     }
 
-    return wrapProgram(
+    return wrapProgram(container, i, templateSpec[i], data, 0, blockParams, depths);
-      container,
-      i,
-      templateSpec[i],
-      data,
-      0,
-      blockParams,
-      depths
-    );
   };
   return ret;
 }
 
-export function wrapProgram(
+export function wrapProgram(container, i, fn, data, declaredBlockParams, blockParams, depths) {
-  container,
-  i,
-  fn,
-  data,
-  declaredBlockParams,
-  blockParams,
-  depths
-) {
   function prog(context, options = {}) {
     let currentDepths = depths;
-    if (
+    if (depths && context != depths[0]) {
-      depths &&
-      context != depths[0] &&
-      !(context === container.nullContext && depths[0] === null)
-    ) {
       currentDepths = [context].concat(depths);
     }
 
-    return fn(
+    return fn(container,
-      container,
+        context,
-      context,
+        container.helpers, container.partials,
-      container.helpers,
+        options.data || data,
-      container.partials,
+        blockParams && [options.blockParams].concat(blockParams),
-      options.data || data,
+        currentDepths);
-      blockParams && [options.blockParams].concat(blockParams),
-      currentDepths
-    );
   }
 
   prog = executeDecorators(fn, prog, container, depths, data, blockParams);
@@ -343,27 +207,24 @@ export function wrapProgram(
   return prog;
 }
 
-/**
- * This is currently part of the official API, therefore implementation details should not be changed.
- */
 export function resolvePartial(partial, context, options) {
   if (!partial) {
     if (options.name === '@partial-block') {
-      partial = lookupOwnProperty(options.data, 'partial-block');
+      partial = options.data['partial-block'];
     } else {
-      partial = lookupOwnProperty(options.partials, options.name);
+      partial = options.partials[options.name];
     }
   } else if (!partial.call && !options.name) {
     // This is a dynamic partial that returned a string
     options.name = partial;
-    partial = lookupOwnProperty(options.partials, partial);
+    partial = options.partials[partial];
   }
   return partial;
 }
 
 export function invokePartial(partial, context, options) {
   // Use the current closure context to save the partial-block if this partial
-  const currentPartialBlock = lookupOwnProperty(options.data, 'partial-block');
+  const currentPartialBlock = options.data && options.data['partial-block'];
   options.partial = true;
   if (options.ids) {
     options.data.contextPath = options.ids[0] || options.data.contextPath;
@@ -374,10 +235,7 @@ export function invokePartial(partial, context, options) {
     options.data = createFrame(options.data);
     // Wrapper function to get access to currentPartialBlock from the closure
     let fn = options.fn;
-    partialBlock = options.data['partial-block'] = function partialBlockWrapper(
+    partialBlock = options.data['partial-block'] = function partialBlockWrapper(context, options) {
-      context,
-      options = {}
-    ) {
       // Restore the partial-block from the closure for the execution of the block
       // i.e. the part inside the block of the partial call.
       options.data = createFrame(options.data);
@@ -400,15 +258,7 @@ export function invokePartial(partial, context, options) {
   }
 }
 
-export function noop() {
+export function noop() { return ''; }
-  return '';
-}
-
-function lookupOwnProperty(obj, name) {
-  if (obj && Object.prototype.hasOwnProperty.call(obj, name)) {
-    return obj[name];
-  }
-}
 
 function initData(context, data) {
   if (!data || !('root' in data)) {
@@ -421,32 +271,8 @@ function initData(context, data) {
 function executeDecorators(fn, prog, container, depths, data, blockParams) {
   if (fn.decorator) {
     let props = {};
-    prog = fn.decorator(
+    prog = fn.decorator(prog, props, container, depths && depths[0], data, blockParams, depths);
-      prog,
-      props,
-      container,
-      depths && depths[0],
-      data,
-      blockParams,
-      depths
-    );
     Utils.extend(prog, props);
   }
   return prog;
 }
-
-function addHelpers(mergedHelpers, helpers, container) {
-  if (!helpers) return;
-  Object.keys(helpers).forEach(helperName => {
-    let helper = helpers[helperName];
-    mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
-  });
-}
-
-function passLookupPropertyOption(helper, container) {
-  const lookupProperty = container.lookupProperty;
-  return wrapHelper(helper, options => {
-    options.lookupProperty = lookupProperty;
-    return options;
-  });
-}

lib/handlebars/utils.js

@@ -9,13 +9,13 @@ const escape = {
 };
 
 const badChars = /[&<>"'`=]/g,
-  possible = /[&<>"'`=]/;
+      possible = /[&<>"'`=]/;
 
 function escapeChar(chr) {
   return escape[chr];
 }
 
-export function extend(obj /* , ...source */) {
+export function extend(obj/* , ...source */) {
   for (let i = 1; i < arguments.length; i++) {
     for (let key in arguments[i]) {
       if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
@@ -39,23 +39,16 @@ let isFunction = function(value) {
 /* istanbul ignore next */
 if (isFunction(/x/)) {
   isFunction = function(value) {
-    return (
+    return typeof value === 'function' && toString.call(value) === '[object Function]';
-      typeof value === 'function' &&
-      toString.call(value) === '[object Function]'
-    );
   };
 }
-export { isFunction };
+export {isFunction};
 /* eslint-enable func-style */
 
 /* istanbul ignore next */
-export const isArray =
+export const isArray = Array.isArray || function(value) {
-  Array.isArray ||
+  return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
-  function(value) {
+};
-    return value && typeof value === 'object'
-      ? toString.call(value) === '[object Array]'
-      : false;
-  };
 
 // Older IE versions do not directly support indexOf so we must implement our own, sadly.
 export function indexOf(array, value) {
@@ -67,6 +60,7 @@ export function indexOf(array, value) {
   return -1;
 }
 
+
 export function escapeExpression(string) {
   if (typeof string !== 'string') {
     // don't escape SafeStrings, since they're already safe
@@ -84,9 +78,7 @@ export function escapeExpression(string) {
     string = '' + string;
   }
 
-  if (!possible.test(string)) {
+  if (!possible.test(string)) { return string; }
-    return string;
-  }
   return string.replace(badChars, escapeChar);
 }
 
@@ -114,30 +106,3 @@ export function blockParams(params, ids) {
 export function appendContextPath(contextPath, id) {
   return (contextPath ? contextPath + '.' : '') + id;
 }
-
-/**
- * Coerce an untrusted depth value to a safe non-negative integer.
- * Returns `0` for any value that is not a finite, non-negative number.
- *
- * @param {unknown} depth - The depth value to sanitize.
- * @returns {number} A non-negative integer.
- */
-export function sanitizeDepth(depth) {
-  let number = Number(depth);
-  if (!Number.isFinite(number) || number < 0) {
-    return 0;
-  }
-  return Math.floor(number);
-}
-
-/**
- * Return a sanitized copy of a PathExpression AST node's parts array.
- * Coerces each element to a string, or returns an empty array if parts
- * is not an array.
- *
- * @param {unknown} parts - The parts value to sanitize.
- * @returns {string[]} A safe string array.
- */
-export function sanitizeParts(parts) {
-  return Array.isArray(parts) ? parts.map(String) : [];
-}

lib/index.js

@@ -1,6 +1,5 @@
 // USAGE:
 // var handlebars = require('handlebars');
-/* eslint-env node */
 /* eslint-disable no-var */
 
 // var local = handlebars.create();

lib/precompiler.js

@@ -1,10 +1,10 @@
-/* eslint-env node */
 /* eslint-disable no-console */
-import Async from 'neo-async';
+import Async from 'async';
 import fs from 'fs';
 import * as Handlebars from './handlebars';
-import { basename } from 'path';
+import {basename} from 'path';
-import { SourceMapConsumer, SourceNode } from 'source-map';
+import {SourceMapConsumer, SourceNode} from 'source-map';
+import uglify from 'uglify-js';
 
 module.exports.loadTemplates = function(opts, callback) {
   loadStrings(opts, function(err, strings) {
@@ -25,19 +25,14 @@ module.exports.loadTemplates = function(opts, callback) {
 
 function loadStrings(opts, callback) {
   let strings = arrayCast(opts.string),
-    names = arrayCast(opts.name);
+      names = arrayCast(opts.name);
 
-  if (names.length !== strings.length && strings.length > 1) {
+  if (names.length !== strings.length
-    return callback(
+      && strings.length > 1) {
-      new Handlebars.Exception(
+    return callback(new Handlebars.Exception('Number of names did not match the number of string inputs'));
-        'Number of names did not match the number of string inputs'
-      )
-    );
   }
 
-  Async.map(
+  Async.map(strings, function(string, callback) {
-    strings,
-    function(string, callback) {
       if (string !== '-') {
         callback(undefined, string);
       } else {
@@ -60,94 +55,80 @@ function loadStrings(opts, callback) {
         source: string
       }));
       callback(err, strings);
-    }
+    });
-  );
 }
 
 function loadFiles(opts, callback) {
   // Build file extension pattern
-  let extension = (opts.extension || 'handlebars').replace(
+  let extension = (opts.extension || 'handlebars').replace(/[\\^$*+?.():=!|{}\-\[\]]/g, function(arg) { return '\\' + arg; });
-    /[\\^$*+?.():=!|{}\-[\]]/g,
-    function(arg) {
-      return '\\' + arg;
-    }
-  );
   extension = new RegExp('\\.' + extension + '$');
 
   let ret = [],
-    queue = (opts.files || []).map(template => ({ template, root: opts.root }));
+      queue = (opts.files || []).map((template) => ({template, root: opts.root}));
-  Async.whilst(
+  Async.whilst(() => queue.length, function(callback) {
-    () => queue.length,
+    let {template: path, root} = queue.shift();
-    function(callback) {
-      let { template: path, root } = queue.shift();
 
-      fs.stat(path, function(err, stat) {
+    fs.stat(path, function(err, stat) {
-        if (err) {
-          return callback(
-            new Handlebars.Exception(`Unable to open template file "${path}"`)
-          );
-        }
-
-        if (stat.isDirectory()) {
-          opts.hasDirectory = true;
-
-          fs.readdir(path, function(err, children) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
-            if (err) {
-              return callback(err);
-            }
-            children.forEach(function(file) {
-              let childPath = path + '/' + file;
-
-              if (
-                extension.test(childPath) ||
-                fs.statSync(childPath).isDirectory()
-              ) {
-                queue.push({ template: childPath, root: root || path });
-              }
-            });
-
-            callback();
-          });
-        } else {
-          fs.readFile(path, 'utf8', function(err, data) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
-            if (err) {
-              return callback(err);
-            }
-
-            if (opts.bom && data.indexOf('\uFEFF') === 0) {
-              data = data.substring(1);
-            }
-
-            // Clean the template name
-            let name = path;
-            if (!root) {
-              name = basename(name);
-            } else if (name.indexOf(root) === 0) {
-              name = name.substring(root.length + 1);
-            }
-            name = name.replace(extension, '');
-
-            ret.push({
-              path: path,
-              name: name,
-              source: data
-            });
-
-            callback();
-          });
-        }
-      });
-    },
-    function(err) {
       if (err) {
-        callback(err);
+        return callback(new Handlebars.Exception(`Unable to open template file "${path}"`));
-      } else {
-        callback(undefined, ret);
       }
+
+      if (stat.isDirectory()) {
+        opts.hasDirectory = true;
+
+        fs.readdir(path, function(err, children) {
+          /* istanbul ignore next : Race condition that being too lazy to test */
+          if (err) {
+            return callback(err);
+          }
+          children.forEach(function(file) {
+            let childPath = path + '/' + file;
+
+            if (extension.test(childPath) || fs.statSync(childPath).isDirectory()) {
+              queue.push({template: childPath, root: root || path});
+            }
+          });
+
+          callback();
+        });
+      } else {
+        fs.readFile(path, 'utf8', function(err, data) {
+          /* istanbul ignore next : Race condition that being too lazy to test */
+          if (err) {
+            return callback(err);
+          }
+
+          if (opts.bom && data.indexOf('\uFEFF') === 0) {
+            data = data.substring(1);
+          }
+
+          // Clean the template name
+          let name = path;
+          if (!root) {
+            name = basename(name);
+          } else if (name.indexOf(root) === 0) {
+            name = name.substring(root.length + 1);
+          }
+          name = name.replace(extension, '');
+
+          ret.push({
+            path: path,
+            name: name,
+            source: data
+          });
+
+          callback();
+        });
+      }
+    });
+  },
+  function(err) {
+    if (err) {
+      callback(err);
+    } else {
+      callback(undefined, ret);
     }
-  );
+  });
 }
 
 module.exports.cli = function(opts) {
@@ -157,9 +138,7 @@ module.exports.cli = function(opts) {
   }
 
   if (!opts.templates.length && !opts.hasDirectory) {
-    throw new Handlebars.Exception(
+    throw new Handlebars.Exception('Must define at least one template or directory.');
-      'Must define at least one template or directory.'
-    );
   }
 
   if (opts.simple && opts.min) {
@@ -168,18 +147,12 @@ module.exports.cli = function(opts) {
 
   const multiple = opts.templates.length !== 1 || opts.hasDirectory;
   if (opts.simple && multiple) {
-    throw new Handlebars.Exception(
+    throw new Handlebars.Exception('Unable to output multiple templates in simple mode');
-      'Unable to output multiple templates in simple mode'
-    );
   }
 
   // Force simple mode if we have only one template and it's unnamed.
-  if (
+  if (!opts.amd && !opts.commonjs && opts.templates.length === 1
-    !opts.amd &&
+      && !opts.templates[0].name) {
-    !opts.commonjs &&
-    opts.templates.length === 1 &&
-    !opts.templates[0].name
-  ) {
     opts.simple = true;
   }
 
@@ -196,24 +169,12 @@ module.exports.cli = function(opts) {
 
   const objectName = opts.partial ? 'Handlebars.partials' : 'templates';
 
-  if (opts.namespace && !isValidNamespace(opts.namespace)) {
-    throw new Handlebars.Exception('Invalid namespace format');
-  }
-
   let output = new SourceNode();
   if (!opts.simple) {
     if (opts.amd) {
-      const runtimeModulePath =
+      output.add('define([\'' + opts.handlebarPath + 'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];');
-        (opts.handlebarPath || '') + 'handlebars.runtime';
-      output.add(
-        'define([' +
-          quoteForJavaScript(runtimeModulePath) +
-          '], function(Handlebars) {\n  Handlebars = Handlebars["default"];'
-      );
     } else if (opts.commonjs) {
-      output.add(
+      output.add('var Handlebars = require("' + opts.commonjs + '");');
-        'var Handlebars = require(' + quoteForJavaScript(opts.commonjs) + ');'
-      );
     } else {
       output.add('(function() {\n');
     }
@@ -245,10 +206,7 @@ module.exports.cli = function(opts) {
     // If we are generating a source map, we have to reconstruct the SourceNode object
     if (opts.map) {
       let consumer = new SourceMapConsumer(precompiled.map);
-      precompiled = SourceNode.fromStringWithSourceMap(
+      precompiled = SourceNode.fromStringWithSourceMap(precompiled.code, consumer);
-        precompiled.code,
-        consumer
-      );
     }
 
     if (opts.simple) {
@@ -261,14 +219,7 @@ module.exports.cli = function(opts) {
       if (opts.amd && !multiple) {
         output.add('return ');
       }
-      output.add([
+      output.add([objectName, '[\'', template.name, '\'] = template(', precompiled, ');\n']);
-        objectName,
-        '[',
-        quoteForJavaScript(template.name),
-        '] = template(',
-        precompiled,
-        ');\n'
-      ]);
     }
   });
 
@@ -284,17 +235,24 @@ module.exports.cli = function(opts) {
     }
   }
 
+
   if (opts.map) {
-    output.add(
+    output.add('\n//# sourceMappingURL=' + opts.map + '\n');
-      '\n//# sourceMappingURL=' + sanitizeSourceMapComment(opts.map) + '\n'
-    );
   }
 
   output = output.toStringWithSourceMap();
   output.map = output.map + '';
 
   if (opts.min) {
-    output = minify(output, opts.map);
+    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) {
@@ -316,63 +274,3 @@ function arrayCast(value) {
   }
   return value;
 }
-
-/*
- * Safely quotes a value for embedding in generated JavaScript strings
- *
- * Uses JSON.stringify which handles all special characters.
- */
-function quoteForJavaScript(value) {
-  return JSON.stringify(String(value));
-}
-
-/**
- * Validates that a namespace is a legitimate dotted JavaScript identifier
- * (e.g. "App.templates") to prevent arbitrary code injection
- */
-function isValidNamespace(namespace) {
-  return /^[A-Za-z_$][A-Za-z0-9_$]*(\.[A-Za-z_$][A-Za-z0-9_$]*)*$/.test(
-    namespace
-  );
-}
-
-/**
- * Strips line terminators from source map URLs to prevent injection of new
- * JavaScript lines via the sourceMappingURL comment
- */
-function sanitizeSourceMapComment(value) {
-  return String(value).replace(/[\r\n\u2028\u2029]/g, '');
-}
-
-/**
- * Run uglify to minify the compiled template, if uglify exists in the dependencies.
- *
- * We are using `require` instead of `import` here, because es6-modules do not allow
- * dynamic imports and uglify-js is an optional dependency. Since we are inside NodeJS here, this
- * should not be a problem.
- *
- * @param {string} output the compiled template
- * @param {string} sourceMapFile the file to write the source map to.
- */
-function minify(output, sourceMapFile) {
-  try {
-    // Try to resolve uglify-js in order to see if it does exist
-    require.resolve('uglify-js');
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
-      // Something else seems to be wrong
-      throw e;
-    }
-    // it does not exist!
-    console.error(
-      'Code minimization is disabled due to missing uglify-js dependency'
-    );
-    return output;
-  }
-  return require('uglify-js').minify(output.code, {
-    sourceMap: {
-      content: output.map,
-      url: sourceMapFile
-    }
-  });
-}

nyc.config.js

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

package.json

@@ -1,9 +1,9 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "4.7.9",
+  "version": "4.0.6",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
-  "homepage": "https://handlebarsjs.com/",
+  "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
     "handlebars",
     "mustache",
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/handlebars-lang/handlebars.js.git"
+    "url": "https://github.com/wycats/handlebars.js.git"
   },
   "author": "Yehuda Katz",
   "license": "MIT",
@@ -21,80 +21,49 @@
     "node": ">=0.4.7"
   },
   "dependencies": {
-    "minimist": "^1.2.5",
+    "async": "^1.4.0",
-    "neo-async": "^2.6.2",
+    "optimist": "^0.6.1",
-    "source-map": "^0.6.1",
+    "source-map": "^0.4.4"
-    "wordwrap": "^1.0.0"
   },
   "optionalDependencies": {
-    "uglify-js": "^3.1.4"
+    "uglify-js": "^2.6"
   },
   "devDependencies": {
-    "@playwright/test": "1.44.1",
     "aws-sdk": "^2.1.49",
     "babel-loader": "^5.0.0",
     "babel-runtime": "^5.1.10",
     "benchmark": "~1.0",
-    "chai": "^4.2.0",
-    "chai-diff": "^1.0.1",
-    "concurrently": "^5.0.0",
-    "dirty-chai": "^2.0.1",
     "dustjs-linkedin": "^2.0.2",
     "eco": "~1.1.0-rc-3",
-    "eslint": "^6.7.2",
+    "grunt": "~0.4.1",
-    "eslint-config-prettier": "^6.7.0",
-    "eslint-plugin-compat": "^3.13.0",
-    "eslint-plugin-es5": "^1.4.1",
-    "fs-extra": "^8.1.0",
-    "grunt": "1.5.3",
     "grunt-babel": "^5.0.0",
-    "grunt-cli": "^1",
+    "grunt-cli": "~0.1.10",
-    "grunt-contrib-clean": "^1",
+    "grunt-contrib-clean": "0.x",
-    "grunt-contrib-concat": "^1",
+    "grunt-contrib-concat": "0.x",
-    "grunt-contrib-connect": "^1",
+    "grunt-contrib-connect": "0.x",
-    "grunt-contrib-copy": "^1",
+    "grunt-contrib-copy": "0.x",
-    "grunt-contrib-requirejs": "^1",
+    "grunt-contrib-requirejs": "0.x",
-    "grunt-contrib-uglify": "^1",
+    "grunt-contrib-uglify": "0.x",
-    "grunt-contrib-watch": "^1.1.0",
+    "grunt-contrib-watch": "0.x",
-    "grunt-shell": "^4.0.0",
+    "grunt-eslint": "^17.1.0",
+    "grunt-saucelabs": "8.x",
     "grunt-webpack": "^1.0.8",
-    "husky": "^3.1.0",
+    "istanbul": "^0.3.0",
     "jison": "~0.3.0",
-    "lint-staged": "^9.5.0",
+    "mocha": "~1.20.0",
-    "mocha": "^5",
     "mock-stdin": "^0.3.0",
     "mustache": "^2.1.3",
-    "nyc": "^14.1.1",
-    "prettier": "^1.19.1",
     "semver": "^5.0.1",
-    "sinon": "^7.5.0",
-    "typescript": "^3.4.3",
     "underscore": "^1.5.1",
     "webpack": "^1.12.6",
     "webpack-dev-server": "^1.12.1"
   },
   "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "browser": "./dist/cjs/handlebars.js",
   "bin": {
     "handlebars": "bin/handlebars"
   },
   "scripts": {
-    "build": "grunt build",
+    "test": "grunt"
-    "release": "npm run build && grunt release",
-    "format": "prettier --write '**/*.js' && eslint --fix .",
-    "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types",
-    "lint:eslint": "eslint --max-warnings 0 .",
-    "lint:prettier": "prettier --check '**/*.js'",
-    "lint:types": "tsc --noEmit --project types",
-    "test": "npm run test:mocha",
-    "test:mocha": "grunt build && grunt test",
-    "test:browser": "playwright test --config tests/browser/playwright.config.js tests/browser/spec.js",
-    "test:integration": "grunt integration-tests",
-    "test:serve": "grunt connect:server:keepalive",
-    "extensive-tests-and-publish-to-aws": "npx mocha tasks/tests/ && grunt --stack extensive-tests-and-publish-to-aws",
-    "--- combined tasks ---": "",
-    "check-before-pull-request": "concurrently --kill-others-on-fail npm:lint npm:test"
   },
   "jspm": {
     "main": "handlebars",
@@ -104,31 +73,5 @@
     "buildConfig": {
       "minify": true
     }
-  },
-  "files": [
-    "bin",
-    "dist/*.js",
-    "dist/amd/**/*.js",
-    "dist/cjs/**/*.js",
-    "lib",
-    "release-notes.md",
-    "runtime.js",
-    "types/*.d.ts",
-    "runtime.d.ts"
-  ],
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,css,json}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.js": [
-      "eslint --fix",
-      "git add"
-    ]
   }
 }

prettier.config.js

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

print-script

@@ -1,30 +1,31 @@
+#! /usr/bin/env node
 /* eslint-disable no-console, no-var */
 // Util script for debugging source code generation issues
 
 var script = process.argv[2].replace(/\\n/g, '\n'),
-  verbose = process.argv[3] === '-v';
+    verbose = process.argv[3] === '-v';
 
-var Handlebars = require('./../lib'),
+var Handlebars = require('./lib'),
-  SourceMap = require('source-map'),
+    SourceMap = require('source-map'),
-  SourceMapConsumer = SourceMap.SourceMapConsumer;
+      SourceMapConsumer = SourceMap.SourceMapConsumer;
 
 var template = Handlebars.precompile(script, {
-  srcName: 'input.hbs',
+      srcName: 'input.hbs',
-  destName: 'output.js',
+      destName: 'output.js',
 
-  assumeObjects: true,
+      assumeObjects: true,
-  compat: false,
+      compat: false,
-  strict: true,
+      strict: true,
-  trackIds: true,
+      trackIds: true,
-  knownHelpersOnly: false
+      knownHelpersOnly: false
-});
+    });
 
 if (!verbose) {
   console.log(template);
 } else {
   var consumer = new SourceMapConsumer(template.map),
-    lines = template.code.split('\n'),
+      lines = template.code.split('\n'),
-    srcLines = script.split('\n');
+      srcLines = script.split('\n');
 
   console.log();
   console.log('Source:');
@@ -42,24 +43,17 @@ if (!verbose) {
   console.log(template.map);
   console.log();
 
-  // eslint-disable-next-line no-inner-declarations
   function collectSource(lines, lineName, colName, order) {
     var ret = {},
-      ordered = [],
+        ordered = [],
-      last;
+        last;
 
     function collect(current) {
       if (last) {
-        var mapLines = lines.slice(
+        var mapLines = lines.slice(last[lineName] - 1, current && current[lineName]);
-          last[lineName] - 1,
-          current && current[lineName]
-        );
         if (mapLines.length) {
           if (current) {
-            mapLines[mapLines.length - 1] = mapLines[mapLines.length - 1].slice(
+            mapLines[mapLines.length - 1] = mapLines[mapLines.length - 1].slice(0, current[colName]);
-              0,
-              current[colName]
-            );
           }
           mapLines[0] = mapLines[0].slice(last[colName]);
         }
@@ -79,36 +73,23 @@ if (!verbose) {
     return ret;
   }
 
-  srcLines = collectSource(
+  srcLines = collectSource(srcLines, 'originalLine', 'originalColumn', SourceMapConsumer.ORIGINAL_ORDER);
-    srcLines,
-    'originalLine',
-    'originalColumn',
-    SourceMapConsumer.ORIGINAL_ORDER
-  );
   lines = collectSource(lines, 'generatedLine', 'generatedColumn');
 
   consumer.eachMapping(function(mapping) {
-    var originalSrc =
+    var originalSrc = srcLines[mapping.originalLine + ':' + mapping.originalColumn],
-        srcLines[mapping.originalLine + ':' + mapping.originalColumn],
+        generatedSrc = lines[mapping.generatedLine + ':' + mapping.generatedColumn];
-      generatedSrc =
-        lines[mapping.generatedLine + ':' + mapping.generatedColumn];
 
     if (!mapping.originalLine) {
-      console.log(
+      console.log('generated', mapping.generatedLine + ':' + mapping.generatedColumn, generatedSrc);
-        'generated',
-        mapping.generatedLine + ':' + mapping.generatedColumn,
-        generatedSrc
-      );
     } else {
-      console.log(
+      console.log('map',
-        'map',
+          mapping.source,
-        mapping.source,
+          mapping.originalLine + ':' + mapping.originalColumn,
-        mapping.originalLine + ':' + mapping.originalColumn,
+          originalSrc,
-        originalSrc,
+          '->',
-        '->',
+          mapping.generatedLine + ':' + mapping.generatedColumn,
-        mapping.generatedLine + ':' + mapping.generatedColumn,
+          generatedSrc);
-        generatedSrc
-      );
     }
   });
 }

runtime.d.ts

@@ -1,5 +0,0 @@
-import Handlebars = require('handlebars')
-
-declare module "handlebars/runtime" {
-   
-}

spec/.eslintrc

@@ -1,21 +1,14 @@
 {
-  "extends": [
-    "../.eslintrc.js",
-    "plugin:es5/no-es2015",
-    "prettier"
-  ],
-  "plugins": [
-    "es5"
-  ],
   "globals": {
     "CompilerContext": true,
     "Handlebars": true,
     "handlebarsEnv": true,
+
     "shouldCompileTo": true,
     "shouldCompileToWithPartials": true,
     "shouldThrow": true,
-    "expectTemplate": true,
     "compileWithPartials": true,
+
     "console": true,
     "require": true,
     "suite": true,
@@ -28,20 +21,16 @@
     "start": true,
     "stop": true,
     "ok": true,
-    "sinon": true,
     "strictEqual": true,
-    "define": true,
+    "define": true
-    "expect": true,
-    "chai": true
   },
   "env": {
     "mocha": true
   },
   "rules": {
     // Disabling for tests, for now.
-    "no-path-concat": "off",
+    "no-path-concat": 0,
 
-    "no-var": "off",
+    "no-var": 0
-    "dot-notation": "off"
   }
 }

spec/amd-runtime.html

@@ -18,16 +18,13 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
-    <script src="/spec/vendor/json2.js"></script>
+
-    <script src="/spec/vendor/require.js"></script>
+    <script src="/spec/env/json2.js"></script>
+    <script src="/spec/env/require.js"></script>
 
     <script src="/spec/env/common.js"></script>
     <script>
@@ -59,7 +56,7 @@
           }
           var runner = mocha.run();
 
-          // Reporting to test-runner
+          //Reporting for saucelabs
           var failedTests = [];
           runner.on('end', function(){
             window.mochaResults = runner.stats;

spec/amd.html

@@ -19,16 +19,13 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
-    <script src="/spec/vendor/json2.js"></script>
+
-    <script src="/spec/vendor/require.js"></script>
+    <script src="/spec/env/json2.js"></script>
+    <script src="/spec/env/require.js"></script>
 
     <script src="/spec/env/common.js"></script>
     <script>
@@ -79,7 +76,7 @@
             }
             var runner = mocha.run();
 
-            // Reporting to test-runner
+            //Reporting for saucelabs
             var failedTests = [];
             runner.on('end', function(){
               window.mochaResults = runner.stats;

spec/artifacts/known.helpers.handlebars

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

spec/artifacts/non.default.extension.hbs

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

spec/artifacts/partial.template.handlebars

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

spec/ast.js

@@ -7,102 +7,44 @@ describe('ast', function() {
 
   describe('BlockStatement', function() {
     it('should throw on mustache mismatch', function() {
-      shouldThrow(
+      shouldThrow(function() {
-        function() {
+        handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
-          handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
+      }, Handlebars.Exception, "foo doesn't match bar - 2:5");
-        },
-        Handlebars.Exception,
-        "foo doesn't match bar - 2:5"
-      );
     });
   });
 
   describe('helpers', function() {
     describe('#helperExpression', function() {
       it('should handle mustache statements', function() {
-        equals(
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [], hash: undefined}), false);
-          AST.helpers.helperExpression({
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [1], hash: undefined}), true);
-            type: 'MustacheStatement',
+        equals(AST.helpers.helperExpression({type: 'MustacheStatement', params: [], hash: {}}), true);
-            params: [],
-            hash: undefined
-          }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'MustacheStatement',
-            params: [1],
-            hash: undefined
-          }),
-          true
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'MustacheStatement',
-            params: [],
-            hash: {}
-          }),
-          true
-        );
       });
       it('should handle block statements', function() {
-        equals(
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [], hash: undefined}), false);
-          AST.helpers.helperExpression({
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [1], hash: undefined}), true);
-            type: 'BlockStatement',
+        equals(AST.helpers.helperExpression({type: 'BlockStatement', params: [], hash: {}}), true);
-            params: [],
-            hash: undefined
-          }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'BlockStatement',
-            params: [1],
-            hash: undefined
-          }),
-          true
-        );
-        equals(
-          AST.helpers.helperExpression({
-            type: 'BlockStatement',
-            params: [],
-            hash: {}
-          }),
-          true
-        );
       });
       it('should handle subexpressions', function() {
-        equals(AST.helpers.helperExpression({ type: 'SubExpression' }), true);
+        equals(AST.helpers.helperExpression({type: 'SubExpression'}), true);
       });
       it('should work with non-helper nodes', function() {
-        equals(AST.helpers.helperExpression({ type: 'Program' }), false);
+        equals(AST.helpers.helperExpression({type: 'Program'}), false);
 
-        equals(
+        equals(AST.helpers.helperExpression({type: 'PartialStatement'}), false);
-          AST.helpers.helperExpression({ type: 'PartialStatement' }),
+        equals(AST.helpers.helperExpression({type: 'ContentStatement'}), false);
-          false
+        equals(AST.helpers.helperExpression({type: 'CommentStatement'}), false);
-        );
-        equals(
-          AST.helpers.helperExpression({ type: 'ContentStatement' }),
-          false
-        );
-        equals(
-          AST.helpers.helperExpression({ type: 'CommentStatement' }),
-          false
-        );
 
-        equals(AST.helpers.helperExpression({ type: 'PathExpression' }), false);
+        equals(AST.helpers.helperExpression({type: 'PathExpression'}), false);
 
-        equals(AST.helpers.helperExpression({ type: 'StringLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'StringLiteral'}), false);
-        equals(AST.helpers.helperExpression({ type: 'NumberLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'NumberLiteral'}), false);
-        equals(AST.helpers.helperExpression({ type: 'BooleanLiteral' }), false);
+        equals(AST.helpers.helperExpression({type: 'BooleanLiteral'}), false);
-        equals(
+        equals(AST.helpers.helperExpression({type: 'UndefinedLiteral'}), false);
-          AST.helpers.helperExpression({ type: 'UndefinedLiteral' }),
+        equals(AST.helpers.helperExpression({type: 'NullLiteral'}), false);
-          false
-        );
-        equals(AST.helpers.helperExpression({ type: 'NullLiteral' }), false);
 
-        equals(AST.helpers.helperExpression({ type: 'Hash' }), false);
+        equals(AST.helpers.helperExpression({type: 'Hash'}), false);
-        equals(AST.helpers.helperExpression({ type: 'HashPair' }), false);
+        equals(AST.helpers.helperExpression({type: 'HashPair'}), false);
       });
     });
   });
@@ -117,21 +59,18 @@ describe('ast', function() {
       equals(node.loc.end.column, lastColumn);
     }
 
-    /* eslint-disable no-multi-spaces */
     ast = Handlebars.parse(
-      'line 1 {{line1Token}}\n' + // 1
+              'line 1 {{line1Token}}\n'             // 1
-      ' line 2 {{line2token}}\n' + // 2
+            + ' line 2 {{line2token}}\n'            // 2
-      ' line 3 {{#blockHelperOnLine3}}\n' + // 3
+            + ' line 3 {{#blockHelperOnLine3}}\n'   // 3
-      'line 4{{line4token}}\n' + // 4
+            + 'line 4{{line4token}}\n'              // 4
-      'line5{{else}}\n' + // 5
+            + 'line5{{else}}\n'                     // 5
-      '{{line6Token}}\n' + // 6
+            + '{{line6Token}}\n'                    // 6
-      '{{/blockHelperOnLine3}}\n' + // 7
+            + '{{/blockHelperOnLine3}}\n'           // 7
-      '{{#open}}\n' + // 8
+            + '{{#open}}\n'                         // 8
-      '{{else inverse}}\n' + // 9
+            + '{{else inverse}}\n'                  // 9
-      '{{else}}\n' + // 10
+            + '{{else}}\n'                          // 10
-        '{{/open}}'
+            + '{{/open}}');                         // 11
-    ); // 11
-    /* eslint-enable no-multi-spaces */
     body = ast.body;
 
     it('gets ContentNode line numbers', function() {
@@ -151,71 +90,35 @@ describe('ast', function() {
     it('gets MustacheStatement line numbers correct across newlines', function() {
       var secondMustacheStatement = body[3];
       testColumns(secondMustacheStatement, 2, 2, 8, 22);
-    });
+     });
 
-    it('gets the block helper information correct', function() {
+     it('gets the block helper information correct', function() {
-      var blockHelperNode = body[5];
+       var blockHelperNode = body[5];
-      testColumns(blockHelperNode, 3, 7, 8, 23);
+       testColumns(blockHelperNode, 3, 7, 8, 23);
-    });
+     });
 
-    it('correctly records the line numbers the program of a block helper', function() {
+     it('correctly records the line numbers the program of a block helper', function() {
-      var blockHelperNode = body[5],
+       var blockHelperNode = body[5],
-        program = blockHelperNode.program;
+           program = blockHelperNode.program;
 
-      testColumns(program, 3, 5, 31, 5);
+       testColumns(program, 3, 5, 31, 5);
-    });
+     });
 
-    it('correctly records the line numbers of an inverse of a block helper', function() {
+     it('correctly records the line numbers of an inverse of a block helper', function() {
-      var blockHelperNode = body[5],
+       var blockHelperNode = body[5],
-        inverse = blockHelperNode.inverse;
+           inverse = blockHelperNode.inverse;
 
-      testColumns(inverse, 5, 7, 13, 0);
+       testColumns(inverse, 5, 7, 13, 0);
-    });
+     });
 
-    it('correctly records the line number of chained inverses', function() {
+     it('correctly records the line number of chained inverses', function() {
-      var chainInverseNode = body[7];
+       var chainInverseNode = body[7];
 
-      testColumns(chainInverseNode.program, 8, 9, 9, 0);
+       testColumns(chainInverseNode.program, 8, 9, 9, 0);
-      testColumns(chainInverseNode.inverse, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse, 9, 10, 16, 0);
-      testColumns(chainInverseNode.inverse.body[0].program, 9, 10, 16, 0);
+       testColumns(chainInverseNode.inverse.body[0].program, 9, 10, 16, 0);
-      testColumns(chainInverseNode.inverse.body[0].inverse, 10, 11, 8, 0);
+       testColumns(chainInverseNode.inverse.body[0].inverse, 10, 11, 8, 0);
-    });
+     });
-  });
-
-  describe('whitespace control', function() {
-    describe('parse', function() {
-      it('mustache', function() {
-        var ast = Handlebars.parse('  {{~comment~}} ');
-
-        equals(ast.body[0].value, '');
-        equals(ast.body[2].value, '');
-      });
-
-      it('block statements', function() {
-        var ast = Handlebars.parse(' {{# comment~}} \nfoo\n {{~/comment}}');
-
-        equals(ast.body[0].value, '');
-        equals(ast.body[1].program.body[0].value, 'foo');
-      });
-    });
-
-    describe('parseWithoutProcessing', function() {
-      it('mustache', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{~comment~}} ');
-
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[2].value, ' ');
-      });
-
-      it('block statements', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-          ' {{# comment~}} \nfoo\n {{~/comment}}'
-        );
-
-        equals(ast.body[0].value, ' ');
-        equals(ast.body[1].program.body[0].value, ' \nfoo\n ');
-      });
-    });
   });
 
   describe('standalone flags', function() {
@@ -226,70 +129,10 @@ describe('ast', function() {
         equals(!!ast.body[2].value, true);
       });
     });
-    describe('blocks - parseWithoutProcessing', function() {
-      it('block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-            ' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
-          ),
-          block = ast.body[1];
-
-        equals(ast.body[0].value, ' ');
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-
-        equals(ast.body[2].value, ' ');
-      });
-      it('initial block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-            '{{# comment}} \nfoo\n {{/comment}}'
-          ),
-          block = ast.body[0];
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-      });
-      it('mustaches with children', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-            '{{# comment}} \n{{foo}}\n {{/comment}}'
-          ),
-          block = ast.body[0];
-
-        equals(block.program.body[0].value, ' \n');
-        equals(block.program.body[1].path.original, 'foo');
-        equals(block.program.body[2].value, '\n ');
-      });
-      it('nested block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-            '{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'
-          ),
-          body = ast.body[0].program.body,
-          block = body[1];
-
-        equals(body[0].value, ' \n');
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-      });
-      it('column 0 block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(
-            'test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
-          ),
-          block = ast.body[1];
-
-        equals(ast.body[0].omit, undefined);
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('blocks', function() {
       it('marks block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            ' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
+            block = ast.body[1];
-          ),
-          block = ast.body[1];
 
         equals(ast.body[0].value, '');
 
@@ -300,24 +143,22 @@ describe('ast', function() {
       });
       it('marks initial block mustaches as standalone', function() {
         var ast = Handlebars.parse('{{# comment}} \nfoo\n {{/comment}}'),
-          block = ast.body[0];
+            block = ast.body[0];
 
         equals(block.program.body[0].value, 'foo\n');
       });
       it('marks mustaches with children as standalone', function() {
         var ast = Handlebars.parse('{{# comment}} \n{{foo}}\n {{/comment}}'),
-          block = ast.body[0];
+            block = ast.body[0];
 
         equals(block.program.body[0].value, '');
         equals(block.program.body[1].path.original, 'foo');
         equals(block.program.body[2].value, '\n');
       });
       it('marks nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-            '{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[1];
-          body = ast.body[0].program.body,
-          block = body[1];
 
         equals(body[0].value, '');
 
@@ -327,11 +168,9 @@ describe('ast', function() {
         equals(body[0].value, '');
       });
       it('does not mark nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'),
-            '{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[1];
-          body = ast.body[0].program.body,
-          block = body[1];
 
         equals(body[0].omit, undefined);
 
@@ -341,11 +180,9 @@ describe('ast', function() {
         equals(body[0].omit, undefined);
       });
       it('does not mark nested initial block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'),
-            '{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'
+            body = ast.body[0].program.body,
-          ),
+            block = body[0];
-          body = ast.body[0].program.body,
-          block = body[0];
 
         equals(block.program.body[0].value, ' \nfoo\n');
         equals(block.inverse.body[0].value, '  bar \n  ');
@@ -354,10 +191,8 @@ describe('ast', function() {
       });
 
       it('marks column 0 block mustaches as standalone', function() {
-        var ast = Handlebars.parse(
+        var ast = Handlebars.parse('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            'test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '
+            block = ast.body[1];
-          ),
-          block = ast.body[1];
 
         equals(ast.body[0].omit, undefined);
 
@@ -367,18 +202,6 @@ describe('ast', function() {
         equals(ast.body[2].value, '');
       });
     });
-    describe('partials - parseWithoutProcessing', function() {
-      it('simple partial', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{> partial }} ');
-        equals(ast.body[1].value, ' ');
-      });
-      it('indented partial', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{> partial }} ');
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[1].indent, '');
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('partials', function() {
       it('marks partial as standalone', function() {
         var ast = Handlebars.parse('{{> partial }} ');
@@ -398,17 +221,6 @@ describe('ast', function() {
         equals(ast.body[1].omit, undefined);
       });
     });
-    describe('comments - parseWithoutProcessing', function() {
-      it('simple comment', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{! comment }} ');
-        equals(ast.body[1].value, ' ');
-      });
-      it('indented comment', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{! comment }} ');
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('comments', function() {
       it('marks comment as standalone', function() {
         var ast = Handlebars.parse('{{! comment }} ');
@@ -429,3 +241,4 @@ describe('ast', function() {
     });
   });
 });
+