@aster-cloud/aster-lang-ts 1.0.37 → 1.2.0

package/dist/src/config/lexicons/identifiers/types.d.ts

@@ -5,7 +5,7 @@
  *
  * **设计原则**：
  * - 领域分离：每个业务领域（金融、保险、医疗等）有独立的映射
- * - 双向映射：支持本地化→规范化 和 规范化→本地化 双向转换
+ * - 本地化→规范化按源码位置解析（VocabularyScopes，ADR 0051）；本索引只提供规范化→本地化
  * - 可扩展：租户可添加自定义映射
  * - 类型安全：通过 TypeScript 类型系统保证映射完整性
  */
@@ -23,8 +23,8 @@ export declare enum IdentifierKind {
     ENUM_VALUE = "enum_value",
     /**
      * 字面量宏（token → 字符串字面量）。与其它 kind 不同：canonical **不是** ASCII
-     * 标识符，而是要替换出去的**字符串内容**（不含引号）。canonicalize 时把 localized
-     * token 逐字替换成 `<open>content<close>`（用当前 lexicon 的 stringQuotes 包裹，
+     * 标识符，而是要替换出去的**字符串内容**（不含引号）。canonicalize 时把触发词
+     * token（按折叠键匹配）替换成 `<open>content<close>`（用当前 lexicon 的 stringQuotes 包裹，
      * 从而被 segmentString 正确保护，避免插入 ASCII 引号在标点归一化后不被隔离）。
      *
      * <p>用途：把一个领域术语固定展开成一段标准文案（合规场景常见），例如
@@ -88,22 +88,16 @@ export interface DomainVocabulary {
     };
 }
 /**
- * 标识符映射索引 - 用于快速查找。
+ * 标识符映射索引 - 用于展示与按类型查找（规范名 → 本地化写法等）。
+ * 源码中的名字按位置解析见 VocabularyScopes（ADR 0051），本索引不参与编译。
  */
 export interface IdentifierIndex {
-    /** 本地化名称 → 规范化名称 */
-    readonly toCanonical: ReadonlyMap<string, string>;
-    /** 规范化名称 → 本地化名称 */
+    /** 规范化名称（小写） → 本地化名称 */
     readonly toLocalized: ReadonlyMap<string, string>;
-    /** 按类型分类的映射 */
+    /** 按类型分类的映射（键为本地化名称小写） */
     readonly byKind: ReadonlyMap<IdentifierKind, ReadonlyMap<string, IdentifierMapping>>;
     /** 字段映射（按父结构体索引） */
     readonly fieldsByParent: ReadonlyMap<string, ReadonlyMap<string, IdentifierMapping>>;
-    /**
-     * 字面量宏的 localized key（已 toLowerCase）。canonicalize 替换时据此判定：
-     * 命中则把 `toCanonical` 里存的**内容**用 lexicon 引号包裹后插入，而非当作标识符原样插入。
-     */
-    readonly literals: ReadonlySet<string>;
 }
 /**
  * 构建标识符索引。
@@ -112,14 +106,6 @@ export interface IdentifierIndex {
  * @returns 标识符索引
  */
 export declare function buildIdentifierIndex(vocabulary: DomainVocabulary): IdentifierIndex;
-/**
- * 将本地化标识符转换为规范化名称。
- *
- * @param index - 标识符索引
- * @param localized - 本地化名称
- * @returns 规范化名称，如果不存在映射则返回原始名称
- */
-export declare function canonicalizeIdentifier(index: IdentifierIndex, localized: string): string;
 /**
  * 将规范化名称转换为本地化标识符。
  *
@@ -129,15 +115,15 @@ export declare function canonicalizeIdentifier(index: IdentifierIndex, localized
  */
 export declare function localizeIdentifier(index: IdentifierIndex, canonical: string): string;
 /**
- * 检查是否存在标识符映射。
+ * 验证领域词汇表（ADR 0051：名称按位置解析）。
  *
- * @param index - 标识符索引
- * @param name - 标识符名称（本地化或规范化）
- * @returns 如果存在映射返回 true
- */
-export declare function hasIdentifierMapping(index: IdentifierIndex, name: string): boolean;
-/**
- * 验证领域词汇表。
+ * - 规范名必须是 ASCII 标识符；字面量宏内容做注入防护。
+ * - 字段与枚举成员必须有 parent（按父类型分作用域；不支持全局字段）。
+ * - 冲突只在同一角色、同一作用域内判定：NFC 后写法（本地化名或同义词）完全相同却对应不同规范名
+ *   → error。同规范名的多个写法（同义词）、仅大小写不同的写法、不同父类型下的同名字段都合法，
+ *   使用点由解析器按位置精确优先、折叠唯一再判定。
+ * - 字面量宏触发词须全局唯一：canonicalize 在解析前做上下文无关替换，触发词若与任何其它映射同名，
+ *   一个词展开成字符串还是标识符就不可预测。
  *
  * @param vocabulary - 领域词汇表
  * @returns 验证结果

package/dist/src/config/lexicons/identifiers/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/config/lexicons/identifiers/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/config/lexicons/identifiers/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH;;GAEG;AACH,oBAAY,cAAc;IACxB,eAAe;IACf,MAAM,WAAW;IACjB,WAAW;IACX,KAAK,UAAU;IACf,WAAW;IACX,QAAQ,aAAa;IACrB,UAAU;IACV,UAAU,eAAe;IACzB;;;;;;;;;OASG;IACH,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,4BAA4B;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,mBAAmB;IACnB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,YAAY;IACZ,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B,uBAAuB;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB,eAAe;IACf,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,uDAAuD;IACvD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,gBAAgB;IAChB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,oCAAoC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,UAAU;IACV,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,YAAY;IACZ,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAE/C,mBAAmB;IACnB,QAAQ,CAAC,MAAM,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAE9C,WAAW;IACX,QAAQ,CAAC,SAAS,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAEjD,YAAY;IACZ,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAEnD;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAEjD,UAAU;IACV,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,YAAY;QACZ,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QACzB,WAAW;QACX,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAC5B,aAAa;QACb,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAC5B,SAAS;QACT,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB;IACxB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElD,0BAA0B;IAC1B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAErF,oBAAoB;IACpB,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;CACtF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,GAAG,eAAe,CAyClF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEpF;AAkDD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAqDA"}

package/dist/src/config/lexicons/identifiers/types.js

@@ -5,10 +5,11 @@
  *
  * **设计原则**：
  * - 领域分离：每个业务领域（金融、保险、医疗等）有独立的映射
- * - 双向映射：支持本地化→规范化 和 规范化→本地化 双向转换
+ * - 本地化→规范化按源码位置解析（VocabularyScopes，ADR 0051）；本索引只提供规范化→本地化
  * - 可扩展：租户可添加自定义映射
  * - 类型安全：通过 TypeScript 类型系统保证映射完整性
  */
+import { nfc } from './casefold.js';
 /**
  * 标识符类型枚举。
  */
@@ -24,8 +25,8 @@ export var IdentifierKind;
     IdentifierKind["ENUM_VALUE"] = "enum_value";
     /**
      * 字面量宏（token → 字符串字面量）。与其它 kind 不同：canonical **不是** ASCII
-     * 标识符，而是要替换出去的**字符串内容**（不含引号）。canonicalize 时把 localized
-     * token 逐字替换成 `<open>content<close>`（用当前 lexicon 的 stringQuotes 包裹，
+     * 标识符，而是要替换出去的**字符串内容**（不含引号）。canonicalize 时把触发词
+     * token（按折叠键匹配）替换成 `<open>content<close>`（用当前 lexicon 的 stringQuotes 包裹，
      * 从而被 segmentString 正确保护，避免插入 ASCII 引号在标点归一化后不被隔离）。
      *
      * <p>用途：把一个领域术语固定展开成一段标准文案（合规场景常见），例如
@@ -41,35 +42,19 @@ export var IdentifierKind;
  * @returns 标识符索引
  */
 export function buildIdentifierIndex(vocabulary) {
-    const toCanonical = new Map();
     const toLocalized = new Map();
     const byKind = new Map();
     const fieldsByParent = new Map();
-    const literals = new Set();
     // 初始化 byKind 分类
     for (const kind of Object.values(IdentifierKind)) {
         byKind.set(kind, new Map());
     }
     const addMapping = (mapping) => {
         const localizedKey = mapping.localized.toLowerCase();
-        // localized → canonical（字面量宏存的是「内容」，替换阶段再包引号）
-        toCanonical.set(localizedKey, mapping.canonical);
         // 字面量宏是单向宏展开，不建反向映射（避免 toLocalized 暴露怪异的内容反查）。
-        if (mapping.kind === IdentifierKind.LITERAL) {
-            literals.add(localizedKey);
-        }
-        else {
+        if (mapping.kind !== IdentifierKind.LITERAL) {
             toLocalized.set(mapping.canonical.toLowerCase(), mapping.localized);
         }
-        // 别名也加入映射（字面量宏的别名同样触发宏展开）
-        if (mapping.aliases) {
-            for (const alias of mapping.aliases) {
-                const aliasKey = alias.toLowerCase();
-                toCanonical.set(aliasKey, mapping.canonical);
-                if (mapping.kind === IdentifierKind.LITERAL)
-                    literals.add(aliasKey);
-            }
-        }
         // 按类型分类
         byKind.get(mapping.kind).set(localizedKey, mapping);
         // 字段按父结构体索引
@@ -87,23 +72,11 @@ export function buildIdentifierIndex(vocabulary) {
     vocabulary.enumValues?.forEach(addMapping);
     vocabulary.literals?.forEach(addMapping);
     return {
-        toCanonical,
         toLocalized,
         byKind: byKind,
         fieldsByParent: fieldsByParent,
-        literals,
     };
 }
-/**
- * 将本地化标识符转换为规范化名称。
- *
- * @param index - 标识符索引
- * @param localized - 本地化名称
- * @returns 规范化名称，如果不存在映射则返回原始名称
- */
-export function canonicalizeIdentifier(index, localized) {
-    return index.toCanonical.get(localized.toLowerCase()) ?? localized;
-}
 /**
  * 将规范化名称转换为本地化标识符。
  *
@@ -114,19 +87,64 @@ export function canonicalizeIdentifier(index, localized) {
 export function localizeIdentifier(index, canonical) {
     return index.toLocalized.get(canonical.toLowerCase()) ?? canonical;
 }
-/**
- * 检查是否存在标识符映射。
- *
- * @param index - 标识符索引
- * @param name - 标识符名称（本地化或规范化）
- * @returns 如果存在映射返回 true
- */
-export function hasIdentifierMapping(index, name) {
-    const lower = name.toLowerCase();
-    return index.toCanonical.has(lower) || index.toLocalized.has(lower);
+/** 映射所属的解析作用域（ADR 0051 §7）：字段 / 枚举成员按规范父名分作用域；字面量宏不在其中。 */
+function scopeOf(mapping) {
+    switch (mapping.kind) {
+        case IdentifierKind.STRUCT:
+            return 'types';
+        case IdentifierKind.FUNCTION:
+            return 'functions';
+        case IdentifierKind.FIELD:
+            return mapping.parent === undefined ? undefined : `fields[${mapping.parent}]`;
+        case IdentifierKind.ENUM_VALUE:
+            return mapping.parent === undefined ? undefined : `enumMembers[${mapping.parent}]`;
+        default:
+            return undefined;
+    }
+}
+/** 缺 parent 时的诊断（字段与枚举成员措辞不同，下游按文案识别原因）。 */
+function missingParentMessage(mapping, context) {
+    if (mapping.parent)
+        return undefined;
+    if (mapping.kind === IdentifierKind.FIELD)
+        return `${context}: 字段 "${mapping.localized}" 没有指定父结构体`;
+    if (mapping.kind === IdentifierKind.ENUM_VALUE)
+        return `${context}: 枚举成员 "${mapping.localized}" 没有指定父枚举`;
+    return undefined;
+}
+/** 字面量宏内容的注入防护校验；普通标识符校验规范名是 ASCII 标识符。 */
+function checkCanonical(mapping, context, errors) {
+    if (mapping.kind !== IdentifierKind.LITERAL) {
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(mapping.canonical)) {
+            errors.push(`${context}: 规范化名称 "${mapping.canonical}" 必须是有效的 ASCII 标识符`);
+        }
+        return;
+    }
+    // 字面量宏：canonical 是要展开的**字符串内容**（不含引号），严格校验以防编译期注入：
+    // 单行、无控制字符、无任何字符串定界符与反斜杠（内容会被包进 lexicon 引号里，含引号可提前
+    // 闭合字符串、逃逸出 token 注入源码；智能引号会被 canonicalize 归一化，放行则展开非幂等）。
+    const content = mapping.canonical ?? '';
+    if (content.length === 0) {
+        errors.push(`${context}: 字面量宏内容不得为空`);
+    }
+    // eslint-disable-next-line no-control-regex
+    if (/[\u0000-\u001F\u007F]/.test(content)) {
+        errors.push(`${context}: 字面量宏内容含控制字符/换行，禁止（防注入）`);
+    }
+    if (/["\\「」『』«»“”‘’]/.test(content)) {
+        errors.push(`${context}: 字面量宏内容不得含引号定界符（" 「 」 『 』 « » “ ” ‘ ’）或反斜杠 "${content}"（防逃逸/注入）`);
+    }
 }
 /**
- * 验证领域词汇表。
+ * 验证领域词汇表（ADR 0051：名称按位置解析）。
+ *
+ * - 规范名必须是 ASCII 标识符；字面量宏内容做注入防护。
+ * - 字段与枚举成员必须有 parent（按父类型分作用域；不支持全局字段）。
+ * - 冲突只在同一角色、同一作用域内判定：NFC 后写法（本地化名或同义词）完全相同却对应不同规范名
+ *   → error。同规范名的多个写法（同义词）、仅大小写不同的写法、不同父类型下的同名字段都合法，
+ *   使用点由解析器按位置精确优先、折叠唯一再判定。
+ * - 字面量宏触发词须全局唯一：canonicalize 在解析前做上下文无关替换，触发词若与任何其它映射同名，
+ *   一个词展开成字符串还是标识符就不可预测。
  *
  * @param vocabulary - 领域词汇表
  * @returns 验证结果
@@ -134,68 +152,40 @@ export function hasIdentifierMapping(index, name) {
 export function validateVocabulary(vocabulary) {
     const errors = [];
     const warnings = [];
-    const seenCanonical = new Set();
-    const seenLocalized = new Set();
-    const seenTrigger = new Map(); // 触发词(localized+aliases) → 是否字面量宏；字面量宏须全局唯一
-    const checkMapping = (mapping, context) => {
-        if (mapping.kind === IdentifierKind.LITERAL) {
-            // 字面量宏：canonical 是要展开的**字符串内容**（不含引号），严格校验以防编译期注入：
-            // 单行、无控制字符、无裸双引号（"）或反斜杠（\）。允许中文/标点/空格等普通可见字符。
-            const content = mapping.canonical ?? '';
-            if (content.length === 0) {
-                errors.push(`${context}: 字面量宏内容不得为空`);
-            }
-            // 禁控制字符（0x00-0x1F 与 0x7F，含 \r \n \t \0）——单行、防注入
-            // eslint-disable-next-line no-control-regex
-            if (/[\u0000-\u001F\u007F]/.test(content)) {
-                errors.push(`${context}: 字面量宏内容含控制字符/换行，禁止（防注入）`);
-            }
-            // 禁任何字符串定界符与反斜杠——内容会被包进 lexicon 引号里，若含该 lexicon（或任何
-            // 已知 lexicon）的引号字符可提前闭合字符串、逃逸出 token 注入源码（Codex 复审 P0）。
-            // 禁：ASCII 双引号 "、反斜杠 \、CJK 直角引号「」『』、书名号/法式引号 « »、
-            // 以及智能/弯引号 “ ” ‘ ’（canonicalize 会先做智能引号归一化，若放行则展开非幂等，
-            // 重编译 canonical 输出会因 unterminated-string 失败）。
-            if (/["\\「」『』«»“”‘’]/.test(content)) {
-                errors.push(`${context}: 字面量宏内容不得含引号定界符（" 「 」 『 』 « » “ ” ‘ ’）或反斜杠 "${content}"（防逃逸/注入）`);
-            }
-        }
-        else {
-            // 普通标识符：canonical 必须是有效 ASCII 标识符（不变）
-            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(mapping.canonical)) {
-                errors.push(`${context}: 规范化名称 "${mapping.canonical}" 必须是有效的 ASCII 标识符`);
-            }
-        }
-        // 检查重复
-        const canonicalKey = `${mapping.kind}:${mapping.canonical.toLowerCase()}`;
-        if (seenCanonical.has(canonicalKey)) {
-            errors.push(`${context}: 规范化名称 "${mapping.canonical}" 重复`);
+    // 作用域内写法（NFC）→ 首个映射的规范名与位置，用于判定同写法不同规范名
+    const seenWritten = new Map();
+    const seenTrigger = new Map(); // 触发词(localized+aliases) → 是否字面量宏
+    const checkScopeConflict = (mapping, context, written) => {
+        const scope = scopeOf(mapping);
+        if (scope === undefined)
+            return;
+        const key = `${scope}\u0000${written}`;
+        const prev = seenWritten.get(key);
+        if (prev === undefined) {
+            seenWritten.set(key, { canonical: mapping.canonical, context });
         }
-        seenCanonical.add(canonicalKey);
-        const localizedKey = `${mapping.kind}:${mapping.localized.toLowerCase()}`;
-        if (seenLocalized.has(localizedKey)) {
-            warnings.push(`${context}: 本地化名称 "${mapping.localized}" 重复，可能导致歧义`);
+        else if (prev.canonical !== mapping.canonical) {
+            errors.push(`${context}: 写法 "${written}" 在 ${scope} 中对应多个规范名（${prev.canonical}、${mapping.canonical}，另见 ${prev.context}）`);
         }
-        seenLocalized.add(localizedKey);
-        // 字面量宏触发词隔离（Codex 复审 P0）：canonicalizer 上下文无关替换——**字面量宏**
-        // 展开成字符串、普通标识符展开成标识符，二者语义天差地别。故要求：字面量宏的触发词
-        // （localized + aliases）不得与**任何其它映射**（含普通标识符、其它字面量宏）的触发词
-        // 冲突，否则一个词到底展开成字符串还是标识符不可预测。普通标识符之间同名（不同 kind，
-        // 靠上下文消歧，如 struct/field 同名）仍是既有的 warning 行为，不动。
+    };
+    const checkTrigger = (mapping, context, trigger) => {
         const isLit = mapping.kind === IdentifierKind.LITERAL;
-        const triggers = [mapping.localized, ...(mapping.aliases ?? [])];
-        for (const t of triggers) {
-            const key = t.toLowerCase();
-            const prev = seenTrigger.get(key);
-            if (prev !== undefined && (prev || isLit)) {
-                // prev 是字面量宏、或当前是字面量宏 → 字面量宏与他人触发词冲突，error。
-                errors.push(`${context}: 触发词 "${t}" 与另一条映射冲突（字面量宏触发词须全局唯一，防"字符串 vs 标识符"替换歧义）`);
-            }
-            // 记录：值=是否字面量宏（一旦记为 true 不回退，保证后续普通标识符命中同名也报错）
-            seenTrigger.set(key, (prev ?? false) || isLit);
+        const key = trigger.toLowerCase();
+        const prev = seenTrigger.get(key);
+        if (prev !== undefined && (prev || isLit)) {
+            errors.push(`${context}: 触发词 "${trigger}" 与另一条映射冲突（字面量宏触发词须全局唯一，防"字符串 vs 标识符"替换歧义）`);
         }
-        // 检查字段映射是否有父结构体
-        if (mapping.kind === IdentifierKind.FIELD && !mapping.parent) {
-            warnings.push(`${context}: 字段 "${mapping.localized}" 没有指定父结构体`);
+        // 一旦记为字面量宏不回退，保证后续普通标识符命中同名也报错
+        seenTrigger.set(key, (prev ?? false) || isLit);
+    };
+    const checkMapping = (mapping, context) => {
+        checkCanonical(mapping, context, errors);
+        const missingParent = missingParentMessage(mapping, context);
+        if (missingParent)
+            errors.push(missingParent);
+        for (const trigger of [mapping.localized, ...(mapping.aliases ?? [])]) {
+            checkScopeConflict(mapping, context, nfc(trigger));
+            checkTrigger(mapping, context, trigger);
         }
     };
     vocabulary.structs.forEach((m, i) => checkMapping(m, `structs[${i}]`));

package/dist/src/config/lexicons/identifiers/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/config/lexicons/identifiers/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/config/lexicons/identifiers/types.ts"],"names":[],"mappings":"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"}

package/dist/src/config/lexicons/lsp-ui-texts.d.ts

@@ -32,6 +32,13 @@ export interface LspUiTexts {
     readonly hintPrefix: string;
     readonly fixPrefix: string;
     readonly missingModuleHeader: string;
+    /** 名称解析悬停（ADR 0051）：`写法 → 规范名（角色 · 父名）` 的角色名与括号 */
+    readonly resolutionRoleType: string;
+    readonly resolutionRoleField: string;
+    readonly resolutionRoleMember: string;
+    readonly resolutionRoleFunction: string;
+    readonly resolutionOpen: string;
+    readonly resolutionClose: string;
 }
 /**
  * 从 JSON overlay 数据注册 LSP UI 文本（覆盖内联 fallback）。

package/dist/src/config/lexicons/lsp-ui-texts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-ui-texts.d.ts","sourceRoot":"","sources":["../../../../src/config/lexicons/lsp-ui-texts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,iBAAiB;AACjB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IAErC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACtC;AAiED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAElH;AAED,iCAAiC;AACjC,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,CAGrE"}
+{"version":3,"file":"lsp-ui-texts.d.ts","sourceRoot":"","sources":["../../../../src/config/lexicons/lsp-ui-texts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,iBAAiB;AACjB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IAErC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IAErC,mDAAmD;IACnD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AA+ED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAElH;AAED,iCAAiC;AACjC,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,CAGrE"}

package/dist/src/config/lexicons/lsp-ui-texts.js

@@ -31,6 +31,12 @@ const EN_US_UI = {
     hintPrefix: 'Hint:',
     fixPrefix: 'Fix:',
     missingModuleHeader: 'Missing module header. Add "Module <name>."',
+    resolutionRoleType: 'type',
+    resolutionRoleField: 'field',
+    resolutionRoleMember: 'enum member',
+    resolutionRoleFunction: 'function',
+    resolutionOpen: ' (',
+    resolutionClose: ')',
 };
 /** 内联 fallback：中文 UI 文本 */
 const ZH_CN_UI = {
@@ -55,6 +61,12 @@ const ZH_CN_UI = {
     hintPrefix: '提示：',
     fixPrefix: '修复：',
     missingModuleHeader: '缺少模块头。请添加 "模块 <名称>。"',
+    resolutionRoleType: '类型',
+    resolutionRoleField: '字段',
+    resolutionRoleMember: '枚举成员',
+    resolutionRoleFunction: '函数',
+    resolutionOpen: '（',
+    resolutionClose: '）',
 };
 const UI_BY_LEXICON = {
     'en-US': EN_US_UI,

package/dist/src/config/lexicons/lsp-ui-texts.js.map

@@ -1 +1 @@
-{"version":3,"file":"lsp-ui-texts.js","sourceRoot":"","sources":["../../../../src/config/lexicons/lsp-ui-texts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA+BrD,2BAA2B;AAC3B,MAAM,QAAQ,GAAyB;IACrC,YAAY,EAAE,UAAU;IACxB,iBAAiB,EAAE,oBAAoB;IACvC,oBAAoB,EAAE,wCAAwC;IAC9D,cAAc,EAAE,iBAAiB;IACjC,iBAAiB,EAAE,gCAAgC;IACnD,kBAAkB,EAAE,qBAAqB;IACzC,qBAAqB,EAAE,uBAAuB;IAE9C,aAAa,EAAE,UAAU;IACzB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,OAAO;IACnB,cAAc,EAAE,WAAW;IAC3B,mBAAmB,EAAE,iBAAiB;IAEtC,gBAAgB,EAAE,UAAU;IAC5B,SAAS,EAAE,2HAA2H;IACtI,SAAS,EAAE,iHAAiH;IAC5H,SAAS,EAAE,0EAA0E;IACrF,aAAa,EAAE,6DAA6D;IAE5E,UAAU,EAAE,OAAO;IACnB,SAAS,EAAE,MAAM;IAEjB,mBAAmB,EAAE,6CAA6C;CACnE,CAAC;AAEF,2BAA2B;AAC3B,MAAM,QAAQ,GAAyB;IACrC,YAAY,EAAE,KAAK;IACnB,iBAAiB,EAAE,MAAM;IACzB,oBAAoB,EAAE,YAAY;IAClC,cAAc,EAAE,MAAM;IACtB,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,MAAM;IAC1B,qBAAqB,EAAE,MAAM;IAE7B,aAAa,EAAE,IAAI;IACnB,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,MAAM;IAClB,cAAc,EAAE,IAAI;IACpB,mBAAmB,EAAE,MAAM;IAE3B,gBAAgB,EAAE,QAAQ;IAC1B,SAAS,EAAE,gEAAgE;IAC3E,SAAS,EAAE,kDAAkD;IAC7D,SAAS,EAAE,8BAA8B;IACzC,aAAa,EAAE,oCAAoC;IAEnD,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAEhB,mBAAmB,EAAE,sBAAsB;CAC5C,CAAC;AAEF,MAAM,aAAa,GAAyC;IAC1D,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,SAAiB,EAAE,OAA+C;IAC1G,aAAa,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;AACrD,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,aAAa,CAAC,OAAiB;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAC;IAC9B,OAAO,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"lsp-ui-texts.js","sourceRoot":"","sources":["../../../../src/config/lexicons/lsp-ui-texts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAuCrD,2BAA2B;AAC3B,MAAM,QAAQ,GAAyB;IACrC,YAAY,EAAE,UAAU;IACxB,iBAAiB,EAAE,oBAAoB;IACvC,oBAAoB,EAAE,wCAAwC;IAC9D,cAAc,EAAE,iBAAiB;IACjC,iBAAiB,EAAE,gCAAgC;IACnD,kBAAkB,EAAE,qBAAqB;IACzC,qBAAqB,EAAE,uBAAuB;IAE9C,aAAa,EAAE,UAAU;IACzB,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,OAAO;IACnB,cAAc,EAAE,WAAW;IAC3B,mBAAmB,EAAE,iBAAiB;IAEtC,gBAAgB,EAAE,UAAU;IAC5B,SAAS,EAAE,2HAA2H;IACtI,SAAS,EAAE,iHAAiH;IAC5H,SAAS,EAAE,0EAA0E;IACrF,aAAa,EAAE,6DAA6D;IAE5E,UAAU,EAAE,OAAO;IACnB,SAAS,EAAE,MAAM;IAEjB,mBAAmB,EAAE,6CAA6C;IAElE,kBAAkB,EAAE,MAAM;IAC1B,mBAAmB,EAAE,OAAO;IAC5B,oBAAoB,EAAE,aAAa;IACnC,sBAAsB,EAAE,UAAU;IAClC,cAAc,EAAE,IAAI;IACpB,eAAe,EAAE,GAAG;CACrB,CAAC;AAEF,2BAA2B;AAC3B,MAAM,QAAQ,GAAyB;IACrC,YAAY,EAAE,KAAK;IACnB,iBAAiB,EAAE,MAAM;IACzB,oBAAoB,EAAE,YAAY;IAClC,cAAc,EAAE,MAAM;IACtB,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,MAAM;IAC1B,qBAAqB,EAAE,MAAM;IAE7B,aAAa,EAAE,IAAI;IACnB,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,MAAM;IAClB,cAAc,EAAE,IAAI;IACpB,mBAAmB,EAAE,MAAM;IAE3B,gBAAgB,EAAE,QAAQ;IAC1B,SAAS,EAAE,gEAAgE;IAC3E,SAAS,EAAE,kDAAkD;IAC7D,SAAS,EAAE,8BAA8B;IACzC,aAAa,EAAE,oCAAoC;IAEnD,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAEhB,mBAAmB,EAAE,sBAAsB;IAE3C,kBAAkB,EAAE,IAAI;IACxB,mBAAmB,EAAE,IAAI;IACzB,oBAAoB,EAAE,MAAM;IAC5B,sBAAsB,EAAE,IAAI;IAC5B,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,GAAG;CACrB,CAAC;AAEF,MAAM,aAAa,GAAyC;IAC1D,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,SAAiB,EAAE,OAA+C;IAC1G,aAAa,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;AACrD,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,aAAa,CAAC,OAAiB;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAC;IAC9B,OAAO,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;AAC/C,CAAC"}

package/dist/src/config/semantic.d.ts

@@ -261,6 +261,11 @@ export declare function isKeyword(word: string, lexicon?: Lexicon): boolean;
  * Core IR 中使用 `Call(Name('await'))` 表示异步操作。
  */
 export declare const BUILTIN_AWAIT = "await";
+/**
+ * 内置运算符集合：解析器降为 `Call(Name(op))` 的运算符名。解释器按此分派，
+ * 名称解析（R2）据此把它们排除在待解析名字之外。
+ */
+export declare const BUILTIN_OPS: ReadonlySet<string>;
 /**
  * 验证是否为内置异步函数。
  *

package/dist/src/config/semantic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../../src/config/semantic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH;;;;;;;GAOG;AACH,oBAAY,MAAM;IAChB,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAED;;;;;GAKG;AACH,QAAA,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAItC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,OAAO,UAAU,CAE/E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,IAAI,MAAM,EAAE,CAExC;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAQxC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,SAAS,MAAM,EAEzC,CAAC;AAMF;;;;GAIG;AACH,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,6CAA6C;IAC7C,OAAO,YAAY;IACnB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,iCAAiC;IACjC,MAAM,WAAW;IACjB,yCAAyC;IACzC,OAAO,YAAY;IACnB,QAAQ,YAAY;IACpB,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAYjE,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAO3E;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAEnD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,GAAG,IAAI,GAAG,KAAK,CAAC;AAEjD,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAajF,CAAC;AAEF,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEjE;AAED,0CAA0C;AAC1C,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEhE;AAMD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0FL,CAAC;AAEX;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAMlE;AAMD;;;;GAIG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD"}
+{"version":3,"file":"semantic.d.ts","sourceRoot":"","sources":["../../../src/config/semantic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH;;;;;;;GAOG;AACH,oBAAY,MAAM;IAChB,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAED;;;;;GAKG;AACH,QAAA,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAItC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,OAAO,UAAU,CAE/E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,IAAI,MAAM,EAAE,CAExC;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAQxC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,SAAS,MAAM,EAEzC,CAAC;AAMF;;;;GAIG;AACH,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,6CAA6C;IAC7C,OAAO,YAAY;IACnB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,iCAAiC;IACjC,MAAM,WAAW;IACjB,yCAAyC;IACzC,OAAO,YAAY;IACnB,QAAQ,YAAY;IACpB,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAYjE,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAO3E;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAEnD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,GAAG,IAAI,GAAG,KAAK,CAAC;AAEjD,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAajF,CAAC;AAEF,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEjE;AAED,0CAA0C;AAC1C,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEhE;AAMD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0FL,CAAC;AAEX;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAMlE;AAMD;;;;GAIG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,MAAM,CAO1C,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/dist/src/config/semantic.js

@@ -334,6 +334,18 @@ export function isKeyword(word, lexicon) {
  * Core IR 中使用 `Call(Name('await'))` 表示异步操作。
  */
 export const BUILTIN_AWAIT = 'await';
+/**
+ * 内置运算符集合：解析器降为 `Call(Name(op))` 的运算符名。解释器按此分派，
+ * 名称解析（R2）据此把它们排除在待解析名字之外。
+ */
+export const BUILTIN_OPS = new Set([
+    '+', '-', '*', '/', '//', '%',
+    // 比较运算符必须与 evalBinaryOp 的 switch 分支一一对应。遗漏 '!='
+    // 会让 `not equal to`（降低为 Call(Name('!='), …)）越过内置分发、
+    // 落入用户函数查找，从而抛出 "Undefined function '!='"。
+    '>', '<', '>=', '<=', '==', '!=',
+    'and', 'or', 'not',
+]);
 /**
  * 验证是否为内置异步函数。
  *

package/dist/src/config/semantic.js.map

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

package/dist/src/core/core_ir.d.ts

@@ -40,6 +40,8 @@ export declare const Core: {
     List: (type: CoreTypes.Type) => CoreTypes.List;
     Map: (key: CoreTypes.Type, val: CoreTypes.Type) => CoreTypes.Map;
     TypeApp: (base: string, args: readonly CoreTypes.Type[]) => CoreTypes.TypeApp;
+    /** 与 Java CoreModel.FuncType 一致：只有 params / ret，不带 effects */
+    FuncType: (params: readonly CoreTypes.Type[], ret: CoreTypes.Type) => CoreTypes.FuncType;
     TypeVar: (name: string) => CoreTypes.TypeVar;
     Pii: (baseType: CoreTypes.Type, sensitivity: "L1" | "L2" | "L3", category: import("../types.js").PiiDataCategory) => CoreTypes.PiiType;
     PatNull: () => CoreTypes.PatNull;

package/dist/src/core/core_ir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core_ir.d.ts","sourceRoot":"","sources":["../../../src/core/core_ir.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core_ir.d.ts","sourceRoot":"","sources":["../../../src/core/core_ir.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAO,MAAM,IAAI;mBAGA,MAAM,GAAG,IAAI,SAAS,SAAS,SAAS,CAAC,WAAW,EAAE,YAAY,MAAM,KAAG,SAAS,CAAC,MAAM;mBAM3F,MAAM,UAAU,MAAM,GAAG,IAAI,YAAY,MAAM,GAAG,IAAI,KAAG,SAAS,CAAC,MAAM;iBAM3E,MAAM,UAAU,SAAS,SAAS,CAAC,KAAK,EAAE,KAAG,SAAS,CAAC,IAAI;iBAK3D,MAAM,YAAY,SAAS,MAAM,EAAE,KAAG,SAAS,CAAC,IAAI;iBAMzD,MAAM,cACA,SAAS,MAAM,EAAE,GAAG,SAAS,UACjC,SAAS,SAAS,CAAC,SAAS,EAAE,OACjC,SAAS,CAAC,IAAI,WACV,SAAS,MAAM,EAAE,QACpB,SAAS,CAAC,KAAK,eACT,SAAS,OAAO,aAAa,EAAE,cAAc,EAAE,+CAE5C,SAAS,MAAM,EAAE,oBACd,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,gBAC9C,SAAS,OAAO,aAAa,EAAE,UAAU,EAAE,KACvD,SAAS,CAAC,IAAI;wBAeG,SAAS,SAAS,CAAC,SAAS,EAAE,KAAG,SAAS,CAAC,KAAK;wBAIhD,SAAS,SAAS,CAAC,SAAS,EAAE,KAAG,SAAS,CAAC,KAAK;gBAMxD,MAAM,QAAQ,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,GAAG;gBAClD,MAAM,QAAQ,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,GAAG;mBAC/C,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,MAAM;eAE9C,SAAS,CAAC,UAAU,aACf,SAAS,CAAC,KAAK,aACf,SAAS,CAAC,KAAK,GAAG,IAAI,KAChC,SAAS,CAAC,EAAE;kBACD,SAAS,CAAC,UAAU,SAAS,SAAS,SAAS,CAAC,IAAI,EAAE,KAAG,SAAS,CAAC,KAAK;oBAKtE,SAAS,CAAC,OAAO,QAAQ,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,KAAG,SAAS,CAAC,IAAI;kBAK9E,MAAM,QAAQ,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,KAAK;kBAKpD,SAAS,MAAM,EAAE,KAAG,SAAS,CAAC,IAAI;sBAEvC,SAAS,SAAS,CAAC,IAAI,EAAE,cACpB,SAAS,OAAO,aAAa,EAAE,cAAc,EAAE,UACnD,SAAS,CAAC,WAAW,YACnB,SAAS,CAAC,OAAO,KAC1B,SAAS,CAAC,QAAQ;iBAQb,MAAM,QACN,SAAS,CAAC,KAAK,cACT,SAAS,OAAO,aAAa,EAAE,cAAc,EAAE,eAC9C,SAAS,CAAC,KAAK,iBACd,SAAS,MAAM,EAAE,KAC9B,SAAS,CAAC,IAAI;iBAUJ,MAAM,KAAG,SAAS,CAAC,IAAI;kBACtB,OAAO,KAAG,SAAS,CAAC,IAAI;iBACzB,MAAM,KAAG,SAAS,CAAC,GAAG;kBACrB,MAAM,KAAG,SAAS,CAAC,IAAI;oBACrB,MAAM,KAAG,SAAS,CAAC,MAAM;qBACxB,MAAM,KAAG,SAAS,CAAC,OAAO;oBAC3B,MAAM,KAAG,SAAS,CAAC,MAAM;gBAC/B,SAAS,CAAC,IAAI;mBACT,SAAS,CAAC,UAAU,QAAQ,SAAS,SAAS,CAAC,UAAU,EAAE,KAAG,SAAS,CAAC,IAAI;0BAM/E,MAAM,UACR,SAAS,SAAS,CAAC,cAAc,EAAE,KAC1C,SAAS,CAAC,SAAS;eACX,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,EAAE;gBAClC,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,GAAG;iBACnC,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,IAAI;gBACxC,SAAS,CAAC,IAAI;qBAGP,MAAM,KAAG,SAAS,CAAC,QAAQ;kBAC9B,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,KAAK;mBAC/B,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,MAAM;iBACnC,SAAS,CAAC,IAAI,OAAO,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,MAAM;iBAKtD,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,IAAI;eACjC,SAAS,CAAC,IAAI,OAAO,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,GAAG;oBAC9C,MAAM,QAAQ,SAAS,SAAS,CAAC,IAAI,EAAE,KAAG,SAAS,CAAC,OAAO;IAK3E,8DAA8D;uBAC3C,SAAS,SAAS,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,IAAI,KAAG,SAAS,CAAC,QAAQ;oBAKtE,MAAM,KAAG,SAAS,CAAC,OAAO;oBAE9B,SAAS,CAAC,IAAI,eACX,IAAI,GAAG,IAAI,GAAG,IAAI,YACrB,OAAO,aAAa,EAAE,eAAe,KAC9C,SAAS,CAAC,OAAO;mBAQP,SAAS,CAAC,OAAO;kBAChB,SAAS,CAAC,UAAU,KAAG,SAAS,CAAC,KAAK;mBAM5C,SAAS,CAAC,UAAU,SACnB,SAAS,CAAC,UAAU,SACpB,SAAS,CAAC,UAAU,KAC1B,SAAS,CAAC,MAAM;wBAOC,SAAS,SAAS,CAAC,UAAU,EAAE,KAAG,SAAS,CAAC,OAAO;wBAK3D,MAAM,UACT,SAAS,MAAM,EAAE,SACjB,SAAS,SAAS,CAAC,OAAO,EAAE,KAClC,SAAS,CAAC,OAAO;oBAMJ,MAAM,KAAG,SAAS,CAAC,OAAO;oBAC1B,MAAM,KAAG,SAAS,CAAC,MAAM;CAC1C,CAAC"}

package/dist/src/core/core_ir.js

@@ -120,6 +120,12 @@ export const Core = {
         base,
         args,
     }),
+    /** 与 Java CoreModel.FuncType 一致：只有 params / ret，不带 effects */
+    FuncType: (params, ret) => ({
+        kind: 'FuncType',
+        params,
+        ret,
+    }),
     TypeVar: (name) => ({ kind: 'TypeVar', name }),
     Pii: (baseType, sensitivity, category) => ({
         kind: 'PiiType',

package/dist/src/core/core_ir.js.map

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