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

package/dist/src/frontend/resolve-policy-types.d.ts

@@ -0,0 +1,54 @@
+import type { DomainVocabulary } from '../config/lexicons/identifiers/types.js';
+import type { Diagnostic } from '../diagnostics/diagnostics.js';
+import type { Core, TypecheckDiagnostic } from '../types.js';
+/** 规范类型引用（与 Core IR 的类型节点同形） */
+export type TypeRef = Core.Type;
+export interface PolicyTypes {
+    structs: Array<{
+        canonical: string;
+        written: string;
+        fields: Array<{
+            canonical: string;
+            written: string;
+            type: TypeRef;
+        }>;
+    }>;
+    enums: Array<{
+        canonical: string;
+        written: string;
+        members: Array<{
+            canonical: string;
+            written: string;
+        }>;
+    }>;
+    functions: Array<{
+        canonical: string;
+        written: string;
+        params: Array<{
+            name: string;
+            type: TypeRef;
+        }>;
+        returnType?: TypeRef;
+    }>;
+}
+/** 解析诊断（语法）与名称解析诊断（E8xx / W8xx） */
+export type PolicyTypesDiagnostic = Diagnostic | TypecheckDiagnostic;
+export interface ResolvePolicyTypesOptions {
+    /** 源码的 CNL 语言（lexicon id，如 de-DE） */
+    locale: string;
+    vocabulary?: DomainVocabulary;
+    /** 关键词别名（ADR 0022），按语义 token 种类并入 lexicon，只影响解析 */
+    aliasSet?: Record<string, string[]>;
+}
+export type ResolvePolicyTypesResult = {
+    ok: true;
+    types: PolicyTypes;
+} | {
+    ok: false;
+    diagnostics: PolicyTypesDiagnostic[];
+};
+/**
+ * 解析策略源码中的类型声明。语法错误或任一 E8xx 时返回 ok:false 与诊断；W8xx 不影响结果。
+ */
+export declare function resolvePolicyTypes(source: string, opts: ResolvePolicyTypesOptions): ResolvePolicyTypesResult;
+//# sourceMappingURL=resolve-policy-types.d.ts.map

package/dist/src/frontend/resolve-policy-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-policy-types.d.ts","sourceRoot":"","sources":["../../../src/frontend/resolve-policy-types.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE7D,gCAAgC;AAChC,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;AAEhC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,KAAK,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,KAAK,CAAC;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;KACtE,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IAC7G,SAAS,EAAE,KAAK,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC/C,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC,CAAC;CACJ;AAED,mCAAmC;AACnC,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,mBAAmB,CAAC;AAErE,MAAM,WAAW,yBAAyB;IACxC,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,wBAAwB,GAChC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAChC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,WAAW,EAAE,qBAAqB,EAAE,CAAA;CAAE,CAAC;AAyCxD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,wBAAwB,CAa5G"}

package/dist/src/frontend/resolve-policy-types.js

