@tsonic/emitter 0.0.4 → 0.0.5

package/dist/core/type-resolution.test.js

@@ -0,0 +1,271 @@
+/**
+ * Tests for type resolution helpers
+ */
+import { describe, it } from "mocha";
+import { expect } from "chai";
+import { containsTypeParameter, substituteTypeArgs, getPropertyType, } from "./type-resolution.js";
+describe("type-resolution", () => {
+    describe("containsTypeParameter", () => {
+        it("returns true for typeParameterType IR kind", () => {
+            const type = { kind: "typeParameterType", name: "T" };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns true for referenceType matching typeParams set (legacy)", () => {
+            const type = { kind: "referenceType", name: "T" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for referenceType not in typeParams set", () => {
+            const type = { kind: "referenceType", name: "string" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+        it("returns true for Array<T> containing type parameter", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "typeParameterType", name: "T" }],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for Array<string> (concrete type)", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+        it("returns true for arrayType with type parameter element", () => {
+            const type = {
+                kind: "arrayType",
+                elementType: { kind: "typeParameterType", name: "T" },
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns true for union type containing type parameter", () => {
+            const type = {
+                kind: "unionType",
+                types: [
+                    { kind: "primitiveType", name: "string" },
+                    { kind: "typeParameterType", name: "T" },
+                ],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for primitive types", () => {
+            const type = { kind: "primitiveType", name: "number" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+    });
+    describe("substituteTypeArgs", () => {
+        it("substitutes simple type parameter", () => {
+            const type = { kind: "typeParameterType", name: "T" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+        it("substitutes type parameter in referenceType (legacy)", () => {
+            const type = { kind: "referenceType", name: "T" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "number" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "number" });
+        });
+        it("substitutes type argument in generic reference", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "typeParameterType", name: "T" }],
+            };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            });
+        });
+        it("substitutes in array element type", () => {
+            const type = {
+                kind: "arrayType",
+                elementType: { kind: "typeParameterType", name: "T" },
+            };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "boolean" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({
+                kind: "arrayType",
+                elementType: { kind: "primitiveType", name: "boolean" },
+            });
+        });
+        it("returns unchanged type when no matching type param", () => {
+            const type = { kind: "referenceType", name: "SomeType" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "referenceType", name: "SomeType" });
+        });
+    });
+    describe("getPropertyType", () => {
+        const defaultOptions = {
+            rootNamespace: "Test",
+            indent: 4,
+        };
+        const createContext = (localTypes) => ({
+            indentLevel: 0,
+            options: defaultOptions,
+            isStatic: false,
+            isAsync: false,
+            localTypes,
+        });
+        it("returns property type from interface", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            // After substitution, T becomes string
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+        it("returns undefined for unknown property", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "unknown", context);
+            expect(result).to.be.undefined;
+        });
+        it("returns undefined for unknown type", () => {
+            const localTypes = new Map();
+            const contextualType = {
+                kind: "referenceType",
+                name: "ExternalType",
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            expect(result).to.be.undefined;
+        });
+        it("returns unsubstituted type when no type arguments", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                // No typeArguments - using raw generic type
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            // Returns unsubstituted T
+            expect(result).to.deep.equal({ kind: "typeParameterType", name: "T" });
+        });
+        it("chases type alias", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "data",
+                    type: { kind: "primitiveType", name: "string" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "MyAlias",
+                    {
+                        kind: "typeAlias",
+                        typeParameters: [],
+                        type: { kind: "referenceType", name: "Target" },
+                    },
+                ],
+                [
+                    "Target",
+                    {
+                        kind: "interface",
+                        typeParameters: [],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "MyAlias",
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "data", context);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+    });
+});
+//# sourceMappingURL=type-resolution.test.js.map

package/dist/core/type-resolution.test.js.map

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

package/dist/emitter-types/context.d.ts

@@ -26,4 +26,33 @@ export declare const withAsync: (context: EmitterContext, isAsync: boolean) => E
  * Set current class name in context
  */
 export declare const withClassName: (context: EmitterContext, className: string) => EmitterContext;
+/**
+ * Scoped fields that should be restored after emission.
+ * These fields define lexical scopes and should not leak to parent scopes.
+ */
+type ScopedFields = Pick<EmitterContext, "typeParameters" | "returnType">;
+/**
+ * Execute an emission function with scoped context fields.
+ *
+ * This helper ensures that scoped fields (typeParameters, returnType) are
+ * restored after emission, preventing scope leaks when context is threaded
+ * upward via [result, newContext] tuples.
+ *
+ * Other context mutations (intLoopVars, importBindings, etc.) are preserved
+ * and bubbled up correctly.
+ *
+ * @example
+ * ```typescript
+ * const [result, finalCtx] = withScoped(
+ *   context,
+ *   {
+ *     typeParameters: new Set([...context.typeParameters ?? [], "T"]),
+ *     returnType: stmt.returnType
+ *   },
+ *   (scopedCtx) => emitFunctionBody(stmt.body, scopedCtx)
+ * );
+ * ```
+ */
+export declare const withScoped: <T>(context: EmitterContext, scopedPatch: Partial<ScopedFields>, emit: (ctx: EmitterContext) => [T, EmitterContext]) => [T, EmitterContext];
+export {};
 //# sourceMappingURL=context.d.ts.map

package/dist/emitter-types/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3D;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,cAAc,KAAG,cA4BvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,SAAS,cAAc,EACvB,UAAU,OAAO,KAChB,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,SAAS,cAAc,EACvB,SAAS,OAAO,KACf,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,EACvB,WAAW,MAAM,KAChB,cAGD,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3D;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,cAAc,KAAG,cA4BvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,SAAS,cAAc,EACvB,UAAU,OAAO,KAChB,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,SAAS,cAAc,EACvB,SAAS,OAAO,KACf,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,EACvB,WAAW,MAAM,KAChB,cAGD,CAAC;AAEH;;;GAGG;AACH,KAAK,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,gBAAgB,GAAG,YAAY,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,SAAS,cAAc,EACvB,aAAa,OAAO,CAAC,YAAY,CAAC,EAClC,MAAM,CAAC,GAAG,EAAE,cAAc,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,KACjD,CAAC,CAAC,EAAE,cAAc,CAoBpB,CAAC"}

package/dist/emitter-types/context.js

@@ -65,4 +65,43 @@ export const withClassName = (context, className) => ({
     ...context,
     className,
 });
+/**
+ * Execute an emission function with scoped context fields.
+ *
+ * This helper ensures that scoped fields (typeParameters, returnType) are
+ * restored after emission, preventing scope leaks when context is threaded
+ * upward via [result, newContext] tuples.
+ *
+ * Other context mutations (intLoopVars, importBindings, etc.) are preserved
+ * and bubbled up correctly.
+ *
+ * @example
+ * ```typescript
+ * const [result, finalCtx] = withScoped(
+ *   context,
+ *   {
+ *     typeParameters: new Set([...context.typeParameters ?? [], "T"]),
+ *     returnType: stmt.returnType
+ *   },
+ *   (scopedCtx) => emitFunctionBody(stmt.body, scopedCtx)
+ * );
+ * ```
+ */
+export const withScoped = (context, scopedPatch, emit) => {
+    // Save current scoped field values
+    const saved = {
+        typeParameters: context.typeParameters,
+        returnType: context.returnType,
+    };
+    // Create child context with scoped patch applied
+    const childContext = { ...context, ...scopedPatch };
+    // Execute the emission
+    const [result, innerContext] = emit(childContext);
+    // Restore scoped fields while keeping other mutations from child
+    const restoredContext = {
+        ...innerContext,
+        ...saved,
+    };
+    return [result, restoredContext];
+};
 //# sourceMappingURL=context.js.map

package/dist/emitter-types/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,aAAa,EACb,qBAAqB,GACtB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAuB,EAAkB,EAAE;IACvE,sDAAsD;IACtD,IAAI,QAAQ,GAA+B,SAAS,CAAC;IACrD,IAAI,gBAAgB,GAAuC,SAAS,CAAC;IAErE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtD,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;YACvB,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC1C,gBAAgB,GAAG,qBAAqB,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,sDAAsD;YACtD,wDAAwD;YACxD,OAAO,CAAC,IAAI,CACV,oCAAoC,EACpC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACvD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,WAAW,EAAE,CAAC;QACd,OAAO;QACP,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,QAAQ;QACR,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAuB,EAAkB,EAAE,CAAC,CAAC;IAClE,GAAG,OAAO;IACV,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,CAAC;CACrC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAuB,EAAkB,EAAE,CAAC,CAAC;IAClE,GAAG,OAAO;IACV,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;CAClD,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAuB,EACvB,QAAiB,EACD,EAAE,CAAC,CAAC;IACpB,GAAG,OAAO;IACV,QAAQ;CACT,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,OAAuB,EACvB,OAAgB,EACA,EAAE,CAAC,CAAC;IACpB,GAAG,OAAO;IACV,OAAO;CACR,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAAuB,EACvB,SAAiB,EACD,EAAE,CAAC,CAAC;IACpB,GAAG,OAAO;IACV,SAAS;CACV,CAAC,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"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"}

package/dist/emitter-types/core.d.ts

@@ -3,6 +3,7 @@
  */
 import type { MetadataFile } from "@tsonic/frontend/types/metadata.js";
 import type { TypeBinding } from "@tsonic/frontend/types/bindings.js";
+import type { IrType, IrInterfaceMember, IrClassMember } from "@tsonic/frontend";
 /**
  * Module identity for import resolution
  */
@@ -10,6 +11,11 @@ export type ModuleIdentity = {
     readonly namespace: string;
     readonly className: string;
     readonly filePath: string;
+    /**
+     * True if the module has a type declaration (class/interface) with the same name as className.
+     * When true, value imports should target ClassName__Module instead of ClassName.
+     */
+    readonly hasTypeCollision: boolean;
 };
 /**
  * Module map for resolving cross-file imports
@@ -79,6 +85,25 @@ export type ImportBinding = {
     /** For value imports: the member name inside the container (e.g., "createUser") */
     readonly member?: string;
 };
