Skip to content

Commit

Permalink
chore(ts2dart): replace List with Array
Browse files Browse the repository at this point in the history
  • Loading branch information
mhevery committed Aug 28, 2015
1 parent 35977cc commit 6639954
Show file tree
Hide file tree
Showing 200 changed files with 818 additions and 877 deletions.
2 changes: 1 addition & 1 deletion modules/angular2/directives.ts
Expand Up @@ -60,5 +60,5 @@ export * from './src/core/directives/ng_switch';
* ```
*
*/
export const CORE_DIRECTIVES: List<Type> =
export const CORE_DIRECTIVES: Array<Type> =
CONST_EXPR([NgClass, NgFor, NgIf, NgNonBindable, NgSwitch, NgSwitchWhen, NgSwitchDefault]);
2 changes: 1 addition & 1 deletion modules/angular2/forms.ts
Expand Up @@ -39,4 +39,4 @@ export {FormBuilder} from './src/forms/form_builder';
import {FormBuilder} from './src/forms/form_builder';
import {CONST_EXPR, Type} from './src/core/facade/lang';

export const FORM_BINDINGS: List<Type> = CONST_EXPR([FormBuilder]);
export const FORM_BINDINGS: Array<Type> = CONST_EXPR([FormBuilder]);
4 changes: 1 addition & 3 deletions modules/angular2/globals.d.ts
Expand Up @@ -5,11 +5,9 @@
/// <reference path="typings/zone/zone.d.ts"/>
declare var assert: any;

interface List<T> extends Array<T> {}

// FIXME: K must be string!
// FIXME: should have an index signature, `[k: string]: V;`
interface StringMap<K, V> {}
interface StringMap<K extends string, V> {}

interface BrowserNodeGlobal {
Object: typeof Object;
Expand Down
4 changes: 2 additions & 2 deletions modules/angular2/http.ts
Expand Up @@ -62,7 +62,7 @@ export {EventEmitter, Observable} from './src/core/facade/async';
* ```
*
*/
export const HTTP_BINDINGS: List<any> = [
export const HTTP_BINDINGS: Array<any> = [
// TODO(pascal): use factory type annotations once supported in DI
// issue: https://github.com/angular/angular/issues/3183
bind(Http)
Expand All @@ -74,7 +74,7 @@ export const HTTP_BINDINGS: List<any> = [
XHRBackend
];

export const JSONP_BINDINGS: List<any> = [
export const JSONP_BINDINGS: Array<any> = [
// TODO(pascal): use factory type annotations once supported in DI
// issue: https://github.com/angular/angular/issues/3183
bind(Jsonp)
Expand Down
5 changes: 2 additions & 3 deletions modules/angular2/router.ts
Expand Up @@ -35,11 +35,10 @@ import {Location} from './src/router/location';
import {APP_COMPONENT} from './src/core/application_tokens';
import {Binding} from './di';
import {CONST_EXPR} from './src/core/facade/lang';
import {List} from './src/core/facade/collection';

export const ROUTER_DIRECTIVES: List<any> = CONST_EXPR([RouterOutlet, RouterLink]);
export const ROUTER_DIRECTIVES: Array<any> = CONST_EXPR([RouterOutlet, RouterLink]);

export const ROUTER_BINDINGS: List<any> = CONST_EXPR([
export const ROUTER_BINDINGS: Array<any> = CONST_EXPR([
RouteRegistry,
Pipeline,
CONST_EXPR(new Binding(LocationStrategy, {toClass: PathLocationStrategy})),
Expand Down
5 changes: 2 additions & 3 deletions modules/angular2/src/compiler/html_parser.ts
@@ -1,4 +1,3 @@
import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
import {
isPresent,
StringWrapper,
Expand Down Expand Up @@ -56,8 +55,8 @@ function parseAttrs(element: Element, elementSourceInfo: string): HtmlAttrAst[]
// in DOM parsers!
var attrMap = DOM.attributeMap(element);
var attrList: string[][] = [];
MapWrapper.forEach(attrMap, (value, name) => { attrList.push([name, value]); });
ListWrapper.sort(attrList, (entry1, entry2) => StringWrapper.compare(entry1[0], entry2[0]));
attrMap.forEach((value, name) => attrList.push([name, value]));
attrList.sort((entry1, entry2) => StringWrapper.compare(entry1[0], entry2[0]));
return attrList.map(entry => parseAttr(element, elementSourceInfo, entry[0], entry[1]));
}

Expand Down
12 changes: 6 additions & 6 deletions modules/angular2/src/core/application_common.ts
Expand Up @@ -33,7 +33,7 @@ import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'
import {ViewResolver} from './compiler/view_resolver';
import {DirectiveResolver} from './compiler/directive_resolver';
import {PipeResolver} from './compiler/pipe_resolver';
import {List, ListWrapper} from 'angular2/src/core/facade/collection';
import {ListWrapper} from 'angular2/src/core/facade/collection';
import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
import {NgZone} from 'angular2/src/core/zone/ng_zone';
import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
Expand Down Expand Up @@ -84,7 +84,7 @@ var _rootInjector: Injector;
// Contains everything that is safe to share between applications.
var _rootBindings = [bind(Reflector).toValue(reflector), TestabilityRegistry];

function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
function _injectorBindings(appComponentType): Array<Type | Binding | Array<any>> {
var bestChangeDetection = new DynamicChangeDetection();
if (PreGeneratedChangeDetection.isSupported()) {
bestChangeDetection = new PreGeneratedChangeDetection();
Expand Down Expand Up @@ -290,9 +290,9 @@ export function createNgZone(): NgZone {
*
* Returns a `Promise` of {@link ApplicationRef}.
*/
export function commonBootstrap(
appComponentType: /*Type*/ any,
componentInjectableBindings: List<Type | Binding | List<any>> = null): Promise<ApplicationRef> {
export function commonBootstrap(appComponentType: /*Type*/ any,
componentInjectableBindings: Array<Type | Binding | Array<any>> =
null): Promise<ApplicationRef> {
BrowserDomAdapter.makeCurrent();
wtfInit();
var bootstrapProcess = PromiseWrapper.completer();
Expand Down Expand Up @@ -338,7 +338,7 @@ export function commonBootstrap(
return bootstrapProcess.promise;
}

function _createAppInjector(appComponentType: Type, bindings: List<Type | Binding | List<any>>,
function _createAppInjector(appComponentType: Type, bindings: Array<Type | Binding | Array<any>>,
zone: NgZone): Injector {
if (isBlank(_rootInjector)) _rootInjector = Injector.resolveAndCreate(_rootBindings);
var mergedBindings: any[] =
Expand Down
@@ -1,5 +1,5 @@
import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
import {List, ListWrapper} from 'angular2/src/core/facade/collection';
import {ListWrapper} from 'angular2/src/core/facade/collection';
import {ChangeDetectionUtil} from './change_detection_util';
import {ChangeDetectorRef} from './change_detector_ref';
import {DirectiveIndex} from './directive_record';
Expand All @@ -25,8 +25,8 @@ class _Context {
}

export class AbstractChangeDetector<T> implements ChangeDetector {
lightDomChildren: List<any> = [];
shadowDomChildren: List<any> = [];
lightDomChildren: Array<any> = [];
shadowDomChildren: Array<any> = [];
parent: ChangeDetector;
ref: ChangeDetectorRef;

Expand Down
Expand Up @@ -12,7 +12,7 @@ import {
ChangeDetectorGenConfig
} from './interfaces';
import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/di';
import {List, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {
CONST,
CONST_EXPR,
Expand Down
@@ -1,5 +1,5 @@
import {BaseException, Type, isBlank, isPresent} from 'angular2/src/core/facade/lang';
import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';

import {AbstractChangeDetector} from './abstract_change_detector';
import {ChangeDetectionUtil} from './change_detection_util';
Expand Down Expand Up @@ -36,8 +36,8 @@ export class ChangeDetectorJITGenerator {
_typeName: string;

constructor(private id: string, private changeDetectionStrategy: ChangeDetectionStrategy,
private records: List<ProtoRecord>, private propertyBindingTargets: BindingTarget[],
private eventBindings: EventBinding[], private directiveRecords: List<any>,
private records: Array<ProtoRecord>, private propertyBindingTargets: BindingTarget[],
private eventBindings: EventBinding[], private directiveRecords: Array<any>,
private genConfig: ChangeDetectorGenConfig) {
this._names =
new CodegenNameUtil(this.records, this.eventBindings, this.directiveRecords, UTIL);
Expand Down
Expand Up @@ -6,7 +6,7 @@ import {
Type,
StringWrapper
} from 'angular2/src/core/facade/lang';
import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {ProtoRecord} from './proto_record';
import {ChangeDetectionStrategy, isDefaultChangeDetectionStrategy} from './constants';
import {implementsOnDestroy} from './pipe_lifecycle_reflector';
Expand Down Expand Up @@ -128,7 +128,7 @@ export class ChangeDetectionUtil {
static operation_logical_or(left, right): any { return left || right; }
static cond(cond, trueVal, falseVal): any { return cond ? trueVal : falseVal; }

static mapFn(keys: List<any>): any {
static mapFn(keys: Array<any>): any {
function buildMap(values): StringMap<any, any> {
var res = StringMapWrapper.create();
for (var i = 0; i < keys.length; ++i) {
Expand Down
6 changes: 3 additions & 3 deletions modules/angular2/src/core/change_detection/coalesce.ts
@@ -1,5 +1,5 @@
import {isPresent, isBlank, looseIdentical} from 'angular2/src/core/facade/lang';
import {List, ListWrapper, Map} from 'angular2/src/core/facade/collection';
import {ListWrapper, Map} from 'angular2/src/core/facade/collection';
import {RecordType, ProtoRecord} from './proto_record';

/**
Expand All @@ -13,7 +13,7 @@ import {RecordType, ProtoRecord} from './proto_record';
* replaced with very cheap SELF records.
*/
export function coalesce(records: ProtoRecord[]): ProtoRecord[] {
var res: List<ProtoRecord> = [];
var res: Array<ProtoRecord> = [];
var indexMap: Map<number, number> = new Map<number, number>();

for (var i = 0; i < records.length; ++i) {
Expand Down Expand Up @@ -48,7 +48,7 @@ function _selfRecord(r: ProtoRecord, contextIndex: number, selfIndex: number): P
r.lastInDirective, false, false, r.propertyBindingIndex);
}

function _findMatching(r: ProtoRecord, rs: List<ProtoRecord>) {
function _findMatching(r: ProtoRecord, rs: Array<ProtoRecord>) {
return ListWrapper.find(
rs, (rr) => rr.mode !== RecordType.DirectiveLifecycle && _sameDirIndex(rr, r) &&
rr.mode === r.mode && looseIdentical(rr.funcOrValue, r.funcOrValue) &&
Expand Down
@@ -1,4 +1,3 @@
import {List} from 'angular2/src/core/facade/collection';

/**
* Converts `funcOrValue` to a string which can be used in generated code.
Expand Down
12 changes: 6 additions & 6 deletions modules/angular2/src/core/change_detection/codegen_name_util.ts
@@ -1,5 +1,5 @@
import {RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
import {List, ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection';
import {ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection';

import {DirectiveIndex} from './directive_record';

Expand Down Expand Up @@ -41,11 +41,11 @@ export class CodegenNameUtil {
* Record names sanitized for use as fields.
* See [sanitizeName] for details.
*/
_sanitizedNames: List<string>;
_sanitizedEventNames: Map<EventBinding, List<string>>;
_sanitizedNames: Array<string>;
_sanitizedEventNames: Map<EventBinding, Array<string>>;

constructor(private records: List<ProtoRecord>, private eventBindings: EventBinding[],
private directiveRecords: List<any>, private utilName: string) {
constructor(private records: Array<ProtoRecord>, private eventBindings: EventBinding[],
private directiveRecords: Array<any>, private utilName: string) {
this._sanitizedNames = ListWrapper.createFixedSize(this.records.length + 1);
this._sanitizedNames[CONTEXT_INDEX] = _CONTEXT_ACCESSOR;
for (var i = 0, iLen = this.records.length; i < iLen; ++i) {
Expand Down Expand Up @@ -135,7 +135,7 @@ export class CodegenNameUtil {

getFieldName(idx: number): string { return this._addFieldPrefix(this._sanitizedNames[idx]); }

getAllFieldNames(): List<string> {
getAllFieldNames(): Array<string> {
var fieldList = [];
for (var k = 0, kLen = this.getFieldCount(); k < kLen; ++k) {
if (k === 0 || this.records[k - 1].shouldBeChecked()) {
Expand Down
Expand Up @@ -5,7 +5,7 @@ import {
FunctionWrapper,
StringWrapper
} from 'angular2/src/core/facade/lang';
import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';

import {AbstractChangeDetector} from './abstract_change_detector';
import {EventBinding} from './event_binding';
Expand All @@ -18,10 +18,10 @@ import {ChangeDetectionStrategy} from './constants';
import {ProtoRecord, RecordType} from './proto_record';

export class DynamicChangeDetector extends AbstractChangeDetector<any> {
values: List<any>;
changes: List<any>;
localPipes: List<any>;
prevContexts: List<any>;
values: Array<any>;
changes: Array<any>;
localPipes: Array<any>;
prevContexts: Array<any>;
directives: any = null;

constructor(id: string, dispatcher: any, numberOfPropertyProtoRecords: number,
Expand Down
3 changes: 1 addition & 2 deletions modules/angular2/src/core/change_detection/interfaces.ts
@@ -1,4 +1,3 @@
import {List} from 'angular2/src/core/facade/collection';
import {CONST} from 'angular2/src/core/facade/lang';
import {Locals} from './parser/locals';
import {BindingTarget, BindingRecord} from './binding_record';
Expand Down Expand Up @@ -82,7 +81,7 @@ export class ChangeDetectorGenConfig {

export class ChangeDetectorDefinition {
constructor(public id: string, public strategy: ChangeDetectionStrategy,
public variableNames: List<string>, public bindingRecords: BindingRecord[],
public variableNames: Array<string>, public bindingRecords: BindingRecord[],
public eventRecords: BindingRecord[], public directiveRecords: DirectiveRecord[],
public genConfig: ChangeDetectorGenConfig) {}
}
22 changes: 11 additions & 11 deletions modules/angular2/src/core/change_detection/parser/ast.ts
@@ -1,5 +1,5 @@
import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/core/facade/lang";
import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection";
import {Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection";

export class AST {
visit(visitor: AstVisitor): any { return null; }
Expand All @@ -20,7 +20,7 @@ export class ImplicitReceiver extends AST {
* Multiple expressions separated by a semicolon.
*/
export class Chain extends AST {
constructor(public expressions: List<any>) { super(); }
constructor(public expressions: Array<any>) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitChain(this); }
}

Expand Down Expand Up @@ -63,7 +63,7 @@ export class KeyedWrite extends AST {
}

export class BindingPipe extends AST {
constructor(public exp: AST, public name: string, public args: List<any>) { super(); }
constructor(public exp: AST, public name: string, public args: Array<any>) { super(); }

visit(visitor: AstVisitor): any { return visitor.visitPipe(this); }
}
Expand All @@ -74,17 +74,17 @@ export class LiteralPrimitive extends AST {
}

export class LiteralArray extends AST {
constructor(public expressions: List<any>) { super(); }
constructor(public expressions: Array<any>) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitLiteralArray(this); }
}

export class LiteralMap extends AST {
constructor(public keys: List<any>, public values: List<any>) { super(); }
constructor(public keys: Array<any>, public values: Array<any>) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitLiteralMap(this); }
}

export class Interpolation extends AST {
constructor(public strings: List<any>, public expressions: List<any>) { super(); }
constructor(public strings: Array<any>, public expressions: Array<any>) { super(); }
visit(visitor: AstVisitor) { visitor.visitInterpolation(this); }
}

Expand All @@ -100,22 +100,22 @@ export class PrefixNot extends AST {

export class MethodCall extends AST {
constructor(public receiver: AST, public name: string, public fn: Function,
public args: List<any>) {
public args: Array<any>) {
super();
}
visit(visitor: AstVisitor): any { return visitor.visitMethodCall(this); }
}

export class SafeMethodCall extends AST {
constructor(public receiver: AST, public name: string, public fn: Function,
public args: List<any>) {
public args: Array<any>) {
super();
}
visit(visitor: AstVisitor): any { return visitor.visitSafeMethodCall(this); }
}

export class FunctionCall extends AST {
constructor(public target: AST, public args: List<any>) { super(); }
constructor(public target: AST, public args: Array<any>) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitFunctionCall(this); }
}

Expand Down Expand Up @@ -222,7 +222,7 @@ export class RecursiveAstVisitor implements AstVisitor {
ast.receiver.visit(this);
return this.visitAll(ast.args);
}
visitAll(asts: List<AST>): any {
visitAll(asts: Array<AST>): any {
ListWrapper.forEach(asts, (ast) => { ast.visit(this); });
return null;
}
Expand Down Expand Up @@ -294,7 +294,7 @@ export class AstTransformer implements AstVisitor {
return new KeyedWrite(ast.obj.visit(this), ast.key.visit(this), ast.value.visit(this));
}

visitAll(asts: List<any>): List<any> {
visitAll(asts: Array<any>): Array<any> {
var res = ListWrapper.createFixedSize(asts.length);
for (var i = 0; i < asts.length; ++i) {
res[i] = asts[i].visit(this);
Expand Down
4 changes: 2 additions & 2 deletions modules/angular2/src/core/change_detection/parser/lexer.ts
@@ -1,5 +1,5 @@
import {Injectable} from 'angular2/src/core/di/decorators';
import {List, ListWrapper, SetWrapper} from "angular2/src/core/facade/collection";
import {ListWrapper, SetWrapper} from "angular2/src/core/facade/collection";
import {
NumberWrapper,
StringJoiner,
Expand All @@ -19,7 +19,7 @@ export enum TokenType {

@Injectable()
export class Lexer {
tokenize(text: string): List<any> {
tokenize(text: string): Array<any> {
var scanner = new _Scanner(text);
var tokens = [];
var token = scanner.scanToken();
Expand Down

0 comments on commit 6639954

Please sign in to comment.