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

package/dist/src/ai/validator.js

@@ -1,14 +1,11 @@
-import { canonicalize } from '../frontend/canonicalizer.js';
-import { lex } from '../frontend/lexer.js';
-import { parse } from '../parser.js';
-import { lowerModule } from '../lower_to_core.js';
+import { parseSource, resolveAndLower } from '../compile-pipeline.js';
 import { typecheckModule } from '../typecheck.js';
 /**
  * Policy Validator
  *
  * 封装 policy-converter 的编译流程，提供字符串输入的验证接口。
  * 验证 LLM 生成的 CNL 代码是否通过完整的编译管线：
- * canonicalize → lex → parse → lowerModule → typecheck
+ * canonicalize → lex → parse → R1 → lowerModule → R2 → typecheck（名称解析见 ADR 0051）
  */
 export class PolicyValidator {
     /**
@@ -19,10 +16,8 @@ export class PolicyValidator {
      */
     async validate(cnlCode) {
         try {
-            // 编译管线：CNL → Canonical → Tokens → AST → Core IR
-            const canonical = canonicalize(cnlCode);
-            const tokens = lex(canonical);
-            const { ast, diagnostics: parseDiags } = parse(tokens);
+            // 编译管线：CNL → Canonical → Tokens → AST
+            const { ast, diagnostics: parseDiags } = parseSource(cnlCode);
             // 解析错误直接返回
             if (parseDiags.length > 0) {
                 return {
@@ -35,9 +30,14 @@ export class PolicyValidator {
                     })),
                 };
             }
-            const coreIR = lowerModule(ast);
-            // 类型检查
-            const diagnostics = typecheckModule(coreIR);
+            // 名称解析 R1 → lower → R2；任一 E8xx 时不做类型检查、不返回 IR
+            const resolved = resolveAndLower(ast);
+            if (resolved.diagnostics.some(d => d.severity === 'error')) {
+                return { valid: false, diagnostics: [...resolved.diagnostics] };
+            }
+            const coreIR = resolved.core;
+            // 类型检查（名称解析的 warning 一并返回）
+            const diagnostics = [...resolved.diagnostics, ...typecheckModule(coreIR)];
             // 检查是否有错误（忽略 warning 和 info）
             const hasErrors = diagnostics.some(d => d.severity === 'error');
             if (hasErrors) {

package/dist/src/ai/validator.js.map

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

package/dist/src/ast/ast.d.ts

@@ -1,4 +1,5 @@
 import type * as AST from '../types.js';
+export type { Resolved, ResolvedRole } from '../types.js';
 export declare const Node: {
     Module: (name: string | null, profile: string | null, decls: readonly AST.Declaration[]) => AST.Module;
     Import: (name: string, asName: string | null, version?: number | null) => AST.Import;
@@ -40,6 +41,7 @@ export declare const Node: {
     List: (type: AST.Type) => AST.List;
     Map: (key: AST.Type, val: AST.Type) => AST.Map;
     TypeApp: (base: string, args: readonly AST.Type[]) => AST.TypeApp;
+    FuncType: (params: readonly AST.Type[], ret: AST.Type) => AST.FuncType;
     TypeVar: (name: string) => AST.TypeVar;
     EffectVar: (name: string) => AST.EffectVar;
     TypePii: (baseType: AST.Type, sensitivity: AST.PiiSensitivityLevel, category: AST.PiiDataCategory) => AST.TypePii;

package/dist/src/ast/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast/ast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,GAAG,MAAM,aAAa,CAAC;AASxC,eAAO,MAAM,IAAI;mBACA,MAAM,GAAG,IAAI,WAAW,MAAM,GAAG,IAAI,SAAS,SAAS,GAAG,CAAC,WAAW,EAAE,KAAG,GAAG,CAAC,MAAM;mBAOrF,MAAM,UAAU,MAAM,GAAG,IAAI,YAAY,MAAM,GAAG,IAAI,KAAG,GAAG,CAAC,MAAM;iBAOrE,MAAM,UAAU,SAAS,GAAG,CAAC,KAAK,EAAE,KAAG,GAAG,CAAC,IAAI;iBAM/C,MAAM,YAAY,SAAS,MAAM,EAAE,KAAG,GAAG,CAAC,IAAI;iBAOnD,MAAM,cACA,SAAS,MAAM,EAAE,UACrB,SAAS,GAAG,CAAC,SAAS,EAAE,WACvB,GAAG,CAAC,IAAI,WACR,SAAS,MAAM,EAAE,cACd,SAAS,GAAG,CAAC,cAAc,EAAE,sBACrB,OAAO,QACrB,GAAG,CAAC,KAAK,GAAG,IAAI,iBACP,SAAS,MAAM,EAAE,gBACnB,SAAS,GAAG,CAAC,UAAU,EAAE,KACrC,GAAG,CAAC,IAAI;wBAeS,SAAS,GAAG,CAAC,SAAS,EAAE,KAAG,GAAG,CAAC,KAAK;gBAK5C,MAAM,QAAQ,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,GAAG;gBAMtC,MAAM,QAAQ,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,GAAG;mBAMnC,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,MAAM;eAK/B,GAAG,CAAC,UAAU,aAAa,GAAG,CAAC,KAAK,aAAa,GAAG,CAAC,KAAK,GAAG,IAAI,KAAG,GAAG,CAAC,EAAE;kBAOvE,GAAG,CAAC,UAAU,SAAS,SAAS,GAAG,CAAC,IAAI,EAAE,KAAG,GAAG,CAAC,KAAK;oBAMpD,GAAG,CAAC,OAAO,QAAQ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,KAAG,GAAG,CAAC,IAAI;kBAMtD,MAAM,QAAQ,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,KAAK;kBAMxC,SAAS,MAAM,EAAE,KAAG,GAAG,CAAC,IAAI;sBAMjC,SAAS,GAAG,CAAC,QAAQ,EAAE,UACtB,GAAG,CAAC,WAAW,YACb,GAAG,CAAC,OAAO,KACpB,GAAG,CAAC,YAAY;iBAQX,MAAM,QACN,GAAG,CAAC,KAAK,eACF,GAAG,CAAC,KAAK,iBACR,SAAS,MAAM,EAAE,KAC9B,GAAG,CAAC,QAAQ;iBAUF,MAAM,KAAG,GAAG,CAAC,IAAI;kBAChB,OAAO,KAAG,GAAG,CAAC,IAAI;gBACtB,GAAG,CAAC,IAAI;iBACL,MAAM,KAAG,GAAG,CAAC,GAAG;kBACf,MAAM,KAAG,GAAG,CAAC,IAAI;oBACf,MAAM,KAAG,GAAG,CAAC,MAAM;qBAClB,MAAM,KAAG,GAAG,CAAC,OAAO;oBACrB,MAAM,KAAG,GAAG,CAAC,MAAM;mBACpB,GAAG,CAAC,UAAU,QAAQ,SAAS,GAAG,CAAC,UAAU,EAAE,KAAG,GAAG,CAAC,IAAI;0BAMnD,MAAM,UAAU,SAAS,GAAG,CAAC,cAAc,EAAE,KAAG,GAAG,CAAC,SAAS;eAMxE,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,EAAE;gBACtB,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,GAAG;iBACvB,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,IAAI;gBAC5B,GAAG,CAAC,IAAI;qBACD,SAAS,GAAG,CAAC,SAAS,EAAE,WAAW,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,KAAK,KAAG,GAAG,CAAC,MAAM;kBAO5E,GAAG,CAAC,UAAU,KAAG,GAAG,CAAC,KAAK;wBAEpB,GAAG,CAAC,UAAU,EAAE,KAAG,GAAG,CAAC,OAAO;qBAGjC,MAAM,KAAG,GAAG,CAAC,QAAQ;kBACxB,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,KAAK;mBACnB,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,MAAM;iBACvB,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,MAAM;iBAMpC,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,IAAI;eACrB,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,IAAI,KAAG,GAAG,CAAC,GAAG;oBAM5B,MAAM,QAAQ,SAAS,GAAG,CAAC,IAAI,EAAE,KAAG,GAAG,CAAC,OAAO;oBAM/C,MAAM,KAAG,GAAG,CAAC,OAAO;sBAClB,MAAM,KAAG,GAAG,CAAC,SAAS;wBAE5B,GAAG,CAAC,IAAI,eACL,GAAG,CAAC,mBAAmB,YAC1B,GAAG,CAAC,eAAe,KAC5B,GAAG,CAAC,OAAO;uBAQG,GAAG,CAAC,WAAW;4BAEpB,MAAM,SACT,SAAS,MAAM,EAAE,SACjB,SAAS,GAAG,CAAC,OAAO,EAAE,KAC5B,GAAG,CAAC,WAAW;wBAOE,MAAM,KAAG,GAAG,CAAC,WAAW;wBACxB,MAAM,KAAG,GAAG,CAAC,UAAU;CAK5C,CAAC"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast/ast.ts"],"names":[],"mappings":"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"}

package/dist/src/ast/ast.js

@@ -171,6 +171,12 @@ export const Node = {
         args,
         span: createEmptySpan(),
     }),
+    FuncType: (params, ret) => ({
+        kind: 'FuncType',
+        params,
+        ret,
+        span: createEmptySpan(),
+    }),
     TypeVar: (name) => ({ kind: 'TypeVar', name, span: createEmptySpan() }),
     EffectVar: (name) => ({ kind: 'EffectVar', name, span: createEmptySpan() }),
     TypePii: (baseType, sensitivity, category) => ({

package/dist/src/ast/ast.js.map

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

package/dist/src/ast/type-nodes.d.ts

@@ -0,0 +1,25 @@
+/**
+ * AST 类型树遍历（名称解析与格式化器共用）。
+ *
+ * 判断函数的类型参数是显式 `of T` 还是解析器推断的隐式参数，两处都要看签名里的
+ * 类型写法；共用同一遍历，避免两套递归各自漏掉新类型节点（如 FuncType）。
+ */
+import type { Func, Span, Type } from '../types.js';
+/** 先序遍历类型树的全部节点（含自身） */
+export declare function typeNodes(t: Type): Generator<Type>;
+/** 函数签名中类型参数相关的写法 */
+export interface SignatureTypeNames {
+    /** 以 TypeVar 出现的名字：只有显式 `of T` 的使用才会解析成 TypeVar */
+    readonly typeVars: ReadonlySet<string>;
+    /** 以 TypeName 出现的名字及其第一处位置：隐式类型参数全部来自这里 */
+    readonly firstTypeNameUse: ReadonlyMap<string, Span>;
+}
+/** 收集签名（参数类型 + 返回类型）中的 TypeVar 与 TypeName 写法 */
+export declare function signatureTypeNames(f: Pick<Func, 'params' | 'retType'>): SignatureTypeNames;
+/**
+ * 类型参数是否显式声明（`of T`）。隐式参数由解析器从签名里的 TypeName 推断，
+ * 所以：签名里以 TypeVar 出现，或签名里根本没有它的 TypeName 写法（只在函数体内使用、
+ * 或未使用）的，都只能来自显式 `of`。
+ */
+export declare function isExplicitTypeParam(names: SignatureTypeNames, name: string): boolean;
+//# sourceMappingURL=type-nodes.d.ts.map

package/dist/src/ast/type-nodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-nodes.d.ts","sourceRoot":"","sources":["../../../src/ast/type-nodes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AA8BpD,wBAAwB;AACxB,wBAAiB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAGnD;AAED,qBAAqB;AACrB,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,2CAA2C;IAC3C,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CACtD;AAED,gDAAgD;AAChD,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,kBAAkB,CAU1F;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpF"}

package/dist/src/ast/type-nodes.js

@@ -0,0 +1,56 @@
+/** 直接子类型（不含自身） */
+function childTypes(t) {
+    switch (t.kind) {
+        case 'TypeApp':
+            return t.args;
+        case 'Maybe':
+        case 'Option':
+        case 'List':
+            return [t.type];
+        case 'Result':
+            return [t.ok, t.err];
+        case 'Map':
+            return [t.key, t.val];
+        case 'FuncType':
+            return [...t.params, t.ret];
+        case 'TypePii':
+            return [t.baseType];
+        case 'TypeName':
+        case 'TypeVar':
+        case 'EffectVar':
+            return [];
+        default: {
+            const never = t;
+            throw new Error(`未处理的类型节点：${JSON.stringify(never)}`);
+        }
+    }
+}
+/** 先序遍历类型树的全部节点（含自身） */
+export function* typeNodes(t) {
+    yield t;
+    for (const child of childTypes(t))
+        yield* typeNodes(child);
+}
+/** 收集签名（参数类型 + 返回类型）中的 TypeVar 与 TypeName 写法 */
+export function signatureTypeNames(f) {
+    const typeVars = new Set();
+    const firstTypeNameUse = new Map();
+    for (const root of [...f.params.map((p) => p.type), f.retType]) {
+        for (const t of typeNodes(root)) {
+            if (t.kind === 'TypeVar')
+                typeVars.add(t.name);
+            else if (t.kind === 'TypeName' && !firstTypeNameUse.has(t.name))
+                firstTypeNameUse.set(t.name, t.span);
+        }
+    }
+    return { typeVars, firstTypeNameUse };
+}
+/**
+ * 类型参数是否显式声明（`of T`）。隐式参数由解析器从签名里的 TypeName 推断，
+ * 所以：签名里以 TypeVar 出现，或签名里根本没有它的 TypeName 写法（只在函数体内使用、
+ * 或未使用）的，都只能来自显式 `of`。
+ */
+export function isExplicitTypeParam(names, name) {
+    return names.typeVars.has(name) || !names.firstTypeNameUse.has(name);
+}
+//# sourceMappingURL=type-nodes.js.map

package/dist/src/ast/type-nodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-nodes.js","sourceRoot":"","sources":["../../../src/ast/type-nodes.ts"],"names":[],"mappings":"AAQA,kBAAkB;AAClB,SAAS,UAAU,CAAC,CAAO;IACzB,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,IAAI,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM;YACT,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QACvB,KAAK,KAAK;YACR,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QACxB,KAAK,UAAU;YACb,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,WAAW;YACd,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,KAAK,GAAU,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC;AAED,wBAAwB;AACxB,MAAM,SAAS,CAAC,CAAC,SAAS,CAAC,CAAO;IAChC,MAAM,CAAC,CAAC;IACR,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC;QAAE,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC7D,CAAC;AAUD,gDAAgD;AAChD,MAAM,UAAU,kBAAkB,CAAC,CAAmC;IACpE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAgB,CAAC;IACjD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;gBAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;iBAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;gBAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACxG,CAAC;IACH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAyB,EAAE,IAAY;IACzE,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC"}

package/dist/src/browser.d.ts

@@ -9,7 +9,7 @@
  *
  * **Compilation Pipeline**:
  * ```
- * CNL Source → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck
+ * CNL 源码 → canonicalize → lex → parse → AST → R1 名称解析 → lowerModule → R2 名称解析 → Core IR → typecheck
  * ```
  *
  * @example Basic compilation
@@ -29,7 +29,6 @@
 export { canonicalize } from './frontend/canonicalizer.js';
 export { lex } from './frontend/lexer.js';
 export { parse } from './parser.js';
-export { lowerModule } from './lower_to_core.js';
 export { createKeywordTranslator, buildKeywordTranslationIndex, buildFullTranslationIndex, translateTokens, translateTokensWithMarkers, translateToken, needsKeywordTranslation, } from './frontend/keyword-translator.js';
 export type { KeywordTranslationIndex, MarkerKeywordIndex, TranslationIndexResult, } from './frontend/keyword-translator.js';
 export { Core, Effect } from './core/core_ir.js';
@@ -39,16 +38,22 @@ export { evaluate, serializeGuestValue } from './core/interpreter.js';
 export type { EvalResult } from './core/interpreter.js';
 export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
 export type { TypeKind, FieldInfo, ParameterInfo, } from './parser/input-generator.js';
+export { RESOLVER_VERSION, CASEFOLD_VERSION, CORE_IR_ABI } from './version.js';
 export type * from './types.js';
 export { EN_US, ZH_CN, DE_DE, HI_IN, LexiconRegistry, initializeDefaultLexicons, initializeAllBundledLexicons, } from './config/lexicons/index.js';
 export type { Lexicon } from './config/lexicons/types.js';
 export { getLspUiTexts } from './config/lexicons/lsp-ui-texts.js';
 export type { LspUiTexts } from './config/lexicons/lsp-ui-texts.js';
-export { IdentifierKind, vocabularyRegistry, initBuiltinVocabularies, VocabularyRegistry, buildIdentifierIndex, canonicalizeIdentifier, localizeIdentifier, hasIdentifierMapping, validateVocabulary, } from './config/lexicons/identifiers/index.js';
-export type { IdentifierMapping, DomainVocabulary, IdentifierIndex, VocabularyEntry, } from './config/lexicons/identifiers/index.js';
-import type { Core as CoreTypes, Token, Module as AstModule } from './types.js';
+export { IdentifierKind, vocabularyRegistry, initBuiltinVocabularies, VocabularyRegistry, buildIdentifierIndex, localizeIdentifier, validateVocabulary, buildVocabularyScopes, canonicalScopesJson, foldKey, VocabularyScopeError, } from './config/lexicons/identifiers/index.js';
+export type { IdentifierMapping, DomainVocabulary, IdentifierIndex, VocabularyEntry, Candidate, VocabularyScopes, VocabularyScopeErrorCode, } from './config/lexicons/identifiers/index.js';
+export { resolvePolicyTypes } from './frontend/resolve-policy-types.js';
+export type { PolicyTypes, PolicyTypesDiagnostic, ResolvePolicyTypesOptions, ResolvePolicyTypesResult, TypeRef, } from './frontend/resolve-policy-types.js';
+export { parseSource, resolveAndLowerChecked, NameResolutionError } from './compile-pipeline.js';
+export type { ParsedSource, ResolvedCore } from './compile-pipeline.js';
+import type { Core as CoreTypes, Token, Module as AstModule, TypecheckDiagnostic } from './types.js';
 import type { Lexicon } from './config/lexicons/types.js';
 import type { ControlRegistry } from './governance/controls.js';
+import type { DomainVocabulary } from './config/lexicons/identifiers/types.js';
 /**
  * Parse error with position information
  */
@@ -79,9 +84,16 @@ export interface CompileResult {
     parseErrors?: ParseError[];
     /** Lowering errors (if any) */
     loweringErrors?: string[];
+    /**
+     * 名称解析诊断（ADR 0051 E800–E807 / W800–W801），仅在非空时出现。
+     * 含 error 时 success 为 false 且不产出 core；只有 warning 时编译成功。
+     * E8xx 失败只出现在这里：此时 parseErrors 为空或只含 warning，
+     * compileAndTypecheck 的 typeErrors 为空（不对未通过名称解析的程序做类型检查）。
+     */
+    resolutionDiagnostics?: TypecheckDiagnostic[];
     /** Raw tokens from lexer (only when includeIntermediates is true) */
     tokens?: Token[];
-    /** AST from parser (only when includeIntermediates is true) */
+    /** R1 名称解析后的 AST，标识符节点带 `resolved`（仅 includeIntermediates 为 true 时返回） */
     ast?: AstModule;
 }
 /**
@@ -90,10 +102,15 @@ export interface CompileResult {
 export interface CompileOptions {
     /** CNL lexicon (default: EN_US). Pass a Lexicon object from the exports. */
     lexicon?: Lexicon;
-    /** 领域标识符（如 'insurance.auto'），启用领域标识符翻译 */
+    /**
+     * 领域词汇（ADR 0051）：源码中的本地化名字按位置解析为规范名。
+     * 提供时优先于 domain / tenantId。
+     */
+    vocabulary?: DomainVocabulary;
+    /** 已注册的领域标识符（如 'insurance.auto'），按 lexicon 语言查注册中心中的词汇 */
     domain?: string;
     /**
-     * 租户标识符。提供时，领域词汇翻译优先命中该租户的自定义词汇
+     * 租户标识符。与 domain 一起使用时优先命中该租户的自定义词汇
      * （需先经 `vocabularyRegistry.registerCustom` 注册），未命中回退内置。
      */
     tenantId?: string;
@@ -106,8 +123,8 @@ export interface CompileOptions {
  * Compile CNL source code to Core IR
  *
  * This is the main compilation function for browser/edge use.
- * It runs the full compilation pipeline without type checking
- * (type checking requires module resolution which needs file system access).
+ * 运行完整编译流水线（含 ADR 0051 名称解析 R1/R2），不做类型检查。
+ * 任一名称解析 error（E8xx）时 `success: false` 且不产出 `core`。
  *
  * @param source - CNL source code
  * @param options - Compilation options

package/dist/src/browser.d.ts.map

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

package/dist/src/browser.js

@@ -9,7 +9,7 @@
  *
  * **Compilation Pipeline**:
  * ```
- * CNL Source → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck
+ * CNL 源码 → canonicalize → lex → parse → AST → R1 名称解析 → lowerModule → R2 名称解析 → Core IR → typecheck
  * ```
  *
  * @example Basic compilation
@@ -30,7 +30,6 @@
 export { canonicalize } from './frontend/canonicalizer.js';
 export { lex } from './frontend/lexer.js';
 export { parse } from './parser.js';
-export { lowerModule } from './lower_to_core.js';
 // Keyword translation (multi-language CNL support)
 export { createKeywordTranslator, buildKeywordTranslationIndex, buildFullTranslationIndex, translateTokens, translateTokensWithMarkers, translateToken, needsKeywordTranslation, } from './frontend/keyword-translator.js';
 // Core types and enums
@@ -41,6 +40,8 @@ export { Node } from './ast/ast.js';
 export { evaluate, serializeGuestValue } from './core/interpreter.js';
 // Input value generation (for policy execution)
 export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
+// 工具链分量版本常量（ADR 0051 §7）
+export { RESOLVER_VERSION, CASEFOLD_VERSION, CORE_IR_ABI } from './version.js';
 // Lexicons for multi-language support.
 // 浏览器路径下使用 initializeAllBundledLexicons —— 因为浏览器 bundle 本来就把
 // en/zh/de 编译进去，不存在"按需加载"的服务端约束。后续可在 next major 时
@@ -49,27 +50,44 @@ import { LexiconRegistry, initializeAllBundledLexicons } from './config/lexicons
 export { EN_US, ZH_CN, DE_DE, HI_IN, LexiconRegistry, initializeDefaultLexicons, initializeAllBundledLexicons, } from './config/lexicons/index.js';
 // LSP UI texts (localized labels for hover, completion, etc.)
 export { getLspUiTexts } from './config/lexicons/lsp-ui-texts.js';
-// 领域标识符词汇表（ADR 0014）+ 字面量宏（IdentifierKind.LITERAL）：让浏览器消费者
-// 能经 vocabularyRegistry.registerCustom 注册自定义词汇（含 token→字符串字面量宏），
-// 再用 compile(source, { lexicon, domain, tenantId }) 触发标识符/字面量宏展开。
-export { IdentifierKind, vocabularyRegistry, initBuiltinVocabularies, VocabularyRegistry, buildIdentifierIndex, canonicalizeIdentifier, localizeIdentifier, hasIdentifierMapping, validateVocabulary, } from './config/lexicons/identifiers/index.js';
+// 领域词汇（ADR 0014 / ADR 0051）：compile(source, { lexicon, vocabulary }) 直接传入词汇，
+// 或经 vocabularyRegistry.registerCustom 注册后用 { lexicon, domain, tenantId } 引用。
+// 标识符在解析后按位置解析（R1/R2）；字面量宏（IdentifierKind.LITERAL）仍在 canonicalize 中展开。
+export { IdentifierKind, vocabularyRegistry, initBuiltinVocabularies, VocabularyRegistry, buildIdentifierIndex, localizeIdentifier, validateVocabulary, buildVocabularyScopes, canonicalScopesJson, foldKey, VocabularyScopeError, } from './config/lexicons/identifiers/index.js';
+export { resolvePolicyTypes } from './frontend/resolve-policy-types.js';
+// 只导出带检查的出口：原始 lower 与不抛错的 resolveAndLower 为内部实现（可能产出含本地化名的 Core）
+export { parseSource, resolveAndLowerChecked, NameResolutionError } from './compile-pipeline.js';
 // ============================================================================
 // High-level compilation API (browser-friendly)
 // ============================================================================
 import { canonicalize } from './frontend/canonicalizer.js';
 import { lex } from './frontend/lexer.js';
 import { parse } from './parser.js';
-import { lowerModule } from './lower_to_core.js';
 import { typecheckBrowser as _typecheckBrowser } from './typecheck/browser.js';
+import { localizeDiagnostics } from './typecheck/diagnostics.js';
 import { createKeywordTranslator, needsKeywordTranslation } from './frontend/keyword-translator.js';
 import { attachTypeInferenceRules } from './config/lexicons/type-inference-rules.js';
 import { DiagnosticError } from './diagnostics/diagnostics.js';
+import { buildVocabularyScopes } from './config/lexicons/identifiers/scopes.js';
+import { vocabularyRegistry, initBuiltinVocabularies } from './config/lexicons/identifiers/registry.js';
+import { hasErrors, parseSource, resolveAndLower } from './compile-pipeline.js';
+/** 本次编译使用的词汇作用域：显式词汇优先，其次按 domain / tenantId 查注册中心。 */
+function vocabularyScopesOf(options) {
+    if (options?.vocabulary)
+        return buildVocabularyScopes(options.vocabulary);
+    if (!options?.domain)
+        return undefined;
+    // 浏览器入口预注册 en + zh + de（这些已在 bundle 里）
+    const lexicon = options.lexicon ?? (initializeAllBundledLexicons(), LexiconRegistry.getDefault());
+    initBuiltinVocabularies();
+    return vocabularyRegistry.getWithCustom(options.tenantId, options.domain, lexicon.id);
+}
 /**
  * Compile CNL source code to Core IR
  *
  * This is the main compilation function for browser/edge use.
- * It runs the full compilation pipeline without type checking
- * (type checking requires module resolution which needs file system access).
+ * 运行完整编译流水线（含 ADR 0051 名称解析 R1/R2），不做类型检查。
+ * 任一名称解析 error（E8xx）时 `success: false` 且不产出 `core`。
  *
  * @param source - CNL source code
  * @param options - Compilation options
@@ -92,63 +110,34 @@ import { DiagnosticError } from './diagnostics/diagnostics.js';
 export function compile(source, options) {
     try {
         const lexicon = options?.lexicon;
-        const domain = options?.domain;
-        const tenantId = options?.tenantId;
-        // Step 1: Canonicalize source WITH lexicon for language-specific normalization
-        // If domain is specified, pass CanonicalizerOptions to enable identifier translation
-        let canonical;
-        if (domain) {
-            // Resolve effective lexicon for domain translation (default to EN_US)
-            // M3: 浏览器入口预注册 en + zh + de（这些已在 bundle 里）
-            const effectiveLexicon = lexicon ?? (initializeAllBundledLexicons(), LexiconRegistry.getDefault());
-            canonical = canonicalize(source, { lexicon: effectiveLexicon, domain, locale: effectiveLexicon.id, tenantId });
-        }
-        else {
-            canonical = canonicalize(source, lexicon);
-        }
-        // Step 2: Lexical analysis
-        let tokens = lex(canonical, lexicon);
-        // Step 3: Translate non-English tokens to English for parser compatibility
-        // Parser uses hardcoded English keywords (e.g., 'Module', 'if', 'return')
-        // so we need to translate German/Chinese tokens to English before parsing
-        if (lexicon && needsKeywordTranslation(lexicon)) {
-            const translator = createKeywordTranslator(lexicon);
-            tokens = translator.translateTokens(tokens);
-        }
-        // Step 4: Parse to AST (now with English tokens)
-        const effectiveLex = lexicon ? attachTypeInferenceRules(lexicon) : undefined;
-        const parseResult = parse(tokens, effectiveLex);
+        const scopes = vocabularyScopesOf(options);
+        const parsed = parseSource(source, lexicon, scopes);
+        const tokens = parsed.tokens;
+        const parseErrors = parsed.diagnostics.map(d => ({ message: d.message, span: d.span }));
         // Parse 诊断分级：error 必须导致 success=false（即使部分 decl 可恢复），
         // warning 不阻塞编译。原实现仅在 decls 全空时才报失败，导致调用方在
         // 部分恢复场景下误以为编译成功 —— 实际产物（Core IR）来自残缺 AST。
-        const parseErrorDiagnostics = parseResult.diagnostics.filter(d => d.severity === 'error');
-        if (parseErrorDiagnostics.length > 0) {
-            const result = {
-                success: false,
-                parseErrors: parseResult.diagnostics.map(d => ({
-                    message: d.message,
-                    span: d.span,
-                })),
-            };
+        if (hasErrors(parsed.diagnostics)) {
+            const result = { success: false, parseErrors };
             if (options?.includeIntermediates) {
                 result.tokens = tokens;
             }
             return result;
         }
-        const ast = parseResult.ast;
-        // Step 5: Lower to Core IR
-        const core = lowerModule(ast);
-        const result = {
-            success: true,
-            core,
-        };
-        if (parseResult.diagnostics.length > 0) {
+        // 名称解析：R1 → lower → R2；任一 E8xx 不产出 core
+        const resolved = resolveAndLower(parsed.ast, scopes);
+        const success = !hasErrors(resolved.diagnostics);
+        const result = success ? { success, core: resolved.core } : { success };
+        if (parseErrors.length > 0) {
             // 此时只剩 warning（error 已在上面 short-circuit），保留以便调用方展示
-            result.parseErrors = parseResult.diagnostics.map(d => ({ message: d.message, span: d.span }));
+            result.parseErrors = parseErrors;
+        }
+        if (resolved.diagnostics.length > 0) {
+            result.resolutionDiagnostics = localizeDiagnostics(resolved.diagnostics, lexicon);
         }
         if (options?.includeIntermediates) {
             result.tokens = tokens;
-            result.ast = ast;
+            result.ast = resolved.ast;
         }
         return result;
     }
@@ -287,7 +276,7 @@ export function compileAndTypecheck(source, options) {
     }
     if (options?.controls)
         typecheckOptions.controls = options.controls;
-    const typeErrors = _typecheckBrowser(compileResult.core, typecheckOptions);
+    const typeErrors = localizeDiagnostics(_typecheckBrowser(compileResult.core, typecheckOptions), options?.lexicon);
     return {
         ...compileResult,
         typeErrors,

package/dist/src/browser.js.map

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

package/dist/src/cli/policy-converter.js

@@ -7,10 +7,7 @@
  * - json-to-cnl: 将 Core IR JSON 转换回 CNL
  */
 import * as fs from 'fs';
-import { parse } from '../parser.js';
-import { lex } from '../frontend/lexer.js';
-import { canonicalize } from '../frontend/canonicalizer.js';
-import { lowerModule } from '../lower_to_core.js';
+import { parseSource, resolveAndLowerChecked } from '../compile-pipeline.js';
 import { formatModule } from '../core/pretty_core.js';
 import { serializeCoreIR, deserializeCoreIR } from '../core/core_ir_json.js';
 /**
@@ -36,10 +33,8 @@ function readInput(inputPath) {
 function compileToJson(inputPath, outputPath) {
     try {
         const source = readInput(inputPath);
-        // 编译管线：CNL → Canonical → Tokens → AST → Core IR
-        const canonical = canonicalize(source);
-        const tokens = lex(canonical);
-        const { ast, diagnostics } = parse(tokens);
+        // 编译管线：CNL → Canonical → Tokens → AST → R1 → Core IR → R2（ADR 0051）
+        const { ast, diagnostics } = parseSource(source);
         // CLI 转换必须严格：解析错误不应被 silently 忽略，否则会生成 Core IR
         // 缺失片段的 JSON 文件。warning/info/hint 允许通过。
         const parseErrors = diagnostics.filter(d => d.severity === 'error');
@@ -47,7 +42,8 @@ function compileToJson(inputPath, outputPath) {
             throw new Error(`Parse error${parseErrors.length > 1 ? 's' : ''}:\n` +
                 parseErrors.map(d => `  - ${d.message} (line ${d.span.start.line}, col ${d.span.start.col})`).join('\n'));
         }
-        const coreIR = lowerModule(ast);
+        // 名称解析任一 E8xx 抛出 NameResolutionError，不写出 IR
+        const coreIR = resolveAndLowerChecked(ast).core;
         // 序列化为 JSON
         const metadata = {
             generatedAt: new Date().toISOString(),