c-next 0.1.69 → 0.1.71

package/src/transpiler/output/codegen/assignment/handlers/__tests__/ArrayHandlers.test.ts

@@ -183,9 +183,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("performs bounds checking when type info available", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { arrayDimensions: [10, 10], baseType: "i32" }],
-      ]) as any;
+      ]);
       mockCheckArrayBounds.mockClear();
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
@@ -242,9 +242,9 @@ describe("ArrayHandlers", () => {
       arrayHandlers.find(([kind]) => kind === AssignmentKind.ARRAY_SLICE)?.[1];
 
     it("generates memcpy for valid slice assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -267,7 +267,7 @@ describe("ArrayHandlers", () => {
     });
 
     it("generates memcpy for string slice", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         [
           "str",
           {
@@ -277,7 +277,7 @@ describe("ArrayHandlers", () => {
             baseType: "string",
           },
         ],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -299,9 +299,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on compound assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -323,9 +323,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on multi-dimensional array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { arrayDimensions: [10, 10], baseType: "u8" }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         identifiers: ["matrix"],
         subscripts: [
@@ -340,9 +340,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on non-constant offset", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi.fn().mockReturnValue(undefined),
       });
@@ -359,9 +359,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on non-constant length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -381,9 +381,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on out of bounds access", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [50], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -404,9 +404,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on negative offset", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -427,9 +427,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on zero length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -450,9 +450,9 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws on negative length", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["buffer", { arrayDimensions: [100], baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()
@@ -473,9 +473,7 @@ describe("ArrayHandlers", () => {
     });
 
     it("throws when buffer size cannot be determined", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["unknown", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["unknown", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         tryEvaluateConstant: vi
           .fn()

package/src/transpiler/output/codegen/assignment/handlers/__tests__/BitAccessHandlers.test.ts

@@ -76,9 +76,7 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates single bit read-modify-write", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u32" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u32" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("3"),
       });
@@ -92,9 +90,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for 64-bit types", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("32"),
       });
@@ -108,9 +104,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for signed 64-bit types", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "i64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "i64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("bit"),
       });
@@ -123,9 +117,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("converts true to 1", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("0"),
       });
@@ -139,9 +131,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("converts false to 0", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u8" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u8" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("0"),
       });
