@alloy-js/csharp 0.5.0 → 0.6.0

package/test/class.test.tsx

@@ -6,7 +6,7 @@ import * as utils from "./utils.js";
 
 it("declares class with no members", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass" />,
+    <csharp.Class accessModifier="public" name="TestClass" />,
   );
 
   expect(res).toBe(coretest.d`
@@ -14,15 +14,24 @@ it("declares class with no members", () => {
     {
         public class TestClass;
     }
-
   `);
 });
 
 it("declares class with some members", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass">
-      <csharp.ClassMember accessModifier="public" name="MemberOne" type="string" />
-      <csharp.ClassMember accessModifier="private" name="MemberTwo" type="int" />
+    <csharp.Class accessModifier="public" name="TestClass">
+      <core.StatementList>
+        <csharp.ClassMember
+          accessModifier="public"
+          name="MemberOne"
+          type="string"
+        />
+        <csharp.ClassMember
+          accessModifier="private"
+          name="MemberTwo"
+          type="int"
+        />
+      </core.StatementList>
     </csharp.Class>,
   );
 
@@ -35,15 +44,20 @@ it("declares class with some members", () => {
             private int memberTwo;
         }
     }
-
   `);
 });
 
 it("declares class with some methods", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass">
-      <csharp.ClassMethod accessModifier="public" name="MethodOne" />
-      <csharp.ClassMethod accessModifier="private" methodModifier="virtual" name="MethodTwo" />
+    <csharp.Class accessModifier="public" name="TestClass">
+      <core.List>
+        <csharp.ClassMethod accessModifier="public" name="MethodOne" />
+        <csharp.ClassMethod
+          accessModifier="private"
+          methodModifier="virtual"
+          name="MethodTwo"
+        />
+      </core.List>
     </csharp.Class>,
   );
 
@@ -56,7 +70,6 @@ it("declares class with some methods", () => {
             private virtual void MethodTwo() {}
         }
     }
-
   `);
 });
 
@@ -72,8 +85,13 @@ it("declares class with params and return type", () => {
     },
   ];
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass">
-      <csharp.ClassMethod accessModifier="public" name="MethodOne" parameters={params} returns="string" />
+    <csharp.Class accessModifier="public" name="TestClass">
+      <csharp.ClassMethod
+        accessModifier="public"
+        name="MethodOne"
+        parameters={params}
+        returns="string"
+      />
     </csharp.Class>,
   );
 
@@ -85,7 +103,6 @@ it("declares class with params and return type", () => {
             public string MethodOne(int intParam, string stringParam) {}
         }
     }
-
   `);
 });
 
@@ -107,17 +124,45 @@ it("uses refkeys for members, params, and return type", () => {
 
   const res = core.render(
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum accessModifier='public' name="TestEnum" refkey={enumTypeRefkey}>
-            <csharp.EnumMember name="One" />,
-            <csharp.EnumMember name="Two" />
+          <csharp.Enum
+            accessModifier="public"
+            name="TestEnum"
+            refkey={enumTypeRefkey}
+          >
+            <core.List comma hardline>
+              <csharp.EnumMember name="One" />
+              <csharp.EnumMember name="Two" />
+            </core.List>
           </csharp.Enum>
-          <csharp.Class accessModifier="public" name="TestInput" refkey={inputTypeRefkey} />
-          <csharp.Class accessModifier="public" name="TestResult" refkey={testResultTypeRefkey} />
-          <csharp.Class accessModifier='public' name="TestClass">
-            <csharp.ClassMember accessModifier="private" name="MemberOne" type={enumTypeRefkey} />
-            <csharp.ClassMethod accessModifier="public" name="MethodOne" parameters={params} returns={testResultTypeRefkey}>
+          <hbr />
+          <csharp.Class
+            accessModifier="public"
+            name="TestInput"
+            refkey={inputTypeRefkey}
+          />
+          <hbr />
+          <csharp.Class
+            accessModifier="public"
+            name="TestResult"
+            refkey={testResultTypeRefkey}
+          />
+          <hbr />
+          <csharp.Class accessModifier="public" name="TestClass">
+            <csharp.ClassMember
+              accessModifier="private"
+              name="MemberOne"
+              type={enumTypeRefkey}
+            />
+            ;
+            <hbr />
+            <csharp.ClassMethod
+              accessModifier="public"
+              name="MethodOne"
+              parameters={params}
+              returns={testResultTypeRefkey}
+            >
               return new {testResultTypeRefkey}();
             </csharp.ClassMethod>
           </csharp.Class>
@@ -145,7 +190,6 @@ it("uses refkeys for members, params, and return type", () => {
             }
         }
     }
-
   `);
 });
 
