@alloy-js/csharp 0.18.0-dev.4 → 0.18.0-dev.6

package/test/class-method.test.tsx

@@ -1,13 +1,13 @@
 import { Children } from "@alloy-js/core/jsx-runtime";
 import { describe, expect, it } from "vitest";
-import { Class, ClassMethod } from "../src/index.js";
+import { ClassDeclaration, ClassMethod } from "../src/index.js";
 import { TestNamespace } from "./utils.jsx";
 
 const Wrapper = (props: { children: Children }) => (
   <TestNamespace>
-    <Class public name="TestClass">
+    <ClassDeclaration public name="TestClass">
       {props.children}
-    </Class>
+    </ClassDeclaration>
   </TestNamespace>
 );
 

package/test/class.test.tsx

@@ -1,28 +1,60 @@
 import * as core from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
-import { expect, it } from "vitest";
+import { describe, expect, it } from "vitest";
 import * as csharp from "../src/index.js";
+import { ClassDeclaration } from "../src/index.js";
 import * as utils from "./utils.js";
 
 it("declares class with no members", () => {
-  const res = utils.toSourceText(<csharp.Class public name="TestClass" />);
-
-  expect(res).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass;
-    }
+  expect(
+    <utils.TestNamespace>
+      <ClassDeclaration name="TestClass" />
+    </utils.TestNamespace>,
+  ).toRenderTo(`
+      class TestClass;
   `);
 });
 
