@tsonic/frontend 0.0.14 → 0.0.15

package/dist/ir/converters/expressions/operators.js

@@ -2,68 +2,208 @@
  * Operator expression converters (binary, unary, update, assignment)
  */
 import * as ts from "typescript";
-import { getInferredType, getSourceSpan, convertBinaryOperator, isAssignmentOperator, } from "./helpers.js";
+import { deriveIdentifierType, getSourceSpan, convertBinaryOperator, isAssignmentOperator, } from "./helpers.js";
 import { convertExpression } from "../../expression-converter.js";
+import { getBinaryResultKind, NUMERIC_KIND_TO_CSHARP, TSONIC_TO_NUMERIC_KIND, } from "../../types/numeric-kind.js";
+const getNumericKindFromIrType = (type) => {
+    if (!type)
+        return undefined;
+    if (type.kind === "primitiveType") {
+        if (type.name === "int")
+            return "Int32";
+        if (type.name === "number")
+            return "Double";
+        return undefined;
+    }
+    if (type.kind === "referenceType") {
+        // Numeric proof pass can annotate using CLR kind names (e.g., "Int64").
+        if (type.name === "SByte" ||
+            type.name === "Byte" ||
+            type.name === "Int16" ||
+            type.name === "UInt16" ||
+            type.name === "Int32" ||
+            type.name === "UInt32" ||
+            type.name === "Int64" ||
+            type.name === "UInt64" ||
+            type.name === "Single" ||
+            type.name === "Double") {
+            return type.name;
+        }
+        return TSONIC_TO_NUMERIC_KIND.get(type.name);
+    }
+    return undefined;
+};
+const numericKindToIrType = (kind) => {
+    if (kind === "Int32")
+        return { kind: "primitiveType", name: "int" };
+    if (kind === "Double")
+        return { kind: "primitiveType", name: "number" };
+    // Use the canonical C# keyword spelling as the IR referenceType name
+    // (e.g., Int64 -> "long", UInt16 -> "ushort").
+    const alias = NUMERIC_KIND_TO_CSHARP.get(kind) ?? "double";
+    return { kind: "referenceType", name: alias };
+};
+/**
+ * Derive result type from binary operator and operand types.
+ *
+ * DETERMINISTIC TYPING:
+ * - Arithmetic: both int → int, otherwise double
+ * - Comparison: always boolean
+ * - Bitwise: int
+ * - Logical: derives from operands
+ */
+const deriveBinaryResultType = (operator, leftType, rightType) => {
+    // Comparison operators always return boolean
+    if (["==", "!=", "===", "!==", "<", ">", "<=", ">="].includes(operator)) {
+        return { kind: "primitiveType", name: "boolean" };
+    }
+    // Bitwise operators return int
+    if (["&", "|", "^", "<<", ">>", ">>>"].includes(operator)) {
+        return { kind: "primitiveType", name: "int" };
+    }
+    // instanceof returns boolean
+    if (operator === "instanceof") {
+        return { kind: "primitiveType", name: "boolean" };
+    }
+    // in operator returns boolean
+    if (operator === "in") {
+        return { kind: "primitiveType", name: "boolean" };
+    }
+    // String concatenation: if either is string, result is string
+    if (operator === "+") {
+        if ((leftType?.kind === "primitiveType" && leftType.name === "string") ||
+            (rightType?.kind === "primitiveType" && rightType.name === "string")) {
+            return { kind: "primitiveType", name: "string" };
+        }
+    }
+    // Arithmetic operators: both int → int, otherwise double
+    if (["+", "-", "*", "/", "%", "**"].includes(operator)) {
+        const leftKind = getNumericKindFromIrType(leftType);
+        const rightKind = getNumericKindFromIrType(rightType);
+        if (leftKind !== undefined && rightKind !== undefined) {
+            const resultKind = getBinaryResultKind(leftKind, rightKind);
+            return numericKindToIrType(resultKind);
+        }
+    }
+    // Logical operators: result type is one of the operand types
+    // For &&, ||, ?? the result depends on which branch is taken
+    if (["&&", "||", "??"].includes(operator)) {
+        return leftType ?? rightType;
+    }
+    return undefined;
+};
+/**
+ * Derive result type from unary operator and operand type.
+ */
+const deriveUnaryResultType = (operator, operandType) => {
+    // Logical not always returns boolean
+    if (operator === "!") {
+        return { kind: "primitiveType", name: "boolean" };
+    }
+    // Bitwise not returns int
+    if (operator === "~") {
+        return { kind: "primitiveType", name: "int" };
+    }
+    // Numeric + and - return same type as operand
+    if (operator === "+" || operator === "-") {
+        return operandType;
+    }
+    // typeof always returns string
+    if (operator === "typeof") {
+        return { kind: "primitiveType", name: "string" };
+    }
+    // void always returns undefined (void type)
+    if (operator === "void") {
+        return { kind: "voidType" };
+    }
+    // delete returns boolean
+    if (operator === "delete") {
+        return { kind: "primitiveType", name: "boolean" };
+    }
+    // ++/-- return same type as operand
+    if (operator === "++" || operator === "--") {
+        return operandType;
+    }
+    return operandType;
+};
 /**
  * Convert binary expression (including logical and assignment)
+ *
+ * Threads expectedType through:
+ * - Assignment RHS: gets LHS type
+ * - Nullish coalescing (??): RHS gets expectedType (fallback value)
+ * - Logical OR (||): RHS gets expectedType (fallback value)
  */
