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

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

@@ -0,0 +1,53 @@
+import * as core from "@alloy-js/core";
+import { AccessModifiers } from "../modifiers.js";
+import { ParameterProps } from "./Parameters.jsx";
+export interface ClassModifiers {
+    readonly abstract?: boolean;
+    readonly partial?: boolean;
+    readonly sealed?: boolean;
+    readonly static?: boolean;
+}
+export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "nameKind">, AccessModifiers, ClassModifiers {
+    name: string;
+    refkey?: core.Refkey;
+    typeParameters?: Record<string, core.Refkey>;
+}
+/**
+ * CSharp class declaration.
+ * @example
+ * ```tsx
+ * <ClassDeclaration public name="MyClass">
+ *   <ClassMember public name="MyField" type="int" />
+ *   <ClassConstructor>
+ *     <Parameter name="value" type="int" />
+ *     this.MyField = value;
+ *   </ClassConstructor>
+ * </ClassDeclaration>
+ * ```
+ * This will produce:
+ * ```csharp
+ * public class MyClass
+ * {
+ *   public int MyField;
+ *   public MyClass(int value)
+ *   {
+ *     this.MyField = value;
+ *   }
+ * }
+ * ```
+ */
+export declare function ClassDeclaration(props: ClassDeclarationProps): core.Children;
+export interface ClassConstructorProps extends AccessModifiers {
+    parameters?: Array<ParameterProps>;
+    refkey?: core.Refkey;
+    symbol?: core.OutputSymbol;
+    children?: core.Children;
+}
+export declare function ClassConstructor(props: ClassConstructorProps): core.Children;
+export interface ClassMemberProps extends AccessModifiers {
+    name: string;
+    type: core.Children;
+    refkey?: core.Refkey;
+}
+export declare function ClassMember(props: ClassMemberProps): core.Children;
+//# sourceMappingURL=ClassDeclaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ClassDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/ClassDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAE9D,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,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC9C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBAwD5D;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBAkC5D;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;CACtB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,iBAyBlD"}

package/dist/src/components/{Class.js → ClassDeclaration.js}

@@ -1,16 +1,40 @@
 import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
-import { computeModifiersPrefix, getAccessModifier } from "../modifiers.js";
+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 { Name } from "./Name.js";
 import { Parameters } from "./Parameters.js";
+const getClassModifiers = makeModifiers(["abstract", "partial", "sealed", "static"]);
 
 // properties for creating a class
 
