@alloy-js/csharp 0.19.0-dev.5 → 0.19.0-dev.8

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

@@ -1,6 +1,13 @@
 import { Children, Refkey } from "@alloy-js/core";
 import { AccessModifiers } from "../../modifiers.js";
-export interface FieldProps extends AccessModifiers {
+/** Field modifiers. */
+export interface FieldModifiers {
+    readonly new?: boolean;
+    readonly static?: boolean;
+    readonly readonly?: boolean;
+    readonly volatile?: boolean;
+}
+export interface FieldProps extends AccessModifiers, FieldModifiers {
     name: string;
     type: Children;
     refkey?: Refkey;

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

@@ -1 +1 @@
-{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../../../src/components/field/field.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EACL,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAM5B,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,wBAAwB;AACxB,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,YA6BtC"}
+{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../../../src/components/field/field.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAM5B,uBAAuB;AACvB,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AASD,MAAM,WAAW,UAAW,SAAQ,eAAe,EAAE,cAAc;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,wBAAwB;AACxB,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,YAiCtC"}

package/dist/src/components/field/field.js

@@ -1,14 +1,18 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import { Declaration, Name, refkey } from "@alloy-js/core";
-import { computeModifiersPrefix, getAccessModifier } from "../../modifiers.js";
+import { computeModifiersPrefix, getAccessModifier, makeModifiers } from "../../modifiers.js";
 import { useCSharpNamePolicy } from "../../name-policy.js";
 import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
 import { useCSharpScope } from "../../symbols/scopes.js";
 import { DocWhen } from "../doc/comment.js";
+
+/** Field modifiers. */
+
+const getModifiers = makeModifiers(["new", "static", "readonly", "volatile"]);
 /** Render a c# field */
 export function Field(props) {
   let nameElement = "class-member-private";
-  if (props.public) {
+  if (props.public || props.protected || props.internal) {
     nameElement = "class-member-public";
   }
   const name = useCSharpNamePolicy().getName(props.name, nameElement);
@@ -20,7 +24,7 @@ export function Field(props) {
     scope,
     refkeys: props.refkey ?? refkey(props.name)
   });
-  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
+  const modifiers = computeModifiersPrefix([getAccessModifier(props), getModifiers(props)]);
   return _$createComponent(Declaration, {
     symbol: memberSymbol,
     get children() {
@@ -28,7 +32,7 @@ export function Field(props) {
         get doc() {
           return props.doc;
         }
-      }), modifiers, _$memo(() => props.type), " ", _$createComponent(Name, {})];
+      }), modifiers, _$memo(() => props.type), " ", _$createComponent(Name, {}), ";"];
     }
   });
 }

package/dist/src/components/field/field.test.js

@@ -1,29 +1,36 @@
-import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { StatementList } from "@alloy-js/core";
-import { expect, it } from "vitest";
+import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { List } from "@alloy-js/core";
+import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { ClassDeclaration } from "../ClassDeclaration.js";
 import { Field } from "./field.js";
