@alloy-js/csharp 0.21.0-dev.4 → 0.21.0-dev.6

package/src/components/method/method.test.tsx

@@ -158,3 +158,52 @@ it("use expression body form", () => {
     }
   `);
 });
+
+describe("format", () => {
+  it("split expression after => if too long", () => {
+    expect(
+      <TestNamespace printWidth={60}>
+        <ClassDeclaration name="Test">
+          <Method public override name="ThisIsAVeryLongMethodName" expression>
+            this.WithAVeryLongPropertyName.AndAnEvenLongerMemberName
+          </Method>
+        </ClassDeclaration>
+      </TestNamespace>,
+    ).toRenderTo(`
+      class Test
+      {
+          public override void ThisIsAVeryLongMethodName() =>
+              this.WithAVeryLongPropertyName.AndAnEvenLongerMemberName;
+      }
+  `);
+  });
+
+  it("split parameters first if too long", () => {
+    expect(
+      <TestNamespace printWidth={60}>
+        <ClassDeclaration name="Test">
+          <Method
+            public
+            override
+            name="ThisIsAVeryLongMethodName"
+            expression
+            parameters={[
+              { name: "firstParameter", type: "int" },
+              { name: "secondParameter", type: "string" },
+            ]}
+          >
+            this.Short
+          </Method>
+        </ClassDeclaration>
+      </TestNamespace>,
+    ).toRenderTo(`
+      class Test
+      {
+          public override void ThisIsAVeryLongMethodName(
+              int firstParameter,
+              string secondParameter
+          ) => this.Short;
+      }
+  `);
+  });
+});

package/src/components/method/method.tsx

@@ -154,9 +154,12 @@ export function Method(props: MethodProps) {
 
 const ExpressionBody = (props: { children?: Children }) => {
   return (
-    <>
-      {" => "}
-      {props.children};
-    </>
+    <group>
+      {" =>"}
+      <indent>
+        <line />
+        {props.children};
+      </indent>
+    </group>
   );
 };

package/src/components/parameters/parameters.tsx

@@ -51,9 +51,14 @@ export function Parameters(props: ParametersProps) {
     <group>
       {"("}
       {props.parameters && (
-        <Indent softline>
+        <Indent nobreak>
           <For each={props.parameters} joiner={", "}>
-            {(param) => <Parameter {...param} />}
+            {(param) => (
+              <>
+                <softline />
+                <Parameter {...param} />
+              </>
+            )}
           </For>
         </Indent>
       )}

package/src/components/property/property.test.tsx

@@ -207,3 +207,28 @@ it("specify attributes", () => {
     }
   `);
 });
+
+describe("format", () => {
+  it("split after = if initializer too long", () => {
+    expect(
+      <TestNamespace printWidth={60}>
+        <ClassDeclaration name="Test">
+          <Property
+            public
+            get
+            set
+            name="ThisIsAVeryLongPropertyName"
+            type="string"
+            initializer={`"Some very long initializer value"`}
+          />
+        </ClassDeclaration>
+      </TestNamespace>,
+    ).toRenderTo(`
+      class Test
+      {
+          public string ThisIsAVeryLongPropertyName { get; set; } =
+              "Some very long initializer value";
+      }
+  `);
+  });
+});

package/src/components/property/property.tsx

@@ -1,7 +1,5 @@
 import {
-  Block,
   Children,
-  code,
   createSymbolSlot,
   List,
   MemberDeclaration,
@@ -142,15 +140,28 @@ export function Property(props: PropertyProps) {
       <AttributeList attributes={props.attributes} endline />
       {modifiers}
       <TypeSlot>{props.type}</TypeSlot>
-      {props.nullable && "?"} <MemberName />{" "}
-      <Block newline inline>
-        <List joiner=" ">
-          {props.get && "get;"}
-          {props.set && "set;"}
-          {props.init && "init;"}
-        </List>
-      </Block>
-      {props.initializer && code` = ${props.initializer};`}
+      {props.nullable && "?"} <MemberName /> {"{ "}
+      <List joiner=" ">
+        {props.get && "get;"}
+        {props.set && "set;"}
+        {props.init && "init;"}
+      </List>
+      {" }"}
+      {props.initializer && (
+        <PropertyInitializer>{props.initializer}</PropertyInitializer>
+      )}
     </MemberDeclaration>
   );
 }
+
+function PropertyInitializer(props: { children: Children }) {
+  return (
+    <group>
+      {" ="}
+      <indent>
+        <line />
+        {props.children};
+      </indent>
+    </group>
+  );
+}

package/src/components/var/declaration.tsx

@@ -19,6 +19,9 @@ export interface VarDeclarationProps
   refkey?: Refkey;
   /** Variable value */
   children?: Children;
+
+  /** Constant variable. Add the const modifier. */
+  const?: boolean;
 }
 
 /**
@@ -46,8 +49,12 @@ export function VarDeclaration(props: VarDeclarationProps) {
   const sym = createVariableSymbol(props.name, {
     refkeys: props.refkey,
   });
+  if (props.const && !props.type) {
+    throw new Error("Implicitly-typed variables cannot be constant");
+  }
   return (
     <Declaration symbol={sym}>
+      {props.const ? "const " : ""}
       {props.type ?? "var"} <Name /> = {props.children};
     </Declaration>
   );

package/temp/api.json

@@ -13886,6 +13886,33 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!VarDeclarationProps#const:member",
+              "docComment": "/**\n * Constant variable. Add the const modifier.\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "const?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "const",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!VarDeclarationProps#name:member",

package/test/utils.tsx

@@ -3,12 +3,15 @@ import * as coretest from "@alloy-js/core/testing";
 import { expect } from "vitest";
 import * as csharp from "../src/index.js";
 
-export function TestNamespace(props: {
+export interface TestNamespaceProps extends csharp.CSharpFormatOptions {
   children: core.Children;
-}): core.Children {
+}
+export function TestNamespace(props: TestNamespaceProps): core.Children {
   return (
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
-      <csharp.SourceFile path="Test.cs">{props.children}</csharp.SourceFile>
+      <csharp.SourceFile path="Test.cs" {...props}>
+        {props.children}
+      </csharp.SourceFile>
     </core.Output>
   );
 }