feat(ComponentResolver): Add a SystemJS resolver for compiled apps (#9145)

This commit is contained in:
Victor Berchet 2016-06-10 16:31:34 -07:00 committed by GitHub
parent b866f32832
commit a6e5ddc5af
6 changed files with 46 additions and 12 deletions

View File

@ -62,7 +62,7 @@ export class RuntimeCompiler implements ComponentResolver {
compMeta.selector, compiledTemplate.viewFactory, componentType)); compMeta.selector, compiledTemplate.viewFactory, componentType));
} }
clearCache() { clearCache(): void {
this._styleCache.clear(); this._styleCache.clear();
this._compiledTemplateCache.clear(); this._compiledTemplateCache.clear();
this._compiledTemplateDone.clear(); this._compiledTemplateDone.clear();

View File

@ -5,7 +5,7 @@ export {DynamicComponentLoader} from './linker/dynamic_component_loader';
export {ElementRef} from './linker/element_ref'; export {ElementRef} from './linker/element_ref';
export {ExpressionChangedAfterItHasBeenCheckedException} from './linker/exceptions'; export {ExpressionChangedAfterItHasBeenCheckedException} from './linker/exceptions';
export {QueryList} from './linker/query_list'; export {QueryList} from './linker/query_list';
export {SystemJsComponentResolver} from './linker/systemjs_component_resolver'; export {SystemJsCmpFactoryResolver, SystemJsComponentResolver} from './linker/systemjs_component_resolver';
export {TemplateRef} from './linker/template_ref'; export {TemplateRef} from './linker/template_ref';
export {ViewContainerRef} from './linker/view_container_ref'; export {ViewContainerRef} from './linker/view_container_ref';
export {EmbeddedViewRef, ViewRef} from './linker/view_ref'; export {EmbeddedViewRef, ViewRef} from './linker/view_ref';

View File

@ -14,7 +14,7 @@ import {ComponentFactory} from './component_factory';
*/ */
export abstract class ComponentResolver { export abstract class ComponentResolver {
abstract resolveComponent(component: Type|string): Promise<ComponentFactory<any>>; abstract resolveComponent(component: Type|string): Promise<ComponentFactory<any>>;
abstract clearCache(): any /** TODO #9100 */; abstract clearCache(): void;
} }
function _isComponentFactory(type: any): boolean { function _isComponentFactory(type: any): boolean {
@ -37,5 +37,6 @@ export class ReflectorComponentResolver extends ComponentResolver {
} }
return PromiseWrapper.resolve(componentFactory); return PromiseWrapper.resolve(componentFactory);
} }
clearCache() {} clearCache() {}
} }

View File

@ -3,6 +3,7 @@ import {Type, global, isString} from '../facade/lang';
import {ComponentFactory} from './component_factory'; import {ComponentFactory} from './component_factory';
import {ComponentResolver} from './component_resolver'; import {ComponentResolver} from './component_resolver';
const _SEPARATOR = '#';
/** /**
* Component resolver that can load components lazily * Component resolver that can load components lazily
@ -13,13 +14,42 @@ export class SystemJsComponentResolver implements ComponentResolver {
resolveComponent(componentType: string|Type): Promise<ComponentFactory<any>> { resolveComponent(componentType: string|Type): Promise<ComponentFactory<any>> {
if (isString(componentType)) { if (isString(componentType)) {
let [module, component] = componentType.split(_SEPARATOR);
if (component === void(0)) {
// Use the default export when no component is specified
component = 'default';
}
return (<any>global) return (<any>global)
.System.import(componentType) .System.import(module)
.then((module: any /** TODO #9100 */) => this._resolver.resolveComponent(module.default)); .then((module: any) => this._resolver.resolveComponent(module[component]));
} else {
return this._resolver.resolveComponent(<Type>componentType);
} }
return this._resolver.resolveComponent(componentType);
} }
clearCache() {} clearCache(): void {}
}
const FACTORY_MODULE_SUFFIX = '.ngfactory';
const FACTORY_CLASS_SUFFIX = 'NgFactory';
/**
* Component resolver that can load component factories lazily
* @experimental
*/
export class SystemJsCmpFactoryResolver implements ComponentResolver {
resolveComponent(componentType: string|Type): Promise<ComponentFactory<any>> {
if (isString(componentType)) {
let [module, factory] = componentType.split(_SEPARATOR);
return (<any>global)
.System.import(module + FACTORY_MODULE_SUFFIX)
.then((module: any) => module[factory + FACTORY_CLASS_SUFFIX]);
}
return Promise.resolve(null);
}
clearCache(): void {}
} }

