@aster-cloud/aster-lang-ts 1.1.0 → 1.2.1

package/dist/test/unit/diagnostics/diagnostic-overlays.test.js

@@ -0,0 +1,156 @@
+/**
+ * 诊断译文 overlay 接入（aster-cloud/aster-lang-locales#107）。
+ *
+ * 英文基准是 shared/error_codes.json；各语言的 message/help 译文唯一来源是语言包 overlay
+ * （aster-lang-locales 的 zh/de、aster-lang-hi 的 hi），经 core exportLexicons 进入
+ * lexicons.json，再由 scripts/generate-diagnostic-overlays.ts 生成
+ * src/config/lexicons/diagnostic-overlays.generated.ts。本文件校验：
+ * - 生成表经 registerOverlayDiagnostic* 注册，且每个语言覆盖全部错误码、占位符与英文一致；
+ * - 生成脚本的渲染规则（确定性、只收诊断 overlay、拒绝畸形输入）；
+ * - localizeDiagnostics 与浏览器入口 compile / compileAndTypecheck 输出本地化诊断。
+ */
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { compile, compileAndTypecheck, DE_DE, EN_US, ZH_CN } from '../../../src/browser.js';
+import { HI_IN } from '../../../src/config/lexicons/hi-IN.js';
+import { DIAGNOSTIC_OVERLAYS } from '../../../src/config/lexicons/diagnostic-overlays.generated.js';
+import { HELP_BY_LEXICON, MESSAGES_BY_LEXICON } from '../../../src/config/lexicons/diagnostic-messages.js';
+import { localizeDiagnostics } from '../../../src/typecheck/diagnostics.js';
+import { renderDiagnosticOverlays } from '../../../scripts/generate-diagnostic-overlays.js';
+const TABLE = Object.values(JSON.parse(readFileSync(resolve(process.cwd(), 'shared', 'error_codes.json'), 'utf8')));
+const LOCALIZED = ['de-DE', 'hi-IN', 'zh-CN'];
+function placeholders(text) {
+    return [...new Set([...text.matchAll(/\{(\w+)\}/g)].map((m) => m[1]))].sort();
+}
+function coverageProblems(texts, pick) {
+    if (!texts)
+        return ['未注册'];
+    const problems = [];
+    for (const spec of TABLE) {
+        const text = texts[spec.code];
+        if (!text || text.trim() === '') {
+            problems.push(`${spec.code}: 缺少译文`);
+        }
+        else if (placeholders(text).join() !== placeholders(pick(spec)).join()) {
+            problems.push(`${spec.code}: 占位符 ${placeholders(text)} 与英文 ${placeholders(pick(spec))} 不一致`);
+        }
+    }
+    const codes = new Set(TABLE.map((s) => s.code));
+    for (const code of Object.keys(texts))
+        if (!codes.has(code))
+            problems.push(`${code}: 码表中不存在`);
+    return problems;
+}
+describe('诊断译文 overlay：生成表与注册', () => {
+    it('生成表恰好包含 de-DE、hi-IN、zh-CN，且全部注册到 MESSAGES/HELP_BY_LEXICON', () => {
+        assert.deepEqual(Object.keys(DIAGNOSTIC_OVERLAYS).sort(), [...LOCALIZED]);
+        for (const id of LOCALIZED) {
+            assert.deepEqual(MESSAGES_BY_LEXICON[id], DIAGNOSTIC_OVERLAYS[id]?.diagnosticMessages?.messages, `${id} messages`);
+            assert.deepEqual(HELP_BY_LEXICON[id], DIAGNOSTIC_OVERLAYS[id]?.diagnosticHelp?.help, `${id} help`);
+        }
+        assert.equal(MESSAGES_BY_LEXICON['en-US'], undefined, 'en-US 使用码表英文，不注册 overlay');
+    });
+    for (const id of LOCALIZED) {
+        it(`${id}：message 覆盖全部 ${TABLE.length} 个错误码且占位符与英文一致`, () => {
+            assert.deepEqual(coverageProblems(MESSAGES_BY_LEXICON[id], (s) => s.message), []);
+        });
+        it(`${id}：help 覆盖全部错误码且占位符与英文一致`, () => {
+            assert.deepEqual(coverageProblems(HELP_BY_LEXICON[id], (s) => s.help), []);
+        });
+    }
+});
+describe('generate-diagnostic-overlays 渲染', () => {
+    const lexiconsJson = {
+        lexicons: {
+            'zz-ZZ': { overlays: { diagnosticHelp: { version: 1, help: { E001: "z'help" } } } },
+            'aa-AA': {
+                overlays: {
+                    lspUiTexts: { version: 1, texts: { a: 'b' } },
+                    diagnosticMessages: { version: 1, messages: { E001: 'a {expected} {actual}' } },
+                    diagnosticHelp: { version: 1, help: { E001: 'a-help' } },
+                },
+            },
+            'en-US': { overlays: { lspUiTexts: { version: 1, texts: {} } } },
+            'xx-XX': {},
+        },
+    };
+    it('按语言 id 排序，只收诊断 overlay，跳过没有诊断 overlay 的语言', () => {
+        const out = renderDiagnosticOverlays(lexiconsJson);
+        assert.ok(out.indexOf("'aa-AA'") < out.indexOf("'zz-ZZ'"));
+        assert.ok(!out.includes('en-US') && !out.includes('xx-XX') && !out.includes('lspUiTexts'));
+        assert.ok(out.includes('"z\'help"'), '值以 JSON 字面量写出');
+        assert.equal(renderDiagnosticOverlays(lexiconsJson), out, '输出确定');
+    });
+    it('译文不是字符串时拒绝生成', () => {
+        const bad = { lexicons: { 'aa-AA': { overlays: { diagnosticMessages: { version: 1, messages: { E001: 1 } } } } } };
+        assert.throws(() => renderDiagnosticOverlays(bad), /aa-AA.*diagnosticMessages.*E001/);
+    });
+    it('译文节点缺失时拒绝生成', () => {
+        const bad = { lexicons: { 'aa-AA': { overlays: { diagnosticHelp: { version: 1 } } } } };
+        assert.throws(() => renderDiagnosticOverlays(bad), /aa-AA.*diagnosticHelp/);
+    });
+});
+describe('localizeDiagnostics', () => {
+    const english = {
+        severity: 'error',
+        code: "E801" /* ErrorCode.UNRESOLVED_FIELD */,
+        message: "Cannot resolve field 'gewicht' in FIELD_REF position",
+        help: 'Check the field name against the data type declaration or the active vocabulary.',
+        data: { written: 'gewicht', role: 'FIELD_REF', candidates: '' },
+    };
+    it('按诊断参数用目标语言模板重新渲染 message，并替换 help', () => {
+        const [de] = localizeDiagnostics([english], DE_DE);
+        assert.equal(de.message, "Feld 'gewicht' kann an Position FIELD_REF nicht aufgelöst werden");
+        assert.equal(de.help, DIAGNOSTIC_OVERLAYS['de-DE'].diagnosticHelp.help['E801']);
+        const [hi] = localizeDiagnostics([english], HI_IN);
+        assert.equal(hi.message, "FIELD_REF स्थान पर फ़ील्ड 'gewicht' हल नहीं हो सका");
+        assert.equal(english.message, "Cannot resolve field 'gewicht' in FIELD_REF position", '不修改输入');
+    });
+    it('参数不足以填满模板时保留原 message，只替换 help', () => {
+        const noData = { ...english };
+        delete noData.data;
+        const [zh] = localizeDiagnostics([noData], ZH_CN);
+        assert.equal(zh.message, english.message);
+        assert.equal(zh.help, HELP_BY_LEXICON['zh-CN']['E801']);
+    });
+    it('原诊断没有 help 时不补 help', () => {
+        const noHelp = { ...english };
+        delete noHelp.help;
+        const [zh] = localizeDiagnostics([noHelp], ZH_CN);
+        assert.equal(zh.help, undefined);
+        assert.equal(zh.message, "无法在 FIELD_REF 位置解析字段 'gewicht'");
+    });
+    it('无 lexicon 或 en-US 时原样返回', () => {
+        assert.deepEqual(localizeDiagnostics([english], undefined), [english]);
+        assert.deepEqual(localizeDiagnostics([english], EN_US), [english]);
+    });
+});
+describe('浏览器入口输出本地化诊断（cloud 编辑器路径）', () => {
+    const unresolvedField = 'Modul m.\n\nDefiniere Fahrer hat alter als Ganzzahl.\n\n' +
+        'Regel f gegeben x als Fahrer, liefert Ganzzahl:\n  gib zurueck x.gewicht.\n';
+    it('compile 的名称解析诊断按 lexicon 本地化', () => {
+        const result = compile(unresolvedField, { lexicon: DE_DE });
+        const e801 = result.resolutionDiagnostics?.find((d) => d.code === "E801" /* ErrorCode.UNRESOLVED_FIELD */);
+        assert.ok(e801, JSON.stringify(result.resolutionDiagnostics));
+        assert.match(e801.message, /^Feld 'gewicht' kann an Position \w+ nicht aufgelöst werden$/);
+        assert.equal(e801.help, HELP_BY_LEXICON['de-DE']['E801']);
+    });
+    it('compileAndTypecheck 的类型检查诊断按 lexicon 本地化', () => {
+        const source = readFileSync(resolve(process.cwd(), 'test', 'fixtures', 'e104-shadowing', 'auto-insurance.de.aster'), 'utf8');
+        const result = compileAndTypecheck(source, { lexicon: DE_DE });
+        const e104 = result.typeErrors.filter((d) => d.code === "E104" /* ErrorCode.DUPLICATE_SYMBOL */);
+        assert.ok(e104.length > 0, JSON.stringify(result.typeErrors));
+        for (const d of e104)
+            assert.match(d.message, /ist in diesem Gültigkeitsbereich bereits definiert\.$/);
+    });
+    it('英文源码不带 lexicon 时诊断保持英文', () => {
+        const src = 'Module m.\n\nRule r given x as Int, produce Int:\n  Let x be 1.\n  Return x.\n';
+        const result = compileAndTypecheck(src);
+        const e104 = result.typeErrors.find((d) => d.code === "E104" /* ErrorCode.DUPLICATE_SYMBOL */);
+        assert.ok(e104);
+        assert.match(e104.message, /already defined in this scope/);
+    });
+});
+//# sourceMappingURL=diagnostic-overlays.test.js.map

