Implement tsp namespace for http-client-csharp

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

@@ -73,8 +73,7 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
       logDiagnostics(context.program.diagnostics, context.program.host.logSink);
       process.exit(1);
     }
-    const tspNamespace = root.Name; // this is the top-level namespace defined in the typespec file, which is actually always different from the namespace of the SDK
-    // await program.host.writeFile(outPath, prettierOutput(JSON.stringify(root, null, 2)));
+
     if (root) {
       const generatedFolder = resolvePath(outputFolder, "src", "Generated");
 
@@ -88,16 +87,13 @@ export async function $onEmit(context: EmitContext<NetEmitterOptions>) {
       );
 
       //emit configuration.json
-      const namespace = options.namespace ?? tspNamespace;
       const configurations: Configuration = {
         "output-folder": ".",
-        namespace: namespace,
-        "library-name": options["library-name"] ?? namespace,
+        "library-name": options["library-name"] ?? root.Name,
         "single-top-level-client": options["single-top-level-client"],
         "unreferenced-types-handling": options["unreferenced-types-handling"],
         "keep-non-overloadable-protocol-signature":
           options["keep-non-overloadable-protocol-signature"],
-        "model-namespace": options["model-namespace"],
         "models-to-treat-empty-string-as-null": options["models-to-treat-empty-string-as-null"],
         "intrinsic-types-to-treat-empty-string-as-null": options[
           "models-to-treat-empty-string-as-null"

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

@@ -12,20 +12,19 @@ import {
   UsageFlags,
 } from "@azure-tools/typespec-client-generator-core";
 import { NoTarget } from "@typespec/compiler";
-import { NetEmitterOptions, resolveOptions } from "../options.js";
+import { NetEmitterOptions } from "../options.js";
 import { CodeModel } from "../type/code-model.js";
 import { InputClient } from "../type/input-client.js";
 import { InputOperationParameterKind } from "../type/input-operation-parameter-kind.js";
 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 +50,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 +62,55 @@ 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) {
+      // we report diagnostics when the last segment of the namespace is the same as the client name
+      // because in our design, a sub namespace will be generated as a sub client with exact the same name as the namespace
+      // in csharp, this will cause a conflict between the namespace and the class name
+      reportDiagnostic(sdkContext.program, {
+        code: "client-namespace-conflict",
+        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
@@ -119,14 +141,6 @@ export function createModel(sdkContext: SdkContext<NetEmitterOptions>): CodeMode
     if (parentClientNames.length >= 2)
       return `${parentClientNames.slice(parentClientNames.length - 1).join("")}${clientName}`;
 
-    if (
-      clientName === "Models" &&
-      resolveOptions(sdkContext.emitContext)["model-namespace"] !== false
-    ) {
-      Logger.getInstance().warn(`Invalid client name "${clientName}"`);
-      return "ModelsOps";
-    }
-
     return clientName;
   }
 

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

@@ -19,12 +19,6 @@ const $lib = createTypeSpecLibrary({
         default: paramMessage`No Route for service for service ${"service"}`,
       },
     },
-    "invalid-name": {
-      severity: "warning",
-      messages: {
-        default: paramMessage`Invalid interface or operation group name ${"name"} when configuration "model-namespace" is on`,
-      },
-    },
     "general-warning": {
       severity: "warning",
       messages: {
@@ -58,6 +52,12 @@ const $lib = createTypeSpecLibrary({
         default: paramMessage`${"message"}`,
       },
     },
+    "client-namespace-conflict": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`namespace ${"clientNamespace"} conflicts with 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/options.ts

@@ -7,15 +7,13 @@ export interface NetEmitterOptions extends SdkEmitterOptions {
   "api-version"?: string;
   outputFile?: string;
   logFile?: string;
-  namespace: string;
   "library-name": string;
   "single-top-level-client"?: boolean;
   skipSDKGeneration?: boolean;
   "unreferenced-types-handling"?: "removeOrInternalize" | "internalize" | "keepAll";
   "new-project"?: boolean;
   "clear-output-folder"?: boolean;
   "save-inputs"?: boolean;
-  "model-namespace"?: boolean;
   "existing-project-folder"?: string;
   "keep-non-overloadable-protocol-signature"?: boolean;
   debug?: boolean;
@@ -45,7 +43,6 @@ export const NetEmitterOptionsSchema: JSONSchemaType<NetEmitterOptions> = {
     "api-version": { type: "string", nullable: true },
     outputFile: { type: "string", nullable: true },
     logFile: { type: "string", nullable: true },
-    namespace: { type: "string" },
     "library-name": { type: "string" },
     "single-top-level-client": { type: "boolean", nullable: true },
     skipSDKGeneration: { type: "boolean", default: false, nullable: true },
@@ -57,7 +54,6 @@ export const NetEmitterOptionsSchema: JSONSchemaType<NetEmitterOptions> = {
     "new-project": { type: "boolean", nullable: true },
     "clear-output-folder": { type: "boolean", nullable: true },
     "save-inputs": { type: "boolean", nullable: true },
-    "model-namespace": { type: "boolean", nullable: true },
     "generate-protocol-methods": { type: "boolean", nullable: true },
     "generate-convenience-methods": { type: "boolean", nullable: true },
     "flatten-union-as-enum": { type: "boolean", nullable: true },

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

@@ -3,12 +3,10 @@
 
 export interface Configuration {
   "output-folder": string;
-  namespace: string;
-  "library-name": string | null;
+  "library-name": string;
   flavor?: string;
   "single-top-level-client"?: boolean;
   "unreferenced-types-handling"?: "removeOrInternalize" | "internalize" | "keepAll";
-  "model-namespace"?: boolean;
   "models-to-treat-empty-string-as-null"?: string[];
   "additional-intrinsic-types-to-treat-empty-string-as-null"?: string[];
   "methods-to-keep-client-default-value"?: string[];

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,10 @@ $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' 'structure' 'client-operation-group'
     Join-Path 'http' 'client' 'structure' 'default'
     Join-Path 'http' 'client' 'structure' 'multi-client'
@@ -110,6 +110,7 @@ foreach ($directory in $directories) {
     }
 
     if ($folders.Contains("versioning")) {
+        Write-Host "Generating versioning for $subPath" -ForegroundColor Cyan
         Generate-Versioning $directory.FullName $generationDir -generateStub $stubbed
         $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
         $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")