@alloy-js/csharp 0.2.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/csharp",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "",
   "exports": {
     ".": {
@@ -18,7 +18,7 @@
   "dependencies": {
     "change-case": "^5.4.4",
     "pathe": "^1.1.2",
-    "@alloy-js/core": "~0.2.0"
+    "@alloy-js/core": "~0.4.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.7",
@@ -28,12 +28,9 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "concurrently": "^8.2.2",
     "typescript": "^5.5.4",
-    "vitest": "^2.0.5",
+    "vitest": "^3.0.4",
     "@alloy-js/babel-preset": "~0.1.1"
   },
-  "overrides": {
-    "esbuild": "0.23"
-  },
   "type": "module",
   "scripts": {
     "build-src": "babel src -d dist/src --extensions .ts,.tsx",

package/src/components/SourceFile.tsx

@@ -49,18 +49,18 @@ export function SourceFile(props: SourceFileProps) {
     addUsing,
   };
 
-  return <core.SourceFile path={props.path} filetype="cs" reference={Reference}>
+  return <core.SourceFile path={props.path} filetype="cs" reference={Reference} indent="    ">
       <SourceFileContext.Provider value={sourceFileCtx}>
         <core.Scope name={props.path} kind="source-file">
           {using.length > 0 ? (
             <>
-              <UsingDirective namespaces={using} />{"\n"}
+              <UsingDirective namespaces={using} />{"\n\n"}
             </>
-          ) : undefined}namespace {namespaceCtx.name}{!props.children && " {}"}{props.children && 
+          ) : undefined}namespace {namespaceCtx.name}{!props.children && " {}\n"}{props.children && 
             <>
               {"\n{"}
                 {props.children}
-              {"}"}
+              {"}\n"}
             </>
           }
         </core.Scope>

package/test/class.test.tsx

@@ -12,8 +12,9 @@ it("declares class with no members", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass;
+        public class TestClass;
     }
+
   `);
 });
 
@@ -28,12 +29,13 @@ it("declares class with some members", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass
-      {
-        public string MemberOne;
-        private int memberTwo;
-      }
+        public class TestClass
+        {
+            public string MemberOne;
+            private int memberTwo;
+        }
     }
+
   `);
 });
 
@@ -48,12 +50,13 @@ it("declares class with some methods", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass
-      {
-        public void MethodOne() {}
-        private virtual void MethodTwo() {}
-      }
+        public class TestClass
+        {
+            public void MethodOne() {}
+            private virtual void MethodTwo() {}
+        }
     }
+
   `);
 });
 
@@ -77,11 +80,12 @@ it("declares class with params and return type", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass
-      {
-        public string MethodOne(int intParam, string stringParam) {}
-      }
+        public class TestClass
+        {
+            public string MethodOne(int intParam, string stringParam) {}
+        }
     }
+
   `);
 });
 
@@ -125,22 +129,23 @@ it("uses refkeys for members, params, and return type", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
-      public class TestInput;
-      public class TestResult;
-      public class TestClass
-      {
-        private TestEnum memberOne;
-        public TestResult MethodOne(int intParam, TestInput bodyParam)
+        public enum TestEnum
         {
-          return new TestResult();
+            One,
+            Two
+        }
+        public class TestInput;
+        public class TestResult;
+        public class TestClass
+        {
+            private TestEnum memberOne;
+            public TestResult MethodOne(int intParam, TestInput bodyParam)
+            {
+                return new TestResult();
+            }
         }
-      }
     }
+
   `);
 });
 
@@ -160,12 +165,13 @@ it("declares class with generic parameters", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass<T, U>
-      {
-        public T MemberOne;
-        private U memberTwo;
-      }
+        public class TestClass<T, U>
+        {
+            public T MemberOne;
+            private U memberTwo;
+        }
     }
+
   `);
 });
 
@@ -191,11 +197,12 @@ it("declares class with constructor", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass
-      {
-        public TestClass() {}
-      }
+        public class TestClass
+        {
+            public TestClass() {}
+        }
     }
+
   `);
 });
 
@@ -234,16 +241,17 @@ it("declares class with constructor params and assigns values to fields", () =>
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass
-      {
-        private string name;
-        private int size;
-        public TestClass(string name, int size)
+        public class TestClass
         {
-          name = name;
-          size = size;
+            private string name;
+            private int size;
+            public TestClass(string name, int size)
+            {
+                name = name;
+                size = size;
+            }
         }
-      }
     }
+
   `);
 });

package/test/enum.test.tsx

@@ -12,8 +12,9 @@ it("declares enum with no members", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum;
+        public enum TestEnum;
     }
