@elaraai/east 1.0.83 → 1.0.85

package/dist/src/codegen/canonical.js

@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
+ */
+/**
+ * IR up to what the cross-runtime contract lets two builders differ on — the
+ * erasure `east-c ir normalize` makes, made in TypeScript.
+ *
+ * @internal
+ */
+import { isVariant } from "../containers/variant.js";
+/**
+ * The canonical form of an IR value: loc_ids zeroed, variables and labels
+ * renamed in the order they are bound and met, recursive type ids renumbered,
+ * bigints as strings. Two IR values are the same program when their
+ * canonical forms are {@link canonicalEqual}.
+ *
+ * @param node - an IR value (a node, or any value holding nodes)
+ * @returns its canonical form: plain arrays, objects and leaves
+ *
+ * @remarks
+ * Variables are renamed per BINDING, resolved lexically — a parameter, a
+ * Let, a loop, match or catch variable each mint a canonical name for the
+ * body they scope — not per name: sibling bodies reuse a name (three
+ * callbacks each naming their element `x`), and two programs that bind the
+ * same variable under different names are the same program. A variable no
+ * binding in the value reaches is `free:<name>`.
+ *
+ * @internal
+ */
+export function canonicalIR(node) {
+    const labels = new Map();
+    const recursive = new Map();
+    let variables = 0;
+    const rename = (table, name, prefix) => {
+        let hit = table.get(name);
+        if (hit === undefined) {
+            hit = `${prefix}${table.size}`;
+            table.set(name, hit);
+        }
+        return hit;
+    };
+    /** Binds `variable` (a Variable node) in `scope`: its canonical name, minted in binding order. */
+    const bind = (variable, scope) => {
+        const name = `v${variables}`;
+        variables += 1;
+        scope.set(variable.value.name, name);
+        return variableNode(variable, name);
+    };
+    const variableNode = (v, name) => ["Variable", { type: walk(v.value.type, "type"), name, mutable: v.value.mutable, captured: v.value.captured }];
+    const lookup = (scopes, name) => {
+        for (let i = scopes.length - 1; i >= 0; i--) {
+            const hit = scopes[i].get(name);
+            if (hit !== undefined)
+                return hit;
+        }
+        return `free:${name}`;
+    };
+    // the scope chain is threaded through the walk: a body opens a scope, a Let extends the current one
+    let chain = [new Map()];
+    const inScope = (f) => {
+        chain = [...chain, new Map()];
+        try {
+            return f();
+        }
+        finally {
+            chain = chain.slice(0, -1);
+        }
+    };
+    const walk = (v, context) => {
+        if (v === null || v === undefined)
+            return null;
+        if (typeof v === "bigint")
+            return v.toString();
+        if (v instanceof Date)
+            return v.toISOString();
+        if (v instanceof Uint8Array)
+            return Array.from(v);
+        if (Array.isArray(v))
+            return v.map(x => walk(x, context));
+        if (isVariant(v)) {
+            const tag = v.type;
+            const p = v.value;
+            if (context === "type") {
+                if (tag === "Recursive") {
+                    const payload = v.value;
+                    if (payload.type === "ref")
+                        return ["Recursive", ["ref", rename(recursive, String(payload.value), "r")]];
+                    return ["Recursive", ["wrapper", { id: rename(recursive, String(payload.value.id), "r"), inner: walk(payload.value.inner, "type") }]];
+                }
+                return [tag, walk(v.value, context)];
+            }
+            switch (tag) {
+                case "Variable":
+                    return variableNode(v, lookup(chain, p.name));
+                case "Function":
+                case "AsyncFunction":
+                    return inScope(() => [tag, {
+                            type: walk(p.type, "type"),
+                            parameters: p.parameters.map(q => bind(q, chain[chain.length - 1])),
+                            body: walk(p.body, context),
+                            captures: walk(p.captures, context),
+                        }]);
+                case "Let": {
+                    const value = walk(p.value, context);
+                    return [tag, { type: walk(p.type, "type"), value, variable: bind(p.variable, chain[chain.length - 1]) }];
+                }
+                case "ForArray":
+                case "ForDict":
+                case "ForSet": {
+                    const source = tag === "ForArray" ? "array" : tag === "ForDict" ? "dict" : "set";
+                    const coll = walk(p[source], context);
+                    return inScope(() => {
+                        const scope = chain[chain.length - 1];
+                        const out = { type: walk(p.type, "type"), [source]: coll, label: { name: rename(labels, p.label.name, "L") } };
+                        if (tag !== "ForSet")
+                            out["value"] = bind(p.value, scope);
+                        out["key"] = bind(p.key, scope);
+                        out["body"] = walk(p.body, context);
+                        return [tag, out];
+                    });
+                }
+                case "Match": {
+                    const subject = walk(p.variant, context);
+                    const cases = p.cases.map(c => inScope(() => ({
+                        case: c.case, variable: bind(c.variable, chain[chain.length - 1]), body: walk(c.body, context),
+                    })));
+                    return [tag, { type: walk(p.type, "type"), variant: subject, cases }];
+                }
+                case "TryCatch": {
+                    const tryBody = inScope(() => walk(p.try_body, context));
+                    const caught = inScope(() => {
+                        const scope = chain[chain.length - 1];
+                        const message = bind(p.message, scope);
+                        const stack = bind(p.stack, scope);
+                        return { message, stack, catch_body: walk(p.catch_body, context) };
+                    });
+                    const finallyBody = inScope(() => walk(p.finally_body, context));
+                    return [tag, { type: walk(p.type, "type"), try_body: tryBody, ...caught, finally_body: finallyBody }];
+                }
+                case "Block":
+                    return inScope(() => [tag, { type: walk(p.type, "type"), statements: walk(p.statements, context) }]);
+                case "While":
+                    return [tag, { type: walk(p.type, "type"), predicate: walk(p.predicate, context), label: { name: rename(labels, p.label.name, "L") }, body: inScope(() => walk(p.body, context)) }];
+                case "IfElse":
+                    return [tag, {
+                            type: walk(p.type, "type"),
+                            ifs: p.ifs.map(branch => ({ predicate: walk(branch.predicate, context), body: inScope(() => walk(branch.body, context)) })),
+                            else_body: inScope(() => walk(p.else_body, context)),
+                        }];
+                default:
+                    return [tag, walk(v.value, context)];
+            }
+        }
+        if (typeof v === "object") {
+            const out = {};
+            for (const key of Object.keys(v).sort()) {
+                if (key === "loc_id") {
+                    out[key] = "0";
+                    continue;
+                }
+                if (key === "label" && typeof v[key] === "object" && v[key] !== null && "name" in v[key]) {
+                    out[key] = { name: rename(labels, v[key].name, "L") };
+                    continue;
+                }
+                out[key] = walk(v[key], key === "type" || key === "type_parameters" ? "type" : context);
+            }
+            return out;
+        }
+        return v;
+    };
+    return walk(node, null);
+}
+/**
+ * The first place two canonical forms differ, or `null` when they are the
+ * same: a leaf compares by `Object.is`, so -0.0 is not 0.0 and NaN is NaN.
+ *
+ * @param a - a canonical form ({@link canonicalIR})
+ * @param b - another
+ * @param path - where `a` and `b` sit, for the report
+ * @returns the path of the first difference and the two values there, or `null`
+ *
+ * @internal
+ */
+export function canonicalDifference(a, b, path = "ir") {
+    if (Object.is(a, b))
+        return null;
+    if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length !== b.length)
+            return `${path}.length: ${a.length} vs ${b.length}`;
+        for (let i = 0; i < a.length; i++) {
+            const d = canonicalDifference(a[i], b[i], `${path}[${i}]`);
+            if (d !== null)
+                return d;
+        }
+        return null;
+    }
+    if (a !== null && b !== null && typeof a === "object" && typeof b === "object" && !Array.isArray(a) && !Array.isArray(b)) {
+        for (const k of [...new Set([...Object.keys(a), ...Object.keys(b)])].sort()) {
+            const d = canonicalDifference(a[k], b[k], `${path}.${k}`);
+            if (d !== null)
+                return d;
+        }
+        return null;
+    }
+    return `${path}: ${String(a)} vs ${String(b)}`;
+}
+//# sourceMappingURL=canonical.js.map

