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

package/src/metadata/test/template.ts

@@ -0,0 +1,101 @@
+export const recordedClientContent = `
+
+import {
+  Recorder,
+  RecorderStartOptions,
+  VitestTestContext,
+} from "@azure-tools/test-recorder";
+
+const replaceableVariables: Record<string, string> = {
+  SUBSCRIPTION_ID: "azure_subscription_id"
+};
+
+const recorderEnvSetup: RecorderStartOptions = {
+  envSetupForPlayback: replaceableVariables,
+};
+
+/**
+ * creates the recorder and reads the environment variables from the \`.env\` file.
+ * Should be called first in the test suite to make sure environment variables are
+ * read before they are being used.
+ */
+export async function createRecorder(context: VitestTestContext): Promise<Recorder> {
+  const recorder = new Recorder(context);
+  await recorder.start(recorderEnvSetup);
+  return recorder;
+}
+`;
+
+export const sampleTestContent = `
+// import { Recorder } from "@azure-tools/test-recorder";
+// import { createRecorder } from "./utils/recordedClient.js";
+import { assert, 
+         // beforeEach,
+         // afterEach,
+         it,
+         describe
+} from "vitest";
+
+describe("My test", () => {
+  // let recorder: Recorder;
+
+  // beforeEach(async function(ctx) {
+    // recorder = await createRecorder(ctx);
+  // });
+
+  // afterEach(async function() {
+    // await recorder.stop();
+  // });
+
+  it("sample test", async function() {
+    assert.equal(1, 1);
+  });
+});
+`;
+
+export const snippetsContent = `
+import { {{ clientClassName }} } from "../src/index.js";
+import { DefaultAzureCredential, InteractiveBrowserCredential } from "@azure/identity";
+import { setLogLevel } from "@azure/logger";
+import { describe, it } from "vitest";
+
+describe("snippets", () => {
+  it("ReadmeSampleCreateClient_Node", async () => {
+    {{#if azureArm}}
+    {{#if hasSubscriptionId}}
+    const subscriptionId = "00000000-0000-0000-0000-000000000000";
+    const client = new {{ clientClassName }}(new DefaultAzureCredential(), subscriptionId);
+    {{else}}
+    const client = new {{ clientClassName }}(new DefaultAzureCredential());
+    {{/if}}
+    {{else}}
+    const client = new {{ clientClassName }}("<endpoint>", new DefaultAzureCredential());
+    {{/if}}
+  });
+
+  it("ReadmeSampleCreateClient_Browser", async () => {
+    {{#if azureArm}}
+    const credential = new InteractiveBrowserCredential({
+      tenantId: "<YOUR_TENANT_ID>",
+      clientId: "<YOUR_CLIENT_ID>",
+    });
+    {{#if hasSubscriptionId}}
+    const subscriptionId = "00000000-0000-0000-0000-000000000000";
+    const client = new {{ clientClassName }}(credential, subscriptionId);
+    {{else}}
+    const client = new {{ clientClassName }}(credential);
+    {{/if}}
+    {{else}}
+    const credential = new InteractiveBrowserCredential({
+      tenantId: "<YOUR_TENANT_ID>",
+      clientId: "<YOUR_CLIENT_ID>",
+    });
+    const client = new {{ clientClassName }}("<endpoint>", credential);
+    {{/if}}
+  });
+
+  it("SetLogLevel", async () => {
+    setLogLevel("info");
+  });
+});
+`;

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

