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

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

@@ -1,25 +1,22 @@
 import * as core from "@alloy-js/core";
-import { AccessModifier } from "../modifiers.js";
+import { AccessModifiers } from "../modifiers.js";
 import { ParameterProps } from "./Parameters.js";
-export interface ClassProps extends Omit<core.DeclarationProps, "nameKind"> {
+export interface ClassProps extends Omit<core.DeclarationProps, "nameKind">, AccessModifiers {
     name: string;
     refkey?: core.Refkey;
-    accessModifier?: AccessModifier;
     typeParameters?: Record<string, core.Refkey>;
 }
 export declare function Class(props: ClassProps): core.Children;
-export interface ClassConstructorProps {
-    accessModifier?: AccessModifier;
+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 {
+export interface ClassMemberProps extends AccessModifiers {
     name: string;
     type: core.Children;
-    accessModifier?: AccessModifier;
     refkey?: core.Refkey;
 }
 export declare function ClassMember(props: ClassMemberProps): core.Children;

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

@@ -1 +1 @@
-{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../../src/components/Class.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,cAAc,EAAqB,MAAM,iBAAiB,CAAC;AAKpE,OAAO,EAAE,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAG7D,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC;IACzE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC9C;AAGD,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,iBAoDtC;AAED,MAAM,WAAW,qBAAqB;IACpC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,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,iBAiC5D;AAGD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CACtB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,iBAwBlD"}
+{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../../src/components/Class.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EAAE,cAAc,EAAc,MAAM,iBAAiB,CAAC;AAG7D,MAAM,WAAW,UACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe;IACjB,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;AAGD,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,iBAqDtC;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

@@ -1,6 +1,6 @@
 import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
-import { getAccessModifier } from "../modifiers.js";
+import { computeModifiersPrefix, getAccessModifier } from "../modifiers.js";
 import { useCSharpNamePolicy } from "../name-policy.js";
 import { CSharpOutputSymbol } from "../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
@@ -46,10 +46,11 @@ export function Class(props) {
       }
     });
   }
+  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
   return _$createComponent(core.Declaration, {
     symbol: thisClassSymbol,
     get children() {
-      return [_$memo(() => getAccessModifier(props.accessModifier)), "class ", _$createComponent(Name, {}), typeParams, _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Block, {
+      return [modifiers, "class ", _$createComponent(Name, {}), typeParams, _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Block, {
         newline: true,
         get children() {
           return _$createComponent(core.Scope, {
@@ -81,7 +82,7 @@ export function ClassConstructor(props) {
   const ctorDeclScope = new CSharpMemberScope("constructor-decl", {
     owner: ctorSymbol
   });
-  const accessModifier = getAccessModifier(props.accessModifier);
+  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
   const params = props.parameters ? _$createComponent(Parameters, {
     get parameters() {
       return props.parameters;
@@ -95,7 +96,7 @@ export function ClassConstructor(props) {
       return _$createComponent(core.Scope, {
         value: ctorDeclScope,
         get children() {
-          return [accessModifier, _$createComponent(Name, {}), "(", params, ")", _$createComponent(core.Block, {
+          return [modifiers, _$createComponent(Name, {}), "(", params, ")", _$createComponent(core.Block, {
             newline: true,
             get children() {
               return props.children;
@@ -112,7 +113,7 @@ export function ClassConstructor(props) {
 // 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.accessModifier === "public") {
+  if (props.public) {
     nameElement = "class-member-public";
   }
   const name = useCSharpNamePolicy().getName(props.name, nameElement);
@@ -124,10 +125,11 @@ export function ClassMember(props) {
     scope,
     refkeys: props.refkey ?? core.refkey(props.name)
   });
+  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
   return _$createComponent(core.Declaration, {
     symbol: memberSymbol,
     get children() {
-      return [_$memo(() => getAccessModifier(props.accessModifier)), _$memo(() => props.type), " ", _$createComponent(Name, {})];
+      return [modifiers, _$memo(() => props.type), " ", _$createComponent(Name, {})];
     }
   });
 }

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

@@ -1,12 +1,10 @@
 import { Children, Refkey } from "@alloy-js/core";
-import { AccessModifier, MethodModifier } from "../modifiers.js";
+import { AccessModifiers, MethodModifiers } from "../modifiers.js";
 import { ParameterProps } from "./Parameters.jsx";
-export interface ClassMethodProps {
+export interface ClassMethodProps extends AccessModifiers, MethodModifiers {
     name: string;
     refkey?: Refkey;
     children?: Children;
-    accessModifier?: AccessModifier;
-    methodModifier?: MethodModifier;
     parameters?: Array<ParameterProps>;
     returns?: Children;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMethod.d.ts","sourceRoot":"","sources":["../../../src/components/ClassMethod.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,cAAc,EAKd,cAAc,EACf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAsClD"}
+{"version":3,"file":"ClassMethod.d.ts","sourceRoot":"","sources":["../../../src/components/ClassMethod.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKf,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,MAAM,WAAW,gBAAiB,SAAQ,eAAe,EAAE,eAAe;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAoClD"}

package/dist/src/components/ClassMethod.js

@@ -30,7 +30,7 @@ export function ClassMethod(props) {
     }
   }) : "";
   const returns = props.returns ?? (props.async ? "Task" : "void");
-  const modifiers = computeModifiersPrefix([getAccessModifier(props.accessModifier), getMethodModifier(props.methodModifier), getAsyncModifier(props.async)]);
+  const modifiers = computeModifiersPrefix([getAccessModifier(props), getMethodModifier(props), getAsyncModifier(props.async)]);
   // note that scope wraps the method decl so that the params get the correct scope
   return _$createComponent(MemberDeclaration, {
     symbol: methodSymbol,
@@ -38,7 +38,7 @@ export function ClassMethod(props) {
       return _$createComponent(Scope, {
         value: methodScope,
         get children() {
-          return [modifiers, returns, " ", name, "(", params, ")", _$memo(() => _$memo(() => props.methodModifier === "abstract")() ? ";" : _$createComponent(Block, {
+          return [modifiers, returns, " ", name, "(", params, ")", _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$createComponent(Block, {
             newline: true,
             get children() {
               return props.children;

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

@@ -1,10 +1,9 @@
 import * as core from "@alloy-js/core";
-import { AccessModifier } from "../modifiers.js";
-export interface EnumProps {
+import { AccessModifiers } from "../modifiers.js";
+export interface EnumProps extends AccessModifiers {
     name: string;
     refkey?: core.Refkey;
     children?: core.Children;
-    accessModifier?: AccessModifier;
 }
 export declare function Enum(props: EnumProps): core.Children;
 export interface EnumMemberProps {

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

@@ -1 +1 @@
-{"version":3,"file":"Enum.d.ts","sourceRoot":"","sources":["../../../src/components/Enum.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,cAAc,EAAqB,MAAM,iBAAiB,CAAC;AAOpE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACzB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAGD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,iBA8BpC;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"}
+{"version":3,"file":"Enum.d.ts","sourceRoot":"","sources":["../../../src/components/Enum.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,iBAgCpC;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

@@ -1,6 +1,6 @@
-import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
-import { getAccessModifier } from "../modifiers.js";
+import { computeModifiersPrefix, getAccessModifier } from "../modifiers.js";
 import { useCSharpNamePolicy } from "../name-policy.js";
 import { CSharpOutputSymbol } from "../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
@@ -25,10 +25,11 @@ export function Enum(props) {
     parent: scope,
     owner: thisEnumSymbol
   });
+  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
   if (thisEnumScope.owner) return _$createComponent(core.Declaration, {
     symbol: thisEnumSymbol,
     get children() {
-      return [_$memo(() => getAccessModifier(props.accessModifier)), "enum ", _$createComponent(Name, {}), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Scope, {
+      return [modifiers, "enum ", _$createComponent(Name, {}), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Scope, {
         value: thisEnumScope,
         get children() {
           return _$createComponent(core.Block, {

package/dist/src/modifiers.d.ts

@@ -1,7 +1,20 @@
-export type AccessModifier = "public" | "protected" | "private" | "internal" | "protected-internal" | "private-protected" | "file";
-export declare function getAccessModifier(accessModifier?: AccessModifier): string;
-export type MethodModifier = "abstract" | "sealed" | "static" | "virtual";
-export declare function getMethodModifier(methodModifier?: MethodModifier): string;
+/** Access modifiers.  */
+export interface AccessModifiers {
+    readonly public?: boolean;
+    readonly protected?: boolean;
+    readonly private?: boolean;
+    readonly internal?: boolean;
+    readonly file?: boolean;
+}
+export declare function getAccessModifier(data: AccessModifiers): string;
+/** Method modifiers. Can only be one. */
+export interface MethodModifiers {
+    readonly abstract?: boolean;
+    readonly sealed?: boolean;
+    readonly static?: boolean;
+    readonly virtual?: boolean;
+}
+export declare function getMethodModifier(data: MethodModifiers): string;
 export declare function getAsyncModifier(async?: boolean): string;
 /** Resolve the modifier prefix */
 export declare function computeModifiersPrefix(modifiers: Array<string | undefined>): string;

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

@@ -1 +1 @@
-{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,WAAW,GACX,SAAS,GACT,UAAU,GACV,oBAAoB,GACpB,mBAAmB,GACnB,MAAM,CAAC;AAgBX,wBAAgB,iBAAiB,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,MAAM,CAEzE;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAa1E,wBAAgB,iBAAiB,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,MAAM,CAEzE;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,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"}

package/dist/src/modifiers.js

@@ -1,43 +1,23 @@
 // the possible C# access modifiers
 // https://learn.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/access-modifiers
 
-// maps the above access modifier value to its C# syntax.
-// note that the C# keyword includes a trailing space
-const accessModifierLookup = {
-  public: "public ",
-  protected: "protected ",
-  private: "private ",
-  internal: "internal ",
-  "protected-internal": "protected internal ",
-  "private-protected": "private protected ",
-  file: "file "
-};
+/** Access modifiers.  */
 
-// returns the C# syntax for the specified access modifier.
-// if no access modifier is specified, the empty string is returned.
-export function getAccessModifier(accessModifier) {
-  return accessModifier ? accessModifierLookup[accessModifier] : "";
+export function getAccessModifier(data) {
+  return [data.public && "public", data.protected && "protected", data.private && "private", data.internal && "internal", data.file && "file"].filter(x => x).join(" ");
 }
-// maps the above method modifier value to its C# syntax.
-// note that the C# keyword includes a trailing space
-const methodModifierLookup = {
-  abstract: "abstract ",
-  sealed: "sealed ",
-  static: "static ",
-  virtual: "virtual "
-};
 
-// returns the C# syntax for the specified method modifier.
-// if no method modifier is specified, the empty string is returned.
-export function getMethodModifier(methodModifier) {
-  return methodModifier ? methodModifierLookup[methodModifier] : "";
+/** 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 function getAsyncModifier(async) {
-  return async ? "async " : "";
+  return async ? "async" : "";
 }
 
 /** Resolve the modifier prefix */
 export function computeModifiersPrefix(modifiers) {
   const resolved = modifiers.filter(x => x);
-  return resolved.length > 0 ? resolved.join("") : "";
+  return resolved.length > 0 ? resolved.join(" ") + " " : "";
 }

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

@@ -1,11 +1,11 @@
-import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+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 { TestNamespace } from "./utils.js";
 const Wrapper = props => _$createComponent(TestNamespace, {
   get children() {
     return _$createComponent(Class, {
-      accessModifier: "public",
+      "public": true,
       name: "TestClass",
       get children() {
         return props.children;
@@ -18,10 +18,11 @@ describe("modifiers", () => {
     it.each(["public", "private", "protected", "internal"])("%s", accessModifier => {
       expect(_$createComponent(Wrapper, {
         get children() {
-          return _$createComponent(ClassMethod, {
-            accessModifier: accessModifier,
+          return _$createComponent(ClassMethod, _$mergeProps({
+            [accessModifier]: true
+          }, {
             name: "MethodOne"
-          });
+          }));
         }
       })).toRenderTo(`
         public class TestClass
@@ -35,10 +36,11 @@ describe("modifiers", () => {
     it.each(["static", "virtual", "sealed"])("%s", methodModifier => {
       expect(_$createComponent(Wrapper, {
         get children() {
-          return _$createComponent(ClassMethod, {
-            methodModifier: methodModifier,
+          return _$createComponent(ClassMethod, _$mergeProps({
+            [methodModifier]: true
+          }, {
             name: "MethodOne"
-          });
+          }));
         }
       })).toRenderTo(`
         public class TestClass
@@ -51,7 +53,7 @@ describe("modifiers", () => {
       expect(_$createComponent(Wrapper, {
         get children() {
           return _$createComponent(ClassMethod, {
-            methodModifier: "abstract",
+            abstract: true,
             name: "MethodOne"
           });
         }
@@ -84,8 +86,8 @@ describe("modifiers", () => {
         return _$createComponent(ClassMethod, {
           async: true,
           returns: "Task",
-          accessModifier: "public",
-          methodModifier: "abstract",
+          "public": true,
+          abstract: true,
           name: "MethodOne"
         });
       }
@@ -122,7 +124,7 @@ it("defines params and return type", () => {
   const res = _$createComponent(Wrapper, {
     get children() {
       return _$createComponent(ClassMethod, {
-        accessModifier: "public",
+        "public": true,
         name: "MethodOne",
         parameters: params,
         returns: "string"

package/dist/test/class.test.js

@@ -6,7 +6,7 @@ import * as csharp from "../src/index.js";
 import * as utils from "./utils.js";
 it("declares class with no members", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass"
   }));
   expect(res).toBe(coretest.d`
@@ -18,17 +18,17 @@ it("declares class with no members", () => {
 });
 it("declares class with some members", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     get children() {
       return _$createComponent(core.StatementList, {
         get children() {
           return [_$createComponent(csharp.ClassMember, {
-            accessModifier: "public",
+            "public": true,
             name: "MemberOne",
             type: "string"
           }), _$createComponent(csharp.ClassMember, {
-            accessModifier: "private",
+            "private": true,
             name: "MemberTwo",
             type: "int"
           })];
@@ -49,17 +49,17 @@ it("declares class with some members", () => {
 });
 it("declares class with some methods", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     get children() {
       return _$createComponent(core.List, {
         get children() {
           return [_$createComponent(csharp.ClassMethod, {
-            accessModifier: "public",
+            "public": true,
             name: "MethodOne"
           }), _$createComponent(csharp.ClassMethod, {
-            accessModifier: "private",
-            methodModifier: "virtual",
+            "private": true,
+            virtual: true,
             name: "MethodTwo"
           })];
         }
@@ -100,7 +100,7 @@ it("uses refkeys for members, params, and return type", () => {
             path: "Test.cs",
             get children() {
               return [_$createComponent(csharp.Enum, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestEnum",
                 refkey: enumTypeRefkey,
                 get children() {
@@ -117,23 +117,23 @@ it("uses refkeys for members, params, and return type", () => {
                   });
                 }
               }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestInput",
                 refkey: inputTypeRefkey
               }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestResult",
                 refkey: testResultTypeRefkey
               }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestClass",
                 get children() {
                   return [_$createComponent(csharp.ClassMember, {
-                    accessModifier: "private",
+                    "private": true,
                     name: "MemberOne",
                     type: enumTypeRefkey
                   }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMethod, {
-                    accessModifier: "public",
+                    "public": true,
                     name: "MethodOne",
                     parameters: params,
                     returns: testResultTypeRefkey,
@@ -176,18 +176,18 @@ it("declares class with generic parameters", () => {
     U: core.refkey()
   };
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     typeParameters: typeParameters,
     get children() {
       return [_$createComponent(csharp.ClassMember, {
-        accessModifier: "public",
+        "public": true,
         name: "memberOne",
         get type() {
           return typeParameters.T;
         }
       }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMember, {
-        accessModifier: "private",
+        "private": true,
         name: "memberTwo",
         get type() {
           return typeParameters.U;
@@ -208,7 +208,7 @@ it("declares class with generic parameters", () => {
 });
 it("declares class with invalid members", () => {
   const decl = _$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     get children() {
       return [_$createComponent(csharp.EnumMember, {
@@ -222,11 +222,11 @@ it("declares class with invalid members", () => {
 });
 it("declares class with constructor", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     get children() {
       return _$createComponent(csharp.ClassConstructor, {
-        accessModifier: "public"
+        "public": true
       });
     }
   }));
@@ -255,21 +255,21 @@ it("declares class with constructor params and assigns values to fields", () =>
     refkey: paramSizeRefkey
   }];
   const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+    "public": true,
     name: "TestClass",
     get children() {
       return [_$createComponent(csharp.ClassMember, {
-        accessModifier: "private",
+        "private": true,
         name: "name",
         type: "string",
         refkey: thisNameRefkey
       }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMember, {
-        accessModifier: "private",
+        "private": true,
         name: "size",
         type: "int",
         refkey: thisSizeRefkey
       }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassConstructor, {
-        accessModifier: "public",
+        "public": true,
         parameters: ctorParams,
         get children() {
           return [thisNameRefkey, " = ", paramNameRefkey, ";", _$createIntrinsic("hbr", {}), thisSizeRefkey, " = ", paramSizeRefkey, ";"];

package/dist/test/enum.test.js

@@ -6,7 +6,7 @@ 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, {
-    accessModifier: "public",
+    "public": true,
     name: "TestEnum"
   }));
   expect(res).toBe(coretest.d`
@@ -18,7 +18,7 @@ it("declares enum with no members", () => {
 });
 it("declares enum with members", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Enum, {
-    accessModifier: "public",
+    "public": true,
     name: "TestEnum",
     get children() {
       return [_$createComponent(csharp.EnumMember, {
@@ -41,7 +41,7 @@ it("declares enum with members", () => {
 });
 it("applies naming policy to enum and members", () => {
   const res = utils.toSourceText(_$createComponent(csharp.Enum, {
-    accessModifier: "public",
+    "public": true,
     name: "testEnum",
     get children() {
       return [_$createComponent(csharp.EnumMember, {
@@ -74,7 +74,7 @@ it("can reference things by refkey", () => {
             path: "Test.cs",
             get children() {
               return [_$createComponent(csharp.Enum, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestEnum",
                 refkey: enumRK,
                 get children() {
@@ -117,7 +117,7 @@ it("can reference things by refkey across files", () => {
             path: "Test.cs",
             get children() {
               return [_$createComponent(csharp.Enum, {
-                accessModifier: "public",
+                "public": true,
                 name: "TestEnum",
                 get children() {
                   return [_$createComponent(csharp.EnumMember, {
@@ -132,7 +132,7 @@ it("can reference things by refkey across files", () => {
             path: "Other.cs",
             get children() {
               return [_$createComponent(csharp.Enum, {
-                accessModifier: "public",
+                "public": true,
                 name: "OtherEnum",
                 refkey: enumRK,
                 get children() {

package/dist/test/namespace.test.js

@@ -13,7 +13,7 @@ it("defines multiple namespaces and source files with unique content", () => {
             path: "Model1.cs",
             get children() {
               return _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "Model1"
               });
             }
@@ -21,7 +21,7 @@ it("defines multiple namespaces and source files with unique content", () => {
             path: "Model2.cs",
             get children() {
               return _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "Model2"
               });
             }
@@ -34,7 +34,7 @@ it("defines multiple namespaces and source files with unique content", () => {
             path: "Model3.cs",
             get children() {
               return _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "Model3"
               });
             }
@@ -42,7 +42,7 @@ it("defines multiple namespaces and source files with unique content", () => {
             path: "Model4.cs",
             get children() {
               return _$createComponent(csharp.Class, {
-                accessModifier: "public",
+                "public": true,
                 name: "Model4"
               });
             }

package/dist/test/projectdirectory.test.js

@@ -19,7 +19,7 @@ it("defines a project directory file with multiple source files", () => {
                 path: "Test1.cs",
                 get children() {
                   return _$createComponent(csharp.Class, {
-                    accessModifier: "public",
+                    "public": true,
                     name: "TestClass1"
                   });
                 }
@@ -27,7 +27,7 @@ it("defines a project directory file with multiple source files", () => {
                 path: "Test2.cs",
                 get children() {
                   return _$createComponent(csharp.Class, {
-                    accessModifier: "public",
+                    "public": true,
                     name: "TestClass2"
                   });
                 }
@@ -83,7 +83,7 @@ it("defines a project directory file with multiple source files and a custom TFM
                 path: "Test1.cs",
                 get children() {
                   return _$createComponent(csharp.Class, {
-                    accessModifier: "public",
+                    "public": true,
                     name: "TestClass1"
                   });
                 }
@@ -91,7 +91,7 @@ it("defines a project directory file with multiple source files and a custom TFM
                 path: "Test2.cs",
                 get children() {
                   return _$createComponent(csharp.Class, {
-                    accessModifier: "public",
+                    "public": true,
                     name: "TestClass2"
                   });
                 }

package/dist/test/sourcefile.test.js

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