Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ivy): cleanup of the view compiler #23375

Closed
wants to merge 2 commits into from
Closed

refactor(ivy): cleanup of the view compiler #23375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd8792
refactor(ivy): cleanup of the view compiler
vicb Apr 13, 2018
ab52004
fix(ivy): add unparsed selectors to the `projectionDef` instruction
vicb Apr 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
159 changes: 82 additions & 77 deletions packages/compiler/src/render3/r3_view_compiler.ts
View file
Open in desktop
Expand Up @@ -456,7 +456,7 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
});
}

buildTemplateFunction(asts: TemplateAst[], variables: VariableAst[]): o.FunctionExpr {
buildTemplateFunction(nodes: TemplateAst[], variables: VariableAst[]): o.FunctionExpr {
// Create variable bindings
for (const variable of variables) {
const variableName = variable.name;
Expand All @@ -469,29 +469,40 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {

// Collect content projections
if (this.ngContentSelectors && this.ngContentSelectors.length > 0) {
const contentProjections = getContentProjection(asts, this.ngContentSelectors);
const contentProjections = getContentProjection(nodes, this.ngContentSelectors);
this._contentProjections = contentProjections;

if (contentProjections.size > 0) {
const infos: R3CssSelectorList[] = [];
const selectors: string[] = [];

Array.from(contentProjections.values()).forEach(info => {
if (info.selector) {
infos[info.index - 1] = info.selector;
selectors[info.index - 1] = info.selector;
}
});

const projectionIndex = this._projectionDefinitionIndex = this.allocateDataSlot();
const parameters: o.Expression[] = [o.literal(projectionIndex)];
!infos.some(value => !value) || error(`content project information skipped an index`);
if (infos.length > 1) {
parameters.push(this.outputCtx.constantPool.getConstLiteral(
asLiteral(infos), /* forceShared */ true));

if (selectors.some(value => !value)) {
error(`content project information skipped an index`);
}

if (selectors.length > 1) {
const r3Selectors = selectors.map(s => parseSelectorToR3Selector(s));
// `projectionDef` needs both the parsed and raw value of the selectors
const parsed = this.outputCtx.constantPool.getConstLiteral(asLiteral(r3Selectors), true);
const unParsed = this.outputCtx.constantPool.getConstLiteral(asLiteral(selectors), true);
parameters.push(parsed, unParsed);
}

this.instruction(this._creationMode, null, R3.projectionDef, ...parameters);
}
}

// Define and update any view queries
for (let query of this.viewQueries) {
// e.g. r3.Q(0, SomeDirective, true);
// e.g. r3.Q(0, somePredicate, true);
const querySlot = this.allocateDataSlot();
const predicate = getQueryPredicate(query, this.outputCtx);
const args = [
Expand All @@ -515,7 +526,7 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
this._bindingMode.push(refresh.and(updateDirective).toStmt());
}

templateVisitAll(this, asts);
templateVisitAll(this, nodes);

const creationMode = this._creationMode.length > 0 ?
[o.ifStmt(
Expand Down Expand Up @@ -563,15 +574,16 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
getLocal(name: string): o.Expression|null { return this.bindingScope.get(name); }

// TemplateAstVisitor
visitNgContent(ast: NgContentAst) {
const info = this._contentProjections.get(ast) !;
info || error(`Expected ${ast.sourceSpan} to be included in content projection collection`);
visitNgContent(ngContent: NgContentAst) {
const info = this._contentProjections.get(ngContent) !;
info ||
error(`Expected ${ngContent.sourceSpan} to be included in content projection collection`);
const slot = this.allocateDataSlot();
const parameters = [o.literal(slot), o.literal(this._projectionDefinitionIndex)];
if (info.index !== 0) {
parameters.push(o.literal(info.index));
}
this.instruction(this._creationMode, ast.sourceSpan, R3.projection, ...parameters);
this.instruction(this._creationMode, ngContent.sourceSpan, R3.projection, ...parameters);
}

// TemplateAstVisitor
Expand Down Expand Up @@ -615,16 +627,13 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
}

// Element creation mode
const component = findComponent(element.directives);
const nullNode = o.literal(null, o.INFERRED_TYPE);
const parameters: o.Expression[] = [o.literal(elementIndex)];
const parameters: o.Expression[] = [
o.literal(elementIndex),
o.literal(element.name),
];

if (component) {
this.directives.add(component.directive.type.reference);
}
element.directives.forEach(
directive => this.directives.add(directive.directive.type.reference));
parameters.push(o.literal(element.name));

// Add the attributes
const i18nMessages: o.Statement[] = [];
Expand All @@ -644,7 +653,7 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
}
});

let attrArg: o.Expression = nullNode;
let attrArg: o.Expression = o.TYPED_NULL_EXPR;

if (attributes.length > 0) {
attrArg = hasI18nAttr ? getLiteralFactory(this.outputCtx, o.literalArr(attributes)) :
Expand All @@ -669,7 +678,7 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
parameters.push(
this.constantPool.getConstLiteral(o.literalArr(references), /* forceShared */ true));
} else {
parameters.push(nullNode);
parameters.push(o.TYPED_NULL_EXPR);
}

// Generate the instruction create element instruction
Expand Down Expand Up @@ -762,11 +771,11 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
}

// TemplateAstVisitor
visitEmbeddedTemplate(ast: EmbeddedTemplateAst) {
visitEmbeddedTemplate(template: EmbeddedTemplateAst) {
const templateIndex = this.allocateDataSlot();

const templateRef = this.reflector.resolveExternalReference(Identifiers.TemplateRef);
const templateDirective = ast.directives.find(
const templateDirective = template.directives.find(
directive => directive.directive.type.diDeps.some(
dependency =>
dependency.token != null && (tokenReference(dependency.token) == templateRef)));
Expand All @@ -780,7 +789,7 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {

const parameters: o.Expression[] = [o.variable(templateName), o.literal(null, o.INFERRED_TYPE)];
const attributeNames: o.Expression[] = [];
ast.directives.forEach((directiveAst: DirectiveAst) => {
template.directives.forEach((directiveAst: DirectiveAst) => {
this.directives.add(directiveAst.directive.type.reference);
CssSelector.parse(directiveAst.directive.selector !).forEach(selector => {
selector.attrs.forEach((value) => {
Expand All @@ -802,18 +811,19 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {

// e.g. C(1, C1Template)
this.instruction(
this._creationMode, ast.sourceSpan, R3.containerCreate, o.literal(templateIndex),
this._creationMode, template.sourceSpan, R3.containerCreate, o.literal(templateIndex),
...trimTrailingNulls(parameters));

// Generate directives
this._visitDirectives(ast.directives, o.variable(CONTEXT_NAME), templateIndex);
this._visitDirectives(template.directives, o.variable(CONTEXT_NAME), templateIndex);

// Create the template function
const templateVisitor = new TemplateDefinitionBuilder(
this.outputCtx, this.constantPool, this.reflector, templateContext, this.bindingScope,
this.level + 1, this.ngContentSelectors, contextName, templateName, this.pipeMap, [],
this.directives, this.pipes);
const templateFunctionExpr = templateVisitor.buildTemplateFunction(ast.children, ast.variables);
const templateFunctionExpr =
templateVisitor.buildTemplateFunction(template.children, template.variables);
this._postfix.push(templateFunctionExpr.toDeclStmt(templateName, null));
}

Expand All @@ -825,23 +835,23 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
readonly visitAttr = invalid;

// TemplateAstVisitor
visitBoundText(ast: BoundTextAst) {
visitBoundText(text: BoundTextAst) {
const nodeIndex = this.allocateDataSlot();

// Creation mode
this.instruction(this._creationMode, ast.sourceSpan, R3.text, o.literal(nodeIndex));
this.instruction(this._creationMode, text.sourceSpan, R3.text, o.literal(nodeIndex));

this.instruction(
this._bindingMode, ast.sourceSpan, R3.textCreateBound, o.literal(nodeIndex),
this.convertPropertyBinding(o.variable(CONTEXT_NAME), ast.value));
this._bindingMode, text.sourceSpan, R3.textCreateBound, o.literal(nodeIndex),
this.convertPropertyBinding(o.variable(CONTEXT_NAME), text.value));
}

// TemplateAstVisitor
visitText(ast: TextAst) {
visitText(text: TextAst) {
// Text is defined in creation mode only.
this.instruction(
this._creationMode, ast.sourceSpan, R3.text, o.literal(this.allocateDataSlot()),
o.literal(ast.value));
this._creationMode, text.sourceSpan, R3.text, o.literal(this.allocateDataSlot()),
o.literal(text.value));
}

// When the content of the element is a single text node the translation can be inlined:
Expand Down Expand Up @@ -899,25 +909,22 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
}

function getQueryPredicate(query: CompileQueryMetadata, outputCtx: OutputContext): o.Expression {
let predicate: o.Expression;
if (query.selectors.length > 1 || (query.selectors.length == 1 && query.selectors[0].value)) {
const selectors = query.selectors.map(value => value.value as string);
selectors.some(value => !value) && error('Found a type among the string selectors expected');
predicate = outputCtx.constantPool.getConstLiteral(
return outputCtx.constantPool.getConstLiteral(
o.literalArr(selectors.map(value => o.literal(value))));
} else if (query.selectors.length == 1) {
}

if (query.selectors.length == 1) {
const first = query.selectors[0];
if (first.identifier) {
predicate = outputCtx.importExpr(first.identifier.reference);
} else {
error('Unexpected query form');
predicate = o.literal(null);
return outputCtx.importExpr(first.identifier.reference);
}
} else {
error('Unexpected query form');
predicate = o.literal(null);
}
return predicate;

error('Unexpected query form');
return o.NULL_EXPR;
}

export function createFactory(
Expand Down Expand Up @@ -961,7 +968,7 @@ export function createFactory(
for (let query of queries) {
const predicate = getQueryPredicate(query, outputCtx);

// e.g. r3.Q(null, SomeDirective, false) or r3.Q(null, ['div'], false)
// e.g. r3.Q(null, somePredicate, false) or r3.Q(null, ['div'], false)
const parameters = [
/* memoryIndex */ o.literal(null, o.INFERRED_TYPE),
/* predicate */ predicate,
Expand Down Expand Up @@ -1020,7 +1027,7 @@ type HostBindings = {

// Turn a directive selector into an R3-compatible selector for directive def
function createDirectiveSelector(selector: string): o.Expression {
return asLiteral(parseSelectorsToR3Selector(CssSelector.parse(selector)));
return asLiteral(parseSelectorToR3Selector(selector));
}

function createHostAttributesArray(
Expand Down Expand Up @@ -1143,22 +1150,22 @@ class ValueConverter extends AstMemoryEfficientTransformer {
}

// AstMemoryEfficientTransformer
visitPipe(ast: BindingPipe, context: any): AST {
visitPipe(pipe: BindingPipe, context: any): AST {
// Allocate a slot to create the pipe
const slot = this.allocateSlot();
const slotPseudoLocal = `PIPE:${slot}`;
const target = new PropertyRead(ast.span, new ImplicitReceiver(ast.span), slotPseudoLocal);
const bindingId = pipeBinding(ast.args);
this.definePipe(ast.name, slotPseudoLocal, slot, o.importExpr(bindingId));
const value = ast.exp.visit(this);
const args = this.visitAll(ast.args);
const target = new PropertyRead(pipe.span, new ImplicitReceiver(pipe.span), slotPseudoLocal);
const bindingId = pipeBinding(pipe.args);
this.definePipe(pipe.name, slotPseudoLocal, slot, o.importExpr(bindingId));
const value = pipe.exp.visit(this);
const args = this.visitAll(pipe.args);

return new FunctionCall(
ast.span, target, [new LiteralPrimitive(ast.span, slot), value, ...args]);
pipe.span, target, [new LiteralPrimitive(pipe.span, slot), value, ...args]);
}

visitLiteralArray(ast: LiteralArray, context: any): AST {
return new BuiltinFunctionCall(ast.span, this.visitAll(ast.expressions), values => {
visitLiteralArray(array: LiteralArray, context: any): AST {
return new BuiltinFunctionCall(array.span, this.visitAll(array.expressions), values => {
// If the literal has calculated (non-literal) elements transform it into
// calls to literal factories that compose the literal and will cache intermediate
// values. Otherwise, just return an literal array that contains the values.
Expand All @@ -1169,13 +1176,13 @@ class ValueConverter extends AstMemoryEfficientTransformer {
});
}

visitLiteralMap(ast: LiteralMap, context: any): AST {
return new BuiltinFunctionCall(ast.span, this.visitAll(ast.values), values => {
visitLiteralMap(map: LiteralMap, context: any): AST {
return new BuiltinFunctionCall(map.span, this.visitAll(map.values), values => {
// If the literal has calculated (non-literal) elements transform it into
// calls to literal factories that compose the literal and will cache intermediate
// values. Otherwise, just return an literal array that contains the values.
const literal = o.literalMap(values.map(
(value, index) => ({key: ast.keys[index].key, value, quoted: ast.keys[index].quoted})));
(value, index) => ({key: map.keys[index].key, value, quoted: map.keys[index].quoted})));
return values.every(a => a.isConstant()) ?
this.outputCtx.constantPool.getConstLiteral(literal, true) :
getLiteralFactory(this.outputCtx, literal);
Expand All @@ -1188,13 +1195,9 @@ function invalid<T>(arg: o.Expression | o.Statement | TemplateAst): never {
`Invalid state: Visitor ${this.constructor.name} doesn't handle ${o.constructor.name}`);
}

function findComponent(directives: DirectiveAst[]): DirectiveAst|undefined {
return directives.filter(directive => directive.directive.isComponent)[0];
}

interface NgContentInfo {
index: number;
selector?: R3CssSelectorList;
selector?: string;
}

class ContentProjectionVisitor extends RecursiveTemplateAstVisitor {
Expand All @@ -1205,23 +1208,24 @@ class ContentProjectionVisitor extends RecursiveTemplateAstVisitor {
super();
}

visitNgContent(ast: NgContentAst) {
const selectorText = this.ngContentSelectors[ast.index];
selectorText != null || error(`could not find selector for index ${ast.index} in ${ast}`);
if (!selectorText || selectorText === '*') {
this.projectionMap.set(ast, {index: 0});
visitNgContent(ngContent: NgContentAst) {
const selector = this.ngContentSelectors[ngContent.index];
if (selector == null) {
error(`could not find selector for index ${ngContent.index} in ${ngContent}`);
}

if (!selector || selector === '*') {
this.projectionMap.set(ngContent, {index: 0});
} else {
const cssSelectors = CssSelector.parse(selectorText);
this.projectionMap.set(
ast, {index: this.index++, selector: parseSelectorsToR3Selector(cssSelectors)});
this.projectionMap.set(ngContent, {index: this.index++, selector});
}
}
}

function getContentProjection(asts: TemplateAst[], ngContentSelectors: string[]) {
function getContentProjection(nodes: TemplateAst[], ngContentSelectors: string[]) {
const projectIndexMap = new Map<NgContentAst, NgContentInfo>();
const visitor = new ContentProjectionVisitor(projectIndexMap, ngContentSelectors);
templateVisitAll(visitor, asts);
templateVisitAll(visitor, nodes);
return projectIndexMap;
}

Expand Down Expand Up @@ -1285,7 +1289,8 @@ function parserSelectorToR3Selector(selector: CssSelector): R3CssSelector {
return positive.concat(...negative);
}

function parseSelectorsToR3Selector(selectors: CssSelector[]): R3CssSelectorList {
function parseSelectorToR3Selector(selector: string): R3CssSelectorList {
const selectors = CssSelector.parse(selector);
return selectors.map(parserSelectorToR3Selector);
}

Expand Down