@@ -1,12 +1,19 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { joinPaths, NoTarget } from "@typespec/compiler";
-import { Project, SourceFile } from "ts-morph";
+import { Project, SourceFile, StructureKind } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
+import {
+  beginSourceFileBatch,
+  enqueueStatement,
+  flushSourceFileBatch,
+  getEffectiveExportedNames,
+  getQueuedExportNames,
+} from "../framework/source-file-batch.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";
@@ -24,6 +31,20 @@ export function buildRootIndex(
   emitterOptions: ModularEmitterOptions,
   rootIndexFile: SourceFile,
   clientMap?: [string[], SdkClientType<SdkServiceOperation>],
+) {
+  beginSourceFileBatch();
+  try {
+    buildRootIndexImpl(context, emitterOptions, rootIndexFile, clientMap);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildRootIndexImpl(
+  context: SdkContext,
+  emitterOptions: ModularEmitterOptions,
+  rootIndexFile: SourceFile,
+  clientMap?: [string[], SdkClientType<SdkServiceOperation>],
 ) {
   if (!clientMap) {
     // we still need to export the models if no client is provided
@@ -34,7 +55,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(
@@ -109,7 +130,8 @@ function exportRestErrorTypes(rootIndexFile: SourceFile) {
   const existingExports = getExistingExports(rootIndexFile);
   const namedExports = ["RestError", "isRestError"].filter((name) => !existingExports.has(name));
   if (namedExports.length > 0) {
-    rootIndexFile.addExportDeclaration({
+    enqueueStatement(rootIndexFile, {
+      kind: StructureKind.ExportDeclaration,
       moduleSpecifier: "@azure/core-rest-pipeline",
       namedExports,
     });
@@ -165,13 +187,7 @@ function exportFileContentsType(context: SdkContext, rootIndexFile: SourceFile)
 }
 
 function getExistingExports(rootIndexFile: SourceFile): Set<string> {
-  return new Set(
-    rootIndexFile
-      .getExportDeclarations()
-      .flatMap((exportDecl) =>
-        exportDecl.getNamedExports().map((namedExport) => namedExport.getName()),
-      ),
-  );
+  return getEffectiveExportedNames(rootIndexFile);
 }
 
 function getNewNamedExports(namedExports: string[], existingExports: Set<string>): string[] {
@@ -186,7 +202,8 @@ function addExportsToRootIndexFile(
   const existingExports = getExistingExports(rootIndexFile);
   const newNamedExports = getNewNamedExports(namedExports, existingExports);
   if (newNamedExports.length > 0) {
-    rootIndexFile.addExportDeclaration({
+    enqueueStatement(rootIndexFile, {
+      kind: StructureKind.ExportDeclaration,
       isTypeOnly,
       namedExports: newNamedExports,
     });
@@ -208,7 +225,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(
@@ -222,7 +239,8 @@ function exportSimplePollerLike(
   const moduleSpecifier = `./${
     isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""
   }static-helpers/simplePollerHelpers.js`;
-  indexFile.addExportDeclaration({
+  enqueueStatement(indexFile, {
+    kind: StructureKind.ExportDeclaration,
     isTypeOnly: true,
     moduleSpecifier,
     namedExports: ["SimplePollerLike"],
@@ -243,7 +261,10 @@ function exportRestoreHelpers(
   if (!helperFile) {
     return;
   }
-  const exported = new Set(indexFile.getExportedDeclarations().keys());
+  const exported = new Set([
+    ...indexFile.getExportedDeclarations().keys(),
+    ...getQueuedExportNames(indexFile),
+  ]);
   const allEntries = [...helperFile.getExportedDeclarations().entries()];
   const moduleSpecifier = `./${
     isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""
@@ -259,7 +280,8 @@ function exportClassicalClient(
   isSubClient: boolean = false,
 ) {
   const clientName = client.name;
-  indexFile.addExportDeclaration({
+  enqueueStatement(indexFile, {
+    kind: StructureKind.ExportDeclaration,
     namedExports: [clientName],
     moduleSpecifier: `./${
       subfolder && subfolder !== "" && !isSubClient ? subfolder + "/" : ""
@@ -321,7 +343,10 @@ function exportModules(
       continue;
     }
 
-    const exported = new Set(indexFile.getExportedDeclarations().keys());
+    const exported = new Set([
+      ...indexFile.getExportedDeclarations().keys(),
+      ...getQueuedExportNames(indexFile),
+    ]);
     const serializerOrDeserializerRegex = /.*(Serializer|Deserializer)(_\d+)?$/;
     const filteredEntries = [...modelsFile.getExportedDeclarations().entries()].filter(
       (exDeclaration) => {
@@ -362,10 +387,23 @@ export function buildSubClientIndexFile(
   context: SdkContext,
   clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions,
+) {
+  beginSourceFileBatch();
+  try {
+    buildSubClientIndexFileImpl(context, clientMap, emitterOptions);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildSubClientIndexFileImpl(
+  context: SdkContext,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
+  emitterOptions: ModularEmitterOptions,
 ) {
   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

@@ -2,9 +2,14 @@ import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client
 import { joinPaths } from "@typespec/compiler";
 import { ModularEmitterOptions } from "./interfaces.js";
 
-import { Node, SourceFile } from "ts-morph";
+import { Node, SourceFile, StructureKind } from "ts-morph";
 import { useContext } from "../context-manager.js";
-import { getModularClientOptions } from "../utils/client-utils.js";
+import {
+  beginSourceFileBatch,
+  enqueueStatement,
+  flushSourceFileBatch,
+} from "../framework/source-file-batch.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 
 export interface buildSubpathIndexFileOptions {
   exportIndex?: boolean;
@@ -17,9 +22,23 @@ export function buildSubpathIndexFile(
   subpath: string,
   clientMap?: [string[], SdkClientType<SdkServiceOperation>],
   options: buildSubpathIndexFileOptions = {},
+) {
+  beginSourceFileBatch();
+  try {
+    buildSubpathIndexFileImpl(emitterOptions, subpath, clientMap, options);
+  } finally {
+    flushSourceFileBatch();
+  }
+}
+
+function buildSubpathIndexFileImpl(
+  emitterOptions: ModularEmitterOptions,
+  subpath: string,
+  clientMap?: [string[], SdkClientType<SdkServiceOperation>],
+  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"];
@@ -137,14 +156,16 @@ export function partitionAndEmitExports(
     }
   }
   if (typeOnlyExports.length > 0) {
-    indexFile.addExportDeclaration({
+    enqueueStatement(indexFile, {
+      kind: StructureKind.ExportDeclaration,
       isTypeOnly: true,
       moduleSpecifier,
       namedExports: typeOnlyExports,
     });
   }
   if (valueExports.length > 0) {
-    indexFile.addExportDeclaration({
+    enqueueStatement(indexFile, {
+      kind: StructureKind.ExportDeclaration,
       moduleSpecifier,
       namedExports: valueExports,
     });

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("/");