chore(release): bump Angular version to 2.0.0-rc.6 in package.json

- simplify and correct systemjs config
- remove deep imports into Ng2 packages to work with bundles
- have separate Ng2 and Polymer bootstrap files

.gitattributes

@@ -1,8 +1,9 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
-# JS files must always use LF for tools to work
+# JS and TS files must always use LF for tools to work
 *.js eol=lf
+*.ts eol=lf
 
 # Must keep Windows line ending to be parsed correctly
 scripts/windows/packages.txt eol=crlf

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 **I'm submitting a ...**  (check one with "x")
 ```
-[ ] bug report
+[ ] bug report => search github for a similar issue or PR before submitting
 [ ] feature request
 [ ] support request => Please do not submit support request here, instead see https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
 ```
@@ -30,4 +30,4 @@ If the current behavior is a bug or you can illustrate your feature request bett
  
 * **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 | Dart] 
+* **Language:** [all | TypeScript X.X | ES6/7 | ES5] 

.travis.yml

@@ -47,6 +47,7 @@ env:
    - CI_MODE=browserstack_optional
 
 matrix:
+  fast_finish: true
   allow_failures:
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"

CHANGELOG.md

@@ -1,3 +1,706 @@
+<a name="2.0.0-rc.6"></a>
+# [2.0.0-rc.6](https://github.com/angular/angular/compare/2.0.0-rc.5...2.0.0-rc.6) (2016-08-31)
+
+
+### Bug Fixes
+
+* **compiler:** allow tsc-wrapped to be compile with TypeScript 2.0 ([#11086](https://github.com/angular/angular/issues/11086)) ([fc2fe00](https://github.com/angular/angular/commit/fc2fe00))
+* **compiler:** correctly handles references to static methods ([#11013](https://github.com/angular/angular/issues/11013)) ([14a30f3](https://github.com/angular/angular/commit/14a30f3))
+* **compiler:** do not autoinclude components declared as entry points ([#10898](https://github.com/angular/angular/issues/10898)) ([c56f3f2](https://github.com/angular/angular/commit/c56f3f2))
+* **compiler:** generate temporary variables for guarded expressions ([#10657](https://github.com/angular/angular/issues/10657)) ([2d520ae](https://github.com/angular/angular/commit/2d520ae))
+* **compiler:** handle invalid host bindings and events ([#11101](https://github.com/angular/angular/issues/11101)) ([f25c976](https://github.com/angular/angular/commit/f25c976))
+* **compiler:** make ShadowCSS shim work on Android browser ([#11139](https://github.com/angular/angular/issues/11139)) ([38069ab](https://github.com/angular/angular/commit/38069ab)), closes [#11123](https://github.com/angular/angular/issues/11123)
+* **compiler:** no longer use assetCacheKey and Function#name for token identity. ([51877ef](https://github.com/angular/angular/commit/51877ef)), closes [#10545](https://github.com/angular/angular/issues/10545) [#10538](https://github.com/angular/angular/issues/10538)
+* **compiler:** only emit metadata for exported enums ([#10957](https://github.com/angular/angular/issues/10957)) ([a7b7682](https://github.com/angular/angular/commit/a7b7682))
+* **compiler:** throw descriptive error meesage for invalid NgModule providers ([#10947](https://github.com/angular/angular/issues/10947)) ([aa5c8ca](https://github.com/angular/angular/commit/aa5c8ca)), closes [#10714](https://github.com/angular/angular/issues/10714)
+* **compiler:** detect invalid elements in templates via DomSchemaRegistry ([1df69cb](https://github.com/angular/angular/commit/1df69cb))
+* **compiler:** ExtractorMerger returns return errors together with nodes (as a ParseTreeResult)  ([39c0f9e](https://github.com/angular/angular/commit/39c0f9e))
+* **compiler:** throw better errors when components are passed to imports or modules are passed to declarations. ([#10888](https://github.com/angular/angular/issues/10888)) ([c4fd862](https://github.com/angular/angular/commit/c4fd862)), closes [#10823](https://github.com/angular/angular/issues/10823)
+* **compiler:** properly shim selectors after :host and :host-context ([#10997](https://github.com/angular/angular/issues/10997)) ([af63378](https://github.com/angular/angular/commit/af63378)), closes [#5390](https://github.com/angular/angular/issues/5390)
+* **compiler:** disallow event-property binding even with the NO_ERRORS_SCHEMA ([1818056](https://github.com/angular/angular/commit/1818056)), closes [#11026](https://github.com/angular/angular/issues/11026)
+* **compiler-cli:** make ngc to work on Windows ([#10919](https://github.com/angular/angular/issues/10919)) ([6c77d71](https://github.com/angular/angular/commit/6c77d71)), closes [#10792](https://github.com/angular/angular/issues/10792)
+* **compiler-cli:** treat empty array of metadata like absent file ([#10610](https://github.com/angular/angular/issues/10610)) ([9a11ec2](https://github.com/angular/angular/commit/9a11ec2))
+* **compiler-cli:** codegen allows --strictNullChecks ([#10991](https://github.com/angular/angular/issues/10991)) ([01111b0](https://github.com/angular/angular/commit/01111b0))
+* **compiler-cli:** comment out a private keyword in codegen. ([#10949](https://github.com/angular/angular/issues/10949)) ([8560e1e](https://github.com/angular/angular/commit/8560e1e))
+* **compiler-cli:** don't codegen foo.d.ngfactory.ts from foo.d.ts ([#10833](https://github.com/angular/angular/issues/10833)) ([cd8cbd3](https://github.com/angular/angular/commit/cd8cbd3))
+* **compiler-cli:** don't quote properties in literal maps ([#11110](https://github.com/angular/angular/issues/11110)) ([abad667](https://github.com/angular/angular/commit/abad667)), closes [#11050](https://github.com/angular/angular/issues/11050)
+* **common:** allow float for DatePipe input ([#10687](https://github.com/angular/angular/issues/10687)) ([712c7d5](https://github.com/angular/angular/commit/712c7d5))
+* **common:** remove bidi control chars in DatePipe output ([#10870](https://github.com/angular/angular/issues/10870)) ([9198038](https://github.com/angular/angular/commit/9198038)), closes [#10080](https://github.com/angular/angular/issues/10080)
+* **core:** report errors for missing host-level referenced animations ([#10650](https://github.com/angular/angular/issues/10650)) ([f12d519](https://github.com/angular/angular/commit/f12d519))
+* **core:** assign an overriden name to constructor named constructor ([#11043](https://github.com/angular/angular/issues/11043)) ([bd510cc](https://github.com/angular/angular/commit/bd510cc)), closes [#10545](https://github.com/angular/angular/issues/10545)
+* **core:** don't strip sourceMappingURL in shimmed stylesheets ([#9664](https://github.com/angular/angular/issues/9664)) ([bc6d1c8](https://github.com/angular/angular/commit/bc6d1c8))
+* **core:** FactoryProvider's deps property should be optional ([eb7d8c7](https://github.com/angular/angular/commit/eb7d8c7))
+* **core/testing:** have fakeAsync use Proxy zone. ([#10797](https://github.com/angular/angular/issues/10797)) ([8a5eb08](https://github.com/angular/angular/commit/8a5eb08)), closes [#10503](https://github.com/angular/angular/issues/10503)
+* **forms:** fix conflicting getter name ([#11081](https://github.com/angular/angular/issues/11081)) ([ce08982](https://github.com/angular/angular/commit/ce08982))
+* **forms:** fully support rebinding form group directive ([#11051](https://github.com/angular/angular/issues/11051)) ([515ff61](https://github.com/angular/angular/commit/515ff61))
+* **forms:** remove deprecated form provider functions ([#10741](https://github.com/angular/angular/issues/10741)) ([79afcf0](https://github.com/angular/angular/commit/79afcf0))
+* **forms:** remove deprecated forms APIs ([#10624](https://github.com/angular/angular/issues/10624)) ([7606c96](https://github.com/angular/angular/commit/7606c96))
+* **forms:** support radio buttons with same name but diff parent ([#11152](https://github.com/angular/angular/issues/11152)) ([e8a1566](https://github.com/angular/angular/commit/e8a1566)), closes [#10065](https://github.com/angular/angular/issues/10065)
+* **forms:** update validity when validator dir changes ([d2ad871](https://github.com/angular/angular/commit/d2ad871)), closes [#11116](https://github.com/angular/angular/issues/11116)
+* **http:** deep copy for constructor using existing Headers ([#10679](https://github.com/angular/angular/issues/10679)) ([654ff61](https://github.com/angular/angular/commit/654ff61)), closes [#6845](https://github.com/angular/angular/issues/6845)
+* **http:** encode correct value for %3D ([#9790](https://github.com/angular/angular/issues/9790)) ([7555320](https://github.com/angular/angular/commit/7555320))
+* **http:** expose jsonpFactory for AoT compilation ([#10730](https://github.com/angular/angular/issues/10730)) ([203b2ba](https://github.com/angular/angular/commit/203b2ba))
+* **http:** inline HTTP_PROVIDERS and JSONP_PROVIDERS until the metadata collector can do it automatically. ([#10928](https://github.com/angular/angular/issues/10928)) ([477e425](https://github.com/angular/angular/commit/477e425))
+* **http:** restructure exports so that we don't leak private factory functions ([#11016](https://github.com/angular/angular/issues/11016)) ([7dfcaac](https://github.com/angular/angular/commit/7dfcaac))
+* **http:** return empty string if no body is present ([#10668](https://github.com/angular/angular/issues/10668)) ([7cd4741](https://github.com/angular/angular/commit/7cd4741))
+* **i18n:** change default locale from `en_US` to `en-US` ([#11103](https://github.com/angular/angular/issues/11103)) ([b9647b7](https://github.com/angular/angular/commit/b9647b7))
+* **i18n:** Currency/Date/Number pipe use injected locale ([#11093](https://github.com/angular/angular/issues/11093)) ([0a053a4](https://github.com/angular/angular/commit/0a053a4))
+* **i18n:** ICU placeholders are replaced by their translations ([#10586](https://github.com/angular/angular/issues/10586)) ([43512aa](https://github.com/angular/angular/commit/43512aa))
+* **i18n:** update NgLocalLocalization ([#10771](https://github.com/angular/angular/issues/10771)) ([4df48b2](https://github.com/angular/angular/commit/4df48b2))
+* **platform-browser:** remove export for private symbol _WORKER_UI_PLATFORM_PROVIDERS. ([#11018](https://github.com/angular/angular/issues/11018)) ([05bbb8e](https://github.com/angular/angular/commit/05bbb8e))
+* **router:** use encodeUri/decodeUri to encode fragment ([bb9dfbc](https://github.com/angular/angular/commit/bb9dfbc))
+* **router:** add an option to disable initial navigation ([a2deafc](https://github.com/angular/angular/commit/a2deafc))
+* **router:** canLoad should cancel a navigation instead of failing it ([#11001](https://github.com/angular/angular/issues/11001)) ([f1ce760](https://github.com/angular/angular/commit/f1ce760))
+* **router:** do not use rx/add/operator ([c350ba2](https://github.com/angular/angular/commit/c350ba2))
+* **router:** fix the order of guards, so canActivateChild runs before canActivate ([0bb516f](https://github.com/angular/angular/commit/0bb516f))
+* **router:** lazy loading keeps refetching modules ([#10707](https://github.com/angular/angular/issues/10707)) ([cc6749c](https://github.com/angular/angular/commit/cc6749c))
+* **router:** location changes and redirects break the back button ([#10742](https://github.com/angular/angular/issues/10742)) ([04c6b2f](https://github.com/angular/angular/commit/04c6b2f))
+* **router:** make routerLinkActiveOptions public ([#10758](https://github.com/angular/angular/issues/10758)) ([73c0a9d](https://github.com/angular/angular/commit/73c0a9d))
+* **router:** support guards navigating synchronously ([#11150](https://github.com/angular/angular/issues/11150)) ([e2241a2](https://github.com/angular/angular/commit/e2241a2))
+* **router:** support relative param-only navigation ([#10613](https://github.com/angular/angular/issues/10613)) ([c7f3aa7](https://github.com/angular/angular/commit/c7f3aa7))
+* **router:** update the location before activating components ([2ffecc0](https://github.com/angular/angular/commit/2ffecc0))
+* **router:** fix type ([#11181](https://github.com/angular/angular/issues/11181)) ([0f68351](https://github.com/angular/angular/commit/0f68351))
+* **router:** merge artifacts ([fc1e45d](https://github.com/angular/angular/commit/fc1e45d)), closes [#11063](https://github.com/angular/angular/issues/11063) [#11102](https://github.com/angular/angular/issues/11102)
+* **compiler/testing:** override metadata subclasses properly ([#10767](https://github.com/angular/angular/issues/10767)) ([87fe477](https://github.com/angular/angular/commit/87fe477))
+* **bundles:** correct RxJS mapping in rollup config for umd/es5 bundles ([174c016](https://github.com/angular/angular/commit/174c016))
+* **closure:** prevent closure renaming of testability interface ([#11146](https://github.com/angular/angular/issues/11146)) ([875e664](https://github.com/angular/angular/commit/875e664))
+* **closure:** replace property accesses ([#11078](https://github.com/angular/angular/issues/11078)) ([dc6f72e](https://github.com/angular/angular/commit/dc6f72e))
+
+
+### Code Refactoring
+
+* **common:** remove deprecated ReplacePipe ([#10772](https://github.com/angular/angular/issues/10772)) ([33ced70](https://github.com/angular/angular/commit/33ced70))
+* **core:** remove all previously deprecated ApplicationRef apis ([f84c3fd](https://github.com/angular/angular/commit/f84c3fd))
+* **core:** remove deprecated NgZoneError ([#10822](https://github.com/angular/angular/issues/10822)) ([3f5331b](https://github.com/angular/angular/commit/3f5331b))
+* **core:** remove deprecated @Component.directives and @Component.pipes ([4a740f2](https://github.com/angular/angular/commit/4a740f2))
+* **core:** remove deprecated coreBootstrap and coreLoadAndBootstrap ([3329977](https://github.com/angular/angular/commit/3329977))
+* **core:** remove deprecated DynamicComponentLoader ([#10759](https://github.com/angular/angular/issues/10759)) ([4a9745e](https://github.com/angular/angular/commit/4a9745e))
+* **core:** remove deprecated SystemJsComponentResolver and SystemJsCmpFactoryResolver ([b238414](https://github.com/angular/angular/commit/b238414))
+* **core:** remove deprecated DebugNode.inject() ([#10751](https://github.com/angular/angular/issues/10751)) ([a235ae1](https://github.com/angular/angular/commit/a235ae1))
+* **core:** remove deprecated properties and events from metadata ([#10753](https://github.com/angular/angular/issues/10753)) ([156a52e](https://github.com/angular/angular/commit/156a52e))
+* **core:** remove deprecated Query and ViewQuery ([#10820](https://github.com/angular/angular/issues/10820)) ([48751cc](https://github.com/angular/angular/commit/48751cc))
+* **core:** remove deprecated lockRunMode ([#10763](https://github.com/angular/angular/issues/10763)) ([2eb4ee8](https://github.com/angular/angular/commit/2eb4ee8))
+* **core:** remove deprecated ComponentResolver (#10858) ([73a9ee4](https://github.com/angular/angular/commit/73a9ee4))
+* **core:** remove deprecated PlatformRef#registerDisposeListener, #disposed, #dispose() ([44e1b23](https://github.com/angular/angular/commit/44e1b23))
+* **core:** remove deprecated provider/bind API ([#10652](https://github.com/angular/angular/issues/10652)) ([bec5c5f](https://github.com/angular/angular/commit/bec5c5f)), closes [#9751](https://github.com/angular/angular/issues/9751)
+* **core:** remove supporter deprecated `var` / `#` ([#11084](https://github.com/angular/angular/issues/11084)) ([b867764](https://github.com/angular/angular/commit/b867764))
+* **core:** removed deprecated disposePlatform ([d282507](https://github.com/angular/angular/commit/d282507))
+* **core:** merge Type and ConcreteType<?> into Type<?> ([#10616](https://github.com/angular/angular/issues/10616)) ([b96869a](https://github.com/angular/angular/commit/b96869a)), closes [#9729](https://github.com/angular/angular/issues/9729)
+* **core:** remove deprecated animations trigger APIs ([#10825](https://github.com/angular/angular/issues/10825)) ([9adf803](https://github.com/angular/angular/commit/9adf803))
+* **core:** rename Exception to Error; remove from public API ([86ba072](https://github.com/angular/angular/commit/86ba072)), ([7c07bff](https://github.com/angular/angular/commit/7c07bff))
+* **core/testing:** remove deprecated TestComponentBuilder ([a29f9f3](https://github.com/angular/angular/commit/a29f9f3))
+* **http:** remove deprecated HTTP_PROVIDERS and JSONP_PROVIDERS ([#10864](https://github.com/angular/angular/issues/10864)) ([675e582](https://github.com/angular/angular/commit/675e582))
+* **platform-browser-dynamic:** Rename CACHED_TEMPLATE_PROVIDER to RESOURCE_CACHE_PROVIDER ([#10866](https://github.com/angular/angular/issues/10866)) ([40e160c](https://github.com/angular/angular/commit/40e160c)), closes [#9741](https://github.com/angular/angular/issues/9741)
+* **upgrade:** remove deprecated addProvider ([12b0a3d](https://github.com/angular/angular/commit/12b0a3d))
+* **webworkers:** move webworkers to separate @angular/platform-webworker and @angular/platform-webworker-dynamic packages ([71ae2c4](https://github.com/angular/angular/commit/71ae2c4))
+* **core & platform-browser:** rename SanitizationService to Sanitizer and DomSanitizationService to DomSanitizer ([#11085](https://github.com/angular/angular/issues/11085)) ([811962b](https://github.com/angular/angular/commit/811962b))
+
+
+### Features
+
+* **npm packages:** use ES modules for primary build ([#11120](https://github.com/angular/angular/issues/11120)) ([9796579](https://github.com/angular/angular/commit/9796579))
+* **compiler:** Add an error message when the locale is not provided ([#11104](https://github.com/angular/angular/issues/11104)) ([e220a80](https://github.com/angular/angular/commit/e220a80))
+* **compiler:** Added "strictMetadataEmit" option to ngc ([#10951](https://github.com/angular/angular/issues/10951)) ([39a2c39](https://github.com/angular/angular/commit/39a2c39))
+* **compiler-cli:** allow ngc implementations to provide XHR ([#10708](https://github.com/angular/angular/issues/10708)) ([6e842fc](https://github.com/angular/angular/commit/6e842fc))
+* **compiler-cli:** support pathmapping using a separate reflector ([#10985](https://github.com/angular/angular/issues/10985)) ([e0fbca9](https://github.com/angular/angular/commit/e0fbca9))
+* **core:** make sure animation callback reports the totalTime ([#11022](https://github.com/angular/angular/issues/11022)) ([4f8f8cf](https://github.com/angular/angular/commit/4f8f8cf))
+* **core:** add NO_ERRORS_SCHEMA that allows any properties to be set on any element ([#10956](https://github.com/angular/angular/issues/10956)) ([c631cfc](https://github.com/angular/angular/commit/c631cfc))
+* **core:** make ngprobe tokens pluggable ([f48142e](https://github.com/angular/angular/commit/f48142e))
+* **core:** throw a descriptive error when BrowserModule is installed a second time (via lazy loading). ([#10899](https://github.com/angular/angular/issues/10899)) ([628d06c](https://github.com/angular/angular/commit/628d06c))
+* **core:** update public api ([951ecb4](https://github.com/angular/angular/commit/951ecb4))
+* **core:** allow configurable module prefixes and suffixes. ([#11049](https://github.com/angular/angular/issues/11049)) ([8b78281](https://github.com/angular/angular/commit/8b78281))
+* **core/testing:** add TestBed.get ([4648b3e](https://github.com/angular/angular/commit/4648b3e))
+* **forms:** add control status classes to form groups ([#10667](https://github.com/angular/angular/issues/10667)) ([2291929](https://github.com/angular/angular/commit/2291929))
+* **forms:** add NgForm method that resets submit state ([#10715](https://github.com/angular/angular/issues/10715)) ([97f3571](https://github.com/angular/angular/commit/97f3571))
+* **forms:** add support for disabled controls ([#10994](https://github.com/angular/angular/issues/10994)) ([2b313e4](https://github.com/angular/angular/commit/2b313e4))
+* **forms:** add support to bind validation attributes ([0b665c0](https://github.com/angular/angular/commit/0b665c0))
+* **i18n:** add an HtmlParser decorator ([#10645](https://github.com/angular/angular/issues/10645)) ([50345b8](https://github.com/angular/angular/commit/50345b8))
+* **i18n:** Add NgLocaleLocalization which returns plural cases given a locale ([#10744](https://github.com/angular/angular/issues/10744)) ([161a4dd](https://github.com/angular/angular/commit/161a4dd))
+* **i18n:** pass translation config directly into ngc ([#10622](https://github.com/angular/angular/issues/10622)) ([6580d67](https://github.com/angular/angular/commit/6580d67))
+* **i18n:** provide LOCALE_ID and NgLocalization ([ce4eae6](https://github.com/angular/angular/commit/ce4eae6))
+* **i18n:** xliff ([72bb38f](https://github.com/angular/angular/commit/72bb38f))
+* **i18n:** xliff integration  ([f6a7d65](https://github.com/angular/angular/commit/f6a7d65))
+* **router:** add support for custom error handlers ([2fc5c57](https://github.com/angular/angular/commit/2fc5c57))
+* **router:** add syntax sugar for confuguring RouterTestingModule ([#10906](https://github.com/angular/angular/issues/10906)) ([53c99cf](https://github.com/angular/angular/commit/53c99cf))
+* **router:** extend support for lazy loading children ([#10705](https://github.com/angular/angular/issues/10705)) ([6b26102](https://github.com/angular/angular/commit/6b26102))
+* **router:** make router.config public ([947f9c3](https://github.com/angular/angular/commit/947f9c3))
+* **router:** throw a helpful error when misusing forRoot() from a lazy module. ([#10996](https://github.com/angular/angular/issues/10996)) ([5ddecb1](https://github.com/angular/angular/commit/5ddecb1))
+
+
+### PEER-DEPENDENCY UPDATES ###
+
+* **core**: zone.js@0.6.17
+* **core**: rxjs@5.0.0-beta.11
+* **core**: reflect-metadata dependency is now optional when in AOT mode
+* **compiler-cli**: typescript@2.0.2
+
+
+### BREAKING CHANGES
+
+* core: `Type` is now `Type<T>` which means that in most cases you have to
+use `Type<any>` in place of `Type`.
+
+  We don't expect that any user applications use the `Type` type directly.
+  
+* core: Previously inconsistently named APIs SanitizationService and DomSanitizationService were renamed to Sanitizer and DomSanitizer
+
+* core: previously deprecated @Component.directives and @Component.pipes support was removed.
+
+  All the components and pipes now must be declared via an NgModule. NgModule is the basic compilation block passed into the Angular compiler via Compiler#compileModuleSync or #compileModuleAsync.
+
+  Because of this change, the Compiler#compileComponentAsync and #compileComponentSync were removed as well - any code doing compilation should compile module instead using the APIs mentioned above.
+
+  Lastly, since modules are the basic compilation unit, the ngUpgrade module was modified to always require an NgModule to be passed into the UpgradeAdapter's constructor - previously this was optional.
+
+* core: deprecated ComponentResolver was removed. Please use ComponentFactoryResolver instead.
+
+* core: animations defined using an at-symbol prefix that are not property bound are now invalid.
+  
+  ```html
+  <!-- this is now invalid -->
+  <div @flip="flipState"></div>
+  
+  <!-- change that to -->
+  <div [@flip]="flipState"></div>
+  ```
+
+* core: Animations that are not bound using the at-symbol
+prefix using `animate-` must now be preixed using `bind-animate-`.
+
+```html
+<!-- this is now invalid -->
+<div animate-flip="flipState"></div>
+
+<!-- is valid now -->
+<div bind-animate-flip="flipState"></div>
+```
+
+* core: These forms of providers are no longer accepted:
+  ```
+  bind(MyClass).toFactory(...)
+  new Provider(MyClass, toFactory: ...)
+  ```
+
+  We now only accept:
+  ```
+  {provider: MyClass, toFactory: ...}
+  ```
+  
+* core: previously deprecated NgZoneError has been removed
+
+* core: Exceptions are no longer part of the public API. We don't expect that anyone should be referring to the Exception types.
+
+  ```
+  ExceptionHandler.call(exception: any, stackTrace?: any, reason?: string): void;
+  ```
+  change to:
+  ```
+  ErrorHandler.handleError(error: any): void;
+  ```
+  
+* core: deprecated DynamicComponentLoader was removed; see deprecation notice for migration instructions.
+
+* core: deprecated SystemJsComponentResolver and SystemJsCmpFactoryResolver have been removed.
+
+* core: previously deprecated coreBootstrap and coreLoadAndBootstrap have been removed.
+
+* core: all previously deprecated ApplicationRef apis have been removed.
+
+* core: deprecated PlatformRef#registerDisposeListener, #disposed, #dispose() - follow deprecation instructions to upgrade
+
+* core: deprecated disposePlatform was removed; see deprecation notice for migration instructions.
+
+* core: deprecated DirectiveMetadataType#properties and DirectiveMetadataType#events were removed; see deprecation notice for migration instructions.
+
+* core: deprecated lockRunMode was removed; see deprecation notice for migration instructions.
+
+* core: deprecated DebugNode#inject was removed, see deprecation notice for migration instructions.
+
+* core: deprecated Query and ViewQuery  were removed; see deprecation notice for migration instructions.
+
+* core/testing: deprecated TestComponentBuilder was removed, please use TestBed instead
+
+* compiler: Previously deprecated`#` and `var` are not supported any more in expressions within templates, use `let`:
+  - `var-<name>` cannot be used any more on templates, use `let-<name>`
+  - `var-<name>` cannot be used any more to create a reference, use `ref-<name>`
+
+* http: any code which relies on the fact that a newly created Headers object is referencing an existing Headers map is now broken, but that should normally not be the case since this behavior is not documented and not in accordance with the spec.
+
+* http: previously deprecated HTTP_PROVIDERS and JSONP_PROVIDERS were removed; see deprecation notice for migration instructions.
+
+* platform-browser-dynamic: `CACHED_TEMPLATE_PROVIDER` is now renamed to `RESOURCE_CACHE_PROVIDER`
+
+  Before:
+  
+  ```js
+  import {CACHED_TEMPLATE_PROVIDER} from '@angular/platform-browser-dynamic';
+  ```
+  
+  After:
+  
+  ```js
+  import {RESOURCE_CACHE_PROVIDER} from '@angular/platform-browser-dynamic';
+  ```
+
+* common: previously deprecated NgSwitchWhen directive was removed, use NgSwitchCase instead
+
+* common: previously deprecated ReplacePipe was removed
+
+* upgrade: deprecated UpgradeAdapter#addProvider was removed, see deprecation notice for migration instructions.
+
+* forms: deprecated `provideForms()` and `disableDeprecatedForms()` functions have been removed. Please import the `FormsModule` or the `ReactiveFormsModule` from @angular/forms instead.
+
+* forms: deprecated forms APIs in @angular/common have been removed. Please update to the new forms API in @angular/forms. See angular.io for more information.
+
+* webworkers: web worker platform is now exported via separate packages.
+
+  Please use @angular/platform-webworker and @angular/platform-webworker-dynamic
+  
+
+
+<a name="2.0.0-rc.5"></a>
+# [2.0.0-rc.5](https://github.com/angular/angular/compare/2.0.0-rc.4...2.0.0-rc.5) (2016-08-09)
+
+
+### Bug Fixes
+
+* **animations:** change trigger binding syntax to function as a property binding [] ([7f4954b](https://github.com/angular/angular/commit/7f4954b))
+* **animations:** ensure a null easing value is never used with web-animations ([9cc3b2c](https://github.com/angular/angular/commit/9cc3b2c)), closes [#9780](https://github.com/angular/angular/issues/9780) [#9752](https://github.com/angular/angular/issues/9752)
+* **animations:** ensure all child elements are rendered before running animations ([c3bdd50](https://github.com/angular/angular/commit/c3bdd50)), closes [#9402](https://github.com/angular/angular/issues/9402) [#9775](https://github.com/angular/angular/issues/9775) [#9887](https://github.com/angular/angular/issues/9887)
+* **animations:** ensure animation detection doesn't rely on the body node ([0d1bf81](https://github.com/angular/angular/commit/0d1bf81)), closes [#10230](https://github.com/angular/angular/issues/10230) [#10191](https://github.com/angular/angular/issues/10191) [#10273](https://github.com/angular/angular/issues/10273)
+* **animations:** throw errors when duplicate component trigger names are registered ([5af1e89](https://github.com/angular/angular/commit/5af1e89))
+* **compiler:** allow to use pipes inside of `*ngIf` ([#10452](https://github.com/angular/angular/issues/10452)) ([8efbcc9](https://github.com/angular/angular/commit/8efbcc9)), closes [#9746](https://github.com/angular/angular/issues/9746)
+* **compiler:** auto declare `entryComponents` recursively ([a32c4ad](https://github.com/angular/angular/commit/a32c4ad)), closes [#10348](https://github.com/angular/angular/issues/10348)
+* **compiler:** Collector collects enum values. ([#9967](https://github.com/angular/angular/issues/9967)) ([e6b2443](https://github.com/angular/angular/commit/e6b2443))
+* **compiler:** Fixed ?. operator to short-circut execution ([#9965](https://github.com/angular/angular/issues/9965)) ([4ec2a30](https://github.com/angular/angular/commit/4ec2a30)), closes [#9965](https://github.com/angular/angular/issues/9965)
+* **compiler:** Generates function expressions as returning any ([#9980](https://github.com/angular/angular/issues/9980)) ([eb5763c](https://github.com/angular/angular/commit/eb5763c))
+* **compiler:** Ignore references to declared modules and unneeded types ([#9776](https://github.com/angular/angular/issues/9776)) ([4ef8689](https://github.com/angular/angular/commit/4ef8689))
+* **compiler:** Missing metadata files should result in  undefined ([#9704](https://github.com/angular/angular/issues/9704)) ([30bec78](https://github.com/angular/angular/commit/30bec78)), closes [#9678](https://github.com/angular/angular/issues/9678)
+* **compiler:** No longer writes 0 length files outside of genDir ([#10023](https://github.com/angular/angular/issues/10023)) ([6518ff8](https://github.com/angular/angular/commit/6518ff8))
+* **compiler:** Query expression lambdas should have dynamic type ([961c9d4](https://github.com/angular/angular/commit/961c9d4))
+* **compiler:** report better error messages for `host` bindings ([fb3608a](https://github.com/angular/angular/commit/fb3608a)), closes [#10346](https://github.com/angular/angular/issues/10346)
+* **compiler:** Report references to non-exported symbols. ([9925aa8](https://github.com/angular/angular/commit/9925aa8))
+* **compiler:** StaticReflect now resolves re-exported symbols ([#10453](https://github.com/angular/angular/issues/10453)) ([82e7ecd](https://github.com/angular/angular/commit/82e7ecd)), closes [#10453](https://github.com/angular/angular/issues/10453)
+* **compiler:** treat custom elements as unknown elements by default ([fc83bbb](https://github.com/angular/angular/commit/fc83bbb)), closes [#10300](https://github.com/angular/angular/issues/10300)
+* **compiler:** Catch exceptions in the logging of binding update ([2743627](https://github.com/angular/angular/commit/2743627)), closes [#9994](https://github.com/angular/angular/issues/9994)
+* **compiler:** Better error message in case of unknown property binding ([a55d796](https://github.com/angular/angular/commit/a55d796))
+* **compiler:** String.split(str, n) stops after n separator ([#10408](https://github.com/angular/angular/issues/10408)) ([13c8211](https://github.com/angular/angular/commit/13c8211))
+* **compiler-cli:** put all `ngc` files into a single directory ([#10486](https://github.com/angular/angular/issues/10486)) ([790362e](https://github.com/angular/angular/commit/790362e))
+* **compiler-cli:** support trailing slash in basePath ([#10533](https://github.com/angular/angular/issues/10533)) ([0d1f3c3](https://github.com/angular/angular/commit/0d1f3c3))
+* **core:** allow module providers to overwrite providers from `ModuleWithProviders` ([5533447](https://github.com/angular/angular/commit/5533447)), closes [#10313](https://github.com/angular/angular/issues/10313) [#10317](https://github.com/angular/angular/issues/10317)
+* **core:** Don't use ES6 spread operator when undefined is allowed. ([2ff8332](https://github.com/angular/angular/commit/2ff8332))
+* **core:** ensure ngFor only inserts/moves/removes elements when necessary ([#10287](https://github.com/angular/angular/issues/10287)) ([e18626b](https://github.com/angular/angular/commit/e18626b)), closes [#9960](https://github.com/angular/angular/issues/9960) [#7239](https://github.com/angular/angular/issues/7239) [#9672](https://github.com/angular/angular/issues/9672) [#9454](https://github.com/angular/angular/issues/9454) [#10287](https://github.com/angular/angular/issues/10287)
+* **core:** fix offline detection in ng_module_factory_loader ([915a666](https://github.com/angular/angular/commit/915a666))
+* **core:** only warn and auto declare undeclared `entryComponents`. ([e44e866](https://github.com/angular/angular/commit/e44e866)), closes [#10316](https://github.com/angular/angular/issues/10316)
+* **core:** support components without a selector ([#10331](https://github.com/angular/angular/issues/10331)) ([9b39e49](https://github.com/angular/angular/commit/9b39e49)), closes [#3464](https://github.com/angular/angular/issues/3464) [#10216](https://github.com/angular/angular/issues/10216)
+* **CurrencyPipe:** use default Intl formatting options when none provided ([d455942](https://github.com/angular/angular/commit/d455942)), closes [#10189](https://github.com/angular/angular/issues/10189)
+* **datePipe:** short timezone not displayed, closes [#9812](https://github.com/angular/angular/issues/9812) ([#9816](https://github.com/angular/angular/issues/9816)) ([f29457f](https://github.com/angular/angular/commit/f29457f)), closes [#9812](https://github.com/angular/angular/issues/9812) [#9816](https://github.com/angular/angular/issues/9816)
+* **DirectiveResolver:** throw on duplicate Input & Output names ([d1a3e3a](https://github.com/angular/angular/commit/d1a3e3a))
+* **docs:** typo in comments ([#9743](https://github.com/angular/angular/issues/9743)) ([afb7216](https://github.com/angular/angular/commit/afb7216))
+* **ExpressionParser:** undefined is undefined (was null)   ([b4613ab](https://github.com/angular/angular/commit/b4613ab))
+* **fake_async:** share zone between `beforeEach` and `it` ([16cc9b4](https://github.com/angular/angular/commit/16cc9b4))
+* **forms:** allow arrays as parents ([#10440](https://github.com/angular/angular/issues/10440)) ([d6d4568](https://github.com/angular/angular/commit/d6d4568)), closes [#10432](https://github.com/angular/angular/issues/10432)
+* **forms:** export AbstractFormGroupDirective ([6195a45](https://github.com/angular/angular/commit/6195a45))
+* **forms:** export form directive arrays for offline compile ([#9893](https://github.com/angular/angular/issues/9893)) ([93025d1](https://github.com/angular/angular/commit/93025d1))
+* **forms:** improve ngModel error messages ([#10314](https://github.com/angular/angular/issues/10314)) ([43349dd](https://github.com/angular/angular/commit/43349dd))
+* **forms:** improve no value accessor error message ([#10051](https://github.com/angular/angular/issues/10051)) ([34feecf](https://github.com/angular/angular/commit/34feecf))
+* **forms:** mark control containers as touched when child controls are touched ([#9735](https://github.com/angular/angular/issues/9735)) ([77dc6ef](https://github.com/angular/angular/commit/77dc6ef))
+* **forms:** normalize written value in NumberValueAccessor ([b48f7bc](https://github.com/angular/angular/commit/b48f7bc)), closes [#10379](https://github.com/angular/angular/issues/10379)
+* **forms:** re-enable form provider functions for easier migration ([#9972](https://github.com/angular/angular/issues/9972)) ([e68252a](https://github.com/angular/angular/commit/e68252a))
+* **forms:** throw error if wrong control container for reactive forms ([#10286](https://github.com/angular/angular/issues/10286)) ([0aba42a](https://github.com/angular/angular/commit/0aba42a))
+* **forms:** update dirty before emitting value change ([#10362](https://github.com/angular/angular/issues/10362)) ([7c76a75](https://github.com/angular/angular/commit/7c76a75)), closes [#5328](https://github.com/angular/angular/issues/5328)
+* **forms:** missing export for validators ([91c64d2](https://github.com/angular/angular/commit/91c64d2))
+* **forms:** use change event for select multiple ([#9713](https://github.com/angular/angular/issues/9713)) ([3cbded6](https://github.com/angular/angular/commit/3cbded6))
+* **HtmlParser:** correctly propagate the interpolation config across layers ([25e070d](https://github.com/angular/angular/commit/25e070d))
+* **http:** convert objects passed to requests into a string ([#10124](https://github.com/angular/angular/issues/10124)) ([83bc5c9](https://github.com/angular/angular/commit/83bc5c9)), closes [#10073](https://github.com/angular/angular/issues/10073)
+* **http:** headers should be case-insensitive. ([7f64782](https://github.com/angular/angular/commit/7f64782)), closes [#9452](https://github.com/angular/angular/issues/9452)
+* **http:** URLSearchParams.clone propagate the QueryEncoder ([#9900](https://github.com/angular/angular/issues/9900)) ([2519532](https://github.com/angular/angular/commit/2519532))
+* **i18n extractor:** array manipulation ([df44e3e](https://github.com/angular/angular/commit/df44e3e))
+* **KeyValueDiffer:** check for changes ([3f08efa](https://github.com/angular/angular/commit/3f08efa)), closes [#9115](https://github.com/angular/angular/issues/9115)
+* **linker:** prevent pollution of empty embeddedView context ([#10548](https://github.com/angular/angular/issues/10548)) ([46bbcef](https://github.com/angular/angular/commit/46bbcef)), closes [#10045](https://github.com/angular/angular/issues/10045)
+* **linker/compiler:** rename const to avoid duplicate declaration ([#10457](https://github.com/angular/angular/issues/10457)) ([2b704f0](https://github.com/angular/angular/commit/2b704f0))
+* **metadata:** fix typechecking with typescript[@next](https://github.com/next) ([0a46f37](https://github.com/angular/angular/commit/0a46f37))
+* **ng upgrade:** do not compile ng2 components until after ng1 bootstrap ([#10084](https://github.com/angular/angular/issues/10084)) ([9edea0b](https://github.com/angular/angular/commit/9edea0b)), closes [#9407](https://github.com/angular/angular/issues/9407) [angular/protractor#2944](https://github.com/angular/protractor/issues/2944)
+* **ngc:** gather metadata for OpaqueToken ([c8d53d7](https://github.com/angular/angular/commit/c8d53d7)), closes [#10482](https://github.com/angular/angular/issues/10482)
+* **ngClass:** do not deconstruct classes on element removal ([#10303](https://github.com/angular/angular/issues/10303)) ([ba88db5](https://github.com/angular/angular/commit/ba88db5)), closes [#10008](https://github.com/angular/angular/issues/10008) [#10303](https://github.com/angular/angular/issues/10303)
+* **NgPlural:** expression inside cases ([#9883](https://github.com/angular/angular/issues/9883)) ([b7e69bc](https://github.com/angular/angular/commit/b7e69bc)), closes [#9868](https://github.com/angular/angular/issues/9868)
+* **NgStyle:** remove duplicate input declaration ([#9978](https://github.com/angular/angular/issues/9978)) ([94dc632](https://github.com/angular/angular/commit/94dc632)), closes [#9977](https://github.com/angular/angular/issues/9977)
+* **ngUpgrade:** to work with [@NgModule](https://github.com/NgModule) ([d21331e](https://github.com/angular/angular/commit/d21331e))
+* **platform-browser:** IEMobile is badly detected when testing ([#10382](https://github.com/angular/angular/issues/10382)) ([43c71ae](https://github.com/angular/angular/commit/43c71ae))
+* **platform-browser:** remove testing_e2e target ([#10029](https://github.com/angular/angular/issues/10029)) ([4a96505](https://github.com/angular/angular/commit/4a96505))
+* **platform-browser:** throw useful error on missing platform module. ([73f02c7](https://github.com/angular/angular/commit/73f02c7))
+* **platform-browser-dynamic:** Add [@Injectable](https://github.com/Injectable)() annotation to XHRImpl. ([7b31178](https://github.com/angular/angular/commit/7b31178))
+* **static_reflector:** report methods with decorators in `propMetadata` as well ([367f0fd](https://github.com/angular/angular/commit/367f0fd)), closes [#10308](https://github.com/angular/angular/issues/10308) [#10318](https://github.com/angular/angular/issues/10318)
+* **static_reflector:** resolve values of functions in the function context ([d6b65db](https://github.com/angular/angular/commit/d6b65db))
+* **SyncAsyncResult:** fix default async value ([#10013](https://github.com/angular/angular/issues/10013)) ([6d02d2f](https://github.com/angular/angular/commit/6d02d2f)), closes [#10013](https://github.com/angular/angular/issues/10013)
+* **TemplateParser:** add support for data-template attribute ([d84a43c](https://github.com/angular/angular/commit/d84a43c)), closes [#9904](https://github.com/angular/angular/issues/9904)
+* **TemplateParser:** report empty expression ([#10391](https://github.com/angular/angular/issues/10391)) ([e73d051](https://github.com/angular/angular/commit/e73d051)), closes [#3754](https://github.com/angular/angular/issues/3754)
+* **testing:** add an explicit doAsyncPrecompilation step ([#10015](https://github.com/angular/angular/issues/10015)) ([b43f954](https://github.com/angular/angular/commit/b43f954)), closes [#9975](https://github.com/angular/angular/issues/9975) [#9593](https://github.com/angular/angular/issues/9593)
+* **testing:** Add platform directives to the shim that keeps setBaseTestProviders running ([#10154](https://github.com/angular/angular/issues/10154)) ([979946c](https://github.com/angular/angular/commit/979946c))
+* **testing:** ComponentFixture - Avoid extra scheduleMicrotask ([#10223](https://github.com/angular/angular/issues/10223)) ([e34eb45](https://github.com/angular/angular/commit/e34eb45))
+* **testing:** correctly import NgMatchers ([#10077](https://github.com/angular/angular/issues/10077)) ([64fc464](https://github.com/angular/angular/commit/64fc464))
+* **testing:** Fix error message in test bed ([3b690b6](https://github.com/angular/angular/commit/3b690b6))
+* **testing:** reintroduce and deprecate setBaseTestProviders ([#9905](https://github.com/angular/angular/issues/9905)) ([2923187](https://github.com/angular/angular/commit/2923187))
+* **testing:** remove deprecated testing APIs ([#9923](https://github.com/angular/angular/issues/9923)) ([9af2d8b](https://github.com/angular/angular/commit/9af2d8b))
+* **typescript:** make router compile with typescript[@next](https://github.com/next) ([73f017b](https://github.com/angular/angular/commit/73f017b)), closes [#9731](https://github.com/angular/angular/issues/9731)
+* **UrlParser:** stop setting default value 'true' ([#10399](https://github.com/angular/angular/issues/10399)) ([0d6cc17](https://github.com/angular/angular/commit/0d6cc17))
+
+
+### Code Refactoring
+
+* **core:** change bootstrap of modules and names of platforms ([5a21f16](https://github.com/angular/angular/commit/5a21f16))
+* **core:** change module semantics ([46b2127](https://github.com/angular/angular/commit/46b2127)), closes [#10164](https://github.com/angular/angular/issues/10164)
+* **core:** clean up platform bootstrap and initTestEnvironment ([fa47890](https://github.com/angular/angular/commit/fa47890)), closes [#9922](https://github.com/angular/angular/issues/9922)
+* **core:** deprecate `coreBootstrap`, `PLATFORM_PIPES/DIRECTIVES` providers and `ComponentResolver` ([daa9da4](https://github.com/angular/angular/commit/daa9da4)), closes [#9726](https://github.com/angular/angular/issues/9726)
+* **core:** deprecate old methods on `ApplicationRef` ([34624b2](https://github.com/angular/angular/commit/34624b2))
+* **core:** introduce `APP_BOOTSTRAP_LISTENER` multi provider ([af2e80e](https://github.com/angular/angular/commit/af2e80e))
+* **core:** Introduce `AppInitStatus` ([6300283](https://github.com/angular/angular/commit/6300283))
+* **core:** introduce `NgModule.schemas` ([00b726f](https://github.com/angular/angular/commit/00b726f))
+* **core:** make `lockRunMode` a noop and deprecate it. ([98d49d4](https://github.com/angular/angular/commit/98d49d4)), closes [#9878](https://github.com/angular/angular/issues/9878)
+* **core:** remove `ViewResolver` and `ViewResolverMock` ([0988cc8](https://github.com/angular/angular/commit/0988cc8))
+* **core:** rename `precompile` into `entryComponents`. ([6f4e49e](https://github.com/angular/angular/commit/6f4e49e))
+* **core:** use `ngOnDestroy` in providers ([8e6091d](https://github.com/angular/angular/commit/8e6091d))
+* **testing:** introduce new testing api to support ng modules ([d0a95e3](https://github.com/angular/angular/commit/d0a95e3)), closes [#10354](https://github.com/angular/angular/issues/10354)
+
+
+### Features
+
+* **animations:** allow animation integration support into host params ([806a254](https://github.com/angular/angular/commit/806a254)), closes [#9044](https://github.com/angular/angular/issues/9044) [#9933](https://github.com/angular/angular/issues/9933)
+* **browser:** use AppModules for bootstrap in the browser ([3f55aa6](https://github.com/angular/angular/commit/3f55aa6))
+* **compiler:** add `MockPipeResolver` ([4ad6bcc](https://github.com/angular/angular/commit/4ad6bcc))
+* **compiler:** Added support for conditional expressions. ([#10366](https://github.com/angular/angular/issues/10366)) ([20b03ba](https://github.com/angular/angular/commit/20b03ba))
+* **compiler:** Added support for references to static fields. ([#10334](https://github.com/angular/angular/issues/10334)) ([b58e9ea](https://github.com/angular/angular/commit/b58e9ea))
+* **compiler:** Allow calls to simple static methods ([#10289](https://github.com/angular/angular/issues/10289)) ([b449467](https://github.com/angular/angular/commit/b449467))
+* **compiler:** Expression span information and error correction ([#9772](https://github.com/angular/angular/issues/9772)) ([9a04fcd](https://github.com/angular/angular/commit/9a04fcd))
+* **compiler:** introduce `MockDirectiveResolver.setDirective` ([acc6c8d](https://github.com/angular/angular/commit/acc6c8d))
+* **compiler:** Support default parameters in static reflector ([#10370](https://github.com/angular/angular/issues/10370)) ([763ca60](https://github.com/angular/angular/commit/763ca60))
+* **core:** add AddModuleFactoryLoader ([6fcf962](https://github.com/angular/angular/commit/6fcf962))
+* **core:** allow to add precompiled tokens via a provider ([7073cf7](https://github.com/angular/angular/commit/7073cf7)), closes [#9874](https://github.com/angular/angular/issues/9874)
+* **core:** introduce `[@AppModule](https://github.com/AppModule)` ([17e4cfc](https://github.com/angular/angular/commit/17e4cfc)), closes [#9730](https://github.com/angular/angular/issues/9730)
+* **core:** introduce `ModuleWithProviders`. ([f02da4e](https://github.com/angular/angular/commit/f02da4e))
+* **core:** introduce `NgModuleRef.destroy` and call `ngOnDestroy` on all providers ([ecdaded](https://github.com/angular/angular/commit/ecdaded))
+* **core:** support `ngOnDestroy` on providers of a directive. ([c161ed4](https://github.com/angular/angular/commit/c161ed4))
+* **ExpressionChangedAfterItHasBeenCheckedException:** more meaningful error message ([2de8364](https://github.com/angular/angular/commit/2de8364)), closes [#9882](https://github.com/angular/angular/issues/9882)
+* **ExpressionParser:** add support for `this` ([0ca05ee](https://github.com/angular/angular/commit/0ca05ee))
+* **facade:** add support for all thenables ([#10278](https://github.com/angular/angular/issues/10278)) ([58d9e7f](https://github.com/angular/angular/commit/58d9e7f))
+* **forms:** add ability to reset forms ([#9974](https://github.com/angular/angular/issues/9974)) ([da8eb9f](https://github.com/angular/angular/commit/da8eb9f)), closes [#4914](https://github.com/angular/angular/issues/4914) [#4933](https://github.com/angular/angular/issues/4933)
+* **forms:** add get method for easy access to child controls ([#10428](https://github.com/angular/angular/issues/10428)) ([8d44999](https://github.com/angular/angular/commit/8d44999))
+* **forms:** add invalid prop to abstract controls ([#10439](https://github.com/angular/angular/issues/10439)) ([e0eea6c](https://github.com/angular/angular/commit/e0eea6c))
+* **forms:** add modules for forms and deprecatedForms ([#9859](https://github.com/angular/angular/issues/9859)) ([9d265b6](https://github.com/angular/angular/commit/9d265b6)), closes [#9732](https://github.com/angular/angular/issues/9732)
+* **forms:** allow both patching and strict setting of values ([#10537](https://github.com/angular/angular/issues/10537)) ([fcafdff](https://github.com/angular/angular/commit/fcafdff))
+* **forms:** updateValue() for form groups and form arrays ([#9901](https://github.com/angular/angular/issues/9901)) ([30a332e](https://github.com/angular/angular/commit/30a332e)), closes [#9553](https://github.com/angular/angular/issues/9553)
+* **HtmlLexer:** better hint on unclosed ICU message errors ([4117836](https://github.com/angular/angular/commit/4117836)), closes [#10227](https://github.com/angular/angular/issues/10227)
+* **http:** add content-type override support for http request ([#10211](https://github.com/angular/angular/issues/10211)) ([bdb5912](https://github.com/angular/angular/commit/bdb5912))
+* **http:** add options method to Http ([#10540](https://github.com/angular/angular/issues/10540)) ([0bd97ec](https://github.com/angular/angular/commit/0bd97ec)), closes [#10500](https://github.com/angular/angular/issues/10500) [#7918](https://github.com/angular/angular/issues/7918)
+* **http:** add support for ArrayBuffer ([1266460](https://github.com/angular/angular/commit/1266460))
+* **http:** add support for blob as a response type ([#10190](https://github.com/angular/angular/issues/10190)) ([76b8a49](https://github.com/angular/angular/commit/76b8a49))
+* **i18n:** merge translations ([7a8ef1e](https://github.com/angular/angular/commit/7a8ef1e))
+* **i18n:** xmb serializer ([cc5cfe8](https://github.com/angular/angular/commit/cc5cfe8))
+* **i18n:** xtb serializer ([0eee1d5](https://github.com/angular/angular/commit/0eee1d5))
+* **I18nAst:** introduce an intermediate AST ([48f230a](https://github.com/angular/angular/commit/48f230a))
+* **ICU:** enable ICU extraction even when when in is not used ([3050ae1](https://github.com/angular/angular/commit/3050ae1))
+* **ICU:** extract ICU messages ([28e8b2f](https://github.com/angular/angular/commit/28e8b2f))
+* **NgStyle:** add support for the style.unit notation ([#10496](https://github.com/angular/angular/issues/10496)) ([8b18ef4](https://github.com/angular/angular/commit/8b18ef4)), closes [#10326](https://github.com/angular/angular/issues/10326)
+* **ngUpgrade:** add support for NgModules ([6b564ec](https://github.com/angular/angular/commit/6b564ec))
+* **NumberPipe:** add string support ([#10163](https://github.com/angular/angular/issues/10163)) ([f3dd91e](https://github.com/angular/angular/commit/f3dd91e)), closes [#10159](https://github.com/angular/angular/issues/10159)
+* **security:** categorize <track src> as a regular URL. ([a441b5b](https://github.com/angular/angular/commit/a441b5b)), closes [#10089](https://github.com/angular/angular/issues/10089)
+* **security:** only warn when actually sanitizing HTML. ([#10272](https://github.com/angular/angular/issues/10272)) ([482c019](https://github.com/angular/angular/commit/482c019)), closes [#10206](https://github.com/angular/angular/issues/10206)
+* **security:** trust resource URLs as URLs. ([#10220](https://github.com/angular/angular/issues/10220)) ([51f3d22](https://github.com/angular/angular/commit/51f3d22))
+* **testing:** add implicit test module ([8d746e3](https://github.com/angular/angular/commit/8d746e3)), closes [#9846](https://github.com/angular/angular/issues/9846)
+* **xmb/xtb:** support dtd ([e34a04d](https://github.com/angular/angular/commit/e34a04d))
+
+
+### BREAKING CHANGES
+
+* core:
+
+  ## Bootstrap changes
+  ```
+  import {NgModule} from '@angular/core';
+
+  @NgModule({
+    declarations: […], // directives, components, and pipes owned by this NgModule
+    imports: [BrowserModule],
+    providers: […], // additional providers
+    bootstrap: [MainComponent],
+  })
+  class MyAppModule {}
+
+  // Ahead of Time compile
+  import {platformBrowser} from ‘@angular/platform-browser’;
+
+  platformBrowser().bootstrapModuleFactory(MyAppModuleNgFactory);
+
+  // JIT compile long form
+  import {platformBrowserDynamic} from ‘@angular/platform-browser-dynamic’;
+
+  platformBrowserDynamic().bootstrapModule(MyAppModule);
+  ```
+* browser:
+  - short form bootstrap does no longer allow
+    to inject compiler internals (i.e. everything
+    from `@angular/compiler`). Inject `Compiler` instead.
+* core:
+  - `ApplicationRef.waitForAsyncInitializers` is deprecated. Use
+  `AppInitStatus.donePromise` / `AppInitStatus.done` instead.
+* core:
+  - `ApplicationRef.registerBootstrapListener` is deprecated. Provide a multi
+  provider for the new token `APP_BOOTSTRAP_LISTENER` instead.
+* core:
+  - `ApplicationRef.dispose` is deprecated. Destroy the module that was
+    created during bootstrap instead by calling `NgModuleRef.destroy`.
+  - `AplicationRef.registerDisposeListener` is deprecated.
+    Use the `ngOnDestroy` lifecycle hook for providers or
+    `NgModuleRef.onDestroy` instead.
+  - `disposePlatform` is deprecated. Use `destroyPlatform` instead.
+  - `PlatformRef.dipose()` is deprecated. Use `PlatformRef.destroy()`
+    instead.
+  - `PlatformRef.registerDisposeListener` is deprecated. Use
+    `PlatformRef.onDestroy` instead.
+  - `PlaformRef.diposed` is deprecated. Use `PlatformRef.destroyed`
+    instead.
+* testing:
+  * `withProviders`, use `TestBed.withModule` instead
+  * `addProviders`, use `TestBed.configureTestingModule` instead
+  * `TestComponentBuilder`, use `TestBed.configureTestModule` / `TestBed.override...` / `TestBed.createComponent` instead.
+* core:
+  - ES5 users can no longer use the `View(…)` function to provide `ViewMetadata`.
+  This mirrors the removal of the `@View` decorator a while ago.
+* core:
+  - `bootstrapModule` and `bootstrapModuleFactory` have been moved to be members of `PlaformRef`.
+    E.g. `platformBrowserDynamic().bootstrapModule(MyModule)`.
+* core:
+  - By default, Angular will error during parsing
+  on unknown properties,
+  even if they are on elements with a `-` in their name
+  (aka custom elements). If you application is using
+  custom elements, fill the new parameter `@NgModule.schemas`
+  with the value `[CUSTOM_ELEMENTS_SCHEMA]`.
+
+  E.g. :
+  ```
+    @NgModule({
+      declarations: [MyComponentThatUsesAWebComponent],
+      imports: [BrowserModule],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      bootstrap:  [MyComponentThatUsesAWebComponent],
+    })
+    export class MyAppModule{}
+  ```
+* core:
+  - `coreLoadAndBootstrap` and `coreBootstrap` can't be used any more (without migration support).
+    Use `bootstrapModule` / `bootstrapModuleFactory` instead.
+  - All Components listed in routes have to be part of the `declarations` of an NgModule.
+    Either directly on the bootstrap module / lazy loaded module, or in an NgModule imported by them.
+* core:
+  - `ApplicationRef.run` is deprecated. Use `NgZone.run` directly
+  - `ApplicationRef.injector` is deprecated. Inject an `Injector` or
+    use `NgModuleRef.injector` instead
+  - `ApplicationRef.zone` is deprecated. Inject `NgZone` instead.
+* testing: `TestInjector` is now renamed to `TestBed`
+
+  Before:
+
+  ```js
+  import {TestInjector, getTestInjector} from '@angular/core/testing';
+  ```
+
+  After:
+
+  ```js
+  import {TestBed, getTestBed} from '@angular/core/testing';
+  ```
+* http: The behavior in this commit is the same as before PR 7260 : the objects sent with the request are converted to a string, therefore there is no need for the user to take care of the serialization.
+* platform-browser: The following API was never intended to be public and is removed:
+
+  ```js
+  import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e';
+  ```
+
+  Consider using Protractor's console plugin: https://github.com/angular/protractor-console-plugin
+* ICU:
+
+  "{" is used a a delimiter for ICU messages then it could not be used in text nodes.
+  "{" should be escaped as "{{ '{' }}"
+
+  Before:
+
+      <span>some { valid } text</span>
+
+  After:
+
+      <span>some { invalid } text<span> <!-- throw parse error -->
+      <span>some {{ '{' }} valid } text</span>
+* core: (deprecations)
+
+  - Instead of `coreBootstrap`, create an `@NgModule` and use `bootstrapModule`.
+  - Instead of `coreLoadAndBootstarp`, create an `@NgModule` and use `bootstrapModuleFactory`.
+  - Instead of `bootstrapWorkerApp`, create an `@NgModule` that includes the `WorkerAppModule` and use `bootstrapModule` with the `workerAppPlatform()`.
+  - Instead of `bootstrapWorkerUi`, create an @AppModule that includes the `WorkerUiModule` and use `bootstrapModule` with the `workerUiPlatform()` instead.
+  - Instead of `serverBootstrap`, create an @AppModule and use `bootstrapModule` with the `serverDynamicPlatform()` instead.
+  - Instead of `PLATFORM_PIPES` and `PLATFORM_DIRECTIVES`, provide platform directives/pipes via an `@NgModule`.
+  - Instead of `ComponentResolver`:
+    - use `ComponentFactoryResolver` together with `@NgModule.entryComponents` or `ANALYZE_FOR_ENTRY_COMPONENTS` provider for dynamic component creation.
+    - use `NgModuleFactoryLoader` for lazy loading.
+  - Instead of `SystemJsComponentResolver`, create an `@NgModule` and use `SystemJsNgModuleLoader`.
+  - Instead of `SystemJsCmpFactoryResolver`, create an `@NgModule` and use `SystemJsNgModuleFactoryLoader`
+* core:
+  - `lockRunMode` is deprecated and no more needed.
+* animations:
+  - animation trigger expressions within the template that are assigned as
+  an element attribute (e.g. `@prop`) are deprecated. Please use the
+  Angular2 property binding syntax (e.g. `[@prop]`) when assigning
+  properties.
+
+  ```ts
+  // this is now deprecated
+  <div @trigger="expression"></div>
+
+  // do this instead
+  <div [@trigger]="expression"></div>
+  ```
+
+* forms:
+
+  We have removed the deprecated form directives from the built-in platform directive list, so apps are not required to package forms with their app. This also makes forms friendly to offline compilation.
+
+  Instead, we have exposed three modules:
+
+  OLD API:
+  - `DeprecatedFormsModule`
+
+  NEW API:
+  - `FormsModule`
+  - `ReactiveFormsModule`
+
+  If you provide one of these modules, the default forms directives and providers from that module will be available to you app-wide.  Note: You can provide both the `FormsModule` and the `ReactiveFormsModule` together if you like, but they are fully-functional separately.
+
+  **Before:**
+  ```ts
+  import {disableDeprecatedForms, provideForms} from @angular/forms;
+
+  bootstrap(App, [
+    disableDeprecatedForms(),
+    provideForms()
+  ]);
+  ```
+
+  **After:**
+
+  ```ts
+  import {DeprecatedFormsModule} from @angular/common;
+
+  @NgModule({
+    declarations: [MyComponent],
+    imports: [BrowserModule, DeprecatedFormsModule],
+    bootstrap:  [MyComponent],
+  })
+  export class MyAppModule{}
+  ```
+* testing:
+  - Application providers can no longer inject compiler internals (i.e. everything
+  from `@angular/compiler`). Inject `Compiler` instead. This reflects the
+  changes to `bootstrap` for module support (3f55aa609f60f130f1d69188ed057214b1267cb3).
+  - Compiler providers can no longer be added via `addProviders` / `withProviders`.
+    Use the new method `configureCompiler` instead.
+  - Platform directives / pipes need to be provided via
+    `configureModule` and can no longer be provided via the
+    `PLATFORM_PIPES` / `PLATFORM_DIRECTIVES` tokens.
+  - `setBaseTestProviders()` was renamed into `initTestEnvironment` and
+    now takes a `PlatformRef` and a factory for a
+    `Compiler`.
+  - E.g. for the browser platform:
+
+    BEFORE:
+    ```
+    import {setBaseTestProviders} from ‘@angular/core/testing’;
+    import {TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+        TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS} from ‘@angular/platform-browser-dynamic/testing’;
+
+    setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+        TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
+    ```
+
+    AFTER:
+    ```
+    import {TestBed} from ‘@angular/core/testing’;
+    import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from ‘@angular/platform-browser-dynamic/testing’;
+
+    TestBed.initTestEnvironment(
+        BrowserDynamicTestingModule,
+        platformBrowserDynamicTesting()
+        );
+
+    ```
+  - E.g. for the server platform:
+
+    BEFORE:
+    ```
+    import {setBaseTestProviders} from ‘@angular/core/testing’;
+    import {TEST_SERVER_PLATFORM_PROVIDERS,
+        TEST_SERVER_APPLICATION_PROVIDERS} from ‘@angular/platform-server/testing/server’;
+
+    setBaseTestProviders(TEST_SERVER_PLATFORM_PROVIDERS,
+        TEST_SERVER_APPLICATION_PROVIDERS);
+    ```
+
+    AFTER:
+    ```
+    import {TestBed} from ‘@angular/core/testing’;
+    import {ServerTestingModule, serverTestingPlatform} from ‘@angular/platform-browser-dynamic/testing’;
+
+    TestBed.initTestEnvironment(
+        ServerTestingModule,
+        serverTestingPlatform()
+        );
+    ```
+
+  Related to #9726
+* ngUpgrade: UpgradeAdapter.addProvider are now deprecated in favor of passing in an NgModule into the adapter's constructor
+
+  Before:
+
+  ```
+  let upgradeAdapter = new UpgradeAdapter();
+  upgradeAdapter.addProviders([myProvidersArray);
+  ```
+
+  After:
+
+  ```
+  @NgModule({
+    providers: myProvidersArray
+  })
+  class MyModule {}
+
+  let upgradeAdapter = new UpgradeAdapter(MyModule);
+  ```
+
+  * ngModel: `ngModel` is now always asynchronous when updating. This means that in tests, instead of calling `ComponentFixture.detectChanges`, you'll need to use `ComponentFixture.whenStable`, which is asynchronous.
+
+  Before:
+
+  ```js
+      let fixture = TestBed.createComponent(InputComp);
+      fixture.detectChanges();
+
+      let inputBox = <HTMLInputElement> fixture.debugElement.query(By.css('input')).nativeElement;
+      expect(inputBox.value).toEqual('Original Name');
+  ```
+
+  After:
+  ```js
+      let fixture = TedBed.createComponent(InputComp);
+      fixture.whenStable().then(() => {
+        let inputBox = <HTMLInputElement> fixture.debugElement.query(By.css('input')).nativeElement;
+        expect(inputBox.value).toEqual('Original Name');
+     });
+  ```
+
+### ROUTER CHANGE LOG
+
+[You can find the router changelog here.](https://github.com/angular/angular/blob/master/modules/@angular/router/CHANGELOG.md)
+
 <a name="2.0.0-rc.4"></a>
 # [2.0.0-rc.4](https://github.com/angular/angular/compare/2.0.0-rc.3...2.0.0-rc.4) (2016-06-30)
 
@@ -62,7 +765,7 @@
 
 ### BREAKING CHANGES
 
-* http: The changes to Http's URLSearchParams serialization now 
+* http: The changes to Http's URLSearchParams serialization now
   prevent encoding of these characters inside query parameters
   which were previously converted to percent-encoded values `@ : $ , ; + ; ? /`
 
@@ -124,14 +827,17 @@
   stringifyElement,
   expect (and custom matchers for Jasmine)
   ```
-* testing: Before:
+* testing:
+
+  Before:
 
       expect(...).toThrowErrorWith(msg);
 
   After:
 
       expect(...).toThrowError(msg);
-  * testing: Before:
+
+  Before:
 
       expect(...).toMatchPattern(pattern);
 
@@ -151,7 +857,7 @@
 
   Before:
   ```js
-  import {beforeEachProviders, it, describe, inject} from '@angular/testing/core';
+  import {beforeEachProviders, it, describe, inject} from '@angular/core/testing';
 
   describe('my code', () => {
     beforeEachProviders(() => [MyService]);
@@ -164,7 +870,7 @@
 
   After:
   ```js
-  import {addProviders, inject} from '@angular/testing/core';
+  import {addProviders, inject} from '@angular/core/testing';
 
   describe('my code', () => {
     beforeEach(() => {
@@ -173,7 +879,7 @@
 
     it('does stuff', inject([MyService], (service) => {
       // actual test
-    });
+    }));
   });
   ```
 
@@ -400,7 +1106,7 @@ The likelihood of anyone actually depending on this property is very low.
 * HTML, style values, and URLs are now automatically sanitized. Values that do not match are escaped
   or ignored. When binding a URL or style property that would get ignored, bind to a value
   explicitly marked as safe instead by injection the DOM sanitization service:
-  
+
   ```
   class MyComponent {
     constructor(sanitizer: DomSanitizationService) {
@@ -411,7 +1117,7 @@ The likelihood of anyone actually depending on this property is very low.
   }
   ```
 
-* `PLATFORM_PIPES` and `PLATFORM_DIRECTIVES` now are fields on `CompilerConfig`. 
+* `PLATFORM_PIPES` and `PLATFORM_DIRECTIVES` now are fields on `CompilerConfig`.
   Instead of providing a binding to these tokens, provide a binding for `CompilerConfig` instead.
 
 * `CompilerConfig` used to take positional arguments and now takes named arguments.

CONTRIBUTING.md

@@ -21,7 +21,7 @@ If you have questions about how to *use* Angular, please direct them to the [Goo
 discussion list or [StackOverflow][stackoverflow]. Please note that Angular 2 is still in early developer preview, and the core team's capacity to answer usage questions is limited. We are also available on [Gitter][gitter].
 
 ## <a name="issue"></a> Found an Issue?
-If you find a bug in the source code or a mistake in the documentation, you can help us by
+If you find a bug in the source code, you can help us by
 [submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
 [submit a Pull Request](#submit-pr) with a fix.
 
@@ -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

DEVELOPER.md

@@ -1,19 +1,13 @@
-# Building and Testing Angular 2 for JS and Dart
+# Building and Testing Angular 2 for JS
 
-This document describes how to set up your development environment to build and test Angular, both
-JS and Dart versions. It also explains the basic mechanics of using `git`, `node`, and `npm`.
+This document describes how to set up your development environment to build and test Angular 2 JS version. 
+It also explains the basic mechanics of using `git`, `node`, and `npm`.
 
 * [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)
-* [Code Style](#code-style)
-* [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.
@@ -32,15 +26,6 @@ following products on your development machine:
   (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.
 
-* *Optional*: [Dart](https://www.dartlang.org) (version `>=1.13.2 <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). Visit Dart's [Downloads page](https://www.dartlang.org/downloads) page for
-  instructions. You can also download both **stable** and **dev** channel versions from the
-  [download archive](https://www.dartlang.org/downloads/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`).
-
 * [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.
 
@@ -65,44 +50,9 @@ cd angular
 # Add the main Angular repository as an upstream remote to your repository:
 git remote add upstream https://github.com/angular/angular.git
 ```
+## Installing NPM Modules
 
-## 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
-
-Next, install the JavaScript modules and Dart packages needed to build and test Angular:
+Next, install the JavaScript modules needed to build and test Angular:
 
 ```shell
 # Install Angular project dependencies (package.json)
@@ -124,243 +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. On Windows, only administrators can create symbolic links by default, but you may change the policy. (see [here](https://technet.microsoft.com/library/cc766301.aspx?f=255&MSPPError=-2147217396).)
-
-### 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.(sauce|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.sauce --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.sauce --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`
-
-## Code Style
-
-### 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 lint
-
-Note that the continuous build on CircleCI will 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 `gulp format` to format everything.
-* Use `gulp lint` 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 --style file' > .git/hooks/pre-commit
-    $ chmod u+x !$
-```
-
-**NOTE**: To use ```git clang-format``` use have to make sure that ```git-clang-format``` is in your
-```PATH```. The easiest way is probably to just ```npm install -g clang-format``` as it comes with
-```git-clang-format```.
-
-* **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.).
-
-### Linting
-
-We use [tslint](https://github.com/palantir/tslint) for linting. See linting rules in [gulpfile](gulpfile.js). To lint, run
+To run tests:
 
 ```shell
-$ gulp lint
+$ ./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
 ```
 
-## Generating the API documentation
+You should execute the 3 test suites before submitting a PR to github.
 
-The following gulp task will generate the API docs in the `dist/angular.io/partials/api/angular2`:  
+All the tests are executed on our Continuous Integration infrastructure and a PR could only be merged once the tests pass.
 
-```shell
-$(npm bin)/gulp docs/angular.io
+- CircleCI fails if your code is not formatted properly,
+- Travis CI fails if any of the test suite describe above fails.
+
+## Update the public API tests
+
+If you happen to modify the public API of Angular, API golden files must be updated using:
+
+``` shell
+$ gulp public-api:update
 ```
 
-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.
+Note: The command `./test.sh tools` fails when the API doesn't match the golden files.
 
-## Project Information
+## Formatting your source code
 
-### Folder structure
+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.
 
-* `modules/*`: modules that will be loaded in the browser
-* `tools/*`: tools that are needed to build Angular
-* `dist/*`: build files are placed here.
+You can automatically format your code by running:
 
-### File suffixes
+``` shell
+$ gulp format
+```
 
-* `*.ts`: TypeScript files that get transpiled to Dart and EcmaScript 5/6
-* `*.dart`: Dart files that don't get transpiled
 
-## CI using Travis
-
-For instructions on setting up Continuous Integration using Travis, see the instructions given
-[here](https://github.com/angular/angular.dart/blob/master/travis.md).
-
-## Transforming Dart code
-
-See the [wiki](//github.com/angular/angular/wiki/Angular-2-Dart-Transformer).
-
-## Debugging
-
-### 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.

README.md

@@ -12,7 +12,9 @@ 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 **Release Candidate**.
 
@@ -34,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.md

@@ -1,4 +1,140 @@
 # Developer Tools for Angular 2
 
-- [JavaScript](TOOLS_JS.md)
-- [Dart](TOOLS_DART.md)
+Here you will find a collection of tools and tips for keeping your application
+perform well and contain fewer bugs.
+
+## Angular debug tools in the dev console
+
+Angular provides a set of debug tools that are accessible from any browser's
+developer console. In Chrome the dev console can be accessed by pressing
+Ctrl + Shift + j.
+
+### Enabling debug tools
+
+By default the debug tools are disabled. You can enable debug tools as follows:
+
+```typescript
+import {enableDebugTools} from '@angular/platform-browser';
+
+bootstrap(Application).then((appRef) => {
+  enableDebugTools(appRef);
+});
+```
+
+### Using debug tools
+
+In the browser open the developer console (Ctrl + Shift + j in Chrome). The
+top level object is called `ng` and contains more specific tools inside it.
+
+Example:
+
+```javascript
+ng.profiler.timeChangeDetection();
+```
+
+## Performance
+
+### Change detection profiler
+
+If your application is janky (it misses frames) or is slow according to other
+metrics it is important to find the root cause of the issue. Change detection
+is a phase in Angular's lifecycle that detects changes in values that are
+bound to UI, and if it finds a change it performs the corresponding UI update.
+However, sometimes it is hard to tell if the slowness is due to the act of
+computing the changes being slow, or due to the act of applying those changes
+to the UI. For your application to be performant it is important that the
+process of computing changes is very fast. For best results it should be under
+3 milliseconds in order to leave room for the application logic, the UI updates
+and browser's rendering pipeline to fit withing the 16 millisecond frame
+(assuming the 60 FPS target frame rate).
+
+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 it took to perform a single cycle of
+change detection in milliseconds and prints it to the console. This number
+depends on the current state of the UI. You will likely see different numbers
+as you go from one screen in your application to another.
+
+#### Running the profiler
+
+Enable debug tools (see above), then in the dev console enter the following:
+
+```javascript
+ng.profiler.timeChangeDetection();
+```
+
+The results will be printed to the console.
+
+#### Recording CPU profile
+
+Pass `{record: true}` an argument:
+
+```javascript
+ng.profiler.timeChangeDetection({record: true});
+```
+
+Then open the "Profiles" tab. You will see the recorded profile titled
+"Change Detection". In Chrome, if you record the profile repeatedly, all the
+profiles will be nested under "Change Detection".
+
+#### Interpreting the numbers
+
+In a properly-designed application repeated attempts to detect changes without
+any user actions should result in no changes to be applied on 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. Ideally the
+number printed by the profiler should be well below the length of a single
+animation frame (16ms). A good rule of thumb is to keep it under 3ms.
+
+#### 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 would help to understand how change detection works. Such a
+discussion is outside the scope of this document (TODO link to docs), but here
+are some key concepts in brief.
+
+By default Angular uses "dirty checking" mechanism for finding 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 could contribute to slow change detection. A good way to
+speed things up is to use plain class fields in your expressions and avoid any
+kinds of computation. Example:
+
+```typescript
+@Component({
+  template: '<button [enabled]="isEnabled">{{title}}</button>'
+})
+class FancyButton {
+  // GOOD: no computation, just return the value
+  isEnabled: boolean;
+
+  // BAD: computes the final value upon request
+  _title: String;
+  get title(): String { return this._title.trim().toUpperCase(); }
+}
+```
+
+Most cases like these could 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 (also a discussion for another time).

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

@@ -1,140 +0,0 @@
-# Developer Tools for JavaScript
-
-Here you will find a collection of tools and tips for keeping your application
-perform well and contain fewer bugs.
-
-## Angular debug tools in the dev console
-
-Angular provides a set of debug tools that are accessible from any browser's
-developer console. In Chrome the dev console can be accessed by pressing
-Ctrl + Shift + j.
-
-### Enabling debug tools
-
-By default the debug tools are disabled. You can enable debug tools as follows:
-
-```typescript
-import {enableDebugTools} from '@angular/platform-browser';
-
-bootstrap(Application).then((appRef) => {
-  enableDebugTools(appRef);
-});
-```
-
-### Using debug tools
-
-In the browser open the developer console (Ctrl + Shift + j in Chrome). The
-top level object is called `ng` and contains more specific tools inside it.
-
-Example:
-
-```javascript
-ng.profiler.timeChangeDetection();
-```
-
-## Performance
-
-### Change detection profiler
-
-If your application is janky (it misses frames) or is slow according to other
-metrics it is important to find the root cause of the issue. Change detection
-is a phase in Angular's lifecycle that detects changes in values that are
-bound to UI, and if it finds a change it performs the corresponding UI update.
-However, sometimes it is hard to tell if the slowness is due to the act of
-computing the changes being slow, or due to the act of applying those changes
-to the UI. For your application to be performant it is important that the
-process of computing changes is very fast. For best results it should be under
-3 milliseconds in order to leave room for the application logic, the UI updates
-and browser's rendering pipeline to fit withing the 16 millisecond frame
-(assuming the 60 FPS target frame rate).
-
-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 it took to perform a single cycle of
-change detection in milliseconds and prints it to the console. This number
-depends on the current state of the UI. You will likely see different numbers
-as you go from one screen in your application to another.
-
-#### Running the profiler
-
-Enable debug tools (see above), then in the dev console enter the following:
-
-```javascript
-ng.profiler.timeChangeDetection();
-```
-
-The results will be printed to the console.
-
-#### Recording CPU profile
-
-Pass `{record: true}` an argument:
-
-```javascript
-ng.profiler.timeChangeDetection({record: true});
-```
-
-Then open the "Profiles" tab. You will see the recorded profile titled
-"Change Detection". In Chrome, if you record the profile repeatedly, all the
-profiles will be nested under "Change Detection".
-
-#### Interpreting the numbers
-
-In a properly-designed application repeated attempts to detect changes without
-any user actions should result in no changes to be applied on 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. Ideally the
-number printed by the profiler should be well below the length of a single
-animation frame (16ms). A good rule of thumb is to keep it under 3ms.
-
-#### 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 would help to understand how change detection works. Such a
-discussion is outside the scope of this document (TODO link to docs), but here
-are some key concepts in brief.
-
-By default Angular uses "dirty checking" mechanism for finding 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 could contribute to slow change detection. A good way to
-speed things up is to use plain class fields in your expressions and avoid any
-kinds of computation. Example:
-
-```typescript
-@Component({
-  template: '<button [enabled]="isEnabled">{{title}}</button>'
-})
-class FancyButton {
-  // GOOD: no computation, just return the value
-  isEnabled: boolean;
-
-  // BAD: computes the final value upon request
-  _title: String;
-  get title(): String { return this._title.trim().toUpperCase(); }
-}
-```
-
-Most cases like these could 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 (also a discussion for another time).

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2",
   "dependencies": {
-    "polymer": "Polymer/polymer"
+    "polymer": "Polymer/polymer#^1.6.0"
   }
 }

browser-providers.conf.js

@@ -13,7 +13,7 @@ var CIconfiguration = {
   '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: false}, 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}},
@@ -38,7 +38,7 @@ var customLaunchers = {
   'SL_CHROME': {
     base: 'SauceLabs',
     browserName: 'chrome',
-    version: '50'
+    version: '52'
   },
   'SL_CHROMEBETA': {
     base: 'SauceLabs',
@@ -53,7 +53,7 @@ var customLaunchers = {
   'SL_FIREFOX': {
     base: 'SauceLabs',
     browserName: 'firefox',
-    version: '45'
+    version: '46'
   },
   'SL_FIREFOXBETA': {
     base: 'SauceLabs',
@@ -69,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',
@@ -99,7 +99,7 @@ var customLaunchers = {
     base: 'SauceLabs',
     browserName: 'iphone',
     platform: 'OS X 10.10',
-    version: '9.1'
+    version: '9.3'
   },
   'SL_IE9': {
     base: 'SauceLabs',
@@ -202,7 +202,7 @@ var customLaunchers = {
     base: 'BrowserStack',
     device: 'iPhone 6S',
     os: 'ios',
-    os_version: '9.0'
+    os_version: '9.1'
   },
   'BS_IE9': {
     base: 'BrowserStack',

build.sh

@@ -21,7 +21,7 @@ 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/core-js/client/core.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 .
@@ -31,11 +31,27 @@ ln -s ../../../../node_modules/rxjs .
 ln -s ../../../../node_modules/angular/angular.js .
 cd -
 
+echo "====== Copying files needed for benchmarks ====="
+cp -r ./modules/benchmarks ./dist/all/
+cp -r ./modules/benchmarks/favicon.ico ./dist/
+mkdir ./dist/all/benchmarks/vendor
+cd ./dist/all/benchmarks/vendor
+ln -s ../../../../node_modules/core-js/client/core.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 .
+ln -s ../../../../bower_components/polymer .
+cd -
 
 TSCONFIG=./modules/tsconfig.json
 echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
 # compile ts code
-TSC="node dist/tools/@angular/tsc-wrapped/src/main"
+TSC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
+UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
 $TSC -p modules/tsconfig.json
 
 rm -rf ./dist/packages-dist
@@ -48,71 +64,68 @@ for PACKAGE in \
   platform-browser \
   platform-browser-dynamic \
   platform-server \
+  platform-webworker \
+  platform-webworker-dynamic \
   http \
   router \
-  router-deprecated \
   upgrade \
-  compiler-cli
+  compiler-cli \
+  benchpress
 do
-  SRCDIR=./modules/@angular/${PACKAGE}
-  DESTDIR=./dist/packages-dist/${PACKAGE}
-  UMD_ES6_PATH=${DESTDIR}/esm/${PACKAGE}.umd.js
+  PWD=`pwd`
+  SRCDIR=${PWD}/modules/@angular/${PACKAGE}
+  DESTDIR=${PWD}/dist/packages-dist/${PACKAGE}
   UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
+  UMD_TESTING_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-testing.umd.js
   UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
+  LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
 
-  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
+  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig.json        ====="
+  $TSC -p ${SRCDIR}/tsconfig.json
 
   cp ${SRCDIR}/package.json ${DESTDIR}/
 
+  if [[ -e ${SRCDIR}/tsconfig-testing.json ]]; then
+    echo "======      COMPILING TESTING: ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
+    $TSC -p ${SRCDIR}/tsconfig-testing.json
+  fi
 
   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'
+    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/\/\/\/ <reference types="node" \/>//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/\/\/\/ <reference types="node" \/>//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
+  if [[ ${PACKAGE} != compiler-cli && ${PACKAGE} != benchpress ]]; then
 
     echo "======      BUNDLING: ${SRCDIR} ====="
     mkdir ${DESTDIR}/bundles
 
     (
       cd  ${SRCDIR}
-      echo "..."  # here just to have grep match something and not exit with 1
+      echo "======         Rollup ${PACKAGE} index"
       ../../../node_modules/.bin/rollup -c rollup.config.js
+      cat ${LICENSE_BANNER} > ${UMD_ES5_PATH}.tmp
+      cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
+      mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
+      $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
+
+
+      if [[ -e rollup-testing.config.js ]]; then
+        echo "======         Rollup ${PACKAGE} testing"
+        ../../../node_modules/.bin/rollup -c rollup-testing.config.js
+        echo "{\"main\": \"../bundles/${PACKAGE}-testing.umd.js\"}" > ${DESTDIR}/testing/package.json
+        cat ${LICENSE_BANNER} > ${UMD_TESTING_ES5_PATH}.tmp
+        cat ${UMD_TESTING_ES5_PATH} >> ${UMD_TESTING_ES5_PATH}.tmp
+        mv ${UMD_TESTING_ES5_PATH}.tmp ${UMD_TESTING_ES5_PATH}
+      fi
     ) 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

gulpfile.js

@@ -11,7 +11,8 @@ const path = require('path');
 const os = require('os');
 
 const srcsToFmt =
-    ['tools/**/*.ts', 'modules/@angular/**/*.ts', '!tools/public_api_guard/**/*.d.ts'];
+    ['tools/**/*.ts', 'modules/@angular/**/*.ts', '!tools/public_api_guard/**/*.d.ts',
+    'modules/playground/**/*.ts', 'modules/benchmarks/**/*.ts', 'modules/e2e_util/**/*.ts'];
 
 gulp.task('format:enforce', () => {
   const format = require('gulp-clang-format');
@@ -29,27 +30,28 @@ gulp.task('format', () => {
 
 const entrypoints = [
   'dist/packages-dist/core/index.d.ts',
-  'dist/packages-dist/core/testing.d.ts',
+  'dist/packages-dist/core/testing/index.d.ts',
   'dist/packages-dist/common/index.d.ts',
-  'dist/packages-dist/common/testing.d.ts',
+  'dist/packages-dist/common/testing/index.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
   'dist/packages-dist/upgrade/index.d.ts',
   'dist/packages-dist/platform-browser/index.d.ts',
-  'dist/packages-dist/platform-browser/testing.d.ts',
-  'dist/packages-dist/platform-browser/testing_e2e.d.ts',
+  'dist/packages-dist/platform-browser/testing/index.d.ts',
   'dist/packages-dist/platform-browser-dynamic/index.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/testing.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/testing/index.d.ts',
+  'dist/packages-dist/platform-webworker/index.d.ts',
+  'dist/packages-dist/platform-webworker-dynamic/index.d.ts',
   'dist/packages-dist/platform-server/index.d.ts',
-  'dist/packages-dist/platform-server/testing.d.ts',
+  'dist/packages-dist/platform-server/testing/index.d.ts',
   'dist/packages-dist/http/index.d.ts',
-  'dist/packages-dist/http/testing.d.ts',
+  'dist/packages-dist/http/testing/index.d.ts',
   'dist/packages-dist/forms/index.d.ts',
   'dist/packages-dist/router/index.d.ts'
 ];
-const publicApiDir = 'tools/public_api_guard';
+const publicApiDir = path.normalize('tools/public_api_guard');
 const publicApiArgs = [
   '--rootDir', 'dist/packages-dist',
   '--stripExportPattern', '^__',
@@ -59,30 +61,38 @@ const publicApiArgs = [
   '--onStabilityMissing', 'error'
 ].concat(entrypoints);
 
-// Note that these two commands work on built d.ts files instead of the source
-gulp.task('public-api:enforce', (done) => {
-  const child_process = require('child_process');
-  child_process
-      .spawn(
-          `${__dirname}/node_modules/.bin/ts-api-guardian`,
-          ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', (errorCode) => {
-        if (errorCode !== 0) {
-          done(new Error(
-              'Public API differs from golden file. Please run `gulp public-api:update`.'));
-        } else {
-          done();
-        }
-      });
+gulp.task('build.sh', (done) => {
+  const childProcess = require('child_process');
+
+  childProcess.exec(path.join(__dirname, 'build.sh'), error => done(error));
 });
 
-gulp.task('public-api:update', (done) => {
-  const child_process = require('child_process');
-  child_process
-      .spawn(
-          `${__dirname}/node_modules/.bin/ts-api-guardian`,
-          ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', (errorCode) => done(errorCode));
+// Note that these two commands work on built d.ts files instead of the source
+gulp.task('public-api:enforce', (done) => {
+  const childProcess = require('child_process');
+
+  childProcess
+    .spawn(
+      path.join(__dirname, `/node_modules/.bin/ts-api-guardian${/^win/.test(os.platform()) ? '.cmd' : ''}`),
+      ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+    .on('close', (errorCode) => {
+      if (errorCode !== 0) {
+        done(new Error(
+          'Public API differs from golden file. Please run `gulp public-api:update`.'));
+      } else {
+        done();
+      }
+    });
+});
+
+gulp.task('public-api:update', ['build.sh'], (done) => {
+  const childProcess = require('child_process');
+
+  childProcess
+    .spawn(
+      path.join(__dirname, `/node_modules/.bin/ts-api-guardian${/^win/.test(os.platform()) ? '.cmd' : ''}`),
+      ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+    .on('close', (errorCode) => done(errorCode));
 });
 
 gulp.task('lint', ['format:enforce', 'tools:build'], () => {
@@ -90,17 +100,34 @@ gulp.task('lint', ['format:enforce', 'tools:build'], () => {
   // Built-in rules are at
   // https://github.com/palantir/tslint#supported-rules
   const tslintConfig = require('./tslint.json');
-  return gulp.src(['modules/@angular/**/*.ts', '!modules/@angular/*/test/**'])
+  return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
     .pipe(tslint({
       tslint: require('tslint').default,
       configuration: tslintConfig,
-      rulesDirectory: 'dist/tools/tslint'
+      rulesDirectory: 'dist/tools/tslint',
+      formatter: 'prose'
     }))
-    .pipe(tslint.report('prose', {emitError: true}));
+    .pipe(tslint.report({emitError: true}));
 });
 
 gulp.task('tools:build', (done) => { tsc('tools/', done); });
 
+gulp.task('check-cycle', (done) => {
+  const madge = require('madge');
+
+  var dependencyObject = madge(['dist/all/'], {
+    format: 'cjs',
+    extensions: ['.js'],
+    onParseFile: function(data) { data.src = data.src.replace(/\/\* circular \*\//g, "//"); }
+  });
+  var circularDependencies = dependencyObject.circular().getArray();
+  if (circularDependencies.length > 0) {
+    console.log('Found circular dependencies!');
+    console.log(circularDependencies);
+    process.exit(1);
+  }
+  done();
+});
 
 gulp.task('serve', () => {
   let connect = require('gulp-connect');
@@ -132,11 +159,10 @@ gulp.task('changelog', () => {
     .pipe(gulp.dest('./'));
 });
 
-
 function tsc(projectPath, done) {
-  let child_process = require('child_process');
+  const childProcess = require('child_process');
 
-  child_process
+  childProcess
       .spawn(
           path.normalize(`${__dirname}/node_modules/.bin/tsc`) + (/^win/.test(os.platform()) ? '.cmd' : ''),
           ['-p', path.join(__dirname, projectPath)],

karma-js.conf.js

@@ -13,12 +13,14 @@ module.exports = function(config) {
       // Loaded through the System loader, in `test-main.js`.
       {pattern: 'dist/all/@angular/**/*.js', included: false, watched: true},
 
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/core.js',
       // include Angular v1 for upgrade module testing
       'node_modules/angular/angular.min.js',
 
       'node_modules/zone.js/dist/zone.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
+      'node_modules/zone.js/dist/proxy.js',
+      'node_modules/zone.js/dist/sync-test.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',
@@ -37,8 +39,9 @@ module.exports = function(config) {
 
     exclude: [
       'dist/all/@angular/**/e2e_test/**',
-      'dist/all/@angular/examples/**',
+      'dist/all/@angular/router/**',
       'dist/all/@angular/compiler-cli/**',
+      'dist/all/@angular/benchpress/**',
       'dist/all/angular1_router.js',
       'dist/all/@angular/platform-browser/testing/e2e_util.js'
     ],

modules/@angular/README.dart.md

@@ -1,6 +0,0 @@
-Angular2
-=========
-
-The sources for this package are in the main [Angular2](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo. This is the repository for the upcoming 2.0 version. If you're looking for the current official version of Angular you should go to [angular/angular.js](https://github.com/angular/angular.js)
-
-License: Apache MIT 2.0

modules/@angular/benchpress/README.md

@@ -3,6 +3,10 @@
 Benchpress is a framework for e2e performance tests.
 See [here for an example project](https://github.com/angular/benchpress-tree).
 
+The sources for this package are in the main [Angular2](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.
+
+License: Apache MIT 2.0
+
 # Why?
 
 There are so called "micro benchmarks" that essentially use a stop watch in the browser to measure time
@@ -158,7 +162,7 @@ runner.sample({
 ````
 
 When looking into the DevTools Timeline, we see a marker as well:
-![Marked Timeline](marked_timeline.png)
+![Marked Timeline](docs/marked_timeline.png)
 
 ### Custom Metrics Without Using `console.time`
 
@@ -185,8 +189,8 @@ describe('home page load', function() {
       userMetrics: {
         timeToBootstrap: 'The time in milliseconds to bootstrap'
       },
-      bindings: [
-        bind(RegressionSlopeValidator.METRIC).toValue('timeToBootstrap')
+      providers: [
+        {provide: RegressionSlopeValidator.METRIC, useValue: 'timeToBootstrap'}
       ]
     }).then(done);
   });
@@ -208,9 +212,9 @@ Benchpress can also measure the "smoothness" of scrolling and animations. In ord
 
 To collect these metrics, you need to execute `console.time('frameCapture')` and `console.timeEnd('frameCapture')` either in your benchmark application or in you benchmark driver via webdriver. The metrics mentioned above will only be collected between those two calls and it is recommended to wrap the time/timeEnd calls as closely as possible around the action you want to evaluate to get accurate measurements.
 
-In addition to that, one extra binding needs to be passed to benchpress in tests that want to collect these metrics:
+In addition to that, one extra provider needs to be passed to benchpress in tests that want to collect these metrics:
 
-    benchpress.sample(providers: [bp.bind(bp.Options.CAPTURE_FRAMES).toValue(true)], ... )
+    benchpress.sample(providers: [{provide: bp.Options.CAPTURE_FRAMES, useValue: true}], ... )
 
 # Requests Metrics
 
@@ -222,8 +226,8 @@ Benchpress can also record the number of requests sent and count the received "e
 To collect these metrics, you need the following corresponding extra providers:
 
     benchpress.sample(providers: [
-      bp.bind(bp.Options.RECEIVED_DATA).toValue(true),
-      bp.bind(bp.Options.REQUEST_COUNT).toValue(true)
+      {provide: bp.Options.RECEIVED_DATA, useValue: true},
+      {provide: bp.Options.REQUEST_COUNT, useValue: true}
     ], ... )
 
 # Best practices
@@ -256,7 +260,7 @@ To collect these metrics, you need the following corresponding extra providers:
 
 # Detailed overview
 
-![Overview](overview.png)
+![Overview](docs/overview.png)
 
 Definitions:
 

modules/@angular/benchpress/index.ts

@@ -1,23 +1,34 @@
-export {Sampler, SampleState} from './src/sampler';
+/**
+ * @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
+ */
+
+// Must be imported first, because angular2 decorators throws on load.
+import 'reflect-metadata';
+
+export {Injector, OpaqueToken, Provider, ReflectiveInjector} from '@angular/core';
+export {Options} from './src/common_options';
+export {MeasureValues} from './src/measure_values';
 export {Metric} from './src/metric';
-export {Validator} from './src/validator';
+export {MultiMetric} from './src/metric/multi_metric';
+export {PerflogMetric} from './src/metric/perflog_metric';
+export {UserMetric} from './src/metric/user_metric';
 export {Reporter} from './src/reporter';
-export {WebDriverExtension, PerfLogFeatures} from './src/web_driver_extension';
-export {WebDriverAdapter} from './src/web_driver_adapter';
-export {SizeValidator} from './src/validator/size_validator';
-export {RegressionSlopeValidator} from './src/validator/regression_slope_validator';
 export {ConsoleReporter} from './src/reporter/console_reporter';
 export {JsonFileReporter} from './src/reporter/json_file_reporter';
+export {MultiReporter} from './src/reporter/multi_reporter';
+export {Runner} from './src/runner';
 export {SampleDescription} from './src/sample_description';
-export {PerflogMetric} from './src/metric/perflog_metric';
+export {SampleState, Sampler} from './src/sampler';
+export {Validator} from './src/validator';
+export {RegressionSlopeValidator} from './src/validator/regression_slope_validator';
+export {SizeValidator} from './src/validator/size_validator';
+export {WebDriverAdapter} from './src/web_driver_adapter';
+export {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from './src/web_driver_extension';
 export {ChromeDriverExtension} from './src/webdriver/chrome_driver_extension';
 export {FirefoxDriverExtension} from './src/webdriver/firefox_driver_extension';
 export {IOsDriverExtension} from './src/webdriver/ios_driver_extension';
-export {Runner} from './src/runner';
-export {Options} from './src/common_options';
-export {MeasureValues} from './src/measure_values';
-export {MultiMetric} from './src/metric/multi_metric';
-export {UserMetric} from './src/metric/user_metric';
-export {MultiReporter} from './src/reporter/multi_reporter';
-
-export {bind, provide, Injector, ReflectiveInjector, OpaqueToken} from '@angular/core/src/di';
+export {SeleniumWebDriverAdapter} from './src/webdriver/selenium_webdriver_adapter';

modules/@angular/benchpress/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "@angular/benchpress",
+  "version": "0.0.0-PLACEHOLDER",
+  "description": "Benchpress - a framework for e2e performance tests",
+  "main": "index.js",
+  "typings": "index.d.ts",
+  "dependencies": {
+    "@angular/core": "0.0.0-PLACEHOLDER",
+    "reflect-metadata": "^0.1.2",
+    "rxjs": "5.0.0-beta.11"
+  },
+  "optionalDependencies": {
+    "jpm": "1.1.4",
+    "firefox-profile": "0.4.0",
+    "selenium-webdriver": "3.0.0-beta-2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.git"
+  },
+  "keywords": [
+    "angular",
+    "benchmarks"
+  ],
+  "contributors": [
+    "Tobias Bosch <tbosch@google.com> (https://angular.io/)"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular/issues"
+  },
+  "homepage": "https://github.com/angular/angular/tree/master/modules/@angular/compiler-cli"
+}

modules/@angular/benchpress/src/common_options.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 {OpaqueToken} from '@angular/core';
+import * as fs from 'fs';
+
+import {DateWrapper} from './facade/lang';
+
+export class Options {
+  static SAMPLE_ID = new OpaqueToken('Options.sampleId');
+  static DEFAULT_DESCRIPTION = new OpaqueToken('Options.defaultDescription');
+  static SAMPLE_DESCRIPTION = new OpaqueToken('Options.sampleDescription');
+  static FORCE_GC = new OpaqueToken('Options.forceGc');
+  static NO_PREPARE = () => true;
+  static PREPARE = new OpaqueToken('Options.prepare');
+  static EXECUTE = new OpaqueToken('Options.execute');
+  static CAPABILITIES = new OpaqueToken('Options.capabilities');
+  static USER_AGENT = new OpaqueToken('Options.userAgent');
+  static MICRO_METRICS = new OpaqueToken('Options.microMetrics');
+  static USER_METRICS = new OpaqueToken('Options.userMetrics');
+  static NOW = new OpaqueToken('Options.now');
+  static WRITE_FILE = new OpaqueToken('Options.writeFile');
+  static RECEIVED_DATA = new OpaqueToken('Options.receivedData');
+  static REQUEST_COUNT = new OpaqueToken('Options.requestCount');
+  static CAPTURE_FRAMES = new OpaqueToken('Options.frameCapture');
+  static DEFAULT_PROVIDERS = [
+    {provide: Options.DEFAULT_DESCRIPTION, useValue: {}},
+    {provide: Options.SAMPLE_DESCRIPTION, useValue: {}},
+    {provide: Options.FORCE_GC, useValue: false},
+    {provide: Options.PREPARE, useValue: Options.NO_PREPARE},
+    {provide: Options.MICRO_METRICS, useValue: {}}, {provide: Options.USER_METRICS, useValue: {}},
+    {provide: Options.NOW, useValue: () => DateWrapper.now()},
+    {provide: Options.RECEIVED_DATA, useValue: false},
+    {provide: Options.REQUEST_COUNT, useValue: false},
+    {provide: Options.CAPTURE_FRAMES, useValue: false},
+    {provide: Options.WRITE_FILE, useValue: writeFile}
+  ];
+}
+
+function writeFile(filename: string, content: string): Promise<any> {
+  return new Promise(function(resolve, reject) {
+    fs.writeFile(filename, content, (error) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    });
+  });
+}

modules/@angular/benchpress/src/firefox_extension/data/installed_script.ts

@@ -0,0 +1,38 @@
+/**
+ * @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
+ */
+
+declare var exportFunction: any;
+declare var unsafeWindow: any;
+
+exportFunction(function() {
+  var curTime = unsafeWindow.performance.now();
+  (<any>self).port.emit('startProfiler', curTime);
+}, unsafeWindow, {defineAs: 'startProfiler'});
+
+exportFunction(function() {
+  (<any>self).port.emit('stopProfiler');
+}, unsafeWindow, {defineAs: 'stopProfiler'});
+
+exportFunction(function(cb: Function) {
+  (<any>self).port.once('perfProfile', cb);
+  (<any>self).port.emit('getProfile');
+}, unsafeWindow, {defineAs: 'getProfile'});
+
+exportFunction(function() {
+  (<any>self).port.emit('forceGC');
+}, unsafeWindow, {defineAs: 'forceGC'});
+
+exportFunction(function(name: string) {
+  var curTime = unsafeWindow.performance.now();
+  (<any>self).port.emit('markStart', name, curTime);
+}, unsafeWindow, {defineAs: 'markStart'});
+
+exportFunction(function(name: string) {
+  var curTime = unsafeWindow.performance.now();
+  (<any>self).port.emit('markEnd', name, curTime);
+}, unsafeWindow, {defineAs: 'markEnd'});

modules/@angular/benchpress/src/firefox_extension/lib/main.ts

@@ -1,15 +1,23 @@
+/**
+ * @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
+ */
+
 var {Cc, Ci, Cu} = require('chrome');
 var os = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
 var ParserUtil = require('./parser_util');
 
 class Profiler {
-  private _profiler;
+  private _profiler: any;
   private _markerEvents: any[];
   private _profilerStartTime: number;
 
   constructor() { this._profiler = Cc['@mozilla.org/tools/profiler;1'].getService(Ci.nsIProfiler); }
 
-  start(entries, interval, features, timeStarted) {
+  start(entries: any, interval: any, features: any, timeStarted: any) {
     this._profiler.StartProfiler(entries, interval, features, features.length);
     this._profilerStartTime = timeStarted;
     this._markerEvents = [];
@@ -21,11 +29,14 @@ class Profiler {
     var profileData = this._profiler.getProfileData();
     var perfEvents = ParserUtil.convertPerfProfileToEvents(profileData);
     perfEvents = this._mergeMarkerEvents(perfEvents);
-    perfEvents.sort(function(event1, event2) { return event1.ts - event2.ts; });  // Sort by ts
+    perfEvents.sort(function(event1: any, event2: any) {
+      return event1.ts - event2.ts;
+    });  // Sort by ts
     return perfEvents;
   }
 
-  _mergeMarkerEvents(perfEvents: any[]): any[] {
+  /** @internal */
+  private _mergeMarkerEvents(perfEvents: any[]): any[] {
     this._markerEvents.forEach(function(markerEvent) { perfEvents.push(markerEvent); });
     return perfEvents;
   }
@@ -50,15 +61,18 @@ var profiler = new Profiler();
 mod.PageMod({
   include: ['*'],
   contentScriptFile: data.url('installed_script.js'),
-  onAttach: worker => {
-    worker.port.on('startProfiler',
-                   (timeStarted) => profiler.start(/* = profiler memory */ 3000000, 0.1,
-                                                   ['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
+  onAttach: (worker: any) => {
+    worker.port.on(
+        'startProfiler',
+        (timeStarted: any) => profiler.start(
+            /* = profiler memory */ 3000000, 0.1, ['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
     worker.port.on('stopProfiler', () => profiler.stop());
-    worker.port.on('getProfile',
-                   () => worker.port.emit('perfProfile', profiler.getProfilePerfEvents()));
+    worker.port.on(
+        'getProfile', () => worker.port.emit('perfProfile', profiler.getProfilePerfEvents()));
     worker.port.on('forceGC', forceGC);
-    worker.port.on('markStart', (name, timeStarted) => profiler.addStartEvent(name, timeStarted));
-    worker.port.on('markEnd', (name, timeEnded) => profiler.addEndEvent(name, timeEnded));
+    worker.port.on(
+        'markStart', (name: string, timeStarted: any) => profiler.addStartEvent(name, timeStarted));
+    worker.port.on(
+        'markEnd', (name: string, timeEnded: any) => profiler.addEndEvent(name, timeEnded));
   }
 });

modules/@angular/benchpress/src/firefox_extension/lib/parser_util.ts

@@ -1,14 +1,22 @@
+/**
+ * @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
+ */
+
 /**
  * @param {Object} perfProfile The perf profile JSON object.
  * @return {Object[]} An array of recognized events that are captured
  *     within the perf profile.
  */
 export function convertPerfProfileToEvents(perfProfile: any): any[] {
-  var inProgressEvents = new Map();  // map from event name to start time
-  var finishedEvents = [];           // Event[] finished events
-  var addFinishedEvent = function(eventName, startTime, endTime) {
+  var inProgressEvents = new Map();                 // map from event name to start time
+  var finishedEvents: {[key: string]: any}[] = [];  // Event[] finished events
+  var addFinishedEvent = function(eventName: string, startTime: number, endTime: number) {
     var categorizedEventName = categorizeEvent(eventName);
-    var args = undefined;
+    var args: {[key: string]: any} = undefined;
     if (categorizedEventName == 'gc') {
       // TODO: We cannot measure heap size at the moment
       args = {usedHeapSize: 0};
@@ -34,7 +42,9 @@ export function convertPerfProfileToEvents(perfProfile: any): any[] {
     // Add all the frames into a set so it's easier/faster to find the set
     // differences
     var sampleFrames = new Set();
-    sample.frames.forEach(function(frame) { sampleFrames.add(frame.location); });
+    sample.frames.forEach(function(frame: {[key: string]: any}) {
+      sampleFrames.add(frame['location']);
+    });
 
     // If an event is in the inProgressEvents map, but not in the current sample,
     // then it must have just finished. We add this event to the finishedEvents
@@ -65,7 +75,7 @@ export function convertPerfProfileToEvents(perfProfile: any): any[] {
   });
 
   // Remove all the unknown categories.
-  return finishedEvents.filter(function(event) { return event.name != 'unknown'; });
+  return finishedEvents.filter(function(event) { return event['name'] != 'unknown'; });
 }
 
 // TODO: this is most likely not exhaustive.

modules/@angular/benchpress/src/firefox_extension/lib/test_helper.ts

@@ -1,3 +1,11 @@
+/**
+ * @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
+ */
+
 var q = require('q');
 var FirefoxProfile = require('firefox-profile');
 var jpm = require('jpm/lib/xpi');
@@ -5,7 +13,7 @@ var pathUtil = require('path');
 
 var PERF_ADDON_PACKAGE_JSON_DIR = '..';
 
-exports.getAbsolutePath = function(path) {
+exports.getAbsolutePath = function(path: string) {
   var normalizedPath = pathUtil.normalize(path);
   if (pathUtil.resolve(normalizedPath) == normalizedPath) {
     // Already absolute path
@@ -15,12 +23,12 @@ exports.getAbsolutePath = function(path) {
   }
 };
 
-exports.getFirefoxProfile = function(extensionPath) {
+exports.getFirefoxProfile = function(extensionPath: string) {
   var deferred = q.defer();
 
   var firefoxProfile = new FirefoxProfile();
   firefoxProfile.addExtensions([extensionPath], () => {
-    firefoxProfile.encoded(encodedProfile => {
+    firefoxProfile.encoded((encodedProfile: any) => {
       var multiCapabilities = [{browserName: 'firefox', firefox_profile: encodedProfile}];
       deferred.resolve(multiCapabilities);
     });
@@ -36,9 +44,8 @@ exports.getFirefoxProfileWithExtension = function() {
   var savedCwd = process.cwd();
   process.chdir(absPackageJsonDir);
 
-  return jpm(packageJson)
-      .then(xpiPath => {
-        process.chdir(savedCwd);
-        return exports.getFirefoxProfile(xpiPath);
-      });
+  return jpm(packageJson).then((xpiPath: string) => {
+    process.chdir(savedCwd);
+    return exports.getFirefoxProfile(xpiPath);
+  });
 };

modules/@angular/benchpress/src/measure_values.ts

@@ -0,0 +1,23 @@
+/**
+ * @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 {Map} from './facade/collection';
+import {Date, DateWrapper} from './facade/lang';
+
+export class MeasureValues {
+  constructor(
+      public runIndex: number, public timeStamp: Date, public values: {[key: string]: any}) {}
+
+  toJson() {
+    return {
+      'timeStamp': DateWrapper.toJson(this.timeStamp),
+      'runIndex': this.runIndex,
+      'values': this.values
+    };
+  }
+}

modules/@angular/benchpress/src/metric.ts

@@ -1,28 +1,31 @@
-import {BaseException, WrappedException} from '@angular/facade';
+/**
+ * @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
+ */
+
 
 /**
  * A metric is measures values
  */
 export abstract class Metric {
-  static bindTo(delegateToken): any[] {
-    return [{provide: Metric, useFactory: (delegate) => delegate, deps: [delegateToken]}];
-  }
-
   /**
    * Starts measuring
    */
-  beginMeasure(): Promise<any> { throw new BaseException('NYI'); }
+  beginMeasure(): Promise<any> { throw new Error('NYI'); }
 
   /**
    * Ends measuring and reports the data
    * since the begin call.
    * @param restart: Whether to restart right after this.
    */
-  endMeasure(restart: boolean): Promise<{[key: string]: any}> { throw new BaseException('NYI'); }
+  endMeasure(restart: boolean): Promise<{[key: string]: any}> { throw new Error('NYI'); }
 
   /**
    * Describes the metrics provided by this metric implementation.
    * (e.g. units, ...)
    */
-  describe(): {[key: string]: any} { throw new BaseException('NYI'); }
+  describe(): {[key: string]: string} { throw new Error('NYI'); }
 }

modules/@angular/benchpress/src/metric/multi_metric.ts

@@ -1,20 +1,27 @@
-import {Injector, OpaqueToken} from '@angular/core/src/di';
-import {StringMapWrapper} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+/**
+ * @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 {Injector, OpaqueToken} from '@angular/core';
+import {StringMapWrapper} from '../facade/collection';
 
 import {Metric} from '../metric';
 
 export class MultiMetric extends Metric {
-  static createBindings(childTokens: any[]): any[] {
+  static provideWith(childTokens: any[]): any[] {
     return [
       {
         provide: _CHILDREN,
-        useFactory:(injector: Injector) => childTokens.map(token => injector.get(token)),
+        useFactory: (injector: Injector) => childTokens.map(token => injector.get(token)),
         deps: [Injector]
       },
       {
         provide: MultiMetric,
-        useFactory: children => new MultiMetric(children),
+        useFactory: (children: Metric[]) => new MultiMetric(children),
         deps: [_CHILDREN]
       }
     ];
@@ -26,7 +33,7 @@ export class MultiMetric extends Metric {
    * Starts measuring
    */
   beginMeasure(): Promise<any> {
-    return PromiseWrapper.all(this._metrics.map(metric => metric.beginMeasure()));
+    return Promise.all(this._metrics.map(metric => metric.beginMeasure()));
   }
 
   /**
@@ -35,8 +42,8 @@ export class MultiMetric extends Metric {
    * @param restart: Whether to restart right after this.
    */
   endMeasure(restart: boolean): Promise<{[key: string]: any}> {
-    return PromiseWrapper.all(this._metrics.map(metric => metric.endMeasure(restart)))
-        .then(values => mergeStringMaps(values));
+    return Promise.all(this._metrics.map(metric => metric.endMeasure(restart)))
+        .then(values => mergeStringMaps(<any>values));
   }
 
   /**
@@ -48,8 +55,8 @@ export class MultiMetric extends Metric {
   }
 }
 
-function mergeStringMaps(maps: { [key: string]: string }[]): Object {
-  var result = {};
+function mergeStringMaps(maps: {[key: string]: string}[]): {[key: string]: string} {
+  var result: {[key: string]: string} = {};
   maps.forEach(
       map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); });
   return result;

modules/@angular/benchpress/src/metric/perflog_metric.ts

@@ -1,43 +1,50 @@
-import {PromiseWrapper, TimerWrapper} from '@angular/facade';
-import {
-  isPresent,
-  isBlank,
-  StringWrapper,
-  Math,
-  RegExpWrapper,
-  NumberWrapper
-} from '@angular/facade';
-import {BaseException, WrappedException} from '@angular/facade';
-import {ListWrapper, StringMapWrapper} from '@angular/facade';
-import {OpaqueToken} from '@angular/core/src/di';
+/**
+ * @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, OpaqueToken} from '@angular/core';
 
-import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
-import {Metric} from '../metric';
 import {Options} from '../common_options';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {Math, NumberWrapper, StringWrapper, isBlank, isPresent} from '../facade/lang';
+import {Metric} from '../metric';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+
 
 /**
  * A metric that reads out the performance log
  */
+@Injectable()
 export class PerflogMetric extends Metric {
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get SET_TIMEOUT(): OpaqueToken { return _SET_TIMEOUT; }
+  static SET_TIMEOUT = new OpaqueToken('PerflogMetric.setTimeout');
+  static PROVIDERS = [
+    PerflogMetric, {
+      provide: PerflogMetric.SET_TIMEOUT,
+      useValue: (fn: Function, millis: number) => <any>setTimeout(fn, millis)
+    }
+  ];
 
-  private _remainingEvents: Array<{[key: string]: any}>;
+  private _remainingEvents: PerfLogEvent[];
   private _measureCount: number;
-  _perfLogFeatures: PerfLogFeatures;
-
+  private _perfLogFeatures: PerfLogFeatures;
 
   /**
    * @param driverExtension
    * @param setTimeout
    * @param microMetrics Name and description of metrics provided via console.time / console.timeEnd
    **/
-  constructor(private _driverExtension: WebDriverExtension, private _setTimeout: Function,
-              private _microMetrics: {[key: string]: any}, private _forceGc: boolean,
-              private _captureFrames: boolean, private _receivedData: boolean,
-              private _requestCount: boolean) {
+  constructor(
+      private _driverExtension: WebDriverExtension,
+      @Inject(PerflogMetric.SET_TIMEOUT) private _setTimeout: Function,
+      @Inject(Options.MICRO_METRICS) private _microMetrics: {[key: string]: string},
+      @Inject(Options.FORCE_GC) private _forceGc: boolean,
+      @Inject(Options.CAPTURE_FRAMES) private _captureFrames: boolean,
+      @Inject(Options.RECEIVED_DATA) private _receivedData: boolean,
+      @Inject(Options.REQUEST_COUNT) private _requestCount: boolean) {
     super();
 
     this._remainingEvents = [];
@@ -50,8 +57,8 @@ export class PerflogMetric extends Metric {
     }
   }
 
-  describe(): {[key: string]: any} {
-    var res = {
+  describe(): {[key: string]: string} {
+    var res: {[key: string]: any} = {
       'scriptTime': 'script execution time in ms, including gc and render',
       'pureScriptTime': 'script execution time in ms, without gc nor render'
     };
@@ -88,20 +95,20 @@ export class PerflogMetric extends Metric {
         res['frameTime.smooth'] = 'percentage of frames that hit 60fps';
       }
     }
-    StringMapWrapper.forEach(this._microMetrics,
-                             (desc, name) => { StringMapWrapper.set(res, name, desc); });
+    StringMapWrapper.forEach(
+        this._microMetrics, (desc, name) => { StringMapWrapper.set(res, name, desc); });
     return res;
   }
 
   beginMeasure(): Promise<any> {
-    var resultPromise = PromiseWrapper.resolve(null);
+    var resultPromise = Promise.resolve(null);
     if (this._forceGc) {
       resultPromise = resultPromise.then((_) => this._driverExtension.gc());
     }
     return resultPromise.then((_) => this._beginMeasure());
   }
 
-  endMeasure(restart: boolean): Promise<{[key: string]: any}> {
+  endMeasure(restart: boolean): Promise<{[key: string]: number}> {
     if (this._forceGc) {
       return this._endPlainMeasureAndMeasureForceGc(restart);
     } else {
@@ -109,7 +116,8 @@ export class PerflogMetric extends Metric {
     }
   }
 
-  _endPlainMeasureAndMeasureForceGc(restartMeasure: boolean) {
+  /** @internal */
+  private _endPlainMeasureAndMeasureForceGc(restartMeasure: boolean) {
     return this._endMeasure(true).then((measureValues) => {
       // disable frame capture for measurements during forced gc
       var originalFrameCaptureValue = this._captureFrames;
@@ -125,20 +133,21 @@ export class PerflogMetric extends Metric {
     });
   }
 
-  _beginMeasure(): Promise<any> {
+  private _beginMeasure(): Promise<any> {
     return this._driverExtension.timeBegin(this._markName(this._measureCount++));
   }
 
-  _endMeasure(restart: boolean): Promise<{[key: string]: any}> {
+  private _endMeasure(restart: boolean): Promise<{[key: string]: number}> {
     var markName = this._markName(this._measureCount - 1);
     var nextMarkName = restart ? this._markName(this._measureCount++) : null;
     return this._driverExtension.timeEnd(markName, nextMarkName)
         .then((_) => this._readUntilEndMark(markName));
   }
 
-  _readUntilEndMark(markName: string, loopCount: number = 0, startEvent = null) {
+  private _readUntilEndMark(
+      markName: string, loopCount: number = 0, startEvent: PerfLogEvent = null) {
     if (loopCount > _MAX_RETRY_COUNT) {
-      throw new BaseException(`Tried too often to get the ending mark: ${loopCount}`);
+      throw new Error(`Tried too often to get the ending mark: ${loopCount}`);
     }
     return this._driverExtension.readPerfLog().then((events) => {
       this._addEvents(events);
@@ -147,23 +156,23 @@ export class PerflogMetric extends Metric {
         this._remainingEvents = events;
         return result;
       }
-      var completer = PromiseWrapper.completer();
-      this._setTimeout(() => completer.resolve(this._readUntilEndMark(markName, loopCount + 1)),
-                       100);
-      return completer.promise;
+      var resolve: (result: any) => void;
+      var promise = new Promise(res => { resolve = res; });
+      this._setTimeout(() => resolve(this._readUntilEndMark(markName, loopCount + 1)), 100);
+      return promise;
     });
   }
 
-  _addEvents(events: { [key: string]: string }[]) {
+  private _addEvents(events: PerfLogEvent[]) {
     var needSort = false;
     events.forEach(event => {
       if (StringWrapper.equals(event['ph'], 'X')) {
         needSort = true;
-        var startEvent = {};
-        var endEvent = {};
+        var startEvent: PerfLogEvent = {};
+        var endEvent: PerfLogEvent = {};
         StringMapWrapper.forEach(event, (value, prop) => {
-          startEvent[prop] = value;
-          endEvent[prop] = value;
+          (<any>startEvent)[prop] = value;
+          (<any>endEvent)[prop] = value;
         });
         startEvent['ph'] = 'B';
         endEvent['ph'] = 'E';
@@ -183,8 +192,8 @@ export class PerflogMetric extends Metric {
     }
   }
 
-  _aggregateEvents(events: Array<{[key: string]: any}>, markName): {[key: string]: any} {
-    var result = {'scriptTime': 0, 'pureScriptTime': 0};
+  private _aggregateEvents(events: PerfLogEvent[], markName: string): {[key: string]: number} {
+    var result: {[key: string]: number} = {'scriptTime': 0, 'pureScriptTime': 0};
     if (this._perfLogFeatures.gc) {
       result['gcTime'] = 0;
       result['majorGcTime'] = 0;
@@ -207,23 +216,23 @@ export class PerflogMetric extends Metric {
       result['requestCount'] = 0;
     }
 
-    var markStartEvent = null;
-    var markEndEvent = null;
+    var markStartEvent: PerfLogEvent = null;
+    var markEndEvent: PerfLogEvent = null;
     var gcTimeInScript = 0;
     var renderTimeInScript = 0;
 
-    var frameTimestamps = [];
-    var frameTimes = [];
-    var frameCaptureStartEvent = null;
-    var frameCaptureEndEvent = null;
+    var frameTimestamps: number[] = [];
+    var frameTimes: number[] = [];
+    var frameCaptureStartEvent: PerfLogEvent = null;
+    var frameCaptureEndEvent: PerfLogEvent = null;
 
-    var intervalStarts: {[key: string]: any} = {};
+    var intervalStarts: {[key: string]: PerfLogEvent} = {};
     var intervalStartCount: {[key: string]: number} = {};
     events.forEach((event) => {
       var ph = event['ph'];
       var name = event['name'];
       var microIterations = 1;
-      var microIterationsMatch = RegExpWrapper.firstMatch(_MICRO_ITERATIONS_REGEX, name);
+      var microIterationsMatch = name.match(_MICRO_ITERATIONS_REGEX);
       if (isPresent(microIterationsMatch)) {
         name = microIterationsMatch[1];
         microIterations = NumberWrapper.parseInt(microIterationsMatch[2], 10);
@@ -255,17 +264,17 @@ export class PerflogMetric extends Metric {
           event['pid'] === markStartEvent['pid']) {
         if (StringWrapper.equals(ph, 'b') && StringWrapper.equals(name, _MARK_NAME_FRAME_CAPUTRE)) {
           if (isPresent(frameCaptureStartEvent)) {
-            throw new BaseException('can capture frames only once per benchmark run');
+            throw new Error('can capture frames only once per benchmark run');
           }
           if (!this._captureFrames) {
-            throw new BaseException(
-                'found start event for frame capture, but frame capture was not requested in benchpress')
+            throw new Error(
+                'found start event for frame capture, but frame capture was not requested in benchpress');
           }
           frameCaptureStartEvent = event;
-        } else if (StringWrapper.equals(ph, 'e') &&
-                   StringWrapper.equals(name, _MARK_NAME_FRAME_CAPUTRE)) {
+        } else if (
+            StringWrapper.equals(ph, 'e') && StringWrapper.equals(name, _MARK_NAME_FRAME_CAPUTRE)) {
           if (isBlank(frameCaptureStartEvent)) {
-            throw new BaseException('missing start event for frame capture');
+            throw new Error('missing start event for frame capture');
           }
           frameCaptureEndEvent = event;
         }
@@ -275,8 +284,9 @@ export class PerflogMetric extends Metric {
               StringWrapper.equals(name, 'frame')) {
             frameTimestamps.push(event['ts']);
             if (frameTimestamps.length >= 2) {
-              frameTimes.push(frameTimestamps[frameTimestamps.length - 1] -
-                              frameTimestamps[frameTimestamps.length - 2]);
+              frameTimes.push(
+                  frameTimestamps[frameTimestamps.length - 1] -
+                  frameTimestamps[frameTimestamps.length - 2]);
             }
           }
         }
@@ -288,8 +298,9 @@ export class PerflogMetric extends Metric {
           } else {
             intervalStartCount[name]++;
           }
-        } else if ((StringWrapper.equals(ph, 'E') || StringWrapper.equals(ph, 'e')) &&
-                   isPresent(intervalStarts[name])) {
+        } else if (
+            (StringWrapper.equals(ph, 'E') || StringWrapper.equals(ph, 'e')) &&
+            isPresent(intervalStarts[name])) {
           intervalStartCount[name]--;
           if (intervalStartCount[name] === 0) {
             var startEvent = intervalStarts[name];
@@ -315,7 +326,7 @@ export class PerflogMetric extends Metric {
             } else if (StringWrapper.equals(name, 'script')) {
               result['scriptTime'] += duration;
             } else if (isPresent(this._microMetrics[name])) {
-              result[name] += duration / microIterations;
+              (<any>result)[name] += duration / microIterations;
             }
           }
         }
@@ -328,11 +339,10 @@ export class PerflogMetric extends Metric {
 
     if (isPresent(markEndEvent) && isPresent(frameCaptureStartEvent) &&
         isBlank(frameCaptureEndEvent)) {
-      throw new BaseException('missing end event for frame capture');
+      throw new Error('missing end event for frame capture');
     }
     if (this._captureFrames && isBlank(frameCaptureStartEvent)) {
-      throw new BaseException(
-          'frame capture requested in benchpress, but no start event was found');
+      throw new Error('frame capture requested in benchpress, but no start event was found');
     }
     if (frameTimes.length > 0) {
       this._addFrameMetrics(result, frameTimes);
@@ -341,7 +351,7 @@ export class PerflogMetric extends Metric {
     return result;
   }
 
-  _addFrameMetrics(result: {[key: string]: any}, frameTimes: any[]) {
+  private _addFrameMetrics(result: {[key: string]: number}, frameTimes: any[]) {
     result['frameTime.mean'] = frameTimes.reduce((a, b) => a + b, 0) / frameTimes.length;
     var firstFrame = frameTimes[0];
     result['frameTime.worst'] = frameTimes.reduce((a, b) => a > b ? a : b, firstFrame);
@@ -350,35 +360,14 @@ export class PerflogMetric extends Metric {
         frameTimes.filter(t => t < _FRAME_TIME_SMOOTH_THRESHOLD).length / frameTimes.length;
   }
 
-  _markName(index) { return `${_MARK_NAME_PREFIX}${index}`; }
+  private _markName(index: number) { return `${_MARK_NAME_PREFIX}${index}`; }
 }
 
-var _MICRO_ITERATIONS_REGEX = /(.+)\*(\d+)$/g;
+var _MICRO_ITERATIONS_REGEX = /(.+)\*(\d+)$/;
 
 var _MAX_RETRY_COUNT = 20;
 var _MARK_NAME_PREFIX = 'benchpress';
-var _SET_TIMEOUT = new OpaqueToken('PerflogMetric.setTimeout');
 
 var _MARK_NAME_FRAME_CAPUTRE = 'frameCapture';
 // using 17ms as a somewhat looser threshold, instead of 16.6666ms
 var _FRAME_TIME_SMOOTH_THRESHOLD = 17;
-
-var _PROVIDERS = [
-  {
-    provide: PerflogMetric,
-    useFactory:
-      (driverExtension, setTimeout, microMetrics, forceGc, captureFrames, receivedData,
-       requestCount) => new PerflogMetric(driverExtension, setTimeout, microMetrics, forceGc,
-        captureFrames, receivedData, requestCount),
-    deps: [
-      WebDriverExtension,
-      _SET_TIMEOUT,
-      Options.MICRO_METRICS,
-      Options.FORCE_GC,
-      Options.CAPTURE_FRAMES,
-      Options.RECEIVED_DATA,
-      Options.REQUEST_COUNT
-    ]
-  },
-  {provide: _SET_TIMEOUT, useValue: (fn, millis) => TimerWrapper.setTimeout(fn, millis)}
-];

modules/@angular/benchpress/src/metric/user_metric.ts

@@ -0,0 +1,71 @@
+/**
+ * @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, OpaqueToken, Provider} from '@angular/core';
+
+import {Options} from '../common_options';
+import {StringMapWrapper} from '../facade/collection';
+import {isNumber} from '../facade/lang';
+import {Metric} from '../metric';
+import {WebDriverAdapter} from '../web_driver_adapter';
+
+@Injectable()
+export class UserMetric extends Metric {
+  static PROVIDERS = [UserMetric];
+
+  constructor(
+      @Inject(Options.USER_METRICS) private _userMetrics: {[key: string]: string},
+      private _wdAdapter: WebDriverAdapter) {
+    super();
+  }
+
+  /**
+   * Starts measuring
+   */
+  beginMeasure(): Promise<any> { return Promise.resolve(true); }
+
+  /**
+   * Ends measuring.
+   */
+  endMeasure(restart: boolean): Promise<{[key: string]: any}> {
+    let resolve: (result: any) => void;
+    let reject: (error: any) => void;
+    let promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    let adapter = this._wdAdapter;
+    let names = StringMapWrapper.keys(this._userMetrics);
+
+    function getAndClearValues() {
+      Promise.all(names.map(name => adapter.executeScript(`return window.${name}`)))
+          .then((values: any[]) => {
+            if (values.every(isNumber)) {
+              Promise.all(names.map(name => adapter.executeScript(`delete window.${name}`)))
+                  .then((_: any[]) => {
+                    let map = StringMapWrapper.create();
+                    for (let i = 0, n = names.length; i < n; i++) {
+                      StringMapWrapper.set(map, names[i], values[i]);
+                    }
+                    resolve(map);
+                  }, reject);
+            } else {
+              <any>setTimeout(getAndClearValues, 100);
+            }
+          }, reject);
+    }
+    getAndClearValues();
+    return promise;
+  }
+
+  /**
+   * Describes the metrics provided by this metric implementation.
+   * (e.g. units, ...)
+   */
+  describe(): {[key: string]: any} { return this._userMetrics; }
+}

modules/@angular/benchpress/src/reporter.ts

@@ -1,17 +1,20 @@
-import {BaseException, WrappedException} from '@angular/facade';
+/**
+ * @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 {MeasureValues} from './measure_values';
 
 /**
  * A reporter reports measure values and the valid sample.
  */
 export abstract class Reporter {
-  static bindTo(delegateToken): any[] {
-    return [{provide: Reporter, useFactory: (delegate) => delegate, deps: [delegateToken]}];
-  }
-
-  reportMeasureValues(values: MeasureValues): Promise<any> { throw new BaseException('NYI'); }
+  reportMeasureValues(values: MeasureValues): Promise<any> { throw new Error('NYI'); }
 
   reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
-    throw new BaseException('NYI');
+    throw new Error('NYI');
   }
 }

modules/@angular/benchpress/src/reporter/console_reporter.ts

@@ -0,0 +1,86 @@
+/**
+ * @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, OpaqueToken} from '@angular/core';
+
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {NumberWrapper, isBlank, isPresent, print} from '../facade/lang';
+import {Math} from '../facade/math';
+import {MeasureValues} from '../measure_values';
+import {Reporter} from '../reporter';
+import {SampleDescription} from '../sample_description';
+
+import {formatNum, formatStats, sortedProps} from './util';
+
+
+/**
+ * A reporter for the console
+ */
+@Injectable()
+export class ConsoleReporter extends Reporter {
+  static PRINT = new OpaqueToken('ConsoleReporter.print');
+  static COLUMN_WIDTH = new OpaqueToken('ConsoleReporter.columnWidth');
+  static PROVIDERS = [
+    ConsoleReporter, {provide: ConsoleReporter.COLUMN_WIDTH, useValue: 18},
+    {provide: ConsoleReporter.PRINT, useValue: print}
+  ];
+
+  private static _lpad(value: string, columnWidth: number, fill = ' ') {
+    var result = '';
+    for (var i = 0; i < columnWidth - value.length; i++) {
+      result += fill;
+    }
+    return result + value;
+  }
+
+  private _metricNames: string[];
+
+  constructor(
+      @Inject(ConsoleReporter.COLUMN_WIDTH) private _columnWidth: number,
+      sampleDescription: SampleDescription,
+      @Inject(ConsoleReporter.PRINT) private _print: Function) {
+    super();
+    this._metricNames = sortedProps(sampleDescription.metrics);
+    this._printDescription(sampleDescription);
+  }
+
+  private _printDescription(sampleDescription: SampleDescription) {
+    this._print(`BENCHMARK ${sampleDescription.id}`);
+    this._print('Description:');
+    var props = sortedProps(sampleDescription.description);
+    props.forEach((prop) => { this._print(`- ${prop}: ${sampleDescription.description[prop]}`); });
+    this._print('Metrics:');
+    this._metricNames.forEach((metricName) => {
+      this._print(`- ${metricName}: ${sampleDescription.metrics[metricName]}`);
+    });
+    this._print('');
+    this._printStringRow(this._metricNames);
+    this._printStringRow(this._metricNames.map((_) => ''), '-');
+  }
+
+  reportMeasureValues(measureValues: MeasureValues): Promise<any> {
+    var formattedValues = this._metricNames.map(metricName => {
+      var value = measureValues.values[metricName];
+      return formatNum(value);
+    });
+    this._printStringRow(formattedValues);
+    return Promise.resolve(null);
+  }
+
+  reportSample(completeSample: MeasureValues[], validSamples: MeasureValues[]): Promise<any> {
+    this._printStringRow(this._metricNames.map((_) => ''), '=');
+    this._printStringRow(
+        this._metricNames.map(metricName => formatStats(validSamples, metricName)));
+    return Promise.resolve(null);
+  }
+
+  private _printStringRow(parts: any[], fill = ' ') {
+    this._print(
+        parts.map(part => ConsoleReporter._lpad(part, this._columnWidth, fill)).join(' | '));
+  }
+}

modules/@angular/benchpress/src/reporter/json_file_reporter.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 {Inject, Injectable, OpaqueToken} from '@angular/core';
+
+import {Options} from '../common_options';
+import {DateWrapper, Json, isBlank, isPresent} from '../facade/lang';
+import {MeasureValues} from '../measure_values';
+import {Reporter} from '../reporter';
+import {SampleDescription} from '../sample_description';
+
+import {formatStats, sortedProps} from './util';
+
+
+/**
+ * A reporter that writes results into a json file.
+ */
+@Injectable()
+export class JsonFileReporter extends Reporter {
+  static PATH = new OpaqueToken('JsonFileReporter.path');
+  static PROVIDERS = [JsonFileReporter, {provide: JsonFileReporter.PATH, useValue: '.'}];
+
+  constructor(
+      private _description: SampleDescription, @Inject(JsonFileReporter.PATH) private _path: string,
+      @Inject(Options.WRITE_FILE) private _writeFile: Function,
+      @Inject(Options.NOW) private _now: Function) {
+    super();
+  }
+
+  reportMeasureValues(measureValues: MeasureValues): Promise<any> { return Promise.resolve(null); }
+
+  reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
+    const stats: {[key: string]: string} = {};
+    sortedProps(this._description.metrics).forEach((metricName) => {
+      stats[metricName] = formatStats(validSample, metricName);
+    });
+    var content = Json.stringify({
+      'description': this._description,
+      'stats': stats,
+      'completeSample': completeSample,
+      'validSample': validSample,
+    });
+    var filePath =
+        `${this._path}/${this._description.id}_${DateWrapper.toMillis(this._now())}.json`;
+    return this._writeFile(filePath, content);
+  }
+}

modules/@angular/benchpress/src/reporter/multi_reporter.ts

@@ -1,35 +1,40 @@
-import {Injector, OpaqueToken} from '@angular/core/src/di';
-import {PromiseWrapper} from '@angular/facade';
+/**
+ * @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 {Injector, OpaqueToken} from '@angular/core';
 
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';
 
 export class MultiReporter extends Reporter {
-  static createBindings(childTokens: any[]): any[] {
+  static provideWith(childTokens: any[]): any[] {
     return [
       {
         provide: _CHILDREN,
         useFactory: (injector: Injector) => childTokens.map(token => injector.get(token)),
         deps: [Injector],
       },
-      {provide: MultiReporter, useFactory: children => new MultiReporter(children), deps: [_CHILDREN]}
+      {
+        provide: MultiReporter,
+        useFactory: (children: Reporter[]) => new MultiReporter(children),
+        deps: [_CHILDREN]
+      }
     ];
   }
 
-  _reporters: Reporter[];
-
-  constructor(reporters) {
-    super();
-    this._reporters = reporters;
-  }
+  constructor(private _reporters: Reporter[]) { super(); }
 
   reportMeasureValues(values: MeasureValues): Promise<any[]> {
-    return PromiseWrapper.all(
-        this._reporters.map(reporter => reporter.reportMeasureValues(values)));
+    return Promise.all(this._reporters.map(reporter => reporter.reportMeasureValues(values)));
   }
 
   reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any[]> {
-    return PromiseWrapper.all(
+    return Promise.all(
         this._reporters.map(reporter => reporter.reportSample(completeSample, validSample)));
   }
 }

modules/@angular/benchpress/src/reporter/util.ts

@@ -0,0 +1,33 @@
+/**
+ * @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 {StringMapWrapper} from '../facade/collection';
+import {NumberWrapper} from '../facade/lang';
+import {MeasureValues} from '../measure_values';
+import {Statistic} from '../statistic';
+
+export function formatNum(n: number) {
+  return NumberWrapper.toFixed(n, 2);
+}
+
+export function sortedProps(obj: {[key: string]: any}) {
+  var props: string[] = [];
+  StringMapWrapper.forEach(obj, (value, prop) => props.push(prop));
+  props.sort();
+  return props;
+}
+
+export function formatStats(validSamples: MeasureValues[], metricName: string): string {
+  var samples = validSamples.map(measureValues => measureValues.values[metricName]);
+  var mean = Statistic.calculateMean(samples);
+  var cv = Statistic.calculateCoefficientOfVariation(samples, mean);
+  var formattedMean = formatNum(mean);
+  // Note: Don't use the unicode character for +- as it might cause
+  // hickups for consoles...
+  return NumberWrapper.isNaN(cv) ? formattedMean : `${formattedMean}+-${Math.floor(cv)}%`;
+}

modules/@angular/benchpress/src/runner.ts

@@ -1,46 +1,52 @@
-import {ReflectiveInjector} from '@angular/core';
-import {isPresent, isBlank} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+/**
+ * @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 {Sampler, SampleState} from './sampler';
+import {Provider, ReflectiveInjector} from '@angular/core';
+
+import {Options} from './common_options';
+import {isBlank, isPresent} from './facade/lang';
+import {Metric} from './metric';
+import {MultiMetric} from './metric/multi_metric';
+import {PerflogMetric} from './metric/perflog_metric';
+import {UserMetric} from './metric/user_metric';
+import {Reporter} from './reporter';
 import {ConsoleReporter} from './reporter/console_reporter';
 import {MultiReporter} from './reporter/multi_reporter';
+import {SampleDescription} from './sample_description';
+import {SampleState, Sampler} from './sampler';
+import {Validator} from './validator';
 import {RegressionSlopeValidator} from './validator/regression_slope_validator';
 import {SizeValidator} from './validator/size_validator';
-import {Validator} from './validator';
-import {PerflogMetric} from './metric/perflog_metric';
-import {MultiMetric} from './metric/multi_metric';
-import {UserMetric} from './metric/user_metric';
+import {WebDriverAdapter} from './web_driver_adapter';
+import {WebDriverExtension} from './web_driver_extension';
 import {ChromeDriverExtension} from './webdriver/chrome_driver_extension';
 import {FirefoxDriverExtension} from './webdriver/firefox_driver_extension';
 import {IOsDriverExtension} from './webdriver/ios_driver_extension';
-import {WebDriverExtension} from './web_driver_extension';
-import {SampleDescription} from './sample_description';
-import {WebDriverAdapter} from './web_driver_adapter';
-import {Reporter} from './reporter';
-import {Metric} from './metric';
-import {Options} from './common_options';
+
+
 
 /**
  * The Runner is the main entry point for executing a sample run.
  * It provides defaults, creates the injector and calls the sampler.
  */
 export class Runner {
-  private _defaultProviders: any[];
-  constructor(defaultProviders: any[] = null) {
-    if (isBlank(defaultProviders)) {
-      defaultProviders = [];
-    }
-    this._defaultProviders = defaultProviders;
-  }
+  constructor(private _defaultProviders: Provider[] = []) {}
 
-  sample({id, execute, prepare, microMetrics, providers, userMetrics}:
-             {id: string, execute?: any, prepare?: any, microMetrics?: any, providers?: any, userMetrics?: any}):
-      Promise<SampleState> {
-    var sampleProviders = [
-      _DEFAULT_PROVIDERS,
-      this._defaultProviders,
-      {provide: Options.SAMPLE_ID, useValue: id},
+  sample({id, execute, prepare, microMetrics, providers, userMetrics}: {
+    id: string,
+    execute?: Function,
+    prepare?: Function,
+    microMetrics?: {[key: string]: string},
+    providers?: Provider[],
+    userMetrics?: {[key: string]: string}
+  }): Promise<SampleState> {
+    var sampleProviders: Provider[] = [
+      _DEFAULT_PROVIDERS, this._defaultProviders, {provide: Options.SAMPLE_ID, useValue: id},
       {provide: Options.EXECUTE, useValue: execute}
     ];
     if (isPresent(prepare)) {
@@ -59,7 +65,7 @@ export class Runner {
     var inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
     var adapter = inj.get(WebDriverAdapter);
 
-    return PromiseWrapper
+    return Promise
         .all([adapter.capabilities(), adapter.executeScript('return window.navigator.userAgent;')])
         .then((args) => {
           var capabilities = args[0];
@@ -71,8 +77,7 @@ export class Runner {
           // TODO vsavkin consider changing it when toAsyncFactory is added back or when child
           // injectors are handled better.
           var injector = ReflectiveInjector.resolveAndCreate([
-            sampleProviders,
-            {provide: Options.CAPABILITIES, useValue: capabilities},
+            sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
             {provide: Options.USER_AGENT, useValue: userAgent},
             {provide: WebDriverAdapter, useValue: adapter}
           ]);
@@ -93,12 +98,13 @@ var _DEFAULT_PROVIDERS = [
   FirefoxDriverExtension.PROVIDERS,
   IOsDriverExtension.PROVIDERS,
   PerflogMetric.PROVIDERS,
-  UserMetric.BINDINGS,
+  UserMetric.PROVIDERS,
   SampleDescription.PROVIDERS,
-  MultiReporter.createBindings([ConsoleReporter]),
-  MultiMetric.createBindings([PerflogMetric, UserMetric]),
-  Reporter.bindTo(MultiReporter),
-  Validator.bindTo(RegressionSlopeValidator),
-  WebDriverExtension.bindTo([ChromeDriverExtension, FirefoxDriverExtension, IOsDriverExtension]),
-  Metric.bindTo(MultiMetric),
+  MultiReporter.provideWith([ConsoleReporter]),
+  MultiMetric.provideWith([PerflogMetric, UserMetric]),
+  {provide: Reporter, useExisting: MultiReporter},
+  {provide: Validator, useExisting: RegressionSlopeValidator},
+  WebDriverExtension.provideFirstSupported(
+      [ChromeDriverExtension, FirefoxDriverExtension, IOsDriverExtension]),
+  {provide: Metric, useExisting: MultiMetric},
 ];

modules/@angular/benchpress/src/sample_description.ts

@@ -0,0 +1,50 @@
+/**
+ * @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 {Options} from './common_options';
+import {StringMapWrapper} from './facade/collection';
+import {Metric} from './metric';
+import {Validator} from './validator';
+
+
+/**
+ * SampleDescription merges all available descriptions about a sample
+ */
+export class SampleDescription {
+  static PROVIDERS = [{
+    provide: SampleDescription,
+    useFactory:
+        (metric: Metric, id: string, forceGc: boolean, userAgent: string, validator: Validator,
+         defaultDesc: {[key: string]: string}, userDesc: {[key: string]: string}) =>
+            new SampleDescription(
+                id,
+                [
+                  {'forceGc': forceGc, 'userAgent': userAgent}, validator.describe(), defaultDesc,
+                  userDesc
+                ],
+                metric.describe()),
+    deps: [
+      Metric, Options.SAMPLE_ID, Options.FORCE_GC, Options.USER_AGENT, Validator,
+      Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION
+    ]
+  }];
+  description: {[key: string]: any};
+
+  constructor(
+      public id: string, descriptions: Array<{[key: string]: any}>,
+      public metrics: {[key: string]: any}) {
+    this.description = {};
+    descriptions.forEach(description => {
+      StringMapWrapper.forEach(description, (value, prop) => this.description[prop] = value);
+    });
+  }
+
+  toJson() { return {'id': this.id, 'description': this.description, 'metrics': this.metrics}; }
+}

modules/@angular/benchpress/src/sampler.ts

@@ -0,0 +1,81 @@
+/**
+ * @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, OpaqueToken} from '@angular/core';
+
+import {Options} from './common_options';
+import {Date, DateWrapper, isBlank, isPresent} from './facade/lang';
+import {MeasureValues} from './measure_values';
+import {Metric} from './metric';
+import {Reporter} from './reporter';
+import {Validator} from './validator';
+import {WebDriverAdapter} from './web_driver_adapter';
+
+
+/**
+ * The Sampler owns the sample loop:
+ * 1. calls the prepare/execute callbacks,
+ * 2. gets data from the metric
+ * 3. asks the validator for a valid sample
+ * 4. reports the new data to the reporter
+ * 5. loop until there is a valid sample
+ */
+@Injectable()
+export class Sampler {
+  static PROVIDERS = [Sampler];
+
+  constructor(
+      private _driver: WebDriverAdapter, private _metric: Metric, private _reporter: Reporter,
+      private _validator: Validator, @Inject(Options.PREPARE) private _prepare: Function,
+      @Inject(Options.EXECUTE) private _execute: Function,
+      @Inject(Options.NOW) private _now: Function) {}
+
+  sample(): Promise<SampleState> {
+    const loop = (lastState: SampleState): Promise<SampleState> => {
+      return this._iterate(lastState).then((newState) => {
+        if (isPresent(newState.validSample)) {
+          return newState;
+        } else {
+          return loop(newState);
+        }
+      });
+    };
+    return loop(new SampleState([], null));
+  }
+
+  private _iterate(lastState: SampleState): Promise<SampleState> {
+    var resultPromise: Promise<any>;
+    if (this._prepare !== Options.NO_PREPARE) {
+      resultPromise = this._driver.waitFor(this._prepare);
+    } else {
+      resultPromise = Promise.resolve(null);
+    }
+    if (this._prepare !== Options.NO_PREPARE || lastState.completeSample.length === 0) {
+      resultPromise = resultPromise.then((_) => this._metric.beginMeasure());
+    }
+    return resultPromise.then((_) => this._driver.waitFor(this._execute))
+        .then((_) => this._metric.endMeasure(this._prepare === Options.NO_PREPARE))
+        .then((measureValues) => this._report(lastState, measureValues));
+  }
+
+  private _report(state: SampleState, metricValues: {[key: string]: any}): Promise<SampleState> {
+    var measureValues = new MeasureValues(state.completeSample.length, this._now(), metricValues);
+    var completeSample = state.completeSample.concat([measureValues]);
+    var validSample = this._validator.validate(completeSample);
+    var resultPromise = this._reporter.reportMeasureValues(measureValues);
+    if (isPresent(validSample)) {
+      resultPromise =
+          resultPromise.then((_) => this._reporter.reportSample(completeSample, validSample));
+    }
+    return resultPromise.then((_) => new SampleState(completeSample, validSample));
+  }
+}
+
+export class SampleState {
+  constructor(public completeSample: any[], public validSample: any[]) {}
+}

modules/@angular/benchpress/src/statistic.ts

@@ -1,7 +1,15 @@
-import {Math} from '@angular/facade';
+/**
+ * @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 {Math} from './facade/math';
 
 export class Statistic {
-  static calculateCoefficientOfVariation(sample, mean) {
+  static calculateCoefficientOfVariation(sample: number[], mean: number) {
     return Statistic.calculateStandardDeviation(sample, mean) / mean * 100;
   }
 
@@ -12,7 +20,7 @@ export class Statistic {
     return total / samples.length;
   }
 
-  static calculateStandardDeviation(samples: number[], mean) {
+  static calculateStandardDeviation(samples: number[], mean: number) {
     var deviation = 0;
     // TODO: use reduce
     samples.forEach(x => deviation += Math.pow(x - mean, 2));
@@ -21,8 +29,8 @@ export class Statistic {
     return deviation;
   }
 
-  static calculateRegressionSlope(xValues: number[], xMean: number, yValues: number[],
-                                  yMean: number) {
+  static calculateRegressionSlope(
+      xValues: number[], xMean: number, yValues: number[], yMean: number) {
     // See http://en.wikipedia.org/wiki/Simple_linear_regression
     var dividendSum = 0;
     var divisorSum = 0;

modules/@angular/benchpress/src/validator.ts

@@ -1,4 +1,10 @@
-import {BaseException, WrappedException} from '@angular/facade';
+/**
+ * @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 {MeasureValues} from './measure_values';
 
@@ -8,18 +14,14 @@ import {MeasureValues} from './measure_values';
  * in the correct way.
  */
 export abstract class Validator {
-  static bindTo(delegateToken): any[] {
-    return [{provide: Validator, useFactory: (delegate) => delegate, deps: [delegateToken]}];
-  }
-
   /**
    * Calculates a valid sample out of the complete sample
    */
-  validate(completeSample: MeasureValues[]): MeasureValues[] { throw new BaseException('NYI'); }
+  validate(completeSample: MeasureValues[]): MeasureValues[] { throw new Error('NYI'); }
 
   /**
    * Returns a Map that describes the properties of the validator
    * (e.g. sample size, ...)
    */
-  describe(): {[key: string]: any} { throw new BaseException('NYI'); }
+  describe(): {[key: string]: any} { throw new Error('NYI'); }
 }

modules/@angular/benchpress/src/validator/regression_slope_validator.ts

@@ -0,0 +1,60 @@
+/**
+ * @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, OpaqueToken} from '@angular/core';
+
+import {ListWrapper} from '../facade/collection';
+import {MeasureValues} from '../measure_values';
+import {Statistic} from '../statistic';
+import {Validator} from '../validator';
+
+
+
+/**
+ * A validator that checks the regression slope of a specific metric.
+ * Waits for the regression slope to be >=0.
+ */
+@Injectable()
+export class RegressionSlopeValidator extends Validator {
+  static SAMPLE_SIZE = new OpaqueToken('RegressionSlopeValidator.sampleSize');
+  static METRIC = new OpaqueToken('RegressionSlopeValidator.metric');
+  static PROVIDERS = [
+    RegressionSlopeValidator, {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: 10},
+    {provide: RegressionSlopeValidator.METRIC, useValue: 'scriptTime'}
+  ];
+
+  constructor(
+      @Inject(RegressionSlopeValidator.SAMPLE_SIZE) private _sampleSize: number,
+      @Inject(RegressionSlopeValidator.METRIC) private _metric: string) {
+    super();
+  }
+
+  describe(): {[key: string]: any} {
+    return {'sampleSize': this._sampleSize, 'regressionSlopeMetric': this._metric};
+  }
+
+  validate(completeSample: MeasureValues[]): MeasureValues[] {
+    if (completeSample.length >= this._sampleSize) {
+      var latestSample = ListWrapper.slice(
+          completeSample, completeSample.length - this._sampleSize, completeSample.length);
+      var xValues: number[] = [];
+      var yValues: number[] = [];
+      for (var i = 0; i < latestSample.length; i++) {
+        // For now, we only use the array index as x value.
+        // TODO(tbosch): think about whether we should use time here instead
+        xValues.push(i);
+        yValues.push(latestSample[i].values[this._metric]);
+      }
+      var regressionSlope = Statistic.calculateRegressionSlope(
+          xValues, Statistic.calculateMean(xValues), yValues, Statistic.calculateMean(yValues));
+      return regressionSlope >= 0 ? latestSample : null;
+    } else {
+      return null;
+    }
+  }
+}

modules/@angular/benchpress/src/validator/size_validator.ts

@@ -0,0 +1,37 @@
+/**
+ * @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, OpaqueToken} from '@angular/core';
+
+import {ListWrapper} from '../facade/collection';
+import {MeasureValues} from '../measure_values';
+import {Validator} from '../validator';
+
+
+
+/**
+ * A validator that waits for the sample to have a certain size.
+ */
+@Injectable()
+export class SizeValidator extends Validator {
+  static SAMPLE_SIZE = new OpaqueToken('SizeValidator.sampleSize');
+  static PROVIDERS = [SizeValidator, {provide: SizeValidator.SAMPLE_SIZE, useValue: 10}];
+
+  constructor(@Inject(SizeValidator.SAMPLE_SIZE) private _sampleSize: number) { super(); }
+
+  describe(): {[key: string]: any} { return {'sampleSize': this._sampleSize}; }
+
+  validate(completeSample: MeasureValues[]): MeasureValues[] {
+    if (completeSample.length >= this._sampleSize) {
+      return ListWrapper.slice(
+          completeSample, completeSample.length - this._sampleSize, completeSample.length);
+    } else {
+      return null;
+    }
+  }
+}

modules/@angular/benchpress/src/web_driver_adapter.ts

@@ -0,0 +1,22 @@
+/**
+ * @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
+ */
+
+
+
+/**
+ * A WebDriverAdapter bridges API differences between different WebDriver clients,
+ * e.g. JS vs Dart Async vs Dart Sync webdriver.
+ * Needs one implementation for every supported WebDriver client.
+ */
+export abstract class WebDriverAdapter {
+  waitFor(callback: Function): Promise<any> { throw new Error('NYI'); }
+  executeScript(script: string): Promise<any> { throw new Error('NYI'); }
+  executeAsyncScript(script: string): Promise<any> { throw new Error('NYI'); }
+  capabilities(): Promise<Map<string, any>> { throw new Error('NYI'); }
+  logs(type: string): Promise<any[]> { throw new Error('NYI'); }
+}

modules/@angular/benchpress/src/web_driver_extension.ts

@@ -1,9 +1,25 @@
-import {Injector, OpaqueToken} from '@angular/core/src/di';
+/**
+ * @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 {isBlank, isPresent} from '@angular/facade';
-import {BaseException, WrappedException} from '@angular/facade';
+import {Injector, OpaqueToken} from '@angular/core';
 
 import {Options} from './common_options';
+import {isBlank, isPresent} from './facade/lang';
+
+export type PerfLogEvent = {
+  cat?: string,
+  ph?: 'X' | 'B' | 'E' | 'b' | 'e',
+  ts?: number,
+  dur?: number,
+  name?: string,
+  pid?: string,
+  args?: {encodedDataLength?: number, usedHeapSize?: number, majorGc?: number}
+};
 
 /**
  * A WebDriverExtension implements extended commands of the webdriver protocol
@@ -11,7 +27,7 @@ import {Options} from './common_options';
  * Needs one implementation for every supported Browser.
  */
 export abstract class WebDriverExtension {
-  static bindTo(childTokens: any[]): any[] {
+  static provideFirstSupported(childTokens: any[]): any[] {
     var res = [
       {
         provide: _CHILDREN,
@@ -20,15 +36,15 @@ export abstract class WebDriverExtension {
       },
       {
         provide: WebDriverExtension,
-        useFactory: (children:WebDriverExtension[], capabilities) => {
-          var delegate;
+        useFactory: (children: WebDriverExtension[], capabilities: any) => {
+          var delegate: WebDriverExtension;
           children.forEach(extension => {
             if (extension.supports(capabilities)) {
               delegate = extension;
             }
           });
           if (isBlank(delegate)) {
-            throw new BaseException('Could not find a delegate for given capabilities!');
+            throw new Error('Could not find a delegate for given capabilities!');
           }
           return delegate;
         },
@@ -38,11 +54,11 @@ export abstract class WebDriverExtension {
     return res;
   }
 
-  gc(): Promise<any> { throw new BaseException('NYI'); }
+  gc(): Promise<any> { throw new Error('NYI'); }
 
-  timeBegin(name: string): Promise<any> { throw new BaseException('NYI'); }
+  timeBegin(name: string): Promise<any> { throw new Error('NYI'); }
 
-  timeEnd(name: string, restartName: string): Promise<any> { throw new BaseException('NYI'); }
+  timeEnd(name: string, restartName: string): Promise<any> { throw new Error('NYI'); }
 
   /**
    * Format:
@@ -57,9 +73,9 @@ export abstract class WebDriverExtension {
    * Based on [Chrome Trace Event
    *Format](https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit)
    **/
-  readPerfLog(): Promise<any[]> { throw new BaseException('NYI'); }
+  readPerfLog(): Promise<PerfLogEvent[]> { throw new Error('NYI'); }
 
-  perfLogFeatures(): PerfLogFeatures { throw new BaseException('NYI'); }
+  perfLogFeatures(): PerfLogFeatures { throw new Error('NYI'); }
 
   supports(capabilities: {[key: string]: any}): boolean { return true; }
 }

modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts

@@ -1,17 +1,20 @@
-import {ListWrapper, StringMapWrapper} from '@angular/facade';
-import {
-  Json,
-  isPresent,
-  isBlank,
-  RegExpWrapper,
-  StringWrapper,
-  NumberWrapper
-} from '@angular/facade';
-import {BaseException, WrappedException} from '@angular/facade';
+/**
+ * @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} from '@angular/core';
 
-import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
-import {WebDriverAdapter} from '../web_driver_adapter';
 import {Options} from '../common_options';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {NumberWrapper, StringWrapper, isBlank, isPresent} from '../facade/lang';
+import {WebDriverAdapter} from '../web_driver_adapter';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+
+
 
 /**
  * Set the following 'traceCategories' to collect metrics in Chrome:
@@ -20,13 +23,13 @@ import {Options} from '../common_options';
  * In order to collect the frame rate related metrics, add 'benchmark'
  * to the list above.
  */
+@Injectable()
 export class ChromeDriverExtension extends WebDriverExtension {
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [ChromeDriverExtension];
 
   private _majorChromeVersion: number;
 
-  constructor(private _driver: WebDriverAdapter, userAgent: string) {
+  constructor(private _driver: WebDriverAdapter, @Inject(Options.USER_AGENT) userAgent: string) {
     super();
     this._majorChromeVersion = this._parseChromeVersion(userAgent);
   }
@@ -55,35 +58,35 @@ export class ChromeDriverExtension extends WebDriverExtension {
   timeEnd(name: string, restartName: string = null): Promise<any> {
     var script = `console.timeEnd('${name}');`;
     if (isPresent(restartName)) {
-      script += `console.time('${restartName}');`
+      script += `console.time('${restartName}');`;
     }
     return this._driver.executeScript(script);
   }
 
   // See [Chrome Trace Event
   // Format](https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit)
-  readPerfLog(): Promise<any> {
+  readPerfLog(): Promise<PerfLogEvent[]> {
     // TODO(tbosch): Chromedriver bug https://code.google.com/p/chromedriver/issues/detail?id=1098
     // Need to execute at least one command so that the browser logs can be read out!
     return this._driver.executeScript('1+1')
         .then((_) => this._driver.logs('performance'))
         .then((entries) => {
-          var events = [];
+          var events: PerfLogEvent[] = [];
           entries.forEach(entry => {
-            var message = Json.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
             if (StringWrapper.equals(message['method'], 'Tracing.dataCollected')) {
               events.push(message['params']);
             }
             if (StringWrapper.equals(message['method'], 'Tracing.bufferUsage')) {
-              throw new BaseException('The DevTools trace buffer filled during the test!');
+              throw new Error('The DevTools trace buffer filled during the test!');
             }
           });
           return this._convertPerfRecordsToEvents(events);
         });
   }
 
-  private _convertPerfRecordsToEvents(chromeEvents: Array<{[key: string]: any}>,
-                                      normalizedEvents: Array<{[key: string]: any}> = null) {
+  private _convertPerfRecordsToEvents(
+      chromeEvents: Array<{[key: string]: any}>, normalizedEvents: PerfLogEvent[] = null) {
     if (isBlank(normalizedEvents)) {
       normalizedEvents = [];
     }
@@ -93,8 +96,9 @@ export class ChromeDriverExtension extends WebDriverExtension {
       var name = event['name'];
       if (this._isEvent(categories, name, ['blink.console'])) {
         normalizedEvents.push(normalizeEvent(event, {'name': name}));
-      } else if (this._isEvent(categories, name, ['benchmark'],
-                               'BenchmarkInstrumentation::ImplThreadRenderingStats')) {
+      } else if (this._isEvent(
+                     categories, name, ['benchmark'],
+                     'BenchmarkInstrumentation::ImplThreadRenderingStats')) {
         // TODO(goderbauer): Instead of BenchmarkInstrumentation::ImplThreadRenderingStats the
         // following events should be used (if available) for more accurate measurments:
         //   1st choice: vsync_before - ground truth on Android
@@ -104,15 +108,15 @@ export class ChromeDriverExtension extends WebDriverExtension {
         //               always available if something is rendered
         var frameCount = event['args']['data']['frame_count'];
         if (frameCount > 1) {
-          throw new BaseException('multi-frame render stats not supported');
+          throw new Error('multi-frame render stats not supported');
         }
         if (frameCount == 1) {
           normalizedEvents.push(normalizeEvent(event, {'name': 'frame'}));
         }
-      } else if (this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                               'Rasterize') ||
-                 this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                               'CompositeLayers')) {
+      } else if (
+          this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'], 'Rasterize') ||
+          this._isEvent(
+              categories, name, ['disabled-by-default-devtools.timeline'], 'CompositeLayers')) {
         normalizedEvents.push(normalizeEvent(event, {'name': 'render'}));
       } else if (this._majorChromeVersion < 45) {
         var normalizedEvent = this._processAsPreChrome45Event(event, categories, majorGCPids);
@@ -125,28 +129,28 @@ export class ChromeDriverExtension extends WebDriverExtension {
     return normalizedEvents;
   }
 
-  private _processAsPreChrome45Event(event, categories, majorGCPids) {
+  private _processAsPreChrome45Event(
+      event: {[key: string]: any}, categories: string[], majorGCPids: {[key: string]: any}) {
     var name = event['name'];
     var args = event['args'];
     var pid = event['pid'];
     var ph = event['ph'];
-    if (this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                      'FunctionCall') &&
+    if (this._isEvent(
+            categories, name, ['disabled-by-default-devtools.timeline'], 'FunctionCall') &&
         (isBlank(args) || isBlank(args['data']) ||
          !StringWrapper.equals(args['data']['scriptName'], 'InjectedScript'))) {
       return normalizeEvent(event, {'name': 'script'});
-    } else if (this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                             'RecalculateStyles') ||
-               this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                             'Layout') ||
-               this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                             'UpdateLayerTree') ||
-               this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                             'Paint')) {
+    } else if (
+        this._isEvent(
+            categories, name, ['disabled-by-default-devtools.timeline'], 'RecalculateStyles') ||
+        this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'], 'Layout') ||
+        this._isEvent(
+            categories, name, ['disabled-by-default-devtools.timeline'], 'UpdateLayerTree') ||
+        this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'], 'Paint')) {
       return normalizeEvent(event, {'name': 'render'});
-    } else if (this._isEvent(categories, name, ['disabled-by-default-devtools.timeline'],
-                             'GCEvent')) {
-      var normArgs = {
+    } else if (this._isEvent(
+                   categories, name, ['disabled-by-default-devtools.timeline'], 'GCEvent')) {
+      var normArgs: {[key: string]: any} = {
         'usedHeapSize': isPresent(args['usedHeapSizeAfter']) ? args['usedHeapSizeAfter'] :
                                                                args['usedHeapSizeBefore']
       };
@@ -155,14 +159,14 @@ export class ChromeDriverExtension extends WebDriverExtension {
       }
       majorGCPids[pid] = false;
       return normalizeEvent(event, {'name': 'gc', 'args': normArgs});
-    } else if (this._isEvent(categories, name, ['v8'], 'majorGC') &&
-               StringWrapper.equals(ph, 'B')) {
+    } else if (
+        this._isEvent(categories, name, ['v8'], 'majorGC') && StringWrapper.equals(ph, 'B')) {
       majorGCPids[pid] = true;
     }
     return null;  // nothing useful in this event
   }
 
-  private _processAsPostChrome44Event(event, categories) {
+  private _processAsPostChrome44Event(event: {[key: string]: any}, categories: string[]) {
     var name = event['name'];
     var args = event['args'];
     if (this._isEvent(categories, name, ['devtools.timeline', 'v8'], 'MajorGC')) {
@@ -179,17 +183,19 @@ export class ChromeDriverExtension extends WebDriverExtension {
                                                                args['usedHeapSizeBefore']
       };
       return normalizeEvent(event, {'name': 'gc', 'args': normArgs});
-    } else if (this._isEvent(categories, name, ['devtools.timeline', 'v8'], 'FunctionCall') &&
-               (isBlank(args) || isBlank(args['data']) ||
-                (!StringWrapper.equals(args['data']['scriptName'], 'InjectedScript') &&
-                 !StringWrapper.equals(args['data']['scriptName'], '')))) {
+    } else if (
+        this._isEvent(categories, name, ['devtools.timeline'], 'FunctionCall') &&
+        (isBlank(args) || isBlank(args['data']) ||
+         (!StringWrapper.equals(args['data']['scriptName'], 'InjectedScript') &&
+          !StringWrapper.equals(args['data']['scriptName'], '')))) {
       return normalizeEvent(event, {'name': 'script'});
-    } else if (this._isEvent(categories, name, ['devtools.timeline', 'blink'],
-                             'UpdateLayoutTree')) {
+    } else if (this._isEvent(
+                   categories, name, ['devtools.timeline', 'blink'], 'UpdateLayoutTree')) {
       return normalizeEvent(event, {'name': 'render'});
-    } else if (this._isEvent(categories, name, ['devtools.timeline'], 'UpdateLayerTree') ||
-               this._isEvent(categories, name, ['devtools.timeline'], 'Layout') ||
-               this._isEvent(categories, name, ['devtools.timeline'], 'Paint')) {
+    } else if (
+        this._isEvent(categories, name, ['devtools.timeline'], 'UpdateLayerTree') ||
+        this._isEvent(categories, name, ['devtools.timeline'], 'Layout') ||
+        this._isEvent(categories, name, ['devtools.timeline'], 'Paint')) {
       return normalizeEvent(event, {'name': 'render'});
     } else if (this._isEvent(categories, name, ['devtools.timeline'], 'ResourceReceivedData')) {
       let normArgs = {'encodedDataLength': args['data']['encodedDataLength']};
@@ -206,8 +212,9 @@ export class ChromeDriverExtension extends WebDriverExtension {
 
   private _parseCategories(categories: string): string[] { return categories.split(','); }
 
-  private _isEvent(eventCategories: string[], eventName: string, expectedCategories: string[],
-                   expectedName: string = null): boolean {
+  private _isEvent(
+      eventCategories: string[], eventName: string, expectedCategories: string[],
+      expectedName: string = null): boolean {
     var hasCategories = expectedCategories.reduce(
         (value, cat) => { return value && ListWrapper.contains(eventCategories, cat); }, true);
     return isBlank(expectedName) ? hasCategories :
@@ -220,19 +227,19 @@ export class ChromeDriverExtension extends WebDriverExtension {
 
   supports(capabilities: {[key: string]: any}): boolean {
     return this._majorChromeVersion != -1 &&
-           StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'chrome');
+        StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'chrome');
   }
 }
 
-function normalizeEvent(chromeEvent: {[key: string]: any},
-                        data: {[key: string]: any}): {[key: string]: any} {
+function normalizeEvent(
+    chromeEvent: {[key: string]: any}, data: {[key: string]: any}): PerfLogEvent {
   var ph = chromeEvent['ph'];
   if (StringWrapper.equals(ph, 'S')) {
     ph = 'b';
   } else if (StringWrapper.equals(ph, 'F')) {
     ph = 'e';
   }
-  var result =
+  var result: {[key: string]: any} =
       {'pid': chromeEvent['pid'], 'ph': ph, 'cat': 'timeline', 'ts': chromeEvent['ts'] / 1000};
   if (chromeEvent['ph'] === 'X') {
     var dur = chromeEvent['dur'];
@@ -244,11 +251,3 @@ function normalizeEvent(chromeEvent: {[key: string]: any},
   StringMapWrapper.forEach(data, (value, prop) => { result[prop] = value; });
   return result;
 }
-
-var _PROVIDERS = [
-  {
-    provide: ChromeDriverExtension,
-    useFactory: (driver, userAgent) => new ChromeDriverExtension(driver, userAgent),
-    deps: [WebDriverAdapter, Options.USER_AGENT]
-  }
-];

modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts

@@ -1,9 +1,20 @@
-import {isPresent, StringWrapper} from '@angular/facade';
-import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
-import {WebDriverAdapter} from '../web_driver_adapter';
+/**
+ * @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 {StringWrapper, isPresent} from '../facade/lang';
+import {WebDriverAdapter} from '../web_driver_adapter';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+
+@Injectable()
 export class FirefoxDriverExtension extends WebDriverExtension {
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [FirefoxDriverExtension];
 
   private _profilerStarted: boolean;
 
@@ -30,7 +41,7 @@ export class FirefoxDriverExtension extends WebDriverExtension {
     return this._driver.executeScript(script);
   }
 
-  readPerfLog(): Promise<any> {
+  readPerfLog(): Promise<PerfLogEvent> {
     return this._driver.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);');
   }
 
@@ -40,11 +51,3 @@ export class FirefoxDriverExtension extends WebDriverExtension {
     return StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'firefox');
   }
 }
-
-var _PROVIDERS = [
-  {
-    provide: FirefoxDriverExtension,
-    useFactory: (driver) => new FirefoxDriverExtension(driver),
-    deps: [WebDriverAdapter]
-  }
-];

modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts

@@ -1,16 +1,24 @@
-import {Json, isPresent, isBlank, RegExpWrapper, StringWrapper} from '@angular/facade';
-import {BaseException, WrappedException} from '@angular/facade';
+/**
+ * @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 {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
+import {Injectable} from '@angular/core';
+
+import {StringWrapper, isBlank, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
 
+@Injectable()
 export class IOsDriverExtension extends WebDriverExtension {
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [IOsDriverExtension];
 
   constructor(private _driver: WebDriverAdapter) { super(); }
 
-  gc(): Promise<any> { throw new BaseException('Force GC is not supported on iOS'); }
+  gc(): Promise<any> { throw new Error('Force GC is not supported on iOS'); }
 
   timeBegin(name: string): Promise<any> {
     return this._driver.executeScript(`console.time('${name}');`);
@@ -19,7 +27,7 @@ export class IOsDriverExtension extends WebDriverExtension {
   timeEnd(name: string, restartName: string = null): Promise<any> {
     var script = `console.timeEnd('${name}');`;
     if (isPresent(restartName)) {
-      script += `console.time('${restartName}');`
+      script += `console.time('${restartName}');`;
     }
     return this._driver.executeScript(script);
   }
@@ -31,9 +39,9 @@ export class IOsDriverExtension extends WebDriverExtension {
     return this._driver.executeScript('1+1')
         .then((_) => this._driver.logs('performance'))
         .then((entries) => {
-          var records = [];
+          var records: any[] = [];
           entries.forEach(entry => {
-            var message = Json.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
             if (StringWrapper.equals(message['method'], 'Timeline.eventRecorded')) {
               records.push(message['params']['record']);
             }
@@ -42,12 +50,13 @@ export class IOsDriverExtension extends WebDriverExtension {
         });
   }
 
-  _convertPerfRecordsToEvents(records: any[], events: any[] = null) {
+  /** @internal */
+  private _convertPerfRecordsToEvents(records: any[], events: PerfLogEvent[] = null) {
     if (isBlank(events)) {
       events = [];
     }
     records.forEach((record) => {
-      var endEvent = null;
+      var endEvent: PerfLogEvent = null;
       var type = record['type'];
       var data = record['data'];
       var startTime = record['startTime'];
@@ -61,11 +70,11 @@ export class IOsDriverExtension extends WebDriverExtension {
         events.push(createMarkStartEvent(data['message'], startTime));
       } else if (StringWrapper.equals(type, 'TimeEnd')) {
         events.push(createMarkEndEvent(data['message'], startTime));
-      } else if (StringWrapper.equals(type, 'RecalculateStyles') ||
-                 StringWrapper.equals(type, 'Layout') ||
-                 StringWrapper.equals(type, 'UpdateLayerTree') ||
-                 StringWrapper.equals(type, 'Paint') || StringWrapper.equals(type, 'Rasterize') ||
-                 StringWrapper.equals(type, 'CompositeLayers')) {
+      } else if (
+          StringWrapper.equals(type, 'RecalculateStyles') || StringWrapper.equals(type, 'Layout') ||
+          StringWrapper.equals(type, 'UpdateLayerTree') || StringWrapper.equals(type, 'Paint') ||
+          StringWrapper.equals(type, 'Rasterize') ||
+          StringWrapper.equals(type, 'CompositeLayers')) {
         events.push(createStartEvent('render', startTime));
         endEvent = createEndEvent('render', endTime);
       }
@@ -87,8 +96,9 @@ export class IOsDriverExtension extends WebDriverExtension {
   }
 }
 
-function createEvent(ph, name, time, args = null) {
-  var result = {
+function createEvent(
+    ph: 'X' | 'B' | 'E' | 'b' | 'e', name: string, time: number, args: any = null) {
+  var result: PerfLogEvent = {
     'cat': 'timeline',
     'name': name,
     'ts': time,
@@ -103,22 +113,18 @@ function createEvent(ph, name, time, args = null) {
   return result;
 }
 
-function createStartEvent(name, time, args = null) {
+function createStartEvent(name: string, time: number, args: any = null) {
   return createEvent('B', name, time, args);
 }
 
-function createEndEvent(name, time, args = null) {
+function createEndEvent(name: string, time: number, args: any = null) {
   return createEvent('E', name, time, args);
 }
 
-function createMarkStartEvent(name, time) {
+function createMarkStartEvent(name: string, time: number) {
   return createEvent('b', name, time);
 }
 
-function createMarkEndEvent(name, time) {
+function createMarkEndEvent(name: string, time: number) {
   return createEvent('e', name, time);
 }
-
-var _PROVIDERS = [
-  {provide: IOsDriverExtension, useFactory: (driver) => new IOsDriverExtension(driver), deps: [WebDriverAdapter]}
-];

modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.ts

@@ -1,27 +1,42 @@
-import {PromiseWrapper} from '@angular/facade';
-import {WebDriverAdapter} from '../web_driver_adapter';
+/**
+ * @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 * as webdriver from 'selenium-webdriver';
 
+import {WebDriverAdapter} from '../web_driver_adapter';
+
 /**
  * Adapter for the selenium-webdriver.
  */
 export class SeleniumWebDriverAdapter extends WebDriverAdapter {
-  static get PROTRACTOR_BINDINGS(): any[] { return _PROTRACTOR_BINDINGS; }
+  static PROTRACTOR_PROVIDERS = [{
+    provide: WebDriverAdapter,
+    useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser)
+  }];
 
   constructor(private _driver: any) { super(); }
 
-  _convertPromise(thenable) {
-    var completer = PromiseWrapper.completer();
+  /** @internal */
+  private _convertPromise(thenable: PromiseLike<any>) {
+    var resolve: (result: any) => void;
+    var reject: (error: any) => void;
+    var promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
     thenable.then(
         // selenium-webdriver uses an own Node.js context,
         // so we need to convert data into objects of this context.
-        // Previously needed for rtts_asserts.
-        (data) => completer.resolve(convertToLocalProcess(data)), completer.reject);
-    return completer.promise;
+        (data: any) => resolve(convertToLocalProcess(data)), reject);
+    return promise;
   }
 
-  waitFor(callback): Promise<any> {
+  waitFor(callback: () => any): Promise<any> {
     return this._convertPromise(this._driver.controlFlow().execute(callback));
   }
 
@@ -35,7 +50,7 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
 
   capabilities(): Promise<any> {
     return this._convertPromise(
-        this._driver.getCapabilities().then((capsObject) => capsObject.serialize()));
+        this._driver.getCapabilities().then((capsObject: any) => capsObject.serialize()));
   }
 
   logs(type: string): Promise<any> {
@@ -47,14 +62,10 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
   }
 }
 
-function convertToLocalProcess(data): Object {
+function convertToLocalProcess(data: any): Object {
   var serialized = JSON.stringify(data);
   if ('' + serialized === 'undefined') {
     return undefined;
   }
   return JSON.parse(serialized);
 }
-
-var _PROTRACTOR_BINDINGS = [
-  {provide: WebDriverAdapter, useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser), deps: []}
-];

modules/@angular/benchpress/test/firefox_extension/conf.ts

@@ -1,4 +1,12 @@
-require('es6-shim/es6-shim.js');
+/**
+ * @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
+ */
+
+require('core-js');
 require('reflect-metadata');
 var testHelper = require('../../src/firefox_extension/lib/test_helper.js');
 

modules/@angular/benchpress/test/firefox_extension/parser_util_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 {convertPerfProfileToEvents} from '../../src/firefox_extension/lib/parser_util';
+
+function assertEventsEqual(actualEvents: any[], expectedEvents: any[]) {
+  expect(actualEvents.length == expectedEvents.length);
+  for (var i = 0; i < actualEvents.length; ++i) {
+    var actualEvent = actualEvents[i];
+    var expectedEvent = expectedEvents[i];
+    for (var key in actualEvent) {
+      expect(actualEvent[key]).toEqual(expectedEvent[key]);
+    }
+  }
+};
+
+export function main() {
+  describe('convertPerfProfileToEvents', function() {
+    it('should convert single instantaneous event', function() {
+      var profileData = {
+        threads: [
+          {samples: [{time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]}]}
+        ]
+      };
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
+    });
+
+    it('should convert single non-instantaneous event', function() {
+      var profileData = {
+        threads: [{
+          samples: [
+            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 2, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 100, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]}
+          ]
+        }]
+      };
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(
+          perfEvents, [{ph: 'B', ts: 1, name: 'script'}, {ph: 'E', ts: 100, name: 'script'}]);
+    });
+
+    it('should convert multiple instantaneous events', function() {
+      var profileData = {
+        threads: [{
+          samples: [
+            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 2, frames: [{location: 'PresShell::Paint'}]}
+          ]
+        }]
+      };
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(
+          perfEvents, [{ph: 'X', ts: 1, name: 'script'}, {ph: 'X', ts: 2, name: 'render'}]);
+    });
+
+    it('should convert multiple mixed events', function() {
+      var profileData = {
+        threads: [{
+          samples: [
+            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 2, frames: [{location: 'PresShell::Paint'}]},
+            {time: 5, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 10, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]}
+          ]
+        }]
+      };
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(perfEvents, [
+        {ph: 'X', ts: 1, name: 'script'}, {ph: 'X', ts: 2, name: 'render'},
+        {ph: 'B', ts: 5, name: 'script'}, {ph: 'E', ts: 10, name: 'script'}
+      ]);
+    });
+
+    it('should add args to gc events', function() {
+      var profileData = {threads: [{samples: [{time: 1, frames: [{location: 'forceGC'}]}]}]};
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'gc', args: {usedHeapSize: 0}}]);
+    });
+
+    it('should skip unknown events', function() {
+      var profileData = {
+        threads: [{
+          samples: [
+            {time: 1, frames: [{location: 'FirefoxDriver.prototype.executeScript'}]},
+            {time: 2, frames: [{location: 'foo'}]}
+          ]
+        }]
+      };
+      var perfEvents = convertPerfProfileToEvents(profileData);
+      assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
+    });
+  });
+};

modules/@angular/benchpress/test/firefox_extension/sample_benchmark.ts

@@ -1,7 +1,15 @@
+/**
+ * @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
+ */
+
 var benchpress = require('../../index.js');
 var runner = new benchpress.Runner([
   // use protractor as Webdriver client
-  benchpress.SeleniumWebDriverAdapter.PROTRACTOR_BINDINGS,
+  benchpress.SeleniumWebDriverAdapter.PROTRACTOR_PROVIDERS,
   // use RegressionSlopeValidator to validate samples
   benchpress.Validator.bindTo(benchpress.RegressionSlopeValidator),
   // use 10 samples to calculate slope regression
@@ -21,12 +29,12 @@ describe('deep tree baseline', function() {
      * Benchpress will log the collected metrics after each sample is collected, and will stop
      * sampling as soon as the calculated regression slope for last 20 samples is stable.
      */
-    runner.sample({
-            id: 'baseline',
-            execute: function() { $('button')
-                                      .click(); },
-            providers: [benchpress.bind(benchpress.Options.SAMPLE_DESCRIPTION).toValue({depth: 9})]
-          })
+    runner
+        .sample({
+          id: 'baseline',
+          execute: function() { $('button').click(); },
+          providers: [benchpress.bind(benchpress.Options.SAMPLE_DESCRIPTION).toValue({depth: 9})]
+        })
         .then(done, done.fail);
   });
 });

modules/@angular/benchpress/test/firefox_extension/spec.ts

@@ -1,4 +1,12 @@
-var assertEventsContainsName = function(events, eventName) {
+/**
+ * @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
+ */
+
+var assertEventsContainsName = function(events: any[], eventName: string) {
   var found = false;
   for (var i = 0; i < events.length; ++i) {
     if (events[i].name == eventName) {
@@ -17,16 +25,17 @@ describe('firefox extension', function() {
 
     browser.driver.get(TEST_URL);
 
-    browser.executeScript('window.startProfiler()')
-        .then(function() { console.log('started measuring perf'); });
+    browser.executeScript('window.startProfiler()').then(function() {
+      console.log('started measuring perf');
+    });
 
     browser.executeAsyncScript('setTimeout(arguments[0], 1000);');
     browser.executeScript('window.forceGC()');
 
     browser.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);')
-        .then(function(profile) {
+        .then(function(profile: any) {
           assertEventsContainsName(profile, 'gc');
           assertEventsContainsName(profile, 'script');
         });
-  })
+  });
 });

modules/@angular/benchpress/test/metric/multi_metric_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 {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Metric, MultiMetric, ReflectiveInjector} from '../../index';
+
+export function main() {
+  function createMetric(ids: any[]) {
+    var m = ReflectiveInjector
+                .resolveAndCreate([
+                  ids.map(id => { return {provide: id, useValue: new MockMetric(id)}; }),
+                  MultiMetric.provideWith(ids)
+                ])
+                .get(MultiMetric);
+    return Promise.resolve(m);
+  }
+
+  describe('multi metric', () => {
+    it('should merge descriptions', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createMetric(['m1', 'm2']).then((m) => {
+           expect(m.describe()).toEqual({'m1': 'describe', 'm2': 'describe'});
+           async.done();
+         });
+       }));
+
+    it('should merge all beginMeasure calls',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createMetric(['m1', 'm2']).then((m) => m.beginMeasure()).then((values) => {
+           expect(values).toEqual(['m1_beginMeasure', 'm2_beginMeasure']);
+           async.done();
+         });
+       }));
+
+    [false, true].forEach((restartFlag) => {
+      it(`should merge all endMeasure calls for restart=${restartFlag}`,
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createMetric(['m1', 'm2']).then((m) => m.endMeasure(restartFlag)).then((values) => {
+             expect(values).toEqual(
+                 {'m1': {'restart': restartFlag}, 'm2': {'restart': restartFlag}});
+             async.done();
+           });
+         }));
+    });
+
+  });
+}
+
+class MockMetric extends Metric {
+  constructor(private _id: string) { super(); }
+
+  beginMeasure(): Promise<string> { return Promise.resolve(`${this._id}_beginMeasure`); }
+
+  endMeasure(restart: boolean): Promise<{[key: string]: any}> {
+    var result: {[key: string]: any} = {};
+    result[this._id] = {'restart': restart};
+    return Promise.resolve(result);
+  }
+
+  describe(): {[key: string]: string} {
+    var result: {[key: string]: string} = {};
+    result[this._id] = 'describe';
+    return result;
+  }
+}

modules/@angular/benchpress/test/metric/perflog_metric_spec.ts

@@ -0,0 +1,685 @@
+/**
+ * @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 {Provider} from '@angular/core';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
+import {StringMapWrapper} from '../../src/facade/collection';
+import {isBlank, isPresent} from '../../src/facade/lang';
+import {TraceEventFactory} from '../trace_event_factory';
+
+export function main() {
+  var commandLog: any[];
+  var eventFactory = new TraceEventFactory('timeline', 'pid0');
+
+  function createMetric(
+      perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
+      {microMetrics, forceGc, captureFrames, receivedData, requestCount}: {
+        microMetrics?: {[key: string]: string},
+        forceGc?: boolean,
+        captureFrames?: boolean,
+        receivedData?: boolean,
+        requestCount?: boolean
+      } = {}): Metric {
+    commandLog = [];
+    if (isBlank(perfLogFeatures)) {
+      perfLogFeatures =
+          new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
+    }
+    if (isBlank(microMetrics)) {
+      microMetrics = StringMapWrapper.create();
+    }
+    var providers: Provider[] = [
+      Options.DEFAULT_PROVIDERS, PerflogMetric.PROVIDERS,
+      {provide: Options.MICRO_METRICS, useValue: microMetrics}, {
+        provide: PerflogMetric.SET_TIMEOUT,
+        useValue: (fn: Function, millis: number) => {
+          commandLog.push(['setTimeout', millis]);
+          fn();
+        },
+      },
+      {
+        provide: WebDriverExtension,
+        useValue: new MockDriverExtension(perfLogs, commandLog, perfLogFeatures)
+      }
+    ];
+    if (isPresent(forceGc)) {
+      providers.push({provide: Options.FORCE_GC, useValue: forceGc});
+    }
+    if (isPresent(captureFrames)) {
+      providers.push({provide: Options.CAPTURE_FRAMES, useValue: captureFrames});
+    }
+    if (isPresent(receivedData)) {
+      providers.push({provide: Options.RECEIVED_DATA, useValue: receivedData});
+    }
+    if (isPresent(requestCount)) {
+      providers.push({provide: Options.REQUEST_COUNT, useValue: requestCount});
+    }
+    return ReflectiveInjector.resolveAndCreate(providers).get(PerflogMetric);
+  }
+
+  describe('perflog metric', () => {
+
+    function sortedKeys(stringMap: {[key: string]: any}) {
+      var res: string[] = [];
+      StringMapWrapper.forEach(stringMap, (_, key) => { res.push(key); });
+      res.sort();
+      return res;
+    }
+
+    it('should describe itself based on the perfLogFeatrues', () => {
+      expect(sortedKeys(createMetric([[]], new PerfLogFeatures()).describe())).toEqual([
+        'pureScriptTime', 'scriptTime'
+      ]);
+
+      expect(
+          sortedKeys(createMetric([[]], new PerfLogFeatures({render: true, gc: false})).describe()))
+          .toEqual(['pureScriptTime', 'renderTime', 'scriptTime']);
+
+      expect(sortedKeys(createMetric([[]], null).describe())).toEqual([
+        'gcAmount', 'gcTime', 'majorGcTime', 'pureScriptTime', 'renderTime', 'scriptTime'
+      ]);
+
+      expect(sortedKeys(createMetric([[]], new PerfLogFeatures({render: true, gc: true}), {
+                          forceGc: true
+                        }).describe()))
+          .toEqual([
+            'forcedGcAmount', 'forcedGcTime', 'gcAmount', 'gcTime', 'majorGcTime', 'pureScriptTime',
+            'renderTime', 'scriptTime'
+          ]);
+
+
+      expect(sortedKeys(createMetric([[]], new PerfLogFeatures({userTiming: true}), {
+                          receivedData: true,
+                          requestCount: true
+                        }).describe()))
+          .toEqual(['pureScriptTime', 'receivedData', 'requestCount', 'scriptTime']);
+    });
+
+    it('should describe itself based on micro metrics', () => {
+      var description =
+          createMetric([[]], null, {microMetrics: {'myMicroMetric': 'someDesc'}}).describe();
+      expect(description['myMicroMetric']).toEqual('someDesc');
+    });
+
+    it('should describe itself if frame capture is requested and available', () => {
+      var description = createMetric([[]], new PerfLogFeatures({frameCapture: true}), {
+                          captureFrames: true
+                        }).describe();
+      expect(description['frameTime.mean']).not.toContain('WARNING');
+      expect(description['frameTime.best']).not.toContain('WARNING');
+      expect(description['frameTime.worst']).not.toContain('WARNING');
+      expect(description['frameTime.smooth']).not.toContain('WARNING');
+    });
+
+    it('should describe itself if frame capture is requested and not available', () => {
+      var description = createMetric([[]], new PerfLogFeatures({frameCapture: false}), {
+                          captureFrames: true
+                        }).describe();
+      expect(description['frameTime.mean']).toContain('WARNING');
+      expect(description['frameTime.best']).toContain('WARNING');
+      expect(description['frameTime.worst']).toContain('WARNING');
+      expect(description['frameTime.smooth']).toContain('WARNING');
+    });
+
+    describe('beginMeasure', () => {
+
+      it('should not force gc and mark the timeline',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var metric = createMetric([[]], null);
+           metric.beginMeasure().then((_) => {
+             expect(commandLog).toEqual([['timeBegin', 'benchpress0']]);
+
+             async.done();
+           });
+         }));
+
+      it('should force gc and mark the timeline',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var metric = createMetric([[]], null, {forceGc: true});
+           metric.beginMeasure().then((_) => {
+             expect(commandLog).toEqual([['gc'], ['timeBegin', 'benchpress0']]);
+
+             async.done();
+           });
+         }));
+
+    });
+
+    describe('endMeasure', () => {
+
+      it('should mark and aggregate events in between the marks',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var events = [[
+             eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 4),
+             eventFactory.end('script', 6), eventFactory.markEnd('benchpress0', 10)
+           ]];
+           var metric = createMetric(events, null);
+           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
+             expect(commandLog).toEqual([
+               ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', null], 'readPerfLog'
+             ]);
+             expect(data['scriptTime']).toBe(2);
+
+             async.done();
+           });
+         }));
+
+      it('should restart timing', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var events = [
+             [
+               eventFactory.markStart('benchpress0', 0),
+               eventFactory.markEnd('benchpress0', 1),
+               eventFactory.markStart('benchpress1', 2),
+             ],
+             [eventFactory.markEnd('benchpress1', 3)]
+           ];
+           var metric = createMetric(events, null);
+           metric.beginMeasure()
+               .then((_) => metric.endMeasure(true))
+               .then((_) => metric.endMeasure(true))
+               .then((_) => {
+                 expect(commandLog).toEqual([
+                   ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', 'benchpress1'],
+                   'readPerfLog', ['timeEnd', 'benchpress1', 'benchpress2'], 'readPerfLog'
+                 ]);
+
+                 async.done();
+               });
+         }));
+
+      it('should loop and aggregate until the end mark is present',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var events = [
+             [eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 1)],
+             [eventFactory.end('script', 2)],
+             [
+               eventFactory.start('script', 3), eventFactory.end('script', 5),
+               eventFactory.markEnd('benchpress0', 10)
+             ]
+           ];
+           var metric = createMetric(events, null);
+           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
+             expect(commandLog).toEqual([
+               ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', null], 'readPerfLog',
+               ['setTimeout', 100], 'readPerfLog', ['setTimeout', 100], 'readPerfLog'
+             ]);
+             expect(data['scriptTime']).toBe(3);
+
+             async.done();
+           });
+         }));
+
+      it('should store events after the end mark for the next call',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var events = [
+             [
+               eventFactory.markStart('benchpress0', 0), eventFactory.markEnd('benchpress0', 1),
+               eventFactory.markStart('benchpress1', 1), eventFactory.start('script', 1),
+               eventFactory.end('script', 2)
+             ],
+             [
+               eventFactory.start('script', 3), eventFactory.end('script', 5),
+               eventFactory.markEnd('benchpress1', 6)
+             ]
+           ];
+           var metric = createMetric(events, null);
+           metric.beginMeasure()
+               .then((_) => metric.endMeasure(true))
+               .then((data) => {
+                 expect(data['scriptTime']).toBe(0);
+                 return metric.endMeasure(true);
+               })
+               .then((data) => {
+                 expect(commandLog).toEqual([
+                   ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', 'benchpress1'],
+                   'readPerfLog', ['timeEnd', 'benchpress1', 'benchpress2'], 'readPerfLog'
+                 ]);
+                 expect(data['scriptTime']).toBe(3);
+
+                 async.done();
+               });
+         }));
+
+      describe('with forced gc', () => {
+        var events: PerfLogEvent[][];
+        beforeEach(() => {
+          events = [[
+            eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 4),
+            eventFactory.end('script', 6), eventFactory.markEnd('benchpress0', 10),
+            eventFactory.markStart('benchpress1', 11),
+            eventFactory.start('gc', 12, {'usedHeapSize': 2500}),
+            eventFactory.end('gc', 15, {'usedHeapSize': 1000}),
+            eventFactory.markEnd('benchpress1', 20)
+          ]];
+        });
+
+        it('should measure forced gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var metric = createMetric(events, null, {forceGc: true});
+             metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
+               expect(commandLog).toEqual([
+                 ['gc'], ['timeBegin', 'benchpress0'], ['timeEnd', 'benchpress0', 'benchpress1'],
+                 'readPerfLog', ['gc'], ['timeEnd', 'benchpress1', null], 'readPerfLog'
+               ]);
+               expect(data['forcedGcTime']).toBe(3);
+               expect(data['forcedGcAmount']).toBe(1.5);
+
+               async.done();
+             });
+           }));
+
+        it('should restart after the forced gc if needed',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             var metric = createMetric(events, null, {forceGc: true});
+             metric.beginMeasure().then((_) => metric.endMeasure(true)).then((data) => {
+               expect(commandLog[5]).toEqual(['timeEnd', 'benchpress1', 'benchpress2']);
+
+               async.done();
+             });
+           }));
+
+      });
+
+    });
+
+    describe('aggregation', () => {
+
+      function aggregate(events: any[], {microMetrics, captureFrames, receivedData, requestCount}: {
+        microMetrics?: {[key: string]: string},
+        captureFrames?: boolean,
+        receivedData?: boolean,
+        requestCount?: boolean
+      } = {}) {
+        events.unshift(eventFactory.markStart('benchpress0', 0));
+        events.push(eventFactory.markEnd('benchpress0', 10));
+        var metric = createMetric([events], null, {
+          microMetrics: microMetrics,
+          captureFrames: captureFrames,
+          receivedData: receivedData,
+          requestCount: requestCount
+        });
+        return metric.beginMeasure().then((_) => metric.endMeasure(false));
+      }
+
+      describe('frame metrics', () => {
+        it('should calculate mean frame time',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('frameCapture', 0), eventFactory.instant('frame', 1),
+                   eventFactory.instant('frame', 3), eventFactory.instant('frame', 4),
+                   eventFactory.markEnd('frameCapture', 5)
+                 ],
+                 {captureFrames: true})
+                 .then((data) => {
+                   expect(data['frameTime.mean']).toBe(((3 - 1) + (4 - 3)) / 2);
+                   async.done();
+                 });
+           }));
+
+        it('should throw if no start event',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+
+             aggregate(
+                 [eventFactory.instant('frame', 4), eventFactory.markEnd('frameCapture', 5)],
+                 {captureFrames: true})
+                 .catch((err): any => {
+                   expect(() => {
+                     throw err;
+                   }).toThrowError('missing start event for frame capture');
+                   async.done();
+                 });
+           }));
+
+        it('should throw if no end event',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+
+             aggregate(
+                 [eventFactory.markStart('frameCapture', 3), eventFactory.instant('frame', 4)],
+                 {captureFrames: true})
+                 .catch((err): any => {
+                   expect(() => { throw err; }).toThrowError('missing end event for frame capture');
+                   async.done();
+                 });
+           }));
+
+        it('should throw if trying to capture twice',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+
+             aggregate(
+                 [
+                   eventFactory.markStart('frameCapture', 3),
+                   eventFactory.markStart('frameCapture', 4)
+                 ],
+                 {captureFrames: true})
+                 .catch((err): any => {
+                   expect(() => {
+                     throw err;
+                   }).toThrowError('can capture frames only once per benchmark run');
+                   async.done();
+                 });
+           }));
+
+        it('should throw if trying to capture when frame capture is disabled',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate([eventFactory.markStart('frameCapture', 3)]).catch((err) => {
+               expect(() => { throw err; })
+                   .toThrowError(
+                       'found start event for frame capture, but frame capture was not requested in benchpress');
+               async.done();
+               return null;
+             });
+           }));
+
+        it('should throw if frame capture is enabled, but nothing is captured',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate([], {captureFrames: true}).catch((err): any => {
+               expect(() => { throw err; })
+                   .toThrowError(
+                       'frame capture requested in benchpress, but no start event was found');
+               async.done();
+             });
+           }));
+
+        it('should calculate best and worst frame time',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('frameCapture', 0), eventFactory.instant('frame', 1),
+                   eventFactory.instant('frame', 9), eventFactory.instant('frame', 15),
+                   eventFactory.instant('frame', 18), eventFactory.instant('frame', 28),
+                   eventFactory.instant('frame', 32), eventFactory.markEnd('frameCapture', 10)
+                 ],
+                 {captureFrames: true})
+                 .then((data) => {
+                   expect(data['frameTime.worst']).toBe(10);
+                   expect(data['frameTime.best']).toBe(3);
+                   async.done();
+                 });
+           }));
+
+        it('should calculate percentage of smoothness to be good',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('frameCapture', 0), eventFactory.instant('frame', 1),
+                   eventFactory.instant('frame', 2), eventFactory.instant('frame', 3),
+                   eventFactory.markEnd('frameCapture', 4)
+                 ],
+                 {captureFrames: true})
+                 .then((data) => {
+                   expect(data['frameTime.smooth']).toBe(1.0);
+                   async.done();
+                 });
+           }));
+
+        it('should calculate percentage of smoothness to be bad',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('frameCapture', 0), eventFactory.instant('frame', 1),
+                   eventFactory.instant('frame', 2), eventFactory.instant('frame', 22),
+                   eventFactory.instant('frame', 23), eventFactory.instant('frame', 24),
+                   eventFactory.markEnd('frameCapture', 4)
+                 ],
+                 {captureFrames: true})
+                 .then((data) => {
+                   expect(data['frameTime.smooth']).toBe(0.75);
+                   async.done();
+                 });
+           }));
+
+      });
+
+      it('should report a single interval',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('script', 0), eventFactory.end('script', 5)
+           ]).then((data) => {
+             expect(data['scriptTime']).toBe(5);
+             async.done();
+           });
+         }));
+
+      it('should sum up multiple intervals',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('script', 0), eventFactory.end('script', 5),
+             eventFactory.start('script', 10), eventFactory.end('script', 17)
+           ]).then((data) => {
+             expect(data['scriptTime']).toBe(12);
+             async.done();
+           });
+         }));
+
+      it('should ignore not started intervals',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([eventFactory.end('script', 10)]).then((data) => {
+             expect(data['scriptTime']).toBe(0);
+             async.done();
+           });
+         }));
+
+      it('should ignore not ended intervals',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([eventFactory.start('script', 10)]).then((data) => {
+             expect(data['scriptTime']).toBe(0);
+             async.done();
+           });
+         }));
+
+      it('should ignore nested intervals',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('script', 0), eventFactory.start('script', 5),
+             eventFactory.end('script', 10), eventFactory.end('script', 17)
+           ]).then((data) => {
+             expect(data['scriptTime']).toBe(17);
+             async.done();
+           });
+         }));
+
+      it('should ignore events from different processed as the start mark',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var otherProcessEventFactory = new TraceEventFactory('timeline', 'pid1');
+           var metric = createMetric(
+               [[
+                 eventFactory.markStart('benchpress0', 0), eventFactory.start('script', 0, null),
+                 eventFactory.end('script', 5, null),
+                 otherProcessEventFactory.start('script', 10, null),
+                 otherProcessEventFactory.end('script', 17, null),
+                 eventFactory.markEnd('benchpress0', 20)
+               ]],
+               null);
+           metric.beginMeasure().then((_) => metric.endMeasure(false)).then((data) => {
+             expect(data['scriptTime']).toBe(5);
+             async.done();
+           });
+         }));
+
+      it('should support scriptTime metric',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('script', 0), eventFactory.end('script', 5)
+           ]).then((data) => {
+             expect(data['scriptTime']).toBe(5);
+             async.done();
+           });
+         }));
+
+      it('should support renderTime metric',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('render', 0), eventFactory.end('render', 5)
+           ]).then((data) => {
+             expect(data['renderTime']).toBe(5);
+             async.done();
+           });
+         }));
+
+      it('should support gcTime/gcAmount metric',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('gc', 0, {'usedHeapSize': 2500}),
+             eventFactory.end('gc', 5, {'usedHeapSize': 1000})
+           ]).then((data) => {
+             expect(data['gcTime']).toBe(5);
+             expect(data['gcAmount']).toBe(1.5);
+             expect(data['majorGcTime']).toBe(0);
+             async.done();
+           });
+         }));
+
+      it('should support majorGcTime metric',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('gc', 0, {'usedHeapSize': 2500}),
+             eventFactory.end('gc', 5, {'usedHeapSize': 1000, 'majorGc': true})
+           ]).then((data) => {
+             expect(data['gcTime']).toBe(5);
+             expect(data['majorGcTime']).toBe(5);
+             async.done();
+           });
+         }));
+
+      it('should support pureScriptTime = scriptTime-gcTime-renderTime',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           aggregate([
+             eventFactory.start('script', 0), eventFactory.start('gc', 1, {'usedHeapSize': 1000}),
+             eventFactory.end('gc', 4, {'usedHeapSize': 0}), eventFactory.start('render', 4),
+             eventFactory.end('render', 5), eventFactory.end('script', 6)
+           ]).then((data) => {
+             expect(data['scriptTime']).toBe(6);
+             expect(data['pureScriptTime']).toBe(2);
+             async.done();
+           });
+         }));
+
+      describe('receivedData', () => {
+        it('should report received data since last navigationStart',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.instant('receivedData', 0, {'encodedDataLength': 1}),
+                   eventFactory.instant('navigationStart', 1),
+                   eventFactory.instant('receivedData', 2, {'encodedDataLength': 2}),
+                   eventFactory.instant('navigationStart', 3),
+                   eventFactory.instant('receivedData', 4, {'encodedDataLength': 4}),
+                   eventFactory.instant('receivedData', 5, {'encodedDataLength': 8})
+                 ],
+                 {receivedData: true})
+                 .then((data) => {
+                   expect(data['receivedData']).toBe(12);
+                   async.done();
+                 });
+           }));
+      });
+
+      describe('requestCount', () => {
+        it('should report count of requests sent since last navigationStart',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.instant('sendRequest', 0),
+                   eventFactory.instant('navigationStart', 1),
+                   eventFactory.instant('sendRequest', 2),
+                   eventFactory.instant('navigationStart', 3),
+                   eventFactory.instant('sendRequest', 4), eventFactory.instant('sendRequest', 5)
+                 ],
+                 {requestCount: true})
+                 .then((data) => {
+                   expect(data['requestCount']).toBe(2);
+                   async.done();
+                 });
+           }));
+      });
+
+      describe('microMetrics', () => {
+
+        it('should report micro metrics',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('mm1', 0),
+                   eventFactory.markEnd('mm1', 5),
+                 ],
+                 {microMetrics: {'mm1': 'micro metric 1'}})
+                 .then((data) => {
+                   expect(data['mm1']).toBe(5.0);
+                   async.done();
+                 });
+           }));
+
+        it('should ignore micro metrics that were not specified',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate([
+               eventFactory.markStart('mm1', 0),
+               eventFactory.markEnd('mm1', 5),
+             ]).then((data) => {
+               expect(data['mm1']).toBeFalsy();
+               async.done();
+             });
+           }));
+
+        it('should report micro metric averages',
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             aggregate(
+                 [
+                   eventFactory.markStart('mm1*20', 0),
+                   eventFactory.markEnd('mm1*20', 5),
+                 ],
+                 {microMetrics: {'mm1': 'micro metric 1'}})
+                 .then((data) => {
+                   expect(data['mm1']).toBe(5 / 20);
+                   async.done();
+                 });
+           }));
+
+      });
+
+    });
+
+  });
+}
+
+class MockDriverExtension extends WebDriverExtension {
+  constructor(
+      private _perfLogs: any[], private _commandLog: any[],
+      private _perfLogFeatures: PerfLogFeatures) {
+    super();
+  }
+
+  timeBegin(name: string): Promise<any> {
+    this._commandLog.push(['timeBegin', name]);
+    return Promise.resolve(null);
+  }
+
+  timeEnd(name: string, restartName: string): Promise<any> {
+    this._commandLog.push(['timeEnd', name, restartName]);
+    return Promise.resolve(null);
+  }
+
+  perfLogFeatures(): PerfLogFeatures { return this._perfLogFeatures; }
+
+  readPerfLog(): Promise<any> {
+    this._commandLog.push('readPerfLog');
+    if (this._perfLogs.length > 0) {
+      var next = this._perfLogs[0];
+      this._perfLogs.shift();
+      return Promise.resolve(next);
+    } else {
+      return Promise.resolve([]);
+    }
+  }
+
+  gc(): Promise<any> {
+    this._commandLog.push(['gc']);
+    return Promise.resolve(null);
+  }
+}

modules/@angular/benchpress/test/metric/user_metric_spec.ts

@@ -1,41 +1,24 @@
-import {ReflectiveInjector} from "angular2/core";
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit
-} from 'angular2/testing_internal';
+/**
+ * @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 {TimerWrapper} from 'angular2/src/facade/async';
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {isPresent, isBlank, Json} from 'angular2/src/facade/lang';
+import {Provider, ReflectiveInjector} from '@angular/core';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {
-  Metric,
-  MultiMetric,
-  PerflogMetric,
-  UserMetric,
-  WebDriverAdapter,
-  WebDriverExtension,
-  PerfLogFeatures,
-  bind,
-  provide,
-  Injector,
-  Options
-} from 'benchpress/common';
+import {Injector, Metric, MultiMetric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, UserMetric, WebDriverAdapter, WebDriverExtension} from '../../index';
+import {StringMapWrapper} from '../../src/facade/collection';
+import {Json, isBlank, isPresent} from '../../src/facade/lang';
 
 export function main() {
   var wdAdapter: MockDriverAdapter;
 
-  function createMetric(perfLogs, perfLogFeatures,
-                        {userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
+  function createMetric(
+      perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
+      {userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
     if (isBlank(perfLogFeatures)) {
       perfLogFeatures =
           new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
@@ -44,26 +27,26 @@ export function main() {
       userMetrics = StringMapWrapper.create();
     }
     wdAdapter = new MockDriverAdapter();
-    var bindings = [
-      Options.DEFAULT_PROVIDERS,
-      UserMetric.BINDINGS,
-      bind(Options.USER_METRICS).toValue(userMetrics),
-      provide(WebDriverAdapter, {useValue: wdAdapter})
+    var providers: Provider[] = [
+      Options.DEFAULT_PROVIDERS, UserMetric.PROVIDERS,
+      {provide: Options.USER_METRICS, useValue: userMetrics},
+      {provide: WebDriverAdapter, useValue: wdAdapter}
     ];
-    return ReflectiveInjector.resolveAndCreate(bindings).get(UserMetric);
+    return ReflectiveInjector.resolveAndCreate(providers).get(UserMetric);
   }
 
   describe('user metric', () => {
 
     it('should describe itself based on userMetrics', () => {
-      expect(createMetric([[]], new PerfLogFeatures(), {userMetrics: {'loadTime': 'time to load'}})
-                 .describe())
+      expect(createMetric([[]], new PerfLogFeatures(), {
+               userMetrics: {'loadTime': 'time to load'}
+             }).describe())
           .toEqual({'loadTime': 'time to load'});
     });
 
     describe('endMeasure', () => {
       it('should stop measuring when all properties have numeric values',
-         inject([AsyncTestCompleter], (async) => {
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            let metric = createMetric(
                [[]], new PerfLogFeatures(),
                {userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
@@ -77,7 +60,7 @@ export function main() {
 
            wdAdapter.data['loadTime'] = 25;
            // Wait before setting 2nd property.
-           TimerWrapper.setTimeout(() => { wdAdapter.data['content'] = 250; }, 50);
+           setTimeout(() => { wdAdapter.data['content'] = 250; }, 50);
 
          }), 600);
     });
@@ -91,11 +74,11 @@ class MockDriverAdapter extends WebDriverAdapter {
     // Just handles `return window.propName` ignores `delete window.propName`.
     if (script.indexOf('return window.') == 0) {
       let metricName = script.substring('return window.'.length);
-      return PromiseWrapper.resolve(this.data[metricName]);
+      return Promise.resolve(this.data[metricName]);
     } else if (script.indexOf('delete window.') == 0) {
-      return PromiseWrapper.resolve(null);
+      return Promise.resolve(null);
     } else {
-      return PromiseWrapper.reject(`Unexpected syntax: ${script}`, null);
+      return Promise.reject(`Unexpected syntax: ${script}`);
     }
   }
 }

modules/@angular/benchpress/test/reporter/console_reporter_spec.ts

@@ -1,32 +1,29 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
+/**
+ * @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 {isBlank, isPresent, Date, DateWrapper} from '@angular/facade';
+import {Provider} from '@angular/core';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {
-  SampleState,
-  Reporter,
-  ReflectiveInjector,
-  ConsoleReporter,
-  SampleDescription,
-  MeasureValues
-} from 'benchpress/common';
+import {ConsoleReporter, MeasureValues, ReflectiveInjector, Reporter, SampleDescription, SampleState} from '../../index';
+import {Date, DateWrapper, isBlank, isPresent} from '../../src/facade/lang';
 
 export function main() {
   describe('console reporter', () => {
-    var reporter;
+    var reporter: ConsoleReporter;
     var log: string[];
 
-    function createReporter({columnWidth = null, sampleId = null, descriptions = null,
-                             metrics = null}: {columnWidth?, sampleId?, descriptions?, metrics?}) {
+    function createReporter(
+        {columnWidth = null, sampleId = null, descriptions = null, metrics = null}: {
+          columnWidth?: number,
+          sampleId?: string,
+          descriptions?: {[key: string]: any}[],
+          metrics?: {[key: string]: any}
+        }) {
       log = [];
       if (isBlank(descriptions)) {
         descriptions = [];
@@ -34,15 +31,17 @@ export function main() {
       if (isBlank(sampleId)) {
         sampleId = 'null';
       }
-      var bindings = [
-        ConsoleReporter.PROVIDERS,
-        {provide: SampleDescription, useValue: new SampleDescription(sampleId, descriptions, metrics)},
-        {provide: ConsoleReporter.PRINT, useValue: (line) => log.push(line)}
+      var providers: Provider[] = [
+        ConsoleReporter.PROVIDERS, {
+          provide: SampleDescription,
+          useValue: new SampleDescription(sampleId, descriptions, metrics)
+        },
+        {provide: ConsoleReporter.PRINT, useValue: (line: string) => log.push(line)}
       ];
       if (isPresent(columnWidth)) {
-        bindings.push({provide: ConsoleReporter.COLUMN_WIDTH, useValue(columnWidth)};
+        providers.push({provide: ConsoleReporter.COLUMN_WIDTH, useValue: columnWidth});
       }
-      reporter = ReflectiveInjector.resolveAndCreate(bindings).get(ConsoleReporter);
+      reporter = ReflectiveInjector.resolveAndCreate(providers).get(ConsoleReporter);
     }
 
     it('should print the sample id, description and table header', () => {
@@ -90,6 +89,6 @@ export function main() {
   });
 }
 
-function mv(runIndex, time, values) {
+function mv(runIndex: number, time: number, values: {[key: string]: number}) {
   return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }

modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -0,0 +1,81 @@
+/**
+ * @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, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index';
+import {DateWrapper, Json, isPresent} from '../../src/facade/lang';
+
+export function main() {
+  describe('file reporter', () => {
+    var loggedFile: any;
+
+    function createReporter({sampleId, descriptions, metrics, path}: {
+      sampleId: string,
+      descriptions: {[key: string]: any}[],
+      metrics: {[key: string]: string},
+      path: string
+    }) {
+      var providers = [
+        JsonFileReporter.PROVIDERS, {
+          provide: SampleDescription,
+          useValue: new SampleDescription(sampleId, descriptions, metrics)
+        },
+        {provide: JsonFileReporter.PATH, useValue: path},
+        {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(1234)}, {
+          provide: Options.WRITE_FILE,
+          useValue: (filename: string, content: string) => {
+            loggedFile = {'filename': filename, 'content': content};
+            return Promise.resolve(null);
+          }
+        }
+      ];
+      return ReflectiveInjector.resolveAndCreate(providers).get(JsonFileReporter);
+    }
+
+    it('should write all data into a file',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createReporter({
+           sampleId: 'someId',
+           descriptions: [{'a': 2}],
+           path: 'somePath',
+           metrics: {'a': 'script time', 'b': 'render time'}
+         })
+             .reportSample(
+                 [mv(0, 0, {'a': 3, 'b': 6})],
+                 [mv(0, 0, {'a': 3, 'b': 6}), mv(1, 1, {'a': 5, 'b': 9})]);
+         var regExp = /somePath\/someId_\d+\.json/;
+         expect(isPresent(loggedFile['filename'].match(regExp))).toBe(true);
+         var parsedContent = Json.parse(loggedFile['content']);
+         expect(parsedContent).toEqual({
+           'description': {
+             'id': 'someId',
+             'description': {'a': 2},
+             'metrics': {'a': 'script time', 'b': 'render time'}
+           },
+           'stats': {'a': '4.00+-25%', 'b': '7.50+-20%'},
+           'completeSample': [
+             {'timeStamp': '1970-01-01T00:00:00.000Z', 'runIndex': 0, 'values': {'a': 3, 'b': 6}}
+           ],
+           'validSample': [
+             {'timeStamp': '1970-01-01T00:00:00.000Z', 'runIndex': 0, 'values': {'a': 3, 'b': 6}}, {
+               'timeStamp': '1970-01-01T00:00:00.001Z',
+               'runIndex': 1,
+               'values': {'a': 5, 'b': 9}
+             }
+           ]
+         });
+         async.done();
+       }));
+
+  });
+}
+
+function mv(runIndex: number, time: number, values: {[key: string]: number}) {
+  return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
+}

modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts

@@ -0,0 +1,70 @@
+/**
+ * @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, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../index';
+import {DateWrapper} from '../../src/facade/lang';
+
+export function main() {
+  function createReporters(ids: any[]) {
+    var r = ReflectiveInjector
+                .resolveAndCreate([
+                  ids.map(id => { return {provide: id, useValue: new MockReporter(id)}; }),
+                  MultiReporter.provideWith(ids)
+                ])
+                .get(MultiReporter);
+    return Promise.resolve(r);
+  }
+
+  describe('multi reporter', () => {
+
+    it('should reportMeasureValues to all',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var mv = new MeasureValues(0, DateWrapper.now(), {});
+         createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
+
+           expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
+           async.done();
+         });
+       }));
+
+    it('should reportSample to call', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var completeSample = [
+           new MeasureValues(0, DateWrapper.now(), {}), new MeasureValues(1, DateWrapper.now(), {})
+         ];
+         var validSample = [completeSample[1]];
+
+         createReporters(['m1', 'm2'])
+             .then((r) => r.reportSample(completeSample, validSample))
+             .then((values) => {
+
+               expect(values).toEqual([
+                 {'id': 'm1', 'completeSample': completeSample, 'validSample': validSample},
+                 {'id': 'm2', 'completeSample': completeSample, 'validSample': validSample}
+               ]);
+               async.done();
+             });
+       }));
+
+  });
+}
+
+class MockReporter extends Reporter {
+  constructor(private _id: string) { super(); }
+
+  reportMeasureValues(values: MeasureValues): Promise<{[key: string]: any}> {
+    return Promise.resolve({'id': this._id, 'values': values});
+  }
+
+  reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]):
+      Promise<{[key: string]: any}> {
+    return Promise.resolve(
+        {'id': this._id, 'completeSample': completeSample, 'validSample': validSample});
+  }
+}

modules/@angular/benchpress/test/runner_spec.ts

@@ -0,0 +1,141 @@
+/**
+ * @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, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
+import {isBlank} from '../src/facade/lang';
+
+export function main() {
+  describe('runner', () => {
+    var injector: ReflectiveInjector;
+    var runner: Runner;
+
+    function createRunner(defaultProviders: any[] = null): Runner {
+      if (isBlank(defaultProviders)) {
+        defaultProviders = [];
+      }
+      runner = new Runner([
+        defaultProviders, {
+          provide: Sampler,
+          useFactory: (_injector: ReflectiveInjector) => {
+            injector = _injector;
+            return new MockSampler();
+          },
+          deps: [Injector]
+        },
+        {provide: Metric, useFactory: () => new MockMetric(), deps: []},
+        {provide: Validator, useFactory: () => new MockValidator(), deps: []},
+        {provide: WebDriverAdapter, useFactory: () => new MockWebDriverAdapter(), deps: []}
+      ]);
+      return runner;
+    }
+
+    it('should set SampleDescription.id',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createRunner()
+             .sample({id: 'someId'})
+             .then((_) => injector.get(SampleDescription))
+             .then((desc) => {
+               expect(desc.id).toBe('someId');
+               async.done();
+             });
+       }));
+
+    it('should merge SampleDescription.description',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createRunner([{provide: Options.DEFAULT_DESCRIPTION, useValue: {'a': 1}}])
+             .sample({
+               id: 'someId',
+               providers: [{provide: Options.SAMPLE_DESCRIPTION, useValue: {'b': 2}}]
+             })
+             .then((_) => injector.get(SampleDescription))
+             .then((desc) => {
+               expect(desc.description)
+                   .toEqual(
+                       {'forceGc': false, 'userAgent': 'someUserAgent', 'a': 1, 'b': 2, 'v': 11});
+               async.done();
+             });
+       }));
+
+    it('should fill SampleDescription.metrics from the Metric',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createRunner()
+             .sample({id: 'someId'})
+             .then((_) => injector.get(SampleDescription))
+             .then((desc) => {
+
+               expect(desc.metrics).toEqual({'m1': 'some metric'});
+               async.done();
+             });
+       }));
+
+    it('should provide Options.EXECUTE',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var execute = () => {};
+         createRunner().sample({id: 'someId', execute: execute}).then((_) => {
+           expect(injector.get(Options.EXECUTE)).toEqual(execute);
+           async.done();
+         });
+       }));
+
+    it('should provide Options.PREPARE',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var prepare = () => {};
+         createRunner().sample({id: 'someId', prepare: prepare}).then((_) => {
+           expect(injector.get(Options.PREPARE)).toEqual(prepare);
+           async.done();
+         });
+       }));
+
+    it('should provide Options.MICRO_METRICS',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createRunner().sample({id: 'someId', microMetrics: {'a': 'b'}}).then((_) => {
+           expect(injector.get(Options.MICRO_METRICS)).toEqual({'a': 'b'});
+           async.done();
+         });
+       }));
+
+    it('should overwrite providers per sample call',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createRunner([{provide: Options.DEFAULT_DESCRIPTION, useValue: {'a': 1}}])
+             .sample({
+               id: 'someId',
+               providers: [{provide: Options.DEFAULT_DESCRIPTION, useValue: {'a': 2}}]
+             })
+             .then((_) => injector.get(SampleDescription))
+             .then((desc) => {
+
+               expect(desc.description['a']).toBe(2);
+               async.done();
+             });
+
+       }));
+
+  });
+}
+
+class MockWebDriverAdapter extends WebDriverAdapter {
+  executeScript(script: string): Promise<string> { return Promise.resolve('someUserAgent'); }
+  capabilities(): Promise<Map<string, any>> { return null; }
+}
+
+class MockValidator extends Validator {
+  constructor() { super(); }
+  describe() { return {'v': 11}; }
+}
+
+class MockMetric extends Metric {
+  constructor() { super(); }
+  describe() { return {'m1': 'some metric'}; }
+}
+
+class MockSampler extends Sampler {
+  constructor() { super(null, null, null, null, null, null, null); }
+  sample(): Promise<SampleState> { return Promise.resolve(new SampleState([], [])); }
+}

modules/@angular/benchpress/test/sampler_spec.ts

@@ -1,29 +1,15 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+/**
+ * @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 {isBlank, isPresent, stringify, Date, DateWrapper} from '@angular/facade';
-import {PromiseWrapper} from '@angular/facade';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
-import {
-  Sampler,
-  WebDriverAdapter,
-  Validator,
-  Metric,
-  Reporter,
-  ReflectiveInjector,
-  Options,
-  MeasureValues
-} from 'benchpress/common';
+import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
+import {Date, DateWrapper, isBlank, isPresent, stringify} from '../src/facade/lang';
 
 export function main() {
   var EMPTY_EXECUTE = () => {};
@@ -50,13 +36,9 @@ export function main() {
         driver = new MockDriverAdapter([]);
       }
       var providers = [
-        Options.DEFAULT_PROVIDERS,
-        Sampler.PROVIDERS,
-        {provide: Metric, useValue: metric},
-        {provide: Reporter, useValue: reporter},
-        {provide: WebDriverAdapter, useValue: driver},
-        {provide: Options.EXECUTE, useValue: execute},
-        {provide: Validator, useValue: validator},
+        Options.DEFAULT_PROVIDERS, Sampler.PROVIDERS, {provide: Metric, useValue: metric},
+        {provide: Reporter, useValue: reporter}, {provide: WebDriverAdapter, useValue: driver},
+        {provide: Options.EXECUTE, useValue: execute}, {provide: Validator, useValue: validator},
         {provide: Options.NOW, useValue: () => DateWrapper.fromMillis(time++)}
       ];
       if (isPresent(prepare)) {
@@ -67,13 +49,13 @@ export function main() {
     }
 
     it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor',
-       inject([AsyncTestCompleter], (async) => {
-         var log = [];
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var log: any[] = [];
          var count = 0;
-         var driver = new MockDriverAdapter([], (callback) => {
+         var driver = new MockDriverAdapter([], (callback: Function) => {
            var result = callback();
            log.push(result);
-           return PromiseWrapper.resolve(result);
+           return Promise.resolve(result);
          });
          createSampler({
            driver: driver,
@@ -90,9 +72,9 @@ export function main() {
        }));
 
     it('should call prepare, beginMeasure, execute, endMeasure for every iteration',
-       inject([AsyncTestCompleter], (async) => {
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
          var workCount = 0;
-         var log = [];
+         var log: any[] = [];
          createSampler({
            metric: createCountingMetric(log),
            validator: createCountingValidator(2),
@@ -115,8 +97,8 @@ export function main() {
        }));
 
     it('should call execute, endMeasure for every iteration if there is no prepare callback',
-       inject([AsyncTestCompleter], (async) => {
-         var log = [];
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var log: any[] = [];
          var workCount = 0;
          createSampler({
            metric: createCountingMetric(log),
@@ -137,17 +119,18 @@ export function main() {
        }));
 
     it('should only collect metrics for execute and ignore metrics from prepare',
-       inject([AsyncTestCompleter], (async) => {
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
          var scriptTime = 0;
          var iterationCount = 1;
          createSampler({
            validator: createCountingValidator(2),
-           metric: new MockMetric([],
-                                  () => {
-                                    var result = PromiseWrapper.resolve({'script': scriptTime});
-                                    scriptTime = 0;
-                                    return result;
-                                  }),
+           metric: new MockMetric(
+               [],
+               () => {
+                 var result = Promise.resolve({'script': scriptTime});
+                 scriptTime = 0;
+                 return result;
+               }),
            prepare: () => { scriptTime = 1 * iterationCount; },
            execute: () => {
              scriptTime = 10 * iterationCount;
@@ -163,9 +146,9 @@ export function main() {
        }));
 
     it('should call the validator for every execution and store the valid sample',
-       inject([AsyncTestCompleter], (async) => {
-         var log = [];
-         var validSample = [{}];
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var log: any[] = [];
+         var validSample = [mv(null, null, {})];
 
          createSampler({
            metric: createCountingMetric(),
@@ -189,9 +172,10 @@ export function main() {
          });
        }));
 
-    it('should report the metric values', inject([AsyncTestCompleter], (async) => {
-         var log = [];
-         var validSample = [{}];
+    it('should report the metric values',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         var log: any[] = [];
+         var validSample = [mv(null, null, {})];
          createSampler({
            validator: createCountingValidator(2, validSample),
            metric: createCountingMetric(),
@@ -209,9 +193,7 @@ export function main() {
            expect(log[0]).toEqual(['reportMeasureValues', mv(0, 1000, {'script': 0})]);
            expect(log[1]).toEqual(['reportMeasureValues', mv(1, 1001, {'script': 1})]);
            expect(log[2]).toEqual([
-             'reportSample',
-             [mv(0, 1000, {'script': 0}), mv(1, 1001, {'script': 1})],
-             validSample
+             'reportSample', [mv(0, 1000, {'script': 0}), mv(1, 1001, {'script': 1})], validSample
            ]);
 
            async.done();
@@ -221,12 +203,13 @@ export function main() {
   });
 }
 
-function mv(runIndex, time, values) {
+function mv(runIndex: number, time: number, values: {[key: string]: number}) {
   return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }
 
-function createCountingValidator(count, validSample = null, log = null) {
-  return new MockValidator(log, (completeSample) => {
+function createCountingValidator(
+    count: number, validSample: MeasureValues[] = null, log: any[] = []) {
+  return new MockValidator(log, (completeSample: MeasureValues[]) => {
     count--;
     if (count === 0) {
       return isPresent(validSample) ? validSample : completeSample;
@@ -236,41 +219,25 @@ function createCountingValidator(count, validSample = null, log = null) {
   });
 }
 
-function createCountingMetric(log = null) {
+function createCountingMetric(log: any[] = []) {
   var scriptTime = 0;
   return new MockMetric(log, () => { return {'script': scriptTime++}; });
 }
 
 class MockDriverAdapter extends WebDriverAdapter {
-  private _log: any[];
-  private _waitFor: Function;
-  constructor(log = null, waitFor = null) {
-    super();
-    if (isBlank(log)) {
-      log = [];
-    }
-    this._log = log;
-    this._waitFor = waitFor;
-  }
+  constructor(private _log: any[] = [], private _waitFor: Function = null) { super(); }
   waitFor(callback: Function): Promise<any> {
     if (isPresent(this._waitFor)) {
       return this._waitFor(callback);
     } else {
-      return PromiseWrapper.resolve(callback());
+      return Promise.resolve(callback());
     }
   }
 }
 
 
 class MockValidator extends Validator {
-  private _log: any[];
-  constructor(log = null, private _validate: Function = null) {
-    super();
-    if (isBlank(log)) {
-      log = [];
-    }
-    this._log = log;
-  }
+  constructor(private _log: any[] = [], private _validate: Function = null) { super(); }
   validate(completeSample: MeasureValues[]): MeasureValues[] {
     var stableSample = isPresent(this._validate) ? this._validate(completeSample) : completeSample;
     this._log.push(['validate', completeSample, stableSample]);
@@ -279,40 +246,26 @@ class MockValidator extends Validator {
 }
 
 class MockMetric extends Metric {
-  private _log: any[];
-  constructor(log = null, private _endMeasure: Function = null) {
-    super();
-    if (isBlank(log)) {
-      log = [];
-    }
-    this._log = log;
-  }
+  constructor(private _log: any[] = [], private _endMeasure: Function = null) { super(); }
   beginMeasure() {
     this._log.push(['beginMeasure']);
-    return PromiseWrapper.resolve(null);
+    return Promise.resolve(null);
   }
-  endMeasure(restart) {
+  endMeasure(restart: boolean) {
     var measureValues = isPresent(this._endMeasure) ? this._endMeasure() : {};
     this._log.push(['endMeasure', restart, measureValues]);
-    return PromiseWrapper.resolve(measureValues);
+    return Promise.resolve(measureValues);
   }
 }
 
 class MockReporter extends Reporter {
-  _log: any[];
-  constructor(log = null) {
-    super();
-    if (isBlank(log)) {
-      log = [];
-    }
-    this._log = log;
-  }
-  reportMeasureValues(values): Promise<any> {
+  constructor(private _log: any[] = []) { super(); }
+  reportMeasureValues(values: MeasureValues): Promise<any> {
     this._log.push(['reportMeasureValues', values]);
-    return PromiseWrapper.resolve(null);
+    return Promise.resolve(null);
   }
-  reportSample(completeSample, validSample): Promise<any> {
+  reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
     this._log.push(['reportSample', completeSample, validSample]);
-    return PromiseWrapper.resolve(null);
+    return Promise.resolve(null);
   }
 }

modules/@angular/benchpress/test/statistic_spec.ts

@@ -1,17 +1,13 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
+/**
+ * @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 {Statistic} from 'benchpress/src/statistic';
-
-import {NaN} from '@angular/facade';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+import {Statistic} from '../src/statistic';
 
 export function main() {
   describe('statistic', () => {

modules/@angular/benchpress/test/trace_event_factory.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 {PerfLogEvent} from '../index';
+import {isPresent} from '../src/facade/lang';
+
+export class TraceEventFactory {
+  constructor(private _cat: string, private _pid: string) {}
+
+  create(ph: any, name: string, time: number, args: any = null) {
+    var res:
+        PerfLogEvent = {'name': name, 'cat': this._cat, 'ph': ph, 'ts': time, 'pid': this._pid};
+    if (isPresent(args)) {
+      res['args'] = args;
+    }
+    return res;
+  }
+
+  markStart(name: string, time: number) { return this.create('b', name, time); }
+
+  markEnd(name: string, time: number) { return this.create('e', name, time); }
+
+  start(name: string, time: number, args: any = null) { return this.create('B', name, time, args); }
+
+  end(name: string, time: number, args: any = null) { return this.create('E', name, time, args); }
+
+  instant(name: string, time: number, args: any = null) {
+    return this.create('i', name, time, args);
+  }
+
+  complete(name: string, time: number, duration: number, args: any = null) {
+    var res = this.create('X', name, time, args);
+    res['dur'] = duration;
+    return res;
+  }
+}

modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts

@@ -1,32 +1,28 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
-import {Date, DateWrapper} from '@angular/facade';
-import {ListWrapper} from '@angular/facade';
+/**
+ * @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 {
-  RegressionSlopeValidator,
-  ReflectiveInjector,
-  MeasureValues
-} from 'benchpress/common';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
+import {ListWrapper} from '../../src/facade/collection';
+import {Date, DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('regression slope validator', () => {
-    var validator;
+    var validator: RegressionSlopeValidator;
 
-    function createValidator({size, metric}) {
-      validator = ReflectiveInjector.resolveAndCreate([
-                                      RegressionSlopeValidator.PROVIDERS,
-                                      {provide: RegressionSlopeValidator.METRIC, useValue(metric)},
-                                      {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue(size)}
-                                    ])
+    function createValidator({size, metric}: {size: number, metric: string}) {
+      validator = ReflectiveInjector
+                      .resolveAndCreate([
+                        RegressionSlopeValidator.PROVIDERS,
+                        {provide: RegressionSlopeValidator.METRIC, useValue: metric},
+                        {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}
+                      ])
                       .get(RegressionSlopeValidator);
     }
 
@@ -65,6 +61,6 @@ export function main() {
   });
 }
 
-function mv(runIndex, time, values) {
+function mv(runIndex: number, time: number, values: {[key: string]: number}) {
   return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }

modules/@angular/benchpress/test/validator/size_validator_spec.ts

@@ -1,33 +1,27 @@
-import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  xit,
-  expect,
-  beforeEach,
-  afterEach
-} from '@angular/testing/testing_internal';
-import {Date, DateWrapper} from '@angular/facade';
-import {ListWrapper} from '@angular/facade';
+/**
+ * @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 {
-  Validator,
-  SizeValidator,
-  ReflectiveInjector,
-  MeasureValues
-} from 'benchpress/common';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {MeasureValues, ReflectiveInjector, SizeValidator, Validator} from '../../index';
+import {ListWrapper} from '../../src/facade/collection';
+import {Date, DateWrapper} from '../../src/facade/lang';
 
 export function main() {
   describe('size validator', () => {
-    var validator;
+    var validator: SizeValidator;
 
-    function createValidator(size) {
-      validator = ReflectiveInjector.resolveAndCreate([
-                                      SizeValidator.PROVIDERS,
-                                      {provide: SizeValidator.SAMPLE_SIZE, useValue: size}
-                                    ])
-                      .get(SizeValidator);
+    function createValidator(size: number) {
+      validator =
+          ReflectiveInjector
+              .resolveAndCreate(
+                  [SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}])
+              .get(SizeValidator);
     }
 
     it('should return sampleSize as description', () => {
@@ -52,6 +46,6 @@ export function main() {
   });
 }
 
-function mv(runIndex, time, values) {
+function mv(runIndex: number, time: number, values: {[key: string]: number}) {
   return new MeasureValues(runIndex, DateWrapper.fromMillis(time), values);
 }

modules/@angular/benchpress/test/web_driver_extension_spec.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 {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {Options, ReflectiveInjector, WebDriverExtension} from '../index';
+import {StringWrapper, isPresent} from '../src/facade/lang';
+
+export function main() {
+  function createExtension(ids: any[], caps: any) {
+    return new Promise<any>((res, rej) => {
+      try {
+        res(ReflectiveInjector
+                .resolveAndCreate([
+                  ids.map((id) => { return {provide: id, useValue: new MockExtension(id)}; }),
+                  {provide: Options.CAPABILITIES, useValue: caps},
+                  WebDriverExtension.provideFirstSupported(ids)
+                ])
+                .get(WebDriverExtension));
+      } catch (e) {
+        rej(e);
+      }
+    });
+  }
+
+  describe('WebDriverExtension.provideFirstSupported', () => {
+
+    it('should provide the extension that matches the capabilities',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension(['m1', 'm2', 'm3'], {'browser': 'm2'}).then((m) => {
+           expect(m.id).toEqual('m2');
+           async.done();
+         });
+       }));
+
+    it('should throw if there is no match',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension(['m1'], {'browser': 'm2'}).catch((err) => {
+           expect(isPresent(err)).toBe(true);
+           async.done();
+         });
+       }));
+  });
+}
+
+class MockExtension extends WebDriverExtension {
+  constructor(public id: string) { super(); }
+
+  supports(capabilities: {[key: string]: any}): boolean {
+    return StringWrapper.equals(capabilities['browser'], this.id);
+  }
+}

modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts

@@ -1,27 +1,15 @@
-import {
-  afterEach,
-  AsyncTestCompleter,
-  beforeEach,
-  ddescribe,
-  describe,
-  expect,
-  iit,
-  inject,
-  it,
-  xit,
-} from '@angular/testing/testing_internal';
+/**
+ * @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 {PromiseWrapper} from '@angular/facade';
-import {Json, isBlank} from '@angular/facade';
-
-import {
-  WebDriverExtension,
-  ChromeDriverExtension,
-  WebDriverAdapter,
-  ReflectiveInjector,
-  Options
-} from 'benchpress/common';
+import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 
+import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
+import {Json, isBlank} from '../../src/facade/lang';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -31,8 +19,8 @@ export function main() {
     var CHROME45_USER_AGENT =
         '"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2499.0 Safari/537.36"';
 
-    var log;
-    var extension;
+    var log: any[];
+    var extension: ChromeDriverExtension;
 
     var blinkEvents = new TraceEventFactory('blink.console', 'pid0');
     var v8Events = new TraceEventFactory('v8', 'pid0');
@@ -46,8 +34,9 @@ export function main() {
     var benchmarkEvents = new TraceEventFactory('benchmark', 'pid0');
     var normEvents = new TraceEventFactory('timeline', 'pid0');
 
-    function createExtension(perfRecords = null, userAgent = null,
-                             messageMethod = 'Tracing.dataCollected'): WebDriverExtension {
+    function createExtension(
+        perfRecords: any[] = null, userAgent: string = null,
+        messageMethod = 'Tracing.dataCollected'): WebDriverExtension {
       if (isBlank(perfRecords)) {
         perfRecords = [];
       }
@@ -55,55 +44,54 @@ export function main() {
         userAgent = CHROME44_USER_AGENT;
       }
       log = [];
-      extension =
-          ReflectiveInjector.resolveAndCreate([
-                              ChromeDriverExtension.PROVIDERS,
-                              {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords, messageMethod)},
-                              {provide: Options.USER_AGENT, useValue(userAgent)}
-                            ])
-              .get(ChromeDriverExtension);
+      extension = ReflectiveInjector
+                      .resolveAndCreate([
+                        ChromeDriverExtension.PROVIDERS, {
+                          provide: WebDriverAdapter,
+                          useValue: new MockDriverAdapter(log, perfRecords, messageMethod)
+                        },
+                        {provide: Options.USER_AGENT, useValue: userAgent}
+                      ])
+                      .get(ChromeDriverExtension);
       return extension;
     }
 
-    it('should force gc via window.gc()', inject([AsyncTestCompleter], (async) => {
+    it('should force gc via window.gc()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
          createExtension().gc().then((_) => {
            expect(log).toEqual([['executeScript', 'window.gc()']]);
            async.done();
          });
        }));
 
-    it('should mark the timeline via console.time()', inject([AsyncTestCompleter], (async) => {
-         createExtension()
-             .timeBegin('someName')
-             .then((_) => {
-               expect(log).toEqual([['executeScript', `console.time('someName');`]]);
-               async.done();
-             });
+    it('should mark the timeline via console.time()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeBegin('someName').then((_) => {
+           expect(log).toEqual([['executeScript', `console.time('someName');`]]);
+           async.done();
+         });
        }));
 
-    it('should mark the timeline via console.timeEnd()', inject([AsyncTestCompleter], (async) => {
-         createExtension()
-             .timeEnd('someName', null)
-             .then((_) => {
-               expect(log).toEqual([['executeScript', `console.timeEnd('someName');`]]);
-               async.done();
-             });
+    it('should mark the timeline via console.timeEnd()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeEnd('someName', null).then((_) => {
+           expect(log).toEqual([['executeScript', `console.timeEnd('someName');`]]);
+           async.done();
+         });
        }));
 
     it('should mark the timeline via console.time() and console.timeEnd()',
-       inject([AsyncTestCompleter], (async) => {
-         createExtension()
-             .timeEnd('name1', 'name2')
-             .then((_) => {
-               expect(log)
-                   .toEqual([['executeScript', `console.timeEnd('name1');console.time('name2');`]]);
-               async.done();
-             });
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeEnd('name1', 'name2').then((_) => {
+           expect(log).toEqual(
+               [['executeScript', `console.timeEnd('name1');console.time('name2');`]]);
+           async.done();
+         });
        }));
 
     describe('readPerfLog Chrome44', () => {
       it('should normalize times to ms and forward ph and pid event properties',
-         inject([AsyncTestCompleter], (async) => {
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([chromeTimelineEvents.complete('FunctionCall', 1100, 5500, null)])
                .readPerfLog()
                .then((events) => {
@@ -114,8 +102,9 @@ export function main() {
                });
          }));
 
-      it('should normalize "tdur" to "dur"', inject([AsyncTestCompleter], (async) => {
-           var event = chromeTimelineEvents.create('X', 'FunctionCall', 1100, null);
+      it('should normalize "tdur" to "dur"',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var event: any = chromeTimelineEvents.create('X', 'FunctionCall', 1100, null);
            event['tdur'] = 5500;
            createExtension([event]).readPerfLog().then((events) => {
              expect(events).toEqual([
@@ -125,7 +114,8 @@ export function main() {
            });
          }));
 
-      it('should report FunctionCall events as "script"', inject([AsyncTestCompleter], (async) => {
+      it('should report FunctionCall events as "script"',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([chromeTimelineEvents.start('FunctionCall', 0)])
                .readPerfLog()
                .then((events) => {
@@ -136,7 +126,7 @@ export function main() {
                });
          }));
 
-      it('should report gc', inject([AsyncTestCompleter], (async) => {
+      it('should report gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([
              chromeTimelineEvents.start('GCEvent', 1000, {'usedHeapSizeBefore': 1000}),
              chromeTimelineEvents.end('GCEvent', 2000, {'usedHeapSizeAfter': 0}),
@@ -152,7 +142,7 @@ export function main() {
          }));
 
       it('should ignore major gc from different processes',
-         inject([AsyncTestCompleter], (async) => {
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([
              chromeTimelineEvents.start('GCEvent', 1000, {'usedHeapSizeBefore': 1000}),
              v8EventsOtherProcess.start('majorGC', 1100, null),
@@ -169,7 +159,7 @@ export function main() {
                });
          }));
 
-      it('should report major gc', inject([AsyncTestCompleter], (async) => {
+      it('should report major gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([
              chromeTimelineEvents.start('GCEvent', 1000, {'usedHeapSizeBefore': 1000}),
              v8Events.start('majorGC', 1100, null),
@@ -187,7 +177,8 @@ export function main() {
          }));
 
       ['RecalculateStyles', 'Layout', 'UpdateLayerTree', 'Paint'].forEach((recordType) => {
-        it(`should report ${recordType} as "render"`, inject([AsyncTestCompleter], (async) => {
+        it(`should report ${recordType} as "render"`,
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
              createExtension([
                chromeTimelineEvents.start(recordType, 1234),
                chromeTimelineEvents.end(recordType, 2345)
@@ -203,11 +194,10 @@ export function main() {
            }));
       });
 
-      it('should ignore FunctionCalls from webdriver', inject([AsyncTestCompleter], (async) => {
-           createExtension([
-             chromeTimelineEvents.start('FunctionCall', 0,
-                                        {'data': {'scriptName': 'InjectedScript'}})
-           ])
+      it('should ignore FunctionCalls from webdriver',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([chromeTimelineEvents.start(
+                               'FunctionCall', 0, {'data': {'scriptName': 'InjectedScript'}})])
                .readPerfLog()
                .then((events) => {
                  expect(events).toEqual([]);
@@ -220,9 +210,10 @@ export function main() {
 
     describe('readPerfLog Chrome45', () => {
       it('should normalize times to ms and forward ph and pid event properties',
-         inject([AsyncTestCompleter], (async) => {
-           createExtension([chromeTimelineV8Events.complete('FunctionCall', 1100, 5500, null)],
-                           CHROME45_USER_AGENT)
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension(
+               [chromeTimelineV8Events.complete('FunctionCall', 1100, 5500, null)],
+               CHROME45_USER_AGENT)
                .readPerfLog()
                .then((events) => {
                  expect(events).toEqual([
@@ -232,20 +223,20 @@ export function main() {
                });
          }));
 
-      it('should normalize "tdur" to "dur"', inject([AsyncTestCompleter], (async) => {
-           var event = chromeTimelineV8Events.create('X', 'FunctionCall', 1100, null);
+      it('should normalize "tdur" to "dur"',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           var event: any = chromeTimelineV8Events.create('X', 'FunctionCall', 1100, null);
            event['tdur'] = 5500;
-           createExtension([event], CHROME45_USER_AGENT)
-               .readPerfLog()
-               .then((events) => {
-                 expect(events).toEqual([
-                   normEvents.complete('script', 1.1, 5.5, null),
-                 ]);
-                 async.done();
-               });
+           createExtension([event], CHROME45_USER_AGENT).readPerfLog().then((events) => {
+             expect(events).toEqual([
+               normEvents.complete('script', 1.1, 5.5, null),
+             ]);
+             async.done();
+           });
          }));
 
-      it('should report FunctionCall events as "script"', inject([AsyncTestCompleter], (async) => {
+      it('should report FunctionCall events as "script"',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([chromeTimelineV8Events.start('FunctionCall', 0)], CHROME45_USER_AGENT)
                .readPerfLog()
                .then((events) => {
@@ -256,7 +247,7 @@ export function main() {
                });
          }));
 
-      it('should report minor gc', inject([AsyncTestCompleter], (async) => {
+      it('should report minor gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
                [
                  chromeTimelineV8Events.start('MinorGC', 1000, {'usedHeapSizeBefore': 1000}),
@@ -268,13 +259,13 @@ export function main() {
                  expect(events.length).toEqual(2);
                  expect(events[0]).toEqual(
                      normEvents.start('gc', 1.0, {'usedHeapSize': 1000, 'majorGc': false}));
-                 expect(events[1])
-                     .toEqual(normEvents.end('gc', 2.0, {'usedHeapSize': 0, 'majorGc': false}));
+                 expect(events[1]).toEqual(
+                     normEvents.end('gc', 2.0, {'usedHeapSize': 0, 'majorGc': false}));
                  async.done();
                });
          }));
 
-      it('should report major gc', inject([AsyncTestCompleter], (async) => {
+      it('should report major gc', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
                [
                  chromeTimelineV8Events.start('MajorGC', 1000, {'usedHeapSizeBefore': 1000}),
@@ -284,16 +275,17 @@ export function main() {
                .readPerfLog()
                .then((events) => {
                  expect(events.length).toEqual(2);
-                 expect(events[0])
-                     .toEqual(normEvents.start('gc', 1.0, {'usedHeapSize': 1000, 'majorGc': true}));
-                 expect(events[1])
-                     .toEqual(normEvents.end('gc', 2.0, {'usedHeapSize': 0, 'majorGc': true}));
+                 expect(events[0]).toEqual(
+                     normEvents.start('gc', 1.0, {'usedHeapSize': 1000, 'majorGc': true}));
+                 expect(events[1]).toEqual(
+                     normEvents.end('gc', 2.0, {'usedHeapSize': 0, 'majorGc': true}));
                  async.done();
                });
          }));
 
       ['Layout', 'UpdateLayerTree', 'Paint'].forEach((recordType) => {
-        it(`should report ${recordType} as "render"`, inject([AsyncTestCompleter], (async) => {
+        it(`should report ${recordType} as "render"`,
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
              createExtension(
                  [
                    chrome45TimelineEvents.start(recordType, 1234),
@@ -311,7 +303,8 @@ export function main() {
            }));
       });
 
-      it(`should report UpdateLayoutTree as "render"`, inject([AsyncTestCompleter], (async) => {
+      it(`should report UpdateLayoutTree as "render"`,
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
                [
                  chromeBlinkTimelineEvents.start('UpdateLayoutTree', 1234),
@@ -330,11 +323,10 @@ export function main() {
 
 
 
-      it('should ignore FunctionCalls from webdriver', inject([AsyncTestCompleter], (async) => {
-           createExtension([
-             chromeTimelineV8Events.start('FunctionCall', 0,
-                                          {'data': {'scriptName': 'InjectedScript'}})
-           ])
+      it('should ignore FunctionCalls from webdriver',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([chromeTimelineV8Events.start(
+                               'FunctionCall', 0, {'data': {'scriptName': 'InjectedScript'}})])
                .readPerfLog()
                .then((events) => {
                  expect(events).toEqual([]);
@@ -343,7 +335,7 @@ export function main() {
          }));
 
       it('should ignore FunctionCalls with empty scriptName',
-         inject([AsyncTestCompleter], (async) => {
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
                [chromeTimelineV8Events.start('FunctionCall', 0, {'data': {'scriptName': ''}})])
                .readPerfLog()
@@ -353,9 +345,10 @@ export function main() {
                });
          }));
 
-      it('should report navigationStart', inject([AsyncTestCompleter], (async) => {
-           createExtension([chromeBlinkUserTimingEvents.start('navigationStart', 1234)],
-                           CHROME45_USER_AGENT)
+      it('should report navigationStart',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension(
+               [chromeBlinkUserTimingEvents.start('navigationStart', 1234)], CHROME45_USER_AGENT)
                .readPerfLog()
                .then((events) => {
                  expect(events).toEqual([normEvents.start('navigationStart', 1.234)]);
@@ -363,12 +356,10 @@ export function main() {
                });
          }));
 
-      it('should report receivedData', inject([AsyncTestCompleter], (async) => {
+      it('should report receivedData', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
-               [
-                 chrome45TimelineEvents.instant('ResourceReceivedData', 1234,
-                                                {'data': {'encodedDataLength': 987}})
-               ],
+               [chrome45TimelineEvents.instant(
+                   'ResourceReceivedData', 1234, {'data': {'encodedDataLength': 987}})],
                CHROME45_USER_AGENT)
                .readPerfLog()
                .then((events) => {
@@ -378,20 +369,16 @@ export function main() {
                });
          }));
 
-      it('should report sendRequest', inject([AsyncTestCompleter], (async) => {
+      it('should report sendRequest', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension(
-               [
-                 chrome45TimelineEvents.instant(
-                     'ResourceSendRequest', 1234,
-                     {'data': {'url': 'http://here', 'requestMethod': 'GET'}})
-               ],
+               [chrome45TimelineEvents.instant(
+                   'ResourceSendRequest', 1234,
+                   {'data': {'url': 'http://here', 'requestMethod': 'GET'}})],
                CHROME45_USER_AGENT)
                .readPerfLog()
                .then((events) => {
-                 expect(events).toEqual([
-                   normEvents.instant('sendRequest', 1.234,
-                                      {'url': 'http://here', 'method': 'GET'})
-                 ]);
+                 expect(events).toEqual([normEvents.instant(
+                     'sendRequest', 1.234, {'url': 'http://here', 'method': 'GET'})]);
                  async.done();
                });
          }));
@@ -400,7 +387,7 @@ export function main() {
     describe('readPerfLog (common)', () => {
 
       it('should execute a dummy script before reading them',
-         inject([AsyncTestCompleter], (async) => {
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            // TODO(tbosch): This seems to be a bug in ChromeDriver:
            // Sometimes it does not report the newest events of the performance log
            // to the WebDriver client unless a script is executed...
@@ -411,7 +398,8 @@ export function main() {
          }));
 
       ['Rasterize', 'CompositeLayers'].forEach((recordType) => {
-        it(`should report ${recordType} as "render"`, inject([AsyncTestCompleter], (async) => {
+        it(`should report ${recordType} as "render"`,
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
              createExtension(
                  [
                    chromeTimelineEvents.start(recordType, 1234),
@@ -431,11 +419,10 @@ export function main() {
 
       describe('frame metrics', () => {
         it('should report ImplThreadRenderingStats as frame event',
-           inject([AsyncTestCompleter], (async) => {
-             createExtension([
-               benchmarkEvents.instant('BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
-                                       {'data': {'frame_count': 1}})
-             ])
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             createExtension([benchmarkEvents.instant(
+                                 'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
+                                 {'data': {'frame_count': 1}})])
                  .readPerfLog()
                  .then((events) => {
                    expect(events).toEqual([
@@ -446,11 +433,10 @@ export function main() {
            }));
 
         it('should not report ImplThreadRenderingStats with zero frames',
-           inject([AsyncTestCompleter], (async) => {
-             createExtension([
-               benchmarkEvents.instant('BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
-                                       {'data': {'frame_count': 0}})
-             ])
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+             createExtension([benchmarkEvents.instant(
+                                 'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
+                                 {'data': {'frame_count': 0}})])
                  .readPerfLog()
                  .then((events) => {
                    expect(events).toEqual([]);
@@ -459,22 +445,24 @@ export function main() {
            }));
 
         it('should throw when ImplThreadRenderingStats contains more than one frame',
-           inject([AsyncTestCompleter], (async) => {
-             PromiseWrapper.catchError(
-                 createExtension([
-                   benchmarkEvents.instant('BenchmarkInstrumentation::ImplThreadRenderingStats',
-                                           1100, {'data': {'frame_count': 2}})
-                 ]).readPerfLog(),
-                 (err): any => {
-                   expect(() => { throw err; })
-                       .toThrowError('multi-frame render stats not supported');
+           inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+
+             createExtension([benchmarkEvents.instant(
+                                 'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
+                                 {'data': {'frame_count': 2}})])
+                 .readPerfLog()
+                 .catch((err): any => {
+                   expect(() => {
+                     throw err;
+                   }).toThrowError('multi-frame render stats not supported');
                    async.done();
                  });
            }));
 
       });
 
-      it('should report begin timestamps', inject([AsyncTestCompleter], (async) => {
+      it('should report begin timestamps',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([blinkEvents.create('S', 'someName', 1000)])
                .readPerfLog()
                .then((events) => {
@@ -483,7 +471,8 @@ export function main() {
                });
          }));
 
-      it('should report end timestamps', inject([AsyncTestCompleter], (async) => {
+      it('should report end timestamps',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
            createExtension([blinkEvents.create('F', 'someName', 1000)])
                .readPerfLog()
                .then((events) => {
@@ -492,17 +481,19 @@ export function main() {
                });
          }));
 
-      it('should throw an error on buffer overflow', inject([AsyncTestCompleter], (async) => {
-           PromiseWrapper.catchError(
-               createExtension(
-                   [
-                     chromeTimelineEvents.start('FunctionCall', 1234),
-                   ],
-                   CHROME45_USER_AGENT, 'Tracing.bufferUsage')
-                   .readPerfLog(),
-               (err): any => {
-                 expect(() => { throw err; })
-                     .toThrowError('The DevTools trace buffer filled during the test!');
+      it('should throw an error on buffer overflow',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+
+           createExtension(
+               [
+                 chromeTimelineEvents.start('FunctionCall', 1234),
+               ],
+               CHROME45_USER_AGENT, 'Tracing.bufferUsage')
+               .readPerfLog()
+               .catch((err): any => {
+                 expect(() => {
+                   throw err;
+                 }).toThrowError('The DevTools trace buffer filled during the test!');
                  async.done();
                });
          }));
@@ -523,15 +514,15 @@ class MockDriverAdapter extends WebDriverAdapter {
     super();
   }
 
-  executeScript(script) {
+  executeScript(script: string) {
     this._log.push(['executeScript', script]);
-    return PromiseWrapper.resolve(null);
+    return Promise.resolve(null);
   }
 
-  logs(type) {
+  logs(type: string) {
     this._log.push(['logs', type]);
     if (type === 'performance') {
-      return PromiseWrapper.resolve(this._events.map((event) => {
+      return Promise.resolve(this._events.map((event) => {
         return {
           'message': Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
         };

modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts

@@ -0,0 +1,195 @@
+/**
+ * @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, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
+
+import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
+import {Json, isBlank, isPresent} from '../../src/facade/lang';
+import {TraceEventFactory} from '../trace_event_factory';
+
+export function main() {
+  describe('ios driver extension', () => {
+    var log: any[];
+    var extension: IOsDriverExtension;
+
+    var normEvents = new TraceEventFactory('timeline', 'pid0');
+
+    function createExtension(perfRecords: any[] = null): WebDriverExtension {
+      if (isBlank(perfRecords)) {
+        perfRecords = [];
+      }
+      log = [];
+      extension =
+          ReflectiveInjector
+              .resolveAndCreate([
+                IOsDriverExtension.PROVIDERS,
+                {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
+              ])
+              .get(IOsDriverExtension);
+      return extension;
+    }
+
+    it('should throw on forcing gc', () => {
+      expect(() => createExtension().gc()).toThrowError('Force GC is not supported on iOS');
+    });
+
+    it('should mark the timeline via console.time()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeBegin('someName').then((_) => {
+           expect(log).toEqual([['executeScript', `console.time('someName');`]]);
+           async.done();
+         });
+       }));
+
+    it('should mark the timeline via console.timeEnd()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeEnd('someName', null).then((_) => {
+           expect(log).toEqual([['executeScript', `console.timeEnd('someName');`]]);
+           async.done();
+         });
+       }));
+
+    it('should mark the timeline via console.time() and console.timeEnd()',
+       inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+         createExtension().timeEnd('name1', 'name2').then((_) => {
+           expect(log).toEqual(
+               [['executeScript', `console.timeEnd('name1');console.time('name2');`]]);
+           async.done();
+         });
+       }));
+
+    describe('readPerfLog', () => {
+
+      it('should execute a dummy script before reading them',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           // TODO(tbosch): This seems to be a bug in ChromeDriver:
+           // Sometimes it does not report the newest events of the performance log
+           // to the WebDriver client unless a script is executed...
+           createExtension([]).readPerfLog().then((_) => {
+             expect(log).toEqual([['executeScript', '1+1'], ['logs', 'performance']]);
+             async.done();
+           });
+         }));
+
+      it('should report FunctionCall records as "script"',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([durationRecord('FunctionCall', 1, 5)]).readPerfLog().then((events) => {
+             expect(events).toEqual([normEvents.start('script', 1), normEvents.end('script', 5)]);
+             async.done();
+           });
+         }));
+
+      it('should ignore FunctionCalls from webdriver',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([internalScriptRecord(1, 5)]).readPerfLog().then((events) => {
+             expect(events).toEqual([]);
+             async.done();
+           });
+         }));
+
+      it('should report begin time', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([timeBeginRecord('someName', 12)]).readPerfLog().then((events) => {
+             expect(events).toEqual([normEvents.markStart('someName', 12)]);
+             async.done();
+           });
+         }));
+
+      it('should report end timestamps',
+         inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([timeEndRecord('someName', 12)]).readPerfLog().then((events) => {
+             expect(events).toEqual([normEvents.markEnd('someName', 12)]);
+             async.done();
+           });
+         }));
+
+      ['RecalculateStyles', 'Layout', 'UpdateLayerTree', 'Paint', 'Rasterize', 'CompositeLayers']
+          .forEach((recordType) => {
+            it(`should report ${recordType}`,
+               inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+                 createExtension([durationRecord(recordType, 0, 1)])
+                     .readPerfLog()
+                     .then((events) => {
+                       expect(events).toEqual([
+                         normEvents.start('render', 0),
+                         normEvents.end('render', 1),
+                       ]);
+                       async.done();
+                     });
+               }));
+          });
+
+
+      it('should walk children', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
+           createExtension([durationRecord('FunctionCall', 1, 5, [timeBeginRecord('someName', 2)])])
+               .readPerfLog()
+               .then((events) => {
+                 expect(events).toEqual([
+                   normEvents.start('script', 1), normEvents.markStart('someName', 2),
+                   normEvents.end('script', 5)
+                 ]);
+                 async.done();
+               });
+         }));
+
+      it('should match safari browsers', () => {
+        expect(createExtension().supports({'browserName': 'safari'})).toBe(true);
+
+        expect(createExtension().supports({'browserName': 'Safari'})).toBe(true);
+      });
+
+    });
+
+  });
+}
+
+function timeBeginRecord(name: string, time: number) {
+  return {'type': 'Time', 'startTime': time, 'data': {'message': name}};
+}
+
+function timeEndRecord(name: string, time: number) {
+  return {'type': 'TimeEnd', 'startTime': time, 'data': {'message': name}};
+}
+
+function durationRecord(type: string, startTime: number, endTime: number, children: any[] = null) {
+  if (isBlank(children)) {
+    children = [];
+  }
+  return {'type': type, 'startTime': startTime, 'endTime': endTime, 'children': children};
+}
+
+function internalScriptRecord(startTime: number, endTime: number) {
+  return {
+    'type': 'FunctionCall',
+    'startTime': startTime,
+    'endTime': endTime,
+    'data': {'scriptName': 'InjectedScript'}
+  };
+}
+
+class MockDriverAdapter extends WebDriverAdapter {
+  constructor(private _log: any[], private _perfRecords: any[]) { super(); }
+
+  executeScript(script: string) {
+    this._log.push(['executeScript', script]);
+    return Promise.resolve(null);
+  }
+
+  logs(type: string) {
+    this._log.push(['logs', type]);
+    if (type === 'performance') {
+      return Promise.resolve(this._perfRecords.map(function(record) {
+        return {
+          'message': Json.stringify(
+              {'message': {'method': 'Timeline.eventRecorded', 'params': {'record': record}}})
+        };
+      }));
+    } else {
+      return null;
+    }
+  }
+}

modules/@angular/benchpress/tsconfig.json

@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "sourceMap": true,
+        "baseUrl": ".",
+        "paths": {
+          "@angular/core": ["../../../dist/packages-dist/core"]
+        },
+        "experimentalDecorators": true,
+        "rootDir": ".",
+        "sourceRoot": ".",
+        "outDir": "../../../dist/packages-dist/benchpress",
+        "declaration": true,
+        "skipLibCheck": true
+    },
+    "exclude": ["integrationtest"],
+    "files": [
+        "index.ts",
+        "../../../node_modules/@types/node/index.d.ts",
+        "../../../node_modules/@types/jasmine/index.d.ts",
+        "../../../node_modules/zone.js/dist/zone.js.d.ts"
+    ]
+}

modules/@angular/common/common.dart

@@ -1 +0,0 @@
-export 'index.dart';

modules/@angular/common/index.ts

@@ -6,9 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-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';
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the common package.
+ */
+export * from './src/common';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/common/package.json

@@ -2,8 +2,8 @@
   "name": "@angular/common",
   "version": "0.0.0-PLACEHOLDER",
   "description": "",
-  "main": "index.js",
-  "jsnext:main": "esm/index.js",
+  "main": "bundles/common.umd.js",
+  "module": "index.js",
   "typings": "index.d.ts",
   "author": "angular",
   "license": "MIT",

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

@@ -0,0 +1,13 @@
+
+export default {
+  entry: '../../../dist/packages-dist/common/testing/index.js',
+  dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
+  format: 'umd',
+  moduleName: 'ng.common.testing',
+  globals: {
+    '@angular/core': 'ng.core',
+    '@angular/common': 'ng.common',
+    'rxjs/Observable': 'Rx',
+    'rxjs/Subject': 'Rx'
+  }
+}

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

@@ -1,17 +1,12 @@
 
 export default {
-  entry: '../../../dist/packages-dist/common/esm/index.js',
-  dest: '../../../dist/packages-dist/common/esm/common.umd.js',
+  entry: '../../../dist/packages-dist/common/index.js',
+  dest: '../../../dist/packages-dist/common/bundles/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 }),
-  ]
+    'rxjs/Observable': 'Rx',
+    'rxjs/Subject': 'Rx'
+  }
 }

modules/@angular/common/src/common.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 './pipes';
+export * from './directives';
+export * from './location';
+export {NgLocalization} from './localization';
+export {CommonModule} from './common_module';

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

@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '@angular/core';
+import {Provider} from '@angular/core';
 
-import {CORE_DIRECTIVES} from './directives';
-import {FORM_DIRECTIVES} from './forms-deprecated';
+import {CORE_DIRECTIVES} from './directives/core_directives';
 
 
 /**
@@ -25,14 +24,14 @@ import {FORM_DIRECTIVES} from './forms-deprecated';
  * Instead of writing:
  *
  * ```typescript
- * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, NgModel, NgForm} from
+ * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchCase, 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,
+ *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchCase, NgSwitchDefault, NgModel, NgForm,
  * OtherDirective]
  * })
  * export class MyComponent {
@@ -57,4 +56,4 @@ import {FORM_DIRECTIVES} from './forms-deprecated';
  *
  * @experimental Contains forms which are experimental.
  */
-export const COMMON_DIRECTIVES: Type[][] = /*@ts2dart_const*/[CORE_DIRECTIVES, FORM_DIRECTIVES];
+export const COMMON_DIRECTIVES: Provider[] = CORE_DIRECTIVES;

modules/@angular/common/src/common_module.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 './common_directives';
+import {NgLocaleLocalization, NgLocalization} from './localization';
+import {COMMON_PIPES} from './pipes/common_pipes';
+
+// 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}, ...
+ *
+ * @stable
+ */
+@NgModule({
+  declarations: [COMMON_DIRECTIVES, COMMON_PIPES],
+  exports: [COMMON_DIRECTIVES, COMMON_PIPES],
+  providers: [
+    {provide: NgLocalization, useClass: NgLocaleLocalization},
+  ],
+})
+export class CommonModule {
+}

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

@@ -11,7 +11,6 @@
  * @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';

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

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '../facade/lang';
+import {Type} from '@angular/core';
 
 import {NgClass} from './ng_class';
 import {NgFor} from './ng_for';
@@ -16,8 +16,6 @@ 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.
@@ -30,13 +28,13 @@ import {NgTemplateOutlet} from './ng_template_outlet';
  * Instead of writing:
  *
  * ```typescript
- * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from '@angular/common';
+ * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({
  *   selector: 'my-component',
  *   templateUrl: 'myComponent.html',
- *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+ *   directives: [NgClass, NgIf, NgFor, NgSwitch, NgSwitchCase, NgSwitchDefault, OtherDirective]
  * })
  * export class MyComponent {
  *   ...
@@ -60,7 +58,7 @@ import {NgTemplateOutlet} from './ng_template_outlet';
  *
  * @stable
  */
-export const CORE_DIRECTIVES: Type[] = /*@ts2dart_const*/[
+export const CORE_DIRECTIVES: Type<any>[] = [
   NgClass,
   NgFor,
   NgIf,

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

@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CollectionChangeRecord, Directive, DoCheck, ElementRef, IterableDiffer, IterableDiffers, KeyValueChangeRecord, KeyValueDiffer, KeyValueDiffers, OnDestroy, Renderer} from '@angular/core';
+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.
@@ -73,8 +74,8 @@ import {isArray, isPresent, isString} from '../facade/lang';
  *
  * @stable
  */
-@Directive({selector: '[ngClass]', inputs: ['rawClass: ngClass', 'initialClasses: class']})
-export class NgClass implements DoCheck, OnDestroy {
+@Directive({selector: '[ngClass]'})
+export class NgClass implements DoCheck {
   private _iterableDiffer: IterableDiffer;
   private _keyValueDiffer: KeyValueDiffer;
   private _initialClasses: string[] = [];
@@ -84,6 +85,8 @@ export class NgClass implements DoCheck, OnDestroy {
       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(' ') : [];
@@ -91,7 +94,8 @@ export class NgClass implements DoCheck, OnDestroy {
     this._applyClasses(this._rawClass, false);
   }
 
-  set rawClass(v: string|string[]|Set<string>|{[key: string]: any}) {
+  @Input()
+  set ngClass(v: string|string[]|Set<string>|{[key: string]: any}) {
     this._cleanupClasses(this._rawClass);
 
     if (isString(v)) {
@@ -125,8 +129,6 @@ export class NgClass implements DoCheck, OnDestroy {
     }
   }
 
-  ngOnDestroy(): void { this._cleanupClasses(this._rawClass); }
-
   private _cleanupClasses(rawClassVal: string[]|Set<string>|{[key: string]: any}): void {
     this._applyClasses(rawClassVal, true);
     this._applyInitialClasses(false);

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

@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, CollectionChangeRecord, DefaultIterableDiffer, Directive, DoCheck, EmbeddedViewRef, IterableDiffer, IterableDiffers, TemplateRef, TrackByFn, ViewContainerRef} from '@angular/core';
+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 {
@@ -63,11 +62,22 @@ export class NgForRow {
  * elements were deleted and all new elements inserted). This is an expensive operation and should
  * be avoided if possible.
  *
+ * To customize the default tracking algorithm, `NgFor` supports `trackBy` option.
+ * `trackBy` takes a function which has two arguments: `index` and `item`.
+ * If `trackBy` is given, Angular tracks changes by the return value of the function.
+ *
  * ### 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>`
+ * - `<li *ngFor="let item of items; let i = index; trackBy: trackByFn">...</li>`
+ * - `<li template="ngFor let item of items; let i = index; trackBy: trackByFn">...</li>`
+ *
+ * With `<template>` element:
+ *
+ * ```
+ * <template ngFor let-item [ngForOf]="items" let-i="index" [ngForTrackBy]="trackByFn">
+ *   <li>...</li>
+ * </template>
+ * ```
  *
  * ### Example
  *
@@ -76,76 +86,76 @@ export class NgForRow {
  *
  * @stable
  */
-@Directive({selector: '[ngFor][ngForOf]', inputs: ['ngForTrackBy', 'ngForOf', 'ngForTemplate']})
-export class NgFor implements DoCheck {
-  /** @internal */
-  _ngForOf: any;
-  /** @internal */
-  _ngForTrackBy: TrackByFn;
+@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) {}
 
-  set ngForOf(value: any) {
-    this._ngForOf = value;
-    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.`);
-      }
-    }
-  }
-
+  @Input()
   set ngForTemplate(value: TemplateRef<NgForRow>) {
     if (isPresent(value)) {
       this._templateRef = value;
     }
   }
 
-  set ngForTrackBy(value: TrackByFn) { this._ngForTrackBy = 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 Error(
+              `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)) {
-      var changes = this._differ.diff(this._ngForOf);
+      const changes = this._differ.diff(this.ngForOf);
       if (isPresent(changes)) this._applyChanges(changes);
     }
   }
 
   private _applyChanges(changes: DefaultIterableDiffer) {
-    // TODO(rado): check if change detection can produce a change record that is
-    // easier to consume than current.
-    var recordViewTuples: RecordViewTuple[] = [];
-    changes.forEachRemovedItem(
-        (removedRecord: CollectionChangeRecord) =>
-            recordViewTuples.push(new RecordViewTuple(removedRecord, null)));
+    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);
+          }
+        });
 
-    changes.forEachMovedItem(
-        (movedRecord: CollectionChangeRecord) =>
-            recordViewTuples.push(new RecordViewTuple(movedRecord, null)));
-
-    var insertTuples = this._bulkRemove(recordViewTuples);
-
-    changes.forEachAddedItem(
-        (addedRecord: CollectionChangeRecord) =>
-            insertTuples.push(new RecordViewTuple(addedRecord, null)));
-
-    this._bulkInsert(insertTuples);
-
-    for (var i = 0; i < insertTuples.length; i++) {
+    for (let i = 0; i < insertTuples.length; i++) {
       this._perViewChange(insertTuples[i].view, insertTuples[i].record);
     }
 
-    for (var i = 0, ilen = this._viewContainer.length; i < ilen; i++) {
+    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 /** TODO #9100 */) => {
+    changes.forEachIdentityChange((record: any) => {
       var viewRef = <EmbeddedViewRef<NgForRow>>this._viewContainer.get(record.currentIndex);
       viewRef.context.$implicit = record.item;
     });
@@ -154,46 +164,8 @@ export class NgFor implements DoCheck {
   private _perViewChange(view: EmbeddedViewRef<NgForRow>, record: CollectionChangeRecord) {
     view.context.$implicit = record.item;
   }
-
-  private _bulkRemove(tuples: RecordViewTuple[]): RecordViewTuple[] {
-    tuples.sort(
-        (a: RecordViewTuple, b: RecordViewTuple) =>
-            a.record.previousIndex - b.record.previousIndex);
-    var movedTuples: RecordViewTuple[] = [];
-    for (var i = tuples.length - 1; i >= 0; i--) {
-      var tuple = tuples[i];
-      // separate moved views from removed views.
-      if (isPresent(tuple.record.currentIndex)) {
-        tuple.view =
-            <EmbeddedViewRef<NgForRow>>this._viewContainer.detach(tuple.record.previousIndex);
-        movedTuples.push(tuple);
-      } else {
-        this._viewContainer.remove(tuple.record.previousIndex);
-      }
-    }
-    return movedTuples;
-  }
-
-  private _bulkInsert(tuples: RecordViewTuple[]): RecordViewTuple[] {
-    tuples.sort((a, b) => a.record.currentIndex - b.record.currentIndex);
-    for (var i = 0; i < tuples.length; i++) {
-      var tuple = tuples[i];
-      if (isPresent(tuple.view)) {
-        this._viewContainer.insert(tuple.view, tuple.record.currentIndex);
-      } else {
-        tuple.view = this._viewContainer.createEmbeddedView(
-            this._templateRef, new NgForRow(null, null, null), tuple.record.currentIndex);
-      }
-    }
-    return tuples;
-  }
 }
 
 class RecordViewTuple {
-  view: EmbeddedViewRef<NgForRow>;
-  record: any;
-  constructor(record: any, view: EmbeddedViewRef<NgForRow>) {
-    this.record = record;
-    this.view = view;
-  }
+  constructor(public record: any, public view: EmbeddedViewRef<NgForRow>) {}
 }

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

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
+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}.
  *
@@ -35,14 +36,15 @@ import {isBlank} from '../facade/lang';
  *
  * @stable
  */
-@Directive({selector: '[ngIf]', inputs: ['ngIf']})
+@Directive({selector: '[ngIf]'})
 export class NgIf {
   private _prevCondition: boolean = null;
 
   constructor(private _viewContainer: ViewContainerRef, private _templateRef: TemplateRef<Object>) {
   }
 
-  set ngIf(newCondition: any /* boolean */) {
+  @Input()
+  set ngIf(newCondition: any) {
     if (newCondition && (isBlank(this._prevCondition) || !this._prevCondition)) {
       this._prevCondition = true;
       this._viewContainer.createEmbeddedView(this._templateRef);

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

@@ -6,38 +6,33 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AfterContentInit, Attribute, ContentChildren, Directive, Input, QueryList, TemplateRef, ViewContainerRef} from '@angular/core';
+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
+ * To use this directive you must provide 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.
+ * value matches aren't found and the value maps to its category for the defined locale.
  *
  * ```typescript
- * class MyLocalization extends NgLocalization {
- *    getPluralCategory(value: any) {
- *       if(value < 5) {
- *          return 'few';
- *       }
- *    }
- * }
- *
  * @Component({
  *    selector: 'app',
- *    providers: [{provide: NgLocalization, useClass: MyLocalization}]
+ *    // best practice is to define the locale at the application level
+ *    providers: [{provide: LOCALE_ID, useValue: 'en_US'}]
  * })
  * @View({
  *   template: `
@@ -64,27 +59,11 @@ import {SwitchView} from './ng_switch';
  * ```
  * @experimental
  */
-
-@Directive({selector: '[ngPluralCase]'})
-export class NgPluralCase {
-  /** @internal */
-  _view: SwitchView;
-  constructor(
-      @Attribute('ngPluralCase') public value: string, template: TemplateRef<Object>,
-      viewContainer: ViewContainerRef) {
-    this._view = new SwitchView(viewContainer, template);
-  }
-}
-
-/**
- * @experimental
- */
 @Directive({selector: '[ngPlural]'})
-export class NgPlural implements AfterContentInit {
+export class NgPlural {
   private _switchValue: number;
   private _activeView: SwitchView;
   private _caseViews: {[k: string]: SwitchView} = {};
-  @ContentChildren(NgPluralCase) cases: QueryList<NgPluralCase> = null;
 
   constructor(private _localization: NgLocalization) {}
 
@@ -94,19 +73,14 @@ export class NgPlural implements AfterContentInit {
     this._updateView();
   }
 
-  ngAfterContentInit() {
-    this.cases.forEach((pluralCase: NgPluralCase): void => {
-      this._caseViews[pluralCase.value] = pluralCase._view;
-    });
-    this._updateView();
-  }
+  addCase(value: string, switchView: SwitchView): void { this._caseViews[value] = switchView; }
 
   /** @internal */
   _updateView(): void {
     this._clearViews();
 
-    var key = getPluralCategory(
-        this._switchValue, Object.getOwnPropertyNames(this._caseViews), this._localization);
+    var key =
+        getPluralCategory(this._switchValue, Object.keys(this._caseViews), this._localization);
     this._activateView(this._caseViews[key]);
   }
 
@@ -122,3 +96,15 @@ export class NgPlural implements AfterContentInit {
     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

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, DoCheck, ElementRef, KeyValueChangeRecord, KeyValueDiffer, KeyValueDiffers, Renderer} from '@angular/core';
+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.
  *
@@ -20,7 +21,8 @@ import {isBlank, isPresent} from '../facade/lang';
  *
  * ### Syntax
  *
- * - `<div [ngStyle]="{'font-style': style}"></div>`
+ * - `<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)):
@@ -64,26 +66,27 @@ import {isBlank, isPresent} from '../facade/lang';
  *
  * @stable
  */
-@Directive({selector: '[ngStyle]', inputs: ['rawStyle: ngStyle']})
+@Directive({selector: '[ngStyle]'})
 export class NgStyle implements DoCheck {
   /** @internal */
-  _rawStyle: {[key: string]: string};
+  _ngStyle: {[key: string]: string};
   /** @internal */
   _differ: KeyValueDiffer;
 
   constructor(
       private _differs: KeyValueDiffers, private _ngEl: ElementRef, private _renderer: Renderer) {}
 
-  set rawStyle(v: {[key: string]: string}) {
-    this._rawStyle = v;
+  @Input()
+  set ngStyle(v: {[key: string]: string}) {
+    this._ngStyle = v;
     if (isBlank(this._differ) && isPresent(v)) {
-      this._differ = this._differs.find(this._rawStyle).create(null);
+      this._differ = this._differs.find(this._ngStyle).create(null);
     }
   }
 
   ngDoCheck() {
     if (isPresent(this._differ)) {
-      var changes = this._differ.diff(this._rawStyle);
+      var changes = this._differ.diff(this._ngStyle);
       if (isPresent(changes)) {
         this._applyChanges(changes);
       }
@@ -91,15 +94,19 @@ export class NgStyle implements DoCheck {
   }
 
   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); });
-    changes.forEachRemovedItem(
-        (record: KeyValueChangeRecord) => { this._setStyle(record.key, null); });
   }
 
   private _setStyle(name: string, val: string): void {
-    this._renderer.setElementStyle(this._ngEl.nativeElement, name, val);
+    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

@@ -6,15 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Host, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Directive, Host, Input, TemplateRef, ViewContainerRef} from '@angular/core';
 
-import {ListWrapper, Map} from '../facade/collection';
+import {ListWrapper} from '../facade/collection';
 import {isBlank, isPresent, normalizeBlank} from '../facade/lang';
 
-const _CASE_DEFAULT = /*@ts2dart_const*/ new Object();
-
-// TODO: remove when fully deprecated
-let _warned: boolean = false;
+const _CASE_DEFAULT = new Object();
 
 export class SwitchView {
   constructor(
@@ -28,7 +25,7 @@ export class SwitchView {
 /**
  * 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
+ * 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
@@ -68,7 +65,7 @@ export class SwitchView {
  *       <template ngSwitchDefault>&gt; 2, STOP!</template>
  *     </p>
  *   `,
- *   directives: [NgSwitch, ngSwitchCase, NgSwitchDefault]
+ *   directives: [NgSwitch, NgSwitchCase, NgSwitchDefault]
  * })
  * export class App {
  *   value = 'init';
@@ -77,19 +74,18 @@ export class SwitchView {
  *     this.value = this.value === 'init' ? 0 : this.value + 1;
  *   }
  * }
- *
- * bootstrap(App).catch(err => console.error(err));
  * ```
  *
- * @experimental
+ * @stable
  */
-@Directive({selector: '[ngSwitch]', inputs: ['ngSwitch']})
+@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();
@@ -181,9 +177,9 @@ export class NgSwitch {
  *
  * See {@link NgSwitch} for more details and example.
  *
- * @experimental
+ * @stable
  */
-@Directive({selector: '[ngSwitchCase],[ngSwitchWhen]', inputs: ['ngSwitchCase', 'ngSwitchWhen']})
+@Directive({selector: '[ngSwitchCase]'})
 export class NgSwitchCase {
   // `_CASE_DEFAULT` is used as a marker for a not yet initialized value
   /** @internal */
@@ -199,19 +195,11 @@ export class NgSwitchCase {
     this._view = new SwitchView(viewContainer, templateRef);
   }
 
+  @Input()
   set ngSwitchCase(value: any) {
     this._switch._onCaseValueChanged(this._value, value, this._view);
     this._value = value;
   }
-
-  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;
-  }
 }
 
 /**
@@ -220,7 +208,7 @@ export class NgSwitchCase {
  *
  * See {@link NgSwitch} for more details and example.
  *
- * @experimental
+ * @stable
  */
 @Directive({selector: '[ngSwitchDefault]'})
 export class NgSwitchDefault {

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

@@ -6,11 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, EmbeddedViewRef, Input, TemplateRef, ViewContainerRef} from '@angular/core';
-
-import {isPresent} from '../facade/lang';
-
-
+import {Directive, EmbeddedViewRef, Input, OnChanges, TemplateRef, ViewContainerRef} from '@angular/core';
 
 /**
  * Creates and inserts an embedded view based on a prepared `TemplateRef`.
@@ -21,13 +17,17 @@ import {isPresent} from '../facade/lang';
  * Note: using the key `$implicit` in the context object will set it's value as default.
  *
  * ### Syntax
- * - `<template [ngTemplateOutlet]="templateRefExpression"
- * [ngOutletContext]="objectExpression"></template>`
+ *
+ * ```
+ * <template [ngTemplateOutlet]="templateRefExpression"
+ *           [ngOutletContext]="objectExpression">
+ * </template>
+ * ```
  *
  * @experimental
  */
 @Directive({selector: '[ngTemplateOutlet]'})
-export class NgTemplateOutlet {
+export class NgTemplateOutlet implements OnChanges {
   private _viewRef: EmbeddedViewRef<any>;
   private _context: Object;
   private _templateRef: TemplateRef<any>;
@@ -35,29 +35,17 @@ export class NgTemplateOutlet {
   constructor(private _viewContainerRef: ViewContainerRef) {}
 
   @Input()
-  set ngOutletContext(context: Object) {
-    if (this._context !== context) {
-      this._context = context;
-      if (isPresent(this._viewRef)) {
-        this.createView();
-      }
-    }
-  }
+  set ngOutletContext(context: Object) { this._context = context; }
 
   @Input()
-  set ngTemplateOutlet(templateRef: TemplateRef<Object>) {
-    if (this._templateRef !== templateRef) {
-      this._templateRef = templateRef;
-      this.createView();
-    }
-  }
+  set ngTemplateOutlet(templateRef: TemplateRef<Object>) { this._templateRef = templateRef; }
 
-  private createView() {
-    if (isPresent(this._viewRef)) {
+  ngOnChanges() {
+    if (this._viewRef) {
       this._viewContainerRef.remove(this._viewContainerRef.indexOf(this._viewRef));
     }
 
-    if (isPresent(this._templateRef)) {
+    if (this._templateRef) {
       this._viewRef = this._viewContainerRef.createEmbeddedView(this._templateRef, this._context);
     }
   }

modules/@angular/common/src/directives/observable_list_diff.dart

@@ -1,63 +0,0 @@
-library angular2.directives.observable_list_iterable_diff;
-
-import 'package:observe/observe.dart' show ObservableList;
-import 'package:angular2/core.dart';
-import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
-import 'dart:async';
-
-class ObservableListDiff extends DefaultIterableDiffer {
-  ChangeDetectorRef _ref;
-  ObservableListDiff(this._ref);
-
-  bool _updated = true;
-  ObservableList _collection;
-  StreamSubscription _subscription;
-
-  onDestroy() {
-    if (this._subscription != null) {
-      this._subscription.cancel();
-      this._subscription = null;
-      this._collection = null;
-    }
-  }
-
-  DefaultIterableDiffer diff(ObservableList collection) {
-    if (collection is! ObservableList) {
-      throw "Cannot change the type of a collection";
-    }
-
-    // A new collection instance is passed in.
-    // - We need to set up a listener.
-    // - We need to diff collection.
-    if (!identical(_collection, collection)) {
-      _collection = collection;
-
-      if (_subscription != null) _subscription.cancel();
-      _subscription = collection.changes.listen((_) {
-        _updated = true;
-        _ref.markForCheck();
-      });
-      _updated = false;
-      return super.diff(collection);
-
-      // An update has been registered since the last change detection check.
-      // - We reset the flag.
-      // - We diff the collection.
-    } else if (_updated) {
-      _updated = false;
-      return super.diff(collection);
-
-      // No updates has been registered.
-    } else {
-      return null;
-    }
-  }
-}
-
-class ObservableListDiffFactory implements IterableDifferFactory {
-  const ObservableListDiffFactory();
-  bool supports(obj) => obj is ObservableList;
-  IterableDiffer create(ChangeDetectorRef cdRef, [Function trackByFn]) {
-    return new ObservableListDiff(cdRef);
-  }
-}

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

@@ -1,59 +0,0 @@
-/**
- * @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 {Type} from '@angular/core';
-
-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[] = /*@ts2dart_const*/[FormBuilder, RadioControlRegistry];

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

@@ -1,84 +0,0 @@
-/**
- * @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[] = /*@ts2dart_const*/[
-  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

@@ -1,41 +0,0 @@
-/**
- * @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

@@ -1,46 +0,0 @@
-/**
- * @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 = /*@ts2dart_const*/ {
-  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

@@ -1,32 +0,0 @@
-/**
- * @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

@@ -1,45 +0,0 @@
-/**
- * @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 =
-    /*@ts2dart_const*/ new OpaqueToken('NgValueAccessor');

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

@@ -1,55 +0,0 @@
-/**
- * @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 = /*@ts2dart_const*/
-    /* @ts2dart_Provider */ {
-      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

@@ -1,57 +0,0 @@
-/**
- * @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;
-}