@azure-tools/typespec-ts 0.30.1 → 0.31.0-alpha.20240723.1

package/src/modular/helpers/operationHelpers.ts

@@ -37,6 +37,7 @@ import {
   Operation,
   Parameter,
   Property,
+  Response,
   Type
 } from "../modularCodeModel.js";
 import {
@@ -46,30 +47,55 @@ import {
 import { getClassicalLayerPrefix, getOperationName } from "./namingHelpers.js";
 import { buildType, isTypeNullable } from "./typeHelpers.js";
 
-function getRLCResponseType(rlcResponse?: OperationResponse) {
+function getRLCResponseTypes(rlcResponse?: OperationResponse) {
   if (!rlcResponse?.responses) {
     return;
   }
   return rlcResponse?.responses
-    .map((resp) => {
-      const baseResponseName = getResponseBaseName(
-        rlcResponse.operationGroup,
-        rlcResponse.operationName,
-        resp.statusCode
-      );
-      // Get the information to build the Response Interface
-      return resp.predefinedName ?? getResponseTypeName(baseResponseName);
-    })
+    .map(
+      (resp) =>
+        resp.predefinedName ?? getRLCResponseType(resp.statusCode, rlcResponse)
+    )
     .join(" | ");
 }
 
-function getRLCLroLogicalResponse(rlcResponse?: OperationResponse) {
-  const logicalResponse = (rlcResponse?.responses ?? []).filter(
-    (r) => r.predefinedName && r.predefinedName.endsWith(`LogicalResponse`)
+function getRLCResponseType(
+  statusCode: string,
+  operationInfo?: OperationResponse
+) {
+  if (!operationInfo) {
+    return;
+  }
+  const baseResponseName = getResponseBaseName(
+    operationInfo.operationGroup,
+    operationInfo.operationName,
+    statusCode
+  );
+  // Get the information to build the Response Interface
+  return getResponseTypeName(baseResponseName);
+}
+
+function getNarrowedRLCResponse(
+  response: Response,
+  rlcResponse?: OperationResponse
+): string | undefined {
+  if (!rlcResponse) {
+    return;
+  }
+  const statusCode = response.statusCodes;
+  const names = getRLCResponseTypes(rlcResponse)?.split(" | ");
+  const lroResponse = names?.filter((n) => n.endsWith(`LogicalResponse`));
+  const normalResponse = names?.filter(
+    (n) => n === getRLCResponseType(`${statusCode}`, rlcResponse)
+  );
+  return (
+    // if the response is a LRO response, narrow to the lro logical response
+    lroResponse?.at(0) ??
+    // if the default response is a superset of one of other responses, narrow to the normal response
+    (rlcResponse.isDefaultSupersetOfOthers
+      ? normalResponse?.at(0) ?? "any"
+      : undefined)
   );
-  return logicalResponse.length > 0
-    ? logicalResponse[0]!.predefinedName!
-    : "any";
 }
 
 export function getSendPrivateFunction(
@@ -80,7 +106,7 @@ export function getSendPrivateFunction(
 ): OptionalKind<FunctionDeclarationStructure> {
   const parameters = getOperationSignatureParameters(operation, clientType);
   const { name } = getOperationName(operation);
-  const returnType = `StreamableMethod<${getRLCResponseType(
+  const returnType = `StreamableMethod<${getRLCResponseTypes(
     operation.rlcResponse
   )}>`;
 
@@ -125,7 +151,7 @@ export function getDeserializePrivateFunction(
   const parameters: OptionalKind<ParameterDeclarationStructure>[] = [
     {
       name: "result",
-      type: getRLCResponseType(operation.rlcResponse)
+      type: getRLCResponseTypes(operation.rlcResponse)
     }
   ];
   // TODO: Support LRO + paging operation
@@ -183,31 +209,31 @@ export function getDeserializePrivateFunction(
     }
   }
 
-  let deserializedType = isLroOnly
+  const deserializedType = isLroOnly
     ? operation?.lroMetadata?.finalResult
     : response.type;
-  let hasLroSubPath = operation?.lroMetadata?.finalResultPath !== undefined;
-  let deserializedRoot = hasLroSubPath
-    ? `result.body.${operation?.lroMetadata?.finalResultPath}`
-    : "result.body";
-  // TODO: Hard-coded for LRO PATCH case for now
-  // https://github.com/Azure/autorest.typescript/issues/2314
-  if (isLroOnly && operation.method.toLowerCase() === "patch") {
-    deserializedType = response.type;
-    hasLroSubPath = false;
-    deserializedRoot = "result.body";
+  const hasLroSubPath = operation?.lroMetadata?.finalResultPath !== undefined;
+  // Narrow down the rlc response type to deserialized one
+  const isNarrowedResponse = getNarrowedRLCResponse(
+    response,
+    operation.rlcResponse
+  );
+  let deserializePrefix = "result.body";
+  if (isNarrowedResponse) {
+    statements.push(`const res = result as unknown as ${isNarrowedResponse};`);
+    deserializePrefix = "res.body";
   }
-  if (isLroOnly) {
-    const lroLogicalResponse = getRLCLroLogicalResponse(operation.rlcResponse);
-    statements.push(`result = result as ${lroLogicalResponse};`);
-    if (hasLroSubPath) {
-      statements.push(
-        `if(${deserializedRoot.split(".").join("?.")} === undefined) {
-          throw createRestError(\`Expected a result in the response at position "${deserializedRoot}"\`, result);
-        }
-        `
-      );
-    }
+
+  const deserializedRoot = hasLroSubPath
+    ? `${deserializePrefix}.${operation?.lroMetadata?.finalResultPath}`
+    : `${deserializePrefix}`;
+  if (isLroOnly && hasLroSubPath) {
+    statements.push(
+      `if(${deserializedRoot.split(".").join("?.")} === undefined) {
+        throw createRestError(\`Expected a result in the response at position "${deserializedRoot}"\`, result);
+      }
+      `
+    );
   }
 
   const allParents = deserializedType ? getAllAncestors(deserializedType) : [];
@@ -222,7 +248,7 @@ export function getDeserializePrivateFunction(
     response.isBinaryPayload
   ) {
     // TODO: Fix this any cast when implementing handling dict.
-    statements.push(`return result.body as any`);
+    statements.push(`return ${deserializedRoot} as any`);
   } else if (
     deserializedType &&
     properties.length > 0 &&
@@ -658,8 +684,15 @@ function buildBodyParameter(
         directAssignment === true
           ? bodyParts.join(", ")
           : `{ ${bodyParts.join(", ")} }`;
+      let bodyElementStatement = "";
+      if (
+        isTypeNullable(bodyParameter.type.elementType) ||
+        bodyParameter.type.elementType.optional
+      ) {
+        bodyElementStatement = `!p ? p : `;
+      }
       return `\nbody: (${bodyParameter.clientName} ?? []).map((p) => { 
-      return ${mapBody};
+      return ${bodyElementStatement}${mapBody};
       }),`;
     }
     return `\nbody: ${bodyParameter.clientName},`;
@@ -1206,12 +1239,16 @@ export function deserializeResponseValue(
           : `${requiredOrNullablePrefix} ? ${restValue} : ${restValue}`;
       if (type.elementType?.type === "model") {
         if (!type.elementType.aliasType) {
-          return `${prefix}.map(p => ({${getResponseMapping(
+          const elementNullOrUndefinedPrefix =
+            isTypeNullable(type.elementType) || type.elementType.optional
+              ? "!p ? p :"
+              : "";
+          return `${prefix}.map(p => { return ${elementNullOrUndefinedPrefix}{${getResponseMapping(
             type.elementType,
             "p",
             runtimeImports,
             [...typeStack, type.elementType]
-          )}}))`;
+          )}}})`;
         } else if (isPolymorphicUnion(type.elementType)) {
           let nullOrUndefinedPrefix = "";
           if (isTypeNullable(type.elementType)) {
@@ -1328,6 +1365,10 @@ export function serializeRequestValue(
           ? `${clientValue}`
           : `${requiredOrNullablePrefix}? ${clientValue}: ${clientValue}`;
       if (type.elementType?.type === "model" && !type.elementType.aliasType) {
+        const elementNullOrUndefinedPrefix =
+          isTypeNullable(type.elementType) || type.elementType.optional
+            ? "!p ? p :"
+            : "";
         if (!type.elementType.name) {
           // If it is an anonymous model we need to serialize inline
           const { propertiesStr } = getRequestModelMapping(
@@ -1337,7 +1378,7 @@ export function serializeRequestValue(
             [...typeStack, type.elementType]
           );
 
-          return `${prefix}.map(p => ({${propertiesStr}}))`;
+          return `${prefix}.map(p => { return ${elementNullOrUndefinedPrefix}{${propertiesStr}}})`;
         } else {
           // When it is not anonymous we can hand it off to the serializer function
           return `${prefix}.map(${toCamelCase(

package/src/modular/helpers/typeHelpers.ts

@@ -246,8 +246,13 @@ function handleDictType(type: Type): TypeMetadata {
   }
   const elementType = getType(type.elementType, type.elementType.format);
   const elementName = elementType.name;
+  const name = handleNullableTypeName({
+    name: `Record<string, ${elementName}>`,
+    nullable: isTypeNullable(type)
+  });
   return {
-    name: `Record<string, ${elementName}>`
+    name,
+    nullable: isTypeNullable(type)
   };
 }
 

package/src/modular/modularCodeModel.ts

@@ -120,6 +120,8 @@ export interface Type {
   isPolymorphicBaseModel?: boolean;
   tcgcType?: SdkType;
   __raw?: TypespecType;
+  nullable?: boolean;
+  optional?: boolean;
 }
 
 export interface Client {

package/src/transform/transformApiVersionInfo.ts

@@ -7,13 +7,12 @@ import {
   UrlInfo
 } from "@azure-tools/rlc-common";
 import {
+  getHttpOperationWithCache,
   isApiVersion,
   listOperationGroups,
   listOperationsInOperationGroup,
   SdkClient
 } from "@azure-tools/typespec-client-generator-core";
-import { ignoreDiagnostics } from "@typespec/compiler";
-import { getHttpOperation } from "@typespec/http";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   getDefaultApiVersionString,
@@ -71,9 +70,7 @@ export function getOperationApiVersion(
   let hasApiVersionInOperation = true;
   for (const clientOp of clientOperations) {
     hasApiVersionInOperation = false;
-    const route = ignoreDiagnostics(
-      getHttpOperation(dpgContext.program, clientOp)
-    );
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -113,7 +110,7 @@ export function getOperationApiVersion(
     );
     for (const op of operations) {
       hasApiVersionInOperation = false;
-      const route = ignoreDiagnostics(getHttpOperation(dpgContext.program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;

package/src/transform/transformHelperFunctionDetails.ts

@@ -1,11 +1,12 @@
 import { HelperFunctionDetails, PackageFlavor } from "@azure-tools/rlc-common";
 import {
+  getHttpOperationWithCache,
   listOperationGroups,
   listOperationsInOperationGroup,
   SdkClient
 } from "@azure-tools/typespec-client-generator-core";
-import { ignoreDiagnostics, Model, Program, Type } from "@typespec/compiler";
-import { getHttpOperation, HttpOperation } from "@typespec/http";
+import { Model, Program, Type } from "@typespec/compiler";
+import { HttpOperation } from "@typespec/http";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   extractPagedMetadataNested,
@@ -48,7 +49,7 @@ export function transformHelperFunctionDetails(
   const nextLinks = new Set<string>();
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -67,7 +68,7 @@ export function transformHelperFunctionDetails(
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;
@@ -118,7 +119,7 @@ function extractPageDetailFromCore(client: SdkClient, dpgContext: SdkContext) {
   itemNames.add("value");
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -132,7 +133,7 @@ function extractPageDetailFromCore(client: SdkClient, dpgContext: SdkContext) {
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;
@@ -175,7 +176,6 @@ function extractSpecialSerializeInfo(
   client: SdkClient,
   dpgContext: SdkContext
 ) {
-  const program = dpgContext.program;
   let hasMultiCollection = false;
   let hasPipeCollection = false;
   let hasTsvCollection = false;
@@ -183,7 +183,7 @@ function extractSpecialSerializeInfo(
   let hasCsvCollection = false;
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     route.parameters.parameters.forEach((parameter) => {
       const serializeInfo = getSpecialSerializeInfo(
         parameter.type,
@@ -213,7 +213,7 @@ function extractSpecialSerializeInfo(
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       route.parameters.parameters.forEach((parameter) => {
         const serializeInfo = getSpecialSerializeInfo(
           parameter.type,

package/src/transform/transformParameters.ts

@@ -11,9 +11,8 @@ import {
   Schema,
   SchemaContext
 } from "@azure-tools/rlc-common";
-import { ignoreDiagnostics, isVoidType, Type } from "@typespec/compiler";
+import { isVoidType, Type } from "@typespec/compiler";
 import {
-  getHttpOperation,
   HttpOperation,
   HttpOperationParameter,
   HttpOperationParameters
@@ -28,6 +27,7 @@ import {
 } from "../utils/modelUtils.js";
 
 import {
+  getHttpOperationWithCache,
   isApiVersion,
   listOperationGroups,
   listOperationsInOperationGroup,
@@ -52,12 +52,11 @@ export function transformToParameterTypes(
   importDetails: Imports,
   apiVersionInfo?: ApiVersionInfo
 ): OperationParameter[] {
-  const program = dpgContext.program;
   const rlcParameters: OperationParameter[] = [];
   const outputImportedSet = new Set<string>();
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -71,7 +70,7 @@ export function transformToParameterTypes(
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;
@@ -106,7 +105,7 @@ export function transformToParameterTypes(
       outputImportedSet
     );
     // transform body
-    const bodyType = getBodyType(program, route);
+    const bodyType = getBodyType(route);
     let bodyParameter = undefined;
     if (bodyType) {
       bodyParameter = transformBodyParameters(

package/src/transform/transformPaths.ts

@@ -11,17 +11,14 @@ import {
   SchemaContext
 } from "@azure-tools/rlc-common";
 import {
+  getHttpOperationWithCache,
   isApiVersion,
   listOperationGroups,
   listOperationsInOperationGroup,
   SdkClient
 } from "@azure-tools/typespec-client-generator-core";
-import { getDoc, ignoreDiagnostics } from "@typespec/compiler";
-import {
-  getHttpOperation,
-  HttpOperation,
-  HttpOperationParameters
-} from "@typespec/http";
+import { getDoc } from "@typespec/compiler";
+import { HttpOperation, HttpOperationParameters } from "@typespec/http";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   getImportedModelName,
@@ -44,12 +41,11 @@ export function transformPaths(
   dpgContext: SdkContext,
   importDetails: Imports
 ): Paths {
-  const program = dpgContext.program;
   const pathParamsImportedSet = new Set<string>();
   const paths: Paths = {};
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -63,7 +59,7 @@ export function transformPaths(
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;

package/src/transform/transformResponses.ts

@@ -4,6 +4,8 @@
 import {
   getLroLogicalResponseName,
   Imports,
+  isObjectSchema,
+  ObjectSchema,
   OperationResponse,
   ResponseHeaderSchema,
   ResponseMetadata,
@@ -11,16 +13,13 @@ import {
   SchemaContext
 } from "@azure-tools/rlc-common";
 import {
+  getHttpOperationWithCache,
   listOperationGroups,
   listOperationsInOperationGroup,
   SdkClient
 } from "@azure-tools/typespec-client-generator-core";
-import { getDoc, ignoreDiagnostics, isVoidType } from "@typespec/compiler";
-import {
-  getHttpOperation,
-  HttpOperation,
-  HttpOperationResponse
-} from "@typespec/http";
+import { getDoc, isVoidType, NoTarget } from "@typespec/compiler";
+import { HttpOperation, HttpOperationResponse } from "@typespec/http";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   getBinaryType,
@@ -36,18 +35,18 @@ import {
   isBinaryPayload,
   sortedOperationResponses
 } from "../utils/operationUtil.js";
+import { reportDiagnostic } from "../lib.js";
 
 export function transformToResponseTypes(
   client: SdkClient,
   dpgContext: SdkContext,
   importDetails: Imports
 ): OperationResponse[] {
-  const program = dpgContext.program;
   const rlcResponses: OperationResponse[] = [];
   const inputImportedSet = new Set<string>();
   const clientOperations = listOperationsInOperationGroup(dpgContext, client);
   for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
+    const route = getHttpOperationWithCache(dpgContext, clientOp);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
@@ -61,7 +60,7 @@ export function transformToResponseTypes(
       operationGroup
     );
     for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
+      const route = getHttpOperationWithCache(dpgContext, op);
       // ignore overload base operation
       if (route.overloads && route.overloads?.length > 0) {
         continue;
@@ -77,8 +76,11 @@ export function transformToResponseTypes(
       operationGroup: getOperationGroupName(dpgContext, route),
       operationName: getOperationName(dpgContext, route.operation),
       path: route.path,
+      isDefaultSupersetOfOthers: false,
       responses: []
     };
+    const defaultSchemas: Schema[] = [],
+      nonDefaultSchemas: Schema[] = [];
     for (const resp of sortedOperationResponses(route.responses)) {
       const statusCode = getOperationStatuscode(resp);
       const rlcResponseUnit: ResponseMetadata = {
@@ -88,12 +90,21 @@ export function transformToResponseTypes(
       // transform header
       const headers = transformHeaders(dpgContext, resp, inputImportedSet);
       // transform body
-      const body = transformBody(dpgContext, resp, inputImportedSet);
+      const [body, schemas] = transformBody(
+        dpgContext,
+        resp,
+        inputImportedSet
+      ) ?? [undefined, []];
       rlcOperationUnit.responses.push({
         ...rlcResponseUnit,
         headers,
         body
       });
+      if (statusCode === "default") {
+        defaultSchemas.push(...schemas);
+      } else {
+        nonDefaultSchemas.push(...schemas);
+      }
     }
     const lroLogicalResponse = transformLroLogicalResponse(
       dpgContext,
@@ -104,15 +115,72 @@ export function transformToResponseTypes(
     if (lroLogicalResponse) {
       rlcOperationUnit.responses.push(lroLogicalResponse);
     }
+    rlcOperationUnit.isDefaultSupersetOfOthers =
+      transformIsDefaultSupersetOfOthers(
+        dpgContext,
+        defaultSchemas,
+        nonDefaultSchemas,
+        getOperationName(dpgContext, route.operation)
+      );
     rlcResponses.push(rlcOperationUnit);
   }
   return rlcResponses;
 }
 
+function transformIsDefaultSupersetOfOthers(
+  dpgContext: SdkContext,
+  defaultSchemas: Schema[],
+  nonDefaultSchemas: Schema[],
+  operationName: string
+): boolean {
+  if (defaultSchemas.length !== 1 || nonDefaultSchemas.length === 0) {
+    return false;
+  }
+  if (!isObjectSchema(defaultSchemas[0]!)) {
+    reportDiagnostic(dpgContext.program, {
+      code: "default-response-body-type",
+      format: {
+        operationName
+      },
+      target: NoTarget
+    });
+    return false;
+  }
+  const [typeName, properties] = getNameAndPropertyMap(defaultSchemas[0]!);
+  for (const schema of nonDefaultSchemas) {
+    if (!isObjectSchema(schema)) {
+      return false;
+    }
+    const [nonDefaultTypeName, nonDefaultProperties] =
+      getNameAndPropertyMap(schema);
+    if (typeName === nonDefaultTypeName) {
+      return true;
+    }
+    // check if any properties in default schema is existing in non-default schema
+    for (const [propName, propTypeName] of properties) {
+      if (propTypeName === nonDefaultProperties.get(propName)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+function getNameAndPropertyMap(
+  schema: ObjectSchema
+): [string, Map<string, string>] {
+  const map = new Map<string, string>();
+  for (const [key, value] of Object.entries(schema.properties!)) {
+    map.set(key, getTypeName(value));
+  }
+  return [getTypeName(schema), map];
+}
+
 /**
  * Return undefined if no valid header param
  * @param response response detail
- * @returns rlc header shcema
+ * @returns rlc header schema
  */
 function transformHeaders(
   dpgContext: SdkContext,
@@ -166,15 +234,16 @@ function transformBody(
   dpgContext: SdkContext,
   response: HttpOperationResponse,
   importedModels: Set<string>
-) {
+): [Schema, Schema[]] | undefined {
   if (!response.responses.length) {
     return;
   }
-  // Currently RLC reponse only have one header and body defined
+  // Currently RLC response only have one header and body defined
   // So we'll union all body shapes together with "|"
   const typeSet = new Set<string>();
   const descriptions = new Set<string>();
   let fromCore = false;
+  const schemas = [];
   for (const data of response.responses) {
     const body = data?.body;
     if (!body || isVoidType(body.type)) {
@@ -202,18 +271,22 @@ function transformBody(
         .forEach(importedModels.add, importedModels);
     }
     typeSet.add(bodyType);
+    schemas.push(bodySchema);
   }
 
   if (!typeSet.size) {
     return;
   }
 
-  return {
-    name: "body",
-    type: [...typeSet].join("|"),
-    description: [...descriptions].join("\n\n"),
-    fromCore
-  };
+  return [
+    {
+      name: "body",
+      type: [...typeSet].join("|"),
+      description: [...descriptions].join("\n\n"),
+      fromCore
+    },
+    schemas
+  ];
 }
 
 function transformLroLogicalResponse(