@@ -156,9 +200,23 @@ it("declares class with generic parameters", () => {
   };
 
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass" typeParameters={typeParameters}>
-      <csharp.ClassMember accessModifier="public" name="memberOne" type={typeParameters.T} />
-      <csharp.ClassMember accessModifier="private" name="memberTwo" type={typeParameters.U} />
+    <csharp.Class
+      accessModifier="public"
+      name="TestClass"
+      typeParameters={typeParameters}
+    >
+      <csharp.ClassMember
+        accessModifier="public"
+        name="memberOne"
+        type={typeParameters.T}
+      />
+      ;<hbr />
+      <csharp.ClassMember
+        accessModifier="private"
+        name="memberTwo"
+        type={typeParameters.U}
+      />
+      ;
     </csharp.Class>,
   );
 
@@ -171,16 +229,16 @@ it("declares class with generic parameters", () => {
             private U memberTwo;
         }
     }
-
   `);
 });
 
 it("declares class with invalid members", () => {
-  const decl =
-    <csharp.Class accessModifier='public' name="TestClass">
-      <csharp.EnumMember name="One" />,
+  const decl = (
+    <csharp.Class accessModifier="public" name="TestClass">
+      <csharp.EnumMember name="One" />,<hbr />
       <csharp.EnumMember name="Two" />
-    </csharp.Class>;
+    </csharp.Class>
+  );
 
   expect(() => utils.toSourceText(decl)).toThrow(
     "can't define an enum member outside of an enum-decl scope",
@@ -189,7 +247,7 @@ it("declares class with invalid members", () => {
 
 it("declares class with constructor", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass">
+    <csharp.Class accessModifier="public" name="TestClass">
       <csharp.ClassConstructor accessModifier="public" />
     </csharp.Class>,
   );
@@ -202,7 +260,6 @@ it("declares class with constructor", () => {
             public TestClass() {}
         }
     }
-
   `);
 });
 
@@ -226,11 +283,23 @@ it("declares class with constructor params and assigns values to fields", () =>
   ];
 
   const res = utils.toSourceText(
-    <csharp.Class accessModifier='public' name="TestClass">
-      <csharp.ClassMember accessModifier="private" name="name" type="string" refkey={thisNameRefkey} />
-      <csharp.ClassMember accessModifier="private" name="size" type="int" refkey={thisSizeRefkey} />
+    <csharp.Class accessModifier="public" name="TestClass">
+      <csharp.ClassMember
+        accessModifier="private"
+        name="name"
+        type="string"
+        refkey={thisNameRefkey}
+      />
+      ;<hbr />
+      <csharp.ClassMember
+        accessModifier="private"
+        name="size"
+        type="int"
+        refkey={thisSizeRefkey}
+      />
+      ;<hbr />
       <csharp.ClassConstructor accessModifier="public" parameters={ctorParams}>
-        {thisNameRefkey} = {paramNameRefkey};
+        {thisNameRefkey} = {paramNameRefkey};<hbr />
         {thisSizeRefkey} = {paramSizeRefkey};
       </csharp.ClassConstructor>
     </csharp.Class>,
@@ -252,6 +321,5 @@ it("declares class with constructor params and assigns values to fields", () =>
             }
         }
     }
-
   `);
 });

package/test/enum.test.tsx

@@ -6,7 +6,7 @@ import * as utils from "./utils.js";
 
 it("declares enum with no members", () => {
   const res = utils.toSourceText(
-    <csharp.Enum accessModifier='public' name="TestEnum" />,
+    <csharp.Enum accessModifier="public" name="TestEnum" />,
   );
 
   expect(res).toBe(coretest.d`