+
   `);
 });
 
@@ -28,12 +29,13 @@ it("declares enum with members", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
+        public enum TestEnum
+        {
+            One,
+            Two
+        }
     }
+
   `);
 });
 
@@ -48,12 +50,13 @@ it("applies naming policy to enum and members", () => {
   expect(res).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
+        public enum TestEnum
+        {
+            One,
+            Two
+        }
     }
+
   `);
 });
 
@@ -79,14 +82,15 @@ it("can reference things by refkey", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
-      TestEnum;
-      TestEnum.Two;
+        public enum TestEnum
+        {
+            One,
+            Two
+        }
+        TestEnum;
+        TestEnum.Two;
     }
+
   `);
 });
 
@@ -121,27 +125,29 @@ it("can reference things by refkey across files", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
-      OtherEnum;
-      OtherEnum.Bar;
+        public enum TestEnum
+        {
+            One,
+            Two
+        }
+        OtherEnum;
+        OtherEnum.Bar;
     }
+
   `);
 
   expect(res.contents[1].path).toBe("Other.cs");
   expect(res.contents[1].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public enum OtherEnum
-      {
-        Foo,
-        Bar
-      }
-      OtherEnum;
-      OtherEnum.Bar;
+        public enum OtherEnum
+        {
+            Foo,
+            Bar
+        }
+        OtherEnum;
+        OtherEnum.Bar;
     }
+
   `);
 });

package/test/namespace.test.tsx

@@ -29,31 +29,35 @@ it("defines multiple namespaces and source files with unique content", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace Namespace1
     {
-      public class Model1;
+        public class Model1;
     }
+
   `);
 
   expect(res.contents[1].path).equals("Model2.cs");
   expect(res.contents[1].contents).toBe(coretest.d`
     namespace Namespace1
     {
-      public class Model2;
+        public class Model2;
     }
+
   `);
 
   expect(res.contents[2].path).equals("Model3.cs");
   expect(res.contents[2].contents).toBe(coretest.d`
     namespace Namespace2
     {
-      public class Model3;
+        public class Model3;
     }
+
   `);
 
   expect(res.contents[3].path).equals("Model4.cs");
   expect(res.contents[3].contents).toBe(coretest.d`
     namespace Namespace2
     {
-      public class Model4;
+        public class Model4;
     }
+
   `);
 });

package/test/projectdirectory.test.tsx

@@ -41,16 +41,18 @@ it("defines a project directory file with multiple source files", () => {
   expect(srcDir.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass1;
+        public class TestClass1;
     }
+
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect(srcDir.contents[1].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass2;
+        public class TestClass2;
     }
+
   `);
 });
 
@@ -92,15 +94,17 @@ it("defines a project directory file with multiple source files and a custom TFM
   expect(srcDir.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass1;
+        public class TestClass1;
     }
+
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect(srcDir.contents[1].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass2;
+        public class TestClass2;
     }
+
   `);
 });

package/test/sourcefile.test.tsx

@@ -21,16 +21,18 @@ it("defines multiple source files with unique content", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass1;
+        public class TestClass1;
     }
+
   `);
 
   expect(res.contents[1].path).equals("Test2.cs");
   expect(res.contents[1].contents).toBe(coretest.d`
     namespace TestCode
     {
-      public class TestClass2;
+        public class TestClass2;
     }
+
   `);
 });
 

package/test/using.test.tsx

@@ -14,7 +14,9 @@ it("uses a single namespace", () => {
 
   expect(res.contents[0].contents).toBe(coretest.d`
     using Foo;
+
     namespace TestCode {}
+
   `);
 });
 
@@ -30,7 +32,9 @@ it("uses multiple namespaces", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     using Bar.Baz;
     using Foo;
+
     namespace TestCode {}
+
   `);
 });
 
@@ -72,26 +76,29 @@ it("adds using statement across namespaces", () => {
   expect(res.contents[0].contents).toBe(coretest.d`
     namespace Models
     {
-      public class Input;
-      public class Output;
-      public enum TestEnum
-      {
-        One,
-        Two
-      }
+        public class Input;
+        public class Output;
+        public enum TestEnum
+        {
+            One,
+            Two
+        }
     }
+
   `);
 
   expect(res.contents[1].contents).toBe(coretest.d`
     using Models;
     using System;
+
     namespace Client
     {
-      public class Client
-      {
-        public Output MethodOne(Input bodyParam) {}
-      }
-      TestEnum.Two;
+        public class Client
+        {
+            public Output MethodOne(Input bodyParam) {}
+        }
+        TestEnum.Two;
     }
+
   `);
 });