Support model-namespace option (Azure#49518)

* Support model-namespace option

* PR fb

* Flip default

* regen

Author: JoshLove-msft

eng/Packages.Data.props

@@ -206,7 +206,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250418.3" />
+    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250421.4" />
     <PackageReference Update="System.ClientModel" Version="1.3.0" />
   </ItemGroup>
 

eng/packages/http-client-csharp-mgmt/package.json

@@ -1,6 +1,17 @@
 {
   "name": "@azure-typespec/http-client-csharp-mgmt",
   "version": "1.0.0",
+  "author": "Microsoft Corporation",
+  "description": "TypeSpec library for emitting Azure management libraries for C#.",
+  "readme": "https://github.com/Azure/azure-sdk-for-net/blob/main/eng/packages/http-client-csharp-mgmt/README.md",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/azure-sdk/azure-sdk-for-net.git"
+  },
+  "bugs": {
+    "url": "https://github.com/azure-sdk/azure-sdk-for-net/issues"
+  },
   "type": "module",
   "main": "dist/emitter/index.js",
   "exports": {

eng/packages/http-client-csharp/README.md

@@ -1,5 +1,7 @@
 # @azure-typespec/http-client-csharp
 
+TypeSpec library for emitting Azure libraries for C#.
+
 ## Install
 
 ```bash
@@ -59,12 +61,6 @@ Defines the strategy on how to handle unreferenced types. The default value is `
 
 Set to `true` to overwrite the csproj if it already exists. The default value is `false`.
 
-### `clear-output-folder`
-
-**Type:** `boolean`
-
-Indicates if you want to clear the output folder before generating. The default value is `true`.
-
 ### `save-inputs`
 
 **Type:** `boolean`
@@ -135,4 +131,4 @@ The C# namespace to use for the generated code. This will override the TypeSpec
 
 **Type:** `boolean`
 
-Whether to put models under a separate 'Models' sub-namespace. This only applies if the 'namespace' option is set. The default value is 'true' when the 'namespace' option is set. Otherwise, each model will be in the corresponding namespace defined in the TypeSpec.
+Whether to put models under a separate 'Models' sub-namespace. This only applies if the 'namespace' option is set. The default value is 'false'.

eng/packages/http-client-csharp/docs/emitter.md

@@ -55,12 +55,6 @@ Defines the strategy on how to handle unreferenced types. The default value is `
 
 Set to `true` to overwrite the csproj if it already exists. The default value is `false`.
 
-### `clear-output-folder`
-
-**Type:** `boolean`
-
-Indicates if you want to clear the output folder before generating. The default value is `true`.
-
 ### `save-inputs`
 
 **Type:** `boolean`
@@ -131,4 +125,4 @@ The C# namespace to use for the generated code. This will override the TypeSpec
 
 **Type:** `boolean`
 
-Whether to put models under a separate 'Models' sub-namespace. This only applies if the 'namespace' option is set. The default value is 'true' when the 'namespace' option is set. Otherwise, each model will be in the corresponding namespace defined in the TypeSpec.
+Whether to put models under a separate 'Models' sub-namespace. This only applies if the 'namespace' option is set. The default value is 'false'.

eng/packages/http-client-csharp/docs/index.mdx

@@ -7,6 +7,8 @@ toc_max_heading_level: 3
 
 import { Tabs, TabItem } from '@astrojs/starlight/components';
 
+TypeSpec library for emitting Azure libraries for C#.
+
 ## Install
 
 <Tabs>

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

@@ -1,10 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-import { EmitContext } from "@typespec/compiler";
+import { EmitContext, NoTarget } from "@typespec/compiler";
 
 import { $onEmit as $onMTGEmit } from "@typespec/http-client-csharp";
 import { AzureEmitterOptions } from "./options.js";
+import { $lib } from "./lib/lib.js";
 
 export async function $onEmit(context: EmitContext<AzureEmitterOptions>) {
   context.options["generator-name"] ??= "AzureClientGenerator";
@@ -13,5 +14,14 @@ export async function $onEmit(context: EmitContext<AzureEmitterOptions>) {
     name: "MIT License",
     company: "Microsoft Corporation"
   };
+
+  // warn if use-model-namespaces is true, but namespace is not set
+  if (context.options["model-namespace"] && !context.options["namespace"]) {
+    $lib.reportDiagnostic(context.program, {
+      code: "invalid-model-namespace-usage",
+      target: NoTarget,
+    });
+  }
+
   await $onMTGEmit(context);
 }

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

@@ -1,13 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-import { createTypeSpecLibrary } from "@typespec/compiler";
+import {
+  createTypeSpecLibrary,
+  DiagnosticDefinition,
+  DiagnosticMessages
+} from "@typespec/compiler";
 import { $lib as httpClientCSharpLib } from "@typespec/http-client-csharp";
 import { AzureEmitterOptionsSchema } from "../options.js";
 
+const diags: { [code: string]: DiagnosticDefinition<DiagnosticMessages> } = {
+  ...httpClientCSharpLib.diagnostics,
+  "invalid-model-namespace-usage": {
+    severity: "warning",
+    messages: {
+      default:
+        "The 'model-namespace' option is set to true, but the 'namespace' option is not set. " +
+        "'model-namespace' can only be true, if the 'namespace' option is."
+    }
+  }
+};
+
 export const $lib = createTypeSpecLibrary({
   name: "@azure-typespec/http-client-csharp",
-  diagnostics: httpClientCSharpLib.diagnostics,
+  diagnostics: diags,
   emitter: {
     options: AzureEmitterOptionsSchema
   }

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

@@ -28,7 +28,7 @@ export const AzureEmitterOptionsSchema: JSONSchemaType<AzureEmitterOptions> = {
       nullable: true,
       description:
         "Whether to put models under a separate 'Models' sub-namespace. This only applies if the 'namespace' option is set. " +
-        " The default value is 'true' when the 'namespace' option is set. Otherwise, each model will be in the corresponding namespace defined in the TypeSpec."
+        " The default value is 'false'."
     }
   },
   required: []

eng/packages/http-client-csharp/emitter/test/Unit/options.test.ts

@@ -0,0 +1,50 @@
+import { Program } from "@typespec/compiler";
+import { beforeEach, describe, it } from "vitest";
+import {
+  createEmitterContext,
+  createEmitterTestHost,
+  typeSpecCompile
+} from "./test-util.js";
+import { AzureEmitterOptions } from "../../src/options.js";
+import { $onEmit } from "../../src/emitter.js";
+import { strictEqual } from "assert";
+
+describe("Configuration tests", async () => {
+  let program: Program;
+
+  beforeEach(async () => {
+    const runner = await createEmitterTestHost();
+    program = await typeSpecCompile(
+      `
+          `,
+      runner
+    );
+  });
+
+  it("Diagnostic is logged when model-namespace is set without namespace", async () => {
+    const options: AzureEmitterOptions = {
+      "model-namespace": true
+    };
+    const context = createEmitterContext(program, options);
+    $onEmit(context);
+    strictEqual(program.diagnostics.length, 1);
+    strictEqual(
+      program.diagnostics[0].code,
+      "@azure-typespec/http-client-csharp/invalid-model-namespace-usage"
+    );
+  });
+  it("Diagnostic is NOT logged when model-namespace AND namespace are set", async () => {
+    const options: AzureEmitterOptions = {
+      "model-namespace": true,
+      namespace: "Azure.Testing"
+    };
+    const context = createEmitterContext(program, options);
+    $onEmit(context);
+    strictEqual(program.diagnostics.length, 0);
+  });
+  it("Diagnostic is NOT logged when NEITHER model-namespace NOR namespace are set", async () => {
+    const context = createEmitterContext(program);
+    $onEmit(context);
+    strictEqual(program.diagnostics.length, 0);
+  });
+});

eng/packages/http-client-csharp/emitter/test/Unit/test-util.ts

@@ -16,6 +16,7 @@ import { HttpTestLibrary } from "@typespec/http/testing";
 import { RestTestLibrary } from "@typespec/rest/testing";
 import { VersioningTestLibrary } from "@typespec/versioning/testing";
 import { XmlTestLibrary } from "@typespec/xml/testing";
+import { AzureEmitterOptions } from "../../src/options.js";
 
 export async function createEmitterTestHost(): Promise<TestHost> {
   return createTestHost({
@@ -89,12 +90,13 @@ export async function typeSpecCompile(
 }
 
 export function createEmitterContext(
-  program: Program
+  program: Program,
+  options: AzureEmitterOptions = {}
 ): EmitContext<CSharpEmitterOptions> {
   return {
     program: program,
     emitterOutputDir: "./",
-    options: {
+    options: options ?? {
       outputFile: "tspCodeModel.json",
       logFile: "log.json",
       "new-project": false,
@@ -109,7 +111,7 @@ export function createEmitterContext(
 
 /* We always need to pass in the emitter name now that it is required so making a helper to do this. */
 export async function createCSharpSdkContext(
-  program: EmitContext<CSharpEmitterOptions>,
+  program: EmitContext<AzureEmitterOptions>,
   sdkContextOptions: CreateSdkContextOptions = {}
 ): Promise<CSharpEmitterContext> {
   const context = await createSdkContext(
@@ -125,7 +127,19 @@ export async function createCSharpSdkContext(
       types: new Map(),
       models: new Map(),
       enums: new Map(),
-      clients: new Map()
+      clients: new Map(),
+      properties: new Map(),
+      responses: new Map(),
+      updateSdkClientReferences: (sdkClient, inputClient) => {
+      },
+      updateSdkPropertyReferences: (sdkProperty, inputProperty) => {
+      },
+      updateSdkResponseReferences: (sdkResponse, response) => {
+      },
+      updateSdkTypeReferences: (sdkType, inputType) => {
+      },
+      updateTypeCache: (typeName, type) => {
+      }
     }
   };
 }