Skip to content

Commit 3aa322a

Browse files
mheverymprobst
mhevery
authored and
mprobst
committed
chore: replace @const() with /*@ts2dart_const*/
1 parent a02614b commit 3aa322a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+240
-246
lines changed

‎modules/angular2/platform/browser.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ import {
3434
import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
3535
import {XHRImpl} from "angular2/src/platform/browser/xhr_impl";
3636
import {XHR} from 'angular2/compiler';
37-
import {Provider} from 'angular2/src/core/di';
3837

3938
/**
4039
* An array of providers that should be passed into `application()` when bootstrapping a component.
4140
*/
4241
export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = /*@ts2dart_const*/ [
4342
BROWSER_APP_COMMON_PROVIDERS,
4443
COMPILER_PROVIDERS,
45-
new Provider(XHR, {useClass: XHRImpl},
46-
]);
44+
/*@ts2dart_Provider*/{provide: XHR, useClass: XHRImpl},
45+
];
4746

4847
export function browserPlatform(): PlatformRef {
4948
if (isBlank(getPlatform())) {

‎modules/angular2/platform/testing/browser_static.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ function createNgZone(): NgZone {
4949
export const TEST_BROWSER_STATIC_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
5050
/*@ts2dart_const*/ [
5151
PLATFORM_COMMON_PROVIDERS,
52-
new Provider(PLATFORM_INITIALIZER, {useValue: initBrowserTests, multi: true}
53-
]);
52+
/*@ts2dart_Provider*/{provide: PLATFORM_INITIALIZER, useValue: initBrowserTests, multi: true}
53+
];
5454

5555
export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
5656
/*@ts2dart_const*/ [
57-
new Provider(APP_ID, {useValue: 'a'},
57+
/*@ts2dart_Provider*/{provide: APP_ID, useValue: 'a'},
5858
ELEMENT_PROBE_PROVIDERS,
59-
new Provider(DirectiveResolver, {useClass: MockDirectiveResolver}),
60-
new Provider(ViewResolver, {useClass: MockViewResolver}),
59+
/*@ts2dart_Provider*/{provide: DirectiveResolver, useClass: MockDirectiveResolver},
60+
/*@ts2dart_Provider*/{provide: ViewResolver, useClass: MockViewResolver},
6161
Log,
6262
TestComponentBuilder,
63-
new Provider(NgZone, {useFactory: createNgZone}),
64-
new Provider(LocationStrategy, {useClass: MockLocationStrategy}),
65-
new Provider(AnimationBuilder, {useClass: MockAnimationBuilder}),
66-
]);
63+
/*@ts2dart_Provider*/{provide: NgZone, useFactory: createNgZone},
64+
/*@ts2dart_Provider*/{provide: LocationStrategy, useClass: MockLocationStrategy},
65+
/*@ts2dart_Provider*/{provide: AnimationBuilder, useClass: MockAnimationBuilder},
66+
];
6767

6868
/**
6969
* Default application providers for testing without a compiler.
7070
*/
7171
export const TEST_BROWSER_STATIC_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
7272
/*@ts2dart_const*/ [
7373
BROWSER_APP_COMMON_PROVIDERS,
74-
new Provider(XHR, {useClass: XHRImpl},
74+
/*@ts2dart_Provider*/{provide: XHR, useClass: XHRImpl},
7575
ADDITIONAL_TEST_BROWSER_PROVIDERS
76-
]);
76+
];

‎modules/angular2/platform/testing/server.ts‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
APP_ID,
33
NgZone,
4-
Provider,
54
PLATFORM_COMMON_PROVIDERS,
65
PLATFORM_INITIALIZER,
76
APPLICATION_COMMON_PROVIDERS,
@@ -52,8 +51,8 @@ function initServerTests() {
5251
export const TEST_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
5352
/*@ts2dart_const*/ [
5453
PLATFORM_COMMON_PROVIDERS,
55-
new Provider(PLATFORM_INITIALIZER, {useValue: initServerTests, multi: true}
56-
]);
54+
/*@ts2dart_Provider*/{provide: PLATFORM_INITIALIZER, useValue: initServerTests, multi: true}
55+
];
5756

