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

feat(ivy): translate type-check diagnostics to their original source (#30181)

Browse Source 
PR Close #30181
This commit is contained in:
JoostK
2019-04-28 00:26:13 +02:00
committed by Miško Hevery
parent 489cef6ea2
commit 3a2b195a58
17 changed files with 823 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/compiler-cli/src/ngtsc/annotations/src/component.ts
View File

@ -34,7 +34,7 @@ const EMPTY_ARRAY: any[] = [];
export interface ComponentHandlerData {
meta: R3ComponentMetadata;
parsedTemplate: TmplAstNode[];
parsedTemplate: {nodes: TmplAstNode[]; file: ParseSourceFile};
metadataStmt: Statement|null;
parseTemplate: (options?: ParseTemplateOptions) => ParsedTemplate;
}
@ -308,7 +308,7 @@ export class ComponentDecoratorHandler implements
},
metadataStmt: generateSetClassMetadataCall(
node, this.reflector, this.defaultImportRecorder, this.isCore),
parsedTemplate: template.nodes, parseTemplate,
parsedTemplate: template, parseTemplate,
},
typeCheck: true,
};
@ -360,7 +360,7 @@ export class ComponentDecoratorHandler implements
const extMeta = flattenInheritedDirectiveMetadata(this.metaReader, meta.ref);
matcher.addSelectables(CssSelector.parse(meta.selector), extMeta);
}
const bound = new R3TargetBinder(matcher).bind({template: meta.parsedTemplate});
const bound = new R3TargetBinder(matcher).bind({template: meta.parsedTemplate.nodes});
const pipes = new Map<string, Reference<ClassDeclaration<ts.ClassDeclaration>>>();
for (const {name, ref} of scope.compilation.pipes) {
if (!ts.isClassDeclaration(ref.node)) {
@ -369,7 +369,7 @@ export class ComponentDecoratorHandler implements
}
pipes.set(name, ref as Reference<ClassDeclaration<ts.ClassDeclaration>>);
}
ctx.addTemplate(new Reference(node), bound, pipes);
ctx.addTemplate(new Reference(node), bound, pipes, meta.parsedTemplate.file);
}
}