@aster-cloud/aster-lang-ts 1.0.31 → 1.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (127) hide show
  1. package/dist/scripts/corpus-loader.d.ts +10 -4
  2. package/dist/scripts/corpus-loader.d.ts.map +1 -1
  3. package/dist/scripts/corpus-loader.js +24 -9
  4. package/dist/scripts/corpus-loader.js.map +1 -1
  5. package/dist/scripts/lexicon-completeness.d.ts +42 -0
  6. package/dist/scripts/lexicon-completeness.d.ts.map +1 -0
  7. package/dist/scripts/lexicon-completeness.js +57 -0
  8. package/dist/scripts/lexicon-completeness.js.map +1 -0
  9. package/dist/scripts/lsp-client-helper.d.ts +7 -1
  10. package/dist/scripts/lsp-client-helper.d.ts.map +1 -1
  11. package/dist/scripts/lsp-client-helper.js +6 -1
  12. package/dist/scripts/lsp-client-helper.js.map +1 -1
  13. package/dist/scripts/verify-lexicon-sync.js +14 -44
  14. package/dist/scripts/verify-lexicon-sync.js.map +1 -1
  15. package/dist/src/lsp/codeaction.d.ts.map +1 -1
  16. package/dist/src/lsp/codeaction.js +12 -4
  17. package/dist/src/lsp/codeaction.js.map +1 -1
  18. package/dist/src/lsp/diagnostics.d.ts +2 -0
  19. package/dist/src/lsp/diagnostics.d.ts.map +1 -1
  20. package/dist/src/lsp/diagnostics.js +4 -0
  21. package/dist/src/lsp/diagnostics.js.map +1 -1
  22. package/dist/src/lsp/navigation/hover.d.ts.map +1 -1
  23. package/dist/src/lsp/navigation/hover.js +23 -0
  24. package/dist/src/lsp/navigation/hover.js.map +1 -1
  25. package/dist/src/lsp/navigation/references.d.ts +3 -1
  26. package/dist/src/lsp/navigation/references.d.ts.map +1 -1
  27. package/dist/src/lsp/navigation/references.js +16 -6
  28. package/dist/src/lsp/navigation/references.js.map +1 -1
  29. package/dist/src/lsp/navigation/rename.d.ts +1 -1
  30. package/dist/src/lsp/navigation/rename.d.ts.map +1 -1
  31. package/dist/src/lsp/navigation/rename.js +31 -42
  32. package/dist/src/lsp/navigation/rename.js.map +1 -1
  33. package/dist/src/lsp/navigation/shared.d.ts +34 -2
  34. package/dist/src/lsp/navigation/shared.d.ts.map +1 -1
  35. package/dist/src/lsp/navigation/shared.js +88 -10
  36. package/dist/src/lsp/navigation/shared.js.map +1 -1
  37. package/dist/src/lsp/navigation.js +2 -2
  38. package/dist/src/lsp/navigation.js.map +1 -1
  39. package/dist/src/lsp/parse-document.d.ts +11 -0
  40. package/dist/src/lsp/parse-document.d.ts.map +1 -0
  41. package/dist/src/lsp/parse-document.js +51 -0
  42. package/dist/src/lsp/parse-document.js.map +1 -0
  43. package/dist/src/lsp/server.js +18 -23
  44. package/dist/src/lsp/server.js.map +1 -1
  45. package/dist/src/lsp/settings.d.ts +35 -0
  46. package/dist/src/lsp/settings.d.ts.map +1 -0
  47. package/dist/src/lsp/settings.js +31 -0
  48. package/dist/src/lsp/settings.js.map +1 -0
  49. package/dist/src/lsp/source-positions.d.ts +47 -0
  50. package/dist/src/lsp/source-positions.d.ts.map +1 -0
  51. package/dist/src/lsp/source-positions.js +92 -0
  52. package/dist/src/lsp/source-positions.js.map +1 -0
  53. package/dist/src/lsp/workspace/document-indexer.d.ts +3 -1
  54. package/dist/src/lsp/workspace/document-indexer.d.ts.map +1 -1
  55. package/dist/src/lsp/workspace/document-indexer.js +5 -7
  56. package/dist/src/lsp/workspace/document-indexer.js.map +1 -1
  57. package/dist/src/lsp/workspace/symbol-finder.d.ts +8 -1
  58. package/dist/src/lsp/workspace/symbol-finder.d.ts.map +1 -1
  59. package/dist/src/lsp/workspace/symbol-finder.js +10 -13
  60. package/dist/src/lsp/workspace/symbol-finder.js.map +1 -1
  61. package/dist/src/parser/constraint-parser.d.ts.map +1 -1
  62. package/dist/src/parser/constraint-parser.js +18 -7
  63. package/dist/src/parser/constraint-parser.js.map +1 -1
  64. package/dist/src/parser/decl-parser.d.ts.map +1 -1
  65. package/dist/src/parser/decl-parser.js +6 -5
  66. package/dist/src/parser/decl-parser.js.map +1 -1
  67. package/dist/src/parser/expr-stmt-parser.d.ts.map +1 -1
  68. package/dist/src/parser/expr-stmt-parser.js +95 -38
  69. package/dist/src/parser/expr-stmt-parser.js.map +1 -1
  70. package/dist/src/parser/import-parser.d.ts.map +1 -1
  71. package/dist/src/parser/import-parser.js +2 -1
  72. package/dist/src/parser/import-parser.js.map +1 -1
  73. package/dist/src/parser/keyword-display.d.ts +40 -0
  74. package/dist/src/parser/keyword-display.d.ts.map +1 -0
  75. package/dist/src/parser/keyword-display.js +73 -0
  76. package/dist/src/parser/keyword-display.js.map +1 -0
  77. package/dist/src/parser/type-parser.d.ts.map +1 -1
  78. package/dist/src/parser/type-parser.js +5 -4
  79. package/dist/src/parser/type-parser.js.map +1 -1
  80. package/dist/src/parser.d.ts.map +1 -1
  81. package/dist/src/parser.js +1 -0
  82. package/dist/src/parser.js.map +1 -1
  83. package/dist/test/integration/lsp/lsp-rename-safety.test.d.ts +2 -0
  84. package/dist/test/integration/lsp/lsp-rename-safety.test.d.ts.map +1 -0
  85. package/dist/test/integration/lsp/lsp-rename-safety.test.js +114 -0
  86. package/dist/test/integration/lsp/lsp-rename-safety.test.js.map +1 -0
  87. package/dist/test/integration/lsp/lsp-source-positions.test.d.ts +2 -0
  88. package/dist/test/integration/lsp/lsp-source-positions.test.d.ts.map +1 -0
  89. package/dist/test/integration/lsp/lsp-source-positions.test.js +161 -0
  90. package/dist/test/integration/lsp/lsp-source-positions.test.js.map +1 -0
  91. package/dist/test/integration/lsp/lsp-zh-inmemory-navigation.test.d.ts +2 -0
  92. package/dist/test/integration/lsp/lsp-zh-inmemory-navigation.test.d.ts.map +1 -0
  93. package/dist/test/integration/lsp/lsp-zh-inmemory-navigation.test.js +79 -0
  94. package/dist/test/integration/lsp/lsp-zh-inmemory-navigation.test.js.map +1 -0
  95. package/dist/test/unit/eval-regression-poker-straight-high.test.d.ts +2 -0
  96. package/dist/test/unit/eval-regression-poker-straight-high.test.d.ts.map +1 -0
  97. package/dist/test/unit/eval-regression-poker-straight-high.test.js +61 -0
  98. package/dist/test/unit/eval-regression-poker-straight-high.test.js.map +1 -0
  99. package/dist/test/unit/lexicon-completeness.test.d.ts +2 -0
  100. package/dist/test/unit/lexicon-completeness.test.d.ts.map +1 -0
  101. package/dist/test/unit/lexicon-completeness.test.js +42 -0
  102. package/dist/test/unit/lexicon-completeness.test.js.map +1 -0
  103. package/dist/test/unit/lsp/codeaction.test.js +28 -0
  104. package/dist/test/unit/lsp/codeaction.test.js.map +1 -1
  105. package/dist/test/unit/lsp/lsp-locale-fixes.test.d.ts +2 -0
  106. package/dist/test/unit/lsp/lsp-locale-fixes.test.d.ts.map +1 -0
  107. package/dist/test/unit/lsp/lsp-locale-fixes.test.js +105 -0
  108. package/dist/test/unit/lsp/lsp-locale-fixes.test.js.map +1 -0
  109. package/dist/test/unit/lsp/parse-document.test.d.ts +2 -0
  110. package/dist/test/unit/lsp/parse-document.test.d.ts.map +1 -0
  111. package/dist/test/unit/lsp/parse-document.test.js +30 -0
  112. package/dist/test/unit/lsp/parse-document.test.js.map +1 -0
  113. package/dist/test/unit/mapping/redos-budget.test.js +60 -23
  114. package/dist/test/unit/mapping/redos-budget.test.js.map +1 -1
  115. package/dist/test/unit/parser/keyword-display.test.d.ts +8 -0
  116. package/dist/test/unit/parser/keyword-display.test.d.ts.map +1 -0
  117. package/dist/test/unit/parser/keyword-display.test.js +27 -0
  118. package/dist/test/unit/parser/keyword-display.test.js.map +1 -0
  119. package/dist/test/unit/parser/localized-diagnostic-keywords.test.d.ts +15 -0
  120. package/dist/test/unit/parser/localized-diagnostic-keywords.test.d.ts.map +1 -0
  121. package/dist/test/unit/parser/localized-diagnostic-keywords.test.js +98 -0
  122. package/dist/test/unit/parser/localized-diagnostic-keywords.test.js.map +1 -0
  123. package/dist/test/unit/parser/prefix-operator-call.test.js +119 -1
  124. package/dist/test/unit/parser/prefix-operator-call.test.js.map +1 -1
  125. package/dist/test/unit/scripts/corpus-loader.test.js +44 -9
  126. package/dist/test/unit/scripts/corpus-loader.test.js.map +1 -1
  127. package/package.json +1 -1
