docs(changelog): update change log to rc.5

Closes #10599

.gitattributes

@@ -3,3 +3,6 @@
 
 # JS files must always use LF for tools to work
 *.js eol=lf
+
+# Must keep Windows line ending to be parsed correctly
+scripts/windows/packages.txt eol=crlf

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,33 @@
+**I'm submitting a ...**  (check one with "x")
+```
+[ ] bug report
+[ ] feature request
+[ ] support request => Please do not submit support request here, instead see https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
+```
+
+**Current behavior**
+
+
+**Expected/desired behavior**
+
+
+**Reproduction of the problem**
+If the current behavior is a bug or you can illustrate your feature request better with an example, please provide the steps to reproduce and if possible a minimal demo of the problem via https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5).
+
+
+
+**What is the expected behavior?**
+
+
+
+**What is the motivation / use case for changing the behavior?**
+
+
+
+**Please tell us about your environment:**
+
+* **Angular version:** 2.0.0-rc.X
+ 
+* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ] 
+ 
+* **Language:** [all | TypeScript X.X | ES6/7 | ES5] 

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,36 @@
+**Please check if the PR fulfills these requirements**
+- [ ] The commit message follows our guidelines: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit-message-format
+- [ ] Tests for the changes have been added (for bug fixes / features)
+- [ ] Docs have been added / updated (for bug fixes / features)
+
+
+**What kind of change does this PR introduce?** (check one with "x")
+```
+[ ] Bugfix
+[ ] Feature
+[ ] Code style update (formatting, local variables)
+[ ] Refactoring (no functional changes, no api changes)
+[ ] Build related changes
+[ ] CI related changes
+[ ] Other... Please describe:
+```
+
+**What is the current behavior?** (You can also link to an open issue here)
+
+
+
+**What is the new behavior?**
+
+
+
+**Does this PR introduce a breaking change?** (check one with "x")
+```
+[ ] Yes
+[ ] No
+```
+
+If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...
+
+
+**Other information**:
+

.gitignore

@@ -21,10 +21,6 @@ tmp
 *.js.deps
 *.js.map
 
-# Or type definitions we mirror from github
-**/typings/**/*.d.ts
-**/typings/tsd.cached.json
-
 # Include when developing application packages.
 pubspec.lock
 .c9
@@ -48,3 +44,6 @@ npm-debug.log
 
 # built dart payload tests
 /modules_dart/payload/**/build
+
+# rollup-test output
+/modules/rollup-test/dist/

.nvmrc

@@ -1 +1 @@
-4.2.1
+5.4.1

.travis.yml

@@ -1,113 +1,196 @@
 language: node_js
 sudo: false
 node_js:
-- '4.2.1'
+  - '5.4.1'
+
+addons:
+#  firefox: "38.0"
+  apt:
+    sources:
+      # needed to install g++ that is used by npms's native modules
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 
 branches:
   except:
-    - g3sync
+    - g3_v2_0
 
 cache:
   directories:
-    - node_modules
-    - $HOME/.pub-cache
+     - ./node_modules
+     - ./.chrome/chromium
+#    - $HOME/.pub-cache
+
+
+#before_cache:
+#  # Undo the pollution of the typescript_next build before the cache is primed for future use
+#  - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi
 
 env:
   global:
-  - KARMA_BROWSERS=DartiumWithWebPlatform
-  - E2E_BROWSERS=Dartium
-  - LOGS_DIR=/tmp/angular-build/logs
-  - SAUCE_USERNAME=angular-ci
-  - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-  - BROWSER_STACK_USERNAME=angularteam1
-  - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
-  - ARCH=linux-x64
-  - DART_DEV_VERSION=latest
-  - DART_STABLE_VERSION=latest
-  # Token for tsd to increase github rate limit
-  # See https://github.com/DefinitelyTyped/tsd#tsdrc
-  # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
-  # because those are not visible for pull requests, and those should also be reliable.
-  # This SSO token belongs to github account angular-github-ratelimit-token which has no access
-  # (password is in Valentine)
-  - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
-  # GITHUB_TOKEN_ANGULAR
-  - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
+#    - KARMA_JS_BROWSERS=ChromeNoSandbox
+#    - E2E_BROWSERS=ChromeOnTravis
+#    - LOGS_DIR=/tmp/angular-build/logs
+#    - ARCH=linux-x64
+
+    # GITHUB_TOKEN_ANGULAR
+    # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery.
+    - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
-    - MODE=dart DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
-    - MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=saucelabs_required DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=browserstack_required DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=saucelabs_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=browserstack_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=build_only DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
-    - MODE=lint DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
-    - MODE=payload DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
+   - CI_MODE=js
+   - CI_MODE=e2e
+   - CI_MODE=saucelabs_required
+   - CI_MODE=browserstack_required
+   - CI_MODE=saucelabs_optional
+   - CI_MODE=browserstack_optional
 
 matrix:
   allow_failures:
-  - env: "MODE=saucelabs_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
-  - env: "MODE=browserstack_optional DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
-  - env: "MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
-  # TODO(alxhub): remove when dartdoc #1039 is in dev channel
-  - env: "MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
+    - env: "CI_MODE=saucelabs_optional"
+    - env: "CI_MODE=browserstack_optional"
 
-addons:
-  firefox: "38.0"
-
-before_install:
-- node tools/analytics/build-analytics start ci job
-- node tools/analytics/build-analytics start ci before_install
-- echo ${TSDRC} > .tsdrc
-- export DISPLAY=:99.0
-- export GIT_SHA=$(git rev-parse HEAD)
-- ./scripts/ci/init_android.sh
-- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
-- sh -e /etc/init.d/xvfb start
-- if [[ -e SKIP_TRAVIS_TESTS ]]; then { cat SKIP_TRAVIS_TESTS ; exit 0; } fi
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
-- node tools/analytics/build-analytics success ci before_install
 
 install:
-  - node tools/analytics/build-analytics start ci install
-  # Check the size of caches
-  - du -sh ./node_modules || true
-  # Install npm dependecies
-  - npm install
-  - node tools/analytics/build-analytics success ci install
+  - ./scripts/ci-lite/install.sh
 
 before_script:
-- node tools/analytics/build-analytics start ci before_script
-- mkdir -p $LOGS_DIR
-- ./scripts/ci/presubmit-queue-setup.sh
-- node tools/analytics/build-analytics success ci before_script
+
 
 script:
-- node tools/analytics/build-analytics start ci script
-- ./scripts/ci/build_and_test.sh ${MODE}
-- node tools/analytics/build-analytics success ci script
+  - ./scripts/ci-lite/build.sh && ./scripts/ci-lite/test.sh
 
 after_script:
-- node tools/analytics/build-analytics start ci after_script
-- ./scripts/ci/print-logs.sh
-- ./scripts/ci/after-script.sh
-- ./scripts/publish/publish-build-artifacts.sh
-- node tools/analytics/build-analytics success ci after_script
-- if [[ $TRAVIS_TEST_RESULT -eq 0 ]]; then node tools/analytics/build-analytics success ci job; else node tools/analytics/build-analytics error ci job; fi
+  - ./scripts/ci-lite/cleanup.sh
 
-notifications:
-  webhooks:
-    urls:
-    - https://webhooks.gitter.im/e/1ef62e23078036f9cee4
-    # trigger Buildtime Trend Service to parse Travis CI log
-    - https://buildtimetrend.herokuapp.com/travis
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
-  slack:
-    secure: EP4MzZ8JMyNQJ4S3cd5LEPWSMjC7ZRdzt3veelDiOeorJ6GwZfCDHncR+4BahDzQAuqyE/yNpZqaLbwRWloDi15qIUsm09vgl/1IyNky1Sqc6lEknhzIXpWSalo4/T9ZP8w870EoDvM/UO+LCV99R3wS8Nm9o99eLoWVb2HIUu0=
 
+#branches:
+#  except:
+#    - g3_v2_0
+#
+#cache:
+#  directories:
+#    - $HOME/.pub-cache
+#    - $HOME/.chrome/chromium
+#
+#before_cache:
+#  # Undo the pollution of the typescript_next build before the cache is primed for future use
+#  - if [[ "$MODE" == "typescript_next" ]]; then npm install typescript; fi
+#
+#env:
+#  global:
+#    # Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise
+#    # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
+#    - CXX=g++-4.8
+#    - KARMA_DART_BROWSERS=DartiumWithWebPlatform
+#    # No sandbox mode is needed for Chromium in Travis, it crashes otherwise: https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start
+#    - KARMA_JS_BROWSERS=ChromeNoSandbox
+#    - E2E_BROWSERS=ChromeOnTravis
+#    - LOGS_DIR=/tmp/angular-build/logs
+#    - SAUCE_USERNAME=angular-ci
+#    - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
+#    - BROWSER_STACK_USERNAME=angularteam1
+#    - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
+#    - ARCH=linux-x64
+#    - DART_DEV_VERSION=latest
+#    - DART_STABLE_VERSION=latest
+#    - DART_CHANNEL=stable
+#    - DART_VERSION=$DART_STABLE_VERSION
+#    # Token for tsd to increase github rate limit
+#    # See https://github.com/DefinitelyTyped/tsd#tsdrc
+#    # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
+#    # because those are not visible for pull requests, and those should also be reliable.
+#    # This SSO token belongs to github account angular-github-ratelimit-token which has no access
+#    # (password is in Valentine)
+#    - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
+#    # GITHUB_TOKEN_ANGULAR
+#    - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
+#  matrix:
+#    # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
+#    - MODE=dart
+#    - MODE=dart DART_CHANNEL=dev
+#    - MODE=saucelabs_required
+#    - MODE=browserstack_required
+#    - MODE=saucelabs_optional
+#    - MODE=browserstack_optional
+#    - MODE=dart_ddc
+#    - MODE=js
+#    - MODE=router
+#    - MODE=build_only
+#    - MODE=typescript_next
+#    - MODE=lint
+#
+#matrix:
+#  allow_failures:
+#    - env: "MODE=saucelabs_optional"
+#    - env: "MODE=browserstack_optional"
+#
+#addons:
+#  firefox: "38.0"
+#  apt:
+#    sources:
+#      - ubuntu-toolchain-r-test
+#    packages:
+#      - g++-4.8
+#
+#before_install:
+#  - node tools/analytics/build-analytics start ci job
+#  - node tools/analytics/build-analytics start ci before_install
+#  - echo ${TSDRC} > .tsdrc
+#  - export CHROME_BIN=$HOME/.chrome/chromium/chrome-linux/chrome
+#  - export DISPLAY=:99.0
+#  - export GIT_SHA=$(git rev-parse HEAD)
+#  - ./scripts/ci/init_android.sh
+#  - sh -e /etc/init.d/xvfb start
+#  # Use a separate SauseLabs account for upstream/master builds in order for Sauce to create a badge representing the status of just upstream/master
+#  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
+#  - node tools/analytics/build-analytics success ci before_install
+#
+#install:
+#  - node tools/analytics/build-analytics start ci install
+#  # Install version of npm that we are locked against
+#  - npm install -g npm@3.5.3
+#  # Install version of Chromium that we are locked against
+#  - ./scripts/ci/install_chromium.sh
+#  # Install version of Dart based on the matrix build variables
+#  - ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
+#  # Print the size of caches to ease debugging
+#  - du -sh ./node_modules || true
+#  # Install npm dependecies
+#  # check-node-modules will exit(1) if we don't need to install
+#  # we need to manually kick off the postinstall script if check-node-modules exit(0)s
+#  - node tools/npm/check-node-modules --purge && npm install || npm run postinstall
+#  - node tools/analytics/build-analytics success ci install
+#
+#before_script:
+#  - node tools/analytics/build-analytics start ci before_script
+#  - mkdir -p $LOGS_DIR
+#  - ./scripts/ci/presubmit-queue-setup.sh
+#  - node tools/analytics/build-analytics success ci before_script
+#
+#script:
+#  - node tools/analytics/build-analytics start ci script
+#  - ./scripts/ci/build_and_test.sh ${MODE}
+#  - node tools/analytics/build-analytics success ci script
+#
+#after_script:
+#  - node tools/analytics/build-analytics start ci after_script
+#  - ./scripts/ci/print-logs.sh
+#  - ./scripts/ci/after-script.sh
+#  - ./scripts/publish/publish-build-artifacts.sh
+#  - node tools/analytics/build-analytics success ci after_script
+#  - tools/analytics/build-analytics $TRAVIS_TEST_RESULT ci job
+#
+#notifications:
+#  webhooks:
+#    urls:
+#      - https://webhooks.gitter.im/e/1ef62e23078036f9cee4
+#      # trigger Buildtime Trend Service to parse Travis CI log
+#      - https://buildtimetrend.herokuapp.com/travis
+#      - http://104.197.9.155:8484/hubot/travis/activity
+#    on_success: always  # options: [always|never|change] default: always
+#    on_failure: always  # options: [always|never|change] default: always
+#    on_start: never     # default: never
+#  slack:
+#    secure: EP4MzZ8JMyNQJ4S3cd5LEPWSMjC7ZRdzt3veelDiOeorJ6GwZfCDHncR+4BahDzQAuqyE/yNpZqaLbwRWloDi15qIUsm09vgl/1IyNky1Sqc6lEknhzIXpWSalo4/T9ZP8w870EoDvM/UO+LCV99R3wS8Nm9o99eLoWVb2HIUu0=

CONTRIBUTING.md

@@ -95,7 +95,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 * In GitHub, send a pull request to `angular:master`.
 * If we suggest changes then:
   * Make the required updates.
-  * Re-run the Angular 2 test suites for JS and Dart to ensure tests are still passing.
+  * Re-run the Angular 2 test suites to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
 
     ```shell
@@ -166,6 +166,19 @@ The **header** is mandatory and the **scope** of the header is optional.
 Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
 to read on GitHub as well as in various git tools.
 
+Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
+
+Samples: (even more [samples](https://github.com/angular/angular/commits/master))
+
+```
+docs(changelog): update change log to beta.5
+```
+```
+fix(release): need to depend on latest rxjs and zone.js
+
+The version in our package.json gets copied to the one we publish, and users need the latest of these.
+```
+
 ### Revert
 If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
 
@@ -180,7 +193,8 @@ Must be one of the following:
 * **refactor**: A code change that neither fixes a bug nor adds a feature
 * **perf**: A code change that improves performance
 * **test**: Adding missing tests or correcting existing tests
-* **build** Changes that affect the build system, CI configuration or external dependencies (example scopes: gulp, broccoli, npm)
+* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 * **chore**: Other changes that don't modify `src` or `test` files
 
 ### Scope
@@ -224,8 +238,8 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [github]: https://github.com/angular/angular
 [gitter]: https://gitter.im/angular/angular
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
-[js-style-guide]: http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
-[jsfiddle]: http://jsfiddle.net/
+[js-style-guide]: https://google.github.io/styleguide/javascriptguide.xml
+[jsfiddle]: http://jsfiddle.net
 [plunker]: http://plnkr.co/edit
-[runnable]: http://runnable.com/
+[runnable]: http://runnable.com
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angular

DEVELOPER.md

@@ -5,15 +5,9 @@ JS and Dart versions. It also explains the basic mechanics of using `git`, `node
 
 * [Prerequisite Software](#prerequisite-software)
 * [Getting the Sources](#getting-the-sources)
-* [Environment Variable Setup](#environment-variable-setup)
-* [Installing NPM Modules and Dart Packages](#installing-npm-modules-and-dart-packages)
-* [Build commands](#build-commands)
+* [Installing NPM Modules](#installing-npm-modules)
+* [Building](#building)
 * [Running Tests Locally](#running-tests-locally)
-* [Formatting](#clang-format)
-* [Project Information](#project-information)
-* [CI using Travis](#ci-using-travis)
-* [Transforming Dart code](#transforming-dart-code)
-* [Debugging](#debugging)
 
 See the [contribution guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md)
 if you'd like to contribute to Angular.
@@ -23,30 +17,17 @@ if you'd like to contribute to Angular.
 Before you can build and test Angular, you must install and configure the
 following products on your development machine:
 
-* [Dart](https://www.dartlang.org) (version ` >=1.12.0 <2.0.0`), specifically the Dart-SDK and
-  Dartium (a version of [Chromium](http://www.chromium.org) with native support for Dart through
-  the Dart VM). One of the **simplest** ways to get both is to install the **Dart Editor bundle**,
-  which includes the editor, SDK and Dartium. See the [Dart tools](https://www.dartlang.org/tools)
-  download [page for instructions](https://www.dartlang.org/tools/download.html).  
-  You can also download both **stable** and **dev** channel versions from the [download
-  archive](https://www.dartlang.org/tools/download-archive). In that case, on Windows, Dart must be added
-  to the `Path` (e.g. `path-to-dart-sdk-folder\bin`) and a new `DARTIUM_BIN` environment variable must be
-  created, pointing to the executable (e.g. `path-to-dartium-folder\chrome.exe).`
-
 * [Git](http://git-scm.com) and/or the **GitHub app** (for [Mac](http://mac.github.com) or
   [Windows](http://windows.github.com)); [GitHub's Guide to Installing
   Git](https://help.github.com/articles/set-up-git) is a good source of information.
 
-* [Node.js](http://nodejs.org), (version `>=4.2.1 <5`) which is used to run a development web server,
+* [Node.js](http://nodejs.org), (version `>=5.4.1 <6`) which is used to run a development web server,
   run tests, and generate distributable files. We also use Node's Package Manager, `npm`
-  (version `>=2.14.7 <3.0`), which comes with Node. Depending on your system, you can install Node either from
+  (version `>=3.5.3 <4.0`), which comes with Node. Depending on your system, you can install Node either from
   source or as a pre-packaged bundle.
 
-* [Chrome Canary](https://www.google.com/chrome/browser/canary.html), a version of Chrome with
-  bleeding edge functionality, built especially for developers (and early adopters).
-
-* [Bower](http://bower.io/).
-
+* [Java Development Kit](http://www.oracle.com/technetwork/es/java/javase/downloads/index.html) which is used
+  to execute the selenium standalone server for e2e testing.
 
 ## Getting the Sources
 
@@ -69,42 +50,7 @@ cd angular
 # Add the main Angular repository as an upstream remote to your repository:
 git remote add upstream https://github.com/angular/angular.git
 ```
-
-## Environment Variable Setup
-
-Define the environment variables listed below. These are mainly needed for the testing. The
-notation shown here is for [`bash`](http://www.gnu.org/software/bash); adapt as appropriate for
-your favorite shell.
-
-Examples given below of possible values for initializing the environment variables assume **Mac OS
-X** and that you have installed the Dart Editor in the directory named by
-`DART_EDITOR_DIR=/Applications/dart`. This is only for illustrative purposes.
-
-```shell
-# DARTIUM_BIN: path to a Dartium browser executable; used by Karma to run Dart tests
-export DARTIUM_BIN="$DART_EDITOR_DIR/chromium/Chromium.app/Contents/MacOS/Chromium"
-```
-
-Add the Dart SDK `bin` directory to your path and/or define `DART_SDK` (this is also detailed
-[here](https://www.dartlang.org/tools/pub/installing.html)):
-
-```shell
-# DART_SDK: path to a Dart SDK directory
-export DART_SDK="$DART_EDITOR_DIR/dart-sdk"
-
-# Update PATH to include the Dart SDK bin directory
-PATH+=":$DART_SDK/bin"
-```
-
-And specify where the pub’s dependencies are downloaded. By default, this directory is located under .pub_cache
-in your home directory (on Mac and Linux), or in AppData\Roaming\Pub\Cache (on Windows).
-
-```shell
-# PUB_CACHE: location of pub dependencies
-export PUB_CACHE="/Users/<user>/.pub-cache"
-```
-
-## Installing NPM Modules and Dart Packages
+## Installing NPM Modules
 
 Next, install the JavaScript modules and Dart packages needed to build and test Angular:
 
@@ -128,229 +74,67 @@ use in these instructions.
 *Option 2*: defining a bash alias like `alias nbin='PATH=$(npm bin):$PATH'` as detailed in this
 [Stackoverflow answer](http://stackoverflow.com/questions/9679932/how-to-use-package-installed-locally-in-node-modules/15157360#15157360) and used like this: e.g., `nbin gulp build`.
 
-## Build commands
-
-To build Angular and prepare tests, run:
+## Windows only
 
+In order to create the right symlinks, run **as administrator**:
 ```shell
-$(npm bin)/gulp build
+./scripts/windows/create-symlinks.sh
 ```
 
-Notes:
-* Results are put in the `dist` folder.
-* This will also run `pub get` for the subfolders in `modules` and run `dartanalyzer` for
-  every file that matches `<module>/src/<module>.dart`, e.g. `di/src/di.dart`.
+Before submitting a PR, do not forget to remove them:
+```shell
+ ./scripts/windows/remove-symlinks.sh
+ ```
 
-You can selectively build either the JS or Dart versions as follows:
+## Building
 
-* `$(npm bin)/gulp build.js`
-* `$(npm bin)/gulp build.dart`
-
-To clean out the `dist` folder, run:
+To build Angular run:
 
 ```shell
-$(npm bin)/gulp clean
+./build.sh
 ```
 
+* Results are put in the dist folder.
+
 ## Running Tests Locally
 
-### Full test suite
-
-* `npm test`: full test suite for both JS and Dart versions of Angular. These are the same tests
-  that run on Travis.
-
-You can selectively run either the JS or Dart versions as follows:
-
-* `$(npm bin)/gulp test.all.js`
-* `$(npm bin)/gulp test.all.dart`
-
-### Unit tests
-
-You can run just the unit tests as follows:
-
-* `$(npm bin)/gulp test.unit.js`: JS tests in a browser; runs in **watch mode** (i.e.
-   watches the test files for changes and re-runs tests when files are updated).
-* `$(npm bin)/gulp test.unit.cjs`: JS tests in NodeJS; runs in **watch mode**.
-* `$(npm bin)/gulp test.unit.dart`: Dart tests in Dartium; runs in **watch mode**.
-
-If you prefer running tests in "single-run" mode rather than watch mode use:
-
-* `$(npm bin)/gulp test.unit.js/ci`
-* `$(npm bin)/gulp test.unit.cjs/ci`
-* `$(npm bin)/gulp test.unit.dart/ci`
-
-The task updates the dist folder with transpiled code whenever a source or test file changes, and
-Karma is run against the new output.
-
-**Note**: If you want to only run a single test you can alter the test you wish to run by changing
-`it` to `iit` or `describe` to `ddescribe`. This will only run that individual test and make it
-much easier to debug. `xit` and `xdescribe` can also be useful to exclude a test and a group of
-tests respectively.
-
-**Note**: **watch mode** needs symlinks to work, so if you're using windows, ensure you have the
-rights to built them in your operating system.
-
-### Unit tests with Sauce Labs or Browser Stack
-
-First, in a terminal, create a tunnel with [Sauce Connect](https://docs.saucelabs.com/reference/sauce-connect/) or [Browser Stack Local](https://www.browserstack.com/local-testing#command-line), and valid credentials.  
-
-Then, in another terminal:
- - Define the credentials as environment variables, e.g.:
-```
-export SAUCE_USERNAME='my_user'; export SAUCE_ACCESS_KEY='my_key';
-export BROWSER_STACK_USERNAME='my_user'; export BROWSER_STACK_ACCESS_KEY='my_key';
-```
- - Then run `gulp test.unit.js.(saucelabs|browserstack) --browsers=option1,option2,..,optionN`  
-The options are any mix of browsers and aliases which are defined in the [browser-providers.conf.js](https://github.com/angular/angular/blob/master/browser-providers.conf.js) file.  
-They are case insensitive, and the `SL_` or `BS_` prefix must not be added for browsers.
-
-Some examples of commands:
-```
-gulp test.unit.js.saucelabs --browsers=Safari8,ie11  //run in Sauce Labs with Safari 8 and IE11
-gulp test.unit.js.browserstack --browsers=Safari,IE  //run in Browser Stack with Safari 7, Safari 8, Safari 9, IE 9, IE 10 and IE 11
-gulp test.unit.js.saucelabs --browsers=IOS,safari8,android5.1  //run in Sauce Labs with iOS 7, iOS 8, iOs 9, Safari 8 and Android 5.1
-```
-
-### E2E tests
-
-1. `$(npm bin)/gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder).
-2. `$(npm bin)/gulp serve.js.prod serve.dart` (runs a local webserver).
-3. `$(npm bin)/protractor protractor-js.conf.js`: JS e2e tests.
-4. `$(npm bin)/protractor protractor-dart2js.conf.js`: dart2js e2e tests.
-
-Angular specific command line options when running protractor:
-  - `$(npm bin)/protractor protractor-{js|dart2js}-conf.js --ng-help`
-
-### Performance tests
-
-1. `$(npm bin)/gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder)
-2. `$(npm bin)/gulp serve.js.prod serve.dart` (runs a local webserver)
-3. `$(npm bin)/protractor protractor-js.conf.js --benchmark`: JS performance tests
-4. `$(npm bin)/protractor protractor-dart2js.conf.js --benchmark`: dart2js performance tests
-
-Angular specific command line options when running protractor (e.g. force gc, ...):
-`$(npm bin)/protractor protractor-{js|dart2js}-conf.js --ng-help`
-
-## Formatting with <a name="clang-format">clang-format</a>
-
-We use [clang-format](http://clang.llvm.org/docs/ClangFormat.html) to automatically enforce code
-style for our TypeScript code. This allows us to focus our code reviews more on the content, and
-less on style nit-picking. It also lets us encode our style guide in the `.clang-format` file in the
-repository, allowing many tools and editors to share our settings.
-
-To check the formatting of your code, run
-
-    gulp check-format
-
-Note that the continuous build on Travis runs `gulp enforce-format`. Unlike the `check-format` task,
-this will actually fail the build if files aren't formatted according to the style guide.
-
-Your life will be easier if you include the formatter in your standard workflow. Otherwise, you'll
-likely forget to check the formatting, and waste time waiting for a build on Travis that fails due
-to some whitespace difference.
-
-* Use `$(npm bin)/clang-format -i [file name]` to format a file (or multiple).
-* Use `gulp enforce-format` to check if your code is `clang-format` clean. This also gives
-  you a command line to format your code.
-* `clang-format` also includes a git hook, run `git clang-format` to format all files you
-  touched.
-* You can run this as a **git pre-commit hook** to automatically format your delta regions when you
-  commit a change. In the angular repo, run
-
-```
-    $ echo -e '#!/bin/sh\nexec git clang-format' > .git/hooks/pre-commit
-    $ chmod u+x !$
-```
-
-* **WebStorm** can run clang-format on the current file.
-  1. Under Preferences, open Tools > External Tools.
-  1. Plus icon to Create Tool
-  1. Fill in the form:
-    - Name: clang-format
-    - Description: Format
-    - Synchronize files after execution: checked
-    - Open console: not checked
-    - Show in: Editor menu
-    - Program: `$ProjectFileDir$/node_modules/.bin/clang-format`
-    - Parameters: `-i -style=file $FilePath$`
-    - Working directory: `$ProjectFileDir$`
-* `clang-format` integrations are also available for many popular editors (`vim`, `emacs`,
-  `Sublime Text`, etc.).
-
-## Generating the API documentation
-
-The following gulp task will generate the API docs in the `dist/angular.io/partials/api/angular2`:  
+To run tests:
 
 ```shell
-$(npm bin)/gulp docs/angular.io
+$ ./test.sh node             # Run all angular tests on node
+
+$ ./test.sh browser          # Run all angular tests in browser
+$ ./test.sh browserNoRouter  # Optionally run all angular tests without router in browser
+
+$ ./test.sh tools            # Run angular tooling (not framework) tests
 ```
 
-You can serve the generated documentation to check how it would render on [angular.io](https://angular.io/):
-- check out the [angular.io repo](https://github.com/angular/angular.io) locally,
-- install dependencies as described in the [angular.io README](https://github.com/angular/angular.io/blob/master/README.md),
-- copy the generated documentation from your local angular repo at `angular/dist/angular.io/partials/api/angular2` to your local angular.io repo at `angular.io/public/docs/js/latest/api`,
-- run `harp compile` at the root of the angular.io repo to check the generated documentation for errors,
-- run `harp server` and open a browser at `http://localhost:9000/docs/js/latest/api/` to check the rendered documentation.
+You should execute the 3 test suites before submitting a PR to github.
 
-## Project Information
+All the tests are executed on our Continuous Integration infrastructure and a PR could only be merged once the tests pass.
 
-### Folder structure
+- CircleCI fails if your code is not formatted properly,
+- Travis CI fails if any of the test suite describe above fails.
 
-* `modules/*`: modules that will be loaded in the browser
-* `tools/*`: tools that are needed to build Angular
-* `dist/*`: build files are placed here.
+## Update the public API tests
 
-### File suffixes
+If you happen to modify the public API of Angular, API golden files must be updated using:
 
-* `*.ts`: TypeScript files that get transpiled to Dart and EcmaScript 5/6
-* `*.dart`: Dart files that don't get transpiled
+``` shell
+$ gulp public-api:update
+```
 
-## CI using Travis
+Note: The command `./test.sh tools` fails when the API doesn't match the golden files.
 
-For instructions on setting up Continuous Integration using Travis, see the instructions given
-[here](https://github.com/angular/angular.dart/blob/master/travis.md).
+## Formatting your source code
 
-## Transforming Dart code
+Angular uses [clang-format](http://clang.llvm.org/docs/ClangFormat.html) to format the source code. If the source code
+is not properly formatted, the CI will fail and the PR can not be merged.
 
-See the [wiki](//github.com/angular/angular/wiki/Angular-2-Dart-Transformer).
+You can automatically format your code by running:
 
-## Debugging
+``` shell
+$ gulp format
+```
 
-### Debug the transpiler
 
-If you need to debug the transpiler:
-
-- add a `debugger;` statement in the transpiler code,
-- from the root folder, execute `node debug $(npm bin)/gulp build` to enter the node
-  debugger
-- press "c" to execute the program until you reach the `debugger;` statement,
-- you can then type "repl" to enter the REPL and inspect variables in the context.
-
-See the [Node.js manual](http://nodejs.org/api/debugger.html) for more information.
-
-Notes:
-- You can also execute `node $(npm bin)/karma start karma-dart.conf.js` depending on which
-  code you want to debug (the former will process the "modules" folder while the later processes
-  the transpiler specs).
-- You can also add `debugger;` statements in the specs (JavaScript). The execution will halt when
-  the developer tools are opened in the browser running Karma.
-
-### Debug the tests
-
-If you need to debug the tests:
-
-- add a `debugger;` statement to the test you want to debug (or the source code),
-- execute karma `$(npm bin)/gulp test.js`,
-- press the top right "DEBUG" button,
-- open the DevTools and press F5,
-- the execution halts at the `debugger;` statement
-
-**Note (WebStorm users)**:
-
-1. Create a Karma run config from WebStorm.
-2. Then in the "Run" menu, press "Debug 'karma-js.conf.js'", and WebStorm will stop in the generated
-   code on the `debugger;` statement.
-3. You can then step into the code and add watches.
-
-The `debugger;` statement is needed because WebStorm will stop in a transpiled file. Breakpoints in
-the original source files are not supported at the moment.

LICENSE

@@ -1,202 +1,21 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+The MIT License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2014-2016 Google, Inc. http://angular.io
 
-   1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,18 +1,22 @@
-[![Build Status](https://travis-ci.org/angular/angular.svg?branch=master)](https://travis-ci.org/angular/angular) 
+[![Build Status](https://travis-ci.org/angular/angular.svg?branch=master)](https://travis-ci.org/angular/angular)
+[![CircleCI](https://circleci.com/gh/angular/angular/tree/master.svg?style=shield)](https://circleci.com/gh/angular/angular/tree/master)
 [![Join the chat at https://gitter.im/angular/angular](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/angular?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Issue Stats](http://issuestats.com/github/angular/angular/badge/pr)](http://issuestats.com/github/angular/angular)
-[![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue)](http://issuestats.com/github/angular/angular)
-[![npm version](https://badge.fury.io/js/angular2.svg)](http://badge.fury.io/js/angular2)
+[![Issue Stats](http://issuestats.com/github/angular/angular/badge/pr?style=flat)](http://issuestats.com/github/angular/angular)
+[![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
+[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
 [![Downloads](http://img.shields.io/npm/dm/angular2.svg)](https://npmjs.org/package/angular2)
+
 [![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
 
-Angular 
+Angular
 =========
 
 Angular is a development platform for building mobile and desktop web applications. This is the
-repository for [Angular 2][ng2], both the JavaScript (JS) and [Dart][dart] versions.
+repository for [Angular 2][ng2] Typescript/JavaScript (JS).
+ 
+Angular2 for [Dart][dart] can be found at [dart-lang/angular2][ng2dart].
 
-Angular 2 is currently in **Beta**. 
+Angular 2 is currently in **Release Candidate**.
 
 ## Quickstart
 
@@ -32,3 +36,4 @@ guidelines for [contributing][contributing] and then check out one of our issues
 [ng2]: http://angular.io
 [ngDart]: http://angulardart.org
 [ngJS]: http://angularjs.org
+[ng2dart]: https://github.com/dart-lang/angular2

TOOLS_DART.md

@@ -1,376 +0,0 @@
-# Developer Tools for Dart
-
-Use these tools and techniques to increase your app's performance
-and reliability.
-
-* [Angular debugging tools](#angular-debugging-tools)
-* [Code size](#code-size)
-* [Performance](#performance)
-
-
-## Angular debugging tools
-
-Starting with alpha.38, Angular provides a set of debugging tools
-that are accessible from any browser's developer console.
-In Chrome, you can get to the dev console by pressing
-Ctrl + Shift + J (on Mac: Cmd + Opt + J).
-
-### Enabling the debugging tools
-
-By default the debugging tools are disabled.
-Enable the debugging tools as follows:
-
-```dart
-import 'package:angular2/platform/browser.dart';
-
-main() async {
-  var appRef = await bootstrap(Application);
-  enableDebugTools(appRef);
-}
-```
-
-<!-- Change function name to enableDebuggingTools? -->
-
-
-### Using the debugging tools
-
-In the browser, open the dev console. The top-level object is called `ng` and
-contains more specific tools inside it.
-
-For example, to run the change detection profiler on your app:
-
-```javascript
-// In the dev console:
-ng.profiler.timeChangeDetection();
-```
-
-The [Change detection profiler](#change-detection-profiler) section
-has more details.
-<!-- Point to API docs when they're published, if they're useful.
-They should be under
-http://www.dartdocs.org/documentation/angular2/latest
-and/or
-https://angular.io/docs/js/latest/api/. -->
-
-
-## Code size
-
-Code must be downloaded, parsed, and executed. Too much code can lead to
-slow application start-up time, especially on slow networks and low-end devices.
-The tools and techniques in this section can help you to identify
-unnecessarily large code and to reduce code size.
-
-### Finding contributors to code size
-
-Options for investigating code size include the `--dump-info` dart2js option,
-ng2soyc, `reflector.trackUsage()`, and code coverage information
-from the Dart VM.
-
-#### Use --dump-info
-
-The `--dump-info` option of `dart2js` outputs information about what happened
-during compilation. You can specify `--dump-info` in `pubspec.yaml`:
-
-```yaml
-transformers:
-...
-- $dart2js:
-    commandLineOptions:
-    - --dump-info
-```
-
-The [Dump Info Visualizer](https://github.com/dart-lang/dump-info-visualizer)
-can help you analyze the output.
-For more information, see the
-[dart2js_info API reference](http://dart-lang.github.io/dart2js_info/doc/api/).
-
-#### Use ng2soyc.dart
-
-[ng2soyc](https://github.com/angular/ng2soyc.dart) is a utility for analyzing
-code size contributors in Angular 2 applications. It groups code size by
-library and, assuming your library names follow
-[standard naming conventions](https://www.dartlang.org/articles/style-guide/#do-prefix-library-names-with-the-package-name-and-a-dot-separated-path)
-(package.library.sublibrary...), gives the code size breakdown at
-each level. To reduce noise in the output of very large apps, ng2soyc provides
-an option to hide libraries that are too small, so you can focus on the biggest
-contributors.
-
-#### Find unused reflection data
-
-Your app might have types that are annotated with `@Component` or `@Injectable`
-but never used.
-To find these unused types, use `reflector.trackUsage()` and then,
-after exercising your app, `reflector.listUnusedKeys()`.
-For example:
-
-```
-import 'package:angular2/src/core/reflection/reflection.dart';
-...
-main() async {
-  reflector.trackUsage();
-  await bootstrap(AppComponent);
-  print('Unused keys: ${reflector.listUnusedKeys()}');
-}
-```
-
-When you run that code (in Dartium or another browser),
-you'll see a list of types that Angular _can_ inject but hasn't needed to.
-Consider removing those types or their `@Component`/`@Injectable` annotation
-to decrease your app's code size.
-
-Three conditions must be true for `listUnusedKeys()` to return helpful data:
-
-1. The angular2 transformer must run on the app.
-2. If you're running a JavaScript version of the app,
-   the app must not be minified, so that the names are readable.
-3. You must exercise your app in as many ways as possible
-   before calling `listUnusedKeys()`.
-   Otherwise, you might get false positives:
-   keys that haven't been used only because you didn't exercise
-   the relevant feature of the app.
-
-To run the angular2 transformer, first specify it in `pubspec.yaml`:
-
-```
-name: hello_world
-...
-transformers:
-- angular2:
-    entry_points: web/main.dart
-```
-
-Then use pub to run the transformer. If you use `pub serve`,
-it provides both Dart and unminified (by default) JavaScript versions.
-If you want to serve actual files, then use `pub build` in debug mode
-to generate Dart and unminified JavaScript files:
-`pub build --mode=debug`.
-
-The `reflector.trackUsage()` method makes Angular track the reflection
-information used by the app. Reflection information (`ReflectionInfo`) is a data
-structure that stores information that Angular uses for locating DI factories
-and for generating change detectors and other code related to a
-given type.
-
-#### Use code coverage to find dead code
-
-When running in Dartium (or in the Dart VM, in general) you can request code
-coverage information from the VM. You can either use
-[observatory](https://www.dartlang.org/tools/observatory/) or download
-the coverage file and use your own tools to inspect it. Lines of code that are
-not covered are top candidates for dead code.
-
-Keep in mind, however, that uncovered code is not sufficient evidence of dead
-code, only necessary evidence. It is perfectly possible that you simply didn't
-exercise your application in a way that triggers the execution of uncovered
-code. A common example is error handling code. Just because your testing never
-encountered an error does not mean the error won't happen in production. You
-therefore don't have to rush and remove all the `catch` blocks.
-
-### Reducing code size
-
-To reduce code size, you can disable reflection,
-enable minification, and manually remove dead code.
-You can also try less safe options such as
-telling dart2js to trust type annotations.
-
-
-#### Disable reflection
-
-`dart:mirrors` allows discovering program metadata at runtime. However, this
-means that `dart2js` needs to retain that metadata and thus increase the size
-of resulting JS output. In practice, however, it is possible to extract most
-metadata necessary for your metaprogramming tasks statically using a
-transformer and `package:analyzer`, and act on it before compiling to JS.
-
-#### Enable minification
-
-Minification shortens all your `longMethodNames` into 2- or 3-letter long
-symbols. `dart2js` ensures that this kind of renaming is done safely, without
-breaking the functionality of your programs. You can enable it in `pubspec.yaml`
-under `$dart2js` transformer:
-
-```yaml
-transformers:
-...
-- $dart2js:
-    minify: true
-```
-
-#### Manually remove dead code
-
-`dart2js` comes with dead code elimination out-of-the-box. However, it may not
-always be able to tell if a piece of code could be used. Consider the following
-example:
-
-```dart
-/// This function decides which serialization format to use
-void setupSerializers() {
-  if (server.doYouSupportProtocolBuffers()) {
-    useProtobufSerializers();
-  } else {
-    useJsonSerializers();
-  }
-}
-```
-
-In this example the application asks the server what kind of serialization
-format it uses and dynamically chooses one or the other. `dart2js` can't
-tell whether the server responds with yes or no, so it must retain both
-kinds of serializers. However, if you know that your server supports
-protocol buffers, you can remove that `if` block entirely and default to
-protocol buffers.
-
-Code coverage (see above) is a good way to find dead code in your app.
-
-#### Unsafe options
-
-Dart also provides more aggressive optimization options. However, you have to
-be careful when using them and as of today the benefits aren't that clear. If
-your type annotations are inaccurate you may end up with non-Darty runtime
-behavior, including the classic "undefined is not a function" tautology, as
-well as the "keep on truckin'" behavior, e.g. `null + 1 == 1` and
-`{} + [] == 0`.
-
-`--trust-type-annotations` tells `dart2js` to trust that your type annotations
-are correct. So if you have a function `foo(Bar bar)` the compiler can omit the
-check that `bar` is truly `Bar` when calling methods on it.
-
-`--trust-primitives` tells `dart2js` that primitive types, such as numbers and
-booleans are never `null` when performing arithmetic, and that your program
-does not run into range error when operating on lists, letting the compiler
-remove some of the error checking code.
-
-Specify these options in `pubspec.yaml`.
-
-Example:
-
-```yaml
-transformers:
-...
-- $dart2js:
-    commandLineOptions:
-    - --trust-type-annotations
-    - --trust-primitives
-```
-
-## Performance
-
-### Change detection profiler
-
-If your application is janky (it misses frames) or is slow according to other
-metrics, you need to find out why. This tool helps by measuring the average
-speed of _change detection_, a phase in Angular's
-lifecycle that detects changes in values that are bound to the UI.
-Janky UI updates can result from slowness either in _computing_ the changes or
-in _applying_ those changes to the UI.
-
-For your app to be performant, the process of _computing_ changes must be very
-fast—preferably **under 3 milliseconds**.
-Fast change computation leaves room for
-the application logic, UI updates, and browser rendering pipeline
-to fit within a 16 ms frame (assuming a target frame rate of 60 FPS).
-
-The change detection profiler repeatedly performs change detection
-without invoking any user actions, such as clicking buttons or entering
-text in input fields. It then computes the average amount of time
-(in milliseconds) to perform a single cycle of change detection and
-prints that to the console. This number depends on the current state of the UI. You are likely to see different numbers
-as you go from one screen in your application to another.
-
-#### Running the profiler
-
-Before running the profiler, enable the debugging tools
-and put the app into the state you want to measure:
-
-1. If you haven't already done so,
-   [enable the debugging tools](#enabling-the-debugging-tools).
-2. Navigate the app to a screen whose performance you want to profile.
-3. Make sure the screen is in a state that you want to measure.
-   For example, you might want to profile the screen several times,
-   with different amounts and kinds of data.
-
-To run the profiler, enter the following in the dev console:
-
-```javascript
-ng.profiler.timeChangeDetection();
-```
-
-The results are visible in the console.
-
-
-#### Recording CPU profiles
-
-To record a profile, pass `{record: true}` to `timeChangeDetection()`:
-
-```javascript
-ng.profiler.timeChangeDetection({record: true});
-```
-
-Then open the **Profiles** tab. The recorded profile has the title
-**Change Detection**. In Chrome, if you record the profile repeatedly, all the
-profiles are nested under Change Detection.
-
-
-#### Interpreting the numbers
-
-In a properly designed application, repeated attempts to detect changes without
-any user actions result in no changes to the UI. It is
-also desirable to have the cost of a user action be proportional to the amount
-of UI changes required. For example, popping up a menu with 5 items should be
-vastly faster than rendering a table of 500 rows and 10 columns. Therefore,
-change detection with no UI updates should be as fast as possible.
-
-#### Investigating slow change detection
-
-So you found a screen in your application on which the profiler reports a very
-high number (i.e. >3ms). This is where a recorded CPU profile can help. Enable
-recording while profiling:
-
-```javascript
-ng.profiler.timeChangeDetection({record: true});
-```
-
-Then look for hot spots using
-[Chrome CPU profiler](https://developer.chrome.com/devtools/docs/cpu-profiling).
-
-#### Reducing change detection cost
-
-There are many reasons for slow change detection. To gain intuition about
-possible causes it helps to understand how change detection works. Such a
-discussion is outside the scope of this document,
-but here are some key concepts.
-
-<!-- TODO: link to change detection docs -->
-
-By default, Angular uses a _dirty checking_ mechanism to find model changes.
-This mechanism involves evaluating every bound expression that's active on the
-UI. These usually include text interpolation via `{{expression}}` and property
-bindings via `[prop]="expression"`. If any of the evaluated expressions are
-costly to compute, they might contribute to slow change detection. A good way to
-speed things up is to use plain class fields in your expressions and avoid any
-kind of computation. For example:
-
-```dart
-@View(
-  template: '<button [enabled]="isEnabled">{{title}}</button>'
-)
-class FancyButton {
-  // GOOD: no computation, just returns the value
-  bool isEnabled;
-
-  // BAD: computes the final value upon request
-  String _title;
-  String get title => _title.trim().toUpperCase();
-}
-```
-
-Most cases like these can be solved by precomputing the value and storing the
-final value in a field.
-
-Angular also supports a second type of change detection: the _push_ model. In
-this model, Angular does not poll your component for changes. Instead, the
-component tells Angular when it changes, and only then does Angular perform
-the update. This model is suitable in situations when your data model uses
-observable or immutable objects.
-
-<!-- TODO: link to discussion of push model -->

TOOLS_JS.md

@@ -14,7 +14,7 @@ Ctrl + Shift + j.
 By default the debug tools are disabled. You can enable debug tools as follows:
 
 ```typescript
-import {enableDebugTools} from 'angular2/platform/browser';
+import {enableDebugTools} from '@angular/platform-browser';
 
 bootstrap(Application).then((appRef) => {
   enableDebugTools(appRef);
@@ -117,7 +117,7 @@ speed things up is to use plain class fields in your expressions and avoid any
 kinds of computation. Example:
 
 ```typescript
-@View({
+@Component({
   template: '<button [enabled]="isEnabled">{{title}}</button>'
 })
 class FancyButton {

browser-providers.conf.js

@@ -4,14 +4,16 @@
 var CIconfiguration = {
   'Chrome':       { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
   'Firefox':      { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'ChromeBeta':   { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'FirefoxBeta':  { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  // FirefoxBeta and ChromeBeta should be target:'BS' or target:'SL', and required:true
+  // Currently deactivated due to https://github.com/angular/angular/issues/7560
+  'ChromeBeta':   { unitTest: {target: null, required: true}, e2e: {target: null, required: false}},
+  'FirefoxBeta':  { unitTest: {target: null, required: false}, e2e: {target: null, required: false}},
   'ChromeDev':    { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
   'FirefoxDev':   { unitTest: {target: null, required: true}, e2e: {target: null, required: true}},
   'IE9':          { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
   'IE10':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
   'IE11':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
-  'Edge':         { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
+  'Edge':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'Android4.1':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
   'Android4.2':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
   'Android4.3':   { unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
@@ -22,8 +24,7 @@ var CIconfiguration = {
   'Safari9':      { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'iOS7':         { unitTest: {target: 'BS', required: true}, e2e: {target: null, required: true}},
   'iOS8':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
-  // TODO(mlaval): iOS9 deactivated as not reliable, reactivate after https://github.com/angular/angular/issues/5408
-  'iOS9':         { unitTest: {target: null, required: false}, e2e: {target: null, required: true}},
+  'iOS9':         { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}},
   'WindowsPhone': { unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
 };
 
@@ -37,7 +38,7 @@ var customLaunchers = {
   'SL_CHROME': {
     base: 'SauceLabs',
     browserName: 'chrome',
-    version: '46'
+    version: '52'
   },
   'SL_CHROMEBETA': {
     base: 'SauceLabs',
@@ -52,7 +53,7 @@ var customLaunchers = {
   'SL_FIREFOX': {
     base: 'SauceLabs',
     browserName: 'firefox',
-    version: '42'
+    version: '46'
   },
   'SL_FIREFOXBETA': {
     base: 'SauceLabs',
@@ -68,13 +69,13 @@ var customLaunchers = {
     base: 'SauceLabs',
     browserName: 'safari',
     platform: 'OS X 10.9',
-    version: '7'
+    version: '7.0'
   },
   'SL_SAFARI8': {
     base: 'SauceLabs',
     browserName: 'safari',
     platform: 'OS X 10.10',
-    version: '8'
+    version: '8.0'
   },
   'SL_SAFARI9': {
     base: 'SauceLabs',
@@ -98,7 +99,7 @@ var customLaunchers = {
     base: 'SauceLabs',
     browserName: 'iphone',
     platform: 'OS X 10.10',
-    version: '9.1'
+    version: '9.3'
   },
   'SL_IE9': {
     base: 'SauceLabs',
@@ -120,9 +121,9 @@ var customLaunchers = {
   },
   'SL_EDGE': {
     base: 'SauceLabs',
-    browserName: 'microsoftedge',
+    browserName: 'MicrosoftEdge',
     platform: 'Windows 10',
-    version: '20.10240'
+    version: '13.10586'
   },
   'SL_ANDROID4.1': {
     base: 'SauceLabs',
@@ -201,7 +202,7 @@ var customLaunchers = {
     base: 'BrowserStack',
     device: 'iPhone 6S',
     os: 'ios',
-    os_version: '9.0'
+    os_version: '9.1'
   },
   'BS_IE9': {
     base: 'BrowserStack',
@@ -298,12 +299,7 @@ module.exports = {
   customLaunchers: customLaunchers,
   sauceAliases: sauceAliases,
   browserstackAliases: browserstackAliases
-}
-
-if (process.env.TRAVIS) {
-  process.env.SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY.split('').reverse().join('');
-  process.env.BROWSER_STACK_ACCESS_KEY = process.env.BROWSER_STACK_ACCESS_KEY.split('').reverse().join('');
-}
+};
 
 function buildConfiguration(type, target, required) {
   return Object.keys(CIconfiguration)

build.sh

@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail
+
+cd `dirname $0`
+
+export NODE_PATH=${NODE_PATH}:$(pwd)/dist/all:$(pwd)/dist/tools
+
+
+rm -rf ./dist/all/
+mkdir -p ./dist/all/
+
+TSCONFIG=./tools/tsconfig.json
+echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
+$(npm bin)/tsc -p ${TSCONFIG}
+cp ./tools/@angular/tsc-wrapped/package.json ./dist/tools/@angular/tsc-wrapped
+
+echo "====== Copying files needed for e2e tests ====="
+cp -r ./modules/playground ./dist/all/
+cp -r ./modules/playground/favicon.ico ./dist/
+#rsync -aP ./modules/playground/* ./dist/all/playground/
+mkdir ./dist/all/playground/vendor
+cd ./dist/all/playground/vendor
+ln -s ../../../../node_modules/es6-shim/es6-shim.js .
+ln -s ../../../../node_modules/zone.js/dist/zone.js .
+ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
+ln -s ../../../../node_modules/systemjs/dist/system.src.js .
+ln -s ../../../../node_modules/base64-js/lib/b64.js .
+ln -s ../../../../node_modules/reflect-metadata/Reflect.js .
+ln -s ../../../../node_modules/rxjs .
+ln -s ../../../../node_modules/angular/angular.js .
+cd -
+
+
+TSCONFIG=./modules/tsconfig.json
+echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
+# compile ts code
+TSC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
+$TSC -p modules/tsconfig.json
+
+rm -rf ./dist/packages-dist
+
+for PACKAGE in \
+  core \
+  compiler \
+  common \
+  forms \
+  platform-browser \
+  platform-browser-dynamic \
+  platform-server \
+  http \
+  router \
+  router-deprecated \
+  upgrade \
+  compiler-cli
+do
+  SRCDIR=./modules/@angular/${PACKAGE}
+  DESTDIR=./dist/packages-dist/${PACKAGE}
+  UMD_ES6_PATH=${DESTDIR}/esm/${PACKAGE}.umd.js
+  UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
+  UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
+
+  if [[ ${PACKAGE} == "router-deprecated" ]]; then
+    echo "======      COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json        ====="
+    $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json
+  else
+    echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json        ====="
+    $TSC -p ${SRCDIR}/tsconfig-es5.json
+  fi
+
+  cp ${SRCDIR}/package.json ${DESTDIR}/
+
+
+  echo "======      TSC 1.8 d.ts compat for ${DESTDIR}   ====="
+  # safely strips 'readonly' specifier from d.ts files to make them compatible with tsc 1.8
+  if [ "$(uname)" == "Darwin" ]; then
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i ''    -e 's/\(^ *(static |private )*\)*readonly  */\1/g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i ''    -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
+  else
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i -e 's/\(^ *(static |private )*\)*readonly  */\1/g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
+  fi
+
+  if [[ ${PACKAGE} != compiler-cli ]]; then
+
+    if [[ ${PACKAGE} == "router-deprecated" ]]; then
+      echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
+      $(npm bin)/tsc --emitDecoratorMetadata -p ${SRCDIR}/tsconfig-es2015.json
+    else
+      echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
+      $TSC -p ${SRCDIR}/tsconfig-es2015.json
+    fi
+
+    echo "======      BUNDLING: ${SRCDIR} ====="
+    mkdir ${DESTDIR}/bundles
+
+    (
+      cd  ${SRCDIR}
+      echo "..."  # here just to have grep match something and not exit with 1
+      ../../../node_modules/.bin/rollup -c rollup.config.js
+    ) 2>&1 | grep -v "as external dependency"
+
+    $(npm bin)/tsc  \
+        --out ${UMD_ES5_PATH} \
+        --target es5 \
+        --lib "es6,dom" \
+        --allowJs \
+        ${UMD_ES6_PATH}
+
+    rm ${UMD_ES6_PATH}
+
+    cat ./modules/@angular/license-banner.txt > ${UMD_ES5_PATH}.tmp
+    cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
+    mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
+
+    $(npm bin)/uglifyjs -c --screw-ie8 -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
+  fi
+done
+
+echo "======      COMPILING: \$(npm bin)/tsc -p benchpress/tsconfig.json ====="
+$(npm bin)/tsc -p ./modules/benchpress/tsconfig.json

circle.yml

@@ -0,0 +1,11 @@
+machine:
+  node:
+    version: 5.4.1
+
+dependencies:
+  pre:
+    - npm install -g npm
+
+test:
+  override:
+    - gulp lint

karma-dart-evalcache.js

@@ -1,86 +0,0 @@
-// This module provides a customFileHandler for karma
-// that serves files with urls like /packages_<timestamp>/...
-// with maximum cache.
-// We are using these urls when we spawn isolates
-// so that the isolates don't reload files every time.
-
-var common = require('karma/lib/middleware/common');
-var fs = require('fs');
-
-var DART_EVAL_PATH_RE = /.*\/packages_\d+\/(.*)$/;
-
-module.exports = createFactory;
-
-function createFactory(proxyPaths) {
-  return {
-    'framework:dart-evalcache': ['factory', dartEvalCacheFactory]
-  };
-
-  function dartEvalCacheFactory(emitter, logger, customFileHandlers) {
-    var filesPromise = new common.PromiseContainer();
-    emitter.on('file_list_modified', function(files) {
-      filesPromise.set(Promise.resolve(files));
-    });
-
-    var serveFile = common.createServeFile(fs);
-    var log = logger.create('dart-evalcache');
-
-    customFileHandlers.push({
-      urlRegex: DART_EVAL_PATH_RE,
-      handler: handler
-    });
-
-    // See source_files handler
-    function handler(request, response, fa, fb, basePath) {
-      return filesPromise.then(function(files) {
-        try {
-          var requestedFilePath = mapUrlToFile(request.url, proxyPaths, basePath, log);
-          // TODO(vojta): change served to be a map rather then an array
-          var file = findByPath(files.served, requestedFilePath);
-          if (file) {
-            serveFile(file.contentPath || file.path, response, function() {
-              common.setHeavyCacheHeaders(response);
-            }, file.content);
-          } else {
-            response.writeHead(404);
-            response.end('Not found');
-          }
-        } catch (e) {
-          log.error(e.stack);
-          response.writeHead(500);
-          response.end('Error', e.stack);
-        }
-      });
-    }
-  };
-}
-
-function mapUrlToFile(url, proxyPaths, basePath, log) {
-  var originalUrl = url;
-  url = url.indexOf('?') > -1 ? url.substring(0, url.indexOf('?')) : url;
-  var match = DART_EVAL_PATH_RE.exec(url);
-  var packagePath = match[1];
-  var result = null;
-  var lastProxyFromLength = 0;
-  Object.keys(proxyPaths).forEach(function(proxyFrom) {
-    if (startsWith(packagePath, proxyFrom) && proxyFrom.length > lastProxyFromLength) {
-      lastProxyFromLength = proxyFrom.length;
-      result = proxyPaths[proxyFrom] + packagePath.substring(proxyFrom.length);
-    }
-  });
-  return basePath + '/' + result;
-}
-
-function startsWith(string, subString) {
-  return string.length >= subString.length && string.slice(0, subString.length) === subString;
-}
-
-function findByPath(files, path) {
-  for (var i = 0; i < files.length; i++) {
-    if (files[i].path === path) {
-      return files[i];
-    }
-  }
-
-  return null;
-}

karma-dart.conf.js

@@ -1,82 +0,0 @@
-var browserProvidersConf = require('./browser-providers.conf.js');
-
-var packageSources = {
-  // Dependencies installed with `pub install`.
-  'unittest': 'packages/unittest',
-  'guinness': 'packages/guinness',
-  'matcher': 'packages/matcher',
-  'stack_trace': 'packages/stack_trace',
-  'collection': 'packages/collection',
-  'path': 'packages/path',
-  'observe': 'packages/observe',
-  'quiver': 'packages/quiver',
-  'intl': 'packages/intl',
-  'smoke': 'packages/smoke',
-  'logging': 'packages/logging',
-  'utf': 'packages/utf',
-
-  // Local dependencies, transpiled from the source.
-  'angular2': 'dist/dart/angular2/lib',
-  'angular2/test/': 'dist/dart/angular2/test/',
-  'http': 'dist/dart/http/lib',
-  'angular2_material': 'dist/dart/angular2_material/lib',
-  'benchpress': 'dist/dart/benchpress/lib',
-  'examples': 'dist/dart/examples/lib'
-};
-
-var proxyPaths = {};
-Object.keys(packageSources).map(function(packageName) {
-  var filePath = packageSources[packageName];
-  proxyPaths['/packages/'+packageName] = '/base/'+filePath;
-});
-
-// Karma configuration
-// Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
-module.exports = function(config) {
-  config.set({
-
-    frameworks: ['dart-unittest', 'dart-evalcache'],
-
-    files: [
-      // Init and configure guiness.
-      {pattern: 'test-init.dart', included: true},
-      // Unit test files needs to be included.
-      {pattern: 'dist/dart/**/*_spec.dart', included: true, watched: false},
-
-      // Karma-dart via the dart-unittest framework generates
-      // `__adapter_unittest.dart` that imports these files.
-      {pattern: 'dist/dart/**', included: false, watched: false},
-
-      // Dependencies, installed with `pub install`.
-      {pattern: 'packages/**/*.dart', included: false, watched: false},
-
-      // Init and configure guiness.
-      {pattern: 'test-main.dart', included: true},
-      {pattern: 'modules/**/test/**/static_assets/**', included: false, watched: false},
-    ],
-
-    exclude: [
-      'dist/dart/**/packages/**',
-      'modules/angular1_router/**'
-    ],
-
-    karmaDartImports: {
-      guinness: 'package:guinness/guinness_html.dart'
-    },
-
-    // Map packages to the correct urls where Karma serves them.
-    proxies: proxyPaths,
-
-    customLaunchers: browserProvidersConf.customLaunchers,
-    browsers: ['DartiumWithWebPlatform'],
-
-    port: 9877,
-
-    plugins: [
-      require('karma-dart'),
-      require('karma-chrome-launcher'),
-      require('karma-sauce-launcher'),
-      require('./karma-dart-evalcache')(packageSources)
-    ]
-  });
-};

karma-js.conf.js

@@ -11,28 +11,38 @@ module.exports = function(config) {
     files: [
       // Sources and specs.
       // Loaded through the System loader, in `test-main.js`.
-      {pattern: 'dist/js/dev/es5/**', included: false, watched: false},
+      {pattern: 'dist/all/@angular/**/*.js', included: false, watched: true},
 
       'node_modules/es6-shim/es6-shim.js',
       // include Angular v1 for upgrade module testing
       'node_modules/angular/angular.min.js',
 
-      // zone-microtask must be included first as it contains a Promise monkey patch
-      'node_modules/zone.js/dist/zone-microtask.js',
+      'node_modules/zone.js/dist/zone.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
       'node_modules/zone.js/dist/jasmine-patch.js',
+      'node_modules/zone.js/dist/async-test.js',
+      'node_modules/zone.js/dist/fake-async-test.js',
 
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
-      'modules/angular2/src/testing/shims_for_IE.js',
+      'shims_for_IE.js',
       'node_modules/systemjs/dist/system.src.js',
       {pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true},
       'node_modules/reflect-metadata/Reflect.js',
       'tools/build/file2modulename.js',
       'test-main.js',
-      {pattern: 'modules/**/test/**/static_assets/**', included: false, watched: false}
+      {pattern: 'dist/all/empty.*', included: false, watched: false},
+      {pattern: 'modules/@angular/platform-browser/test/static_assets/**', included: false, watched: false},
+      {pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**', included: false, watched: false}
     ],
 
-    exclude: ['dist/js/dev/es5/**/e2e_test/**', 'dist/js/dev/es5/angular2/examples/**', 'dist/angular1_router.js'],
+    exclude: [
+      'dist/all/@angular/**/e2e_test/**',
+      'dist/all/@angular/examples/**',
+      'dist/all/@angular/router/**',
+      'dist/all/@angular/compiler-cli/**',
+      'dist/all/angular1_router.js',
+      'dist/all/@angular/platform-browser/testing/e2e_util.js'
+    ],
 
     customLaunchers: browserProvidersConf.customLaunchers,
 
@@ -42,7 +52,6 @@ module.exports = function(config) {
       'karma-sauce-launcher',
       'karma-chrome-launcher',
       'karma-sourcemap-loader',
-      'karma-dart',
       internalAngularReporter
     ],
 
@@ -53,11 +62,12 @@ module.exports = function(config) {
     reporters: ['internal-angular'],
     sauceLabs: {
       testName: 'Angular2',
+      retryLimit: 3,
       startConnect: false,
       recordVideo: false,
       recordScreenshots: false,
       options: {
-        'selenium-version': '2.48.2',
+        'selenium-version': '2.53.0',
         'command-timeout': 600,
         'idle-timeout': 600,
         'max-duration': 5400
@@ -67,19 +77,23 @@ module.exports = function(config) {
     browserStack: {
       project: 'Angular2',
       startTunnel: false,
-      retryLimit: 1,
+      retryLimit: 3,
       timeout: 600,
       pollingTimeout: 10000
     },
 
     browsers: ['Chrome'],
 
-    port: 9876
+    port: 9876,
+    captureTimeout: 60000,
+    browserDisconnectTimeout : 60000,
+    browserDisconnectTolerance : 3,
+    browserNoActivityTimeout : 60000,
   });
 
   if (process.env.TRAVIS) {
     var buildId = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
-    if (process.env.MODE.startsWith('saucelabs')) {
+    if (process.env.CI_MODE.startsWith('saucelabs')) {
       config.sauceLabs.build = buildId;
       config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
 
@@ -89,7 +103,7 @@ module.exports = function(config) {
       config.transports = ['polling'];
     }
 
-    if (process.env.MODE.startsWith('browserstack')) {
+    if (process.env.CI_MODE.startsWith('browserstack')) {
       config.browserStack.build = buildId;
       config.browserStack.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
     }

modules/@angular/common/index.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgModule} from '@angular/core';
+import {COMMON_DIRECTIVES} from './src/common_directives';
+import {COMMON_PIPES} from './src/pipes';
+
+export * from './src/pipes';
+export * from './src/directives';
+export * from './src/forms-deprecated';
+export * from './src/common_directives';
+export * from './src/location';
+export {NgLocalization} from './src/localization';
+
+// Note: This does not contain the location providers,
+// as they need some platform specific implementations to work.
+/**
+ * The module that includes all the basic Angular directives like {@link NgIf}, ${link NgFor}, ...
+ *
+ * @experimental
+ */
+@NgModule(
+    {declarations: [COMMON_DIRECTIVES, COMMON_PIPES], exports: [COMMON_DIRECTIVES, COMMON_PIPES]})
+export class CommonModule {
+}

modules/@angular/common/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@angular/common",
+  "version": "0.0.0-PLACEHOLDER",
+  "description": "",
+  "main": "index.js",
+  "jsnext:main": "esm/index.js",
+  "typings": "index.d.ts",
+  "author": "angular",
+  "license": "MIT",
+  "peerDependencies": {
+    "@angular/core": "0.0.0-PLACEHOLDER"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.git"
+  }
+}

modules/@angular/common/rollup.config.js

@@ -0,0 +1,17 @@
+
+export default {
+  entry: '../../../dist/packages-dist/common/esm/index.js',
+  dest: '../../../dist/packages-dist/common/esm/common.umd.js',
+  format: 'umd',
+  moduleName: 'ng.common',
+  globals: {
+    '@angular/core': 'ng.core',
+    'rxjs/Subject': 'Rx',
+    'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
+    'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+    'rxjs/Observable': 'Rx'
+  },
+  plugins: [
+//    nodeResolve({ jsnext: true, main: true }),
+  ]
+}

modules/@angular/common/src/common_directives.ts

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Type} from '@angular/core';
+
+import {CORE_DIRECTIVES} from './directives';
+
+/**
+ * A collection of Angular core directives that are likely to be used in each and every Angular
+ * application. This includes core directives (e.g., NgIf and NgFor), and forms directives (e.g.,
+ * NgModel).
+ *
+ * This collection can be used to quickly enumerate all the built-in directives in the `directives`
+ * property of the `@Component` decorator.
+ *
+ * ### Example
+ *
+ * Instead of writing:
+ *
+ * ```typescript
+ * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, NgModel, NgForm} from
+ * '@angular/common';
+ * import {OtherDirective} from './myDirectives';
+ *
+ * @Component({
+ *   selector: 'my-component',
+ *   templateUrl: 'myComponent.html',
+ *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, NgModel, NgForm,
+ * OtherDirective]
+ * })
+ * export class MyComponent {
+ *   ...
+ * }
+ * ```
+ * one could import all the common directives at once:
+ *
+ * ```typescript
+ * import {COMMON_DIRECTIVES} from '@angular/common';
+ * import {OtherDirective} from './myDirectives';
+ *
+ * @Component({
+ *   selector: 'my-component',
+ *   templateUrl: 'myComponent.html',
+ *   directives: [COMMON_DIRECTIVES, OtherDirective]
+ * })
+ * export class MyComponent {
+ *   ...
+ * }
+ * ```
+ *
+ * @experimental Contains forms which are experimental.
+ */
+export const COMMON_DIRECTIVES: Type[][] = [CORE_DIRECTIVES];

modules/@angular/common/src/directives.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Common directives shipped with Angular.
+ */
+export {CORE_DIRECTIVES} from './directives/core_directives';
+export {NgClass} from './directives/ng_class';
+export {NgFor} from './directives/ng_for';
+export {NgIf} from './directives/ng_if';
+export {NgPlural, NgPluralCase} from './directives/ng_plural';
+export {NgStyle} from './directives/ng_style';
+export {NgSwitch, NgSwitchCase, NgSwitchDefault} from './directives/ng_switch';
+export {NgTemplateOutlet} from './directives/ng_template_outlet';

modules/@angular/common/src/directives/core_directives.ts

@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Type} from '../facade/lang';
+
+import {NgClass} from './ng_class';
+import {NgFor} from './ng_for';
+import {NgIf} from './ng_if';
+import {NgPlural, NgPluralCase} from './ng_plural';
+import {NgStyle} from './ng_style';
+import {NgSwitch, NgSwitchCase, NgSwitchDefault} from './ng_switch';
+import {NgTemplateOutlet} from './ng_template_outlet';
+
+/**
+ * A collection of Angular core directives that are likely to be used in each and every Angular
+ * application.
+ *
+ * This collection can be used to quickly enumerate all the built-in directives in the `directives`
+ * property of the `@Component` annotation.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/yakGwpCdUkg0qfzX5m8g?p=preview))
+ *
+ * Instead of writing:
+ *
+ * ```typescript
+ * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from '@angular/common';
+ * import {OtherDirective} from './myDirectives';
+ *
+ * @Component({
+ *   selector: 'my-component',
+ *   templateUrl: 'myComponent.html',
+ *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+ * })
+ * export class MyComponent {
+ *   ...
+ * }
+ * ```
+ * one could import all the core directives at once:
+ *
+ * ```typescript
+ * import {CORE_DIRECTIVES} from '@angular/common';
+ * import {OtherDirective} from './myDirectives';
+ *
+ * @Component({
+ *   selector: 'my-component',
+ *   templateUrl: 'myComponent.html',
+ *   directives: [CORE_DIRECTIVES, OtherDirective]
+ * })
+ * export class MyComponent {
+ *   ...
+ * }
+ * ```
+ *
+ * @stable
+ */
+export const CORE_DIRECTIVES: Type[] = [
+  NgClass,
+  NgFor,
+  NgIf,
+  NgTemplateOutlet,
+  NgStyle,
+  NgSwitch,
+  NgSwitchCase,
+  NgSwitchDefault,
+  NgPlural,
+  NgPluralCase,
+];

modules/@angular/common/src/directives/ng_class.ts

@@ -0,0 +1,189 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {CollectionChangeRecord, Directive, DoCheck, ElementRef, Input, IterableDiffer, IterableDiffers, KeyValueChangeRecord, KeyValueDiffer, KeyValueDiffers, Renderer} from '@angular/core';
+
+import {StringMapWrapper, isListLikeIterable} from '../facade/collection';
+import {isArray, isPresent, isString} from '../facade/lang';
+
+
+
+/**
+ * The `NgClass` directive conditionally adds and removes CSS classes on an HTML element based on
+ * an expression's evaluation result.
+ *
+ * The result of an expression evaluation is interpreted differently depending on type of
+ * the expression evaluation result:
+ * - `string` - all the CSS classes listed in a string (space delimited) are added
+ * - `Array` - all the CSS classes (Array elements) are added
+ * - `Object` - each key corresponds to a CSS class name while values are interpreted as expressions
+ * evaluating to `Boolean`. If a given expression evaluates to `true` a corresponding CSS class
+ * is added - otherwise it is removed.
+ *
+ * While the `NgClass` directive can interpret expressions evaluating to `string`, `Array`
+ * or `Object`, the `Object`-based version is the most often used and has an advantage of keeping
+ * all the CSS class names in a template.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/a4YdtmWywhJ33uqfpPPn?p=preview)):
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {NgClass} from '@angular/common';
+ *
+ * @Component({
+ *   selector: 'toggle-button',
+ *   inputs: ['isDisabled'],
+ *   template: `
+ *      <div class="button" [ngClass]="{active: isOn, disabled: isDisabled}"
+ *          (click)="toggle(!isOn)">
+ *          Click me!
+ *      </div>`,
+ *   styles: [`
+ *     .button {
+ *       width: 120px;
+ *       border: medium solid black;
+ *     }
+ *
+ *     .active {
+ *       background-color: red;
+ *    }
+ *
+ *     .disabled {
+ *       color: gray;
+ *       border: medium solid gray;
+ *     }
+ *   `],
+ *   directives: [NgClass]
+ * })
+ * class ToggleButton {
+ *   isOn = false;
+ *   isDisabled = false;
+ *
+ *   toggle(newState) {
+ *     if (!this.isDisabled) {
+ *       this.isOn = newState;
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * @stable
+ */
+@Directive({selector: '[ngClass]'})
+export class NgClass implements DoCheck {
+  private _iterableDiffer: IterableDiffer;
+  private _keyValueDiffer: KeyValueDiffer;
+  private _initialClasses: string[] = [];
+  private _rawClass: string[]|Set<string>;
+
+  constructor(
+      private _iterableDiffers: IterableDiffers, private _keyValueDiffers: KeyValueDiffers,
+      private _ngEl: ElementRef, private _renderer: Renderer) {}
+
+
+  @Input('class')
+  set initialClasses(v: string) {
+    this._applyInitialClasses(true);
+    this._initialClasses = isPresent(v) && isString(v) ? v.split(' ') : [];
+    this._applyInitialClasses(false);
+    this._applyClasses(this._rawClass, false);
+  }
+
+  @Input()
+  set ngClass(v: string|string[]|Set<string>|{[key: string]: any}) {
+    this._cleanupClasses(this._rawClass);
+
+    if (isString(v)) {
+      v = (<string>v).split(' ');
+    }
+
+    this._rawClass = <string[]|Set<string>>v;
+    this._iterableDiffer = null;
+    this._keyValueDiffer = null;
+    if (isPresent(v)) {
+      if (isListLikeIterable(v)) {
+        this._iterableDiffer = this._iterableDiffers.find(v).create(null);
+      } else {
+        this._keyValueDiffer = this._keyValueDiffers.find(v).create(null);
+      }
+    }
+  }
+
+  ngDoCheck(): void {
+    if (isPresent(this._iterableDiffer)) {
+      var changes = this._iterableDiffer.diff(this._rawClass);
+      if (isPresent(changes)) {
+        this._applyIterableChanges(changes);
+      }
+    }
+    if (isPresent(this._keyValueDiffer)) {
+      var changes = this._keyValueDiffer.diff(this._rawClass);
+      if (isPresent(changes)) {
+        this._applyKeyValueChanges(changes);
+      }
+    }
+  }
+
+  private _cleanupClasses(rawClassVal: string[]|Set<string>|{[key: string]: any}): void {
+    this._applyClasses(rawClassVal, true);
+    this._applyInitialClasses(false);
+  }
+
+  private _applyKeyValueChanges(changes: any): void {
+    changes.forEachAddedItem(
+        (record: KeyValueChangeRecord) => { this._toggleClass(record.key, record.currentValue); });
+    changes.forEachChangedItem(
+        (record: KeyValueChangeRecord) => { this._toggleClass(record.key, record.currentValue); });
+    changes.forEachRemovedItem((record: KeyValueChangeRecord) => {
+      if (record.previousValue) {
+        this._toggleClass(record.key, false);
+      }
+    });
+  }
+
+  private _applyIterableChanges(changes: any): void {
+    changes.forEachAddedItem(
+        (record: CollectionChangeRecord) => { this._toggleClass(record.item, true); });
+    changes.forEachRemovedItem(
+        (record: CollectionChangeRecord) => { this._toggleClass(record.item, false); });
+  }
+
+  private _applyInitialClasses(isCleanup: boolean) {
+    this._initialClasses.forEach(className => this._toggleClass(className, !isCleanup));
+  }
+
+  private _applyClasses(
+      rawClassVal: string[]|Set<string>|{[key: string]: any}, isCleanup: boolean) {
+    if (isPresent(rawClassVal)) {
+      if (isArray(rawClassVal)) {
+        (<string[]>rawClassVal).forEach(className => this._toggleClass(className, !isCleanup));
+      } else if (rawClassVal instanceof Set) {
+        (<Set<string>>rawClassVal).forEach(className => this._toggleClass(className, !isCleanup));
+      } else {
+        StringMapWrapper.forEach(
+            <{[k: string]: any}>rawClassVal, (expVal: any, className: string) => {
+              if (isPresent(expVal)) this._toggleClass(className, !isCleanup);
+            });
+      }
+    }
+  }
+
+  private _toggleClass(className: string, enabled: boolean): void {
+    className = className.trim();
+    if (className.length > 0) {
+      if (className.indexOf(' ') > -1) {
+        var classes = className.split(/\s+/g);
+        for (var i = 0, len = classes.length; i < len; i++) {
+          this._renderer.setElementClass(this._ngEl.nativeElement, classes[i], enabled);
+        }
+      } else {
+        this._renderer.setElementClass(this._ngEl.nativeElement, className, enabled);
+      }
+    }
+  }
+}

modules/@angular/common/src/directives/ng_for.ts

@@ -0,0 +1,161 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {ChangeDetectorRef, CollectionChangeRecord, DefaultIterableDiffer, Directive, DoCheck, EmbeddedViewRef, Input, IterableDiffer, IterableDiffers, OnChanges, SimpleChanges, TemplateRef, TrackByFn, ViewContainerRef} from '@angular/core';
+
+import {BaseException} from '../facade/exceptions';
+import {getTypeNameForDebugging, isBlank, isPresent} from '../facade/lang';
+
+export class NgForRow {
+  constructor(public $implicit: any, public index: number, public count: number) {}
+
+  get first(): boolean { return this.index === 0; }
+
+  get last(): boolean { return this.index === this.count - 1; }
+
+  get even(): boolean { return this.index % 2 === 0; }
+
+  get odd(): boolean { return !this.even; }
+}
+
+/**
+ * The `NgFor` directive instantiates a template once per item from an iterable. The context for
+ * each instantiated template inherits from the outer context with the given loop variable set
+ * to the current item from the iterable.
+ *
+ * ### Local Variables
+ *
+ * `NgFor` provides several exported values that can be aliased to local variables:
+ *
+ * * `index` will be set to the current loop iteration for each template context.
+ * * `first` will be set to a boolean value indicating whether the item is the first one in the
+ *   iteration.
+ * * `last` will be set to a boolean value indicating whether the item is the last one in the
+ *   iteration.
+ * * `even` will be set to a boolean value indicating whether this item has an even index.
+ * * `odd` will be set to a boolean value indicating whether this item has an odd index.
+ *
+ * ### Change Propagation
+ *
+ * When the contents of the iterator changes, `NgFor` makes the corresponding changes to the DOM:
+ *
+ * * When an item is added, a new instance of the template is added to the DOM.
+ * * When an item is removed, its template instance is removed from the DOM.
+ * * When items are reordered, their respective templates are reordered in the DOM.
+ * * Otherwise, the DOM element for that item will remain the same.
+ *
+ * Angular uses object identity to track insertions and deletions within the iterator and reproduce
+ * those changes in the DOM. This has important implications for animations and any stateful
+ * controls
+ * (such as `<input>` elements which accept user input) that are present. Inserted rows can be
+ * animated in, deleted rows can be animated out, and unchanged rows retain any unsaved state such
+ * as user input.
+ *
+ * It is possible for the identities of elements in the iterator to change while the data does not.
+ * This can happen, for example, if the iterator produced from an RPC to the server, and that
+ * RPC is re-run. Even if the data hasn't changed, the second response will produce objects with
+ * different identities, and Angular will tear down the entire DOM and rebuild it (as if all old
+ * elements were deleted and all new elements inserted). This is an expensive operation and should
+ * be avoided if possible.
+ *
+ * ### Syntax
+ *
+ * - `<li *ngFor="let item of items; let i = index">...</li>`
+ * - `<li template="ngFor let item of items; let i = index">...</li>`
+ * - `<template ngFor let-item [ngForOf]="items" let-i="index"><li>...</li></template>`
+ *
+ * ### Example
+ *
+ * See a [live demo](http://plnkr.co/edit/KVuXxDp0qinGDyo307QW?p=preview) for a more detailed
+ * example.
+ *
+ * @stable
+ */
+@Directive({selector: '[ngFor][ngForOf]'})
+export class NgFor implements DoCheck, OnChanges {
+  @Input() ngForOf: any;
+  @Input() ngForTrackBy: TrackByFn;
+
+  private _differ: IterableDiffer;
+
+  constructor(
+      private _viewContainer: ViewContainerRef, private _templateRef: TemplateRef<NgForRow>,
+      private _iterableDiffers: IterableDiffers, private _cdr: ChangeDetectorRef) {}
+
+  @Input()
+  set ngForTemplate(value: TemplateRef<NgForRow>) {
+    if (isPresent(value)) {
+      this._templateRef = value;
+    }
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if ('ngForOf' in changes) {
+      // React on ngForOf changes only once all inputs have been initialized
+      const value = changes['ngForOf'].currentValue;
+      if (isBlank(this._differ) && isPresent(value)) {
+        try {
+          this._differ = this._iterableDiffers.find(value).create(this._cdr, this.ngForTrackBy);
+        } catch (e) {
+          throw new BaseException(
+              `Cannot find a differ supporting object '${value}' of type '${getTypeNameForDebugging(value)}'. NgFor only supports binding to Iterables such as Arrays.`);
+        }
+      }
+    }
+  }
+
+  ngDoCheck() {
+    if (isPresent(this._differ)) {
+      const changes = this._differ.diff(this.ngForOf);
+      if (isPresent(changes)) this._applyChanges(changes);
+    }
+  }
+
+  private _applyChanges(changes: DefaultIterableDiffer) {
+    const insertTuples: RecordViewTuple[] = [];
+    changes.forEachOperation(
+        (item: CollectionChangeRecord, adjustedPreviousIndex: number, currentIndex: number) => {
+          if (item.previousIndex == null) {
+            let view = this._viewContainer.createEmbeddedView(
+                this._templateRef, new NgForRow(null, null, null), currentIndex);
+            let tuple = new RecordViewTuple(item, view);
+            insertTuples.push(tuple);
+          } else if (currentIndex == null) {
+            this._viewContainer.remove(adjustedPreviousIndex);
+          } else {
+            let view = this._viewContainer.get(adjustedPreviousIndex);
+            this._viewContainer.move(view, currentIndex);
+            let tuple = new RecordViewTuple(item, <EmbeddedViewRef<NgForRow>>view);
+            insertTuples.push(tuple);
+          }
+        });
+
+    for (let i = 0; i < insertTuples.length; i++) {
+      this._perViewChange(insertTuples[i].view, insertTuples[i].record);
+    }
+
+    for (let i = 0, ilen = this._viewContainer.length; i < ilen; i++) {
+      var viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(i);
+      viewRef.context.index = i;
+      viewRef.context.count = ilen;
+    }
+
+    changes.forEachIdentityChange((record: any) => {
+      var viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(record.currentIndex);
+      viewRef.context.$implicit = record.item;
+    });
+  }
+
+  private _perViewChange(view: EmbeddedViewRef<NgForRow>, record: CollectionChangeRecord) {
+    view.context.$implicit = record.item;
+  }
+}
+
+class RecordViewTuple {
+  constructor(public record: any, public view: EmbeddedViewRef<NgForRow>) {}
+}

modules/@angular/common/src/directives/ng_if.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Input, TemplateRef, ViewContainerRef} from '@angular/core';
+
+import {isBlank} from '../facade/lang';
+
+
+
+/**
+ * Removes or recreates a portion of the DOM tree based on an {expression}.
+ *
+ * If the expression assigned to `ngIf` evaluates to a false value then the element
+ * is removed from the DOM, otherwise a clone of the element is reinserted into the DOM.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/fe0kgemFBtmQOY31b4tw?p=preview)):
+ *
+ * ```
+ * <div *ngIf="errorCount > 0" class="error">
+ *   <!-- Error message displayed when the errorCount property on the current context is greater
+ * than 0. -->
+ *   {{errorCount}} errors detected
+ * </div>
+ * ```
+ *
+ * ### Syntax
+ *
+ * - `<div *ngIf="condition">...</div>`
+ * - `<div template="ngIf condition">...</div>`
+ * - `<template [ngIf]="condition"><div>...</div></template>`
+ *
+ * @stable
+ */
+@Directive({selector: '[ngIf]'})
+export class NgIf {
+  private _prevCondition: boolean = null;
+
+  constructor(private _viewContainer: ViewContainerRef, private _templateRef: TemplateRef<Object>) {
+  }
+
+  @Input()
+  set ngIf(newCondition: any) {
+    if (newCondition && (isBlank(this._prevCondition) || !this._prevCondition)) {
+      this._prevCondition = true;
+      this._viewContainer.createEmbeddedView(this._templateRef);
+    } else if (!newCondition && (isBlank(this._prevCondition) || this._prevCondition)) {
+      this._prevCondition = false;
+      this._viewContainer.clear();
+    }
+  }
+}

modules/@angular/common/src/directives/ng_plural.ts

@@ -0,0 +1,118 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Attribute, Directive, Host, Input, OnInit, TemplateRef, ViewContainerRef} from '@angular/core';
+
+import {isPresent} from '../facade/lang';
+import {NgLocalization, getPluralCategory} from '../localization';
+
+import {SwitchView} from './ng_switch';
+
+
+/**
+ * `ngPlural` is an i18n directive that displays DOM sub-trees that match the switch expression
+ * value, or failing that, DOM sub-trees that match the switch expression's pluralization category.
+ *
+ * To use this directive, you must provide an extension of `NgLocalization` that maps values to
+ * category names. You then define a container element that sets the `[ngPlural]` attribute to a
+ * switch expression.
+ *    - Inner elements defined with an `[ngPluralCase]` attribute will display based on their
+ * expression.
+ *    - If `[ngPluralCase]` is set to a value starting with `=`, it will only display if the value
+ * matches the switch expression exactly.
+ *    - Otherwise, the view will be treated as a "category match", and will only display if exact
+ * value matches aren't found and the value maps to its category using the `getPluralCategory`
+ * function provided.
+ *
+ * ```typescript
+ * class MyLocalization extends NgLocalization {
+ *    getPluralCategory(value: any) {
+ *       if(value < 5) {
+ *          return 'few';
+ *       }
+ *    }
+ * }
+ *
+ * @Component({
+ *    selector: 'app',
+ *    providers: [{provide: NgLocalization, useClass: MyLocalization}]
+ * })
+ * @View({
+ *   template: `
+ *     <p>Value = {{value}}</p>
+ *     <button (click)="inc()">Increment</button>
+ *
+ *     <div [ngPlural]="value">
+ *       <template ngPluralCase="=0">there is nothing</template>
+ *       <template ngPluralCase="=1">there is one</template>
+ *       <template ngPluralCase="few">there are a few</template>
+ *       <template ngPluralCase="other">there is some number</template>
+ *     </div>
+ *   `,
+ *   directives: [NgPlural, NgPluralCase]
+ * })
+ * export class App {
+ *   value = 'init';
+ *
+ *   inc() {
+ *     this.value = this.value === 'init' ? 0 : this.value + 1;
+ *   }
+ * }
+ *
+ * ```
+ * @experimental
+ */
+@Directive({selector: '[ngPlural]'})
+export class NgPlural {
+  private _switchValue: number;
+  private _activeView: SwitchView;
+  private _caseViews: {[k: string]: SwitchView} = {};
+
+  constructor(private _localization: NgLocalization) {}
+
+  @Input()
+  set ngPlural(value: number) {
+    this._switchValue = value;
+    this._updateView();
+  }
+
+  addCase(value: string, switchView: SwitchView): void { this._caseViews[value] = switchView; }
+
+  /** @internal */
+  _updateView(): void {
+    this._clearViews();
+
+    var key =
+        getPluralCategory(this._switchValue, Object.keys(this._caseViews), this._localization);
+    this._activateView(this._caseViews[key]);
+  }
+
+  /** @internal */
+  _clearViews() {
+    if (isPresent(this._activeView)) this._activeView.destroy();
+  }
+
+  /** @internal */
+  _activateView(view: SwitchView) {
+    if (!isPresent(view)) return;
+    this._activeView = view;
+    this._activeView.create();
+  }
+}
+
+/**
+ * @experimental
+ */
+@Directive({selector: '[ngPluralCase]'})
+export class NgPluralCase {
+  constructor(
+      @Attribute('ngPluralCase') public value: string, template: TemplateRef<Object>,
+      viewContainer: ViewContainerRef, @Host() ngPlural: NgPlural) {
+    ngPlural.addCase(value, new SwitchView(viewContainer, template));
+  }
+}

modules/@angular/common/src/directives/ng_style.ts

@@ -0,0 +1,112 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, DoCheck, ElementRef, Input, KeyValueChangeRecord, KeyValueDiffer, KeyValueDiffers, Renderer} from '@angular/core';
+
+import {isBlank, isPresent} from '../facade/lang';
+
+
+
+/**
+ * The `NgStyle` directive changes styles based on a result of expression evaluation.
+ *
+ * An expression assigned to the `ngStyle` property must evaluate to an object and the
+ * corresponding element styles are updated based on changes to this object. Style names to update
+ * are taken from the object's keys, and values - from the corresponding object's values.
+ *
+ * ### Syntax
+ *
+ * - `<div [ngStyle]="{'font-style': styleExp}"></div>`
+ * - `<div [ngStyle]="{'max-width.px': widthExp}"></div>`
+ * - `<div [ngStyle]="styleExp"></div>` - here the `styleExp` must evaluate to an object
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/YamGS6GkUh9GqWNQhCyM?p=preview)):
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {NgStyle} from '@angular/common';
+ *
+ * @Component({
+ *  selector: 'ngStyle-example',
+ *  template: `
+ *    <h1 [ngStyle]="{'font-style': style, 'font-size': size, 'font-weight': weight}">
+ *      Change style of this text!
+ *    </h1>
+ *
+ *    <hr>
+ *
+ *    <label>Italic: <input type="checkbox" (change)="changeStyle($event)"></label>
+ *    <label>Bold: <input type="checkbox" (change)="changeWeight($event)"></label>
+ *    <label>Size: <input type="text" [value]="size" (change)="size = $event.target.value"></label>
+ *  `,
+ *  directives: [NgStyle]
+ * })
+ * export class NgStyleExample {
+ *    style = 'normal';
+ *    weight = 'normal';
+ *    size = '20px';
+ *
+ *    changeStyle($event: any) {
+ *      this.style = $event.target.checked ? 'italic' : 'normal';
+ *    }
+ *
+ *    changeWeight($event: any) {
+ *      this.weight = $event.target.checked ? 'bold' : 'normal';
+ *    }
+ * }
+ * ```
+ *
+ * In this example the `font-style`, `font-size` and `font-weight` styles will be updated
+ * based on the `style` property's value changes.
+ *
+ * @stable
+ */
+@Directive({selector: '[ngStyle]'})
+export class NgStyle implements DoCheck {
+  /** @internal */
+  _ngStyle: {[key: string]: string};
+  /** @internal */
+  _differ: KeyValueDiffer;
+
+  constructor(
+      private _differs: KeyValueDiffers, private _ngEl: ElementRef, private _renderer: Renderer) {}
+
+  @Input()
+  set ngStyle(v: {[key: string]: string}) {
+    this._ngStyle = v;
+    if (isBlank(this._differ) && isPresent(v)) {
+      this._differ = this._differs.find(this._ngStyle).create(null);
+    }
+  }
+
+  ngDoCheck() {
+    if (isPresent(this._differ)) {
+      var changes = this._differ.diff(this._ngStyle);
+      if (isPresent(changes)) {
+        this._applyChanges(changes);
+      }
+    }
+  }
+
+  private _applyChanges(changes: any): void {
+    changes.forEachRemovedItem(
+        (record: KeyValueChangeRecord) => { this._setStyle(record.key, null); });
+    changes.forEachAddedItem(
+        (record: KeyValueChangeRecord) => { this._setStyle(record.key, record.currentValue); });
+    changes.forEachChangedItem(
+        (record: KeyValueChangeRecord) => { this._setStyle(record.key, record.currentValue); });
+  }
+
+  private _setStyle(name: string, val: string): void {
+    const nameParts = name.split('.');
+    const nameToSet = nameParts[0];
+    const valToSet = isPresent(val) && nameParts.length === 2 ? `${val}${nameParts[1]}` : val;
+
+    this._renderer.setElementStyle(this._ngEl.nativeElement, nameToSet, valToSet);
+  }
+}

modules/@angular/common/src/directives/ng_switch.ts

@@ -0,0 +1,235 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Host, Input, TemplateRef, ViewContainerRef} from '@angular/core';
+
+import {ListWrapper} from '../facade/collection';
+import {isBlank, isPresent, normalizeBlank} from '../facade/lang';
+
+const _CASE_DEFAULT = new Object();
+
+// TODO: remove when fully deprecated
+let _warned: boolean = false;
+
+export class SwitchView {
+  constructor(
+      private _viewContainerRef: ViewContainerRef, private _templateRef: TemplateRef<Object>) {}
+
+  create(): void { this._viewContainerRef.createEmbeddedView(this._templateRef); }
+
+  destroy(): void { this._viewContainerRef.clear(); }
+}
+
+/**
+ * Adds or removes DOM sub-trees when their match expressions match the switch expression.
+ *
+ * Elements within `NgSwitch` but without `NgSwitchCase` or `NgSwitchDefault` directives will be
+ * preserved at the location as specified in the template.
+ *
+ * `NgSwitch` simply inserts nested elements based on which match expression matches the value
+ * obtained from the evaluated switch expression. In other words, you define a container element
+ * (where you place the directive with a switch expression on the
+ * `[ngSwitch]="..."` attribute), define any inner elements inside of the directive and
+ * place a `[ngSwitchCase]` attribute per element.
+ *
+ * The `ngSwitchCase` property is used to inform `NgSwitch` which element to display when the
+ * expression is evaluated. If a matching expression is not found via a `ngSwitchCase` property
+ * then an element with the `ngSwitchDefault` attribute is displayed.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/DQMTII95CbuqWrl3lYAs?p=preview))
+ *
+ * ```typescript
+ * @Component({
+ *   selector: 'app',
+ *   template: `
+ *     <p>Value = {{value}}</p>
+ *     <button (click)="inc()">Increment</button>
+ *
+ *     <div [ngSwitch]="value">
+ *       <p *ngSwitchCase="'init'">increment to start</p>
+ *       <p *ngSwitchCase="0">0, increment again</p>
+ *       <p *ngSwitchCase="1">1, increment again</p>
+ *       <p *ngSwitchCase="2">2, stop incrementing</p>
+ *       <p *ngSwitchDefault>&gt; 2, STOP!</p>
+ *     </div>
+ *
+ *     <!-- alternate syntax -->
+ *
+ *     <p [ngSwitch]="value">
+ *       <template ngSwitchCase="init">increment to start</template>
+ *       <template [ngSwitchCase]="0">0, increment again</template>
+ *       <template [ngSwitchCase]="1">1, increment again</template>
+ *       <template [ngSwitchCase]="2">2, stop incrementing</template>
+ *       <template ngSwitchDefault>&gt; 2, STOP!</template>
+ *     </p>
+ *   `,
+ *   directives: [NgSwitch, NgSwitchCase, NgSwitchDefault]
+ * })
+ * export class App {
+ *   value = 'init';
+ *
+ *   inc() {
+ *     this.value = this.value === 'init' ? 0 : this.value + 1;
+ *   }
+ * }
+ *
+ * bootstrap(App).catch(err => console.error(err));
+ * ```
+ *
+ * @experimental
+ */
+@Directive({selector: '[ngSwitch]'})
+export class NgSwitch {
+  private _switchValue: any;
+  private _useDefault: boolean = false;
+  private _valueViews = new Map<any, SwitchView[]>();
+  private _activeViews: SwitchView[] = [];
+
+  @Input()
+  set ngSwitch(value: any) {
+    // Empty the currently active ViewContainers
+    this._emptyAllActiveViews();
+
+    // Add the ViewContainers matching the value (with a fallback to default)
+    this._useDefault = false;
+    var views = this._valueViews.get(value);
+    if (isBlank(views)) {
+      this._useDefault = true;
+      views = normalizeBlank(this._valueViews.get(_CASE_DEFAULT));
+    }
+    this._activateViews(views);
+
+    this._switchValue = value;
+  }
+
+  /** @internal */
+  _onCaseValueChanged(oldCase: any, newCase: any, view: SwitchView): void {
+    this._deregisterView(oldCase, view);
+    this._registerView(newCase, view);
+
+    if (oldCase === this._switchValue) {
+      view.destroy();
+      ListWrapper.remove(this._activeViews, view);
+    } else if (newCase === this._switchValue) {
+      if (this._useDefault) {
+        this._useDefault = false;
+        this._emptyAllActiveViews();
+      }
+      view.create();
+      this._activeViews.push(view);
+    }
+
+    // Switch to default when there is no more active ViewContainers
+    if (this._activeViews.length === 0 && !this._useDefault) {
+      this._useDefault = true;
+      this._activateViews(this._valueViews.get(_CASE_DEFAULT));
+    }
+  }
+
+  /** @internal */
+  _emptyAllActiveViews(): void {
+    var activeContainers = this._activeViews;
+    for (var i = 0; i < activeContainers.length; i++) {
+      activeContainers[i].destroy();
+    }
+    this._activeViews = [];
+  }
+
+  /** @internal */
+  _activateViews(views: SwitchView[]): void {
+    // TODO(vicb): assert(this._activeViews.length === 0);
+    if (isPresent(views)) {
+      for (var i = 0; i < views.length; i++) {
+        views[i].create();
+      }
+      this._activeViews = views;
+    }
+  }
+
+  /** @internal */
+  _registerView(value: any, view: SwitchView): void {
+    var views = this._valueViews.get(value);
+    if (isBlank(views)) {
+      views = [];
+      this._valueViews.set(value, views);
+    }
+    views.push(view);
+  }
+
+  /** @internal */
+  _deregisterView(value: any, view: SwitchView): void {
+    // `_CASE_DEFAULT` is used a marker for non-registered cases
+    if (value === _CASE_DEFAULT) return;
+    var views = this._valueViews.get(value);
+    if (views.length == 1) {
+      this._valueViews.delete(value);
+    } else {
+      ListWrapper.remove(views, view);
+    }
+  }
+}
+
+/**
+ * Insert the sub-tree when the `ngSwitchCase` expression evaluates to the same value as the
+ * enclosing switch expression.
+ *
+ * If multiple match expression match the switch expression value, all of them are displayed.
+ *
+ * See {@link NgSwitch} for more details and example.
+ *
+ * @experimental
+ */
+@Directive({selector: '[ngSwitchCase],[ngSwitchWhen]'})
+export class NgSwitchCase {
+  // `_CASE_DEFAULT` is used as a marker for a not yet initialized value
+  /** @internal */
+  _value: any = _CASE_DEFAULT;
+  /** @internal */
+  _view: SwitchView;
+  private _switch: NgSwitch;
+
+  constructor(
+      viewContainer: ViewContainerRef, templateRef: TemplateRef<Object>,
+      @Host() ngSwitch: NgSwitch) {
+    this._switch = ngSwitch;
+    this._view = new SwitchView(viewContainer, templateRef);
+  }
+
+  @Input()
+  set ngSwitchCase(value: any) {
+    this._switch._onCaseValueChanged(this._value, value, this._view);
+    this._value = value;
+  }
+
+  @Input()
+  set ngSwitchWhen(value: any) {
+    if (!_warned) {
+      _warned = true;
+      console.warn('*ngSwitchWhen is deprecated and will be removed. Use *ngSwitchCase instead');
+    }
+    this._switch._onCaseValueChanged(this._value, value, this._view);
+    this._value = value;
+  }
+}
+
+/**
+ * Default case statements are displayed when no match expression matches the switch expression
+ * value.
+ *
+ * See {@link NgSwitch} for more details and example.
+ *
+ * @experimental
+ */
+@Directive({selector: '[ngSwitchDefault]'})
+export class NgSwitchDefault {
+  constructor(
+      viewContainer: ViewContainerRef, templateRef: TemplateRef<Object>,
+      @Host() sswitch: NgSwitch) {
+    sswitch._registerView(_CASE_DEFAULT, new SwitchView(viewContainer, templateRef));
+  }
+}

modules/@angular/common/src/directives/ng_template_outlet.ts

@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, EmbeddedViewRef, Input, OnChanges, TemplateRef, ViewContainerRef} from '@angular/core';
+
+/**
+ * Creates and inserts an embedded view based on a prepared `TemplateRef`.
+ * You can attach a context object to the `EmbeddedViewRef` by setting `[ngOutletContext]`.
+ * `[ngOutletContext]` should be an object, the object's keys will be the local template variables
+ * available within the `TemplateRef`.
+ *
+ * Note: using the key `$implicit` in the context object will set it's value as default.
+ *
+ * ### Syntax
+ *
+ * ```
+ * <template [ngTemplateOutlet]="templateRefExpression"
+ *           [ngOutletContext]="objectExpression">
+ * </template>
+ * ```
+ *
+ * @experimental
+ */
+@Directive({selector: '[ngTemplateOutlet]'})
+export class NgTemplateOutlet implements OnChanges {
+  private _viewRef: EmbeddedViewRef<any>;
+  private _context: Object;
+  private _templateRef: TemplateRef<any>;
+
+  constructor(private _viewContainerRef: ViewContainerRef) {}
+
+  @Input()
+  set ngOutletContext(context: Object) { this._context = context; }
+
+  @Input()
+  set ngTemplateOutlet(templateRef: TemplateRef<Object>) { this._templateRef = templateRef; }
+
+  ngOnChanges() {
+    if (this._viewRef) {
+      this._viewContainerRef.remove(this._viewContainerRef.indexOf(this._viewRef));
+    }
+
+    if (this._templateRef) {
+      this._viewRef = this._viewContainerRef.createEmbeddedView(this._templateRef, this._context);
+    }
+  }
+}

modules/@angular/common/src/facade

@@ -0,0 +1 @@
+../../facade/src

modules/@angular/common/src/forms-deprecated.ts

@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * This module is used for handling user input, by defining and building a {@link ControlGroup} that
+ * consists of
+ * {@link Control} objects, and mapping them onto the DOM. {@link Control} objects can then be used
+ * to read information
+ * from the form DOM elements.
+ *
+ * Forms providers are not included in default providers; you must import these providers
+ * explicitly.
+ */
+import {NgModule, Type} from '@angular/core';
+
+import {FORM_DIRECTIVES} from './forms-deprecated/directives';
+import {RadioControlRegistry} from './forms-deprecated/directives/radio_control_value_accessor';
+import {FormBuilder} from './forms-deprecated/form_builder';
+
+export {FORM_DIRECTIVES, RadioButtonState} from './forms-deprecated/directives';
+export {AbstractControlDirective} from './forms-deprecated/directives/abstract_control_directive';
+export {CheckboxControlValueAccessor} from './forms-deprecated/directives/checkbox_value_accessor';
+export {ControlContainer} from './forms-deprecated/directives/control_container';
+export {ControlValueAccessor, NG_VALUE_ACCESSOR} from './forms-deprecated/directives/control_value_accessor';
+export {DefaultValueAccessor} from './forms-deprecated/directives/default_value_accessor';
+export {Form} from './forms-deprecated/directives/form_interface';
+export {NgControl} from './forms-deprecated/directives/ng_control';
+export {NgControlGroup} from './forms-deprecated/directives/ng_control_group';
+export {NgControlName} from './forms-deprecated/directives/ng_control_name';
+export {NgControlStatus} from './forms-deprecated/directives/ng_control_status';
+export {NgForm} from './forms-deprecated/directives/ng_form';
+export {NgFormControl} from './forms-deprecated/directives/ng_form_control';
+export {NgFormModel} from './forms-deprecated/directives/ng_form_model';
+export {NgModel} from './forms-deprecated/directives/ng_model';
+export {NgSelectOption, SelectControlValueAccessor} from './forms-deprecated/directives/select_control_value_accessor';
+export {MaxLengthValidator, MinLengthValidator, PatternValidator, RequiredValidator, Validator} from './forms-deprecated/directives/validators';
+export {FormBuilder} from './forms-deprecated/form_builder';
+export {AbstractControl, Control, ControlArray, ControlGroup} from './forms-deprecated/model';
+export {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from './forms-deprecated/validators';
+
+
+/**
+ * Shorthand set of providers used for building Angular forms.
+ *
+ * ### Example
+ *
+ * ```typescript
+ * bootstrap(MyApp, [FORM_PROVIDERS]);
+ * ```
+ *
+ * @experimental
+ */
+export const FORM_PROVIDERS: Type[] = [FormBuilder, RadioControlRegistry];
+
+
+/**
+ * The ng module for the deprecated forms API.
+ * @deprecated
+ */
+@NgModule({
+  providers: [
+    FORM_PROVIDERS,
+  ],
+  declarations: FORM_DIRECTIVES,
+  exports: FORM_DIRECTIVES
+})
+export class DeprecatedFormsModule {
+}

modules/@angular/common/src/forms-deprecated/directives.ts

@@ -0,0 +1,84 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Type} from '@angular/core';
+
+import {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
+import {DefaultValueAccessor} from './directives/default_value_accessor';
+import {NgControlGroup} from './directives/ng_control_group';
+import {NgControlName} from './directives/ng_control_name';
+import {NgControlStatus} from './directives/ng_control_status';
+import {NgForm} from './directives/ng_form';
+import {NgFormControl} from './directives/ng_form_control';
+import {NgFormModel} from './directives/ng_form_model';
+import {NgModel} from './directives/ng_model';
+import {NumberValueAccessor} from './directives/number_value_accessor';
+import {RadioControlValueAccessor} from './directives/radio_control_value_accessor';
+import {NgSelectOption, SelectControlValueAccessor} from './directives/select_control_value_accessor';
+import {NgSelectMultipleOption, SelectMultipleControlValueAccessor} from './directives/select_multiple_control_value_accessor';
+import {MaxLengthValidator, MinLengthValidator, PatternValidator, RequiredValidator} from './directives/validators';
+
+export {CheckboxControlValueAccessor} from './directives/checkbox_value_accessor';
+export {ControlValueAccessor} from './directives/control_value_accessor';
+export {DefaultValueAccessor} from './directives/default_value_accessor';
+export {NgControl} from './directives/ng_control';
+export {NgControlGroup} from './directives/ng_control_group';
+export {NgControlName} from './directives/ng_control_name';
+export {NgControlStatus} from './directives/ng_control_status';
+export {NgForm} from './directives/ng_form';
+export {NgFormControl} from './directives/ng_form_control';
+export {NgFormModel} from './directives/ng_form_model';
+export {NgModel} from './directives/ng_model';
+export {NumberValueAccessor} from './directives/number_value_accessor';
+export {RadioButtonState, RadioControlValueAccessor} from './directives/radio_control_value_accessor';
+export {NgSelectOption, SelectControlValueAccessor} from './directives/select_control_value_accessor';
+export {NgSelectMultipleOption, SelectMultipleControlValueAccessor} from './directives/select_multiple_control_value_accessor';
+export {MaxLengthValidator, MinLengthValidator, PatternValidator, RequiredValidator} from './directives/validators';
+
+
+/**
+ *
+ * A list of all the form directives used as part of a `@Component` annotation.
+ *
+ *  This is a shorthand for importing them each individually.
+ *
+ * ### Example
+ *
+ * ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   directives: [FORM_DIRECTIVES]
+ * })
+ * class MyApp {}
+ * ```
+ * @experimental
+ */
+export const FORM_DIRECTIVES: Type[] = [
+  NgControlName,
+  NgControlGroup,
+
+  NgFormControl,
+  NgModel,
+  NgFormModel,
+  NgForm,
+
+  NgSelectOption,
+  NgSelectMultipleOption,
+  DefaultValueAccessor,
+  NumberValueAccessor,
+  CheckboxControlValueAccessor,
+  SelectControlValueAccessor,
+  SelectMultipleControlValueAccessor,
+  RadioControlValueAccessor,
+  NgControlStatus,
+
+  RequiredValidator,
+  MinLengthValidator,
+  MaxLengthValidator,
+  PatternValidator,
+];

modules/@angular/common/src/forms-deprecated/directives/abstract_control_directive.ts

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {unimplemented} from '../../facade/exceptions';
+import {isPresent} from '../../facade/lang';
+import {AbstractControl} from '../model';
+
+
+/**
+ * Base class for control directives.
+ *
+ * Only used internally in the forms module.
+ *
+ * @experimental
+ */
+export abstract class AbstractControlDirective {
+  get control(): AbstractControl { return unimplemented(); }
+
+  get value(): any { return isPresent(this.control) ? this.control.value : null; }
+
+  get valid(): boolean { return isPresent(this.control) ? this.control.valid : null; }
+
+  get errors(): {[key: string]: any} {
+    return isPresent(this.control) ? this.control.errors : null;
+  }
+
+  get pristine(): boolean { return isPresent(this.control) ? this.control.pristine : null; }
+
+  get dirty(): boolean { return isPresent(this.control) ? this.control.dirty : null; }
+
+  get touched(): boolean { return isPresent(this.control) ? this.control.touched : null; }
+
+  get untouched(): boolean { return isPresent(this.control) ? this.control.untouched : null; }
+
+  get path(): string[] { return null; }
+}

modules/@angular/common/src/forms-deprecated/directives/checkbox_value_accessor.ts

@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+
+export const CHECKBOX_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => CheckboxControlValueAccessor),
+  multi: true
+};
+
+/**
+ * The accessor for writing a value and listening to changes on a checkbox input element.
+ *
+ *  ### Example
+ *  ```
+ *  <input type="checkbox" ngControl="rememberLogin">
+ *  ```
+ *
+ *  @experimental
+ */
+@Directive({
+  selector:
+      'input[type=checkbox][ngControl],input[type=checkbox][ngFormControl],input[type=checkbox][ngModel]',
+  host: {'(change)': 'onChange($event.target.checked)', '(blur)': 'onTouched()'},
+  providers: [CHECKBOX_VALUE_ACCESSOR]
+})
+export class CheckboxControlValueAccessor implements ControlValueAccessor {
+  onChange = (_: any) => {};
+  onTouched = () => {};
+
+  constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
+
+  writeValue(value: any): void {
+    this._renderer.setElementProperty(this._elementRef.nativeElement, 'checked', value);
+  }
+  registerOnChange(fn: (_: any) => {}): void { this.onChange = fn; }
+  registerOnTouched(fn: () => {}): void { this.onTouched = fn; }
+}

modules/@angular/common/src/forms-deprecated/directives/control_container.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {AbstractControlDirective} from './abstract_control_directive';
+import {Form} from './form_interface';
+
+
+/**
+ * A directive that contains multiple {@link NgControl}s.
+ *
+ * Only used by the forms module.
+ *
+ * @experimental
+ */
+export class ControlContainer extends AbstractControlDirective {
+  name: string;
+
+  /**
+   * Get the form to which this container belongs.
+   */
+  get formDirective(): Form { return null; }
+
+  /**
+   * Get the path to this container.
+   */
+  get path(): string[] { return null; }
+}

modules/@angular/common/src/forms-deprecated/directives/control_value_accessor.ts

@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {OpaqueToken} from '@angular/core';
+
+/**
+ * A bridge between a control and a native element.
+ *
+ * A `ControlValueAccessor` abstracts the operations of writing a new value to a
+ * DOM element representing an input control.
+ *
+ * Please see {@link DefaultValueAccessor} for more information.
+ *
+ * @experimental
+ */
+export interface ControlValueAccessor {
+  /**
+   * Write a new value to the element.
+   */
+  writeValue(obj: any): void;
+
+  /**
+   * Set the function to be called when the control receives a change event.
+   */
+  registerOnChange(fn: any): void;
+
+  /**
+   * Set the function to be called when the control receives a touch event.
+   */
+  registerOnTouched(fn: any): void;
+}
+
+/**
+ * Used to provide a {@link ControlValueAccessor} for form controls.
+ *
+ * See {@link DefaultValueAccessor} for how to implement one.
+ * @experimental
+ */
+export const NG_VALUE_ACCESSOR: OpaqueToken = new OpaqueToken('NgValueAccessor');

modules/@angular/common/src/forms-deprecated/directives/default_value_accessor.ts

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
+
+import {isBlank} from '../../facade/lang';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+
+export const DEFAULT_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => DefaultValueAccessor),
+  multi: true
+};
+
+/**
+ * The default accessor for writing a value and listening to changes that is used by the
+ * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+ *
+ *  ### Example
+ *  ```
+ *  <input type="text" ngControl="searchQuery">
+ *  ```
+ *
+ *  @experimental
+ */
+@Directive({
+  selector:
+      'input:not([type=checkbox])[ngControl],textarea[ngControl],input:not([type=checkbox])[ngFormControl],textarea[ngFormControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]',
+  // TODO: vsavkin replace the above selector with the one below it once
+  // https://github.com/angular/angular/issues/3011 is implemented
+  // selector: '[ngControl],[ngModel],[ngFormControl]',
+  host: {'(input)': 'onChange($event.target.value)', '(blur)': 'onTouched()'},
+  providers: [DEFAULT_VALUE_ACCESSOR]
+})
+export class DefaultValueAccessor implements ControlValueAccessor {
+  onChange = (_: any) => {};
+  onTouched = () => {};
+
+  constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
+
+  writeValue(value: any): void {
+    var normalizedValue = isBlank(value) ? '' : value;
+    this._renderer.setElementProperty(this._elementRef.nativeElement, 'value', normalizedValue);
+  }
+
+  registerOnChange(fn: (_: any) => void): void { this.onChange = fn; }
+  registerOnTouched(fn: () => void): void { this.onTouched = fn; }
+}

modules/@angular/common/src/forms-deprecated/directives/form_interface.ts

@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Control, ControlGroup} from '../model';
+
+import {NgControl} from './ng_control';
+import {NgControlGroup} from './ng_control_group';
+
+
+/**
+ * An interface that {@link NgFormModel} and {@link NgForm} implement.
+ *
+ * Only used by the forms module.
+ *
+ * @experimental
+ */
+export interface Form {
+  /**
+   * Add a control to this form.
+   */
+  addControl(dir: NgControl): void;
+
+  /**
+   * Remove a control from this form.
+   */
+  removeControl(dir: NgControl): void;
+
+  /**
+   * Look up the {@link Control} associated with a particular {@link NgControl}.
+   */
+  getControl(dir: NgControl): Control;
+
+  /**
+   * Add a group of controls to this form.
+   */
+  addControlGroup(dir: NgControlGroup): void;
+
+  /**
+   * Remove a group of controls from this form.
+   */
+  removeControlGroup(dir: NgControlGroup): void;
+
+  /**
+   * Look up the {@link ControlGroup} associated with a particular {@link NgControlGroup}.
+   */
+  getControlGroup(dir: NgControlGroup): ControlGroup;
+
+  /**
+   * Update the model for a particular control with a new value.
+   */
+  updateModel(dir: NgControl, value: any): void;
+}

modules/@angular/common/src/forms-deprecated/directives/ng_control.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {unimplemented} from '../../facade/exceptions';
+
+import {AbstractControlDirective} from './abstract_control_directive';
+import {ControlValueAccessor} from './control_value_accessor';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+
+/**
+ * A base class that all control directive extend.
+ * It binds a {@link Control} object to a DOM element.
+ *
+ * Used internally by Angular forms.
+ *
+ * @experimental
+ */
+export abstract class NgControl extends AbstractControlDirective {
+  name: string = null;
+  valueAccessor: ControlValueAccessor = null;
+
+  get validator(): ValidatorFn { return <ValidatorFn>unimplemented(); }
+  get asyncValidator(): AsyncValidatorFn { return <AsyncValidatorFn>unimplemented(); }
+
+  abstract viewToModelUpdate(newValue: any): void;
+}

modules/@angular/common/src/forms-deprecated/directives/ng_control_group.ts

@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Host, Inject, OnDestroy, OnInit, Optional, Self, SkipSelf, forwardRef} from '@angular/core';
+
+import {ControlGroup} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
+
+import {ControlContainer} from './control_container';
+import {Form} from './form_interface';
+import {composeAsyncValidators, composeValidators, controlPath} from './shared';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+export const controlGroupProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => NgControlGroup)
+};
+
+/**
+ * Creates and binds a control group to a DOM element.
+ *
+ * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/7EJ11uGeaggViYM6T5nq?p=preview))
+ *
+ * ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   template: `
+ *     <div>
+ *       <h2>Angular Control &amp; ControlGroup Example</h2>
+ *       <form #f="ngForm">
+ *         <div ngControlGroup="name" #cgName="ngForm">
+ *           <h3>Enter your name:</h3>
+ *           <p>First: <input ngControl="first" required></p>
+ *           <p>Middle: <input ngControl="middle"></p>
+ *           <p>Last: <input ngControl="last" required></p>
+ *         </div>
+ *         <h3>Name value:</h3>
+ *         <pre>{{valueOf(cgName)}}</pre>
+ *         <p>Name is {{cgName?.control?.valid ? "valid" : "invalid"}}</p>
+ *         <h3>What's your favorite food?</h3>
+ *         <p><input ngControl="food"></p>
+ *         <h3>Form value</h3>
+ *         <pre>{{valueOf(f)}}</pre>
+ *       </form>
+ *     </div>
+ *   `
+ * })
+ * export class App {
+ *   valueOf(cg: NgControlGroup): string {
+ *     if (cg.control == null) {
+ *       return null;
+ *     }
+ *     return JSON.stringify(cg.control.value, null, 2);
+ *   }
+ * }
+ * ```
+ *
+ * This example declares a control group for a user's name. The value and validation state of
+ * this group can be accessed separately from the overall form.
+ *
+ * @experimental
+ */
+@Directive({
+  selector: '[ngControlGroup]',
+  providers: [controlGroupProvider],
+  inputs: ['name: ngControlGroup'],
+  exportAs: 'ngForm'
+})
+export class NgControlGroup extends ControlContainer implements OnInit,
+    OnDestroy {
+  /** @internal */
+  _parent: ControlContainer;
+
+  constructor(
+      @Host() @SkipSelf() parent: ControlContainer,
+      @Optional() @Self() @Inject(NG_VALIDATORS) private _validators: any[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators: any[]) {
+    super();
+    this._parent = parent;
+  }
+
+  ngOnInit(): void { this.formDirective.addControlGroup(this); }
+
+  ngOnDestroy(): void { this.formDirective.removeControlGroup(this); }
+
+  /**
+   * Get the {@link ControlGroup} backing this binding.
+   */
+  get control(): ControlGroup { return this.formDirective.getControlGroup(this); }
+
+  /**
+   * Get the path to this control group.
+   */
+  get path(): string[] { return controlPath(this.name, this._parent); }
+
+  /**
+   * Get the {@link Form} to which this group belongs.
+   */
+  get formDirective(): Form { return this._parent.formDirective; }
+
+  get validator(): ValidatorFn { return composeValidators(this._validators); }
+
+  get asyncValidator(): AsyncValidatorFn { return composeAsyncValidators(this._asyncValidators); }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_control_name.ts

@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Host, Inject, OnChanges, OnDestroy, Optional, Self, SimpleChanges, SkipSelf, forwardRef} from '@angular/core';
+
+import {EventEmitter} from '../../facade/async';
+import {Control} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
+
+import {ControlContainer} from './control_container';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+import {NgControl} from './ng_control';
+import {composeAsyncValidators, composeValidators, controlPath, isPropertyUpdated, selectValueAccessor} from './shared';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+
+export const controlNameBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => NgControlName)
+};
+
+/**
+ * Creates and binds a control with a specified name to a DOM element.
+ *
+ * This directive can only be used as a child of {@link NgForm} or {@link NgFormModel}.
+
+ * ### Example
+ *
+ * In this example, we create the login and password controls.
+ * We can work with each control separately: check its validity, get its value, listen to its
+ * changes.
+ *
+ *  ```
+ * @Component({
+ *      selector: "login-comp",
+ *      directives: [FORM_DIRECTIVES],
+ *      template: `
+ *        <form #f="ngForm" (submit)='onLogIn(f.value)'>
+ *          Login <input type='text' ngControl='login' #l="ngForm">
+ *          <div *ngIf="!l.valid">Login is invalid</div>
+ *
+ *          Password <input type='password' ngControl='password'>
+ *          <button type='submit'>Log in!</button>
+ *        </form>
+ *      `})
+ * class LoginComp {
+ *  onLogIn(value): void {
+ *    // value === {login: 'some login', password: 'some password'}
+ *  }
+ * }
+ *  ```
+ *
+ * We can also use ngModel to bind a domain model to the form.
+ *
+ *  ```
+ * @Component({
+ *      selector: "login-comp",
+ *      directives: [FORM_DIRECTIVES],
+ *      template: `
+ *        <form (submit)='onLogIn()'>
+ *          Login <input type='text' ngControl='login' [(ngModel)]="credentials.login">
+ *          Password <input type='password' ngControl='password'
+ *                          [(ngModel)]="credentials.password">
+ *          <button type='submit'>Log in!</button>
+ *        </form>
+ *      `})
+ * class LoginComp {
+ *  credentials: {login:string, password:string};
+ *
+ *  onLogIn(): void {
+ *    // this.credentials.login === "some login"
+ *    // this.credentials.password === "some password"
+ *  }
+ * }
+ *  ```
+ *
+ *  @experimental
+ */
+@Directive({
+  selector: '[ngControl]',
+  providers: [controlNameBinding],
+  inputs: ['name: ngControl', 'model: ngModel'],
+  outputs: ['update: ngModelChange'],
+  exportAs: 'ngForm'
+})
+export class NgControlName extends NgControl implements OnChanges,
+    OnDestroy {
+  /** @internal */
+  update = new EventEmitter();
+  model: any;
+  viewModel: any;
+  private _added = false;
+
+  constructor(@Host() @SkipSelf() private _parent: ControlContainer,
+              @Optional() @Self() @Inject(NG_VALIDATORS) private _validators:
+                  /* Array<Validator|Function> */ any[],
+              @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators:
+                  /* Array<Validator|Function> */ any[],
+              @Optional() @Self() @Inject(NG_VALUE_ACCESSOR)
+              valueAccessors: ControlValueAccessor[]) {
+                super();
+                this.valueAccessor = selectValueAccessor(this, valueAccessors);
+              }
+
+              ngOnChanges(changes: SimpleChanges) {
+                if (!this._added) {
+                  this.formDirective.addControl(this);
+                  this._added = true;
+                }
+                if (isPropertyUpdated(changes, this.viewModel)) {
+                  this.viewModel = this.model;
+                  this.formDirective.updateModel(this, this.model);
+                }
+              }
+
+              ngOnDestroy(): void { this.formDirective.removeControl(this); }
+
+              viewToModelUpdate(newValue: any): void {
+                this.viewModel = newValue;
+                this.update.emit(newValue);
+              }
+
+              get path(): string[] { return controlPath(this.name, this._parent); }
+
+              get formDirective(): any { return this._parent.formDirective; }
+
+              get validator(): ValidatorFn { return composeValidators(this._validators); }
+
+              get asyncValidator(): AsyncValidatorFn {
+                return composeAsyncValidators(this._asyncValidators);
+              }
+
+              get control(): Control { return this.formDirective.getControl(this); }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_control_status.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Self} from '@angular/core';
+
+import {isPresent} from '../../facade/lang';
+
+import {NgControl} from './ng_control';
+
+
+/**
+ * Directive automatically applied to Angular forms that sets CSS classes
+ * based on control status (valid/invalid/dirty/etc).
+ *
+ * @experimental
+ */
+@Directive({
+  selector: '[ngControl],[ngModel],[ngFormControl]',
+  host: {
+    '[class.ng-untouched]': 'ngClassUntouched',
+    '[class.ng-touched]': 'ngClassTouched',
+    '[class.ng-pristine]': 'ngClassPristine',
+    '[class.ng-dirty]': 'ngClassDirty',
+    '[class.ng-valid]': 'ngClassValid',
+    '[class.ng-invalid]': 'ngClassInvalid'
+  }
+})
+export class NgControlStatus {
+  private _cd: NgControl;
+
+  constructor(@Self() cd: NgControl) { this._cd = cd; }
+
+  get ngClassUntouched(): boolean {
+    return isPresent(this._cd.control) ? this._cd.control.untouched : false;
+  }
+  get ngClassTouched(): boolean {
+    return isPresent(this._cd.control) ? this._cd.control.touched : false;
+  }
+  get ngClassPristine(): boolean {
+    return isPresent(this._cd.control) ? this._cd.control.pristine : false;
+  }
+  get ngClassDirty(): boolean {
+    return isPresent(this._cd.control) ? this._cd.control.dirty : false;
+  }
+  get ngClassValid(): boolean {
+    return isPresent(this._cd.control) ? this._cd.control.valid : false;
+  }
+  get ngClassInvalid(): boolean {
+    return isPresent(this._cd.control) ? !this._cd.control.valid : false;
+  }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_form.ts

@@ -0,0 +1,202 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Inject, Optional, Self, forwardRef} from '@angular/core';
+
+import {EventEmitter} from '../../facade/async';
+import {ListWrapper} from '../../facade/collection';
+import {isPresent} from '../../facade/lang';
+import {AbstractControl, Control, ControlGroup} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
+
+import {ControlContainer} from './control_container';
+import {Form} from './form_interface';
+import {NgControl} from './ng_control';
+import {NgControlGroup} from './ng_control_group';
+import {composeAsyncValidators, composeValidators, setUpControl, setUpControlGroup} from './shared';
+
+export const formDirectiveProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => NgForm)
+};
+
+let _formWarningDisplayed: boolean = false;
+
+const resolvedPromise = Promise.resolve(null);
+
+/**
+ * If `NgForm` is bound in a component, `<form>` elements in that component will be
+ * upgraded to use the Angular form system.
+ *
+ * ### Typical Use
+ *
+ * Include `FORM_DIRECTIVES` in the `directives` section of a {@link Component} annotation
+ * to use `NgForm` and its associated controls.
+ *
+ * ### Structure
+ *
+ * An Angular form is a collection of `Control`s in some hierarchy.
+ * `Control`s can be at the top level or can be organized in `ControlGroup`s
+ * or `ControlArray`s. This hierarchy is reflected in the form's `value`, a
+ * JSON object that mirrors the form structure.
+ *
+ * ### Submission
+ *
+ * The `ngSubmit` event signals when the user triggers a form submission.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/ltdgYj4P0iY64AR71EpL?p=preview))
+ *
+ *  ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   template: `
+ *     <div>
+ *       <p>Submit the form to see the data object Angular builds</p>
+ *       <h2>NgForm demo</h2>
+ *       <form #f="ngForm" (ngSubmit)="onSubmit(f.value)">
+ *         <h3>Control group: credentials</h3>
+ *         <div ngControlGroup="credentials">
+ *           <p>Login: <input type="text" ngControl="login"></p>
+ *           <p>Password: <input type="password" ngControl="password"></p>
+ *         </div>
+ *         <h3>Control group: person</h3>
+ *         <div ngControlGroup="person">
+ *           <p>First name: <input type="text" ngControl="firstName"></p>
+ *           <p>Last name: <input type="text" ngControl="lastName"></p>
+ *         </div>
+ *         <button type="submit">Submit Form</button>
+ *       <p>Form data submitted:</p>
+ *       </form>
+ *       <pre>{{data}}</pre>
+ *     </div>
+ * `,
+ *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+ * })
+ * export class App {
+ *   constructor() {}
+ *
+ *   data: string;
+ *
+ *   onSubmit(data) {
+ *     this.data = JSON.stringify(data, null, 2);
+ *   }
+ * }
+ *  ```
+ *
+ *  @experimental
+ */
+
+@Directive({
+  selector: 'form:not([ngNoForm]):not([ngFormModel]),ngForm,[ngForm]',
+  providers: [formDirectiveProvider],
+  host: {
+    '(submit)': 'onSubmit()',
+  },
+  outputs: ['ngSubmit'],
+  exportAs: 'ngForm'
+})
+export class NgForm extends ControlContainer implements Form {
+  private _submitted: boolean = false;
+
+  form: ControlGroup;
+  ngSubmit = new EventEmitter();
+
+  constructor(
+      @Optional() @Self() @Inject(NG_VALIDATORS) validators: any[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) asyncValidators: any[]) {
+    super();
+    this._displayWarning();
+    this.form = new ControlGroup(
+        {}, null, composeValidators(validators), composeAsyncValidators(asyncValidators));
+  }
+
+  private _displayWarning() {
+    // TODO(kara): Update this when the new forms module becomes the default
+    if (!_formWarningDisplayed) {
+      _formWarningDisplayed = true;
+      console.warn(`
+      *It looks like you're using the old forms module. This will be opt-in in the next RC, and
+      will eventually be removed in favor of the new forms module. For more information, see:
+      https://docs.google.com/document/d/1RIezQqE4aEhBRmArIAS1mRIZtWFf6JxN_7B4meyWK0Y/preview
+    `);
+    }
+  }
+
+  get submitted(): boolean { return this._submitted; }
+
+  get formDirective(): Form { return this; }
+
+  get control(): ControlGroup { return this.form; }
+
+  get path(): string[] { return []; }
+
+  get controls(): {[key: string]: AbstractControl} { return this.form.controls; }
+
+  addControl(dir: NgControl): void {
+    resolvedPromise.then(() => {
+      var container = this._findContainer(dir.path);
+      var ctrl = new Control();
+      setUpControl(ctrl, dir);
+      container.registerControl(dir.name, ctrl);
+      ctrl.updateValueAndValidity({emitEvent: false});
+    });
+  }
+
+  getControl(dir: NgControl): Control { return <Control>this.form.find(dir.path); }
+
+  removeControl(dir: NgControl): void {
+    resolvedPromise.then(() => {
+      var container = this._findContainer(dir.path);
+      if (isPresent(container)) {
+        container.removeControl(dir.name);
+      }
+    });
+  }
+
+  addControlGroup(dir: NgControlGroup): void {
+    resolvedPromise.then(() => {
+      var container = this._findContainer(dir.path);
+      var group = new ControlGroup({});
+      setUpControlGroup(group, dir);
+      container.registerControl(dir.name, group);
+      group.updateValueAndValidity({emitEvent: false});
+    });
+  }
+
+  removeControlGroup(dir: NgControlGroup): void {
+    resolvedPromise.then(() => {
+      var container = this._findContainer(dir.path);
+      if (isPresent(container)) {
+        container.removeControl(dir.name);
+      }
+    });
+  }
+
+  getControlGroup(dir: NgControlGroup): ControlGroup {
+    return <ControlGroup>this.form.find(dir.path);
+  }
+
+  updateModel(dir: NgControl, value: any): void {
+    resolvedPromise.then(() => {
+      var ctrl = <Control>this.form.find(dir.path);
+      ctrl.updateValue(value);
+    });
+  }
+
+  onSubmit(): boolean {
+    this._submitted = true;
+    this.ngSubmit.emit(null);
+    return false;
+  }
+
+  /** @internal */
+  _findContainer(path: string[]): ControlGroup {
+    path.pop();
+    return ListWrapper.isEmpty(path) ? this.form : <ControlGroup>this.form.find(path);
+  }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_form_control.ts

@@ -0,0 +1,127 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Inject, OnChanges, Optional, Self, SimpleChanges, forwardRef} from '@angular/core';
+
+import {EventEmitter} from '../../facade/async';
+import {StringMapWrapper} from '../../facade/collection';
+import {Control} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+import {NgControl} from './ng_control';
+import {composeAsyncValidators, composeValidators, isPropertyUpdated, selectValueAccessor, setUpControl} from './shared';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+export const formControlBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => NgFormControl)
+};
+
+/**
+ * Binds an existing {@link Control} to a DOM element.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/jcQlZ2tTh22BZZ2ucNAT?p=preview))
+ *
+ * In this example, we bind the control to an input element. When the value of the input element
+ * changes, the value of the control will reflect that change. Likewise, if the value of the
+ * control changes, the input element reflects that change.
+ *
+ *  ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   template: `
+ *     <div>
+ *       <h2>NgFormControl Example</h2>
+ *       <form>
+ *         <p>Element with existing control: <input type="text"
+ * [ngFormControl]="loginControl"></p>
+ *         <p>Value of existing control: {{loginControl.value}}</p>
+ *       </form>
+ *     </div>
+ *   `,
+ *   directives: [CORE_DIRECTIVES, FORM_DIRECTIVES]
+ * })
+ * export class App {
+ *   loginControl: Control = new Control('');
+ * }
+ *  ```
+ *
+ * ### ngModel
+ *
+ * We can also use `ngModel` to bind a domain model to the form.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/yHMLuHO7DNgT8XvtjTDH?p=preview))
+ *
+ *  ```typescript
+ * @Component({
+ *      selector: "login-comp",
+ *      directives: [FORM_DIRECTIVES],
+ *      template: "<input type='text' [ngFormControl]='loginControl' [(ngModel)]='login'>"
+ *      })
+ * class LoginComp {
+ *  loginControl: Control = new Control('');
+ *  login:string;
+ * }
+ *  ```
+ *
+ *  @experimental
+ */
+@Directive({
+  selector: '[ngFormControl]',
+  providers: [formControlBinding],
+  inputs: ['form: ngFormControl', 'model: ngModel'],
+  outputs: ['update: ngModelChange'],
+  exportAs: 'ngForm'
+})
+export class NgFormControl extends NgControl implements OnChanges {
+  form: Control;
+  update = new EventEmitter();
+  model: any;
+  viewModel: any;
+
+  constructor(@Optional() @Self() @Inject(NG_VALIDATORS) private _validators:
+                  /* Array<Validator|Function> */ any[],
+              @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators:
+                  /* Array<Validator|Function> */ any[],
+              @Optional() @Self() @Inject(NG_VALUE_ACCESSOR)
+              valueAccessors: ControlValueAccessor[]) {
+                super();
+                this.valueAccessor = selectValueAccessor(this, valueAccessors);
+              }
+
+              ngOnChanges(changes: SimpleChanges): void {
+                if (this._isControlChanged(changes)) {
+                  setUpControl(this.form, this);
+                  this.form.updateValueAndValidity({emitEvent: false});
+                }
+                if (isPropertyUpdated(changes, this.viewModel)) {
+                  this.form.updateValue(this.model);
+                  this.viewModel = this.model;
+                }
+              }
+
+              get path(): string[] { return []; }
+
+              get validator(): ValidatorFn { return composeValidators(this._validators); }
+
+              get asyncValidator(): AsyncValidatorFn {
+                return composeAsyncValidators(this._asyncValidators);
+              }
+
+              get control(): Control { return this.form; }
+
+              viewToModelUpdate(newValue: any): void {
+                this.viewModel = newValue;
+                this.update.emit(newValue);
+              }
+
+              private _isControlChanged(changes: {[key: string]: any}): boolean {
+                return StringMapWrapper.contains(changes, 'form');
+              }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_form_model.ts

@@ -0,0 +1,212 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Inject, OnChanges, Optional, Self, SimpleChanges, forwardRef} from '@angular/core';
+
+import {EventEmitter} from '../../facade/async';
+import {ListWrapper, StringMapWrapper} from '../../facade/collection';
+import {BaseException} from '../../facade/exceptions';
+import {isBlank} from '../../facade/lang';
+import {Control, ControlGroup} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../validators';
+
+import {ControlContainer} from './control_container';
+import {Form} from './form_interface';
+import {NgControl} from './ng_control';
+import {NgControlGroup} from './ng_control_group';
+import {composeAsyncValidators, composeValidators, setUpControl, setUpControlGroup} from './shared';
+
+export const formDirectiveProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => NgFormModel)
+};
+
+let _formModelWarningDisplayed: boolean = false;
+
+/**
+ * Binds an existing control group to a DOM element.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/jqrVirudY8anJxTMUjTP?p=preview))
+ *
+ * In this example, we bind the control group to the form element, and we bind the login and
+ * password controls to the login and password elements.
+ *
+ *  ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   template: `
+ *     <div>
+ *       <h2>NgFormModel Example</h2>
+ *       <form [ngFormModel]="loginForm">
+ *         <p>Login: <input type="text" ngControl="login"></p>
+ *         <p>Password: <input type="password" ngControl="password"></p>
+ *       </form>
+ *       <p>Value:</p>
+ *       <pre>{{value}}</pre>
+ *     </div>
+ *   `,
+ *   directives: [FORM_DIRECTIVES]
+ * })
+ * export class App {
+ *   loginForm: ControlGroup;
+ *
+ *   constructor() {
+ *     this.loginForm = new ControlGroup({
+ *       login: new Control(""),
+ *       password: new Control("")
+ *     });
+ *   }
+ *
+ *   get value(): string {
+ *     return JSON.stringify(this.loginForm.value, null, 2);
+ *   }
+ * }
+ *  ```
+ *
+ * We can also use ngModel to bind a domain model to the form.
+ *
+ *  ```typescript
+ * @Component({
+ *      selector: "login-comp",
+ *      directives: [FORM_DIRECTIVES],
+ *      template: `
+ *        <form [ngFormModel]='loginForm'>
+ *          Login <input type='text' ngControl='login' [(ngModel)]='credentials.login'>
+ *          Password <input type='password' ngControl='password'
+ *                          [(ngModel)]='credentials.password'>
+ *          <button (click)="onLogin()">Login</button>
+ *        </form>`
+ *      })
+ * class LoginComp {
+ *  credentials: {login: string, password: string};
+ *  loginForm: ControlGroup;
+ *
+ *  constructor() {
+ *    this.loginForm = new ControlGroup({
+ *      login: new Control(""),
+ *      password: new Control("")
+ *    });
+ *  }
+ *
+ *  onLogin(): void {
+ *    // this.credentials.login === 'some login'
+ *    // this.credentials.password === 'some password'
+ *  }
+ * }
+ *  ```
+ *
+ *  @experimental
+ */
+
+@Directive({
+  selector: '[ngFormModel]',
+  providers: [formDirectiveProvider],
+  inputs: ['form: ngFormModel'],
+  host: {'(submit)': 'onSubmit()'},
+  outputs: ['ngSubmit'],
+  exportAs: 'ngForm'
+})
+export class NgFormModel extends ControlContainer implements Form,
+    OnChanges {
+  private _submitted: boolean = false;
+
+  form: ControlGroup = null;
+  directives: NgControl[] = [];
+  ngSubmit = new EventEmitter();
+
+  constructor(
+      @Optional() @Self() @Inject(NG_VALIDATORS) private _validators: any[],
+      @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators: any[]) {
+    super();
+    this._displayWarning();
+  }
+
+  private _displayWarning() {
+    // TODO(kara): Update this when the new forms module becomes the default
+    if (!_formModelWarningDisplayed) {
+      _formModelWarningDisplayed = true;
+      console.warn(`
+      *It looks like you're using the old forms module. This will be opt-in in the next RC, and
+      will eventually be removed in favor of the new forms module. For more information, see:
+      https://docs.google.com/document/d/1RIezQqE4aEhBRmArIAS1mRIZtWFf6JxN_7B4meyWK0Y/preview
+    `);
+    }
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    this._checkFormPresent();
+    if (StringMapWrapper.contains(changes, 'form')) {
+      var sync = composeValidators(this._validators);
+      this.form.validator = Validators.compose([this.form.validator, sync]);
+
+      var async = composeAsyncValidators(this._asyncValidators);
+      this.form.asyncValidator = Validators.composeAsync([this.form.asyncValidator, async]);
+
+      this.form.updateValueAndValidity({onlySelf: true, emitEvent: false});
+    }
+
+    this._updateDomValue();
+  }
+
+  get submitted(): boolean { return this._submitted; }
+
+  get formDirective(): Form { return this; }
+
+  get control(): ControlGroup { return this.form; }
+
+  get path(): string[] { return []; }
+
+  addControl(dir: NgControl): void {
+    var ctrl: any = this.form.find(dir.path);
+    setUpControl(ctrl, dir);
+    ctrl.updateValueAndValidity({emitEvent: false});
+    this.directives.push(dir);
+  }
+
+  getControl(dir: NgControl): Control { return <Control>this.form.find(dir.path); }
+
+  removeControl(dir: NgControl): void { ListWrapper.remove(this.directives, dir); }
+
+  addControlGroup(dir: NgControlGroup) {
+    var ctrl: any = this.form.find(dir.path);
+    setUpControlGroup(ctrl, dir);
+    ctrl.updateValueAndValidity({emitEvent: false});
+  }
+
+  removeControlGroup(dir: NgControlGroup) {}
+
+  getControlGroup(dir: NgControlGroup): ControlGroup {
+    return <ControlGroup>this.form.find(dir.path);
+  }
+
+  updateModel(dir: NgControl, value: any): void {
+    var ctrl  = <Control>this.form.find(dir.path);
+    ctrl.updateValue(value);
+  }
+
+  onSubmit(): boolean {
+    this._submitted = true;
+    this.ngSubmit.emit(null);
+    return false;
+  }
+
+  /** @internal */
+  _updateDomValue() {
+    this.directives.forEach(dir => {
+      var ctrl: any = this.form.find(dir.path);
+      dir.valueAccessor.writeValue(ctrl.value);
+    });
+  }
+
+  private _checkFormPresent() {
+    if (isBlank(this.form)) {
+      throw new BaseException(
+          `ngFormModel expects a form. Please pass one in. Example: <form [ngFormModel]="myCoolForm">`);
+    }
+  }
+}

modules/@angular/common/src/forms-deprecated/directives/ng_model.ts

@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, Inject, OnChanges, Optional, Self, SimpleChanges, forwardRef} from '@angular/core';
+
+import {EventEmitter} from '../../facade/async';
+import {Control} from '../model';
+import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+import {NgControl} from './ng_control';
+import {composeAsyncValidators, composeValidators, isPropertyUpdated, selectValueAccessor, setUpControl} from './shared';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+export const formControlBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => NgModel)
+};
+
+/**
+ * Binds a domain model to a form control.
+ *
+ * ### Usage
+ *
+ * `ngModel` binds an existing domain model to a form control. For a
+ * two-way binding, use `[(ngModel)]` to ensure the model updates in
+ * both directions.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/R3UX5qDaUqFO2VYR0UzH?p=preview))
+ *  ```typescript
+ * @Component({
+ *      selector: "search-comp",
+ *      directives: [FORM_DIRECTIVES],
+ *      template: `<input type='text' [(ngModel)]="searchQuery">`
+ *      })
+ * class SearchComp {
+ *  searchQuery: string;
+ * }
+ *  ```
+ *
+ *  @experimental
+ */
+@Directive({
+  selector: '[ngModel]:not([ngControl]):not([ngFormControl])',
+  providers: [formControlBinding],
+  inputs: ['model: ngModel'],
+  outputs: ['update: ngModelChange'],
+  exportAs: 'ngForm'
+})
+export class NgModel extends NgControl implements OnChanges {
+  /** @internal */
+  _control = new Control();
+  /** @internal */
+  _added = false;
+  update = new EventEmitter();
+  model: any;
+  viewModel: any;
+
+  constructor(@Optional() @Self() @Inject(NG_VALIDATORS) private _validators: any[],
+              @Optional() @Self() @Inject(NG_ASYNC_VALIDATORS) private _asyncValidators: any[],
+              @Optional() @Self() @Inject(NG_VALUE_ACCESSOR)
+              valueAccessors: ControlValueAccessor[]) {
+                super();
+                this.valueAccessor = selectValueAccessor(this, valueAccessors);
+              }
+
+              ngOnChanges(changes: SimpleChanges) {
+                if (!this._added) {
+                  setUpControl(this._control, this);
+                  this._control.updateValueAndValidity({emitEvent: false});
+                  this._added = true;
+                }
+
+                if (isPropertyUpdated(changes, this.viewModel)) {
+                  this._control.updateValue(this.model);
+                  this.viewModel = this.model;
+                }
+              }
+
+              get control(): Control { return this._control; }
+
+              get path(): string[] { return []; }
+
+              get validator(): ValidatorFn { return composeValidators(this._validators); }
+
+              get asyncValidator(): AsyncValidatorFn {
+                return composeAsyncValidators(this._asyncValidators);
+              }
+
+              viewToModelUpdate(newValue: any): void {
+                this.viewModel = newValue;
+                this.update.emit(newValue);
+              }
+}

modules/@angular/common/src/forms-deprecated/directives/normalize_validator.ts

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {AbstractControl} from '../model';
+
+import {AsyncValidatorFn, Validator, ValidatorFn} from './validators';
+
+export function normalizeValidator(validator: ValidatorFn | Validator): ValidatorFn {
+  if ((<Validator>validator).validate !== undefined) {
+    return (c: AbstractControl) => (<Validator>validator).validate(c);
+  } else {
+    return <ValidatorFn>validator;
+  }
+}
+
+export function normalizeAsyncValidator(validator: AsyncValidatorFn | Validator): AsyncValidatorFn {
+  if ((<Validator>validator).validate !== undefined) {
+    return (c: AbstractControl) => (<Validator>validator).validate(c);
+  } else {
+    return <AsyncValidatorFn>validator;
+  }
+}

modules/@angular/common/src/forms-deprecated/directives/number_value_accessor.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
+
+import {NumberWrapper, isBlank} from '../../facade/lang';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+
+export const NUMBER_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => NumberValueAccessor),
+  multi: true
+};
+
+/**
+ * The accessor for writing a number value and listening to changes that is used by the
+ * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+ *
+ *  ### Example
+ *  ```
+ *  <input type="number" [(ngModel)]="age">
+ *  ```
+ */
+@Directive({
+  selector:
+      'input[type=number][ngControl],input[type=number][ngFormControl],input[type=number][ngModel]',
+  host: {
+    '(change)': 'onChange($event.target.value)',
+    '(input)': 'onChange($event.target.value)',
+    '(blur)': 'onTouched()'
+  },
+  providers: [NUMBER_VALUE_ACCESSOR]
+})
+export class NumberValueAccessor implements ControlValueAccessor {
+  onChange = (_: any) => {};
+  onTouched = () => {};
+
+  constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
+
+  writeValue(value: number): void {
+    // The value needs to be normalized for IE9, otherwise it is set to 'null' when null
+    const normalizedValue = isBlank(value) ? '' : value;
+    this._renderer.setElementProperty(this._elementRef.nativeElement, 'value', normalizedValue);
+  }
+
+  registerOnChange(fn: (_: number) => void): void {
+    this.onChange = (value) => { fn(value == '' ? null : NumberWrapper.parseFloat(value)); };
+  }
+  registerOnTouched(fn: () => void): void { this.onTouched = fn; }
+}

modules/@angular/common/src/forms-deprecated/directives/radio_control_value_accessor.ts

@@ -0,0 +1,134 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Injectable, Injector, Input, OnDestroy, OnInit, Renderer, forwardRef} from '@angular/core';
+
+import {ListWrapper} from '../../facade/collection';
+import {isPresent} from '../../facade/lang';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+import {NgControl} from './ng_control';
+
+export const RADIO_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => RadioControlValueAccessor),
+  multi: true
+};
+
+/**
+ * Internal class used by Angular to uncheck radio buttons with the matching name.
+ */
+@Injectable()
+export class RadioControlRegistry {
+  private _accessors: any[] = [];
+
+  add(control: NgControl, accessor: RadioControlValueAccessor) {
+    this._accessors.push([control, accessor]);
+  }
+
+  remove(accessor: RadioControlValueAccessor) {
+    var indexToRemove = -1;
+    for (var i = 0; i < this._accessors.length; ++i) {
+      if (this._accessors[i][1] === accessor) {
+        indexToRemove = i;
+      }
+    }
+    ListWrapper.removeAt(this._accessors, indexToRemove);
+  }
+
+  select(accessor: RadioControlValueAccessor) {
+    this._accessors.forEach((c) => {
+      if (this._isSameGroup(c, accessor) && c[1] !== accessor) {
+        c[1].fireUncheck();
+      }
+    });
+  }
+
+  private _isSameGroup(
+      controlPair: [NgControl, RadioControlValueAccessor], accessor: RadioControlValueAccessor) {
+    return controlPair[0].control.root === accessor._control.control.root &&
+        controlPair[1].name === accessor.name;
+  }
+}
+
+/**
+ * The value provided by the forms API for radio buttons.
+ *
+ * @experimental
+ */
+export class RadioButtonState {
+  constructor(public checked: boolean, public value: string) {}
+}
+
+
+/**
+ * The accessor for writing a radio control value and listening to changes that is used by the
+ * {@link NgModel}, {@link NgFormControl}, and {@link NgControlName} directives.
+ *
+ *  ### Example
+ *  ```
+ *  @Component({
+ *    template: `
+ *      <input type="radio" name="food" [(ngModel)]="foodChicken">
+ *      <input type="radio" name="food" [(ngModel)]="foodFish">
+ *    `
+ *  })
+ *  class FoodCmp {
+ *    foodChicken = new RadioButtonState(true, "chicken");
+ *    foodFish = new RadioButtonState(false, "fish");
+ *  }
+ *  ```
+ */
+@Directive({
+  selector:
+      'input[type=radio][ngControl],input[type=radio][ngFormControl],input[type=radio][ngModel]',
+  host: {'(change)': 'onChange()', '(blur)': 'onTouched()'},
+  providers: [RADIO_VALUE_ACCESSOR]
+})
+export class RadioControlValueAccessor implements ControlValueAccessor,
+    OnDestroy, OnInit {
+  /** @internal */
+  _state: RadioButtonState;
+  /** @internal */
+  _control: NgControl;
+  @Input() name: string;
+  /** @internal */
+  _fn: Function;
+  onChange = () => {};
+  onTouched = () => {};
+
+  constructor(
+      private _renderer: Renderer, private _elementRef: ElementRef,
+      private _registry: RadioControlRegistry, private _injector: Injector) {}
+
+  ngOnInit(): void {
+    this._control = this._injector.get(NgControl);
+    this._registry.add(this._control, this);
+  }
+
+  ngOnDestroy(): void { this._registry.remove(this); }
+
+  writeValue(value: any): void {
+    this._state = value;
+    if (isPresent(value) && value.checked) {
+      this._renderer.setElementProperty(this._elementRef.nativeElement, 'checked', true);
+    }
+  }
+
+  registerOnChange(fn: (_: any) => {}): void {
+    this._fn = fn;
+    this.onChange = () => {
+      fn(new RadioButtonState(true, this._state.value));
+      this._registry.select(this);
+    };
+  }
+
+  fireUncheck(): void { this._fn(new RadioButtonState(false, this._state.value)); }
+
+  registerOnTouched(fn: () => {}): void { this.onTouched = fn; }
+}

modules/@angular/common/src/forms-deprecated/directives/select_control_value_accessor.ts

@@ -0,0 +1,140 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Host, Input, OnDestroy, Optional, Renderer, forwardRef} from '@angular/core';
+
+import {MapWrapper} from '../../facade/collection';
+import {StringWrapper, isBlank, isPresent, isPrimitive, looseIdentical} from '../../facade/lang';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+
+export const SELECT_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => SelectControlValueAccessor),
+  multi: true
+};
+
+function _buildValueString(id: string, value: any): string {
+  if (isBlank(id)) return `${value}`;
+  if (!isPrimitive(value)) value = 'Object';
+  return StringWrapper.slice(`${id}: ${value}`, 0, 50);
+}
+
+function _extractId(valueString: string): string {
+  return valueString.split(':')[0];
+}
+
+/**
+ * The accessor for writing a value and listening to changes on a select element.
+ *
+ * Note: We have to listen to the 'change' event because 'input' events aren't fired
+ * for selects in Firefox and IE:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1024350
+ * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/4660045/
+ *
+ * @experimental
+ */
+@Directive({
+  selector:
+      'select:not([multiple])[ngControl],select:not([multiple])[ngFormControl],select:not([multiple])[ngModel]',
+  host: {'(change)': 'onChange($event.target.value)', '(blur)': 'onTouched()'},
+  providers: [SELECT_VALUE_ACCESSOR]
+})
+export class SelectControlValueAccessor implements ControlValueAccessor {
+  value: any;
+  /** @internal */
+  _optionMap: Map<string, any> = new Map<string, any>();
+  /** @internal */
+  _idCounter: number = 0;
+
+  onChange = (_: any) => {};
+  onTouched = () => {};
+
+  constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
+
+  writeValue(value: any): void {
+    this.value = value;
+    var valueString = _buildValueString(this._getOptionId(value), value);
+    this._renderer.setElementProperty(this._elementRef.nativeElement, 'value', valueString);
+  }
+
+  registerOnChange(fn: (value: any) => any): void {
+    this.onChange = (valueString: string) => {
+      this.value = valueString;
+      fn(this._getOptionValue(valueString));
+    };
+  }
+  registerOnTouched(fn: () => any): void { this.onTouched = fn; }
+
+  /** @internal */
+  _registerOption(): string { return (this._idCounter++).toString(); }
+
+  /** @internal */
+  _getOptionId(value: any): string {
+    for (let id of MapWrapper.keys(this._optionMap)) {
+      if (looseIdentical(this._optionMap.get(id), value)) return id;
+    }
+    return null;
+  }
+
+  /** @internal */
+  _getOptionValue(valueString: string): any {
+    let value = this._optionMap.get(_extractId(valueString));
+    return isPresent(value) ? value : valueString;
+  }
+}
+
+/**
+ * Marks `<option>` as dynamic, so Angular can be notified when options change.
+ *
+ * ### Example
+ *
+ * ```
+ * <select ngControl="city">
+ *   <option *ngFor="let c of cities" [value]="c"></option>
+ * </select>
+ * ```
+ *
+ * @experimental
+ */
+@Directive({selector: 'option'})
+export class NgSelectOption implements OnDestroy {
+  id: string;
+
+  constructor(
+      private _element: ElementRef, private _renderer: Renderer,
+      @Optional() @Host() private _select: SelectControlValueAccessor) {
+    if (isPresent(this._select)) this.id = this._select._registerOption();
+  }
+
+  @Input('ngValue')
+  set ngValue(value: any) {
+    if (this._select == null) return;
+    this._select._optionMap.set(this.id, value);
+    this._setElementValue(_buildValueString(this.id, value));
+    this._select.writeValue(this._select.value);
+  }
+
+  @Input('value')
+  set value(value: any) {
+    this._setElementValue(value);
+    if (isPresent(this._select)) this._select.writeValue(this._select.value);
+  }
+
+  /** @internal */
+  _setElementValue(value: string): void {
+    this._renderer.setElementProperty(this._element.nativeElement, 'value', value);
+  }
+
+  ngOnDestroy() {
+    if (isPresent(this._select)) {
+      this._select._optionMap.delete(this.id);
+      this._select.writeValue(this._select.value);
+    }
+  }
+}

modules/@angular/common/src/forms-deprecated/directives/select_multiple_control_value_accessor.ts

@@ -0,0 +1,185 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Directive, ElementRef, Host, Input, OnDestroy, OpaqueToken, Optional, Renderer, Type, forwardRef} from '@angular/core';
+
+import {MapWrapper} from '../../facade/collection';
+import {StringWrapper, isBlank, isPresent, isPrimitive, isString, looseIdentical} from '../../facade/lang';
+
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
+
+export const SELECT_MULTIPLE_VALUE_ACCESSOR = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => SelectMultipleControlValueAccessor),
+  multi: true
+};
+
+function _buildValueString(id: string, value: any): string {
+  if (isBlank(id)) return `${value}`;
+  if (isString(value)) value = `'${value}'`;
+  if (!isPrimitive(value)) value = 'Object';
+  return StringWrapper.slice(`${id}: ${value}`, 0, 50);
+}
+
+function _extractId(valueString: string): string {
+  return valueString.split(':')[0];
+}
+
+/** Mock interface for HTML Options */
+interface HTMLOption {
+  value: string;
+  selected: boolean;
+}
+
+/** Mock interface for HTMLCollection */
+abstract class HTMLCollection {
+  length: number;
+  abstract item(_: number): HTMLOption;
+}
+
+/**
+ * The accessor for writing a value and listening to changes on a select element.
+ */
+@Directive({
+  selector: 'select[multiple][ngControl],select[multiple][ngFormControl],select[multiple][ngModel]',
+  host: {'(change)': 'onChange($event.target)', '(blur)': 'onTouched()'},
+  providers: [SELECT_MULTIPLE_VALUE_ACCESSOR]
+})
+export class SelectMultipleControlValueAccessor implements ControlValueAccessor {
+  value: any;
+  /** @internal */
+  _optionMap: Map<string, NgSelectMultipleOption> = new Map<string, NgSelectMultipleOption>();
+  /** @internal */
+  _idCounter: number = 0;
+
+  onChange = (_: any) => {};
+  onTouched = () => {};
+
+  constructor() {}
+
+  writeValue(value: any): void {
+    this.value = value;
+    if (value == null) return;
+    let values: Array<any> = <Array<any>>value;
+    // convert values to ids
+    let ids = values.map((v) => this._getOptionId(v));
+    this._optionMap.forEach((opt, o) => { opt._setSelected(ids.indexOf(o.toString()) > -1); });
+  }
+
+  registerOnChange(fn: (value: any) => any): void {
+    this.onChange = (_: any) => {
+      let selected: Array<any> = [];
+      if (_.hasOwnProperty('selectedOptions')) {
+        let options: HTMLCollection = _.selectedOptions;
+        for (var i = 0; i < options.length; i++) {
+          let opt: any = options.item(i);
+          let val: any = this._getOptionValue(opt.value);
+          selected.push(val);
+        }
+      }
+      // Degrade on IE
+      else {
+        let options: HTMLCollection = <HTMLCollection>_.options;
+        for (var i = 0; i < options.length; i++) {
+          let opt: HTMLOption = options.item(i);
+          if (opt.selected) {
+            let val: any = this._getOptionValue(opt.value);
+            selected.push(val);
+          }
+        }
+      }
+      fn(selected);
+    };
+  }
+  registerOnTouched(fn: () => any): void { this.onTouched = fn; }
+
+  /** @internal */
+  _registerOption(value: NgSelectMultipleOption): string {
+    let id: string = (this._idCounter++).toString();
+    this._optionMap.set(id, value);
+    return id;
+  }
+
+  /** @internal */
+  _getOptionId(value: any): string {
+    for (let id of MapWrapper.keys(this._optionMap)) {
+      if (looseIdentical(this._optionMap.get(id)._value, value)) return id;
+    }
+    return null;
+  }
+
+  /** @internal */
+  _getOptionValue(valueString: string): any {
+    let opt = this._optionMap.get(_extractId(valueString));
+    return isPresent(opt) ? opt._value : valueString;
+  }
+}
+
+/**
+ * Marks `<option>` as dynamic, so Angular can be notified when options change.
+ *
+ * ### Example
+ *
+ * ```
+ * <select multiple ngControl="city">
+ *   <option *ngFor="let c of cities" [value]="c"></option>
+ * </select>
+ * ```
+ */
+@Directive({selector: 'option'})
+export class NgSelectMultipleOption implements OnDestroy {
+  id: string;
+  /** @internal */
+  _value: any;
+
+  constructor(
+      private _element: ElementRef, private _renderer: Renderer,
+      @Optional() @Host() private _select: SelectMultipleControlValueAccessor) {
+    if (isPresent(this._select)) {
+      this.id = this._select._registerOption(this);
+    }
+  }
+
+  @Input('ngValue')
+  set ngValue(value: any) {
+    if (this._select == null) return;
+    this._value = value;
+    this._setElementValue(_buildValueString(this.id, value));
+    this._select.writeValue(this._select.value);
+  }
+
+  @Input('value')
+  set value(value: any) {
+    if (isPresent(this._select)) {
+      this._value = value;
+      this._setElementValue(_buildValueString(this.id, value));
+      this._select.writeValue(this._select.value);
+    } else {
+      this._setElementValue(value);
+    }
+  }
+
+  /** @internal */
+  _setElementValue(value: string): void {
+    this._renderer.setElementProperty(this._element.nativeElement, 'value', value);
+  }
+
+  /** @internal */
+  _setSelected(selected: boolean) {
+    this._renderer.setElementProperty(this._element.nativeElement, 'selected', selected);
+  }
+
+  ngOnDestroy() {
+    if (isPresent(this._select)) {
+      this._select._optionMap.delete(this.id);
+      this._select.writeValue(this._select.value);
+    }
+  }
+}
+
+export const SELECT_DIRECTIVES = [SelectMultipleControlValueAccessor, NgSelectMultipleOption];

modules/@angular/common/src/forms-deprecated/directives/shared.ts

@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {ListWrapper, StringMapWrapper} from '../../facade/collection';
+import {BaseException} from '../../facade/exceptions';
+import {hasConstructor, isBlank, isPresent, looseIdentical} from '../../facade/lang';
+import {Control, ControlGroup} from '../model';
+import {Validators} from '../validators';
+
+import {AbstractControlDirective} from './abstract_control_directive';
+import {CheckboxControlValueAccessor} from './checkbox_value_accessor';
+import {ControlContainer} from './control_container';
+import {ControlValueAccessor} from './control_value_accessor';
+import {DefaultValueAccessor} from './default_value_accessor';
+import {NgControl} from './ng_control';
+import {NgControlGroup} from './ng_control_group';
+import {normalizeAsyncValidator, normalizeValidator} from './normalize_validator';
+import {NumberValueAccessor} from './number_value_accessor';
+import {RadioControlValueAccessor} from './radio_control_value_accessor';
+import {SelectControlValueAccessor} from './select_control_value_accessor';
+import {SelectMultipleControlValueAccessor} from './select_multiple_control_value_accessor';
+import {AsyncValidatorFn, ValidatorFn} from './validators';
+
+
+export function controlPath(name: string, parent: ControlContainer): string[] {
+  var p = ListWrapper.clone(parent.path);
+  p.push(name);
+  return p;
+}
+
+export function setUpControl(control: Control, dir: NgControl): void {
+  if (isBlank(control)) _throwError(dir, 'Cannot find control with');
+  if (isBlank(dir.valueAccessor)) _throwError(dir, 'No value accessor for form control with');
+
+  control.validator = Validators.compose([control.validator, dir.validator]);
+  control.asyncValidator = Validators.composeAsync([control.asyncValidator, dir.asyncValidator]);
+  dir.valueAccessor.writeValue(control.value);
+
+  // view -> model
+  dir.valueAccessor.registerOnChange((newValue: any) => {
+    dir.viewToModelUpdate(newValue);
+    control.updateValue(newValue, {emitModelToViewChange: false});
+    control.markAsDirty();
+  });
+
+  // model -> view
+  control.registerOnChange((newValue: any) => dir.valueAccessor.writeValue(newValue));
+
+  // touched
+  dir.valueAccessor.registerOnTouched(() => control.markAsTouched());
+}
+
+export function setUpControlGroup(control: ControlGroup, dir: NgControlGroup) {
+  if (isBlank(control)) _throwError(dir, 'Cannot find control with');
+  control.validator = Validators.compose([control.validator, dir.validator]);
+  control.asyncValidator = Validators.composeAsync([control.asyncValidator, dir.asyncValidator]);
+}
+
+function _throwError(dir: AbstractControlDirective, message: string): void {
+  let messageEnd: string;
+  if (dir.path.length > 1) {
+    messageEnd = `path: '${dir.path.join(' -> ')}'`;
+  } else if (dir.path[0]) {
+    messageEnd = `name: '${dir.path}'`;
+  } else {
+    messageEnd = 'unspecified name';
+  }
+  throw new BaseException(`${message} ${messageEnd}`);
+}
+
+export function composeValidators(validators: /* Array<Validator|Function> */ any[]): ValidatorFn {
+  return isPresent(validators) ? Validators.compose(validators.map(normalizeValidator)) : null;
+}
+
+export function composeAsyncValidators(validators: /* Array<Validator|Function> */ any[]):
+    AsyncValidatorFn {
+  return isPresent(validators) ? Validators.composeAsync(validators.map(normalizeAsyncValidator)) :
+                                 null;
+}
+
+export function isPropertyUpdated(changes: {[key: string]: any}, viewModel: any): boolean {
+  if (!StringMapWrapper.contains(changes, 'model')) return false;
+  var change = changes['model'];
+
+  if (change.isFirstChange()) return true;
+  return !looseIdentical(viewModel, change.currentValue);
+}
+
+// TODO: vsavkin remove it once https://github.com/angular/angular/issues/3011 is implemented
+export function selectValueAccessor(
+    dir: NgControl, valueAccessors: ControlValueAccessor[]): ControlValueAccessor {
+  if (isBlank(valueAccessors)) return null;
+
+  var defaultAccessor: ControlValueAccessor;
+  var builtinAccessor: ControlValueAccessor;
+  var customAccessor: ControlValueAccessor;
+  valueAccessors.forEach((v: ControlValueAccessor) => {
+    if (hasConstructor(v, DefaultValueAccessor)) {
+      defaultAccessor = v;
+
+    } else if (
+        hasConstructor(v, CheckboxControlValueAccessor) || hasConstructor(v, NumberValueAccessor) ||
+        hasConstructor(v, SelectControlValueAccessor) ||
+        hasConstructor(v, SelectMultipleControlValueAccessor) ||
+        hasConstructor(v, RadioControlValueAccessor)) {
+      if (isPresent(builtinAccessor))
+        _throwError(dir, 'More than one built-in value accessor matches form control with');
+      builtinAccessor = v;
+
+    } else {
+      if (isPresent(customAccessor))
+        _throwError(dir, 'More than one custom value accessor matches form control with');
+      customAccessor = v;
+    }
+  });
+
+  if (isPresent(customAccessor)) return customAccessor;
+  if (isPresent(builtinAccessor)) return builtinAccessor;
+  if (isPresent(defaultAccessor)) return defaultAccessor;
+
+  _throwError(dir, 'No valid value accessor for form control with');
+  return null;
+}

modules/@angular/common/src/forms-deprecated/directives/validators.ts

@@ -0,0 +1,169 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Attribute, Directive, forwardRef} from '@angular/core';
+
+import {NumberWrapper} from '../../facade/lang';
+import {AbstractControl} from '../model';
+import {NG_VALIDATORS, Validators} from '../validators';
+
+
+
+/**
+ * An interface that can be implemented by classes that can act as validators.
+ *
+ * ## Usage
+ *
+ * ```typescript
+ * @Directive({
+ *   selector: '[custom-validator]',
+ *   providers: [{provide: NG_VALIDATORS, useExisting: CustomValidatorDirective, multi: true}]
+ * })
+ * class CustomValidatorDirective implements Validator {
+ *   validate(c: Control): {[key: string]: any} {
+ *     return {"custom": true};
+ *   }
+ * }
+ * ```
+ *
+ * @experimental
+ */
+export interface Validator { validate(c: AbstractControl): {[key: string]: any}; }
+
+export const REQUIRED = Validators.required;
+
+export const REQUIRED_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useValue: REQUIRED,
+  multi: true
+};
+
+/**
+ * A Directive that adds the `required` validator to any controls marked with the
+ * `required` attribute, via the {@link NG_VALIDATORS} binding.
+ *
+ * ### Example
+ *
+ * ```
+ * <input ngControl="fullName" required>
+ * ```
+ *
+ * @experimental
+ */
+@Directive({
+  selector: '[required][ngControl],[required][ngFormControl],[required][ngModel]',
+  providers: [REQUIRED_VALIDATOR]
+})
+export class RequiredValidator {
+}
+
+export interface ValidatorFn { (c: AbstractControl): {[key: string]: any}; }
+export interface AsyncValidatorFn {
+  (c: AbstractControl): any /*Promise<{[key: string]: any}>|Observable<{[key: string]: any}>*/;
+}
+
+/**
+ * Provivder which adds {@link MinLengthValidator} to {@link NG_VALIDATORS}.
+ *
+ * ## Example:
+ *
+ * {@example common/forms/ts/validators/validators.ts region='min'}
+ */
+export const MIN_LENGTH_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useExisting: forwardRef(() => MinLengthValidator),
+  multi: true
+};
+
+/**
+ * A directive which installs the {@link MinLengthValidator} for any `ngControl`,
+ * `ngFormControl`, or control with `ngModel` that also has a `minlength` attribute.
+ *
+ * @experimental
+ */
+@Directive({
+  selector: '[minlength][ngControl],[minlength][ngFormControl],[minlength][ngModel]',
+  providers: [MIN_LENGTH_VALIDATOR]
+})
+export class MinLengthValidator implements Validator {
+  private _validator: ValidatorFn;
+
+  constructor(@Attribute('minlength') minLength: string) {
+    this._validator = Validators.minLength(NumberWrapper.parseInt(minLength, 10));
+  }
+
+  validate(c: AbstractControl): {[key: string]: any} { return this._validator(c); }
+}
+
+/**
+ * Provider which adds {@link MaxLengthValidator} to {@link NG_VALIDATORS}.
+ *
+ * ## Example:
+ *
+ * {@example common/forms/ts/validators/validators.ts region='max'}
+ */
+export const MAX_LENGTH_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useExisting: forwardRef(() => MaxLengthValidator),
+  multi: true
+};
+
+/**
+ * A directive which installs the {@link MaxLengthValidator} for any `ngControl, `ngFormControl`,
+ * or control with `ngModel` that also has a `maxlength` attribute.
+ *
+ * @experimental
+ */
+@Directive({
+  selector: '[maxlength][ngControl],[maxlength][ngFormControl],[maxlength][ngModel]',
+  providers: [MAX_LENGTH_VALIDATOR]
+})
+export class MaxLengthValidator implements Validator {
+  private _validator: ValidatorFn;
+
+  constructor(@Attribute('maxlength') maxLength: string) {
+    this._validator = Validators.maxLength(NumberWrapper.parseInt(maxLength, 10));
+  }
+
+  validate(c: AbstractControl): {[key: string]: any} { return this._validator(c); }
+}
+
+
+export const PATTERN_VALIDATOR: any = {
+  provide: NG_VALIDATORS,
+  useExisting: forwardRef(() => PatternValidator),
+  multi: true
+};
+
+
+/**
+ * A Directive that adds the `pattern` validator to any controls marked with the
+ * `pattern` attribute, via the {@link NG_VALIDATORS} binding. Uses attribute value
+ * as the regex to validate Control value against.  Follows pattern attribute
+ * semantics; i.e. regex must match entire Control value.
+ *
+ * ### Example
+ *
+ * ```
+ * <input [ngControl]="fullName" pattern="[a-zA-Z ]*">
+ * ```
+ * @experimental
+ */
+@Directive({
+  selector: '[pattern][ngControl],[pattern][ngFormControl],[pattern][ngModel]',
+  providers: [PATTERN_VALIDATOR]
+})
+export class PatternValidator implements Validator {
+  private _validator: ValidatorFn;
+
+  constructor(@Attribute('pattern') pattern: string) {
+    this._validator = Validators.pattern(pattern);
+  }
+
+  validate(c: AbstractControl): {[key: string]: any} { return this._validator(c); }
+}

modules/@angular/common/src/forms-deprecated/form_builder.ts

@@ -0,0 +1,123 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Injectable} from '@angular/core';
+
+import {StringMapWrapper} from '../facade/collection';
+import {isArray, isPresent} from '../facade/lang';
+
+import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
+import {AbstractControl, Control, ControlArray, ControlGroup} from './model';
+
+
+
+/**
+ * Creates a form object from a user-specified configuration.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/ENgZo8EuIECZNensZCVr?p=preview))
+ *
+ * ```typescript
+ * @Component({
+ *   selector: 'my-app',
+ *   viewProviders: [FORM_BINDINGS]
+ *   template: `
+ *     <form [ngFormModel]="loginForm">
+ *       <p>Login <input ngControl="login"></p>
+ *       <div ngControlGroup="passwordRetry">
+ *         <p>Password <input type="password" ngControl="password"></p>
+ *         <p>Confirm password <input type="password" ngControl="passwordConfirmation"></p>
+ *       </div>
+ *     </form>
+ *     <h3>Form value:</h3>
+ *     <pre>{{value}}</pre>
+ *   `,
+ *   directives: [FORM_DIRECTIVES]
+ * })
+ * export class App {
+ *   loginForm: ControlGroup;
+ *
+ *   constructor(builder: FormBuilder) {
+ *     this.loginForm = builder.group({
+ *       login: ["", Validators.required],
+ *       passwordRetry: builder.group({
+ *         password: ["", Validators.required],
+ *         passwordConfirmation: ["", Validators.required, asyncValidator]
+ *       })
+ *     });
+ *   }
+ *
+ *   get value(): string {
+ *     return JSON.stringify(this.loginForm.value, null, 2);
+ *   }
+ * }
+ * ```
+ *
+ * @experimental
+ */
+@Injectable()
+export class FormBuilder {
+  /**
+   * Construct a new {@link ControlGroup} with the given map of configuration.
+   * Valid keys for the `extra` parameter map are `optionals` and `validator`.
+   *
+   * See the {@link ControlGroup} constructor for more details.
+   */
+  group(controlsConfig: {[key: string]: any}, extra: {[key: string]: any} = null): ControlGroup {
+    var controls = this._reduceControls(controlsConfig);
+    var optionals = <{[key: string]: boolean}>(
+        isPresent(extra) ? StringMapWrapper.get(extra, 'optionals') : null);
+    var validator: ValidatorFn = isPresent(extra) ? StringMapWrapper.get(extra, 'validator') : null;
+    var asyncValidator: AsyncValidatorFn =
+        isPresent(extra) ? StringMapWrapper.get(extra, 'asyncValidator') : null;
+    return new ControlGroup(controls, optionals, validator, asyncValidator);
+  }
+  /**
+   * Construct a new {@link Control} with the given `value`,`validator`, and `asyncValidator`.
+   */
+  control(value: Object, validator: ValidatorFn = null, asyncValidator: AsyncValidatorFn = null):
+      Control {
+    return new Control(value, validator, asyncValidator);
+  }
+
+  /**
+   * Construct an array of {@link Control}s from the given `controlsConfig` array of
+   * configuration, with the given optional `validator` and `asyncValidator`.
+   */
+  array(
+      controlsConfig: any[], validator: ValidatorFn = null,
+      asyncValidator: AsyncValidatorFn = null): ControlArray {
+    var controls = controlsConfig.map(c => this._createControl(c));
+    return new ControlArray(controls, validator, asyncValidator);
+  }
+
+  /** @internal */
+  _reduceControls(controlsConfig: {[k: string]: any}): {[key: string]: AbstractControl} {
+    var controls: {[key: string]: AbstractControl} = {};
+    StringMapWrapper.forEach(controlsConfig, (controlConfig: any, controlName: string) => {
+      controls[controlName] = this._createControl(controlConfig);
+    });
+    return controls;
+  }
+
+  /** @internal */
+  _createControl(controlConfig: any): AbstractControl {
+    if (controlConfig instanceof Control || controlConfig instanceof ControlGroup ||
+        controlConfig instanceof ControlArray) {
+      return controlConfig;
+
+    } else if (isArray(controlConfig)) {
+      var value = controlConfig[0];
+      var validator: ValidatorFn = controlConfig.length > 1 ? controlConfig[1] : null;
+      var asyncValidator: AsyncValidatorFn = controlConfig.length > 2 ? controlConfig[2] : null;
+      return this.control(value, validator, asyncValidator);
+
+    } else {
+      return this.control(controlConfig);
+    }
+  }
+}

modules/@angular/common/src/forms-deprecated/model.ts

@@ -0,0 +1,538 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {PromiseObservable} from 'rxjs/observable/PromiseObservable';
+
+import {EventEmitter, Observable} from '../facade/async';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {isBlank, isPresent, isPromise, normalizeBool} from '../facade/lang';
+
+import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
+
+
+/**
+ * Indicates that a Control is valid, i.e. that no errors exist in the input value.
+ */
+export const VALID = 'VALID';
+
+/**
+ * Indicates that a Control is invalid, i.e. that an error exists in the input value.
+ */
+export const INVALID = 'INVALID';
+
+/**
+ * Indicates that a Control is pending, i.e. that async validation is occurring and
+ * errors are not yet available for the input value.
+ */
+export const PENDING = 'PENDING';
+
+export function isControl(control: Object): boolean {
+  return control instanceof AbstractControl;
+}
+
+function _find(control: AbstractControl, path: Array<string|number>| string) {
+  if (isBlank(path)) return null;
+
+  if (!(path instanceof Array)) {
+    path = (<string>path).split('/');
+  }
+  if (path instanceof Array && ListWrapper.isEmpty(path)) return null;
+
+  return (<Array<string|number>>path).reduce((v, name) => {
+    if (v instanceof ControlGroup) {
+      return isPresent(v.controls[name]) ? v.controls[name] : null;
+    } else if (v instanceof ControlArray) {
+      var index = <number>name;
+      return isPresent(v.at(index)) ? v.at(index) : null;
+    } else {
+      return null;
+    }
+  }, control);
+}
+
+function toObservable(r: any): Observable<any> {
+  return isPromise(r) ? PromiseObservable.create(r) : r;
+}
+
+/**
+ * @experimental
+ */
+export abstract class AbstractControl {
+  /** @internal */
+  _value: any;
+
+  private _valueChanges: EventEmitter<any>;
+  private _statusChanges: EventEmitter<any>;
+  private _status: string;
+  private _errors: {[key: string]: any};
+  private _pristine: boolean = true;
+  private _touched: boolean = false;
+  private _parent: ControlGroup|ControlArray;
+  private _asyncValidationSubscription: any;
+
+  constructor(public validator: ValidatorFn, public asyncValidator: AsyncValidatorFn) {}
+
+  get value(): any { return this._value; }
+
+  get status(): string { return this._status; }
+
+  get valid(): boolean { return this._status === VALID; }
+
+  /**
+   * Returns the errors of this control.
+   */
+  get errors(): {[key: string]: any} { return this._errors; }
+
+  get pristine(): boolean { return this._pristine; }
+
+  get dirty(): boolean { return !this.pristine; }
+
+  get touched(): boolean { return this._touched; }
+
+  get untouched(): boolean { return !this._touched; }
+
+  get valueChanges(): Observable<any> { return this._valueChanges; }
+
+  get statusChanges(): Observable<any> { return this._statusChanges; }
+
+  get pending(): boolean { return this._status == PENDING; }
+
+  markAsTouched(): void { this._touched = true; }
+
+  markAsDirty({onlySelf}: {onlySelf?: boolean} = {}): void {
+    onlySelf = normalizeBool(onlySelf);
+    this._pristine = false;
+
+    if (isPresent(this._parent) && !onlySelf) {
+      this._parent.markAsDirty({onlySelf: onlySelf});
+    }
+  }
+
+  markAsPending({onlySelf}: {onlySelf?: boolean} = {}): void {
+    onlySelf = normalizeBool(onlySelf);
+    this._status = PENDING;
+
+    if (isPresent(this._parent) && !onlySelf) {
+      this._parent.markAsPending({onlySelf: onlySelf});
+    }
+  }
+
+  setParent(parent: ControlGroup|ControlArray): void { this._parent = parent; }
+
+  updateValueAndValidity({onlySelf, emitEvent}: {onlySelf?: boolean, emitEvent?: boolean} = {}):
+      void {
+    onlySelf = normalizeBool(onlySelf);
+    emitEvent = isPresent(emitEvent) ? emitEvent : true;
+
+    this._updateValue();
+
+    this._errors = this._runValidator();
+    this._status = this._calculateStatus();
+
+    if (this._status == VALID || this._status == PENDING) {
+      this._runAsyncValidator(emitEvent);
+    }
+
+    if (emitEvent) {
+      this._valueChanges.emit(this._value);
+      this._statusChanges.emit(this._status);
+    }
+
+    if (isPresent(this._parent) && !onlySelf) {
+      this._parent.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});
+    }
+  }
+
+  private _runValidator(): {[key: string]: any} {
+    return isPresent(this.validator) ? this.validator(this) : null;
+  }
+
+  private _runAsyncValidator(emitEvent: boolean): void {
+    if (isPresent(this.asyncValidator)) {
+      this._status = PENDING;
+      this._cancelExistingSubscription();
+      var obs = toObservable(this.asyncValidator(this));
+      this._asyncValidationSubscription = obs.subscribe(
+          {next: (res: {[key: string]: any}) => this.setErrors(res, {emitEvent: emitEvent})});
+    }
+  }
+
+  private _cancelExistingSubscription(): void {
+    if (isPresent(this._asyncValidationSubscription)) {
+      this._asyncValidationSubscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Sets errors on a control.
+   *
+   * This is used when validations are run not automatically, but manually by the user.
+   *
+   * Calling `setErrors` will also update the validity of the parent control.
+   *
+   * ## Usage
+   *
+   * ```
+   * var login = new Control("someLogin");
+   * login.setErrors({
+   *   "notUnique": true
+   * });
+   *
+   * expect(login.valid).toEqual(false);
+   * expect(login.errors).toEqual({"notUnique": true});
+   *
+   * login.updateValue("someOtherLogin");
+   *
+   * expect(login.valid).toEqual(true);
+   * ```
+   */
+  setErrors(errors: {[key: string]: any}, {emitEvent}: {emitEvent?: boolean} = {}): void {
+    emitEvent = isPresent(emitEvent) ? emitEvent : true;
+
+    this._errors = errors;
+    this._status = this._calculateStatus();
+
+    if (emitEvent) {
+      this._statusChanges.emit(this._status);
+    }
+
+    if (isPresent(this._parent)) {
+      this._parent._updateControlsErrors();
+    }
+  }
+
+  find(path: Array<string|number>|string): AbstractControl { return _find(this, path); }
+
+  getError(errorCode: string, path: string[] = null): any {
+    var control = isPresent(path) && !ListWrapper.isEmpty(path) ? this.find(path) : this;
+    if (isPresent(control) && isPresent(control._errors)) {
+      return StringMapWrapper.get(control._errors, errorCode);
+    } else {
+      return null;
+    }
+  }
+
+  hasError(errorCode: string, path: string[] = null): boolean {
+    return isPresent(this.getError(errorCode, path));
+  }
+
+  get root(): AbstractControl {
+    let x: AbstractControl = this;
+
+    while (isPresent(x._parent)) {
+      x = x._parent;
+    }
+
+    return x;
+  }
+
+  /** @internal */
+  _updateControlsErrors(): void {
+    this._status = this._calculateStatus();
+
+    if (isPresent(this._parent)) {
+      this._parent._updateControlsErrors();
+    }
+  }
+
+  /** @internal */
+  _initObservables() {
+    this._valueChanges = new EventEmitter();
+    this._statusChanges = new EventEmitter();
+  }
+
+
+  private _calculateStatus(): string {
+    if (isPresent(this._errors)) return INVALID;
+    if (this._anyControlsHaveStatus(PENDING)) return PENDING;
+    if (this._anyControlsHaveStatus(INVALID)) return INVALID;
+    return VALID;
+  }
+
+  /** @internal */
+  abstract _updateValue(): void;
+
+  /** @internal */
+  abstract _anyControlsHaveStatus(status: string): boolean;
+}
+
+/**
+ * Defines a part of a form that cannot be divided into other controls. `Control`s have values and
+ * validation state, which is determined by an optional validation function.
+ *
+ * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+ * with {@link ControlGroup} and {@link ControlArray}.
+ *
+ * ## Usage
+ *
+ * By default, a `Control` is created for every `<input>` or other form component.
+ * With {@link NgFormControl} or {@link NgFormModel} an existing {@link Control} can be
+ * bound to a DOM element instead. This `Control` can be configured with a custom
+ * validation function.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+ *
+ * @experimental
+ */
+export class Control extends AbstractControl {
+  /** @internal */
+  _onChange: Function;
+
+  constructor(
+      value: any = null, validator: ValidatorFn = null, asyncValidator: AsyncValidatorFn = null) {
+    super(validator, asyncValidator);
+    this._value = value;
+    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
+    this._initObservables();
+  }
+
+  /**
+   * Set the value of the control to `value`.
+   *
+   * If `onlySelf` is `true`, this change will only affect the validation of this `Control`
+   * and not its parent component. If `emitEvent` is `true`, this change will cause a
+   * `valueChanges` event on the `Control` to be emitted. Both of these options default to
+   * `false`.
+   *
+   * If `emitModelToViewChange` is `true`, the view will be notified about the new value
+   * via an `onChange` event. This is the default behavior if `emitModelToViewChange` is not
+   * specified.
+   */
+  updateValue(value: any, {onlySelf, emitEvent, emitModelToViewChange}: {
+    onlySelf?: boolean,
+    emitEvent?: boolean,
+    emitModelToViewChange?: boolean
+  } = {}): void {
+    emitModelToViewChange = isPresent(emitModelToViewChange) ? emitModelToViewChange : true;
+    this._value = value;
+    if (isPresent(this._onChange) && emitModelToViewChange) this._onChange(this._value);
+    this.updateValueAndValidity({onlySelf: onlySelf, emitEvent: emitEvent});
+  }
+
+  /**
+   * @internal
+   */
+  _updateValue() {}
+
+  /**
+   * @internal
+   */
+  _anyControlsHaveStatus(status: string): boolean { return false; }
+
+  /**
+   * Register a listener for change events.
+   */
+  registerOnChange(fn: Function): void { this._onChange = fn; }
+}
+
+/**
+ * Defines a part of a form, of fixed length, that can contain other controls.
+ *
+ * A `ControlGroup` aggregates the values of each {@link Control} in the group.
+ * The status of a `ControlGroup` depends on the status of its children.
+ * If one of the controls in a group is invalid, the entire group is invalid.
+ * Similarly, if a control changes its value, the entire group changes as well.
+ *
+ * `ControlGroup` is one of the three fundamental building blocks used to define forms in Angular,
+ * along with {@link Control} and {@link ControlArray}. {@link ControlArray} can also contain other
+ * controls, but is of variable length.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+ *
+ * @experimental
+ */
+export class ControlGroup extends AbstractControl {
+  private _optionals: {[key: string]: boolean};
+
+  constructor(
+      public controls: {[key: string]: AbstractControl}, optionals: {[key: string]: boolean} = null,
+      validator: ValidatorFn = null, asyncValidator: AsyncValidatorFn = null) {
+    super(validator, asyncValidator);
+    this._optionals = isPresent(optionals) ? optionals : {};
+    this._initObservables();
+    this._setParentForControls();
+    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
+  }
+
+  /**
+   * Register a control with the group's list of controls.
+   */
+  registerControl(name: string, control: AbstractControl): void {
+    this.controls[name] = control;
+    control.setParent(this);
+  }
+
+  /**
+   * Add a control to this group.
+   */
+  addControl(name: string, control: AbstractControl): void {
+    this.registerControl(name, control);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Remove a control from this group.
+   */
+  removeControl(name: string): void {
+    StringMapWrapper.delete(this.controls, name);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Mark the named control as non-optional.
+   */
+  include(controlName: string): void {
+    StringMapWrapper.set(this._optionals, controlName, true);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Mark the named control as optional.
+   */
+  exclude(controlName: string): void {
+    StringMapWrapper.set(this._optionals, controlName, false);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Check whether there is a control with the given name in the group.
+   */
+  contains(controlName: string): boolean {
+    var c = StringMapWrapper.contains(this.controls, controlName);
+    return c && this._included(controlName);
+  }
+
+  /** @internal */
+  _setParentForControls() {
+    StringMapWrapper.forEach(
+        this.controls, (control: AbstractControl, name: string) => { control.setParent(this); });
+  }
+
+  /** @internal */
+  _updateValue() { this._value = this._reduceValue(); }
+
+  /** @internal */
+  _anyControlsHaveStatus(status: string): boolean {
+    var res = false;
+    StringMapWrapper.forEach(this.controls, (control: AbstractControl, name: string) => {
+      res = res || (this.contains(name) && control.status == status);
+    });
+    return res;
+  }
+
+  /** @internal */
+  _reduceValue() {
+    return this._reduceChildren(
+        {}, (acc: {[k: string]: AbstractControl}, control: AbstractControl, name: string) => {
+          acc[name] = control.value;
+          return acc;
+        });
+  }
+
+  /** @internal */
+  _reduceChildren(initValue: any, fn: Function) {
+    var res = initValue;
+    StringMapWrapper.forEach(this.controls, (control: AbstractControl, name: string) => {
+      if (this._included(name)) {
+        res = fn(res, control, name);
+      }
+    });
+    return res;
+  }
+
+  /** @internal */
+  _included(controlName: string): boolean {
+    var isOptional = StringMapWrapper.contains(this._optionals, controlName);
+    return !isOptional || StringMapWrapper.get(this._optionals, controlName);
+  }
+}
+
+/**
+ * Defines a part of a form, of variable length, that can contain other controls.
+ *
+ * A `ControlArray` aggregates the values of each {@link Control} in the group.
+ * The status of a `ControlArray` depends on the status of its children.
+ * If one of the controls in a group is invalid, the entire array is invalid.
+ * Similarly, if a control changes its value, the entire array changes as well.
+ *
+ * `ControlArray` is one of the three fundamental building blocks used to define forms in Angular,
+ * along with {@link Control} and {@link ControlGroup}. {@link ControlGroup} can also contain
+ * other controls, but is of fixed length.
+ *
+ * ## Adding or removing controls
+ *
+ * To change the controls in the array, use the `push`, `insert`, or `removeAt` methods
+ * in `ControlArray` itself. These methods ensure the controls are properly tracked in the
+ * form's hierarchy. Do not modify the array of `AbstractControl`s used to instantiate
+ * the `ControlArray` directly, as that will result in strange and unexpected behavior such
+ * as broken change detection.
+ *
+ * ### Example ([live demo](http://plnkr.co/edit/23DESOpbNnBpBHZt1BR4?p=preview))
+ *
+ * @experimental
+ */
+export class ControlArray extends AbstractControl {
+  constructor(
+      public controls: AbstractControl[], validator: ValidatorFn = null,
+      asyncValidator: AsyncValidatorFn = null) {
+    super(validator, asyncValidator);
+    this._initObservables();
+    this._setParentForControls();
+    this.updateValueAndValidity({onlySelf: true, emitEvent: false});
+  }
+
+  /**
+   * Get the {@link AbstractControl} at the given `index` in the array.
+   */
+  at(index: number): AbstractControl { return this.controls[index]; }
+
+  /**
+   * Insert a new {@link AbstractControl} at the end of the array.
+   */
+  push(control: AbstractControl): void {
+    this.controls.push(control);
+    control.setParent(this);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Insert a new {@link AbstractControl} at the given `index` in the array.
+   */
+  insert(index: number, control: AbstractControl): void {
+    ListWrapper.insert(this.controls, index, control);
+    control.setParent(this);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Remove the control at the given `index` in the array.
+   */
+  removeAt(index: number): void {
+    ListWrapper.removeAt(this.controls, index);
+    this.updateValueAndValidity();
+  }
+
+  /**
+   * Length of the control array.
+   */
+  get length(): number { return this.controls.length; }
+
+  /** @internal */
+  _updateValue(): void { this._value = this.controls.map((control) => control.value); }
+
+  /** @internal */
+  _anyControlsHaveStatus(status: string): boolean {
+    return this.controls.some(c => c.status == status);
+  }
+
+
+  /** @internal */
+  _setParentForControls(): void {
+    this.controls.forEach((control) => { control.setParent(this); });
+  }
+}

modules/@angular/common/src/forms-deprecated/validators.ts

@@ -0,0 +1,155 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {OpaqueToken} from '@angular/core';
+import {toPromise} from 'rxjs/operator/toPromise';
+
+import {StringMapWrapper} from '../facade/collection';
+import {isBlank, isPresent, isPromise, isString} from '../facade/lang';
+
+import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
+import {AbstractControl} from './model';
+
+
+/**
+ * Providers for validators to be used for {@link Control}s in a form.
+ *
+ * Provide this using `multi: true` to add validators.
+ *
+ * ### Example
+ *
+ * {@example core/forms/ts/ng_validators/ng_validators.ts region='ng_validators'}
+ * @experimental
+ */
+export const NG_VALIDATORS: OpaqueToken = new OpaqueToken('NgValidators');
+
+/**
+ * Providers for asynchronous validators to be used for {@link Control}s
+ * in a form.
+ *
+ * Provide this using `multi: true` to add validators.
+ *
+ * See {@link NG_VALIDATORS} for more details.
+ *
+ * @experimental
+ */
+export const NG_ASYNC_VALIDATORS: OpaqueToken = new OpaqueToken('NgAsyncValidators');
+
+/**
+ * Provides a set of validators used by form controls.
+ *
+ * A validator is a function that processes a {@link Control} or collection of
+ * controls and returns a map of errors. A null map means that validation has passed.
+ *
+ * ### Example
+ *
+ * ```typescript
+ * var loginControl = new Control("", Validators.required)
+ * ```
+ *
+ * @experimental
+ */
+export class Validators {
+  /**
+   * Validator that requires controls to have a non-empty value.
+   */
+  static required(control: AbstractControl): {[key: string]: boolean} {
+    return isBlank(control.value) || (isString(control.value) && control.value == '') ?
+        {'required': true} :
+        null;
+  }
+
+  /**
+   * Validator that requires controls to have a value of a minimum length.
+   */
+  static minLength(minLength: number): ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} => {
+      if (isPresent(Validators.required(control))) return null;
+      var v: string = control.value;
+      return v.length < minLength ?
+          {'minlength': {'requiredLength': minLength, 'actualLength': v.length}} :
+          null;
+    };
+  }
+
+  /**
+   * Validator that requires controls to have a value of a maximum length.
+   */
+  static maxLength(maxLength: number): ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} => {
+      if (isPresent(Validators.required(control))) return null;
+      var v: string = control.value;
+      return v.length > maxLength ?
+          {'maxlength': {'requiredLength': maxLength, 'actualLength': v.length}} :
+          null;
+    };
+  }
+
+  /**
+   * Validator that requires a control to match a regex to its value.
+   */
+  static pattern(pattern: string): ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} => {
+      if (isPresent(Validators.required(control))) return null;
+      let regex = new RegExp(`^${pattern}$`);
+      let v: string = control.value;
+      return regex.test(v) ? null :
+                             {'pattern': {'requiredPattern': `^${pattern}$`, 'actualValue': v}};
+    };
+  }
+
+  /**
+   * No-op validator.
+   */
+  static nullValidator(c: AbstractControl): {[key: string]: boolean} { return null; }
+
+  /**
+   * Compose multiple validators into a single function that returns the union
+   * of the individual error maps.
+   */
+  static compose(validators: ValidatorFn[]): ValidatorFn {
+    if (isBlank(validators)) return null;
+    var presentValidators = validators.filter(isPresent);
+    if (presentValidators.length == 0) return null;
+
+    return function(control: AbstractControl) {
+      return _mergeErrors(_executeValidators(control, presentValidators));
+    };
+  }
+
+  static composeAsync(validators: AsyncValidatorFn[]): AsyncValidatorFn {
+    if (isBlank(validators)) return null;
+    var presentValidators = validators.filter(isPresent);
+    if (presentValidators.length == 0) return null;
+
+    return function(control: AbstractControl) {
+      let promises = _executeAsyncValidators(control, presentValidators).map(_convertToPromise);
+      return Promise.all(promises).then(_mergeErrors);
+    };
+  }
+}
+
+function _convertToPromise(obj: any): Promise<any> {
+  return isPromise(obj) ? obj : toPromise.call(obj);
+}
+
+function _executeValidators(control: AbstractControl, validators: ValidatorFn[]): any[] {
+  return validators.map(v => v(control));
+}
+
+function _executeAsyncValidators(control: AbstractControl, validators: AsyncValidatorFn[]): any[] {
+  return validators.map(v => v(control));
+}
+
+function _mergeErrors(arrayOfErrors: any[]): {[key: string]: any} {
+  var res: {[key: string]: any} =
+      arrayOfErrors.reduce((res: {[key: string]: any}, errors: {[key: string]: any}) => {
+        return isPresent(errors) ? StringMapWrapper.merge(res, errors) : res;
+      }, {});
+  return StringMapWrapper.isEmpty(res) ? null : res;
+}

modules/@angular/common/src/localization.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @experimental
+ */
+export abstract class NgLocalization { abstract getPluralCategory(value: any): string; }
+
+/**
+ * Returns the plural category for a given value.
+ * - "=value" when the case exists,
+ * - the plural category otherwise
+ *
+ * @internal
+ */
+export function getPluralCategory(
+    value: number, cases: string[], ngLocalization: NgLocalization): string {
+  const nbCase = `=${value}`;
+
+  return cases.indexOf(nbCase) > -1 ? nbCase : ngLocalization.getPluralCategory(value);
+}

modules/@angular/common/src/location.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './location/platform_location';
+export * from './location/location_strategy';
+export * from './location/hash_location_strategy';
+export * from './location/path_location_strategy';
+export * from './location/location';

modules/@angular/common/src/location/hash_location_strategy.ts

@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Inject, Injectable, Optional} from '@angular/core';
+
+import {isPresent} from '../facade/lang';
+
+import {Location} from './location';
+import {APP_BASE_HREF, LocationStrategy} from './location_strategy';
+import {PlatformLocation, UrlChangeListener} from './platform_location';
+
+
+
+/**
+ * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the
+ * {@link Location} service to represent its state in the
+ * [hash fragment](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax)
+ * of the browser's URL.
+ *
+ * For instance, if you call `location.go('/foo')`, the browser's URL will become
+ * `example.com#/foo`.
+ *
+ * ### Example
+ *
+ * ```
+ * import {Component, provide} from '@angular/core';
+ * import {
+ *   Location,
+ *   LocationStrategy,
+ *   HashLocationStrategy
+ * } from '@angular/common';
+ * import {
+ *   ROUTER_DIRECTIVES,
+ *   ROUTER_PROVIDERS,
+ *   RouteConfig
+ * } from '@angular/router';
+ *
+ * @Component({directives: [ROUTER_DIRECTIVES]})
+ * @RouteConfig([
+ *  {...},
+ * ])
+ * class AppCmp {
+ *   constructor(location: Location) {
+ *     location.go('/foo');
+ *   }
+ * }
+ *
+ * bootstrap(AppCmp, [
+ *   ROUTER_PROVIDERS,
+ *   {provide: LocationStrategy, useClass: HashLocationStrategy}
+ * ]);
+ * ```
+ *
+ * @stable
+ */
+@Injectable()
+export class HashLocationStrategy extends LocationStrategy {
+  private _baseHref: string = '';
+  constructor(
+      private _platformLocation: PlatformLocation,
+      @Optional() @Inject(APP_BASE_HREF) _baseHref?: string) {
+    super();
+    if (isPresent(_baseHref)) {
+      this._baseHref = _baseHref;
+    }
+  }
+
+  onPopState(fn: UrlChangeListener): void {
+    this._platformLocation.onPopState(fn);
+    this._platformLocation.onHashChange(fn);
+  }
+
+  getBaseHref(): string { return this._baseHref; }
+
+  path(includeHash: boolean = false): string {
+    // the hash value is always prefixed with a `#`
+    // and if it is empty then it will stay empty
+    var path = this._platformLocation.hash;
+    if (!isPresent(path)) path = '#';
+
+    return path.length > 0 ? path.substring(1) : path;
+  }
+
+  prepareExternalUrl(internal: string): string {
+    var url = Location.joinWithSlash(this._baseHref, internal);
+    return url.length > 0 ? ('#' + url) : url;
+  }
+
+  pushState(state: any, title: string, path: string, queryParams: string) {
+    var url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
+    if (url.length == 0) {
+      url = this._platformLocation.pathname;
+    }
+    this._platformLocation.pushState(state, title, url);
+  }
+
+  replaceState(state: any, title: string, path: string, queryParams: string) {
+    var url = this.prepareExternalUrl(path + Location.normalizeQueryParams(queryParams));
+    if (url.length == 0) {
+      url = this._platformLocation.pathname;
+    }
+    this._platformLocation.replaceState(state, title, url);
+  }
+
+  forward(): void { this._platformLocation.forward(); }
+
+  back(): void { this._platformLocation.back(); }
+}

modules/@angular/common/src/location/location.ts

@@ -0,0 +1,205 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {EventEmitter, Injectable} from '@angular/core';
+
+import {LocationStrategy} from './location_strategy';
+
+
+/**
+ * `Location` is a service that applications can use to interact with a browser's URL.
+ * Depending on which {@link LocationStrategy} is used, `Location` will either persist
+ * to the URL's path or the URL's hash segment.
+ *
+ * Note: it's better to use {@link Router#navigate} service to trigger route changes. Use
+ * `Location` only if you need to interact with or create normalized URLs outside of
+ * routing.
+ *
+ * `Location` is responsible for normalizing the URL against the application's base href.
+ * A normalized URL is absolute from the URL host, includes the application's base href, and has no
+ * trailing slash:
+ * - `/my/app/user/123` is normalized
+ * - `my/app/user/123` **is not** normalized
+ * - `/my/app/user/123/` **is not** normalized
+ *
+ * ### Example
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {Location} from '@angular/common';
+ * import {
+ *   ROUTER_DIRECTIVES,
+ *   ROUTER_PROVIDERS,
+ *   RouteConfig
+ * } from '@angular/router';
+ *
+ * @Component({directives: [ROUTER_DIRECTIVES]})
+ * @RouteConfig([
+ *  {...},
+ * ])
+ * class AppCmp {
+ *   constructor(location: Location) {
+ *     location.go('/foo');
+ *   }
+ * }
+ *
+ * bootstrap(AppCmp, [ROUTER_PROVIDERS]);
+ * ```
+ *
+ * @stable
+ */
+@Injectable()
+export class Location {
+  /** @internal */
+  _subject: EventEmitter<any> = new EventEmitter();
+  /** @internal */
+  _baseHref: string;
+
+  /** @internal */
+  _platformStrategy: LocationStrategy;
+
+  constructor(platformStrategy: LocationStrategy) {
+    this._platformStrategy = platformStrategy;
+    var browserBaseHref = this._platformStrategy.getBaseHref();
+    this._baseHref = Location.stripTrailingSlash(_stripIndexHtml(browserBaseHref));
+    this._platformStrategy.onPopState(
+        (ev) => { this._subject.emit({'url': this.path(true), 'pop': true, 'type': ev.type}); });
+  }
+
+  /**
+   * Returns the normalized URL path.
+   */
+  // TODO: vsavkin. Remove the boolean flag and always include hash once the deprecated router is
+  // removed.
+  path(includeHash: boolean = false): string {
+    return this.normalize(this._platformStrategy.path(includeHash));
+  }
+
+  /**
+   * Normalizes the given path and compares to the current normalized path.
+   */
+  isCurrentPathEqualTo(path: string, query: string = ''): boolean {
+    return this.path() == this.normalize(path + Location.normalizeQueryParams(query));
+  }
+
+  /**
+   * Given a string representing a URL, returns the normalized URL path without leading or
+   * trailing slashes
+   */
+  normalize(url: string): string {
+    return Location.stripTrailingSlash(_stripBaseHref(this._baseHref, _stripIndexHtml(url)));
+  }
+
+  /**
+   * Given a string representing a URL, returns the platform-specific external URL path.
+   * If the given URL doesn't begin with a leading slash (`'/'`), this method adds one
+   * before normalizing. This method will also add a hash if `HashLocationStrategy` is
+   * used, or the `APP_BASE_HREF` if the `PathLocationStrategy` is in use.
+   */
+  prepareExternalUrl(url: string): string {
+    if (url.length > 0 && !url.startsWith('/')) {
+      url = '/' + url;
+    }
+    return this._platformStrategy.prepareExternalUrl(url);
+  }
+
+  // TODO: rename this method to pushState
+  /**
+   * Changes the browsers URL to the normalized version of the given URL, and pushes a
+   * new item onto the platform's history.
+   */
+  go(path: string, query: string = ''): void {
+    this._platformStrategy.pushState(null, '', path, query);
+  }
+
+  /**
+   * Changes the browsers URL to the normalized version of the given URL, and replaces
+   * the top item on the platform's history stack.
+   */
+  replaceState(path: string, query: string = ''): void {
+    this._platformStrategy.replaceState(null, '', path, query);
+  }
+
+  /**
+   * Navigates forward in the platform's history.
+   */
+  forward(): void { this._platformStrategy.forward(); }
+
+  /**
+   * Navigates back in the platform's history.
+   */
+  back(): void { this._platformStrategy.back(); }
+
+  /**
+   * Subscribe to the platform's `popState` events.
+   */
+  subscribe(
+      onNext: (value: any) => void, onThrow: (exception: any) => void = null,
+      onReturn: () => void = null): Object {
+    return this._subject.subscribe({next: onNext, error: onThrow, complete: onReturn});
+  }
+
+  /**
+   * Given a string of url parameters, prepend with '?' if needed, otherwise return parameters as
+   * is.
+   */
+  public static normalizeQueryParams(params: string): string {
+    return (params.length > 0 && params.substring(0, 1) != '?') ? ('?' + params) : params;
+  }
+
+  /**
+   * Given 2 parts of a url, join them with a slash if needed.
+   */
+  public static joinWithSlash(start: string, end: string): string {
+    if (start.length == 0) {
+      return end;
+    }
+    if (end.length == 0) {
+      return start;
+    }
+    var slashes = 0;
+    if (start.endsWith('/')) {
+      slashes++;
+    }
+    if (end.startsWith('/')) {
+      slashes++;
+    }
+    if (slashes == 2) {
+      return start + end.substring(1);
+    }
+    if (slashes == 1) {
+      return start + end;
+    }
+    return start + '/' + end;
+  }
+
+  /**
+   * If url has a trailing slash, remove it, otherwise return url as is.
+   */
+  public static stripTrailingSlash(url: string): string {
+    if (/\/$/g.test(url)) {
+      url = url.substring(0, url.length - 1);
+    }
+    return url;
+  }
+}
+
+function _stripBaseHref(baseHref: string, url: string): string {
+  if (baseHref.length > 0 && url.startsWith(baseHref)) {
+    return url.substring(baseHref.length);
+  }
+  return url;
+}
+
+function _stripIndexHtml(url: string): string {
+  if (/\/index.html$/g.test(url)) {
+    // '/index.html'.length == 11
+    return url.substring(0, url.length - 11);
+  }
+  return url;
+}

modules/@angular/common/src/location/location_strategy.ts

@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {OpaqueToken} from '@angular/core';
+import {UrlChangeListener} from './platform_location';
+
+/**
+ * `LocationStrategy` is responsible for representing and reading route state
+ * from the browser's URL. Angular provides two strategies:
+ * {@link HashLocationStrategy} and {@link PathLocationStrategy} (default).
+ *
+ * This is used under the hood of the {@link Location} service.
+ *
+ * Applications should use the {@link Router} or {@link Location} services to
+ * interact with application route state.
+ *
+ * For instance, {@link HashLocationStrategy} produces URLs like
+ * `http://example.com#/foo`, and {@link PathLocationStrategy} produces
+ * `http://example.com/foo` as an equivalent URL.
+ *
+ * See these two classes for more.
+ *
+ * @stable
+ */
+export abstract class LocationStrategy {
+  abstract path(includeHash?: boolean): string;
+  abstract prepareExternalUrl(internal: string): string;
+  abstract pushState(state: any, title: string, url: string, queryParams: string): void;
+  abstract replaceState(state: any, title: string, url: string, queryParams: string): void;
+  abstract forward(): void;
+  abstract back(): void;
+  abstract onPopState(fn: UrlChangeListener): void;
+  abstract getBaseHref(): string;
+}
+
+
+/**
+ * The `APP_BASE_HREF` token represents the base href to be used with the
+ * {@link PathLocationStrategy}.
+ *
+ * If you're using {@link PathLocationStrategy}, you must provide a provider to a string
+ * representing the URL prefix that should be preserved when generating and recognizing
+ * URLs.
+ *
+ * ### Example
+ *
+ * ```
+ * import {Component} from '@angular/core';
+ * import {ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouteConfig} from '@angular/router';
+ * import {APP_BASE_HREF} from '@angular/common';
+ *
+ * @Component({directives: [ROUTER_DIRECTIVES]})
+ * @RouteConfig([
+ *  {...},
+ * ])
+ * class AppCmp {
+ *   // ...
+ * }
+ *
+ * bootstrap(AppCmp, [
+ *   ROUTER_PROVIDERS,
+ *   {provide: APP_BASE_HREF, useValue: '/my/app'}
+ * ]);
+ * ```
+ * @stable
+ */
+export const APP_BASE_HREF: OpaqueToken = new OpaqueToken('appBaseHref');

modules/@angular/common/src/location/path_location_strategy.ts

@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Inject, Injectable, Optional} from '@angular/core';
+
+import {BaseException} from '../facade/exceptions';
+import {isBlank} from '../facade/lang';
+
+import {Location} from './location';
+import {APP_BASE_HREF, LocationStrategy} from './location_strategy';
+import {PlatformLocation, UrlChangeListener} from './platform_location';
+
+
+/**
+ * `PathLocationStrategy` is a {@link LocationStrategy} used to configure the
+ * {@link Location} service to represent its state in the
+ * [path](https://en.wikipedia.org/wiki/Uniform_Resource_Locator#Syntax) of the
+ * browser's URL.
+ *
+ * `PathLocationStrategy` is the default binding for {@link LocationStrategy}
+ * provided in {@link ROUTER_PROVIDERS}.
+ *
+ * If you're using `PathLocationStrategy`, you must provide a {@link APP_BASE_HREF}
+ * or add a base element to the document. This URL prefix that will be preserved
+ * when generating and recognizing URLs.
+ *
+ * For instance, if you provide an `APP_BASE_HREF` of `'/my/app'` and call
+ * `location.go('/foo')`, the browser's URL will become
+ * `example.com/my/app/foo`.
+ *
+ * Similarly, if you add `<base href='/my/app'/>` to the document and call
+ * `location.go('/foo')`, the browser's URL will become
+ * `example.com/my/app/foo`.
+ *
+ * @stable
+ */
+@Injectable()
+export class PathLocationStrategy extends LocationStrategy {
+  private _baseHref: string;
+
+  constructor(
+      private _platformLocation: PlatformLocation,
+      @Optional() @Inject(APP_BASE_HREF) href?: string) {
+    super();
+
+    if (isBlank(href)) {
+      href = this._platformLocation.getBaseHrefFromDOM();
+    }
+
+    if (isBlank(href)) {
+      throw new BaseException(
+          `No base href set. Please provide a value for the APP_BASE_HREF token or add a base element to the document.`);
+    }
+
+    this._baseHref = href;
+  }
+
+  onPopState(fn: UrlChangeListener): void {
+    this._platformLocation.onPopState(fn);
+    this._platformLocation.onHashChange(fn);
+  }
+
+  getBaseHref(): string { return this._baseHref; }
+
+  prepareExternalUrl(internal: string): string {
+    return Location.joinWithSlash(this._baseHref, internal);
+  }
+
+  path(includeHash: boolean = false): string {
+    const pathname = this._platformLocation.pathname +
+        Location.normalizeQueryParams(this._platformLocation.search);
+    const hash = this._platformLocation.hash;
+    return hash && includeHash ? `${pathname}${hash}` : pathname;
+  }
+
+  pushState(state: any, title: string, url: string, queryParams: string) {
+    var externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
+    this._platformLocation.pushState(state, title, externalUrl);
+  }
+
+  replaceState(state: any, title: string, url: string, queryParams: string) {
+    var externalUrl = this.prepareExternalUrl(url + Location.normalizeQueryParams(queryParams));
+    this._platformLocation.replaceState(state, title, externalUrl);
+  }
+
+  forward(): void { this._platformLocation.forward(); }
+
+  back(): void { this._platformLocation.back(); }
+}

modules/@angular/common/src/location/platform_location.ts

@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * This class should not be used directly by an application developer. Instead, use
+ * {@link Location}.
+ *
+ * `PlatformLocation` encapsulates all calls to DOM apis, which allows the Router to be platform
+ * agnostic.
+ * This means that we can have different implementation of `PlatformLocation` for the different
+ * platforms
+ * that angular supports. For example, the default `PlatformLocation` is {@link
+ * BrowserPlatformLocation},
+ * however when you run your app in a WebWorker you use {@link WebWorkerPlatformLocation}.
+ *
+ * The `PlatformLocation` class is used directly by all implementations of {@link LocationStrategy}
+ * when
+ * they need to interact with the DOM apis like pushState, popState, etc...
+ *
+ * {@link LocationStrategy} in turn is used by the {@link Location} service which is used directly
+ * by
+ * the {@link Router} in order to navigate between routes. Since all interactions between {@link
+ * Router} /
+ * {@link Location} / {@link LocationStrategy} and DOM apis flow through the `PlatformLocation`
+ * class
+ * they are all platform independent.
+ *
+ * @stable
+ */
+export abstract class PlatformLocation {
+  abstract getBaseHrefFromDOM(): string;
+  abstract onPopState(fn: UrlChangeListener): void;
+  abstract onHashChange(fn: UrlChangeListener): void;
+
+  get pathname(): string { return null; }
+  get search(): string { return null; }
+  get hash(): string { return null; }
+
+  abstract replaceState(state: any, title: string, url: string): void;
+
+  abstract pushState(state: any, title: string, url: string): void;
+
+  abstract forward(): void;
+
+  abstract back(): void;
+}
+
+/**
+ * A serializable version of the event from onPopState or onHashChange
+ *
+ * @experimental
+ */
+export interface UrlChangeEvent { type: string; }
+
+/**
+ * @experimental
+ */
+export interface UrlChangeListener { (e: UrlChangeEvent): any; }

modules/@angular/common/src/pipes.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * This module provides a set of common Pipes.
+ */
+
+export {AsyncPipe} from './pipes/async_pipe';
+export {COMMON_PIPES} from './pipes/common_pipes';
+export {DatePipe} from './pipes/date_pipe';
+export {I18nPluralPipe} from './pipes/i18n_plural_pipe';
+export {I18nSelectPipe} from './pipes/i18n_select_pipe';
+export {JsonPipe} from './pipes/json_pipe';
+export {LowerCasePipe} from './pipes/lowercase_pipe';
+export {CurrencyPipe, DecimalPipe, PercentPipe} from './pipes/number_pipe';
+export {ReplacePipe} from './pipes/replace_pipe';
+export {SlicePipe} from './pipes/slice_pipe';
+export {UpperCasePipe} from './pipes/uppercase_pipe';

modules/@angular/common/src/pipes/async_pipe.ts

@@ -0,0 +1,151 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {ChangeDetectorRef, OnDestroy, Pipe, WrappedValue} from '@angular/core';
+import {EventEmitter, Observable} from '../facade/async';
+import {isBlank, isPresent, isPromise} from '../facade/lang';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+interface SubscriptionStrategy {
+  createSubscription(async: any, updateLatestValue: any): any;
+  dispose(subscription: any): void;
+  onDestroy(subscription: any): void;
+}
+
+class ObservableStrategy implements SubscriptionStrategy {
+  createSubscription(async: any, updateLatestValue: any): any {
+    return async.subscribe({next: updateLatestValue, error: (e: any) => { throw e; }});
+  }
+
+  dispose(subscription: any): void { subscription.unsubscribe(); }
+
+  onDestroy(subscription: any): void { subscription.unsubscribe(); }
+}
+
+class PromiseStrategy implements SubscriptionStrategy {
+  createSubscription(async: Promise<any>, updateLatestValue: (v: any) => any): any {
+    return async.then(updateLatestValue, e => { throw e; });
+  }
+
+  dispose(subscription: any): void {}
+
+  onDestroy(subscription: any): void {}
+}
+
+var _promiseStrategy = new PromiseStrategy();
+var _observableStrategy = new ObservableStrategy();
+var __unused: Promise<any>;  // avoid unused import when Promise union types are erased
+
+/**
+ * The `async` pipe subscribes to an `Observable` or `Promise` and returns the latest value it has
+ * emitted.
+ * When a new value is emitted, the `async` pipe marks the component to be checked for changes.
+ * When the component gets destroyed, the `async` pipe unsubscribes automatically to avoid
+ * potential memory leaks.
+ *
+ * ## Usage
+ *
+ *     object | async
+ *
+ * where `object` is of type `Observable` or of type `Promise`.
+ *
+ * ## Examples
+ *
+ * This example binds a `Promise` to the view. Clicking the `Resolve` button resolves the
+ * promise.
+ *
+ * {@example core/pipes/ts/async_pipe/async_pipe_example.ts region='AsyncPipePromise'}
+ *
+ * It's also possible to use `async` with Observables. The example below binds the `time` Observable
+ * to the view. Every 500ms, the `time` Observable updates the view with the current time.
+ *
+ * {@example core/pipes/ts/async_pipe/async_pipe_example.ts region='AsyncPipeObservable'}
+ *
+ * @stable
+ */
+@Pipe({name: 'async', pure: false})
+export class AsyncPipe implements OnDestroy {
+  /** @internal */
+  _latestValue: Object = null;
+  /** @internal */
+  _latestReturnedValue: Object = null;
+
+  /** @internal */
+  _subscription: Object = null;
+  /** @internal */
+  _obj: Observable<any>|Promise<any>|EventEmitter<any> = null;
+  /** @internal */
+  _ref: ChangeDetectorRef;
+  private _strategy: SubscriptionStrategy = null;
+
+  constructor(_ref: ChangeDetectorRef) { this._ref = _ref; }
+
+  ngOnDestroy(): void {
+    if (isPresent(this._subscription)) {
+      this._dispose();
+    }
+  }
+
+  transform(obj: Observable<any>|Promise<any>|EventEmitter<any>): any {
+    if (isBlank(this._obj)) {
+      if (isPresent(obj)) {
+        this._subscribe(obj);
+      }
+      this._latestReturnedValue = this._latestValue;
+      return this._latestValue;
+    }
+
+    if (obj !== this._obj) {
+      this._dispose();
+      return this.transform(obj);
+    }
+
+    if (this._latestValue === this._latestReturnedValue) {
+      return this._latestReturnedValue;
+    } else {
+      this._latestReturnedValue = this._latestValue;
+      return WrappedValue.wrap(this._latestValue);
+    }
+  }
+
+  /** @internal */
+  _subscribe(obj: Observable<any>|Promise<any>|EventEmitter<any>): void {
+    this._obj = obj;
+    this._strategy = this._selectStrategy(obj);
+    this._subscription = this._strategy.createSubscription(
+        obj, (value: Object) => this._updateLatestValue(obj, value));
+  }
+
+  /** @internal */
+  _selectStrategy(obj: Observable<any>|Promise<any>|EventEmitter<any>): any {
+    if (isPromise(obj)) {
+      return _promiseStrategy;
+    } else if ((<any>obj).subscribe) {
+      return _observableStrategy;
+    } else {
+      throw new InvalidPipeArgumentException(AsyncPipe, obj);
+    }
+  }
+
+  /** @internal */
+  _dispose(): void {
+    this._strategy.dispose(this._subscription);
+    this._latestValue = null;
+    this._latestReturnedValue = null;
+    this._subscription = null;
+    this._obj = null;
+  }
+
+  /** @internal */
+  _updateLatestValue(async: any, value: Object) {
+    if (async === this._obj) {
+      this._latestValue = value;
+      this._ref.markForCheck();
+    }
+  }
+}

modules/@angular/common/src/pipes/common_pipes.ts

@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * This module provides a set of common Pipes.
+ */
+import {AsyncPipe} from './async_pipe';
+import {DatePipe} from './date_pipe';
+import {I18nPluralPipe} from './i18n_plural_pipe';
+import {I18nSelectPipe} from './i18n_select_pipe';
+import {JsonPipe} from './json_pipe';
+import {LowerCasePipe} from './lowercase_pipe';
+import {CurrencyPipe, DecimalPipe, PercentPipe} from './number_pipe';
+import {ReplacePipe} from './replace_pipe';
+import {SlicePipe} from './slice_pipe';
+import {UpperCasePipe} from './uppercase_pipe';
+
+
+/**
+ * A collection of Angular core pipes that are likely to be used in each and every
+ * application.
+ *
+ * This collection can be used to quickly enumerate all the built-in pipes in the `pipes`
+ * property of the `@Component` decorator.
+ *
+ * @experimental Contains i18n pipes which are experimental
+ */
+export const COMMON_PIPES = [
+  AsyncPipe,
+  UpperCasePipe,
+  LowerCasePipe,
+  JsonPipe,
+  SlicePipe,
+  DecimalPipe,
+  PercentPipe,
+  CurrencyPipe,
+  DatePipe,
+  ReplacePipe,
+  I18nPluralPipe,
+  I18nSelectPipe,
+];

modules/@angular/common/src/pipes/date_pipe.ts

@@ -1,20 +1,17 @@
-import {
-  isDate,
-  isNumber,
-  isPresent,
-  Date,
-  DateWrapper,
-  CONST,
-  isBlank,
-  FunctionWrapper
-} from 'angular2/src/facade/lang';
-import {DateFormatter} from 'angular2/src/facade/intl';
-import {PipeTransform, WrappedValue, Pipe, Injectable} from 'angular2/core';
-import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
 
+import {Pipe, PipeTransform} from '@angular/core';
+import {StringMapWrapper} from '../facade/collection';
+import {DateFormatter} from '../facade/intl';
+import {DateWrapper, NumberWrapper, isBlank, isDate, isString} from '../facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
-
 // TODO: move to a global configurable location along with other i18n components.
 var defaultLocale: string = 'en-US';
 
@@ -33,8 +30,9 @@ var defaultLocale: string = 'en-US';
  *
  *     expression | date[:format]
  *
- * where `expression` is a date object or a number (milliseconds since UTC epoch) and
- * `format` indicates which date/time components to include:
+ * where `expression` is a date object or a number (milliseconds since UTC epoch) or an ISO string
+ * (https://www.w3.org/TR/NOTE-datetime) and `format` indicates which date/time components to
+ * include:
  *
  *  | Component | Symbol | Short Form   | Long Form         | Numeric   | 2-digit   |
  *  |-----------|:------:|--------------|-------------------|-----------|-----------|
@@ -53,9 +51,6 @@ var defaultLocale: string = 'en-US';
  *
  * In javascript, only the components specified will be respected (not the ordering,
  * punctuations, ...) and details of the formatting will be dependent on the locale.
- * On the other hand in Dart version, you can also include quoted text as well as some extra
- * date/time components such as quarter. For more information see:
- * https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/intl/intl.DateFormat.
  *
  * `format` can also be one of the following predefined formats:
  *
@@ -83,10 +78,10 @@ var defaultLocale: string = 'en-US';
  * ```
  *
  * {@example core/pipes/ts/date_pipe/date_pipe_example.ts region='DatePipe'}
+ *
+ * @experimental
  */
-@CONST()
 @Pipe({name: 'date', pure: true})
-@Injectable()
 export class DatePipe implements PipeTransform {
   /** @internal */
   static _ALIASES: {[key: string]: String} = {
@@ -101,16 +96,17 @@ export class DatePipe implements PipeTransform {
   };
 
 
-  transform(value: any, args: any[]): string {
+  transform(value: any, pattern: string = 'mediumDate'): string {
     if (isBlank(value)) return null;
 
     if (!this.supports(value)) {
       throw new InvalidPipeArgumentException(DatePipe, value);
     }
 
-    var pattern: string = isPresent(args) && args.length > 0 ? args[0] : 'mediumDate';
-    if (isNumber(value)) {
-      value = DateWrapper.fromMillis(value);
+    if (NumberWrapper.isNumeric(value)) {
+      value = DateWrapper.fromMillis(NumberWrapper.parseInt(value, 10));
+    } else if (isString(value)) {
+      value = DateWrapper.fromISOString(value);
     }
     if (StringMapWrapper.contains(DatePipe._ALIASES, pattern)) {
       pattern = <string>StringMapWrapper.get(DatePipe._ALIASES, pattern);
@@ -118,5 +114,13 @@ export class DatePipe implements PipeTransform {
     return DateFormatter.format(value, defaultLocale, pattern);
   }
 
-  supports(obj: any): boolean { return isDate(obj) || isNumber(obj); }
+  private supports(obj: any): boolean {
+    if (isDate(obj) || NumberWrapper.isNumeric(obj)) {
+      return true;
+    }
+    if (isString(obj) && isDate(DateWrapper.fromISOString(obj))) {
+      return true;
+    }
+    return false;
+  }
 }

modules/@angular/common/src/pipes/i18n_plural_pipe.ts

@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {StringWrapper, isBlank, isStringMap} from '../facade/lang';
+import {NgLocalization, getPluralCategory} from '../localization';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+const _INTERPOLATION_REGEXP: RegExp = /#/g;
+
+/**
+ *  Maps a value to a string that pluralizes the value properly.
+ *
+ *  ## Usage
+ *
+ *  expression | i18nPlural:mapping
+ *
+ *  where `expression` is a number and `mapping` is an object that mimics the ICU format,
+ *  see http://userguide.icu-project.org/formatparse/messages
+ *
+ *  ## Example
+ *
+ *  ```
+ *  class MyLocalization extends NgLocalization {
+ *    getPluralCategory(value: any) {
+ *      if(value > 1) {
+ *        return 'other';
+ *      }
+ *    }
+ *  }
+ *
+ *  @Component({
+ *    selector: 'app',
+ *    template: `
+ *      <div>
+ *        {{ messages.length | i18nPlural: messageMapping }}
+ *      </div>
+ *    `,
+ *    providers: [{provide: NgLocalization, useClass: MyLocalization}]
+ *  })
+ *
+ *  class MyApp {
+ *    messages: any[];
+ *    messageMapping: {[k:string]: string} = {
+ *      '=0': 'No messages.',
+ *      '=1': 'One message.',
+ *      'other': '# messages.'
+ *    }
+ *    ...
+ *  }
+ *  ```
+ *
+ * @experimental
+ */
+@Pipe({name: 'i18nPlural', pure: true})
+export class I18nPluralPipe implements PipeTransform {
+  constructor(private _localization: NgLocalization) {}
+
+  transform(value: number, pluralMap: {[count: string]: string}): string {
+    if (isBlank(value)) return '';
+
+    if (!isStringMap(pluralMap)) {
+      throw new InvalidPipeArgumentException(I18nPluralPipe, pluralMap);
+    }
+
+    const key = getPluralCategory(value, Object.keys(pluralMap), this._localization);
+
+    return StringWrapper.replaceAll(pluralMap[key], _INTERPOLATION_REGEXP, value.toString());
+  }
+}

modules/@angular/common/src/pipes/i18n_select_pipe.ts

@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {isBlank, isStringMap} from '../facade/lang';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+/**
+ *
+ *  Generic selector that displays the string that matches the current value.
+ *
+ *  ## Usage
+ *
+ *  expression | i18nSelect:mapping
+ *
+ *  where `mapping` is an object that indicates the text that should be displayed
+ *  for different values of the provided `expression`.
+ *
+ *  ## Example
+ *
+ *  ```
+ *  <div>
+ *    {{ gender | i18nSelect: inviteMap }}
+ *  </div>
+ *
+ *  class MyApp {
+ *    gender: string = 'male';
+ *    inviteMap: any = {
+ *      'male': 'Invite him.',
+ *      'female': 'Invite her.',
+ *      'other': 'Invite them.'
+ *    }
+ *    ...
+ *  }
+ *  ```
+ *
+ *  @experimental
+ */
+@Pipe({name: 'i18nSelect', pure: true})
+export class I18nSelectPipe implements PipeTransform {
+  transform(value: string, mapping: {[key: string]: string}): string {
+    if (isBlank(value)) return '';
+
+    if (!isStringMap(mapping)) {
+      throw new InvalidPipeArgumentException(I18nSelectPipe, mapping);
+    }
+
+    return mapping.hasOwnProperty(value) ? mapping[value] : '';
+  }
+}

modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {BaseException} from '../facade/exceptions';
+import {Type, stringify} from '../facade/lang';
+
+export class InvalidPipeArgumentException extends BaseException {
+  constructor(type: Type, value: Object) {
+    super(`Invalid argument '${value}' for pipe '${stringify(type)}'`);
+  }
+}

modules/@angular/common/src/pipes/json_pipe.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+
+import {Json} from '../facade/lang';
+
+
+
+/**
+ * Transforms any input value using `JSON.stringify`. Useful for debugging.
+ *
+ * ### Example
+ * {@example core/pipes/ts/json_pipe/json_pipe_example.ts region='JsonPipe'}
+ *
+ * @stable
+ */
+@Pipe({name: 'json', pure: false})
+export class JsonPipe implements PipeTransform {
+  transform(value: any): string { return Json.stringify(value); }
+}

modules/@angular/common/src/pipes/lowercase_pipe.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {isBlank, isString} from '../facade/lang';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+
+/**
+ * Transforms text to lowercase.
+ *
+ * ### Example
+ *
+ * {@example core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts region='LowerUpperPipe'}
+ *
+ * @experimental
+ */
+@Pipe({name: 'lowercase'})
+export class LowerCasePipe implements PipeTransform {
+  transform(value: string): string {
+    if (isBlank(value)) return value;
+    if (!isString(value)) {
+      throw new InvalidPipeArgumentException(LowerCasePipe, value);
+    }
+    return value.toLowerCase();
+  }
+}

modules/@angular/common/src/pipes/number_pipe.ts

@@ -0,0 +1,156 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+
+import {NumberFormatStyle, NumberFormatter} from '../facade/intl';
+import {NumberWrapper, Type, isBlank, isNumber, isPresent, isString} from '../facade/lang';
+
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+var defaultLocale: string = 'en-US';
+const _NUMBER_FORMAT_REGEXP = /^(\d+)?\.((\d+)(\-(\d+))?)?$/;
+
+function formatNumber(
+    pipe: Type, value: number | string, style: NumberFormatStyle, digits: string,
+    currency: string = null, currencyAsSymbol: boolean = false): string {
+  if (isBlank(value)) return null;
+  // Convert strings to numbers
+  value = isString(value) && NumberWrapper.isNumeric(value) ? +value : value;
+  if (!isNumber(value)) {
+    throw new InvalidPipeArgumentException(pipe, value);
+  }
+  let minInt: number;
+  let minFraction: number;
+  let maxFraction: number;
+  if (style !== NumberFormatStyle.Currency) {
+    // rely on Intl default for currency
+    minInt = 1;
+    minFraction = 0;
+    maxFraction = 3;
+  }
+
+  if (isPresent(digits)) {
+    var parts = digits.match(_NUMBER_FORMAT_REGEXP);
+    if (parts === null) {
+      throw new Error(`${digits} is not a valid digit info for number pipes`);
+    }
+    if (isPresent(parts[1])) {  // min integer digits
+      minInt = NumberWrapper.parseIntAutoRadix(parts[1]);
+    }
+    if (isPresent(parts[3])) {  // min fraction digits
+      minFraction = NumberWrapper.parseIntAutoRadix(parts[3]);
+    }
+    if (isPresent(parts[5])) {  // max fraction digits
+      maxFraction = NumberWrapper.parseIntAutoRadix(parts[5]);
+    }
+  }
+  return NumberFormatter.format(value as number, defaultLocale, style, {
+    minimumIntegerDigits: minInt,
+    minimumFractionDigits: minFraction,
+    maximumFractionDigits: maxFraction,
+    currency: currency,
+    currencyAsSymbol: currencyAsSymbol
+  });
+}
+
+/**
+ * WARNING: this pipe uses the Internationalization API.
+ * Therefore it is only reliable in Chrome and Opera browsers. For other browsers please use an
+ * polyfill, for example: [https://github.com/andyearnshaw/Intl.js/].
+ *
+ * Formats a number as local text. i.e. group sizing and separator and other locale-specific
+ * configurations are based on the active locale.
+ *
+ * ### Usage
+ *
+ *     expression | number[:digitInfo]
+ *
+ * where `expression` is a number and `digitInfo` has the following format:
+ *
+ *     {minIntegerDigits}.{minFractionDigits}-{maxFractionDigits}
+ *
+ * - minIntegerDigits is the minimum number of integer digits to use. Defaults to 1.
+ * - minFractionDigits is the minimum number of digits after fraction. Defaults to 0.
+ * - maxFractionDigits is the maximum number of digits after fraction. Defaults to 3.
+ *
+ * For more information on the acceptable range for each of these numbers and other
+ * details see your native internationalization library.
+ *
+ * ### Example
+ *
+ * {@example core/pipes/ts/number_pipe/number_pipe_example.ts region='NumberPipe'}
+ *
+ * @experimental
+ */
+@Pipe({name: 'number'})
+export class DecimalPipe implements PipeTransform {
+  transform(value: any, digits: string = null): string {
+    return formatNumber(DecimalPipe, value, NumberFormatStyle.Decimal, digits);
+  }
+}
+
+/**
+ * WARNING: this pipe uses the Internationalization API.
+ * Therefore it is only reliable in Chrome and Opera browsers. For other browsers please use an
+ * polyfill, for example: [https://github.com/andyearnshaw/Intl.js/].
+ *
+ * Formats a number as local percent.
+ *
+ * ### Usage
+ *
+ *     expression | percent[:digitInfo]
+ *
+ * For more information about `digitInfo` see {@link DecimalPipe}
+ *
+ * ### Example
+ *
+ * {@example core/pipes/ts/number_pipe/number_pipe_example.ts region='PercentPipe'}
+ *
+ * @experimental
+ */
+@Pipe({name: 'percent'})
+export class PercentPipe implements PipeTransform {
+  transform(value: any, digits: string = null): string {
+    return formatNumber(PercentPipe, value, NumberFormatStyle.Percent, digits);
+  }
+}
+
+/**
+ * WARNING: this pipe uses the Internationalization API.
+ * Therefore it is only reliable in Chrome and Opera browsers. For other browsers please use an
+ * polyfill, for example: [https://github.com/andyearnshaw/Intl.js/].
+ *
+ *
+ * Formats a number as local currency.
+ *
+ * ### Usage
+ *
+ *     expression | currency[:currencyCode[:symbolDisplay[:digitInfo]]]
+ *
+ * where `currencyCode` is the ISO 4217 currency code, such as "USD" for the US dollar and
+ * "EUR" for the euro. `symbolDisplay` is a boolean indicating whether to use the currency
+ * symbol (e.g. $) or the currency code (e.g. USD) in the output. The default for this value
+ * is `false`.
+ * For more information about `digitInfo` see {@link DecimalPipe}
+ *
+ * ### Example
+ *
+ * {@example core/pipes/ts/number_pipe/number_pipe_example.ts region='CurrencyPipe'}
+ *
+ * @experimental
+ */
+@Pipe({name: 'currency'})
+export class CurrencyPipe implements PipeTransform {
+  transform(
+      value: any, currencyCode: string = 'USD', symbolDisplay: boolean = false,
+      digits: string = null): string {
+    return formatNumber(
+        CurrencyPipe, value, NumberFormatStyle.Currency, digits, currencyCode, symbolDisplay);
+  }
+}

modules/@angular/common/src/pipes/replace_pipe.ts

@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {StringWrapper, isBlank, isFunction, isNumber, isString} from '../facade/lang';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+/**
+ * Creates a new String with some or all of the matches of a pattern replaced by
+ * a replacement.
+ *
+ * The pattern to be matched is specified by the 'pattern' parameter.
+ *
+ * The replacement to be set is specified by the 'replacement' parameter.
+ *
+ * An optional 'flags' parameter can be set.
+ *
+ * ### Usage
+ *
+ *     expression | replace:pattern:replacement
+ *
+ * All behavior is based on the expected behavior of the JavaScript API
+ * String.prototype.replace() function.
+ *
+ * Where the input expression is a [String] or [Number] (to be treated as a string),
+ * the `pattern` is a [String] or [RegExp],
+ * the 'replacement' is a [String] or [Function].
+ *
+ * --Note--: The 'pattern' parameter will be converted to a RegExp instance. Make sure to escape the
+ * string properly if you are matching for regular expression special characters like parenthesis,
+ * brackets etc.
+ *
+ * @deprecated The current pipe has limited functionality. The pipe api is not meant to be able
+ * express complex yet generic value transformations. We recommend that these transformations happen
+ * in the component logic instead.
+ */
+
+@Pipe({name: 'replace'})
+export class ReplacePipe implements PipeTransform {
+  transform(value: any, pattern: string|RegExp, replacement: Function|string): any {
+    if (isBlank(value)) {
+      return value;
+    }
+
+    if (!this._supportedInput(value)) {
+      throw new InvalidPipeArgumentException(ReplacePipe, value);
+    }
+
+    var input = value.toString();
+
+    if (!this._supportedPattern(pattern)) {
+      throw new InvalidPipeArgumentException(ReplacePipe, pattern);
+    }
+    if (!this._supportedReplacement(replacement)) {
+      throw new InvalidPipeArgumentException(ReplacePipe, replacement);
+    }
+
+    if (isFunction(replacement)) {
+      const rgxPattern = isString(pattern) ? new RegExp(pattern, 'g') : pattern;
+
+      return StringWrapper.replaceAllMapped(
+          input, rgxPattern, <(m: string[]) => string>replacement);
+    }
+
+    if (pattern instanceof RegExp) {
+      // use the replaceAll variant
+      return StringWrapper.replaceAll(input, pattern, <string>replacement);
+    }
+
+    return StringWrapper.replace(input, <string>pattern, <string>replacement);
+  }
+
+  private _supportedInput(input: any): boolean { return isString(input) || isNumber(input); }
+
+  private _supportedPattern(pattern: any): boolean {
+    return isString(pattern) || pattern instanceof RegExp;
+  }
+
+  private _supportedReplacement(replacement: any): boolean {
+    return isString(replacement) || isFunction(replacement);
+  }
+}

modules/@angular/common/src/pipes/slice_pipe.ts

@@ -1,7 +1,14 @@
-import {isBlank, isString, isArray, StringWrapper, CONST} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {ListWrapper} from '../facade/collection';
+import {StringWrapper, isArray, isBlank, isString} from '../facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**
@@ -40,6 +47,8 @@ import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
  * When operating on a [List], the returned list is always a copy even when all
  * the elements are being returned.
  *
+ * When operating on a blank value, returns it.
+ *
  * ## List Example
  *
  * This `ngFor` example:
@@ -54,21 +63,17 @@ import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
  * ## String Examples
  *
  * {@example core/pipes/ts/slice_pipe/slice_pipe_example.ts region='SlicePipe_string'}
+ *
+ * @stable
  */
 
 @Pipe({name: 'slice', pure: false})
-@Injectable()
 export class SlicePipe implements PipeTransform {
-  transform(value: any, args: any[] = null): any {
-    if (isBlank(args) || args.length == 0) {
-      throw new BaseException('Slice pipe requires one argument');
-    }
+  transform(value: any, start: number, end: number = null): any {
+    if (isBlank(value)) return value;
     if (!this.supports(value)) {
       throw new InvalidPipeArgumentException(SlicePipe, value);
     }
-    if (isBlank(value)) return value;
-    var start: number = args[0];
-    var end: number = args.length > 1 ? args[1] : null;
     if (isString(value)) {
       return StringWrapper.slice(value, start, end);
     }

modules/@angular/common/src/pipes/uppercase_pipe.ts

@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Pipe, PipeTransform} from '@angular/core';
+import {isBlank, isString} from '../facade/lang';
+import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
+
+/**
+ * Implements uppercase transforms to text.
+ *
+ * ### Example
+ *
+ * {@example core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts region='LowerUpperPipe'}
+ *
+ * @experimental
+ */
+@Pipe({name: 'uppercase'})
+export class UpperCasePipe implements PipeTransform {
+  transform(value: string): string {
+    if (isBlank(value)) return value;
+    if (!isString(value)) {
+      throw new InvalidPipeArgumentException(UpperCasePipe, value);
+    }
+    return value.toUpperCase();
+  }
+}

modules/@angular/common/test/directives/ng_class_spec.ts

@@ -0,0 +1,597 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgClass, NgFor} from '@angular/common';
+import {Component} from '@angular/core';
+import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
+import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+
+function detectChangesAndCheck(fixture: ComponentFixture<any>, classes: string) {
+  fixture.detectChanges();
+  expect(fixture.debugElement.children[0].nativeElement.className).toEqual(classes);
+}
+
+export function main() {
+  describe('binding to CSS class list', () => {
+
+    it('should clean up when the directive is destroyed',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div *ngFor="let item of items" [ngClass]="item"></div>';
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture: ComponentFixture<TestComponent>) => {
+                   fixture.debugElement.componentInstance.items = [['0']];
+                   fixture.detectChanges();
+                   fixture.debugElement.componentInstance.items = [['1']];
+
+                   detectChangesAndCheck(fixture, '1');
+
+                   async.done();
+                 });
+           }));
+
+
+    describe('expressions evaluating to objects', () => {
+
+      it('should add classes specified in an object literal',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="{foo: true, bar: false}"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+                     async.done();
+                   });
+             }));
+
+
+      it('should add classes specified in an object literal without change in class names',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="{'foo-bar': true, 'fooBar': true}"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo-bar fooBar');
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes based on changes in object literal values',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="{foo: condition, bar: !condition}"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.condition = false;
+                     detectChangesAndCheck(fixture, 'bar');
+
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes based on changes to the expression object',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'baz', true);
+                     detectChangesAndCheck(fixture, 'foo bar baz');
+
+                     StringMapWrapper.delete(fixture.debugElement.componentInstance.objExpr, 'bar');
+                     detectChangesAndCheck(fixture, 'foo baz');
+
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes based on reference changes to the expression object',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.objExpr = {foo: true, bar: true};
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+                     fixture.debugElement.componentInstance.objExpr = {baz: true};
+                     detectChangesAndCheck(fixture, 'baz');
+
+                     async.done();
+                   });
+             }));
+
+      it('should remove active classes when expression evaluates to null',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.objExpr = null;
+                     detectChangesAndCheck(fixture, '');
+
+                     fixture.debugElement.componentInstance.objExpr = {'foo': false, 'bar': true};
+                     detectChangesAndCheck(fixture, 'bar');
+
+                     async.done();
+                   });
+             }));
+
+
+      it('should allow multiple classes per expression',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+
+                     fixture.debugElement.componentInstance.objExpr = {
+                       'bar baz': true,
+                       'bar1 baz1': true
+                     };
+                     detectChangesAndCheck(fixture, 'bar baz bar1 baz1');
+
+                     fixture.debugElement.componentInstance.objExpr = {
+                       'bar baz': false,
+                       'bar1 baz1': true
+                     };
+                     detectChangesAndCheck(fixture, 'bar1 baz1');
+
+
+                     async.done();
+                   });
+             }));
+
+      it('should split by one or more spaces between classes',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+
+                     fixture.debugElement.componentInstance.objExpr = {'foo bar     baz': true};
+                     detectChangesAndCheck(fixture, 'foo bar baz');
+
+                     async.done();
+                   });
+             }));
+
+    });
+
+    describe('expressions evaluating to lists', () => {
+
+      it('should add classes specified in a list literal',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="['foo', 'bar', 'foo-bar', 'fooBar']"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo bar foo-bar fooBar');
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes based on changes to the expression',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     var arrExpr: string[] = fixture.debugElement.componentInstance.arrExpr;
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     arrExpr.push('bar');
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+                     arrExpr[1] = 'baz';
+                     detectChangesAndCheck(fixture, 'foo baz');
+
+                     ListWrapper.remove(fixture.debugElement.componentInstance.arrExpr, 'baz');
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes when a reference changes',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.arrExpr = ['bar'];
+                     detectChangesAndCheck(fixture, 'bar');
+
+                     async.done();
+                   });
+             }));
+
+      it('should take initial classes into account when a reference changes',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div class="foo" [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.arrExpr = ['bar'];
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+                     async.done();
+                   });
+             }));
+
+      it('should ignore empty or blank class names',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div class="foo" [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+
+                     fixture.debugElement.componentInstance.arrExpr = ['', '  '];
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     async.done();
+                   });
+             }));
+
+      it('should trim blanks from class names',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div class="foo" [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+
+                     fixture.debugElement.componentInstance.arrExpr = [' bar  '];
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+                     async.done();
+                   });
+             }));
+
+
+      it('should allow multiple classes per item in arrays',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="arrExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+
+                     fixture.debugElement.componentInstance.arrExpr =
+                         ['foo bar baz', 'foo1 bar1   baz1'];
+                     detectChangesAndCheck(fixture, 'foo bar baz foo1 bar1 baz1');
+
+                     fixture.debugElement.componentInstance.arrExpr = ['foo bar   baz foobar'];
+                     detectChangesAndCheck(fixture, 'foo bar baz foobar');
+
+                     async.done();
+                   });
+             }));
+    });
+
+    describe('expressions evaluating to sets', () => {
+
+      it('should add and remove classes if the set instance changed',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="setExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     var setExpr = new Set<string>();
+                     setExpr.add('bar');
+                     fixture.debugElement.componentInstance.setExpr = setExpr;
+                     detectChangesAndCheck(fixture, 'bar');
+
+                     setExpr = new Set<string>();
+                     setExpr.add('baz');
+                     fixture.debugElement.componentInstance.setExpr = setExpr;
+                     detectChangesAndCheck(fixture, 'baz');
+
+                     async.done();
+                   });
+             }));
+    });
+    describe('expressions evaluating to string', () => {
+
+      it('should add classes specified in a string literal',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="'foo bar foo-bar fooBar'"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo bar foo-bar fooBar');
+                     async.done();
+                   });
+             }));
+
+      it('should add and remove classes based on changes to the expression',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="strExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.strExpr = 'foo bar';
+                     detectChangesAndCheck(fixture, 'foo bar');
+
+
+                     fixture.debugElement.componentInstance.strExpr = 'baz';
+                     detectChangesAndCheck(fixture, 'baz');
+
+                     async.done();
+                   });
+             }));
+
+      it('should remove active classes when switching from string to null',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="strExpr"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.strExpr = null;
+                     detectChangesAndCheck(fixture, '');
+
+                     async.done();
+                   });
+             }));
+
+      it('should take initial classes into account when switching from string to null',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div class="foo" [ngClass]="strExpr"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     fixture.debugElement.componentInstance.strExpr = null;
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     async.done();
+                   });
+             }));
+
+      it('should ignore empty and blank strings',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div class="foo" [ngClass]="strExpr"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.debugElement.componentInstance.strExpr = '';
+                     detectChangesAndCheck(fixture, 'foo');
+
+                     async.done();
+                   });
+             }));
+
+    });
+
+    describe('cooperation with other class-changing constructs', () => {
+
+      it('should co-operate with the class attribute',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div [ngClass]="objExpr" class="init foo"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, 'init foo bar');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'foo', false);
+                     detectChangesAndCheck(fixture, 'init bar');
+
+                     fixture.debugElement.componentInstance.objExpr = null;
+                     detectChangesAndCheck(fixture, 'init foo');
+
+                     async.done();
+                   });
+             }));
+
+      it('should co-operate with the interpolated class attribute',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="objExpr" class="{{'init foo'}}"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, `init foo bar`);
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'foo', false);
+                     detectChangesAndCheck(fixture, `init bar`);
+
+                     fixture.debugElement.componentInstance.objExpr = null;
+                     detectChangesAndCheck(fixture, `init foo`);
+
+                     async.done();
+                   });
+             }));
+
+      it('should co-operate with the class attribute and binding to it',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = `<div [ngClass]="objExpr" class="init" [class]="'foo'"></div>`;
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, `init foo bar`);
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'foo', false);
+                     detectChangesAndCheck(fixture, `init bar`);
+
+                     fixture.debugElement.componentInstance.objExpr = null;
+                     detectChangesAndCheck(fixture, `init foo`);
+
+                     async.done();
+                   });
+             }));
+
+      it('should co-operate with the class attribute and class.name binding',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template =
+                   '<div class="init foo" [ngClass]="objExpr" [class.baz]="condition"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'init foo baz');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, 'init foo baz bar');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'foo', false);
+                     detectChangesAndCheck(fixture, 'init baz bar');
+
+                     fixture.debugElement.componentInstance.condition = false;
+                     detectChangesAndCheck(fixture, 'init bar');
+
+                     async.done();
+                   });
+             }));
+
+      it('should co-operate with initial class and class attribute binding when binding changes',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div class="init" [ngClass]="objExpr" [class]="strExpr"></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     detectChangesAndCheck(fixture, 'init foo');
+
+                     StringMapWrapper.set(
+                         fixture.debugElement.componentInstance.objExpr, 'bar', true);
+                     detectChangesAndCheck(fixture, 'init foo bar');
+
+                     fixture.debugElement.componentInstance.strExpr = 'baz';
+                     detectChangesAndCheck(fixture, 'init bar baz foo');
+
+                     fixture.debugElement.componentInstance.objExpr = null;
+                     detectChangesAndCheck(fixture, 'init baz');
+
+                     async.done();
+                   });
+             }));
+
+    });
+  });
+}
+
+@Component({selector: 'test-cmp', directives: [NgClass, NgFor], template: ''})
+class TestComponent {
+  condition: boolean = true;
+  items: any[];
+  arrExpr: string[] = ['foo'];
+  setExpr: Set<string> = new Set<string>();
+  objExpr = {'foo': true, 'bar': false};
+  strExpr = 'foo';
+
+  constructor() { this.setExpr.add('foo'); }
+}

modules/@angular/common/test/directives/ng_for_spec.ts

@@ -0,0 +1,586 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgFor, NgIf} from '@angular/common';
+import {Component, ContentChild, TemplateRef} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+import {ListWrapper} from '../../src/facade/collection';
+
+let thisArg: any;
+
+export function main() {
+  describe('ngFor', () => {
+    const TEMPLATE =
+        '<div><copy-me template="ngFor let item of items">{{item.toString()}};</copy-me></div>';
+
+    it('should reflect initial elements',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;2;');
+                   async.done();
+                 });
+           }));
+
+    it('should reflect added elements',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   (<number[]>fixture.debugElement.componentInstance.items).push(3);
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;2;3;');
+                   async.done();
+                 });
+           }));
+
+    it('should reflect removed elements',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   ListWrapper.removeAt(fixture.debugElement.componentInstance.items, 1);
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;');
+                   async.done();
+                 });
+           }));
+
+    it('should reflect moved elements',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   ListWrapper.removeAt(fixture.debugElement.componentInstance.items, 0);
+                   (<number[]>fixture.debugElement.componentInstance.items).push(1);
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('2;1;');
+                   async.done();
+                 });
+           }));
+
+    it('should reflect a mix of all changes (additions/removals/moves)',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2, 3, 4, 5];
+                   fixture.detectChanges();
+
+                   fixture.debugElement.componentInstance.items = [6, 2, 7, 0, 4, 8];
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('6;2;7;0;4;8;');
+                   async.done();
+                 });
+           }));
+
+    it('should iterate over an array of objects',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<ul><li template="ngFor let item of items">{{item["name"]}};</li></ul>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   // INIT
+                   fixture.debugElement.componentInstance.items =
+                       [{'name': 'misko'}, {'name': 'shyam'}];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('misko;shyam;');
+
+                   // GROW
+                   (<any[]>fixture.debugElement.componentInstance.items).push({'name': 'adam'});
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('misko;shyam;adam;');
+
+                   // SHRINK
+                   ListWrapper.removeAt(fixture.debugElement.componentInstance.items, 2);
+                   ListWrapper.removeAt(fixture.debugElement.componentInstance.items, 0);
+                   fixture.detectChanges();
+
+                   expect(fixture.debugElement.nativeElement).toHaveText('shyam;');
+                   async.done();
+                 });
+           }));
+
+    it('should gracefully handle nulls',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template = '<ul><li template="ngFor let item of null">{{item}};</li></ul>';
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+                   async.done();
+                 });
+           }));
+
+    it('should gracefully handle ref changing to null and back',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;2;');
+
+                   fixture.debugElement.componentInstance.items = null;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   fixture.debugElement.componentInstance.items = [1, 2, 3];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;2;3;');
+                   async.done();
+                 });
+           }));
+
+    it('should throw on non-iterable ref and suggest using an array',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE).createAsync(TestComponent).then((fixture) => {
+               fixture.debugElement.componentInstance.items = 'whaaa';
+               expect(() => fixture.detectChanges())
+                   .toThrowError(
+                       /Cannot find a differ supporting object 'whaaa' of type 'string'. NgFor only supports binding to Iterables such as Arrays/);
+               async.done();
+             });
+           }));
+
+    it('should throw on ref changing to string',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('1;2;');
+
+                   fixture.debugElement.componentInstance.items = 'whaaa';
+                   expect(() => fixture.detectChanges()).toThrowError();
+                   async.done();
+                 });
+           }));
+
+    it('should works with duplicates',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, TEMPLATE)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   var a = new Foo();
+                   fixture.debugElement.componentInstance.items = [a, a];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('foo;foo;');
+                   async.done();
+                 });
+           }));
+
+    it('should repeat over nested arrays',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template = '<div>' +
+                 '<div template="ngFor let item of items">' +
+                 '<div template="ngFor let subitem of item">' +
+                 '{{subitem}}-{{item.length}};' +
+                 '</div>|' +
+                 '</div>' +
+                 '</div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [['a', 'b'], ['c']];
+                   fixture.detectChanges();
+                   fixture.detectChanges();
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('a-2;b-2;|c-1;|');
+
+                   fixture.debugElement.componentInstance.items = [['e'], ['f', 'g']];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('e-1;|f-2;g-2;|');
+
+                   async.done();
+                 });
+           }));
+
+    it('should repeat over nested arrays with no intermediate element',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template = '<div><template ngFor let-item [ngForOf]="items">' +
+                 '<div template="ngFor let subitem of item">' +
+                 '{{subitem}}-{{item.length}};' +
+                 '</div></template></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [['a', 'b'], ['c']];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('a-2;b-2;c-1;');
+
+                   fixture.debugElement.componentInstance.items = [['e'], ['f', 'g']];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('e-1;f-2;g-2;');
+                   async.done();
+                 });
+           }));
+
+    it('should repeat over nested ngIf that are the last node in the ngFor temlate',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 `<div><template ngFor let-item [ngForOf]="items" let-i="index"><div>{{i}}|</div>` +
+                 `<div *ngIf="i % 2 == 0">even|</div></template></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   const el = fixture.debugElement.nativeElement;
+                   const items = [1];
+                   fixture.debugElement.componentInstance.items = items;
+                   fixture.detectChanges();
+                   expect(el).toHaveText('0|even|');
+
+                   items.push(1);
+                   fixture.detectChanges();
+                   expect(el).toHaveText('0|even|1|');
+
+                   items.push(1);
+                   fixture.detectChanges();
+                   expect(el).toHaveText('0|even|1|2|even|');
+
+                   async.done();
+                 });
+           }));
+
+    it('should display indices correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<div><copy-me template="ngFor: let item of items; let i=index">{{i.toString()}}</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('0123456789');
+
+                   fixture.debugElement.componentInstance.items = [1, 2, 6, 7, 4, 3, 5, 8, 9, 0];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('0123456789');
+                   async.done();
+                 });
+           }));
+
+    it('should display first item correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<div><copy-me template="ngFor: let item of items; let isFirst=first">{{isFirst.toString()}}</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('truefalsefalse');
+
+                   fixture.debugElement.componentInstance.items = [2, 1];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('truefalse');
+                   async.done();
+                 });
+           }));
+
+    it('should display last item correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<div><copy-me template="ngFor: let item of items; let isLast=last">{{isLast.toString()}}</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('falsefalsetrue');
+
+                   fixture.debugElement.componentInstance.items = [2, 1];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('falsetrue');
+                   async.done();
+                 });
+           }));
+
+    it('should display even items correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<div><copy-me template="ngFor: let item of items; let isEven=even">{{isEven.toString()}}</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('truefalsetrue');
+
+                   fixture.debugElement.componentInstance.items = [2, 1];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('truefalse');
+                   async.done();
+                 });
+           }));
+
+    it('should display odd items correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template =
+                 '<div><copy-me template="ngFor: let item of items; let isOdd=odd">{{isOdd.toString()}}</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.items = [0, 1, 2, 3];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('falsetruefalsetrue');
+
+                   fixture.debugElement.componentInstance.items = [2, 1];
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('falsetrue');
+                   async.done();
+                 });
+           }));
+
+    it('should allow to use a custom template',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(
+                    TestComponent,
+                    '<ul><template ngFor [ngForOf]="items" [ngForTemplate]="contentTpl"></template></ul>')
+                 .overrideTemplate(
+                     ComponentUsingTestComponent,
+                     '<test-cmp><li template="let item; let i=index">{{i}}: {{item}};</li></test-cmp>')
+                 .createAsync(ComponentUsingTestComponent)
+                 .then((fixture) => {
+                   const testComponent = fixture.debugElement.children[0];
+                   testComponent.componentInstance.items = ['a', 'b', 'c'];
+                   fixture.detectChanges();
+                   expect(testComponent.nativeElement).toHaveText('0: a;1: b;2: c;');
+
+                   async.done();
+                 });
+           }));
+
+    it('should use a default template if a custom one is null',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, `<ul><template ngFor let-item [ngForOf]="items"
+         [ngForTemplate]="contentTpl" let-i="index">{{i}}: {{item}};</template></ul>`)
+                 .overrideTemplate(ComponentUsingTestComponent, '<test-cmp></test-cmp>')
+                 .createAsync(ComponentUsingTestComponent)
+                 .then((fixture) => {
+                   const testComponent = fixture.debugElement.children[0];
+                   testComponent.componentInstance.items = ['a', 'b', 'c'];
+                   fixture.detectChanges();
+                   expect(testComponent.nativeElement).toHaveText('0: a;1: b;2: c;');
+
+                   async.done();
+                 });
+           }));
+
+    it('should use a custom template when both default and a custom one are present',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             tcb.overrideTemplate(TestComponent, `<ul><template ngFor let-item [ngForOf]="items"
+         [ngForTemplate]="contentTpl" let-i="index">{{i}}=> {{item}};</template></ul>`)
+                 .overrideTemplate(
+                     ComponentUsingTestComponent,
+                     '<test-cmp><li template="let item; let i=index">{{i}}: {{item}};</li></test-cmp>')
+                 .createAsync(ComponentUsingTestComponent)
+                 .then((fixture) => {
+                   const testComponent = fixture.debugElement.children[0];
+                   testComponent.componentInstance.items = ['a', 'b', 'c'];
+                   fixture.detectChanges();
+                   expect(testComponent.nativeElement).toHaveText('0: a;1: b;2: c;');
+
+                   async.done();
+                 });
+           }));
+
+    describe('track by', () => {
+      it('should set the context to the component instance',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               const template =
+                   `<template ngFor let-item [ngForOf]="items" [ngForTrackBy]="trackByContext.bind(this)"></template>`;
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     thisArg = null;
+                     fixture.detectChanges();
+                     expect(thisArg).toBe(fixture.debugElement.componentInstance);
+                     async.done();
+                   });
+             }));
+
+      it('should not replace tracked items',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               const template =
+                   `<template ngFor let-item [ngForOf]="items" [ngForTrackBy]="trackById" let-i="index">
+               <p>{{items[i]}}</p>
+              </template>`;
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     var buildItemList = () => {
+                       fixture.debugElement.componentInstance.items = [{'id': 'a'}];
+                       fixture.detectChanges();
+                       return fixture.debugElement.queryAll(By.css('p'))[0];
+                     };
+
+                     var firstP = buildItemList();
+                     var finalP = buildItemList();
+                     expect(finalP.nativeElement).toBe(firstP.nativeElement);
+                     async.done();
+                   });
+             }));
+
+      it('should update implicit local variable on view',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               const template =
+                   `<div><template ngFor let-item [ngForOf]="items" [ngForTrackBy]="trackById">{{item['color']}}</template></div>`;
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.debugElement.componentInstance.items = [{'id': 'a', 'color': 'blue'}];
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('blue');
+                     fixture.debugElement.componentInstance.items = [{'id': 'a', 'color': 'red'}];
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('red');
+                     async.done();
+                   });
+             }));
+      it('should move items around and keep them updated ',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               const template =
+                   `<div><template ngFor let-item [ngForOf]="items" [ngForTrackBy]="trackById">{{item['color']}}</template></div>`;
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.debugElement.componentInstance.items =
+                         [{'id': 'a', 'color': 'blue'}, {'id': 'b', 'color': 'yellow'}];
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('blueyellow');
+                     fixture.debugElement.componentInstance.items =
+                         [{'id': 'b', 'color': 'orange'}, {'id': 'a', 'color': 'red'}];
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('orangered');
+                     async.done();
+                   });
+             }));
+
+      it('should handle added and removed items properly when tracking by index',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               const template =
+                   `<div><template ngFor let-item [ngForOf]="items" [ngForTrackBy]="trackByIndex">{{item}}</template></div>`;
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.debugElement.componentInstance.items = ['a', 'b', 'c', 'd'];
+                     fixture.detectChanges();
+                     fixture.debugElement.componentInstance.items = ['e', 'f', 'g', 'h'];
+                     fixture.detectChanges();
+                     fixture.debugElement.componentInstance.items = ['e', 'f', 'h'];
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('efh');
+                     async.done();
+                   });
+             }));
+    });
+  });
+}
+
+class Foo {
+  toString() { return 'foo'; }
+}
+
+@Component({selector: 'test-cmp', directives: [NgFor, NgIf], template: ''})
+class TestComponent {
+  @ContentChild(TemplateRef) contentTpl: TemplateRef<Object>;
+  items: any;
+  constructor() { this.items = [1, 2]; }
+  trackById(index: number, item: any): string { return item['id']; }
+  trackByIndex(index: number, item: any): number { return index; }
+  trackByContext(): void { thisArg = this; }
+}
+
+@Component({selector: 'outer-cmp', directives: [TestComponent], template: ''})
+class ComponentUsingTestComponent {
+  items: any;
+  constructor() { this.items = [1, 2]; }
+}

modules/@angular/common/test/directives/ng_if_spec.ts

@@ -0,0 +1,258 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgIf} from '@angular/common';
+import {Component} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+export function main() {
+  describe('ngIf directive', () => {
+    it('should work in a template attribute',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html = '<div><copy-me template="ngIf booleanCondition">hello</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+                   async.done();
+                 });
+           }));
+
+    it('should work in a template element',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html =
+                 '<div><template [ngIf]="booleanCondition"><copy-me>hello2</copy-me></template></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello2');
+                   async.done();
+                 });
+           }));
+
+    it('should toggle node when condition changes',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html = '<div><copy-me template="ngIf booleanCondition">hello</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.booleanCondition = false;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(0);
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   fixture.debugElement.componentInstance.booleanCondition = true;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+
+                   fixture.debugElement.componentInstance.booleanCondition = false;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(0);
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   async.done();
+                 });
+           }));
+
+    it('should handle nested if correctly',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html =
+                 '<div><template [ngIf]="booleanCondition"><copy-me *ngIf="nestedBooleanCondition">hello</copy-me></template></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.booleanCondition = false;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(0);
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   fixture.debugElement.componentInstance.booleanCondition = true;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+
+                   fixture.debugElement.componentInstance.nestedBooleanCondition = false;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(0);
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   fixture.debugElement.componentInstance.nestedBooleanCondition = true;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+
+                   fixture.debugElement.componentInstance.booleanCondition = false;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(0);
+                   expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                   async.done();
+                 });
+           }));
+
+    it('should update several nodes with if',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html = '<div>' +
+                 '<copy-me template="ngIf numberCondition + 1 >= 2">helloNumber</copy-me>' +
+                 '<copy-me template="ngIf stringCondition == \'foo\'">helloString</copy-me>' +
+                 '<copy-me template="ngIf functionCondition(stringCondition, numberCondition)">helloFunction</copy-me>' +
+                 '</div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(3);
+                   expect(getDOM().getText(fixture.debugElement.nativeElement))
+                       .toEqual('helloNumberhelloStringhelloFunction');
+
+                   fixture.debugElement.componentInstance.numberCondition = 0;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('helloString');
+
+                   fixture.debugElement.componentInstance.numberCondition = 1;
+                   fixture.debugElement.componentInstance.stringCondition = 'bar';
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('helloNumber');
+                   async.done();
+                 });
+           }));
+
+    it('should not add the element twice if the condition goes from true to true (JS)',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html = '<div><copy-me template="ngIf numberCondition">hello</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+
+                   fixture.debugElement.componentInstance.numberCondition = 2;
+                   fixture.detectChanges();
+                   expect(getDOM()
+                              .querySelectorAll(fixture.debugElement.nativeElement, 'copy-me')
+                              .length)
+                       .toEqual(1);
+                   expect(fixture.debugElement.nativeElement).toHaveText('hello');
+
+                   async.done();
+                 });
+           }));
+
+    it('should not recreate the element if the condition goes from true to true (JS)',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var html = '<div><copy-me template="ngIf numberCondition">hello</copy-me></div>';
+
+             tcb.overrideTemplate(TestComponent, html)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   getDOM().addClass(
+                       getDOM().querySelector(fixture.debugElement.nativeElement, 'copy-me'),
+                       'foo');
+
+                   fixture.debugElement.componentInstance.numberCondition = 2;
+                   fixture.detectChanges();
+                   expect(getDOM().hasClass(
+                              getDOM().querySelector(fixture.debugElement.nativeElement, 'copy-me'),
+                              'foo'))
+                       .toBe(true);
+
+                   async.done();
+                 });
+           }));
+  });
+}
+
+@Component({selector: 'test-cmp', directives: [NgIf], template: ''})
+class TestComponent {
+  booleanCondition: boolean;
+  nestedBooleanCondition: boolean;
+  numberCondition: number;
+  stringCondition: string;
+  functionCondition: Function;
+  constructor() {
+    this.booleanCondition = true;
+    this.nestedBooleanCondition = true;
+    this.numberCondition = 1;
+    this.stringCondition = 'foo';
+    this.functionCondition = function(s: any, n: any): boolean { return s == 'foo' && n == 1; };
+  }
+}

modules/@angular/common/test/directives/ng_plural_spec.ts

@@ -0,0 +1,182 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgLocalization, NgPlural, NgPluralCase} from '@angular/common';
+import {Component, Injectable} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+export function main() {
+  describe('switch', () => {
+    beforeEachProviders(() => [{provide: NgLocalization, useClass: TestLocalization}]);
+
+    it('should display the template according to the exact value',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ul [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="=0"><li>you have no messages.</li></template>' +
+                 '<template ngPluralCase="=1"><li>you have one message.</li></template>' +
+                 '</ul></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 0;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have no messages.');
+
+                   fixture.debugElement.componentInstance.switchValue = 1;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have one message.');
+
+                   async.done();
+                 });
+           }));
+
+    // https://github.com/angular/angular/issues/9868
+    // https://github.com/angular/angular/issues/9882
+    it('should not throw when ngPluralCase contains expressions',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ul [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="=0"><li>{{ switchValue }}</li></template>' +
+                 '</ul></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 0;
+                   expect(() => fixture.detectChanges()).not.toThrow();
+                   async.done();
+                 });
+           }));
+
+
+    it('should be applicable to <ng-container> elements',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ng-container [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="=0">you have no messages.</template>' +
+                 '<template ngPluralCase="=1">you have one message.</template>' +
+                 '</ng-container></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 0;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have no messages.');
+
+                   fixture.debugElement.componentInstance.switchValue = 1;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have one message.');
+
+                   async.done();
+                 });
+           }));
+
+    it('should display the template according to the category',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ul [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="few"><li>you have a few messages.</li></template>' +
+                 '<template ngPluralCase="many"><li>you have many messages.</li></template>' +
+                 '</ul></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 2;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement)
+                       .toHaveText('you have a few messages.');
+
+                   fixture.debugElement.componentInstance.switchValue = 8;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have many messages.');
+
+                   async.done();
+                 });
+           }));
+
+    it('should default to other when no matches are found',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ul [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="few"><li>you have a few messages.</li></template>' +
+                 '<template ngPluralCase="other"><li>default message.</li></template>' +
+                 '</ul></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 100;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('default message.');
+
+                   async.done();
+                 });
+           }));
+
+    it('should prioritize value matches over category matches',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>' +
+                 '<ul [ngPlural]="switchValue">' +
+                 '<template ngPluralCase="few"><li>you have a few messages.</li></template>' +
+                 '<template ngPluralCase="=2">you have two messages.</template>' +
+                 '</ul></div>';
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.switchValue = 2;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('you have two messages.');
+
+                   fixture.debugElement.componentInstance.switchValue = 3;
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement)
+                       .toHaveText('you have a few messages.');
+
+                   async.done();
+                 });
+           }));
+  });
+}
+
+@Injectable()
+class TestLocalization extends NgLocalization {
+  getPluralCategory(value: number): string {
+    if (value > 1 && value < 4) {
+      return 'few';
+    }
+    if (value >= 4 && value < 10) {
+      return 'many';
+    }
+
+    return 'other';
+  }
+}
+
+@Component({selector: 'test-cmp', directives: [NgPlural, NgPluralCase], template: ''})
+class TestComponent {
+  switchValue: number = null;
+}

modules/@angular/common/test/directives/ng_style_spec.ts

@@ -0,0 +1,211 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, xdescribe, describe, expect, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
+import {TestComponentBuilder, ComponentFixture} from '@angular/core/testing';
+
+import {Component} from '@angular/core';
+
+import {NgStyle} from '@angular/common/src/directives/ng_style';
+
+function expectNativeEl(fixture: ComponentFixture<any>) {
+  return <any>expect(fixture.debugElement.children[0].nativeElement);
+}
+
+export function main() {
+  describe('binding to CSS styles', () => {
+
+    it('should add styles specified in an object literal',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [ngStyle]="{'max-width': '40px'}"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40px'});
+
+                   async.done();
+                 });
+           }));
+
+    it('should add and change styles specified in an object expression',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   var expr: Map<string, any>;
+
+                   fixture.debugElement.componentInstance.expr = {'max-width': '40px'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40px'});
+
+                   expr = fixture.debugElement.componentInstance.expr;
+                   (expr as any)['max-width'] = '30%';
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '30%'});
+
+                   async.done();
+                 });
+           }));
+
+    it('should add and remove styles specified using style.unit notation',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [ngStyle]="{'max-width.px': expr}"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.debugElement.componentInstance.expr = '40';
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40px'});
+
+                   fixture.debugElement.componentInstance.expr = null;
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).not.toHaveCssStyle('max-width');
+
+                   async.done();
+                 });
+           }));
+
+    it('should update styles using style.unit notation when unit changes',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.debugElement.componentInstance.expr = {'max-width.px': '40'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40px'});
+
+                   fixture.debugElement.componentInstance.expr = {'max-width.em': '40'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40em'});
+
+                   async.done();
+                 });
+           }));
+
+    // keyValueDiffer is sensitive to key order #9115
+    it('should change styles specified in an object expression',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             const template = `<div [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.expr = {
+                     // height, width order is important here
+                     height: '10px',
+                     width: '10px'
+                   };
+
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'height': '10px', 'width': '10px'});
+
+                   fixture.debugElement.componentInstance.expr = {
+                     // width, height order is important here
+                     width: '5px',
+                     height: '5px',
+                   };
+
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'height': '5px', 'width': '5px'});
+
+                   async.done();
+                 });
+           }));
+
+    it('should remove styles when deleting a key in an object expression',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.expr = {'max-width': '40px'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle({'max-width': '40px'});
+
+                   delete fixture.debugElement.componentInstance.expr['max-width'];
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).not.toHaveCssStyle('max-width');
+
+                   async.done();
+                 });
+           }));
+
+    it('should co-operate with the style attribute',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div style="font-size: 12px" [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.expr = {'max-width': '40px'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle(
+                       {'max-width': '40px', 'font-size': '12px'});
+
+                   delete fixture.debugElement.componentInstance.expr['max-width'];
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).not.toHaveCssStyle('max-width');
+                   expectNativeEl(fixture).toHaveCssStyle({'font-size': '12px'});
+
+                   async.done();
+                 });
+           }));
+
+    it('should co-operate with the style.[styleName]="expr" special-case in the compiler',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<div [style.font-size.px]="12" [ngStyle]="expr"></div>`;
+
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.debugElement.componentInstance.expr = {'max-width': '40px'};
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).toHaveCssStyle(
+                       {'max-width': '40px', 'font-size': '12px'});
+
+                   delete fixture.debugElement.componentInstance.expr['max-width'];
+                   fixture.detectChanges();
+                   expectNativeEl(fixture).not.toHaveCssStyle('max-width');
+                   expectNativeEl(fixture).toHaveCssStyle({'font-size': '12px'});
+
+                   async.done();
+                 });
+           }));
+  });
+}
+
+@Component({selector: 'test-cmp', directives: [NgStyle], template: ''})
+class TestComponent {
+  expr: any;
+}

modules/@angular/common/test/directives/ng_switch_spec.ts

@@ -0,0 +1,193 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
+import {Component} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+export function main() {
+  describe('switch', () => {
+    describe('switch value changes', () => {
+      it('should switch amongst when values',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div>' +
+                   '<ul [ngSwitch]="switchValue">' +
+                   '<template ngSwitchCase="a"><li>when a</li></template>' +
+                   '<template ngSwitchCase="b"><li>when b</li></template>' +
+                   '</ul></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                     fixture.debugElement.componentInstance.switchValue = 'a';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when a');
+
+                     fixture.debugElement.componentInstance.switchValue = 'b';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when b');
+
+                     async.done();
+                   });
+             }));
+
+      // TODO(robwormald): deprecate and remove
+      it('should switch amongst when values using switchWhen',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div>' +
+                   '<ul [ngSwitch]="switchValue">' +
+                   '<template ngSwitchWhen="a"><li>when a</li></template>' +
+                   '<template ngSwitchWhen="b"><li>when b</li></template>' +
+                   '</ul></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('');
+
+                     fixture.debugElement.componentInstance.switchValue = 'a';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when a');
+
+                     fixture.debugElement.componentInstance.switchValue = 'b';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when b');
+
+                     async.done();
+                   });
+             }));
+
+      it('should switch amongst when values with fallback to default',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div>' +
+                   '<ul [ngSwitch]="switchValue">' +
+                   '<li template="ngSwitchCase \'a\'">when a</li>' +
+                   '<li template="ngSwitchDefault">when default</li>' +
+                   '</ul></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when default');
+
+                     fixture.debugElement.componentInstance.switchValue = 'a';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when a');
+
+                     fixture.debugElement.componentInstance.switchValue = 'b';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when default');
+
+                     async.done();
+                   });
+             }));
+
+      it('should support multiple whens with the same value',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div>' +
+                   '<ul [ngSwitch]="switchValue">' +
+                   '<template ngSwitchCase="a"><li>when a1;</li></template>' +
+                   '<template ngSwitchCase="b"><li>when b1;</li></template>' +
+                   '<template ngSwitchCase="a"><li>when a2;</li></template>' +
+                   '<template ngSwitchCase="b"><li>when b2;</li></template>' +
+                   '<template ngSwitchDefault><li>when default1;</li></template>' +
+                   '<template ngSwitchDefault><li>when default2;</li></template>' +
+                   '</ul></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement)
+                         .toHaveText('when default1;when default2;');
+
+                     fixture.debugElement.componentInstance.switchValue = 'a';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when a1;when a2;');
+
+                     fixture.debugElement.componentInstance.switchValue = 'b';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when b1;when b2;');
+
+                     async.done();
+                   });
+             }));
+    });
+
+    describe('when values changes', () => {
+      it('should switch amongst when values',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               var template = '<div>' +
+                   '<ul [ngSwitch]="switchValue">' +
+                   '<template [ngSwitchCase]="when1"><li>when 1;</li></template>' +
+                   '<template [ngSwitchCase]="when2"><li>when 2;</li></template>' +
+                   '<template ngSwitchDefault><li>when default;</li></template>' +
+                   '</ul></div>';
+
+               tcb.overrideTemplate(TestComponent, template)
+                   .createAsync(TestComponent)
+                   .then((fixture) => {
+                     fixture.debugElement.componentInstance.when1 = 'a';
+                     fixture.debugElement.componentInstance.when2 = 'b';
+                     fixture.debugElement.componentInstance.switchValue = 'a';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when 1;');
+
+                     fixture.debugElement.componentInstance.switchValue = 'b';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when 2;');
+
+                     fixture.debugElement.componentInstance.switchValue = 'c';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when default;');
+
+                     fixture.debugElement.componentInstance.when1 = 'c';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when 1;');
+
+                     fixture.debugElement.componentInstance.when1 = 'd';
+                     fixture.detectChanges();
+                     expect(fixture.debugElement.nativeElement).toHaveText('when default;');
+
+                     async.done();
+                   });
+             }));
+    });
+  });
+}
+
+@Component(
+    {selector: 'test-cmp', directives: [NgSwitch, NgSwitchCase, NgSwitchDefault], template: ''})
+class TestComponent {
+  switchValue: any;
+  when1: any;
+  when2: any;
+
+  constructor() {
+    this.switchValue = null;
+    this.when1 = null;
+    this.when2 = null;
+  }
+}

modules/@angular/common/test/directives/ng_template_outlet_spec.ts

@@ -0,0 +1,218 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgTemplateOutlet} from '@angular/common';
+import {Component, ContentChildren, Directive, QueryList, TemplateRef} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+export function main() {
+  describe('insert', () => {
+    it('should do nothing if templateRef is null',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = `<template [ngTemplateOutlet]="null"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('');
+
+                   async.done();
+                 });
+           }));
+
+    it('should insert content specified by TemplateRef',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template>foo</template></tpl-refs><template [ngTemplateOutlet]="currentTplRef"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('');
+
+                   var refs = fixture.debugElement.children[0].references['refs'];
+
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('foo');
+
+                   async.done();
+                 });
+           }));
+
+    it('should clear content if TemplateRef becomes null',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template>foo</template></tpl-refs><template [ngTemplateOutlet]="currentTplRef"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.detectChanges();
+                   var refs = fixture.debugElement.children[0].references['refs'];
+
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('foo');
+
+                   fixture.componentInstance.currentTplRef = null;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('');
+
+                   async.done();
+                 });
+           }));
+
+    it('should swap content if TemplateRef changes',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template>foo</template><template>bar</template></tpl-refs><template [ngTemplateOutlet]="currentTplRef"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.detectChanges();
+                   var refs = fixture.debugElement.children[0].references['refs'];
+
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('foo');
+
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.last;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('bar');
+
+                   async.done();
+                 });
+           }));
+
+    it('should display template if context is null',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template>foo</template></tpl-refs><template [ngTemplateOutlet]="currentTplRef" [ngOutletContext]="null"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('');
+
+                   var refs = fixture.debugElement.children[0].references['refs'];
+
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+                   fixture.detectChanges();
+                   expect(fixture.nativeElement).toHaveText('foo');
+
+                   async.done();
+                 });
+           }));
+
+    it('should reflect initial context and changes',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template let-foo="foo"><span>{{foo}}</span></template></tpl-refs><template [ngTemplateOutlet]="currentTplRef" [ngOutletContext]="context"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   var refs = fixture.debugElement.children[0].references['refs'];
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('bar');
+
+                   fixture.componentInstance.context.foo = 'alter-bar';
+
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('alter-bar');
+
+                   async.done();
+                 });
+           }));
+
+    it('should reflect user defined $implicit property in the context',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template let-ctx><span>{{ctx.foo}}</span></template></tpl-refs><template [ngTemplateOutlet]="currentTplRef" [ngOutletContext]="context"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   var refs = fixture.debugElement.children[0].references['refs'];
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+
+                   fixture.componentInstance.context = {
+                     $implicit: fixture.componentInstance.context
+                   };
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('bar');
+
+                   async.done();
+                 });
+           }));
+
+    it('should reflect context re-binding',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template =
+                 `<tpl-refs #refs="tplRefs"><template let-shawshank="shawshank"><span>{{shawshank}}</span></template></tpl-refs><template [ngTemplateOutlet]="currentTplRef" [ngOutletContext]="context"></template>`;
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   var refs = fixture.debugElement.children[0].references['refs'];
+                   fixture.componentInstance.currentTplRef = refs.tplRefs.first;
+                   fixture.componentInstance.context = {shawshank: 'brooks'};
+
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('brooks');
+
+                   fixture.componentInstance.context = {shawshank: 'was here'};
+
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('was here');
+
+                   async.done();
+                 });
+           }));
+  });
+}
+
+
+@Directive({selector: 'tpl-refs', exportAs: 'tplRefs'})
+class CaptureTplRefs {
+  @ContentChildren(TemplateRef) tplRefs: QueryList<TemplateRef<any>>;
+}
+
+@Component({selector: 'test-cmp', directives: [NgTemplateOutlet, CaptureTplRefs], template: ''})
+class TestComponent {
+  currentTplRef: TemplateRef<any>;
+  context: any = {foo: 'bar'};
+}

modules/@angular/common/test/directives/non_bindable_spec.ts

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Component, Directive} from '@angular/core';
+import {ElementRef} from '@angular/core/src/linker/element_ref';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+export function main() {
+  describe('non-bindable', () => {
+    it('should not interpolate children',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div>{{text}}<span ngNonBindable>{{text}}</span></div>';
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   expect(fixture.debugElement.nativeElement).toHaveText('foo{{text}}');
+                   async.done();
+                 });
+           }));
+
+    it('should ignore directives on child nodes',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div ngNonBindable><span id=child test-dec>{{text}}</span></div>';
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+
+                   // We must use getDOM().querySelector instead of fixture.query here
+                   // since the elements inside are not compiled.
+                   var span = getDOM().querySelector(fixture.debugElement.nativeElement, '#child');
+                   expect(getDOM().hasClass(span, 'compiled')).toBeFalsy();
+                   async.done();
+                 });
+           }));
+
+    it('should trigger directives on the same node',
+       inject(
+           [TestComponentBuilder, AsyncTestCompleter],
+           (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+             var template = '<div><span id=child ngNonBindable test-dec>{{text}}</span></div>';
+             tcb.overrideTemplate(TestComponent, template)
+                 .createAsync(TestComponent)
+                 .then((fixture) => {
+                   fixture.detectChanges();
+                   var span = getDOM().querySelector(fixture.debugElement.nativeElement, '#child');
+                   expect(getDOM().hasClass(span, 'compiled')).toBeTruthy();
+                   async.done();
+                 });
+           }));
+  });
+}
+
+@Directive({selector: '[test-dec]'})
+class TestDirective {
+  constructor(el: ElementRef) { getDOM().addClass(el.nativeElement, 'compiled'); }
+}
+
+@Component({selector: 'test-cmp', directives: [TestDirective], template: ''})
+class TestComponent {
+  text: string;
+  constructor() { this.text = 'foo'; }
+}

modules/@angular/common/test/forms-deprecated/directives_spec.ts

@@ -0,0 +1,489 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {CheckboxControlValueAccessor, Control, ControlGroup, ControlValueAccessor, DefaultValueAccessor, NgControl, NgControlGroup, NgControlName, NgForm, NgFormControl, NgFormModel, NgModel, SelectControlValueAccessor, Validator, Validators} from '@angular/common/src/forms-deprecated';
+import {composeValidators, selectValueAccessor} from '@angular/common/src/forms-deprecated/directives/shared';
+import {SimpleChange} from '@angular/core/src/change_detection';
+import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {SpyNgControl, SpyValueAccessor} from '../spies';
+
+class DummyControlValueAccessor implements ControlValueAccessor {
+  writtenValue: any /** TODO #9100 */;
+
+  registerOnChange(fn: any /** TODO #9100 */) {}
+  registerOnTouched(fn: any /** TODO #9100 */) {}
+
+  writeValue(obj: any): void { this.writtenValue = obj; }
+}
+
+class CustomValidatorDirective implements Validator {
+  validate(c: Control): {[key: string]: any} { return {'custom': true}; }
+}
+
+function asyncValidator(expected: any /** TODO #9100 */, timeout = 0) {
+  return (c: any /** TODO #9100 */) => {
+    return new Promise((resolve) => {
+      var res = c.value != expected ? {'async': true} : null;
+      if (timeout == 0) {
+        resolve(res);
+      } else {
+        setTimeout(() => { resolve(res); }, timeout);
+      }
+    });
+  };
+}
+
+export function main() {
+  describe('Form Directives', () => {
+    var defaultAccessor: DefaultValueAccessor;
+
+    beforeEach(() => { defaultAccessor = new DefaultValueAccessor(null, null); });
+
+    describe('shared', () => {
+      describe('selectValueAccessor', () => {
+        var dir: NgControl;
+
+        beforeEach(() => { dir = <any>new SpyNgControl(); });
+
+        it('should throw when given an empty array',
+           () => { expect(() => selectValueAccessor(dir, [])).toThrowError(); });
+
+        it('should return the default value accessor when no other provided',
+           () => { expect(selectValueAccessor(dir, [defaultAccessor])).toEqual(defaultAccessor); });
+
+        it('should return checkbox accessor when provided', () => {
+          var checkboxAccessor = new CheckboxControlValueAccessor(null, null);
+          expect(selectValueAccessor(dir, [
+            defaultAccessor, checkboxAccessor
+          ])).toEqual(checkboxAccessor);
+        });
+
+        it('should return select accessor when provided', () => {
+          var selectAccessor = new SelectControlValueAccessor(null, null);
+          expect(selectValueAccessor(dir, [
+            defaultAccessor, selectAccessor
+          ])).toEqual(selectAccessor);
+        });
+
+        it('should throw when more than one build-in accessor is provided', () => {
+          var checkboxAccessor = new CheckboxControlValueAccessor(null, null);
+          var selectAccessor = new SelectControlValueAccessor(null, null);
+          expect(() => selectValueAccessor(dir, [checkboxAccessor, selectAccessor])).toThrowError();
+        });
+
+        it('should return custom accessor when provided', () => {
+          var customAccessor = new SpyValueAccessor();
+          var checkboxAccessor = new CheckboxControlValueAccessor(null, null);
+          expect(selectValueAccessor(dir, <any>[defaultAccessor, customAccessor, checkboxAccessor]))
+              .toEqual(customAccessor);
+        });
+
+        it('should throw when more than one custom accessor is provided', () => {
+          var customAccessor: ControlValueAccessor = <any>new SpyValueAccessor();
+          expect(() => selectValueAccessor(dir, [customAccessor, customAccessor])).toThrowError();
+        });
+      });
+
+      describe('composeValidators', () => {
+        it('should compose functions', () => {
+          var dummy1 = (_: any /** TODO #9100 */) => ({'dummy1': true});
+          var dummy2 = (_: any /** TODO #9100 */) => ({'dummy2': true});
+          var v = composeValidators([dummy1, dummy2]);
+          expect(v(new Control(''))).toEqual({'dummy1': true, 'dummy2': true});
+        });
+
+        it('should compose validator directives', () => {
+          var dummy1 = (_: any /** TODO #9100 */) => ({'dummy1': true});
+          var v = composeValidators([dummy1, new CustomValidatorDirective()]);
+          expect(v(new Control(''))).toEqual({'dummy1': true, 'custom': true});
+        });
+      });
+    });
+
+    describe('NgFormModel', () => {
+      var form: any /** TODO #9100 */;
+      var formModel: ControlGroup;
+      var loginControlDir: any /** TODO #9100 */;
+
+      beforeEach(() => {
+        form = new NgFormModel([], []);
+        formModel = new ControlGroup({
+          'login': new Control(),
+          'passwords':
+              new ControlGroup({'password': new Control(), 'passwordConfirm': new Control()})
+        });
+        form.form = formModel;
+
+        loginControlDir = new NgControlName(
+            form, [Validators.required], [asyncValidator('expected')], [defaultAccessor]);
+        loginControlDir.name = 'login';
+        loginControlDir.valueAccessor = new DummyControlValueAccessor();
+      });
+
+      it('should reexport control properties', () => {
+        expect(form.control).toBe(formModel);
+        expect(form.value).toBe(formModel.value);
+        expect(form.valid).toBe(formModel.valid);
+        expect(form.errors).toBe(formModel.errors);
+        expect(form.pristine).toBe(formModel.pristine);
+        expect(form.dirty).toBe(formModel.dirty);
+        expect(form.touched).toBe(formModel.touched);
+        expect(form.untouched).toBe(formModel.untouched);
+      });
+
+      describe('addControl', () => {
+        it('should throw when no control found', () => {
+          var dir = new NgControlName(form, null, null, [defaultAccessor]);
+          dir.name = 'invalidName';
+
+          expect(() => form.addControl(dir))
+              .toThrowError(new RegExp(`Cannot find control with name: 'invalidName'`));
+        });
+
+        it('should throw when no value accessor', () => {
+          var dir = new NgControlName(form, null, null, null);
+          dir.name = 'login';
+
+          expect(() => form.addControl(dir))
+              .toThrowError(new RegExp(`No value accessor for form control with name: 'login'`));
+        });
+
+        it('should throw when no value accessor with path', () => {
+          const group = new NgControlGroup(form, null, null);
+          const dir = new NgControlName(group, null, null, null);
+          group.name = 'passwords';
+          dir.name = 'password';
+
+          expect(() => form.addControl(dir))
+              .toThrowError(new RegExp(
+                  `No value accessor for form control with path: 'passwords -> password'`));
+        });
+
+        it('should set up validators', fakeAsync(() => {
+             form.addControl(loginControlDir);
+
+             // sync validators are set
+             expect(formModel.hasError('required', ['login'])).toBe(true);
+             expect(formModel.hasError('async', ['login'])).toBe(false);
+
+             (<Control>formModel.find(['login'])).updateValue('invalid value');
+
+             // sync validator passes, running async validators
+             expect(formModel.pending).toBe(true);
+
+             tick();
+
+             expect(formModel.hasError('required', ['login'])).toBe(false);
+             expect(formModel.hasError('async', ['login'])).toBe(true);
+           }));
+
+        it('should write value to the DOM', () => {
+          (<Control>formModel.find(['login'])).updateValue('initValue');
+
+          form.addControl(loginControlDir);
+
+          expect((<any>loginControlDir.valueAccessor).writtenValue).toEqual('initValue');
+        });
+
+        it('should add the directive to the list of directives included in the form', () => {
+          form.addControl(loginControlDir);
+          expect(form.directives).toEqual([loginControlDir]);
+        });
+      });
+
+      describe('addControlGroup', () => {
+        var matchingPasswordsValidator = (g: any /** TODO #9100 */) => {
+          if (g.controls['password'].value != g.controls['passwordConfirm'].value) {
+            return {'differentPasswords': true};
+          } else {
+            return null;
+          }
+        };
+
+        it('should set up validator', fakeAsync(() => {
+             var group = new NgControlGroup(
+                 form, [matchingPasswordsValidator], [asyncValidator('expected')]);
+             group.name = 'passwords';
+             form.addControlGroup(group);
+
+             (<Control>formModel.find(['passwords', 'password'])).updateValue('somePassword');
+             (<Control>formModel.find([
+               'passwords', 'passwordConfirm'
+             ])).updateValue('someOtherPassword');
+
+             // sync validators are set
+             expect(formModel.hasError('differentPasswords', ['passwords'])).toEqual(true);
+
+             (<Control>formModel.find([
+               'passwords', 'passwordConfirm'
+             ])).updateValue('somePassword');
+
+             // sync validators pass, running async validators
+             expect(formModel.pending).toBe(true);
+
+             tick();
+
+             expect(formModel.hasError('async', ['passwords'])).toBe(true);
+           }));
+      });
+
+      describe('removeControl', () => {
+        it('should remove the directive to the list of directives included in the form', () => {
+          form.addControl(loginControlDir);
+          form.removeControl(loginControlDir);
+          expect(form.directives).toEqual([]);
+        });
+      });
+
+      describe('ngOnChanges', () => {
+        it('should update dom values of all the directives', () => {
+          form.addControl(loginControlDir);
+
+          (<Control>formModel.find(['login'])).updateValue('new value');
+
+          form.ngOnChanges({});
+
+          expect((<any>loginControlDir.valueAccessor).writtenValue).toEqual('new value');
+        });
+
+        it('should set up a sync validator', () => {
+          var formValidator = (c: any /** TODO #9100 */) => ({'custom': true});
+          var f = new NgFormModel([formValidator], []);
+          f.form = formModel;
+          f.ngOnChanges({'form': new SimpleChange(null, null)});
+
+          expect(formModel.errors).toEqual({'custom': true});
+        });
+
+        it('should set up an async validator', fakeAsync(() => {
+             var f = new NgFormModel([], [asyncValidator('expected')]);
+             f.form = formModel;
+             f.ngOnChanges({'form': new SimpleChange(null, null)});
+
+             tick();
+
+             expect(formModel.errors).toEqual({'async': true});
+           }));
+      });
+    });
+
+    describe('NgForm', () => {
+      var form: any /** TODO #9100 */;
+      var formModel: ControlGroup;
+      var loginControlDir: any /** TODO #9100 */;
+      var personControlGroupDir: any /** TODO #9100 */;
+
+      beforeEach(() => {
+        form = new NgForm([], []);
+        formModel = form.form;
+
+        personControlGroupDir = new NgControlGroup(form, [], []);
+        personControlGroupDir.name = 'person';
+
+        loginControlDir = new NgControlName(personControlGroupDir, null, null, [defaultAccessor]);
+        loginControlDir.name = 'login';
+        loginControlDir.valueAccessor = new DummyControlValueAccessor();
+      });
+
+      it('should reexport control properties', () => {
+        expect(form.control).toBe(formModel);
+        expect(form.value).toBe(formModel.value);
+        expect(form.valid).toBe(formModel.valid);
+        expect(form.errors).toBe(formModel.errors);
+        expect(form.pristine).toBe(formModel.pristine);
+        expect(form.dirty).toBe(formModel.dirty);
+        expect(form.touched).toBe(formModel.touched);
+        expect(form.untouched).toBe(formModel.untouched);
+      });
+
+      describe('addControl & addControlGroup', () => {
+        it('should create a control with the given name', fakeAsync(() => {
+             form.addControlGroup(personControlGroupDir);
+             form.addControl(loginControlDir);
+
+             flushMicrotasks();
+
+             expect(formModel.find(['person', 'login'])).not.toBeNull;
+           }));
+
+        // should update the form's value and validity
+      });
+
+      describe('removeControl & removeControlGroup', () => {
+        it('should remove control', fakeAsync(() => {
+             form.addControlGroup(personControlGroupDir);
+             form.addControl(loginControlDir);
+
+             form.removeControlGroup(personControlGroupDir);
+             form.removeControl(loginControlDir);
+
+             flushMicrotasks();
+
+             expect(formModel.find(['person'])).toBeNull();
+             expect(formModel.find(['person', 'login'])).toBeNull();
+           }));
+
+        // should update the form's value and validity
+      });
+
+      it('should set up sync validator', fakeAsync(() => {
+           var formValidator = (c: any /** TODO #9100 */) => ({'custom': true});
+           var f = new NgForm([formValidator], []);
+
+           tick();
+
+           expect(f.form.errors).toEqual({'custom': true});
+         }));
+
+      it('should set up async validator', fakeAsync(() => {
+           var f = new NgForm([], [asyncValidator('expected')]);
+
+           tick();
+
+           expect(f.form.errors).toEqual({'async': true});
+         }));
+    });
+
+    describe('NgControlGroup', () => {
+      var formModel: any /** TODO #9100 */;
+      var controlGroupDir: any /** TODO #9100 */;
+
+      beforeEach(() => {
+        formModel = new ControlGroup({'login': new Control(null)});
+
+        var parent = new NgFormModel([], []);
+        parent.form = new ControlGroup({'group': formModel});
+        controlGroupDir = new NgControlGroup(parent, [], []);
+        controlGroupDir.name = 'group';
+      });
+
+      it('should reexport control properties', () => {
+        expect(controlGroupDir.control).toBe(formModel);
+        expect(controlGroupDir.value).toBe(formModel.value);
+        expect(controlGroupDir.valid).toBe(formModel.valid);
+        expect(controlGroupDir.errors).toBe(formModel.errors);
+        expect(controlGroupDir.pristine).toBe(formModel.pristine);
+        expect(controlGroupDir.dirty).toBe(formModel.dirty);
+        expect(controlGroupDir.touched).toBe(formModel.touched);
+        expect(controlGroupDir.untouched).toBe(formModel.untouched);
+      });
+    });
+
+    describe('NgFormControl', () => {
+      var controlDir: any /** TODO #9100 */;
+      var control: any /** TODO #9100 */;
+      var checkProperties = function(control: any /** TODO #9100 */) {
+        expect(controlDir.control).toBe(control);
+        expect(controlDir.value).toBe(control.value);
+        expect(controlDir.valid).toBe(control.valid);
+        expect(controlDir.errors).toBe(control.errors);
+        expect(controlDir.pristine).toBe(control.pristine);
+        expect(controlDir.dirty).toBe(control.dirty);
+        expect(controlDir.touched).toBe(control.touched);
+        expect(controlDir.untouched).toBe(control.untouched);
+      };
+
+      beforeEach(() => {
+        controlDir = new NgFormControl([Validators.required], [], [defaultAccessor]);
+        controlDir.valueAccessor = new DummyControlValueAccessor();
+
+        control = new Control(null);
+        controlDir.form = control;
+      });
+
+      it('should reexport control properties', () => { checkProperties(control); });
+
+      it('should reexport new control properties', () => {
+        var newControl = new Control(null);
+        controlDir.form = newControl;
+        controlDir.ngOnChanges({'form': new SimpleChange(control, newControl)});
+
+        checkProperties(newControl);
+      });
+
+      it('should set up validator', () => {
+        expect(control.valid).toBe(true);
+
+        // this will add the required validator and recalculate the validity
+        controlDir.ngOnChanges({'form': new SimpleChange(null, control)});
+
+        expect(control.valid).toBe(false);
+      });
+    });
+
+    describe('NgModel', () => {
+      var ngModel: any /** TODO #9100 */;
+
+      beforeEach(() => {
+        ngModel =
+            new NgModel([Validators.required], [asyncValidator('expected')], [defaultAccessor]);
+        ngModel.valueAccessor = new DummyControlValueAccessor();
+      });
+
+      it('should reexport control properties', () => {
+        var control = ngModel.control;
+        expect(ngModel.control).toBe(control);
+        expect(ngModel.value).toBe(control.value);
+        expect(ngModel.valid).toBe(control.valid);
+        expect(ngModel.errors).toBe(control.errors);
+        expect(ngModel.pristine).toBe(control.pristine);
+        expect(ngModel.dirty).toBe(control.dirty);
+        expect(ngModel.touched).toBe(control.touched);
+        expect(ngModel.untouched).toBe(control.untouched);
+      });
+
+      it('should throw when no value accessor with unnamed control', () => {
+        const unnamedDir = new NgModel(null, null, null);
+
+        expect(() => unnamedDir.ngOnChanges({}))
+            .toThrowError(new RegExp(`No value accessor for form control with unspecified name`));
+      });
+
+
+      it('should set up validator', fakeAsync(() => {
+           // this will add the required validator and recalculate the validity
+           ngModel.ngOnChanges({});
+           tick();
+
+           expect(ngModel.control.errors).toEqual({'required': true});
+
+           ngModel.control.updateValue('someValue');
+           tick();
+
+           expect(ngModel.control.errors).toEqual({'async': true});
+         }));
+    });
+
+    describe('NgControlName', () => {
+      var formModel: any /** TODO #9100 */;
+      var controlNameDir: any /** TODO #9100 */;
+
+      beforeEach(() => {
+        formModel = new Control('name');
+
+        var parent = new NgFormModel([], []);
+        parent.form = new ControlGroup({'name': formModel});
+        controlNameDir = new NgControlName(parent, [], [], [defaultAccessor]);
+        controlNameDir.name = 'name';
+      });
+
+      it('should reexport control properties', () => {
+        expect(controlNameDir.control).toBe(formModel);
+        expect(controlNameDir.value).toBe(formModel.value);
+        expect(controlNameDir.valid).toBe(formModel.valid);
+        expect(controlNameDir.errors).toBe(formModel.errors);
+        expect(controlNameDir.pristine).toBe(formModel.pristine);
+        expect(controlNameDir.dirty).toBe(formModel.dirty);
+        expect(controlNameDir.touched).toBe(formModel.touched);
+        expect(controlNameDir.untouched).toBe(formModel.untouched);
+      });
+    });
+  });
+}

modules/@angular/common/test/forms-deprecated/form_builder_spec.ts

@@ -0,0 +1,69 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Control, FormBuilder} from '@angular/common/src/forms-deprecated';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+
+export function main() {
+  function syncValidator(_: any): any { return null; }
+  function asyncValidator(_: any) { return Promise.resolve(null); }
+
+  describe('Form Builder', () => {
+    var b: any /** TODO #9100 */;
+
+    beforeEach(() => { b = new FormBuilder(); });
+
+    it('should create controls from a value', () => {
+      var g = b.group({'login': 'some value'});
+
+      expect(g.controls['login'].value).toEqual('some value');
+    });
+
+    it('should create controls from an array', () => {
+      var g = b.group(
+          {'login': ['some value'], 'password': ['some value', syncValidator, asyncValidator]});
+
+      expect(g.controls['login'].value).toEqual('some value');
+      expect(g.controls['password'].value).toEqual('some value');
+      expect(g.controls['password'].validator).toEqual(syncValidator);
+      expect(g.controls['password'].asyncValidator).toEqual(asyncValidator);
+    });
+
+    it('should use controls', () => {
+      var g = b.group({'login': b.control('some value', syncValidator, asyncValidator)});
+
+      expect(g.controls['login'].value).toEqual('some value');
+      expect(g.controls['login'].validator).toBe(syncValidator);
+      expect(g.controls['login'].asyncValidator).toBe(asyncValidator);
+    });
+
+    it('should create groups with optional controls', () => {
+      var g = b.group({'login': 'some value'}, {'optionals': {'login': false}});
+
+      expect(g.contains('login')).toEqual(false);
+    });
+
+    it('should create groups with a custom validator', () => {
+      var g = b.group(
+          {'login': 'some value'}, {'validator': syncValidator, 'asyncValidator': asyncValidator});
+
+      expect(g.validator).toBe(syncValidator);
+      expect(g.asyncValidator).toBe(asyncValidator);
+    });
+
+    it('should create control arrays', () => {
+      var c = b.control('three');
+      var a = b.array(
+          ['one', ['two', syncValidator], c, b.array(['four'])], syncValidator, asyncValidator);
+
+      expect(a.value).toEqual(['one', 'two', 'three', ['four']]);
+      expect(a.validator).toBe(syncValidator);
+      expect(a.asyncValidator).toBe(asyncValidator);
+    });
+  });
+}

modules/@angular/common/test/forms-deprecated/model_spec.ts

@@ -0,0 +1,856 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Control, ControlArray, ControlGroup, Validators} from '@angular/common/src/forms-deprecated';
+import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {EventEmitter} from '../../src/facade/async';
+import {isPresent} from '../../src/facade/lang';
+
+export function main() {
+  function asyncValidator(expected: any /** TODO #9100 */, timeouts = {}) {
+    return (c: any /** TODO #9100 */) => {
+      return new Promise((resolve) => {
+        var t = isPresent((timeouts as any /** TODO #9100 */)[c.value]) ?
+            (timeouts as any /** TODO #9100 */)[c.value] :
+            0;
+        var res = c.value != expected ? {'async': true} : null;
+
+        if (t == 0) {
+          resolve(res);
+        } else {
+          setTimeout(() => { resolve(res); }, t);
+        }
+      });
+    };
+  }
+
+  function asyncValidatorReturningObservable(c: any /** TODO #9100 */) {
+    var e = new EventEmitter();
+    Promise.resolve(null).then(() => { e.emit({'async': true}); });
+    return e;
+  }
+
+  describe('Form Model', () => {
+    describe('Control', () => {
+      it('should default the value to null', () => {
+        var c = new Control();
+        expect(c.value).toBe(null);
+      });
+
+      describe('validator', () => {
+        it('should run validator with the initial value', () => {
+          var c = new Control('value', Validators.required);
+          expect(c.valid).toEqual(true);
+        });
+
+        it('should rerun the validator when the value changes', () => {
+          var c = new Control('value', Validators.required);
+          c.updateValue(null);
+          expect(c.valid).toEqual(false);
+        });
+
+        it('should return errors', () => {
+          var c = new Control(null, Validators.required);
+          expect(c.errors).toEqual({'required': true});
+        });
+      });
+
+      describe('asyncValidator', () => {
+        it('should run validator with the initial value', fakeAsync(() => {
+             var c = new Control('value', null, asyncValidator('expected'));
+             tick();
+
+             expect(c.valid).toEqual(false);
+             expect(c.errors).toEqual({'async': true});
+           }));
+
+        it('should support validators returning observables', fakeAsync(() => {
+             var c = new Control('value', null, asyncValidatorReturningObservable);
+             tick();
+
+             expect(c.valid).toEqual(false);
+             expect(c.errors).toEqual({'async': true});
+           }));
+
+        it('should rerun the validator when the value changes', fakeAsync(() => {
+             var c = new Control('value', null, asyncValidator('expected'));
+
+             c.updateValue('expected');
+             tick();
+
+             expect(c.valid).toEqual(true);
+           }));
+
+        it('should run the async validator only when the sync validator passes', fakeAsync(() => {
+             var c = new Control('', Validators.required, asyncValidator('expected'));
+             tick();
+
+             expect(c.errors).toEqual({'required': true});
+
+             c.updateValue('some value');
+             tick();
+
+             expect(c.errors).toEqual({'async': true});
+           }));
+
+        it('should mark the control as pending while running the async validation',
+           fakeAsync(() => {
+             var c = new Control('', null, asyncValidator('expected'));
+
+             expect(c.pending).toEqual(true);
+
+             tick();
+
+             expect(c.pending).toEqual(false);
+           }));
+
+        it('should only use the latest async validation run', fakeAsync(() => {
+             var c =
+                 new Control('', null, asyncValidator('expected', {'long': 200, 'expected': 100}));
+
+             c.updateValue('long');
+             c.updateValue('expected');
+
+             tick(300);
+
+             expect(c.valid).toEqual(true);
+           }));
+      });
+
+      describe('dirty', () => {
+        it('should be false after creating a control', () => {
+          var c = new Control('value');
+          expect(c.dirty).toEqual(false);
+        });
+
+        it('should be true after changing the value of the control', () => {
+          var c = new Control('value');
+          c.markAsDirty();
+          expect(c.dirty).toEqual(true);
+        });
+      });
+
+      describe('updateValue', () => {
+        var g: any /** TODO #9100 */, c: any /** TODO #9100 */;
+        beforeEach(() => {
+          c = new Control('oldValue');
+          g = new ControlGroup({'one': c});
+        });
+
+        it('should update the value of the control', () => {
+          c.updateValue('newValue');
+          expect(c.value).toEqual('newValue');
+        });
+
+        it('should invoke ngOnChanges if it is present', () => {
+          var ngOnChanges: any /** TODO #9100 */;
+          c.registerOnChange((v: any /** TODO #9100 */) => ngOnChanges = ['invoked', v]);
+
+          c.updateValue('newValue');
+
+          expect(ngOnChanges).toEqual(['invoked', 'newValue']);
+        });
+
+        it('should not invoke on change when explicitly specified', () => {
+          var onChange: any /** TODO #9100 */ = null;
+          c.registerOnChange((v: any /** TODO #9100 */) => onChange = ['invoked', v]);
+
+          c.updateValue('newValue', {emitModelToViewChange: false});
+
+          expect(onChange).toBeNull();
+        });
+
+        it('should update the parent', () => {
+          c.updateValue('newValue');
+          expect(g.value).toEqual({'one': 'newValue'});
+        });
+
+        it('should not update the parent when explicitly specified', () => {
+          c.updateValue('newValue', {onlySelf: true});
+          expect(g.value).toEqual({'one': 'oldValue'});
+        });
+
+        it('should fire an event', fakeAsync(() => {
+
+             c.valueChanges.subscribe(
+                 {next: (value: any) => { expect(value).toEqual('newValue'); }});
+
+             c.updateValue('newValue');
+             tick();
+           }));
+
+        it('should not fire an event when explicitly specified', fakeAsync(() => {
+             c.valueChanges.subscribe({next: (value: any) => { throw 'Should not happen'; }});
+
+             c.updateValue('newValue', {emitEvent: false});
+
+             tick();
+           }));
+      });
+
+      describe('valueChanges & statusChanges', () => {
+        var c: any /** TODO #9100 */;
+
+        beforeEach(() => { c = new Control('old', Validators.required); });
+
+        it('should fire an event after the value has been updated',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             c.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(c.value).toEqual('new');
+                 expect(value).toEqual('new');
+                 async.done();
+               }
+             });
+             c.updateValue('new');
+           }));
+
+        it('should fire an event after the status has been updated to invalid', fakeAsync(() => {
+             c.statusChanges.subscribe({
+               next: (status: any) => {
+                 expect(c.status).toEqual('INVALID');
+                 expect(status).toEqual('INVALID');
+               }
+             });
+
+             c.updateValue('');
+             tick();
+           }));
+
+        it('should fire an event after the status has been updated to pending', fakeAsync(() => {
+             var c = new Control('old', Validators.required, asyncValidator('expected'));
+
+             var log: any[] /** TODO #9100 */ = [];
+             c.valueChanges.subscribe({next: (value: any) => log.push(`value: '${value}'`)});
+
+             c.statusChanges.subscribe({next: (status: any) => log.push(`status: '${status}'`)});
+
+             c.updateValue('');
+             tick();
+
+             c.updateValue('nonEmpty');
+             tick();
+
+             c.updateValue('expected');
+             tick();
+
+             expect(log).toEqual([
+               '' +
+                   'value: \'\'',
+               'status: \'INVALID\'',
+               'value: \'nonEmpty\'',
+               'status: \'PENDING\'',
+               'status: \'INVALID\'',
+               'value: \'expected\'',
+               'status: \'PENDING\'',
+               'status: \'VALID\'',
+             ]);
+           }));
+
+        // TODO: remove the if statement after making observable delivery sync
+        it('should update set errors and status before emitting an event',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             c.valueChanges.subscribe((value: any /** TODO #9100 */) => {
+               expect(c.valid).toEqual(false);
+               expect(c.errors).toEqual({'required': true});
+               async.done();
+             });
+             c.updateValue('');
+           }));
+
+        it('should return a cold observable',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             c.updateValue('will be ignored');
+             c.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(value).toEqual('new');
+                 async.done();
+               }
+             });
+             c.updateValue('new');
+           }));
+      });
+
+      describe('setErrors', () => {
+        it('should set errors on a control', () => {
+          var c = new Control('someValue');
+
+          c.setErrors({'someError': true});
+
+          expect(c.valid).toEqual(false);
+          expect(c.errors).toEqual({'someError': true});
+        });
+
+        it('should reset the errors and validity when the value changes', () => {
+          var c = new Control('someValue', Validators.required);
+
+          c.setErrors({'someError': true});
+          c.updateValue('');
+
+          expect(c.errors).toEqual({'required': true});
+        });
+
+        it('should update the parent group\'s validity', () => {
+          var c = new Control('someValue');
+          var g = new ControlGroup({'one': c});
+
+          expect(g.valid).toEqual(true);
+
+          c.setErrors({'someError': true});
+
+          expect(g.valid).toEqual(false);
+        });
+
+        it('should not reset parent\'s errors', () => {
+          var c = new Control('someValue');
+          var g = new ControlGroup({'one': c});
+
+          g.setErrors({'someGroupError': true});
+          c.setErrors({'someError': true});
+
+          expect(g.errors).toEqual({'someGroupError': true});
+        });
+
+        it('should reset errors when updating a value', () => {
+          var c = new Control('oldValue');
+          var g = new ControlGroup({'one': c});
+
+          g.setErrors({'someGroupError': true});
+          c.setErrors({'someError': true});
+
+          c.updateValue('newValue');
+
+          expect(c.errors).toEqual(null);
+          expect(g.errors).toEqual(null);
+        });
+      });
+    });
+
+    describe('ControlGroup', () => {
+      describe('value', () => {
+        it('should be the reduced value of the child controls', () => {
+          var g = new ControlGroup({'one': new Control('111'), 'two': new Control('222')});
+          expect(g.value).toEqual({'one': '111', 'two': '222'});
+        });
+
+        it('should be empty when there are no child controls', () => {
+          var g = new ControlGroup({});
+          expect(g.value).toEqual({});
+        });
+
+        it('should support nested groups', () => {
+          var g = new ControlGroup(
+              {'one': new Control('111'), 'nested': new ControlGroup({'two': new Control('222')})});
+          expect(g.value).toEqual({'one': '111', 'nested': {'two': '222'}});
+
+          (<Control>(g.controls['nested'].find('two'))).updateValue('333');
+
+          expect(g.value).toEqual({'one': '111', 'nested': {'two': '333'}});
+        });
+      });
+
+      describe('adding and removing controls', () => {
+        it('should update value and validity when control is added', () => {
+          var g = new ControlGroup({'one': new Control('1')});
+          expect(g.value).toEqual({'one': '1'});
+          expect(g.valid).toBe(true);
+
+          g.addControl('two', new Control('2', Validators.minLength(10)));
+
+          expect(g.value).toEqual({'one': '1', 'two': '2'});
+          expect(g.valid).toBe(false);
+        });
+
+        it('should update value and validity when control is removed', () => {
+          var g = new ControlGroup(
+              {'one': new Control('1'), 'two': new Control('2', Validators.minLength(10))});
+          expect(g.value).toEqual({'one': '1', 'two': '2'});
+          expect(g.valid).toBe(false);
+
+          g.removeControl('two');
+
+          expect(g.value).toEqual({'one': '1'});
+          expect(g.valid).toBe(true);
+        });
+      });
+
+      describe('errors', () => {
+        it('should run the validator when the value changes', () => {
+          var simpleValidator = (c: any /** TODO #9100 */) =>
+              c.controls['one'].value != 'correct' ? {'broken': true} : null;
+
+          var c = new Control(null);
+          var g = new ControlGroup({'one': c}, null, simpleValidator);
+
+          c.updateValue('correct');
+
+          expect(g.valid).toEqual(true);
+          expect(g.errors).toEqual(null);
+
+          c.updateValue('incorrect');
+
+          expect(g.valid).toEqual(false);
+          expect(g.errors).toEqual({'broken': true});
+        });
+      });
+
+      describe('dirty', () => {
+        var c: any /** TODO #9100 */, g: any /** TODO #9100 */;
+
+        beforeEach(() => {
+          c = new Control('value');
+          g = new ControlGroup({'one': c});
+        });
+
+        it('should be false after creating a control', () => { expect(g.dirty).toEqual(false); });
+
+        it('should be false after changing the value of the control', () => {
+          c.markAsDirty();
+
+          expect(g.dirty).toEqual(true);
+        });
+      });
+
+      describe('optional components', () => {
+        describe('contains', () => {
+          var group: any /** TODO #9100 */;
+
+          beforeEach(() => {
+            group = new ControlGroup(
+                {
+                  'required': new Control('requiredValue'),
+                  'optional': new Control('optionalValue')
+                },
+                {'optional': false});
+          });
+
+          // rename contains into has
+          it('should return false when the component is not included',
+             () => { expect(group.contains('optional')).toEqual(false); });
+
+          it('should return false when there is no component with the given name',
+             () => { expect(group.contains('something else')).toEqual(false); });
+
+          it('should return true when the component is included', () => {
+            expect(group.contains('required')).toEqual(true);
+
+            group.include('optional');
+
+            expect(group.contains('optional')).toEqual(true);
+          });
+        });
+
+        it('should not include an inactive component into the group value', () => {
+          var group = new ControlGroup(
+              {'required': new Control('requiredValue'), 'optional': new Control('optionalValue')},
+              {'optional': false});
+
+          expect(group.value).toEqual({'required': 'requiredValue'});
+
+          group.include('optional');
+
+          expect(group.value).toEqual({'required': 'requiredValue', 'optional': 'optionalValue'});
+        });
+
+        it('should not run Validators on an inactive component', () => {
+          var group = new ControlGroup(
+              {
+                'required': new Control('requiredValue', Validators.required),
+                'optional': new Control('', Validators.required)
+              },
+              {'optional': false});
+
+          expect(group.valid).toEqual(true);
+
+          group.include('optional');
+
+          expect(group.valid).toEqual(false);
+        });
+      });
+
+      describe('valueChanges', () => {
+        var g: any /** TODO #9100 */, c1: any /** TODO #9100 */, c2: any /** TODO #9100 */;
+
+        beforeEach(() => {
+          c1 = new Control('old1');
+          c2 = new Control('old2');
+          g = new ControlGroup({'one': c1, 'two': c2}, {'two': true});
+        });
+
+        it('should fire an event after the value has been updated',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             g.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(g.value).toEqual({'one': 'new1', 'two': 'old2'});
+                 expect(value).toEqual({'one': 'new1', 'two': 'old2'});
+                 async.done();
+               }
+             });
+             c1.updateValue('new1');
+           }));
+
+        it('should fire an event after the control\'s observable fired an event',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var controlCallbackIsCalled = false;
+
+
+             c1.valueChanges.subscribe({next: (value: any) => { controlCallbackIsCalled = true; }});
+
+             g.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(controlCallbackIsCalled).toBe(true);
+                 async.done();
+               }
+             });
+
+             c1.updateValue('new1');
+           }));
+
+        it('should fire an event when a control is excluded',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             g.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(value).toEqual({'one': 'old1'});
+                 async.done();
+               }
+             });
+
+             g.exclude('two');
+           }));
+
+        it('should fire an event when a control is included',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             g.exclude('two');
+
+             g.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(value).toEqual({'one': 'old1', 'two': 'old2'});
+                 async.done();
+               }
+             });
+
+             g.include('two');
+           }));
+
+        it('should fire an event every time a control is updated',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var loggedValues: any[] /** TODO #9100 */ = [];
+
+             g.valueChanges.subscribe({
+               next: (value: any) => {
+                 loggedValues.push(value);
+
+                 if (loggedValues.length == 2) {
+                   expect(loggedValues).toEqual([
+                     {'one': 'new1', 'two': 'old2'}, {'one': 'new1', 'two': 'new2'}
+                   ]);
+                   async.done();
+                 }
+               }
+             });
+
+             c1.updateValue('new1');
+             c2.updateValue('new2');
+           }));
+
+        xit('should not fire an event when an excluded control is updated',
+            inject(
+                [AsyncTestCompleter], (async: AsyncTestCompleter) => {
+                                          // hard to test without hacking zones
+                                      }));
+      });
+
+      describe('getError', () => {
+        it('should return the error when it is present', () => {
+          var c = new Control('', Validators.required);
+          var g = new ControlGroup({'one': c});
+          expect(c.getError('required')).toEqual(true);
+          expect(g.getError('required', ['one'])).toEqual(true);
+        });
+
+        it('should return null otherwise', () => {
+          var c = new Control('not empty', Validators.required);
+          var g = new ControlGroup({'one': c});
+          expect(c.getError('invalid')).toEqual(null);
+          expect(g.getError('required', ['one'])).toEqual(null);
+          expect(g.getError('required', ['invalid'])).toEqual(null);
+        });
+      });
+
+      describe('asyncValidator', () => {
+        it('should run the async validator', fakeAsync(() => {
+             var c = new Control('value');
+             var g = new ControlGroup({'one': c}, null, null, asyncValidator('expected'));
+
+             expect(g.pending).toEqual(true);
+
+             tick(1);
+
+             expect(g.errors).toEqual({'async': true});
+             expect(g.pending).toEqual(false);
+           }));
+
+        it('should set the parent group\'s status to pending', fakeAsync(() => {
+             var c = new Control('value', null, asyncValidator('expected'));
+             var g = new ControlGroup({'one': c});
+
+             expect(g.pending).toEqual(true);
+
+             tick(1);
+
+             expect(g.pending).toEqual(false);
+           }));
+
+        it('should run the parent group\'s async validator when children are pending',
+           fakeAsync(() => {
+             var c = new Control('value', null, asyncValidator('expected'));
+             var g = new ControlGroup({'one': c}, null, null, asyncValidator('expected'));
+
+             tick(1);
+
+             expect(g.errors).toEqual({'async': true});
+             expect(g.find(['one']).errors).toEqual({'async': true});
+           }));
+      });
+    });
+
+    describe('ControlArray', () => {
+      describe('adding/removing', () => {
+        var a: ControlArray;
+        var c1: any /** TODO #9100 */, c2: any /** TODO #9100 */, c3: any /** TODO #9100 */;
+
+        beforeEach(() => {
+          a = new ControlArray([]);
+          c1 = new Control(1);
+          c2 = new Control(2);
+          c3 = new Control(3);
+        });
+
+        it('should support pushing', () => {
+          a.push(c1);
+          expect(a.length).toEqual(1);
+          expect(a.controls).toEqual([c1]);
+        });
+
+        it('should support removing', () => {
+          a.push(c1);
+          a.push(c2);
+          a.push(c3);
+
+          a.removeAt(1);
+
+          expect(a.controls).toEqual([c1, c3]);
+        });
+
+        it('should support inserting', () => {
+          a.push(c1);
+          a.push(c3);
+
+          a.insert(1, c2);
+
+          expect(a.controls).toEqual([c1, c2, c3]);
+        });
+      });
+
+      describe('value', () => {
+        it('should be the reduced value of the child controls', () => {
+          var a = new ControlArray([new Control(1), new Control(2)]);
+          expect(a.value).toEqual([1, 2]);
+        });
+
+        it('should be an empty array when there are no child controls', () => {
+          var a = new ControlArray([]);
+          expect(a.value).toEqual([]);
+        });
+      });
+
+      describe('errors', () => {
+        it('should run the validator when the value changes', () => {
+          var simpleValidator = (c: any /** TODO #9100 */) =>
+              c.controls[0].value != 'correct' ? {'broken': true} : null;
+
+          var c = new Control(null);
+          var g = new ControlArray([c], simpleValidator);
+
+          c.updateValue('correct');
+
+          expect(g.valid).toEqual(true);
+          expect(g.errors).toEqual(null);
+
+          c.updateValue('incorrect');
+
+          expect(g.valid).toEqual(false);
+          expect(g.errors).toEqual({'broken': true});
+        });
+      });
+
+
+      describe('dirty', () => {
+        var c: Control;
+        var a: ControlArray;
+
+        beforeEach(() => {
+          c = new Control('value');
+          a = new ControlArray([c]);
+        });
+
+        it('should be false after creating a control', () => { expect(a.dirty).toEqual(false); });
+
+        it('should be false after changing the value of the control', () => {
+          c.markAsDirty();
+
+          expect(a.dirty).toEqual(true);
+        });
+      });
+
+      describe('pending', () => {
+        var c: Control;
+        var a: ControlArray;
+
+        beforeEach(() => {
+          c = new Control('value');
+          a = new ControlArray([c]);
+        });
+
+        it('should be false after creating a control', () => {
+          expect(c.pending).toEqual(false);
+          expect(a.pending).toEqual(false);
+        });
+
+        it('should be true after changing the value of the control', () => {
+          c.markAsPending();
+
+          expect(c.pending).toEqual(true);
+          expect(a.pending).toEqual(true);
+        });
+
+        it('should not update the parent when onlySelf = true', () => {
+          c.markAsPending({onlySelf: true});
+
+          expect(c.pending).toEqual(true);
+          expect(a.pending).toEqual(false);
+        });
+      });
+
+      describe('valueChanges', () => {
+        var a: ControlArray;
+        var c1: any /** TODO #9100 */, c2: any /** TODO #9100 */;
+
+        beforeEach(() => {
+          c1 = new Control('old1');
+          c2 = new Control('old2');
+          a = new ControlArray([c1, c2]);
+        });
+
+        it('should fire an event after the value has been updated',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             a.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(a.value).toEqual(['new1', 'old2']);
+                 expect(value).toEqual(['new1', 'old2']);
+                 async.done();
+               }
+             });
+             c1.updateValue('new1');
+           }));
+
+        it('should fire an event after the control\'s observable fired an event',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var controlCallbackIsCalled = false;
+
+
+             c1.valueChanges.subscribe({next: (value: any) => { controlCallbackIsCalled = true; }});
+
+             a.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(controlCallbackIsCalled).toBe(true);
+                 async.done();
+               }
+             });
+
+             c1.updateValue('new1');
+           }));
+
+        it('should fire an event when a control is removed',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             a.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(value).toEqual(['old1']);
+                 async.done();
+               }
+             });
+
+             a.removeAt(1);
+           }));
+
+        it('should fire an event when a control is added',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             a.removeAt(1);
+
+             a.valueChanges.subscribe({
+               next: (value: any) => {
+                 expect(value).toEqual(['old1', 'old2']);
+                 async.done();
+               }
+             });
+
+             a.push(c2);
+           }));
+      });
+
+      describe('find', () => {
+        it('should return null when path is null', () => {
+          var g = new ControlGroup({});
+          expect(g.find(null)).toEqual(null);
+        });
+
+        it('should return null when path is empty', () => {
+          var g = new ControlGroup({});
+          expect(g.find([])).toEqual(null);
+        });
+
+        it('should return null when path is invalid', () => {
+          var g = new ControlGroup({});
+          expect(g.find(['one', 'two'])).toEqual(null);
+        });
+
+        it('should return a child of a control group', () => {
+          var g = new ControlGroup(
+              {'one': new Control('111'), 'nested': new ControlGroup({'two': new Control('222')})});
+
+          expect(g.find(['nested', 'two']).value).toEqual('222');
+          expect(g.find(['one']).value).toEqual('111');
+          expect(g.find('nested/two').value).toEqual('222');
+          expect(g.find('one').value).toEqual('111');
+        });
+
+        it('should return an element of an array', () => {
+          var g = new ControlGroup({'array': new ControlArray([new Control('111')])});
+
+          expect(g.find(['array', 0]).value).toEqual('111');
+        });
+      });
+
+      describe('asyncValidator', () => {
+        it('should run the async validator', fakeAsync(() => {
+             var c = new Control('value');
+             var g = new ControlArray([c], null, asyncValidator('expected'));
+
+             expect(g.pending).toEqual(true);
+
+             tick(1);
+
+             expect(g.errors).toEqual({'async': true});
+             expect(g.pending).toEqual(false);
+           }));
+      });
+    });
+  });
+}

modules/@angular/common/test/forms-deprecated/validators_spec.ts

@@ -0,0 +1,196 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {AbstractControl, Control, ControlArray, ControlGroup, Validators} from '@angular/common/src/forms-deprecated';
+import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {Observable} from 'rxjs/Observable';
+
+import {EventEmitter} from '../../src/facade/async';
+import {normalizeAsyncValidator} from '../../src/forms-deprecated/directives/normalize_validator';
+
+export function main() {
+  function validator(key: string, error: any) {
+    return function(c: AbstractControl) {
+      var r = {};
+      (r as any)[key] = error;
+      return r;
+    };
+  }
+
+  class AsyncValidatorDirective {
+    constructor(private expected: string, private error: any) {}
+
+    validate(c: any): {[key: string]: any;} {
+      return Observable.create((obs: any) => {
+        const error = this.expected !== c.value ? this.error : null;
+        obs.next(error);
+        obs.complete();
+      });
+    }
+  }
+
+  describe('Validators', () => {
+    describe('required', () => {
+      it('should error on an empty string',
+         () => { expect(Validators.required(new Control(''))).toEqual({'required': true}); });
+
+      it('should error on null',
+         () => { expect(Validators.required(new Control(null))).toEqual({'required': true}); });
+
+      it('should not error on a non-empty string',
+         () => { expect(Validators.required(new Control('not empty'))).toEqual(null); });
+
+      it('should accept zero as valid',
+         () => { expect(Validators.required(new Control(0))).toEqual(null); });
+    });
+
+    describe('minLength', () => {
+      it('should not error on an empty string',
+         () => { expect(Validators.minLength(2)(new Control(''))).toEqual(null); });
+
+      it('should not error on null',
+         () => { expect(Validators.minLength(2)(new Control(null))).toEqual(null); });
+
+      it('should not error on valid strings',
+         () => { expect(Validators.minLength(2)(new Control('aa'))).toEqual(null); });
+
+      it('should error on short strings', () => {
+        expect(Validators.minLength(2)(new Control('a'))).toEqual({
+          'minlength': {'requiredLength': 2, 'actualLength': 1}
+        });
+      });
+    });
+
+    describe('maxLength', () => {
+      it('should not error on an empty string',
+         () => { expect(Validators.maxLength(2)(new Control(''))).toEqual(null); });
+
+      it('should not error on null',
+         () => { expect(Validators.maxLength(2)(new Control(null))).toEqual(null); });
+
+      it('should not error on valid strings',
+         () => { expect(Validators.maxLength(2)(new Control('aa'))).toEqual(null); });
+
+      it('should error on long strings', () => {
+        expect(Validators.maxLength(2)(new Control('aaa'))).toEqual({
+          'maxlength': {'requiredLength': 2, 'actualLength': 3}
+        });
+      });
+    });
+
+    describe('pattern', () => {
+      it('should not error on an empty string',
+         () => { expect(Validators.pattern('[a-zA-Z ]*')(new Control(''))).toEqual(null); });
+
+      it('should not error on null',
+         () => { expect(Validators.pattern('[a-zA-Z ]*')(new Control(null))).toEqual(null); });
+
+      it('should not error on valid strings',
+         () => { expect(Validators.pattern('[a-zA-Z ]*')(new Control('aaAA'))).toEqual(null); });
+
+      it('should error on failure to match string', () => {
+        expect(Validators.pattern('[a-zA-Z ]*')(new Control('aaa0'))).toEqual({
+          'pattern': {'requiredPattern': '^[a-zA-Z ]*$', 'actualValue': 'aaa0'}
+        });
+      });
+    });
+
+    it('should normalize and evaluate async validator-directives correctly', fakeAsync(() => {
+         const c = Validators.composeAsync(
+             [normalizeAsyncValidator(new AsyncValidatorDirective('expected', {'one': true}))]);
+
+         let value: any = null;
+         c(new Control()).then((v: any) => value = v);
+         tick(1);
+
+         expect(value).toEqual({'one': true});
+       }));
+
+    describe('compose', () => {
+      it('should return null when given null',
+         () => { expect(Validators.compose(null)).toBe(null); });
+
+      it('should collect errors from all the validators', () => {
+        var c = Validators.compose([validator('a', true), validator('b', true)]);
+        expect(c(new Control(''))).toEqual({'a': true, 'b': true});
+      });
+
+      it('should run validators left to right', () => {
+        var c = Validators.compose([validator('a', 1), validator('a', 2)]);
+        expect(c(new Control(''))).toEqual({'a': 2});
+      });
+
+      it('should return null when no errors', () => {
+        var c = Validators.compose([Validators.nullValidator, Validators.nullValidator]);
+        expect(c(new Control(''))).toEqual(null);
+      });
+
+      it('should ignore nulls', () => {
+        var c = Validators.compose([null, Validators.required]);
+        expect(c(new Control(''))).toEqual({'required': true});
+      });
+    });
+
+    describe('composeAsync', () => {
+      function asyncValidator(expected: any /** TODO #9100 */, response: any /** TODO #9100 */) {
+        return (c: any /** TODO #9100 */) => {
+          var emitter = new EventEmitter();
+          var res = c.value != expected ? response : null;
+          Promise.resolve(null).then(() => {
+            emitter.emit(res);
+            // this is required because of a bug in ObservableWrapper
+            // where callComplete can fire before callEmit
+            // remove this one the bug is fixed
+            setTimeout(() => { emitter.complete(); }, 0);
+          });
+
+          return emitter;
+        };
+      }
+
+      it('should return null when given null',
+         () => { expect(Validators.composeAsync(null)).toEqual(null); });
+
+      it('should collect errors from all the validators', fakeAsync(() => {
+           var c = Validators.composeAsync([
+             asyncValidator('expected', {'one': true}), asyncValidator('expected', {'two': true})
+           ]);
+
+           var value: any /** TODO #9100 */ = null;
+           (<Promise<any>>c(new Control('invalid'))).then(v => value = v);
+
+           tick(1);
+
+           expect(value).toEqual({'one': true, 'two': true});
+         }));
+
+      it('should return null when no errors', fakeAsync(() => {
+           var c = Validators.composeAsync([asyncValidator('expected', {'one': true})]);
+
+           var value: any /** TODO #9100 */ = null;
+           (<Promise<any>>c(new Control('expected'))).then(v => value = v);
+
+           tick(1);
+
+           expect(value).toEqual(null);
+         }));
+
+      it('should ignore nulls', fakeAsync(() => {
+           var c = Validators.composeAsync([asyncValidator('expected', {'one': true}), null]);
+
+           var value: any /** TODO #9100 */ = null;
+           (<Promise<any>>c(new Control('invalid'))).then(v => value = v);
+
+           tick(1);
+
+           expect(value).toEqual({'one': true});
+         }));
+    });
+  });
+}

modules/@angular/common/test/pipes/async_pipe_spec.ts

@@ -0,0 +1,218 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {AsyncPipe} from '@angular/common';
+import {WrappedValue} from '@angular/core';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
+import {browserDetection} from '@angular/platform-browser/testing/browser_util';
+
+import {EventEmitter} from '../../src/facade/async';
+import {isBlank} from '../../src/facade/lang';
+import {SpyChangeDetectorRef} from '../spies';
+
+export function main() {
+  describe('AsyncPipe', () => {
+
+    describe('Observable', () => {
+      var emitter: EventEmitter<any>;
+      var pipe: AsyncPipe;
+      var ref: any;
+      var message = {};
+
+      beforeEach(() => {
+        emitter = new EventEmitter();
+        ref = new SpyChangeDetectorRef();
+        pipe = new AsyncPipe(ref);
+      });
+
+      describe('transform', () => {
+        it('should return null when subscribing to an observable',
+           () => { expect(pipe.transform(emitter)).toBe(null); });
+
+        it('should return the latest available value wrapped',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(emitter);
+             emitter.emit(message);
+
+             setTimeout(() => {
+               expect(pipe.transform(emitter)).toEqual(new WrappedValue(message));
+               async.done();
+             }, 0);
+           }));
+
+
+        it('should return same value when nothing has changed since the last call',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(emitter);
+             emitter.emit(message);
+
+             setTimeout(() => {
+               pipe.transform(emitter);
+               expect(pipe.transform(emitter)).toBe(message);
+               async.done();
+             }, 0);
+           }));
+
+        it('should dispose of the existing subscription when subscribing to a new observable',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(emitter);
+
+             var newEmitter = new EventEmitter();
+             expect(pipe.transform(newEmitter)).toBe(null);
+             emitter.emit(message);
+
+             // this should not affect the pipe
+             setTimeout(() => {
+               expect(pipe.transform(newEmitter)).toBe(null);
+               async.done();
+             }, 0);
+           }));
+
+        it('should request a change detection check upon receiving a new value',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(emitter);
+             emitter.emit(message);
+
+             setTimeout(() => {
+               expect(ref.spy('markForCheck')).toHaveBeenCalled();
+               async.done();
+             }, 10);
+           }));
+      });
+
+      describe('ngOnDestroy', () => {
+        it('should do nothing when no subscription',
+           () => { expect(() => pipe.ngOnDestroy()).not.toThrow(); });
+
+        it('should dispose of the existing subscription',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(emitter);
+             pipe.ngOnDestroy();
+             emitter.emit(message);
+
+             setTimeout(() => {
+               expect(pipe.transform(emitter)).toBe(null);
+               async.done();
+             }, 0);
+           }));
+      });
+    });
+
+    describe('Promise', () => {
+      var message = new Object();
+      var pipe: AsyncPipe;
+      var resolve: (result: any) => void;
+      var reject: (error: any) => void;
+      var promise: Promise<any>;
+      var ref: SpyChangeDetectorRef;
+      // adds longer timers for passing tests in IE
+      var timer = (!isBlank(getDOM()) && browserDetection.isIE) ? 50 : 10;
+
+      beforeEach(() => {
+        promise = new Promise((res, rej) => {
+          resolve = res;
+          reject = rej;
+        });
+        ref = new SpyChangeDetectorRef();
+        pipe = new AsyncPipe(<any>ref);
+      });
+
+      describe('transform', () => {
+        it('should return null when subscribing to a promise',
+           () => { expect(pipe.transform(promise)).toBe(null); });
+
+        it('should return the latest available value',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(promise);
+
+             resolve(message);
+
+             setTimeout(() => {
+               expect(pipe.transform(promise)).toEqual(new WrappedValue(message));
+               async.done();
+             }, timer);
+           }));
+
+        it('should return unwrapped value when nothing has changed since the last call',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(promise);
+             resolve(message);
+
+             setTimeout(() => {
+               pipe.transform(promise);
+               expect(pipe.transform(promise)).toBe(message);
+               async.done();
+             }, timer);
+           }));
+
+        it('should dispose of the existing subscription when subscribing to a new promise',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             pipe.transform(promise);
+
+             var promise = new Promise<any>(() => {});
+             expect(pipe.transform(promise)).toBe(null);
+
+             // this should not affect the pipe, so it should return WrappedValue
+             resolve(message);
+
+             setTimeout(() => {
+               expect(pipe.transform(promise)).toBe(null);
+               async.done();
+             }, timer);
+           }));
+
+        it('should request a change detection check upon receiving a new value',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var markForCheck = ref.spy('markForCheck');
+             pipe.transform(promise);
+             resolve(message);
+
+             setTimeout(() => {
+               expect(markForCheck).toHaveBeenCalled();
+               async.done();
+             }, timer);
+           }));
+
+        describe('ngOnDestroy', () => {
+          it('should do nothing when no source',
+             () => { expect(() => pipe.ngOnDestroy()).not.toThrow(); });
+
+          it('should dispose of the existing source',
+             inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+               pipe.transform(promise);
+               expect(pipe.transform(promise)).toBe(null);
+               resolve(message);
+
+
+               setTimeout(() => {
+                 expect(pipe.transform(promise)).toEqual(new WrappedValue(message));
+                 pipe.ngOnDestroy();
+                 expect(pipe.transform(promise)).toBe(null);
+                 async.done();
+               }, timer);
+             }));
+        });
+      });
+    });
+
+    describe('null', () => {
+      it('should return null when given null', () => {
+        var pipe = new AsyncPipe(null);
+        expect(pipe.transform(null)).toEqual(null);
+      });
+    });
+
+    describe('other types', () => {
+      it('should throw when given an invalid object', () => {
+        var pipe = new AsyncPipe(null);
+        expect(() => pipe.transform(<any>'some bogus object')).toThrowError();
+      });
+    });
+  });
+}

modules/@angular/common/test/pipes/date_pipe_spec.ts

@@ -0,0 +1,100 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {DatePipe} from '@angular/common';
+import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+import {browserDetection} from '@angular/platform-browser/testing/browser_util';
+
+import {DateWrapper} from '../../src/facade/lang';
+
+export function main() {
+  describe('DatePipe', () => {
+    var date: Date;
+    var pipe: DatePipe;
+
+    beforeEach(() => {
+      date = DateWrapper.create(2015, 6, 15, 9, 3, 1);
+      pipe = new DatePipe();
+    });
+
+    it('should be marked as pure',
+       () => { expect(new PipeResolver().resolve(DatePipe).pure).toEqual(true); });
+
+    // TODO(mlaval): enable tests when Intl API is no longer used, see
+    // https://github.com/angular/angular/issues/3333
+    // Have to restrict to Chrome as IE uses a different formatting
+    if (browserDetection.supportsIntlApi && browserDetection.isChromeDesktop) {
+      describe('supports', () => {
+        it('should support date', () => { expect(() => pipe.transform(date)).not.toThrow(); });
+        it('should support int', () => { expect(() => pipe.transform(123456789)).not.toThrow(); });
+        it('should support numeric strings',
+           () => { expect(() => pipe.transform('123456789')).not.toThrow(); });
+
+        it('should support ISO string',
+           () => { expect(() => pipe.transform('2015-06-15T21:43:11Z')).not.toThrow(); });
+
+        it('should not support other objects', () => {
+          expect(() => pipe.transform({})).toThrow();
+          expect(() => pipe.transform('')).toThrow();
+        });
+      });
+
+      describe('transform', () => {
+        it('should format each component correctly', () => {
+          expect(pipe.transform(date, 'y')).toEqual('2015');
+          expect(pipe.transform(date, 'yy')).toEqual('15');
+          expect(pipe.transform(date, 'M')).toEqual('6');
+          expect(pipe.transform(date, 'MM')).toEqual('06');
+          expect(pipe.transform(date, 'MMM')).toEqual('Jun');
+          expect(pipe.transform(date, 'MMMM')).toEqual('June');
+          expect(pipe.transform(date, 'd')).toEqual('15');
+          expect(pipe.transform(date, 'E')).toEqual('Mon');
+          expect(pipe.transform(date, 'EEEE')).toEqual('Monday');
+          expect(pipe.transform(date, 'h')).toEqual('9');
+          expect(pipe.transform(date, 'hh')).toEqual('09');
+          expect(pipe.transform(date, 'HH')).toEqual('09');
+          expect(pipe.transform(date, 'j')).toEqual('9 AM');
+          expect(pipe.transform(date, 'm')).toEqual('3');
+          expect(pipe.transform(date, 's')).toEqual('1');
+          expect(pipe.transform(date, 'mm')).toEqual('03');
+          expect(pipe.transform(date, 'ss')).toEqual('01');
+          expect(pipe.transform(date, 'Z')).toBeDefined();
+        });
+
+        it('should format common multi component patterns', () => {
+          expect(pipe.transform(date, 'E, M/d/y')).toEqual('Mon, 6/15/2015');
+          expect(pipe.transform(date, 'E, M/d')).toEqual('Mon, 6/15');
+          expect(pipe.transform(date, 'MMM d')).toEqual('Jun 15');
+          expect(pipe.transform(date, 'dd/MM/yyyy')).toEqual('15/06/2015');
+          expect(pipe.transform(date, 'MM/dd/yyyy')).toEqual('06/15/2015');
+          expect(pipe.transform(date, 'yMEd')).toEqual('20156Mon15');
+          expect(pipe.transform(date, 'MEd')).toEqual('6Mon15');
+          expect(pipe.transform(date, 'MMMd')).toEqual('Jun15');
+          expect(pipe.transform(date, 'yMMMMEEEEd')).toEqual('Monday, June 15, 2015');
+
+          expect(pipe.transform(date, 'ms')).toEqual('31');
+          expect(pipe.transform(date, 'jm')).toEqual('9:03 AM');
+        });
+
+        it('should format with pattern aliases', () => {
+          expect(pipe.transform(date, 'medium')).toEqual('Jun 15, 2015, 9:03:01 AM');
+          expect(pipe.transform(date, 'short')).toEqual('6/15/2015, 9:03 AM');
+          expect(pipe.transform(date, 'dd/MM/yyyy')).toEqual('15/06/2015');
+          expect(pipe.transform(date, 'MM/dd/yyyy')).toEqual('06/15/2015');
+          expect(pipe.transform(date, 'fullDate')).toEqual('Monday, June 15, 2015');
+          expect(pipe.transform(date, 'longDate')).toEqual('June 15, 2015');
+          expect(pipe.transform(date, 'mediumDate')).toEqual('Jun 15, 2015');
+          expect(pipe.transform(date, 'shortDate')).toEqual('6/15/2015');
+          expect(pipe.transform(date, 'mediumTime')).toEqual('9:03:01 AM');
+          expect(pipe.transform(date, 'shortTime')).toEqual('9:03 AM');
+        });
+      });
+    }
+  });
+}

modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts

@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {I18nPluralPipe, NgLocalization} from '@angular/common';
+import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+
+export function main() {
+  describe('I18nPluralPipe', () => {
+    var localization: NgLocalization;
+    var pipe: I18nPluralPipe;
+
+    var mapping = {
+      '=0': 'No messages.',
+      '=1': 'One message.',
+      'many': 'Many messages.',
+      'other': 'There are # messages, that is #.',
+    };
+
+    beforeEach(() => {
+      localization = new TestLocalization();
+      pipe = new I18nPluralPipe(localization);
+    });
+
+    it('should be marked as pure',
+       () => { expect(new PipeResolver().resolve(I18nPluralPipe).pure).toEqual(true); });
+
+    describe('transform', () => {
+      it('should return 0 text if value is 0', () => {
+        var val = pipe.transform(0, mapping);
+        expect(val).toEqual('No messages.');
+      });
+
+      it('should return 1 text if value is 1', () => {
+        var val = pipe.transform(1, mapping);
+        expect(val).toEqual('One message.');
+      });
+
+      it('should return category messages', () => {
+        var val = pipe.transform(4, mapping);
+        expect(val).toEqual('Many messages.');
+      });
+
+      it('should interpolate the value into the text where indicated', () => {
+        var val = pipe.transform(6, mapping);
+        expect(val).toEqual('There are 6 messages, that is 6.');
+      });
+
+      it('should use "" if value is undefined', () => {
+        var val = pipe.transform(void(0), mapping);
+        expect(val).toEqual('');
+      });
+
+      it('should not support bad arguments',
+         () => { expect(() => pipe.transform(0, <any>'hey')).toThrowError(); });
+    });
+
+  });
+}
+
+class TestLocalization extends NgLocalization {
+  getPluralCategory(value: number): string { return value > 1 && value < 6 ? 'many' : 'other'; }
+}

modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {I18nSelectPipe} from '@angular/common';
+import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+
+export function main() {
+  describe('I18nSelectPipe', () => {
+    var pipe: I18nSelectPipe;
+    var mapping = {'male': 'Invite him.', 'female': 'Invite her.', 'other': 'Invite them.'};
+
+    beforeEach(() => { pipe = new I18nSelectPipe(); });
+
+    it('should be marked as pure',
+       () => { expect(new PipeResolver().resolve(I18nSelectPipe).pure).toEqual(true); });
+
+    describe('transform', () => {
+      it('should return male text if value is male', () => {
+        var val = pipe.transform('male', mapping);
+        expect(val).toEqual('Invite him.');
+      });
+
+      it('should return female text if value is female', () => {
+        var val = pipe.transform('female', mapping);
+        expect(val).toEqual('Invite her.');
+      });
+
+      it('should return "" if value is anything other than male or female', () => {
+        var val = pipe.transform('Anything else', mapping);
+        expect(val).toEqual('');
+      });
+
+      it('should use "" if value is undefined', () => {
+        var val = pipe.transform(void(0), mapping);
+        expect(val).toEqual('');
+      });
+
+      it('should not support bad arguments',
+         () => { expect(() => pipe.transform('male', <any>'hey')).toThrowError(); });
+    });
+
+  });
+}

modules/@angular/common/test/pipes/json_pipe_spec.ts

@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {JsonPipe} from '@angular/common';
+import {Component} from '@angular/core';
+import {TestComponentBuilder} from '@angular/core/testing';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {expect} from '@angular/platform-browser/testing/matchers';
+
+import {Json, StringWrapper} from '../../src/facade/lang';
+
+export function main() {
+  describe('JsonPipe', () => {
+    var regNewLine = '\n';
+    var inceptionObj: any;
+    var inceptionObjString: string;
+    var pipe: JsonPipe;
+
+    function normalize(obj: string): string { return StringWrapper.replace(obj, regNewLine, ''); }
+
+    beforeEach(() => {
+      inceptionObj = {dream: {dream: {dream: 'Limbo'}}};
+      inceptionObjString = '{\n' +
+          '  "dream": {\n' +
+          '    "dream": {\n' +
+          '      "dream": "Limbo"\n' +
+          '    }\n' +
+          '  }\n' +
+          '}';
+
+
+      pipe = new JsonPipe();
+    });
+
+    describe('transform', () => {
+      it('should return JSON-formatted string',
+         () => { expect(pipe.transform(inceptionObj)).toEqual(inceptionObjString); });
+
+      it('should return JSON-formatted string even when normalized', () => {
+        var dream1 = normalize(pipe.transform(inceptionObj));
+        var dream2 = normalize(inceptionObjString);
+        expect(dream1).toEqual(dream2);
+      });
+
+      it('should return JSON-formatted string similar to Json.stringify', () => {
+        var dream1 = normalize(pipe.transform(inceptionObj));
+        var dream2 = normalize(Json.stringify(inceptionObj));
+        expect(dream1).toEqual(dream2);
+      });
+    });
+
+    describe('integration', () => {
+      it('should work with mutable objects',
+         inject(
+             [TestComponentBuilder, AsyncTestCompleter],
+             (tcb: TestComponentBuilder, async: AsyncTestCompleter) => {
+               tcb.createAsync(TestComp).then((fixture) => {
+                 let mutable: number[] = [1];
+                 fixture.debugElement.componentInstance.data = mutable;
+                 fixture.detectChanges();
+                 expect(fixture.debugElement.nativeElement).toHaveText('[\n  1\n]');
+
+                 mutable.push(2);
+                 fixture.detectChanges();
+                 expect(fixture.debugElement.nativeElement).toHaveText('[\n  1,\n  2\n]');
+
+                 async.done();
+               });
+             }));
+    });
+  });
+}
+
+@Component({selector: 'test-comp', template: '{{data | json}}', pipes: [JsonPipe]})
+class TestComp {
+  data: any;
+}

modules/@angular/common/test/pipes/lowercase_pipe_spec.ts

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {LowerCasePipe} from '@angular/common';
+import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal';
+
+export function main() {
+  describe('LowerCasePipe', () => {
+    var upper: string;
+    var lower: string;
+    var pipe: LowerCasePipe;
+
+    beforeEach(() => {
+      lower = 'something';
+      upper = 'SOMETHING';
+      pipe = new LowerCasePipe();
+    });
+
+    describe('transform', () => {
+      it('should return lowercase', () => {
+        var val = pipe.transform(upper);
+        expect(val).toEqual(lower);
+      });
+
+      it('should lowercase when there is a new value', () => {
+        var val = pipe.transform(upper);
+        expect(val).toEqual(lower);
+        var val2 = pipe.transform('WAT');
+        expect(val2).toEqual('wat');
+      });
+
+      it('should not support other objects',
+         () => { expect(() => pipe.transform(<any>{})).toThrowError(); });
+    });
+
+  });
+}