@alloy-js/csharp 0.18.0-dev.16 → 0.18.0-dev.18

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

@@ -1,6 +1,7 @@
 import * as core from "@alloy-js/core";
 import { AccessModifiers } from "../modifiers.js";
 import { ParameterProps } from "./Parameters.jsx";
+import { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
 export interface ClassModifiers {
     readonly abstract?: boolean;
     readonly partial?: boolean;
@@ -12,7 +13,19 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
     /** Doc comment */
     doc?: core.Children;
     refkey?: core.Refkey;
-    typeParameters?: Record<string, core.Refkey>;
+    /**
+     * Type parameters for the class
+     *
+     * @example
+     * ```tsx
+     * <ClassDeclaration name="MyClass" typeParameters={["T"]} />
+     * ```
+     * This will produce:
+     * ```csharp
+     * public class MyClass<T>
+     * ```
+     */
+    typeParameters?: (string | TypeParameterProps)[];
     /** Base class that this class extends */
     baseType?: core.Children;
     /** Interfaces this class implements */

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;AAKzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,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;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7C,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAEzB,uCAAuC;IACvC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBAgE5D;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;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;AAKzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,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;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,iBA4C5D;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;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

@@ -1,4 +1,4 @@
-import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
+import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import * as core from "@alloy-js/core";
 import { join } from "@alloy-js/core";
 import { computeModifiersPrefix, getAccessModifier, makeModifiers } from "../modifiers.js";
@@ -8,6 +8,8 @@ import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
 import { Name } from "./Name.js";
 import { Parameters } from "./Parameters.js";
 import { DocWhen } from "./doc/comment.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"]);
 
 // properties for creating a class
