lemmascript 0.2.0 → 0.3.1

package/tools/dist/resolve.js

@@ -6,6 +6,72 @@
  */
 import { parseTsType } from "./types.js";
 import { parseExpr } from "./specparser.js";
+// ── Raw expression substitution ─────────────────────────────
+let _synVarCounter = 0;
+/**
+ * Structural equality for raw field-access chains (var and field nodes only).
+ * Exact within a single expression scope — raw IR has no bindings that could
+ * cause name collisions (those are introduced by resolve, which runs after).
+ */
+function rawExprEquals(a, b) {
+    if (a.kind === "var" && b.kind === "var")
+        return a.name === b.name;
+    if (a.kind === "field" && b.kind === "field")
+        return a.field === b.field && rawExprEquals(a.obj, b.obj);
+    if (a.kind === "call" && b.kind === "call")
+        return rawExprEquals(a.fn, b.fn) && a.args.length === b.args.length && a.args.every((arg, i) => rawExprEquals(arg, b.args[i]));
+    if (a.kind === "index" && b.kind === "index")
+        return rawExprEquals(a.obj, b.obj) && rawExprEquals(a.idx, b.idx);
+    return false;
+}
+/** Return the root variable name of a field-access chain, or null. */
+function rawChainRoot(e) {
+    if (e.kind === "var")
+        return e.name;
+    if (e.kind === "field")
+        return rawChainRoot(e.obj);
+    return null;
+}
+/**
+ * Replace all occurrences of `target` in `expr` with `replacement`.
+ * Only matches field-access chains (see rawExprEquals). Stops at lambda
+ * boundaries that shadow the chain's root variable.
+ */
+function substituteRawExpr(expr, target, replacement) {
+    if (rawExprEquals(expr, target))
+        return replacement;
+    const root = rawChainRoot(target);
+    const sub = (e) => substituteRawExpr(e, target, replacement);
+    switch (expr.kind) {
+        case "var":
+        case "num":
+        case "str":
+        case "bool":
+        case "result":
+        case "havoc":
+        case "emptyCollection":
+            return expr;
+        case "binop": return { ...expr, left: sub(expr.left), right: sub(expr.right) };
+        case "unop": return { ...expr, expr: sub(expr.expr) };
+        case "call": return { ...expr, fn: sub(expr.fn), args: expr.args.map(sub) };
+        case "field": return { ...expr, obj: sub(expr.obj) };
+        case "index": return { ...expr, obj: sub(expr.obj), idx: sub(expr.idx) };
+        case "record":
+            return { ...expr, spread: expr.spread ? sub(expr.spread) : null,
+                fields: expr.fields.map(f => ({ ...f, value: sub(f.value) })) };
+        case "arrayLiteral": return { ...expr, elems: expr.elems.map(sub) };
+        case "conditional": return { ...expr, cond: sub(expr.cond), then: sub(expr.then), else: sub(expr.else) };
+        case "nonNull": return { ...expr, expr: sub(expr.expr) };
+        case "forall":
+        case "exists":
+            return { ...expr, body: sub(expr.body) };
+        case "lambda":
+            // Don't cross lambda boundaries that shadow the chain's root variable
+            if (root && expr.params.some(p => p.name === root))
+                return expr;
+            return { ...expr, body: Array.isArray(expr.body) ? expr.body : sub(expr.body) };
+    }
+}
 function lookup(env, name) {
     if (!env)
         return undefined;
@@ -33,22 +99,47 @@ function coerceStr(expr, targetTy) {
     return expr;
 }
 // ── Helpers ──────────────────────────────────────────────────
-/** Detect `v !== undefined` or `undefined !== v` where v: optional<T>. */
-function narrowOptional(cond, env) {
+/** Wrap a resolved expression in Some() for optional coercion. */
+function wrapSome(value, optionalTy) {
+    return {
+        kind: "call", fn: { kind: "var", name: "Some", ty: optionalTy },
+        args: [value], ty: optionalTy, callKind: "pure",
+    };
+}
+/** Detect `v !== undefined` or `undefined !== v` where v: optional<T>.
+ *  Handles simple variables, field access chains, and arbitrary expressions.
+ *  When `fieldExpr` is returned, callers must use `substituteRawExpr` to narrow.
+ *
+ *  Does NOT recurse into `&&` — callers that need to detect optional checks
+ *  inside `&&` conditions should check `cond.left` explicitly. */
+function detectOptionalCheck(cond, ctx) {
     if (cond.kind !== "binop" || (cond.op !== "!==" && cond.op !== "==="))
         return null;
-    // v !== undefined  OR  undefined !== v
-    let varName = null;
-    if (cond.left.kind === "var" && cond.right.kind === "var" && cond.right.name === "undefined")
-        varName = cond.left.name;
-    if (cond.right.kind === "var" && cond.left.kind === "var" && cond.left.name === "undefined")
-        varName = cond.right.name;
-    if (!varName)
-        return null;
-    const ty = lookup(env, varName);
-    if (!ty || ty.kind !== "optional")
+    // Identify the expression being checked against undefined
+    let optExpr = null;
+    if (cond.right.kind === "var" && cond.right.name === "undefined")
+        optExpr = cond.left;
+    if (cond.left.kind === "var" && cond.left.name === "undefined")
+        optExpr = cond.right;
+    if (!optExpr)
         return null;
-    return { varName, innerTy: ty.inner, inThen: cond.op === "!==" };
+    // Simple variable — env lookup, no substitution needed
+    if (optExpr.kind === "var") {
+        const ty = lookup(ctx.env, optExpr.name);
+        if (!ty || ty.kind !== "optional")
+            return null;
+        return { varName: optExpr.name, innerTy: ty.inner, inThen: cond.op === "!==" };
+    }
+    // Field access chain or arbitrary expression — resolve to check type, needs substitution
+    const resolved = resolveExpr(optExpr, ctx);
+    if (resolved.ty.kind === "optional") {
+        const synVar = optExpr.kind === "field" ? `_narr${_synVarCounter++}` : `_opt${_synVarCounter++}`;
+        return {
+            varName: synVar, innerTy: resolved.ty.inner, inThen: cond.op === "!==",
+            fieldExpr: optExpr, narrowedExpr: resolved,
+        };
+    }
+    return null;
 }
 /** TS reference types that become value types in Dafny/Lean — const bindings need mutable var. */
 function isRefMutableInTS(ty) {
@@ -137,10 +228,99 @@ function classifyCall(fn, ctx) {
         return "method";
     return "unknown";
 }
+// ── Call resolution helpers ─────────────────────────────────
+/** Infer lambda param types from array method context (map, filter, etc.).
+ *  Returns updated rawArgs with inferred tsType on the first lambda param. */
+function inferLambdaParamTypes(fn, rawArgs) {
+    if (fn.kind === "field" && fn.obj.ty.kind === "array" &&
+        ["map", "filter", "every", "some", "find"].includes(fn.field) &&
+        rawArgs.length >= 1 && rawArgs[0].kind === "lambda" &&
+        rawArgs[0].params.length >= 1 && !rawArgs[0].params[0].tsType) {
+        const elemTy = fn.obj.ty.elem;
+        const tsType = elemTy.kind === "user" ? elemTy.name
+            : elemTy.kind === "string" ? "string"
+                : elemTy.kind === "int" || elemTy.kind === "nat" ? "number"
+                    : elemTy.kind === "bool" ? "boolean" : undefined;
+        if (tsType) {
+            const lam = rawArgs[0];
+            const updatedParams = [{ ...lam.params[0], tsType }, ...lam.params.slice(1)];
+            return [{ ...lam, params: updatedParams }, ...rawArgs.slice(1)];
+        }
+    }
+    return rawArgs;
+}
+/** Coerce call arguments: string literals → user types, non-optional → Some, pad missing optional args. */
+function coerceCallArgs(args, fn, ctx) {
+    if (fn.kind !== "var" || !ctx.fnParams.has(fn.name))
+        return args;
+    const paramTys = ctx.fnParams.get(fn.name);
+    args = args.map((a, i) => {
+        if (i >= paramTys.length)
+            return a;
+        a = coerceStr(a, paramTys[i]);
+        if (a.ty.kind !== "optional" && paramTys[i].kind === "optional") {
+            return wrapSome(a, paramTys[i]);
+        }
+        return a;
+    });
+    // Pad missing optional args with None
+    for (let i = args.length; i < paramTys.length; i++) {
+        if (paramTys[i].kind === "optional") {
+            args.push({ kind: "var", name: "undefined", ty: paramTys[i] });
+        }
+    }
+    return args;
+}
+/** Infer return type for collection/string method calls. */
+function inferMethodReturnTy(fn, args, ctx) {
+    if (fn.kind !== "field")
+        return { kind: "unknown" };
+    const objTy = fn.obj.ty;
+    if (objTy.kind === "map") {
+        if (fn.field === "get")
+            return ctx.inSpec ? objTy.value : { kind: "optional", inner: objTy.value };
+        if (fn.field === "has")
+            return { kind: "bool" };
+        if (fn.field === "set" || fn.field === "delete")
+            return objTy;
+    }
+    else if (objTy.kind === "set") {
+        if (fn.field === "has")
+            return { kind: "bool" };
+        if (fn.field === "add" || fn.field === "delete")
+            return objTy;
+    }
+    else if (objTy.kind === "array") {
+        if (fn.field === "includes")
+            return { kind: "bool" };
+        if (fn.field === "shift")
+            return objTy.elem;
+        if (fn.field === "push" || fn.field === "concat")
+            return objTy;
+        if (fn.field === "filter")
+            return objTy;
+        if (fn.field === "every" || fn.field === "some")
+            return { kind: "bool" };
+        if (fn.field === "map" && args.length >= 1 && args[0].kind === "lambda") {
+            const retTy = args[0].body.length > 0 && args[0].body[0].kind === "return"
+                ? args[0].body[0].value.ty : { kind: "unknown" };
+            return { kind: "array", elem: retTy };
+        }
+    }
+    else if (objTy.kind === "string") {
+        if (fn.field === "trim" || fn.field === "toLowerCase" || fn.field === "toUpperCase")
+            return { kind: "string" };
+        if (fn.field === "includes")
+            return { kind: "bool" };
+    }
+    return { kind: "unknown" };
+}
 // ── Resolve expressions ──────────────────────────────────────
 function resolveExpr(e, ctx) {
     switch (e.kind) {
         case "var":
+            if (e.name === "undefined")
+                return { kind: "var", name: "undefined", ty: { kind: "void" } };
             return { kind: "var", name: e.name, ty: lookup(ctx.env, e.name) ?? { kind: "unknown" } };
         case "num":
             if (!Number.isInteger(e.value))
@@ -162,18 +342,31 @@ function resolveExpr(e, ctx) {
         }
         case "binop": {
             let left = resolveExpr(e.left, ctx);
-            let right = resolveExpr(e.right, ctx);
+            // && narrowing: if left is "x !== undefined", narrow x for right side.
+            // Field chains are excluded — resolve can't substitute in sub-expressions;
+            // transform's emitOptionalMatch handles field chains in statement contexts.
+            let rightCtx = ctx;
+            let rawRight = e.right;
+            if (e.op === "&&") {
+                const narrowed = detectOptionalCheck(e.left, ctx);
+                if (narrowed && narrowed.inThen && !narrowed.fieldExpr) {
+                    rightCtx = withEnv(ctx, extend(ctx.env, narrowed.varName, narrowed.innerTy));
+                }
+            }
+            let right = resolveExpr(rawRight, rightCtx);
             if (e.op === "===" || e.op === "!==") {
                 left = coerceStr(left, right.ty);
                 right = coerceStr(right, left.ty);
             }
             let ty = { kind: "unknown" };
-            if (["===", "!==", ">=", "<=", ">", "<"].includes(e.op))
+            if (["===", "!==", ">=", "<=", ">", "<", "in"].includes(e.op))
                 ty = { kind: "bool" };
             else if (e.op === "&&")
                 ty = right.ty;
-            else if (e.op === "||" && left.ty.kind === "optional")
-                ty = left.ty.inner;
+            else if (e.op === "||" && left.ty.kind === "optional") {
+                // || undefined is identity for optionals — keep the optional type
+                ty = (e.right.kind === "var" && e.right.name === "undefined") ? left.ty : left.ty.inner;
+            }
             else if (e.op === "||")
                 ty = right.ty;
             else if (["+", "-", "*", "/", "%"].includes(e.op)) {
@@ -187,65 +380,24 @@ function resolveExpr(e, ctx) {
         }
         case "call": {
             const fn = resolveExpr(e.fn, ctx);
-            let args = e.args.map(a => resolveExpr(a, ctx));
-            // Coerce non-optional args to Option when callee expects optional param: wrap in Some
-            if (fn.kind === "var" && ctx.fnParams.has(fn.name)) {
-                const paramTys = ctx.fnParams.get(fn.name);
-                args = args.map((a, i) => {
-                    if (i < paramTys.length && a.ty.kind !== "optional" && paramTys[i].kind === "optional") {
-                        return {
-                            kind: "call",
-                            fn: { kind: "var", name: "Some", ty: paramTys[i] },
-                            args: [a],
-                            ty: paramTys[i],
-                            callKind: "pure",
-                        };
-                    }
-                    return a;
-                });
-            }
-            let ty = { kind: "unknown" };
-            // Infer return types for collection methods
-            if (fn.kind === "field" && fn.obj.ty.kind === "map") {
-                if (fn.field === "get")
-                    ty = ctx.inSpec ? fn.obj.ty.value : { kind: "optional", inner: fn.obj.ty.value };
-                else if (fn.field === "has")
-                    ty = { kind: "bool" };
-                else if (fn.field === "set")
-                    ty = fn.obj.ty;
-            }
-            else if (fn.kind === "field" && fn.obj.ty.kind === "set") {
-                if (fn.field === "has")
-                    ty = { kind: "bool" };
-                else if (fn.field === "add")
-                    ty = fn.obj.ty;
-                else if (fn.field === "delete")
-                    ty = fn.obj.ty;
-            }
-            else if (fn.kind === "field" && fn.obj.ty.kind === "array") {
-                if (fn.field === "includes")
-                    ty = { kind: "bool" };
-                else if (fn.field === "shift")
-                    ty = fn.obj.ty.elem;
-                else if (fn.field === "push")
-                    ty = fn.obj.ty;
-            }
-            else if (fn.kind === "field" && fn.obj.ty.kind === "string") {
-                if (fn.field === "trim")
-                    ty = { kind: "string" };
-                else if (fn.field === "toLowerCase")
-                    ty = { kind: "string" };
-                else if (fn.field === "toUpperCase")
-                    ty = { kind: "string" };
-                else if (fn.field === "includes")
-                    ty = { kind: "bool" };
+            const rawArgs = inferLambdaParamTypes(fn, e.args);
+            // For .push() on a typed array, resolve args with element type context
+            let argCtx = ctx;
+            if (fn.kind === "field" && fn.obj.ty.kind === "array" && fn.field === "push" &&
+                fn.obj.ty.elem.kind === "user") {
+                argCtx = { ...ctx, returnTy: fn.obj.ty.elem };
             }
+            const args = coerceCallArgs(rawArgs.map(a => resolveExpr(a, argCtx)), fn, ctx);
+            const ty = inferMethodReturnTy(fn, args, ctx);
             return { kind: "call", fn, args, ty, callKind: classifyCall(e.fn, ctx) };
         }
         case "index": {
             const obj = resolveExpr(e.obj, ctx);
             const idx = resolveExpr(e.idx, ctx);
-            return { kind: "index", obj, idx, ty: obj.ty.kind === "array" ? obj.ty.elem : { kind: "unknown" } };
+            const idxTy = obj.ty.kind === "array" ? obj.ty.elem
+                : obj.ty.kind === "map" ? obj.ty.value
+                    : { kind: "unknown" };
+            return { kind: "index", obj, idx, ty: idxTy };
         }
         case "field": {
             const obj = resolveExpr(e.obj, ctx);
@@ -264,7 +416,17 @@ function resolveExpr(e, ctx) {
                 if (decl?.kind === "record") {
                     const f = decl.fields?.find(f => f.name === e.field);
                     if (f)
-                        ty = resolveTsType(f.tsType, ctx.overrides);
+                        ty = f.type;
+                }
+                // Also resolve fields from discriminated-union variants
+                if (ty.kind === "unknown" && decl?.kind === "discriminated-union" && decl.variants) {
+                    for (const variant of decl.variants) {
+                        const f = variant.fields.find(f => f.name === e.field);
+                        if (f) {
+                            ty = f.type;
+                            break;
+                        }
+                    }
                 }
             }
             return { kind: "field", obj, field: e.field, ty, isDiscriminant };
@@ -275,11 +437,19 @@ function resolveExpr(e, ctx) {
             // Infer record type: from spread, or from return type context
             const recordTy = ty.kind === "user" ? ty : ctx.returnTy.kind === "user" ? ctx.returnTy : null;
             const decl = recordTy ? ctx.typeDecls.find(d => d.name === recordTy.name && d.kind === "record") : undefined;
+            // Clear returnTy for field values — it applies to THIS record, not nested ones
+            const fieldCtx = recordTy ? { ...ctx, returnTy: { kind: "unknown" } } : ctx;
             const fields = e.fields.map(f => {
-                let value = resolveExpr(f.value, ctx);
+                let value = resolveExpr(f.value, fieldCtx);
                 const fieldDecl = decl?.fields?.find(df => df.name === f.name);
-                if (fieldDecl)
-                    value = coerceStr(value, parseTsType(fieldDecl.tsType));
+                if (fieldDecl) {
+                    const declTy = fieldDecl.type;
+                    value = coerceStr(value, declTy);
+                    // Coerce non-optional to optional: wrap in Some (only when value type is concrete)
+                    if (declTy.kind === "optional" && value.ty.kind !== "optional" && value.ty.kind !== "void" && value.ty.kind !== "unknown") {
+                        value = wrapSome(value, declTy);
+                    }
+                }
                 return { name: f.name, value };
             });
             return { kind: "record", spread, fields, ty: recordTy ?? ty };
@@ -289,12 +459,12 @@ function resolveExpr(e, ctx) {
                 throw new Error("\\result is only valid in ensures");
             return { kind: "result", ty: ctx.returnTy };
         case "forall": {
-            const varTy = e.varType === "nat" ? { kind: "nat" }
+            const varTy = e.varType !== "int" ? parseTsType(e.varType)
                 : inferQuantVarType(e.var, e.body, ctx) ?? { kind: "int" };
             return { kind: "forall", var: e.var, varTy, body: resolveExpr(e.body, withEnv(ctx, extend(ctx.env, e.var, varTy))), ty: { kind: "bool" } };
         }
         case "exists": {
-            const varTy = e.varType === "nat" ? { kind: "nat" }
+            const varTy = e.varType !== "int" ? parseTsType(e.varType)
                 : inferQuantVarType(e.var, e.body, ctx) ?? { kind: "int" };
             return { kind: "exists", var: e.var, varTy, body: resolveExpr(e.body, withEnv(ctx, extend(ctx.env, e.var, varTy))), ty: { kind: "bool" } };
         }
@@ -322,16 +492,61 @@ function resolveExpr(e, ctx) {
         }
         case "conditional": {
             const cond = resolveExpr(e.cond, ctx);
-            let then_ = resolveExpr(e.then, ctx);
+            let narrowedVar;
+            let narrowedExprResolved;
+            let thenCtx = ctx;
+            let rawThen = e.then;
+            // Phase 1: Optional truthiness — cond itself is optional (e.g. opt ? X : Y)
+            if (cond.ty.kind === "optional") {
+                const innerTy = cond.ty.inner;
+                if (e.cond.kind === "var") {
+                    narrowedVar = e.cond.name;
+                    thenCtx = withEnv(ctx, extend(ctx.env, e.cond.name, innerTy));
+                }
+                else {
+                    narrowedVar = `_opt${_synVarCounter++}`;
+                    rawThen = substituteRawExpr(e.then, e.cond, { kind: "var", name: narrowedVar });
+                    thenCtx = withEnv(ctx, extend(ctx.env, narrowedVar, innerTy));
+                }
+            }
+            // Phase 2: Explicit check — v !== undefined (simple vars, field chains,
+            // complex expressions all handled uniformly by detectOptionalCheck)
+            if (!narrowedVar) {
+                const narrowed = detectOptionalCheck(e.cond, ctx)
+                    // Phase 3: && with optional check — (v !== undefined && ...) ? ... : ...
+                    ?? (e.cond.kind === "binop" && e.cond.op === "&&" ? detectOptionalCheck(e.cond.left, ctx) : null);
+                if (narrowed && narrowed.inThen) {
+                    narrowedVar = narrowed.varName;
+                    thenCtx = withEnv(ctx, extend(ctx.env, narrowed.varName, narrowed.innerTy));
+                    if (narrowed.fieldExpr) {
+                        narrowedExprResolved = narrowed.narrowedExpr ?? resolveExpr(narrowed.fieldExpr, ctx);
+                        rawThen = substituteRawExpr(e.then, narrowed.fieldExpr, { kind: "var", name: narrowed.varName });
+                    }
+                }
+            }
+            let then_ = resolveExpr(rawThen, thenCtx);
             let else_ = resolveExpr(e.else, ctx);
             then_ = coerceStr(then_, else_.ty);
             else_ = coerceStr(else_, then_.ty);
-            const ty = then_.ty.kind !== "unknown" ? then_.ty : else_.ty;
-            return { kind: "conditional", cond, then: then_, else: else_, ty };
+            let ty = then_.ty.kind !== "unknown" ? then_.ty : else_.ty;
+            // When one branch is undefined, result is optional
+            if (then_.ty.kind === "void" && else_.ty.kind !== "void" && else_.ty.kind !== "unknown") {
+                ty = { kind: "optional", inner: else_.ty };
+            }
+            else if (else_.ty.kind === "void" && then_.ty.kind !== "void" && then_.ty.kind !== "unknown") {
+                ty = { kind: "optional", inner: then_.ty };
+            }
+            // When narrowedExpr is set AND a branch is void, the match produces Optional
+            const hasVoidBranch = then_.ty.kind === "void" || else_.ty.kind === "void";
+            if (narrowedExprResolved && hasVoidBranch && ty.kind !== "optional") {
+                ty = { kind: "optional", inner: ty };
+            }
+            return { kind: "conditional", cond, then: then_, else: else_, ty, narrowedVar, narrowedExpr: narrowedExprResolved };
         }
         case "emptyCollection": {
             const ty = parseTsType(e.tsType);
-            return { kind: "arrayLiteral", elems: [], ty };
+            const elems = e.initElems ? e.initElems.map(el => resolveExpr(el, ctx)) : [];
+            return { kind: "arrayLiteral", elems, ty };
         }
         case "havoc":
             return { kind: "havoc", ty: resolveTsType(e.tsType, ctx.overrides) };
@@ -363,6 +578,15 @@ function resolveBlock(stmts, ctx) {
         const [typed, nextEnv] = resolveStmt(s, withEnv(ctx, env));
         result.push(typed);
         env = nextEnv;
+        // Flow narrowing: if (x === undefined) { return } narrows x for rest of block.
+        // Field chains are excluded — resolve can't substitute in statement lists;
+        // transform's emitOptionalMatch handles field chains in statement contexts.
+        if (s.kind === "if" && s.then.length > 0 && s.then[s.then.length - 1].kind === "return" && s.else.length === 0) {
+            const narrowed = detectOptionalCheck(s.cond, withEnv(ctx, env));
+            if (narrowed && !narrowed.inThen && !narrowed.fieldExpr) {
+                env = extend(env, narrowed.varName, narrowed.innerTy);
+            }
+        }
     }
     return result;
 }
@@ -379,8 +603,16 @@ function resolveStmt(s, ctx) {
             const targetTy = lookup(ctx.env, s.target) ?? { kind: "unknown" };
             return [{ kind: "assign", target: s.target, value: coerceStr(resolveExpr(s.value, ctx), targetTy) }, ctx.env];
         }
-        case "return":
-            return [{ kind: "return", value: coerceStr(resolveExpr(s.value, ctx), ctx.returnTy) }, ctx.env];
+        case "return": {
+            let value = coerceStr(resolveExpr(s.value, ctx), ctx.returnTy);
+            // Wrap non-optional return value in Some when function returns optional
+            // Skip if already optional, void, or undefined (which maps to None)
+            const isUndef = value.kind === "var" && value.name === "undefined";
+            if (ctx.returnTy.kind === "optional" && value.ty.kind !== "optional" && !isUndef) {
+                value = wrapSome(value, ctx.returnTy);
+            }
+            return [{ kind: "return", value }, ctx.env];
+        }
         case "break":
             return [{ kind: "break" }, ctx.env];
         case "continue":
@@ -388,10 +620,14 @@ function resolveStmt(s, ctx) {
         case "expr":
             return [{ kind: "expr", expr: resolveExpr(s.expr, ctx) }, ctx.env];
         case "if": {
-            // Narrow optional<T> → T when checking !== undefined or undefined !==
+            // Narrow optional<T> → T when checking !== undefined or undefined !==.
+            // Also checks left side of && conditions: if (x !== undefined && ...) { ... }
+            // Field chains are excluded — resolve can't substitute in statement bodies;
+            // transform's emitOptionalMatch handles field chains in statement contexts.
             let thenCtx = ctx, elseCtx = ctx;
-            const narrowed = narrowOptional(s.cond, ctx.env);
-            if (narrowed) {
+            const narrowed = detectOptionalCheck(s.cond, ctx)
+                ?? (s.cond.kind === "binop" && s.cond.op === "&&" ? detectOptionalCheck(s.cond.left, ctx) : null);
+            if (narrowed && !narrowed.fieldExpr) {
                 const env = extend(ctx.env, narrowed.varName, narrowed.innerTy);
                 if (narrowed.inThen)
                     thenCtx = withEnv(ctx, env);
@@ -483,7 +719,7 @@ function isSyntacticallyPure(stmts) {
             case "while":
             case "forof": return false;
             case "let":
-                if (s.mutable)
+                if (s.mutable || s.init.kind === "havoc")
                     return false;
                 break;
             case "if":
@@ -644,24 +880,28 @@ function containsReturn(stmts) {
     return false;
 }
 // ── Resolve function / module ────────────────────────────────
-function resolveFunction(fn, typeDecls, pureFns, fnParams = new Map()) {
-    if (hasReturnInLoop(fn.body)) {
-        throw new Error(`${fn.name}: return inside a loop is not supported.`);
-    }
+function resolveFunction(fn, typeDecls, pureFns, fnParams = new Map(), opts) {
     const overrides = new Map(fn.typeAnnotations.map(a => [a.name, a.type]));
     const params = fn.params.map(p => ({ name: p.name, ty: resolveTsType(p.tsType, overrides, p.name) }));
     const returnTy = resolveTsType(fn.returnType, overrides, "\\result");
     let env = null;
+    if (opts?.thisBinding)
+        env = extend(env, opts.thisBinding.name, opts.thisBinding.ty);
     for (const p of params)
         env = extend(env, p.name, p.ty);
     const baseCtx = { env, typeDecls, overrides, allowResult: false, returnTy, pureFns, fnParams, inSpec: false, inLambda: false };
     const requiresCtx = { ...baseCtx, inSpec: true };
     const ensuresCtx = { ...baseCtx, allowResult: true, inSpec: true };
+    // Apply type parameter constraints from //@ type T (==) annotations
+    const typeParams = fn.typeParams.map(tp => {
+        const constraint = overrides.get(tp);
+        return constraint ? `${tp}${constraint}` : tp;
+    });
     return {
-        name: fn.name, params, returnTy,
+        name: fn.name, typeParams, params, returnTy,
         requires: resolveSpecs(fn.requires, requiresCtx),
         ensures: resolveSpecs(fn.ensures, ensuresCtx),
-        isPure: pureFns.has(fn.name),
+        isPure: opts?.forcePure !== undefined ? opts.forcePure : pureFns.has(fn.name),
         body: resolveBlock(fn.body, baseCtx),
     };
 }
@@ -669,31 +909,31 @@ function resolveClass(cls, typeDecls, pureFns, fnParams = new Map()) {
     const fields = cls.fields.map(f => ({ name: f.name, ty: parseTsType(f.tsType) }));
     // Create a synthetic record type for 'this' so field access resolves
     const thisType = { kind: "user", name: cls.name };
-    const thisDecl = { name: cls.name, kind: "record", fields: cls.fields.map(f => ({ name: f.name, tsType: f.tsType })) };
+    const thisDecl = { name: cls.name, kind: "record", fields: cls.fields.map(f => ({ name: f.name, tsType: f.tsType, type: parseTsType(f.tsType) })) };
     const allTypeDecls = [...typeDecls, thisDecl];
-    const methods = cls.methods.map(fn => {
-        // Add 'this' to the environment
-        const overrides = new Map(fn.typeAnnotations.map(a => [a.name, a.type]));
-        const params = fn.params.map(p => ({ name: p.name, ty: resolveTsType(p.tsType, overrides, p.name) }));
-        const returnTy = resolveTsType(fn.returnType, overrides, "\\result");
-        let env = null;
-        env = extend(env, "this", thisType);
-        for (const p of params)
-            env = extend(env, p.name, p.ty);
-        const baseCtx = { env, typeDecls: allTypeDecls, overrides, allowResult: false, returnTy, pureFns, fnParams, inSpec: false, inLambda: false };
-        const requiresCtx = { ...baseCtx, inSpec: true };
-        const ensuresCtx = { ...baseCtx, allowResult: true, inSpec: true };
-        return {
-            name: fn.name, params, returnTy,
-            requires: resolveSpecs(fn.requires, requiresCtx),
-            ensures: resolveSpecs(fn.ensures, ensuresCtx),
-            isPure: false, // class methods are never pure (they access this)
-            body: resolveBlock(fn.body, baseCtx),
-        };
-    });
+    const methods = cls.methods.map(fn => resolveFunction(fn, allTypeDecls, pureFns, fnParams, {
+        thisBinding: { name: "this", ty: thisType },
+        forcePure: false, // class methods are never pure (they access this)
+    }));
     return { name: cls.name, fields, methods };
 }
+/** Pre-compute Ty on all TypeDeclInfo fields/variants/aliases.
+ *  Called once per module so consumers can read field.type instead of re-parsing tsType. */
+function precomputeFieldTypes(typeDecls) {
+    for (const d of typeDecls) {
+        if (d.fields)
+            for (const f of d.fields)
+                f.type = parseTsType(f.tsType);
+        if (d.variants)
+            for (const v of d.variants)
+                for (const f of v.fields)
+                    f.type = parseTsType(f.tsType);
+        if (d.aliasOf && !d.aliasOfTy)
+            d.aliasOfTy = parseTsType(d.aliasOf);
+    }
+}
 export function resolveModule(raw) {
+    precomputeFieldTypes(raw.typeDecls);
     const pureFns = computePureFns(raw.functions);
     // Pre-compute function parameter types for optional coercion
     const fnParams = new Map();

package/tools/dist/specparser.js

@@ -129,6 +129,11 @@ class Parser {
     parseCmp() {
         const left = this.parseAdd();
         const t = this.peek();
+        // 'in' as infix membership operator (set/seq/map): x in S
+        if (t?.type === "ident" && t.value === "in") {
+            this.advance();
+            return { kind: "binop", op: "in", left, right: this.parseAdd() };
+        }
         if (t?.type === "op" && ["===", "!==", "==", "!=", ">=", "<=", ">", "<"].includes(t.value)) {
             this.advance();
             // Normalize == to ===, != to !== so downstream sees one spelling
@@ -252,8 +257,6 @@ class Parser {
                 let varType = "int";
                 if (this.match("punc", ":")) {
                     const ty = this.expect("ident").value;
-                    if (ty !== "nat" && ty !== "int")
-                        throw new Error(`Unknown type '${ty}'`);
                     varType = ty;
                 }
                 this.expect("punc", ",");