Skip to content

fix(compiler-cli): correctly resolve symbol for SafePropertyRead in c… #70155

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

Open
atscott wants to merge 1 commit into
base: main
Choose a base branch
from
+71 −6
Open

fix(compiler-cli): correctly resolve symbol for SafePropertyRead in c… #70155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,7 @@ export class SymbolBuilder {
const expressionTarget = this.boundTarget.getExpressionTarget(expression);
if (expressionTarget !== null) {
return this.getSymbol(expressionTarget) as
| VariableSymbol
| ReferenceSymbol
| ExpressionSymbol
| LetDeclarationSymbol
| null;
VariableSymbol | ReferenceSymbol | ExpressionSymbol | LetDeclarationSymbol | null;
}

let withSpan = expression.sourceSpan;
Expand Down Expand Up @@ -714,7 +710,7 @@ export class SymbolBuilder {
node.parent !== undefined &&
(ts.isParenthesizedExpression(node.parent) ||
ts.isNonNullExpression(node.parent) ||
isAccessExpression(node.parent))
(ts.isPropertyAccessExpression(node.parent) && node.parent.name === node))
) {
node = node.parent;
}
Expand Down
69 changes: 69 additions & 0 deletions ...s/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import {
BindingPipe,
Conditional,
Interpolation,
KeyedRead,
LiteralArray,
LiteralMap,
MatchSource,
ParseTemplateOptions,
PropertyRead,
SafeKeyedRead,
SafePropertyRead,
TmplAstBoundAttribute,
TmplAstBoundText,
Expand Down Expand Up @@ -878,6 +880,73 @@ runInEachFileSystem(() => {
).toEqual('data');
});

it('safe property reads with optional chaining', () => {
const fileName = absoluteFrom('/main.ts');
const templateString = `<div [inputA]="route?.data?.['icon']"></div>`;
const {templateTypeChecker, program} = setup(
[
{
fileName,
templates: {'Cmp': templateString},
source: `
interface Route {
data?: { icon: string; };
}
export class Cmp { route?: Route; }
`,
},
],
{strictSafeNavigationTypes: true},
);
const sf = getSourceFileOrError(program, fileName);
const cmp = getClass(sf, 'Cmp');
const nodes = getAstElements(templateTypeChecker, cmp);
const ast = (nodes[0].inputs[0].value as ASTWithSource).ast as SafeKeyedRead;
const dataRead = ast.receiver as SafePropertyRead;
const dataSymbol = templateTypeChecker.getSymbolOfNode(dataRead, cmp)!;
assertExpressionSymbol(dataSymbol);
expect(
program
.getTypeChecker()
.symbolToString(templateTypeChecker.getTsSymbolOfSymbol(dataSymbol)!),
).toEqual('data');
});

it('safe property reads used in element access argument', () => {
const fileName = absoluteFrom('/main.ts');
const templateString = `<div [inputA]="arr[route?.data]"></div>`;
const {templateTypeChecker, program} = setup(
[
{
fileName,
templates: {'Cmp': templateString},
source: `
interface Route {
data: string;
}
export class Cmp {
route?: Route;
arr: Record<string, string> = {};
}
`,
},
],
{strictSafeNavigationTypes: true},
);
const sf = getSourceFileOrError(program, fileName);
const cmp = getClass(sf, 'Cmp');
const nodes = getAstElements(templateTypeChecker, cmp);
const ast = (nodes[0].inputs[0].value as ASTWithSource).ast as KeyedRead;
const dataRead = ast.key as SafePropertyRead;
const dataSymbol = templateTypeChecker.getSymbolOfNode(dataRead, cmp)!;
assertExpressionSymbol(dataSymbol);
expect(
program
.getTypeChecker()
.symbolToString(templateTypeChecker.getTsSymbolOfSymbol(dataSymbol)!),
).toEqual('data');
});

it('ternary expressions', () => {
const nodes = getAstElements(templateTypeChecker, cmp);

Expand Down