X Tutup
Skip to content

Commit 4282297

Browse files
yjbanovyjbanov
committed
fix(ddc): type fixes necessary to bring DDC severe count to 0
1 parent 9c96b8a commit 4282297

File tree

13 files changed

+82
-59
lines changed

13 files changed

+82
-59
lines changed

‎modules/angular2/src/common/directives/observable_list_diff.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ObservableListDiff extends DefaultIterableDiffer {
2121
}
2222
}
2323

24-
dynamic diff(ObservableList collection) {
24+
DefaultIterableDiffer diff(ObservableList collection) {
2525
if (collection is! ObservableList) {
2626
throw "Cannot change the type of a collection";
2727
}

‎modules/angular2/src/core/application_ref.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,5 +513,5 @@ export class ApplicationRef_ extends ApplicationRef {
513513
this._platform._applicationDisposed(this);
514514
}
515515

516-
get componentTypes(): any[] { return this._rootComponentTypes; }
516+
get componentTypes(): Type[] { return this._rootComponentTypes; }
517517
}

‎modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {IterableDiffer, IterableDifferFactory} from '../differs/iterable_differs
2222
@CONST()
2323
export class DefaultIterableDifferFactory implements IterableDifferFactory {
2424
supports(obj: Object): boolean { return isListLikeIterable(obj); }
25-
create(cdRef: ChangeDetectorRef): any { return new DefaultIterableDiffer(); }
25+
create(cdRef: ChangeDetectorRef): DefaultIterableDiffer { return new DefaultIterableDiffer(); }
2626
}
2727

2828
export class DefaultIterableDiffer implements IterableDiffer {

‎modules/angular2/src/core/change_detection/differs/iterable_differs.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2
99
* respond to changes in an iterable by effecting equivalent changes in the DOM.
1010
*/
1111
export interface IterableDiffer {
12-
diff(object: Object): any;
12+
diff(object: any): any;
1313
onDestroy();
1414
}
1515

1616
/**
1717
* Provides a factory for {@link IterableDiffer}.
1818
*/
1919
export interface IterableDifferFactory {
20-
supports(objects: Object): boolean;
20+
supports(objects: any): boolean;
2121
create(cdRef: ChangeDetectorRef): IterableDiffer;
2222
}
2323

@@ -74,7 +74,7 @@ export class IterableDiffers {
7474
});
7575
}
7676