5857
function appDoc() {
5958
try {
@@ -72,21 +71,21 @@ export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | an
7271
// list here.
7372
APPLICATION_COMMON_PROVIDERS,
7473
COMPILER_PROVIDERS,
75-
new Provider(DOCUMENT, {useFactory: appDoc}),
76-
new Provider(DomRootRenderer, {useClass: DomRootRenderer_}),
77-
new Provider(RootRenderer, {useExisting: DomRootRenderer}),
74+
/*@ts2dart_Provider*/{provide: DOCUMENT, useFactory: appDoc},
75+
/*@ts2dart_Provider*/{provide: DomRootRenderer, useClass: DomRootRenderer_},
76+
/*@ts2dart_Provider*/{provide: RootRenderer, useExisting: DomRootRenderer},
7877
EventManager,
79-
new Provider(EVENT_MANAGER_PLUGINS, {useClass: DomEventsPlugin, multi: true}),
80-
new Provider(XHR, {useClass: XHR}),
81-
new Provider(APP_ID, {useValue: 'a'}),
82-
new Provider(SharedStylesHost, {useExisting: DomSharedStylesHost}),
78+
/*@ts2dart_Provider*/{provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
79+
/*@ts2dart_Provider*/{provide: XHR, useClass: XHR},
80+
/*@ts2dart_Provider*/{provide: APP_ID, useValue: 'a'},
81+
/*@ts2dart_Provider*/{provide: SharedStylesHost, useExisting: DomSharedStylesHost},
8382
DomSharedStylesHost,
8483
ELEMENT_PROBE_PROVIDERS,
85-
new Provider(DirectiveResolver, {useClass: MockDirectiveResolver}),
86-
new Provider(ViewResolver, {useClass: MockViewResolver}),
84+
/*@ts2dart_Provider*/{provide: DirectiveResolver, useClass: MockDirectiveResolver},
85+
/*@ts2dart_Provider*/{provide: ViewResolver, useClass: MockViewResolver},
8786
Log,
8887
TestComponentBuilder,
89-
new Provider(NgZone, {useFactory: createNgZone}),
90-
new Provider(LocationStrategy, {useClass: MockLocationStrategy}),
91-
new Provider(AnimationBuilder, {useClass: MockAnimationBuilder}),
92-
]);
88+
/*@ts2dart_Provider*/{provide: NgZone, useFactory: createNgZone},
89+
/*@ts2dart_Provider*/{provide: LocationStrategy, useClass: MockLocationStrategy},
90+
/*@ts2dart_Provider*/{provide: AnimationBuilder, useClass: MockAnimationBuilder},
91+
];

‎modules/angular2/src/alt_router/metadata/metadata.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {CONST, Type, stringify} from "angular2/src/facade/lang";
1+
import {Type, stringify} from "angular2/src/facade/lang";
22

33
export abstract class RouteMetadata {
44
abstract get path(): string;
55
abstract get component(): Type;
66
}
77

8-
@CONST()
8+
/* @ts2dart_const */
99
export class Route implements RouteMetadata {
1010
path: string;
1111
component: Type;
@@ -16,8 +16,8 @@ export class Route implements RouteMetadata {
1616
toString(): string { return `@Route(${this.path}, ${stringify(this.component)})`; }
1717
}
1818

19-
@CONST()
19+
/* @ts2dart_const */
2020
export class RoutesMetadata {
2121
constructor(public routes: RouteMetadata[]) {}
2222
toString(): string { return `@Routes(${this.routes})`; }
23-
}
23+
}

‎modules/angular2/src/alt_router/router_providers.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import {ROUTER_PROVIDERS_COMMON} from './router_providers_common';
2-
import {Provider} from 'angular2/core';
32
import {
43
BrowserPlatformLocation
54
} from 'angular2/src/platform/browser/location/browser_platform_location';
65
import {PlatformLocation} from 'angular2/platform/common';
7-
import {CONST_EXPR} from 'angular2/src/facade/lang';
86