@@ -0,0 +1,15 @@
1
+ /**
2
+ * @module test/unit/parser/localized-diagnostic-keywords.test
3
+ *
4
+ * 语法诊断里的**关键词槽位**用作者所写语言的拼写;用户的名字原样保留。
5
+ *
6
+ * 背景:parseWithLexicon 先把 zh/de 关键词翻译成英文 token 再解析,报错文案若写死
7
+ * 英文关键词,作者看到的是从未写过的 'return'。修复在构造诊断时按上下文 lexicon
8
+ * 显示关键词(parser/keyword-display)。本文件锁住三件事:
9
+ * 1. 关键词槽位回译——同一条消息里的**每一个**关键词都回译(不是只改第一个);
10
+ * 2. 用户名字不被改写——类型名 Profile / Pattern 与规范关键词 profile / pattern 同形,
11
+ * 必须保持原样(曾经的事后整句替换会把它改成「档案」「模式」);
12
+ * 3. en-US 文案逐字不变。
13
+ */
14
+ export {};
15
+ //# sourceMappingURL=localized-diagnostic-keywords.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"localized-diagnostic-keywords.test.d.ts","sourceRoot":"","sources":["../../../../test/unit/parser/localized-diagnostic-keywords.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG"}
@@ -0,0 +1,98 @@
1
+ /**
2
+ * @module test/unit/parser/localized-diagnostic-keywords.test
3
+ *
4
+ * 语法诊断里的**关键词槽位**用作者所写语言的拼写;用户的名字原样保留。
5
+ *
6
+ * 背景:parseWithLexicon 先把 zh/de 关键词翻译成英文 token 再解析,报错文案若写死
7
+ * 英文关键词,作者看到的是从未写过的 'return'。修复在构造诊断时按上下文 lexicon
8
+ * 显示关键词(parser/keyword-display)。本文件锁住三件事:
9
+ * 1. 关键词槽位回译——同一条消息里的**每一个**关键词都回译(不是只改第一个);
10
+ * 2. 用户名字不被改写——类型名 Profile / Pattern 与规范关键词 profile / pattern 同形,
11
+ * 必须保持原样(曾经的事后整句替换会把它改成「档案」「模式」);
12
+ * 3. en-US 文案逐字不变。
13
+ */
14
+ import { describe, it } from 'node:test';
15
+ import assert from 'node:assert';
16
+ import { canonicalize } from '../../../src/frontend/canonicalizer.js';
17
+ import { lex } from '../../../src/frontend/lexer.js';
18
+ import { parseWithLexicon } from '../../../src/parser.js';
19
+ import { ZH_CN } from '../../../src/config/lexicons/zh-CN.js';
20
+ import { DE_DE } from '../../../src/config/lexicons/de-DE.js';
21
+ import { EN_US } from '../../../src/config/lexicons/en-US.js';
22
+ function messages(src, lexicon) {
23
+ const tokens = lex(canonicalize(src, lexicon), lexicon);
24
+ return parseWithLexicon(tokens, lexicon).diagnostics.map(d => d.message).join(' | ');
25
+ }
26
+ const ZH_HEADER = '模块 m。\n\n';
27
+ describe('语法诊断关键词槽位本地化', () => {
28
+ it('zh:同一条消息里的两个关键词都回译', () => {
29
+ const msg = messages(ZH_HEADER + '规则 r 给定 x 作为 整数 产出 整数:\n 如果 x 小于 0 那么 x。\n 返回 x。', ZH_CN);
30
+ assert.strictEqual(msg, "Expected '返回' after '那么'");
31
+ });
32
+ it('de:同一错误用德语关键词', () => {
33
+ const k = DE_DE.keywords;
34
+ const src = [
35
+ `${k.MODULE_DECL} m.`,
36
+ '',
37
+ `${k.FUNC_TO} r ${k.FUNC_GIVEN} x ${k.IMPORT_ALIAS} ${k.INT_TYPE}, ${k.FUNC_PRODUCE} ${k.INT_TYPE}:`,
38
+ ` ${k.IF} x < 0 ${k.THEN} x.`,
39
+ ` ${k.RETURN} x.`,
40
+ ].join('\n');
41
+ assert.strictEqual(messages(src, DE_DE), `Expected '${k.RETURN}' after '${k.THEN}'`);
42
+ });
43
+ it('en:文案逐字不变', () => {
44
+ const msg = messages('Module m.\n\nRule r given x as Int, produce Int:\n If x less than 0 then x.\n Return x.', EN_US);
45
+ assert.strictEqual(msg, "Expected 'return' after 'then'");
46
+ });
47
+ });
48
+ describe('各关键词槽位(zh 逐条锁住,en 逐字不变)', () => {
49
+ const ZH_RULE = ZH_HEADER + '规则 r 给定 x 作为 整数 产出 整数:\n';
50
+ const EN_RULE = 'Module m.\n\nRule r given x as Int, produce Int:\n';
51
+ const cases = [
52
+ // [说明, zh 源码, 期望的完整报错]
53
+ ['else 分支(KW.ELSE 与 EN_US 的 Otherwise 拼写不同,须按语义种类查)',
54
+ ZH_RULE + ' 如果 x 小于 0 那么 返回 1 否则 x。\n 返回 x。',
55
+ "Expected '返回' or '如果' after '否则'"],
56
+ ['Let … be',
57
+ ZH_RULE + ' 令 y x。\n 返回 y。',
58
+ "Use '定义为' in bindings: '令 x 定义为 ...'."],
59
+ ['表达式 if 缺 else',
60
+ ZH_RULE + ' 返回 如果 x 小于 0 那么 1。',
61
+ "Expected '否则' in if-expression (否则 is mandatory for expression-level if)"],
62
+ ['match 分支缺 When',
63
+ ZH_RULE + ' 匹配于 x:\n 1,返回 1。\n 返回 x。',
64
+ "Expected '当' (若...为 pattern requires '为' after '若')"],
65
+ ['约束 at 后缺 least/most(zh 里 at least 是单个词,给出完整本地写法)',
66
+ ZH_HEADER + '定义 P 包含 score 作为 整数 at foo 3。',
67
+ "此处需要 '至少' 或 '至多'"],
68
+ ['约束 at least 后缺数值',
69
+ ZH_HEADER + '定义 P 包含 score 作为 整数 至少。',
70
+ "约束 '至少' 后需要数值"],
71
+ ];
72
+ for (const [label, src, expected] of cases) {
73
+ it(`zh:${label}`, () => {
74
+ assert.strictEqual(messages(src, ZH_CN), expected);
75
+ });
76
+ }
77
+ it('en:else 分支与 at 修饰词文案逐字不变', () => {
78
+ assert.strictEqual(messages(EN_RULE + ' If x less than 0 then Return 1 otherwise x.\n Return x.', EN_US), "Expected 'return' or 'if' after 'else'");
79
+ assert.strictEqual(messages('Module m.\n\nDefine P with score as Int at foo 3.', EN_US), "'at' 后需要 'least' 或 'most'");
80
+ });
81
+ });
82
+ describe('用户名字不被当作关键词改写', () => {
83
+ // 类型名与规范关键词同形:profile(档案)/ pattern(模式)
84
+ for (const [typeName, wouldBe] of [['Profile', '档案'], ['Pattern', '模式']]) {
85
+ it(`zh:类型名 ${typeName} 原样保留,句中关键词照常回译`, () => {
86
+ const msg = messages(ZH_HEADER + `定义 ${typeName} 包含 score 作为 整数。\n\n规则 r 给定 x 作为 整数 产出 ${typeName}:\n 返回 ${typeName}(x)。`, ZH_CN);
87
+ assert.ok(msg.includes(`Cannot construct '${typeName}'`), msg);
88
+ assert.ok(!msg.includes(wouldBe), `类型名不应被改写成「${wouldBe}」:${msg}`);
89
+ // 后半句的 with / set to / and 是关键词槽位,应显示 zh 拼写
90
+ assert.ok(msg.includes(`'${typeName} 包含 <field> 将 设为 <value> 并且 ...'`), msg);
91
+ });
92
+ }
93
+ it('en:同一构造错误文案逐字不变', () => {
94
+ const msg = messages('Module m.\n\nDefine Profile with score as Int.\n\nRule r given x as Int, produce Profile:\n Return Profile(x).', EN_US);
95
+ assert.strictEqual(msg, "Cannot construct 'Profile' with positional arguments. Use named fields instead: 'Profile with <field> set to <value> and ...'");
96
+ });
97
+ });
98
+ //# sourceMappingURL=localized-diagnostic-keywords.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"localized-diagnostic-keywords.test.js","sourceRoot":"","sources":["../../../../test/unit/parser/localized-diagnostic-keywords.test.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,8 @@ import { describe, test } from 'node:test';
6
6
  import assert from 'node:assert/strict';
