fix(core): remove NgZone_ and use NgZone instead

modules/angular2/angular2.dart

@@ -8,6 +8,5 @@ library angular2;
 export 'package:angular2/core.dart' hide forwardRef, resolveForwardRef, ForwardRefFn;
 export 'package:angular2/profile.dart';
 export 'package:angular2/lifecycle_hooks.dart';
-export 'package:angular2/src/core/application_ref.dart';
 export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_BINDING;
 export 'package:angular2/src/core/render/dom/dom_tokens.dart';

modules/angular2/core.dart

@@ -8,7 +8,7 @@ export 'package:angular2/src/core/pipes.dart';
 export 'package:angular2/src/core/facade.dart';
 // Do not export application for dart. Must import from angular2/bootstrap
 //export 'package:angular2/src/core/application.dart';
-export 'package:angular2/src/core/application_ref.dart';
+export 'package:angular2/src/core/application_ref.dart' hide ApplicationRef_, PlatformRef_;
 export 'package:angular2/src/core/services.dart';
 export 'package:angular2/src/core/linker.dart';
 export 'package:angular2/src/core/lifecycle.dart';

modules/angular2/src/core/application_ref.ts

@@ -1,4 +1,4 @@
-import {NgZone, NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {Type, isBlank, isPresent, assertionsEnabled} from 'angular2/src/core/facade/lang';
 import {bind, Binding, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {
@@ -112,7 +112,7 @@ export function applicationCommonBindings(): Array<Type | Binding | any[]> {
  * Create an Angular zone.
  */
 export function createNgZone(): NgZone {
-  return new NgZone_({enableLongStackTrace: assertionsEnabled()});
+  return new NgZone({enableLongStackTrace: assertionsEnabled()});
 }
 
 var _platform: PlatformRef;
@@ -240,7 +240,7 @@ export class PlatformRef_ extends PlatformRef {
       try {
         injector = this.injector.resolveAndCreateChild(bindings);
         exceptionHandler = injector.get(ExceptionHandler);
-        (<NgZone_>zone).overrideOnErrorHandler((e, s) => exceptionHandler.call(e, s));
+        zone.overrideOnErrorHandler((e, s) => exceptionHandler.call(e, s));
       } catch (e) {
         if (isPresent(exceptionHandler)) {
           exceptionHandler.call(e, e.stack);

modules/angular2/src/core/life_cycle/life_cycle.ts

@@ -4,7 +4,6 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {isPresent} from 'angular2/src/core/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile';
-import {NgZone_} from "../zone/ng_zone";
 
 /**
  * Provides access to explicitly trigger change detection in an application.
@@ -72,7 +71,7 @@ export class LifeCycle_ extends LifeCycle {
     if (isPresent(changeDetector)) {
       this._changeDetectors.push(changeDetector);
     }
-    (<NgZone_>zone).overrideOnTurnDone(() => this.tick());
+    zone.overrideOnTurnDone(() => this.tick());
   }
 
   tick() {

modules/angular2/src/core/linker/element_ref.ts

@@ -66,8 +66,6 @@ export class ElementRef_ extends ElementRef {
   }
 
   get renderView(): RenderViewRef { return (<ViewRef_>this.parentView).render; }
-  set renderView(value) {
+  set renderView(value) { unimplemented(); }
-    unimplemented();
-  }
   get nativeElement(): any { return this._renderer.getNativeElementSync(this); }
 }

modules/angular2/src/core/testability/testability.ts

@@ -3,7 +3,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
-import {NgZone, NgZone_} from '../zone/ng_zone';
+import {NgZone} from '../zone/ng_zone';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';
 
 
@@ -21,12 +21,11 @@ export class Testability {
   constructor(public _ngZone: NgZone) { this._watchAngularEvents(_ngZone); }
 
   _watchAngularEvents(_ngZone: NgZone): void {
-    (<NgZone_>_ngZone).overrideOnTurnStart(() => { this._isAngularEventPending = true; });
+    _ngZone.overrideOnTurnStart(() => { this._isAngularEventPending = true; });
-    (<NgZone_>_ngZone)
+    _ngZone.overrideOnEventDone(() => {
-        .overrideOnEventDone(() => {
+      this._isAngularEventPending = false;
-          this._isAngularEventPending = false;
+      this._runCallbacksIfReady();
-          this._runCallbacksIfReady();
+    }, true);
-        }, true);
   }
 
   increasePendingRequestCount(): number {

modules/angular2/src/core/zone/ng_zone.dart

@@ -293,7 +293,3 @@ class NgZone {
         zoneValues: {'_innerZone': true});
   }
 }
-
-class NgZone_ extends NgZone {
-  NgZone_({bool enableLongStackTrace}) : super(enableLongStackTrace: enableLongStackTrace);
-}

modules/angular2/src/core/zone/ng_zone.ts

@@ -77,35 +77,7 @@ export interface NgZoneZone extends Zone { _innerZone: boolean; }
  * }
  * ```
  */
-export abstract class NgZone {
+export class NgZone {
-  /**
-   * Executes the `fn` function synchronously within the Angular zone and returns value returned by
-   * the function.
-   *
-   * Running functions via `run` allows you to reenter Angular zone from a task that was executed
-   * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
-   *
-   * Any future tasks or microtasks scheduled from within this function will continue executing from
-   * within the Angular zone.
-   */
-  abstract run(fn: () => any): any;
-
-  /**
-   * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
-   * the function.
-   *
-   * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
-   * doesn't trigger Angular change-detection or is subject to Angular's error handling.
-   *
-   * Any future tasks or microtasks scheduled from within this function will continue executing from
-   * outside of the Angular zone.
-   *
-   * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
-   */
-  abstract runOutsideAngular(fn: () => any): any;
-}
-
-export class NgZone_ extends NgZone {
   _runScope: WtfScopeFn = wtfCreateScope(`NgZone#run()`);
   _microtaskScope: WtfScopeFn = wtfCreateScope(`NgZone#microtask()`);
 
@@ -143,7 +115,6 @@ export class NgZone_ extends NgZone {
    *               enabled in development mode as they significantly impact perf.
    */
   constructor({enableLongStackTrace}) {
-    super();
     this._onTurnStart = null;
     this._onTurnDone = null;
     this._onEventDone = null;
@@ -222,6 +193,16 @@ export class NgZone_ extends NgZone {
     this._onErrorHandler = normalizeBlank(errorHandler);
   }
 
+  /**
+   * Executes the `fn` function synchronously within the Angular zone and returns value returned by
+   * the function.
+   *
+   * Running functions via `run` allows you to reenter Angular zone from a task that was executed
+   * outside of the Angular zone (typically started via {@link #runOutsideAngular}).
+   *
+   * Any future tasks or microtasks scheduled from within this function will continue executing from
+   * within the Angular zone.
+   */
   run(fn: () => any): any {
     if (this._disabled) {
       return fn();
@@ -235,6 +216,18 @@ export class NgZone_ extends NgZone {
     }
   }
 
+  /**
+   * Executes the `fn` function synchronously in Angular's parent zone and returns value returned by
+   * the function.
+   *
+   * Running functions via `runOutsideAngular` allows you to escape Angular's zone and do work that
+   * doesn't trigger Angular change-detection or is subject to Angular's error handling.
+   *
+   * Any future tasks or microtasks scheduled from within this function will continue executing from
+   * outside of the Angular zone.
+   *
+   * Use {@link #run} to reenter the Angular zone and do work that updates the application model.
+   */
   runOutsideAngular(fn: () => any): any {
     if (this._disabled) {
       return fn();

modules/angular2/src/mock/ng_zone_mock.ts

@@ -1,6 +1,6 @@
-import {NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
-export class MockNgZone extends NgZone_ {
+export class MockNgZone extends NgZone {
   _onEventDone: () => void;
 
   constructor() { super({enableLongStackTrace: false}); }

modules/angular2/src/web_workers/shared/post_message_bus.ts

@@ -7,7 +7,7 @@ import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptio
 import {EventEmitter} from 'angular2/src/core/facade/async';
 import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {Injectable} from "angular2/src/core/di";
-import {NgZone, NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
 /**
  * A TypeScript implementation of {@link MessageBus} for communicating via JavaScript's
@@ -41,7 +41,7 @@ export class PostMessageBusSink implements MessageBusSink {
 
   attachToZone(zone: NgZone): void {
     this._zone = zone;
-    (<NgZone_>this._zone).overrideOnEventDone(() => this._handleOnEventDone(), false);
+    this._zone.overrideOnEventDone(() => this._handleOnEventDone(), false);
   }
 
   initChannel(channel: string, runInZone: boolean = true): void {

modules/angular2/test/core/render/dom/events/event_manager_spec.ts

@@ -14,7 +14,7 @@ import {
   EventManagerPlugin,
   DomEventsPlugin
 } from 'angular2/src/core/render/dom/events/event_manager';
-import {NgZone, NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
@@ -106,7 +106,7 @@ class FakeEventManagerPlugin extends EventManagerPlugin {
   }
 }
 
-class FakeNgZone extends NgZone_ {
+class FakeNgZone extends NgZone {
   constructor() { super({enableLongStackTrace: false}); }
   run(fn) { fn(); }
 

modules/angular2/test/core/testability/testability_spec.ts

@@ -12,7 +12,7 @@ import {
   SpyObject
 } from 'angular2/test_lib';
 import {Testability} from 'angular2/src/core/testability/testability';
-import {NgZone, NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {normalizeBlank} from 'angular2/src/core/facade/lang';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';
 
@@ -21,7 +21,7 @@ function microTask(fn: Function): void {
   PromiseWrapper.resolve(null).then((_) => { fn(); });
 }
 
-class MockNgZone extends NgZone_ {
+class MockNgZone extends NgZone {
   _onTurnStart: () => void;
   _onEventDone: () => void;
 

modules/angular2/test/core/zone/ng_zone_spec.ts

@@ -17,7 +17,7 @@ import {
 import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/core/facade/async';
 import {BaseException} from 'angular2/src/core/facade/exceptions';
 
-import {NgZone, NgZone_} from 'angular2/src/core/zone/ng_zone';
+import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
 var needsLongerTimers = browserDetection.isSlow || browserDetection.isEdge;
 var resultTimer = 1000;
@@ -47,7 +47,7 @@ export function main() {
   describe("NgZone", () => {
 
     function createZone(enableLongStackTrace) {
-      var zone = new NgZone_({enableLongStackTrace: enableLongStackTrace});
+      var zone = new NgZone({enableLongStackTrace: enableLongStackTrace});
       zone.overrideOnTurnStart(_log.fn('onTurnStart'));
       zone.overrideOnTurnDone(_log.fn('onTurnDone'));
       return zone;

modules/angular2/test/public_api_spec.ts

@@ -72,7 +72,8 @@ var NG_API = [
   'AppRootUrl',
   'AppRootUrl.value',
   'AppRootUrl.value=',
-  'AppViewManager',
+  'AppViewManager:js',
+  'AppViewManager.getHostElement():js',
   /*
   Abstract methods
   'AppViewManager.attachViewInContainer()',
@@ -83,18 +84,17 @@ var NG_API = [
   'AppViewManager.destroyViewInContainer()',
   'AppViewManager.detachViewInContainer()',
   'AppViewManager.getComponent()',
-  'AppViewManager.getHostElement()',
   'AppViewManager.getNamedElementInComponentView()',
   'AppViewManager.getViewContainer()',
   */
-  'ApplicationRef',
+  'ApplicationRef:js',
+  'ApplicationRef.injector:js',
+  'ApplicationRef.zone:js',
   /*
   Abstract methods
   'ApplicationRef.bootstrap()',
   'ApplicationRef.dispose()',
-  'ApplicationRef.injector',
   'ApplicationRef.registerBootstrapListener()',
-  'ApplicationRef.zone',
   */
   'AsyncPipe',
   'AsyncPipe.onDestroy()',
@@ -158,7 +158,7 @@ var NG_API = [
   'CheckboxControlValueAccessor.registerOnTouched()',
   'CheckboxControlValueAccessor.writeValue()',
   'Class:js',
-  'Compiler',
+  'Compiler:js',
   /*
    Abstract methods
   'Compiler.compileInHost()',
@@ -207,19 +207,20 @@ var NG_API = [
   'ComponentRef',
   'ComponentRef.componentType',
   'ComponentRef.componentType=',
-  /*
+  'ComponentRef.hostComponent:js',
-   Abstract method
+  'ComponentRef.hostView:js',
-  'ComponentRef.dispose()',
-  */
-  'ComponentRef.hostComponent',
-  'ComponentRef.hostComponentType',
-  'ComponentRef.hostView',
   'ComponentRef.injector',
   'ComponentRef.injector=',
   'ComponentRef.instance',
   'ComponentRef.instance=',
   'ComponentRef.location',
   'ComponentRef.location=',
+  /*
+   Abstract method
+  'ComponentRef.dispose()',
+  'ComponentRef.hostComponentType',
+   */
+
   'ContentChild',
   'ContentChild.descendants',
   'ContentChild.first',
@@ -440,7 +441,6 @@ var NG_API = [
   'ElementRef.parentView',
   'ElementRef.parentView=',
   'ElementRef.renderView',
-  'ElementRef.renderView=',
   'Output',
   'Output.bindingPropertyName',
   'EventEmitter',
@@ -533,10 +533,7 @@ var NG_API = [
   'Injector.resolveAndCreateChild()',
   'Injector.resolveAndInstantiate()',
   'InstantiationError',
-  /*
-   Abstract method
   'InstantiationError.addKey()',
-  */
   'InstantiationError.causeKey',
   'InstantiationError.context',
   'InstantiationError.injectors',
@@ -570,11 +567,11 @@ var NG_API = [
   'KeyValueDiffers.factories',
   'KeyValueDiffers.find()',
   'LifeCycle',  // TODO: replace with ApplicationRef
-  /*
+                /*
-   Abstract methods
+                 Abstract methods
-  'LifeCycle.registerWith()',
+                'LifeCycle.registerWith()',
-  'LifeCycle.tick()',
+                'LifeCycle.tick()',
-  */
+                */
   'LowerCasePipe',
   'LowerCasePipe.transform()',
   'NG_VALIDATORS',
@@ -769,15 +766,12 @@ var NG_API = [
   'NgSwitchWhen',
   'NgSwitchWhen.ngSwitchWhen=',
   'NgZone',
-  /*
-   Abstract methods
   'NgZone.overrideOnErrorHandler()',
   'NgZone.overrideOnEventDone()',
   'NgZone.overrideOnTurnDone()',
   'NgZone.overrideOnTurnStart()',
   'NgZone.run()',
   'NgZone.runOutsideAngular()',
-  */
   'NoAnnotationError',
   'NoAnnotationError.message',
   'NoAnnotationError.stackTrace',
@@ -916,14 +910,13 @@ var NG_API = [
    'Renderer.setEventDispatcher()',
    'Renderer.setText()',
   */
-  'ResolvedBinding',
+  'ResolvedBinding:dart',
-  'ResolvedBinding.key',
+  'ResolvedBinding.key:dart',
-  'ResolvedBinding.key=',
+  'ResolvedBinding.key=:dart',
-  'ResolvedBinding.multiBinding',
+  'ResolvedBinding.multiBinding:dart',
-  'ResolvedBinding.multiBinding=',
+  'ResolvedBinding.multiBinding=:dart',
-  'ResolvedBinding.resolvedFactories',
+  'ResolvedBinding.resolvedFactories:dart',
-  'ResolvedBinding.resolvedFactories=',
+  'ResolvedBinding.resolvedFactories=:dart',
-  'ResolvedBinding.resolvedFactory',
   'ResolvedFactory',
   'ResolvedFactory.dependencies',
   'ResolvedFactory.dependencies=',
@@ -963,7 +956,6 @@ var NG_API = [
    Abstract method
    'TemplateRef.hasLocal()',
   */
-  'TemplateRef.protoViewRef',
   'Type:js',
   'Title',
   'Title.getTitle()',
@@ -1036,8 +1028,6 @@ var NG_API = [
    'ViewContainerRef.insert()',
   */
   'ViewContainerRef.length',
-  'ViewContainerRef.viewManager',
-  'ViewContainerRef.viewManager=',
   'ViewEncapsulation#Emulated',
   'ViewEncapsulation#Native',
   'ViewEncapsulation#None',
@@ -1071,8 +1061,6 @@ var NG_API = [
   'ViewRef',
   'ViewRef.changeDetectorRef',
   'ViewRef.changeDetectorRef=',
-  'ViewRef.render',
-  'ViewRef.renderFragment',
   /*
    Abstract method
    'ViewRef.setLocal()',
@@ -1107,100 +1095,97 @@ var NG_API = [
   'wtfLeave:dart',
   'wtfStartTimeRange():js',
   'wtfStartTimeRange:dart',
-  '{AfterContentChecked}',
+  'AfterContentChecked:dart',
-  '{AfterContentInit}',
+  'AfterContentInit:dart',
-  '{AfterViewChecked}',
+  'AfterViewChecked:dart',
-  '{AfterViewInit}',
+  'AfterViewInit:dart',
-  '{ControlValueAccessor}',
+  'ControlValueAccessor:dart',
-  '{DoCheck}',
+  'DoCheck:dart',
-  '{Form}',
+  'Form:dart',
-  '{HostViewRef}',
+  'HostViewRef:dart',
-  '{HostViewRef}.changeDetectorRef',
+  'HostViewRef.changeDetectorRef',
-  '{HostViewRef}.changeDetectorRef=',
+  'HostViewRef.changeDetectorRef=',
-  '{IterableDifferFactory}',
+  'IterableDifferFactory:dart',
-  '{IterableDiffer}',
+  'IterableDiffer:dart',
-  '{KeyValueDifferFactory}',
+  'KeyValueDifferFactory:dart',
-  '{KeyValueDiffer}',
+  'KeyValueDiffer:dart',
-  '{OnChanges}',
+  'OnChanges:dart',
-  '{OnDestroy}',
+  'OnDestroy:dart',
-  '{OnInit}',
+  'OnInit:dart',
-  '{PipeOnDestroy}',
+  'PipeOnDestroy:dart',
-  '{PipeTransform}',
+  'PipeTransform:dart',
-  '{RenderBeginCmd}',
+  'RenderBeginCmd:dart',
-  '{RenderBeginCmd}.isBound',
+  'RenderBeginCmd.isBound',
-  '{RenderBeginCmd}.isBound=',
+  'RenderBeginCmd.isBound=',
-  '{RenderBeginCmd}.ngContentIndex',
+  'RenderBeginCmd.ngContentIndex',
-  '{RenderBeginCmd}.ngContentIndex=',
+  'RenderBeginCmd.ngContentIndex=',
-  '{RenderBeginComponentCmd}',
+  'RenderBeginComponentCmd:dart',
-  '{RenderBeginComponentCmd}.nativeShadow',
+  'RenderBeginComponentCmd.nativeShadow',
-  '{RenderBeginComponentCmd}.nativeShadow=',
+  'RenderBeginComponentCmd.nativeShadow=',
-  '{RenderBeginComponentCmd}.templateId',
+  'RenderBeginComponentCmd.templateId',
-  '{RenderBeginComponentCmd}.templateId=',
+  'RenderBeginComponentCmd.templateId=',
-  '{RenderBeginElementCmd}',
+  'RenderBeginElementCmd:dart',
-  '{RenderBeginElementCmd}.attrNameAndValues',
+  'RenderBeginElementCmd.attrNameAndValues',
-  '{RenderBeginElementCmd}.attrNameAndValues=',
+  'RenderBeginElementCmd.attrNameAndValues=',
-  '{RenderBeginElementCmd}.eventTargetAndNames',
+  'RenderBeginElementCmd.eventTargetAndNames',
-  '{RenderBeginElementCmd}.eventTargetAndNames=',
+  'RenderBeginElementCmd.eventTargetAndNames=',
-  '{RenderBeginElementCmd}.name',
+  'RenderBeginElementCmd.name',
-  '{RenderBeginElementCmd}.name=',
+  'RenderBeginElementCmd.name=',
-  '{RenderCommandVisitor}',
+  'RenderCommandVisitor:dart',
-  '{RenderEmbeddedTemplateCmd}',
+  'RenderEmbeddedTemplateCmd:dart',
-  '{RenderEmbeddedTemplateCmd}.children',
+  'RenderEmbeddedTemplateCmd.children',
-  '{RenderEmbeddedTemplateCmd}.children=',
+  'RenderEmbeddedTemplateCmd.children=',
-  '{RenderEmbeddedTemplateCmd}.isMerged',
+  'RenderEmbeddedTemplateCmd.isMerged',
-  '{RenderEmbeddedTemplateCmd}.isMerged=',
+  'RenderEmbeddedTemplateCmd.isMerged=',
-  '{RenderNgContentCmd}',
+  'RenderNgContentCmd:dart',
-  '{RenderNgContentCmd}.index',
+  'RenderNgContentCmd.ngContentIndex',
-  '{RenderNgContentCmd}.index=',
+  'RenderNgContentCmd.ngContentIndex=',
-  '{RenderNgContentCmd}.ngContentIndex',
+  'RenderTemplateCmd:dart',
-  '{RenderNgContentCmd}.ngContentIndex=',
+  'RenderTextCmd:dart',
-  '{RenderTemplateCmd}',
+  'RenderTextCmd.value',
-  '{RenderTextCmd}',
+  'RenderTextCmd.value=',
-  '{RenderTextCmd}.value',
+  'RenderElementRef:dart',
-  '{RenderTextCmd}.value=',
+  'RenderElementRef.boundElementIndex',
-  '{RenderElementRef}',
+  'RenderElementRef.boundElementIndex=',
-  '{RenderElementRef}.boundElementIndex',
+  'RenderElementRef.renderView',
-  '{RenderElementRef}.boundElementIndex=',
+  'RenderElementRef.renderView=',
-  '{RenderElementRef}.renderView',
+  'RenderEventDispatcher:dart',
-  '{RenderElementRef}.renderView=',
+  'Stream:dart',
-  '{RenderEventDispatcher}',
+  'Stream.any():dart',
-  '{Stream}',
+  'Stream.asBroadcastStream():dart',
-  '{Stream}.any()',
+  'Stream.asyncExpand():dart',
-  '{Stream}.asBroadcastStream()',
+  'Stream.asyncMap():dart',
-  '{Stream}.asyncExpand()',
+  'Stream.contains():dart',
-  '{Stream}.asyncMap()',
+  'Stream.distinct():dart',
-  '{Stream}.contains()',
+  'Stream.drain():dart',
-  '{Stream}.distinct()',
+  'Stream.elementAt():dart',
-  '{Stream}.drain()',
+  'Stream.every():dart',
-  '{Stream}.elementAt()',
+  'Stream.expand():dart',
-  '{Stream}.every()',
+  'Stream.first:dart',
-  '{Stream}.expand()',
+  'Stream.firstWhere():dart',
-  '{Stream}.first',
+  'Stream.fold():dart',
-  '{Stream}.firstWhere()',
+  'Stream.forEach():dart',
-  '{Stream}.fold()',
+  'Stream.handleError():dart',
-  '{Stream}.forEach()',
+  'Stream.isBroadcast:dart',
-  '{Stream}.handleError()',
+  'Stream.isEmpty:dart',
-  '{Stream}.isBroadcast',
+  'Stream.join():dart',
-  '{Stream}.isEmpty',
+  'Stream.last:dart',
-  '{Stream}.join()',
+  'Stream.lastWhere():dart',
-  '{Stream}.last',
+  'Stream.length:dart',
-  '{Stream}.lastWhere()',
+  'Stream.map():dart',
-  '{Stream}.length',
+  'Stream.pipe():dart',
-  '{Stream}.map()',
+  'Stream.reduce():dart',
-  '{Stream}.pipe()',
+  'Stream.single:dart',
-  '{Stream}.reduce()',
+  'Stream.singleWhere():dart',
-  '{Stream}.single',
+  'Stream.skip():dart',
-  '{Stream}.singleWhere()',
+  'Stream.skipWhile():dart',
-  '{Stream}.skip()',
+  'Stream.take():dart',
-  '{Stream}.skipWhile()',
+  'Stream.takeWhile():dart',
-  '{Stream}.take()',
+  'Stream.timeout():dart',
-  '{Stream}.takeWhile()',
+  'Stream.toList():dart',
-  '{Stream}.timeout()',
+  'Stream.toSet():dart',
-  '{Stream}.toList()',
+  'Stream.transform():dart',
-  '{Stream}.toSet()',
+  'Stream.where():dart',
-  '{Stream}.transform()',
-  '{Stream}.where()',
-  '{Type}'
 ];
 
 export function main() {
@@ -1208,7 +1193,7 @@ export function main() {
   var x = getSymbolsFromLibrary('ng');
   x.sort();
   var parts = [];
-  x.forEach((i) => parts.push(`'${i}'`));
+  x.forEach((i) => parts.push(`'${i'`));
   print(`[ ${parts.join(',
   ')} ]`);
    */

modules/angular2/test/symbol_inspector/symbol_inspector.dart

@@ -52,7 +52,7 @@ class ExportedSymbol {
       names.add('$name()');
     } else if (declaration is ClassMirror) {
       var classMirror = declaration as ClassMirror;
-      if (classMirror.isAbstract) name = '{$name}';
+      if (classMirror.isAbstract) name = '$name';
       names.add(name);
       classMirror.staticMembers.forEach(members('$name#', names));
       classMirror.instanceMembers.forEach(members('$name.', names));

modules/angular2/test/symbol_inspector/symbol_inspector_spec.ts

@@ -42,7 +42,7 @@ export function main() {
                                'StaticFieldType',
                                'TypedefParam',
                                'TypedefReturnType',
-                               '{SomeInterface}',
+                               'SomeInterface:dart',
                              ])
                  .errors)
           .toEqual([]);

modules/upgrade/src/upgrade_module.ts

@@ -34,7 +34,6 @@ import {
 } from './constants';
 import {Ng2ComponentFacade} from './ng2_facade';
 import {ExportedNg1Component} from './ng1_facade';
-import {NgZone_} from "angular2/src/core/zone/ng_zone";
 
 var moduleCount: number = 0;
 
@@ -116,7 +115,7 @@ export class UpgradeModule {
             '$rootScope',
             (injector: angular.auto.IInjectorService, rootScope: angular.IRootScopeService) => {
               ng1Injector = injector;
-              (<NgZone_>ngZone).overrideOnTurnDone(() => rootScope.$apply());
+              ngZone.overrideOnTurnDone(() => rootScope.$apply());
               ExportedNg1Component.resolve(this.exportedNg1Components, injector);
             }
           ]);