@azure-tools/typespec-ts 0.56.0-dev.1 → 0.56.0-dev.11

package/src/modular/emit-models.ts

@@ -28,7 +28,6 @@ import {
   StructureKind,
   TypeAliasDeclarationStructure,
 } from "ts-morph";
-import { fixLeadingNumber, NameType, normalizeName } from "../rlc-common/index.js";
 // import { isKey } from "@typespec/compiler";
 import {
   getExternalModel,
@@ -47,10 +46,12 @@ import {
   pagedModelsKeptPublic,
 } from "../framework/hooks/sdk-types.js";
 import { refkey } from "../framework/refkey.js";
+import { beginSourceFileBatch, flushSourceFileBatch } from "../framework/source-file-batch.js";
 import { reportDiagnostic } from "../lib.js";
 import { getClientHierarchyMap } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../utils/model-utils.js";
+import { fixLeadingNumber, NameType, normalizeName } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { getHeaderClientOptions } from "./helpers/client-option-helpers.js";
 import {
@@ -117,32 +118,37 @@ export function emitTypes(context: SdkContext, { sourceRoot }: { sourceRoot: str
 
   let sourceFile;
 
-  for (const type of emitQueue) {
-    if (!isGenerableType(type)) {
-      continue;
-    }
+  beginSourceFileBatch();
+  try {
+    for (const type of emitQueue) {
+      if (!isGenerableType(type)) {
+        continue;
+      }
 
-    const namespaces = getModelNamespaces(context, type);
-    const filepath = getModelsPath(sourceRoot, namespaces);
-    sourceFile = outputProject.getSourceFile(filepath);
-    if (!sourceFile) {
-      sourceFile = outputProject.createSourceFile(filepath);
-      sourceFile.addStatements(`/**
+      const namespaces = getModelNamespaces(context, type);
+      const filepath = getModelsPath(sourceRoot, namespaces);
+      sourceFile = outputProject.getSourceFile(filepath);
+      if (!sourceFile) {
+        sourceFile = outputProject.createSourceFile(filepath);
+        sourceFile.addStatements(`/*
 * This file contains only generated model types and their (de)serializers.
 * Disable the following rules for internal models with '_' prefix and deserializers which require 'any' for raw JSON input.
 */
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */`);
+      }
+      emitType(context, type, sourceFile);
     }
-    emitType(context, type, sourceFile);
-  }
 
-  // Emit serialization/deserialization functions for flattened properties
-  for (const [property, _] of flattenPropertyModelMap) {
-    const namespaces = getModelNamespaces(context, property.type);
-    const filepath = getModelsPath(sourceRoot, namespaces);
-    sourceFile = outputProject.getSourceFile(filepath);
-    addSerializationFunctions(context, property, sourceFile!);
+    // Emit serialization/deserialization functions for flattened properties
+    for (const [property, _] of flattenPropertyModelMap) {
+      const namespaces = getModelNamespaces(context, property.type);
+      const filepath = getModelsPath(sourceRoot, namespaces);
+      sourceFile = outputProject.getSourceFile(filepath);
+      addSerializationFunctions(context, property, sourceFile!);
+    }
+  } finally {
+    flushSourceFileBatch();
   }
 
   const modelFiles = outputProject.getSourceFiles(sourceRoot + "/models/**/*.ts");
@@ -245,7 +251,7 @@ function emitType(context: SdkContext, type: SdkType, sourceFile: SourceFile) {
     }
     const apiVersionEnumOnly = type.usage === UsageFlags.ApiVersionEnum;
     // Skip known api version enums for multi-service scenarios as users are not allowed to set api versions
-    if (apiVersionEnumOnly && context.rlcOptions?.isMultiService) {
+    if (apiVersionEnumOnly && context.emitterOptions?.isMultiService) {
       return;
     }
     const inputUsage = (type.usage & UsageFlags.Input) === UsageFlags.Input;
@@ -290,7 +296,7 @@ function emitType(context: SdkContext, type: SdkType, sourceFile: SourceFile) {
 
 export function getApiVersionEnum(context: SdkContext) {
   // Skip api version enum for multi-service scenarios since each service may have different versions
-  if (context.rlcOptions?.isMultiService) {
+  if (context.emitterOptions?.isMultiService) {
     return;
   }
   const apiVersionEnum = context.sdkPackage.enums.find(
@@ -325,7 +331,7 @@ export function getModelNamespaces(context: SdkContext, model: SdkType): string[
     }
     const segments = model.namespace.split(".");
     // Keep full namespace segments if multiple services are present because there isn't a root namespace to trim
-    if (context.rlcOptions?.isMultiService) {
+    if (context.emitterOptions?.isMultiService) {
       return segments;
     }
 
@@ -603,7 +609,7 @@ function emitEnumMember(
 ): EnumMemberStructure {
   const shouldNormalizeName = !member.name.startsWith("$DO_NOT_NORMALIZE$");
   const enumTypeName = normalizeName(member.enumType.name, NameType.Interface, true);
-  let normalizedMemberName = context.rlcOptions?.ignoreEnumMemberNameNormalize
+  let normalizedMemberName = context.emitterOptions?.ignoreEnumMemberNameNormalize
     ? fixLeadingNumber(member.name, NameType.EnumMemberName) // need to fix the leading number also for enum member
     : normalizeName(member.name, NameType.EnumMemberName, true);
   // If the member name starts with _ due to a leading digit (not because the original has _),
@@ -744,7 +750,7 @@ function addExtendedDictInfo(
   const additionalPropertiesType = model.additionalProperties
     ? getTypeExpression(context, model.additionalProperties)
     : undefined;
-  if (context.rlcOptions?.compatibilityMode) {
+  if (context.emitterOptions?.compatibilityMode) {
     const ancestors = getAllAncestors(model);
     const properties = getAllProperties(context, model, ancestors);
     let anyType: boolean;
@@ -839,7 +845,7 @@ export function normalizeModelName(
       unionSuffix = "Union";
     }
   }
-  const namespacePrefix = context.rlcOptions?.enableModelNamespace ? segments.join("") : "";
+  const namespacePrefix = context.emitterOptions?.enableModelNamespace ? segments.join("") : "";
   const internalModelPrefix =
     (isPagedResultModel(context, type) && !pagedModelsKeptPublic.has(type)) || type.isGeneratedName
       ? "_"
@@ -883,7 +889,7 @@ function buildModelProperty(
 ): PropertySignatureStructure {
   const normalizedPropName = normalizeModelPropertyName(context, property);
   if (
-    !context.rlcOptions?.ignorePropertyNameNormalize &&
+    !context.emitterOptions?.ignorePropertyNameNormalize &&
     normalizedPropName !== `"${property.name}"`
   ) {
     reportDiagnostic(context.program, {

package/src/modular/emit-samples.ts

@@ -14,10 +14,10 @@ import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
 import { reportDiagnostic } from "../index.js";
 import { AzureIdentityDependencies } from "../modular/external-dependencies.js";
-import { NameType, normalizeName } from "../rlc-common/index.js";
-import { getSubscriptionId } from "../transform/transfrom-rlc-options.js";
+import { getSubscriptionId } from "../transform/transform-client-options.js";
 import { hasKeyCredential, hasTokenCredential } from "../utils/credential-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 import {
   getMethodHierarchiesMap,
   isTenantLevelOperation,
@@ -115,9 +115,9 @@ function emitMethodSamples(
   });
   const exampleFunctions = [];
   // TODO: remove hard-coded for package
-  if (dpgContext.rlcOptions?.packageDetails?.name) {
+  if (dpgContext.emitterOptions?.packageDetails?.name) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: dpgContext.rlcOptions?.packageDetails?.name,
+      moduleSpecifier: dpgContext.emitterOptions?.packageDetails?.name,
       namedImports: [getClassicalClientName(options.topLevelClient)],
     });
   }
@@ -606,7 +606,7 @@ function getParameterValue(
       retValue = `${JSON.stringify(value.value)}`;
       break;
     case "null": {
-      const ignoreNullableOnOptional = context.rlcOptions?.ignoreNullableOnOptional ?? false;
+      const ignoreNullableOnOptional = context.emitterOptions?.ignoreNullableOnOptional ?? false;
       if (ignoreNullableOnOptional) {
         // When ignore-nullable-on-optional is true, the TypeScript type won't include
         // | null for optional properties, so we convert null to a type-appropriate default

package/src/modular/emit-tests.ts

@@ -1,8 +1,8 @@
 import { type CompilerHost, joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { resolveReference } from "../framework/reference.js";
-import { NameType, normalizeName } from "../rlc-common/index.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 import { ServiceOperation } from "../utils/operation-util.js";
 import { AzureTestDependencies } from "./external-dependencies.js";
 import {

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

@@ -10,9 +10,9 @@ import {
 import { addDeclaration } from "../../framework/declaration.js";
 import { resolveReference } from "../../framework/reference.js";
 import { refkey } from "../../framework/refkey.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
-import { getModularClientOptions } from "../../utils/client-utils.js";
+import { getClientModuleInfo } from "../../utils/client-utils.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { ServiceOperation } from "../../utils/operation-util.js";
 import { AzurePollingDependencies } from "../external-dependencies.js";
 import { PagingHelpers, SimplePollerHelpers } from "../static-helpers-metadata.js";
@@ -55,18 +55,18 @@ export function getClassicalOperation(
 ) {
   const prefixes = operationGroup[0];
   const operations = operationGroup[1];
-  const { rlcClientName } = getModularClientOptions(clientMap);
+  const { clientName } = getClientModuleInfo(clientMap);
   const hasClientContextImport = classicFile.getImportDeclarations().filter((i) => {
     return (
       i.getModuleSpecifierValue() ===
-      `${"../".repeat(layer + 2)}api/${normalizeName(rlcClientName, NameType.File)}.js`
+      `${"../".repeat(layer + 2)}api/${normalizeName(clientName, NameType.File)}.js`
     );
   });
   if (!hasClientContextImport || hasClientContextImport.length === 0) {
     classicFile.addImportDeclaration({
-      namedImports: [rlcClientName],
+      namedImports: [clientName],
       moduleSpecifier: `${"../".repeat(layer + 2)}api/${normalizeName(
-        rlcClientName,
+        clientName,
         NameType.File,
       )}.js`,
     });
@@ -78,7 +78,7 @@ export function getClassicalOperation(
   >();
   const operationDeclarations: OptionalKind<FunctionDeclarationStructure>[] = operations.map(
     (operation) => {
-      const declaration = getOperationFunction(dpgContext, [prefixes, operation], rlcClientName);
+      const declaration = getOperationFunction(dpgContext, [prefixes, operation], clientName);
       operationDeclarationMap.set(declaration, {
         declaration,
         oriName: operation.oriName,
@@ -141,7 +141,7 @@ export function getClassicalOperation(
       });
       // add LRO helper methods if applicable
       if (
-        dpgContext.rlcOptions?.compatibilityLro &&
+        dpgContext.emitterOptions?.compatibilityLro &&
         (operationInfo?.isLro || operationInfo?.isLroPaging)
       ) {
         const operationStateReference = resolveReference(AzurePollingDependencies.OperationState);
@@ -207,7 +207,7 @@ export function getClassicalOperation(
       parameters: [
         {
           name: "context",
-          type: rlcClientName,
+          type: clientName,
         },
       ],
       statements: `return {
@@ -237,7 +237,7 @@ export function getClassicalOperation(
             ];
             // add LRO helper methods if applicable
             if (
-              dpgContext.rlcOptions?.compatibilityLro &&
+              dpgContext.emitterOptions?.compatibilityLro &&
               (operationInfo?.isLro || operationInfo?.isLroPaging)
             ) {
               const getSimplePollerReference = resolveReference(
@@ -336,7 +336,7 @@ export function getClassicalOperation(
       parameters: [
         {
           name: "context",
-          type: rlcClientName,
+          type: clientName,
         },
       ],
       returnType: resolveReference(refkey(interfaceName, layer, "classicOperations")),

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

@@ -10,8 +10,8 @@ import { OptionalKind, ParameterDeclarationStructure, StatementedNode } from "ts
 import { ModularEmitterOptions } from "../interfaces.js";
 
 import { resolveReference } from "../../framework/reference.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { CloudSettingHelpers } from "../static-helpers-metadata.js";
 import { getTypeExpression } from "../type-expressions/get-type-expression.js";
 import { getClassicalClientName } from "./naming-helpers.js";
@@ -87,10 +87,10 @@ export function getClientParameters(
   const armSpecific = (p: SdkParameter) => !(p.kind === "endpoint" && dpgContext.arm);
   // Skip apiVersion parameter when it's multi-service (each service has its own default apiVersion)
   const skipApiVersionOnMultiService = (p: SdkParameter) =>
-    !(dpgContext.rlcOptions?.isMultiService && p.isApiVersionParam);
+    !(dpgContext.emitterOptions?.isMultiService && p.isApiVersionParam);
   const filters = [
     options.requiredOnly ? isRequired : undefined,
-    dpgContext.rlcOptions?.addCredentials === false ? skipCredentials : undefined,
+    dpgContext.emitterOptions?.addCredentials === false ? skipCredentials : undefined,
     options.optionalOnly ? isOptional : undefined,
     options.onClientOnly ? skipMethodParam : undefined,
     options.skipArmSpecific ? undefined : armSpecific,

package/src/modular/helpers/example-value-helpers.ts

@@ -12,10 +12,10 @@ import { joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../../context-manager.js";
 import { resolveReference } from "../../framework/reference.js";
-import { NameType, normalizeName } from "../../rlc-common/index.js";
-import { getSubscriptionId } from "../../transform/transfrom-rlc-options.js";
+import { getSubscriptionId } from "../../transform/transform-client-options.js";
 import { hasKeyCredential, hasTokenCredential } from "../../utils/credential-utils.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName } from "../../utils/name-utils.js";
 import { getMethodHierarchiesMap, ServiceOperation } from "../../utils/operation-util.js";
 import { AzureIdentityDependencies, AzureTestDependencies } from "../external-dependencies.js";
 import { getClientParametersDeclaration } from "./client-helpers.js";

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

@@ -1,6 +1,6 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import { NameType, normalizeName, ReservedModelNames } from "../../rlc-common/index.js";
 import { SdkContext } from "../../utils/interfaces.js";
+import { NameType, normalizeName, ReservedModelNames } from "../../utils/name-utils.js";
 import { ServiceOperation } from "../../utils/operation-util.js";
 
 export function getClientName(client: SdkClientType<SdkServiceOperation>): string {
@@ -21,7 +21,7 @@ export function getOperationName(
   dpgContext?: SdkContext,
 ): GuardedName {
   const norm = normalizeName(operation.name, NameType.Method, true);
-  const isDataplane = dpgContext !== undefined && !dpgContext.rlcOptions?.azureArm;
+  const isDataplane = dpgContext !== undefined && !dpgContext.emitterOptions?.azureArm;
   if (isReservedName(operation.name, NameType.Method) && isDataplane) {
     return {
       name: norm,

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":