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

package/src/metadata/render-template.ts

@@ -0,0 +1,202 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+/**
+ * A tiny, dependency-free renderer for the small subset of Handlebars/Mustache
+ * syntax used by the emitter's metadata templates. It intentionally supports only
+ * what those templates need:
+ *
+ * - `{{ name }}` interpolation (always "unescaped", matching the previous
+ *   `{ noEscape: true }` Handlebars option).
+ * - `{{#if name}} ... {{else}} ... {{/if}}` conditional blocks (nesting allowed).
+ *
+ * It reproduces Handlebars' "standalone" whitespace handling so that a block tag
+ * occupying its own line does not leave a blank line behind, keeping the rendered
+ * output byte-for-byte identical to the previous Handlebars-based implementation.
+ */
+
+type TemplateData = Record<string, unknown>;
+
+interface TextToken {
+  kind: "text";
+  value: string;
+}
+
+interface TagToken {
+  kind: "open" | "else" | "close" | "var";
+  /** Condition (for `open`) or variable name (for `var`). */
+  name: string;
+  /** Whether this block tag stands alone on its line (Handlebars semantics). */
+  standalone: boolean;
+}
+
+type Token = TextToken | TagToken;
+
+const MUSTACHE = /\{\{([^}]*)\}\}/g;
+
+function tokenize(template: string): Token[] {
+  const tokens: Token[] = [];
+  let lastIndex = 0;
+  let match: RegExpExecArray | null;
+  MUSTACHE.lastIndex = 0;
+  while ((match = MUSTACHE.exec(template)) !== null) {
+    tokens.push({ kind: "text", value: template.slice(lastIndex, match.index) });
+    const inner = match[1]!.trim();
+    if (inner.startsWith("#if ")) {
+      tokens.push({ kind: "open", name: inner.slice(4).trim(), standalone: false });
+    } else if (inner === "else") {
+      tokens.push({ kind: "else", name: "", standalone: false });
+    } else if (inner === "/if") {
+      tokens.push({ kind: "close", name: "", standalone: false });
+    } else {
+      tokens.push({ kind: "var", name: inner, standalone: false });
+    }
+    lastIndex = match.index + match[0].length;
+  }
+  tokens.push({ kind: "text", value: template.slice(lastIndex) });
+  return tokens;
+}
+
+/**
+ * Applies Handlebars "standalone" whitespace stripping. A block tag (`#if`,
+ * `else`, `/if`) that is the only non-whitespace content on its line has the
+ * surrounding indentation and trailing newline removed.
+ */
+function stripStandaloneWhitespace(tokens: Token[]): void {
+  const isBlock = (t: Token): t is TagToken =>
+    t.kind === "open" || t.kind === "else" || t.kind === "close";
+
+  // First pass: detect standalone tags from the original text tokens.
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i]!;
+    if (!isBlock(token)) {
+      continue;
+    }
+    const prev = tokens[i - 1] as TextToken | undefined;
+    const next = tokens[i + 1] as TextToken | undefined;
+    const prevIsFirst = i - 1 === 0;
+    const nextIsLast = i + 1 === tokens.length - 1;
+
+    const prevValue = prev?.value ?? "";
+    const nextValue = next?.value ?? "";
+
+    const prevStandalone =
+      /\n[ \t]*$/.test(prevValue) || (prevIsFirst && /^[ \t]*$/.test(prevValue));
+    const nextStandalone =
+      /^[ \t]*\n/.test(nextValue) || (nextIsLast && /^[ \t]*$/.test(nextValue));
+
+    token.standalone = prevStandalone && nextStandalone;
+  }
+
+  // Second pass: strip whitespace around standalone tags.
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i]!;
+    if (!isBlock(token) || !token.standalone) {
+      continue;
+    }
+    const prev = tokens[i - 1] as TextToken | undefined;
+    const next = tokens[i + 1] as TextToken | undefined;
+    if (prev) {
+      // Drop the indentation preceding the tag, keeping the previous newline.
+      prev.value = prev.value.replace(/[ \t]*$/, "");
+    }
+    if (next) {
+      // Drop the rest of the tag's line, including its trailing newline.
+      next.value = /^[ \t]*\n/.test(next.value)
+        ? next.value.replace(/^[ \t]*\n/, "")
+        : next.value.replace(/^[ \t]*$/, "");
+    }
+  }
+}
+
+type Node = TextNode | VarNode | IfNode;
+interface TextNode {
+  kind: "text";
+  value: string;
+}
+interface VarNode {
+  kind: "var";
+  name: string;
+}
+interface IfNode {
+  kind: "if";
+  condition: string;
+  whenTrue: Node[];
+  whenFalse: Node[];
+}
+
+function parse(tokens: Token[], start: number, stopKinds: Token["kind"][]): [Node[], number] {
+  const nodes: Node[] = [];
+  let i = start;
+  while (i < tokens.length) {
+    const token = tokens[i]!;
+    if (token.kind === "text") {
+      if (token.value) {
+        nodes.push({ kind: "text", value: token.value });
+      }
+      i++;
+    } else if (token.kind === "var") {
+      nodes.push({ kind: "var", name: token.name });
+      i++;
+    } else if (token.kind === "open") {
+      const [whenTrue, afterTrue] = parse(tokens, i + 1, ["else", "close"]);
+      let whenFalse: Node[] = [];
+      let next = afterTrue;
+      if (tokens[next]?.kind === "else") {
+        const [elseNodes, afterElse] = parse(tokens, next + 1, ["close"]);
+        whenFalse = elseNodes;
+        next = afterElse;
+      }
+      // `next` now points at the matching `close` token.
+      nodes.push({ kind: "if", condition: token.name, whenTrue, whenFalse });
+      i = next + 1;
+    } else if (stopKinds.includes(token.kind)) {
+      return [nodes, i];
+    } else {
+      // Unmatched `else`/`close`; skip defensively.
+      i++;
+    }
+  }
+  return [nodes, i];
+}
+
+function isTruthy(value: unknown): boolean {
+  if (Array.isArray(value)) {
+    return value.length > 0;
+  }
+  return Boolean(value);
+}
+
+function renderNodes(nodes: Node[], data: TemplateData): string {
+  let out = "";
+  for (const node of nodes) {
+    switch (node.kind) {
+      case "text":
+        out += node.value;
+        break;
+      case "var": {
+        const value = data[node.name];
+        out += value === undefined || value === null ? "" : String(value);
+        break;
+      }
+      case "if":
+        out += renderNodes(isTruthy(data[node.condition]) ? node.whenTrue : node.whenFalse, data);
+        break;
+    }
+  }
+  return out;
+}
+
+/**
+ * Renders a metadata template against the provided data.
+ *
+ * @param template - Template using the supported `{{var}}` / `{{#if}}` subset.
+ * @param data - Values referenced by the template.
+ * @returns The rendered string.
+ */
+export function renderTemplate(template: string, data: TemplateData): string {
+  const tokens = tokenize(template);
+  stripStandaloneWhitespace(tokens);
+  const [nodes] = parse(tokens, 0, []);
+  return renderNodes(nodes, data);
+}

