@typespec/emitter-framework 0.11.0-dev.6 → 0.11.0-dev.8

package/src/csharp/components/class/declaration.test.tsx

@@ -5,7 +5,7 @@ import {
 import { Tester } from "#test/test-host.js";
 import { List, type Children } from "@alloy-js/core";
 import { d } from "@alloy-js/core/testing";
-import { createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp";
 import { t, type TesterInstance } from "@typespec/compiler/testing";
 import { beforeEach, describe, expect, it } from "vitest";
 import { Output } from "../../../core/index.js";
@@ -21,9 +21,7 @@ function Wrapper(props: { children: Children }) {
   const policy = createCSharpNamePolicy();
   return (
     <Output program={runner.program} namePolicy={policy}>
-      <Namespace name="TestNamespace">
-        <SourceFile path="test.cs">{props.children}</SourceFile>
-      </Namespace>
+      <SourceFile path="test.cs">{props.children}</SourceFile>
     </Output>
   );
 }
@@ -38,12 +36,9 @@ it("renders an empty class declaration", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestModel
     {
-        class TestModel
-        {
 
-        }
     }
   `);
 });
@@ -61,13 +56,10 @@ it("renders a class declaration with properties", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestModel
     {
-        class TestModel
-        {
-            public required string Prop1 { get; set; }
-            public required int Prop2 { get; set; }
-        }
+        public required string Prop1 { get; set; }
+        public required int Prop2 { get; set; }
     }
   `);
 });
@@ -94,22 +86,19 @@ it("renders a class declaration with properties using component override", async
       </TestClientOverrides>
     </Wrapper>,
   ).toRenderTo(d`
-    namespace TestNamespace
+    class Foo
     {
-        class Foo
-        {
-
-        }
-        class Bar
-        {
-
-        }
-        class TestModel
-        {
-            public required string Prop1 { get; set; }
-            public required int Prop2 { get; set; }
-            public Bar? Prop3 { get; set; }
-        }
+
+    }
+    class Bar
+    {
+
+    }
+    class TestModel
+    {
+        public required string Prop1 { get; set; }
+        public required int Prop2 { get; set; }
+        public Bar? Prop3 { get; set; }
     }
   `);
 });
@@ -141,12 +130,9 @@ it("can override class name", async () => {
       <ClassDeclaration type={TestModel} name="CustomClassName" />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class CustomClassName
     {
-        class CustomClassName
-        {
 
-        }
     }
   `);
 });
@@ -162,12 +148,9 @@ it("renders a class with access modifiers", async () => {
       <ClassDeclaration type={TestModel} protected />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    protected class TestModel
     {
-        protected class TestModel
-        {
 
-        }
     }
   `);
 });
@@ -184,12 +167,9 @@ describe("from an interface", () => {
         <ClassDeclaration type={TestInterface} />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      class TestInterface
       {
-          class TestInterface
-          {
 
-          }
       }
     `);
   });
@@ -206,12 +186,9 @@ describe("from an interface", () => {
         <ClassDeclaration type={TestInterface} />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      class TestInterface
       {
-          class TestInterface
-          {
-              public abstract string GetName(string id);
-          }
+          public abstract string GetName(string id);
       }
     `);
   });
@@ -232,16 +209,13 @@ it("renders a class with model members", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestReference
     {
-        class TestReference
-        {
-
-        }
-        class TestModel
-        {
-            public required TestReference Prop1 { get; set; }
-        }
+
+    }
+    class TestModel
+    {
+        public required TestReference Prop1 { get; set; }
     }
   `);
 });
@@ -264,17 +238,14 @@ it("renders a class with enum members", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
+    {
+        Value1,
+        Value2
+    }
+    class TestModel
     {
-        enum TestEnum
-        {
-            Value1,
-            Value2
-        }
-        class TestModel
-        {
-            public required TestEnum Prop1 { get; set; }
-        }
+        public required TestEnum Prop1 { get; set; }
     }
   `);
 });
@@ -291,12 +262,9 @@ it("maps prop: string | null to nullable property", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestModel
     {
-        class TestModel
-        {
-            public required string? Prop1 { get; set; }
-        }
+        public required string? Prop1 { get; set; }
     }
   `);
 });
@@ -319,17 +287,14 @@ it("renders a class with string enums", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
+    {
+        Value1,
+        Value2
+    }
+    class TestModel
     {
-        enum TestEnum
-        {
-            Value1,
-            Value2
-        }
-        class TestModel
-        {
-            public required TestEnum Prop1 { get; set; }
-        }
+        public required TestEnum Prop1 { get; set; }
     }
   `);
 });
