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

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

@@ -1,5 +1,6 @@
-import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
+import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
+import { join } from "@alloy-js/core";
 import { computeModifiersPrefix, getAccessModifier, makeModifiers } from "../../modifiers.js";
 import { useCSharpNamePolicy } from "../../name-policy.js";
 import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
@@ -42,6 +43,9 @@ export function StructDeclaration(props) {
     owner: thisStructSymbol
   });
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getStructModifiers(props)]);
+  const base = props.interfaceTypes && props.interfaceTypes.length > 0 ? [" : ", _$memo(() => join(props.interfaceTypes, {
+    joiner: ", "
+  }))] : null;
   return _$createComponent(core.Declaration, {
     symbol: thisStructSymbol,
     get children() {
@@ -58,7 +62,7 @@ export function StructDeclaration(props) {
         get parameters() {
           return props.typeParameters;
         }
-      })), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+      })), base, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
         get parameters() {
           return props.typeParameters;
         }

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

@@ -1,8 +1,11 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
-import { List, refkey } from "@alloy-js/core";
+import { List, refkey, StatementList } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { Attribute } from "../attributes/attributes.js";
+import { Constructor } from "../constructor/constructor.js";
+import { Field } from "../field/field.js";
+import { Method } from "../method/method.js";
 import { Property } from "../property/property.js";
 import { SourceFile } from "../SourceFile.js";
 import { StructDeclaration } from "./declaration.js";
@@ -168,4 +171,85 @@ it("specify attributes", () => {
     [Test]
     struct Test;
   `);
+});
+it("define methods", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        name: "Test",
+        get children() {
+          return _$createComponent(Method, {
+            name: "MethodOne"
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    struct Test
+    {
+      void MethodOne() {}
+    }
+  `);
+});
+it("define constructor", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        name: "Test",
+        get children() {
+          return _$createComponent(Constructor, {
+            "public": true
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    struct Test
+    {
+      public Test() {}
+    }
+  `);
+});
+it("defines fields", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        "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"
+              })];
+            }
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    public struct TestClass
+    {
+      public string MemberOne;
+      private int memberTwo;
+    }
+  `);
+});
+it("define multiple interface types", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        name: "Test",
+        interfaceTypes: ["Foo", "Bar"]
+      });
+    }
+  })).toRenderTo(`
+      struct Test : Foo, Bar;
+  `);
 });

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

@@ -4,8 +4,10 @@ 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.js";
+import { Field } from "../src/components/field/field.js";
+import { Constructor } from "../src/components/stc/index.js";
 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.js";
 it("declares class with no members", () => {
   expect(_$createComponent(utils.TestNamespace, {
@@ -106,11 +108,11 @@ it("declares class with some members", () => {
     get children() {
       return _$createComponent(core.StatementList, {
         get children() {
-          return [_$createComponent(csharp.ClassMember, {
+          return [_$createComponent(Field, {
             "public": true,
             name: "MemberOne",
             type: "string"
-          }), _$createComponent(csharp.ClassMember, {
+          }), _$createComponent(Field, {
             "private": true,
             name: "MemberTwo",
             type: "int"
@@ -137,10 +139,10 @@ it("declares class with some methods", () => {
     get children() {
       return _$createComponent(core.List, {
         get children() {
-          return [_$createComponent(csharp.ClassMethod, {
+          return [_$createComponent(csharp.Method, {
             "public": true,
             name: "MethodOne"
-          }), _$createComponent(csharp.ClassMethod, {
+          }), _$createComponent(csharp.Method, {
             "private": true,
             virtual: true,
             name: "MethodTwo"
@@ -211,11 +213,11 @@ it("uses refkeys for members, params, and return type", () => {
                 "public": true,
                 name: "TestClass",
                 get children() {
-                  return [_$createComponent(csharp.ClassMember, {
+                  return [_$createComponent(Field, {
                     "private": true,
                     name: "MemberOne",
                     type: enumTypeRefkey
-                  }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMethod, {
+                  }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,
@@ -353,7 +355,7 @@ it("declares class with constructor", () => {
     "public": true,
     name: "TestClass",
     get children() {
-      return _$createComponent(csharp.ClassConstructor, {
+      return _$createComponent(Constructor, {
         "public": true
       });
     }
@@ -386,17 +388,17 @@ it("declares class with constructor params and assigns values to fields", () =>
     "public": true,
     name: "TestClass",
     get children() {
-      return [_$createComponent(csharp.ClassMember, {
+      return [_$createComponent(Field, {
         "private": true,
         name: "name",
         type: "string",
         refkey: thisNameRefkey
-      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMember, {
+      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(Field, {
         "private": true,
         name: "size",
         type: "int",
         refkey: thisSizeRefkey
-      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassConstructor, {
+      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
         "public": true,
         parameters: ctorParams,
         get children() {
@@ -444,7 +446,7 @@ it("supports class member doc comments", () => {
         name: "Test",
         doc: "This is a test",
         get children() {
-          return _$createComponent(ClassMember, {
+          return _$createComponent(Field, {
             name: "Member",
             "public": true,
             type: "int",

package/dist/test/using.test.js

@@ -97,7 +97,7 @@ it("adds using statement across namespaces", () => {
                 "public": true,
                 name: "Client",
                 get children() {
-                  return _$createComponent(csharp.ClassMethod, {
+                  return _$createComponent(csharp.Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,