-it("declares some field", () => {
-  expect(_$createComponent(TestNamespace, {
+function Wrapper(props) {
+  return _$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(ClassDeclaration, {
         "public": true,
         name: "TestClass",
         get children() {
-          return _$createComponent(StatementList, {
-            get children() {
-              return [_$createComponent(Field, {
-                "public": true,
-                name: "MemberOne",
-                type: "string"
-              }), _$createComponent(Field, {
-                "private": true,
-                name: "MemberTwo",
-                type: "int"
-              })];
-            }
-          });
+          return props.children;
+        }
+      });
+    }
+  });
+}
+it("declares multiple fields", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(List, {
+        get children() {
+          return [_$createComponent(Field, {
+            "public": true,
+            name: "MemberOne",
+            type: "string"
+          }), _$createComponent(Field, {
+            "public": true,
+            name: "MemberTwo",
+            type: "int"
+          })];
         }
       });
     }
@@ -31,7 +38,106 @@ it("declares some field", () => {
     public class TestClass
     {
       public string MemberOne;
-      private int memberTwo;
+      public int MemberTwo;
+    }
+  `);
+});
+describe("modifiers", () => {
+  describe("access modifiers", () => {
+    it.each(["public", "private", "protected", "internal"])("%s", accessModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(Field, _$mergeProps({
+            [accessModifier]: true
+          }, {
+            name: "TestProp",
+            type: "string"
+          }));
+        }
+      })).toRenderTo(`
+        public class TestClass
+        {
+          ${accessModifier} string ${accessModifier === "private" ? "_testProp" : "TestProp"};
+        }
+      `);
+    });
+  });
+  describe("modifiers", () => {
+    it.each(["new", "static", "readonly", "volatile"])("%s", methodModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(Field, _$mergeProps({
+            [methodModifier]: true
+          }, {
+            name: "TestField",
+            type: "string"
+          }));
+        }
+      })).toRenderTo(`
+        public class TestClass
+        {
+          ${methodModifier} string _testField;
+        }
+      `);
+    });
+  });
+  it("combine modifiers", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(Field, {
+          "public": true,
+          "new": true,
+          name: "TestField",
+          type: "string"
+        });
+      }
+    })).toRenderTo(`
+        public class TestClass
+        {
+          public new string TestField;
+        }
+      `);
+  });
+});
+describe("naming", () => {
+  it("public field are PascalCase", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return _$createComponent(Field, {
+              "public": true,
+              name: "member_one",
+              type: "string"
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      public class TestClass
+      {
+        public string MemberOne;
+      }
+    `);
+  });
+  it("private field are camelCase with _ prefix", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return _$createComponent(Field, {
+              "private": true,
+              name: "member_one",
+              type: "string"
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+    public class TestClass
+    {
+      private string _memberOne;
     }
   `);
+  });
 });

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

@@ -9,6 +9,9 @@ export interface MethodModifiers {
     readonly sealed?: boolean;
     readonly static?: boolean;
     readonly virtual?: boolean;
+    readonly override?: boolean;
+    readonly extern?: boolean;
+    readonly readonly?: boolean;
 }
 export interface MethodProps extends AccessModifiers, MethodModifiers {
     name: string;

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

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAuDxC"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAaD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAoDxC"}

package/dist/src/components/method/method.js

@@ -12,7 +12,7 @@ import { TypeParameters } from "../type-parameters/type-parameters.js";
 
 /** Method modifiers. Can only be one. */
 
-const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtual"]);
+const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtual", "override", "extern", "readonly"]);
 
 // properties for creating a method
 
@@ -62,7 +62,11 @@ export function Method(props) {
             get parameters() {
               return props.typeParameters;
             }
-          })), _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$memo(() => !!props.expression)() ? [" => ", _$memo(() => props.children)] : _$createComponent(Block, {
+          })), _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$memo(() => !!props.expression)() ? _$createComponent(ExpressionBody, {
+            get children() {
+              return props.children;
+            }
+          }) : _$createComponent(Block, {
             newline: true,
             get children() {
               return props.children;
@@ -72,4 +76,7 @@ export function Method(props) {
       });
     }
   });
-}
+}
+const ExpressionBody = props => {
+  return [" => ", _$memo(() => props.children), ";"];
+};

package/dist/src/components/method/method.test.js

@@ -169,7 +169,7 @@ it("use expression body form", () => {
             name: "Method",
             doc: "This is a test",
             expression: true,
-            children: "this.MyProperty.Value;"
+            children: "this.MyProperty.Value"
           });
         }
       });

package/dist/src/components/struct/declaration.test.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
-import { List, refkey, StatementList } from "@alloy-js/core";
+import { List, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { Attribute } from "../attributes/attributes.js";
@@ -217,14 +217,14 @@ it("defines fields", () => {
         "public": true,
         name: "TestClass",
         get children() {
-          return _$createComponent(StatementList, {
+          return _$createComponent(List, {
             get children() {
               return [_$createComponent(Field, {
                 "public": true,
                 name: "MemberOne",
                 type: "string"
               }), _$createComponent(Field, {
-                "private": true,
+                "public": true,
                 name: "MemberTwo",
                 type: "int"
               })];
@@ -237,7 +237,7 @@ it("defines fields", () => {
     public struct TestClass
     {
       public string MemberOne;
-      private int memberTwo;
+      public int MemberTwo;
     }
   `);
 });

package/dist/src/name-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,UAAU,GACV,QAAQ,GACR,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,QAAQ,GACR,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAoBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}
+{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,UAAU,GACV,QAAQ,GACR,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,QAAQ,GACR,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAsBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}

package/dist/src/name-policy.js

@@ -20,6 +20,8 @@ export function createCSharpNamePolicy() {
         return changecase.pascalCase(name);
       case "constant":
         return changecase.constantCase(name);
+      case "class-member-private":
+        return `_${changecase.camelCase(name)}`;
       default:
         return changecase.camelCase(name);
     }

package/dist/test/class-declaration.test.js

@@ -106,14 +106,14 @@ it("declares class with some members", () => {
     "public": true,
     name: "TestClass",
     get children() {
-      return _$createComponent(core.StatementList, {
+      return _$createComponent(List, {
         get children() {
           return [_$createComponent(Field, {
             "public": true,
             name: "MemberOne",
             type: "string"
           }), _$createComponent(Field, {
-            "private": true,
+            "public": true,
             name: "MemberTwo",
             type: "int"
           })];
@@ -127,7 +127,7 @@ it("declares class with some members", () => {
         public class TestClass
         {
             public string MemberOne;
-            private int memberTwo;
+            public int MemberTwo;
         }
     }
   `);
@@ -217,7 +217,7 @@ it("uses refkeys for members, params, and return type", () => {
                     "private": true,
                     name: "MemberOne",
                     type: enumTypeRefkey
-                  }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
+                  }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,
@@ -246,7 +246,7 @@ it("uses refkeys for members, params, and return type", () => {
         public class TestResult;
         public class TestClass
         {
-            private TestEnum memberOne;
+            private TestEnum _memberOne;
             public TestResult MethodOne(int intParam, TestInput bodyParam)
             {
                 return new TestResult();
@@ -393,12 +393,12 @@ it("declares class with constructor params and assigns values to fields", () =>
         name: "name",
         type: "string",
         refkey: thisNameRefkey
-      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(Field, {
+      }), _$createIntrinsic("hbr", {}), _$createComponent(Field, {
         "private": true,
         name: "size",
         type: "int",
         refkey: thisSizeRefkey
-      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
+      }), _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
         "public": true,
         parameters: ctorParams,
         get children() {
@@ -415,12 +415,12 @@ it("declares class with constructor params and assigns values to fields", () =>
     {
         public class TestClass
         {
-            private string name;
-            private int size;
+            private string _name;
+            private int _size;
             public TestClass(string name, int size)
             {
-                name = name;
-                size = size;
+                _name = name;
+                _size = size;
             }
         }
     }
@@ -460,7 +460,7 @@ it("supports class member doc comments", () => {
     class Test
     {
       /// This is a member
-      public int Member
+      public int Member;
     }
   `);
 });