View File

@ -128,7 +128,7 @@ export function isNumber(obj: any): boolean {
return typeof obj === 'number'; return typeof obj === 'number';
} }
export function isString(obj: any): boolean { export function isString(obj: any): obj is String {
return typeof obj === 'string'; return typeof obj === 'string';
} }

View File

@ -161,7 +161,7 @@ const CORE = [
'ComponentRef.onDestroy(callback:Function):void', 'ComponentRef.onDestroy(callback:Function):void',
'ComponentRef<C>', 'ComponentRef<C>',
'ComponentResolver', 'ComponentResolver',
'ComponentResolver.clearCache():any', 'ComponentResolver.clearCache():void',
'ComponentResolver.resolveComponent(component:Type|string):Promise<ComponentFactory<any>>', 'ComponentResolver.resolveComponent(component:Type|string):Promise<ComponentFactory<any>>',
'const APP_ID:any', 'const APP_ID:any',
'const APP_INITIALIZER:any', 'const APP_INITIALIZER:any',
@ -512,8 +512,11 @@ const CORE = [
'SkipSelfMetadataFactory', 'SkipSelfMetadataFactory',
'state(stateNameExpr:string, styles:AnimationStyleMetadata):AnimationStateDeclarationMetadata', 'state(stateNameExpr:string, styles:AnimationStyleMetadata):AnimationStateDeclarationMetadata',
'style(tokens:string|{[key:string]:string|number}|Array<string|{[key:string]:string|number}>):AnimationStyleMetadata', 'style(tokens:string|{[key:string]:string|number}|Array<string|{[key:string]:string|number}>):AnimationStyleMetadata',
'SystemJsCmpFactoryResolver',
'SystemJsCmpFactoryResolver.clearCache():void',
'SystemJsCmpFactoryResolver.resolveComponent(componentType:string|Type):Promise<ComponentFactory<any>>',
'SystemJsComponentResolver', 'SystemJsComponentResolver',
'SystemJsComponentResolver.clearCache():any', 'SystemJsComponentResolver.clearCache():void',
'SystemJsComponentResolver.constructor(_resolver:ComponentResolver)', 'SystemJsComponentResolver.constructor(_resolver:ComponentResolver)',
'SystemJsComponentResolver.resolveComponent(componentType:string|Type):Promise<ComponentFactory<any>>', 'SystemJsComponentResolver.resolveComponent(componentType:string|Type):Promise<ComponentFactory<any>>',
'TemplateRef.createEmbeddedView(context:C):EmbeddedViewRef<C>', 'TemplateRef.createEmbeddedView(context:C):EmbeddedViewRef<C>',
@ -1356,7 +1359,7 @@ const COMPILER = [
'RenderTypes.renderNode:CompileIdentifierMetadata', 'RenderTypes.renderNode:CompileIdentifierMetadata',
'RenderTypes.renderText:CompileIdentifierMetadata', 'RenderTypes.renderText:CompileIdentifierMetadata',
'RuntimeCompiler', 'RuntimeCompiler',
'RuntimeCompiler.clearCache():any', 'RuntimeCompiler.clearCache():void',
'RuntimeCompiler.constructor(_metadataResolver:CompileMetadataResolver, _templateNormalizer:DirectiveNormalizer, _templateParser:TemplateParser, _styleCompiler:StyleCompiler, _viewCompiler:ViewCompiler, _xhr:XHR, _genConfig:CompilerConfig)', 'RuntimeCompiler.constructor(_metadataResolver:CompileMetadataResolver, _templateNormalizer:DirectiveNormalizer, _templateParser:TemplateParser, _styleCompiler:StyleCompiler, _viewCompiler:ViewCompiler, _xhr:XHR, _genConfig:CompilerConfig)',
'RuntimeCompiler.resolveComponent(component:Type|string):Promise<ComponentFactory<any>>', 'RuntimeCompiler.resolveComponent(component:Type|string):Promise<ComponentFactory<any>>',
'SourceModule', 'SourceModule',