@azure-tools/typespec-ts 0.40.0 → 0.40.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.40.0",
+  "version": "0.40.2",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -21,11 +21,11 @@
     "@typespec/http-specs": "0.1.0-alpha.22-dev.0",
     "@typespec/spector": "0.1.0-alpha.14-dev.1",
     "@typespec/spec-api": "0.1.0-alpha.7-dev.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.17-dev.0",
-    "@azure-tools/typespec-autorest": "0.56.0",
-    "@azure-tools/typespec-azure-core": "0.56.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.56.0",
-    "@azure-tools/typespec-client-generator-core": "0.56.0",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.17-dev.0",
+    "@azure-tools/typespec-autorest": "^0.56.0",
+    "@azure-tools/typespec-azure-core": "^0.56.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.56.1",
+    "@azure-tools/typespec-client-generator-core": "^0.56.2",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -40,12 +40,12 @@
     "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
-    "@typespec/compiler": "1.0.0",
-    "@typespec/http": "1.0.0",
-    "@typespec/openapi": "1.0.0",
-    "@typespec/rest": "0.70.0",
-    "@typespec/ts-http-runtime": "0.1.0",
-    "@typespec/versioning": "0.70.0",
+    "@typespec/compiler": "^1.0.0",
+    "@typespec/http": "^1.0.1",
+    "@typespec/openapi": "^1.0.0",
+    "@typespec/rest": "^0.70.0",
+    "@typespec/ts-http-runtime": "^0.1.0",
+    "@typespec/versioning": "^0.70.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -67,16 +67,16 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "0.56.0",
-    "@azure-tools/typespec-client-generator-core": "0.56.0",
-    "@typespec/compiler": "1.0.0",
-    "@typespec/http": "1.0.0",
-    "@typespec/rest": "0.70.0",
-    "@typespec/versioning": "0.70.0",
-    "@typespec/xml": "0.70.0"
+    "@azure-tools/typespec-azure-core": "^0.56.0",
+    "@azure-tools/typespec-client-generator-core": "^0.56.2",
+    "@typespec/compiler": "^1.0.0",
+    "@typespec/http": "^1.0.1",
+    "@typespec/rest": "^0.70.0",
+    "@typespec/versioning": "^0.70.0",
+    "@typespec/xml": "^0.70.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.39.0",
+    "@azure-tools/rlc-common": "^0.40.2",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -83,7 +83,7 @@ import { emitLoggerFile } from "./modular/emitLoggerFile.js";
 import { emitTypes } from "./modular/emitModels.js";
 import { existsSync } from "fs";
 import { getModuleExports } from "./modular/buildProjectFiles.js";
-import { getRLCClients } from "./utils/clientUtils.js";
+import { getClientHierarchyMap, getRLCClients } from "./utils/clientUtils.js";
 import { join } from "path";
 import { loadStaticHelpers } from "./framework/load-static-helpers.js";
 import { provideBinder } from "./framework/hooks/binder.js";