9-
export const ROUTER_PROVIDERS: any[] = CONST_EXPR([
7+
export const ROUTER_PROVIDERS: any[] = /*@ts2dart_const*/[
108
ROUTER_PROVIDERS_COMMON,
11-
CONST_EXPR(new Provider(PlatformLocation, {useClass: BrowserPlatformLocation})),
12-
]);
9+
/*@ts2dart_Provider*/{provide: PlatformLocation, useClass: BrowserPlatformLocation},
10+
];

‎modules/angular2/src/alt_router/router_providers_common.ts‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,20 @@ import {OpaqueToken, ComponentResolver} from 'angular2/core';
22
import {LocationStrategy, PathLocationStrategy, Location} from 'angular2/platform/common';
33
import {Router, RouterOutletMap} from './router';
44
import {RouterUrlSerializer, DefaultRouterUrlSerializer} from './router_url_serializer';
5-
import {CONST_EXPR} from 'angular2/src/facade/lang';
6-
import {ApplicationRef, Provider} from 'angular2/core';
5+
import {ApplicationRef} from 'angular2/core';
76
import {BaseException} from 'angular2/src/facade/exceptions';
87

9-
export const ROUTER_PROVIDERS_COMMON: any[] = CONST_EXPR([
8+
export const ROUTER_PROVIDERS_COMMON: any[] = /*@ts2dart_const*/[
109
RouterOutletMap,
11-
CONST_EXPR(new Provider(RouterUrlSerializer, {useClass: DefaultRouterUrlSerializer})),
12-
CONST_EXPR(new Provider(LocationStrategy, {useClass: PathLocationStrategy})),
13-
Location,
14-
CONST_EXPR(new Provider(Router,
15-
{
16-
useFactory: routerFactory,
17-
deps: CONST_EXPR([
18-
ApplicationRef,
19-
ComponentResolver,
20-
RouterUrlSerializer,
21-
RouterOutletMap,
22-
Location
23-
])
24-
}))
25-
]);
10+
/*@ts2dart_Provider*/ {provide: RouterUrlSerializer, useClass: DefaultRouterUrlSerializer},
11+
/*@ts2dart_Provider*/ {provide: LocationStrategy, useClass: PathLocationStrategy}, Location,
12+
/*@ts2dart_Provider*/ {
13+
provide: Router,
14+
useFactory: routerFactory,
15+
deps: /*@ts2dart_const*/
16+
[ApplicationRef, ComponentResolver, RouterUrlSerializer, RouterOutletMap, Location],
17+
},
18+
];
2619

2720
function routerFactory(app: ApplicationRef, componentResolver: ComponentResolver,
2821
urlSerializer: RouterUrlSerializer, routerOutletMap: RouterOutletMap,

‎modules/angular2/src/common/forms/directives/number_value_accessor.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import {Directive, ElementRef, Renderer, Self, forwardRef, Provider} from 'angular2/core';
1+
import {Directive, ElementRef, Renderer, Self, forwardRef} from 'angular2/core';
22
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
33
import {isBlank, NumberWrapper} from 'angular2/src/facade/lang';
44

5-
export const NUMBER_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
6-
NG_VALUE_ACCESSOR, {useExisting: forwardRef(( => NumberValueAccessor), multi: true}));
5+
export const NUMBER_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
6+
provide: NG_VALUE_ACCESSOR,
7+
useExisting: forwardRef(() => NumberValueAccessor),
8+
multi: true
9+
};
710