+/**
+ * Information about a locally-defined type (class/interface/typeAlias).
+ * Used for property type lookup during expression emission.
+ */
+export type LocalTypeInfo = {
+    readonly kind: "interface";
+    readonly typeParameters: readonly string[];
+    readonly members: readonly IrInterfaceMember[];
+    readonly extends: readonly IrType[];
+} | {
+    readonly kind: "class";
+    readonly typeParameters: readonly string[];
+    readonly members: readonly IrClassMember[];
+    readonly implements: readonly IrType[];
+} | {
+    readonly kind: "typeAlias";
+    readonly typeParameters: readonly string[];
+    readonly type: IrType;
+};
 /**
  * Context passed through emission process
  */
@@ -107,6 +132,12 @@ export type EmitterContext = {
     readonly importBindings?: ReadonlyMap<string, ImportBinding>;
     /** Set of variable names known to be int (from canonical for-loop counters) */
     readonly intLoopVars?: ReadonlySet<string>;
+    /** Type parameter names in current scope (for detecting generic type contexts) */
+    readonly typeParameters?: ReadonlySet<string>;
+    /** Return type of current function/method (for contextual typing in return statements) */
+    readonly returnType?: IrType;
+    /** Map of local type names to their definitions (for property type lookup) */
+    readonly localTypes?: ReadonlyMap<string, LocalTypeInfo>;
 };
 /**
  * Result of emitting C# code

package/dist/emitter-types/core.d.ts.map

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

package/dist/emitter-types/index.d.ts

@@ -1,9 +1,9 @@
 /**
  * Emitter types - Public API
  */
