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

package/src/{rlc-common/metadata → metadata}/build-package-file.ts

@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 import { Project, SourceFile } from "ts-morph";
-import { hasPollingOperations } from "../helpers/operation-helpers.js";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
+import { hasPollingOperations } from "../utils/operation-helpers.js";
 import { buildAzureMonorepoPackage } from "./package-json/build-azure-monorepo-package.js";
 import { PackageCommonInfoConfig, resolveWarpExports } from "./package-json/package-common.js";
 import { getPackageName } from "./utils.js";
@@ -15,7 +15,7 @@ interface PackageFileOptions {
 }
 
 export function buildPackageFile(
-  model: RLCModel,
+  model: ClientModel,
   { exports, dependencies, clientContextPaths }: PackageFileOptions = {},
 ) {
   const config: PackageCommonInfoConfig = {
@@ -66,7 +66,7 @@ export function buildPackageFile(
  * - Updates `//metadata.constantPaths` when `clientContextPaths` is provided.
  */
 export function updatePackageFile(
-  model: RLCModel,
+  model: ClientModel,
   existingFilePathOrContent: string | Record<string, any>,
   { exports, clientContextPaths }: PackageFileOptions = {},
 ) {
@@ -167,11 +167,11 @@ export function updatePackageFile(
   };
 }
 
-function getPackageVersion(model: RLCModel): string {
+function getPackageVersion(model: ClientModel): string {
   return model.options?.packageDetails?.version ?? "1.0.0-beta.1";
 }
 
-function getDescription(model: RLCModel): string {
+function getDescription(model: ClientModel): string {
   const description = model.options?.packageDetails?.description;
   if (!description) {
     return `A generated SDK for ${model.libraryName}.`;

package/src/{rlc-common/metadata → metadata}/build-readme-file.ts

@@ -4,9 +4,9 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
 import hbs from "handlebars";
-import { getClientName } from "../helpers/name-constructors.js";
-import { NameType, normalizeName } from "../helpers/name-utils.js";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
+import { getClientName } from "../utils/name-constructors.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 
 const azureReadmeModularTemplate = `# {{ clientDescriptiveName }} library for JavaScript
 
@@ -269,7 +269,7 @@ interface Metadata {
   hasSubscriptionId?: boolean;
 }
 
-export function buildReadmeFile(model: RLCModel) {
+export function buildReadmeFile(model: ClientModel) {
   const metadata = createMetadata(model) ?? {};
   const readmeFileContents = hbs.compile(
     model.options ? azureReadmeModularTemplate : nonBrandedReadmeTemplate,
@@ -281,7 +281,7 @@ export function buildReadmeFile(model: RLCModel) {
   };
 }
 
-export function hasClientNameChanged(model: RLCModel, existingReadmeContent: string): boolean {
+export function hasClientNameChanged(model: ClientModel, existingReadmeContent: string): boolean {
   try {
     const importMatch = existingReadmeContent.match(
       /import\s*\{\s*([A-Za-z0-9_]+)\s*\}\s*from\s*["'][^"']*["']/,
@@ -295,7 +295,7 @@ export function hasClientNameChanged(model: RLCModel, existingReadmeContent: str
 }
 
 export function updateReadmeFile(
-  model: RLCModel,
+  model: ClientModel,
   existingReadmeContent: string,
 ): { path: string; content: string } | undefined {
   try {
@@ -324,7 +324,7 @@ export function updateReadmeFile(
  * @param codeModel - include the client details
  * @returns inferred metadata about the service, the package, and the client
  */
-function createMetadata(model: RLCModel): Metadata | undefined {
+function createMetadata(model: ClientModel): Metadata | undefined {
   if (!model.options || !model.options.packageDetails) {
     return;
   }
@@ -379,7 +379,7 @@ function createMetadata(model: RLCModel): Metadata | undefined {
   };
 }
 
-function getServiceName(model: RLCModel) {
+function getServiceName(model: ClientModel) {
   const azureHuh =
     model?.options?.packageDetails?.scopeName === "azure" ||
     model?.options?.packageDetails?.scopeName === "azure-rest";

package/src/{rlc-common/metadata → metadata}/build-sample-env-file.ts

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 
 const sampleEnvText = `
 # Feel free to add your own environment variables.
 `;
 
-export function buildSampleEnvFile(model: RLCModel) {
+export function buildSampleEnvFile(model: ClientModel) {
   if (model.options?.generateMetadata === true || model.options?.generateSample === true) {
     const filePath = "sample.env";
     return {

package/src/{rlc-common/metadata → metadata}/build-test-config.ts

@@ -1,17 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 import { getPackageName } from "./utils.js";
 
-function shouldGenerateTestConfig(model: RLCModel): boolean {
+function shouldGenerateTestConfig(model: ClientModel): boolean {
   return !(model.options?.generateMetadata === false || model.options?.generateTest === false);
 }
 
 /**
  * Builds config/tsconfig.test.browser.json — extends eng/tsconfigs/test.browser.json
  */
-export function buildTestBrowserTsConfig(model: RLCModel) {
+export function buildTestBrowserTsConfig(model: ClientModel) {
   if (!shouldGenerateTestConfig(model)) {
     return;
   }
@@ -40,7 +40,7 @@ export function buildTestBrowserTsConfig(model: RLCModel) {
 /**
  * Builds config/tsconfig.test.node.json — extends eng/tsconfigs/test.node.json
  */
-export function buildTestNodeTsConfig(model: RLCModel) {
+export function buildTestNodeTsConfig(model: ClientModel) {
   if (!shouldGenerateTestConfig(model)) {
     return;
   }

package/src/{rlc-common/metadata → metadata}/build-ts-config.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Project } from "ts-morph";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 
 /**
  * Builds the root tsconfig.json.
@@ -10,7 +10,7 @@ import { RLCModel } from "../interfaces.js";
  * Emits project references pointing into the `config/` subfolder
  * (following the eng/tsconfigs pattern).
  */
-export function buildTsConfig(model: RLCModel) {
+export function buildTsConfig(model: ClientModel) {
   const { generateTest, generateSample, generateReactNativeTarget } = model.options || {};
   const project = new Project({ useInMemoryFileSystem: true });
 
@@ -123,7 +123,7 @@ export function buildTsSrcCjsConfig() {
 /**
  * Builds config/tsconfig.samples.json — extends eng/tsconfigs/samples.json
  */
-export function buildTsSampleConfig(model: RLCModel) {
+export function buildTsSampleConfig(model: ClientModel) {
   const { packageDetails } = model.options || {};
   const clientPackageName = packageDetails?.name ?? "";
   return {

package/src/{rlc-common/metadata → metadata}/build-vitest-config.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 
 const nodeConfig = `import viteConfig from "../../../vitest.shared.config.ts";
 
@@ -11,7 +11,7 @@ export default viteConfig;
 const browserConfig = `export { default } from "../../../eng/vitestconfigs/browser.config.ts";
 `;
 
-export function buildVitestConfig(model: RLCModel, platform: "browser" | "node") {
+export function buildVitestConfig(model: ClientModel, platform: "browser" | "node") {
   if (model.options?.generateMetadata === false || model.options?.generateTest === false) {
     return;
   }

package/src/{rlc-common/metadata → metadata}/build-warp-config.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 
 export interface WarpConfigOptions {
   /** Source-level exports, e.g. { ".": "./src/index.ts", "./models": "./src/models/index.ts" } */
@@ -67,7 +67,7 @@ targets:
  * By default, react-native target is NOT included. Set `generateReactNativeTarget: true`
  * in options to include it.
  */
-export function buildWarpConfig(model: RLCModel, { exports }: WarpConfigOptions = {}) {
+export function buildWarpConfig(model: ClientModel, { exports }: WarpConfigOptions = {}) {
   const allExports: Record<string, string> = {
     ...BASE_EXPORTS,
     ...exports,

package/src/{rlc-common → metadata}/test/build-recorded-client.ts

@@ -1,10 +1,10 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
 import hbs from "handlebars";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../../interfaces.js";
 import { recordedClientContent } from "./template.js";
 
-export function buildRecordedClientFile(_model: RLCModel) {
+export function buildRecordedClientFile(_model: ClientModel) {
   const recordedClientFileContents = hbs.compile(recordedClientContent, {
     noEscape: true,
   });

package/src/{rlc-common → metadata}/test/build-sample-test.ts

@@ -1,10 +1,10 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
 import hbs from "handlebars";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../../interfaces.js";
 import { sampleTestContent } from "./template.js";
 
-export function buildSampleTest(_model: RLCModel) {
+export function buildSampleTest(_model: ClientModel) {
   return {
     path: "test/public/sampleTest.spec.ts",
     content: hbs.compile(sampleTestContent, { noEscape: true })({}),

package/src/{rlc-common → metadata}/test/build-snippets.ts

@@ -1,11 +1,11 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
 import hbs from "handlebars";
-import { getClientName } from "../helpers/name-constructors.js";
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../../interfaces.js";
+import { getClientName } from "../../utils/name-constructors.js";
 import { snippetsContent } from "./template.js";
 
-export function buildSnippets(model: RLCModel, clientName?: string) {
+export function buildSnippets(model: ClientModel, clientName?: string) {
   // to keep the same config for azure scope in buildReadmeFile.ts
   if (
     (model?.options?.packageDetails?.scopeName === "azure" ||

package/src/{rlc-common/metadata → metadata}/utils.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../interfaces.js";
 
-export function getPackageName(model: RLCModel): string {
+export function getPackageName(model: ClientModel): string {
   return model.options?.packageDetails?.name ?? model.libraryName;
 }

package/src/modular/build-classical-client.ts

@@ -5,7 +5,6 @@ import {
   SourceFile,
   StructureKind,
 } from "ts-morph";
-import { NameType, normalizeName } from "../rlc-common/index.js";
 import { buildUserAgentOptions, getClientParametersDeclaration } from "./helpers/client-helpers.js";
 import { getClassicalClientName, getClientName } from "./helpers/naming-helpers.js";
 import { ModularEmitterOptions } from "./interfaces.js";
@@ -20,8 +19,9 @@ import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getModularClientOptions, isRLCMultiEndpoint } from "../utils/client-utils.js";
+import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap, isTenantLevelOperation } from "../utils/operation-util.js";
 import { AzurePollingDependencies } from "./external-dependencies.js";
 import { getPagingLROMethodName } from "./helpers/classical-operation-helpers.js";
@@ -47,7 +47,7 @@ export function buildClassicalClient(
     requiredOnly: true,
   });
   const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const { subfolder, rlcClientName } = getModularClientOptions(clientMap);
+  const { subfolder, clientName } = getClientModuleInfo(clientMap);
 
   const clientFile = project.createSourceFile(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
@@ -68,16 +68,16 @@ export function buildClassicalClient(
   });
 
   // Add the private client member. This will be the client context from /api
-  if (isRLCMultiEndpoint(dpgContext)) {
+  if (isMultiEndpointClient(dpgContext)) {
     clientClass.addProperty({
       name: "_client",
-      type: `Client.${rlcClientName}`,
+      type: `Client.${clientName}`,
       scope: Scope.Private,
     });
   } else {
     clientClass.addProperty({
       name: "_client",
-      type: `${rlcClientName}`,
+      type: `${clientName}`,
       scope: Scope.Private,
     });
   }
@@ -214,7 +214,7 @@ function generateMethod(
   });
 
   // add LRO helper methods if applicable
-  if (context.rlcOptions?.compatibilityLro && declaration?.isLro && !declaration?.isLroPaging) {
+  if (context.emitterOptions?.compatibilityLro && declaration?.isLro && !declaration?.isLroPaging) {
     const operationStateReference = resolveReference(AzurePollingDependencies.OperationState);
     const simplePollerLikeReference = resolveReference(SimplePollerHelpers.SimplePollerLike);
     const getSimplePollerReference = resolveReference(SimplePollerHelpers.getSimplePoller);
@@ -244,7 +244,7 @@ function generateMethod(
       statements: `return await ${declarationRefKey}(${methodParamStr});`,
     });
   } // For LRO+Paging operations, use different return types and implementation
-  else if (context.rlcOptions?.compatibilityLro && declaration?.isLroPaging) {
+  else if (context.emitterOptions?.compatibilityLro && declaration?.isLroPaging) {
     const returnType = declaration?.lropagingFinalReturnType ?? "void";
     const pagedAsyncIterableIteratorReference = resolveReference(
       PagingHelpers.PagedAsyncIterableIterator,
@@ -274,7 +274,7 @@ function buildClientOperationGroups(
 ) {
   let clientType = "Client";
   const [_hierarchy, client] = clientMap;
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   if (subfolder && subfolder !== "") {
     clientType = `Client.${clientClass.getName()}`;
   }

package/src/modular/build-classical-operation-groups.ts

@@ -1,9 +1,9 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
-import { NameType } 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 } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { getClassicalOperation } from "./helpers/classical-operation-helpers.js";
 import { getClassicalLayerPrefix } from "./helpers/naming-helpers.js";
@@ -17,7 +17,7 @@ export function buildClassicOperationFiles(
   // const sdkPackage = dpgContext.sdkPackage;
   const project = useContext("outputProject");
   const [_hierarchy, client] = clientMap;
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const classicOperationFiles: Map<string, SourceFile> = new Map<string, SourceFile>();
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {

package/src/modular/build-client-context.ts

@@ -1,4 +1,3 @@
-import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   buildGetClientCredentialParam,
   buildGetClientEndpointParam,
@@ -24,8 +23,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 { 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 { buildEnumTypes, getApiVersionEnum } from "./emit-models.js";
 import { getDocsFromDescription } from "./helpers/docs-helpers.js";
 import { getClassicalClientName, getClientName } from "./helpers/naming-helpers.js";
@@ -40,7 +40,7 @@ export function getClientContextPath(
   emitterOptions: ModularEmitterOptions,
 ): string {
   const [_, client] = clientMap;
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const name = getClientName(client);
   const srcPath = emitterOptions.modularOptions.sourceRoot;
   const contentPath = `${srcPath}/${
@@ -61,7 +61,7 @@ export function buildClientContext(
   const dependencies = useDependencies();
   const [hierarchy, client] = clientMap;
   const name = getClientName(client);
-  const { rlcClientName } = getModularClientOptions(clientMap);
+  const { clientName } = getClientModuleInfo(clientMap);
   const requiredParams = getClientParametersDeclaration(client, dpgContext, {
     onClientOnly: false,
     requiredOnly: true,
@@ -116,7 +116,7 @@ export function buildClientContext(
 
   clientContextFile.addInterface({
     isExported: true,
-    name: `${rlcClientName}`,
+    name: `${clientName}`,
     extends: [resolveReference(dependencies.Client)],
     docs: getDocsFromDescription(client.doc),
     properties: [...requiredInterfaceProperties, ...optionalInterfaceProperties],
@@ -172,7 +172,7 @@ export function buildClientContext(
   const factoryFunction = clientContextFile.addFunction({
     docs: getDocsFromDescription(client.doc),
     name: `create${name}`,
-    returnType: `${rlcClientName}`,
+    returnType: `${clientName}`,
     parameters: getClientParametersDeclaration(client, dpgContext, {
       onClientOnly: false,
       requiredOnly: true,
@@ -286,7 +286,7 @@ export function buildClientContext(
 
   if (allContextParams.length) {
     factoryFunction.addStatements(
-      `return { ...clientContext, ${allContextParams.join(", ")}} as ${rlcClientName};`,
+      `return { ...clientContext, ${allContextParams.join(", ")}} as ${clientName};`,
     );
   } else {
     factoryFunction.addStatements(`return clientContext;`);

package/src/modular/build-modular-options.ts

@@ -10,11 +10,11 @@ export function transformModularEmitterOptions(
 ): ModularEmitterOptions {
   CASING = options.casing ?? CASING;
   const emitterOptions: ModularEmitterOptions = {
-    options: dpgContext.rlcOptions ?? {},
+    options: dpgContext.emitterOptions ?? {},
     modularOptions: {
       sourceRoot: modularSourcesRoot,
-      compatibilityMode: !!dpgContext.rlcOptions?.compatibilityMode,
-      experimentalExtensibleEnums: !!dpgContext.rlcOptions?.experimentalExtensibleEnums,
+      compatibilityMode: !!dpgContext.emitterOptions?.compatibilityMode,
+      experimentalExtensibleEnums: !!dpgContext.emitterOptions?.experimentalExtensibleEnums,
     },
   };
 

package/src/modular/build-operations.ts

@@ -1,5 +1,4 @@
 import { InterfaceDeclarationStructure, SourceFile, StructureKind } from "ts-morph";
-import { NameType, normalizeName } from "../rlc-common/index.js";
 import {
   getDeserializeExceptionHeadersPrivateFunction,
   getDeserializeHeadersPrivateFunction,
@@ -23,8 +22,9 @@ import { addDeclaration } from "../framework/declaration.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getModularClientOptions, isRLCMultiEndpoint } from "../utils/client-utils.js";
+import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 import {
   getMethodHierarchiesMap,
   hasDualFormatSupport,
@@ -48,9 +48,9 @@ export function buildOperationFiles(
   const project = useContext("outputProject");
   const [_, client] = clientMap;
   const operationFiles: Set<SourceFile> = new Set();
-  const { subfolder, rlcClientName } = getModularClientOptions(clientMap);
-  const isMultiEndpoint = isRLCMultiEndpoint(dpgContext);
-  const clientType = isMultiEndpoint ? `Client.${rlcClientName}` : "Client";
+  const { subfolder, clientName } = getClientModuleInfo(clientMap);
+  const isMultiEndpoint = isMultiEndpointClient(dpgContext);
+  const clientType = isMultiEndpoint ? `Client.${clientName}` : "Client";
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
@@ -102,7 +102,7 @@ export function buildOperationFiles(
 
     const indexPathPrefix = "../".repeat(prefixKey === "" ? 0 : prefixes.length) || "./";
     operationGroupFile.addImportDeclaration({
-      namedImports: [`${rlcClientName} as Client`],
+      namedImports: [`${clientName} as Client`],
       moduleSpecifier: `${indexPathPrefix}index.js`,
     });
     operationGroupFile.fixUnusedIdentifiers();

package/src/modular/build-project-files.ts

@@ -1,9 +1,8 @@
-import { NameType } from "../rlc-common/index.js";
-
 import { getRelativePathFromDirectory, joinPaths } from "@typespec/compiler";
 import { useContext } from "../context-manager.js";
-import { getClientHierarchyMap, getModularClientOptions } from "../utils/client-utils.js";
+import { getClientHierarchyMap, getClientModuleInfo } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
+import { NameType } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { getClassicalLayerPrefix } from "./helpers/naming-helpers.js";
 import { ModularEmitterOptions } from "./interfaces.js";
@@ -42,7 +41,7 @@ function buildExportsForMultiClient(
     if (hierarchy.length === 0) {
       hasTopLevelClient = true;
     }
-    const { subfolder } = getModularClientOptions([hierarchy, client]);
+    const { subfolder } = getClientModuleInfo([hierarchy, client]);
     if (subfolder !== "" && methodMap.size > 0) {
       packageInfo.exports[`./${subfolder}`] = `${srcPrefix}/${subfolder}/index.ts`;
 
@@ -56,7 +55,7 @@ function buildExportsForMultiClient(
     // TODO: support api subpath exports for multi-service. Skip for now. https://github.com/Azure/autorest.typescript/issues/3717
     if (!emitterOptions.options.isMultiService) {
       for (const flattenedClient of clientMap) {
-        const { subfolder } = getModularClientOptions(flattenedClient);
+        const { subfolder } = getClientModuleInfo(flattenedClient);
         const client = flattenedClient[1];
         const methodMap = getMethodHierarchiesMap(context, client);
         for (const [prefixKey, _] of methodMap) {

package/src/modular/build-restore-poller.ts

@@ -4,9 +4,9 @@ import { SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.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 { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { buildLroDeserDetailMap } from "./build-operations.js";
 import { AzurePollingDependencies } from "./external-dependencies.js";
@@ -23,7 +23,7 @@ export function buildRestorePoller(
   const project = useContext("outputProject");
   const [_, client] = clientMap;
   const dependencies = useDependencies();
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const methodMap = getMethodHierarchiesMap(context, client);
   const hasLro = Array.from(methodMap.values()).some((operations) => {
     return operations.some(isLroOnlyOperation);

package/src/modular/build-root-index.ts

@@ -4,9 +4,9 @@ import { Project, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
 import { reportDiagnostic } from "../lib.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 { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { partitionAndEmitExports } from "./build-subpath-index.js";
 import { getClassicalClientName } from "./helpers/naming-helpers.js";
@@ -34,7 +34,7 @@ export function buildRootIndex(
   const project = useContext("outputProject");
   const [_, client] = clientMap;
   const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const clientName = `${getClassicalClientName(client)}`;
   const clientFile = project.getSourceFile(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
@@ -208,7 +208,7 @@ function exportSimplePollerLike(
   const hasLro = Array.from(methodMap.values()).some((operations) => {
     return operations.some(isLroOnlyOperation);
   });
-  if (!hasLro || context.rlcOptions?.compatibilityLro !== true) {
+  if (!hasLro || context.emitterOptions?.compatibilityLro !== true) {
     return;
   }
   const helperFile = project.getSourceFile(
@@ -365,7 +365,7 @@ export function buildSubClientIndexFile(
 ) {
   const project = useContext("outputProject");
   const [_, client] = clientMap;
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const srcPath = emitterOptions.modularOptions.sourceRoot;
   const subClientIndexFile = project.createSourceFile(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}index.ts`,

package/src/modular/build-subpath-index.ts

@@ -4,7 +4,7 @@ import { ModularEmitterOptions } from "./interfaces.js";
 
 import { Node, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
-import { getModularClientOptions } from "../utils/client-utils.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 
 export interface buildSubpathIndexFileOptions {
   exportIndex?: boolean;
@@ -19,7 +19,7 @@ export function buildSubpathIndexFile(
   options: buildSubpathIndexFileOptions = {},
 ) {
   const project = useContext("outputProject");
-  const subfolder = clientMap ? (getModularClientOptions(clientMap).subfolder ?? "") : "";
+  const subfolder = clientMap ? (getClientModuleInfo(clientMap).subfolder ?? "") : "";
   const srcPath = emitterOptions.modularOptions.sourceRoot;
   // Skip to export these files because they are used internally.
   const skipFiles = ["pagingHelpers.ts", "pollingHelpers.ts"];

package/src/modular/emit-models-options.ts

@@ -4,9 +4,9 @@ import { ModularEmitterOptions } from "./interfaces.js";
 
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { useContext } from "../context-manager.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 { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { buildOperationOptions } from "./build-operations.js";
 
@@ -20,7 +20,7 @@ export function buildApiOptions(
   const project = useContext("outputProject");
   const [_, client] = clientMap;
   const modelOptionsFiles = [];
-  const { subfolder } = getModularClientOptions(clientMap);
+  const { subfolder } = getClientModuleInfo(clientMap);
   const methodMap = getMethodHierarchiesMap(context, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");