@@ -0,0 +1,71 @@
+/**
+ * @module frontend/resolve-policy-types
+ *
+ * 为执行输入映射提取策略的已解析类型（ADR 0051 §8）：只跑解析 + R1 + lower + R2，不做类型检查。
+ * 每个声明同时给出规范名与源码原写法，供调用方把用户按策略写法提交的输入映射到规范 IR。
+ */
+import { LexiconRegistry, initializeAllBundledLexicons } from '../config/lexicons/index.js';
+import { buildVocabularyScopes } from '../config/lexicons/identifiers/scopes.js';
+import { DiagnosticError } from '../diagnostics/diagnostics.js';
+import { hasErrors, parseSource, resolveAndLower } from '../compile-pipeline.js';
+function lexiconFor(locale, aliasSet) {
+    initializeAllBundledLexicons();
+    const base = LexiconRegistry.get(locale);
+    if (!base)
+        throw new Error(`未注册的 locale：${locale}`);
+    if (!aliasSet || Object.keys(aliasSet).length === 0)
+        return base;
+    return { ...base, aliases: { ...base.aliases, ...aliasSet } };
+}
+/** 类型引用只保留结构，去掉源码位置（origin 中的写法与位置不属于类型身份）。 */
+function typeRef(t) {
+    return JSON.parse(JSON.stringify(t, (k, v) => (k === 'origin' ? undefined : v)));
+}
+const writtenOf = (resolved, fallback) => resolved?.written ?? fallback;
+function collect(ast, core) {
+    const types = { structs: [], enums: [], functions: [] };
+    // lower 与 R2 都逐个映射声明，AST 与 Core 的声明下标一一对应
+    core.decls.forEach((d, i) => {
+        const src = ast.decls[i];
+        if (d.kind === 'Data' && src.kind === 'Data') {
+            const fields = d.fields.map((f, j) => ({
+                canonical: f.name,
+                written: writtenOf(src.fields[j]?.resolved, f.name),
+                type: typeRef(f.type),
+            }));
+            types.structs.push({ canonical: d.name, written: writtenOf(src.resolved, d.name), fields });
+        }
+        else if (d.kind === 'Enum' && src.kind === 'Enum') {
+            const members = d.variants.map((v, j) => ({ canonical: v, written: writtenOf(src.resolvedVariants?.[j], v) }));
+            types.enums.push({ canonical: d.name, written: writtenOf(src.resolved, d.name), members });
+        }
+        else if (d.kind === 'Func' && src.kind === 'Func') {
+            const params = d.params.map((p) => ({ name: p.name, type: typeRef(p.type) }));
+            const returnType = d.retTypeInferred ? {} : { returnType: typeRef(d.ret) };
+            types.functions.push({ canonical: d.name, written: writtenOf(src.resolved, d.name), params, ...returnType });
+        }
+    });
+    return types;
+}
+/**
+ * 解析策略源码中的类型声明。语法错误或任一 E8xx 时返回 ok:false 与诊断；W8xx 不影响结果。
+ */
+export function resolvePolicyTypes(source, opts) {
+    const lexicon = lexiconFor(opts.locale, opts.aliasSet);
+    const scopes = opts.vocabulary ? buildVocabularyScopes(opts.vocabulary) : undefined;
+    try {
+        const parsed = parseSource(source, lexicon, scopes);
+        if (hasErrors(parsed.diagnostics))
+            return { ok: false, diagnostics: [...parsed.diagnostics] };
+        const resolved = resolveAndLower(parsed.ast, scopes);
+        if (hasErrors(resolved.diagnostics))
+            return { ok: false, diagnostics: [...resolved.diagnostics] };
+        return { ok: true, types: collect(resolved.ast, resolved.core) };
+    }
+    catch (err) {
+        if (err instanceof DiagnosticError)
+            return { ok: false, diagnostics: [err.diagnostic] };
+        throw err;
+    }
+}
+//# sourceMappingURL=resolve-policy-types.js.map

package/dist/src/frontend/resolve-policy-types.js.map

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

package/dist/src/index.d.ts

@@ -8,26 +8,32 @@
  *
  * **编译管道**：
  * ```
- * CNL 源代码 → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck → JVM
+ * CNL 源代码 → canonicalize → lex → parse → AST → R1 名称解析 → lowerModule → R2 名称解析 → Core IR → typecheck → JVM
  * ```
  *
  * @example 基础用法
  * ```typescript
- * import { canonicalize, lex, parse, lowerModule } from '@aster-cloud/aster-lang-ts';
+ * import { parseSource, resolveAndLowerChecked } from '@aster-cloud/aster-lang-ts';
  *
  * const src = `Module app. Rule id, produce Int: Return 1.`;
- * const canonical = canonicalize(src);  // 规范化源代码
- * const tokens = lex(canonical);         // 词法分析
- * const ast = parse(tokens);             // 语法分析
- * const core = lowerModule(ast);         // 降级到 Core IR
+ * const { ast } = parseSource(src);                   // 规范化 + 词法 + 语法分析
+ * const { core } = resolveAndLowerChecked(ast);       // R1 → lower → R2；任一 E8xx 抛出 NameResolutionError
  * console.log(core);
  * ```
+ *
+ * 公开 API 只提供带名称解析检查的出口（resolveAndLowerChecked / compile / resolvePolicyTypes）：
+ * 未经 R1/R2 的原始 lower 与不抛错的 resolveAndLower 是内部实现，可能产出含本地化名的 Core。
  */
 export { canonicalize } from './frontend/canonicalizer.js';
 export { lex } from './frontend/lexer.js';
 export { parse, parseWithLexicon } from './parser.js';
 export type { ParseResult } from './parser.js';
