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

package/test/class-method.test.tsx

@@ -5,7 +5,7 @@ import { TestNamespace } from "./utils.jsx";
 
 const Wrapper = (props: { children: Children }) => (
   <TestNamespace>
-    <Class accessModifier="public" name="TestClass">
+    <Class public name="TestClass">
       {props.children}
     </Class>
   </TestNamespace>
@@ -18,7 +18,7 @@ describe("modifiers", () => {
       (accessModifier) => {
         expect(
           <Wrapper>
-            <ClassMethod accessModifier={accessModifier} name="MethodOne" />
+            <ClassMethod {...{ [accessModifier]: true }} name="MethodOne" />
           </Wrapper>,
         ).toRenderTo(`
         public class TestClass
@@ -36,7 +36,7 @@ describe("modifiers", () => {
       (methodModifier) => {
         expect(
           <Wrapper>
-            <ClassMethod methodModifier={methodModifier} name="MethodOne" />
+            <ClassMethod {...{ [methodModifier]: true }} name="MethodOne" />
           </Wrapper>,
         ).toRenderTo(`
         public class TestClass
@@ -50,7 +50,7 @@ describe("modifiers", () => {
     it("abstract exclude body", () => {
       expect(
         <Wrapper>
-          <ClassMethod methodModifier="abstract" name="MethodOne" />
+          <ClassMethod abstract name="MethodOne" />
         </Wrapper>,
       ).toRenderTo(`
         public class TestClass
@@ -77,13 +77,7 @@ describe("modifiers", () => {
   it("combine modifiers", () => {
     expect(
       <Wrapper>
-        <ClassMethod
-          async
-          returns="Task"
-          accessModifier="public"
-          methodModifier="abstract"
-          name="MethodOne"
-        />
+        <ClassMethod async returns="Task" public abstract name="MethodOne" />
       </Wrapper>,
     ).toRenderTo(`
         public class TestClass
@@ -120,7 +114,7 @@ it("defines params and return type", () => {
   const res = (
     <Wrapper>
       <ClassMethod
-        accessModifier="public"
+        public
         name="MethodOne"
         parameters={params}
         returns="string"

package/test/class.test.tsx

@@ -5,9 +5,7 @@ import * as csharp from "../src/index.js";
 import * as utils from "./utils.js";
 
 it("declares class with no members", () => {
-  const res = utils.toSourceText(
-    <csharp.Class accessModifier="public" name="TestClass" />,
-  );
+  const res = utils.toSourceText(<csharp.Class public name="TestClass" />);
 
   expect(res).toBe(coretest.d`
     namespace TestCode
@@ -19,18 +17,10 @@ it("declares class with no members", () => {
 
 it("declares class with some members", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier="public" name="TestClass">
+    <csharp.Class public name="TestClass">
       <core.StatementList>
-        <csharp.ClassMember
-          accessModifier="public"
-          name="MemberOne"
-          type="string"
-        />
-        <csharp.ClassMember
-          accessModifier="private"
-          name="MemberTwo"
-          type="int"
-        />
+        <csharp.ClassMember public name="MemberOne" type="string" />
+        <csharp.ClassMember private name="MemberTwo" type="int" />
       </core.StatementList>
     </csharp.Class>,
   );
@@ -49,14 +39,10 @@ it("declares class with some members", () => {
 
 it("declares class with some methods", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier="public" name="TestClass">
+    <csharp.Class public name="TestClass">
       <core.List>
-        <csharp.ClassMethod accessModifier="public" name="MethodOne" />
-        <csharp.ClassMethod
-          accessModifier="private"
-          methodModifier="virtual"
-          name="MethodTwo"
-        />
+        <csharp.ClassMethod public name="MethodOne" />
+        <csharp.ClassMethod private virtual name="MethodTwo" />
       </core.List>
     </csharp.Class>,
   );
@@ -93,39 +79,31 @@ 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
-            accessModifier="public"
-            name="TestEnum"
-            refkey={enumTypeRefkey}
-          >
+          <csharp.Enum public name="TestEnum" refkey={enumTypeRefkey}>
             <core.List comma hardline>
               <csharp.EnumMember name="One" />
               <csharp.EnumMember name="Two" />
             </core.List>
           </csharp.Enum>
           <hbr />
-          <csharp.Class
-            accessModifier="public"
-            name="TestInput"
-            refkey={inputTypeRefkey}
-          />
+          <csharp.Class public name="TestInput" refkey={inputTypeRefkey} />
           <hbr />
           <csharp.Class
-            accessModifier="public"
+            public
             name="TestResult"
             refkey={testResultTypeRefkey}
           />
           <hbr />
-          <csharp.Class accessModifier="public" name="TestClass">
+          <csharp.Class public name="TestClass">
             <csharp.ClassMember
-              accessModifier="private"
+              private
               name="MemberOne"
               type={enumTypeRefkey}
             />
             ;
             <hbr />
             <csharp.ClassMethod
-              accessModifier="public"
+              public
               name="MethodOne"
               parameters={params}
               returns={testResultTypeRefkey}
@@ -167,23 +145,10 @@ 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.Class public name="TestClass" typeParameters={typeParameters}>
+      <csharp.ClassMember public name="memberOne" type={typeParameters.T} />
       ;<hbr />
-      <csharp.ClassMember
-        accessModifier="private"
-        name="memberTwo"
-        type={typeParameters.U}
-      />
-      ;
+      <csharp.ClassMember private name="memberTwo" type={typeParameters.U} />;
     </csharp.Class>,
   );
 
@@ -201,7 +166,7 @@ it("declares class with generic parameters", () => {
 
 it("declares class with invalid members", () => {
   const decl = (
-    <csharp.Class accessModifier="public" name="TestClass">
+    <csharp.Class public name="TestClass">
       <csharp.EnumMember name="One" />,<hbr />
       <csharp.EnumMember name="Two" />
     </csharp.Class>
@@ -214,8 +179,8 @@ it("declares class with invalid members", () => {
 
 it("declares class with constructor", () => {
   const res = utils.toSourceText(
-    <csharp.Class accessModifier="public" name="TestClass">
-      <csharp.ClassConstructor accessModifier="public" />
+    <csharp.Class public name="TestClass">
+      <csharp.ClassConstructor public />
     </csharp.Class>,
   );
 
@@ -250,22 +215,22 @@ it("declares class with constructor params and assigns values to fields", () =>
   ];
 
   const res = utils.toSourceText(
-    <csharp.Class accessModifier="public" name="TestClass">
+    <csharp.Class public name="TestClass">
       <csharp.ClassMember
-        accessModifier="private"
+        private
         name="name"
         type="string"
         refkey={thisNameRefkey}
       />
       ;<hbr />
       <csharp.ClassMember
-        accessModifier="private"
+        private
         name="size"
         type="int"
         refkey={thisSizeRefkey}
       />
       ;<hbr />
-      <csharp.ClassConstructor accessModifier="public" parameters={ctorParams}>
+      <csharp.ClassConstructor public parameters={ctorParams}>
         {thisNameRefkey} = {paramNameRefkey};<hbr />
         {thisSizeRefkey} = {paramSizeRefkey};
       </csharp.ClassConstructor>

package/test/enum.test.tsx

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

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 accessModifier="public" name="Model1" />
+          <csharp.Class public name="Model1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model2.cs">
-          <csharp.Class accessModifier="public" name="Model2" />
+          <csharp.Class public name="Model2" />
         </csharp.SourceFile>
       </csharp.Namespace>
       <csharp.Namespace name="Namespace2">
         <csharp.SourceFile path="Model3.cs">
-          <csharp.Class accessModifier="public" name="Model3" />
+          <csharp.Class public name="Model3" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Model4.cs">
-          <csharp.Class accessModifier="public" name="Model4" />
+          <csharp.Class 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 accessModifier="public" name="TestClass1" />
+            <csharp.Class public name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class accessModifier="public" name="TestClass2" />
+            <csharp.Class 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 accessModifier="public" name="TestClass1" />
+            <csharp.Class public name="TestClass1" />
           </csharp.SourceFile>
           <csharp.SourceFile path="Test2.cs">
-            <csharp.Class accessModifier="public" name="TestClass2" />
+            <csharp.Class 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 accessModifier="public" name="TestClass1" />
+          <csharp.Class public name="TestClass1" />
         </csharp.SourceFile>
         <csharp.SourceFile path="Test2.cs">
-          <csharp.Class accessModifier="public" name="TestClass2" />
+          <csharp.Class public name="TestClass2" />
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,

package/test/using.test.tsx

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