Project source models (#4445)

fix [#4280](#4280) --------- Co-authored-by: Christopher Radek <[email protected]>
microsoft · Oct 7, 2024 · aaae51a · aaae51a
1 parent 0defe8f
commit aaae51a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/.chronus/changes/fix-project-source-models-2024-8-13-15-15-44.md b/.chronus/changes/fix-project-source-models-2024-8-13-15-15-44.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@typespec/compiler"
+---
+
+[API] model `sourceModels` property are now projected correctly
diff --git a/packages/compiler/src/core/projector.ts b/packages/compiler/src/core/projector.ts
@@ -302,6 +302,10 @@ export function createProjector(
       projectedModel.sourceModel = projectType(model.sourceModel) as Model;
     }
 
+    projectedModel.sourceModels = model.sourceModels.map((source) => {
+      return { ...source, model: projectType(source.model) as Model };
+    });
+
     if (model.indexer) {
       const projectedValue = projectType(model.indexer.value);
       projectedModel.indexer = {

diff --git a/packages/compiler/test/projection/projector-identity.test.ts b/packages/compiler/test/projection/projector-identity.test.ts
@@ -126,6 +126,22 @@ describe("compiler: projector: Identity", () => {
       strictEqual(projectResult.type.properties.get("name")?.model, projectResult.type);
     });
 
+    it("link projected model with sourceModels", async () => {
+      const code = `
+        @test("target") model Foo is Bar {
+          ...Spreadable
+        }
+        model Bar {}
+        model Spreadable {}
+      `;
+      const projectResult = await projectWithNoChange(code, "Model");
+      const [sourceBar, sourceSpreadable] = projectResult.type.sourceModels.map((x) => x.model);
+      const Spreadable = projectResult.globalNamespace.models.get("Spreadable")!;
+      const Bar = projectResult.globalNamespace.models.get("Bar")!;
+      strictEqual(sourceBar, Bar);
+      strictEqual(sourceSpreadable, Spreadable);
+    });
+
     it("link projected property with sourceProperty", async () => {
       const code = `
         @test("target") model Foo {