@alloy-js/csharp 0.23.0-dev.6 → 0.23.0-dev.8

package/src/components/constructor/constructor.tsx

@@ -1,5 +1,12 @@
 import { MethodScope } from "#components/method-scope.jsx";
-import { Block, MemberDeclaration, MemberName, Refkey } from "@alloy-js/core";
+import {
+  Block,
+  For,
+  Indent,
+  MemberDeclaration,
+  MemberName,
+  Refkey,
+} from "@alloy-js/core";
 import { Children } from "@alloy-js/core/jsx-runtime";
 import {
   AccessModifiers,
@@ -8,6 +15,7 @@ import {
 } from "../../modifiers.js";
 import { useNamedTypeScope } from "../../scopes/contexts.js";
 import { MethodSymbol } from "../../symbols/method.js";
+import { DocWhen } from "../doc/comment.jsx";
 import { ParameterProps, Parameters } from "../parameters/parameters.jsx";
 
 /**
@@ -17,14 +25,57 @@ export interface ConstructorProps extends AccessModifiers {
   /** Constructor parameters */
   parameters?: ParameterProps[];
 
+  /** Doc comment */
+  doc?: Children;
+
   /** Refkey */
   refkey?: Refkey;
 
+  /**
+   * Arguments to pass to the base class constructor.
+   * Renders `: base(args)` between parameter list and body.
+   *
+   * @example
+   * ```tsx
+   * <Constructor public baseConstructor={["name", "42"]}>
+   * ```
+   * This will produce:
+   * ```csharp
+   * public MyClass(...) : base(name, 42)
+   * {
+   * }
+   * ```
+   */
+  baseConstructor?: Children[];
+
+  /**
+   * Arguments to pass to another constructor in the same class.
+   * Renders `: this(args)` between parameter list and body.
+   *
+   * @example
+   * ```tsx
+   * <Constructor public thisConstructor={["0", "0"]}>
+   * ```
+   * This will produce:
+   * ```csharp
+   * public MyClass() : this(0, 0)
+   * {
+   * }
+   * ```
+   */
+  thisConstructor?: Children[];
+
   /** Constructor body */
   children?: Children;
 }
 
 export function Constructor(props: ConstructorProps) {
+  if (props.baseConstructor && props.thisConstructor) {
+    throw new Error(
+      "Cannot use both 'baseConstructor' and 'thisConstructor' on the same constructor",
+    );
+  }
+
   const scope = useNamedTypeScope();
 
   const name = scope.ownerSymbol.name;
@@ -35,14 +86,48 @@ export function Constructor(props: ConstructorProps) {
 
   const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
 
+  const initializer =
+    props.baseConstructor ?
+      <ConstructorInitializer keyword="base" args={props.baseConstructor} />
+    : props.thisConstructor ?
+      <ConstructorInitializer keyword="this" args={props.thisConstructor} />
+    : null;
+
   return (
     <MemberDeclaration symbol={ctorSymbol}>
       <MethodScope>
+        <DocWhen doc={props.doc} />
         {modifiers}
         <MemberName />
         <Parameters parameters={props.parameters} />
+        {initializer}
         <Block newline>{props.children}</Block>
       </MethodScope>
     </MemberDeclaration>
   );
 }
+
+interface ConstructorInitializerProps {
+  keyword: "base" | "this";
+  args: Children[];
+}
+
+function ConstructorInitializer(props: ConstructorInitializerProps) {
+  return (
+    <group>
+      {" : "}
+      {props.keyword}(
+      <Indent nobreak>
+        <For each={props.args} joiner={", "}>
+          {(arg) => (
+            <>
+              <softline />
+              {arg}
+            </>
+          )}
+        </For>
+      </Indent>
+      <softline />)
+    </group>
+  );
+}

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

@@ -45,3 +45,23 @@ it("takes a namekey", () => {
     enum MyEnum;
   `);
 });
+
+it("renders doc comment", () => {
+  const res = toSourceText(
+    <EnumDeclaration public name="TestEnum" doc="This is a test enum">
+      <EnumMember name="One" />,<hbr />
+      <EnumMember name="Two" />
+    </EnumDeclaration>,
+  );
+
+  expect(res).toBe(d`
+    namespace TestCode;
+
+    /// This is a test enum
+    public enum TestEnum
+    {
+        One,
+        Two
+    }
+  `);
+});

package/src/components/enum/declaration.tsx

@@ -14,11 +14,14 @@ import {
 import { useCSharpNamePolicy } from "../../name-policy.js";
 import { createNamedTypeScope } from "../../scopes/factories.js";
 import { createNamedTypeSymbol } from "../../symbols/factories.js";
+import { DocWhen } from "../doc/comment.jsx";
 import { Name } from "../Name.jsx";
 
 // properties for creating an enum
 export interface EnumDeclarationProps extends AccessModifiers {
   name: string | Namekey;
+  /** Doc comment */
+  doc?: Children;
   refkey?: Refkey | Refkey[];
   children?: Children;
 }
@@ -54,6 +57,7 @@ export function EnumDeclaration(props: EnumDeclarationProps) {
 
   return (
     <Declaration symbol={symbol}>
+      <DocWhen doc={props.doc} />
       {modifiers}enum <Name />
       {!props.children && ";"}
       {props.children && (

package/src/components/enum/member.test.tsx

@@ -43,3 +43,24 @@ it("takes a namekey", () => {
     Foo.MyMember;
   `);
 });
