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

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

@@ -1,7 +1,6 @@
 import * as core from "@alloy-js/core";
 import { AccessModifiers } from "../modifiers.js";
 import { AttributesProp } from "./attributes/attributes.jsx";
-import { ParameterProps } from "./parameters/parameters.jsx";
 import { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
 export interface ClassModifiers {
     readonly abstract?: boolean;
@@ -74,13 +73,6 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
  * ```
  */
 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;

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;AAG5E,OAAO,EAAE,cAAc,EAAc,MAAM,6BAA6B,CAAC;AAEzE,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;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,iBAiC5D;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;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"}

package/dist/src/components/ClassDeclaration.js

@@ -8,7 +8,6 @@ import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
 import { AttributeList } from "./attributes/attributes.js";
 import { DocWhen } from "./doc/comment.js";
 import { Name } from "./Name.js";
-import { Parameters } from "./parameters/parameters.js";
 import { TypeParameterConstraints } from "./type-parameters/type-parameter-constraints.js";
 import { TypeParameters } from "./type-parameters/type-parameters.js";
 const getClassModifiers = makeModifiers(["abstract", "partial", "sealed", "static"]);
@@ -91,48 +90,6 @@ export function ClassDeclaration(props) {
     }
   });
 }
-// a C# class constructor
-export function ClassConstructor(props) {
-  const scope = useCSharpScope();
-  if (scope.kind !== "member" || scope.name !== "class-decl") {
-    throw new Error("can't define a class constructor outside of a class-decl scope");
-  }
-
-  // fetch the class name from the scope
-  const name = useCSharpNamePolicy().getName(scope.owner.name, "class-method");
-  const ctorSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? core.refkey(name)
-  });
-
-  // scope for ctor declaration
-  const ctorDeclScope = new CSharpMemberScope("constructor-decl", {
-    owner: ctorSymbol
-  });
-  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
-
-  // note that scope wraps the ctor decl so that the params get the correct scope
-  return _$createComponent(core.Declaration, {
-    symbol: ctorSymbol,
-    get children() {
-      return _$createComponent(core.Scope, {
-        value: ctorDeclScope,
-        get children() {
-          return [modifiers, _$createComponent(Name, {}), _$createComponent(Parameters, {
-            get parameters() {
-              return props.parameters;
-            }
-          }), _$createComponent(core.Block, {
-            newline: true,
-            get children() {
-              return props.children;
-            }
-          })];
-        }
-      });
-    }
-  });
-}
 
 // properties for creating a class member
 

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

@@ -0,0 +1,17 @@
+import { Refkey } from "@alloy-js/core";
+import { Children } from "@alloy-js/core/jsx-runtime";
+import { AccessModifiers } from "../../modifiers.js";
+import { ParameterProps } from "../parameters/parameters.jsx";
+/**
+ * Properties for {@link Constructor} component.
+ */
+export interface ConstructorProps extends AccessModifiers {
+    /** Constructor parameters */
+    parameters?: ParameterProps[];
+    /** Refkey */
+    refkey?: Refkey;
+    /** Constructor body */
+    children?: Children;
+}
+export declare function Constructor(props: ConstructorProps): Children;
+//# sourceMappingURL=constructor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constructor.d.ts","sourceRoot":"","sources":["../../../../src/components/constructor/constructor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EAGP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EACL,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,6BAA6B;IAC7B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAiClD"}

package/dist/src/components/constructor/constructor.js

@@ -0,0 +1,47 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { Block, Declaration, Name, refkey, Scope } from "@alloy-js/core";
+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";
+import { Parameters } from "../parameters/parameters.js";
+
+/**
+ * Properties for {@link Constructor} component.
+ */
+
+export function Constructor(props) {
+  const scope = useCSharpScope();
+  if (scope.kind !== "member" || scope.name !== "class-decl" && scope.name !== "struct-decl") {
+    throw new Error("can't define a class method outside of a class or struct scope");
+  }
+  const name = useCSharpNamePolicy().getName(scope.owner.name, "class-method");
+  const ctorSymbol = new CSharpOutputSymbol(name, {
+    scope,
+    refkeys: props.refkey ?? refkey(name)
+  });
+  const ctorDeclScope = new CSharpMemberScope("constructor-decl", {
+    owner: ctorSymbol
+  });
+  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
+  return _$createComponent(Declaration, {
+    symbol: ctorSymbol,
+    get children() {
+      return _$createComponent(Scope, {
+        value: ctorDeclScope,
+        get children() {
+          return [modifiers, _$createComponent(Name, {}), _$createComponent(Parameters, {
+            get parameters() {
+              return props.parameters;
+            }
+          }), _$createComponent(Block, {
+            newline: true,
+            get children() {
+              return props.children;
+            }
+          })];
+        }
+      });
+    }
+  });
+}

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

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

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

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

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

@@ -0,0 +1,54 @@
+import { createIntrinsic as _$createIntrinsic, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { refkey } from "@alloy-js/core";
+import { expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.js";
+import { ClassDeclaration } from "../ClassDeclaration.js";
+import { SourceFile } from "../SourceFile.js";
+import { Constructor } from "./constructor.js";
+it("reference constructor parameters in body", () => {
+  const paramNameRefkey = refkey();
+  const paramSizeRefkey = refkey();
+  const ctorParams = [{
+    name: "name",
+    type: "string",
+    refkey: paramNameRefkey
+  }, {
+    name: "size",
+    type: "int",
+    refkey: paramSizeRefkey
+  }];
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(SourceFile, {
+        path: "Test.cs",
+        get children() {
+          return _$createComponent(ClassDeclaration, {
+            "public": true,
+            name: "TestClass",
+            get children() {
+              return _$createComponent(Constructor, {
+                "public": true,
+                parameters: ctorParams,
+                get children() {
+                  return [paramNameRefkey, ";", _$createIntrinsic("hbr", {}), paramSizeRefkey, ";"];
+                }
+              });
+            }
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    namespace TestCode
+    {
+        public class TestClass
+        {
+            public TestClass(string name, int size)
+            {
+                name;
+                size;
+            }
+        }
+    }
+  `);
+});

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

