@alloy-js/csharp 0.19.0-dev.4 → 0.19.0-dev.7

package/temp/api.json

@@ -1078,196 +1078,6 @@
             }
           ]
         },
-        {
-          "kind": "Function",
-          "canonicalReference": "@alloy-js/csharp!ClassMember:function(1)",
-          "docComment": "",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export declare function ClassMember(props: "
-            },
-            {
-              "kind": "Reference",
-              "text": "ClassMemberProps",
-              "canonicalReference": "@alloy-js/csharp!ClassMemberProps:interface"
-            },
-            {
-              "kind": "Content",
-              "text": "): "
-            },
-            {
-              "kind": "Reference",
-              "text": "core.Children",
-              "canonicalReference": "@alloy-js/core!Children:type"
-            },
-            {
-              "kind": "Content",
-              "text": ";"
-            }
-          ],
-          "fileUrlPath": "src/components/ClassDeclaration.tsx",
-          "returnTypeTokenRange": {
-            "startIndex": 3,
-            "endIndex": 4
-          },
-          "releaseTag": "Public",
-          "overloadIndex": 1,
-          "parameters": [
-            {
-              "parameterName": "props",
-              "parameterTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              },
-              "isOptional": false
-            }
-          ],
-          "name": "ClassMember"
-        },
-        {
-          "kind": "Interface",
-          "canonicalReference": "@alloy-js/csharp!ClassMemberProps:interface",
-          "docComment": "",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export interface ClassMemberProps extends "
-            },
-            {
-              "kind": "Reference",
-              "text": "AccessModifiers",
-              "canonicalReference": "@alloy-js/csharp!AccessModifiers:interface"
-            },
-            {
-              "kind": "Content",
-              "text": " "
-            }
-          ],
-          "fileUrlPath": "src/components/ClassDeclaration.tsx",
-          "releaseTag": "Public",
-          "name": "ClassMemberProps",
-          "preserveMemberOrder": false,
-          "members": [
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/csharp!ClassMemberProps#doc:member",
-              "docComment": "/**\n * Doc comment\n */\n",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "doc?: "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "core.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!ClassMemberProps#name:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "name: "
-                },
-                {
-                  "kind": "Content",
-                  "text": "string"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": false,
-              "releaseTag": "Public",
-              "name": "name",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            },
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/csharp!ClassMemberProps#refkey:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "refkey?: "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "core.Refkey",
-                  "canonicalReference": "@alloy-js/core!Refkey:type"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": true,
-              "releaseTag": "Public",
-              "name": "refkey",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            },
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/csharp!ClassMemberProps#type:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "type: "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "core.Children",
-                  "canonicalReference": "@alloy-js/core!Children:type"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": false,
-              "releaseTag": "Public",
-              "name": "type",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            }
-          ],
-          "extendsTokenRanges": [
-            {
-              "startIndex": 1,
-              "endIndex": 2
-            }
-          ]
-        },
         {
           "kind": "Interface",
           "canonicalReference": "@alloy-js/csharp!ClassModifiers:interface",
@@ -4239,6 +4049,335 @@
           ],
           "extendsTokenRanges": []
         },
+        {
+          "kind": "Function",
+          "canonicalReference": "@alloy-js/csharp!Field:function(1)",
+          "docComment": "/**\n * Render a c# field\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export declare function Field(props: "
+            },
+            {
+              "kind": "Reference",
+              "text": "FieldProps",
+              "canonicalReference": "@alloy-js/csharp!FieldProps:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "): "
+            },
+            {
+              "kind": "Reference",
+              "text": "Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
+            },
+            {
+              "kind": "Content",
+              "text": ";"
+            }
+          ],
+          "fileUrlPath": "src/components/field/field.tsx",
+          "returnTypeTokenRange": {
+            "startIndex": 3,
+            "endIndex": 4
+          },
+          "releaseTag": "Public",
+          "overloadIndex": 1,
+          "parameters": [
+            {
+              "parameterName": "props",
+              "parameterTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              },
+              "isOptional": false
+            }
+          ],
+          "name": "Field"
+        },
+        {
+          "kind": "Interface",
+          "canonicalReference": "@alloy-js/csharp!FieldModifiers:interface",
+          "docComment": "/**\n * Field modifiers.\n */\n",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export interface FieldModifiers "
+            }
+          ],
+          "fileUrlPath": "src/components/field/field.tsx",
+          "releaseTag": "Public",
+          "name": "FieldModifiers",
+          "preserveMemberOrder": false,
+          "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldModifiers#new:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly new?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "new",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldModifiers#readonly:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly readonly?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "readonly",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldModifiers#static:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly static?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "static",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldModifiers#volatile:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly volatile?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "volatile",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            }
+          ],
+          "extendsTokenRanges": []
+        },
+        {
+          "kind": "Interface",
+          "canonicalReference": "@alloy-js/csharp!FieldProps:interface",
+          "docComment": "",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export interface FieldProps extends "
+            },
+            {
+              "kind": "Reference",
+              "text": "AccessModifiers",
+              "canonicalReference": "@alloy-js/csharp!AccessModifiers:interface"
+            },
+            {
+              "kind": "Content",
+              "text": ", "
+            },
+            {
+              "kind": "Reference",
+              "text": "FieldModifiers",
+              "canonicalReference": "@alloy-js/csharp!FieldModifiers:interface"
+            },
+            {
+              "kind": "Content",
+              "text": " "
+            }
+          ],
+          "fileUrlPath": "src/components/field/field.tsx",
+          "releaseTag": "Public",
+          "name": "FieldProps",
+          "preserveMemberOrder": false,
+          "members": [
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldProps#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!FieldProps#name:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "name: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "string"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": false,
+              "releaseTag": "Public",
+              "name": "name",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldProps#refkey:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "refkey?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Refkey",
+                  "canonicalReference": "@alloy-js/core!Refkey:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "refkey",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!FieldProps#type:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "type: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": false,
+              "releaseTag": "Public",
+              "name": "type",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            }
+          ],
+          "extendsTokenRanges": [
+            {
+              "startIndex": 1,
+              "endIndex": 2
+            },
+            {
+              "startIndex": 3,
+              "endIndex": 4
+            }
+          ]
+        },
         {
           "kind": "Function",
           "canonicalReference": "@alloy-js/csharp!getAccessModifier:function(1)",
@@ -8270,6 +8409,38 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!StructDeclarationProps#interfaceTypes:member",
+              "docComment": "/**\n * Interfaces this struct implements\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "interfaceTypes?: "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "core.Children",
+                  "canonicalReference": "@alloy-js/core!Children:type"
+                },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "interfaceTypes",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!StructDeclarationProps#name:member",