-export type { EmitterOptions, EmitterContext, EmitResult, CSharpFragment, ImportBinding, ModuleIdentity, ModuleMap, ExportSource, ExportMap, JsonAotRegistry, } from "./core.js";
+export type { EmitterOptions, EmitterContext, EmitResult, CSharpFragment, ImportBinding, ModuleIdentity, ModuleMap, ExportSource, ExportMap, JsonAotRegistry, LocalTypeInfo, } from "./core.js";
 export type { CSharpAccessModifier, CSharpClassModifier, CSharpMethodModifier, CSharpUsing, } from "./csharp-types.js";
-export { createContext, indent, dedent, withStatic, withAsync, withClassName, } from "./context.js";
+export { createContext, indent, dedent, withStatic, withAsync, withClassName, withScoped, } from "./context.js";
 export { getIndent } from "./formatting.js";
 export { renderTypeFQN, renderMemberFQN, renderFQN, FQN } from "./fqn.js";
 export { escapeCSharpIdentifier, isCSharpKeyword } from "./identifiers.js";

package/dist/emitter-types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/emitter-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,GAChB,MAAM,WAAW,CAAC;AACnB,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,EACb,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,aAAa,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/emitter-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,EACf,aAAa,GACd,MAAM,WAAW,CAAC;AACnB,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,EACb,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,aAAa,EACb,UAAU,GACX,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/emitter-types/index.js