@@ -1,6 +1,6 @@
 export * from "./attributes/attributes.jsx";
 export * from "./ClassDeclaration.jsx";
-export * from "./ClassMethod.jsx";
+export * from "./constructor/constructor.jsx";
 export * from "./Declaration.js";
 export * from "./doc/comment.jsx";
 export * from "./doc/from-markdown.jsx";
@@ -8,6 +8,7 @@ export * from "./EnumDeclaration.jsx";
 export * from "./interface/declaration.js";
 export * from "./interface/method.js";
 export * from "./interface/property.js";
+export * from "./method/method.jsx";
 export * from "./Name.js";
 export * from "./Namespace.js";
 export * from "./parameters/parameters.jsx";

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,mBAAmB,CAAC;AAClC,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,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,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

@@ -1,6 +1,6 @@
 export * from "./attributes/attributes.js";
 export * from "./ClassDeclaration.js";
-export * from "./ClassMethod.js";
+export * from "./constructor/constructor.js";
 export * from "./Declaration.js";
 export * from "./doc/comment.js";
 export * from "./doc/from-markdown.js";
@@ -8,6 +8,7 @@ export * from "./EnumDeclaration.js";
 export * from "./interface/declaration.js";
 export * from "./interface/method.js";
 export * from "./interface/property.js";
+export * from "./method/method.js";
 export * from "./Name.js";
 export * from "./Namespace.js";
 export * from "./parameters/parameters.js";

package/dist/src/components/{ClassMethod.d.ts → method/method.d.ts}

@@ -1,16 +1,16 @@
 import { Children, Refkey } from "@alloy-js/core";