7
7
  import { canonicalize } from '../../../src/frontend/canonicalizer.js';
8
8
  import { lex } from '../../../src/frontend/lexer.js';
9
- import { parse } from '../../../src/parser.js';
9
+ import { parse, parseWithLexicon } from '../../../src/parser.js';
10
+ import { ZH_CN } from '../../../src/config/lexicons/zh-CN.js';
10
11
  import { lowerModule } from '../../../src/lower_to_core.js';
11
12
  import { typecheckModule } from '../../../src/typecheck.js';
12
13
  function toCore(source) {
@@ -16,6 +17,13 @@ function toCore(source) {
16
17
  throw new Error(errors.map((d) => `${d.code} ${d.message}`).join('\n'));
17
18
  return lowerModule(result.ast);
18
19
  }
20
+ function zhToCore(source) {
21
+ const result = parseWithLexicon(lex(canonicalize(source, ZH_CN), ZH_CN), ZH_CN);
22
+ const errors = result.diagnostics.filter((d) => d.severity === 'error');
23
+ if (errors.length > 0)
24
+ throw new Error(errors.map((d) => `${d.code} ${d.message}`).join('\n'));
25
+ return lowerModule(result.ast);
26
+ }
19
27
  function stripOrigins(o) {
20
28
  if (Array.isArray(o))
21
29
  return o.map(stripOrigins);
@@ -66,4 +74,114 @@ describe('前缀运算符调用', () => {
66
74
  assert.throws(() => toCore(ruleReturning('>=(x)', 'Bool')), /前缀操作符调用需要 2 个参数,但实际为 1/);
67
75
  });
68
76
  });
