Skip to content

Fix: augmenting template property didn't resolve declaration #3212

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

Merged
timotheeguerin merged 2 commits into from
Apr 23, 2024
Merged

Fix: augmenting template property didn't resolve declaration #3212

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
f8c002b
Fix: augmenting template property didn't resolve declaration
timotheeguerin Apr 23, 2024
3093495
Create fix-augment-decorator-template-decl-2024-3-23-15-44-27.md
timotheeguerin Apr 23, 2024
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: 8 additions & 0 deletions .chronus/changes/fix-augment-decorator-template-decl-2024-3-23-15-44-27.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
changeKind: fix
packages:
- "@typespec/compiler"
---

Fix: augmenting template model property could result in sending invalid argument to decorator
3 changes: 1 addition & 2 deletions packages/compiler/src/core/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,7 +1981,6 @@ export function createChecker(program: Program): Checker {

function getSymbolLinks(s: Sym): SymbolLinks {
const id = getSymbolId(s);

if (symbolLinks.has(id)) {
return symbolLinks.get(id)!;
}
Expand Down Expand Up @@ -3675,7 +3674,7 @@ export function createChecker(program: Program): Checker {
x.kind === SyntaxKind.DecoratorDeclarationStatement
);
if (decoratorDeclNode) {
checkDecoratorDeclaration(decoratorDeclNode, mapper);
checkDecoratorDeclaration(decoratorDeclNode, undefined);
}
}
if (symbolLinks.declaredType) {
Expand Down
15 changes: 15 additions & 0 deletions packages/compiler/test/checker/decorators.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,21 @@ describe("compiler: checker: decorators", () => {
expectDecoratorNotCalled();
});

// Regresssion test for https://github.com/microsoft/typespec/issues/3211
it("augmenting a template model property before a decorator declaration resolve the declaration correctly", async () => {
await runner.compile(`
model Foo<T> {
prop: T;
}
model Test {foo: Foo<string>}

@@testDec(Foo.prop, "abc");
extern dec testDec(target: unknown, arg1: valueof string);

`);
strictEqual(calledArgs![2], "abc");
});

describe("value marshalling", () => {
async function testCallDecorator(type: string, value: string): Promise<any> {
await runner.compile(`
Expand Down