cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(compiler): cleanup method and property names

Browse Source 
Closes #4236
This commit is contained in:
Tobias Bosch
2015-09-17 09:58:18 -07:00
parent d05df30a94
commit f490565b09
7 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/angular2/src/compiler/source_module.ts
View File

@ -7,25 +7,26 @@ export function moduleRef(moduleId): string {
}
export class SourceModule {
constructor(public moduleId: string, public source: string) {}
constructor(public moduleId: string, public sourceWithModuleRefs: string) {}
getSourceWithImports(): SourceWithImports {
var moduleAliases = {};
var imports: string[][] = [];
var newSource = StringWrapper.replaceAllMapped(this.source, MODULE_REGEXP, (match) => {
var moduleId = match[1];
var alias = moduleAliases[moduleId];
if (isBlank(alias)) {
if (moduleId == this.moduleId) {
alias = '';
} else {
alias = `import${imports.length}`;
imports.push([moduleId, alias]);
}
moduleAliases[moduleId] = alias;
}
return alias.length > 0 ? `${alias}.` : '';
});
var newSource =
StringWrapper.replaceAllMapped(this.sourceWithModuleRefs, MODULE_REGEXP, (match) => {
var moduleId = match[1];
var alias = moduleAliases[moduleId];
if (isBlank(alias)) {
if (moduleId == this.moduleId) {
alias = '';
} else {
alias = `import${imports.length}`;
imports.push([moduleId, alias]);
}
moduleAliases[moduleId] = alias;
}
return alias.length > 0 ? `${alias}.` : '';
});
return new SourceWithImports(newSource, imports);
}
}

44
modules/angular2/src/compiler/template_compiler.ts
View File

@ -36,7 +36,7 @@ export class TemplateCompiler {
private _commandCompiler: CommandCompiler,
private _cdCompiler: ChangeDetectionCompiler) {}
normalizeDirective(directive: DirectiveMetadata): Promise<INormalizedDirectiveMetadata> {
normalizeDirectiveMetadata(directive: DirectiveMetadata): Promise<INormalizedDirectiveMetadata> {
var normalizedTemplatePromise;
if (directive.isComponent) {
normalizedTemplatePromise =
@ -54,11 +54,11 @@ export class TemplateCompiler {
}));
}
serializeTemplateMetadata(metadata: INormalizedDirectiveMetadata): string {
serializeDirectiveMetadata(metadata: INormalizedDirectiveMetadata): string {
return Json.stringify((<NormalizedDirectiveMetadata>metadata).toJson());
}
deserializeTemplateMetadata(data: string): INormalizedDirectiveMetadata {
deserializeDirectiveMetadata(data: string): INormalizedDirectiveMetadata {
return NormalizedDirectiveMetadata.fromJson(Json.parse(data));
}
@ -87,26 +87,26 @@ export class TemplateCompiler {
new CompiledTemplate(compMeta.type.id, () => [changeDetectorFactories, commands, styles]);
this._compiledTemplateCache.set(compMeta.type.id, compiledTemplate);
compilingComponentIds.add(compMeta.type.id);
done =
PromiseWrapper.all([this._styleCompiler.compileComponentRuntime(compMeta)].concat(
viewDirectives.map(dirMeta => this.normalizeDirective(dirMeta))))
.then((stylesAndNormalizedViewDirMetas: any[]) => {
var childPromises = [];
var normalizedViewDirMetas = stylesAndNormalizedViewDirMetas.slice(1);
var parsedTemplate = this._templateParser.parse(
compMeta.template.template, normalizedViewDirMetas, compMeta.type.name);
done = PromiseWrapper.all([this._styleCompiler.compileComponentRuntime(compMeta)].concat(
viewDirectives.map(
dirMeta => this.normalizeDirectiveMetadata(dirMeta))))
.then((stylesAndNormalizedViewDirMetas: any[]) => {
var childPromises = [];
var normalizedViewDirMetas = stylesAndNormalizedViewDirMetas.slice(1);
var parsedTemplate = this._templateParser.parse(
compMeta.template.template, normalizedViewDirMetas, compMeta.type.name);
changeDetectorFactories = this._cdCompiler.compileComponentRuntime(
compMeta.type, compMeta.changeDetection.changeDetection, parsedTemplate);
styles = stylesAndNormalizedViewDirMetas[0];
commands = this._compileCommandsRuntime(compMeta, parsedTemplate,
compilingComponentIds, childPromises);
return PromiseWrapper.all(childPromises);
})
.then((_) => {
SetWrapper.delete(compilingComponentIds, compMeta.type.id);
return compiledTemplate;
});
changeDetectorFactories = this._cdCompiler.compileComponentRuntime(
compMeta.type, compMeta.changeDetection.changeDetection, parsedTemplate);
styles = stylesAndNormalizedViewDirMetas[0];
commands = this._compileCommandsRuntime(compMeta, parsedTemplate,
compilingComponentIds, childPromises);
return PromiseWrapper.all(childPromises);
})
.then((_) => {
SetWrapper.delete(compilingComponentIds, compMeta.type.id);
return compiledTemplate;
});
this._compiledTemplateDone.set(compMeta.type.id, done);
}
return compiledTemplate;