@azure-tools/typespec-ts 0.54.0 → 0.54.1

package/src/transform/transformResponses.ts

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import { getHttpOperationWithCache, SdkClient } from "@azure-tools/typespec-client-generator-core";
+import { getDoc, isVoidType } from "@typespec/compiler";
+import { HttpOperation, HttpOperationResponse } from "@typespec/http";
 import {
   getLroLogicalResponseName,
   Imports,
@@ -8,20 +11,15 @@ import {
   ResponseHeaderSchema,
   ResponseMetadata,
   Schema,
-  SchemaContext
+  SchemaContext,
 } from "../rlc-common/index.js";
-import {
-  getHttpOperationWithCache,
-  SdkClient
-} from "@azure-tools/typespec-client-generator-core";
-import { getDoc, isVoidType } from "@typespec/compiler";
-import { HttpOperation, HttpOperationResponse } from "@typespec/http";
+import { listOperationsUnderRLCClient } from "../utils/clientUtils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   getBinaryType,
   getImportedModelName,
   getSchemaForType,
-  getTypeName
+  getTypeName,
 } from "../utils/modelUtils.js";
 import {
   getOperationGroupName,
@@ -29,14 +27,13 @@ import {
   getOperationName,
   getOperationStatuscode,
   isBinaryPayload,
-  sortedOperationResponses
+  sortedOperationResponses,
 } from "../utils/operationUtil.js";
-import { listOperationsUnderRLCClient } from "../utils/clientUtils.js";
 
 export function transformToResponseTypes(
   client: SdkClient,
   dpgContext: SdkContext,
-  importDetails: Imports
+  importDetails: Imports,
 ): OperationResponse[] {
   const rlcResponses: OperationResponse[] = [];
   const inputImportedSet = new Set<string>();
@@ -56,7 +53,7 @@ export function transformToResponseTypes(
       operationGroup: getOperationGroupName(dpgContext, route),
       operationName: getOperationName(dpgContext, route.operation),
       path: route.path,
-      responses: []
+      responses: [],
     };
     const defaultSchemas: Schema[] = [],
       nonDefaultSchemas: Schema[] = [];
@@ -64,20 +61,16 @@ export function transformToResponseTypes(
       const statusCode = getOperationStatuscode(resp);
       const rlcResponseUnit: ResponseMetadata = {
         statusCode,
-        description: resp.description
+        description: resp.description,
       };
       // transform header
       const headers = transformHeaders(dpgContext, resp, inputImportedSet);
       // transform body
-      const [body, schemas] = transformBody(
-        dpgContext,
-        resp,
-        inputImportedSet
-      ) ?? [undefined, []];
+      const [body, schemas] = transformBody(dpgContext, resp, inputImportedSet) ?? [undefined, []];
       rlcOperationUnit.responses.push({
         ...rlcResponseUnit,
         headers,
-        body
+        body,
       });
       if (statusCode === "default") {
         defaultSchemas.push(...schemas);
@@ -89,7 +82,7 @@ export function transformToResponseTypes(
       dpgContext,
       route,
       getOperationGroupName(dpgContext, route),
-      rlcOperationUnit.responses
+      rlcOperationUnit.responses,
     );
     if (lroLogicalResponse) {
       rlcOperationUnit.responses.push(lroLogicalResponse);
@@ -107,7 +100,7 @@ export function transformToResponseTypes(
 function transformHeaders(
   dpgContext: SdkContext,
   response: HttpOperationResponse,
-  importedModels: Set<string>
+  importedModels: Set<string>,
 ): ResponseHeaderSchema[] | undefined {
   if (!response.responses.length) {
     return;
@@ -133,18 +126,18 @@ function transformHeaders(
       }
       const typeSchema = getSchemaForType(dpgContext, value!.type, {
         usage: [SchemaContext.Output],
-        relevantProperty: value
+        relevantProperty: value,
       }) as Schema;
       const type = getTypeName(typeSchema, [SchemaContext.Output]);
       getImportedModelName(typeSchema, [SchemaContext.Output])?.forEach(
         importedModels.add,
-        importedModels
+        importedModels,
       );
       const header: ResponseHeaderSchema = {
         name: `"${key.toLowerCase()}"`,
         type,
         required: !value?.optional,
-        description: getDoc(dpgContext.program, value!)
+        description: getDoc(dpgContext.program, value!),
       };
       rlcHeaders.set(header.name, header);
     }
@@ -156,7 +149,7 @@ function transformHeaders(
 function transformBody(
   dpgContext: SdkContext,
   response: HttpOperationResponse,
-  importedModels: Set<string>
+  importedModels: Set<string>,
 ): [Schema, Schema[]] | undefined {
   if (!response.responses.length) {
     return;
@@ -173,7 +166,7 @@ function transformBody(
       continue;
     }
     const hasBinaryContent = body.contentTypes.some((contentType) =>
-      isBinaryPayload(dpgContext, body.type, contentType)
+      isBinaryPayload(dpgContext, body.type, contentType),
     );
     if (hasBinaryContent) {
       typeSet.add(getBinaryType([SchemaContext.Output]));
@@ -181,7 +174,7 @@ function transformBody(
       continue;
     }
     const bodySchema = getSchemaForType(dpgContext, body!.type, {
-      usage: [SchemaContext.Output]
+      usage: [SchemaContext.Output],
     }) as Schema;
     fromCore = bodySchema.fromCore ?? false;
     const bodyType = getTypeName(bodySchema);
@@ -206,9 +199,9 @@ function transformBody(
       name: "body",
       type: [...typeSet].join("|"),
       description: [...descriptions].join("\n\n"),
-      fromCore
+      fromCore,
     },
-    schemas
+    schemas,
   ];
 }
 
@@ -216,13 +209,13 @@ function transformLroLogicalResponse(
   dpgContext: SdkContext,
   route: HttpOperation,
   operationGroupName: string,
-  existingResponses: ResponseMetadata[]
+  existingResponses: ResponseMetadata[],
 ): ResponseMetadata | undefined {
   const operationLroOverload = getOperationLroOverload(
     dpgContext.program,
     route,
     undefined,
-    existingResponses
+    existingResponses,
   );
   if (!operationLroOverload) {
     return;
@@ -236,9 +229,9 @@ function transformLroLogicalResponse(
     description: `The final response for long-running ${route.operation.name} operation`,
     predefinedName: getLroLogicalResponseName(
       operationGroupName,
-      getOperationName(dpgContext, route.operation)
+      getOperationName(dpgContext, route.operation),
     ),
-    body: successResp?.body
+    body: successResp?.body,
   };
   return logicalLROResponse;
 }

package/src/transform/transformSchemas.ts

@@ -1,34 +1,28 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import { SdkClient, getHttpOperationWithCache } from "@azure-tools/typespec-client-generator-core";
+import { Model, Type } from "@typespec/compiler";
 import { HttpOperation, getServers } from "@typespec/http";
 import { KnownMediaType, extractMediaTypes } from "../utils/mediaTypes.js";
-import { Model, Type } from "@typespec/compiler";
-import {
-  SdkClient,
-  getHttpOperationWithCache
-} from "@azure-tools/typespec-client-generator-core";
 import {
   getBodyType,
   getDefaultService,
   getSchemaForType,
   includeDerivedModel,
   isAzureCoreErrorType,
-  trimUsage
+  trimUsage,
 } from "../utils/modelUtils.js";
 
-import { SchemaContext } from "../rlc-common/index.js";
-import { SdkContext } from "../utils/interfaces.js";
 import { useContext } from "../contextManager.js";
+import { SchemaContext } from "../rlc-common/index.js";
 import { listOperationsUnderRLCClient } from "../utils/clientUtils.js";
+import { SdkContext } from "../utils/interfaces.js";
 
 export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
   const program = dpgContext.program;
   const metatree = useContext("rlcMetaTree");
-  const schemas: Map<string, SchemaContext[]> = new Map<
-    string,
-    SchemaContext[]
-  >();
+  const schemas: Map<string, SchemaContext[]> = new Map<string, SchemaContext[]>();
   const schemaMap: Map<any, any> = new Map<any, any>();
   const usageMap = new Map<Type, SchemaContext[]>();
   const requestBodySet = new Set<Type>();
@@ -50,13 +44,11 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
     const bodyModel = getBodyType(route);
     if (
       bodyModel &&
-      (bodyModel.kind === "Model" ||
-        bodyModel.kind === "Union" ||
-        bodyModel.kind === "Enum")
+      (bodyModel.kind === "Model" || bodyModel.kind === "Union" || bodyModel.kind === "Enum")
     ) {
       requestBodySet.add(bodyModel);
       const contentTypes: KnownMediaType[] = extractMediaTypes(
-        route.parameters.body?.contentTypes ?? []
+        route.parameters.body?.contentTypes ?? [],
       );
       if (contentTypes.length > 0) {
         contentTypeMap.set(bodyModel, contentTypes);
@@ -75,10 +67,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
           }
         }
         if (resps.body?.contentTypeProperty) {
-          getGeneratedModels(
-            resps.body.contentTypeProperty,
-            SchemaContext.Output
-          );
+          getGeneratedModels(resps.body.contentTypeProperty, SchemaContext.Output);
         }
         const respModel = resps?.body?.type;
         if (!respModel) {
@@ -89,10 +78,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
     }
   }
   function transformHostParameters() {
-    const serviceNs = getDefaultService(
-      program,
-      dpgContext.rlcOptions?.isModularLibrary
-    )?.type;
+    const serviceNs = getDefaultService(program, dpgContext.rlcOptions?.isModularLibrary)?.type;
     if (serviceNs) {
       const host = getServers(program, serviceNs);
       if (host && host?.[0] && host?.[0]?.parameters) {
@@ -112,7 +98,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
       usage: context,
       isRequestBody: requestBodySet.has(tspModel),
       isParentRequestBody: false,
-      mediaTypes: contentTypeMap.get(tspModel)
+      mediaTypes: contentTypeMap.get(tspModel),
     });
     if (model) {
       model.usage = context;
@@ -144,8 +130,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
       const indexer = (model as Model).indexer;
       if (
         indexer?.value &&
-        (!usageMap.get(indexer?.value) ||
-          !usageMap.get(indexer?.value)?.includes(context))
+        (!usageMap.get(indexer?.value) || !usageMap.get(indexer?.value)?.includes(context))
       ) {
         getGeneratedModels(indexer.value, context);
       }
@@ -166,8 +151,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
               (variant.type.kind === "Model" ||
                 variant.type.kind === "Union" ||
                 variant.type.kind === "Enum") &&
-              (!usageMap.get(variant.type) ||
-                !usageMap.get(variant.type)?.includes(context))
+              (!usageMap.get(variant.type) || !usageMap.get(variant.type)?.includes(context))
             ) {
               getGeneratedModels(variant.type, context);
             }
@@ -184,8 +168,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
       if (
         baseModel &&
         baseModel.kind === "Model" &&
-        (!usageMap.get(baseModel) ||
-          !usageMap.get(baseModel)?.includes(context))
+        (!usageMap.get(baseModel) || !usageMap.get(baseModel)?.includes(context))
       ) {
         getGeneratedModels(baseModel, context);
       }
@@ -207,8 +190,7 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
       for (const variant of variants) {
         if (
           (variant.type.kind === "Model" || variant.type.kind === "Union") &&
-          (!usageMap.get(variant.type) ||
-            !usageMap.get(variant.type)?.includes(context))
+          (!usageMap.get(variant.type) || !usageMap.get(variant.type)?.includes(context))
         ) {
           getGeneratedModels(variant.type, context);
         }

package/src/transform/transformTelemetryInfo.ts

@@ -1,35 +1,29 @@
-import { TelemetryInfo } from "../rlc-common/index.js";
 import {
   getHttpOperationWithCache,
   SdkClient,
-  SdkContext
+  SdkContext,
 } from "@azure-tools/typespec-client-generator-core";
-import { getCustomRequestHeaderNameForOperation } from "../utils/operationUtil.js";
+import { TelemetryInfo } from "../rlc-common/index.js";
 import { listOperationsUnderRLCClient } from "../utils/clientUtils.js";
+import { getCustomRequestHeaderNameForOperation } from "../utils/operationUtil.js";
 
 export function transformTelemetryInfo(
   client: SdkClient,
-  dpgContext: SdkContext
+  dpgContext: SdkContext,
 ): TelemetryInfo | undefined {
-  const customRequestIdHeaderName = getCustomRequestHeaderNameForClient(
-    dpgContext,
-    client
-  );
+  const customRequestIdHeaderName = getCustomRequestHeaderNameForClient(dpgContext, client);
   if (customRequestIdHeaderName) {
     return {
-      customRequestIdHeaderName
+      customRequestIdHeaderName,
     };
   }
   return undefined;
 }
 
-function getCustomRequestHeaderNameForClient(
-  dpgContext: SdkContext,
-  client: SdkClient
-) {
+function getCustomRequestHeaderNameForClient(dpgContext: SdkContext, client: SdkClient) {
   for (const op of listOperationsUnderRLCClient(client)) {
     const headerName = getCustomRequestHeaderNameForOperation(
-      getHttpOperationWithCache(dpgContext, op)
+      getHttpOperationWithCache(dpgContext, op),
     );
     if (headerName !== undefined) {
       return headerName;