package/dist/test/unit/diagnostics/diagnostic-overlays.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostic-overlays.test.js","sourceRoot":"","sources":["../../../../test/unit/diagnostics/diagnostic-overlays.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAQ5F,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CACzB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAyB,CAC/G,CAAC;AACF,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAEvD,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACjF,CAAC;AAED,SAAS,gBAAgB,CAAC,KAA4D,EAAE,IAAyB;IAC/G,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACzE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,SAAS,YAAY,CAAC,IAAI,CAAC,QAAQ,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/F,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC;IAC9F,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QAC1E,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,mBAAmB,CAAC,EAAE,CAAC,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;YACnH,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,mBAAmB,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACrG,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,CAAC,MAAM,gBAAgB,EAAE,GAAG,EAAE;YAC1D,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,GAAG,EAAE,wBAAwB,EAAE,GAAG,EAAE;YACrC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,MAAM,YAAY,GAAG;QACnB,QAAQ,EAAE;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;YACnF,OAAO,EAAE;gBACP,QAAQ,EAAE;oBACR,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;oBAC7C,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE;oBAC/E,cAAc,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;iBACzD;aACF;YACD,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE;YAChE,OAAO,EAAE,EAAE;SACZ;KACF,CAAC;IAEF,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,GAAG,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3F,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACtB,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACnH,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,iCAAiC,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACxF,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,MAAM,OAAO,GAAwB;QACnC,QAAQ,EAAE,OAAO;QACjB,IAAI,yCAA4B;QAChC,OAAO,EAAE,sDAAsD;QAC/D,IAAI,EAAE,kFAAkF;QACxF,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;KAChE,CAAC;IAEF,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,OAAO,EAAE,kEAAkE,CAAC,CAAC;QAC9F,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAE,CAAC,cAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACnF,MAAM,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,OAAO,EAAE,oDAAoD,CAAC,CAAC;QAChF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,sDAAsD,EAAE,OAAO,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC;QACnB,MAAM,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC;QACnB,MAAM,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,EAAG,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,eAAe,GACnB,0DAA0D;QAC1D,6EAA6E,CAAC;IAEhF,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,4CAA+B,CAAC,CAAC;QAC9F,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,8DAA8D,CAAC,CAAC;QAC3F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,yBAAyB,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7H,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,4CAA+B,CAAC,CAAC;QACpF,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9D,KAAK,MAAM,CAAC,IAAI,IAAI;YAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,uDAAuD,CAAC,CAAC;IACzG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,GAAG,GAAG,gFAAgF,CAAC;QAC7F,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,4CAA+B,CAAC,CAAC;QAClF,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/test/unit/diagnostics/resolution-codes.test.d.ts