package/dist/src/codegen/canonical.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical.js","sourceRoot":"","sources":["../../../src/codegen/canonical.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,WAAW,CAAC,IAAa;IACvC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,CAAC,KAA0B,EAAE,IAAY,EAAE,MAAc,EAAU,EAAE;QAClF,IAAI,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,GAAG,GAAG,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/B,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IACF,kGAAkG;IAClG,MAAM,IAAI,GAAG,CAAC,QAAa,EAAE,KAAY,EAAW,EAAE;QACpD,MAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC;QAC7B,SAAS,IAAI,CAAC,CAAC;QACf,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,OAAO,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,CAAM,EAAE,IAAY,EAAW,EAAE,CACrD,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjH,MAAM,MAAM,GAAG,CAAC,MAAe,EAAE,IAAY,EAAU,EAAE;QACvD,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,GAAG,KAAK,SAAS;gBAAE,OAAO,GAAG,CAAC;QACpC,CAAC;QACD,OAAO,QAAQ,IAAI,EAAE,CAAC;IACxB,CAAC,CAAC;IACF,oGAAoG;IACpG,IAAI,KAAK,GAAY,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,CAAI,CAAU,EAAK,EAAE;QACnC,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,CAAC,EAAE,CAAC;QACb,CAAC;gBAAS,CAAC;YACT,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,CAAM,EAAE,OAAsB,EAAW,EAAE;QACvD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC/C,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,YAAY,IAAI;YAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,IAAI,CAAC,YAAY,UAAU;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,CAAC,CAAC,IAAc,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YAClB,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBACvB,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;oBACxB,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC;oBACxB,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK;wBAAE,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;oBACzG,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBACxI,CAAC;gBACD,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;YACvC,CAAC;YACD,QAAQ,GAAG,EAAE,CAAC;gBACZ,KAAK,UAAU;oBACb,OAAO,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,KAAK,UAAU,CAAC;gBAChB,KAAK,eAAe;oBAClB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE;4BACzB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC;4BAC1B,UAAU,EAAG,CAAC,CAAC,UAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,CAAC;4BAC/E,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC;4BAC3B,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC;yBACpC,CAAC,CAAC,CAAC;gBACN,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC;gBAC5G,CAAC;gBACD,KAAK,UAAU,CAAC;gBAChB,KAAK,SAAS,CAAC;gBACf,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,MAAM,MAAM,GAAG,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;oBACjF,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;oBACtC,OAAO,OAAO,CAAC,GAAG,EAAE;wBAClB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;wBACvC,MAAM,GAAG,GAA4B,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;wBACxI,IAAI,GAAG,KAAK,QAAQ;4BAAE,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBAC1D,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;wBAChC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBACpC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBACzC,MAAM,KAAK,GAAI,CAAC,CAAC,KAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;wBACvD,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC;qBAChG,CAAC,CAAC,CAAC,CAAC;oBACL,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;gBACxE,CAAC;gBACD,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;oBACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;wBAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;wBACvC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;wBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBACnC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;oBACrE,CAAC,CAAC,CAAC;oBACH,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;oBACjE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;gBACxG,CAAC;gBACD,KAAK,OAAO;oBACV,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvG,KAAK,OAAO;oBACV,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtL,KAAK,QAAQ;oBACX,OAAO,CAAC,GAAG,EAAE;4BACX,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC;4BAC1B,GAAG,EAAG,CAAC,CAAC,GAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;4BACtI,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;yBACrD,CAAC,CAAC;gBACL;oBACE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,GAAG,GAA4B,EAAE,CAAC;YACxC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;gBACxC,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;oBAAC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBACnD,IAAI,GAAG,KAAK,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzF,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;oBACtD,SAAS;gBACX,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1F,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IACF,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,CAAM,EAAE,CAAM,EAAE,IAAI,GAAG,IAAI;IAC7D,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,GAAG,IAAI,YAAY,CAAC,CAAC,MAAM,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3D,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACzH,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5E,MAAM,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC"}

