@aster-cloud/aster-lang-ts 1.0.27 → 1.0.29

package/dist/test/unit/map-builtins.test.js

@@ -45,8 +45,23 @@ describe('Map null 键显式拒绝', () => {
 // 补漏前：keyFn 返回真 null 与返回字符串 "null" 会塌陷到同一个桶
 // （实测期望 2 组、实得 1 组，两个元素并进一个 bucket）——
 // 与 Map.put 的 null 键塌陷是**同一个 bug 的第二个入口**。
+//
+// ★同一个塌陷还有第三个入口：**变体键**。`String(obj)` 恒为 "[object Object]"，
+// 于是 `Some("null")` 与 `None` 并桶。见下方用例（aster-lang-ts#137）。
 describe('List.groupBy 的分组键同样走 mapKey', () => {
-    it('null 分组键被拒，而不是与字符串 "null" 静默合并', () => {
+    // ★Map.get 返回 Maybe（ADR 0035 档位 C）后，缺键得 `None` 而非裸 null，
+    //   故这里**不再**触发 null 键守卫。真正要锁的是：`Some("null")` 与 `None`
+    //   必须落进**两个**桶。
+    //
+    //   aster-lang-ts#137 统一 None 表示后实测暴露：TS 的 `String(obj)` 对任何
+    //   对象都得 `"[object Object]"`，两个变体键塌陷成 1 桶；truffle 的
+    //   `String.valueOf(map)` 渲染内容，得 2 桶——双引擎分叉且 TS 侧静默丢数据。
+    //
+    //   期望值取自 truffle 实测（同一份 IR、同一入参）：
+    //     Map.size(...) → 2
+    //     Map.keys(...) → [{__type=Some, value=null}, {__type=None}]
+    //   TS 侧现已逐字节一致。
+    it('★变体分组键按内容归一：Some("null") 与 None 不得并桶', () => {
         const c = compile(`Module probe.
 Rule keyOf given x as Text, produce Text:
   Let m be Map.put(Map.empty(), "x", "null").
@@ -56,9 +71,39 @@ Rule main given xs as List, produce Int:
   Return Map.size(List.groupBy(xs, keyOf)).
 `);
         assert.ok(c.core);
-        // 'x' → 字符串 "null"；'zzz' 缺键 → 真 null
+        // 'x' → Some("null")；'zzz' 缺键 → None
+        const ev = evaluate(c.core, 'main', { xs: ['x', 'zzz'] });
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        assert.equal(ev.value, 2, '★两个不同的变体键必须分成两桶（truffle 实测为 2）');
+    });
+    // 反向护栏：键**字符串**也必须与 truffle 逐字节一致，否则只是"桶数碰巧相同"，
+    // 跨引擎 Map.get 仍会查不到。分隔符 `, ` 与 truffle String.valueOf(Map) 对齐。
+    it('★变体键的字符串形式与 truffle 逐字节一致', () => {
+        const c = compile(`Module probe.
+Rule keyOf given x as Text, produce Text:
+  Let m be Map.put(Map.empty(), "x", "null").
+  Return Map.get(m, x).
+
+Rule main given xs as List, produce List:
+  Return Map.keys(List.groupBy(xs, keyOf)).
+`);
+        assert.ok(c.core);
         const ev = evaluate(c.core, 'main', { xs: ['x', 'zzz'] });
-        assert.equal(ev.success, false, '★null 分组键必须被拒，而不是静默并桶');
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        assert.deepEqual(ev.value, ['{__type=Some, value=null}', '{__type=None}']);
+    });
+    // null 键守卫本身不得被本次改动削弱：真 null 仍要响亮失败。
+    it('真 null 分组键仍被拒', () => {
+        const c = compile(`Module probe.
+Rule keyOf given x as Text, produce Text:
+  Return null.
+
+Rule main given xs as List, produce Int:
+  Return Map.size(List.groupBy(xs, keyOf)).
+`);
+        assert.ok(c.core);
+        const ev = evaluate(c.core, 'main', { xs: ['a', 'b'] });
+        assert.equal(ev.success, false, '★真 null 键必须被拒');
         assert.match(String(ev.error), /Map key must not be null/);
     });
     it('正常分组键不受影响', () => {
@@ -75,4 +120,119 @@ Rule main given xs as List, produce Int:
         assert.equal(ev.value, 2, 'a/b 两组');
     });
 });
+// ★四个变体标签逐一独立钉死 + 嵌套载荷递归归一。
+//
+// 交叉审查（false-green-hunter）实测发现：此前只有 `Some`/`None` 被"顺带"覆盖
+// ——因为唯一那条键测试恰好用了这两个。删掉 isVariantValue 里的 `Ok` 或 `Err`
+// 全部测试仍绿；把 mapKeyPart 的递归改成 String(v) 也全绿（嵌套变体键 2 桶塌成 1 桶）。
+//
+// map-type-guard.test.ts 里那个 ['Some','Ok','Err','None'] 四变体矩阵**不构成覆盖**：
+// 它测的是 asGuestMap 的类型守卫（`Map.size(Ok(1))` 要报错），根本不经过 mapKey。
+// 典型的「名字像、断言在别处」。
+//
+// 期望值全部取自 truffle 实测（同一份 core IR 喂 CoreIrEvalCli）：
+//   [{__type=Some, value=null}, {__type=Some, value={__type=Some, value=1}},
+//    {__type=Ok, value=1}, {__type=Err, value=1}]
+describe('变体作 Map 键：四标签 × 嵌套载荷', () => {
+    const keysOf = (body) => {
+        const c = compile(`Module probe.\nRule main produce List:\n${body}  Return Map.keys(m).\n`);
+        assert.ok(c.core, `compile 失败: ${JSON.stringify(c.parseErrors ?? [])}`);
+        const ev = evaluate(c.core, 'main', {});
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        return ev.value;
+    };
+    it('★Ok / Err 各自成键（删掉任一标签此前都不会变红）', () => {
+        const keys = keysOf('  Let m be Map.put(Map.put(Map.empty(), Ok(1), "a"), Err(1), "b").\n');
+        assert.deepEqual(keys, ['{__type=Ok, value=1}', '{__type=Err, value=1}']);
+    });
+    it('★Some / None 各自成键', () => {
+        const keys = keysOf('  Let m be Map.put(Map.put(Map.empty(), Some(1), "a"), none, "b").\n');
+        assert.deepEqual(keys, ['{__type=Some, value=1}', '{__type=None}']);
+    });
+    it('★嵌套载荷递归归一：Some(Some(1)) 与 Some(Some(2)) 不得并桶', () => {
+        const keys = keysOf('  Let m be Map.put(Map.put(Map.empty(), Some(Some(1)), "a"), Some(Some(2)), "b").\n');
+        assert.deepEqual(keys, [
+            '{__type=Some, value={__type=Some, value=1}}',
+            '{__type=Some, value={__type=Some, value=2}}',
+        ]);
+    });
+    it('★嵌套 Some(None) 与 Some(Some(1)) 不得并桶', () => {
+        const keys = keysOf('  Let m be Map.put(Map.put(Map.empty(), Some(none), "a"), Some(Some(1)), "b").\n');
+        assert.deepEqual(keys, [
+            '{__type=Some, value={__type=None}}',
+            '{__type=Some, value={__type=Some, value=1}}',
+        ]);
+    });
+});
+// ★接受侧收紧：裸 null 不再被当作 None。
+//
+// 交叉审查发现这部分**零净覆盖**——把两处放行原样加回（即完整回退到修复前形态）
+// 测试仍全绿。原因是 maybe-isnone-semantics / maybe-map-type-guard 里那两条
+// 「两种 None 表示」用例，在 None 统一表示后两种形态求值成同一个东西，
+// 断言退化成重复断言，而**真正的裸 null**从未被喂进去过。
+//
+// 期望值依据：truffle 的 `"None".equals(m.get("__type"))` 对 null 返回 false，
+// `Maybe.map` 要求带标签的 map、对裸 null 直接抛错。
+describe('接受侧：裸 null 不是 None（与 truffle 对齐）', () => {
+    const run = (body) => {
+        const c = compile(`Module probe.\n${body}`);
+        assert.ok(c.core, `compile 失败: ${JSON.stringify(c.parseErrors ?? [])}`);
+        return evaluate(c.core, 'main', {});
+    };
+    it('★Maybe.isNone(null) 为 false（回退放行则变 true）', () => {
+        const ev = run('Rule main produce Bool:\n  Return Maybe.isNone(null).\n');
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        assert.equal(ev.value, false, '裸 null 不是 None——truffle 侧同样返回 false');
+    });
+    it('★Option.isNone(null) 同样为 false（与 Maybe.isNone 共用实现）', () => {
+        const ev = run('Rule main produce Bool:\n  Return Option.isNone(null).\n');
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        assert.equal(ev.value, false);
+    });
+    it('★Maybe.map(null, f) 响亮报错，而非静默返回 None', () => {
+        // 回退放行后：静默得 None，再被 withDefault 兜成 9——一个看起来完全合理的
+        // 决策值，正是本仓最危险的"静默错答案"。
+        const ev = run('Rule inc given x, produce:\n  Return x plus 1.\n\n'
+            + 'Rule main produce Int:\n  Return Maybe.withDefault(Maybe.map(null, inc), 9).\n');
+        assert.equal(ev.success, false, `必须报错，实际得 value=${JSON.stringify(ev.value)}`);
+        assert.match(String(ev.error), /expected Maybe \(Some or None\)/);
+    });
+    it('反向护栏：真正的 None 仍被 isNone/map 正确接受', () => {
+        // 没有这条，把 isNone 写成"恒 false"、map 写成"恒报错"也能让上面全绿。
+        const a = run('Rule main produce Bool:\n  Return Maybe.isNone(none).\n');
+        assert.equal(a.value, true, 'None() 必须被认作 None');
+        const b = run('Rule inc given x, produce:\n  Return x plus 1.\n\n'
+            + 'Rule main produce Int:\n  Return Maybe.withDefault(Maybe.map(Some(1), inc), 9).\n');
+        assert.equal(b.success, true, String(b.error ?? ''));
+        assert.equal(b.value, 2, 'Some(1) 经 inc 应得 Some(2)，withDefault 取出 2');
+    });
+});
+// ★`None()` 零参**调用形式**——与 evalExpr 的 `case 'None'` 是两条独立代码路径。
+// 交叉审查实测：把 evalCall 这处改回 null，全部测试仍绿（另一处则会红 7 条）。
+// commit 自称"产出侧三处统一"，这是其中唯一没被测到的一处。
+//
+// ★注意：`None()` **不是合法的 CNL 表层语法**（实测报 `Expected '.' at end of
+// statement`），故只能直接构造 Core IR 来覆盖。这条路径并非死代码——本仓是 IR 的
+// **生产者**，宿主或其它前端可以直接投喂 `Call{Name 'None', []}`；若它返回裸 null，
+// 正是本次要消灭的那条分叉，且不会被任何表层语法测试发现。
+describe('None() 调用形式与 None 字面量表示一致（IR 级）', () => {
+    it('★Call{None, []} 求值为 {__type:"None"}', () => {
+        // 先编译一份 `Return none.`，再把 Return 的表达式换成**调用形式**
+        // ——这样 Module/Func/Block 的其余结构完全取自真实编译器产物，
+        // 不必手写（手写易与真实 IR 形状漂移，且漂移后测试会以"编译失败"的
+        // 方式假红/假绿，掩盖真正要测的东西）。
+        const c = compile('Module probe.\nRule main produce:\n  Return none.\n');
+        assert.ok(c.core, 'fixture 编译应成功');
+        const core = JSON.parse(JSON.stringify(c.core));
+        core.decls[0].body.statements[0].expr = {
+            kind: 'Call',
+            target: { kind: 'Name', name: 'None' },
+            args: [],
+        };
+        const ev = evaluate(core, 'main', {});
+        assert.equal(ev.success, true, String(ev.error ?? ''));
+        assert.deepEqual(ev.value, { __type: 'None' });
+        assert.notEqual(ev.value, null, 'None() 调用形式不得退化为裸 null');
+    });
+});
 //# sourceMappingURL=map-builtins.test.js.map

package/dist/test/unit/map-builtins.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-builtins.test.js","sourceRoot":"","sources":["../../../test/unit/map-builtins.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map-builtins.test.js","sourceRoot":"","sources":["../../../test/unit/map-builtins.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/map-structural-equality.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=map-structural-equality.test.d.ts.map

package/dist/test/unit/map-structural-equality.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"map-structural-equality.test.d.ts","sourceRoot":"","sources":["../../../test/unit/map-structural-equality.test.ts"],"names":[],"mappings":""}

package/dist/test/unit/map-structural-equality.test.js

@@ -0,0 +1,64 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { compile } from '../../src/browser.js';
+import { evaluate } from '../../src/core/interpreter.js';
+/**
+ * Map 结构相等（issue aster-lang-ts#143）。
+ *
+ * ★真实缺陷：`valueEquals` 的结构比较分支显式带 `&& !(x instanceof Map)`，
+ * 把 Map **排除**在外，GuestMap 落回引用相等：
+ *
+ *     Map.put(Map.empty(),"a",1) == Map.put(Map.empty(),"a",1)   →  false
+ *     [1, 2] == [1, 2]                                           →  true
+ *
+ * 即 **TS 自身就不自洽**（同样"内容相同"，换个载体结论相反）；而 truffle 的
+ * valueEquals 对映射逐键递归 → 同一条规则 TS 判 false、JVM 判 true，
+ * **跨引擎决策翻转且不报错**。
+ *
+ * 修法镜像 truffle `Builtins.valueEquals`：先比 size，再逐键递归；
+ * 一侧是 Map 另一侧不是 → false。
+ */
+function run(body) {
+    const c = compile(`Module probe.\n${body}\n`);
+    assert.ok(c.core, `compile: ${JSON.stringify(c.parseErrors ?? [])}`);
+    const ev = evaluate(c.core, 'main', { seed: 0 });
+    assert.ok(ev.success, `eval: ${ev.error ?? ''}`);
+    return ev.value;
+}
+const M = (k, v) => `Map.put(Map.empty(), "${k}", ${v})`;
+describe('Map 参与结构相等（与 JVM 对齐）', () => {
+    it('★内容相同的两个 map 相等（此前 false）', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Return ${M('a', '1')} equals to ${M('a', '1')}.`), true);
+    });
+    it('★与列表行为自洽：同样"内容相同"不应因载体不同而结论相反', () => {
+        // 这条钉的是**内部一致性**——原缺陷最刺眼之处正是 list 判 true、map 判 false。
+        assert.equal(run('Rule main produce Bool:\n  Return [1, 2] equals to [1, 2].'), true);
+        assert.equal(run(`Rule main produce Bool:\n  Return ${M('a', '1')} equals to ${M('a', '1')}.`), true);
+    });
+    it('值不同 → 不等', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Return ${M('a', '1')} equals to ${M('a', '2')}.`), false);
+    });
+    it('键不同 → 不等', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Return ${M('a', '1')} equals to ${M('b', '1')}.`), false);
+    });
+    it('★size 不同 → 不等（先比 size，镜像 truffle）', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Let a be Map.put(${M('a', '1')}, "b", 2).\n  Return a equals to ${M('a', '1')}.`), false);
+    });
+    it('空 map 相等', () => {
+        assert.equal(run('Rule main produce Bool:\n  Return Map.empty() equals to Map.empty().'), true);
+    });
+    it('★嵌套 map 逐层递归', () => {
+        const inner = M('x', '1');
+        assert.equal(run(`Rule main produce Bool:\n  Return Map.put(Map.empty(), "k", ${inner}) equals to Map.put(Map.empty(), "k", ${inner}).`), true);
+    });
+    it('★一侧 Map 一侧 List → false（载体不同即不等）', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Return ${M('a', '1')} equals to [1].`), false);
+    });
+    it('★List.contains 含 map 元素时也随之修正', () => {
+        assert.equal(run(`Rule main produce Bool:\n  Return List.contains([${M('a', '1')}], ${M('a', '1')}).`), true);
+    });
+    it('★List.distinct 含 map 元素时能真正去重', () => {
+        assert.equal(run(`Rule main produce Int:\n  Return List.length(List.distinct([${M('a', '1')}, ${M('a', '1')}])).`), 1);
+    });
+});
+//# sourceMappingURL=map-structural-equality.test.js.map

package/dist/test/unit/map-structural-equality.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"map-structural-equality.test.js","sourceRoot":"","sources":["../../../test/unit/map-structural-equality.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/map-type-guard.test.js

@@ -67,7 +67,10 @@ describe('Map.* 首参类型守卫', () => {
     });
     it('文本 / null / 数组等其它类型同样被拒', () => {
         assert.equal(run('Map.size("abc")').error, 'Map.size: expected Map, got string');
-        assert.equal(run('Map.size(None)').error, 'Map.size: expected Map, got object');
+        // None 的运行期表示是 `{__type:'None'}`（aster-lang-ts#137），故类型名报 `None`
+        // ——与 truffle 的 typeName()（读 __type 标签）一致。此前是裸 null，被更前面的
+        // null 分支拦下报 `got object`，那正是被修掉的分叉。
+        assert.equal(run('Map.size(None)').error, 'Map.size: expected Map, got None');
         // 数组不是 Map：truffle 侧 java.util.List 既非 AsterMapValue 也非 Map，同样抛错。
         // 此前 `Map.size(List.range(0,2))` 会返回 2——把列表当成 Map 用。
         assert.equal(run('Map.size(List.range(0, 2))').error, 'Map.size: expected Map, got List');
@@ -91,14 +94,14 @@ describe('Map.* 首参类型守卫', () => {
     // 二维矩阵实测（6 个 Map.* × 6 种输入 = 36 格）：修复前 None 那 6 格两引擎分叉、
     // Some/Ok/Err 那 18 格两引擎"一致地错"；修复后 36 格逐格一致。
     it('Maybe/Result 变体被 Map.* 拒绝（Some/None/Ok/Err）', () => {
-        // 注：`None` 在本引擎的运行期表示是裸 `null`（不是带 __type 的对象），
-        // 故它被更前面的 null 分支拦下、报 `got object` 而非 `got None`。
-        // 两条路径都拒绝，只是消息里的类型名不同——这里如实断言各自的实际消息。
+        // ★四个变体现在走**同一条**路径：都是带 `__type` 的对象，类型名即标签值
+        // （aster-lang-ts#137 起 None 也是 `{__type:'None'}`）。与 truffle 的
+        // typeName()（`m.get("__type")` 命中即返回标签）逐格一致。
         for (const [arg, want] of [
             ['Some(1)', 'Some'],
             ['Ok(1)', 'Ok'],
             ['Err(1)', 'Err'],
-            ['None', 'object'],
+            ['None', 'None'],
         ]) {
             const r = run(`Map.size(${arg})`);
             assert.equal(r.ok, false, `${arg} 应被拒绝，实际返回 ${JSON.stringify(r.value)}`);

package/dist/test/unit/map-type-guard.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-type-guard.test.js","sourceRoot":"","sources":["../../../test/unit/map-type-guard.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map-type-guard.test.js","sourceRoot":"","sources":["../../../test/unit/map-type-guard.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/mapping/candidate-generator.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=candidate-generator.test.d.ts.map

package/dist/test/unit/mapping/candidate-generator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-generator.test.d.ts","sourceRoot":"","sources":["../../../../test/unit/mapping/candidate-generator.test.ts"],"names":[],"mappings":""}

package/dist/test/unit/mapping/candidate-generator.test.js

@@ -0,0 +1,177 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync, readdirSync } from 'node:fs';
+import path from 'node:path';
+import { CORPUS_ROOT } from '@aster-cloud/aster-lang-test';
+import { canonicalize } from '../../../src/frontend/canonicalizer.js';
+import { lex } from '../../../src/frontend/lexer.js';
+import { parse } from '../../../src/parser.js';
+import { lowerModule } from '../../../src/lower_to_core.js';
+import { computeNodeIds } from '../../../src/nodeid/node-id-map.js';
+import { generateCandidates, collectLiteralNodes } from '../../../src/mapping/candidate-generator.js';
+import { verifyMapping } from '../../../src/mapping/mapping-ir.js';
+/**
+ * 确定性候选映射生成器（ADR 0037 §3/§7）。
+ *
+ * <p>核心主张：对 `.aster` 源码，「哪段文本对应哪个 IR 节点」**不需要 AI**——
+ * `origin` 就是答案。本测试用全语料闭环证明这一点。
+ */
+// ★必须走 CORPUS_ROOT（包导出的路径），不能写绝对路径——CI 的 checkout
+//   目录与本机不同，硬编码路径会让 readdirSync 抛错或返回空，测试在 0.4ms
+//   内「通过」而实际一个样本都没跑（本 PR 的 CI 就是这样红的）。
+const CORPUS = path.join(CORPUS_ROOT, 'tier1-equivalence/policies');
+const irOf = (src) => JSON.parse(JSON.stringify(lowerModule(parse(lex(canonicalize(src))).ast)));
+const POLICY = [
+    'Module demo.approve.', '',
+    'Rule approve given amount, produce:',
+    '  If amount greater than 10000:',
+    '    Return "REFER".', '',
+].join('\n');
+describe('确定性候选生成器', () => {
+    it('★候选的 text 必须逐字节等于源码切片（不是重新渲染出来的）', () => {
+        const { candidates, skipped } = generateCandidates(POLICY, collectLiteralNodes(irOf(POLICY)));
+        assert.strictEqual(skipped.length, 0, `不应有跳过，实际：${JSON.stringify(skipped)}`);
+        assert.ok(candidates.length > 0, '应生成候选。');
+        for (const c of candidates) {
+            assert.strictEqual(c.text, POLICY.slice(c.span.start, c.span.end), `候选 text 与 span 切片不符 —— 说明 text 不是从源码切出来的。nodeId=${c.nodeId}`);
+        }
+    });
+    it('★候选的 nodeId 必须与 NodeIdMap 一致（否则 verifier 查不到节点）', () => {
+        const ir = irOf(POLICY);
+        const ids = computeNodeIds(ir);
+        const { candidates } = generateCandidates(POLICY, collectLiteralNodes(ir));
+        for (const c of candidates) {
+            assert.ok(ids.has(c.nodeId), `候选的 nodeId 不在 NodeIdMap 里：${c.nodeId}`
+                + '\n★两处的路径构造规则必须逐字一致，否则生成的候选无法被 verifier 解析。');
+        }
+    });
+    it('★`_` 是占位符不是名字：多条裸表达式语句不得塌成同一个 nodeId', () => {
+        // 裸表达式语句一律降为 `Let "_" be expr`。若拿 `_` 当路径段，同一函数体里
+        // 的多条会全部变成 `statements{_}` —— nodeId 撞车，Map 只留最后一条，
+        // 其余节点的身份**静默消失**。实测曾在 1 个样本上丢 4 个节点。
+        const src = [
+            'Module m.', '',
+            'Rule f, produce. It performs io:',
+            '  Io.write("a").',
+            '  Io.write("b").',
+            '  Return 1.', '',
+        ].join('\n');
+        const ir = irOf(src);
+        const ids = computeNodeIds(ir);
+        let realNodes = 0;
+        (function walk(x) {
+            if (x !== null && typeof x === 'object') {
+                if (typeof x.kind === 'string')
+                    realNodes++;
+                Object.values(x).forEach(walk);
+            }
+        })(ir);
+        assert.strictEqual(ids.size, realNodes, `nodeId 数(${ids.size}) 少于真实节点数(${realNodes}) —— 存在身份碰撞，`
+            + '有节点的身份被静默覆盖了。');
+        // 且两条 Io.write 的字符串字面量必须是**不同**的候选
+        const { candidates } = generateCandidates(src, collectLiteralNodes(ir));
+        const texts = candidates.map(c => c.text);
+        assert.ok(texts.includes('"a"') && texts.includes('"b"'), `两条裸表达式的字面量都应生成候选，实际：${JSON.stringify(texts)}`);
+    });
+    it('★越界 / 零宽 origin 必须跳过并报告，不得编造候选', () => {
+        const r = generateCandidates('short', [
+            { nodeId: '$.oob', kind: 'Int', origin: { start: { line: 99, col: 1 }, end: { line: 99, col: 5 } } },
+            { nodeId: '$.zero', kind: 'Int', origin: { start: { line: 1, col: 3 }, end: { line: 1, col: 3 } } },
+        ]);
+        assert.strictEqual(r.candidates.length, 0, '不应为非法 origin 编造候选。');
+        assert.strictEqual(r.skipped.length, 2, '两个非法节点都必须被报告。');
+        // ★必须**报告**而非静默丢弃：静默跳过会让调用方以为「全都生成了」。
+        assert.ok(r.skipped.every(s => s.why.length > 0), '每条跳过都要说明原因。');
+        // ★断言**跳过的原因**，不只是跳过的条数。
+        //   变异验证发现：零宽区间若不被 `end <= start` 拦下，也会被后面的
+        //   「切片为空白」兜住——**两层防御恰好重叠**，只数条数根本测不出
+        //   是哪一层在起作用，`end <= start` 那道门因此结构上无法变红。
+        const zeroWidth = r.skipped.find(s => s.nodeId === '$.zero');
+        assert.match(zeroWidth?.why ?? '', /零宽/, `零宽区间应由区间检查拦下（而非被「切片为空白」兜住）。实际：${zeroWidth?.why}`);
+        const outOfBounds = r.skipped.find(s => s.nodeId === '$.oob');
+        assert.match(outOfBounds?.why ?? '', /超出源码范围/, `实际：${outOfBounds?.why}`);
+    });
+    it('★全语料闭环：生成的候选必须能被 verifier 判定，且零 REJECTED', () => {
+        // 这是本模块的核心主张：机械生成 + 机械验证 = 零误差闭环。
+        // 若出现 REJECTED，说明生成器切错了位置（候选文本与节点值对不上）。
+        let generated = 0, skipped = 0, verified = 0, rejected = 0, review = 0;
+        const rejectSamples = [];
+        for (const f of readdirSync(CORPUS).filter(x => x.endsWith('.aster'))) {
+            const src = readFileSync(`${CORPUS}/${f}`, 'utf8');
+            let ir;
+            try {
+                ir = irOf(src);
+            }
+            catch {
+                continue;
+            }
+            const nodes = collectLiteralNodes(ir);
+            const r = generateCandidates(src, nodes);
+            generated += r.candidates.length;
+            skipped += r.skipped.length;
+            // 用 NodeIdMap 的 kind + 原 IR 的 value 做解析
+            const byId = new Map(nodes.map(n => [n.nodeId, n]));
+            const values = valueIndex(ir);
+            for (const c of r.candidates) {
+                const node = byId.get(c.nodeId);
+                const val = values.get(c.nodeId);
+                if (!node || val === undefined)
+                    continue;
+                const v = verifyMapping(c, () => (val.value === undefined ? { kind: val.kind } : { kind: val.kind, value: val.value }));
+                if (v.verdict === 'VERIFIED')
+                    verified++;
+                else if (v.verdict === 'REVIEW_REQUIRED')
+                    review++;
+                else {
+                    rejected++;
+                    if (rejectSamples.length < 3)
+                        rejectSamples.push(`${c.text} → ${v.reason}`);
+                }
+            }
+        }
+        // ★阈值按「每个样本至少产出若干候选」来定，不写死绝对数字：
+        //   node_modules 里的语料是**已发布版本**（213 个样本），工作树是 223 —— 两者
+        //   会随发版节奏漂移。写死 1000 这类数字会在语料增删时无故变红/变绿。
+        const samples = readdirSync(CORPUS).filter(x => x.endsWith('.aster')).length;
+        assert.ok(samples > 100, `语料样本数异常（${samples}）—— 路径可能指错了。`);
+        assert.ok(generated > samples * 2, `应在全语料上生成大量候选：${samples} 个样本只产出 ${generated} 条。`);
+        assert.strictEqual(skipped, 0, '全语料上不应有跳过（若有，说明 origin 有缺口）。');
+        assert.strictEqual(rejected, 0, `机械生成的候选不应被证伪（${rejected} 条 REJECTED）——说明切片位置错了。`
+            + `\n样例：${rejectSamples.join(' | ')}`);
+        assert.ok(verified > generated * 0.9, `绝大多数候选应可被机械证明，实际 ${verified}/${generated}（REVIEW_REQUIRED ${review}）。`);
+    });
+});
+/** nodeId → {kind, value}，路径规则与生成器逐字一致。 */
+function valueIndex(ir) {
+    const out = new Map();
+    (function walk(node, path) {
+        if (node === null || typeof node !== 'object' || Array.isArray(node))
+            return;
+        const obj = node;
+        if (typeof obj.kind === 'string' && 'value' in obj) {
+            out.set(path, { kind: obj.kind, value: obj.value });
+        }
+        for (const [field, value] of Object.entries(obj)) {
+            if (field === 'origin')
+                continue;
+            if (Array.isArray(value)) {
+                value.forEach((el, i) => walk(el, `${path}.${field}${seg(el, i)}`));
+            }
+            else {
+                walk(value, `${path}.${field}`);
+            }
+        }
+    })(ir, '$');
+    return out;
+}
+function seg(el, i) {
+    if (el !== null && typeof el === 'object' && !Array.isArray(el)) {
+        const e = el;
+        if (typeof e.name === 'string' && e.name !== '_')
+            return `{${e.name}}`;
+        if (typeof e.path === 'string')
+            return `{${e.path}}`;
+    }
+    return `[${i}]`;
+}
+//# sourceMappingURL=candidate-generator.test.js.map

package/dist/test/unit/mapping/candidate-generator.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate-generator.test.js","sourceRoot":"","sources":["../../../../test/unit/mapping/candidate-generator.test.ts"],"names":[],"mappings":"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"}

package/dist/test/unit/mapping/entity-proposer.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=entity-proposer.test.d.ts.map

package/dist/test/unit/mapping/entity-proposer.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-proposer.test.d.ts","sourceRoot":"","sources":["../../../../test/unit/mapping/entity-proposer.test.ts"],"names":[],"mappings":""}