package/src/metadata/test/build-recorded-client.ts

@@ -0,0 +1,9 @@
+import { ClientModel } from "../../interfaces.js";
+import { recordedClientContent } from "./template.js";
+
+export function buildRecordedClientFile(_model: ClientModel) {
+  return {
+    path: "test/public/utils/recordedClient.ts",
+    content: recordedClientContent,
+  };
+}

package/src/metadata/test/build-sample-test.ts

@@ -0,0 +1,9 @@
+import { ClientModel } from "../../interfaces.js";
+import { sampleTestContent } from "./template.js";
+
+export function buildSampleTest(_model: ClientModel) {
+  return {
+    path: "test/public/sampleTest.spec.ts",
+    content: sampleTestContent,
+  };
+}

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

@@ -1,11 +1,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 { RLCModel } from "../interfaces.js";
+import { ClientModel } from "../../interfaces.js";
+import { getClientName } from "../../utils/name-constructors.js";
+import { renderTemplate } from "../render-template.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" ||
@@ -14,7 +12,7 @@ export function buildSnippets(model: RLCModel, clientName?: string) {
   ) {
     return {
       path: "test/snippets.spec.ts",
-      content: hbs.compile(snippetsContent, { noEscape: true })({
+      content: renderTemplate(snippetsContent, {
         clientClassName: clientName ? clientName : getClientName(model),
         azureArm: model.options?.azureArm,
         hasSubscriptionId: model.options.hasSubscriptionId,

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);