package/dist/src/codegen/codegen.spec.js

@@ -9,11 +9,12 @@
  * (loc_ids, canonical variable and label names, recursive type ids).
  *
  * Three legs: hand-written functions covering every node kind and spelling
- * family; every exported `*.examples.ts` example (`/tmp/east-examples-ir`,
- * `npm run export:examples`), which also executes and must compute its
- * declared `returns`; every compliance-corpus program (`/tmp/east-test-ir`,
- * `npm run test:export`). The two exported legs skip when the directories
- * are absent — the three-way sweep in east-py runs them under CI's
+ * family; every exported `*.examples.ts` example (`EAST_EXAMPLES_IR_DIR`,
+ * `make export-examples`), which also executes and must compute its declared
+ * `returns`; every compliance-corpus program (`EAST_TEST_IR_DIR`, `make
+ * test-export`). The root `paths.mk` sets both to this checkout's `tmp/`. The
+ * two exported legs skip when a variable is unset or nothing is exported
+ * there — the three-way sweep in east-py runs them under CI's
  * `EAST_CONFORMANCE_REQUIRED=1`.
  */
 import { describe, test, after } from "node:test";
@@ -22,7 +23,8 @@ import { existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync,
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { pathToFileURL } from "node:url";
-import { East, Expr, variant, ref, some, none, ArrayType, BlobType, DictType, FloatType, FunctionType, IntegerType, NullType, OptionType, RecursiveType, SetType, StringType, StructType, VariantType, VectorType, IRType, EastTypeType, fromJSONFor, equalFor, isVariant, isPlatformDeclaration, toSource, RAW_ONLY, } from "../index.js";
+import { East, Expr, variant, ref, some, none, SortedSet, SortedMap, compareFor, ArrayType, BlobType, BooleanType, DateTimeType, DictType, FloatType, FunctionType, IntegerType, NullType, OptionType, QueryCallType, RecursiveType, SetType, StringType, StructType, VariantType, VectorType, IRType, EastTypeType, fromJSONFor, equalFor, isVariant, isPlatformDeclaration, toSource, RAW_ONLY, } from "../index.js";
+import { canonicalIR as canonical, canonicalDifference as firstDifference } from "./canonical.js";
 // ── the harness ─────────────────────────────────────────────────────────────
 const INDEX_URL = new URL("../index.js", import.meta.url).href;
 const TMP = mkdtempSync(join(tmpdir(), "east-codegen-"));
@@ -38,186 +40,6 @@ async function rebuild(source) {
     const mod = await import(pathToFileURL(path).href);
     return mod.main;
 }
-/**
- * The normalized shape of an IR value: loc_ids zeroed, variables and labels
- * renamed in first-occurrence order, recursive type ids renumbered, bigints
- * as strings — what `east-c ir normalize` erases, erased here in TypeScript.
- *
- * Variables are renamed per BINDING, resolved lexically — a parameter, a
- * Let, a loop or match or catch variable each mint a canonical name for the
- * body they scope — not per name: since #639 sibling bodies reuse a name
- * (three callbacks each naming their element `x`), and two programs that
- * bind the same variable under different names (a printed module drops an
- * empty `.catch`, whose default variables the rebuild names afresh) are the
- * same program.
- */
-function canonical(node) {
-    const labels = new Map();
-    const recursive = new Map();
-    let variables = 0;
-    const rename = (table, name, prefix) => {
-        let hit = table.get(name);
-        if (hit === undefined) {
-            hit = `${prefix}${table.size}`;
-            table.set(name, hit);
-        }
-        return hit;
-    };
-    /** Binds `variable` (a Variable node) in `scope`: its canonical name, minted in binding order. */
-    const bind = (variable, scope) => {
-        const name = `v${variables}`;
-        variables += 1;
-        scope.set(variable.value.name, name);
-        return variableNode(variable, name);
-    };
-    const variableNode = (v, name) => ["Variable", { type: walk(v.value.type, "type", new Map()), name, mutable: v.value.mutable, captured: v.value.captured }];
-    const lookup = (scopes, name) => {
-        for (let i = scopes.length - 1; i >= 0; i--) {
-            const hit = scopes[i].get(name);
-            if (hit !== undefined)
-                return hit;
-        }
-        return `free:${name}`;
-    };
-    // the scope chain is threaded through the walk: a body opens a scope, a Let extends the current one
-    let chain = [new Map()];
-    const inScope = (f) => {
-        chain = [...chain, new Map()];
-        try {
-            return f();
-        }
-        finally {
-            chain = chain.slice(0, -1);
-        }
-    };
-    const walk = (v, context, _scope) => {
-        if (v === null || v === undefined)
-            return null;
-        if (typeof v === "bigint")
-            return v.toString();
-        if (v instanceof Date)
-            return v.toISOString();
-        if (v instanceof Uint8Array)
-            return Array.from(v);
-        if (Array.isArray(v))
-            return v.map(x => walk(x, context));
-        if (isVariant(v)) {
-            const tag = v.type;
-            const p = v.value;
-            if (context === "type") {
-                if (tag === "Recursive") {
-                    const payload = v.value;
-                    if (payload.type === "ref")
-                        return ["Recursive", ["ref", rename(recursive, String(payload.value), "r")]];
-                    return ["Recursive", ["wrapper", { id: rename(recursive, String(payload.value.id), "r"), inner: walk(payload.value.inner, "type") }]];
-                }
-                return [tag, walk(v.value, context)];
-            }
-            switch (tag) {
-                case "Variable":
-                    return variableNode(v, lookup(chain, p.name));
-                case "Function":
-                case "AsyncFunction":
-                    return inScope(() => [tag, {
-                            type: walk(p.type, "type"),
-                            parameters: p.parameters.map(q => bind(q, chain[chain.length - 1])),
-                            body: walk(p.body, context),
-                            captures: walk(p.captures, context),
-                        }]);
-                case "Let": {
-                    const value = walk(p.value, context);
-                    return [tag, { type: walk(p.type, "type"), value, variable: bind(p.variable, chain[chain.length - 1]) }];
-                }
-                case "ForArray":
-                case "ForDict":
-                case "ForSet": {
-                    const source = tag === "ForArray" ? "array" : tag === "ForDict" ? "dict" : "set";
-                    const coll = walk(p[source], context);
-                    return inScope(() => {
-                        const scope = chain[chain.length - 1];
-                        const out = { type: walk(p.type, "type"), [source]: coll, label: { name: rename(labels, p.label.name, "L") } };
-                        if (tag !== "ForSet")
-                            out["value"] = bind(p.value, scope);
-                        out["key"] = bind(p.key, scope);
-                        out["body"] = walk(p.body, context);
-                        return [tag, out];
-                    });
-                }
-                case "Match": {
-                    const variant = walk(p.variant, context);
-                    const cases = p.cases.map(c => inScope(() => ({
-                        case: c.case, variable: bind(c.variable, chain[chain.length - 1]), body: walk(c.body, context),
-                    })));
-                    return [tag, { type: walk(p.type, "type"), variant, cases }];
-                }
-                case "TryCatch": {
-                    const tryBody = inScope(() => walk(p.try_body, context));
-                    const caught = inScope(() => {
-                        const scope = chain[chain.length - 1];
-                        const message = bind(p.message, scope);
-                        const stack = bind(p.stack, scope);
-                        return { message, stack, catch_body: walk(p.catch_body, context) };
-                    });
-                    const finallyBody = inScope(() => walk(p.finally_body, context));
-                    return [tag, { type: walk(p.type, "type"), try_body: tryBody, ...caught, finally_body: finallyBody }];
-                }
-                case "Block":
-                    return inScope(() => [tag, { type: walk(p.type, "type"), statements: walk(p.statements, context) }]);
-                case "While":
-                    return [tag, { type: walk(p.type, "type"), predicate: walk(p.predicate, context), label: { name: rename(labels, p.label.name, "L") }, body: inScope(() => walk(p.body, context)) }];
-                case "IfElse":
-                    return [tag, {
-                            type: walk(p.type, "type"),
-                            ifs: p.ifs.map(branch => ({ predicate: walk(branch.predicate, context), body: inScope(() => walk(branch.body, context)) })),
-                            else_body: inScope(() => walk(p.else_body, context)),
-                        }];
-                default:
-                    return [tag, walk(v.value, context)];
-            }
-        }
-        if (typeof v === "object") {
-            const out = {};
-            for (const key of Object.keys(v).sort()) {
-                if (key === "loc_id") {
-                    out[key] = "0";
-                    continue;
-                }
-                if (key === "label" && typeof v[key] === "object" && "name" in v[key]) {
-                    out[key] = { name: rename(labels, v[key].name, "L") };
-                    continue;
-                }
-                out[key] = walk(v[key], key === "type" || key === "type_parameters" ? "type" : context);
-            }
-            return out;
-        }
-        return v;
-    };
-    return walk(node, null);
-}
-/** The first path at which two canonical forms differ, or `null`. */
-function firstDifference(a, b, path = "ir") {
-    if (Object.is(a, b))
-        return null;
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length)
-            return `${path}.length: ${a.length} vs ${b.length}`;
-        for (let i = 0; i < a.length; i++) {
-            const d = firstDifference(a[i], b[i], `${path}[${i}]`);
-            if (d !== null)
-                return d;
-        }
-        return null;
-    }
-    if (a !== null && b !== null && typeof a === "object" && typeof b === "object") {
-        for (const k of [...new Set([...Object.keys(a), ...Object.keys(b)])].sort()) {
-            const d = firstDifference(a[k], b[k], `${path}.${k}`);
-            if (d !== null)
-                return d;
-        }
-        return null;
-    }
-    return `${path}: ${String(a)} vs ${String(b)}`;
-}
 /** A host value for a message: bigints, Maps and Sets made printable. */
 function show(v) {
     return JSON.stringify(v, (_k, x) => typeof x === "bigint" ? `${x}n` : x instanceof Map ? [...x] : x instanceof Set ? [...x] : x);
@@ -595,6 +417,36 @@ describe("codegen: toSource round trips the builder surface", () => {
         const main = await roundTrip(fn, "regex+csv");
         assert.equal(main.toIR().compile([])("aab foo", [{ a: 1n }]), fn.toIR().compile([])("aab foo", [{ a: 1n }]));
     });
+    test("a regex JavaScript would re-spell prints raw, and rebuilds as it was", async () => {
+        // `new RegExp("").source` is `(?:)`, a `/` reads back `\/`, and flags come back in JavaScript's order
+        const fn = East.function([StringType], StringType, ($, s) => {
+            const empty = $.const(East.builtin("RegexContains", [], [s, "", ""], BooleanType));
+            const slash = $.const(East.builtin("RegexIndexOf", [], [s, "a/b", ""], IntegerType));
+            const order = $.const(East.builtin("RegexContains", [], [s, "x", "mi"], BooleanType));
+            return East.str `${empty} ${slash} ${order}`;
+        });
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.doesNotMatch(source, /new RegExp/, source);
+        const main = await roundTrip(fn, "regex re-spelled");
+        assert.equal(main.toIR().compile([])("xa/b"), fn.toIR().compile([])("xa/b"));
+    });
+    test("an option's none over a computed null, and a Float key of -0.0, print as they are and rebuild", async () => {
+        const Opt = OptionType(IntegerType);
+        const fn = East.function([Opt], IntegerType, ($, o) => {
+            // `none` spells the null literal only: a payload computed some other way stays
+            const same = $.const(o.match({ none: ($, n) => East.value(variant("none", n), Opt), some: ($, x) => East.value(some(x), Opt) }));
+            // JavaScript's Set and Map fold -0 into 0; East keeps -0.0 apart from 0.0
+            const zeros = $.const(new SortedSet([-0, 0, 1.5], compareFor(FloatType)), SetType(FloatType));
+            const keyed = $.const(new SortedMap([[-0, 1n], [0, 2n]], compareFor(FloatType)), DictType(FloatType, IntegerType));
+            return zeros.size().add(keyed.size()).add(same.match({ none: ($) => 0n, some: ($, x) => x }));
+        });
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.match(source, /variant\("none", n\)/, source);
+        assert.match(source, /new SortedSet\(\[-0, 0, 1\.5\], compareFor\(FloatType\)\)/, source);
+        assert.match(source, /new SortedMap\(\[\[-0, 1n\], \[0, 2n\]\], compareFor\(FloatType\)\)/, source);
+        const main = await roundTrip(fn, "none payload and -0.0 keys");
+        assert.equal(main.toIR().compile([])(some(4n)), 9n); // three floats, two keys, and the 4
+    });
     test("another builder's fresh names print as one v_N sequence, and the printed module prints to itself", async () => {
         const fn = East.function([ArrayType(IntegerType)], IntegerType, ($, xs) => xs.map(($, x) => x.multiply(2n)).reduce(($, acc, x) => acc.add(x), 0n));
         // python spells a slot the body did not name `__nN` (TypeScript: `_N`),
@@ -611,6 +463,24 @@ describe("codegen: toSource round trips the builder surface", () => {
         assert.equal(toSource(main.toIR().ir, { importFrom: INDEX_URL, width: Infinity }), wide, "print → build → print is the identity");
         assert.equal(toSource(main.toIR().ir, { importFrom: INDEX_URL }), toSource(ir, { importFrom: INDEX_URL }), "… at the default width too");
     });
+    test("a variable named as a name the module imports prints renamed, and rebuilds", async () => {
+        const fn = East.function([OptionType(IntegerType)], IntegerType, ($, o) => {
+            const fallback = $.const(East.value(none, OptionType(IntegerType)));
+            const n = $.const(o.match({ none: ($) => 0n, some: ($, x) => x }));
+            return n.add(fallback.match({ none: ($) => 1n, some: ($, x) => x }));
+        });
+        // the bindings named as the module's own imports (a translated query names a variable `none`)
+        const imported = (v) => Array.isArray(v) ? v.map(imported)
+            : isVariant(v) ? variant(v.type, imported(v.value))
+                : v !== null && typeof v === "object" && !(v instanceof Date) && !(v instanceof Uint8Array)
+                    ? Object.fromEntries(Object.entries(v).map(([k, x]) => [k, k === "name" && typeof x === "string" ? (x === "fallback" ? "none" : x === "n" ? "IntegerType" : x) : imported(x)]))
+                    : v;
+        const ir = imported(fn.toIR().ir);
+        const source = toSource(ir, { importFrom: INDEX_URL, width: Infinity });
+        assert.doesNotMatch(source, /const none = |const IntegerType = /, source);
+        const main = await roundTrip(ir, "import-named variables");
+        assert.equal(main.toIR().compile([])(some(4n)), 5n);
+    });
     test("layout: a wide literal, its type and an argument list break one entry per line, as prettier lays them out", async () => {
         const Ops = StructType({ add: FunctionType([IntegerType, IntegerType], IntegerType), multiply: FunctionType([IntegerType, IntegerType], IntegerType) });
         const fn = East.function([], IntegerType, ($) => {
@@ -689,6 +559,46 @@ describe("codegen: toSource round trips the builder surface", () => {
         const main = await roundTrip(fn, "layout hug+chain");
         assert.equal(main.toIR().compile([])([1n, 2n, 3n], "n"), fn.toIR().compile([])([1n, 2n, 3n], "n"));
     });
+    test("a query prints as the East.jq it was, with named inputs as an object, and rebuilds (#927, #1041)", async () => {
+        const Order = StructType({ id: IntegerType, total: FloatType });
+        const fn = East.function([ArrayType(Order)], ArrayType(IntegerType), ($, orders) => East.jq(orders, "[.[] | select(.total > 1000) | .id]", ArrayType(IntegerType)));
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.match(source, /\(\$, orders\) => East\.jq\(orders, "\[\.\[\] \| select\(\.total > 1000\) \| \.id\]", ArrayType\(IntegerType\)\)/, source);
+        assert.doesNotMatch(source, /east_jq|Query/, source);
+        const main = await roundTrip(fn, "jq one input");
+        assert.deepEqual(main.toIR().compile([])([{ id: 1n, total: 250.0 }, { id: 2n, total: 1200.0 }]), [2n]);
+        // Every named input is an argument of the call, one the query does not read too.
+        const named = East.function([ArrayType(Order), IntegerType, StringType], FloatType, ($, orders, min, note) => {
+            const total = $.const(East.jq({ orders, min, note }, ".min as $m | [.orders[] | select(.id >= $m) | .total] | add", FloatType));
+            return total.add(1.0);
+        });
+        const printed = toSource(named, { importFrom: INDEX_URL, width: Infinity });
+        assert.match(printed, /const total = \$\.const\(East\.jq\(\{ orders: orders, min: min, note: note \}, "[^"]*", FloatType\)\);/, printed);
+        await roundTrip(named, "jq named inputs");
+    });
+    test("a query's program prints as written: an ISO date compared with a DateTime stays the text it was (#1041)", async () => {
+        const Order = StructType({ id: IntegerType, at: DateTimeType });
+        const fn = East.function([ArrayType(Order)], ArrayType(IntegerType), ($, orders) => East.jq(orders, "[.[] | select(.at >= \"2026-01-01\") | .id]", ArrayType(IntegerType)));
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.match(source, /East\.jq\(orders, "\[\.\[\] \| select\(\.at >= \\"2026-01-01\\"\) \| \.id\]", ArrayType\(IntegerType\)\)/, source);
+        await roundTrip(fn, "jq as written");
+    });
+    test("a query inside a callback prints as East.jq there (#927)", async () => {
+        const fn = East.function([ArrayType(ArrayType(IntegerType))], ArrayType(IntegerType), ($, rows) => rows.map(($, row) => East.jq(row, "map(. * 2) | add", IntegerType)));
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.match(source, /rows\.map\(\(\$, row, _\d+\) => East\.jq\(row, "map\(\. \* 2\) \| add", IntegerType\)\)/, source);
+        const main = await roundTrip(fn, "jq in a callback");
+        assert.deepEqual(main.toIR().compile([])([[1n, 2n], [3n]]), [6n, 6n]);
+    });
+    test("a Query call whose query is not a constant prints raw, and rebuilds (#1041)", async () => {
+        const Numbers = ArrayType(IntegerType);
+        const F = FunctionType([Numbers], Numbers);
+        const fn = East.function([QueryCallType, Numbers], Numbers, ($, query, xs) => East.builtin("Query", [F], [query, East.function([Numbers], Numbers, ($, ys) => ys)], F)(xs));
+        const source = toSource(fn, { importFrom: INDEX_URL, width: Infinity });
+        assert.doesNotMatch(source, /East\.jq\(/, source);
+        assert.match(source, /East\.builtin\("Query"/, source);
+        await roundTrip(fn, "Query call of no constant");
+    });
     test("a raw builtin prints through East.builtin and rebuilds", async () => {
         const fn = East.function([ArrayType(IntegerType)], ArrayType(IntegerType), ($, xs) => {
             return xs.getKeys([0n, 1n]);
@@ -699,9 +609,20 @@ describe("codegen: toSource round trips the builder surface", () => {
     });
 });
 // ── the exported corpora ────────────────────────────────────────────────────
-const EXAMPLES_DIR = process.env["EAST_EXAMPLES_IR_DIR"] ?? "/tmp/east-examples-ir";
-const CORPUS_DIR = process.env["EAST_TEST_IR_DIR"] ?? "/tmp/east-test-ir";
 const REQUIRED = process.env["EAST_CONFORMANCE_REQUIRED"] === "1";
+/**
+ * Where an exported corpus is, from the variable the root `paths.mk` sets:
+ * its directory, or why the leg has nothing to read — the variable unset
+ * (the spec was not run through make) or nothing exported there.
+ */
+function corpusDir(variable, what) {
+    const dir = process.env[variable];
+    if (dir === undefined)
+        return { dir: null, skip: `${variable} is unset: run it through make (make -C libs/east test)` };
+    if (!existsSync(dir))
+        return { dir: null, skip: `no ${what} in ${dir}` };
+    return { dir, skip: false };
+}
 const decodeIR = fromJSONFor(IRType);
 const decodeType = fromJSONFor(EastTypeType);
 function hasPlatform(node) {
@@ -716,14 +637,13 @@ function hasPlatform(node) {
     return Object.keys(node).some(k => k !== "type" && k !== "type_parameters" && hasPlatform(node[k]));
 }
 describe("codegen: every exported example round trips and runs", () => {
-    const present = existsSync(EXAMPLES_DIR);
-    if (REQUIRED && !present)
-        throw new Error(`EAST_CONFORMANCE_REQUIRED=1 but no exported examples in ${EXAMPLES_DIR}`);
-    const files = present
-        ? readdirSync(EXAMPLES_DIR).flatMap(suite => readdirSync(join(EXAMPLES_DIR, suite)).filter(f => f.endsWith(".json")).map(f => join(EXAMPLES_DIR, suite, f)))
-        : [];
+    const examples = corpusDir("EAST_EXAMPLES_IR_DIR", "exported examples");
+    if (REQUIRED && examples.skip)
+        throw new Error(`EAST_CONFORMANCE_REQUIRED=1 but ${examples.skip}`);
+    const root = examples.dir;
+    const files = root === null ? [] : readdirSync(root).flatMap(suite => readdirSync(join(root, suite)).filter(f => f.endsWith(".json")).map(f => join(root, suite, f)));
     const rawSeen = new Set();
-    test(`round trip (${files.length} examples)`, { skip: !present && `no exported examples in ${EXAMPLES_DIR}` }, async () => {
+    test(`round trip (${files.length} examples)`, { skip: examples.skip }, async () => {
         const labelOf = (file) => `${file.split("/").at(-2)}/${file.split("/").at(-1).slice(0, -5)}`;
         await sweep(files, labelOf, async (file) => {
             const record = JSON.parse(readFileSync(file, "utf-8"));
@@ -748,14 +668,25 @@ describe("codegen: every exported example round trips and runs", () => {
     });
 });
 describe("codegen: every compliance-corpus program round trips", () => {
-    const present = existsSync(CORPUS_DIR);
-    if (REQUIRED && !present)
-        throw new Error(`EAST_CONFORMANCE_REQUIRED=1 but no exported IR corpus in ${CORPUS_DIR}`);
-    const files = present ? readdirSync(CORPUS_DIR).filter(f => f.endsWith(".json")).sort() : [];
-    test(`round trip (${files.length} programs)`, { skip: !present && `no exported IR corpus in ${CORPUS_DIR}` }, async () => {
+    const corpus = corpusDir("EAST_TEST_IR_DIR", "exported IR corpus");
+    if (REQUIRED && corpus.skip)
+        throw new Error(`EAST_CONFORMANCE_REQUIRED=1 but ${corpus.skip}`);
+    const root = corpus.dir;
+    // the top level, and every `query-*` suite directory beside it (#924, #987), as every runner reads them:
+    // their queries print as the East.jq that built them (#927)
+    const suites = root === null
+        ? []
+        : readdirSync(root, { withFileTypes: true }).filter(d => d.isDirectory() && d.name.startsWith("query-")).map(d => d.name).sort();
+    const files = root === null
+        ? []
+        : [
+            ...readdirSync(root).filter(f => f.endsWith(".json")).sort(),
+            ...suites.flatMap(dir => readdirSync(join(root, dir)).filter(f => f.endsWith(".json")).sort().map(f => join(dir, f))),
+        ];
+    test(`round trip (${files.length} programs)`, { skip: corpus.skip }, async () => {
         const labelOf = (file) => `corpus/${file.slice(0, -5)}`;
         await sweep(files, labelOf, async (file) => {
-            const record = JSON.parse(readFileSync(join(CORPUS_DIR, file), "utf-8"));
+            const record = JSON.parse(readFileSync(join(root, file), "utf-8"));
             await roundTrip(decodeIR(record.ir), labelOf(file));
         });
     });