77-
find(iterable: Object): IterableDifferFactory {
77+
find(iterable: any): IterableDifferFactory {
7878
var factory = this.factories.find(f => f.supports(iterable));
7979
if (isPresent(factory)) {
8080
return factory;

‎modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2
88
* A differ that tracks changes made to an object over time.
99
*/
1010
export interface KeyValueDiffer {
11-
diff(object: Object);
11+
diff(object: any);
1212
onDestroy();
1313
}
1414

1515
/**
1616
* Provides a factory for {@link KeyValueDiffer}.
1717
*/
1818
export interface KeyValueDifferFactory {
19-
supports(objects: Object): boolean;
19+
supports(objects: any): boolean;
2020
create(cdRef: ChangeDetectorRef): KeyValueDiffer;
2121
}
2222

‎modules/angular2/src/core/di/injector.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class ProtoInjectorInlineStrategy implements ProtoInjectorStrategy {
143143
}
144144
}
145145

146-
getProviderAtIndex(index: number): any {
146+
getProviderAtIndex(index: number): ResolvedProvider {
147147
if (index == 0) return this.provider0;
148148
if (index == 1) return this.provider1;
149149
if (index == 2) return this.provider2;
@@ -181,7 +181,7 @@ export class ProtoInjectorDynamicStrategy implements ProtoInjectorStrategy {
181181
}
182182
}
183183

184-
getProviderAtIndex(index: number): any {
184+
getProviderAtIndex(index: number): ResolvedProvider {
185185
if (index < 0 || index >= this.providers.length) {
186186
throw new OutOfBoundsError(index);
187187
}
@@ -210,7 +210,9 @@ export class ProtoInjector {
210210
new ProtoInjectorInlineStrategy(this, bwv);
211211
}
212212

213-
getProviderAtIndex(index: number): any { return this._strategy.getProviderAtIndex(index); }
213+
getProviderAtIndex(index: number): ResolvedProvider {
214+
return this._strategy.getProviderAtIndex(index);
215+
}
214216
}
215217

216218

‎modules/angular2/src/core/linker/view.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export class AppView implements ChangeDispatcher {
250250
return this.appElements[directive.elementIndex].getDirectiveAtIndex(directive.directiveIndex);
251251
}
252252

253-
getDetectorFor(directive: DirectiveIndex): any {
253+
getDetectorFor(directive: DirectiveIndex): ChangeDetector {
254254
var componentView = this.appElements[directive.elementIndex].componentView;
255255
return isPresent(componentView) ? componentView.changeDetector : null;
256256
}

‎modules/angular2/src/core/linker/view_container_ref.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ export class ViewContainerRef_ extends ViewContainerRef {
133133

134134
// TODO(rado): profile and decide whether bounds checks should be added
135135
// to the methods below.
136-
createEmbeddedView(templateRef: TemplateRef_, index: number = -1): EmbeddedViewRef {
136+
createEmbeddedView(templateRef: TemplateRef, index: number = -1): EmbeddedViewRef {
137137
if (index == -1) index = this.length;
138138
var vm = this._element.parentView.viewManager;
139139
return vm.createEmbeddedViewInContainer(this._element.ref, index, templateRef);
140140
}
141141

142-
createHostView(hostViewFactoryRef: HostViewFactoryRef_, index: number = -1,
142+
createHostView(hostViewFactoryRef: HostViewFactoryRef, index: number = -1,
143143
dynamicallyCreatedProviders: ResolvedProvider[] = null,
144144
projectableNodes: any[][] = null): HostViewRef {
145145
if (index == -1) index = this.length;
@@ -149,14 +149,14 @@ export class ViewContainerRef_ extends ViewContainerRef {
149149
}
150150

151151
// TODO(i): refactor insert+remove into move
152-
insert(viewRef: ViewRef_, index: number = -1): EmbeddedViewRef {
152+
insert(viewRef: ViewRef, index: number = -1): EmbeddedViewRef {
153153
if (index == -1) index = this.length;
154154
var vm = this._element.parentView.viewManager;
155155
return vm.attachViewInContainer(this._element.ref, index, viewRef);
156156
}
157157

158-
indexOf(viewRef: ViewRef_): number {
159-
return ListWrapper.indexOf(this._element.nestedViews, viewRef.internalView);
158+
indexOf(viewRef: ViewRef): number {
159+
return ListWrapper.indexOf(this._element.nestedViews, (<ViewRef_>viewRef).internalView);
160160
}
161161

162162
// TODO(i): rename to destroy

‎modules/angular2/src/core/linker/view_manager.ts‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
HostViewFactoryRef_,
1818
EmbeddedViewRef,
1919
HostViewRef,
20+
ViewRef,
2021
ViewRef_
2122
} from './view_ref';
2223
import {ViewContainerRef} from './view_container_ref';
@@ -189,20 +190,20 @@ export class AppViewManager_ extends AppViewManager {
189190
super();
190191
}
191192

192-
getViewContainer(location: ElementRef_): ViewContainerRef {
193-
return location.internalElement.getViewContainerRef();
193+
getViewContainer(location: ElementRef): ViewContainerRef {
194+
return (<ElementRef_>location).internalElement.getViewContainerRef();
194195
}
195196

196-
getHostElement(hostViewRef: ViewRef_): ElementRef {
197-
var hostView = hostViewRef.internalView;
197+
getHostElement(hostViewRef: ViewRef): ElementRef {
198+
var hostView = (<ViewRef_>hostViewRef).internalView;
198199
if (hostView.proto.type !== ViewType.HOST) {
199200
throw new BaseException('This operation is only allowed on host views');
200201
}
201202
return hostView.appElements[0].ref;
202203
}
203204

204-
getNamedElementInComponentView(hostLocation: ElementRef_, variableName: string): ElementRef {
205-
var appEl = hostLocation.internalElement;
205+
getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef {
206+
var appEl = (<ElementRef_>hostLocation).internalElement;
206207
var componentView = appEl.componentView;
207208
if (isBlank(componentView)) {
208209
throw new BaseException(`There is no component directive at element ${hostLocation}`);
@@ -216,17 +217,17 @@ export class AppViewManager_ extends AppViewManager {
216217
throw new BaseException(`Could not find variable ${variableName}`);
217218
}
218219

219-
getComponent(hostLocation: ElementRef_): any {
220-
return hostLocation.internalElement.getComponent();
220+
getComponent(hostLocation: ElementRef): any {
221+
return (<ElementRef_>hostLocation).internalElement.getComponent();
221222
}
222223

223224
/** @internal */
224225
_createRootHostViewScope: WtfScopeFn = wtfCreateScope('AppViewManager#createRootHostView()');
225226

226-
createRootHostView(hostViewFactoryRef: HostViewFactoryRef_, overrideSelector: string,
227+
createRootHostView(hostViewFactoryRef: HostViewFactoryRef, overrideSelector: string,
227228
injector: Injector, projectableNodes: any[][] = null): HostViewRef {
228229
var s = this._createRootHostViewScope();
229-
var hostViewFactory = hostViewFactoryRef.internalHostViewFactory;
230+
var hostViewFactory = (<HostViewFactoryRef_>hostViewFactoryRef).internalHostViewFactory;
230231
var selector = isPresent(overrideSelector) ? overrideSelector : hostViewFactory.selector;
231232
var view = hostViewFactory.viewFactory(this._renderer, this, null, projectableNodes, selector,
232233
null, injector);
@@ -236,9 +237,9 @@ export class AppViewManager_ extends AppViewManager {
236237
/** @internal */
237238
_destroyRootHostViewScope: WtfScopeFn = wtfCreateScope('AppViewManager#destroyRootHostView()');
238239

239-
destroyRootHostView(hostViewRef: ViewRef_) {
240+
destroyRootHostView(hostViewRef: ViewRef) {
240241
var s = this._destroyRootHostViewScope();
241-
var hostView = hostViewRef.internalView;
242+
var hostView = (<ViewRef_>hostViewRef).internalView;
242243
hostView.renderer.detachView(flattenNestedViewRenderNodes(hostView.rootNodesOrAppElements));
243244
hostView.destroy();
244245
wtfLeave(s);
@@ -248,42 +249,44 @@ export class AppViewManager_ extends AppViewManager {
248249
_createEmbeddedViewInContainerScope: WtfScopeFn =
249250
wtfCreateScope('AppViewManager#createEmbeddedViewInContainer()');
250251

251-
createEmbeddedViewInContainer(viewContainerLocation: ElementRef_, index: number,
252-
templateRef: TemplateRef_): EmbeddedViewRef {
252+
createEmbeddedViewInContainer(viewContainerLocation: ElementRef, index: number,
253+
templateRef: TemplateRef): EmbeddedViewRef {
253254
var s = this._createEmbeddedViewInContainerScope();
254-
var contextEl = templateRef.elementRef.internalElement;
255+
var contextEl = (<TemplateRef_>templateRef).elementRef.internalElement;
255256
var view: AppView =
256257
contextEl.embeddedViewFactory(contextEl.parentView.renderer, this, contextEl,
257258
contextEl.parentView.projectableNodes, null, null, null);
258-
this._attachViewToContainer(view, viewContainerLocation.internalElement, index);
259+
this._attachViewToContainer(view, (<ElementRef_>viewContainerLocation).internalElement, index);
259260
return wtfLeave(s, view.ref);
260261
}
261262

262263
/** @internal */
263264
_createHostViewInContainerScope: WtfScopeFn =
264265
wtfCreateScope('AppViewManager#createHostViewInContainer()');
265266

266-
createHostViewInContainer(viewContainerLocation: ElementRef_, index: number,
267-
hostViewFactoryRef: HostViewFactoryRef_,
267+
createHostViewInContainer(viewContainerLocation: ElementRef, index: number,
268+
hostViewFactoryRef: HostViewFactoryRef,
268269
dynamicallyCreatedProviders: ResolvedProvider[],
269270
projectableNodes: any[][]): HostViewRef {
270271
var s = this._createHostViewInContainerScope();
271272
// TODO(tbosch): This should be specifiable via an additional argument!
272-
var contextEl = viewContainerLocation.internalElement;
273-
var hostViewFactory = hostViewFactoryRef.internalHostViewFactory;
273+
var viewContainerLocation_ = <ElementRef_>viewContainerLocation;
274+
var contextEl = viewContainerLocation_.internalElement;
275+
var hostViewFactory = (<HostViewFactoryRef_>hostViewFactoryRef).internalHostViewFactory;
274276
var view = hostViewFactory.viewFactory(
275277
contextEl.parentView.renderer, contextEl.parentView.viewManager, contextEl,
276278
projectableNodes, null, dynamicallyCreatedProviders, null);
277-
this._attachViewToContainer(view, viewContainerLocation.internalElement, index);
279+
this._attachViewToContainer(view, viewContainerLocation_.internalElement, index);
278280
return wtfLeave(s, view.ref);
279281
}
280282

281283
/** @internal */
282284
_destroyViewInContainerScope = wtfCreateScope('AppViewMananger#destroyViewInContainer()');
283285

284-
destroyViewInContainer(viewContainerLocation: ElementRef_, index: number) {
286+
destroyViewInContainer(viewContainerLocation: ElementRef, index: number) {
285287
var s = this._destroyViewInContainerScope();
286-
var view = this._detachViewInContainer(viewContainerLocation.internalElement, index);
288+
var view =
289+
this._detachViewInContainer((<ElementRef_>viewContainerLocation).internalElement, index);
287290
view.destroy();
288291
wtfLeave(s);
289292
}
@@ -292,20 +295,23 @@ export class AppViewManager_ extends AppViewManager {
292295
_attachViewInContainerScope = wtfCreateScope('AppViewMananger#attachViewInContainer()');
293296

294297
// TODO(i): refactor detachViewInContainer+attachViewInContainer to moveViewInContainer
295-
attachViewInContainer(viewContainerLocation: ElementRef_, index: number,
296-
viewRef: ViewRef_): EmbeddedViewRef {
298+
attachViewInContainer(viewContainerLocation: ElementRef, index: number,
299+
viewRef: ViewRef): EmbeddedViewRef {
300+
var viewRef_ = <ViewRef_>viewRef;
297301
var s = this._attachViewInContainerScope();
298-
this._attachViewToContainer(viewRef.internalView, viewContainerLocation.internalElement, index);
299-
return wtfLeave(s, viewRef);
302+
this._attachViewToContainer(viewRef_.internalView,
303+
(<ElementRef_>viewContainerLocation).internalElement, index);
304+
return wtfLeave(s, viewRef_);
300305
}
301306

302307
/** @internal */
303308
_detachViewInContainerScope = wtfCreateScope('AppViewMananger#detachViewInContainer()');
304309

305310
// TODO(i): refactor detachViewInContainer+attachViewInContainer to moveViewInContainer
306-
detachViewInContainer(viewContainerLocation: ElementRef_, index: number): EmbeddedViewRef {
311+
detachViewInContainer(viewContainerLocation: ElementRef, index: number): EmbeddedViewRef {
307312
var s = this._detachViewInContainerScope();
308-
var view = this._detachViewInContainer(viewContainerLocation.internalElement, index);
313+
var view =
314+
this._detachViewInContainer((<ElementRef_>viewContainerLocation).internalElement, index);
309315
return wtfLeave(s, view.ref);
310316
}
311317

‎modules/angular2/src/core/reflection/reflection.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class NoReflectionCapabilities implements PlatformReflectionCapabilities {
2323
}
2424

2525
@override
26-
List parameters(dynamic type) {
26+
List<List> parameters(dynamic type) {
2727
throw "Cannot find reflection information on ${stringify(type)}";
2828
}
2929

@@ -33,7 +33,7 @@ class NoReflectionCapabilities implements PlatformReflectionCapabilities {
3333
}
3434

3535
@override
36-
Map propMetadata(dynamic type) {
36+
Map<String, List> propMetadata(dynamic type) {
3737
throw "Cannot find reflection information on ${stringify(type)}";
3838
}
3939

0 commit comments

Comments
 (0)
X Tutup