@alloy-js/csharp 0.16.0 → 0.18.0-dev.10

package/dist/src/modifiers.d.ts

@@ -1,5 +1,14 @@
-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 const getAccessModifier: (data: AccessModifiers) => 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":"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"}
+{"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,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

@@ -1,34 +1,20 @@
 // 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 const getAccessModifier = makeModifiers(["public", "protected", "private", "internal", "file"]);
+export function getAsyncModifier(async) {
+  return async ? "async" : "";
 }
-// 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] : "";
+/** Resolve the modifier prefix */
+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/src/name-policy.d.ts

@@ -1,5 +1,5 @@
 import * as core from "@alloy-js/core";
-export type CSharpElements = "class" | "constant" | "enum" | "enum-member" | "function" | "interface" | "class-member-private" | "class-member-public" | "class-method" | "parameter" | "type-parameter";
+export type CSharpElements = "class" | "constant" | "enum" | "enum-member" | "function" | "interface" | "class-member-private" | "class-member-public" | "class-method" | "class-property" | "parameter" | "type-parameter";
 export declare function createCSharpNamePolicy(): core.NamePolicy<CSharpElements>;
 export declare function useCSharpNamePolicy(): core.NamePolicy<CSharpElements>;
 //# sourceMappingURL=name-policy.d.ts.map

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,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAiBxE;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,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAkBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}

package/dist/src/name-policy.js

