PR Close #35561
This commit is contained in:
parent
bd6a39c364
commit
54fd33fb80
|
@ -91,7 +91,10 @@ function getVarDeclarations(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (const variable of current.variables) {
|
for (const variable of current.variables) {
|
||||||
let symbol = info.members.get(variable.value) || info.query.getBuiltinType(BuiltinType.Any);
|
let symbol = info.members.get(variable.value);
|
||||||
|
if (!symbol) {
|
||||||
|
symbol = getVariableTypeFromDirectiveContext(variable.value, info.query, current);
|
||||||
|
}
|
||||||
const kind = info.query.getTypeKind(symbol);
|
const kind = info.query.getTypeKind(symbol);
|
||||||
if (kind === BuiltinType.Any || kind === BuiltinType.Unbound) {
|
if (kind === BuiltinType.Any || kind === BuiltinType.Unbound) {
|
||||||
// For special cases such as ngFor and ngIf, the any type is not very useful.
|
// For special cases such as ngFor and ngIf, the any type is not very useful.
|
||||||
|
@ -115,22 +118,24 @@ function getVarDeclarations(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the type of an ngFor exported value, as enumerated in
|
* Resolve the type for the variable in `templateElement` by finding the structural
|
||||||
* https://angular.io/api/common/NgForOfContext
|
* directive which has the context member. Returns any when not found.
|
||||||
* @param value exported value name
|
* @param value variable value name
|
||||||
* @param query type symbol query
|
* @param query type symbol query
|
||||||
|
* @param templateElement
|
||||||
*/
|
*/
|
||||||
function getNgForExportedValueType(value: string, query: SymbolQuery): Symbol|undefined {
|
function getVariableTypeFromDirectiveContext(
|
||||||
switch (value) {
|
value: string, query: SymbolQuery, templateElement: EmbeddedTemplateAst): Symbol {
|
||||||
case 'index':
|
for (const {directive} of templateElement.directives) {
|
||||||
case 'count':
|
const context = query.getTemplateContext(directive.type.reference);
|
||||||
return query.getBuiltinType(BuiltinType.Number);
|
if (context) {
|
||||||
case 'first':
|
const member = context.get(value);
|
||||||
case 'last':
|
if (member && member.type) {
|
||||||
case 'even':
|
return member.type;
|
||||||
case 'odd':
|
}
|
||||||
return query.getBuiltinType(BuiltinType.Boolean);
|
}
|
||||||
}
|
}
|
||||||
|
return query.getBuiltinType(BuiltinType.Any);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -145,38 +150,38 @@ function getNgForExportedValueType(value: string, query: SymbolQuery): Symbol|un
|
||||||
function refinedVariableType(
|
function refinedVariableType(
|
||||||
value: string, mergedTable: SymbolTable, query: SymbolQuery,
|
value: string, mergedTable: SymbolTable, query: SymbolQuery,
|
||||||
templateElement: EmbeddedTemplateAst): Symbol {
|
templateElement: EmbeddedTemplateAst): Symbol {
|
||||||
// Special case the ngFor directive
|
if (value === '$implicit') {
|
||||||
const ngForDirective = templateElement.directives.find(d => {
|
// Special case the ngFor directive
|
||||||
const name = identifierName(d.directive.type);
|
const ngForDirective = templateElement.directives.find(d => {
|
||||||
return name == 'NgFor' || name == 'NgForOf';
|
const name = identifierName(d.directive.type);
|
||||||
});
|
return name == 'NgFor' || name == 'NgForOf';
|
||||||
if (ngForDirective) {
|
});
|
||||||
const ngForOfBinding = ngForDirective.inputs.find(i => i.directiveName == 'ngForOf');
|
if (ngForDirective) {
|
||||||
if (ngForOfBinding) {
|
const ngForOfBinding = ngForDirective.inputs.find(i => i.directiveName == 'ngForOf');
|
||||||
// Check if the variable value is a type exported by the ngFor statement.
|
if (ngForOfBinding) {
|
||||||
let result = getNgForExportedValueType(value, query);
|
// Check if there is a known type for the ngFor binding.
|
||||||
|
const bindingType = new AstType(mergedTable, query, {}).getType(ngForOfBinding.value);
|
||||||
// Otherwise, check if there is a known type for the ngFor binding.
|
if (bindingType) {
|
||||||
const bindingType = new AstType(mergedTable, query, {}).getType(ngForOfBinding.value);
|
const result = query.getElementType(bindingType);
|
||||||
if (!result && bindingType) {
|
if (result) {
|
||||||
result = query.getElementType(bindingType);
|
return result;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (result) {
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Special case the ngIf directive ( *ngIf="data$ | async as variable" )
|
// Special case the ngIf directive ( *ngIf="data$ | async as variable" )
|
||||||
const ngIfDirective =
|
if (value === 'ngIf') {
|
||||||
templateElement.directives.find(d => identifierName(d.directive.type) === 'NgIf');
|
const ngIfDirective =
|
||||||
if (ngIfDirective) {
|
templateElement.directives.find(d => identifierName(d.directive.type) === 'NgIf');
|
||||||
const ngIfBinding = ngIfDirective.inputs.find(i => i.directiveName === 'ngIf');
|
if (ngIfDirective) {
|
||||||
if (ngIfBinding) {
|
const ngIfBinding = ngIfDirective.inputs.find(i => i.directiveName === 'ngIf');
|
||||||
const bindingType = new AstType(mergedTable, query, {}).getType(ngIfBinding.value);
|
if (ngIfBinding) {
|
||||||
if (bindingType) {
|
const bindingType = new AstType(mergedTable, query, {}).getType(ngIfBinding.value);
|
||||||
return bindingType;
|
if (bindingType) {
|
||||||
|
return bindingType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -286,6 +286,42 @@ describe('diagnostics', () => {
|
||||||
expect(start).toBe(span.start);
|
expect(start).toBe(span.start);
|
||||||
expect(length).toBe(span.length);
|
expect(length).toBe(span.length);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('report an unknown field in $implicit context', () => {
|
||||||
|
mockHost.override(TEST_TEMPLATE, `
|
||||||
|
<div *withContext="let myVar">
|
||||||
|
{{ ~{start-emb}myVar.missingField ~{end-emb}}}
|
||||||
|
</div>
|
||||||
|
`);
|
||||||
|
const diags = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
|
||||||
|
expect(diags.length).toBe(1);
|
||||||
|
const {messageText, start, length, category} = diags[0];
|
||||||
|
expect(category).toBe(ts.DiagnosticCategory.Error);
|
||||||
|
expect(messageText)
|
||||||
|
.toBe(
|
||||||
|
`Identifier 'missingField' is not defined. '{ implicitPerson: Person; }' does not contain such a member`, );
|
||||||
|
const span = mockHost.getLocationMarkerFor(TEST_TEMPLATE, 'emb');
|
||||||
|
expect(start).toBe(span.start);
|
||||||
|
expect(length).toBe(span.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('report an unknown field in non implicit context', () => {
|
||||||
|
mockHost.override(TEST_TEMPLATE, `
|
||||||
|
<div *withContext="let myVar = nonImplicitPerson">
|
||||||
|
{{ ~{start-emb}myVar.missingField ~{end-emb}}}
|
||||||
|
</div>
|
||||||
|
`);
|
||||||
|
const diags = ngLS.getSemanticDiagnostics(TEST_TEMPLATE);
|
||||||
|
expect(diags.length).toBe(1);
|
||||||
|
const {messageText, start, length, category} = diags[0];
|
||||||
|
expect(category).toBe(ts.DiagnosticCategory.Error);
|
||||||
|
expect(messageText)
|
||||||
|
.toBe(
|
||||||
|
`Identifier 'missingField' is not defined. 'Person' does not contain such a member`, );
|
||||||
|
const span = mockHost.getLocationMarkerFor(TEST_TEMPLATE, 'emb');
|
||||||
|
expect(start).toBe(span.start);
|
||||||
|
expect(length).toBe(span.length);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// #17611
|
// #17611
|
||||||
|
|
|
@ -43,6 +43,7 @@ import * as ParsingCases from './parsing-cases';
|
||||||
ParsingCases.StringModel,
|
ParsingCases.StringModel,
|
||||||
ParsingCases.TemplateReference,
|
ParsingCases.TemplateReference,
|
||||||
ParsingCases.TestComponent,
|
ParsingCases.TestComponent,
|
||||||
|
ParsingCases.WithContextDirective,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class AppModule {
|
export class AppModule {
|
||||||
|
|
|
@ -127,6 +127,21 @@ export class CounterDirective implements OnChanges {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface WithContextDirectiveContext {
|
||||||
|
$implicit: {implicitPerson: Person;};
|
||||||
|
nonImplicitPerson: Person;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Directive({selector: '[withContext]'})
|
||||||
|
export class WithContextDirective {
|
||||||
|
constructor(_template: TemplateRef<WithContextDirectiveContext>) {}
|
||||||
|
|
||||||
|
static ngTemplateContextGuard(dir: WithContextDirective, ctx: unknown):
|
||||||
|
ctx is WithContextDirectiveContext {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This Component provides the `test-comp` selector.
|
* This Component provides the `test-comp` selector.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue