style(lint): re-format modules/@angular
This commit is contained in:
@ -1,53 +1,18 @@
|
||||
import {
|
||||
AnimationMetadata,
|
||||
AnimationEntryMetadata,
|
||||
AnimationStateMetadata,
|
||||
AnimationStateDeclarationMetadata,
|
||||
AnimationStateTransitionMetadata,
|
||||
AnimationStyleMetadata,
|
||||
AnimationKeyframesSequenceMetadata,
|
||||
AnimationAnimateMetadata,
|
||||
AnimationWithStepsMetadata,
|
||||
AnimationGroupMetadata,
|
||||
AttributeMetadata,
|
||||
OptionalMetadata,
|
||||
ComponentMetadata,
|
||||
SelfMetadata,
|
||||
HostMetadata,
|
||||
SkipSelfMetadata,
|
||||
Provider,
|
||||
PLATFORM_DIRECTIVES,
|
||||
PLATFORM_PIPES,
|
||||
Injectable,
|
||||
Inject,
|
||||
Optional,
|
||||
ViewMetadata,
|
||||
QueryMetadata,
|
||||
resolveForwardRef,
|
||||
InjectMetadata,
|
||||
ViewQueryMetadata
|
||||
} from '@angular/core';
|
||||
import {LIFECYCLE_HOOKS_VALUES, ReflectorReader, reflector} from '../core_private';
|
||||
import {
|
||||
Type,
|
||||
isBlank,
|
||||
isPresent,
|
||||
isArray,
|
||||
stringify,
|
||||
isString,
|
||||
isStringMap
|
||||
} from '../src/facade/lang';
|
||||
import {AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata, AnimationMetadata, AnimationStateDeclarationMetadata, AnimationStateMetadata, AnimationStateTransitionMetadata, AnimationStyleMetadata, AnimationWithStepsMetadata, AttributeMetadata, ComponentMetadata, HostMetadata, Inject, InjectMetadata, Injectable, Optional, OptionalMetadata, PLATFORM_DIRECTIVES, PLATFORM_PIPES, Provider, QueryMetadata, SelfMetadata, SkipSelfMetadata, ViewMetadata, ViewQueryMetadata, resolveForwardRef} from '@angular/core';
|
||||
|
||||
import {LIFECYCLE_HOOKS_VALUES, ReflectorReader, createProvider, isProviderLiteral, reflector} from '../core_private';
|
||||
import {StringMapWrapper} from '../src/facade/collection';
|
||||
import {BaseException} from '../src/facade/exceptions';
|
||||
import {Type, isArray, isBlank, isPresent, isString, isStringMap, stringify} from '../src/facade/lang';
|
||||
|
||||
import {assertArrayOfStrings} from './assertions';
|
||||
import * as cpl from './compile_metadata';
|
||||
import {hasLifecycleHook} from './directive_lifecycle_reflector';
|
||||
import {DirectiveResolver} from './directive_resolver';
|
||||
import {PipeResolver} from './pipe_resolver';
|
||||
import {ViewResolver} from './view_resolver';
|
||||
import {hasLifecycleHook} from './directive_lifecycle_reflector';
|
||||
import {MODULE_SUFFIX, sanitizeIdentifier, ValueTransformer, visitValue} from './util';
|
||||
import {assertArrayOfStrings} from './assertions';
|
||||
import {getUrlScheme} from './url_resolver';
|
||||
import {createProvider, isProviderLiteral} from "../core_private";
|
||||
import {MODULE_SUFFIX, ValueTransformer, sanitizeIdentifier, visitValue} from './util';
|
||||
import {ViewResolver} from './view_resolver';
|
||||
|
||||
|
||||
@Injectable()
|
||||
@ -58,11 +23,12 @@ export class CompileMetadataResolver {
|
||||
private _anonymousTypeIndex = 0;
|
||||
private _reflector: ReflectorReader;
|
||||
|
||||
constructor(private _directiveResolver: DirectiveResolver, private _pipeResolver: PipeResolver,
|
||||
private _viewResolver: ViewResolver,
|
||||
@Optional() @Inject(PLATFORM_DIRECTIVES) private _platformDirectives: Type[],
|
||||
@Optional() @Inject(PLATFORM_PIPES) private _platformPipes: Type[],
|
||||
_reflector?: ReflectorReader) {
|
||||
constructor(
|
||||
private _directiveResolver: DirectiveResolver, private _pipeResolver: PipeResolver,
|
||||
private _viewResolver: ViewResolver,
|
||||
@Optional() @Inject(PLATFORM_DIRECTIVES) private _platformDirectives: Type[],
|
||||
@Optional() @Inject(PLATFORM_PIPES) private _platformPipes: Type[],
|
||||
_reflector?: ReflectorReader) {
|
||||
if (isPresent(_reflector)) {
|
||||
this._reflector = _reflector;
|
||||
} else {
|
||||
@ -94,7 +60,8 @@ export class CompileMetadataResolver {
|
||||
var styles = this.getAnimationStyleMetadata(value.styles);
|
||||
return new cpl.CompileAnimationStateDeclarationMetadata(value.stateNameExpr, styles);
|
||||
} else if (value instanceof AnimationStateTransitionMetadata) {
|
||||
return new cpl.CompileAnimationStateTransitionMetadata(value.stateChangeExpr, this.getAnimationMetadata(value.steps));
|
||||
return new cpl.CompileAnimationStateTransitionMetadata(
|
||||
value.stateChangeExpr, this.getAnimationMetadata(value.steps));
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@ -107,9 +74,12 @@ export class CompileMetadataResolver {
|
||||
if (value instanceof AnimationStyleMetadata) {
|
||||
return this.getAnimationStyleMetadata(value);
|
||||
} else if (value instanceof AnimationKeyframesSequenceMetadata) {
|
||||
return new cpl.CompileAnimationKeyframesSequenceMetadata(value.steps.map(entry => this.getAnimationStyleMetadata(entry)));
|
||||
return new cpl.CompileAnimationKeyframesSequenceMetadata(
|
||||
value.steps.map(entry => this.getAnimationStyleMetadata(entry)));
|
||||
} else if (value instanceof AnimationAnimateMetadata) {
|
||||
let animateData = <cpl.CompileAnimationStyleMetadata|cpl.CompileAnimationKeyframesSequenceMetadata>this.getAnimationMetadata(value.styles);
|
||||
let animateData =
|
||||
<cpl.CompileAnimationStyleMetadata|cpl.CompileAnimationKeyframesSequenceMetadata>this
|
||||
.getAnimationMetadata(value.styles);
|
||||
return new cpl.CompileAnimationAnimateMetadata(value.timings, animateData);
|
||||
} else if (value instanceof AnimationWithStepsMetadata) {
|
||||
var steps = value.steps.map(step => this.getAnimationMetadata(step));
|
||||
@ -135,9 +105,9 @@ export class CompileMetadataResolver {
|
||||
var cmpMeta = <ComponentMetadata>dirMeta;
|
||||
var viewMeta = this._viewResolver.resolve(directiveType);
|
||||
assertArrayOfStrings('styles', viewMeta.styles);
|
||||
var animations = isPresent(viewMeta.animations)
|
||||
? viewMeta.animations.map(e => this.getAnimationEntryMetadata(e))
|
||||
: null;
|
||||
var animations = isPresent(viewMeta.animations) ?
|
||||
viewMeta.animations.map(e => this.getAnimationEntryMetadata(e)) :
|
||||
null;
|
||||
|
||||
templateMeta = new cpl.CompileTemplateMetadata({
|
||||
encapsulation: viewMeta.encapsulation,
|
||||
@ -258,8 +228,8 @@ export class CompileMetadataResolver {
|
||||
return pipes.map(type => this.getPipeMetadata(type));
|
||||
}
|
||||
|
||||
getDependenciesMetadata(typeOrFunc: Type | Function,
|
||||
dependencies: any[]): cpl.CompileDiDependencyMetadata[] {
|
||||
getDependenciesMetadata(typeOrFunc: Type|Function, dependencies: any[]):
|
||||
cpl.CompileDiDependencyMetadata[] {
|
||||
let hasUnknownDeps = false;
|
||||
let params = isPresent(dependencies) ? dependencies : this._reflector.parameters(typeOrFunc);
|
||||
if (isBlank(params)) {
|
||||
@ -278,31 +248,30 @@ export class CompileMetadataResolver {
|
||||
let viewQuery: ViewQueryMetadata = null;
|
||||
var token: any /** TODO #9100 */ = null;
|
||||
if (isArray(param)) {
|
||||
(<any[]>param)
|
||||
.forEach((paramEntry) => {
|
||||
if (paramEntry instanceof HostMetadata) {
|
||||
isHost = true;
|
||||
} else if (paramEntry instanceof SelfMetadata) {
|
||||
isSelf = true;
|
||||
} else if (paramEntry instanceof SkipSelfMetadata) {
|
||||
isSkipSelf = true;
|
||||
} else if (paramEntry instanceof OptionalMetadata) {
|
||||
isOptional = true;
|
||||
} else if (paramEntry instanceof AttributeMetadata) {
|
||||
isAttribute = true;
|
||||
token = paramEntry.attributeName;
|
||||
} else if (paramEntry instanceof QueryMetadata) {
|
||||
if (paramEntry.isViewQuery) {
|
||||
viewQuery = paramEntry;
|
||||
} else {
|
||||
query = paramEntry;
|
||||
}
|
||||
} else if (paramEntry instanceof InjectMetadata) {
|
||||
token = paramEntry.token;
|
||||
} else if (isValidType(paramEntry) && isBlank(token)) {
|
||||
token = paramEntry;
|
||||
}
|
||||
});
|
||||
(<any[]>param).forEach((paramEntry) => {
|
||||
if (paramEntry instanceof HostMetadata) {
|
||||
isHost = true;
|
||||
} else if (paramEntry instanceof SelfMetadata) {
|
||||
isSelf = true;
|
||||
} else if (paramEntry instanceof SkipSelfMetadata) {
|
||||
isSkipSelf = true;
|
||||
} else if (paramEntry instanceof OptionalMetadata) {
|
||||
isOptional = true;
|
||||
} else if (paramEntry instanceof AttributeMetadata) {
|
||||
isAttribute = true;
|
||||
token = paramEntry.attributeName;
|
||||
} else if (paramEntry instanceof QueryMetadata) {
|
||||
if (paramEntry.isViewQuery) {
|
||||
viewQuery = paramEntry;
|
||||
} else {
|
||||
query = paramEntry;
|
||||
}
|
||||
} else if (paramEntry instanceof InjectMetadata) {
|
||||
token = paramEntry.token;
|
||||
} else if (isValidType(paramEntry) && isBlank(token)) {
|
||||
token = paramEntry;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
token = param;
|
||||
}
|
||||
@ -324,10 +293,11 @@ export class CompileMetadataResolver {
|
||||
});
|
||||
|
||||
if (hasUnknownDeps) {
|
||||
let depsTokens = dependenciesMetadata.map((dep) => {
|
||||
return dep ? stringify(dep.token) : '?';
|
||||
}).join(', ');
|
||||
throw new BaseException(`Can't resolve all parameters for ${stringify(typeOrFunc)}: (${depsTokens}).`);
|
||||
let depsTokens =
|
||||
dependenciesMetadata.map((dep) => { return dep ? stringify(dep.token) : '?'; })
|
||||
.join(', ');
|
||||
throw new BaseException(
|
||||
`Can't resolve all parameters for ${stringify(typeOrFunc)}: (${depsTokens}).`);
|
||||
}
|
||||
|
||||
return dependenciesMetadata;
|
||||
@ -351,7 +321,7 @@ export class CompileMetadataResolver {
|
||||
}
|
||||
|
||||
getProvidersMetadata(providers: any[]):
|
||||
Array<cpl.CompileProviderMetadata | cpl.CompileTypeMetadata | any[]> {
|
||||
Array<cpl.CompileProviderMetadata|cpl.CompileTypeMetadata|any[]> {
|
||||
return providers.map((provider) => {
|
||||
provider = resolveForwardRef(provider);
|
||||
if (isArray(provider)) {
|
||||
@ -375,15 +345,13 @@ export class CompileMetadataResolver {
|
||||
}
|
||||
return new cpl.CompileProviderMetadata({
|
||||
token: this.getTokenMetadata(provider.token),
|
||||
useClass:
|
||||
isPresent(provider.useClass) ?
|
||||
this.getTypeMetadata(provider.useClass, staticTypeModuleUrl(provider.useClass)) :
|
||||
null,
|
||||
useClass: isPresent(provider.useClass) ?
|
||||
this.getTypeMetadata(provider.useClass, staticTypeModuleUrl(provider.useClass)) :
|
||||
null,
|
||||
useValue: convertToCompileValue(provider.useValue),
|
||||
useFactory: isPresent(provider.useFactory) ?
|
||||
this.getFactoryMetadata(provider.useFactory,
|
||||
staticTypeModuleUrl(provider.useFactory)) :
|
||||
null,
|
||||
this.getFactoryMetadata(provider.useFactory, staticTypeModuleUrl(provider.useFactory)) :
|
||||
null,
|
||||
useExisting: isPresent(provider.useExisting) ? this.getTokenMetadata(provider.useExisting) :
|
||||
null,
|
||||
deps: compileDeps,
|
||||
@ -391,24 +359,28 @@ export class CompileMetadataResolver {
|
||||
});
|
||||
}
|
||||
|
||||
getQueriesMetadata(queries: {[key: string]: QueryMetadata},
|
||||
isViewQuery: boolean, directiveType: Type): cpl.CompileQueryMetadata[] {
|
||||
getQueriesMetadata(
|
||||
queries: {[key: string]: QueryMetadata}, isViewQuery: boolean,
|
||||
directiveType: Type): cpl.CompileQueryMetadata[] {
|
||||
var compileQueries: any[] /** TODO #9100 */ = [];
|
||||
StringMapWrapper.forEach(queries, (query: any /** TODO #9100 */, propertyName: any /** TODO #9100 */) => {
|
||||
if (query.isViewQuery === isViewQuery) {
|
||||
compileQueries.push(this.getQueryMetadata(query, propertyName, directiveType));
|
||||
}
|
||||
});
|
||||
StringMapWrapper.forEach(
|
||||
queries, (query: any /** TODO #9100 */, propertyName: any /** TODO #9100 */) => {
|
||||
if (query.isViewQuery === isViewQuery) {
|
||||
compileQueries.push(this.getQueryMetadata(query, propertyName, directiveType));
|
||||
}
|
||||
});
|
||||
return compileQueries;
|
||||
}
|
||||
|
||||
getQueryMetadata(q: QueryMetadata, propertyName: string, typeOrFunc: Type | Function): cpl.CompileQueryMetadata {
|
||||
getQueryMetadata(q: QueryMetadata, propertyName: string, typeOrFunc: Type|Function):
|
||||
cpl.CompileQueryMetadata {
|
||||
var selectors: any /** TODO #9100 */;
|
||||
if (q.isVarBindingQuery) {
|
||||
selectors = q.varBindings.map(varName => this.getTokenMetadata(varName));
|
||||
} else {
|
||||
if (!isPresent(q.selector)) {
|
||||
throw new BaseException(`Can't construct a query for the property "${propertyName}" of "${stringify(typeOrFunc)}" since the query selector wasn't defined.`);
|
||||
throw new BaseException(
|
||||
`Can't construct a query for the property "${propertyName}" of "${stringify(typeOrFunc)}" since the query selector wasn't defined.`);
|
||||
}
|
||||
selectors = [this.getTokenMetadata(q.selector)];
|
||||
}
|
||||
@ -444,7 +416,7 @@ function flattenPipes(view: ViewMetadata, platformPipes: any[]): Type[] {
|
||||
return pipes;
|
||||
}
|
||||
|
||||
function flattenArray(tree: any[], out: Array<Type | any[]>): void {
|
||||
function flattenArray(tree: any[], out: Array<Type|any[]>): void {
|
||||
for (var i = 0; i < tree.length; i++) {
|
||||
var item = resolveForwardRef(tree[i]);
|
||||
if (isArray(item)) {
|
||||
@ -467,8 +439,8 @@ function staticTypeModuleUrl(value: any): string {
|
||||
return isStaticType(value) ? value['filePath'] : null;
|
||||
}
|
||||
|
||||
function componentModuleUrl(reflector: ReflectorReader, type: any,
|
||||
cmpMetadata: ComponentMetadata): string {
|
||||
function componentModuleUrl(
|
||||
reflector: ReflectorReader, type: any, cmpMetadata: ComponentMetadata): string {
|
||||
if (isStaticType(type)) {
|
||||
return staticTypeModuleUrl(type);
|
||||
}
|
||||
|
Reference in New Issue
Block a user