fix-get-parent-properties

packages/typespec-ts/src/modular/helpers/operationHelpers.ts

@@ -156,11 +156,11 @@ export function getDeserializePrivateFunction(
         response.type.format
       )}`
     );
-  } else if (response?.type?.properties) {
+  } else if (getAllProperties(response?.type).length > 0) {
     statements.push(
       `return {`,
       getResponseMapping(
-        response.type.properties ?? [],
+        getAllProperties(response.type) ?? [],
         "result.body",
         importSet
       ).join(","),
@@ -187,7 +187,7 @@ function getOperationSignatureParameters(
     OptionalKind<ParameterDeclarationStructure>
   > = new Map();
   if (operation.bodyParameter?.type.type === "model") {
-    (operation.bodyParameter?.type.properties ?? [])
+    (getAllProperties(operation.bodyParameter?.type) ?? [])
       .filter((p) => !p.optional)
       .filter((p) => !p.readonly)
       .map((p) => buildType(p.clientName, p.type, p.format))
@@ -363,7 +363,7 @@ function buildBodyParameter(
 
   if (bodyParameter.type.type === "model") {
     const bodyParts: string[] = [];
-    for (const param of bodyParameter?.type.properties?.filter(
+    for (const param of getAllProperties(bodyParameter?.type).filter(
       (p) => !p.readonly
     ) ?? []) {
       if (param.type.type === "model" && isRequired(param)) {
@@ -379,7 +379,7 @@ function buildBodyParameter(
       }
     }
 
-    if (bodyParameter && bodyParameter.type.properties) {
+    if (bodyParameter && getAllProperties(bodyParameter.type).length > 0) {
       return `\nbody: {${bodyParts.join(",\n")}},`;
     }
   }
@@ -631,11 +631,11 @@ function getRequestModelMapping(
   propertyPath: string = "body",
   importSet: Map<string, Set<string>>
 ) {
-  if (!modelPropertyType.properties || !modelPropertyType.properties) {
+  if (getAllProperties(modelPropertyType).length <= 0) {
     return [];
   }
   const props: string[] = [];
-  const properties: Property[] = modelPropertyType.properties;
+  const properties: Property[] = getAllProperties(modelPropertyType) ?? [];
   for (const property of properties) {
     if (property.readonly) {
       continue;
@@ -749,7 +749,7 @@ export function getResponseMapping(
         )} ${
           !property.optional ? "" : `!${propertyFullName} ? undefined :`
         } {${getResponseMapping(
-          property.type.properties ?? [],
+          getAllProperties(property.type) ?? [],
           `${propertyPath}.${property.restApiName}${
             property.optional ? "?" : ""
           }`,
@@ -816,7 +816,7 @@ function deserializeResponseValue(
     case "list":
       if (type.elementType?.type === "model") {
         return `(${restValue} ?? []).map(p => ({${getResponseMapping(
-          type.elementType?.properties ?? [],
+          getAllProperties(type.elementType) ?? [],
           "p",
           importSet
         )}}))`;
@@ -943,3 +943,15 @@ export function hasPagingOperation(codeModel: ModularCodeModel) {
     )
   );
 }
+
+function getAllProperties(type: Type): Property[] {
+  const properties: Property[] = [];
+  if (!type) {
+    return properties;
+  }
+  type.parents?.forEach((p) => {
+    properties.push(...(p.properties ?? []));
+  });
+  properties.push(...(type.properties ?? []));
+  return properties;
+}

packages/typespec-ts/test/modularUnit/modelsGenerator.spec.ts

@@ -804,4 +804,83 @@ describe("inheritance & polymorphism", () => {
       }`
     );
   });
+
+  it.only("should handle inheritance model in operations", async () => {
+    const tspContent = `
+    model Pet {
+      name: string;
+      weight?: float32;
+    }
+    model Cat extends Pet {
+      kind: "cat";
+      meow: int32;
+    }
+    model Dog extends Pet {
+      kind: "dog";
+      bark: string;
+    }
+    op read(): { @body body: Cat };
+    `;
+    const modelFile = await emitModularModelsFromTypeSpec(tspContent);
+    assert.ok(modelFile);
+    assertEqualContent(
+      modelFile?.getFullText()!,
+      `
+      export interface Pet {
+        name: string;
+        weight?: number;
+      }
+
+      export interface Cat extends Pet {
+        kind: "cat";
+        meow: number;
+      }
+
+      export interface Dog extends Pet {
+        kind: "dog";
+        bark: string;
+      }`
+    );
+    const operationFiles = await emitModularOperationsFromTypeSpec(tspContent);
+    assert.ok(operationFiles);
+    assert.equal(operationFiles?.length, 1);
+    assertEqualContent(
+      operationFiles?.[0]?.getFullText()!,`
+      import { TestingContext as Client } from "../rest/index.js";
+      import {
+        StreamableMethod,
+        operationOptionsToRequestParameters,
+      } from "@azure-rest/core-client";
+
+      export function _readSend(
+        context: Client,
+        options: ReadOptions = { requestOptions: {} }
+      ): StreamableMethod<Read200Response> {
+        return context
+          .path("/")
+          .get({ ...operationOptionsToRequestParameters(options) });
+      }
+
+      export async function _readDeserialize(result: Read200Response): Promise<Cat> {
+        if (result.status !== "200") {
+          throw result.body;
+        }
+
+        return {
+          name: result.body["name"],
+          weight: result.body["weight"],
+          kind: result.body["kind"],
+          meow: result.body["meow"],
+        };
+      }
+
+      export async function read(
+        context: Client,
+        options: ReadOptions = { requestOptions: {} }
+      ): Promise<Cat> {
+        const result = await _readSend(context, options);
+        return _readDeserialize(result);
+      }      
+      `);
+  });
 });