@@ -155,7 +145,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("delegates to float bit write for float types", () => {
-      CodeGenState.typeRegistry = new Map([["f", { baseType: "f32" }]]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["f", { baseType: "f32" }]]);
       const generateFloatBitWrite = vi
         .fn()
         .mockReturnValue("float_bit_write_result");
@@ -192,9 +182,7 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates bit range read-modify-write", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u32" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u32" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -214,9 +202,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses correct mask for bit range", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["data", { baseType: "u16" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["data", { baseType: "u16" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -237,9 +223,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses ULL suffix for 64-bit bit range mask", () => {
-      CodeGenState.typeRegistry = new Map([
-        ["flags", { baseType: "u64" }],
-      ]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["flags", { baseType: "u64" }]]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -261,7 +245,7 @@ describe("BitAccessHandlers", () => {
     });
 
     it("delegates to float bit write for float types", () => {
-      CodeGenState.typeRegistry = new Map([["f", { baseType: "f32" }]]) as any;
+      HandlerTestUtils.setupMockTypeRegistry([["f", { baseType: "f32" }]]);
       const generateFloatBitWrite = vi
         .fn()
         .mockReturnValue("float_range_write_result");
@@ -344,9 +328,9 @@ describe("BitAccessHandlers", () => {
       )?.[1];
 
     it("generates array element bit assignment for 1D array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u32", arrayDimensions: [10] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -368,9 +352,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("generates array element bit assignment for 2D array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["matrix", { baseType: "u16", arrayDimensions: [10, 10] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -394,9 +378,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("uses 1ULL for 64-bit array element", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u64", arrayDimensions: [5] }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi
           .fn()
@@ -414,9 +398,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("throws when variable is not an array", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["notArray", { baseType: "u32" }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         identifiers: ["notArray"],
       });
@@ -425,9 +409,9 @@ describe("BitAccessHandlers", () => {
     });
 
     it("throws on compound assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["arr", { baseType: "u32", arrayDimensions: [10] }],
-      ]) as any;
+      ]);
       const ctx = createMockContext({
         isCompound: true,
         cnextOp: "+<-",

package/src/transpiler/output/codegen/assignment/handlers/__tests__/BitmapHandlers.test.ts

@@ -89,9 +89,9 @@ describe("BitmapHandlers", () => {
       )?.[1];
 
     it("generates single-bit read-modify-write", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Running", { offset: 0, width: 1 }]])],
@@ -107,9 +107,9 @@ describe("BitmapHandlers", () => {
     });
 
     it("generates single-bit write with correct offset", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Active", { offset: 3, width: 1 }]])],
@@ -125,9 +125,9 @@ describe("BitmapHandlers", () => {
     });
 
     it("throws on unknown bitmap field", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([["StatusFlags", new Map()]]),
       });
@@ -141,9 +141,9 @@ describe("BitmapHandlers", () => {
     });
 
     it("throws on compound assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Running", { offset: 0, width: 1 }]])],
@@ -160,9 +160,9 @@ describe("BitmapHandlers", () => {
     });
 
     it("validates bitmap field literal", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Running", { offset: 0, width: 1 }]])],
@@ -188,9 +188,9 @@ describe("BitmapHandlers", () => {
       )?.[1];
 
     it("generates multi-bit read-modify-write with mask", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flags", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Mode", { offset: 4, width: 3 }]])],
@@ -210,9 +210,9 @@ describe("BitmapHandlers", () => {
     });
 
     it("generates correct mask for 2-bit field", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["config", { bitmapTypeName: "Config", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["Config", new Map([["Priority", { offset: 0, width: 2 }]])],
@@ -236,9 +236,9 @@ describe("BitmapHandlers", () => {
       )?.[1];
 
     it("generates array element bitmap field assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["flagsArray", { bitmapTypeName: "StatusFlags", baseType: "u8" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockGenerator({
         generateExpression: vi.fn().mockReturnValue("i"),
       });
@@ -266,9 +266,9 @@ describe("BitmapHandlers", () => {
       )?.[1];
 
     it("generates struct member bitmap field assignment", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["device", { baseType: "Device" }],
-      ]) as any;
+      ]);
       HandlerTestUtils.setupMockSymbols({
         bitmapFields: new Map([
           ["StatusFlags", new Map([["Active", { offset: 2, width: 1 }]])],

package/src/transpiler/output/codegen/assignment/handlers/__tests__/SpecialHandlers.test.ts

@@ -71,9 +71,9 @@ describe("SpecialHandlers", () => {
       specialHandlers.find(([kind]) => kind === AssignmentKind.ATOMIC_RMW)?.[1];
 
     it("delegates to generateAtomicRMW for simple identifier", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["counter", { baseType: "u32", isAtomic: true }],
-      ]) as any;
+      ]);
       const generateAtomicRMW = vi.fn().mockReturnValue("LDREX/STREX pattern");
       const generateAssignmentTarget = vi.fn().mockReturnValue("counter");
       HandlerTestUtils.setupMockGenerator({
@@ -84,18 +84,23 @@ describe("SpecialHandlers", () => {
 
       const result = getHandler()!(ctx);
 
-      expect(generateAtomicRMW).toHaveBeenCalledWith("counter", "+=", "1", {
-        baseType: "u32",
-        isAtomic: true,
-      });
+      expect(generateAtomicRMW).toHaveBeenCalledWith(
+        "counter",
+        "+=",
+        "1",
+        expect.objectContaining({
+          baseType: "u32",
+          isAtomic: true,
+        }),
+      );
       expect(result).toBe("LDREX/STREX pattern");
     });
 
     it("handles this.member atomic variable", () => {
       CodeGenState.currentScope = "Motor";
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["Motor_count", { baseType: "u32", isAtomic: true }],
-      ]) as any;
+      ]);
       const generateAtomicRMW = vi.fn().mockReturnValue("atomic result");
       const generateAssignmentTarget = vi.fn().mockReturnValue("Motor_count");
       HandlerTestUtils.setupMockGenerator({
@@ -110,17 +115,22 @@ describe("SpecialHandlers", () => {
 
       const result = getHandler()!(ctx);
 
-      expect(generateAtomicRMW).toHaveBeenCalledWith("Motor_count", "+=", "1", {
-        baseType: "u32",
-        isAtomic: true,
-      });
+      expect(generateAtomicRMW).toHaveBeenCalledWith(
+        "Motor_count",
+        "+=",
+        "1",
+        expect.objectContaining({
+          baseType: "u32",
+          isAtomic: true,
+        }),
+      );
       expect(result).toBe("atomic result");
     });
 
     it("handles global.member atomic variable", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["globalCounter", { baseType: "u32", isAtomic: true }],
-      ]) as any;
+      ]);
       const generateAtomicRMW = vi.fn().mockReturnValue("global atomic result");
       const generateAssignmentTarget = vi.fn().mockReturnValue("globalCounter");
       HandlerTestUtils.setupMockGenerator({
@@ -139,9 +149,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("handles subtract operation", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["counter", { baseType: "u32", isAtomic: true }],
-      ]) as any;
+      ]);
       const generateAtomicRMW = vi.fn().mockReturnValue("atomic sub");
       const generateAssignmentTarget = vi.fn().mockReturnValue("counter");
       HandlerTestUtils.setupMockGenerator({
@@ -171,9 +181,9 @@ describe("SpecialHandlers", () => {
       )?.[1];
 
     it("generates clamp add helper for u8", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["saturated", { baseType: "u8", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("saturated");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -190,9 +200,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("generates clamp sub helper for u16", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["value", { baseType: "u16", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("value");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -211,9 +221,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("generates clamp mul helper for u32", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["result", { baseType: "u32", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("result");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -232,9 +242,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("uses native arithmetic for float types", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["f", { baseType: "f32", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("f");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -251,9 +261,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("uses native arithmetic for f64 type", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["d", { baseType: "f64", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("d");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -270,9 +280,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("falls back to native for unsupported operators", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["value", { baseType: "u32", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("value");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -292,9 +302,9 @@ describe("SpecialHandlers", () => {
 
     it("handles this.member with clamp", () => {
       CodeGenState.currentScope = "Motor";
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["Motor_speed", { baseType: "u8", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("Motor_speed");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,
@@ -313,9 +323,9 @@ describe("SpecialHandlers", () => {
     });
 
     it("handles global.member with clamp", () => {
-      CodeGenState.typeRegistry = new Map([
+      HandlerTestUtils.setupMockTypeRegistry([
         ["globalValue", { baseType: "i16", overflowBehavior: "clamp" }],
-      ]) as any;
+      ]);
       const generateAssignmentTarget = vi.fn().mockReturnValue("globalValue");
       HandlerTestUtils.setupMockGenerator({
         generateAssignmentTarget,

package/src/transpiler/output/codegen/assignment/handlers/__tests__/handlerTestUtils.ts

@@ -141,15 +141,16 @@ function createTypeInfo(overrides: Partial<TTypeInfo> = {}): TTypeInfo {
 }
 
 /**
- * Set up CodeGenState.typeRegistry with typed entries.
+ * Set up CodeGenState type registry with typed entries.
  * Entries only need to specify the fields relevant to the test.
+ * Uses setVariableTypeInfo to properly populate the registry.
  */
 function setupMockTypeRegistry(
   entries: Array<[string, Partial<TTypeInfo>]>,
 ): void {
-  CodeGenState.typeRegistry = new Map(
-    entries.map(([name, partial]) => [name, createTypeInfo(partial)]),
-  );
+  for (const [name, partial] of entries) {
+    CodeGenState.setVariableTypeInfo(name, createTypeInfo(partial));
+  }
 }
 
 export default class HandlerTestUtils {