@typespec/emitter-framework 0.11.0-dev.0 → 0.11.0-dev.10

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

@@ -1,6 +1,11 @@
+import {
+  Experimental_ComponentOverrides,
+  Experimental_ComponentOverridesConfig,
+} from "#core/index.js";
 import { Tester } from "#test/test-host.js";
-import { type Children } from "@alloy-js/core";
-import { createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { List, type Children } from "@alloy-js/core";
+import { d } from "@alloy-js/core/testing";
+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";
@@ -16,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>
   );
 }
@@ -33,12 +36,9 @@ it("renders an empty class declaration", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestModel
     {
-        class TestModel
-        {
 
-        }
     }
   `);
 });
@@ -56,17 +56,73 @@ 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; }
+    }
+  `);
+});
+
+it("renders a class declaration with properties using component override", async () => {
+  const { TestModel, Foo, Bar } = await runner.compile(t.code`
+    model ${t.model("Foo")} {}
+    model ${t.model("Bar")} {}
+    model ${t.model("TestModel")} {
+      Prop1: string;
+      Prop2: int32;
+      Prop3?: Foo;
+    }
+  `);
+
+  expect(
+    <Wrapper>
+      <TestClientOverrides>
+        <List hardline>
+          <ClassDeclaration type={Foo} />
+          <ClassDeclaration type={Bar} />
+          <ClassDeclaration type={TestModel} />
+        </List>
+      </TestClientOverrides>
+    </Wrapper>,
+  ).toRenderTo(d`
+    class Foo
+    {
+
+    }
+    class Bar
+    {
+
+    }
+    class TestModel
+    {
+        public required string Prop1 { get; set; }
+    
+        public required int Prop2 { get; set; }
+    
+        public Bar? Prop3 { get; set; }
     }
   `);
 });
 
+function TestClientOverrides(props: { children?: Children }) {
+  const overrides = Experimental_ComponentOverridesConfig().forTypeKind("Model", {
+    reference: (props) => {
+      if (props.type.name === "Foo") {
+        return "Bar";
+      } else {
+        return props.default;
+      }
+    },
+  });
+  return (
+    <Experimental_ComponentOverrides overrides={overrides}>
+      {props.children}
+    </Experimental_ComponentOverrides>
+  );
+}
+
 it("can override class name", async () => {
   const { TestModel } = await runner.compile(t.code`
     model ${t.model("TestModel")} {}
@@ -77,12 +133,9 @@ it("can override class name", async () => {
       <ClassDeclaration type={TestModel} name="CustomClassName" />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class CustomClassName
     {
-        class CustomClassName
-        {
 
-        }
     }
   `);
 });
@@ -98,12 +151,9 @@ it("renders a class with access modifiers", async () => {
       <ClassDeclaration type={TestModel} protected />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    protected class TestModel
     {
-        protected class TestModel
-        {
 
-        }
     }
   `);
 });
@@ -120,12 +170,9 @@ describe("from an interface", () => {
         <ClassDeclaration type={TestInterface} />
       </Wrapper>,
     ).toRenderTo(`
-      namespace TestNamespace
+      class TestInterface
       {
-          class TestInterface
-          {
 
-          }
       }
     `);
   });
@@ -142,12 +189,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);
       }
     `);
   });
@@ -168,16 +212,13 @@ it("renders a class with model members", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    class TestReference
+    {
+
+    }
+    class TestModel
     {
-        class TestReference
-        {
-
-        }
-        class TestModel
-        {
-            public required TestReference Prop1 { get; set; }
-        }
+        public required TestReference Prop1 { get; set; }
     }
   `);
 });
@@ -200,17 +241,14 @@ it("renders a class with enum members", async () => {
       <ClassDeclaration type={TestModel} />
     </Wrapper>,
   ).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            Value1,
-            Value2
-        }
-        class TestModel
-        {
-            public required TestEnum Prop1 { get; set; }
-        }
+        Value1,
+        Value2
+    }
+    class TestModel
+    {
+        public required TestEnum Prop1 { get; set; }
     }
   `);
 });
@@ -227,12 +265,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; }
     }
   `);
 });
@@ -255,17 +290,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; }
     }
   `);
 });
@@ -286,18 +318,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; }
       }
     `);
   });
@@ -317,22 +346,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

@@ -1,7 +1,7 @@
-import { type Children, For } from "@alloy-js/core";
+import { For, type Children } from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
 import { Method } from "@alloy-js/csharp";
-import type { Interface, Model } from "@typespec/compiler";
+import { isVoidType, type Interface, type Model } from "@typespec/compiler";
 import { useTsp } from "../../../core/index.js";
 import { Property } from "../property/property.jsx";
 import { TypeExpression } from "../type-expression.jsx";
@@ -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" && (
@@ -53,8 +59,12 @@ export function ClassDeclaration(props: ClassDeclarationProps): Children {
 }
 
 function ClassProperties(props: ClassPropertiesProps): Children {
+  // Ignore 'void' type properties which is not valid in csharp
+  const properties = Array.from(props.type.properties.entries()).filter(
+    ([_, p]) => !isVoidType(p.type),
+  );
   return (
-    <For each={props.type.properties.entries()} hardline>
+    <For each={properties} doubleHardline>
       {([name, property]) => <Property type={property} jsonAttributes={props.jsonAttributes} />}
     </For>
   );

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
     }
   `);
 });