77
+ // 以下各组与 aster-lang-core 实测一致(Canonicalizer + AsterParser + AstBuilder)。
78
+ function boolRule(expr) {
79
+ return `Module m.\n\nRule r given a as Bool, b as Bool, x as Int, y as Int, produce Bool:\n Return ${expr}.\n`;
80
+ }
81
+ function zhRule(expr) {
82
+ return `模块 m。\n\n规则 评估 给定 甲,乙,产出:\n 返回 ${expr}。\n`;
83
+ }
84
+ const WORD_CALL_REJECTED = /运算符词 '([a-z ]+)' 不能用作前缀调用/;
85
+ describe('运算符词前缀调用(en-US):Java operatorCall 只认符号', () => {
86
+ // [源码表达式, 报错中的运算符词]
87
+ const REJECTED = [
88
+ ['and(a, b)', 'and'],
89
+ ['or(a, b)', 'or'],
90
+ ['and(a)', 'and'],
91
+ ['plus(x, y) > 0', 'plus'],
92
+ ['minus(x, y) > 0', 'minus'],
93
+ ['times(x, y) > 0', 'times'],
94
+ ['modulo(x, y) > 0', 'modulo'],
95
+ ];
96
+ for (const [expr, word] of REJECTED) {
97
+ test(`${expr} 被拒绝`, () => {
98
+ assert.throws(() => toCore(boolRule(expr)), new RegExp(`运算符词 '${word}' 不能用作前缀调用;只有符号运算符 < > <= >= != == = \\+ - \\* / 可以写成 op\\(a, b\\)`));
99
+ });
100
+ }
101
+ // 多词运算符原本就被两引擎拒绝(TS 报通用语法错误),锁定现状
102
+ const MULTI_WORD_REJECTED = [
103
+ ['divided by(x, y) > 0', WORD_CALL_REJECTED],
104
+ ['integer divided by(x, y) > 0', WORD_CALL_REJECTED],
105
+ ['less than(x, y)', WORD_CALL_REJECTED],
106
+ ['greater than(x, y)', WORD_CALL_REJECTED],
107
+ ['more than(x, y)', WORD_CALL_REJECTED],
108
+ ['at least(x, y)', WORD_CALL_REJECTED],
109
+ ['at most(x, y)', WORD_CALL_REJECTED],
110
+ ['equals to(x, y)', WORD_CALL_REJECTED],
111
+ ['not equal to(x, y)', /Expected '\.' at end of statement/],
112
+ ['less than or equal to(x, y)', /Expected '\.' at end of statement/],
113
+ ['is less than(x, y)', /Expected '\)' after expression/],
114
+ ['not(a, b)', /Expected '\)' after expression/],
115
+ ];
116
+ for (const [expr, message] of MULTI_WORD_REJECTED) {
117
+ test(`${expr} 被拒绝`, () => {
118
+ assert.throws(() => toCore(boolRule(expr)), message);
119
+ });
120
+ }
121
+ test('中缀 and/or 不受影响', () => {
122
+ assert.doesNotThrow(() => toCore(boolRule('a and b or a')));
123
+ });
124
+ test('not(a) 是一元 not 作用于括号表达式,与 not a 相同', () => {
125
+ assert.deepEqual(stripOrigins(toCore(boolRule('not(a)'))), stripOrigins(toCore(boolRule('not a'))));
126
+ });
127
+ test('en-US 下 under/over 是软关键词:under(x, y) 是普通函数调用', () => {
128
+ for (const word of ['under', 'over']) {
129
+ const func = toCore(boolRule(`${word}(x, y)`)).decls[0];
130
+ const call = func.body.statements[0].expr;
131
+ assert.equal(call.target.name, word);
132
+ }
133
+ });
134
+ test('大小写不同的同名标识符是普通函数调用(Java lexer 区分大小写)', () => {
135
+ for (const name of ['Plus', 'pLus', 'And']) {
136
+ const func = toCore(boolRule(`${name}(x, y)`)).decls[0];
137
+ const call = func.body.statements[0].expr;
138
+ assert.equal(call.target.name, name);
139
+ }
140
+ });
141
+ });
142
+ describe('运算符词前缀调用(非英语词法表):Java Canonicalizer 把可映射的运算符词翻成符号', () => {
143
+ // [中文运算符词或英文关键词, 对应符号]
144
+ const ACCEPTED = [
145
+ ['加上', '+'],
146
+ ['减去', '-'],
147
+ ['乘以', '*'],
148
+ ['除以', '/'],
149
+ ['小于', '<'],
150
+ ['大于', '>'],
151
+ ['多于', '>'],
152
+ ['等于', '=='],
153
+ ['至少', '>='],
154
+ ['至多', '<='],
155
+ ['不足', '<'],
156
+ ['超过', '>'],
157
+ ['plus', '+'],
158
+ ['under', '<'],
159
+ ];
160
+ for (const [word, symbol] of ACCEPTED) {
161
+ test(`${word}(甲,乙) 与 ${symbol}(甲,乙) 的 Core IR 相同`, () => {
162
+ assert.deepEqual(stripOrigins(zhToCore(zhRule(`${word}(甲,乙)`))), stripOrigins(zhToCore(zhRule(`${symbol}(甲,乙)`))));
163
+ });
164
+ }
165
+ // 报错里的运算符词按作者 locale 拼写呈现(构造诊断时经 parser/keyword-display 按上下文 lexicon 显示)。
166
+ // 作者在 zh 源码里直接写英文 and/modulo 时,同样显示 zh 词表的规范拼写。
167
+ const REJECTED = [
168
+ ['并且(真值,假值)', '并且'],
169
+ ['或者(真值,假值)', '或者'],
170
+ ['取模(甲,乙)', '取模'],
171
+ ['整除(甲,乙)', '整除'],
172
+ ['and(真值,假值)', '并且'],
173
+ ['modulo(甲,乙)', '取模'],
174
+ ];
175
+ for (const [expr, word] of REJECTED) {
176
+ test(`${expr} 被拒绝`, () => {
177
+ assert.throws(() => zhToCore(zhRule(expr)), new RegExp(`运算符词 '${word}' 不能用作前缀调用`));
178
+ });
179
+ }
180
+ test('参数个数不是 2 时报与符号前缀调用相同的错误', () => {
181
+ assert.throws(() => zhToCore(zhRule('加上(甲)')), /前缀操作符调用需要 2 个参数,但实际为 1/);
182
+ });
183
+ test('不是(真值) 仍是一元 not', () => {
184
+ assert.deepEqual(stripOrigins(zhToCore(zhRule('不是(真值)'))), stripOrigins(zhToCore(zhRule('不是 真值'))));
185
+ });
186
+ });
69
187
  //# sourceMappingURL=prefix-operator-call.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"prefix-operator-call.test.js","sourceRoot":"","sources":["../../../../test/unit/parser/prefix-operator-call.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prefix-operator-call.test.js","sourceRoot":"","sources":["../../../../test/unit/parser/prefix-operator-call.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG5D,SAAS,MAAM,CAAC,MAAc;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IACxE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/F,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc;IAC9B,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAChF,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IACxE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/F,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,CAAU;IAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACjD,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,GAAG,GAA4B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,KAAK,QAAQ;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,GAAW;IAC9C,OAAO,yDAAyD,GAAG,eAAe,IAAI,KAAK,CAAC;AAC9F,CAAC;AAED,wBAAwB;AACxB,MAAM,KAAK,GAAqD;IAC9D,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC;IACtB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;IACxB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;IACxB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;IACxB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;IACxB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACrB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACrB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACrB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;CACtB,CAAC;AAEF,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC;QACrC,IAAI,CAAC,GAAG,EAAE,YAAY,KAAK,eAAe,EAAE,GAAG,EAAE;YAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;YACzD,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACxF,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAc,CAAC;QAC5E,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAgB,CAAC;QACnD,MAAM,CAAC,KAAK,CAAG,GAAG,CAAC,IAAkB,CAAC,MAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAClC,MAAM,CAAC,SAAS,CACd,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC,CAAC,EAC1E,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAC1F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,wEAAwE;AACxE,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,+FAA+F,IAAI,KAAK,CAAC;AAClH,CAAC;AAED,SAAS,MAAM,CAAC,IAAY;IAC1B,OAAO,mCAAmC,IAAI,KAAK,CAAC;AACtD,CAAC;AAED,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AAEvD,QAAQ,CAAC,wCAAwC,EAAE,GAAG,EAAE;IACtD,oBAAoB;IACpB,MAAM,QAAQ,GAA6C;QACzD,CAAC,WAAW,EAAE,KAAK,CAAC;QACpB,CAAC,UAAU,EAAE,IAAI,CAAC;QAClB,CAAC,QAAQ,EAAE,KAAK,CAAC;QACjB,CAAC,gBAAgB,EAAE,MAAM,CAAC;QAC1B,CAAC,iBAAiB,EAAE,OAAO,CAAC;QAC5B,CAAC,iBAAiB,EAAE,OAAO,CAAC;QAC5B,CAAC,kBAAkB,EAAE,QAAQ,CAAC;KAC/B,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,IAAI,MAAM,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAC5B,IAAI,MAAM,CAAC,SAAS,IAAI,oEAAoE,CAAC,CAC9F,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kCAAkC;IAClC,MAAM,mBAAmB,GAA6C;QACpE,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;QAC5C,CAAC,8BAA8B,EAAE,kBAAkB,CAAC;QACpD,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;QACvC,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;QAC1C,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;QACvC,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;QACtC,CAAC,eAAe,EAAE,kBAAkB,CAAC;QACrC,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;QACvC,CAAC,oBAAoB,EAAE,mCAAmC,CAAC;QAC3D,CAAC,6BAA6B,EAAE,mCAAmC,CAAC;QACpE,CAAC,oBAAoB,EAAE,gCAAgC,CAAC;QACxD,CAAC,WAAW,EAAE,gCAAgC,CAAC;KAChD,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAClD,IAAI,CAAC,GAAG,IAAI,MAAM,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC1B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACxD,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAc,CAAC;YACrE,MAAM,IAAI,GAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAiB,CAAC,IAAiB,CAAC;YACxE,MAAM,CAAC,KAAK,CAAE,IAAI,CAAC,MAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAChD,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAc,CAAC;YACrE,MAAM,IAAI,GAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAiB,CAAC,IAAiB,CAAC;YACxE,MAAM,CAAC,KAAK,CAAE,IAAI,CAAC,MAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mDAAmD,EAAE,GAAG,EAAE;IACjE,uBAAuB;IACvB,MAAM,QAAQ,GAA6C;QACzD,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,IAAI,CAAC;QACZ,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,IAAI,EAAE,GAAG,CAAC;QACX,CAAC,MAAM,EAAE,GAAG,CAAC;QACb,CAAC,OAAO,EAAE,GAAG,CAAC;KACf,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG,IAAI,WAAW,MAAM,oBAAoB,EAAE,GAAG,EAAE;YACtD,MAAM,CAAC,SAAS,CACd,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAC9C,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,0EAA0E;IAC1E,gDAAgD;IAChD,MAAM,QAAQ,GAA6C;QACzD,CAAC,WAAW,EAAE,IAAI,CAAC;QACnB,CAAC,WAAW,EAAE,IAAI,CAAC;QACnB,CAAC,SAAS,EAAE,IAAI,CAAC;QACjB,CAAC,SAAS,EAAE,IAAI,CAAC;QACjB,CAAC,YAAY,EAAE,IAAI,CAAC;QACpB,CAAC,aAAa,EAAE,IAAI,CAAC;KACtB,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,IAAI,MAAM,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,MAAM,CAAC,SAAS,IAAI,YAAY,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -4,9 +4,17 @@ import fs from 'node:fs';