+
+it("renders doc comment", () => {
+  const res = toSourceText(
+    <EnumDeclaration public name="TestEnum">
+      <EnumMember name="One" doc="First value" />,<hbr />
+      <EnumMember name="Two" doc="Second value" />
+    </EnumDeclaration>,
+  );
+
+  expect(res).toBe(d`
+    namespace TestCode;
+
+    public enum TestEnum
+    {
+        /// First value
+        One,
+        /// Second value
+        Two
+    }
+  `);
+});

package/src/components/enum/member.tsx

@@ -1,4 +1,5 @@
 import {
+  Children,
   createSymbol,
   MemberDeclaration,
   MemberName,
@@ -8,10 +9,13 @@ import {
 import { useCSharpNamePolicy } from "../../name-policy.js";
 import { useNamedTypeScope } from "../../scopes/contexts.js";
 import { CSharpSymbol } from "../../symbols/csharp.js";
+import { DocWhen } from "../doc/comment.jsx";
 
 // properties for creating a C# enum member
 export interface EnumMemberProps {
   name: string | Namekey;
+  /** Doc comment */
+  doc?: Children;
   refkey?: Refkey;
 }
 
@@ -41,6 +45,7 @@ export function EnumMember(props: EnumMemberProps) {
 
   return (
     <MemberDeclaration symbol={thisEnumValueSymbol}>
+      <DocWhen doc={props.doc} />
       <MemberName />
     </MemberDeclaration>
   );

package/temp/api.json

@@ -2305,6 +2305,38 @@
           "name": "ConstructorProps",
           "preserveMemberOrder": false,
           "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!ConstructorProps#baseConstructor:member",
+              "docComment": "/**\n * Arguments to pass to the base class constructor.\n * Renders `: base(args)` between parameter list and body.\n *\n * @example\n * ```tsx\n * <Constructor public baseConstructor={[\"name\", \"42\"]}>\n * ```\n *\n * This will produce:\n * ```csharp\n * public MyClass(...) : base(name, 42)\n * {\n * }\n * ```\n *\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "baseConstructor?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "baseConstructor",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!ConstructorProps#children:member",
@@ -2333,6 +2365,34 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!ConstructorProps#doc:member",
+              "docComment": "/**\n * Doc comment\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "doc?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "doc",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!ConstructorProps#parameters:member",
@@ -2392,6 +2452,38 @@
                 "startIndex": 1,
                 "endIndex": 2
               }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!ConstructorProps#thisConstructor:member",
+              "docComment": "/**\n * Arguments to pass to another constructor in the same class.\n * Renders `: this(args)` between parameter list and body.\n *\n * @example\n * ```tsx\n * <Constructor public thisConstructor={[\"0\", \"0\"]}>\n * ```\n *\n * This will produce:\n * ```csharp\n * public MyClass() : this(0, 0)\n * {\n * }\n * ```\n *\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "thisConstructor?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "thisConstructor",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
             }
           ],
           "extendsTokenRanges": [
@@ -8184,6 +8276,34 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!EnumDeclarationProps#doc:member",
+              "docComment": "/**\n * Doc comment\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "doc?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "doc",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!EnumDeclarationProps#name:member",
@@ -8359,10 +8479,6 @@
               "kind": "Content",
               "text": "): "
             },
-            {
-              "kind": "Content",
-              "text": "import(\"@alloy-js/core\")."
-            },
             {
               "kind": "Reference",
               "text": "Children",
@@ -8376,7 +8492,7 @@
           "fileUrlPath": "src/components/enum/member.tsx",
           "returnTypeTokenRange": {
             "startIndex": 3,
-            "endIndex": 5
+            "endIndex": 4
           },
           "releaseTag": "Public",
           "overloadIndex": 1,
@@ -8407,6 +8523,34 @@
           "name": "EnumMemberProps",
           "preserveMemberOrder": false,
           "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!EnumMemberProps#doc:member",
+              "docComment": "/**\n * Doc comment\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "doc?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "doc",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!EnumMemberProps#name:member",