@@ -1,6 +1,6 @@
 /**
  * 名称解析诊断码 E800–E807 / W800–W801（ADR 0051）。
- * 校验码值、严重级别、英文文案约束与中文 fallback 覆盖。
+ * 校验码值、严重级别、英文文案约束与中文 overlay 覆盖（全语言覆盖见 diagnostic-overlays.test.ts）。
  */
 export {};
 //# sourceMappingURL=resolution-codes.test.d.ts.map

package/dist/test/unit/diagnostics/resolution-codes.test.js

@@ -1,33 +1,38 @@
 /**
  * 名称解析诊断码 E800–E807 / W800–W801（ADR 0051）。
- * 校验码值、严重级别、英文文案约束与中文 fallback 覆盖。
+ * 校验码值、严重级别、英文文案约束与中文 overlay 覆盖（全语言覆盖见 diagnostic-overlays.test.ts）。
  */
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { ERROR_MESSAGES, ERROR_METADATA } from '../../../src/diagnostics/error_codes.js';
 import { MESSAGES_BY_LEXICON, HELP_BY_LEXICON } from '../../../src/config/lexicons/diagnostic-messages.js';
+const NAME_ROLE = ['role', 'written'];
+const AMBIGUOUS = ['candidates', 'role', 'written'];
 const EXPECTED = [
-    { code: 'E800', severity: 'error' },
-    { code: 'E801', severity: 'error' },
-    { code: 'E802', severity: 'error' },
-    { code: 'E803', severity: 'error' },
-    { code: 'E804', severity: 'error' },
-    { code: 'E805', severity: 'error' },
-    { code: 'E806', severity: 'error' },
-    { code: 'E807', severity: 'error' },
-    { code: 'W800', severity: 'warning' },
-    { code: 'W801', severity: 'warning' },
+    { code: 'E800', name: 'UNRESOLVED_TYPE', severity: 'error', placeholders: NAME_ROLE },
+    { code: 'E801', name: 'UNRESOLVED_FIELD', severity: 'error', placeholders: NAME_ROLE },
+    { code: 'E802', name: 'UNRESOLVED_NAME', severity: 'error', placeholders: NAME_ROLE },
+    { code: 'E803', name: 'UNRESOLVED_PATTERN', severity: 'error', placeholders: NAME_ROLE },
+    { code: 'E804', name: 'AMBIGUOUS_NAME', severity: 'error', placeholders: AMBIGUOUS },
+    { code: 'E805', name: 'AMBIGUOUS_FIELD', severity: 'error', placeholders: AMBIGUOUS },
+    { code: 'E806', name: 'AMBIGUOUS_PATTERN', severity: 'error', placeholders: AMBIGUOUS },
+    { code: 'E807', name: 'DUPLICATE_DECLARATION', severity: 'error', placeholders: NAME_ROLE },
+    { code: 'W800', name: 'SHADOWED_VOCABULARY', severity: 'warning', placeholders: NAME_ROLE },
+    { code: 'W801', name: 'RESOLVED_WITHOUT_TYPE', severity: 'warning', placeholders: NAME_ROLE },
 ];