4
4
  import os from 'node:os';
5
5
  import path from 'node:path';
6
6
  import { fileURLToPath } from 'node:url';
7
- import { assertCorpusFrom, loadCorpus, corpusLoaderPath, CORPUS_PATH_ENV } from '../../../scripts/corpus-loader.js';
7
+ import { assertCorpusFrom, loadCorpus, corpusLoaderPath, siblingCorpusCandidates, CORPUS_PATH_ENV } from '../../../scripts/corpus-loader.js';
8
8
  // ★issue #194:corpus-regression 工作流设置 ASTER_LANG_TEST_PATH,golden.ts 却静态
9
9
  // import npm 包,变量零读取。这里守住两件事:变量生效、生效与否可被察觉。
10
+ /** 按 issue 复现步骤:把 npm 包的 loader 与语料复制成 checkout 布局。 */
11
+ function makeCheckout(root) {
12
+ const pkgRoot = path.resolve(path.dirname(fileURLToPath(import.meta.resolve('@aster-cloud/aster-lang-test'))), '..');
13
+ fs.cpSync(path.join(pkgRoot, 'corpus'), path.join(root, 'corpus'), { recursive: true });
14
+ fs.mkdirSync(path.dirname(corpusLoaderPath(root)), { recursive: true });
15
+ fs.copyFileSync(path.join(pkgRoot, 'dist', 'loader.js'), corpusLoaderPath(root));
16
+ return root;
17
+ }
10
18
  describe('corpus-loader:ASTER_LANG_TEST_PATH 必须生效且可验证', () => {
11
19
  const sample = (absPath) => ({ absPath, meta: { tier: 1 } });
12
20
  it('样本全部位于 checkout 之下 → 通过', () => {
@@ -49,14 +57,9 @@ describe('corpus-loader:ASTER_LANG_TEST_PATH 必须生效且可验证', () =>
49
57
  }
50
58
  });
51
59
  it('★loadCorpus:变量指向符号链接的 checkout → 生效,样本来自该 checkout', async () => {
52
- // 按 issue 复现步骤:把 npm 包的 loader 与语料复制成 checkout 布局,再经软链加载。
53
- const pkgRoot = path.resolve(path.dirname(fileURLToPath(import.meta.resolve('@aster-cloud/aster-lang-test'))), '..');
54
60
  const base = fs.mkdtempSync(path.join(os.tmpdir(), 'aster-corpus-checkout-'));
55
61
  try {
56
- const real = path.join(base, 'real');
57
- fs.cpSync(path.join(pkgRoot, 'corpus'), path.join(real, 'corpus'), { recursive: true });
58
- fs.mkdirSync(path.dirname(corpusLoaderPath(real)), { recursive: true });
59
- fs.copyFileSync(path.join(pkgRoot, 'dist', 'loader.js'), corpusLoaderPath(real));
62
+ const real = makeCheckout(path.join(base, 'real'));
60
63
  const link = path.join(base, 'link');
61
64
  fs.symlinkSync(real, link);
62
65
  const mod = await loadCorpus({ [CORPUS_PATH_ENV]: link });
@@ -68,10 +71,42 @@ describe('corpus-loader:ASTER_LANG_TEST_PATH 必须生效且可验证', () =>
68
71
  fs.rmSync(base, { recursive: true, force: true });
69
72
  }
70
73
  });
71
- it('未设置变量 → 回退到 npm 依赖', async () => {
72
- const mod = await loadCorpus({});
74
+ it('未设置变量且无兄弟 checkout → 回退到 npm 依赖', async () => {
75
+ const mod = await loadCorpus({}, []);
73
76
  assert.equal(typeof mod.listSamples, 'function');
74
77
  });
78
+ // ★golden 期望跟随 aster-lang-test main(corpus-regression 工作流的口径);npm 快照
79
+ // 长期不发版,未设变量时若仍读它,PR CI 与本地 golden 校验的就是陈旧语料。
80
+ it('★未设置变量、兄弟 checkout 已构建 → 从兄弟仓加载', async () => {
81
+ const base = fs.mkdtempSync(path.join(os.tmpdir(), 'aster-corpus-sibling-'));
82
+ try {
83
+ const sibling = makeCheckout(path.join(base, 'aster-lang-test'));
84
+ const mod = await loadCorpus({}, [path.join(base, 'missing'), sibling]);
85
+ const samples = mod.listSamples();
86
+ assert.ok(samples.length > 0);
87
+ assert.ok(samples[0].absPath.startsWith(fs.realpathSync.native(sibling) + path.sep));
88
+ }
89
+ finally {
90
+ fs.rmSync(base, { recursive: true, force: true });
91
+ }
92
+ });
93
+ it('★兄弟 checkout 存在但 loader 未构建 → 失败并提示构建,不静默退回 npm', async () => {
94
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'aster-corpus-unbuilt-'));
95
+ try {
96
+ fs.mkdirSync(path.join(dir, 'corpus'));
97
+ await assert.rejects(loadCorpus({}, [dir]), /pnpm run build/);
98
+ }
99
+ finally {
100
+ fs.rmSync(dir, { recursive: true, force: true });
101
+ }
102
+ });
103
+ it('默认兄弟候选:本地 ../aster-lang-test 与 CI 工作区内 ./aster-lang-test', () => {
104
+ const cwd = path.join(os.tmpdir(), 'ws', 'aster-lang-ts');
105
+ assert.deepEqual(siblingCorpusCandidates(cwd), [
106
+ path.join(os.tmpdir(), 'ws', 'aster-lang-test'),
107
+ path.join(cwd, 'aster-lang-test'),
108
+ ]);
109
+ });
75
110
  it('★变量指向没有 loader 产物的目录 → 失败并提示构建', async () => {
76
111
  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'aster-corpus-missing-'));
77
112
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"corpus-loader.test.js","sourceRoot":"","sources":["../../../../test/unit/scripts/corpus-loader.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"corpus-loader.test.js","sourceRoot":"","sources":["../../../../test/unit/scripts/corpus-loader.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aster-cloud/aster-lang-ts",
3
- "version": "1.0.31",
3
+ "version": "1.0.33",
4
4
  "description": "Aster CNL (Controlled Natural Language) TypeScript Compiler - Lexer, Parser, AST, Core IR, Type Checker",
5
5
  "type": "module",
6
6
  "main": "./dist/src/index.js",