@tsonic/emitter 0.0.62 → 0.0.63

package/dist/types/index.test.js

@@ -108,5 +108,142 @@ describe("Type Emission", () => {
         // Should NOT include using directives - uses global:: FQN
         expect(result).to.not.include("using System.Threading.Tasks");
     });
+    it("should emit symbol-key dictionaries as Dictionary<object, T>", () => {
+        const module = {
+            kind: "module",
+            filePath: "/src/test.ts",
+            namespace: "MyApp",
+            className: "Test",
+            isStaticContainer: true,
+            imports: [],
+            body: [
+                {
+                    kind: "functionDeclaration",
+                    name: "get",
+                    parameters: [
+                        {
+                            kind: "parameter",
+                            pattern: { kind: "identifierPattern", name: "store" },
+                            type: {
+                                kind: "dictionaryType",
+                                keyType: { kind: "referenceType", name: "object" },
+                                valueType: { kind: "primitiveType", name: "string" },
+                            },
+                            isOptional: false,
+                            isRest: false,
+                            passing: "value",
+                        },
+                        {
+                            kind: "parameter",
+                            pattern: { kind: "identifierPattern", name: "key" },
+                            type: { kind: "referenceType", name: "object" },
+                            isOptional: false,
+                            isRest: false,
+                            passing: "value",
+                        },
+                    ],
+                    returnType: { kind: "primitiveType", name: "string" },
+                    body: {
+                        kind: "blockStatement",
+                        statements: [
+                            {
+                                kind: "returnStatement",
+                                expression: {
+                                    kind: "memberAccess",
+                                    object: { kind: "identifier", name: "store" },
+                                    property: { kind: "identifier", name: "key" },
+                                    isOptional: false,
+                                    isComputed: true,
+                                    accessKind: "dictionary",
+                                },
+                            },
+                        ],
+                    },
+                    isExported: true,
+                    isAsync: false,
+                    isGenerator: false,
+                },
+            ],
+            exports: [],
+        };
+        const result = emitModule(module);
+        expect(result).to.include("global::System.Collections.Generic.Dictionary<object, string> store");
+        expect(result).to.include("return store[key];");
+    });
+    it("should emit mixed PropertyKey dictionaries as Dictionary<object, T>", () => {
+        const module = {
+            kind: "module",
+            filePath: "/src/test.ts",
+            namespace: "MyApp",
+            className: "Test",
+            isStaticContainer: true,
+            imports: [],
+            body: [
+                {
+                    kind: "functionDeclaration",
+                    name: "set",
+                    parameters: [
+                        {
+                            kind: "parameter",
+                            pattern: { kind: "identifierPattern", name: "store" },
+                            type: {
+                                kind: "dictionaryType",
+                                keyType: { kind: "referenceType", name: "object" },
+                                valueType: { kind: "primitiveType", name: "number" },
+                            },
+                            isOptional: false,
+                            isRest: false,
+                            passing: "value",
+                        },
+                        {
+                            kind: "parameter",
+                            pattern: { kind: "identifierPattern", name: "key" },
+                            type: { kind: "referenceType", name: "object" },
+                            isOptional: false,
+                            isRest: false,
+                            passing: "value",
+                        },
+                        {
+                            kind: "parameter",
+                            pattern: { kind: "identifierPattern", name: "value" },
+                            type: { kind: "primitiveType", name: "number" },
+                            isOptional: false,
+                            isRest: false,
+                            passing: "value",
+                        },
+                    ],
+                    returnType: { kind: "voidType" },
+                    body: {
+                        kind: "blockStatement",
+                        statements: [
+                            {
+                                kind: "expressionStatement",
+                                expression: {
+                                    kind: "assignment",
+                                    operator: "=",
+                                    left: {
+                                        kind: "memberAccess",
+                                        object: { kind: "identifier", name: "store" },
+                                        property: { kind: "identifier", name: "key" },
+                                        isOptional: false,
+                                        isComputed: true,
+                                        accessKind: "dictionary",
+                                    },
+                                    right: { kind: "identifier", name: "value" },
+                                },
+                            },
+                        ],
+                    },
+                    isExported: true,
+                    isAsync: false,
+                    isGenerator: false,
+                },
+            ],
+            exports: [],
+        };
+        const result = emitModule(module);
+        expect(result).to.include("global::System.Collections.Generic.Dictionary<object, double> store");
+        expect(result).to.include("store[key] = value;");
+    });
 });
 //# sourceMappingURL=index.test.js.map