811
/**
912
* The accessor for writing a number value and listening to changes that is used by the

‎modules/angular2/src/common/forms/directives/radio_control_value_accessor.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import {NgControl} from 'angular2/src/common/forms/directives/ng_control';
2020
import {looseIdentical, isPresent} from 'angular2/src/facade/lang';
2121
import {ListWrapper} from 'angular2/src/facade/collection';
2222

23-
export const RADIO_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
24-
NG_VALUE_ACCESSOR, {useExisting: forwardRef(( => RadioControlValueAccessor), multi: true}));
25-
23+
export const RADIO_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
24+
povide: NG_VALUE_ACCESSOR,
25+
useExisting: forwardRef(() => RadioControlValueAccessor),
26+
multi: true
27+
};
2628

2729
/**
2830
* Internal class used by Angular to uncheck radio buttons with the matching name.

‎modules/angular2/src/common/forms/directives/select_control_value_accessor.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ import {
2020

2121
import {MapWrapper} from 'angular2/src/facade/collection';
2222

23-
export const SELECT_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
24-
NG_VALUE_ACCESSOR, {useExisting: forwardRef(( => SelectControlValueAccessor), multi: true}));
23+
export const SELECT_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
24+
provide: NG_VALUE_ACCESSOR,
25+
useExisting: forwardRef(() => SelectControlValueAccessor),
26+
multi: true
27+
};
2528

2629
function _buildValueString(id: string, value: any): string {
2730
if (isBlank(id)) return `${value}`;

‎modules/angular2/src/common/forms/directives/validators.ts‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {forwardRef, Provider, Attribute, Directive} from 'angular2/core';
1+
import {forwardRef, Attribute, Directive} from 'angular2/core';
22
import {NumberWrapper} from 'angular2/src/facade/lang';
33
import {Validators, NG_VALIDATORS} from '../validators';
44
import {AbstractControl} from '../model';
@@ -27,8 +27,11 @@ export interface Validator { validate(c: modelModule.AbstractControl): {[key: st
2727

2828
const REQUIRED = /*@ts2dart_const*/ Validators.required;
2929

30-
export const REQUIRED_VALIDATOR =
31-
/*@ts2dart_const*/ new Provider(NG_VALIDATORS, {useValue: REQUIRED, multi: true});
30+
export const REQUIRED_VALIDATOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
31+
provide: NG_VALIDATORS,
32+
useValue: REQUIRED,
33+
multi: true
34+
};
3235

3336
/**
3437
* A Directive that adds the `required` validator to any controls marked with the
@@ -59,8 +62,12 @@ export interface AsyncValidatorFn {
5962
*
6063
* {@example common/forms/ts/validators/validators.ts region='min'}
6164
*/
62-
export const MIN_LENGTH_VALIDATOR = /*@ts2dart_const*/
63-
new Provider(NG_VALIDATORS, {useExisting: forwardRef(( => MinLengthValidator), multi: true}));
65+
export const MIN_LENGTH_VALIDATOR: any = /*@ts2dart_const*/
66+
/*@ts2dart_Provider*/ {
67+
provide: NG_VALIDATORS,
68+
useExisting: forwardRef(() => MinLengthValidator),
69+
multi: true
70+
};
6471

6572
/**
6673
* A directive which installs the {@link MinLengthValidator} for any `ngControl`,
@@ -87,8 +94,12 @@ export class MinLengthValidator implements Validator {
8794
*
8895
* {@example common/forms/ts/validators/validators.ts region='max'}
8996
*/
90-
export const MAX_LENGTH_VALIDATOR = /*@ts2dart_const*/
91-
new Provider(NG_VALIDATORS, {useExisting: forwardRef(( => MaxLengthValidator), multi: true}));
97+
export const MAX_LENGTH_VALIDATOR: any = /*@ts2dart_const*/
98+
/*@ts2dart_Provider*/ {
99+
provide: NG_VALIDATORS,
100+
useExisting: forwardRef(() => MaxLengthValidator),
101+
multi: true
102+
};
92103

93104
/**
94105
* A directive which installs the {@link MaxLengthValidator} for any `ngControl, `ngFormControl`,
@@ -121,8 +132,12 @@ export class MaxLengthValidator implements Validator {
121132
* <input [ngControl]="fullName" pattern="[a-zA-Z ]*">
122133
* ```
123134
*/
124-
export const PATTERN_VALIDATOR = /*@ts2dart_const*/
125-
new Provider(NG_VALIDATORS, {useExisting: forwardRef(( => PatternValidator), multi: true}));
135+
export const PATTERN_VALIDATOR: any = /*@ts2dart_const*/
136+
/*@ts2dart_Provider*/ {
137+
provide: NG_VALIDATORS,
138+
useExisting: forwardRef(() => PatternValidator),
139+
multi: true
140+
};
126141
@Directive({
127142
selector: '[pattern][ngControl],[pattern][ngFormControl],[pattern][ngModel]',
128143
providers: [PATTERN_VALIDATOR]

0 commit comments

Comments
 (0)