-// a C# class declaration
-export function Class(props) {
+/**
+ * CSharp class declaration.
+ * @example
+ * ```tsx
+ * <ClassDeclaration public name="MyClass">
+ *   <ClassMember public name="MyField" type="int" />
+ *   <ClassConstructor>
+ *     <Parameter name="value" type="int" />
+ *     this.MyField = value;
+ *   </ClassConstructor>
+ * </ClassDeclaration>
+ * ```
+ * This will produce:
+ * ```csharp
+ * public class MyClass
+ * {
+ *   public int MyField;
+ *   public MyClass(int value)
+ *   {
+ *     this.MyField = value;
+ *   }
+ * }
+ * ```
+ */
+export function ClassDeclaration(props) {
   const name = useCSharpNamePolicy().getName(props.name, "class");
   const thisClassSymbol = new CSharpOutputSymbol(name, {
     refkeys: props.refkey
@@ -46,7 +70,7 @@ export function Class(props) {
       }
     });
   }
-  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
+  const modifiers = computeModifiersPrefix([getAccessModifier(props), getClassModifiers(props)]);
   return _$createComponent(core.Declaration, {
     symbol: thisClassSymbol,
     get children() {

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

@@ -0,0 +1,34 @@
+import * as core from "@alloy-js/core";
+import { AccessModifiers } from "../modifiers.js";
+export interface EnumDeclarationProps extends AccessModifiers {
+    name: string;
+    refkey?: core.Refkey;
+    children?: core.Children;
+}
+/**
+ * A C# enum declaration
+ * @example
+ * ```tsx
+ * <EnumDeclaration public name="Color">
+ *   <EnumMember name="Red" />
+ *   <EnumMember name="Green" />
+ *   <EnumMember name="Blue" />
+ * </EnumDeclaration>
+ * ```
+ * This will produce:
+ * ```csharp
+ * public enum Color
+ * {
+ *   Red,
+ *   Green,
+ *   Blue
+ * }
+ * ```
+ */
+export declare function EnumDeclaration(props: EnumDeclarationProps): core.Children;
+export interface EnumMemberProps {
+    name: string;
+    refkey?: core.Refkey;
+}
+export declare function EnumMember(props: EnumMemberProps): core.Children;
+//# sourceMappingURL=EnumDeclaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EnumDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/EnumDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,iBAgC1D;AAGD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CACtB;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,iBAmBhD"}

package/dist/src/components/{Enum.js → EnumDeclaration.js}

@@ -8,8 +8,27 @@ import { Name } from "./Name.js";
 
 // properties for creating an enum
 
-// a C# enum declaration
-export function Enum(props) {
+/**
+ * A C# enum declaration
+ * @example
+ * ```tsx
+ * <EnumDeclaration public name="Color">
+ *   <EnumMember name="Red" />
+ *   <EnumMember name="Green" />
+ *   <EnumMember name="Blue" />
+ * </EnumDeclaration>
+ * ```
+ * This will produce:
+ * ```csharp
+ * public enum Color
+ * {
+ *   Red,
+ *   Green,
+ *   Blue
+ * }
+ * ```
+ */
+export function EnumDeclaration(props) {
   const name = useCSharpNamePolicy().getName(props.name, "enum");
   const scope = useCSharpScope();
   const thisEnumSymbol = new CSharpOutputSymbol(name, {

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

@@ -1,7 +1,7 @@
-export * from "./Class.js";
+export * from "./ClassDeclaration.jsx";
 export { ClassMethod, type ClassMethodProps } from "./ClassMethod.jsx";
 export * from "./Declaration.js";
-export * from "./Enum.js";
+export * from "./EnumDeclaration.jsx";
 export * from "./Name.js";
 export * from "./Namespace.js";
 export * from "./Parameters.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,YAAY,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACvE,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACvE,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}

package/dist/src/components/index.js

@@ -1,7 +1,7 @@
-export * from "./Class.js";
+export * from "./ClassDeclaration.js";
 export { ClassMethod } from "./ClassMethod.js";
 export * from "./Declaration.js";
-export * from "./Enum.js";
+export * from "./EnumDeclaration.js";
 export * from "./Name.js";
 export * from "./Namespace.js";
 export * from "./Parameters.js";

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

@@ -1,10 +1,10 @@
 import * as core from "@alloy-js/core";
 import * as base from "../index.js";
-export declare const Class: core.StcSignature<base.ClassProps>;
+export declare const ClassDeclaration: core.StcSignature<base.ClassDeclarationProps>;
 export declare const ClassConstructor: core.StcSignature<base.ClassConstructorProps>;
 export declare const ClassMember: core.StcSignature<base.ClassMemberProps>;
 export declare const ClassMethod: core.StcSignature<base.ClassMethodProps>;
-export declare const Enum: core.StcSignature<base.EnumProps>;
+export declare const EnumDeclaration: core.StcSignature<base.EnumDeclarationProps>;
 export declare const EnumMember: core.StcSignature<base.EnumMemberProps>;
 export declare const Parameter: core.StcSignature<base.ParameterProps>;
 export declare const Parameters: core.StcSignature<base.ParametersProps>;

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,KAAK,oCAAuB,CAAC;AAC1C,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,IAAI,mCAAsB,CAAC;AACxC,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"}
+{"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,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,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"}

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

@@ -1,10 +1,10 @@
 import * as core from "@alloy-js/core";
 import * as base from "../index.js";
-export const Class = core.stc(base.Class);
+export const ClassDeclaration = core.stc(base.ClassDeclaration);
 export const ClassConstructor = core.stc(base.ClassConstructor);
 export const ClassMember = core.stc(base.ClassMember);
 export const ClassMethod = core.stc(base.ClassMethod);
-export const Enum = core.stc(base.Enum);
+export const EnumDeclaration = core.stc(base.EnumDeclaration);
 export const EnumMember = core.stc(base.EnumMember);
 export const Parameter = core.stc(base.Parameter);
 export const Parameters = core.stc(base.Parameters);

package/dist/src/modifiers.d.ts

@@ -6,7 +6,7 @@ export interface AccessModifiers {
     readonly internal?: boolean;
     readonly file?: boolean;
 }
-export declare function getAccessModifier(data: AccessModifiers): string;
+export declare const getAccessModifier: (data: AccessModifiers) => string;
 /** Method modifiers. Can only be one. */
 export interface MethodModifiers {
     readonly abstract?: boolean;
@@ -14,8 +14,9 @@ export interface MethodModifiers {
     readonly static?: boolean;
     readonly virtual?: boolean;
 }
-export declare function getMethodModifier(data: MethodModifiers): string;
+export declare const getMethodModifier: (data: MethodModifiers) => string;
 export declare function getAsyncModifier(async?: boolean): string;
 /** Resolve the modifier prefix */
 export declare function computeModifiersPrefix(modifiers: Array<string | undefined>): string;
+export declare function makeModifiers<T>(obj: Array<keyof T>): (data: T) => string;
 //# sourceMappingURL=modifiers.d.ts.map

package/dist/src/modifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAU/D;AAED,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAS/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR"}
+{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,iBAAiB,mCAM5B,CAAC;AAEH,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,iBAAiB,mCAK5B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAC1C,MAAM,CAAC,YAMhB"}

package/dist/src/modifiers.js

@@ -3,15 +3,11 @@
 
 /** Access modifiers.  */
 
-export function getAccessModifier(data) {
-  return [data.public && "public", data.protected && "protected", data.private && "private", data.internal && "internal", data.file && "file"].filter(x => x).join(" ");
-}
+export const getAccessModifier = makeModifiers(["public", "protected", "private", "internal", "file"]);
 
 /** Method modifiers. Can only be one. */
 
-export function getMethodModifier(data) {
-  return [data.abstract && "abstract", data.sealed && "sealed", data.static && "static", data.virtual && "virtual"].filter(x => x).join(" ");
-}
+export const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtual"]);
 export function getAsyncModifier(async) {
   return async ? "async" : "";
 }
@@ -20,4 +16,9 @@ export function getAsyncModifier(async) {
 export function computeModifiersPrefix(modifiers) {
   const resolved = modifiers.filter(x => x);
   return resolved.length > 0 ? resolved.join(" ") + " " : "";
+}
+export function makeModifiers(obj) {
+  return data => {
+    return obj.map(key => data[key] ? key : undefined).filter(x => x).join(" ");
+  };
 }

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

@@ -1,10 +1,10 @@
 import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
 import { describe, expect, it } from "vitest";
-import { Class, ClassMethod } from "../src/index.js";
+import { ClassDeclaration, ClassMethod } from "../src/index.js";
 import { TestNamespace } from "./utils.js";
 const Wrapper = props => _$createComponent(TestNamespace, {
   get children() {
-    return _$createComponent(Class, {
+    return _$createComponent(ClassDeclaration, {
       "public": true,
       name: "TestClass",
       get children() {

package/dist/test/class.test.js

@@ -1,23 +1,65 @@
-import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, mergeProps as _$mergeProps, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
-import { expect, it } from "vitest";
+import { describe, expect, it } from "vitest";
 import * as csharp from "../src/index.js";
+import { ClassDeclaration } from "../src/index.js";
 import * as utils from "./utils.js";
 it("declares class with no members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    "public": true,
-    name: "TestClass"
-  }));
-  expect(res).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass;
+  expect(_$createComponent(utils.TestNamespace, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        name: "TestClass"
+      });
     }
+  })).toRenderTo(`
+      class TestClass;
   `);
 });
+describe("modifiers", () => {
+  it.each(["public", "private"])("%s", mod => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, _$mergeProps({
+          [mod]: true
+        }, {
+          name: "TestClass"
+        }));
+      }
+    })).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+  it.each(["partial", "abstract", "static", "sealed"])("%s", mod => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, _$mergeProps({
+          [mod]: true
+        }, {
+          name: "TestClass"
+        }));
+      }
+    })).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+  it("combines modifiers", () => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          "public": true,
+          abstract: true,
+          partial: true,
+          name: "TestClass"
+        });
+      }
+    })).toRenderTo(`
+        public abstract partial class TestClass;
+    `);
+  });
+});
 it("declares class with some members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
@@ -48,7 +90,7 @@ it("declares class with some members", () => {
   `);
 });
 it("declares class with some methods", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
@@ -99,7 +141,7 @@ it("uses refkeys for members, params, and return type", () => {
           return _$createComponent(csharp.SourceFile, {
             path: "Test.cs",
             get children() {
-              return [_$createComponent(csharp.Enum, {
+              return [_$createComponent(csharp.EnumDeclaration, {
                 "public": true,
                 name: "TestEnum",
                 refkey: enumTypeRefkey,
@@ -116,15 +158,15 @@ it("uses refkeys for members, params, and return type", () => {
                     }
                   });
                 }
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "TestInput",
                 refkey: inputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "TestResult",
                 refkey: testResultTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "TestClass",
                 get children() {
@@ -175,7 +217,7 @@ it("declares class with generic parameters", () => {
     T: core.refkey(),
     U: core.refkey()
   };
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     typeParameters: typeParameters,
@@ -207,7 +249,7 @@ it("declares class with generic parameters", () => {
   `);
 });
 it("declares class with invalid members", () => {
-  const decl = _$createComponent(csharp.Class, {
+  const decl = _$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
@@ -221,7 +263,7 @@ it("declares class with invalid members", () => {
   expect(() => utils.toSourceText(decl)).toThrow("can't define an enum member outside of an enum-decl scope");
 });
 it("declares class with constructor", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
@@ -254,7 +296,7 @@ it("declares class with constructor params and assigns values to fields", () =>
     type: "int",
     refkey: paramSizeRefkey
   }];
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {

package/dist/test/enum.test.js

@@ -5,7 +5,7 @@ import { expect, it } from "vitest";
 import * as csharp from "../src/index.js";
 import * as utils from "./utils.js";
 it("declares enum with no members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Enum, {
+  const res = utils.toSourceText(_$createComponent(csharp.EnumDeclaration, {
     "public": true,
     name: "TestEnum"
   }));
@@ -17,7 +17,7 @@ it("declares enum with no members", () => {
   `);
 });
 it("declares enum with members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Enum, {
+  const res = utils.toSourceText(_$createComponent(csharp.EnumDeclaration, {
     "public": true,
     name: "TestEnum",
     get children() {
@@ -40,7 +40,7 @@ it("declares enum with members", () => {
   `);
 });
 it("applies naming policy to enum and members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Enum, {
+  const res = utils.toSourceText(_$createComponent(csharp.EnumDeclaration, {
     "public": true,
     name: "testEnum",
     get children() {
@@ -73,7 +73,7 @@ it("can reference things by refkey", () => {
           return _$createComponent(csharp.SourceFile, {
             path: "Test.cs",
             get children() {
-              return [_$createComponent(csharp.Enum, {
+              return [_$createComponent(csharp.EnumDeclaration, {
                 "public": true,
                 name: "TestEnum",
                 refkey: enumRK,
@@ -116,7 +116,7 @@ it("can reference things by refkey across files", () => {
           return [_$createComponent(csharp.SourceFile, {
             path: "Test.cs",
             get children() {
-              return [_$createComponent(csharp.Enum, {
+              return [_$createComponent(csharp.EnumDeclaration, {
                 "public": true,
                 name: "TestEnum",
                 get children() {
@@ -131,7 +131,7 @@ it("can reference things by refkey across files", () => {
           }), _$createComponent(csharp.SourceFile, {
             path: "Other.cs",
             get children() {
-              return [_$createComponent(csharp.Enum, {
+              return [_$createComponent(csharp.EnumDeclaration, {
                 "public": true,
                 name: "OtherEnum",
                 refkey: enumRK,

package/dist/test/namespace.test.js

@@ -12,7 +12,7 @@ it("defines multiple namespaces and source files with unique content", () => {
           return [_$createComponent(csharp.SourceFile, {
             path: "Model1.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Model1"
               });
@@ -20,7 +20,7 @@ it("defines multiple namespaces and source files with unique content", () => {
           }), _$createComponent(csharp.SourceFile, {
             path: "Model2.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Model2"
               });
@@ -33,7 +33,7 @@ it("defines multiple namespaces and source files with unique content", () => {
           return [_$createComponent(csharp.SourceFile, {
             path: "Model3.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Model3"
               });
@@ -41,7 +41,7 @@ it("defines multiple namespaces and source files with unique content", () => {
           }), _$createComponent(csharp.SourceFile, {
             path: "Model4.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Model4"
               });

package/dist/test/projectdirectory.test.js

@@ -18,7 +18,7 @@ it("defines a project directory file with multiple source files", () => {
               return [_$createComponent(csharp.SourceFile, {
                 path: "Test1.cs",
                 get children() {
-                  return _$createComponent(csharp.Class, {
+                  return _$createComponent(csharp.ClassDeclaration, {
                     "public": true,
                     name: "TestClass1"
                   });
@@ -26,7 +26,7 @@ it("defines a project directory file with multiple source files", () => {
               }), _$createComponent(csharp.SourceFile, {
                 path: "Test2.cs",
                 get children() {
-                  return _$createComponent(csharp.Class, {
+                  return _$createComponent(csharp.ClassDeclaration, {
                     "public": true,
                     name: "TestClass2"
                   });
@@ -82,7 +82,7 @@ it("defines a project directory file with multiple source files and a custom TFM
               return [_$createComponent(csharp.SourceFile, {
                 path: "Test1.cs",
                 get children() {
-                  return _$createComponent(csharp.Class, {
+                  return _$createComponent(csharp.ClassDeclaration, {
                     "public": true,
                     name: "TestClass1"
                   });
@@ -90,7 +90,7 @@ it("defines a project directory file with multiple source files and a custom TFM
               }), _$createComponent(csharp.SourceFile, {
                 path: "Test2.cs",
                 get children() {
-                  return _$createComponent(csharp.Class, {
+                  return _$createComponent(csharp.ClassDeclaration, {
                     "public": true,
                     name: "TestClass2"
                   });

package/dist/test/sourcefile.test.js

@@ -12,7 +12,7 @@ it("defines multiple source files with unique content", () => {
           return [_$createComponent(csharp.SourceFile, {
             path: "Test1.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "TestClass1"
               });
@@ -20,7 +20,7 @@ it("defines multiple source files with unique content", () => {
           }), _$createComponent(csharp.SourceFile, {
             path: "Test2.cs",
             get children() {
-              return _$createComponent(csharp.Class, {
+              return _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "TestClass2"
               });

package/dist/test/using.test.js

@@ -63,15 +63,15 @@ it("adds using statement across namespaces", () => {
           return _$createComponent(csharp.SourceFile, {
             path: "Models.cs",
             get children() {
-              return [_$createComponent(csharp.Class, {
+              return [_$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Input",
                 refkey: inputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Output",
                 refkey: outputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Enum, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.EnumDeclaration, {
                 "public": true,
                 name: "TestEnum",
                 get children() {
@@ -93,7 +93,7 @@ it("adds using statement across namespaces", () => {
             path: "Client.cs",
             using: ["System"],
             get children() {
-              return [_$createComponent(csharp.Class, {
+              return [_$createComponent(csharp.ClassDeclaration, {
                 "public": true,
                 name: "Client",
                 get children() {