-export { lowerModule } from './lower_to_core.js';
+export { parseSource, resolveAndLowerChecked, NameResolutionError } from './compile-pipeline.js';
+export type { ParsedSource, ResolvedCore } from './compile-pipeline.js';
+export { buildVocabularyScopes, canonicalScopesJson, foldKey, VocabularyScopeError, } from './config/lexicons/identifiers/index.js';
+export type { Candidate, DomainVocabulary, IdentifierMapping, 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 { 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';
@@ -41,6 +47,7 @@ export { CONTROLS_REGISTRY } from './governance/controls-registry.data.js';
 export type { ControlsRegistryData, LocalizedTitle } from './governance/controls-registry.data.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 { runSemanticBridge } from './mapping/pipeline.js';
 export type { BridgeResult, VerifiedCandidate } from './mapping/pipeline.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtD,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvF,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGnG,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EACV,QAAQ,EACR,SAAS,EACT,aAAa,GACd,MAAM,6BAA6B,CAAC;AAGrC,mBAAmB,YAAY,CAAC;AAMhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrF,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,mBAAmB,EACrE,cAAc,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC/E,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACtG,YAAY,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/index.js

@@ -8,26 +8,31 @@
  *
  * **编译管道**：
  * ```
- * CNL 源代码 → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck → JVM
+ * CNL 源代码 → canonicalize → lex → parse → AST → R1 名称解析 → lowerModule → R2 名称解析 → Core IR → typecheck → JVM
  * ```
  *
  * @example 基础用法
  * ```typescript
- * import { canonicalize, lex, parse, lowerModule } from '@aster-cloud/aster-lang-ts';
+ * import { parseSource, resolveAndLowerChecked } from '@aster-cloud/aster-lang-ts';
  *
  * const src = `Module app. Rule id, produce Int: Return 1.`;
- * const canonical = canonicalize(src);  // 规范化源代码
- * const tokens = lex(canonical);         // 词法分析
- * const ast = parse(tokens);             // 语法分析
- * const core = lowerModule(ast);         // 降级到 Core IR
+ * const { ast } = parseSource(src);                   // 规范化 + 词法 + 语法分析
+ * const { core } = resolveAndLowerChecked(ast);       // R1 → lower → R2；任一 E8xx 抛出 NameResolutionError
  * console.log(core);
  * ```
+ *
+ * 公开 API 只提供带名称解析检查的出口（resolveAndLowerChecked / compile / resolvePolicyTypes）：
+ * 未经 R1/R2 的原始 lower 与不抛错的 resolveAndLower 是内部实现，可能产出含本地化名的 Core。
  */
 // 编译器管道函数
 export { canonicalize } from './frontend/canonicalizer.js';
 export { lex } from './frontend/lexer.js';
 export { parse, parseWithLexicon } from './parser.js';
-export { lowerModule } from './lower_to_core.js';
+// 名称解析接入后的前端（ADR 0051）：parse → R1 → lower → R2；只导出带检查的出口
+export { parseSource, resolveAndLowerChecked, NameResolutionError } from './compile-pipeline.js';
+// 领域词汇按位置解析（ADR 0051）
+export { buildVocabularyScopes, canonicalScopesJson, foldKey, VocabularyScopeError, } from './config/lexicons/identifiers/index.js';
+export { resolvePolicyTypes } from './frontend/resolve-policy-types.js';
 // 关键词翻译（多语言 CNL 支持）
 export { createKeywordTranslator, buildKeywordTranslationIndex, buildFullTranslationIndex, translateTokens, translateTokensWithMarkers, translateToken, needsKeywordTranslation, } from './frontend/keyword-translator.js';
 // 核心类型和枚举
@@ -40,6 +45,8 @@ export { controlRegistryFrom, defaultControlRegistry } from './governance/contro
 export { CONTROLS_REGISTRY } from './governance/controls-registry.data.js';
 // 输入值生成器（用于策略执行时自动生成示例输入）
 export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
+// 工具链分量版本常量（ADR 0051 §7）
+export { RESOLVER_VERSION, CASEFOLD_VERSION, CORE_IR_ABI } from './version.js';
 // ── ADR 0037 可验证语义桥 ────────────────────────────────────────────
 // ★接线后才导出：此前六个模块全是死代码（生产调用数 0、不在导出面内）。
 //   `runSemanticBridge` 是唯一入口，内部串起

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,UAAU;AACV,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,oBAAoB;AACpB,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAO1C,UAAU;AACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO;AACP,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,0BAA0B;AAC1B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAUrC,kEAAkE;AAClE,uCAAuC;AACvC,mCAAmC;AACnC,4DAA4D;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,UAAU;AACV,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGtD,yDAAyD;AACzD,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjG,sBAAsB;AACtB,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,OAAO,EACP,oBAAoB,GACrB,MAAM,wCAAwC,CAAC;AAQhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AASxE,oBAAoB;AACpB,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAO1C,UAAU;AACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO;AACP,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAG3E,0BAA0B;AAC1B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAOrC,yBAAyB;AACzB,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAK/E,kEAAkE;AAClE,uCAAuC;AACvC,mCAAmC;AACnC,4DAA4D;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/src/lower_to_core.d.ts

@@ -32,22 +32,8 @@ import type { Module } from './types.js';
  * @param ast - AST Module 节点（通过 parser.parse 生成）
  * @returns Core IR Module 节点，包含所有声明的规范化表示
  *
- * @example
- * ```typescript
- * import { canonicalize, lex, parse, lowerModule } from '@aster-cloud/aster-lang-ts';
- *
- * const src = `Module app.
- * Rule greet, produce Text:
- *   Return "Hello".
- * `;
- *
- * const ast = parse(lex(canonicalize(src)));
- * const core = lowerModule(ast);
- *
- * console.log(core.kind);  // "Module"
- * console.log(core.name);  // "app"
- * // Core IR 是更简洁的表示，适合类型检查和代码生成
- * ```
+ * @internal 不从包入口导出：未经 R1 的 AST 降级后名字保持原写法（可能是本地化名）。
+ * 外部调用方使用 resolveAndLowerChecked（compile-pipeline）或 browser `compile`。
  */
 export declare function lowerModule(ast: Module): import('./types.js').Core.Module;
 //# sourceMappingURL=lower_to_core.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lower_to_core.d.ts","sourceRoot":"","sources":["../../src/lower_to_core.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAQH,OAAO,KAAK,EACV,MAAM,EAUP,MAAM,YAAY,CAAC;AAkMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,YAAY,EAAE,IAAI,CAAC,MAAM,CAIzE"}
+{"version":3,"file":"lower_to_core.d.ts","sourceRoot":"","sources":["../../src/lower_to_core.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAUH,OAAO,KAAK,EACV,MAAM,EAYP,MAAM,YAAY,CAAC;AAsNpB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,YAAY,EAAE,IAAI,CAAC,MAAM,CAIzE"}

package/dist/src/lower_to_core.js

@@ -17,7 +17,9 @@
  * - 简化的效果标注
  */
 import { Core } from './core/core_ir.js';
-import { markFieldTypeInferred } from './core/inferred_fields.js';
+import { markFieldTypeInferred, markLambdaParamTypeInferred } from './core/inferred_fields.js';
+import { markForResolution, withResolvedOrigin } from './core/resolution-mark.js';
+import { KEYWORD_CTORS } from './frontend/resolution-choice.js';
 import { parseEffect, getAllEffects, inferCapabilityFromName } from './config/semantic.js';
 import { Diagnostics } from './diagnostics/diagnostics.js';
 import { DefaultAstVisitor } from './ast/ast_visitor.js';
@@ -49,6 +51,25 @@ function withOrigin(coreNode, astNode) {
     }
     return coreNode;
 }
+/**
+ * 名称解析（ADR 0051）：有 R1 结果时取规范名，否则保留原写法。
+ */
+function canonicalOf(name, resolved) {
+    return resolved?.canonical ?? name;
+}
+/**
+ * 在已附加的 origin 上记录 R1 的原写法与角色（仅 written !== canonical 时）。
+ * 无 R1 结果或节点无 origin 时原样返回，保证未解析的 AST 降级结果不变。
+ */
+function withResolution(coreNode, resolved) {
+    if (!resolved)
+        return coreNode;
+    const origin = withResolvedOrigin(coreNode.origin, resolved.written, resolved.canonical, resolved.role);
+    if (origin && origin !== coreNode.origin) {
+        coreNode.origin = origin;
+    }
+    return coreNode;
+}
 /**
  * 将效果能力（effectCaps）从 AST Func 节点传递到 Core IR Func 节点。
  *
@@ -181,22 +202,8 @@ function lowerConstraints(constraints) {
  * @param ast - AST Module 节点（通过 parser.parse 生成）
  * @returns Core IR Module 节点，包含所有声明的规范化表示
  *
- * @example
- * ```typescript
- * import { canonicalize, lex, parse, lowerModule } from '@aster-cloud/aster-lang-ts';
- *
- * const src = `Module app.
- * Rule greet, produce Text:
- *   Return "Hello".
- * `;
- *
- * const ast = parse(lex(canonicalize(src)));
- * const core = lowerModule(ast);
- *
- * console.log(core.kind);  // "Module"
- * console.log(core.name);  // "app"
- * // Core IR 是更简洁的表示，适合类型检查和代码生成
- * ```
+ * @internal 不从包入口导出：未经 R1 的 AST 降级后名字保持原写法（可能是本地化名）。
+ * 外部调用方使用 resolveAndLowerChecked（compile-pipeline）或 browser `compile`。
  */
 export function lowerModule(ast) {
     const decls = ast.decls.map(lowerDecl);
@@ -208,9 +215,9 @@ function lowerDecl(d) {
         case 'Import':
             return withOrigin(Core.Import(d.name, d.asName || null, d.version), d);
         case 'Data':
-            return withOrigin(Core.Data(d.name, d.fields.map(f => {
+            return withResolution(withOrigin(Core.Data(canonicalOf(d.name, d.resolved), d.fields.map(f => {
                 const field = {
-                    name: f.name,
+                    name: canonicalOf(f.name, f.resolved),
                     type: lowerType(f.type),
                     constraints: lowerConstraints(f.constraints),
                 };
@@ -218,9 +225,9 @@ function lowerDecl(d) {
                 if (f.typeInferred)
                     markFieldTypeInferred(field);
                 return field;
-            })), d);
+            })), d), d.resolved);
         case 'Enum':
-            return withOrigin(Core.Enum(d.name, [...d.variants]), d);
+            return withResolution(withOrigin(Core.Enum(canonicalOf(d.name, d.resolved), d.variants.map((v, i) => canonicalOf(v, d.resolvedVariants?.[i]))), d), d.resolved);
         case 'Func':
             return lowerFunc(d);
         default: {
@@ -261,13 +268,13 @@ function lowerFunc(f) {
         throw new Error('unreachable'); // For TypeScript's control flow analysis
     }
     const body = f.body ? lowerBlock(f.body) : Core.Block([]);
-    const out = Core.Func(f.name, f.typeParams ?? [], params, ret, effects, body, f.effectCaps, f.effectCapsExplicit, f.effectParams, declaredEffects, f.annotations ?? []);
+    const out = Core.Func(canonicalOf(f.name, f.resolved), f.typeParams ?? [], params, ret, effects, body, f.effectCaps, f.effectCapsExplicit, f.effectParams, declaredEffects, f.annotations ?? []);
     if (f.retTypeInferred) {
         out.retTypeInferred = true;
     }
     // 传递能力与 PII 元数据，并附带源位置信息
     const enriched = withFuncPiiMetadata(withEffectCaps(out, f));
-    return withOrigin(enriched, f);
+    return withResolution(withOrigin(enriched, f), f.resolved);
 }
 function lowerBlock(b) {
     return withOrigin(Core.Block(b.statements.map(lowerStmt)), b);
@@ -276,8 +283,12 @@ function lowerStmt(s) {
     switch (s.kind) {
         case 'Let':
             return withOrigin(Core.Let(s.name, lowerExpr(s.expr)), s);
-        case 'Set':
-            return withOrigin(Core.Set(s.name, lowerExpr(s.expr)), s);
+        case 'Set': {
+            // Set 目标属于 FIELD_REF，R1 不解析：保留原写法交给 R2
+            const set = withOrigin(Core.Set(s.name, lowerExpr(s.expr)), s);
+            markForResolution(set, { written: s.name });
+            return set;
+        }
         case 'Return':
             return withOrigin(Core.Return(lowerExpr(s.expr)), s);
         case 'If':
@@ -441,7 +452,7 @@ function patternBindings(p) {
  * （`AstBuilderTest.testMethodCallTransformsReceiver`）；此处职责是对齐，
  * 不是重新设计。若要改语义，应走 ADR。
  */
-function splitUfcsReceiver(target) {
+function splitUfcsReceiver(target, unresolvedTarget) {
     if (!target || target.kind !== 'Name')
         return null;
     const full = target.name;
@@ -473,12 +484,17 @@ function splitUfcsReceiver(target) {
         receiver.origin = span;
         method.origin = span;
     }
+    // 拆分前的点分名由 R1 留给 R2 时，拆出的接收者与方法名同样交给 R2（均为裸名）
+    if (unresolvedTarget) {
+        markForResolution(receiver, { written: head, ufcs: true });
+        markForResolution(method, { written: full.slice(dot + 1), ufcs: true });
+    }
     return { receiver, method };
 }
 function lowerExpr(e) {
     switch (e.kind) {
         case 'Name':
-            return withOrigin(Core.Name(e.name), e);
+            return lowerName(e);
         case 'Bool':
             return withOrigin(Core.Bool(e.value), e);
         case 'Int':
@@ -541,14 +557,14 @@ function lowerExpr(e) {
             //     而不是单方面改变语义。若要重新设计，应走 ADR。
             const target = lowerExpr(e.target);
             const loweredArgs = e.args.map(lowerExpr);
-            const ufcs = splitUfcsReceiver(target);
+            const ufcs = splitUfcsReceiver(target, e.target.kind === 'Name' && !e.target.resolved);
             if (ufcs) {
                 return withOrigin(Core.Call(ufcs.method, [ufcs.receiver, ...loweredArgs]), e);
             }
             return withOrigin(Core.Call(target, loweredArgs), e);
         }
         case 'Construct':
-            return withOrigin(Core.Construct(e.typeName, e.fields.map(f => ({ name: f.name, expr: lowerExpr(f.expr) }))), e);
+            return withResolution(withOrigin(Core.Construct(canonicalOf(e.typeName, e.resolved), e.fields.map(f => ({ name: canonicalOf(f.name, f.resolved), expr: lowerExpr(f.expr) }))), e), e.resolved);
         case 'Ok':
             return withOrigin(Core.Ok(lowerExpr(e.expr)), e);
         case 'Err':
@@ -638,15 +654,23 @@ function lowerExpr(e) {
                         }
                         return;
                     }
-                    if (ex.kind === 'Name' && !isBound(ex.name) && !ex.name.includes('.')) {
-                        names.add(ex.name);
+                    // 以 R1 规范名记录捕获（未解析时即原写法；R2 再按其解析结果改写）
+                    const captured = ex.kind === 'Name' ? canonicalOf(ex.name, ex.resolved) : '';
+                    if (ex.kind === 'Name' && !isBound(captured) && !captured.includes('.')) {
+                        names.add(captured);
                     }
                     super.visitExpression(ex, ctx);
                 }
             }
             new CaptureVisitor().visitBlock(e.body, undefined);
             const captures = Array.from(names);
-            const coreParams = e.params.map(p => ({ name: p.name, type: lowerType(p.type) }));
+            const coreParams = e.params.map(p => {
+                const param = { name: p.name, type: lowerType(p.type) };
+                // 解析器对未标注类型的 lambda 参数同样写入 typeInferred（Parameter），BaseParameter 未声明该字段
+                if (p.typeInferred)
+                    markLambdaParamTypeInferred(param);
+                return param;
+            });
             const ret = lowerType(e.retType);
             const lambda = {
                 kind: 'Lambda',
@@ -672,13 +696,14 @@ function lowerPattern(p) {
             return withOrigin(Core.PatNull(), p);
         case 'PatternInt':
             return withOrigin(Core.PatInt(p.value), p);
-        case 'PatternCtor': {
-            const ctor = p;
-            const args = ctor.args ? ctor.args.map(pp => lowerPattern(pp)) : undefined;
-            return withOrigin(Core.PatCtor(p.typeName, [...(p.names ?? [])], args), p);
+        case 'PatternCtor':
+            return lowerPatternCtor(p);
+        case 'PatternName': {
+            // 模式名可能是期望枚举下的成员（ADR 0051 裁决 R12），由 R2 判定
+            const pat = withOrigin(Core.PatName(p.name), p);
+            markForResolution(pat, { written: p.name });
+            return pat;
         }
-        case 'PatternName':
-            return withOrigin(Core.PatName(p.name), p);
         default: {
             const { span } = extractMetadata(p);
             const kind = p.kind;
@@ -687,6 +712,28 @@ function lowerPattern(p) {
         }
     }
 }
+function lowerPatternCtor(p) {
+    const args = p.args ? p.args.map(pp => lowerPattern(pp)) : undefined;
+    const pat = withResolution(withOrigin(Core.PatCtor(canonicalOf(p.typeName, p.resolved), [...(p.names ?? [])], args), p), p.resolved);
+    // 主语类型在 R1 未知的用户构造器留给 R2；关键词构造器不查词汇
+    if (!p.resolved && !KEYWORD_CTORS.has(p.typeName))
+        markForResolution(pat, { written: p.typeName });
+    return pat;
+}
+/**
+ * 值位置名字：R1 已解析的取规范名。裸单段名一律交给 R2（期望类型为枚举时结果可能改变），
+ * 并记下 R1 的角色；R1 未决定的点分名（字段路径、限定调用）同样交给 R2。
+ */
+function lowerName(e) {
+    const node = withResolution(withOrigin(Core.Name(canonicalOf(e.name, e.resolved)), e), e.resolved);
+    if (!e.name.includes('.')) {
+        markForResolution(node, e.resolved ? { written: e.name, r1Role: e.resolved.role } : { written: e.name });
+    }
+    else if (!e.resolved) {
+        markForResolution(node, { written: e.name });
+    }
+    return node;
+}
 function spanToOrigin(span, file) {
     if (!span)
         return null;
@@ -702,11 +749,11 @@ function spanToOrigin(span, file) {
 function lowerType(t) {
     switch (t.kind) {
         case 'TypeName':
-            return withOrigin(Core.TypeName(t.name), t);
+            return withResolution(withOrigin(Core.TypeName(canonicalOf(t.name, t.resolved)), t), t.resolved);
         case 'TypeVar':
             return withOrigin(Core.TypeVar(t.name), t);
         case 'TypeApp':
-            return withOrigin(Core.TypeApp(t.base, t.args.map(lowerType)), t);
+            return withResolution(withOrigin(Core.TypeApp(canonicalOf(t.base, t.resolved), t.args.map(lowerType)), t), t.resolved);
         case 'Maybe':
             return withOrigin(Core.Maybe(lowerType(t.type)), t);
         case 'Option':
@@ -719,6 +766,8 @@ function lowerType(t) {
             return withOrigin(Core.Map(lowerType(t.key), lowerType(t.val)), t);
         case 'TypePii':
             return withOrigin(Core.Pii(lowerType(t.baseType), t.sensitivity, t.category), t);
+        case 'FuncType':
+            return withOrigin(Core.FuncType(t.params.map(lowerType), lowerType(t.ret)), t);
         default: {
             const { span } = extractMetadata(t);
             const kind = t.kind;
@@ -727,12 +776,22 @@ function lowerType(t) {
         }
     }
 }
+/**
+ * 函数签名类型名的解析记录（ADR 0051 §4，与 Java 对齐）：签名类型平时不带 origin，
+ * 仅当写法被改写（written !== canonical）时才附加带 written/role 的 origin，
+ * 因此无词汇或规范名直写的签名 IR 保持逐字节不变。
+ */
+function withSignatureResolution(coreNode, astNode, resolved) {
+    if (!resolved || resolved.written === resolved.canonical)
+        return coreNode;
+    return withResolution(withOrigin(coreNode, astNode), resolved);
+}
 function lowerTypeWithVars(t, vars) {
     switch (t.kind) {
         case 'TypeName':
             return vars.has(t.name)
                 ? { kind: 'TypeVar', name: t.name }
-                : Core.TypeName(t.name);
+                : withSignatureResolution(Core.TypeName(canonicalOf(t.name, t.resolved)), t, t.resolved);
         case 'EffectVar':
             return { kind: 'EffectVar', name: t.name };
         case 'Maybe':
@@ -746,15 +805,17 @@ function lowerTypeWithVars(t, vars) {
         case 'Map':
             return Core.Map(lowerTypeWithVars(t.key, vars), lowerTypeWithVars(t.val, vars));
         case 'TypeApp':
-            return {
+            return withSignatureResolution({
                 kind: 'TypeApp',
-                base: t.base,
+                base: canonicalOf(t.base, t.resolved),
                 args: t.args.map(tt => lowerTypeWithVars(tt, vars)),
-            };
+            }, t, t.resolved);
         case 'TypeVar':
             return { kind: 'TypeVar', name: t.name };
         case 'TypePii':
             return Core.Pii(lowerTypeWithVars(t.baseType, vars), t.sensitivity, t.category);
+        case 'FuncType':
+            return Core.FuncType(t.params.map(p => lowerTypeWithVars(p, vars)), lowerTypeWithVars(t.ret, vars));
         default:
             return lowerType(t);
     }