-export const convertBinaryExpression = (node, checker) => {
+export const convertBinaryExpression = (node, ctx, expectedType) => {
     const operator = convertBinaryOperator(node.operatorToken);
-    const inferredType = getInferredType(node, checker);
     const sourceSpan = getSourceSpan(node);
     // Handle assignment separately
+    // Thread LHS type to RHS for deterministic typing (e.g., x = 10 where x: int)
     if (isAssignmentOperator(node.operatorToken)) {
+        // DETERMINISTIC: Derive LHS type from declaration (for identifiers)
+        const leftExpr = ts.isIdentifier(node.left)
+            ? {
+                kind: "identifier",
+                name: node.left.text,
+                inferredType: deriveIdentifierType(node.left, ctx),
+                sourceSpan: getSourceSpan(node.left),
+            }
+            : convertExpression(node.left, ctx, undefined);
+        const lhsType = leftExpr.inferredType;
+        const rightExpr = convertExpression(node.right, ctx, lhsType);
         return {
             kind: "assignment",
             operator: operator,
-            left: ts.isIdentifier(node.left)
-                ? {
-                    kind: "identifier",
-                    name: node.left.text,
-                    sourceSpan: getSourceSpan(node.left),
-                }
-                : convertExpression(node.left, checker),
-            right: convertExpression(node.right, checker),
-            inferredType,
+            left: leftExpr,
+            right: rightExpr,
+            inferredType: lhsType, // Assignment result is LHS type
             sourceSpan,
         };
     }
     // Handle logical operators
+    // For ?? and ||, the RHS is the fallback value, so it gets expectedType
+    // For &&, the RHS is only reached if LHS is truthy, no type coercion needed
     if (operator === "&&" || operator === "||" || operator === "??") {
+        const rhsExpectedType = operator === "??" || operator === "||" ? expectedType : undefined;
+        const leftExpr = convertExpression(node.left, ctx, undefined);
+        const rightExpr = convertExpression(node.right, ctx, rhsExpectedType);
         return {
             kind: "logical",
             operator,
-            left: convertExpression(node.left, checker),
-            right: convertExpression(node.right, checker),
-            inferredType,
+            left: leftExpr,
+            right: rightExpr,
+            inferredType: deriveBinaryResultType(operator, leftExpr.inferredType, rightExpr.inferredType),
             sourceSpan,
         };
     }
     // Regular binary expression
+    const leftExpr = convertExpression(node.left, ctx, undefined);
+    const rightExpr = convertExpression(node.right, ctx, undefined);
     return {
         kind: "binary",
         operator: operator,
-        left: convertExpression(node.left, checker),
-        right: convertExpression(node.right, checker),
-        inferredType,
+        left: leftExpr,
+        right: rightExpr,
+        inferredType: deriveBinaryResultType(operator, leftExpr.inferredType, rightExpr.inferredType),
         sourceSpan,
     };
 };
 /**
  * Convert prefix unary expression
  */
-export const convertUnaryExpression = (node, checker) => {
-    const inferredType = getInferredType(node, checker);
+export const convertUnaryExpression = (node, ctx) => {
     const sourceSpan = getSourceSpan(node);
+    const operandExpr = convertExpression(node.operand, ctx, undefined);
     // Check if it's an increment/decrement (++ or --)
     if (node.operator === ts.SyntaxKind.PlusPlusToken ||
         node.operator === ts.SyntaxKind.MinusMinusToken) {
+        const updateOperator = node.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--";
         return {
             kind: "update",
-            operator: node.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--",
+            operator: updateOperator,
             prefix: true,
-            expression: convertExpression(node.operand, checker),
-            inferredType,
+            expression: operandExpr,
+            inferredType: deriveUnaryResultType(updateOperator, operandExpr.inferredType),
             sourceSpan,
         };
     }
@@ -86,39 +226,45 @@ export const convertUnaryExpression = (node, checker) => {
     return {
         kind: "unary",
         operator,
-        expression: convertExpression(node.operand, checker),
-        inferredType,
+        expression: operandExpr,
+        inferredType: deriveUnaryResultType(operator, operandExpr.inferredType),
         sourceSpan,
     };
 };
 /**
  * Convert postfix unary expression (++ or --)
+ *
+ * DETERMINISTIC TYPING: Result type derived from operand type.
+ * ++/-- return same type as operand (int → int, number → number)
  */
-export const convertUpdateExpression = (node, checker) => {
-    const inferredType = getInferredType(node, checker);
+export const convertUpdateExpression = (node, ctx) => {
     const sourceSpan = getSourceSpan(node);
     if (ts.isPrefixUnaryExpression(node)) {
         // Check if it's an increment or decrement
         if (node.operator === ts.SyntaxKind.PlusPlusToken ||
             node.operator === ts.SyntaxKind.MinusMinusToken) {
+            const operandExpr = convertExpression(node.operand, ctx, undefined);
+            const updateOperator = node.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--";
             return {
                 kind: "update",
-                operator: node.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--",
+                operator: updateOperator,
                 prefix: true,
-                expression: convertExpression(node.operand, checker),
-                inferredType,
+                expression: operandExpr,
+                inferredType: deriveUnaryResultType(updateOperator, operandExpr.inferredType),
                 sourceSpan,
             };
         }
     }
     // Handle postfix unary expression
     const postfix = node;
+    const operandExpr = convertExpression(postfix.operand, ctx, undefined);
+    const updateOperator = postfix.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--";
     return {
         kind: "update",
-        operator: postfix.operator === ts.SyntaxKind.PlusPlusToken ? "++" : "--",
+        operator: updateOperator,
         prefix: false,
-        expression: convertExpression(postfix.operand, checker),
-        inferredType,
+        expression: operandExpr,
+        inferredType: deriveUnaryResultType(updateOperator, operandExpr.inferredType),
         sourceSpan,
     };
 };

package/dist/ir/converters/expressions/operators.js.map

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

package/dist/ir/converters/expressions/other.d.ts

@@ -2,13 +2,21 @@
  * Miscellaneous expression converters (conditional, template literals)
  */
 import * as ts from "typescript";
-import { IrConditionalExpression, IrTemplateLiteralExpression } from "../../types.js";
+import { IrConditionalExpression, IrTemplateLiteralExpression, IrType } from "../../types.js";
+import type { ProgramContext } from "../../program-context.js";
 /**
  * Convert conditional (ternary) expression
+ *
+ * DETERMINISTIC TYPING:
+ * - Threads expectedType to both branches for consistent typing
+ * - Result type is expectedType if available, otherwise derives from whenTrue branch
+ * Example: `const x: int = cond ? 5 : 10` → both 5 and 10 get expectedType `int`
  */
-export declare const convertConditionalExpression: (node: ts.ConditionalExpression, checker: ts.TypeChecker) => IrConditionalExpression;
+export declare const convertConditionalExpression: (node: ts.ConditionalExpression, ctx: ProgramContext, expectedType: IrType | undefined) => IrConditionalExpression;
 /**
  * Convert template literal expression
+ *
+ * DETERMINISTIC TYPING: Template literals always produce string type.
  */
-export declare const convertTemplateLiteral: (node: ts.TemplateExpression | ts.NoSubstitutionTemplateLiteral, checker: ts.TypeChecker) => IrTemplateLiteralExpression;
+export declare const convertTemplateLiteral: (node: ts.TemplateExpression | ts.NoSubstitutionTemplateLiteral, ctx: ProgramContext) => IrTemplateLiteralExpression;
 //# sourceMappingURL=other.d.ts.map

package/dist/ir/converters/expressions/other.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAE5B,MAAM,gBAAgB,CAAC;AAIxB;;GAEG;AACH,eAAO,MAAM,4BAA4B,GACvC,MAAM,EAAE,CAAC,qBAAqB,EAC9B,SAAS,EAAE,CAAC,WAAW,KACtB,uBASF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,6BAA6B,EAC9D,SAAS,EAAE,CAAC,WAAW,KACtB,2BA0BF,CAAC"}
+{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAE3B,MAAM,EACP,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,GACvC,MAAM,EAAE,CAAC,qBAAqB,EAC9B,KAAK,cAAc,EACnB,cAAc,MAAM,GAAG,SAAS,KAC/B,uBAeF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,6BAA6B,EAC9D,KAAK,cAAc,KAClB,2BAgCF,CAAC"}

package/dist/ir/converters/expressions/other.js

@@ -2,45 +2,61 @@
  * Miscellaneous expression converters (conditional, template literals)
  */
 import * as ts from "typescript";
-import { getInferredType, getSourceSpan } from "./helpers.js";
+import { getSourceSpan } from "./helpers.js";
 import { convertExpression } from "../../expression-converter.js";
 /**
  * Convert conditional (ternary) expression
+ *
+ * DETERMINISTIC TYPING:
+ * - Threads expectedType to both branches for consistent typing
+ * - Result type is expectedType if available, otherwise derives from whenTrue branch
+ * Example: `const x: int = cond ? 5 : 10` → both 5 and 10 get expectedType `int`
  */
-export const convertConditionalExpression = (node, checker) => {
+export const convertConditionalExpression = (node, ctx, expectedType) => {
+    const whenTrue = convertExpression(node.whenTrue, ctx, expectedType);
+    const whenFalse = convertExpression(node.whenFalse, ctx, expectedType);
+    // DETERMINISTIC: Use expectedType if available, otherwise derive from whenTrue
+    const inferredType = expectedType ?? whenTrue.inferredType;
     return {
         kind: "conditional",
-        condition: convertExpression(node.condition, checker),
-        whenTrue: convertExpression(node.whenTrue, checker),
-        whenFalse: convertExpression(node.whenFalse, checker),
-        inferredType: getInferredType(node, checker),
+        condition: convertExpression(node.condition, ctx, undefined),
+        whenTrue,
+        whenFalse,
+        inferredType,
         sourceSpan: getSourceSpan(node),
     };
 };
 /**
  * Convert template literal expression
+ *
+ * DETERMINISTIC TYPING: Template literals always produce string type.
  */
-export const convertTemplateLiteral = (node, checker) => {
+export const convertTemplateLiteral = (node, ctx) => {
+    // DETERMINISTIC: Template literals always produce string
+    const stringType = {
+        kind: "primitiveType",
+        name: "string",
+    };
     if (ts.isNoSubstitutionTemplateLiteral(node)) {
         return {
             kind: "templateLiteral",
             quasis: [node.text],
             expressions: [],
-            inferredType: getInferredType(node, checker),
+            inferredType: stringType,
             sourceSpan: getSourceSpan(node),
         };
     }
     const quasis = [node.head.text];
     const expressions = [];
     node.templateSpans.forEach((span) => {
-        expressions.push(convertExpression(span.expression, checker));
+        expressions.push(convertExpression(span.expression, ctx, undefined));
         quasis.push(span.literal.text);
     });
     return {
         kind: "templateLiteral",
         quasis,
         expressions,
-        inferredType: getInferredType(node, checker),
+        inferredType: stringType,
         sourceSpan: getSourceSpan(node),
     };
 };

package/dist/ir/converters/expressions/other.js.map

@@ -1 +1 @@
-{"version":3,"file":"other.js","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAMjC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,IAA8B,EAC9B,OAAuB,EACE,EAAE;IAC3B,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;QACrD,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QACnD,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;QACrD,YAAY,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;QAC5C,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAA8D,EAC9D,OAAuB,EACM,EAAE;IAC/B,IAAI,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;YAC5C,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;SAChC,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAClC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,MAAM;QACN,WAAW;QACX,YAAY,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;QAC5C,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"other.js","sourceRoot":"","sources":["../../../../src/ir/converters/expressions/other.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAOjC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,IAA8B,EAC9B,GAAmB,EACnB,YAAgC,EACP,EAAE;IAC3B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAEvE,+EAA+E;IAC/E,MAAM,YAAY,GAAG,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;IAE3D,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,CAAC;QAC5D,QAAQ;QACR,SAAS;QACT,YAAY;QACZ,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAA8D,EAC9D,GAAmB,EACU,EAAE;IAC/B,yDAAyD;IACzD,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,eAAwB;QAC9B,IAAI,EAAE,QAAiB;KACxB,CAAC;IAEF,IAAI,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,UAAU;YACxB,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;SAChC,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAClC,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;QACrE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,MAAM;QACN,WAAW;QACX,YAAY,EAAE,UAAU;QACxB,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC"}

package/dist/ir/converters/statements/control/blocks.d.ts

@@ -1,10 +1,16 @@
 /**
  * Block statement converter
+ *
+ * Phase 5 Step 4: Uses ProgramContext instead of Binding.
  */
 import * as ts from "typescript";
-import { IrBlockStatement } from "../../../types.js";
+import { IrBlockStatement, IrType } from "../../../types.js";
+import type { ProgramContext } from "../../../program-context.js";
 /**
  * Convert block statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
+ *                             Pass `undefined` explicitly when not inside a function.
  */
-export declare const convertBlockStatement: (node: ts.Block, checker: ts.TypeChecker) => IrBlockStatement;
+export declare const convertBlockStatement: (node: ts.Block, ctx: ProgramContext, expectedReturnType: IrType | undefined) => IrBlockStatement;
 //# sourceMappingURL=blocks.d.ts.map

package/dist/ir/converters/statements/control/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/blocks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAGlE;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,EAAE,CAAC,KAAK,EACd,SAAS,EAAE,CAAC,WAAW,KACtB,gBAOF,CAAC"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/blocks.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,EAAE,CAAC,KAAK,EACd,KAAK,cAAc,EACnB,oBAAoB,MAAM,GAAG,SAAS,KACrC,gBAOF,CAAC"}

package/dist/ir/converters/statements/control/blocks.js

@@ -1,15 +1,20 @@
 /**
  * Block statement converter
+ *
+ * Phase 5 Step 4: Uses ProgramContext instead of Binding.
  */
 import { convertStatement } from "../../../statement-converter.js";
 /**
  * Convert block statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
+ *                             Pass `undefined` explicitly when not inside a function.
  */
-export const convertBlockStatement = (node, checker) => {
+export const convertBlockStatement = (node, ctx, expectedReturnType) => {
     return {
         kind: "blockStatement",
         statements: node.statements
-            .map((s) => convertStatement(s, checker))
+            .map((s) => convertStatement(s, ctx, expectedReturnType))
             .filter((s) => s !== null),
     };
 };

package/dist/ir/converters/statements/control/blocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/blocks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAc,EACd,OAAuB,EACL,EAAE;IACpB,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,UAAU,EAAE,IAAI,CAAC,UAAU;aACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;aACxC,MAAM,CAAC,CAAC,CAAC,EAAoB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/blocks.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAc,EACd,GAAmB,EACnB,kBAAsC,EACpB,EAAE;IACpB,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,UAAU,EAAE,IAAI,CAAC,UAAU;aACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;aACxD,MAAM,CAAC,CAAC,CAAC,EAAoB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC"}

package/dist/ir/converters/statements/control/conditionals.d.ts

@@ -1,18 +1,28 @@
 /**
  * Conditional statement converters (if, switch)
+ *
+ * Phase 5 Step 4: Uses ProgramContext instead of Binding.
  */
 import * as ts from "typescript";
-import { IrIfStatement, IrSwitchStatement, IrSwitchCase } from "../../../types.js";
+import { IrIfStatement, IrSwitchStatement, IrSwitchCase, IrType } from "../../../types.js";
+import type { ProgramContext } from "../../../program-context.js";
 /**
  * Convert if statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
+ *                             Passed through to nested statements for return expressions.
  */
-export declare const convertIfStatement: (node: ts.IfStatement, checker: ts.TypeChecker) => IrIfStatement;
+export declare const convertIfStatement: (node: ts.IfStatement, ctx: ProgramContext, expectedReturnType?: IrType) => IrIfStatement;
 /**
  * Convert switch statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export declare const convertSwitchStatement: (node: ts.SwitchStatement, checker: ts.TypeChecker) => IrSwitchStatement;
+export declare const convertSwitchStatement: (node: ts.SwitchStatement, ctx: ProgramContext, expectedReturnType?: IrType) => IrSwitchStatement;
 /**
  * Convert switch case
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export declare const convertSwitchCase: (node: ts.CaseOrDefaultClause, checker: ts.TypeChecker) => IrSwitchCase;
+export declare const convertSwitchCase: (node: ts.CaseOrDefaultClause, ctx: ProgramContext, expectedReturnType?: IrType) => IrSwitchCase;
 //# sourceMappingURL=conditionals.d.ts.map

package/dist/ir/converters/statements/control/conditionals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditionals.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/conditionals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,YAAY,EACb,MAAM,mBAAmB,CAAC;AAQ3B;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,EAAE,CAAC,WAAW,EACpB,SAAS,EAAE,CAAC,WAAW,KACtB,aAYF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,eAAe,EACxB,SAAS,EAAE,CAAC,WAAW,KACtB,iBAQF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,SAAS,EAAE,CAAC,WAAW,KACtB,YAUF,CAAC"}
+{"version":3,"file":"conditionals.d.ts","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/conditionals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,MAAM,EACP,MAAM,mBAAmB,CAAC;AAO3B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,EAAE,CAAC,WAAW,EACpB,KAAK,cAAc,EACnB,qBAAqB,MAAM,KAC1B,aAgBF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,EAAE,CAAC,eAAe,EACxB,KAAK,cAAc,EACnB,qBAAqB,MAAM,KAC1B,iBAQF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,EAAE,CAAC,mBAAmB,EAC5B,KAAK,cAAc,EACnB,qBAAqB,MAAM,KAC1B,YAUF,CAAC"}

package/dist/ir/converters/statements/control/conditionals.js

@@ -1,44 +1,53 @@
 /**
  * Conditional statement converters (if, switch)
+ *
+ * Phase 5 Step 4: Uses ProgramContext instead of Binding.
  */
 import * as ts from "typescript";
 import { convertExpression } from "../../../expression-converter.js";
 import { convertStatementSingle, flattenStatementResult, convertStatement, } from "../../../statement-converter.js";
 /**
  * Convert if statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
+ *                             Passed through to nested statements for return expressions.
  */
-export const convertIfStatement = (node, checker) => {
-    const thenStmt = convertStatementSingle(node.thenStatement, checker);
+export const convertIfStatement = (node, ctx, expectedReturnType) => {
+    const thenStmt = convertStatementSingle(node.thenStatement, ctx, expectedReturnType);
     const elseStmt = node.elseStatement
-        ? convertStatementSingle(node.elseStatement, checker)
+        ? convertStatementSingle(node.elseStatement, ctx, expectedReturnType)
         : undefined;
     return {
         kind: "ifStatement",
-        condition: convertExpression(node.expression, checker),
+        condition: convertExpression(node.expression, ctx, undefined),
         thenStatement: thenStmt ?? { kind: "emptyStatement" },
         elseStatement: elseStmt ?? undefined,
     };
 };
 /**
  * Convert switch statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export const convertSwitchStatement = (node, checker) => {
+export const convertSwitchStatement = (node, ctx, expectedReturnType) => {
     return {
         kind: "switchStatement",
-        expression: convertExpression(node.expression, checker),
-        cases: node.caseBlock.clauses.map((clause) => convertSwitchCase(clause, checker)),
+        expression: convertExpression(node.expression, ctx, undefined),
+        cases: node.caseBlock.clauses.map((clause) => convertSwitchCase(clause, ctx, expectedReturnType)),
     };
 };
 /**
  * Convert switch case
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export const convertSwitchCase = (node, checker) => {
+export const convertSwitchCase = (node, ctx, expectedReturnType) => {
     return {
         kind: "switchCase",
         test: ts.isCaseClause(node)
-            ? convertExpression(node.expression, checker)
+            ? convertExpression(node.expression, ctx, undefined)
             : undefined,
-        statements: node.statements.flatMap((s) => flattenStatementResult(convertStatement(s, checker))),
+        statements: node.statements.flatMap((s) => flattenStatementResult(convertStatement(s, ctx, expectedReturnType))),
     };
 };
 //# sourceMappingURL=conditionals.js.map

package/dist/ir/converters/statements/control/conditionals.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditionals.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/conditionals.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAMjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAoB,EACpB,OAAuB,EACR,EAAE;IACjB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa;QACjC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;QACrD,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;QACtD,aAAa,EAAE,QAAQ,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACrD,aAAa,EAAE,QAAQ,IAAI,SAAS;KACrC,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAwB,EACxB,OAAuB,EACJ,EAAE;IACrB,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;QACvD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3C,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CACnC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAA4B,EAC5B,OAAuB,EACT,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YACzB,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;YAC7C,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CACrD;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"conditionals.js","sourceRoot":"","sources":["../../../../../src/ir/converters/statements/control/conditionals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAOjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,iCAAiC,CAAC;AAGzC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAoB,EACpB,GAAmB,EACnB,kBAA2B,EACZ,EAAE;IACjB,MAAM,QAAQ,GAAG,sBAAsB,CACrC,IAAI,CAAC,aAAa,EAClB,GAAG,EACH,kBAAkB,CACnB,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa;QACjC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,kBAAkB,CAAC;QACrE,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,SAAS,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC;QAC7D,aAAa,EAAE,QAAQ,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACrD,aAAa,EAAE,QAAQ,IAAI,SAAS;KACrC,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAAwB,EACxB,GAAmB,EACnB,kBAA2B,EACR,EAAE;IACrB,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC;QAC9D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3C,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,kBAAkB,CAAC,CACnD;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAA4B,EAC5B,GAAmB,EACnB,kBAA2B,EACb,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YACzB,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,CAAC;YACpD,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC,CACrE;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/ir/converters/statements/control/exceptions.d.ts

@@ -1,14 +1,21 @@
 /**
  * Exception handling converters (try, catch)
+ *
+ * Phase 5 Step 4: Uses ProgramContext instead of Binding.
  */
 import * as ts from "typescript";
-import { IrTryStatement, IrCatchClause } from "../../../types.js";
+import { IrTryStatement, IrCatchClause, IrType } from "../../../types.js";
+import type { ProgramContext } from "../../../program-context.js";
 /**
  * Convert try statement
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export declare const convertTryStatement: (node: ts.TryStatement, checker: ts.TypeChecker) => IrTryStatement;
+export declare const convertTryStatement: (node: ts.TryStatement, ctx: ProgramContext, expectedReturnType?: IrType) => IrTryStatement;
 /**
  * Convert catch clause
+ *
+ * @param expectedReturnType - Return type from enclosing function for contextual typing.
  */
-export declare const convertCatchClause: (node: ts.CatchClause, checker: ts.TypeChecker) => IrCatchClause;
+export declare const convertCatchClause: (node: ts.CatchClause, ctx: ProgramContext, expectedReturnType?: IrType) => IrCatchClause;
 //# sourceMappingURL=exceptions.d.ts.map