@tsonic/frontend 0.0.14 → 0.0.16

package/dist/ir/converters/statements/declarations/variables.js

@@ -3,42 +3,146 @@
  */
 import * as ts from "typescript";
 import { convertExpression } from "../../../expression-converter.js";
-import { convertType, convertBindingName, inferType, } from "../../../type-converter.js";
+import { convertBindingName } from "../../../syntax/binding-patterns.js";
 import { hasExportModifier } from "../helpers.js";
 /**
- * Get the IR type for a variable declaration.
- * Uses explicit annotation if present, otherwise infers from TypeChecker.
+ * Derive the type from a converted IR expression using deterministic rules.
+ * NO TYPESCRIPT FALLBACK - types must be derivable from IR or undefined.
+ *
+ * DETERMINISTIC TYPING RULES:
+ * - Literals → use inferredType (already set deterministically in literals.ts)
+ * - Arrays → derive from element inferredType
+ * - Call/New expressions → use inferredType (has numeric recovery)
+ * - Identifiers → use inferredType
+ * - Other → use inferredType if available, otherwise undefined
  */
-const getDeclarationType = (decl, checker, needsExplicitType) => {
-    // If there's an explicit type annotation, use it
-    if (decl.type) {
-        return convertType(decl.type, checker);
+const deriveTypeFromExpression = (expr) => {
+    // For literals, the inferredType is already set deterministically
+    if (expr.kind === "literal") {
+        return expr.inferredType;
+    }
+    // For arrays, derive from first element's type or array's inferredType
+    if (expr.kind === "array") {
+        if (expr.inferredType) {
+            return expr.inferredType;
+        }
+        // Try to derive from first element
+        if (expr.elements.length > 0) {
+            const firstElement = expr.elements[0];
+            if (firstElement) {
+                const elementType = deriveTypeFromExpression(firstElement);
+                if (elementType) {
+                    return { kind: "arrayType", elementType };
+                }
+            }
+        }
+        return undefined;
+    }
+    // For all other expressions, use their inferredType if available
+    // This includes call, new, identifier, member access, etc.
+    if ("inferredType" in expr && expr.inferredType) {
+        return expr.inferredType;
+    }
+    // Cannot determine type - return undefined (no TypeScript fallback)
+    return undefined;
+};
+/**
+ * Check if a variable statement is at module level (not inside a function).
+ * Module-level variables become static fields in C# and need explicit types.
+ */
+const isModuleLevelVariable = (node) => {
+    // Walk up the parent chain to check if we're inside a function/method
+    let current = node;
+    while (current.parent) {
+        current = current.parent;
+        // If we hit a function-like node, we're not at module level
+        if (ts.isFunctionDeclaration(current) ||
+            ts.isFunctionExpression(current) ||
+            ts.isArrowFunction(current) ||
+            ts.isMethodDeclaration(current) ||
+            ts.isConstructorDeclaration(current) ||
+            ts.isGetAccessorDeclaration(current) ||
+            ts.isSetAccessorDeclaration(current)) {
+            return false;
+        }
+        // If we hit the source file, we're at module level
+        if (ts.isSourceFile(current)) {
+            return true;
+        }
     }
-    // If we need an explicit type (for module-level exports), infer it
-    if (needsExplicitType) {
-        return inferType(decl, checker);
+    return false;
+};
+/**
+ * Check if a variable declaration has a binding pattern (destructuring).
+ * Binding patterns include array patterns ([a, b]) and object patterns ({x, y}).
+ */
+const isBindingPattern = (decl) => {
+    return (ts.isArrayBindingPattern(decl.name) || ts.isObjectBindingPattern(decl.name));
+};
+/**
+ * Get the expected type for initializer conversion (only from explicit annotations).
+ * This is used for deterministic contextual typing - only explicit annotations
+ * should influence literal type inference.
+ */
+const getExpectedTypeForInitializer = (decl, ctx) => {
+    // Only use explicit type annotation as expectedType
+    // Inferred types should NOT influence literal typing
+    if (decl.type) {
+        // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+        return ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(decl.type));
     }
     return undefined;
 };
 /**
  * Convert variable statement
+ *
+ * Passes the LHS type annotation (if present) to the initializer conversion
+ * for deterministic contextual typing. This ensures that:
+ * - `const a: number[] = [1,2,3]` produces `double[]` not `int[]`
+ * - `const x: int = 5` produces `int` not `double`
+ *
+ * For module-level variables (without explicit annotation), we infer the type
+ * from TypeScript and pass it as expectedType to ensure consistent typing
+ * between the variable declaration and its initializer.
  */
-export const convertVariableStatement = (node, checker) => {
+export const convertVariableStatement = (node, ctx) => {
     const isConst = !!(node.declarationList.flags & ts.NodeFlags.Const);
     const isLet = !!(node.declarationList.flags & ts.NodeFlags.Let);
     const declarationKind = isConst ? "const" : isLet ? "let" : "var";
     const isExported = hasExportModifier(node);
+    // Module-level variables need explicit types in C# (they become static fields)
+    const isModuleLevel = isModuleLevelVariable(node);
+    const needsExplicitType = isExported || isModuleLevel;
     return {
         kind: "variableDeclaration",
         declarationKind,
-        declarations: node.declarationList.declarations.map((decl) => ({
-            kind: "variableDeclarator",
-            name: convertBindingName(decl.name),
-            type: getDeclarationType(decl, checker, isExported),
-            initializer: decl.initializer
-                ? convertExpression(decl.initializer, checker)
-                : undefined,
-        })),
+        declarations: node.declarationList.declarations.map((decl) => {
+            // expectedType for initializer: ONLY from explicit type annotation
+            // This ensures deterministic literal typing (e.g., 100 -> int unless annotated)
+            const expectedType = getExpectedTypeForInitializer(decl, ctx);
+            // Convert initializer FIRST (before determining type)
+            // This allows us to derive the variable type from the converted expression
+            const convertedInitializer = decl.initializer
+                ? convertExpression(decl.initializer, ctx, expectedType)
+                : undefined;
+            // Determine the variable type:
+            // 1. If there's an explicit annotation, use it
+            // 2. If we need an explicit type (module-level) and have an initializer,
+            //    derive it from the converted expression (NO TypeScript fallback)
+            // 3. Otherwise, undefined (let emitter use var or report error)
+            // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+            const declaredType = decl.type
+                ? ctx.typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(decl.type))
+                : needsExplicitType && convertedInitializer && !isBindingPattern(decl)
+                    ? deriveTypeFromExpression(convertedInitializer)
+                    : undefined;
+            return {
+                kind: "variableDeclarator",
+                name: convertBindingName(decl.name),
+                type: declaredType,
+                initializer: convertedInitializer,
+            };
+        }),
         isExported,
     };
 };

package/dist/ir/converters/statements/declarations/variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/variables.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,GACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD;;;GAGG;AACH,MAAM,kBAAkB,GAAG,CACzB,IAA4B,EAC5B,OAAuB,EACvB,iBAA0B,EAC1B,EAAE;IACF,iDAAiD;IACjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,mEAAmE;IACnE,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,IAA0B,EAC1B,OAAuB,EACA,EAAE;IACzB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE3C,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,eAAe;QACf,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7D,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;YACnC,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC;YACnD,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC3B,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC;gBAC9C,CAAC,CAAC,SAAS;SACd,CAAC,CAAC;QACH,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/declarations/variables.ts"],"names":[],"mappings":"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"}

package/dist/ir/converters/statements/declarations.d.ts

@@ -1,6 +1,9 @@
 /**
  * Declaration converters (variables, functions, classes, interfaces, enums, type aliases)
  * Main dispatcher - re-exports from declarations/ subdirectory
+ *
+ * Phase 5 Step 4: Registry singletons removed.
+ * All context now flows through ProgramContext.
  */
-export { setMetadataRegistry, setBindingRegistry, convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations/index.js";
+export { convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations/index.js";
 //# sourceMappingURL=declarations.d.ts.map

package/dist/ir/converters/statements/declarations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"declarations.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/declarations.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"declarations.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/declarations.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC"}

package/dist/ir/converters/statements/declarations.js

@@ -1,6 +1,9 @@
 /**
  * Declaration converters (variables, functions, classes, interfaces, enums, type aliases)
  * Main dispatcher - re-exports from declarations/ subdirectory
+ *
+ * Phase 5 Step 4: Registry singletons removed.
+ * All context now flows through ProgramContext.
  */
-export { setMetadataRegistry, setBindingRegistry, convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations/index.js";
+export { convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations/index.js";
 //# sourceMappingURL=declarations.js.map

package/dist/ir/converters/statements/declarations.js.map

@@ -1 +1 @@
-{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../../../src/ir/converters/statements/declarations.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../../../src/ir/converters/statements/declarations.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC"}

package/dist/ir/converters/statements/helpers.d.ts

@@ -3,18 +3,19 @@
  */
 import * as ts from "typescript";
 import { IrParameter, IrAccessibility, IrTypeParameter, IrVariableDeclaration } from "../../types.js";
+import type { ProgramContext } from "../../program-context.js";
 /**
  * Convert TypeScript type parameters to IR, detecting structural constraints
  */
-export declare const convertTypeParameters: (typeParameters: readonly ts.TypeParameterDeclaration[] | undefined, checker: ts.TypeChecker) => readonly IrTypeParameter[] | undefined;
+export declare const convertTypeParameters: (typeParameters: readonly ts.TypeParameterDeclaration[] | undefined, ctx: ProgramContext) => readonly IrTypeParameter[] | undefined;
 /**
  * Convert parameters for functions and methods
  */
-export declare const convertParameters: (parameters: ts.NodeArray<ts.ParameterDeclaration>, checker: ts.TypeChecker) => readonly IrParameter[];
+export declare const convertParameters: (parameters: ts.NodeArray<ts.ParameterDeclaration>, ctx: ProgramContext) => readonly IrParameter[];
 /**
  * Convert variable declaration list (used in for loops)
  */
-export declare const convertVariableDeclarationList: (node: ts.VariableDeclarationList, checker: ts.TypeChecker) => IrVariableDeclaration;
+export declare const convertVariableDeclarationList: (node: ts.VariableDeclarationList, ctx: ProgramContext) => IrVariableDeclaration;
 /**
  * Check if node has export modifier
  */

package/dist/ir/converters/statements/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EAEf,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAKxB;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,gBAAgB,SAAS,EAAE,CAAC,wBAAwB,EAAE,GAAG,SAAS,EAClE,SAAS,EAAE,CAAC,WAAW,KACtB,SAAS,eAAe,EAAE,GAAG,SAmC/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,oBAAoB,CAAC,EACjD,SAAS,EAAE,CAAC,WAAW,KACtB,SAAS,WAAW,EA0CtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,GACzC,MAAM,EAAE,CAAC,uBAAuB,EAChC,SAAS,EAAE,CAAC,WAAW,KACtB,qBAkBF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMjD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMjD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,eAQhD,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EAEf,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,gBAAgB,SAAS,EAAE,CAAC,wBAAwB,EAAE,GAAG,SAAS,EAClE,KAAK,cAAc,KAClB,SAAS,eAAe,EAAE,GAAG,SAsC/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,oBAAoB,CAAC,EACjD,KAAK,cAAc,KAClB,SAAS,WAAW,EA2DtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,8BAA8B,GACzC,MAAM,EAAE,CAAC,uBAAuB,EAChC,KAAK,cAAc,KAClB,qBA0BF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMjD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMjD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,OAMnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,EAAE,CAAC,IAAI,KAAG,eAQhD,CAAC"}

package/dist/ir/converters/statements/helpers.js

@@ -2,30 +2,32 @@
  * Helper utilities for statement conversion
  */
 import * as ts from "typescript";
-import { convertType, convertBindingName } from "../../type-converter.js";
+import { convertBindingName } from "../../syntax/binding-patterns.js";
 import { convertExpression } from "../../expression-converter.js";
 import { convertInterfaceMember } from "./declarations.js";
 /**
  * Convert TypeScript type parameters to IR, detecting structural constraints
  */
-export const convertTypeParameters = (typeParameters, checker) => {
+export const convertTypeParameters = (typeParameters, ctx) => {
     if (!typeParameters || typeParameters.length === 0) {
         return undefined;
     }
+    // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+    const typeSystem = ctx.typeSystem;
     return typeParameters.map((tp) => {
         const name = tp.name.text;
         const constraint = tp.constraint
-            ? convertType(tp.constraint, checker)
+            ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(tp.constraint))
             : undefined;
         const defaultType = tp.default
-            ? convertType(tp.default, checker)
+            ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(tp.default))
             : undefined;
         // Check if constraint is structural (object literal type)
         const isStructural = tp.constraint && ts.isTypeLiteralNode(tp.constraint);
         // Extract structural members if it's a structural constraint
         const structuralMembers = isStructural && tp.constraint && ts.isTypeLiteralNode(tp.constraint)
             ? tp.constraint.members
-                .map((member) => convertInterfaceMember(member, checker))
+                .map((member) => convertInterfaceMember(member, ctx))
                 .filter((m) => m !== null)
             : undefined;
         return {
@@ -42,61 +44,83 @@ export const convertTypeParameters = (typeParameters, checker) => {
 /**
  * Convert parameters for functions and methods
  */
-export const convertParameters = (parameters, checker) => {
+export const convertParameters = (parameters, ctx) => {
     return parameters.map((param) => {
         let passing = "value";
         let actualType = param.type;
-        // Detect ref<T>, out<T>, in<T>, inref<T> wrapper types
-        if (param.type &&
-            ts.isTypeReferenceNode(param.type) &&
-            ts.isIdentifier(param.type.typeName)) {
-            const typeName = param.type.typeName.text;
-            if ((typeName === "ref" ||
-                typeName === "out" ||
-                typeName === "in" ||
-                typeName === "inref") &&
-                param.type.typeArguments &&
-                param.type.typeArguments.length > 0) {
-                // Set passing mode (both "in" and "inref" map to C# "in")
+        let isExtensionReceiver = false;
+        // Detect wrapper types:
+        // - thisarg<T> marks an extension-method receiver parameter (emits C# `this`)
+        // - ref<T>/out<T>/in<T>/inref<T> marks passing mode (unwraps to T)
+        //
+        // Wrappers may be nested; unwrap repeatedly.
+        while (actualType &&
+            ts.isTypeReferenceNode(actualType) &&
+            ts.isIdentifier(actualType.typeName) &&
+            actualType.typeArguments &&
+            actualType.typeArguments.length > 0) {
+            const typeName = actualType.typeName.text;
+            if (typeName === "thisarg") {
+                isExtensionReceiver = true;
+                actualType = actualType.typeArguments[0];
+                continue;
+            }
+            if (typeName === "ref" || typeName === "out" || typeName === "in" || typeName === "inref") {
                 passing =
                     typeName === "in" || typeName === "inref"
                         ? "in"
                         : typeName;
-                // Extract wrapped type
-                actualType = param.type.typeArguments[0];
+                actualType = actualType.typeArguments[0];
+                continue;
             }
+            break;
         }
+        // Get parameter type for contextual typing of default value
+        // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+        const typeSystem = ctx.typeSystem;
+        const paramType = actualType
+            ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(actualType))
+            : undefined;
         return {
             kind: "parameter",
             pattern: convertBindingName(param.name),
-            type: actualType ? convertType(actualType, checker) : undefined,
+            type: paramType,
+            // Pass parameter type for contextual typing of default value
             initializer: param.initializer
-                ? convertExpression(param.initializer, checker)
+                ? convertExpression(param.initializer, ctx, paramType)
                 : undefined,
             isOptional: !!param.questionToken,
             isRest: !!param.dotDotDotToken,
             passing,
+            isExtensionReceiver: isExtensionReceiver || undefined,
         };
     });
 };
 /**
  * Convert variable declaration list (used in for loops)
  */
-export const convertVariableDeclarationList = (node, checker) => {
+export const convertVariableDeclarationList = (node, ctx) => {
     const isConst = !!(node.flags & ts.NodeFlags.Const);
     const isLet = !!(node.flags & ts.NodeFlags.Let);
     const declarationKind = isConst ? "const" : isLet ? "let" : "var";
+    // PHASE 4 (Alice's spec): Use captureTypeSyntax + typeFromSyntax
+    const typeSystem = ctx.typeSystem;
     return {
         kind: "variableDeclaration",
         declarationKind,
-        declarations: node.declarations.map((decl) => ({
-            kind: "variableDeclarator",
-            name: convertBindingName(decl.name),
-            type: decl.type ? convertType(decl.type, checker) : undefined,
-            initializer: decl.initializer
-                ? convertExpression(decl.initializer, checker)
-                : undefined,
-        })),
+        declarations: node.declarations.map((decl) => {
+            const declType = decl.type
+                ? typeSystem.typeFromSyntax(ctx.binding.captureTypeSyntax(decl.type))
+                : undefined;
+            return {
+                kind: "variableDeclarator",
+                name: convertBindingName(decl.name),
+                type: declType,
+                initializer: decl.initializer
+                    ? convertExpression(decl.initializer, ctx, declType)
+                    : undefined,
+            };
+        }),
         isExported: false,
     };
 };

package/dist/ir/converters/statements/helpers.js.map

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

package/dist/ir/converters/statements/index.d.ts

@@ -3,5 +3,5 @@
  */
 export { convertTypeParameters, convertParameters, convertVariableDeclarationList, hasExportModifier, hasStaticModifier, hasReadonlyModifier, getAccessibility, } from "./helpers.js";
 export { convertIfStatement, convertWhileStatement, convertForStatement, convertForOfStatement, convertForInStatement, convertSwitchStatement, convertSwitchCase, convertTryStatement, convertCatchClause, convertBlockStatement, } from "./control.js";
-export { setMetadataRegistry, convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations.js";
+export { convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/ir/converters/statements/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/statements/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAItB,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}

package/dist/ir/converters/statements/index.js

@@ -6,5 +6,6 @@ export { convertTypeParameters, convertParameters, convertVariableDeclarationLis
 // Control flow converters
 export { convertIfStatement, convertWhileStatement, convertForStatement, convertForOfStatement, convertForInStatement, convertSwitchStatement, convertSwitchCase, convertTryStatement, convertCatchClause, convertBlockStatement, } from "./control.js";
 // Declaration converters
-export { setMetadataRegistry, convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations.js";
+// Phase 5 Step 4: Removed setMetadataRegistry - no more global singletons
+export { convertVariableStatement, convertFunctionDeclaration, convertClassDeclaration, convertInterfaceDeclaration, convertInterfaceMember, convertEnumDeclaration, convertTypeAliasDeclaration, } from "./declarations.js";
 //# sourceMappingURL=index.js.map

package/dist/ir/converters/statements/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ir/converters/statements/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,UAAU;AACV,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,0BAA0B;AAC1B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,yBAAyB;AACzB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ir/converters/statements/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,UAAU;AACV,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,0BAA0B;AAC1B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,yBAAyB;AACzB,0EAA0E;AAC1E,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC"}

package/dist/ir/expression-converter.d.ts

@@ -3,11 +3,18 @@
  * Main dispatcher - delegates to specialized modules
  */
 import * as ts from "typescript";
-import { IrExpression } from "./types.js";
+import { IrExpression, IrType } from "./types.js";
+import type { ProgramContext } from "./program-context.js";
 /**
  * Main expression conversion dispatcher
  * Converts TypeScript expression nodes to IR expressions
+ *
+ * @param node - The TypeScript expression node to convert
+ * @param ctx - The ProgramContext for symbol resolution and type system access
+ * @param expectedType - Expected type from context (e.g., LHS annotation, parameter type).
+ *                       Pass `undefined` explicitly when no contextual type exists.
+ *                       Used for deterministic typing of literals and arrays.
  */
-export declare const convertExpression: (node: ts.Expression, checker: ts.TypeChecker) => IrExpression;
-export { getInferredType, extractTypeArguments, checkIfRequiresSpecialization, } from "./converters/expressions/helpers.js";
+export declare const convertExpression: (node: ts.Expression, ctx: ProgramContext, expectedType: IrType | undefined) => IrExpression;
+export { deriveIdentifierType, extractTypeArguments, checkIfRequiresSpecialization, } from "./converters/expressions/helpers.js";
 //# sourceMappingURL=expression-converter.d.ts.map

package/dist/ir/expression-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression-converter.d.ts","sourceRoot":"","sources":["../../src/ir/expression-converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,YAAY,EAIb,MAAM,YAAY,CAAC;AA6DpB;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,UAAU,EACnB,SAAS,EAAE,CAAC,WAAW,KACtB,YA6QF,CAAC;AAGF,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"expression-converter.d.ts","sourceRoot":"","sources":["../../src/ir/expression-converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,YAAY,EAEZ,MAAM,EAGP,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAmG3D;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,UAAU,EACnB,KAAK,cAAc,EACnB,cAAc,MAAM,GAAG,SAAS,KAC/B,YAoUF,CAAC;AAGF,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,qCAAqC,CAAC"}