[tcgc] fix @clientName with @operationGroup (#1203)

fixes #1164 --------- Co-authored-by: iscai-msft <[email protected]>
Azure · Jul 19, 2024 · bbbfe20 · bbbfe20
1 parent ff685cb
commit bbbfe20
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/.chronus/changes/namespace_client_name-2024-6-18-19-15-52.md b/.chronus/changes/namespace_client_name-2024-6-18-19-15-52.md
@@ -0,0 +1,7 @@
+---
+changeKind: fix
+packages:
+  - "@azure-tools/typespec-client-generator-core"
+---
+
+have @clientName work for operation groups as well
diff --git a/packages/typespec-client-generator-core/src/package.ts b/packages/typespec-client-generator-core/src/package.ts
@@ -13,6 +13,7 @@ import { resolveVersions } from "@typespec/versioning";
 import { camelCase } from "change-case";
 import {
   getAccess,
+  getClientNameOverride,
   listClients,
   listOperationGroups,
   listOperationsInOperationGroup,
@@ -539,13 +540,18 @@ function createSdkClientType<
 ): [SdkClientType<TServiceOperation>, readonly Diagnostic[]] {
   const diagnostics = createDiagnosticCollector();
   const isClient = client.kind === "SdkClient";
-  const clientName = isClient ? client.name : client.type.name;
+  let name = "";
+  if (isClient) {
+    name = client.name;
+  } else {
+    name = getClientNameOverride(context, client.type) ?? client.type.name;
+  }
   // NOTE: getSdkMethods recursively calls createSdkClientType
   const methods = diagnostics.pipe(getSdkMethods(context, client));
   const docWrapper = getDocHelper(context, client.type);
   const sdkClientType: SdkClientType<TServiceOperation> = {
     kind: "client",
-    name: clientName,
+    name,
     description: docWrapper.description,
     details: docWrapper.details,
     methods: methods,

diff --git a/packages/typespec-client-generator-core/test/decorators.test.ts b/packages/typespec-client-generator-core/test/decorators.test.ts
@@ -435,6 +435,27 @@ describe("typespec-client-generator-core: decorators", () => {
         },
       ]);
     });
+
+    it("with @clientName", async () => {
+      await runner.compileWithBuiltInService(
+        `
+        @operationGroup
+        @clientName("ClientModel")
+        interface Model {
+          op foo(): void;
+        }
+        `
+      );
+      const sdkPackage = runner.context.sdkPackage;
+      strictEqual(sdkPackage.clients.length, 1);
+      const mainClient = sdkPackage.clients[0];
+      strictEqual(mainClient.methods.length, 1);
+
+      const clientAccessor = mainClient.methods[0];
+      strictEqual(clientAccessor.kind, "clientaccessor");
+      strictEqual(clientAccessor.response.kind, "client");
+      strictEqual(clientAccessor.response.name, "ClientModel");
+    });
   });
 
   describe("listOperationGroups without @client and @operationGroup", () => {