@@ -14,14 +14,13 @@ it("declares enum with no members", () => {
     {
         public enum TestEnum;
     }
-
   `);
 });
 
 it("declares enum with members", () => {
   const res = utils.toSourceText(
-    <csharp.Enum accessModifier='public' name="TestEnum">
-      <csharp.EnumMember name="One" />,
+    <csharp.Enum accessModifier="public" name="TestEnum">
+      <csharp.EnumMember name="One" />,<hbr />
       <csharp.EnumMember name="Two" />
     </csharp.Enum>,
   );
@@ -35,14 +34,13 @@ it("declares enum with members", () => {
             Two
         }
     }
-
   `);
 });
 
 it("applies naming policy to enum and members", () => {
   const res = utils.toSourceText(
-    <csharp.Enum accessModifier='public' name="testEnum">
-      <csharp.EnumMember name="one" />,
+    <csharp.Enum accessModifier="public" name="testEnum">
+      <csharp.EnumMember name="one" />,<hbr />
       <csharp.EnumMember name="two" />
     </csharp.Enum>,
   );
@@ -56,7 +54,6 @@ it("applies naming policy to enum and members", () => {
             Two
         }
     }
-
   `);
 });
 
@@ -66,13 +63,14 @@ it("can reference things by refkey", () => {
 
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum accessModifier='public' name="TestEnum" refkey={enumRK}>
-            <csharp.EnumMember name="One" />,
+          <csharp.Enum accessModifier="public" name="TestEnum" refkey={enumRK}>
+            <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" refkey={twoRK} />
           </csharp.Enum>
-          {enumRK};
+          <hbr />
+          {enumRK};<hbr />
           {twoRK};
         </csharp.SourceFile>
       </csharp.Namespace>
@@ -90,7 +88,6 @@ it("can reference things by refkey", () => {
         TestEnum;
         TestEnum.Two;
     }
-
   `);
 });
 
@@ -100,21 +97,23 @@ it("can reference things by refkey across files", () => {
 
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">
-          <csharp.Enum accessModifier='public' name="TestEnum">
-            <csharp.EnumMember name="One" />,
+          <csharp.Enum accessModifier="public" name="TestEnum">
+            <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" />
           </csharp.Enum>
-          {enumRK};
+          <hbr />
+          {enumRK};<hbr />
           {barRK};
         </csharp.SourceFile>
         <csharp.SourceFile path="Other.cs">
-          <csharp.Enum accessModifier='public' name="OtherEnum" refkey={enumRK}>
-            <csharp.EnumMember name="Foo" />,
+          <csharp.Enum accessModifier="public" name="OtherEnum" refkey={enumRK}>
+            <csharp.EnumMember name="Foo" />,<hbr />
             <csharp.EnumMember name="Bar" refkey={barRK} />
           </csharp.Enum>
-          {enumRK};
+          <hbr />
+          {enumRK};<hbr />
           {barRK};
         </csharp.SourceFile>
       </csharp.Namespace>
@@ -133,7 +132,6 @@ it("can reference things by refkey across files", () => {
         OtherEnum;
         OtherEnum.Bar;
     }
-
   `);
 
   expect(res.contents[1].path).toBe("Other.cs");
@@ -148,6 +146,5 @@ it("can reference things by refkey across files", () => {
         OtherEnum;
         OtherEnum.Bar;
     }
-
   `);
 });

package/test/namespace.test.tsx