@@ -350,18 +315,15 @@ describe("with doc comments", () => {
         <ClassDeclaration type={TestModel} />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      /// <summary>
+      /// This is a test model
+      /// </summary>
+      class TestModel
       {
           /// <summary>
-          /// This is a test model
+          /// This is a test property
           /// </summary>
-          class TestModel
-          {
-              /// <summary>
-              /// This is a test property
-              /// </summary>
-              public required string Prop1 { get; set; }
-          }
+          public required string Prop1 { get; set; }
       }
     `);
   });
@@ -381,22 +343,19 @@ describe("with doc comments", () => {
         <ClassDeclaration type={TestInterface} />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      /// <summary>
+      /// This is a test interface
+      /// </summary>
+      class TestInterface
       {
           /// <summary>
-          /// This is a test interface
+          /// This is a test operation
           /// </summary>
-          class TestInterface
-          {
-              /// <summary>
-              /// This is a test operation
-              /// </summary>
-              ///
-              /// <returns>
-              /// The name of the item
-              /// </returns>
-              public abstract string GetName(string id);
-          }
+          ///
+          /// <returns>
+          /// The name of the item
+          /// </returns>
+          public abstract string GetName(string id);
       }
     `);
   });

package/src/csharp/components/class/declaration.tsx

@@ -41,6 +41,12 @@ export function ClassDeclaration(props: ClassDeclarationProps): Children {
         {...props}
         name={className}
         refkey={refkeys}
+        baseType={
+          props.baseType ??
+          (props.type.kind === "Model" && props.type.baseModel ? (
+            <TypeExpression type={props.type.baseModel} />
+          ) : undefined)
+        }
         doc={getDocComments($, props.type)}
       >
         {props.type.kind === "Model" && (

package/src/csharp/components/enum/declaration.test.tsx

@@ -1,6 +1,6 @@
 import { Tester } from "#test/test-host.js";
 import { type Children } from "@alloy-js/core";
-import { createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp";
 import { t, type TesterInstance } from "@typespec/compiler/testing";
 import { beforeEach, expect, it } from "vitest";
 import { Output } from "../../../core/index.js";
@@ -16,9 +16,7 @@ function Wrapper(props: { children: Children }) {
   const policy = createCSharpNamePolicy();
   return (
     <Output program={runner.program} namePolicy={policy}>
-      <Namespace name="TestNamespace">
-        <SourceFile path="test.cs">{props.children}</SourceFile>
-      </Namespace>
+      <SourceFile path="test.cs">{props.children}</SourceFile>
     </Output>
   );
 }
@@ -37,14 +35,11 @@ it("renders a basic enum declaration", async () => {
       <EnumDeclaration type={TestEnum} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            Value1,
-            Value2,
-            Value3
-        }
+        Value1,
+        Value2,
+        Value3
     }
   `);
 });
@@ -59,12 +54,9 @@ it("renders an empty enum declaration", async () => {
       <EnumDeclaration type={TestEnum} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
 
-        }
     }
   `);
 });
@@ -82,13 +74,10 @@ it("can override enum name", async () => {
       <EnumDeclaration type={TestEnum} name="CustomEnumName" />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum CustomEnumName
     {
-        enum CustomEnumName
-        {
-            Value1,
-            Value2
-        }
+        Value1,
+        Value2
     }
   `);
 });
@@ -106,13 +95,10 @@ it("renders an enum with access modifiers", async () => {
       <EnumDeclaration type={TestEnum} internal />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    internal enum TestEnum
     {
-        internal enum TestEnum
-        {
-            Value1,
-            Value2
-        }
+        Value1,
+        Value2
     }
   `);
 });
@@ -128,21 +114,16 @@ it("renders enum with C# naming conventions", async () => {
 
   expect(
     <Output program={runner.program} namePolicy={createCSharpNamePolicy()}>
-      <Namespace name="TestNamespace">
-        <SourceFile path="test.cs">
-          <EnumDeclaration type={TestEnum} />
-        </SourceFile>
-      </Namespace>
+      <SourceFile path="test.cs">
+        <EnumDeclaration type={TestEnum} />
+      </SourceFile>
     </Output>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            ValueOne,
-            ValueTwo,
-            ValueThree
-        }
+        ValueOne,
+        ValueTwo,
+        ValueThree
     }
   `);
 });
@@ -159,13 +140,10 @@ it("renders enum with single value", async () => {
       <EnumDeclaration type={TestEnum} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
-    {
-        enum TestEnum
-        {
-            OnlyValue
-        }
-    }
+      enum TestEnum
+      {
+          OnlyValue
+      }
   `);
 });
 
@@ -184,15 +162,12 @@ it("renders enum with numeric-like member names", async () => {
       <EnumDeclaration type={TestEnum} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            Value0,
-            Value1,
-            Value10,
-            Value100
-        }
+        Value0,
+        Value1,
+        Value10,
+        Value100
     }
   `);
 });
@@ -217,19 +192,16 @@ it("renders multiple enums in the same namespace", async () => {
       <EnumDeclaration type={TestEnum2} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum1
+    {
+        Value1,
+        Value2
+    }
+    enum TestEnum2
     {
-        enum TestEnum1
-        {
-            Value1,
-            Value2
-        }
-        enum TestEnum2
-        {
-            OptionA,
-            OptionB,
-            OptionC
-        }
+        OptionA,
+        OptionB,
+        OptionC
     }
   `);
 });
