@azure-tools/typespec-ts 0.56.0-dev.0 → 0.56.0-dev.10

package/src/modular/helpers/operation-helpers.ts

@@ -33,9 +33,9 @@ import { useDependencies } from "../../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../../framework/reference.js";
 import { refkey } from "../../framework/refkey.js";
 import { reportDiagnostic } from "../../lib.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../../utils/model-utils.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import {
   getCollectionFormatFromArrayEncoding,
   getCollectionFormatHelper,
@@ -213,11 +213,11 @@ export function getDeserializePrivateFunction(
     };
   } else if (response.type) {
     // When response.optional is true, some HTTP responses have no body (e.g. 204), so
-    // the return type must include undefined to reflect that possibility.
+    // the return type must include void to reflect that possibility.
     const baseType = getTypeExpression(context, response.type);
     returnType = {
       name: (response as any).name ?? "",
-      type: response.optional ? `${baseType} | undefined` : baseType,
+      type: response.optional ? `${baseType} | void` : baseType,
     };
   } else if (isHeadAsBooleanOperation(operation)) {
     returnType = { name: "", type: "boolean" };
@@ -405,15 +405,15 @@ export function getDeserializePrivateFunction(
       }
       if (deserializeFunctionName) {
         if (needsBodyGuard) {
-          // Use ternary form: return result.body ? deserializer(result.body) : undefined
           statements.push(
-            `return ${deserializedRoot} ? ${deserializeFunctionName}(${deserializedRoot})${multipartCastSuffix} : undefined`,
-          );
-        } else {
-          statements.push(
-            `return ${deserializeFunctionName}(${deserializedRoot})${multipartCastSuffix}`,
+            `if (!${deserializedRoot}) {
+            return;
+          }`,
           );
         }
+        statements.push(
+          `return ${deserializeFunctionName}(${deserializedRoot})${multipartCastSuffix}`,
+        );
       } else if (isAzureCoreErrorType(context.program, deserializedType.__raw)) {
         statements.push(`return ${deserializedRoot}${multipartCastSuffix}`);
       } else if (isHeadAsBooleanOperation(operation)) {
@@ -464,8 +464,8 @@ export function getDeserializeHeadersPrivateFunction(
   operation: ServiceOperation,
 ): OptionalKind<FunctionDeclarationStructure> | undefined {
   const responseHeaders = getResponseHeaders(operation.operation.responses);
-  const isResponseHeadersEnabled = context.rlcOptions?.includeHeadersInResponse === true;
-  const isStorageCompatEnabled = context.rlcOptions?.enableStorageCompat === true;
+  const isResponseHeadersEnabled = context.emitterOptions?.includeHeadersInResponse === true;
+  const isStorageCompatEnabled = context.emitterOptions?.enableStorageCompat === true;
 
   // Only generate if headers exist and a relevant feature is enabled
   if (responseHeaders.length === 0 || (!isResponseHeadersEnabled && !isStorageCompatEnabled)) {
@@ -617,7 +617,7 @@ export function getDeserializeExceptionHeadersPrivateFunction(
   context: SdkContext,
   operation: ServiceOperation,
 ): OptionalKind<FunctionDeclarationStructure> | undefined {
-  const isResponseHeadersEnabled = context.rlcOptions?.includeHeadersInResponse === true;
+  const isResponseHeadersEnabled = context.emitterOptions?.includeHeadersInResponse === true;
   if (!isResponseHeadersEnabled) {
     return undefined;
   }
@@ -673,7 +673,7 @@ function getExceptionThrowStatement(context: SdkContext, operation: ServiceOpera
   const { customized, defaultDeserializer, defaultXmlDeserializer, defaultIsXmlOnly } =
     getExceptionDetails(context, operation);
 
-  const isResponseHeadersEnabled = context.rlcOptions?.includeHeadersInResponse === true;
+  const isResponseHeadersEnabled = context.emitterOptions?.includeHeadersInResponse === true;
 
   // Check if exception headers function exists and build the call
   const exceptionHeaders = getExceptionResponseHeaders(operation.operation.exceptions);
@@ -916,8 +916,8 @@ export function getOperationFunction(
   const response = operation.response;
   const responseHeaders = getResponseHeaders(operation.operation.responses);
   const hasHeaderOnlyResponse = !response.type && responseHeaders.length > 0;
-  const isResponseHeadersEnabled = context.rlcOptions?.includeHeadersInResponse === true;
-  const isStorageCompatEnabled = context.rlcOptions?.enableStorageCompat === true;
+  const isResponseHeadersEnabled = context.emitterOptions?.includeHeadersInResponse === true;
+  const isStorageCompatEnabled = context.emitterOptions?.enableStorageCompat === true;
 
   // Track the raw body type separately for storage-compat (before header merging)
   const hasResponseBody = !!response.type;
@@ -949,13 +949,13 @@ export function getOperationFunction(
       const baseCompositeType = buildCompositeResponseType(context, type, responseHeaders);
       returnType = {
         name: (type as any).name ?? "",
-        type: response.optional ? `${baseCompositeType} | undefined` : baseCompositeType,
+        type: response.optional ? `${baseCompositeType} | void` : baseCompositeType,
       };
     } else {
       const baseType = getTypeExpression(context, type!);
       returnType = {
         name: (type as any).name ?? "",
-        type: response.optional ? `${baseType} | undefined` : baseType,
+        type: response.optional ? `${baseType} | void` : baseType,
       };
     }
   } else if (hasHeaderOnlyResponse && isResponseHeadersEnabled) {
@@ -1404,7 +1404,7 @@ export function getOperationOptionsName(
 
 /**
  * This function build the request parameters that we will provide to the
- * RLC internally. This will translate High Level parameters into the RLC ones.
+ * REST-level request internally. This will translate high-level parameters into the REST-level ones.
  * Figuring out what goes in headers, body, path and qsp.
  */
 function getHeaderAndBodyParameters(
@@ -1632,7 +1632,7 @@ export function getParameterMap(
   // Special case for api-version parameters with default values
   if (param.isApiVersionParam && param.clientDefaultValue) {
     // For multi-service, use only the default value (don't reference context.apiVersion)
-    if (context.rlcOptions?.isMultiService) {
+    if (context.emitterOptions?.isMultiService) {
       return `"${serializedName}": "${param.clientDefaultValue}"`;
     }
     return `"${serializedName}": ${param.onClient ? "context." : ""}${param.name} ?? "${param.clientDefaultValue}"`;
@@ -2141,8 +2141,8 @@ export function getRequestModelProperties(
 
 /**
  *
- * This function helps translating an HLC request to RLC request,
- * extracting properties from body and headers and building the RLC response object
+ * This function helps translating a high-level request to a REST-level request,
+ * extracting properties from body and headers and building the REST-level request object
  */
 export function getRequestModelMapping(
   context: SdkContext,
@@ -2177,8 +2177,8 @@ function getHeaderSerializedName(param: SdkHttpParameter) {
 }
 
 /**
- * This function helps translating an RLC response to an HLC response,
- * extracting properties from body and headers and building the HLC response object
+ * This function helps translating a REST-level response to a high-level response,
+ * extracting properties from body and headers and building the high-level response object
  */
 export function getResponseMapping(
   context: SdkContext,
@@ -2324,7 +2324,7 @@ export function serializeRequestValue(
       } else if (
         isSpecialHandledUnion({
           ...type,
-          isNonExhaustive: context.rlcOptions?.experimentalExtensibleEnums ?? false,
+          isNonExhaustive: context.emitterOptions?.experimentalExtensibleEnums ?? false,
         })
       ) {
         const sdkType = getSdkType(type.__raw!);
@@ -2750,7 +2750,7 @@ function getApiVersionExpression(
     return undefined;
   }
   // For multi-service, use only the default value (don't reference context.apiVersion)
-  if (dpgContext.rlcOptions?.isMultiService) {
+  if (dpgContext.emitterOptions?.isMultiService) {
     return queryApiVersionParam.clientDefaultValue
       ? `"${queryApiVersionParam.clientDefaultValue}"`
       : undefined;
@@ -2918,7 +2918,7 @@ export function getOperationResponseTypeName(method: [string[], ServiceOperation
 function isWrappableType(context: SdkContext, type: SdkType): boolean {
   if (type.kind === "array" && type.valueType.kind === "model") return false;
   if (type.kind === "dict" || type.kind === "model") return false;
-  if (type.kind === "unknown" && context.rlcOptions?.treatUnknownAsRecord) return false;
+  if (type.kind === "unknown" && context.emitterOptions?.treatUnknownAsRecord) return false;
   return true;
 }
 
@@ -2952,7 +2952,7 @@ export function checkWrapNonModelReturn(
   }
 
   // Only if the feature flag is enabled
-  if (!context.rlcOptions?.wrapNonModelReturn) {
+  if (!context.emitterOptions?.wrapNonModelReturn) {
     return noWrap;
   }
 

package/src/modular/helpers/type-helpers.ts

@@ -6,8 +6,8 @@ import {
   SdkModelType,
   SdkType,
 } from "@azure-tools/typespec-client-generator-core";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import {
   getPropertyWithOverrides,
   ModelOverrideOptions,

package/src/modular/interfaces.ts

@@ -1,4 +1,4 @@
-import { RLCOptions } from "../rlc-common/index.js";
+import { ClientOptions } from "../interfaces.js";
 
 export interface ModularOptions {
   sourceRoot: string;
@@ -6,13 +6,13 @@ export interface ModularOptions {
   experimentalExtensibleEnums: boolean;
 }
 export interface ModularEmitterOptions {
-  options: RLCOptions;
+  options: ClientOptions;
   modularOptions: ModularOptions;
 }
 
-export interface ModularClientOptions {
+export interface ClientModuleInfo {
   subfolder?: string;
-  rlcClientName: string;
+  clientName: string;
 }
 
 export interface OperationPathAndDeserDetails {

package/src/modular/serialization/build-deserializer-function.ts

@@ -13,9 +13,9 @@ import { useContext } from "../../context-manager.js";
 import { resolveReference } from "../../framework/reference.js";
 import { refkey } from "../../framework/refkey.js";
 import { reportDiagnostic } from "../../lib.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../../utils/model-utils.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { getAdditionalPropertiesName, normalizeModelName } from "../emit-models.js";
 import {
   getAllAncestors,
@@ -447,7 +447,7 @@ function getAdditionalPropertiesStatement(
   if (typeof deserializerFunction === "string") {
     params.push(deserializerFunction);
   }
-  return context.rlcOptions?.compatibilityMode === true
+  return context.emitterOptions?.compatibilityMode === true
     ? "...item,"
     : `${getAdditionalPropertiesName(context, type)}: ${resolveReference(SerializationHelpers.serializeRecord)}(${params.join(",")}),`;
 }

package/src/modular/serialization/build-serializer-function.ts

@@ -14,9 +14,9 @@ import { useContext } from "../../context-manager.js";
 import { resolveReference } from "../../framework/reference.js";
 import { refkey } from "../../framework/refkey.js";
 import { reportDiagnostic } from "../../lib.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../../utils/model-utils.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { getAdditionalPropertiesName, normalizeModelName } from "../emit-models.js";
 import {
   getAllAncestors,
@@ -498,7 +498,7 @@ function getAdditionalPropertiesStatement(
     params.push("undefined");
     params.push(deserializerFunction);
   }
-  return context.rlcOptions?.compatibilityMode === true
+  return context.emitterOptions?.compatibilityMode === true
     ? "...item"
     : `...${resolveReference(SerializationHelpers.serializeRecord)}(${params.join(",")})`;
 }

package/src/modular/serialization/build-xml-serializer-function.ts

@@ -16,9 +16,9 @@ import { useDependencies } from "../../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../../framework/reference.js";
 import { refkey } from "../../framework/refkey.js";
 import { reportDiagnostic } from "../../lib.js";
-import { NameType } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../../utils/model-utils.js";
+import { NameType } from "../../utils/name-utils.js";
 import { getAdditionalPropertiesName, normalizeModelName } from "../emit-models.js";
 import { getAllAncestors, getAllProperties } from "../helpers/operation-helpers.js";
 import { getAdditionalPropertiesType } from "../helpers/type-helpers.js";

package/src/modular/type-expressions/get-enum-expression.ts

@@ -19,5 +19,5 @@ export function getEnumExpression(
 }
 
 export function isExtensibleEnum(context: SdkContext, type: SdkEnumType): boolean {
-  return !type.isFixed && context.rlcOptions?.experimentalExtensibleEnums === true;
+  return !type.isFixed && context.emitterOptions?.experimentalExtensibleEnums === true;
 }

package/src/modular/type-expressions/get-nullable-expression.ts

@@ -11,7 +11,7 @@ export function getNullableExpression(
 ): string {
   if (shouldEmitInline(type, options)) {
     // Check if we should ignore null for optional properties
-    const ignoreNullableOnOptional = context.rlcOptions?.ignoreNullableOnOptional ?? false;
+    const ignoreNullableOnOptional = context.emitterOptions?.ignoreNullableOnOptional ?? false;
     const isOptional = options.isOptional ?? false;
 
     const nonNullableType = getTypeExpression(context, type.type, options);

package/src/modular/type-expressions/get-type-expression.ts

@@ -4,8 +4,8 @@ import {
   SdkServiceResponseHeader,
   SdkType,
 } from "@azure-tools/typespec-client-generator-core";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { getCredentialExpression } from "./get-credential-expression.js";
 import { getEnumExpression } from "./get-enum-expression.js";
 import { getModelExpression } from "./get-model-expression.js";
@@ -22,7 +22,7 @@ export function normalizeModelPropertyName(
   property: SdkModelPropertyType | SdkHttpParameter | SdkServiceResponseHeader,
 ): string {
   const normalizedPropName = normalizeName(property.name, NameType.Property);
-  return context.rlcOptions?.ignorePropertyNameNormalize
+  return context.emitterOptions?.ignorePropertyNameNormalize
     ? `"${property.name}"`
     : `"${normalizedPropName}"`;
 }
@@ -40,7 +40,7 @@ export function getTypeExpression(
     case "enum":
       return getEnumExpression(context, type);
     case "unknown":
-      return context.rlcOptions?.treatUnknownAsRecord ? "Record<string, unknown>" : "any";
+      return context.emitterOptions?.treatUnknownAsRecord ? "Record<string, unknown>" : "any";
     case "boolean":
       return "boolean";
     case "decimal":

package/src/transform/transform-api-version-info.ts

@@ -3,15 +3,9 @@ import {
   isApiVersion,
   SdkClient,
 } from "@azure-tools/typespec-client-generator-core";
-import {
-  ApiVersionInfo,
-  ApiVersionPosition,
-  extractDefinedPosition,
-  extractPathApiVersion,
-  SchemaContext,
-  UrlInfo,
-} from "../rlc-common/index.js";
-import { listOperationsUnderRLCClient } from "../utils/client-utils.js";
+import { ApiVersionInfo, ApiVersionPosition, SchemaContext, UrlInfo } from "../interfaces.js";
+import { extractDefinedPosition, extractPathApiVersion } from "../utils/api-version-util.js";
+import { listOperationsUnderClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getDefaultApiVersionString, getSchemaForType, trimUsage } from "../utils/model-utils.js";
 
@@ -56,7 +50,7 @@ export function getOperationApiVersion(
   const required = new Set<boolean>();
   dpgContext.hasApiVersionInClient = true;
   let hasApiVersionInOperation: boolean;
-  for (const op of listOperationsUnderRLCClient(client)) {
+  for (const op of listOperationsUnderClient(client)) {
     hasApiVersionInOperation = false;
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation

package/src/transform/{transfrom-rlc-options.ts → transform-client-options.ts}

@@ -1,42 +1,36 @@
 import { getHttpOperationWithCache } from "@azure-tools/typespec-client-generator-core";
 import { getDoc, NoTarget, Program } from "@typespec/compiler";
 import { getAuthentication } from "@typespec/http";
+import { ClientOptions, PackageDetails, ServiceInfo } from "../interfaces.js";
 import { EmitterOptions, reportDiagnostic } from "../lib.js";
 import { getClientParameters } from "../modular/helpers/client-helpers.js";
-import {
-  NameType,
-  normalizeName,
-  PackageDetails,
-  pascalCase,
-  RLCOptions,
-  ServiceInfo,
-} from "../rlc-common/index.js";
-import { getRLCClients, listOperationsUnderRLCClient } from "../utils/client-utils.js";
+import { getClients, listOperationsUnderClient } from "../utils/client-utils.js";
 import { getSupportedHttpAuth } from "../utils/credential-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getDefaultService } from "../utils/model-utils.js";
+import { NameType, normalizeName, pascalCase } from "../utils/name-utils.js";
 import { detectModelConflicts } from "../utils/namespace-utils.js";
 import { getOperationName } from "../utils/operation-util.js";
 
-export function transformRLCOptions(
+export function transformClientOptions(
   emitterOptions: EmitterOptions,
   dpgContext: SdkContext,
-): RLCOptions {
+): ClientOptions {
   // Extract the options from emitter option
-  const options = extractRLCOptions(
+  const options = extractClientOptions(
     dpgContext,
     emitterOptions,
     dpgContext.generationPathDetail?.rootDir ?? "",
   );
-  const batch = getRLCClients(dpgContext);
+  const batch = getClients(dpgContext);
   options.batch = batch;
   return options;
 }
-function extractRLCOptions(
+function extractClientOptions(
   dpgContext: SdkContext,
   emitterOptions: EmitterOptions,
   generationRootDir: string,
-): RLCOptions {
+): ClientOptions {
   const program = dpgContext.program;
   const packageDetails = getPackageDetails(program, emitterOptions);
   const serviceInfo = getServiceInfo(program);
@@ -50,13 +44,11 @@ function extractRLCOptions(
   const enableModelNamespace = getEnableModelNamespace(dpgContext, emitterOptions);
   const hierarchyClient = getHierarchyClient(emitterOptions);
   const clearOutputFolder = getClearOutputFolder(emitterOptions);
-  const isTypeSpecTest = emitterOptions["is-typespec-test"];
   const compatibilityMode = emitterOptions["compatibility-mode"];
   const compatibilityLro = emitterOptions["compatibility-lro"];
   const experimentalExtensibleEnums = emitterOptions["experimental-extensible-enums"];
   const ignorePropertyNameNormalize = emitterOptions["ignore-property-name-normalize"];
   const ignoreEnumMemberNameNormalize = emitterOptions["ignore-enum-member-name-normalize"];
-  const compatibilityQueryMultiFormat = emitterOptions["compatibility-query-multi-format"];
   const enableStorageCompat = emitterOptions["enable-storage-compat"] === true;
   const treatUnknownAsRecord = emitterOptions["treat-unknown-as-record"] === true;
   const typespecTitleMap = emitterOptions["typespec-title-map"];
@@ -80,12 +72,10 @@ function extractRLCOptions(
     hierarchyClient,
     azureArm: dpgContext.arm,
     clearOutputFolder,
-    isTypeSpecTest,
     compatibilityMode,
     compatibilityLro,
     experimentalExtensibleEnums,
     ignorePropertyNameNormalize,
-    compatibilityQueryMultiFormat,
     typespecTitleMap,
     ignoreEnumMemberNameNormalize,
     hasSubscriptionId,
@@ -107,7 +97,7 @@ function processAuth(program: Program) {
   if (!authorization || !authorization.options) {
     return undefined;
   }
-  const securityInfo: RLCOptions = {};
+  const securityInfo: ClientOptions = {};
   for (const auth of getSupportedHttpAuth(program, authorization)) {
     switch (auth.type) {
       case "http":
@@ -199,11 +189,11 @@ function getClearOutputFolder(emitterOptions: EmitterOptions) {
 }
 
 function detectIfNameConflicts(dpgContext: SdkContext) {
-  const clients = getRLCClients(dpgContext);
+  const clients = getClients(dpgContext);
   for (const client of clients) {
     // only consider it's conflict when there are conflicts in the same client
     const nameSet = new Set<string>();
-    for (const op of listOperationsUnderRLCClient(client)) {
+    for (const op of listOperationsUnderClient(client)) {
       const route = getHttpOperationWithCache(dpgContext, op);
       const name = getOperationName(dpgContext, route.operation);
       if (nameSet.has(name)) {

package/src/transform/transform-helper-function-details.ts

@@ -1,6 +1,6 @@
 import { getHttpOperationWithCache, SdkClient } from "@azure-tools/typespec-client-generator-core";
-import { HelperFunctionDetails } from "../rlc-common/index.js";
-import { listOperationsUnderRLCClient } from "../utils/client-utils.js";
+import { HelperFunctionDetails } from "../interfaces.js";
+import { listOperationsUnderClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getCollectionFormat } from "../utils/model-utils.js";
 import {
@@ -34,7 +34,7 @@ function extractClientPageDetails(client: SdkClient, dpgContext: SdkContext) {
   }
   const nextLinks = new Set<string>(["nextLink"]);
   const itemNames = new Set<string>(["value"]);
-  for (const op of listOperationsUnderRLCClient(client)) {
+  for (const op of listOperationsUnderClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
@@ -61,11 +61,11 @@ function extractClientPageDetails(client: SdkClient, dpgContext: SdkContext) {
 function extractSpecialSerializeInfo(client: SdkClient, dpgContext: SdkContext) {
   let hasMultiCollection = false;
   let hasCsvCollection = false;
-  for (const op of listOperationsUnderRLCClient(client)) {
+  for (const op of listOperationsUnderClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     route.parameters.parameters.forEach((parameter) => {
       const format = getCollectionFormat(dpgContext, parameter as any);
-      const serializeInfo = getSpecialSerializeInfo(dpgContext, parameter.type, format!);
+      const serializeInfo = getSpecialSerializeInfo(parameter.type, format!);
       hasMultiCollection = hasMultiCollection
         ? hasMultiCollection
         : serializeInfo.hasMultiCollection;

package/src/transform/transform-parameters.ts

@@ -8,7 +8,6 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import { NoTarget, Type, isVoidType } from "@typespec/compiler";
 import { HttpOperation, HttpOperationParameter, HttpOperationParameters } from "@typespec/http";
-import { reportDiagnostic } from "../lib.js";
 import {
   ApiVersionInfo,
   Imports,
@@ -18,8 +17,9 @@ import {
   ParameterMetadata,
   Schema,
   SchemaContext,
-} from "../rlc-common/index.js";
-import { listOperationsUnderRLCClient } from "../utils/client-utils.js";
+} from "../interfaces.js";
+import { reportDiagnostic } from "../lib.js";
+import { listOperationsUnderClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import {
   KnownMediaType,
@@ -57,9 +57,9 @@ export function transformToParameterTypes(
   importDetails: Imports,
   apiVersionInfo?: ApiVersionInfo,
 ): OperationParameter[] {
-  const rlcParameters: OperationParameter[] = [];
+  const clientParameters: OperationParameter[] = [];
   const outputImportedSet = new Set<string>();
-  for (const op of listOperationsUnderRLCClient(client)) {
+  for (const op of listOperationsUnderClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
@@ -73,15 +73,15 @@ export function transformToParameterTypes(
   }
   function transformToParameterTypesForRoute(route: HttpOperation) {
     const parameters = route.parameters;
-    const rlcParameter: OperationParameter = {
+    const clientParameter: OperationParameter = {
       operationGroup: getOperationGroupName(dpgContext, route),
       operationName: getOperationName(dpgContext, route.operation),
       parameters: [],
     };
     const options = {
       apiVersionInfo,
-      operationGroupName: rlcParameter.operationGroup,
-      operationName: rlcParameter.operationName,
+      operationGroupName: clientParameter.operationGroup,
+      operationName: clientParameter.operationName,
       importModels: outputImportedSet,
     };
     // transform query param
@@ -104,13 +104,13 @@ export function transformToParameterTypes(
         bodyType,
       );
     }
-    rlcParameter.parameters.push({
+    clientParameter.parameters.push({
       parameters: [...queryParams, ...pathParams, ...headerParams],
       body: bodyParameter,
     });
-    rlcParameters.push(rlcParameter);
+    clientParameters.push(clientParameter);
   }
-  return rlcParameters;
+  return clientParameters;
 }
 
 function getParameterMetadata(
@@ -131,7 +131,7 @@ function getParameterMetadata(
   let description = getFormattedPropertyDoc(program, parameter.param, schema) ?? "";
   const format = getCollectionFormat(dpgContext, parameter as any);
   if (isArrayType(schema) && format) {
-    const serializeInfo = getSpecialSerializeInfo(dpgContext, parameter.type, format);
+    const serializeInfo = getSpecialSerializeInfo(parameter.type, format);
     if (serializeInfo.hasMultiCollection || serializeInfo.hasCsvCollection) {
       description += `${description ? "\n" : ""}This parameter could be formatted as ${serializeInfo.collectionInfo.join(
         ", ",

package/src/transform/transform-paths.ts

@@ -7,15 +7,6 @@ import {
   isApiVersion,
 } from "@azure-tools/typespec-client-generator-core";
 import { HttpOperation, HttpOperationParameters } from "@typespec/http";
-import {
-  Imports,
-  OperationMethod,
-  PathMetadata,
-  Paths,
-  SchemaContext,
-  getParameterTypeName,
-  getResponseTypeName,
-} from "../rlc-common/index.js";
 import { getImportedModelName, getSchemaForType, isBodyRequired } from "../utils/model-utils.js";
 import {
   extractOperationLroDetail,
@@ -29,8 +20,10 @@ import {
 } from "../utils/operation-util.js";
 
 import { getDoc } from "@typespec/compiler";
-import { listOperationsUnderRLCClient } from "../utils/client-utils.js";
+import { Imports, OperationMethod, PathMetadata, Paths, SchemaContext } from "../interfaces.js";
+import { listOperationsUnderClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { getParameterTypeName, getResponseTypeName } from "../utils/name-constructors.js";
 import { getParameterSerializationInfo } from "../utils/parameter-utils.js";
 
 export function transformPaths(
@@ -40,7 +33,7 @@ export function transformPaths(
 ): Paths {
   const pathParamsImportedSet = new Set<string>();
   const paths: Paths = {};
-  for (const op of listOperationsUnderRLCClient(client)) {
+  for (const op of listOperationsUnderClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
@@ -50,7 +43,7 @@ export function transformPaths(
   }
 
   if (pathParamsImportedSet.size > 0) {
-    importDetails.rlcClientDefinition.importsSet = pathParamsImportedSet;
+    importDetails.clientDefinition.importsSet = pathParamsImportedSet;
   }
 
   return paths;