Implement tsp namespace for http-client-csharp

packages/http-client-csharp/emitter/src/lib/client-model-builder.ts

@@ -20,12 +20,12 @@ import { InputParameter } from "../type/input-parameter.js";
 import { InputEnumType, InputModelType, InputType } from "../type/input-type.js";
 import { RequestLocation } from "../type/request-location.js";
 import { SdkTypeMap } from "../type/sdk-type-map.js";
-import { fromSdkType } from "./converter.js";
 import { reportDiagnostic } from "./lib.js";
 import { Logger } from "./logger.js";
 import { navigateModels } from "./model.js";
 import { fromSdkServiceMethod, getParameterDefaultValue } from "./operation-converter.js";
 import { processServiceAuthentication } from "./service-authentication.js";
+import { fromSdkType } from "./type-converter.js";
 
 export function createModel(sdkContext: SdkContext<NetEmitterOptions>): CodeModel {
   const sdkPackage = sdkContext.sdkPackage;
@@ -51,8 +51,9 @@ export function createModel(sdkContext: SdkContext<NetEmitterOptions>): CodeMode
       ? sdkApiVersionEnums[0].values.map((v) => v.value as string).flat()
       : rootClients[0].apiVersions;
 
+  // this is a set tracking the bad namespace segments
   const inputClients: InputClient[] = [];
-  fromSdkClients(rootClients, inputClients, []);
+  fromSdkClients(sdkContext, rootClients, inputClients, []);
 
   const clientModel: CodeModel = {
     Name: sdkPackage.rootNamespace,
@@ -62,33 +63,53 @@ export function createModel(sdkContext: SdkContext<NetEmitterOptions>): CodeMode
     Clients: inputClients,
     Auth: processServiceAuthentication(sdkContext, sdkPackage),
   };
+
   return clientModel;
 
   function fromSdkClients(
+    sdkContext: SdkContext<NetEmitterOptions>,
     clients: SdkClientType<SdkHttpOperation>[],
     inputClients: InputClient[],
     parentClientNames: string[],
   ) {
     for (const client of clients) {
-      const inputClient = emitClient(client, parentClientNames);
+      const inputClient = fromSdkClient(sdkContext, client, parentClientNames);
       inputClients.push(inputClient);
       const subClients = client.methods
         .filter((m) => m.kind === "clientaccessor")
         .map((m) => m.response as SdkClientType<SdkHttpOperation>);
       parentClientNames.push(inputClient.Name);
-      fromSdkClients(subClients, inputClients, parentClientNames);
+      fromSdkClients(sdkContext, subClients, inputClients, parentClientNames);
       parentClientNames.pop();
     }
   }
 
-  function emitClient(client: SdkClientType<SdkHttpOperation>, parentNames: string[]): InputClient {
+  function fromSdkClient(
+    sdkContext: SdkContext<NetEmitterOptions>,
+    client: SdkClientType<SdkHttpOperation>,
+    parentNames: string[],
+  ): InputClient {
     const endpointParameter = client.initialization.properties.find(
       (p) => p.kind === "endpoint",
     ) as SdkEndpointParameter;
     const uri = getMethodUri(endpointParameter);
     const clientParameters = fromSdkEndpointParameter(endpointParameter);
+    const clientName = getClientName(client, parentNames);
+    // see if this namespace is a sub-namespace of an existing bad namespace
+    const segments = client.clientNamespace.split(".");
+    const lastSegment = segments[segments.length - 1];
+    if (lastSegment === clientName) {
+      // this segment is bad
+      reportDiagnostic(sdkContext.program, {
+        code: "bad-namespace",
+        format: { clientNamespace: client.clientNamespace, clientName },
+        target: client.__raw.type ?? NoTarget,
+      });
+    }
+
     return {
-      Name: getClientName(client, parentNames),
+      Name: clientName,
+      ClientNamespace: client.clientNamespace,
       Summary: client.summary,
       Doc: client.doc,
       Operations: client.methods

packages/http-client-csharp/emitter/src/lib/example-converter.ts

@@ -46,7 +46,7 @@ import {
 } from "../type/input-type.js";
 import { OperationResponse } from "../type/operation-response.js";
 import { SdkTypeMap } from "../type/sdk-type-map.js";
-import { fromSdkType } from "./converter.js";
+import { fromSdkType } from "./type-converter.js";
 
 export function fromSdkHttpExamples(
   sdkContext: SdkContext<NetEmitterOptions>,

packages/http-client-csharp/emitter/src/lib/lib.ts

@@ -50,6 +50,12 @@ const $lib = createTypeSpecLibrary({
         default: paramMessage`${"message"}`,
       },
     },
+    "bad-namespace": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`bad namespace ${"clientNamespace"} for client ${"clientName"}, please use @clientName to specify a different name for the client.`,
+      }
+    }
   },
   emitter: {
     options: NetEmitterOptionsSchema,

packages/http-client-csharp/emitter/src/lib/logger.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-import { NoTarget, Program, Tracer } from "@typespec/compiler";
+import { DiagnosticTarget, NoTarget, Program, Tracer } from "@typespec/compiler";
 import { getTracer, reportDiagnostic } from "./lib.js";
 import { LoggerLevel } from "./log-level.js";
 
@@ -63,19 +63,19 @@ export class Logger {
     }
   }
 
-  warn(message: string): void {
+  warn(message: string, target?: DiagnosticTarget | typeof NoTarget): void {
     reportDiagnostic(this.program, {
       code: "general-warning",
       format: { message: message },
-      target: NoTarget,
+      target: target ?? NoTarget,
     });
   }
 
-  error(message: string): void {
+  error(message: string, target?: DiagnosticTarget | typeof NoTarget): void {
     reportDiagnostic(this.program, {
       code: "general-error",
       format: { message: message },
-      target: NoTarget,
+      target: target ?? NoTarget,
     });
   }
 }

packages/http-client-csharp/emitter/src/lib/model.ts

@@ -18,8 +18,8 @@ import { NetEmitterOptions } from "../options.js";
 import { InputType } from "../type/input-type.js";
 import { LiteralTypeContext } from "../type/literal-type-context.js";
 import { SdkTypeMap } from "../type/sdk-type-map.js";
-import { fromSdkEnumType, fromSdkModelType, fromSdkType } from "./converter.js";
 import { Logger } from "./logger.js";
+import { fromSdkEnumType, fromSdkModelType, fromSdkType } from "./type-converter.js";
 
 /**
  * If type is an anonymous model, tries to find a named model that has the same

packages/http-client-csharp/emitter/src/lib/operation-converter.ts

@@ -36,10 +36,10 @@ import { OperationResponse } from "../type/operation-response.js";
 import { RequestLocation } from "../type/request-location.js";
 import { parseHttpRequestMethod } from "../type/request-method.js";
 import { SdkTypeMap } from "../type/sdk-type-map.js";
-import { fromSdkModelType, fromSdkType } from "./converter.js";
 import { getExternalDocs, getOperationId } from "./decorators.js";
 import { fromSdkHttpExamples } from "./example-converter.js";
 import { Logger } from "./logger.js";
+import { fromSdkModelType, fromSdkType } from "./type-converter.js";
 import { isSdkPathParameter } from "./utils.js";
 
 export function fromSdkServiceMethod(

packages/http-client-csharp/emitter/src/lib/converter.ts → packages/http-client-csharp/emitter/src/lib/type-converter.ts

@@ -55,6 +55,7 @@ export function fromSdkType(
       retVar = {
         kind: "nullable",
         type: inputType,
+        clientNamespace: sdkType.clientNamespace,
       };
       break;
     case "model":
@@ -115,6 +116,7 @@ export function fromSdkModelType(
     inputModelType = {
       kind: "model",
       name: modelTypeName,
+      clientNamespace: modelType.clientNamespace,
       crossLanguageDefinitionId: modelType.crossLanguageDefinitionId,
       access: getAccessOverride(
         context,
@@ -142,6 +144,7 @@ export function fromSdkModelType(
       const ourProperty = fromSdkModelProperty(property, {
         ModelName: modelTypeName,
         Usage: modelType.usage,
+        ClientNamespace: modelType.clientNamespace,
       } as LiteralTypeContext);
       propertiesDict.set(property, ourProperty);
     }
@@ -226,6 +229,7 @@ export function fromSdkEnumType(
         context,
         enumType.__raw as any,
       ) /* when tcgc provide a way to identify if the access is override or not, we can get the accessibility from the enumType.access,*/,
+      clientNamespace: enumType.clientNamespace,
       deprecation: enumType.deprecation,
       summary: enumType.summary,
       doc: enumType.doc,
@@ -303,6 +307,7 @@ function fromUnionType(
     kind: "union",
     name: union.name,
     variantTypes: variantTypes,
+    clientNamespace: union.clientNamespace,
     decorators: union.decorators,
   };
 }
@@ -340,6 +345,7 @@ function fromSdkConstantType(
       values: values,
       crossLanguageDefinitionId: "",
       access: undefined,
+      clientNamespace: literalTypeContext.ClientNamespace,
       doc: `The ${enumName}`, // TODO -- what should we put here?
       isFixed: false,
       isFlags: false,

packages/http-client-csharp/emitter/src/type/input-client.ts

@@ -8,6 +8,7 @@ import { Protocols } from "./protocols.js";
 
 export interface InputClient {
   Name: string;
+  ClientNamespace: string;
   Summary?: string;
   Doc?: string;
   Operations: InputOperation[];

packages/http-client-csharp/emitter/src/type/input-type.ts

@@ -78,6 +78,7 @@ export interface InputUnionType extends InputTypeBase {
   kind: "union";
   name: string;
   variantTypes: InputType[];
+  clientNamespace: string;
 }
 
 export function isInputUnionType(type: InputType): type is InputUnionType {
@@ -91,6 +92,7 @@ export interface InputModelType extends InputTypeBase {
   crossLanguageDefinitionId: string;
   access?: AccessFlags;
   usage: UsageFlags;
+  clientNamespace: string;
   additionalProperties?: InputType;
   discriminatorValue?: string;
   discriminatedSubtypes?: Record<string, InputModelType>;
@@ -124,6 +126,7 @@ export interface InputEnumType extends InputTypeBase {
   isFlags: boolean;
   usage: UsageFlags;
   access?: AccessFlags;
+  clientNamespace: string;
 }
 
 export interface InputEnumTypeValue extends InputTypeBase {
@@ -137,6 +140,7 @@ export interface InputEnumTypeValue extends InputTypeBase {
 export interface InputNullableType extends InputTypeBase {
   kind: "nullable";
   type: InputType;
+  clientNamespace: string;
 }
 
 export function isInputEnumType(type: InputType): type is InputEnumType {

packages/http-client-csharp/emitter/src/type/literal-type-context.ts

@@ -7,4 +7,5 @@ export interface LiteralTypeContext {
   ModelName: string;
   PropertyName: string;
   Usage: UsageFlags;
+  ClientNamespace: string;
 }

packages/http-client-csharp/eng/scripts/Generate.ps1

@@ -54,10 +54,11 @@ $failingSpecs = @(
     Join-Path 'http' 'payload' 'xml'
     Join-Path 'http' 'type' 'model' 'flatten'
     Join-Path 'http' 'type' 'model' 'templated'
+    Join-Path 'http' 'client' 'naming'
 )
 
 $azureAllowSpecs = @(
-    Join-Path 'http' 'client' 'naming'
+    # Join-Path 'http' 'client' 'naming'
     Join-Path 'http' 'client' 'structure' 'client-operation-group'
     Join-Path 'http' 'client' 'structure' 'default'
     Join-Path 'http' 'client' 'structure' 'multi-client'

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientProvider.cs

@@ -143,6 +143,10 @@ public ClientProvider(InputClient inputClient)
             _subClients = new(GetSubClients);
         }
 
+        protected override string BuildNamespace() => string.IsNullOrEmpty(_inputClient.ClientNamespace) ?
+            base.BuildNamespace() :
+            ClientModelPlugin.Instance.TypeFactory.GetCleanNameSpace(_inputClient.ClientNamespace);
+
         private IReadOnlyList<ParameterProvider> GetSubClientInternalConstructorParameters()
         {
             var subClientParameters = new List<ParameterProvider>
@@ -311,7 +315,7 @@ protected override ConstructorProvider[] BuildConstructors()
                 AppendConstructors(_apiKeyAuthFields, primaryConstructors, secondaryConstructors);
             }
             // if there is oauth2 auth
-            if (_oauth2Fields!= null)
+            if (_oauth2Fields != null)
             {
                 AppendConstructors(_oauth2Fields, primaryConstructors, secondaryConstructors);
             }

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/RestClientProvider.cs

@@ -46,6 +46,8 @@ public RestClientProvider(InputClient inputClient, ClientProvider clientProvider
 
         protected override string BuildName() => _inputClient.Name.ToCleanName();
 
+        protected override string BuildNamespace() => ClientProvider.Namespace;
+
         protected override PropertyProvider[] BuildProperties()
         {
             return [.. _pipelineMessage20xClassifiers.Values.OrderBy(v => v.Name)];

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/InputLibraryVisitorTests.cs

@@ -40,7 +40,7 @@ public void PreVisitsMethods()
             var inputOperation = InputFactory.Operation("testOperation", parameters: [param], responses: [InputFactory.OperationResponse(bodytype: InputPrimitiveType.Any)]);
             var inputClient = InputFactory.Client("fooClient", operations: [inputOperation], parameters: [param]);
             _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace(
-                "test library",
+                "Sample",
                 models: [inputModel],
                 clients: [inputClient]));
 
@@ -57,7 +57,7 @@ public void PreVisitsClients()
 
             var inputClient = InputFactory.Client("fooClient");
             _mockInputLibrary.Setup(l => l.InputNamespace).Returns(InputFactory.Namespace(
-                "test library",
+                "Sample",
                 clients: [inputClient]));
 
             var mockOutputLibrary = new Mock<ScmOutputLibrary> { CallBase = true };

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/FriendTests.cs

@@ -3,9 +3,9 @@
 
 using System.ClientModel;
 using System.IO;
-using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
 using Microsoft.Generator.CSharp.Tests.Common;
+using NUnit.Framework;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ModelWithRequiredNullablePropertiesTests.cs

@@ -6,7 +6,7 @@
 using System.Text.Json;
 using Microsoft.Generator.CSharp.Tests.Common;
 using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ProjectedModelTests.cs

@@ -5,7 +5,7 @@
 using System.IO;
 using Microsoft.Generator.CSharp.Tests.Common;
 using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ReturnsAnonymousModelResponseTests.cs

@@ -5,7 +5,7 @@
 using System.IO;
 using Microsoft.Generator.CSharp.Tests.Common;
 using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/RoundTripModelTests.cs

@@ -6,7 +6,7 @@
 using System.Text.Json;
 using Microsoft.Generator.CSharp.Tests.Common;
 using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/ModelReaderWriterValidation/TestProjects/Unbranded_TypeSpec/ThingTests.cs

@@ -6,7 +6,7 @@
 using System.Text.Json;
 using Microsoft.Generator.CSharp.Tests.Common;
 using NUnit.Framework;
-using UnbrandedTypeSpec.Models;
+using UnbrandedTypeSpec;
 
 namespace Microsoft.Generator.CSharp.ClientModel.Tests.ModelReaderWriterValidation.TestProjects.Unbranded_TypeSpec
 {

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientPipelineApiTests.cs

@@ -34,7 +34,7 @@ public void ValidateBodyOfRestClientOperationIsOverridden()
 
         private static ClientProvider CreateTestClient()
         {
-            var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]);
+            var client = InputFactory.Client("TestClient", operations: [InputFactory.Operation("foo")]);
             MockHelpers.LoadMockPlugin(clientPipelineApi: TestClientPipelineApi.Instance);
             var clientProvider = ClientModelPlugin.Instance.TypeFactory.CreateClient(client);
             Assert.IsNotNull(clientProvider);

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/ClientResponseApiTests.cs

@@ -39,7 +39,7 @@ public void ValidateBodyOfClientOperationIsOverridden()
 
         private static ClientProvider CreateMockClientProvider()
         {
-            var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]);
+            var client = InputFactory.Client("TestClient", operations: [InputFactory.Operation("foo")]);
             MockHelpers.LoadMockPlugin(clientResponseApi: TestClientResponseApi.Instance);
             var clientProvider = ClientModelPlugin.Instance.TypeFactory.CreateClient(client);
             Assert.IsNotNull(clientProvider);

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/test/Providers/Abstractions/HttpMessageApiTests.cs

@@ -36,7 +36,7 @@ public void ValidateBodyOfProcessMessageIsOverridden()
 
         private static ClientProvider CreateTestClient()
         {
-            var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]);
+            var client = InputFactory.Client("TestClient", operations: [InputFactory.Operation("foo")]);
             MockHelpers.LoadMockPlugin(httpMessageApi: TestHttpMessageApi.Instance);
             var clientProvider = ClientModelPlugin.Instance.TypeFactory.CreateClient(client);
             Assert.IsNotNull(clientProvider);