@@ -249,19 +221,16 @@ it("renders an enum with doc comments", async () => {
       <EnumDeclaration type={TestEnum} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            /// <summary>
-            /// This is value one
-            /// </summary>
-            Value1,
-            /// <summary>
-            /// This is value two
-            /// </summary>
-            Value2
-        }
+        /// <summary>
+        /// This is value one
+        /// </summary>
+        Value1,
+        /// <summary>
+        /// This is value two
+        /// </summary>
+        Value2
     }
   `);
 });

package/src/csharp/components/property/property.test.tsx

@@ -1,6 +1,6 @@
 import { Tester } from "#test/test-host.js";
-import { type Children } from "@alloy-js/core";
-import { ClassDeclaration, createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { List, type Children } from "@alloy-js/core";
+import { ClassDeclaration, createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp";
 import { t, type TesterInstance } from "@typespec/compiler/testing";
 import { beforeEach, describe, expect, it } from "vitest";
 import { Output } from "../../../core/components/output.jsx";
@@ -16,11 +16,9 @@ function Wrapper(props: { children: Children }) {
   const policy = createCSharpNamePolicy();
   return (
     <Output program={tester.program} namePolicy={policy}>
-      <Namespace name="TestNamespace">
-        <SourceFile path="test.cs">
-          <ClassDeclaration name="Test">{props.children}</ClassDeclaration>
-        </SourceFile>
-      </Namespace>
+      <SourceFile path="test.cs">
+        <ClassDeclaration name="Test">{props.children}</ClassDeclaration>
+      </SourceFile>
     </Output>
   );
 }
@@ -37,12 +35,9 @@ it("maps prop: string | null to nullable property", async () => {
       <Property type={prop1} />
     </Wrapper>,
   ).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              public required string? Prop1 { get; set; }
-          }
+          public required string? Prop1 { get; set; }
       }
   `);
 });
@@ -59,12 +54,9 @@ it("maps optional properties to nullable properties", async () => {
       <Property type={prop1} />
     </Wrapper>,
   ).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              public string? Prop1 { get; set; }
-          }
+          public string? Prop1 { get; set; }
       }
   `);
 });
@@ -81,12 +73,9 @@ it("maps optional and nullable properties to nullable properties", async () => {
       <Property type={prop1} />
     </Wrapper>,
   ).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              public string? Prop1 { get; set; }
-          }
+          public string? Prop1 { get; set; }
       }
   `);
 });
@@ -104,13 +93,10 @@ describe("jsonAttributes", () => {
         <Property type={prop1} jsonAttributes />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              [System.Text.Json.JsonPropertyName("prop1")]
-              public required string Prop1 { get; set; }
-          }
+          [System.Text.Json.JsonPropertyName("prop1")]
+          public required string Prop1 { get; set; }
       }
   `);
   });
@@ -128,14 +114,67 @@ describe("jsonAttributes", () => {
         <Property type={prop1} jsonAttributes />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+        class Test
+        {
+            [System.Text.Json.JsonPropertyName("prop_1")]
+            public required string Prop1 { get; set; }
+        }
+  `);
+  });
+
+  it("inherit prop: override, new", async () => {
+    const r = await tester.compile(t.code`
+      model TestModel extends BaseModel {
+        ${t.modelProperty("prop1")}: string;
+        ${t.modelProperty("prop2")}: string | null;
+      }
+      model BaseModel {
+        prop1: string | null;
+        prop2: string | null;
+      }
+    `);
+
+    expect(
+      <Wrapper>
+        <List>
+          <Property type={r.prop1} />
+          <Property type={r.prop2} />
+        </List>
+      </Wrapper>,
+    ).toRenderTo(`
+      class Test
       {
-          class Test
-          {
-              [System.Text.Json.JsonPropertyName("prop_1")]
-              public required string Prop1 { get; set; }
-          }
+          public new required string Prop1 { get; set; }
+          public override required string? Prop2 { get; set; }
       }
-  `);
+    `);
+  });
+
+  it("inherit prop: virtual", async () => {
+    const r = await tester.compile(t.code`
+      model TestModel extends BaseModel {
+        prop1: string;
+        prop2: string | null;
+      }
+      model BaseModel {
+        ${t.modelProperty("prop1")}: string | null;
+        ${t.modelProperty("prop2")}: string | null;
+      }
+    `);
+
+    expect(
+      <Wrapper>
+        <List>
+          <Property type={r.prop1} />
+          <Property type={r.prop2} />
+        </List>
+      </Wrapper>,
+    ).toRenderTo(`
+      class Test
+      {
+          public required string? Prop1 { get; set; }
+          public virtual required string? Prop2 { get; set; }
+      }
+    `);
   });
 });