refactor: add types (#9606)

relates to #9100
This commit is contained in:
Victor Berchet
2016-06-28 11:35:59 -07:00
committed by GitHub
parent 1620426393
commit 5ee84fe0f6
13 changed files with 68 additions and 70 deletions

View File

@ -36,7 +36,7 @@ export abstract class CompileMetadataWithType extends CompileMetadataWithIdentif
}
export function metadataFromJson(data: {[key: string]: any}): any {
return (_COMPILE_METADATA_FROM_JSON as any /** TODO #9100 */)[data['class']](data);
return (_COMPILE_METADATA_FROM_JSON as any)[data['class']](data);
}
export class CompileAnimationEntryMetadata {
@ -487,7 +487,7 @@ export class CompileTokenMap<VALUE> {
get(token: CompileTokenMetadata): VALUE {
var rk = token.runtimeCacheKey;
var ak = token.assetCacheKey;
var result: any /** TODO #9100 */;
var result: VALUE;
if (isPresent(rk)) {
result = this._valueMap.get(rk);
}

View File

@ -67,9 +67,9 @@ export abstract class RenderTypes {
export class DefaultRenderTypes implements RenderTypes {
renderer = Identifiers.Renderer;
renderText: any /** TODO #9100 */ = null;
renderElement: any /** TODO #9100 */ = null;
renderComment: any /** TODO #9100 */ = null;
renderNode: any /** TODO #9100 */ = null;
renderEvent: any /** TODO #9100 */ = null;
renderText: any = null;
renderElement: any = null;
renderComment: any = null;
renderNode: any = null;
renderEvent: any = null;
}

View File

@ -89,7 +89,7 @@ export class CssScannerError extends BaseException {
public rawMessage: string;
public message: string;
constructor(public token: CssToken, message: any /** TODO #9100 */) {
constructor(public token: CssToken, message: string) {
super('Css Parse Error: ' + message);
this.rawMessage = message;
}
@ -208,7 +208,7 @@ export class CssScanner {
next = new CssToken(0, 0, 0, CssTokenType.EOF, 'end of file');
}
var isMatchingType: any /** TODO #9100 */;
var isMatchingType: boolean;
if (type == CssTokenType.IdentifierOrNumber) {
// TODO (matsko): implement array traversal for lookup here
isMatchingType = next.type == CssTokenType.Number || next.type == CssTokenType.Identifier;
@ -220,7 +220,7 @@ export class CssScanner {
// mode so that the parser can recover...
this.setMode(mode);
var error: any /** TODO #9100 */ = null;
var error: CssScannerError = null;
if (!isMatchingType || (isPresent(value) && value != next.strValue)) {
var errorMessage = resolveEnumToken(CssTokenType, next.type) + ' does not match expected ' +
resolveEnumToken(CssTokenType, type) + ' value';

View File

@ -194,7 +194,7 @@ export class CssParser {
/** @internal */
_parseStyleSheet(delimiters: number): CssStyleSheetAst {
const start = this._getScannerIndex();
var results: any[] /** TODO #9100 */ = [];
var results: CssAst[] = [];
this._scanner.consumeEmptyStatements();
while (this._scanner.peek != chars.$EOF) {
this._scanner.setMode(CssLexerMode.BLOCK);
@ -325,7 +325,7 @@ export class CssParser {
_parseSelectors(delimiters: number): CssSelectorAst[] {
delimiters |= LBRACE_DELIM_FLAG | SEMICOLON_DELIM_FLAG;
var selectors: any[] /** TODO #9100 */ = [];
var selectors: CssSelectorAst[] = [];
var isParsingSelectors = true;
while (isParsingSelectors) {
selectors.push(this._parseSelector(delimiters));
@ -378,7 +378,7 @@ export class CssParser {
this._consume(CssTokenType.Character, '{');
var definitions: any[] /** TODO #9100 */ = [];
var definitions: CssKeyframeDefinitionAst[] = [];
while (!characterContainsDelimiter(this._scanner.peek, delimiters)) {
definitions.push(this._parseKeyframeDefinition(delimiters));
}
@ -392,7 +392,7 @@ export class CssParser {
/** @internal */
_parseKeyframeDefinition(delimiters: number): CssKeyframeDefinitionAst {
const start = this._getScannerIndex();
var stepTokens: any[] /** TODO #9100 */ = [];
var stepTokens: CssToken[] = [];
delimiters |= LBRACE_DELIM_FLAG;
while (!characterContainsDelimiter(this._scanner.peek, delimiters)) {
stepTokens.push(this._parseKeyframeLabel(delimiters | COMMA_DELIM_FLAG));
@ -701,7 +701,7 @@ export class CssParser {
/** @internal */
_collectUntilDelim(delimiters: number, assertType: CssTokenType = null): CssToken[] {
var tokens: any[] /** TODO #9100 */ = [];
var tokens: CssToken[] = [];
while (!characterContainsDelimiter(this._scanner.peek, delimiters)) {
var val = isPresent(assertType) ? this._consume(assertType) : this._scan();
tokens.push(val);
@ -720,7 +720,7 @@ export class CssParser {
this._consume(CssTokenType.Character, '{');
this._scanner.consumeEmptyStatements();
var results: any[] /** TODO #9100 */ = [];
var results: CssAst[] = [];
while (!characterContainsDelimiter(this._scanner.peek, delimiters)) {
results.push(this._parseRule(delimiters));
}
@ -770,7 +770,7 @@ export class CssParser {
this._scanner.setMode(CssLexerMode.STYLE_BLOCK);
var prop = this._consume(CssTokenType.Identifier);
var parseValue: any /** TODO #9100 */, value: any /** TODO #9100 */ = null;
var parseValue: boolean, value: CssStyleValueAst = null;
// the colon value separates the prop from the style.
// there are a few cases as to what could happen if it

View File

@ -34,7 +34,7 @@ const LIFECYCLE_PROPS: Map<any, string> = MapWrapper.createFromPairs([
[LifecycleHooks.AfterViewChecked, 'ngAfterViewChecked'],
]);
export function hasLifecycleHook(hook: LifecycleHooks, token: any /** TODO #9100 */): boolean {
export function hasLifecycleHook(hook: LifecycleHooks, token: any): boolean {
var lcInterface = LIFECYCLE_INTERFACES.get(hook);
var lcProp = LIFECYCLE_PROPS.get(hook);
return reflector.hasLifecycleHook(token, lcInterface, lcProp);

View File

@ -97,7 +97,7 @@ export class DirectiveResolver {
queries: {[key: string]: any}, directiveType: Type): DirectiveMetadata {
var mergedInputs = isPresent(dm.inputs) ? ListWrapper.concat(dm.inputs, inputs) : inputs;
var mergedOutputs: any /** TODO #9100 */;
var mergedOutputs: string[];
if (isPresent(dm.outputs)) {
dm.outputs.forEach((propName: string) => {
if (ListWrapper.contains(outputs, propName)) {