@@ -6,20 +6,20 @@ import * as csharp from "../src/index.js";
 it("defines multiple namespaces and source files with unique content", () => {
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='Namespace1'>
+      <csharp.Namespace name="Namespace1">
         <csharp.SourceFile path="Model1.cs">
-          <csharp.Class accessModifier='public' name="Model1" />
+          <csharp.Class accessModifier="public" name="Model1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model2.cs">
-          <csharp.Class accessModifier='public' name="Model2" />
+          <csharp.Class accessModifier="public" name="Model2" />
         </csharp.SourceFile>
       </csharp.Namespace>
-      <csharp.Namespace name='Namespace2'>
+      <csharp.Namespace name="Namespace2">
         <csharp.SourceFile path="Model3.cs">
-          <csharp.Class accessModifier='public' name="Model3" />
+          <csharp.Class accessModifier="public" name="Model3" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model4.cs">
-          <csharp.Class accessModifier='public' name="Model4" />
+          <csharp.Class accessModifier="public" name="Model4" />
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
@@ -31,7 +31,6 @@ it("defines multiple namespaces and source files with unique content", () => {
     {
         public class Model1;
     }
-
   `);
 
   expect(res.contents[1].path).equals("Model2.cs");
@@ -40,7 +39,6 @@ it("defines multiple namespaces and source files with unique content", () => {
     {
         public class Model2;
     }
-
   `);
 
   expect(res.contents[2].path).equals("Model3.cs");
@@ -49,7 +47,6 @@ it("defines multiple namespaces and source files with unique content", () => {
     {
         public class Model3;
     }
-
   `);
 
   expect(res.contents[3].path).equals("Model4.cs");
@@ -58,6 +55,5 @@ it("defines multiple namespaces and source files with unique content", () => {
     {
         public class Model4;
     }
-
   `);
 });

package/test/projectdirectory.test.tsx

@@ -6,13 +6,18 @@ import * as csharp from "../src/index.js";
 it("defines a project directory file with multiple source files", () => {
   const res = core.render(
     <core.Output>
-      <csharp.ProjectDirectory name="TestProject" path="~/projects" version="0.1.0" description="a test project">
-        <csharp.Namespace name='TestCode'>
+      <csharp.ProjectDirectory
+        name="TestProject"
+        path="~/projects"
+        version="0.1.0"
+        description="a test project"
+      >
+        <csharp.Namespace name="TestCode">
           <csharp.SourceFile path="Test1.cs">
-            <csharp.Class accessModifier='public' name="TestClass1" />
+            <csharp.Class accessModifier="public" name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class accessModifier='public' name="TestClass2" />
+            <csharp.Class accessModifier="public" name="TestClass2" />
           </csharp.SourceFile>
         </csharp.Namespace>
       </csharp.ProjectDirectory>
@@ -43,7 +48,6 @@ it("defines a project directory file with multiple source files", () => {
     {
         public class TestClass1;
     }
-
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
@@ -52,20 +56,25 @@ it("defines a project directory file with multiple source files", () => {
     {
         public class TestClass2;
     }
-
   `);
 });
 
 it("defines a project directory file with multiple source files and a custom TFM", () => {
   const res = core.render(
     <core.Output>
-      <csharp.ProjectDirectory name="TestProject" path="~/projects" version="0.1.0" description="a test project" targetFrameworkMoniker="netstandard2.1">
-        <csharp.Namespace name='TestCode'>
+      <csharp.ProjectDirectory
+        name="TestProject"
+        path="~/projects"
+        version="0.1.0"
+        description="a test project"
+        targetFrameworkMoniker="netstandard2.1"
+      >
+        <csharp.Namespace name="TestCode">
           <csharp.SourceFile path="Test1.cs">
-            <csharp.Class accessModifier='public' name="TestClass1" />
+            <csharp.Class accessModifier="public" name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class accessModifier='public' name="TestClass2" />
+            <csharp.Class accessModifier="public" name="TestClass2" />
           </csharp.SourceFile>
         </csharp.Namespace>
       </csharp.ProjectDirectory>
@@ -96,7 +105,6 @@ it("defines a project directory file with multiple source files and a custom TFM
     {
         public class TestClass1;
     }
-
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
@@ -105,6 +113,5 @@ it("defines a project directory file with multiple source files and a custom TFM
     {
         public class TestClass2;
     }
-
   `);
 });

package/test/sourcefile.test.tsx

@@ -6,12 +6,12 @@ import * as csharp from "../src/index.js";
 it("defines multiple source files with unique content", () => {
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test1.cs">
-          <csharp.Class accessModifier='public' name="TestClass1" />
+          <csharp.Class accessModifier="public" name="TestClass1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Test2.cs">
-          <csharp.Class accessModifier='public' name="TestClass2" />
+          <csharp.Class accessModifier="public" name="TestClass2" />
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
@@ -23,7 +23,6 @@ it("defines multiple source files with unique content", () => {
     {
         public class TestClass1;
     }
-
   `);
 
   expect(res.contents[1].path).equals("Test2.cs");
@@ -32,15 +31,15 @@ it("defines multiple source files with unique content", () => {
     {
         public class TestClass2;
     }
-
   `);
 });
 
 it("throws when declaring a source file outside a namespace", () => {
-  const decl =
+  const decl = (
     <core.Output>
-    <csharp.SourceFile path="Test.cs" />
-  </core.Output>;
+      <csharp.SourceFile path="Test.cs" />
+    </core.Output>
+  );
 
   expect(() => core.render(decl)).toThrow(
     "SourceFile must be declared inside a namespace",

package/test/using.test.tsx

@@ -6,7 +6,7 @@ import * as csharp from "../src/index.js";
 it("uses a single namespace", () => {
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test1.cs" using={["Foo"]} />
       </csharp.Namespace>
     </core.Output>,
@@ -16,14 +16,13 @@ it("uses a single namespace", () => {
     using Foo;
 
     namespace TestCode {}
-
   `);
 });
 
 it("uses multiple namespaces", () => {
   const res = core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test1.cs" using={["Foo", "Bar.Baz"]} />
       </csharp.Namespace>
     </core.Output>,
@@ -34,7 +33,6 @@ it("uses multiple namespaces", () => {
     using Foo;
 
     namespace TestCode {}
-
   `);
 });
 
@@ -52,21 +50,37 @@ it("adds using statement across namespaces", () => {
 
   const res = core.render(
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
-      <csharp.Namespace name='Models'>
+      <csharp.Namespace name="Models">
         <csharp.SourceFile path="Models.cs">
-          <csharp.Class accessModifier='public' name="Input" refkey={inputTypeRefkey} />
-          <csharp.Class accessModifier='public' name="Output" refkey={outputTypeRefkey} />
-          <csharp.Enum accessModifier='public' name="TestEnum">
-            <csharp.EnumMember name="One" />,
+          <csharp.Class
+            accessModifier="public"
+            name="Input"
+            refkey={inputTypeRefkey}
+          />
+          <hbr />
+          <csharp.Class
+            accessModifier="public"
+            name="Output"
+            refkey={outputTypeRefkey}
+          />
+          <hbr />
+          <csharp.Enum accessModifier="public" name="TestEnum">
+            <csharp.EnumMember name="One" />,<hbr />
             <csharp.EnumMember name="Two" refkey={twoValRefkey} />
           </csharp.Enum>
         </csharp.SourceFile>
       </csharp.Namespace>
-      <csharp.Namespace name='Client'>
+      <csharp.Namespace name="Client">
         <csharp.SourceFile path="Client.cs" using={["System"]}>
-          <csharp.Class accessModifier='public' name="Client">
-            <csharp.ClassMethod accessModifier="public" name="MethodOne" parameters={params} returns={outputTypeRefkey} />
+          <csharp.Class accessModifier="public" name="Client">
+            <csharp.ClassMethod
+              accessModifier="public"
+              name="MethodOne"
+              parameters={params}
+              returns={outputTypeRefkey}
+            />
           </csharp.Class>
+          <hbr />
           {twoValRefkey};
         </csharp.SourceFile>
       </csharp.Namespace>
@@ -84,7 +98,6 @@ it("adds using statement across namespaces", () => {
             Two
         }
     }
-
   `);
 
   expect(res.contents[1].contents).toBe(coretest.d`
@@ -99,6 +112,5 @@ it("adds using statement across namespaces", () => {
         }
         TestEnum.Two;
     }
-
   `);
 });

package/test/utils.tsx

@@ -6,7 +6,7 @@ import * as csharp from "../src/index.js";
 export function toSourceText(c: core.Children): string {
   const res = core.render(
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
-      <csharp.Namespace name='TestCode'>
+      <csharp.Namespace name="TestCode">
         <csharp.SourceFile path="Test.cs">{c}</csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
@@ -19,9 +19,7 @@ export function toSourceText(c: core.Children): string {
 export function testRender(c: core.Children): core.OutputDirectory {
   return core.render(
     <core.Output>
-      <csharp.Namespace name='TestCode'>
-        {c}
-      </csharp.Namespace>
+      <csharp.Namespace name="TestCode">{c}</csharp.Namespace>
     </core.Output>,
   );
 }