package/dist/types/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/types/index.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/types/index.test.ts"],"names":[],"mappings":"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"}

package/dist/types/intersections.d.ts

@@ -3,10 +3,11 @@
  */
 import { IrType } from "@tsonic/frontend";
 import { EmitterContext } from "../types.js";
+import type { CSharpTypeAst } from "../core/format/backend-ast/types.js";
 /**
- * Emit intersection types as object (C# doesn't have intersection types)
+ * Emit intersection types as CSharpTypeAst (C# doesn't have intersection types)
  */
 export declare const emitIntersectionType: (_type: Extract<IrType, {
     kind: "intersectionType";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [CSharpTypeAst, EmitterContext];
 //# sourceMappingURL=intersections.d.ts.map

package/dist/types/intersections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intersections.d.ts","sourceRoot":"","sources":["../../src/types/intersections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC,EACpD,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAKzB,CAAC"}
+{"version":3,"file":"intersections.d.ts","sourceRoot":"","sources":["../../src/types/intersections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC,EACpD,SAAS,cAAc,KACtB,CAAC,aAAa,EAAE,cAAc,CAKhC,CAAC"}

package/dist/types/intersections.js

@@ -2,12 +2,12 @@
  * Intersection type emission
  */
 /**
- * Emit intersection types as object (C# doesn't have intersection types)
+ * Emit intersection types as CSharpTypeAst (C# doesn't have intersection types)
  */
 export const emitIntersectionType = (_type, context) => {
     // C# doesn't have intersection types
     // For MVP, we'll use object
     // In a more complete implementation, we might generate an interface
-    return ["object", context];
+    return [{ kind: "predefinedType", keyword: "object" }, context];
 };
 //# sourceMappingURL=intersections.js.map

package/dist/types/intersections.js.map

@@ -1 +1 @@
-{"version":3,"file":"intersections.js","sourceRoot":"","sources":["../../src/types/intersections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAoD,EACpD,OAAuB,EACG,EAAE;IAC5B,qCAAqC;IACrC,4BAA4B;IAC5B,oEAAoE;IACpE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"intersections.js","sourceRoot":"","sources":["../../src/types/intersections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAoD,EACpD,OAAuB,EACU,EAAE;IACnC,qCAAqC;IACrC,4BAA4B;IAC5B,oEAAoE;IACpE,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC,CAAC"}

package/dist/types/literals.d.ts

@@ -3,10 +3,17 @@
  */
 import { IrType } from "@tsonic/frontend";
 import { EmitterContext } from "../types.js";
+import type { CSharpTypeAst } from "../core/format/backend-ast/types.js";
 /**
- * Emit literal types (string, number, boolean literals)
+ * Emit literal types as CSharpTypeAst (predefinedType nodes)
+ *
+ * Literal types emit as their base primitive type:
+ * - string literal → predefinedType("string")
+ * - number literal → predefinedType("double")
+ * - boolean literal → predefinedType("bool")
+ * - other → predefinedType("object")
  */
 export declare const emitLiteralType: (type: Extract<IrType, {
     kind: "literalType";
-}>, context: EmitterContext) => [string, EmitterContext];
+}>, context: EmitterContext) => [CSharpTypeAst, EmitterContext];
 //# sourceMappingURL=literals.d.ts.map

package/dist/types/literals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"literals.d.ts","sourceRoot":"","sources":["../../src/types/literals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAYzB,CAAC"}
+{"version":3,"file":"literals.d.ts","sourceRoot":"","sources":["../../src/types/literals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,KACtB,CAAC,aAAa,EAAE,cAAc,CAYhC,CAAC"}

package/dist/types/literals.js

@@ -2,19 +2,25 @@
  * Literal type emission
  */
 /**
- * Emit literal types (string, number, boolean literals)
+ * Emit literal types as CSharpTypeAst (predefinedType nodes)
+ *
+ * Literal types emit as their base primitive type:
+ * - string literal → predefinedType("string")
+ * - number literal → predefinedType("double")
+ * - boolean literal → predefinedType("bool")
+ * - other → predefinedType("object")
  */
 export const emitLiteralType = (type, context) => {
     // For literal types, we emit the base type
     if (typeof type.value === "string") {
-        return ["string", context];
+        return [{ kind: "predefinedType", keyword: "string" }, context];
     }
     if (typeof type.value === "number") {
-        return ["double", context];
+        return [{ kind: "predefinedType", keyword: "double" }, context];
     }
     if (typeof type.value === "boolean") {
-        return ["bool", context];
+        return [{ kind: "predefinedType", keyword: "bool" }, context];
     }
-    return ["object", context];
+    return [{ kind: "predefinedType", keyword: "object" }, context];
 };
 //# sourceMappingURL=literals.js.map

package/dist/types/literals.js.map

@@ -1 +1 @@
-{"version":3,"file":"literals.js","sourceRoot":"","sources":["../../src/types/literals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAA8C,EAC9C,OAAuB,EACG,EAAE;IAC5B,2CAA2C;IAC3C,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"literals.js","sourceRoot":"","sources":["../../src/types/literals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAA8C,EAC9C,OAAuB,EACU,EAAE;IACnC,2CAA2C;IAC3C,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC,CAAC"}

package/dist/types/objects.d.ts

@@ -8,13 +8,14 @@
  */
 import { IrType } from "@tsonic/frontend";
 import { EmitterContext } from "../types.js";
+import type { CSharpTypeAst } from "../core/format/backend-ast/types.js";
 /**
- * Emit object types
+ * Emit object types as CSharpTypeAst
  *
  * ICE: This should never be called. Frontend validation (TSN7403) should
  * reject anonymous object types. If we reach here, validation has a gap.
  */
 export declare const emitObjectType: (_type: Extract<IrType, {
     kind: "objectType";
-}>, _context: EmitterContext) => [string, EmitterContext];
+}>, _context: EmitterContext) => [CSharpTypeAst, EmitterContext];
 //# sourceMappingURL=objects.d.ts.map

package/dist/types/objects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objects.d.ts","sourceRoot":"","sources":["../../src/types/objects.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,EAC9C,UAAU,cAAc,KACvB,CAAC,MAAM,EAAE,cAAc,CAKzB,CAAC"}
+{"version":3,"file":"objects.d.ts","sourceRoot":"","sources":["../../src/types/objects.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,OAAO,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,EAC9C,UAAU,cAAc,KACvB,CAAC,aAAa,EAAE,cAAc,CAKhC,CAAC"}

package/dist/types/objects.js

@@ -7,7 +7,7 @@
  * Named types (interfaces, type aliases, classes) become IrReferenceType instead.
  */
 /**
- * Emit object types
+ * Emit object types as CSharpTypeAst
  *
  * ICE: This should never be called. Frontend validation (TSN7403) should
  * reject anonymous object types. If we reach here, validation has a gap.

package/dist/types/objects.js.map

@@ -1 +1 @@
-{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../src/types/objects.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAA8C,EAC9C,QAAwB,EACE,EAAE;IAC5B,8DAA8D;IAC9D,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../src/types/objects.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAA8C,EAC9C,QAAwB,EACS,EAAE;IACnC,8DAA8D;IAC9D,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;AACJ,CAAC,CAAC"}

package/dist/types/parameters.d.ts

@@ -3,13 +3,14 @@
  */
 import { IrType, IrTypeParameter } from "@tsonic/frontend";
 import { EmitterContext } from "../types.js";
+import type { CSharpTypeAst, CSharpTypeParameterAst, CSharpTypeParameterConstraintAst } from "../core/format/backend-ast/types.js";
 /**
- * Emit C# type parameters with constraints
- * Example: <T, U extends Foo> → <T, U> with where clauses
+ * Emit C# type parameters with constraints as AST nodes.
+ * Example: <T, U extends Foo> → typeParams=[{name:"T"},{name:"U"}], constraints=[{...}]
  */
-export declare const emitTypeParameters: (typeParams: readonly IrTypeParameter[] | undefined, context: EmitterContext, reservedCsharpNames?: ReadonlySet<string>) => [string, string[], EmitterContext];
+export declare const emitTypeParametersAst: (typeParams: readonly IrTypeParameter[] | undefined, context: EmitterContext, reservedCsharpNames?: ReadonlySet<string>) => [readonly CSharpTypeParameterAst[], readonly CSharpTypeParameterConstraintAst[], EmitterContext];
 /**
- * Emit a parameter type with optional and default value handling
+ * Emit a parameter type as CSharpTypeAst with optional/nullable handling
  */
-export declare const emitParameterType: (type: IrType | undefined, isOptional: boolean, context: EmitterContext) => [string, EmitterContext];
+export declare const emitParameterType: (type: IrType | undefined, isOptional: boolean, context: EmitterContext) => [CSharpTypeAst, EmitterContext];
 //# sourceMappingURL=parameters.d.ts.map

package/dist/types/parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../src/types/parameters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA6C7C;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAC7B,YAAY,SAAS,eAAe,EAAE,GAAG,SAAS,EAClD,SAAS,cAAc,EACvB,sBAAsB,WAAW,CAAC,MAAM,CAAC,KACxC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,cAAc,CAgHnC,CAAC;AAwBF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,GAAG,SAAS,EACxB,YAAY,OAAO,EACnB,SAAS,cAAc,KACtB,CAAC,MAAM,EAAE,cAAc,CAiBzB,CAAC"}
+{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../src/types/parameters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,KAAK,EACV,aAAa,EAEb,sBAAsB,EACtB,gCAAgC,EACjC,MAAM,qCAAqC,CAAC;AAmF7C;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,YAAY,SAAS,eAAe,EAAE,GAAG,SAAS,EAClD,SAAS,cAAc,EACvB,sBAAsB,WAAW,CAAC,MAAM,CAAC,KACxC,CACD,SAAS,sBAAsB,EAAE,EACjC,SAAS,gCAAgC,EAAE,EAC3C,cAAc,CAmIf,CAAC;AAwBF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,GAAG,SAAS,EACxB,YAAY,OAAO,EACnB,SAAS,cAAc,KACtB,CAAC,aAAa,EAAE,cAAc,CAiBhC,CAAC"}

package/dist/types/parameters.js

@@ -1,8 +1,31 @@
 /**
  * Type parameter and parameter type emission
  */
-import { emitType } from "./emitter.js";
+import { emitTypeAst } from "./emitter.js";
 import { escapeCSharpIdentifier } from "../emitter-types/index.js";
+const NON_CONSTRAINT_REFERENCE_TYPES = new Set([
+    // TS/C# primitives and aliases that cannot appear as C# generic constraints.
+    "string",
+    "bool",
+    "char",
+    "byte",
+    "sbyte",
+    "short",
+    "ushort",
+    "int",
+    "uint",
+    "long",
+    "ulong",
+    "nint",
+    "nuint",
+    "int128",
+    "uint128",
+    "half",
+    "float",
+    "double",
+    "decimal",
+    "void",
+]);
 const inferTypeParamConstraintKind = (tp) => {
     // No constraint → unconstrained (can be class or struct in C# terms)
     if (!tp.constraint)
@@ -31,13 +54,25 @@ const inferTypeParamConstraintKind = (tp) => {
     // Interface/class constraints are not enough to determine reference vs value.
     return "unconstrained";
 };
+const isConstraintTypeNodeEmittable = (type) => {
+    if (type.kind === "typeParameterType") {
+        return true;
+    }
+    if (type.kind !== "referenceType") {
+        return false;
+    }
+    if (type.name === "object" || type.name === "struct") {
+        return false;
+    }
+    return !NON_CONSTRAINT_REFERENCE_TYPES.has(type.name);
+};
 /**
- * Emit C# type parameters with constraints
- * Example: <T, U extends Foo> → <T, U> with where clauses
+ * Emit C# type parameters with constraints as AST nodes.
+ * Example: <T, U extends Foo> → typeParams=[{name:"T"},{name:"U"}], constraints=[{...}]
  */
-export const emitTypeParameters = (typeParams, context, reservedCsharpNames) => {
+export const emitTypeParametersAst = (typeParams, context, reservedCsharpNames) => {
     if (!typeParams || typeParams.length === 0) {
-        return ["", [], context];
+        return [[], [], context];
     }
     const normalizeCsharpIdentifier = (id) => id.startsWith("@") ? id.slice(1) : id;
     const used = new Set();
@@ -74,12 +109,11 @@ export const emitTypeParameters = (typeParams, context, reservedCsharpNames) =>
     for (const tp of typeParams) {
         mergedConstraints.set(tp.name, inferTypeParamConstraintKind(tp));
     }
-    const paramNames = typeParams
-        .map((tp) => mergedTypeParamNameMap.get(tp.name) ?? tp.name)
-        .join(", ");
-    const typeParamsStr = `<${paramNames}>`;
-    // Build where clauses for constraints
-    const whereClauses = [];
+    const typeParamAsts = typeParams.map((tp) => ({
+        name: mergedTypeParamNameMap.get(tp.name) ?? tp.name,
+    }));
+    // Build where clause AST nodes for constraints
+    const constraintAsts = [];
     let currentContext = {
         ...context,
         typeParamConstraints: mergedConstraints,
@@ -92,45 +126,70 @@ export const emitTypeParameters = (typeParams, context, reservedCsharpNames) =>
             // Don't call emitType on objectType constraints (would trigger ICE)
             if (tp.isStructuralConstraint) {
                 // Structural constraints generate interfaces - reference them
-                whereClauses.push(`where ${tpName} : __Constraint_${tp.name}`);
+                constraintAsts.push({
+                    typeParameter: tpName,
+                    constraints: [
+                        {
+                            kind: "typeConstraint",
+                            type: {
+                                kind: "identifierType",
+                                name: `__Constraint_${tp.name}`,
+                            },
+                        },
+                    ],
+                });
             }
             else if (tp.constraint.kind === "intersectionType") {
                 // Multiple constraints: T extends A & B → where T : A, B
                 const constraintParts = [];
                 for (const member of tp.constraint.types) {
                     if (member.kind === "referenceType" && member.name === "struct") {
-                        constraintParts.push("struct");
+                        constraintParts.push({ kind: "structConstraint" });
                     }
                     else if (member.kind === "referenceType" &&
                         member.name === "object") {
-                        constraintParts.push("class");
+                        constraintParts.push({ kind: "classConstraint" });
                     }
-                    else {
-                        const [constraintStr, newContext] = emitType(member, currentContext);
+                    else if (isConstraintTypeNodeEmittable(member)) {
+                        const [cAst, newContext] = emitTypeAst(member, currentContext);
                         currentContext = newContext;
-                        constraintParts.push(constraintStr);
+                        constraintParts.push({ kind: "typeConstraint", type: cAst });
                     }
                 }
-                whereClauses.push(`where ${tpName} : ${constraintParts.join(", ")}`);
+                if (constraintParts.length > 0) {
+                    constraintAsts.push({
+                        typeParameter: tpName,
+                        constraints: constraintParts,
+                    });
+                }
             }
             else if (tp.constraint.kind === "referenceType" &&
                 tp.constraint.name === "struct") {
                 // Special case: T extends struct → where T : struct (C# value type constraint)
-                whereClauses.push(`where ${tpName} : struct`);
+                constraintAsts.push({
+                    typeParameter: tpName,
+                    constraints: [{ kind: "structConstraint" }],
+                });
             }
             else if (tp.constraint.kind === "referenceType" &&
                 tp.constraint.name === "object") {
                 // Special case: T extends object → where T : class (C# reference type constraint)
-                whereClauses.push(`where ${tpName} : class`);
+                constraintAsts.push({
+                    typeParameter: tpName,
+                    constraints: [{ kind: "classConstraint" }],
+                });
             }
-            else {
-                const [constraintStr, newContext] = emitType(tp.constraint, currentContext);
+            else if (isConstraintTypeNodeEmittable(tp.constraint)) {
+                const [cAst, newContext] = emitTypeAst(tp.constraint, currentContext);
                 currentContext = newContext;
-                whereClauses.push(`where ${tpName} : ${constraintStr}`);
+                constraintAsts.push({
+                    typeParameter: tpName,
+                    constraints: [{ kind: "typeConstraint", type: cAst }],
+                });
             }
         }
     }
-    return [typeParamsStr, whereClauses, currentContext];
+    return [typeParamAsts, constraintAsts, currentContext];
 };
 /**
  * Check if a type is a ref/out/in wrapper type and return the inner type
@@ -150,20 +209,20 @@ const unwrapParameterModifierType = (type) => {
     return null;
 };
 /**
- * Emit a parameter type with optional and default value handling
+ * Emit a parameter type as CSharpTypeAst with optional/nullable handling
  */
 export const emitParameterType = (type, isOptional, context) => {
     const typeNode = type ?? { kind: "anyType" };
     // Unwrap ref/out/in wrapper types - the modifier is handled separately
     const unwrapped = unwrapParameterModifierType(typeNode);
     const actualType = unwrapped ?? typeNode;
-    const [baseType, newContext] = emitType(actualType, context);
-    // For optional parameters, add ? suffix for nullable types
+    const [baseTypeAst, newContext] = emitTypeAst(actualType, context);
+    // For optional parameters, wrap in nullable
     // This includes both value types (double?, int?) and reference types (string?)
     // per spec/04-type-mappings.md:21-78
     if (isOptional) {
-        return [`${baseType}?`, newContext];
+        return [{ kind: "nullableType", underlyingType: baseTypeAst }, newContext];
     }
-    return [baseType, newContext];
+    return [baseTypeAst, newContext];
 };
 //# sourceMappingURL=parameters.js.map

package/dist/types/parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../src/types/parameters.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInE,MAAM,4BAA4B,GAAG,CACnC,EAAmB,EACM,EAAE;IAC3B,qEAAqE;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU;QAAE,OAAO,eAAe,CAAC;IAE3C,wEAAwE;IACxE,IAAI,EAAE,CAAC,sBAAsB;QAAE,OAAO,OAAO,CAAC;IAE9C,iBAAiB;IACjB,IACE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe;QACtC,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,EAC/B,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IACE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe;QACtC,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,EAC/B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,6DAA6D;IAC7D,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CACzD,CAAC;QACF,MAAM,SAAS,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CACzD,CAAC;QACF,IAAI,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC/B,IAAI,SAAS;YAAE,OAAO,OAAO,CAAC;IAChC,CAAC;IAED,8EAA8E;IAC9E,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,UAAkD,EAClD,OAAuB,EACvB,mBAAyC,EACL,EAAE;IACtC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,yBAAyB,GAAG,CAAC,EAAU,EAAU,EAAE,CACvD,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAExC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,QAAQ,IAAI,mBAAmB,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE;QACrD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAEjC,IAAI,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC;QAEvC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,OAAO,IAAI,EAAE,CAAC;YACZ,OAAO,GAAG,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAAE,OAAO,OAAO,CAAC;YACvC,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IAC3E,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,qBAAqB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAClD,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,4DAA4D;IAC5D,kFAAkF;IAClF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;IACtE,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,4BAA4B,CAAC,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,UAAU,GAAG,UAAU;SAC1B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC;SAC3D,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,aAAa,GAAG,IAAI,UAAU,GAAG,CAAC;IAExC,sCAAsC;IACtC,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,cAAc,GAAmB;QACnC,GAAG,OAAO;QACV,oBAAoB,EAAE,iBAAiB;QACvC,oBAAoB,EAAE,sBAAsB;KAC7C,CAAC;IAEF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC;QAE9D,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;YAClB,6EAA6E;YAC7E,oEAAoE;YACpE,IAAI,EAAE,CAAC,sBAAsB,EAAE,CAAC;gBAC9B,8DAA8D;gBAC9D,YAAY,CAAC,IAAI,CAAC,SAAS,MAAM,mBAAmB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;iBAAM,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBACrD,yDAAyD;gBACzD,MAAM,eAAe,GAAa,EAAE,CAAC;gBACrC,KAAK,MAAM,MAAM,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;oBACzC,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAChE,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACjC,CAAC;yBAAM,IACL,MAAM,CAAC,IAAI,KAAK,eAAe;wBAC/B,MAAM,CAAC,IAAI,KAAK,QAAQ,EACxB,CAAC;wBACD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,QAAQ,CAC1C,MAAM,EACN,cAAc,CACf,CAAC;wBACF,cAAc,GAAG,UAAU,CAAC;wBAC5B,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC;gBACD,YAAY,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvE,CAAC;iBAAM,IACL,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe;gBACtC,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,EAC/B,CAAC;gBACD,+EAA+E;gBAC/E,YAAY,CAAC,IAAI,CAAC,SAAS,MAAM,WAAW,CAAC,CAAC;YAChD,CAAC;iBAAM,IACL,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe;gBACtC,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,EAC/B,CAAC;gBACD,kFAAkF;gBAClF,YAAY,CAAC,IAAI,CAAC,SAAS,MAAM,UAAU,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,QAAQ,CAC1C,EAAE,CAAC,UAAU,EACb,cAAc,CACf,CAAC;gBACF,cAAc,GAAG,UAAU,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,aAAa,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,aAAa,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,2BAA2B,GAAG,CAAC,IAAY,EAAiB,EAAE;IAClE,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,iDAAiD;IACjD,IACE,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,CAAC;QACnD,IAAI,CAAC,aAAa;QAClB,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAC/B,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACxC,OAAO,SAAS,IAAI,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAwB,EACxB,UAAmB,EACnB,OAAuB,EACG,EAAE;IAC5B,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,IAAI,EAAE,SAAkB,EAAE,CAAC;IAEtD,uEAAuE;IACvE,MAAM,SAAS,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,SAAS,IAAI,QAAQ,CAAC;IAEzC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE7D,2DAA2D;IAC3D,+EAA+E;IAC/E,qCAAqC;IACrC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,QAAQ,GAAG,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../src/types/parameters.ts"],"names":[],"mappings":"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"}

package/dist/types/parameters.test.js

@@ -4,6 +4,7 @@
 import { describe, it } from "mocha";
 import { expect } from "chai";
 import { emitParameters } from "../statements/classes/parameters.js";
+import { printParameter } from "../core/format/backend-ast/printer.js";
 describe("Parameter modifiers (ref/out/in)", () => {
     const baseContext = {
         indentLevel: 0,
@@ -32,7 +33,8 @@ describe("Parameter modifiers (ref/out/in)", () => {
                 passing: "out",
             },
         ];
-        const [emitted] = emitParameters(params, baseContext);
+        const [paramAsts] = emitParameters(params, baseContext);
+        const emitted = paramAsts.map(printParameter).join(", ");
         expect(emitted).to.equal("out int result");
     });
     it("should emit ref parameter with ref modifier", () => {
@@ -55,7 +57,8 @@ describe("Parameter modifiers (ref/out/in)", () => {
                 passing: "ref",
             },
         ];
-        const [emitted] = emitParameters(params, baseContext);
+        const [paramAsts] = emitParameters(params, baseContext);
+        const emitted = paramAsts.map(printParameter).join(", ");
         expect(emitted).to.equal("ref int value");
     });
     it("should emit in parameter with in modifier", () => {
@@ -78,7 +81,8 @@ describe("Parameter modifiers (ref/out/in)", () => {
                 passing: "in",
             },
         ];
-        const [emitted] = emitParameters(params, baseContext);
+        const [paramAsts] = emitParameters(params, baseContext);
+        const emitted = paramAsts.map(printParameter).join(", ");
         expect(emitted).to.equal("in int value");
     });
     it("should emit multiple parameters with mixed modifiers", () => {
@@ -129,7 +133,8 @@ describe("Parameter modifiers (ref/out/in)", () => {
                 passing: "ref",
             },
         ];
-        const [emitted] = emitParameters(params, baseContext);
+        const [paramAsts] = emitParameters(params, baseContext);
+        const emitted = paramAsts.map(printParameter).join(", ");
         expect(emitted).to.equal("int input, out int output, ref int counter");
     });
 });