@azure-tools/typespec-ts 0.36.0 → 0.37.0-alpha.20241230.1

package/src/modular/buildOperations.ts

@@ -1,15 +1,5 @@
-import {
-  BodyParameter,
-  Client,
-  ModularCodeModel,
-  Operation,
-  Parameter
-} from "./modularCodeModel.js";
-import {
-  NameType,
-  clearImportSets,
-  normalizeName
-} from "@azure-tools/rlc-common";
+import { ModularEmitterOptions } from "./interfaces.js";
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { Project, SourceFile } from "ts-morph";
 import {
   getDeserializePrivateFunction,
@@ -25,9 +15,22 @@ import { SdkContext } from "../utils/interfaces.js";
 import { addImportBySymbol } from "../utils/importHelper.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { getOperationName } from "./helpers/namingHelpers.js";
-import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
+import {
+  getModularClientOptions,
+  isRLCMultiEndpoint
+} from "../utils/clientUtils.js";
 import { getTypeExpression } from "./type-expressions/get-type-expression.js";
-import { buildType } from "./helpers/typeHelpers.js";
+import {
+  SdkClientType,
+  SdkMethodParameter,
+  SdkServiceOperation
+} from "@azure-tools/typespec-client-generator-core";
+import {
+  getMethodHierarchiesMap,
+  ServiceOperation
+} from "../utils/operationUtil.js";
+import { resolveReference } from "../framework/reference.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
 
 /**
  * This function creates a file under /api for each operation group.
@@ -35,20 +38,23 @@ import { buildType } from "./helpers/typeHelpers.js";
  * file called operations.ts where all operations are generated.
  */
 export function buildOperationFiles(
-  client: Client,
   dpgContext: SdkContext,
-  codeModel: ModularCodeModel
+  client: SdkClientType<SdkServiceOperation>,
+  emitterOptions: ModularEmitterOptions
 ) {
-  const operationFiles = [];
+  const operationFiles: Set<SourceFile> = new Set();
+  const { subfolder, rlcClientName } = getModularClientOptions(
+    dpgContext,
+    client
+  );
   const isMultiEndpoint = isRLCMultiEndpoint(dpgContext);
-  const clientType = isMultiEndpoint
-    ? `Client.${client.rlcClientName}`
-    : "Client";
-  for (const operationGroup of client.operationGroups) {
-    clearImportSets(codeModel.runtimeImports);
+  const clientType = isMultiEndpoint ? `Client.${rlcClientName}` : "Client";
+  const methodMap = getMethodHierarchiesMap(dpgContext, client);
+  for (const [prefixKey, operations] of methodMap) {
+    const prefixes = prefixKey.split("/");
     const operationFileName =
-      operationGroup.className && operationGroup.namespaceHierarchies.length > 0
-        ? `${operationGroup.namespaceHierarchies
+      prefixes.length > 0 && prefixKey !== ""
+        ? `${prefixes
             .map((hierarchy) => {
               return normalizeName(hierarchy, NameType.File);
             })
@@ -57,55 +63,48 @@ export function buildOperationFiles(
           // into a nameless operation group. We'll call this operations.
           "operations";
 
-    const subfolder = client.subfolder;
-    const srcPath = codeModel.modularOptions.sourceRoot;
-    const operationGroupFile = codeModel.project.createSourceFile(
-      `${srcPath}/${
-        subfolder && subfolder !== "" ? subfolder + "/" : ""
-      }api/${operationFileName}.ts`
-    );
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const filepath = `${srcPath}/${
+      subfolder && subfolder !== "" ? subfolder + "/" : ""
+    }api/${operationFileName}.ts`;
 
+    const operationGroupFile =
+      emitterOptions.project.createSourceFile(filepath);
     // Import the deserializeUtils
     importDeserializeUtils(
       srcPath,
       operationGroupFile,
-      codeModel.project,
+      emitterOptions.project,
       "deserialize",
       subfolder,
-      operationGroup.namespaceHierarchies.length
+      prefixes.length
     );
 
     // Import the serializeUtils
     importDeserializeUtils(
       srcPath,
       operationGroupFile,
-      codeModel.project,
+      emitterOptions.project,
       "serialize",
       subfolder,
-      operationGroup.namespaceHierarchies.length
+      prefixes.length
     );
 
-    const indexPathPrefix =
-      "../".repeat(operationGroup.namespaceHierarchies.length) || "./";
-    operationGroupFile.addImportDeclaration({
-      namedImports: [`${client.rlcClientName} as Client`],
-      moduleSpecifier: `${indexPathPrefix}index.js`
-    });
-
-    operationGroup.operations.forEach((o) => {
+    operations.forEach((op) => {
       const operationDeclaration = getOperationFunction(
         dpgContext,
-        o,
+        [prefixes, op],
         clientType
       );
       const sendOperationDeclaration = getSendPrivateFunction(
         dpgContext,
-        o,
+        client,
+        [prefixes, op],
         clientType
       );
       const deserializeOperationDeclaration = getDeserializePrivateFunction(
         dpgContext,
-        o
+        op
       );
       operationGroupFile.addFunctions([
         sendOperationDeclaration,
@@ -114,13 +113,18 @@ export function buildOperationFiles(
       ]);
     });
 
-    // addImportsToFiles(codeModel.runtimeImports, operationGroupFile);
-    operationGroupFile.fixUnusedIdentifiers();
+    const indexPathPrefix =
+      "../".repeat(prefixKey === "" ? 0 : prefixes.length) || "./";
+    operationGroupFile.addImportDeclaration({
+      namedImports: [`${rlcClientName} as Client`],
+      moduleSpecifier: `${indexPathPrefix}index.js`
+    });
     addImportBySymbol("serializeRecord", operationGroupFile);
+    operationGroupFile.fixUnusedIdentifiers();
 
-    operationFiles.push(operationGroupFile);
+    operationFiles.add(operationGroupFile);
   }
-  return operationFiles;
+  return Array.from(operationFiles);
 }
 
 export function importDeserializeUtils(
@@ -160,15 +164,24 @@ export function importDeserializeUtils(
  */
 export function buildOperationOptions(
   context: SdkContext,
-  operation: Operation,
+  method: [string[], ServiceOperation],
   sourceFile: SourceFile
 ) {
+  const dependencies = useDependencies();
+  const operation = method[1];
   const optionalParameters = operation.parameters
-    .filter((p) => p.implementation === "Method")
+    .filter(
+      (p) =>
+        p.onClient === false &&
+        !(
+          p.isGeneratedName &&
+          (p.name === "contentType" || p.name !== "accept")
+        )
+    )
     .filter((p) => p.optional || p.clientDefaultValue);
-  const options: (BodyParameter | Parameter)[] = [...optionalParameters];
+  const options: SdkMethodParameter[] = [...optionalParameters];
 
-  const name = getOperationOptionsName(operation, true);
+  const name = getOperationOptionsName(method, true);
   const lroOptions = {
     name: "updateIntervalInMs",
     type: "number",
@@ -177,27 +190,24 @@ export function buildOperationOptions(
   };
 
   // handle optional body parameter
-  if (operation.bodyParameter?.optional === true) {
-    options.push(operation.bodyParameter);
-  }
-
+  // if (operation.operation.bodyParam?.optional === true) {
+  //   options.push(operation.operation.bodyParam);
+  // }
+  const operationOptionsReference = resolveReference(
+    dependencies.OperationOptions
+  );
   sourceFile.addInterface({
     name,
     isExported: true,
-    extends: ["OperationOptions"],
+    extends: [operationOptionsReference],
     properties: (isLroOnlyOperation(operation) ? [lroOptions] : []).concat(
       options.map((p) => {
         return {
-          docs: getDocsFromDescription(p.description),
+          docs: getDocsFromDescription(p.doc),
           hasQuestionToken: true,
-          ...(p.type.tcgcType
-            ? {
-                type: getTypeExpression(context, p.type.tcgcType),
-                name: p.clientName
-              }
-            : {
-                ...buildType(p.clientName, p.type, p.format)
-              })
+
+          type: getTypeExpression(context, p.type),
+          name: normalizeName(p.name, NameType.Parameter)
         };
       })
     ),
@@ -208,21 +218,24 @@ export function buildOperationOptions(
 /**
  * This function creates a map of operation file path to operation names.
  */
-export function buildLroDeserDetailMap(client: Client) {
+export function buildLroDeserDetailMap(
+  context: SdkContext,
+  client: SdkClientType<SdkServiceOperation>
+) {
   const map = new Map<string, OperationPathAndDeserDetails[]>();
   const existingNames = new Set<string>();
-  for (const operationGroup of client.operationGroups) {
-    const operations = operationGroup.operations.filter((o) =>
-      isLroOnlyOperation(o)
-    );
+  const methodMap = getMethodHierarchiesMap(context, client);
+  for (const [prefixKey, operations] of methodMap) {
+    const prefixes = prefixKey.split("/");
+    const lroOperations = operations.filter((o) => isLroOnlyOperation(o));
     // skip this operation group if it has no LRO operations
-    if (operations.length === 0) {
+    if (lroOperations.length === 0) {
       continue;
     }
 
     const operationFileName =
-      operationGroup.className && operationGroup.namespaceHierarchies.length > 0
-        ? `${operationGroup.namespaceHierarchies
+      prefixes.length > 0 && prefixKey !== ""
+        ? `${prefixes
             .map((hierarchy) => {
               return normalizeName(hierarchy, NameType.File);
             })
@@ -232,7 +245,7 @@ export function buildLroDeserDetailMap(client: Client) {
           "operations";
     map.set(
       `./api/${operationFileName}.js`,
-      operations.map((o) => {
+      lroOperations.map((o) => {
         const { name } = getOperationName(o);
         const deserName = `_${name}Deserialize`;
         let renamedDeserName = undefined;
@@ -245,7 +258,7 @@ export function buildLroDeserDetailMap(client: Client) {
         }
         existingNames.add(deserName);
         return {
-          path: `${o.method.toUpperCase()} ${o.url}`,
+          path: `${o.operation.verb.toUpperCase()} ${o.operation.path}`,
           expectedStatusesExpression: getExpectedStatuses(o),
           deserName,
           renamedDeserName

package/src/modular/buildProjectFiles.ts

@@ -1,20 +1,21 @@
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType } from "@azure-tools/rlc-common";
 
-import { ModularCodeModel } from "./modularCodeModel.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
+import { SdkContext } from "@azure-tools/typespec-client-generator-core";
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
 
 function buildExportsForMultiClient(
-  codeModel: ModularCodeModel,
+  context: SdkContext,
+  emitterOptions: ModularEmitterOptions,
   packageInfo: any
 ) {
-  if (codeModel.clients.length > 1) {
+  if (context.sdkPackage.clients.length > 1) {
     delete packageInfo.exports["./api"];
     delete packageInfo.exports["./models"];
-    for (const client of codeModel.clients) {
-      const subfolder = normalizeName(
-        client.name.replace("Client", ""),
-        NameType.File
-      );
+    for (const client of context.sdkPackage.clients) {
+      const { subfolder } = getModularClientOptions(context, client);
       packageInfo.exports[`./${subfolder}`] = `./src/${subfolder}/index.ts`;
 
       packageInfo.exports[`./${subfolder}/api`] =
@@ -23,18 +24,17 @@ function buildExportsForMultiClient(
         `./src/${subfolder}/models/index.ts`;
     }
   }
-  if (codeModel.options.hierarchyClient) {
-    for (const client of codeModel.clients) {
-      for (const operationGroup of client.operationGroups) {
-        if (operationGroup.namespaceHierarchies.length === 0) {
+  if (emitterOptions.options.hierarchyClient) {
+    for (const client of context.sdkPackage.clients) {
+      const { subfolder } = getModularClientOptions(context, client);
+      const methodMap = getMethodHierarchiesMap(context, client);
+      for (const [prefixKey, _] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        if (prefixKey === "") {
           continue;
         }
-        const subfolder =
-          codeModel.clients.length > 1
-            ? normalizeName(client.name.replace("Client", ""), NameType.File)
-            : undefined;
         const subApiPath = `api/${getClassicalLayerPrefix(
-          operationGroup,
+          prefixes,
           NameType.File,
           "/"
         )}`;
@@ -48,16 +48,19 @@ function buildExportsForMultiClient(
   return packageInfo.exports;
 }
 
-export function getModuleExports(codeModel: ModularCodeModel) {
+export function getModuleExports(
+  context: SdkContext,
+  emitterOptions: ModularEmitterOptions
+) {
   const exports: Record<string, any> = {
     exports: {
       ".": "./src/index.ts",
       "./models": "./src/models/index.ts"
     }
   };
-  if (!codeModel.options.azureArm) {
+  if (!emitterOptions.options.azureArm) {
     exports["exports"]["./api"] = "./src/api/index.ts";
   }
 
-  return buildExportsForMultiClient(codeModel, exports);
+  return buildExportsForMultiClient(context, emitterOptions, exports);
 }

package/src/modular/buildRestorePoller.ts

@@ -1,35 +1,43 @@
 import { SourceFile } from "ts-morph";
 import { isLroOnlyOperation } from "./helpers/operationHelpers.js";
-import { ModularCodeModel, Client } from "./modularCodeModel.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 import path from "path";
 import { buildLroDeserDetailMap } from "./buildOperations.js";
 import { getClientName } from "./helpers/namingHelpers.js";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { resolveReference } from "../framework/reference.js";
-import {
-  AzureCoreDependencies,
-  AzurePollingDependencies
-} from "./external-dependencies.js";
+import { AzurePollingDependencies } from "./external-dependencies.js";
 import { PollingHelpers } from "./static-helpers-metadata.js";
+import {
+  SdkClientType,
+  SdkServiceOperation
+} from "@azure-tools/typespec-client-generator-core";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { SdkContext } from "../utils/interfaces.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
 
 export function buildRestorePoller(
-  codeModel: ModularCodeModel,
-  client: Client
+  context: SdkContext,
+  client: SdkClientType<SdkServiceOperation>,
+  emitterOptions: ModularEmitterOptions
 ) {
-  const lros = client.operationGroups
-    .flatMap((op) => op.operations)
-    .filter(isLroOnlyOperation);
-  if (lros.length === 0) {
+  const dependencies = useDependencies();
+  const { subfolder } = getModularClientOptions(context, client);
+  const methodMap = getMethodHierarchiesMap(context, client);
+  const hasLro = Array.from(methodMap.values()).some((operations) => {
+    return operations.some(isLroOnlyOperation);
+  });
+  if (!hasLro) {
     return;
   }
-  const srcPath = codeModel.modularOptions.sourceRoot;
-  const subfolder = client.subfolder ?? "";
+  const srcPath = emitterOptions.modularOptions.sourceRoot;
   const filePath = path.join(
     `${srcPath}/${
-      subfolder !== "" ? subfolder + "/" : ""
+      subfolder && subfolder !== "" ? subfolder + "/" : ""
     }restorePollerHelpers.ts`
   );
-  const restorePollerFile = codeModel.project.createSourceFile(
+  const restorePollerFile = emitterOptions.project.createSourceFile(
     filePath,
     undefined,
     {
@@ -38,9 +46,13 @@ export function buildRestorePoller(
   );
 
   const clientNames = importClassicalClient(client, restorePollerFile);
-  const deserializeMap = importDeserializeHelpers(client, restorePollerFile);
+  const deserializeMap = importDeserializeHelpers(
+    context,
+    client,
+    restorePollerFile
+  );
   const pathUncheckedReference = resolveReference(
-    AzureCoreDependencies.PathUncheckedResponse
+    dependencies.PathUncheckedResponse
   );
   const pollerLikeReference = resolveReference(
     AzurePollingDependencies.PollerLike
@@ -49,7 +61,7 @@ export function buildRestorePoller(
     AzurePollingDependencies.OperationState
   );
   const operationOptionsReference = resolveReference(
-    AzureCoreDependencies.OperationOptions
+    dependencies.OperationOptions
   );
   const deserializeStateReference = resolveReference(
     AzurePollingDependencies.DeserializeState
@@ -64,7 +76,7 @@ export function buildRestorePoller(
       /**
        * The signal which can be used to abort requests.
       */
-      abortSignal?: ${resolveReference(AzureCoreDependencies.AbortSignalLike)};
+      abortSignal?: ${resolveReference(dependencies.AbortSignalLike)};
       /** Deserialization function for raw response body */
       processResponseBody?: (result: TResponse) => Promise<TResult>;
     }
@@ -203,8 +215,12 @@ export function buildRestorePoller(
   restorePollerFile.addStatements(restorePollerHelperContent);
 }
 
-function importDeserializeHelpers(client: Client, sourceFile: SourceFile) {
-  const deserializeDetails = buildLroDeserDetailMap(client);
+function importDeserializeHelpers(
+  context: SdkContext,
+  client: SdkClientType<SdkServiceOperation>,
+  sourceFile: SourceFile
+) {
+  const deserializeDetails = buildLroDeserDetailMap(context, client);
   const deserializeMap: string[] = [];
   for (const [key, value] of deserializeDetails.entries()) {
     sourceFile.addImportDeclaration({
@@ -227,10 +243,10 @@ function importDeserializeHelpers(client: Client, sourceFile: SourceFile) {
 }
 
 function importClassicalClient(
-  client: Client,
+  client: SdkClientType<SdkServiceOperation>,
   sourceFile: SourceFile
 ): string[] {
-  const classicalClientName = `${getClientName(client.tcgcClient)}Client`;
+  const classicalClientName = `${getClientName(client)}Client`;
   sourceFile.addImportDeclaration({
     namedImports: [`${classicalClientName}`],
     moduleSpecifier: `./${normalizeName(classicalClientName, NameType.File)}.js`

package/src/modular/buildRootIndex.ts

@@ -4,21 +4,29 @@ import {
   getClassicalClientName,
   getClientName
 } from "./helpers/namingHelpers.js";
-import { Client, ModularCodeModel } from "./modularCodeModel.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 import { resolveReference } from "../framework/reference.js";
 import { PagingHelpers } from "./static-helpers-metadata.js";
+import {
+  SdkClientType,
+  SdkContext,
+  SdkServiceOperation
+} from "@azure-tools/typespec-client-generator-core";
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
 
 export function buildRootIndex(
-  client: Client,
-  codeModel: ModularCodeModel,
+  context: SdkContext,
+  client: SdkClientType<SdkServiceOperation>,
+  emitterOptions: ModularEmitterOptions,
   rootIndexFile: SourceFile
 ) {
-  const { project } = codeModel;
-  const srcPath = codeModel.modularOptions.sourceRoot;
-  const subfolder = client.subfolder ?? "";
-  const clientName = `${getClassicalClientName(client.tcgcClient)}`;
+  const { project } = emitterOptions;
+  const srcPath = emitterOptions.modularOptions.sourceRoot;
+  const { subfolder } = getModularClientOptions(context, client);
+  const clientName = `${getClassicalClientName(client)}`;
   const clientFile = project.getSourceFile(
-    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
+    `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
       clientName,
       NameType.File
     )}.ts`
@@ -33,7 +41,7 @@ export function buildRootIndex(
     );
   }
 
-  exportClassicalClient(client, rootIndexFile, subfolder);
+  exportClassicalClient(client, rootIndexFile, subfolder ?? "");
   exportRestoreHelpers(
     rootIndexFile,
     project,
@@ -62,17 +70,14 @@ export function buildRootIndex(
     isTopLevel: true
   });
 
-  exportPagingTypes(codeModel, rootIndexFile);
+  exportPagingTypes(context, rootIndexFile);
 }
 
 /**
  * This is a temporary solution for adding paging exports. Eventually we will have the binder generate the exports automatically.
  */
-function exportPagingTypes(
-  codeModel: ModularCodeModel,
-  rootIndexFile: SourceFile
-) {
-  if (!hasPaging(codeModel)) {
+function exportPagingTypes(context: SdkContext, rootIndexFile: SourceFile) {
+  if (!hasPaging(context)) {
     return;
   }
 
@@ -90,15 +95,18 @@ function exportPagingTypes(
   }
 }
 
-function hasPaging(codeModel: ModularCodeModel): boolean {
-  return codeModel.clients.some((c) =>
-    c.operationGroups.some((og) =>
-      og.operations.some(
-        (op) =>
-          op.discriminator === "paging" || op.discriminator === "lropaging"
-      )
-    )
-  );
+function hasPaging(context: SdkContext): boolean {
+  return context.sdkPackage.clients.some((client) => {
+    const methodMap = getMethodHierarchiesMap(context, client);
+    for (const [_, operations] of methodMap) {
+      if (
+        operations.some((op) => op.kind === "paging" || op.kind === "lropaging")
+      ) {
+        return true;
+      }
+    }
+    return false;
+  });
 }
 
 function getExistingExports(rootIndexFile: SourceFile): Set<string> {
@@ -139,7 +147,7 @@ function exportRestoreHelpers(
 ) {
   const helperFile = project.getSourceFile(
     `${srcPath}/${
-      subfolder !== "" ? subfolder + "/" : ""
+      subfolder && subfolder !== "" ? subfolder + "/" : ""
     }restorePollerHelpers.ts`
   );
   if (!helperFile) {
@@ -155,7 +163,7 @@ function exportRestoreHelpers(
     }
   );
   const moduleSpecifier = `./${
-    isTopLevel && subfolder !== "" ? subfolder + "/" : ""
+    isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""
   }restorePollerHelpers.js`;
   indexFile.addExportDeclaration({
     moduleSpecifier,
@@ -164,16 +172,16 @@ function exportRestoreHelpers(
 }
 
 function exportClassicalClient(
-  client: Client,
+  client: SdkClientType<SdkServiceOperation>,
   indexFile: SourceFile,
   subfolder: string,
   isSubClient: boolean = false
 ) {
-  const clientName = `${getClientName(client.tcgcClient)}Client`;
+  const clientName = `${getClientName(client)}Client`;
   indexFile.addExportDeclaration({
     namedExports: [clientName],
     moduleSpecifier: `./${
-      subfolder !== "" && !isSubClient ? subfolder + "/" : ""
+      subfolder && subfolder !== "" && !isSubClient ? subfolder + "/" : ""
     }${normalizeName(clientName, NameType.File)}.js`
   });
 }
@@ -248,37 +256,38 @@ function exportModules(
 }
 
 export function buildSubClientIndexFile(
-  client: Client,
-  codeModel: ModularCodeModel
+  context: SdkContext,
+  client: SdkClientType<SdkServiceOperation>,
+  emitterOptions: ModularEmitterOptions
 ) {
-  const subfolder = client.subfolder ?? "";
-  const srcPath = codeModel.modularOptions.sourceRoot;
-  const subClientIndexFile = codeModel.project.createSourceFile(
-    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}index.ts`,
+  const { subfolder } = getModularClientOptions(context, client);
+  const srcPath = emitterOptions.modularOptions.sourceRoot;
+  const subClientIndexFile = emitterOptions.project.createSourceFile(
+    `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}index.ts`,
     undefined,
     { overwrite: true }
   );
-  const clientName = `${getClientName(client.tcgcClient)}Client`;
+  const clientName = `${getClientName(client)}Client`;
   const clientFilePath = `${srcPath}/${
-    subfolder !== "" ? subfolder + "/" : ""
+    subfolder && subfolder !== "" ? subfolder + "/" : ""
   }${normalizeName(clientName, NameType.File)}.ts`;
-  const clientFile = codeModel.project.getSourceFile(clientFilePath);
+  const clientFile = emitterOptions.project.getSourceFile(clientFilePath);
 
   if (!clientFile) {
     throw new Error(`Couldn't find client file: ${clientFilePath}`);
   }
 
-  exportClassicalClient(client, subClientIndexFile, subfolder, true);
+  exportClassicalClient(client, subClientIndexFile, subfolder ?? "", true);
   exportRestoreHelpers(
     subClientIndexFile,
-    codeModel.project,
+    emitterOptions.project,
     srcPath,
     clientName,
     subfolder
   );
   exportModules(
     subClientIndexFile,
-    codeModel.project,
+    emitterOptions.project,
     srcPath,
     clientName,
     "api",
@@ -289,7 +298,7 @@ export function buildSubClientIndexFile(
   );
   exportModules(
     subClientIndexFile,
-    codeModel.project,
+    emitterOptions.project,
     srcPath,
     clientName,
     "classic",