+describe("modifiers", () => {
+  it.each(["public", "private"])("%s", (mod) => {
+    expect(
+      <utils.TestNamespace>
+        <ClassDeclaration {...{ [mod]: true }} name="TestClass" />
+      </utils.TestNamespace>,
+    ).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+
+  it.each(["partial", "abstract", "static", "sealed"])("%s", (mod) => {
+    expect(
+      <utils.TestNamespace>
+        <ClassDeclaration {...{ [mod]: true }} name="TestClass" />
+      </utils.TestNamespace>,
+    ).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+
+  it("combines modifiers", () => {
+    expect(
+      <utils.TestNamespace>
+        <ClassDeclaration public abstract partial name="TestClass" />
+      </utils.TestNamespace>,
+    ).toRenderTo(`
+        public abstract partial class TestClass;
+    `);
+  });
+});
+
 it("declares class with some members", () => {
   const res = utils.toSourceText(
-    <csharp.Class public name="TestClass">
+    <csharp.ClassDeclaration public name="TestClass">
       <core.StatementList>
         <csharp.ClassMember public name="MemberOne" type="string" />
         <csharp.ClassMember private name="MemberTwo" type="int" />
       </core.StatementList>
-    </csharp.Class>,
+    </csharp.ClassDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -39,12 +71,12 @@ it("declares class with some members", () => {
 
 it("declares class with some methods", () => {
   const res = utils.toSourceText(
-    <csharp.Class public name="TestClass">
+    <csharp.ClassDeclaration public name="TestClass">
       <core.List>
         <csharp.ClassMethod public name="MethodOne" />
         <csharp.ClassMethod private virtual name="MethodTwo" />
       </core.List>
-    </csharp.Class>,
+    </csharp.ClassDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -79,22 +111,30 @@ it("uses refkeys for members, params, and return type", () => {
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
       <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum public name="TestEnum" refkey={enumTypeRefkey}>
+          <csharp.EnumDeclaration
+            public
+            name="TestEnum"
+            refkey={enumTypeRefkey}
+          >
             <core.List comma hardline>
               <csharp.EnumMember name="One" />
               <csharp.EnumMember name="Two" />
             </core.List>
-          </csharp.Enum>
+          </csharp.EnumDeclaration>
           <hbr />
-          <csharp.Class public name="TestInput" refkey={inputTypeRefkey} />
+          <csharp.ClassDeclaration
+            public
+            name="TestInput"
+            refkey={inputTypeRefkey}
+          />
           <hbr />
-          <csharp.Class
+          <csharp.ClassDeclaration
             public
             name="TestResult"
             refkey={testResultTypeRefkey}
           />
           <hbr />
-          <csharp.Class public name="TestClass">
+          <csharp.ClassDeclaration public name="TestClass">
             <csharp.ClassMember
               private
               name="MemberOne"
@@ -110,7 +150,7 @@ it("uses refkeys for members, params, and return type", () => {
             >
               return new {testResultTypeRefkey}();
             </csharp.ClassMethod>
-          </csharp.Class>
+          </csharp.ClassDeclaration>
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
@@ -145,11 +185,15 @@ it("declares class with generic parameters", () => {
   };
 
   const res = utils.toSourceText(
-    <csharp.Class public name="TestClass" typeParameters={typeParameters}>
+    <csharp.ClassDeclaration
+      public
+      name="TestClass"
+      typeParameters={typeParameters}
+    >
       <csharp.ClassMember public name="memberOne" type={typeParameters.T} />
       ;<hbr />
       <csharp.ClassMember private name="memberTwo" type={typeParameters.U} />;
-    </csharp.Class>,
+    </csharp.ClassDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -166,10 +210,10 @@ it("declares class with generic parameters", () => {
 
 it("declares class with invalid members", () => {
   const decl = (
-    <csharp.Class public name="TestClass">
+    <csharp.ClassDeclaration public name="TestClass">
       <csharp.EnumMember name="One" />,<hbr />
       <csharp.EnumMember name="Two" />
-    </csharp.Class>
+    </csharp.ClassDeclaration>
   );
 
   expect(() => utils.toSourceText(decl)).toThrow(
@@ -179,9 +223,9 @@ it("declares class with invalid members", () => {
 
 it("declares class with constructor", () => {
   const res = utils.toSourceText(
-    <csharp.Class public name="TestClass">
+    <csharp.ClassDeclaration public name="TestClass">
       <csharp.ClassConstructor public />
-    </csharp.Class>,
+    </csharp.ClassDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -215,7 +259,7 @@ it("declares class with constructor params and assigns values to fields", () =>
   ];
 
   const res = utils.toSourceText(
-    <csharp.Class public name="TestClass">
+    <csharp.ClassDeclaration public name="TestClass">
       <csharp.ClassMember
         private
         name="name"
@@ -234,7 +278,7 @@ it("declares class with constructor params and assigns values to fields", () =>
         {thisNameRefkey} = {paramNameRefkey};<hbr />
         {thisSizeRefkey} = {paramSizeRefkey};
       </csharp.ClassConstructor>
-    </csharp.Class>,
+    </csharp.ClassDeclaration>,
   );
 
   // TODO: assignments to members should have this. prefix

package/test/enum.test.tsx

@@ -5,7 +5,9 @@ import * as csharp from "../src/index.js";
 import * as utils from "./utils.js";
 
 it("declares enum with no members", () => {
-  const res = utils.toSourceText(<csharp.Enum public name="TestEnum" />);
+  const res = utils.toSourceText(
+    <csharp.EnumDeclaration public name="TestEnum" />,
+  );
 
   expect(res).toBe(coretest.d`
     namespace TestCode
@@ -17,10 +19,10 @@ it("declares enum with no members", () => {
 
 it("declares enum with members", () => {
   const res = utils.toSourceText(
-    <csharp.Enum public name="TestEnum">
+    <csharp.EnumDeclaration public name="TestEnum">
       <csharp.EnumMember name="One" />,<hbr />
       <csharp.EnumMember name="Two" />
-    </csharp.Enum>,
+    </csharp.EnumDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -37,10 +39,10 @@ it("declares enum with members", () => {
 
 it("applies naming policy to enum and members", () => {
   const res = utils.toSourceText(
-    <csharp.Enum public name="testEnum">
+    <csharp.EnumDeclaration public name="testEnum">
       <csharp.EnumMember name="one" />,<hbr />
       <csharp.EnumMember name="two" />
-    </csharp.Enum>,
+    </csharp.EnumDeclaration>,
   );
 
   expect(res).toBe(coretest.d`
@@ -63,10 +65,10 @@ it("can reference things by refkey", () => {
     <core.Output>
       <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum public name="TestEnum" refkey={enumRK}>
+          <csharp.EnumDeclaration public name="TestEnum" refkey={enumRK}>
             <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" refkey={twoRK} />
-          </csharp.Enum>
+          </csharp.EnumDeclaration>
           <hbr />
           {enumRK};<hbr />
           {twoRK};
@@ -97,19 +99,19 @@ it("can reference things by refkey across files", () => {
     <core.Output>
       <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum public name="TestEnum">
+          <csharp.EnumDeclaration public name="TestEnum">
             <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" />
-          </csharp.Enum>
+          </csharp.EnumDeclaration>
           <hbr />
           {enumRK};<hbr />
           {barRK};
         </csharp.SourceFile>
         <csharp.SourceFile path="Other.cs">
-          <csharp.Enum public name="OtherEnum" refkey={enumRK}>
+          <csharp.EnumDeclaration public name="OtherEnum" refkey={enumRK}>
             <csharp.EnumMember name="Foo" />,<hbr />
             <csharp.EnumMember name="Bar" refkey={barRK} />
-          </csharp.Enum>
+          </csharp.EnumDeclaration>
           <hbr />
           {enumRK};<hbr />
           {barRK};

package/test/namespace.test.tsx

@@ -8,18 +8,18 @@ it("defines multiple namespaces and source files with unique content", () => {
     <core.Output>
       <csharp.Namespace name="Namespace1">
         <csharp.SourceFile path="Model1.cs">
-          <csharp.Class public name="Model1" />
+          <csharp.ClassDeclaration public name="Model1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model2.cs">
-          <csharp.Class public name="Model2" />
+          <csharp.ClassDeclaration public name="Model2" />
         </csharp.SourceFile>
       </csharp.Namespace>
       <csharp.Namespace name="Namespace2">
         <csharp.SourceFile path="Model3.cs">
-          <csharp.Class public name="Model3" />
+          <csharp.ClassDeclaration public name="Model3" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model4.cs">
-          <csharp.Class public name="Model4" />
+          <csharp.ClassDeclaration public name="Model4" />
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,

package/test/projectdirectory.test.tsx

@@ -14,10 +14,10 @@ it("defines a project directory file with multiple source files", () => {
       >
         <csharp.Namespace name="TestCode">
           <csharp.SourceFile path="Test1.cs">
-            <csharp.Class public name="TestClass1" />
+            <csharp.ClassDeclaration public name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class public name="TestClass2" />
+            <csharp.ClassDeclaration public name="TestClass2" />
           </csharp.SourceFile>
         </csharp.Namespace>
       </csharp.ProjectDirectory>
@@ -71,10 +71,10 @@ it("defines a project directory file with multiple source files and a custom TFM
       >
         <csharp.Namespace name="TestCode">
           <csharp.SourceFile path="Test1.cs">
-            <csharp.Class public name="TestClass1" />
+            <csharp.ClassDeclaration public name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class public name="TestClass2" />
+            <csharp.ClassDeclaration public name="TestClass2" />
           </csharp.SourceFile>
         </csharp.Namespace>
       </csharp.ProjectDirectory>

package/test/sourcefile.test.tsx

@@ -8,10 +8,10 @@ it("defines multiple source files with unique content", () => {
     <core.Output>
       <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test1.cs">
-          <csharp.Class public name="TestClass1" />
+          <csharp.ClassDeclaration public name="TestClass1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Test2.cs">
-          <csharp.Class public name="TestClass2" />
+          <csharp.ClassDeclaration public name="TestClass2" />
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,

package/test/using.test.tsx

@@ -52,26 +52,34 @@ it("adds using statement across namespaces", () => {
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
       <csharp.Namespace name="Models">
         <csharp.SourceFile path="Models.cs">
-          <csharp.Class public name="Input" refkey={inputTypeRefkey} />
+          <csharp.ClassDeclaration
+            public
+            name="Input"
+            refkey={inputTypeRefkey}
+          />
           <hbr />
-          <csharp.Class public name="Output" refkey={outputTypeRefkey} />
+          <csharp.ClassDeclaration
+            public
+            name="Output"
+            refkey={outputTypeRefkey}
+          />
           <hbr />
-          <csharp.Enum public name="TestEnum">
+          <csharp.EnumDeclaration public name="TestEnum">
             <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" refkey={twoValRefkey} />
-          </csharp.Enum>
+          </csharp.EnumDeclaration>
         </csharp.SourceFile>
       </csharp.Namespace>
       <csharp.Namespace name="Client">
         <csharp.SourceFile path="Client.cs" using={["System"]}>
-          <csharp.Class public name="Client">
+          <csharp.ClassDeclaration public name="Client">
             <csharp.ClassMethod
               public
               name="MethodOne"
               parameters={params}
               returns={outputTypeRefkey}
             />
-          </csharp.Class>
+          </csharp.ClassDeclaration>
           <hbr />
           {twoValRefkey};
         </csharp.SourceFile>

package/dist/src/components/Class.d.ts

@@ -1,23 +0,0 @@
-import * as core from "@alloy-js/core";
-import { AccessModifiers } from "../modifiers.js";
-import { ParameterProps } from "./Parameters.js";
-export interface ClassProps extends Omit<core.DeclarationProps, "nameKind">, AccessModifiers {
-    name: string;
-    refkey?: core.Refkey;
-    typeParameters?: Record<string, core.Refkey>;
-}
-export declare function Class(props: ClassProps): core.Children;
-export interface ClassConstructorProps extends AccessModifiers {
-    parameters?: Array<ParameterProps>;
-    refkey?: core.Refkey;
-    symbol?: core.OutputSymbol;
-    children?: core.Children;
-}
-export declare function ClassConstructor(props: ClassConstructorProps): core.Children;
-export interface ClassMemberProps extends AccessModifiers {
-    name: string;
-    type: core.Children;
-    refkey?: core.Refkey;
-}
-export declare function ClassMember(props: ClassMemberProps): core.Children;
-//# sourceMappingURL=Class.d.ts.map

package/dist/src/components/Class.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../../src/components/Class.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAG7D,MAAM,WAAW,UACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC9C;AAGD,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,iBAqDtC;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBAkC5D;AAGD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CACtB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,iBAyBlD"}

package/dist/src/components/Enum.d.ts

@@ -1,14 +0,0 @@
-import * as core from "@alloy-js/core";
-import { AccessModifiers } from "../modifiers.js";
-export interface EnumProps extends AccessModifiers {
-    name: string;
-    refkey?: core.Refkey;
-    children?: core.Children;
-}
-export declare function Enum(props: EnumProps): core.Children;
-export interface EnumMemberProps {
-    name: string;
-    refkey?: core.Refkey;
-}
-export declare function EnumMember(props: EnumMemberProps): core.Children;
-//# sourceMappingURL=Enum.d.ts.map

package/dist/src/components/Enum.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Enum.d.ts","sourceRoot":"","sources":["../../../src/components/Enum.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,iBAgCpC;AAGD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CACtB;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,iBAmBhD"}