diff --git a/modules/angular2/alt_router.ts b/modules/angular2/alt_router.ts
index f4565b22a4..9272a92c1c 100644
--- a/modules/angular2/alt_router.ts
+++ b/modules/angular2/alt_router.ts
@@ -17,6 +17,5 @@ export {ROUTER_PROVIDERS} from './src/alt_router/router_providers';
import {RouterOutlet} from './src/alt_router/directives/router_outlet';
import {RouterLink} from './src/alt_router/directives/router_link';
-import {CONST_EXPR} from './src/facade/lang';
-export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
+export const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/ [RouterOutlet, RouterLink];
diff --git a/modules/angular2/platform/browser.ts b/modules/angular2/platform/browser.ts
index 17b186adfd..344430965d 100644
--- a/modules/angular2/platform/browser.ts
+++ b/modules/angular2/platform/browser.ts
@@ -13,7 +13,7 @@ export {
disableDebugTools
} from 'angular2/src/platform/browser_common';
-import {Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {Type, isPresent, isBlank} from 'angular2/src/facade/lang';
import {
BROWSER_PROVIDERS,
BROWSER_APP_COMMON_PROVIDERS,
@@ -39,10 +39,10 @@ import {Provider} from 'angular2/src/core/di';
/**
* An array of providers that should be passed into `application()` when bootstrapping a component.
*/
-export const BROWSER_APP_PROVIDERS: Array = CONST_EXPR([
+export const BROWSER_APP_PROVIDERS: Array = /*@ts2dart_const*/ [
BROWSER_APP_COMMON_PROVIDERS,
COMPILER_PROVIDERS,
- new Provider(XHR, {useClass: XHRImpl}),
+ new Provider(XHR, {useClass: XHRImpl},
]);
export function browserPlatform(): PlatformRef {
diff --git a/modules/angular2/platform/browser_static.ts b/modules/angular2/platform/browser_static.ts
index 06f5db4f57..2e062bdaa4 100644
--- a/modules/angular2/platform/browser_static.ts
+++ b/modules/angular2/platform/browser_static.ts
@@ -33,7 +33,7 @@ import {
* have been precompiled offline.
*/
export const BROWSER_APP_PROVIDERS: Array =
- BROWSER_APP_COMMON_PROVIDERS;
+ /*@ts2dart_const*/ BROWSER_APP_COMMON_PROVIDERS;
export function browserStaticPlatform(): PlatformRef {
if (isBlank(getPlatform())) {
diff --git a/modules/angular2/platform/testing/browser.ts b/modules/angular2/platform/testing/browser.ts
index 5fa0032c70..b755b5b663 100644
--- a/modules/angular2/platform/testing/browser.ts
+++ b/modules/angular2/platform/testing/browser.ts
@@ -3,7 +3,6 @@ import {
ADDITIONAL_TEST_BROWSER_PROVIDERS
} from 'angular2/platform/testing/browser_static';
import {BROWSER_APP_PROVIDERS} from 'angular2/platform/browser';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
/**
* Providers for using template cache to avoid actual XHR.
@@ -15,10 +14,10 @@ export {CACHED_TEMPLATE_PROVIDER} from 'angular2/platform/browser';
* Default platform providers for testing.
*/
export const TEST_BROWSER_PLATFORM_PROVIDERS: Array =
- CONST_EXPR([TEST_BROWSER_STATIC_PLATFORM_PROVIDERS]);
+ /*@ts2dart_const*/[TEST_BROWSER_STATIC_PLATFORM_PROVIDERS];
/**
* Default application providers for testing.
*/
export const TEST_BROWSER_APPLICATION_PROVIDERS: Array =
- CONST_EXPR([BROWSER_APP_PROVIDERS, ADDITIONAL_TEST_BROWSER_PROVIDERS]);
+ /*@ts2dart_const*/[BROWSER_APP_PROVIDERS, ADDITIONAL_TEST_BROWSER_PROVIDERS];
diff --git a/modules/angular2/platform/testing/browser_static.ts b/modules/angular2/platform/testing/browser_static.ts
index 95fe96f8f2..37ead07c68 100644
--- a/modules/angular2/platform/testing/browser_static.ts
+++ b/modules/angular2/platform/testing/browser_static.ts
@@ -30,7 +30,7 @@ import {BrowserDetection} from 'angular2/src/testing/utils';
import {ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/common_dom';
-import {CONST_EXPR, IS_DART} from 'angular2/src/facade/lang';
+import {IS_DART} from 'angular2/src/facade/lang';
import {Log} from 'angular2/src/testing/utils';
@@ -47,14 +47,14 @@ function createNgZone(): NgZone {
* Default platform providers for testing without a compiler.
*/
export const TEST_BROWSER_STATIC_PLATFORM_PROVIDERS: Array =
- CONST_EXPR([
+ /*@ts2dart_const*/ [
PLATFORM_COMMON_PROVIDERS,
- new Provider(PLATFORM_INITIALIZER, {useValue: initBrowserTests, multi: true})
+ new Provider(PLATFORM_INITIALIZER, {useValue: initBrowserTests, multi: true}
]);
export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array =
- CONST_EXPR([
- new Provider(APP_ID, {useValue: 'a'}),
+ /*@ts2dart_const*/ [
+ new Provider(APP_ID, {useValue: 'a'},
ELEMENT_PROBE_PROVIDERS,
new Provider(DirectiveResolver, {useClass: MockDirectiveResolver}),
new Provider(ViewResolver, {useClass: MockViewResolver}),
@@ -69,8 +69,8 @@ export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array =
- CONST_EXPR([
+ /*@ts2dart_const*/ [
BROWSER_APP_COMMON_PROVIDERS,
- new Provider(XHR, {useClass: XHRImpl}),
+ new Provider(XHR, {useClass: XHRImpl},
ADDITIONAL_TEST_BROWSER_PROVIDERS
]);
diff --git a/modules/angular2/platform/testing/server.ts b/modules/angular2/platform/testing/server.ts
index f8efe2c864..306ce49136 100644
--- a/modules/angular2/platform/testing/server.ts
+++ b/modules/angular2/platform/testing/server.ts
@@ -38,7 +38,6 @@ import {
import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
import {LocationStrategy} from 'angular2/platform/common';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
import {Log} from 'angular2/src/testing/utils';
@@ -50,10 +49,11 @@ function initServerTests() {
/**
* Default platform providers for testing.
*/
-export const TEST_SERVER_PLATFORM_PROVIDERS: Array = CONST_EXPR([
- PLATFORM_COMMON_PROVIDERS,
- new Provider(PLATFORM_INITIALIZER, {useValue: initServerTests, multi: true})
-]);
+export const TEST_SERVER_PLATFORM_PROVIDERS: Array =
+ /*@ts2dart_const*/ [
+ PLATFORM_COMMON_PROVIDERS,
+ new Provider(PLATFORM_INITIALIZER, {useValue: initServerTests, multi: true}
+ ]);
function appDoc() {
try {
@@ -67,8 +67,8 @@ function appDoc() {
* Default application providers for testing.
*/
export const TEST_SERVER_APPLICATION_PROVIDERS: Array =
- CONST_EXPR([
- // TODO(julie): when angular2/platform/server is available, use that instead of making our own
+ /*@ts2dart_const*/ [
+ // TODO(julie: when angular2/platform/server is available, use that instead of making our own
// list here.
APPLICATION_COMMON_PROVIDERS,
COMPILER_PROVIDERS,
diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts
index a84d3897bc..18ca5c7f67 100644
--- a/modules/angular2/router.ts
+++ b/modules/angular2/router.ts
@@ -20,7 +20,6 @@ export {ROUTER_PROVIDERS, ROUTER_BINDINGS} from 'angular2/src/router/router_prov
import {RouterOutlet} from './src/router/directives/router_outlet';
import {RouterLink} from './src/router/directives/router_link';
-import {CONST_EXPR} from './src/facade/lang';
/**
* A list of directives. To use the router directives like {@link RouterOutlet} and
@@ -44,4 +43,4 @@ import {CONST_EXPR} from './src/facade/lang';
* bootstrap(AppCmp, [ROUTER_PROVIDERS]);
* ```
*/
-export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
+export const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/[RouterOutlet, RouterLink];
diff --git a/modules/angular2/router/router_link_dsl.ts b/modules/angular2/router/router_link_dsl.ts
index cfc1697882..f0ea49d6e3 100644
--- a/modules/angular2/router/router_link_dsl.ts
+++ b/modules/angular2/router/router_link_dsl.ts
@@ -1,7 +1,6 @@
import {TEMPLATE_TRANSFORMS} from 'angular2/compiler';
import {Provider} from 'angular2/core';
import {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
@@ -32,4 +31,5 @@ export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_tr
* ```
*/
export const ROUTER_LINK_DSL_PROVIDER =
- CONST_EXPR(new Provider(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true}));
+ /*@ts2dart_const*/
+ new Provider(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true});
diff --git a/modules/angular2/src/common/common_directives.ts b/modules/angular2/src/common/common_directives.ts
index 50c3a6c2e6..5b12520b35 100644
--- a/modules/angular2/src/common/common_directives.ts
+++ b/modules/angular2/src/common/common_directives.ts
@@ -1,4 +1,4 @@
-import {CONST_EXPR, Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/facade/lang';
import {FORM_DIRECTIVES} from './forms';
import {CORE_DIRECTIVES} from './directives';
@@ -46,4 +46,4 @@ import {CORE_DIRECTIVES} from './directives';
* }
* ```
*/
-export const COMMON_DIRECTIVES: Type[][] = CONST_EXPR([CORE_DIRECTIVES, FORM_DIRECTIVES]);
+export const COMMON_DIRECTIVES: Type[][] = /*@ts2dart_const*/[CORE_DIRECTIVES, FORM_DIRECTIVES];
diff --git a/modules/angular2/src/common/directives/core_directives.ts b/modules/angular2/src/common/directives/core_directives.ts
index fed030c5c2..ee4c83a349 100644
--- a/modules/angular2/src/common/directives/core_directives.ts
+++ b/modules/angular2/src/common/directives/core_directives.ts
@@ -1,4 +1,4 @@
-import {CONST_EXPR, Type} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/facade/lang';
import {NgClass} from './ng_class';
import {NgFor} from './ng_for';
import {NgIf} from './ng_if';
@@ -47,7 +47,7 @@ import {NgPlural, NgPluralCase} from './ng_plural';
* }
* ```
*/
-export const CORE_DIRECTIVES: Type[] = CONST_EXPR([
+export const CORE_DIRECTIVES: Type[] = /*@ts2dart_const*/[
NgClass,
NgFor,
NgIf,
@@ -58,4 +58,4 @@ export const CORE_DIRECTIVES: Type[] = CONST_EXPR([
NgSwitchDefault,
NgPlural,
NgPluralCase
-]);
+];
diff --git a/modules/angular2/src/common/directives/ng_switch.ts b/modules/angular2/src/common/directives/ng_switch.ts
index 4ad6719368..74db4ab2cf 100644
--- a/modules/angular2/src/common/directives/ng_switch.ts
+++ b/modules/angular2/src/common/directives/ng_switch.ts
@@ -1,8 +1,8 @@
import {Directive, Host, ViewContainerRef, TemplateRef} from 'angular2/core';
-import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isPresent, isBlank, normalizeBlank} from 'angular2/src/facade/lang';
import {ListWrapper, Map} from 'angular2/src/facade/collection';
-const _WHEN_DEFAULT = CONST_EXPR(new Object());
+const _WHEN_DEFAULT = /*@ts2dart_const*/ new Object();
export class SwitchView {
constructor(private _viewContainerRef: ViewContainerRef,
diff --git a/modules/angular2/src/common/forms.ts b/modules/angular2/src/common/forms.ts
index f25b8067c2..2d17fc37ef 100644
--- a/modules/angular2/src/common/forms.ts
+++ b/modules/angular2/src/common/forms.ts
@@ -43,7 +43,7 @@ export {
export {FormBuilder} from './forms/form_builder';
import {FormBuilder} from './forms/form_builder';
import {RadioControlRegistry} from './forms/directives/radio_control_value_accessor';
-import {Type, CONST_EXPR} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/facade/lang';
/**
* Shorthand set of providers used for building Angular forms.
@@ -54,11 +54,11 @@ import {Type, CONST_EXPR} from 'angular2/src/facade/lang';
* bootstrap(MyApp, [FORM_PROVIDERS]);
* ```
*/
-export const FORM_PROVIDERS: Type[] = CONST_EXPR([FormBuilder, RadioControlRegistry]);
+export const FORM_PROVIDERS: Type[] = /*@ts2dart_const*/[FormBuilder, RadioControlRegistry];
/**
* See {@link FORM_PROVIDERS} instead.
*
* @deprecated
*/
-export const FORM_BINDINGS = FORM_PROVIDERS;
+export const FORM_BINDINGS = /*@ts2dart_const*/ FORM_PROVIDERS;
diff --git a/modules/angular2/src/common/forms/directives.ts b/modules/angular2/src/common/forms/directives.ts
index 5becfaa109..4e0463dae1 100644
--- a/modules/angular2/src/common/forms/directives.ts
+++ b/modules/angular2/src/common/forms/directives.ts
@@ -1,4 +1,4 @@
-import {Type, CONST_EXPR} from 'angular2/src/facade/lang';
+import {Type} from 'angular2/src/facade/lang';
import {NgControlName} from './directives/ng_control_name';
import {NgFormControl} from './directives/ng_form_control';
import {NgModel} from './directives/ng_model';
@@ -64,7 +64,7 @@ export {ControlValueAccessor} from './directives/control_value_accessor';
* class MyApp {}
* ```
*/
-export const FORM_DIRECTIVES: Type[] = CONST_EXPR([
+export const FORM_DIRECTIVES: Type[] = /*@ts2dart_const*/[
NgControlName,
NgControlGroup,
@@ -85,4 +85,4 @@ export const FORM_DIRECTIVES: Type[] = CONST_EXPR([
MinLengthValidator,
MaxLengthValidator,
PatternValidator
-]);
+];
diff --git a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
index 7979ce8fe0..7c4d8970de 100644
--- a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
@@ -1,10 +1,9 @@
import {Directive, Renderer, ElementRef, Self, forwardRef, Provider} from 'angular2/core';
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
-export const CHECKBOX_VALUE_ACCESSOR = CONST_EXPR(new Provider(
- NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => CheckboxControlValueAccessor), multi: true}));
+export const CHECKBOX_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
+ NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => CheckboxControlValueAccessor), multi: true});
/**
* The accessor for writing a value and listening to changes on a checkbox input element.
diff --git a/modules/angular2/src/common/forms/directives/control_value_accessor.ts b/modules/angular2/src/common/forms/directives/control_value_accessor.ts
index 90820f7d70..76482248a6 100644
--- a/modules/angular2/src/common/forms/directives/control_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/control_value_accessor.ts
@@ -1,5 +1,4 @@
import {OpaqueToken} from 'angular2/core';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
/**
* A bridge between a control and a native element.
@@ -31,4 +30,5 @@ export interface ControlValueAccessor {
*
* See {@link DefaultValueAccessor} for how to implement one.
*/
-export const NG_VALUE_ACCESSOR: OpaqueToken = CONST_EXPR(new OpaqueToken("NgValueAccessor"));
\ No newline at end of file
+export const NG_VALUE_ACCESSOR: OpaqueToken =
+ /*@ts2dart_const*/ new OpaqueToken("NgValueAccessor");
diff --git a/modules/angular2/src/common/forms/directives/default_value_accessor.ts b/modules/angular2/src/common/forms/directives/default_value_accessor.ts
index 1d5c704b75..48b8bd3ee8 100644
--- a/modules/angular2/src/common/forms/directives/default_value_accessor.ts
+++ b/modules/angular2/src/common/forms/directives/default_value_accessor.ts
@@ -1,9 +1,9 @@
import {Directive, ElementRef, Renderer, Self, forwardRef, Provider} from 'angular2/core';
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
-import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isBlank} from 'angular2/src/facade/lang';
-export const DEFAULT_VALUE_ACCESSOR = CONST_EXPR(new Provider(
- NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => DefaultValueAccessor), multi: true}));
+export const DEFAULT_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
+ NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => DefaultValueAccessor), multi: true});
/**
* The default accessor for writing a value and listening to changes that is used by the
diff --git a/modules/angular2/src/common/forms/directives/ng_control_group.ts b/modules/angular2/src/common/forms/directives/ng_control_group.ts
index 037de2764d..efde8d793f 100644
--- a/modules/angular2/src/common/forms/directives/ng_control_group.ts
+++ b/modules/angular2/src/common/forms/directives/ng_control_group.ts
@@ -10,7 +10,6 @@ import {
Provider,
Self
} from 'angular2/core';
-import {CONST_EXPR} from 'angular2/src/facade/lang';
import {ControlContainer} from './control_container';
import {controlPath, composeValidators, composeAsyncValidators} from './shared';
@@ -20,7 +19,8 @@ import {NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
import {AsyncValidatorFn, ValidatorFn} from './validators';
export const controlGroupProvider =
- CONST_EXPR(new Provider(ControlContainer, {useExisting: forwardRef(() => NgControlGroup)}));
+ /*@ts2dart_const*/
+ new Provider(ControlContainer, {useExisting: forwardRef(() => NgControlGroup)});
/**
* Creates and binds a control group to a DOM element.
diff --git a/modules/angular2/src/common/forms/directives/ng_control_name.ts b/modules/angular2/src/common/forms/directives/ng_control_name.ts
index 3a5dd04a76..62b5a2f6e4 100644
--- a/modules/angular2/src/common/forms/directives/ng_control_name.ts
+++ b/modules/angular2/src/common/forms/directives/ng_control_name.ts
@@ -1,4 +1,3 @@
-import {CONST_EXPR} from 'angular2/src/facade/lang';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {
@@ -32,7 +31,7 @@ import {ValidatorFn, AsyncValidatorFn} from './validators';
export const controlNameBinding =
- CONST_EXPR(new Provider(NgControl, {useExisting: forwardRef(() => NgControlName)}));
+ /*@ts2dart_const*/ new Provider(NgControl, {useExisting: forwardRef(() => NgControlName)});
/**
* Creates and binds a control with a specified name to a DOM element.
diff --git a/modules/angular2/src/common/forms/directives/ng_form.ts b/modules/angular2/src/common/forms/directives/ng_form.ts
index e8a8efd753..5e3344257f 100644
--- a/modules/angular2/src/common/forms/directives/ng_form.ts
+++ b/modules/angular2/src/common/forms/directives/ng_form.ts
@@ -5,7 +5,7 @@ import {
PromiseCompleter
} from 'angular2/src/facade/async';
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/facade/lang';
import {Directive, forwardRef, Provider, Optional, Inject, Self} from 'angular2/core';
import {NgControl} from './ng_control';
import {Form} from './form_interface';
@@ -15,8 +15,8 @@ import {AbstractControl, ControlGroup, Control} from '../model';
import {setUpControl, setUpControlGroup, composeValidators, composeAsyncValidators} from './shared';
import {Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
-export const formDirectiveProvider =
- CONST_EXPR(new Provider(ControlContainer, {useExisting: forwardRef(() => NgForm)}));
+const formDirectiveProvider =
+ /*@ts2dart_const*/ new Provider(ControlContainer, {useExisting: forwardRef(() => NgForm)});
/**
* If `NgForm` is bound in a component, `