@@ -1,7 +1,7 @@
 /**
  * Emitter types - Public API
  */
-export { createContext, indent, dedent, withStatic, withAsync, withClassName, } from "./context.js";
+export { createContext, indent, dedent, withStatic, withAsync, withClassName, withScoped, } from "./context.js";
 export { getIndent } from "./formatting.js";
 export { renderTypeFQN, renderMemberFQN, renderFQN, FQN } from "./fqn.js";
 export { escapeCSharpIdentifier, isCSharpKeyword } from "./identifiers.js";

package/dist/emitter-types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/emitter-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAoBH,OAAO,EACL,aAAa,EACb,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,aAAa,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/emitter-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqBH,OAAO,EACL,aAAa,EACb,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,aAAa,EACb,UAAU,GACX,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/expression-emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-emitter.d.ts","sourceRoot":"","sources":["../src/expression-emitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA6B5D;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,YAAY,EAClB,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,cAAc,EAAE,cAAc,CAqEjC,CAAC;AAGF,OAAO,EACL,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"expression-emitter.d.ts","sourceRoot":"","sources":["../src/expression-emitter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA6B5D;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,YAAY,EAClB,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,cAAc,EAAE,cAAc,CAsEjC,CAAC;AAGF,OAAO,EACL,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,8BAA8B,CAAC"}

package/dist/expression-emitter.js