-import { AccessModifiers } from "../modifiers.js";
-import { AttributesProp } from "./attributes/attributes.jsx";
-import { ParameterProps } from "./parameters/parameters.jsx";
-import { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
+import { AccessModifiers } from "../../modifiers.js";
+import { AttributesProp } from "../attributes/attributes.jsx";
+import { ParameterProps } from "../parameters/parameters.jsx";
+import { TypeParameterProps } from "../type-parameters/type-parameter.jsx";
 /** Method modifiers. Can only be one. */
-export interface ClassMethodModifiers {
+export interface MethodModifiers {
     readonly abstract?: boolean;
     readonly sealed?: boolean;
     readonly static?: boolean;
     readonly virtual?: boolean;
 }
-export interface ClassMethodProps extends AccessModifiers, ClassMethodModifiers {
+export interface MethodProps extends AccessModifiers, MethodModifiers {
     name: string;
     refkey?: Refkey;
     children?: Children;
@@ -67,5 +67,5 @@ export interface ClassMethodProps extends AccessModifiers, ClassMethodModifiers
      */
     expression?: boolean;
 }
-export declare function ClassMethod(props: ClassMethodProps): Children;
-//# sourceMappingURL=ClassMethod.d.ts.map
+export declare function Method(props: MethodProps): Children;
+//# sourceMappingURL=method.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,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;AAUD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,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;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAuDxC"}

package/dist/src/components/{ClassMethod.js → method/method.js}

@@ -1,14 +1,14 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import { Block, MemberDeclaration, refkey, Scope } from "@alloy-js/core";
-import { computeModifiersPrefix, getAccessModifier, getAsyncModifier, 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 { AttributeList } from "./attributes/attributes.js";
-import { DocWhen } from "./doc/comment.js";
-import { Parameters } from "./parameters/parameters.js";
-import { TypeParameterConstraints } from "./type-parameters/type-parameter-constraints.js";
-import { TypeParameters } from "./type-parameters/type-parameters.js";
+import { computeModifiersPrefix, getAccessModifier, getAsyncModifier, 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 { AttributeList } from "../attributes/attributes.js";
+import { DocWhen } from "../doc/comment.js";
+import { Parameters } from "../parameters/parameters.js";
+import { TypeParameterConstraints } from "../type-parameters/type-parameter-constraints.js";
+import { TypeParameters } from "../type-parameters/type-parameters.js";
 
 /** Method modifiers. Can only be one. */
 
@@ -17,11 +17,11 @@ const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtua
 // properties for creating a method
 
 // a C# class method
-export function ClassMethod(props) {
+export function Method(props) {
   const name = useCSharpNamePolicy().getName(props.name, "class-method");
   const scope = useCSharpScope();
-  if (scope.kind !== "member" || scope.name !== "class-decl") {
-    throw new Error("can't define a class method outside of a class scope");
+  if (scope.kind !== "member" || scope.name !== "class-decl" && scope.name !== "struct-decl") {
+    throw new Error("can't define a class method outside of a class or struct scope");
   }
   const methodSymbol = new CSharpOutputSymbol(name, {
     scope,

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

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

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

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

package/dist/{test/class-method.test.js → src/components/method/method.test.js}

@@ -1,7 +1,7 @@
 import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
 import { describe, expect, it } from "vitest";
-import { ClassDeclaration, ClassMethod } from "../src/index.js";
-import { TestNamespace } from "./utils.js";
+import { TestNamespace } from "../../../test/utils.js";
+import { ClassDeclaration, Method } from "../../index.js";
 const Wrapper = props => _$createComponent(TestNamespace, {
   get children() {
     return _$createComponent(ClassDeclaration, {
@@ -18,7 +18,7 @@ describe("modifiers", () => {
     it.each(["public", "private", "protected", "internal"])("%s", accessModifier => {
       expect(_$createComponent(Wrapper, {
         get children() {
-          return _$createComponent(ClassMethod, _$mergeProps({
+          return _$createComponent(Method, _$mergeProps({
             [accessModifier]: true
           }, {
             name: "MethodOne"
@@ -36,7 +36,7 @@ describe("modifiers", () => {
     it.each(["static", "virtual", "sealed"])("%s", methodModifier => {
       expect(_$createComponent(Wrapper, {
         get children() {
-          return _$createComponent(ClassMethod, _$mergeProps({
+          return _$createComponent(Method, _$mergeProps({
             [methodModifier]: true
           }, {
             name: "MethodOne"
@@ -52,7 +52,7 @@ describe("modifiers", () => {
     it("abstract exclude body", () => {
       expect(_$createComponent(Wrapper, {
         get children() {
-          return _$createComponent(ClassMethod, {
+          return _$createComponent(Method, {
             abstract: true,
             name: "MethodOne"
           });
@@ -68,7 +68,7 @@ describe("modifiers", () => {
   it("mark method async", () => {
     expect(_$createComponent(Wrapper, {
       get children() {
-        return _$createComponent(ClassMethod, {
+        return _$createComponent(Method, {
           async: true,
           name: "MethodOne"
         });
@@ -83,7 +83,7 @@ describe("modifiers", () => {
   it("combine modifiers", () => {
     expect(_$createComponent(Wrapper, {
       get children() {
-        return _$createComponent(ClassMethod, {
+        return _$createComponent(Method, {
           async: true,
           returns: "Task",
           "public": true,
@@ -102,7 +102,7 @@ describe("modifiers", () => {
 it("applies PascalCase naming policy", () => {
   expect(_$createComponent(Wrapper, {
     get children() {
-      return _$createComponent(ClassMethod, {
+      return _$createComponent(Method, {
         name: "method_one"
       });
     }
@@ -123,7 +123,7 @@ it("defines params and return type", () => {
   }];
   const res = _$createComponent(Wrapper, {
     get children() {
-      return _$createComponent(ClassMethod, {
+      return _$createComponent(Method, {
         "public": true,
         name: "MethodOne",
         parameters: params,
@@ -144,7 +144,7 @@ it("specify doc comment", () => {
       return _$createComponent(ClassDeclaration, {
         name: "Test",
         get children() {
-          return _$createComponent(ClassMethod, {
+          return _$createComponent(Method, {
             name: "Method",
             doc: "This is a test"
           });
@@ -165,7 +165,7 @@ it("use expression body form", () => {
       return _$createComponent(ClassDeclaration, {
         name: "Test",
         get children() {
-          return _$createComponent(ClassMethod, {
+          return _$createComponent(Method, {
             name: "Method",
             doc: "This is a test",
             expression: true,

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

@@ -1,9 +1,9 @@
 import * as core from "@alloy-js/core";
 import * as base from "../index.js";
 export declare const ClassDeclaration: core.StcSignature<base.ClassDeclarationProps>;
-export declare const ClassConstructor: core.StcSignature<base.ClassConstructorProps>;
+export declare const Constructor: core.StcSignature<base.ConstructorProps>;
 export declare const ClassMember: core.StcSignature<base.ClassMemberProps>;
-export declare const ClassMethod: core.StcSignature<base.ClassMethodProps>;
+export declare const ClassMethod: core.StcSignature<base.MethodProps>;
 export declare const EnumDeclaration: core.StcSignature<base.EnumDeclarationProps>;
 export declare const EnumMember: core.StcSignature<base.EnumMemberProps>;
 export declare const Parameter: core.StcSignature<base.ParameterProps>;

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,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;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,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"}

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

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

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

@@ -3,6 +3,8 @@ import { List, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { Attribute } from "../attributes/attributes.js";
+import { Constructor } from "../constructor/constructor.js";
+import { Method } from "../method/method.js";
 import { Property } from "../property/property.js";
 import { SourceFile } from "../SourceFile.js";
 import { StructDeclaration } from "./declaration.js";
@@ -168,4 +170,42 @@ it("specify attributes", () => {
     [Test]
     struct Test;
   `);
+});
+it("define methods", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        name: "Test",
+        get children() {
+          return _$createComponent(Method, {
+            name: "MethodOne"
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    struct Test
+    {
+      void MethodOne() {}
+    }
+  `);
+});
+it("define constructor", () => {
+  expect(_$createComponent(TestNamespace, {
+    get children() {
+      return _$createComponent(StructDeclaration, {
+        name: "Test",
+        get children() {
+          return _$createComponent(Constructor, {
+            "public": true
+          });
+        }
+      });
+    }
+  })).toRenderTo(`
+    struct Test
+    {
+      public Test() {}
+    }
+  `);
 });

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

@@ -4,6 +4,7 @@ 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 { Constructor } from "../src/components/stc/index.js";
 import * as csharp from "../src/index.js";
 import { ClassDeclaration, ClassMember, Property, SourceFile } from "../src/index.js";
 import * as utils from "./utils.js";
@@ -137,10 +138,10 @@ it("declares class with some methods", () => {
     get children() {
       return _$createComponent(core.List, {
         get children() {
-          return [_$createComponent(csharp.ClassMethod, {
+          return [_$createComponent(csharp.Method, {
             "public": true,
             name: "MethodOne"
-          }), _$createComponent(csharp.ClassMethod, {
+          }), _$createComponent(csharp.Method, {
             "private": true,
             virtual: true,
             name: "MethodTwo"
@@ -215,7 +216,7 @@ it("uses refkeys for members, params, and return type", () => {
                     "private": true,
                     name: "MemberOne",
                     type: enumTypeRefkey
-                  }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassMethod, {
+                  }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,
@@ -353,7 +354,7 @@ it("declares class with constructor", () => {
     "public": true,
     name: "TestClass",
     get children() {
-      return _$createComponent(csharp.ClassConstructor, {
+      return _$createComponent(Constructor, {
         "public": true
       });
     }
@@ -396,7 +397,7 @@ it("declares class with constructor params and assigns values to fields", () =>
         name: "size",
         type: "int",
         refkey: thisSizeRefkey
-      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassConstructor, {
+      }), ";", _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
         "public": true,
         parameters: ctorParams,
         get children() {

package/dist/test/using.test.js

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