@@ -14,6 +14,7 @@ export function createCSharpNamePolicy() {
       case "class-member-public":
       case "class-method":
       case "type-parameter":
+      case "class-property":
         return changecase.pascalCase(name);
       case "constant":
         return changecase.constantCase(name);

package/dist/src/symbols/csharp-output-symbol.d.ts

@@ -1,8 +1,8 @@
 import * as core from "@alloy-js/core";
-import { DeclarationProps } from "../components/Declaration.jsx";
 import { CSharpOutputScope } from "./scopes.js";
-export interface CSharpOutputSymbol extends core.OutputSymbol {
-    scope: CSharpOutputScope;
+export declare class CSharpOutputSymbol extends core.OutputSymbol {
+    get scope(): CSharpOutputScope;
+    set scope(value: CSharpOutputScope);
+    constructor(name: string, options?: core.OutputSymbolOptions);
 }
-export declare function createCSharpSymbol(props: DeclarationProps): CSharpOutputSymbol;
 //# sourceMappingURL=csharp-output-symbol.d.ts.map

package/dist/src/symbols/csharp-output-symbol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csharp-output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/csharp-output-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,YAAY;IAC3D,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAGD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,sBAezD"}
+{"version":3,"file":"csharp-output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/csharp-output-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,qBAAa,kBAAmB,SAAQ,IAAI,CAAC,YAAY;IACvD,IAAI,KAAK,IAGQ,iBAAiB,CADjC;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,EAEjC;gBAEW,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB;CAO7D"}

package/dist/src/symbols/csharp-output-symbol.js

@@ -1,19 +1,19 @@
 import * as core from "@alloy-js/core";
 import { useNamespace } from "../components/Namespace.js";
-
 // represents a symbol from a .cs file. Class, enum, interface etc.
 
-// creates a new C# symbol
-export function createCSharpSymbol(props) {
-  const scope = core.useScope();
-  const namespaceCtx = useNamespace();
-  if (!namespaceCtx) {
-    throw new Error("symbol must be declared inside a namespace");
+export class CSharpOutputSymbol extends core.OutputSymbol {
+  get scope() {
+    return super.scope;
+  }
+  set scope(value) {
+    super.scope = value;
+  }
+  constructor(name, options) {
+    const namespaceCtx = useNamespace();
+    if (!namespaceCtx) {
+      throw new Error("symbol must be declared inside a namespace");
+    }
+    super(name, options);
   }
-  const sym = scope.binder.createSymbol({
-    name: props.name,
-    scope,
-    refkey: props.refkey ?? core.refkey(props.name)
-  });
-  return sym;
 }

package/dist/src/symbols/scopes.d.ts

@@ -1,16 +1,14 @@
 import * as core from "@alloy-js/core";
 import { CSharpOutputSymbol } from "./csharp-output-symbol.js";
-export interface CSharpNamespaceScope extends core.OutputScope {
-    kind: "namespace";
+export declare class CSharpNamespaceScope extends core.OutputScope {
+    get kind(): string;
 }
-export declare function createCSharpNamespaceScope(binder: core.Binder, parent: core.OutputScope | undefined, name: string): CSharpNamespaceScope;
 export type CSharpMemberScopeName = "class-decl" | "constructor-decl" | "enum-decl" | "method-decl";
-export interface CSharpMemberScope extends core.OutputScope {
-    kind: "member";
-    name: CSharpMemberScopeName;
-    owner: CSharpOutputSymbol;
+export declare class CSharpMemberScope extends core.OutputScope {
+    get kind(): string;
+    get name(): CSharpMemberScopeName;
+    get owner(): CSharpOutputSymbol;
 }
-export declare function createCSharpMemberScope(binder: core.Binder, parent: core.OutputScope, owner: CSharpOutputSymbol, name: CSharpMemberScopeName): CSharpMemberScope;
 export type CSharpOutputScope = CSharpMemberScope | CSharpNamespaceScope;
 export declare function useCSharpScope(): CSharpOutputScope;
 //# sourceMappingURL=scopes.d.ts.map

package/dist/src/symbols/scopes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/symbols/scopes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,WAAW;IAC5D,IAAI,EAAE,WAAW,CAAC;CACnB;AAGD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,MAAM,EAAE,IAAI,CAAC,WAAW,GAAG,SAAS,EACpC,IAAI,EAAE,MAAM,GACX,oBAAoB,CAMtB;AAGD,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,kBAAkB,GAClB,WAAW,GACX,aAAa,CAAC;AAKlB,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,WAAW;IACzD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAID,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,MAAM,EAAE,IAAI,CAAC,WAAW,EACxB,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,qBAAqB,GAC1B,iBAAiB,CAOnB;AAGD,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAGzE,wBAAgB,cAAc,IAAI,iBAAiB,CAElD"}
+{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/symbols/scopes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,qBAAa,oBAAqB,SAAQ,IAAI,CAAC,WAAW;IACxD,IAAI,IAAI,WAEP;CACF;AAGD,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,kBAAkB,GAClB,WAAW,GACX,aAAa,CAAC;AAKlB,qBAAa,iBAAkB,SAAQ,IAAI,CAAC,WAAW;IACrD,IAAI,IAAI,WAEP;IAED,IAAI,IAAI,IACe,qBAAqB,CAC3C;IAED,IAAI,KAAK,IACe,kBAAkB,CACzC;CACF;AAGD,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAGzE,wBAAgB,cAAc,IAAI,iBAAiB,CAElD"}

package/dist/src/symbols/scopes.js

@@ -1,14 +1,9 @@
 import * as core from "@alloy-js/core";
-
 // indicates that the scope for a symbols is at the namespace level
-
-// creates a new namespace scope
-export function createCSharpNamespaceScope(binder, parent, name) {
-  return binder.createScope({
-    kind: "namespace",
-    name,
-    parent
-  });
+export class CSharpNamespaceScope extends core.OutputScope {
+  get kind() {
+    return "namespace";
+  }
 }
 
 // the kind of member scope. i.e. are we in an enum, class, etc
@@ -16,16 +11,16 @@ export function createCSharpNamespaceScope(binder, parent, name) {
 // indicates that the scope for a symbol resides within a type
 // e.g. for an enum value, class field etc, these would have
 // member scope where the owner is the containing type.
-
-// creates a new member scope.
-// parent is the owning symbol.
-export function createCSharpMemberScope(binder, parent, owner, name) {
-  return binder.createScope({
-    kind: "member",
-    name: name,
-    owner,
-    parent
-  });
+export class CSharpMemberScope extends core.OutputScope {
+  get kind() {
+    return "member";
+  }
+  get name() {
+    return super.name;
+  }
+  get owner() {
+    return super.owner;
+  }
 }
 
 // contains the possible scopes where a declaration can reside

package/dist/test/class-declaration.test.d.ts

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

package/dist/test/class-declaration.test.d.ts.map

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

package/dist/test/{class.test.js → class-declaration.test.js}

@@ -1,34 +1,76 @@
-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, ClassMember } 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",
-    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, {
-    accessModifier: "public",
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+    "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"
           })];
@@ -48,18 +90,18 @@ it("declares class with some members", () => {
   `);
 });
 it("declares class with some methods", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+    "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"
           })];
         }
@@ -77,36 +119,6 @@ it("declares class with some methods", () => {
     }
   `);
 });
-it("declares class with params and return type", () => {
-  const params = [{
-    name: "IntParam",
-    type: "int"
-  }, {
-    name: "StringParam",
-    type: "string"
-  }];
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
-    name: "TestClass",
-    get children() {
-      return _$createComponent(csharp.ClassMethod, {
-        accessModifier: "public",
-        name: "MethodOne",
-        parameters: params,
-        returns: "string"
-      });
-    }
-  }));
-  expect(res).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass
-        {
-            public string MethodOne(int intParam, string stringParam) {}
-        }
-    }
-  `);
-});
 it("uses refkeys for members, params, and return type", () => {
   const inputTypeRefkey = core.refkey();
   const testResultTypeRefkey = core.refkey();
@@ -129,8 +141,8 @@ it("uses refkeys for members, params, and return type", () => {
           return _$createComponent(csharp.SourceFile, {
             path: "Test.cs",
             get children() {
-              return [_$createComponent(csharp.Enum, {
-                accessModifier: "public",
+              return [_$createComponent(csharp.EnumDeclaration, {
+                "public": true,
                 name: "TestEnum",
                 refkey: enumTypeRefkey,
                 get children() {
@@ -146,24 +158,24 @@ it("uses refkeys for members, params, and return type", () => {
                     }
                   });
                 }
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+                "public": true,
                 name: "TestInput",
                 refkey: inputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+                "public": true,
                 name: "TestResult",
                 refkey: testResultTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Class, {
-                accessModifier: "public",
+              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+                "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,
@@ -205,19 +217,19 @@ it("declares class with generic parameters", () => {
     T: core.refkey(),
     U: core.refkey()
   };
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+    "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;
@@ -237,8 +249,8 @@ it("declares class with generic parameters", () => {
   `);
 });
 it("declares class with invalid members", () => {
-  const decl = _$createComponent(csharp.Class, {
-    accessModifier: "public",
+  const decl = _$createComponent(csharp.ClassDeclaration, {
+    "public": true,
     name: "TestClass",
     get children() {
       return [_$createComponent(csharp.EnumMember, {
@@ -251,12 +263,12 @@ 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, {
-    accessModifier: "public",
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+    "public": true,
     name: "TestClass",
     get children() {
       return _$createComponent(csharp.ClassConstructor, {
-        accessModifier: "public"
+        "public": true
       });
     }
   }));
@@ -284,22 +296,22 @@ it("declares class with constructor params and assigns values to fields", () =>
     type: "int",
     refkey: paramSizeRefkey
   }];
-  const res = utils.toSourceText(_$createComponent(csharp.Class, {
-    accessModifier: "public",
+  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+    "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, ";"];
@@ -325,4 +337,42 @@ it("declares class with constructor params and assigns values to fields", () =>
         }
     }
   `);
+});
+it("specify doc comment", () => {
+  expect(_$createComponent(utils.TestNamespace, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        name: "Test",
+        doc: "This is a test"
+      });
+    }
+  })).toRenderTo(`
+    /// This is a test
+    class Test;
+  `);
+});
+it("supports class member doc comments", () => {
+  expect(_$createComponent(utils.TestNamespace, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        name: "Test",
+        doc: "This is a test",
+        get children() {
+          return _$createComponent(ClassMember, {
+            name: "Member",
+            "public": true,
+            type: "int",
+            doc: "This is a member"
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    /// This is a test
+    class Test
+    {
+      /// This is a member
+      public int Member
+    }
+  `);
 });

package/dist/test/class-method.test.d.ts

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

package/dist/test/class-method.test.d.ts.map

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