+/** 文案中出现的占位符名（去重、排序） */
+function placeholdersOf(text) {
+    return [...new Set([...text.matchAll(/\{(\w+)\}/g)].map((m) => m[1]))].sort();
+}
 // Han、平假名/片假名、谚文
 const CJK = /[぀-ヿ㐀-䶿一-鿿가-힯豈-﫿]/;
-const table = JSON.parse(readFileSync(resolve(process.cwd(), 'shared', 'error_codes.json'), 'utf8'));
-function nameOf(code) {
-    const hit = Object.entries(table).find(([, v]) => v.code === code);
-    assert.ok(hit, `码表缺少 ${code}`);
-    return hit[0];
-}
+// 按测试文件自身位置定位仓库根（dist/test/unit/diagnostics → 上溯 4 级），不依赖 cwd
+const repoFile = (rel) => readFileSync(fileURLToPath(new URL(`../../../../${rel}`, import.meta.url)), 'utf8');
+const table = JSON.parse(repoFile('shared/error_codes.json'));
+// ErrorCode 是 const enum，运行时没有键名 → 从生成的源码里读出「枚举键 → 码值」
+const enumKeys = new Map([...repoFile('src/diagnostics/error_codes.ts').matchAll(/^\s+([A-Z][A-Z0-9_]*) = "([EWI]\d+)",?$/gm)].map((m) => [m[1], m[2]]));
 describe('名称解析诊断码 E800–E807 / W800–W801', () => {
     it('枚举值与码表名称一致', () => {
         assert.equal("E800" /* ErrorCode.UNRESOLVED_TYPE */, 'E800');
@@ -41,7 +46,7 @@ describe('名称解析诊断码 E800–E807 / W800–W801', () => {
         assert.equal("W800" /* ErrorCode.SHADOWED_VOCABULARY */, 'W800');
         assert.equal("W801" /* ErrorCode.RESOLVED_WITHOUT_TYPE */, 'W801');
     });
-    for (const { code, severity } of EXPECTED) {
+    for (const { code, name, severity, placeholders } of EXPECTED) {
         describe(code, () => {
             const meta = Object.values(ERROR_METADATA).find(m => m.code === code);
             it('存在且严重级别正确', () => {
@@ -49,24 +54,32 @@ describe('名称解析诊断码 E800–E807 / W800–W801', () => {
                 assert.equal(meta.severity, severity);
                 assert.equal(meta.category, 'scope');
             });
-            it('英文文案非空、无 CJK 且引用 {written}', () => {
+            it('英文文案非空、无 CJK 且恰好引用约定的占位符', () => {
                 assert.ok(meta);
                 const message = ERROR_MESSAGES[meta.code];
                 assert.ok(message && message.length > 0);
                 assert.ok(meta.help.length > 0);
-                assert.ok(message.includes('{written}'), `${code} message 应引用 {written}`);
+                assert.deepEqual(placeholdersOf(message), placeholders, `${code} 英文 message 占位符`);
                 assert.ok(!CJK.test(message), `${code} message 含 CJK`);
                 assert.ok(!CJK.test(meta.help), `${code} help 含 CJK`);
             });
-            it('中文 fallback 的消息与帮助非空且引用 {written}', () => {
+            it('中文 overlay 的消息与帮助非空，消息占位符与英文一致', () => {
                 const zhMsg = MESSAGES_BY_LEXICON['zh-CN']?.[code];
                 const zhHelp = HELP_BY_LEXICON['zh-CN']?.[code];
                 assert.ok(zhMsg && zhMsg.length > 0, `${code} 缺少 zh-CN 消息`);
-                assert.ok(zhMsg.includes('{written}'));
+                assert.deepEqual(placeholdersOf(zhMsg), placeholders, `${code} zh-CN message 占位符`);
                 assert.ok(zhHelp && zhHelp.length > 0, `${code} 缺少 zh-CN 帮助`);
             });
-            it('码表键名与 json 一致', () => {
-                assert.ok(nameOf(code).length > 0);
+            it('码表键名与 ErrorCode 枚举键一致，条目与生成的元数据一致', () => {
+                const entry = table[name];
+                assert.ok(entry, `shared/error_codes.json 缺少键 ${name}`);
+                assert.equal(entry.code, code);
+                assert.equal(enumKeys.get(name), code, `ErrorCode.${name} 应为 ${code}`);
+                assert.equal(Object.entries(table).filter(([, v]) => v.code === code).length, 1, `${code} 在码表中应唯一`);
+                assert.ok(meta);
+                assert.equal(entry.severity, meta.severity);
+                assert.equal(entry.message, ERROR_MESSAGES[meta.code]);
+                assert.equal(entry.help, meta.help);
             });
         });
     }

package/dist/test/unit/diagnostics/resolution-codes.test.js.map

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

package/dist/test/unit/formatter-corpus-roundtrip.test.js

@@ -47,10 +47,6 @@ const ALLOW_LIST = new Map([
     ['corpus/tier1-parity/vocab-zh/synonyms.aster', CJK_IDENTIFIERS],
     ['corpus/tier1-parity/vocab-zh/type-equals-field.aster', CJK_IDENTIFIERS],
     ['corpus/tier1-reject/vocab-e804-zh-member-vs-rule.aster', CJK_IDENTIFIERS],
-    [
-        'corpus/tier1-parity/vocab-de/type-alias-localized.aster',
-        '格式化器不输出类型别名声明（AST 不含 TypeAlias 节点），签名引用别名时重写后 Core IR 改变；待格式化器支持别名',
-    ],
 ]);
 function asterFiles(dir, out = []) {
     for (const entry of readdirSync(dir)) {

package/dist/test/unit/formatter-corpus-roundtrip.test.js.map

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

package/dist/test/unit/formatter-roundtrip.test.js

@@ -17,6 +17,9 @@ import { formatCNL } from '../../src/formatter.js';
 import { EN_US } from '../../src/config/lexicons/en-US.js';
 import { ZH_CN } from '../../src/config/lexicons/zh-CN.js';
 import { DE_DE } from '../../src/config/lexicons/de-DE.js';
+import { parseSource, resolveAndLower } from '../../src/compile-pipeline.js';
+import { buildVocabularyScopes } from '../../src/config/lexicons/identifiers/scopes.js';
+import { IdentifierKind } from '../../src/config/lexicons/identifiers/types.js';
 // 编译后从 dist/test/unit 运行：上溯 3 级到仓库根，夹具在 test/fixtures 下
 const repoRoot = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..');
 const fixtureDir = join(repoRoot, 'test', 'fixtures', 'formatter-roundtrip');
@@ -52,6 +55,7 @@ const FIXTURES = [
     ['credit-pilot-v3.en.aster', EN_US],
     ['credit-pilot-v3.zh.aster', ZH_CN],
     ['credit-pilot-v3.de.aster', DE_DE],
+    ['type-aliases.aster', EN_US],
 ];
 describe('格式化器往返（Core IR 不变）', () => {
     for (const [file, lexicon] of FIXTURES) {
@@ -60,6 +64,8 @@ describe('格式化器往返（Core IR 不变）', () => {
             assert.doesNotMatch(formatted, /,:/);
             assert.doesNotMatch(formatted, /(>=|<=|[<>*+]|\band)\(/);
             assert.equal(formatCNL(formatted), formatted, '格式化须幂等');
+            // Core IR 看不到只在 AST 中的构造（类型别名），再比对源码 AST
+            assert.deepEqual(astOf(formatted), astOf(readFileSync(join(fixtureDir, file), 'utf8'), lexicon));
         });
     }
     test('If 与 Otherwise 块头不带逗号', () => {
@@ -122,4 +128,82 @@ describe('格式化器往返（Core IR 不变）', () => {
         assert.match(formatted, /Return not \(p and q\)\./);
     });
 });
+/** 去掉位置信息后的源码 AST：Core IR 看不到只存在于 AST 的构造（如类型别名），须直接比对 AST */
+function astOf(source, lexicon = EN_US) {
+    const result = parseWithLexicon(lex(canonicalize(source, lexicon), lexicon), lexicon);
+    const errors = result.diagnostics.filter((d) => d.severity === 'error');
+    if (errors.length > 0)
+        throw new Error(errors.map((d) => d.message).join('\n') + '\n---\n' + source);
+    // span / nameSpan / variantSpans 等位置字段随排版变化，不属于源码语义
+    return JSON.parse(JSON.stringify(result.ast, (k, v) => (/^(span|origin)$|Spans?$/.test(k) ? undefined : v)));
+}
+// 格式化 → 重新解析 → 与原文 AST 比对（去掉 span）；同时检查幂等
+function assertSourceRoundTrip(source, lexicon = EN_US, opts = {}) {
+    const formatted = formatCNL(source, { lexicon, ...opts });
+    assert.deepEqual(astOf(formatted), astOf(source, lexicon), formatted);
+    assert.equal(formatCNL(formatted, opts), formatted, '格式化须幂等');
+    return formatted;
+}
+describe('格式化器往返（源码 AST 不变，#246）', () => {
+    test('★类型别名在默认档与 normalize 档都保留', () => {
+        const src = 'Module m.\n\nType Score as Int.\n\nDefine D has p as Score.\n\nRule f given x as Score, produce Score:\n  Return x.\n';
+        for (const opts of [{}, { mode: 'normalize' }]) {
+            const formatted = assertSourceRoundTrip(src, EN_US, opts);
+            assert.match(formatted, /^Type Score as Int\.$/m);
+        }
+    });
+    test('多个别名按出现顺序前置，目标含 list / Maybe / Map / 注解', () => {
+        const src = ['Module m.', '', 'Rule f given x as Score, produce Score:', '  Return x.', '',
+            'Type Score as Int.', '', 'Type Tags as list of Text.', '', 'Type MaybeName as Text?.', '',
+            'Type Index as map Text to Int.', '', 'Type Secret as @pii(L2, email) Text.', ''].join('\n');
+        const formatted = assertSourceRoundTrip(src);
+        const aliases = formatted.split('\n').filter((l) => l.startsWith('Type '));
+        assert.deepEqual(aliases, ['Type Score as Int.', 'Type Tags as list of Text.', 'Type MaybeName as Text?.',
+            'Type Index as map Text to Int.', 'Type Secret as @pii(L2, email) Text.']);
+        assert.ok(formatted.indexOf('Type Secret') < formatted.indexOf('Rule f'), '别名统一前置于其余声明');
+    });
+    test('只有别名、没有模块头也保留', () => {
+        const formatted = assertSourceRoundTrip('Type Score as Int.\n');
+        assert.equal(formatted, 'Type Score as Int.\n');
+    });
+    test('de-DE 源文的别名以英文 CNL 输出且 AST 不变', () => {
+        const src = 'Modul m.\n\ntype Punktzahl as Ganzzahl.\n\nRegel f gegeben x als Punktzahl, liefert Punktzahl:\n  gib zurueck x plus 1.\n';
+        const formatted = assertSourceRoundTrip(src, DE_DE);
+        assert.match(formatted, /^Type Punktzahl as Int\.$/m);
+    });
+    test('★显式 of T 只在函数体中使用时格式化保留 `of T`（#248）', () => {
+        const src = 'Module m.\n\nRule f of T given x as Int, produce Int:\n  Let g be function with a as T, produce T:\n    Return a.\n  Return x.\n';
+        const formatted = assertSourceRoundTrip(src);
+        assert.match(formatted, /^Rule f of T given x as Int, produce Int:$/m);
+    });
+    test('隐式类型参数不输出 `of`', () => {
+        const formatted = assertSourceRoundTrip('Module m.\n\nRule f given x as Element, produce Element:\n  Return x.\n');
+        assert.match(formatted, /^Rule f given x as Element, produce Element:$/m);
+    });
+    test('与 preserveComments 同用时别名仍保留', () => {
+        const src = 'Module m.\n\n// 分数\nType Score as Int.\n\nRule f given x as Score, produce Score:\n  Return x.\n';
+        const formatted = formatCNL(src, { preserveComments: true, preserveStandaloneComments: true });
+        assert.match(formatted, /^Type Score as Int\.$/m);
+        assert.deepEqual(astOf(formatted), astOf(src));
+    });
+    test('★带词汇的 R1 诊断与函数类型参数在格式化前后一致（别名丢失会让 Score 变成 E800 或隐式类型参数）', () => {
+        const scopes = buildVocabularyScopes({
+            id: 't', name: 't', locale: 'en-US', version: '1',
+            structs: [{ canonical: 'Driver', localized: 'Fahrer', kind: IdentifierKind.STRUCT }],
+            fields: [], functions: [], enumValues: [],
+        });
+        const view = (source) => {
+            const r = resolveAndLower(parseSource(source).ast, scopes);
+            return {
+                codes: r.diagnostics.map((d) => d.code),
+                typeParams: (r.core?.decls ?? []).filter((d) => d.kind === 'Func').map((d) => d.typeParams),
+            };
+        };
+        for (const body of ['Define D has p as Score.\n\n', '']) {
+            const src = `Module m.\n\nType Score as Int.\n\n${body}Rule f given x as Score, produce Score:\n  Return x.\n`;
+            assert.deepEqual(view(formatCNL(src)), view(src));
+            assert.deepEqual(view(src), { codes: [], typeParams: [[]] });
+        }
+    });
+});
 //# sourceMappingURL=formatter-roundtrip.test.js.map

package/dist/test/unit/formatter-roundtrip.test.js.map

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

package/dist/test/unit/frontend/resolve-declarations.test.js

@@ -275,6 +275,27 @@ describe('resolveDeclarations（R1）', () => {
             assert.deepEqual(codes(r), ["E804" /* ErrorCode.AMBIGUOUS_NAME */]);
             assert.deepEqual(decl(r.module, 0, 'Func').typeParams, ['FaHrer']);
         });
+        it('★隐式参数歧义的 E804 落在签名中第一处写法上，而不是整个函数（#248）', () => {
+            const m = parse('Modul m.\n\nRegel f gegeben y als Ganzzahl, x als FaHrer, liefert FaHrer:\n  gib zurueck x.\n');
+            const r = resolveDeclarations(m, ctxOf([struct('Driver', 'Fahrer'), struct('Pilot', 'FAHRER')]));
+            assert.deepEqual(codes(r), ["E804" /* ErrorCode.AMBIGUOUS_NAME */]);
+            const x = decl(m, 0, 'Func').params[1];
+            assert.deepEqual(r.diagnostics[0].span, x.type.span, 'E804 应落在 x 的类型 FaHrer 上');
+            assert.equal(r.diagnostics[0].span?.start.line, 3);
+        });
+        it('隐式参数只出现在返回类型 → E804 落在返回类型上', () => {
+            const m = parse('Modul m.\n\nRegel f gegeben x als Ganzzahl, liefert FaHrer:\n  gib zurueck x.\n');
+            const r = resolveDeclarations(m, ctxOf([struct('Driver', 'Fahrer'), struct('Pilot', 'FAHRER')]));
+            assert.deepEqual(codes(r), ["E804" /* ErrorCode.AMBIGUOUS_NAME */]);
+            assert.deepEqual(r.diagnostics[0].span, decl(m, 0, 'Func').retType.span);
+        });
+        it('隐式参数嵌在 list of 里 → E804 落在内层类型名上', () => {
+            const m = parse('Module m.\n\nRule f given xs as list of FaHrer, produce Int:\n  Return 1.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf([struct('Driver', 'Fahrer'), struct('Pilot', 'FAHRER')]));
+            assert.deepEqual(codes(r), ["E804" /* ErrorCode.AMBIGUOUS_NAME */]);
+            const list = decl(m, 0, 'Func').params[0].type;
+            assert.deepEqual(r.diagnostics[0].span, list.type.span);
+        });
         it('显式 of T → 保留，TypeVar 不查词汇', () => {
             const m = parse('Modul m.\n\nRegel f of Fahrer gegeben x als Fahrer, liefert Fahrer:\n  gib zurueck x.\n');
             const r = resolveDeclarations(m, ctxOf(DRIVER));
@@ -284,6 +305,26 @@ describe('resolveDeclarations（R1）', () => {
             assert.equal(f.params[0].type.kind, 'TypeVar');
             assert.deepEqual(codes(r), []);
         });
+        it('★显式 of T 只在函数体中使用（lambda 参数）且 T 同名 Data → 仍保留（#248，与 Java 一致）', () => {
+            const m = parse('Module m.\n\nDefine T has v as Int.\n\nRule f of T given x as Int, produce Int:\n' +
+                '  Let g be function with a as T, produce T:\n    Return a.\n  Return x.\n', EN_US);
+            assert.deepEqual(decl(m, 1, 'Func').typeParams, ['T'], '前提：解析器记录显式类型参数');
+            const r = resolveDeclarations(m, ctxOf([]));
+            assert.deepEqual(decl(r.module, 1, 'Func').typeParams, ['T']);
+            assert.deepEqual(codes(r), []);
+        });
+        it('显式 of T 只在函数体中使用且 T 命中词汇 → 仍保留', () => {
+            const m = parse('Module m.\n\nRule f of Fahrer given x as Int, produce Int:\n' +
+                '  Let g be function with a as Fahrer, produce Fahrer:\n    Return a.\n  Return x.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf(DRIVER));
+            assert.deepEqual(decl(r.module, 0, 'Func').typeParams, ['Fahrer']);
+        });
+        it('显式 of T 在签名与函数体中都使用 → 保留', () => {
+            const m = parse('Module m.\n\nDefine T has v as Int.\n\nRule f of T given x as T, produce T:\n' +
+                '  Let g be function with a as T, produce T:\n    Return a.\n  Return x.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf([]));
+            assert.deepEqual(decl(r.module, 1, 'Func').typeParams, ['T']);
+        });
     });
     describe('未解析诊断（裁决 R14）', () => {
         it('TYPE 位置在声明 / 导入 / 词汇 / 内置中均未命中 → E800', () => {
@@ -381,6 +422,24 @@ describe('resolveDeclarations（R1）', () => {
             const r = resolveDeclarations(m, ctxOf(DRIVER));
             assert.deepEqual(codes(r), ["E807" /* ErrorCode.DUPLICATE_DECLARATION */]);
         });
+        it('★两个同名别名 → E807 落在后一个别名声明上（#248，旧实现为 0:0）', () => {
+            const m = parse('Module m.\n\nType Score as Int.\n\nType Score as Text.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf([]));
+            assert.deepEqual(codes(r), ["E807" /* ErrorCode.DUPLICATE_DECLARATION */]);
+            assert.deepEqual(r.diagnostics[0].span, { start: { line: 5, col: 1 }, end: { line: 5, col: 20 } });
+        });
+        it('★Define 在前、同名别名在后 → E807 落在后出现的别名上，而非 Data', () => {
+            const m = parse('Module m.\n\nDefine Score has v as Int.\n\nType Score as Int.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf([]));
+            assert.deepEqual(codes(r), ["E807" /* ErrorCode.DUPLICATE_DECLARATION */]);
+            assert.equal(r.diagnostics[0].span?.start.line, 5);
+        });
+        it('别名在前、同名 Define 在后 → E807 落在 Define 上', () => {
+            const m = parse('Module m.\n\nType Score as Int.\n\nDefine Score has v as Int.\n', EN_US);
+            const r = resolveDeclarations(m, ctxOf([]));
+            assert.deepEqual(codes(r), ["E807" /* ErrorCode.DUPLICATE_DECLARATION */]);
+            assert.equal(r.diagnostics[0].span?.start.line, 5);
+        });
     });
     it('不修改输入 AST', () => {
         const m = parse('Modul m.\n\nDefiniere Fahrer hat alter als Ganzzahl.\n');