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

package/dist/src/components/ClassDeclaration.d.ts

@@ -73,12 +73,4 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
  * ```
  */
 export declare function ClassDeclaration(props: ClassDeclarationProps): core.Children;
-export interface ClassMemberProps extends AccessModifiers {
-    name: string;
-    type: core.Children;
-    refkey?: core.Refkey;
-    /** Doc comment */
-    doc?: core.Children;
-}
-export declare function ClassMember(props: ClassMemberProps): core.Children;
 //# sourceMappingURL=ClassDeclaration.d.ts.map

package/dist/src/components/ClassDeclaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClassDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/ClassDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EACL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAiB,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAUD,MAAM,WAAW,qBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,cAAc;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAEjD,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAEzB,uCAAuC;IACvC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAEjC;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBA6C5D;AAGD,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CACrB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,iBA0BlD"}
+{"version":3,"file":"ClassDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/ClassDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EACL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAiB,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAUD,MAAM,WAAW,qBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,cAAc;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAEjD,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAEzB,uCAAuC;IACvC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAEjC;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBA6C5D"}

package/dist/src/components/ClassDeclaration.js

@@ -4,7 +4,7 @@ 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";
-import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
+import { CSharpMemberScope } from "../symbols/scopes.js";
 import { AttributeList } from "./attributes/attributes.js";
 import { DocWhen } from "./doc/comment.js";
 import { Name } from "./Name.js";
@@ -89,34 +89,4 @@ export function ClassDeclaration(props) {
       }))];
     }
   });
-}
-
-// properties for creating a class member
-
-// a C# class member (i.e. a field within a class like "private int count")
-export function ClassMember(props) {
-  let nameElement = "class-member-private";
-  if (props.public) {
-    nameElement = "class-member-public";
-  }
-  const name = useCSharpNamePolicy().getName(props.name, nameElement);
-  const scope = useCSharpScope();
-  if (scope.kind !== "member" || scope.name !== "class-decl") {
-    throw new Error("can't define a class member outside of a class-decl scope");
-  }
-  const memberSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? core.refkey(props.name)
-  });
-  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
-  return _$createComponent(core.Declaration, {
-    symbol: memberSymbol,
-    get children() {
-      return [_$createComponent(DocWhen, {
-        get doc() {
-          return props.doc;
-        }
-      }), modifiers, _$memo(() => props.type), " ", _$createComponent(Name, {})];
-    }
-  });
 }

package/dist/src/components/field/field.d.ts

@@ -0,0 +1,19 @@
+import { Children, Refkey } from "@alloy-js/core";
+import { AccessModifiers } from "../../modifiers.js";
+/** Field modifiers. */
+export interface FieldModifiers {
+    readonly new?: boolean;
+    readonly static?: boolean;
+    readonly readonly?: boolean;
+    readonly volatile?: boolean;
+}
+export interface FieldProps extends AccessModifiers, FieldModifiers {
+    name: string;
+    type: Children;
+    refkey?: Refkey;
+    /** Doc comment */
+    doc?: Children;
+}
+/** Render a c# field */
+export declare function Field(props: FieldProps): Children;
+//# sourceMappingURL=field.d.ts.map

package/dist/src/components/field/field.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"field.d.ts","sourceRoot":"","sources":["../../../../src/components/field/field.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAM5B,uBAAuB;AACvB,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AASD,MAAM,WAAW,UAAW,SAAQ,eAAe,EAAE,cAAc;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,wBAAwB;AACxB,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,YAiCtC"}

package/dist/src/components/field/field.js

@@ -0,0 +1,38 @@
+import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
+import { Declaration, Name, refkey } 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";
+import { useCSharpScope } from "../../symbols/scopes.js";
+import { DocWhen } from "../doc/comment.js";
+
+/** Field modifiers. */
+
+const getModifiers = makeModifiers(["new", "static", "readonly", "volatile"]);
+/** Render a c# field */
+export function Field(props) {
+  let nameElement = "class-member-private";
+  if (props.public || props.protected || props.internal) {
+    nameElement = "class-member-public";
+  }
+  const name = useCSharpNamePolicy().getName(props.name, nameElement);
+  const scope = useCSharpScope();
+  if (scope.kind !== "member" || scope.name !== "class-decl" && scope.name !== "struct-decl") {
+    throw new Error("can't define a class member outside of a class or struct scope");
+  }
+  const memberSymbol = new CSharpOutputSymbol(name, {
+    scope,
+    refkeys: props.refkey ?? refkey(props.name)
+  });
+  const modifiers = computeModifiersPrefix([getAccessModifier(props), getModifiers(props)]);
+  return _$createComponent(Declaration, {
+    symbol: memberSymbol,
+    get children() {
+      return [_$createComponent(DocWhen, {
+        get doc() {
+          return props.doc;
+        }
+      }), modifiers, _$memo(() => props.type), " ", _$createComponent(Name, {}), ";"];
+    }
+  });
+}

package/dist/src/components/field/field.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=field.test.d.ts.map

package/dist/src/components/field/field.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"field.test.d.ts","sourceRoot":"","sources":["../../../../src/components/field/field.test.tsx"],"names":[],"mappings":""}

package/dist/src/components/field/field.test.js

@@ -0,0 +1,143 @@
+import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { List } from "@alloy-js/core";
+import { describe, expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.js";
+import { ClassDeclaration } from "../ClassDeclaration.js";
+import { Field } from "./field.js";
+function Wrapper(props) {
+  return _$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        "public": true,
+        name: "TestClass",
+        get children() {
+          return props.children;
+        }
+      });
+    }
+  });
+}
+it("declares multiple fields", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(List, {
+        get children() {
+          return [_$createComponent(Field, {
+            "public": true,
+            name: "MemberOne",
+            type: "string"
+          }), _$createComponent(Field, {
+            "public": true,
+            name: "MemberTwo",
+            type: "int"
+          })];
+        }
+      });
+    }
+  })).toRenderTo(`
+    public class TestClass
+    {
+      public string MemberOne;
+      public int MemberTwo;
+    }
+  `);
+});
+describe("modifiers", () => {
+  describe("access modifiers", () => {
+    it.each(["public", "private", "protected", "internal"])("%s", accessModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(Field, _$mergeProps({
+            [accessModifier]: true
+          }, {
+            name: "TestProp",
+            type: "string"
+          }));
+        }
+      })).toRenderTo(`
+        public class TestClass
+        {
+          ${accessModifier} string ${accessModifier === "private" ? "_testProp" : "TestProp"};
+        }
+      `);
+    });
+  });
+  describe("modifiers", () => {
+    it.each(["new", "static", "readonly", "volatile"])("%s", methodModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(Field, _$mergeProps({
+            [methodModifier]: true
+          }, {
+            name: "TestField",
+            type: "string"
+          }));
+        }
+      })).toRenderTo(`
+        public class TestClass
+        {
+          ${methodModifier} string _testField;
+        }
+      `);
+    });
+  });
+  it("combine modifiers", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(Field, {
+          "public": true,
+          "new": true,
+          name: "TestField",
+          type: "string"
+        });
+      }
+    })).toRenderTo(`
+        public class TestClass
+        {
+          public new string TestField;
+        }
+      `);
+  });
+});
+describe("naming", () => {
+  it("public field are PascalCase", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return _$createComponent(Field, {
+              "public": true,
+              name: "member_one",
+              type: "string"
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      public class TestClass
+      {
+        public string MemberOne;
+      }
+    `);
+  });
+  it("private field are camelCase with _ prefix", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return _$createComponent(Field, {
+              "private": true,
+              name: "member_one",
+              type: "string"
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+    public class TestClass
+    {
+      private string _memberOne;
+    }
+  `);
+  });
+});

package/dist/src/components/index.d.ts

@@ -5,6 +5,7 @@ export * from "./Declaration.js";
 export * from "./doc/comment.jsx";
 export * from "./doc/from-markdown.jsx";
 export * from "./EnumDeclaration.jsx";
+export * from "./field/field.jsx";
 export * from "./interface/declaration.js";
 export * from "./interface/method.js";
 export * from "./interface/property.js";

package/dist/src/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}

package/dist/src/components/index.js

@@ -5,6 +5,7 @@ export * from "./Declaration.js";
 export * from "./doc/comment.js";
 export * from "./doc/from-markdown.js";
 export * from "./EnumDeclaration.js";
+export * from "./field/field.js";
 export * from "./interface/declaration.js";
 export * from "./interface/method.js";
 export * from "./interface/property.js";

package/dist/src/components/stc/index.d.ts

@@ -2,7 +2,7 @@ import * as core from "@alloy-js/core";
 import * as base from "../index.js";
 export declare const ClassDeclaration: core.StcSignature<base.ClassDeclarationProps>;
 export declare const Constructor: core.StcSignature<base.ConstructorProps>;
-export declare const ClassMember: core.StcSignature<base.ClassMemberProps>;
+export declare const Field: core.StcSignature<base.FieldProps>;
 export declare const ClassMethod: core.StcSignature<base.MethodProps>;
 export declare const EnumDeclaration: core.StcSignature<base.EnumDeclarationProps>;
 export declare const EnumMember: core.StcSignature<base.EnumMemberProps>;

package/dist/src/components/stc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/stc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,qCAAwB,CAAC;AACjD,eAAO,MAAM,eAAe,8CAAiC,CAAC;AAC9D,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,SAAS,wCAA2B,CAAC;AAClD,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,cAAc,6CAAgC,CAAC;AAC5D,eAAO,MAAM,iBAAiB,gDAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/stc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,KAAK,oCAAuB,CAAC;AAC1C,eAAO,MAAM,WAAW,qCAAwB,CAAC;AACjD,eAAO,MAAM,eAAe,8CAAiC,CAAC;AAC9D,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,SAAS,wCAA2B,CAAC;AAClD,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,cAAc,6CAAgC,CAAC;AAC5D,eAAO,MAAM,iBAAiB,gDAAmC,CAAC"}

package/dist/src/components/stc/index.js

@@ -2,7 +2,7 @@ import * as core from "@alloy-js/core";
 import * as base from "../index.js";
 export const ClassDeclaration = core.stc(base.ClassDeclaration);
 export const Constructor = core.stc(base.Constructor);
-export const ClassMember = core.stc(base.ClassMember);
+export const Field = core.stc(base.Field);
 export const ClassMethod = core.stc(base.Method);
 export const EnumDeclaration = core.stc(base.EnumDeclaration);
 export const EnumMember = core.stc(base.EnumMember);

package/dist/src/components/struct/declaration.d.ts

@@ -43,6 +43,8 @@ export interface StructDeclarationProps extends Omit<core.DeclarationProps, "nam
      * ```
      */
     attributes?: AttributesProp;
+    /** Interfaces this struct implements */
+    interfaceTypes?: core.Children[];
 }
 /**
  * CSharp struct declaration.

package/dist/src/components/struct/declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/struct/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBAiC9D"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/struct/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B,wCAAwC;IACxC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBAwC9D"}

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

@@ -4,6 +4,7 @@ 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";
@@ -208,4 +209,47 @@ it("define constructor", () => {
       public Test() {}
     }
   `);
+});
+it("defines fields", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        "public": true,
+        name: "TestClass",
+        get children() {
+          return _$createComponent(List, {
+            get children() {
+              return [_$createComponent(Field, {
+                "public": true,
+                name: "MemberOne",
+                type: "string"
+              }), _$createComponent(Field, {
+                "public": true,
+                name: "MemberTwo",
+                type: "int"
+              })];
+            }
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    public struct TestClass
+    {
+      public string MemberOne;
+      public 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/src/name-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,UAAU,GACV,QAAQ,GACR,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,QAAQ,GACR,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAoBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}
+{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,UAAU,GACV,QAAQ,GACR,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,QAAQ,GACR,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAsBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}

package/dist/src/name-policy.js

@@ -20,6 +20,8 @@ export function createCSharpNamePolicy() {
         return changecase.pascalCase(name);
       case "constant":
         return changecase.constantCase(name);
+      case "class-member-private":
+        return `_${changecase.camelCase(name)}`;
       default:
         return changecase.camelCase(name);
     }

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

@@ -4,9 +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, {
@@ -105,14 +106,14 @@ it("declares class with some members", () => {
     "public": true,
     name: "TestClass",
     get children() {
-      return _$createComponent(core.StatementList, {
+      return _$createComponent(List, {
         get children() {
-          return [_$createComponent(csharp.ClassMember, {
+          return [_$createComponent(Field, {
             "public": true,
             name: "MemberOne",
             type: "string"
-          }), _$createComponent(csharp.ClassMember, {
-            "private": true,
+          }), _$createComponent(Field, {
+            "public": true,
             name: "MemberTwo",
             type: "int"
           })];
@@ -126,7 +127,7 @@ it("declares class with some members", () => {
         public class TestClass
         {
             public string MemberOne;
-            private int memberTwo;
+            public int MemberTwo;
         }
     }
   `);
@@ -212,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.Method, {
+                  }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,
@@ -245,7 +246,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();
@@ -387,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(Constructor, {
+      }), _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
         "public": true,
         parameters: ctorParams,
         get children() {
@@ -414,12 +415,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;
             }
         }
     }
@@ -445,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",
@@ -459,7 +460,7 @@ it("supports class member doc comments", () => {
     class Test
     {
       /// This is a member
-      public int Member
+      public int Member;
     }
   `);
 });