Skip to content

Commit 32a25ec

Browse files
Fix stop running decorators on partially instantiated operations (#3227)
fix [#2619](#2619)
1 parent 0a83800 commit 32a25ec

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
3+
changeKind: fix
4+
packages:
5+
- "@typespec/compiler"
6+
---
7+
8+
Stop running decorators on partially instantiated operations(When interface is instantiated but not the operation)

packages/compiler/src/core/checker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2865,7 +2865,7 @@ export function createChecker(program: Program): Checker {
28652865
}
28662866

28672867
// Some of the mapper args are still template parameter so we shouldn't create the type.
2868-
return mapper.args.every((t) => t.kind !== "TemplateParameter");
2868+
return !mapper.partial && mapper.args.every((t) => t.kind !== "TemplateParameter");
28692869
}
28702870

28712871
function checkModelExpression(node: ModelExpressionNode, mapper: TypeMapper | undefined) {

packages/compiler/src/core/projector.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,9 @@ export function createProjector(
416416
projectedOp.namespace = projectedNamespaceScope();
417417
}
418418

419-
finishTypeForProgram(projectedProgram, projectedOp);
419+
if (op.isFinished) {
420+
finishTypeForProgram(projectedProgram, projectedOp);
421+
}
420422
if (op.interface) {
421423
projectedOp.interface = projectType(op.interface) as Interface;
422424
}

packages/compiler/test/checker/interface.test.ts

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { deepStrictEqual, notStrictEqual, ok, strictEqual } from "assert";
2-
import { beforeEach, describe, it } from "vitest";
2+
import { beforeEach, describe, expect, it, vi } from "vitest";
33
import { isTemplateDeclaration } from "../../src/core/type-utils.js";
44
import { Interface, Model, Operation, Type } from "../../src/core/types.js";
55
import { getDoc } from "../../src/index.js";
@@ -410,6 +410,25 @@ describe("compiler: interfaces", () => {
410410
strictEqual(returnType.name, "int32");
411411
});
412412

413+
it("instantiating an templated interface doesn't finish template operation inside", async () => {
414+
const $track = vi.fn();
415+
testHost.addJsFile("dec.js", { $track });
416+
testHost.addTypeSpecFile(
417+
"main.tsp",
418+
`
419+
import "./dec.js";
420+
421+
interface Base<A> {
422+
@track bar<B>(input: A): B;
423+
}
424+
425+
alias My = Base<string>;
426+
`
427+
);
428+
await testHost.compile("./");
429+
expect($track).not.toHaveBeenCalled();
430+
});
431+
413432
it("emit warning if shadowing parent templated type", async () => {
414433
const diagnostics = await runner.diagnose(`
415434
interface Base<A> {

0 commit comments

Comments
 (0)