@alloy-js/csharp 0.18.0-dev.14 → 0.18.0-dev.16

package/src/components/{class → property}/property.test.tsx

@@ -2,7 +2,7 @@ import { Children } from "@alloy-js/core/jsx-runtime";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.jsx";
 import { ClassDeclaration } from "../ClassDeclaration.jsx";
-import { ClassProperty } from "./property.jsx";
+import { Property } from "./property.jsx";
 
 const Wrapper = (props: { children: Children }) => (
   <TestNamespace>
@@ -19,7 +19,7 @@ describe("modifiers", () => {
       (accessModifier) => {
         expect(
           <Wrapper>
-            <ClassProperty
+            <Property
               {...{ [accessModifier]: true }}
               name="TestProp"
               type="string"
@@ -49,7 +49,7 @@ describe("modifiers", () => {
     ] as const)("%s", (methodModifier) => {
       expect(
         <Wrapper>
-          <ClassProperty
+          <Property
             {...{ [methodModifier]: true }}
             name="TestProp"
             type="string"
@@ -68,7 +68,7 @@ describe("modifiers", () => {
   it("combine modifiers", () => {
     expect(
       <Wrapper>
-        <ClassProperty public new name="TestProp" type="string" get />
+        <Property public new name="TestProp" type="string" get />
       </Wrapper>,
     ).toRenderTo(`
         public class TestClass
@@ -82,7 +82,7 @@ describe("modifiers", () => {
 it("applies PascalCase naming policy", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="test_prop" type="string" get />
+      <Property name="test_prop" type="string" get />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass
@@ -95,7 +95,7 @@ it("applies PascalCase naming policy", () => {
 it("has getter only", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="TestProp" type="string" get />
+      <Property name="TestProp" type="string" get />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass
@@ -108,7 +108,7 @@ it("has getter only", () => {
 it("has setter only", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="TestProp" type="string" set />
+      <Property name="TestProp" type="string" set />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass
@@ -121,7 +121,7 @@ it("has setter only", () => {
 it("has getter and setter", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="TestProp" type="string" get set />
+      <Property name="TestProp" type="string" get set />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass
@@ -131,17 +131,24 @@ it("has getter and setter", () => {
   `);
 });
 
+it("has getter and init", () => {
+  expect(
+    <Wrapper>
+      <Property name="TestProp" type="string" get init />
+    </Wrapper>,
+  ).toRenderTo(`
+    public class TestClass
+    {
+      string TestProp { get; init; }
+    }
+  `);
+});
+
 it("specify doc comment", () => {
   expect(
     <TestNamespace>
       <ClassDeclaration name="Test">
-        <ClassProperty
-          name="Method"
-          type="string"
-          get
-          set
-          doc="This is a test"
-        />
+        <Property name="Method" type="string" get set doc="This is a test" />
       </ClassDeclaration>
     </TestNamespace>,
   ).toRenderTo(`
@@ -156,7 +163,7 @@ it("specify doc comment", () => {
 it("specify nullable property", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="TestProp" type="string" nullable get set />
+      <Property name="TestProp" type="string" nullable get set />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass
@@ -169,7 +176,7 @@ it("specify nullable property", () => {
 it("specify initializer", () => {
   expect(
     <Wrapper>
-      <ClassProperty name="TestProp" type="string" get set init={`"abc"`} />
+      <Property name="TestProp" type="string" get set initializer={`"abc"`} />
     </Wrapper>,
   ).toRenderTo(`
     public class TestClass

package/src/components/{class → property}/property.tsx

@@ -19,8 +19,8 @@ import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope, useCSharpScope } from "../../symbols/scopes.js";
 import { DocWhen } from "../doc/comment.jsx";
 
-/** Method modifiers. Can only be one. */
-export interface ClassPropertyModifiers {
+/** Property modifiers. */
+export interface PropertyModifiers {
   readonly new?: boolean;
   readonly static?: boolean;
   readonly virtual?: boolean;
@@ -31,7 +31,7 @@ export interface ClassPropertyModifiers {
   readonly readonly?: boolean;
 }
 
-const getModifiers = makeModifiers<ClassPropertyModifiers>([
+const getModifiers = makeModifiers<PropertyModifiers>([
   "new",
   "static",
   "virtual",
@@ -42,10 +42,8 @@ const getModifiers = makeModifiers<ClassPropertyModifiers>([
   "readonly",
 ]);
 
-/** Properties for {@link ClassProperty} component */
-export interface ClassPropertyProps
-  extends AccessModifiers,
-    ClassPropertyModifiers {
+/** Properties for {@link Property} component */
+export interface PropertyProps extends AccessModifiers, PropertyModifiers {
   name: string;
   refkey?: Refkey;
 
@@ -58,6 +56,9 @@ export interface ClassPropertyProps
   /** If property should have a setter */
   set?: boolean;
 
+  /** If property should only be set on the type creation */
+  init?: boolean;
+
   /** Doc comment */
   doc?: Children;
 
@@ -79,7 +80,7 @@ export interface ClassPropertyProps
    * int My { get; set; } = 42;
    * ```
    */
-  init?: Children;
+  initializer?: Children;
 }
 
 /**
@@ -91,7 +92,7 @@ export interface ClassPropertyProps
  * public int My { get; set; };
  * ```
  */
-export function ClassProperty(props: ClassPropertyProps) {
+export function Property(props: PropertyProps) {
   const name = useCSharpNamePolicy().getName(props.name, "class-property");
   const scope = useCSharpScope();
   if (
@@ -117,6 +118,12 @@ export function ClassProperty(props: ClassPropertyProps) {
     getAccessModifier(props),
     getModifiers(props),
   ]);
+
+  if (props.init && props.set) {
+    throw new Error(
+      `Cannot use 'init' and 'set' together on property '${name}'`,
+    );
+  }
   // note that scope wraps the method decl so that the params get the correct scope
   return (
     <MemberDeclaration symbol={propertySymbol}>
@@ -129,9 +136,10 @@ export function ClassProperty(props: ClassPropertyProps) {
           <List joiner=" ">
             {props.get && "get;"}
             {props.set && "set;"}
+            {props.init && "init;"}
           </List>
         </Block>
-        {props.init && code` = ${props.init};`}
+        {props.initializer && code` = ${props.initializer};`}
       </Scope>
     </MemberDeclaration>
   );

package/src/components/record/declaration.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.jsx";
-import { ClassProperty } from "../class/property.jsx";
+import { Property } from "../property/property.jsx";
 import { RecordDeclaration } from "./declaration.jsx";
 
 it("declares class with no members", () => {
@@ -60,7 +60,7 @@ it("specify class property inside", () => {
   expect(
     <TestNamespace>
       <RecordDeclaration name="TestRecord" doc="This is a test">
-        <ClassProperty name="Prop" get set type="string" />
+        <Property name="Prop" get set type="string" />
       </RecordDeclaration>
     </TestNamespace>,
   ).toRenderTo(`

package/src/components/record/declaration.tsx

@@ -17,7 +17,7 @@ export interface RecordModifiers {
 
 const getRecordModifiers = makeModifiers<RecordModifiers>(["partial"]);
 
-// properties for creating a class
+/** Props to use the {@link RecordDeclaration} component */
 export interface RecordDeclarationProps
   extends Omit<core.DeclarationProps, "nameKind">,
     AccessModifiers,