@@ -20,15 +20,15 @@ import { emitTemplateLiteral, emitSpread, emitAwait, } from "./expressions/other
 export const emitExpression = (expr, context, expectedType) => {
     switch (expr.kind) {
         case "literal":
-            // Check if the literal has an inferredType that requires integer emission
-            // This handles cases like `1 as int` where the type assertion sets inferredType
-            return emitLiteral(expr, context, getExpectedClrTypeForNumeric(expr.inferredType));
+            // Pass expectedType for null → default conversion in generic contexts
+            // Also check if the literal has an inferredType that requires integer emission
+            return emitLiteral(expr, context, expectedType, getExpectedClrTypeForNumeric(expr.inferredType));
         case "identifier":
             return emitIdentifier(expr, context);
         case "array":
             return emitArray(expr, context, expectedType);
         case "object":
-            return emitObject(expr, context);
+            return emitObject(expr, context, expectedType);
         case "memberAccess":
             return emitMemberAccess(expr, context);
         case "call":
@@ -46,7 +46,7 @@ export const emitExpression = (expr, context, expectedType) => {
         case "assignment":
             return emitAssignment(expr, context);
         case "conditional":
-            return emitConditional(expr, context);
+            return emitConditional(expr, context, expectedType);
         case "functionExpression":
             return emitFunctionExpression(expr, context);
         case "arrowFunction":

package/dist/expression-emitter.js.map

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

package/dist/expressions/collections.d.ts

@@ -17,8 +17,12 @@ export declare const emitArray: (expr: Extract<IrExpression, {
  * 2. Nominal type (interface, class) → new TypeName { prop = value, ... }
  *
  * Anonymous object types should be caught by validation (TSN7403) before reaching here.
+ *
+ * @param expr - The object expression
+ * @param context - Emitter context
+ * @param expectedType - Optional expected type (for property type resolution in generic contexts)
  */
 export declare const emitObject: (expr: Extract<IrExpression, {
     kind: "object";
-}>, context: EmitterContext) => [CSharpFragment, EmitterContext];
+}>, context: EmitterContext, expectedType?: IrType) => [CSharpFragment, EmitterContext];
 //# sourceMappingURL=collections.d.ts.map

package/dist/expressions/collections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/expressions/collections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAgB7D;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,cAAc,EAAE,cAAc,CAmJjC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,KACtB,CAAC,cAAc,EAAE,cAAc,CA0CjC,CAAC"}
+{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/expressions/collections.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAiB7D;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9C,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,cAAc,EAAE,cAAc,CAmJjC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,EAC/C,SAAS,cAAc,EACvB,eAAe,MAAM,KACpB,CAAC,cAAc,EAAE,cAAc,CAmDjC,CAAC"}

package/dist/expressions/collections.js

@@ -3,6 +3,7 @@
  */
 import { emitType } from "../type-emitter.js";
 import { emitExpression } from "../expression-emitter.js";
+import { getPropertyType } from "../core/type-resolution.js";
 /**
  * Escape a string for use in a C# string literal.
  * Handles backslashes, quotes, newlines, carriage returns, and tabs.
@@ -134,12 +135,18 @@ export const emitArray = (expr, context, expectedType) => {
  * 2. Nominal type (interface, class) → new TypeName { prop = value, ... }
  *
  * Anonymous object types should be caught by validation (TSN7403) before reaching here.
+ *
+ * @param expr - The object expression
+ * @param context - Emitter context
+ * @param expectedType - Optional expected type (for property type resolution in generic contexts)
  */
-export const emitObject = (expr, context) => {
+export const emitObject = (expr, context, expectedType) => {
     let currentContext = context;
+    // Use expectedType if provided, fall back to contextualType
+    const effectiveType = expectedType ?? expr.contextualType;
     // Check if contextual type is a dictionary type
-    if (expr.contextualType?.kind === "dictionaryType") {
-        return emitDictionaryLiteral(expr, currentContext);
+    if (effectiveType?.kind === "dictionaryType") {
+        return emitDictionaryLiteral(expr, currentContext, effectiveType);
     }
     // Regular object literal with nominal type
     const properties = [];
@@ -150,14 +157,18 @@ export const emitObject = (expr, context) => {
         }
         else {
             const key = typeof prop.key === "string" ? prop.key : "/* computed */";
-            const [valueFrag, newContext] = emitExpression(prop.value, currentContext);
+            // Resolve property type from contextual type for generic null→default handling
+            const propertyExpectedType = typeof prop.key === "string"
+                ? getPropertyType(effectiveType, prop.key, currentContext)
+                : undefined;
+            const [valueFrag, newContext] = emitExpression(prop.value, currentContext, propertyExpectedType);
             properties.push(`${key} = ${valueFrag.text}`);
             currentContext = newContext;
         }
     }
     // Check for contextual type (from return type, variable annotation, etc.)
     // If present, emit `new TypeName { ... }` instead of anonymous `new { ... }`
-    const [typeName, finalContext] = resolveContextualType(expr.contextualType, currentContext);
+    const [typeName, finalContext] = resolveContextualType(effectiveType, currentContext);
     if (!typeName) {
         // ICE: Validation (TSN7403) should have caught anonymous object literals
         throw new Error("ICE: Object literal without contextual type reached emitter - validation missed TSN7403");
@@ -171,9 +182,8 @@ export const emitObject = (expr, context) => {
  * Input:  const d: Record<string, number> = { a: 1, b: 2 };
  * Output: new Dictionary<string, double> { ["a"] = 1.0, ["b"] = 2.0 }
  */
-const emitDictionaryLiteral = (expr, context) => {
+const emitDictionaryLiteral = (expr, context, dictType) => {
     let currentContext = context;
-    const dictType = expr.contextualType;
     // Get key and value type strings
     const [keyTypeStr, ctx1] = emitDictKeyType(dictType.keyType, currentContext);
     const [valueTypeStr, ctx2] = emitType(dictType.valueType, ctx1);
@@ -190,7 +200,8 @@ const emitDictionaryLiteral = (expr, context) => {
             if (typeof prop.key !== "string") {
                 throw new Error("ICE: Computed property key in dictionary literal - validation gap");
             }
-            const [valueFrag, newContext] = emitExpression(prop.value, currentContext);
+            // Pass dictionary value type as expectedType for generic null→default handling
+            const [valueFrag, newContext] = emitExpression(prop.value, currentContext, dictType.valueType);
             entries.push(`["${escapeCSharpString(prop.key)}"] = ${valueFrag.text}`);
             currentContext = newContext;
         }