@@ -49,29 +51,6 @@ export function ClassDeclaration(props) {
   const thisClassScope = new CSharpMemberScope("class-decl", {
     owner: thisClassSymbol
   });
-  let typeParams;
-  if (props.typeParameters) {
-    const typeParamNames = new Array();
-    for (const entry of Object.entries(props.typeParameters)) {
-      typeParamNames.push(useCSharpNamePolicy().getName(entry[0], "type-parameter"));
-      // create a symbol for each type param so its
-      // refkey resolves to the type param's name
-      new CSharpOutputSymbol(entry[0], {
-        scope: thisClassScope,
-        refkeys: entry[1]
-      });
-    }
-    typeParams = _$createIntrinsic("group", {
-      get children() {
-        return ["<", _$createComponent(core.For, {
-          each: typeParamNames,
-          comma: true,
-          line: true,
-          children: name => name
-        }), ">"];
-      }
-    });
-  }
   const bases = [...(props.baseType ? [props.baseType] : []), ...(props.interfaceTypes || [])];
   const base = bases.length > 0 ? [" : ", _$memo(() => join(bases, {
     joiner: ", "
@@ -84,7 +63,15 @@ export function ClassDeclaration(props) {
         get doc() {
           return props.doc;
         }
-      }), modifiers, "class ", _$createComponent(Name, {}), typeParams, base, _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Block, {
+      }), modifiers, "class ", _$createComponent(Name, {}), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+        get parameters() {
+          return props.typeParameters;
+        }
+      })), base, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+        get parameters() {
+          return props.typeParameters;
+        }
+      })), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Block, {
         newline: true,
         get children() {
           return _$createComponent(core.Scope, {

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

@@ -1,6 +1,7 @@
 import { Children, Refkey } from "@alloy-js/core";
 import { AccessModifiers } from "../modifiers.js";
 import { ParameterProps } from "./Parameters.jsx";
+import { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
 /** Method modifiers. Can only be one. */
 export interface ClassMethodModifiers {
     readonly abstract?: boolean;
@@ -20,6 +21,19 @@ export interface ClassMethodProps extends AccessModifiers, ClassMethodModifiers
     async?: boolean;
     /** Doc comment */
     doc?: Children;
+    /**
+     * Type parameters for the method
+     *
+     * @example
+     * ```tsx
+     * <InterfaceMethod name="Test" typeParameters={["T"]} />
+     * ```
+     * This will produce:
+     * ```csharp
+     * public void Test<T>()
+     * ```
+     */
+    typeParameters?: (TypeParameterProps | string)[];
 }
 export declare function ClassMethod(props: ClassMethodProps): Children;
 //# sourceMappingURL=ClassMethod.d.ts.map

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,eAAe,EAKhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,yCAAyC;AACzC,MAAM,WAAW,oBAAoB;IACnC,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,gBACf,SAAQ,eAAe,EACrB,oBAAoB;IACtB,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;CAChB;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAqClD"}
+{"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,EAKhB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAG9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,yCAAyC;AACzC,MAAM,WAAW,oBAAoB;IACnC,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,gBACf,SAAQ,eAAe,EACrB,oBAAoB;IACtB,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;CAClD;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YA4ClD"}

package/dist/src/components/ClassMethod.js

@@ -6,6 +6,8 @@ import { CSharpOutputSymbol } from "../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
 import { Parameters } from "./Parameters.js";
 import { DocWhen } from "./doc/comment.js";
+import { TypeParameterConstraints } from "./type-parameters/type-parameter-constraints.js";
+import { TypeParameters } from "./type-parameters/type-parameters.js";
 
 /** Method modifiers. Can only be one. */
 
@@ -47,7 +49,15 @@ export function ClassMethod(props) {
             get doc() {
               return props.doc;
             }
-          }), modifiers, returns, " ", name, "(", params, ")", _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$createComponent(Block, {
+          }), modifiers, returns, " ", _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), name, "(", params, ")", _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$createComponent(Block, {
             newline: true,
             get children() {
               return props.children;

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

@@ -15,5 +15,7 @@ export * from "./property/property.jsx";
 export * from "./record/declaration.js";
 export * from "./Reference.js";
 export * from "./SourceFile.js";
+export type { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
 export * from "./UsingDirective.js";
+export * from "./var/declaration.jsx";
 //# sourceMappingURL=index.d.ts.map

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,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,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,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,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,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}

package/dist/src/components/index.js

@@ -15,4 +15,6 @@ export * from "./property/property.js";
 export * from "./record/declaration.js";
 export * from "./Reference.js";
 export * from "./SourceFile.js";
-export * from "./UsingDirective.js";
+export * from "./UsingDirective.js";
+export * from "./var/declaration.js";
+export {};

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

@@ -1,5 +1,6 @@
 import * as core from "@alloy-js/core";
 import { AccessModifiers } from "../../modifiers.js";
+import { TypeParameterProps } from "../type-parameters/type-parameter.jsx";
 export interface InterfaceModifiers {
     readonly partial?: boolean;
 }
@@ -8,7 +9,19 @@ export interface InterfaceDeclarationProps extends Omit<core.DeclarationProps, "
     /** Doc comment */
     doc?: core.Children;
     refkey?: core.Refkey;
-    typeParameters?: Record<string, core.Refkey>;
+    /**
+     * Type parameters for the interface
+     *
+     * @example
+     * ```tsx
+     * <InterfaceDeclaration name="IList" typeParameters={["T"]} />
+     * ```
+     * This will produce:
+     * ```csharp
+     * public interface IList<T>
+     * ```
+     */
+    typeParameters?: (TypeParameterProps | string)[];
 }
 /**
  * CSharp interface declaration.

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

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAO5B,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAKD,MAAM,WAAW,yBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,kBAAkB;IACpB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC9C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,iBAwDpE"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAKD,MAAM,WAAW,yBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,kBAAkB;IACpB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;CAClD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,iBAoCpE"}

package/dist/src/components/interface/declaration.js

@@ -1,4 +1,4 @@
-import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } 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 { computeModifiersPrefix, getAccessModifier, makeModifiers } from "../../modifiers.js";
 import { useCSharpNamePolicy } from "../../name-policy.js";
@@ -6,6 +6,8 @@ import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope } from "../../symbols/scopes.js";
 import { DocWhen } from "../doc/comment.js";
 import { Name } from "../Name.js";
+import { TypeParameterConstraints } from "../type-parameters/type-parameter-constraints.js";
+import { TypeParameters } from "../type-parameters/type-parameters.js";
 const getInterfaceModifiers = makeModifiers(["partial"]);
 
 // properties for creating a class
@@ -43,29 +45,6 @@ export function InterfaceDeclaration(props) {
   const thisInterfaceScope = new CSharpMemberScope("interface-decl", {
     owner: thisInterfaceSymbol
   });
-  let typeParams;
-  if (props.typeParameters) {
-    const typeParamNames = new Array();
-    for (const entry of Object.entries(props.typeParameters)) {
-      typeParamNames.push(useCSharpNamePolicy().getName(entry[0], "type-parameter"));
-      // create a symbol for each type param so its
-      // refkey resolves to the type param's name
-      new CSharpOutputSymbol(entry[0], {
-        scope: thisInterfaceScope,
-        refkeys: entry[1]
-      });
-    }
-    typeParams = _$createIntrinsic("group", {
-      get children() {
-        return ["<", _$createComponent(core.For, {
-          each: typeParamNames,
-          comma: true,
-          line: true,
-          children: name => name
-        }), ">"];
-      }
-    });
-  }
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getInterfaceModifiers(props)]);
   return _$createComponent(core.Declaration, {
     symbol: thisInterfaceSymbol,
@@ -74,7 +53,15 @@ export function InterfaceDeclaration(props) {
         get doc() {
           return props.doc;
         }
-      }), modifiers, "interface ", _$createComponent(Name, {}), typeParams, _$memo(() => _$memo(() => !!props.children)() ? _$createComponent(core.Block, {
+      }), modifiers, "interface ", _$createComponent(Name, {}), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+        get parameters() {
+          return props.typeParameters;
+        }
+      })), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+        get parameters() {
+          return props.typeParameters;
+        }
+      })), _$memo(() => _$memo(() => !!props.children)() ? _$createComponent(core.Block, {
         newline: true,
         get children() {
           return _$createComponent(core.Scope, {

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

@@ -1,7 +1,10 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { List, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
+import { SourceFile } from "../SourceFile.js";
 import { InterfaceDeclaration } from "./declaration.js";
+import { InterfaceProperty } from "./property.js";
 it("declares class with no members", () => {
   expect(_$createComponent(TestNamespace, {
     get children() {
@@ -66,4 +69,85 @@ it("specify doc comment", () => {
     /// This is a test
     interface TestInterface;
   `);
+});
+describe("with type parameters", () => {
+  it("reference parameters", () => {
+    const typeParameters = [{
+      name: "T",
+      refkey: refkey()
+    }, {
+      name: "U",
+      refkey: refkey()
+    }];
+    expect(_$createComponent(TestNamespace, {
+      get children() {
+        return _$createComponent(SourceFile, {
+          path: "Test.cs",
+          get children() {
+            return _$createComponent(InterfaceDeclaration, {
+              "public": true,
+              name: "Test",
+              typeParameters: typeParameters,
+              get children() {
+                return _$createComponent(List, {
+                  get children() {
+                    return [_$createComponent(InterfaceProperty, {
+                      name: "PropA",
+                      get type() {
+                        return typeParameters[0].refkey;
+                      },
+                      get: true,
+                      set: true
+                    }), _$createComponent(InterfaceProperty, {
+                      name: "PropB",
+                      get type() {
+                        return typeParameters[1].refkey;
+                      },
+                      get: true,
+                      set: true
+                    })];
+                  }
+                });
+              }
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      namespace TestCode
+      {
+        public interface Test<T, U>
+        {
+          T PropA { get; set; }
+          U PropB { get; set; }
+        }
+      }
+    `);
+  });
+  it("defines with constraints", () => {
+    const typeParameters = [{
+      name: "T",
+      constraints: "IFoo"
+    }, {
+      name: "U",
+      constraints: "IBar"
+    }];
+    expect(_$createComponent(TestNamespace, {
+      get children() {
+        return _$createComponent(InterfaceDeclaration, {
+          "public": true,
+          name: "Test",
+          typeParameters: typeParameters,
+          children: "// Body"
+        });
+      }
+    })).toRenderTo(`
+      public interface Test<T, U>
+        where T : IFoo
+        where U : IBar
+      {
+        // Body
+      }
+    `);
+  });
 });

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

@@ -1,6 +1,7 @@
 import { Children, Refkey } from "@alloy-js/core";
 import { AccessModifiers } from "../../modifiers.js";
 import { ParameterProps } from "../Parameters.jsx";
+import { TypeParameterProps } from "../type-parameters/type-parameter.jsx";
 /** Method modifiers. Can only be one. */
 export interface InterfaceMethodModifiers {
     readonly new?: boolean;
@@ -10,6 +11,19 @@ export interface InterfaceMethodProps extends AccessModifiers, InterfaceMethodMo
     refkey?: Refkey;
     children?: Children;
     parameters?: Array<ParameterProps>;
+    /**
+     * Type parameters for the method
+     *
+     * @example
+     * ```tsx
+     * <InterfaceMethod name="Test" typeParameters={["T"]} />
+     * ```
+     * This will produce:
+     * ```csharp
+     * public void Test<T>()
+     * ```
+     */
+    typeParameters?: (TypeParameterProps | string)[];
     returns?: Children;
     /** Doc comment */
     doc?: Children;

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

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAC;AAG/D,yCAAyC;AACzC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;CACxB;AAKD,MAAM,WAAW,oBACf,SAAQ,eAAe,EACrB,wBAAwB;IAC1B,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,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YAuC1D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,yCAAyC;AACzC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;CACxB;AAKD,MAAM,WAAW,oBACf,SAAQ,eAAe,EACrB,wBAAwB;IAC1B,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;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YA8C1D"}

package/dist/src/components/interface/method.js

@@ -6,6 +6,8 @@ import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
 import { CSharpMemberScope, useCSharpScope } from "../../symbols/scopes.js";
 import { Parameters } from "../Parameters.js";
 import { DocWhen } from "../doc/comment.js";
+import { TypeParameterConstraints } from "../type-parameters/type-parameter-constraints.js";
+import { TypeParameters } from "../type-parameters/type-parameters.js";
 
 /** Method modifiers. Can only be one. */
 
@@ -46,7 +48,15 @@ export function InterfaceMethod(props) {
             get doc() {
               return props.doc;
             }
-          }), modifiers, _$memo(() => props.returns ?? "void"), " ", name, "(", params, ")", _$memo(() => _$memo(() => !!props.children)() ? _$createComponent(Block, {
+          }), modifiers, _$memo(() => props.returns ?? "void"), " ", _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), name, "(", params, ")", _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), _$memo(() => _$memo(() => !!props.children)() ? _$createComponent(Block, {
             newline: true,
             get children() {
               return props.children;

package/dist/src/components/interface/method.test.js

@@ -1,6 +1,8 @@
 import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
+import { SourceFile } from "../SourceFile.js";
 import { InterfaceDeclaration } from "./declaration.js";
 import { InterfaceMethod } from "./method.js";
 const Wrapper = props => _$createComponent(TestNamespace, {
@@ -172,4 +174,81 @@ it("specify doc comment", () => {
       void Method();
     }
   `);
+});
+describe("with type parameters", () => {
+  it("reference parameters", () => {
+    const typeParameters = [{
+      name: "T",
+      refkey: refkey()
+    }, {
+      name: "U",
+      refkey: refkey()
+    }];
+    expect(_$createComponent(TestNamespace, {
+      get children() {
+        return _$createComponent(SourceFile, {
+          path: "TestFile.cs",
+          get children() {
+            return _$createComponent(InterfaceDeclaration, {
+              "public": true,
+              name: "TestInterface",
+              get children() {
+                return _$createComponent(InterfaceMethod, {
+                  name: "Test",
+                  "public": true,
+                  typeParameters: typeParameters,
+                  get parameters() {
+                    return [{
+                      name: "paramA",
+                      type: typeParameters[0].refkey
+                    }];
+                  },
+                  get returns() {
+                    return typeParameters[0].refkey;
+                  }
+                });
+              }
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      namespace TestCode
+      {
+        public interface TestInterface
+        {
+          public T <T, U>Test(T paramA);
+        }
+      }
+    `);
+  });
+  it("defines with constraints", () => {
+    const typeParameters = [{
+      name: "T",
+      constraints: "IFoo"
+    }, {
+      name: "U",
+      constraints: "IBar"
+    }];
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(InterfaceMethod, {
+          "public": true,
+          name: "Test",
+          typeParameters: typeParameters,
+          children: "// Body"
+        });
+      }
+    })).toRenderTo(`
+      public interface TestInterface
+      {
+        public void <T, U>Test()
+          where T : IFoo
+          where U : IBar
+        {
+          // Body
+        }
+      }
+    `);
+  });
 });

package/dist/src/components/type-parameters/type-parameter-constraints.d.ts

@@ -0,0 +1,8 @@
+import { Children } from "@alloy-js/core";
+import { TypeParameterProps } from "./type-parameter.jsx";
+export interface TypeParameterConstraintsProps {
+    /** Parameters */
+    parameters: (TypeParameterProps | string)[];
+}
+export declare function TypeParameterConstraints(props: TypeParameterConstraintsProps): Children;
+//# sourceMappingURL=type-parameter-constraints.d.ts.map

package/dist/src/components/type-parameters/type-parameter-constraints.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-parameter-constraints.d.ts","sourceRoot":"","sources":["../../../../src/components/type-parameters/type-parameter-constraints.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAqB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,WAAW,6BAA6B;IAC5C,iBAAiB;IACjB,UAAU,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;CAC7C;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,6BAA6B,GACnC,QAAQ,CAcV"}

package/dist/src/components/type-parameters/type-parameter-constraints.js

@@ -0,0 +1,44 @@
+import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic, memo as _$memo } from "@alloy-js/core/jsx-runtime";
+import { code, For, Indent } from "@alloy-js/core";
+import { normalizeParameters } from "./type-parameters.js";
+export function TypeParameterConstraints(props) {
+  const parameters = normalizeParameters(props.parameters);
+  if (!parameters.some(x => x.constraints)) {
+    return null;
+  }
+  return _$createIntrinsic("group", {
+    get children() {
+      return _$createComponent(Indent, {
+        line: true,
+        get children() {
+          return _$createComponent(For, {
+            each: parameters,
+            hardline: true,
+            children: param => _$createComponent(TypeParameterConstraint, param)
+          });
+        }
+      });
+    }
+  });
+}
+function TypeParameterConstraint(props) {
+  const constraints = arrayify(props.constraints);
+  return ["where ", _$memo(() => code`${props.name} : `), _$createIntrinsic("group", {
+    get children() {
+      return _$createComponent(Indent, {
+        softline: true,
+        get children() {
+          return _$createComponent(For, {
+            each: constraints,
+            comma: true,
+            line: true,
+            children: constraint => code`${constraint}`
+          });
+        }
+      });
+    }
+  })];
+}
+function arrayify(value) {
+  return Array.isArray(value) ? value : [value];
+}

package/dist/src/components/type-parameters/type-parameter-constraints.test.d.ts

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

package/dist/src/components/type-parameters/type-parameter-constraints.test.d.ts.map

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