@aster-cloud/aster-lang-ts 1.6.0 → 3.0.0

package/dist/test/unit/typecheck/regression-fixes.test.js

@@ -14,6 +14,7 @@ import { typecheckModule } from '../../../src/typecheck.js';
 import { SymbolTable } from '../../../src/typecheck/symbol_table.js';
 import { DiagnosticBuilder } from '../../../src/typecheck/diagnostics.js';
 import { defineSymbol } from '../../../src/typecheck/context.js';
+import { toV2 } from '../../helpers/core-ir-v2.js';
 // 辅助函数：创建类型
 const typeName = (name) => Core.TypeName(name);
 const resultType = (ok, err) => Core.Result(ok, err);
@@ -74,30 +75,30 @@ describe('回归测试：重复符号检测', () => {
     });
     it('通过完整类型检查流程验证重复参数定义', () => {
         // 构造一个函数有两个同名参数的场景
-        const func = {
+        const func = toV2({
             kind: 'Func',
             name: 'badFunc',
             typeParams: [],
             params: [
-                { name: 'x', type: typeName('Int') },
-                { name: 'x', type: typeName('Text') }, // 重复参数名
+                toV2({ name: 'x', type: typeName('Int') }),
+                toV2({ name: 'x', type: typeName('Text') }), // 重复参数名
             ],
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Int'),
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    { kind: 'Return', expr: Core.Int(0) },
+                    toV2({ kind: 'Return', expr: Core.Int(0) }),
                 ],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.duplicate_param',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(diagnostics.some(d => d.code === "E104" /* ErrorCode.DUPLICATE_SYMBOL */), '重复参数名应触发 DUPLICATE_SYMBOL 错误');
     });
@@ -105,33 +106,33 @@ describe('回归测试：重复符号检测', () => {
 describe('回归测试：补偿效应推断', () => {
     it('workflow 效应应包含 compensate 块的效应', () => {
         // 创建一个 workflow，其中 step body 是 pure，但 compensate 调用了 io 函数
-        const step = {
+        const step = toV2({
             kind: 'step',
             name: 'step1',
             dependencies: [],
             effectCaps: [],
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
                     // 纯计算，无 IO
-                    { kind: 'Return', expr: Core.Ok(Core.Int(42)) },
+                    toV2({ kind: 'Return', expr: Core.Ok(Core.Int(42)) }),
                 ],
-            },
-            compensate: {
+            }),
+            compensate: toV2({
                 kind: 'Block',
                 statements: [
                     // compensate 调用 IO 函数（使用标准 IO 前缀格式）
                     Core.Let('_cleanup', Core.Call(Core.Name('IO.cleanup'), [])),
-                    { kind: 'Return', expr: Core.Ok(Core.Null()) },
+                    toV2({ kind: 'Return', expr: Core.Ok(Core.Null()) }),
                 ],
-            },
-        };
-        const workflow = {
+            }),
+        });
+        const workflow = toV2({
             kind: 'workflow',
             steps: [step],
             effectCaps: [],
-        };
-        const func = {
+        });
+        const func = toV2({
             kind: 'Func',
             name: 'workflowWithCompensate',
             typeParams: [],
@@ -139,21 +140,21 @@ describe('回归测试：补偿效应推断', () => {
             effects: [Effect.IO], // 声明 IO 效应
             effectCaps: [],
             effectCapsExplicit: false,
-            ret: {
+            ret: toV2({
                 kind: 'TypeApp',
                 base: 'Workflow',
                 args: [resultType(typeName('Int'), typeName('Text')), typeName('IO')],
-            },
-            body: {
+            }),
+            body: toV2({
                 kind: 'Block',
                 statements: [workflow],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.compensate_effect',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         // 不应有 EFF_SUPERFLUOUS_IO 警告，因为 compensate 块确实有 IO 效应
         const superfluousIO = diagnostics.find(d => d.code === "E203" /* ErrorCode.EFF_SUPERFLUOUS_IO */);
@@ -162,33 +163,33 @@ describe('回归测试：补偿效应推断', () => {
     it('compensate 块的 IO 效应应触发 EFF_MISSING_IO（正向断言）', () => {
         // 正向断言：如果 compensate 有 IO 但函数未声明 IO，应报错
         // 这证明 compensate 效应确实被合并到函数效应推断中
-        const step = {
+        const step = toV2({
             kind: 'step',
             name: 'stepWithIOCompensate',
             dependencies: [],
             effectCaps: [],
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
                     // 纯计算，无 IO
-                    { kind: 'Return', expr: Core.Ok(Core.Int(42)) },
+                    toV2({ kind: 'Return', expr: Core.Ok(Core.Int(42)) }),
                 ],
-            },
-            compensate: {
+            }),
+            compensate: toV2({
                 kind: 'Block',
                 statements: [
                     // compensate 调用 IO 函数
                     Core.Let('_cleanup', Core.Call(Core.Name('IO.cleanup'), [])),
-                    { kind: 'Return', expr: Core.Ok(Core.Null()) },
+                    toV2({ kind: 'Return', expr: Core.Ok(Core.Null()) }),
                 ],
-            },
-        };
-        const workflow = {
+            }),
+        });
+        const workflow = toV2({
             kind: 'workflow',
             steps: [step],
             effectCaps: [],
-        };
-        const func = {
+        });
+        const func = toV2({
             kind: 'Func',
             name: 'workflowMissingIODeclaration',
             typeParams: [],
@@ -196,47 +197,47 @@ describe('回归测试：补偿效应推断', () => {
             effects: [], // 故意不声明 IO 效应
             effectCaps: [],
             effectCapsExplicit: false,
-            ret: {
+            ret: toV2({
                 kind: 'TypeApp',
                 base: 'Workflow',
                 args: [resultType(typeName('Int'), typeName('Text')), typeName('Unit')],
-            },
-            body: {
+            }),
+            body: toV2({
                 kind: 'Block',
                 statements: [workflow],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.compensate_effect_positive',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         // 正向断言：应有 EFF_MISSING_IO 错误，证明 compensate 的 IO 效应被正确检测
         assert.ok(diagnostics.some(d => d.code === "E200" /* ErrorCode.EFF_MISSING_IO */), 'compensate 块的 IO 效应应被检测，触发 EFF_MISSING_IO 错误（正向证明效应合并生效）');
     });
     it('缺少 compensate 的步骤在有副作用时应发出警告', () => {
-        const step = {
+        const step = toV2({
             kind: 'step',
             name: 'dangerousStep',
             dependencies: [],
             effectCaps: [],
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
                     // 调用 IO 函数（使用标准 IO 前缀格式）
                     Core.Let('result', Core.Call(Core.Name('IO.write'), [Core.String('data')])),
-                    { kind: 'Return', expr: Core.Ok(Core.Int(1)) },
+                    toV2({ kind: 'Return', expr: Core.Ok(Core.Int(1)) }),
                 ],
-            },
+            }),
             // 无 compensate 块
-        };
-        const workflow = {
+        });
+        const workflow = toV2({
             kind: 'workflow',
             steps: [step],
             effectCaps: [],
-        };
-        const func = {
+        });
+        const func = toV2({
             kind: 'Func',
             name: 'workflowWithoutCompensate',
             typeParams: [],
@@ -244,21 +245,21 @@ describe('回归测试：补偿效应推断', () => {
             effects: [Effect.IO],
             effectCaps: [],
             effectCapsExplicit: false,
-            ret: {
+            ret: toV2({
                 kind: 'TypeApp',
                 base: 'Workflow',
                 args: [resultType(typeName('Int'), typeName('Text')), typeName('IO')],
-            },
-            body: {
+            }),
+            body: toV2({
                 kind: 'Block',
                 statements: [workflow],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.missing_compensate',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         // 应有 WORKFLOW_COMPENSATE_MISSING 警告
         assert.ok(diagnostics.some(d => d.code === "E023" /* ErrorCode.WORKFLOW_COMPENSATE_MISSING */), '有 IO 副作用但无 compensate 的步骤应触发警告');
@@ -267,16 +268,14 @@ describe('回归测试：补偿效应推断', () => {
 describe('回归测试：效应参数诊断', () => {
     it('未声明的效应变量应触发 EFFECT_VAR_UNDECLARED', () => {
         // 创建一个使用了未声明效应变量的函数
-        // 通过 declaredEffects 在函数上直接使用一个未声明的效应变量
-        const effectVar = { kind: 'EffectVar', name: 'E' };
-        const func = {
+        // v2 的 effects 中出现一个未在 effectParams 中声明的效应变量（ADR 0055 #5；IR 不变式 undeclared-effect-var）
+        const func = toV2({
             kind: 'Func',
             name: 'funcWithUndeclaredEffect',
             typeParams: [],
             effectParams: [], // 空的效应参数列表
             params: [],
             effects: [],
-            declaredEffects: [effectVar], // 使用了效应变量 E，但未在 effectParams 中声明
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Unit'),
@@ -286,26 +285,25 @@ describe('回归测试：效应参数诊断', () => {
                     { kind: 'Return', expr: Core.Null() },
                 ],
             },
-        };
-        const mod = {
+        });
+        func.effects = ['E'];
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.undeclared_effect_var',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(diagnostics.some(d => d.code === "E210" /* ErrorCode.EFFECT_VAR_UNDECLARED */), '使用未声明的效应变量应触发 EFFECT_VAR_UNDECLARED');
     });
     it('已声明的效应变量不应报错', () => {
         // 创建一个正确声明了效应变量的函数
-        const effectVar = { kind: 'EffectVar', name: 'E' };
-        const func = {
+        const func = toV2({
             kind: 'Func',
             name: 'funcWithDeclaredEffect',
             typeParams: [],
             effectParams: ['E'], // 声明效应参数 E
             params: [],
-            effects: [],
-            declaredEffects: [effectVar], // 函数自身使用 E
+            effects: ['E'], // 函数自身使用 E
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Unit'),
@@ -315,17 +313,17 @@ describe('回归测试：效应参数诊断', () => {
                     { kind: 'Return', expr: Core.Null() },
                 ],
             },
-        };
-        const mod = {
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.declared_effect_var',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(!diagnostics.some(d => d.code === "E210" /* ErrorCode.EFFECT_VAR_UNDECLARED */), '已声明的效应变量不应触发 EFFECT_VAR_UNDECLARED');
     });
     it('声明但未使用的效应变量应触发警告', () => {
-        const func = {
+        const func = toV2({
             kind: 'Func',
             name: 'funcWithUnusedEffect',
             typeParams: [],
@@ -343,112 +341,112 @@ describe('回归测试：效应参数诊断', () => {
                     { kind: 'Return', expr: Core.Name('x') },
                 ],
             },
-        };
-        const mod = {
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.unused_effect_var',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(diagnostics.some(d => d.code === "E005" /* ErrorCode.TYPE_PARAM_UNUSED */), '声明但未使用的效应变量应触发 TYPE_PARAM_UNUSED 警告');
     });
 });
 describe('回归测试：KNOWN_SCALARS 扩展', () => {
     it('使用 Long/Double/Unit 类型不应触发 TYPEVAR_LIKE_UNDECLARED', () => {
-        const func = {
+        const func = toV2({
             kind: 'Func',
             name: 'useBuiltinTypes',
             typeParams: [],
             params: [
-                { name: 'a', type: typeName('Long') },
-                { name: 'b', type: typeName('Double') },
+                toV2({ name: 'a', type: typeName('Long') }),
+                toV2({ name: 'b', type: typeName('Double') }),
             ],
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Unit'),
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    { kind: 'Return', expr: Core.Null() },
+                    toV2({ kind: 'Return', expr: Core.Null() }),
                 ],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.known_scalars',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(!diagnostics.some(d => d.code === "E006" /* ErrorCode.TYPEVAR_LIKE_UNDECLARED */), 'Long/Double/Unit 是内置类型，不应被误认为未声明的类型变量');
     });
     it('使用 Result/Option/List/Map/Set/Workflow 类型不应触发 TYPEVAR_LIKE_UNDECLARED', () => {
         // 构造 Map<Text, Int> 类型
-        const mapType = { kind: 'TypeApp', base: 'Map', args: [typeName('Text'), typeName('Int')] };
+        const mapType = toV2({ kind: 'TypeApp', base: 'Map', args: [typeName('Text'), typeName('Int')] });
         // 构造 Set<Int> 类型
-        const setType = { kind: 'TypeApp', base: 'Set', args: [typeName('Int')] };
+        const setType = toV2({ kind: 'TypeApp', base: 'Set', args: [typeName('Int')] });
         // 构造 Workflow<Result<Int, Text>, Unit> 类型（第二个参数是效应标记，使用 Unit 避免效应类型检查）
-        const workflowType = {
+        const workflowType = toV2({
             kind: 'TypeApp',
             base: 'Workflow',
             args: [resultType(typeName('Int'), typeName('Text')), typeName('Unit')],
-        };
-        const func = {
+        });
+        const func = toV2({
             kind: 'Func',
             name: 'useContainerTypes',
             typeParams: [],
             params: [
-                { name: 'r', type: resultType(typeName('Int'), typeName('Text')) },
-                { name: 'o', type: Core.Option(typeName('Int')) },
-                { name: 'l', type: Core.List(typeName('Int')) },
-                { name: 'm', type: mapType },
-                { name: 's', type: setType },
-                { name: 'w', type: workflowType },
+                toV2({ name: 'r', type: resultType(typeName('Int'), typeName('Text')) }),
+                toV2({ name: 'o', type: Core.Option(typeName('Int')) }),
+                toV2({ name: 'l', type: Core.List(typeName('Int')) }),
+                toV2({ name: 'm', type: mapType }),
+                toV2({ name: 's', type: setType }),
+                toV2({ name: 'w', type: workflowType }),
             ],
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Unit'),
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    { kind: 'Return', expr: Core.Null() },
+                    toV2({ kind: 'Return', expr: Core.Null() }),
                 ],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.container_types',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(!diagnostics.some(d => d.code === "E006" /* ErrorCode.TYPEVAR_LIKE_UNDECLARED */), 'Result/Option/List/Map/Set/Workflow 容器类型不应被误认为未声明的类型变量');
     });
     it('Core 中的未知类型名不触发 TYPEVAR_LIKE_UNDECLARED（可能是类型别名，未声明的类型由 E800 报告，#281）', () => {
         // 使用一个未在 KNOWN_SCALARS 中且未定义的类型名
-        const func = {
+        const func = toV2({
             kind: 'Func',
             name: 'useUnknownType',
             typeParams: [],
             params: [
-                { name: 'x', type: typeName('UnknownCustomType') },
+                toV2({ name: 'x', type: typeName('UnknownCustomType') }),
             ],
             effects: [],
             effectCaps: [],
             effectCapsExplicit: false,
             ret: typeName('Unit'),
-            body: {
+            body: toV2({
                 kind: 'Block',
                 statements: [
-                    { kind: 'Return', expr: Core.Null() },
+                    toV2({ kind: 'Return', expr: Core.Null() }),
                 ],
-            },
-        };
-        const mod = {
+            }),
+        });
+        const mod = toV2({
             kind: 'Module',
             name: 'test.regression.unknown_type',
             decls: [func],
-        };
+        });
         const diagnostics = typecheckModule(mod);
         assert.ok(!diagnostics.some(d => d.code === "E006" /* ErrorCode.TYPEVAR_LIKE_UNDECLARED */), '未知类型名 UnknownCustomType 不应触发 TYPEVAR_LIKE_UNDECLARED（Java 亦不报）');
     });

package/dist/test/unit/typecheck/regression-fixes.test.js.map

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

package/dist/test/unit/typecheck/symbol-table.test.js

@@ -7,6 +7,7 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { SymbolTable, DuplicateSymbolError } from '../../../src/typecheck/symbol_table.js';
 import { Core } from '../../../src/core/core_ir.js';
+import { toV2 } from '../../helpers/core-ir-v2.js';
 const typeName = (name) => Core.TypeName(name);
 const maybeType = (inner) => Core.Maybe(inner);
 const optionType = (inner) => Core.Option(inner);
@@ -105,7 +106,7 @@ describe('SymbolTable', () => {
             table.defineTypeAlias('UserId', typeName('Int'));
             table.defineTypeAlias('MaybeUserId', maybeType(typeName('UserId')));
             table.defineTypeAlias('OptionalUserList', optionType(listType(typeName('MaybeUserId'))));
-            const complexFunc = {
+            const complexFunc = toV2({
                 kind: 'FuncType',
                 params: [
                     typeApp('Wrapper', [
@@ -115,7 +116,7 @@ describe('SymbolTable', () => {
                     piiType(resultType(typeName('OptionalUserList'), typeName('Error')), 'L2', 'email'),
                 ],
                 ret: resultType(typeName('UserId'), listType(typeName('MaybeUserId'))),
-            };
+            });
             table.defineTypeAlias('ComplexAlias', complexFunc);
             const resolved = table.resolveTypeAlias('ComplexAlias');
             assert.ok(resolved && resolved.kind === 'FuncType', '函数别名应成功解析');

package/dist/test/unit/typecheck/symbol-table.test.js.map

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

package/dist/test/unit/typecheck/type-system-extended.test.js

@@ -8,6 +8,7 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { TypeSystem } from '../../../src/typecheck/type_system.js';
 import { Effect } from '../../../src/config/semantic.js';
+import { toV2 } from '../../helpers/core-ir-v2.js';
 const makeFuncType = (override = {}) => ({
     kind: 'FuncType',
     params: [],
@@ -69,9 +70,9 @@ describe('TypeSystem.inferListElementType', () => {
     it('应该在所有元素类型一致时返回该类型', () => {
         // list 字面全部是 Int 时返回 Int
         const ints = [
-            { kind: 'Int', value: 1 },
-            { kind: 'Int', value: 2 },
-            { kind: 'Int', value: 3 },
+            toV2({ kind: 'Int', value: 1 }),
+            toV2({ kind: 'Int', value: 2 }),
+            toV2({ kind: 'Int', value: 3 }),
         ];
         const inferred = TypeSystem.inferListElementType(ints);
         assert.deepStrictEqual(inferred, { kind: 'TypeName', name: 'Int' });
@@ -79,8 +80,8 @@ describe('TypeSystem.inferListElementType', () => {
     it('应该在元素类型不一致时退回 Unknown', () => {
         // list 字面混合 Int 与 Text 必须回退 Unknown
         const mixed = [
-            { kind: 'Int', value: 1 },
-            { kind: 'String', value: 'oops' },
+            toV2({ kind: 'Int', value: 1 }),
+            toV2({ kind: 'String', value: 'oops' }),
         ];
         const inferred = TypeSystem.inferListElementType(mixed);
         assert.deepStrictEqual(inferred, TypeSystem.unknown());