chore: kill ListWrapper.create() and .push().
These wrappers are not natively understood by ts2dart. Removing them will improve Dart2JS compilation due to fewer megamorphic calls to List functions. It also makes Angular code more succinct and improves type safety in Angular due to better type inference of the Array component type. This change exposed several bugs in Angular.
This commit is contained in:
@@ -35,7 +35,7 @@ function _convertLocalsToVariableBindings(locals: Locals): List<any> {
|
||||
var variableBindings = [];
|
||||
var loc = locals;
|
||||
while (isPresent(loc) && isPresent(loc.current)) {
|
||||
MapWrapper.forEach(loc.current, (v, k) => ListWrapper.push(variableBindings, k));
|
||||
MapWrapper.forEach(loc.current, (v, k) => variableBindings.push(k));
|
||||
loc = loc.parent;
|
||||
}
|
||||
return variableBindings;
|
||||
|
||||
@@ -455,9 +455,9 @@ export function main() {
|
||||
|
||||
var onChangesDoneCalls = [];
|
||||
var td1;
|
||||
td1 = new TestDirective(() => ListWrapper.push(onChangesDoneCalls, td1));
|
||||
td1 = new TestDirective(() => onChangesDoneCalls.push(td1));
|
||||
var td2;
|
||||
td2 = new TestDirective(() => ListWrapper.push(onChangesDoneCalls, td2));
|
||||
td2 = new TestDirective(() => onChangesDoneCalls.push(td2));
|
||||
cd.hydrate(_DEFAULT_CONTEXT, null, new FakeDirectives([td1, td2], []));
|
||||
|
||||
cd.detectChanges();
|
||||
@@ -473,11 +473,11 @@ export function main() {
|
||||
var orderOfOperations = [];
|
||||
|
||||
var directiveInShadowDom = null;
|
||||
directiveInShadowDom = new TestDirective(
|
||||
() => { ListWrapper.push(orderOfOperations, directiveInShadowDom); });
|
||||
directiveInShadowDom =
|
||||
new TestDirective(() => { orderOfOperations.push(directiveInShadowDom); });
|
||||
var parentDirective = null;
|
||||
parentDirective = new TestDirective(
|
||||
() => { ListWrapper.push(orderOfOperations, parentDirective); });
|
||||
parentDirective =
|
||||
new TestDirective(() => { orderOfOperations.push(parentDirective); });
|
||||
|
||||
parent.hydrate(_DEFAULT_CONTEXT, null, new FakeDirectives([parentDirective], []));
|
||||
child.hydrate(_DEFAULT_CONTEXT, null, new FakeDirectives([directiveInShadowDom], []));
|
||||
@@ -989,14 +989,14 @@ class TestDispatcher extends ChangeDispatcher {
|
||||
}
|
||||
|
||||
clear() {
|
||||
this.log = ListWrapper.create();
|
||||
this.loggedValues = ListWrapper.create();
|
||||
this.log = [];
|
||||
this.loggedValues = [];
|
||||
this.onAllChangesDoneCalled = true;
|
||||
}
|
||||
|
||||
notifyOnBinding(binding, value) {
|
||||
ListWrapper.push(this.log, `${binding.propertyName}=${this._asString(value)}`);
|
||||
ListWrapper.push(this.loggedValues, value);
|
||||
this.log.push(`${binding.propertyName}=${this._asString(value)}`);
|
||||
this.loggedValues.push(value);
|
||||
}
|
||||
|
||||
notifyOnAllChangesDone() { this.onAllChangesDoneCalled = true; }
|
||||
|
||||
@@ -63,7 +63,7 @@ export function main() {
|
||||
var c = isBlank(passedInContext) ? td() : passedInContext;
|
||||
var res = [];
|
||||
for (var i = 0; i < asts.length; i++) {
|
||||
ListWrapper.push(res, asts[i].eval(c, emptyLocals()));
|
||||
res.push(asts[i].eval(c, emptyLocals()));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ import {
|
||||
IS_DARTIUM
|
||||
} from 'angular2/test_lib';
|
||||
import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
|
||||
import {JsonPipe} from 'angular2/src/change_detection/pipes/json_pipe';
|
||||
|
||||
@@ -26,7 +25,7 @@ export function main() {
|
||||
var inceptionObjString;
|
||||
var catString;
|
||||
var pipe;
|
||||
var collection;
|
||||
var collection: number[];
|
||||
|
||||
function normalize(obj: string): string { return StringWrapper.replace(obj, regNewLine, ''); }
|
||||
|
||||
@@ -87,7 +86,7 @@ export function main() {
|
||||
|
||||
expect(pipe.transform(collection)).toEqual(stringCollection);
|
||||
|
||||
ListWrapper.push(collection, 1);
|
||||
collection.push(1);
|
||||
|
||||
expect(pipe.transform(collection)).toEqual(stringCollectionWith1);
|
||||
});
|
||||
|
||||
@@ -41,7 +41,8 @@ import {RenderCompiler} from 'angular2/src/render/api';
|
||||
export function main() {
|
||||
describe('compiler', function() {
|
||||
var directiveResolver, tplResolver, renderCompiler, protoViewFactory, cmpUrlMapper,
|
||||
renderCompileRequests, rootProtoView;
|
||||
rootProtoView;
|
||||
var renderCompileRequests: any[];
|
||||
|
||||
beforeEach(() => {
|
||||
directiveResolver = new DirectiveResolver();
|
||||
@@ -61,7 +62,7 @@ export function main() {
|
||||
var urlResolver = new FakeUrlResolver();
|
||||
renderCompileRequests = [];
|
||||
renderCompiler.spy('compile').andCallFake((template) => {
|
||||
ListWrapper.push(renderCompileRequests, template);
|
||||
renderCompileRequests.push(template);
|
||||
return PromiseWrapper.resolve(ListWrapper.removeAt(renderCompileResults, 0));
|
||||
});
|
||||
|
||||
@@ -607,7 +608,7 @@ class FakeProtoViewFactory extends ProtoViewFactory {
|
||||
|
||||
createAppProtoViews(componentBinding: DirectiveBinding, renderProtoView: renderApi.ProtoViewDto,
|
||||
directives: List<DirectiveBinding>): List<AppProtoView> {
|
||||
ListWrapper.push(this.requests, [componentBinding, renderProtoView, directives]);
|
||||
this.requests.push([componentBinding, renderProtoView, directives]);
|
||||
return ListWrapper.removeAt(this.results, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ export function main() {
|
||||
var dynamicBindings = [];
|
||||
|
||||
for (var i = 0; i < 20; i++) {
|
||||
ListWrapper.push(dynamicBindings, bind(i).toValue(i));
|
||||
dynamicBindings.push(bind(i).toValue(i));
|
||||
}
|
||||
|
||||
function createPei(parent, index, bindings, distance = 1, hasShadowRoot = false) {
|
||||
@@ -1090,6 +1090,6 @@ class FakeRenderer extends Renderer {
|
||||
this.log = [];
|
||||
}
|
||||
setElementProperty(viewRef, elementIndex, propertyName, value) {
|
||||
ListWrapper.push(this.log, [viewRef, elementIndex, propertyName, value]);
|
||||
this.log.push([viewRef, elementIndex, propertyName, value]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,8 +42,8 @@ export function main() {
|
||||
var viewPool;
|
||||
var manager;
|
||||
var directiveResolver;
|
||||
var createdViews;
|
||||
var createdRenderViews;
|
||||
var createdViews: any[];
|
||||
var createdRenderViews: any[];
|
||||
|
||||
function wrapPv(protoView: AppProtoView): ProtoViewRef { return new ProtoViewRef(protoView); }
|
||||
|
||||
@@ -124,7 +124,7 @@ export function main() {
|
||||
utils.spy('createView')
|
||||
.andCallFake((proto, renderViewRef, _a, _b) => {
|
||||
var view = createView(proto, renderViewRef);
|
||||
ListWrapper.push(createdViews, view);
|
||||
createdViews.push(view);
|
||||
return view;
|
||||
});
|
||||
utils.spy('attachComponentView')
|
||||
@@ -143,13 +143,13 @@ export function main() {
|
||||
renderer.spy('createRootHostView')
|
||||
.andCallFake((_b, _c) => {
|
||||
var rv = new RenderViewRef();
|
||||
ListWrapper.push(createdRenderViews, rv);
|
||||
createdRenderViews.push(rv);
|
||||
return rv;
|
||||
});
|
||||
renderer.spy('createView')
|
||||
.andCallFake((_a) => {
|
||||
var rv = new RenderViewRef();
|
||||
ListWrapper.push(createdRenderViews, rv);
|
||||
createdRenderViews.push(rv);
|
||||
return rv;
|
||||
});
|
||||
viewPool.spy('returnView').andReturn(true);
|
||||
|
||||
@@ -74,13 +74,13 @@ class LifecycleDir {
|
||||
|
||||
constructor() { this.log = []; }
|
||||
|
||||
onChange(_) { ListWrapper.push(this.log, "onChange"); }
|
||||
onChange(_) { this.log.push("onChange"); }
|
||||
|
||||
onInit() { ListWrapper.push(this.log, "onInit"); }
|
||||
onInit() { this.log.push("onInit"); }
|
||||
|
||||
onCheck() { ListWrapper.push(this.log, "onCheck"); }
|
||||
onCheck() { this.log.push("onCheck"); }
|
||||
|
||||
onAllChangesDone() { ListWrapper.push(this.log, "onAllChangesDone"); }
|
||||
onAllChangesDone() { this.log.push("onAllChangesDone"); }
|
||||
}
|
||||
|
||||
@Component({selector: 'my-comp'})
|
||||
|
||||
@@ -14,7 +14,6 @@ import {
|
||||
} from 'angular2/test_lib';
|
||||
|
||||
import {PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {BaseException} from 'angular2/src/facade/lang';
|
||||
import {DOM} from 'angular2/src/dom/dom_adapter';
|
||||
|
||||
@@ -33,13 +32,13 @@ function microTask(fn: Function): void {
|
||||
}
|
||||
|
||||
var _log;
|
||||
var _errors;
|
||||
var _traces;
|
||||
var _errors: any[];
|
||||
var _traces: any[];
|
||||
var _zone;
|
||||
|
||||
function logError(error, stackTrace) {
|
||||
ListWrapper.push(_errors, error);
|
||||
ListWrapper.push(_traces, stackTrace);
|
||||
_errors.push(error);
|
||||
_traces.push(stackTrace);
|
||||
}
|
||||
|
||||
export function main() {
|
||||
@@ -205,7 +204,8 @@ function commonTests() {
|
||||
_zone.initCallbacks({
|
||||
onTurnDone: () => {
|
||||
_log.add('onTurnDone:started');
|
||||
_zone.run(() => _log.add('nested run')) _log.add('onTurnDone:finished');
|
||||
_zone.run(() => _log.add('nested run'));
|
||||
_log.add('onTurnDone:finished');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -36,9 +36,9 @@ import {NgFor} from 'angular2/src/directives/ng_for';
|
||||
class Logger {
|
||||
log: List<string>;
|
||||
|
||||
constructor() { this.log = ListWrapper.create(); }
|
||||
constructor() { this.log = []; }
|
||||
|
||||
add(thing: string) { ListWrapper.push(this.log, thing); }
|
||||
add(thing: string) { this.log.push(thing); }
|
||||
}
|
||||
|
||||
@Directive({selector: '[message]', properties: ['message']})
|
||||
|
||||
@@ -43,7 +43,7 @@ export function main() {
|
||||
.then((view) => {
|
||||
view.detectChanges();
|
||||
|
||||
ListWrapper.push(view.context.items, 3);
|
||||
(<number[]>view.context.items).push(3);
|
||||
view.detectChanges();
|
||||
|
||||
expect(DOM.getText(view.rootNodes[0])).toEqual('1;2;3;');
|
||||
@@ -72,7 +72,7 @@ export function main() {
|
||||
view.detectChanges();
|
||||
|
||||
ListWrapper.removeAt(view.context.items, 0);
|
||||
ListWrapper.push(view.context.items, 1);
|
||||
(<number[]>view.context.items).push(1);
|
||||
view.detectChanges();
|
||||
|
||||
expect(DOM.getText(view.rootNodes[0])).toEqual('2;1;');
|
||||
@@ -108,7 +108,7 @@ export function main() {
|
||||
expect(DOM.getText(view.rootNodes[0])).toEqual('misko;shyam;');
|
||||
|
||||
// GROW
|
||||
ListWrapper.push(view.context.items, {'name': 'adam'});
|
||||
(<any[]>view.context.items).push({'name': 'adam'});
|
||||
view.detectChanges();
|
||||
|
||||
expect(DOM.getText(view.rootNodes[0])).toEqual('misko;shyam;adam;');
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
|
||||
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {
|
||||
isPresent,
|
||||
RegExpWrapper,
|
||||
@@ -18,7 +16,7 @@ export function main() {
|
||||
var m;
|
||||
|
||||
while (isPresent(m = RegExpMatcherWrapper.next(matcher))) {
|
||||
ListWrapper.push(indexes, m.index);
|
||||
indexes.push(m.index);
|
||||
expect(m[0]).toEqual('!');
|
||||
expect(m[1]).toEqual('!');
|
||||
expect(m.length).toBe(2);
|
||||
|
||||
@@ -15,7 +15,6 @@ import {
|
||||
} from 'angular2/test_lib';
|
||||
import {ControlGroup, Control, ControlArray, Validators} from 'angular2/forms';
|
||||
import {ObservableWrapper} from 'angular2/src/facade/async';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
|
||||
export function main() {
|
||||
describe("Form Model", () => {
|
||||
@@ -312,7 +311,7 @@ export function main() {
|
||||
var loggedValues = [];
|
||||
|
||||
ObservableWrapper.subscribe(g.valueChanges, (value) => {
|
||||
ListWrapper.push(loggedValues, value);
|
||||
loggedValues.push(value);
|
||||
|
||||
if (loggedValues.length == 2) {
|
||||
expect(loggedValues)
|
||||
|
||||
@@ -30,7 +30,7 @@ import {resolveInternalDomProtoView} from 'angular2/src/render/dom/view/proto_vi
|
||||
|
||||
export function runCompilerCommonTests() {
|
||||
describe('DomCompiler', function() {
|
||||
var mockStepFactory;
|
||||
var mockStepFactory: MockStepFactory;
|
||||
|
||||
function createCompiler(processClosure, urlData = null) {
|
||||
if (isBlank(urlData)) {
|
||||
@@ -117,8 +117,8 @@ export function runCompilerCommonTests() {
|
||||
var completer = PromiseWrapper.completer();
|
||||
|
||||
var compiler = createCompiler((parent, current, control) => {
|
||||
ListWrapper.push(mockStepFactory.subTaskPromises,
|
||||
completer.promise.then((_) => { subTasksCompleted = true; }));
|
||||
mockStepFactory.subTaskPromises.push(
|
||||
completer.promise.then((_) => { subTasksCompleted = true; }));
|
||||
});
|
||||
|
||||
// It should always return a Promise because the subtask is async
|
||||
@@ -177,7 +177,7 @@ class MockStepFactory extends CompileStepFactory {
|
||||
createSteps(viewDef, subTaskPromises) {
|
||||
this.viewDef = viewDef;
|
||||
this.subTaskPromises = subTaskPromises;
|
||||
ListWrapper.forEach(this.subTaskPromises, (p) => ListWrapper.push(subTaskPromises, p));
|
||||
ListWrapper.forEach(this.subTaskPromises, (p) => this.subTaskPromises.push(p));
|
||||
return this.steps;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,15 +213,15 @@ class IgnoreCurrentElementStep implements CompileStep {
|
||||
}
|
||||
}
|
||||
|
||||
function logEntry(log, parent, current) {
|
||||
function logEntry(log: string[], parent, current) {
|
||||
var parentId = '';
|
||||
if (isPresent(parent)) {
|
||||
parentId = DOM.getAttribute(parent.element, 'id') + '<';
|
||||
}
|
||||
ListWrapper.push(log, parentId + DOM.getAttribute(current.element, 'id'));
|
||||
log.push(parentId + DOM.getAttribute(current.element, 'id'));
|
||||
}
|
||||
|
||||
function createLoggerStep(log) {
|
||||
function createLoggerStep(log: string[]) {
|
||||
return new MockStep((parent, current, control) => { logEntry(log, parent, current); });
|
||||
}
|
||||
|
||||
|
||||
@@ -6,16 +6,17 @@ import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
|
||||
|
||||
export function main() {
|
||||
describe('SelectorMatcher', () => {
|
||||
var matcher, matched, selectableCollector, s1, s2, s3, s4;
|
||||
var matcher, selectableCollector, s1, s2, s3, s4;
|
||||
var matched: any[];
|
||||
|
||||
function reset() { matched = ListWrapper.create(); }
|
||||
function reset() { matched = []; }
|
||||
|
||||
beforeEach(() => {
|
||||
reset();
|
||||
s1 = s2 = s3 = s4 = null;
|
||||
selectableCollector = (selector, context) => {
|
||||
ListWrapper.push(matched, selector);
|
||||
ListWrapper.push(matched, context);
|
||||
matched.push(selector);
|
||||
matched.push(context);
|
||||
};
|
||||
matcher = new SelectorMatcher();
|
||||
});
|
||||
|
||||
@@ -35,7 +35,7 @@ class LoggingEventDispatcher implements EventDispatcher {
|
||||
constructor(log: List<List<any>>) { this.log = log; }
|
||||
|
||||
dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>) {
|
||||
ListWrapper.push(this.log, [elementIndex, eventName, locals]);
|
||||
this.log.push([elementIndex, eventName, locals]);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -93,10 +93,10 @@ export class DomTestbed {
|
||||
createRootViews(protoViews: List<ProtoViewDto>): List<TestView> {
|
||||
var views = [];
|
||||
var lastView = this.createRootView(protoViews[0]);
|
||||
ListWrapper.push(views, lastView);
|
||||
views.push(lastView);
|
||||
for (var i = 1; i < protoViews.length; i++) {
|
||||
lastView = this.createComponentView(lastView.viewRef, 0, protoViews[i]);
|
||||
ListWrapper.push(views, lastView);
|
||||
views.push(lastView);
|
||||
}
|
||||
return views;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ class FakeProtoView extends SpyObject {
|
||||
@proxy
|
||||
@IMPLEMENTS(DomView)
|
||||
class FakeView extends SpyObject {
|
||||
boundElements;
|
||||
boundElements: any[];
|
||||
proto;
|
||||
|
||||
constructor(containers = null, transitiveContentTagCount: number = 1) {
|
||||
@@ -53,7 +53,7 @@ class FakeView extends SpyObject {
|
||||
}
|
||||
var boundElement = new DomElement(null, element, contentTag);
|
||||
boundElement.viewContainer = vc;
|
||||
ListWrapper.push(this.boundElements, boundElement);
|
||||
this.boundElements.push(boundElement);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ import {
|
||||
proxy
|
||||
} from 'angular2/test_lib';
|
||||
import {isBlank} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
|
||||
import {DomProtoView} from 'angular2/src/render/dom/view/proto_view';
|
||||
import {ElementBinder} from 'angular2/src/render/dom/view/element_binder';
|
||||
@@ -42,8 +41,7 @@ export function main() {
|
||||
var root = el('<div><div></div></div>');
|
||||
var boundElements = [];
|
||||
for (var i = 0; i < boundElementCount; i++) {
|
||||
ListWrapper.push(boundElements,
|
||||
new DomElement(pv.elementBinders[i], el('<span></span'), null));
|
||||
boundElements.push(new DomElement(pv.elementBinders[i], el('<span></span'), null));
|
||||
}
|
||||
return new DomView(pv, [DOM.childNodes(root)[0]], [], boundElements);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user