package/test/class-declaration.test.tsx

@@ -3,15 +3,11 @@ import { List, refkey } from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import { Attribute } from "../src/components/attributes/attributes.jsx";
+import { Field } from "../src/components/field/field.jsx";
 import { Constructor } from "../src/components/stc/index.js";
 import { TypeParameterProps } from "../src/components/type-parameters/type-parameter.jsx";
 import * as csharp from "../src/index.js";
-import {
-  ClassDeclaration,
-  ClassMember,
-  Property,
-  SourceFile,
-} from "../src/index.js";
+import { ClassDeclaration, Property, SourceFile } from "../src/index.js";
 import * as utils from "./utils.jsx";
 
 it("declares class with no members", () => {
@@ -98,10 +94,10 @@ describe("base", () => {
 it("declares class with some members", () => {
   const res = utils.toSourceText(
     <csharp.ClassDeclaration public name="TestClass">
-      <core.StatementList>
-        <csharp.ClassMember public name="MemberOne" type="string" />
-        <csharp.ClassMember private name="MemberTwo" type="int" />
-      </core.StatementList>
+      <List>
+        <Field public name="MemberOne" type="string" />
+        <Field public name="MemberTwo" type="int" />
+      </List>
     </csharp.ClassDeclaration>,
   );
 
@@ -111,7 +107,7 @@ it("declares class with some members", () => {
         public class TestClass
         {
             public string MemberOne;
-            private int memberTwo;
+            public int MemberTwo;
         }
     }
   `);
@@ -183,12 +179,7 @@ it("uses refkeys for members, params, and return type", () => {
           />
           <hbr />
           <csharp.ClassDeclaration public name="TestClass">
-            <csharp.ClassMember
-              private
-              name="MemberOne"
-              type={enumTypeRefkey}
-            />
-            ;
+            <Field private name="MemberOne" type={enumTypeRefkey} />
             <hbr />
             <csharp.Method
               public
@@ -216,7 +207,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();
@@ -351,20 +342,10 @@ it("declares class with constructor params and assigns values to fields", () =>
 
   const res = utils.toSourceText(
     <csharp.ClassDeclaration public name="TestClass">
-      <csharp.ClassMember
-        private
-        name="name"
-        type="string"
-        refkey={thisNameRefkey}
-      />
-      ;<hbr />
-      <csharp.ClassMember
-        private
-        name="size"
-        type="int"
-        refkey={thisSizeRefkey}
-      />
-      ;<hbr />
+      <Field private name="name" type="string" refkey={thisNameRefkey} />
+      <hbr />
+      <Field private name="size" type="int" refkey={thisSizeRefkey} />
+      <hbr />
       <Constructor public parameters={ctorParams}>
         {thisNameRefkey} = {paramNameRefkey};<hbr />
         {thisSizeRefkey} = {paramSizeRefkey};
@@ -379,12 +360,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;
             }
         }
     }
@@ -406,7 +387,7 @@ it("supports class member doc comments", () => {
   expect(
     <utils.TestNamespace>
       <ClassDeclaration name="Test" doc="This is a test">
-        <ClassMember name="Member" public type="int" doc="This is a member" />
+        <Field name="Member" public type="int" doc="This is a member" />
       </ClassDeclaration>
     </utils.TestNamespace>,
   ).toRenderTo(`
@@ -414,7 +395,7 @@ it("supports class member doc comments", () => {
     class Test
     {
       /// This is a member
-      public int Member
+      public int Member;
     }
   `);
 });