@@ -166,13 +166,20 @@ export async function $onEmit(context: EmitContext) {
   console.timeEnd("onEmit: build RLC code models");
 
   // 4. Generate sources
-  if (emitterOptions.isModularLibrary) {
+  if (emitterOptions["is-modular-library"]) {
     await generateModularSources();
   } else {
     await generateRLCSources();
   }
 
   // 5. Generate metadata and test files
+  function getTypespecTsVersion(context: EmitContext): string | undefined {
+    const emitterMetadata = context.program.emitters.find(
+      (emitter) => emitter.metadata.name === "@azure-tools/typespec-ts"
+    );
+    return emitterMetadata?.metadata.version;
+  }
+
   await generateMetadataAndTest(dpgContext);
 
   async function enrichDpgContext() {
@@ -180,8 +187,8 @@ export async function $onEmit(context: EmitContext) {
       await calculateGenerationDir();
     dpgContext.generationPathDetail = generationPathDetail;
     const options: RLCOptions = transformRLCOptions(emitterOptions, dpgContext);
-    emitterOptions.isModularLibrary = options.isModularLibrary;
-    emitterOptions.generateSample = options.generateSample;
+    emitterOptions["is-modular-library"] = options.isModularLibrary;
+    emitterOptions["generate-sample"] = options.generateSample;
     // clear output folder if needed
     if (options.clearOutputFolder) {
       await fsextra.emptyDir(context.emitterOutputDir);
@@ -283,58 +290,37 @@ export async function $onEmit(context: EmitContext) {
     console.time("onEmit: emit models");
     emitTypes(dpgContext, { sourceRoot: modularSourcesRoot });
     console.timeEnd("onEmit: emit models");
-    buildSubpathIndexFile(
-      dpgContext,
-      modularEmitterOptions,
-      "models",
-      undefined,
-      { recursive: true }
-    );
+    buildSubpathIndexFile(modularEmitterOptions, "models", undefined, {
+      recursive: true
+    });
     console.time("onEmit: emit source files");
-    for (const subClient of dpgContext.sdkPackage.clients) {
-      await renameClientName(subClient, modularEmitterOptions);
+    const clientMap = getClientHierarchyMap(dpgContext);
+    for (const subClient of clientMap) {
+      await renameClientName(subClient[1], modularEmitterOptions);
       buildApiOptions(dpgContext, subClient, modularEmitterOptions);
       buildOperationFiles(dpgContext, subClient, modularEmitterOptions);
       buildClientContext(dpgContext, subClient, modularEmitterOptions);
       buildRestorePoller(dpgContext, subClient, modularEmitterOptions);
       if (dpgContext.rlcOptions?.hierarchyClient) {
-        buildSubpathIndexFile(
-          dpgContext,
-          modularEmitterOptions,
-          "api",
-          subClient,
-          {
-            exportIndex: false,
-            recursive: true
-          }
-        );
+        buildSubpathIndexFile(modularEmitterOptions, "api", subClient, {
+          exportIndex: false,
+          recursive: true
+        });
       } else {
-        buildSubpathIndexFile(
-          dpgContext,
-          modularEmitterOptions,
-          "api",
-          subClient,
-          {
-            recursive: true,
-            exportIndex: true
-          }
-        );
+        buildSubpathIndexFile(modularEmitterOptions, "api", subClient, {
+          recursive: true,
+          exportIndex: true
+        });
       }
 
       buildClassicalClient(dpgContext, subClient, modularEmitterOptions);
       buildClassicOperationFiles(dpgContext, subClient, modularEmitterOptions);
-      buildSubpathIndexFile(
-        dpgContext,
-        modularEmitterOptions,
-        "classic",
-        subClient,
-        {
-          exportIndex: true,
-          interfaceOnly: true
-        }
-      );
+      buildSubpathIndexFile(modularEmitterOptions, "classic", subClient, {
+        exportIndex: true,
+        interfaceOnly: true
+      });
       if (isMultiClients) {
-        buildSubClientIndexFile(dpgContext, subClient, modularEmitterOptions);
+        buildSubClientIndexFile(subClient, modularEmitterOptions);
       }
       buildRootIndex(
         dpgContext,
@@ -345,7 +331,7 @@ export async function $onEmit(context: EmitContext) {
     }
     console.timeEnd("onEmit: emit source files");
     // Enable modular sample generation when explicitly set to true or MPG
-    if (emitterOptions.generateSample === true) {
+    if (emitterOptions["generate-sample"] === true) {
       console.time("onEmit: emit samples");
       const samples = emitSamples(dpgContext);
       console.timeEnd("onEmit: emit samples");
@@ -358,6 +344,9 @@ export async function $onEmit(context: EmitContext) {
 
     console.time("onEmit: resolve references");
     binder.resolveAllReferences(modularSourcesRoot);
+    if (program.compilerOptions.noEmit || program.hasError()) {
+      return;
+    }
     console.timeEnd("onEmit: resolve references");
 
     console.time("onEmit: generate files");
@@ -372,7 +361,29 @@ export async function $onEmit(context: EmitContext) {
     console.timeEnd("onEmit: generate files");
     console.timeEnd("onEmit: generate modular sources");
   }
+  interface Metadata {
+    apiVersion?: string;
+    emitterVersion?: string;
+  }
 
+  function buildMetadataJson() {
+    const apiVersion = dpgContext.sdkPackage.metadata.apiVersion;
+    const emitterVersion = getTypespecTsVersion(context);
+    if (apiVersion === undefined && emitterVersion === undefined) {
+      return;
+    }
+    const content: Metadata = {};
+    if (apiVersion !== undefined) {
+      content.apiVersion = apiVersion;
+    }
+    if (emitterVersion !== undefined) {
+      content.emitterVersion = emitterVersion;
+    }
+    return {
+      path: "metadata.json",
+      content: JSON.stringify(content, null, 2)
+    };
+  }
   async function generateMetadataAndTest(context: SdkContext) {
     const project = useContext("outputProject");
     if (rlcCodeModels.length === 0 || !rlcCodeModels[0]) {
@@ -402,6 +413,14 @@ export async function $onEmit(context: EmitContext) {
         option.generateTest = true;
       }
     }
+
+    //TODO Need consider multi-client cases
+    if (option.isModularLibrary) {
+      for (const subClient of dpgContext.sdkPackage.clients) {
+        rlcClient.libraryName = subClient.name;
+      }
+    }
+
     if (shouldGenerateMetadata) {
       const commonBuilders = [
         buildRollupConfig,
@@ -486,6 +505,14 @@ export async function $onEmit(context: EmitContext) {
         dpgContext.generationPathDetail?.metadataDir
       );
     }
+    if (isAzureFlavor) {
+      await emitContentByBuilder(
+        program,
+        buildMetadataJson,
+        rlcClient,
+        dpgContext.generationPathDetail?.metadataDir
+      );
+    }
 
     // Generate test relevant files
     if (option.generateTest && isAzureFlavor) {
@@ -502,8 +529,9 @@ export async function $onEmit(context: EmitContext) {
     context: SdkContext,
     options: ModularEmitterOptions
   ) {
-    return context.sdkPackage.clients
-      .map((subClient) => getClientContextPath(context, subClient, options))
+    const clientMap = getClientHierarchyMap(context);
+    return Array.from(clientMap)
+      .map((subClient) => getClientContextPath(subClient, options))
       .map((path) => path.substring(path.indexOf("src")));
   }
   console.timeEnd("onEmit");

package/src/lib.ts

@@ -5,8 +5,7 @@ import {
   PackageDetails,
   DependencyInfo,
   ServiceInfo,
-  PackageFlavor,
-  RLCOptions
+  PackageFlavor
 } from "@azure-tools/rlc-common";
 import {
   createTypeSpecLibrary,
@@ -15,7 +14,7 @@ import {
 } from "@typespec/compiler";
 import { Options } from "prettier";
 
-export interface EmitterOptions extends RLCOptions {
+export interface EmitterOptions {
   "include-shortcuts"?: boolean;
   "multi-client"?: boolean;
   batch?: any[];
@@ -69,107 +68,14 @@ export interface EmitterOptions extends RLCOptions {
   "typespec-title-map"?: Record<string, string>;
   "ignore-enum-member-name-normalize"?: boolean;
   "default-value-object"?: boolean;
+  //TODO should remove this after finish the release tool test
+  "should-use-pnpm-dep"?: boolean;
 }
 
-const _RLCOptionsSchema: JSONSchemaType<RLCOptions> = {
-  type: "object",
-  additionalProperties: true,
-  properties: {
-    includeShortcuts: { type: "boolean", nullable: true },
-    multiClient: { type: "boolean", nullable: true },
-    batch: {
-      type: "array",
-      nullable: true,
-      items: {
-        type: "string"
-      }
-    },
-    packageDetails: {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        name: { type: "string", nullable: false },
-        scopeName: { type: "string", nullable: true },
-        nameWithoutScope: { type: "string", nullable: true },
-        description: { type: "string", nullable: true },
-        version: { type: "string", nullable: true }
-      },
-      required: ["name"],
-      nullable: true
-    },
-    addCredentials: { type: "boolean", nullable: true },
-    credentialScopes: {
-      type: "array",
-      nullable: true,
-      items: { type: "string" }
-    },
-    credentialKeyHeaderName: { type: "string", nullable: true },
-    customHttpAuthHeaderName: { type: "string", nullable: true },
-    customHttpAuthSharedKeyPrefix: { type: "string", nullable: true },
-    generateMetadata: { type: "boolean", nullable: true },
-    generateTest: { type: "boolean", nullable: true },
-    generateSample: { type: "boolean", nullable: true },
-    azureSdkForJs: { type: "boolean", nullable: true },
-    azureOutputDirectory: { type: "string", nullable: true },
-    isTypeSpecTest: { type: "boolean", nullable: true },
-    title: { type: "string", nullable: true },
-    dependencyInfo: {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        link: { type: "string", nullable: false },
-        description: { type: "string", nullable: false }
-      },
-      required: [],
-      nullable: true
-    },
-    productDocLink: { type: "string", nullable: true },
-    serviceInfo: {
-      type: "object",
-      additionalProperties: true,
-      properties: {
-        title: { type: "string", nullable: true },
-        description: { type: "string", nullable: true }
-      },
-      nullable: true
-    },
-    azureArm: { type: "boolean", nullable: true },
-    sourceFrom: { type: "string", nullable: true },
-    isModularLibrary: { type: "boolean", nullable: true, default: false },
-    enableOperationGroup: { type: "boolean", nullable: true },
-    enableModelNamespace: { type: "boolean", nullable: true },
-    hierarchyClient: { type: "boolean", nullable: true },
-    branded: { type: "boolean", nullable: true },
-    flavor: { type: "string", nullable: true },
-    moduleKind: {
-      type: "string",
-      nullable: true,
-      enum: ["esm", "cjs"],
-      default: "esm"
-    },
-    compatibilityMode: { type: "boolean", nullable: true },
-    experimentalExtensibleEnums: { type: "boolean", nullable: true },
-    clearOutputFolder: { type: "boolean", nullable: true },
-    ignorePropertyNameNormalize: { type: "boolean", nullable: true },
-    ignoreEnumMemberNameNormalize: { type: "boolean", nullable: true },
-    compatibilityQueryMultiFormat: { type: "boolean", nullable: true },
-    typespecTitleMap: {
-      type: "object",
-      additionalProperties: {
-        type: "string"
-      },
-      required: [],
-      nullable: true
-    }
-  },
-  required: []
-};
-
 export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
   type: "object",
   additionalProperties: true,
   properties: {
-    ..._RLCOptionsSchema.properties,
     "include-shortcuts": { type: "boolean", nullable: true },
     "multi-client": { type: "boolean", nullable: true },
     batch: {
@@ -256,7 +162,8 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       },
       required: [],
       nullable: true
-    }
+    },
+    "should-use-pnpm-dep": { type: "boolean", nullable: true }
   },
   required: []
 };
@@ -384,12 +291,6 @@ const libDef = {
         default: paramMessage`Please note the decimal type will be converted to number. If you strongly care about precision you can use @encode to encode it as a string for the property - ${"propertyName"}.`
       }
     },
-    "use-kebab-case-option": {
-      severity: "warning",
-      messages: {
-        default: paramMessage`The option - ${"camelCaseOption"} is deprecated and please use this kebab-case one - ${"kebabCaseOption"}.`
-      }
-    },
     "unable-serialized-type": {
       severity: "warning",
       messages: {

package/src/modular/buildClassicalClient.ts

@@ -26,6 +26,7 @@ import {
 import { resolveReference } from "../framework/reference.js";
 import { useDependencies } from "../framework/hooks/useDependencies.js";
 import {
+  InitializedByFlags,
   SdkClientType,
   SdkServiceMethod,
   SdkServiceOperation
@@ -36,10 +37,11 @@ import { refkey } from "../framework/refkey.js";
 
 export function buildClassicalClient(
   dpgContext: SdkContext,
-  client: SdkClientType<SdkServiceOperation>,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions
 ) {
   const project = useContext("outputProject");
+  const [_hierarchy, client] = clientMap;
   const dependencies = useDependencies();
   const modularClientName = getClientName(client);
   const classicalClientName = `${getClassicalClientName(client)}`;
@@ -51,10 +53,7 @@ export function buildClassicalClient(
     requiredOnly: true
   });
   const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const { subfolder, rlcClientName } = getModularClientOptions(
-    dpgContext,
-    client
-  );
+  const { subfolder, rlcClientName } = getModularClientOptions(clientMap);
 
   const clientFile = project.createSourceFile(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(
@@ -99,6 +98,25 @@ export function buildClassicalClient(
     docs: ["The pipeline used by this client to make requests"]
   });
 
+  const hasChildClient =
+    client.children &&
+    client.children.some((childClient) => {
+      return (
+        childClient.clientInitialization.initializedBy &
+        InitializedByFlags.Parent
+      );
+    });
+  if (hasChildClient) {
+    clientClass.addProperty({
+      name: "_clientParams",
+      type: `{${classicalParams.map((p) => {
+        return `${p.name}: ${p.type}`;
+      })}}`,
+      scope: Scope.Private,
+      docs: ["The parent client parameters that are used in the constructors."]
+    });
+  }
+
   // TODO: We may need to generate constructor overloads at some point. Here we'd do that.
   const constructor = clientClass.addConstructor({
     docs: getDocsFromDescription(client.doc),
@@ -124,7 +142,37 @@ export function buildClassicalClient(
   ]);
   constructor.addStatements(`this.pipeline = this._client.pipeline;`);
 
-  buildClientOperationGroups(client, dpgContext, clientClass);
+  if (hasChildClient && client.children) {
+    constructor.addStatements(
+      `this._clientParams = {${classicalParams.map((p) => p.name).join(",")}};`
+    );
+    for (const childClient of client.children) {
+      const subfolder = normalizeName(
+        childClient.name.replace("Client", ""),
+        NameType.File
+      );
+      clientFile.addImportDeclaration({
+        moduleSpecifier: `./${subfolder}/${normalizeName(childClient.name, NameType.File)}.js`,
+        namedImports: [
+          `${getClassicalClientName(childClient)}`,
+          `${getClassicalClientName(childClient)}OptionalParams`
+        ]
+      });
+    }
+  }
+  buildClientOperationGroups(clientMap, dpgContext, clientClass);
+  if (client.children) {
+    client.children
+      .filter((childClient) => {
+        return (
+          childClient.clientInitialization.initializedBy &
+          InitializedByFlags.Parent
+        );
+      })
+      .forEach((childClient) => {
+        addChildClient(dpgContext, clientClass, client, childClient);
+      });
+  }
   importAllApis(clientFile, srcPath, subfolder ?? "");
   clientFile.fixUnusedIdentifiers();
   return clientFile;
@@ -176,12 +224,13 @@ function generateMethod(
   return result;
 }
 function buildClientOperationGroups(
-  client: SdkClientType<SdkServiceOperation>,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   dpgContext: SdkContext,
   clientClass: ClassDeclaration
 ) {
   let clientType = "Client";
-  const { subfolder } = getModularClientOptions(dpgContext, client);
+  const [_hierarchy, client] = clientMap;
+  const { subfolder } = getModularClientOptions(clientMap);
   if (subfolder && subfolder !== "") {
     clientType = `Client.${clientClass.getName()}`;
   }
@@ -229,3 +278,44 @@ function buildClientOperationGroups(
     }
   }
 }
+
+function addChildClient(
+  context: SdkContext,
+  clientClass: ClassDeclaration,
+  parentClient: SdkClientType<SdkServiceOperation>,
+  client: SdkClientType<SdkServiceOperation>
+) {
+  const parentParams = getClientParametersDeclaration(parentClient, context, {
+    requiredOnly: true
+  });
+  const clientParams = getClientParametersDeclaration(client, context, {
+    requiredOnly: true
+  });
+  const diffParams = clientParams.filter((p) => {
+    return !parentParams.some(
+      (pp) => pp.name === p.name && pp.name !== "options"
+    );
+  });
+  const name = getClassicalClientName(client);
+  const getChildClientFunction = clientClass.addMethod({
+    docs: getDocsFromDescription(client.doc),
+    name: `get${name}`,
+    returnType: `${getClassicalClientName(client)}`,
+    parameters: diffParams
+  });
+  getChildClientFunction.addStatements(
+    `return new ${getClassicalClientName(client)}(
+      ${parentParams
+        .filter((p) => !p.name.includes("options"))
+        .map((p) => `this._clientParams.${p.name}`)
+        .join(",")},
+      ${diffParams
+        .filter((p) => p.name !== "options")
+        .map((p) => `${p.name}`)
+        .join(
+          ","
+        )}${diffParams.filter((p) => p.name !== "options").length > 0 ? "," : ""}
+      { ...this._clientParams.options, ...options }
+    )`
+  );
+}

package/src/modular/buildClassicalOperationGroups.ts

@@ -14,12 +14,13 @@ import { useContext } from "../contextManager.js";
 
 export function buildClassicOperationFiles(
   dpgContext: SdkContext,
-  client: SdkClientType<SdkServiceOperation>,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions
 ) {
   // const sdkPackage = dpgContext.sdkPackage;
   const project = useContext("outputProject");
-  const { subfolder } = getModularClientOptions(dpgContext, client);
+  const [_hierarchy, client] = clientMap;
+  const { subfolder } = getModularClientOptions(clientMap);
   const classicOperationFiles: Map<string, SourceFile> = new Map<
     string,
     SourceFile
@@ -48,7 +49,7 @@ export function buildClassicOperationFiles(
             subfolder && subfolder !== "" ? subfolder + "/" : ""
           }classic/${classicOperationFileName}.ts`
         );
-      getClassicalOperation(dpgContext, client, classicFile, [
+      getClassicalOperation(dpgContext, clientMap, classicFile, [
         prefixes,
         operations
       ]);
@@ -80,7 +81,7 @@ export function buildClassicOperationFiles(
           );
         getClassicalOperation(
           dpgContext,
-          client,
+          clientMap,
           classicFile,
           [prefixes, operations],
           layer

package/src/modular/buildClientContext.ts

@@ -38,11 +38,11 @@ import { refkey } from "../framework/refkey.js";
  * This function gets the path of the file containing the modular client context
  */
 export function getClientContextPath(
-  context: SdkContext,
-  client: SdkClientType<SdkServiceOperation>,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions
 ): string {
-  const { subfolder } = getModularClientOptions(context, client);
+  const [_, client] = clientMap;
+  const { subfolder } = getModularClientOptions(clientMap);
   const name = getClientName(client);
   const srcPath = emitterOptions.modularOptions.sourceRoot;
   const contentPath = `${srcPath}/${
@@ -56,20 +56,21 @@ export function getClientContextPath(
  */
 export function buildClientContext(
   dpgContext: SdkContext,
-  client: SdkClientType<SdkServiceOperation>,
+  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions
 ): SourceFile {
   const project = useContext("outputProject");
   const dependencies = useDependencies();
+  const [hierarchy, client] = clientMap;
   const name = getClientName(client);
-  const { rlcClientName } = getModularClientOptions(dpgContext, client);
+  const { rlcClientName } = getModularClientOptions(clientMap);
   const requiredParams = getClientParametersDeclaration(client, dpgContext, {
     onClientOnly: false,
     requiredOnly: true,
     apiVersionAsRequired: true
   });
   const clientContextFile = project.createSourceFile(
-    getClientContextPath(dpgContext, client, emitterOptions)
+    getClientContextPath(clientMap, emitterOptions)
   );
 
   clientContextFile.addInterface({
@@ -125,10 +126,7 @@ export function buildClientContext(
   // (for now) now logger for unbranded pkgs
   if (isAzurePackage(emitterOptions)) {
     clientContextFile.addImportDeclaration({
-      moduleSpecifier:
-        dpgContext.sdkPackage.clients.length > 1
-          ? "../../logger.js"
-          : "../logger.js",
+      moduleSpecifier: "../".repeat(hierarchy.length + 1) + "logger.js",
       namedImports: ["logger"]
     });
   }