[tcgc] Adjust sequence of properties calculation and discriminator ca…

…lculation (#680) fix: #676 cc: @archerzz
Azure · Apr 17, 2024 · 4e522ae · 4e522ae
1 parent 610d9d8
commit 4e522ae
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/.chronus/changes/fix_discriminator-2024-3-17-11-14-15.md b/.chronus/changes/fix_discriminator-2024-3-17-11-14-15.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+adjust sequence of properties calculation and discriminator calculation
diff --git a/packages/typespec-client-generator-core/src/types.ts b/packages/typespec-client-generator-core/src/types.ts
@@ -547,6 +547,8 @@ export function getSdkModelWithDiagnostics(
       );
       sdkType.additionalPropertiesNullable = isNullable(type.sourceModel!.indexer!.value!);
     }
+    // propreties should be generated first since base model'sdiscriminator handling is depend on derived model's properties
+    diagnostics.pipe(addPropertiesToModelType(context, type, sdkType, operation));
     if (type.baseModel) {
       sdkType.baseModel = context.modelsMap?.get(type.baseModel) as SdkModelType | undefined;
       if (sdkType.baseModel === undefined) {
@@ -562,7 +564,6 @@ export function getSdkModelWithDiagnostics(
         }
       }
     }
-    diagnostics.pipe(addPropertiesToModelType(context, type, sdkType, operation));
     diagnostics.pipe(addDiscriminatorToModelType(context, type, sdkType));
 
     updateModelsMap(context, type, sdkType, operation);

diff --git a/packages/typespec-client-generator-core/test/types.test.ts b/packages/typespec-client-generator-core/test/types.test.ts
@@ -2013,6 +2013,44 @@ describe("typespec-client-generator-core: types", () => {
       strictEqual(shark.discriminatorProperty, sharktypeProperty);
     });
 
+    it("handle derived model with discriminator first", async () => {
+      await runner.compileWithBuiltInService(`
+      model Salmon extends Fish {
+        kind: "salmon";
+        friends?: Fish[];
+        hate?: Record<Fish>;
+        partner?: Fish;
+      }
+
+      @discriminator("kind")
+      model Fish {
+        age: int32;
+      }
+
+      @get
+      op getSalmon(): Salmon;
+      `);
+      const models = runner.context.experimental_sdkPackage.models;
+      strictEqual(models.length, 2);
+      const fish = models.find((x) => x.name === "Fish");
+      ok(fish);
+      const kindProperty = fish.properties[0];
+      ok(kindProperty);
+      strictEqual(kindProperty.name, "kind");
+      strictEqual(kindProperty.kind, "property");
+      strictEqual(kindProperty.discriminator, true);
+      strictEqual(kindProperty.type.kind, "string");
+      strictEqual(kindProperty.__raw, undefined);
+      strictEqual(fish.discriminatorProperty, kindProperty);
+
+      const salmon = models.find((x) => x.name === "Salmon");
+      ok(salmon);
+      strictEqual(salmon.properties.length, 4);
+      strictEqual(salmon.properties[0].name, "kind");
+      strictEqual((salmon.properties[0] as SdkBodyModelPropertyType).discriminator, true);
+      strictEqual(salmon.discriminatorValue, "salmon");
+    });
+
     it("single discriminated model", async () => {
       await runner.compileWithBuiltInService(`
       @discriminator("kind")