chore(ts2dart): replace List with Array

Closes #3514
This commit is contained in:
Misko Hevery
2015-08-28 11:29:19 -07:00
committed by Miško Hevery
parent 4415855683
commit e916836261
204 changed files with 815 additions and 947 deletions

View File

@ -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';
@ -25,8 +25,8 @@ class _Context {
}
export class AbstractChangeDetector<T> implements ChangeDetector {
lightDomChildren: List<any> = [];
shadowDomChildren: List<any> = [];
lightDomChildren: any[] = [];
shadowDomChildren: any[] = [];
parent: ChangeDetector;
ref: ChangeDetectorRef;

View File

@ -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,

View File

@ -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';
@ -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: ProtoRecord[], private propertyBindingTargets: BindingTarget[],
private eventBindings: EventBinding[], private directiveRecords: any[],
private genConfig: ChangeDetectorGenConfig) {
this._names =
new CodegenNameUtil(this.records, this.eventBindings, this.directiveRecords, UTIL);

View File

@ -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';
@ -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: any[]): any {
function buildMap(values): StringMap<any, any> {
var res = StringMapWrapper.create();
for (var i = 0; i < keys.length; ++i) {

View File

@ -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';
/**
@ -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: ProtoRecord[] = [];
var indexMap: Map<number, number> = new Map<number, number>();
for (var i = 0; i < records.length; ++i) {
@ -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: ProtoRecord[]) {
return ListWrapper.find(
rs, (rr) => rr.mode !== RecordType.DirectiveLifecycle && _sameDirIndex(rr, r) &&
rr.mode === r.mode && looseIdentical(rr.funcOrValue, r.funcOrValue) &&

View File

@ -1,4 +1,3 @@
import {List} from 'angular2/src/core/facade/collection';
/**
* Converts `funcOrValue` to a string which can be used in generated code.

View File

@ -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';
@ -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: string[];
_sanitizedEventNames: Map<EventBinding, string[]>;
constructor(private records: List<ProtoRecord>, private eventBindings: EventBinding[],
private directiveRecords: List<any>, private utilName: string) {
constructor(private records: ProtoRecord[], private eventBindings: EventBinding[],
private directiveRecords: 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) {
@ -135,7 +135,7 @@ export class CodegenNameUtil {
getFieldName(idx: number): string { return this._addFieldPrefix(this._sanitizedNames[idx]); }
getAllFieldNames(): List<string> {
getAllFieldNames(): string[] {
var fieldList = [];
for (var k = 0, kLen = this.getFieldCount(); k < kLen; ++k) {
if (k === 0 || this.records[k - 1].shouldBeChecked()) {

View File

@ -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';
@ -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: any[];
changes: any[];
localPipes: any[];
prevContexts: any[];
directives: any = null;
constructor(id: string, dispatcher: any, numberOfPropertyProtoRecords: number,

View File

@ -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';
@ -83,7 +82,7 @@ export class ChangeDetectorGenConfig {
export class ChangeDetectorDefinition {
constructor(public id: string, public strategy: ChangeDetectionStrategy,
public variableNames: List<string>, public bindingRecords: BindingRecord[],
public variableNames: string[], public bindingRecords: BindingRecord[],
public eventRecords: BindingRecord[], public directiveRecords: DirectiveRecord[],
public genConfig: ChangeDetectorGenConfig) {}
}

View File

@ -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; }
@ -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: any[]) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitChain(this); }
}
@ -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: any[]) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitPipe(this); }
}
@ -74,17 +74,17 @@ export class LiteralPrimitive extends AST {
}
export class LiteralArray extends AST {
constructor(public expressions: List<any>) { super(); }
constructor(public expressions: 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: any[], public values: 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: any[], public expressions: any[]) { super(); }
visit(visitor: AstVisitor) { visitor.visitInterpolation(this); }
}
@ -99,23 +99,21 @@ export class PrefixNot extends AST {
}
export class MethodCall extends AST {
constructor(public receiver: AST, public name: string, public fn: Function,
public args: List<any>) {
constructor(public receiver: AST, public name: string, public fn: Function, public args: 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>) {
constructor(public receiver: AST, public name: string, public fn: Function, public args: 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: any[]) { super(); }
visit(visitor: AstVisitor): any { return visitor.visitFunctionCall(this); }
}
@ -222,7 +220,7 @@ export class RecursiveAstVisitor implements AstVisitor {
ast.receiver.visit(this);
return this.visitAll(ast.args);
}
visitAll(asts: List<AST>): any {
visitAll(asts: AST[]): any {
ListWrapper.forEach(asts, (ast) => { ast.visit(this); });
return null;
}
@ -294,7 +292,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: any[]): any[] {
var res = ListWrapper.createFixedSize(asts.length);
for (var i = 0; i < asts.length; ++i) {
res[i] = asts[i].visit(this);

View File

@ -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,
@ -19,7 +19,7 @@ export enum TokenType {
@Injectable()
export class Lexer {
tokenize(text: string): List<any> {
tokenize(text: string): any[] {
var scanner = new _Scanner(text);
var tokens = [];
var token = scanner.scanToken();

View File

@ -1,6 +1,6 @@
import {Injectable} from 'angular2/src/core/di/decorators';
import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
import {ListWrapper, List} from 'angular2/src/core/facade/collection';
import {ListWrapper} from 'angular2/src/core/facade/collection';
import {
Lexer,
EOF,
@ -85,7 +85,7 @@ export class Parser {
return new ASTWithSource(ast, input, location);
}
parseTemplateBindings(input: string, location: any): List<TemplateBinding> {
parseTemplateBindings(input: string, location: any): TemplateBinding[] {
var tokens = this._lexer.tokenize(input);
return new _ParseAST(input, location, tokens, this._reflector, false).parseTemplateBindings();
}
@ -141,7 +141,7 @@ export class Parser {
export class _ParseAST {
index: number = 0;
constructor(public input: string, public location: any, public tokens: List<any>,
constructor(public input: string, public location: any, public tokens: any[],
public reflector: Reflector, public parseAction: boolean) {}
peek(offset: number): Token {
@ -471,7 +471,7 @@ export class _ParseAST {
throw new BaseException("Fell through all cases in parsePrimary");
}
parseExpressionList(terminator: number): List<any> {
parseExpressionList(terminator: number): any[] {
var result = [];
if (!this.next.isCharacter(terminator)) {
do {
@ -677,7 +677,7 @@ class SimpleExpressionChecker implements AstVisitor {
visitKeyedWrite(ast: KeyedWrite) { this.simple = false; }
visitAll(asts: List<any>): List<any> {
visitAll(asts: any[]): any[] {
var res = ListWrapper.createFixedSize(asts.length);
for (var i = 0; i < asts.length; ++i) {
res[i] = asts[i].visit(this);

View File

@ -13,7 +13,7 @@ import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lan
* }
* ```
*/
export interface PipeTransform { transform(value: any, args: List<any>): any; }
export interface PipeTransform { transform(value: any, args: any[]): any; }
/**
* An interface that stateful pipes should implement.

View File

@ -1,5 +1,5 @@
import {BaseException, Type, isBlank, isPresent, isString} 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 {
PropertyRead,
@ -76,7 +76,7 @@ export function createEventRecords(definition: ChangeDetectorDefinition): EventB
}
export class ProtoRecordBuilder {
records: List<ProtoRecord>;
records: ProtoRecord[];
constructor() { this.records = []; }
@ -117,16 +117,16 @@ export class ProtoRecordBuilder {
}
class _ConvertAstIntoProtoRecords implements AstVisitor {
constructor(private _records: List<ProtoRecord>, private _bindingRecord: BindingRecord,
constructor(private _records: ProtoRecord[], private _bindingRecord: BindingRecord,
private _variableNames: string[], private _bindingIndex: number) {}
static append(records: List<ProtoRecord>, b: BindingRecord, variableNames: string[],
static append(records: ProtoRecord[], b: BindingRecord, variableNames: string[],
bindingIndex: number) {
var c = new _ConvertAstIntoProtoRecords(records, b, variableNames, bindingIndex);
b.ast.visit(c);
}
static create(b: BindingRecord, variableNames: List<any>): ProtoRecord[] {
static create(b: BindingRecord, variableNames: any[]): ProtoRecord[] {
var rec = [];
_ConvertAstIntoProtoRecords.append(rec, b, variableNames, null);
rec[rec.length - 1].lastInBinding = true;
@ -256,7 +256,7 @@ class _ConvertAstIntoProtoRecords implements AstVisitor {
visitIf(ast: If) { throw new BaseException('Not supported'); }
_visitAll(asts: List<any>) {
_visitAll(asts: any[]) {
var res = ListWrapper.createFixedSize(asts.length);
for (var i = 0; i < asts.length; ++i) {
res[i] = asts[i].visit(this);
@ -307,7 +307,7 @@ function _arrayFn(length: number): Function {
}
}
function _mapPrimitiveName(keys: List<any>) {
function _mapPrimitiveName(keys: any[]) {
var stringifiedKeys =
ListWrapper.join(ListWrapper.map(keys, (k) => isString(k) ? `"${k}"` : `${k}`), ", ");
return `mapFn([${stringifiedKeys}])`;
@ -391,7 +391,7 @@ function s(v): string {
return isPresent(v) ? `${v}` : '';
}
function _interpolationFn(strings: List<any>) {
function _interpolationFn(strings: any[]) {
var length = strings.length;
var c0 = length > 0 ? strings[0] : null;
var c1 = length > 1 ? strings[1] : null;

View File

@ -1,4 +1,3 @@
import {List} from 'angular2/src/core/facade/collection';
import {BindingRecord} from './binding_record';
import {DirectiveIndex} from './directive_record';
@ -23,8 +22,8 @@ export enum RecordType {
}
export class ProtoRecord {
constructor(public mode: RecordType, public name: string, public funcOrValue,
public args: List<any>, public fixedArgs: List<any>, public contextIndex: number,
constructor(public mode: RecordType, public name: string, public funcOrValue, public args: any[],
public fixedArgs: any[], public contextIndex: number,
public directiveIndex: DirectiveIndex, public selfIndex: number,
public bindingRecord: BindingRecord, public lastInBinding: boolean,
public lastInDirective: boolean, public argumentToPureFunction: boolean,