@aster-cloud/aster-lang-ts 1.0.36 → 1.1.0

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 (341) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/README.md +13 -7
  3. package/dist/scripts/aster.js +10 -5
  4. package/dist/scripts/aster.js.map +1 -1
  5. package/dist/scripts/core-ir-json.js +8 -3
  6. package/dist/scripts/core-ir-json.js.map +1 -1
  7. package/dist/scripts/emit-classfiles.js +3 -2
  8. package/dist/scripts/emit-classfiles.js.map +1 -1
  9. package/dist/scripts/emit-core.js +8 -5
  10. package/dist/scripts/emit-core.js.map +1 -1
  11. package/dist/scripts/generate-casefold.d.ts +2 -0
  12. package/dist/scripts/generate-casefold.d.ts.map +1 -0
  13. package/dist/scripts/generate-casefold.js +34 -0
  14. package/dist/scripts/generate-casefold.js.map +1 -0
  15. package/dist/scripts/generate-lexicons.js +17 -1
  16. package/dist/scripts/generate-lexicons.js.map +1 -1
  17. package/dist/scripts/golden.js +16 -16
  18. package/dist/scripts/golden.js.map +1 -1
  19. package/dist/scripts/perf-benchmark.js +1 -0
  20. package/dist/scripts/perf-benchmark.js.map +1 -1
  21. package/dist/scripts/profile-medium-project.js +1 -1
  22. package/dist/scripts/profile-medium-project.js.map +1 -1
  23. package/dist/scripts/repl.js +3 -8
  24. package/dist/scripts/repl.js.map +1 -1
  25. package/dist/scripts/typecheck-cli.js +10 -9
  26. package/dist/scripts/typecheck-cli.js.map +1 -1
  27. package/dist/scripts/update-eff-violation-expected.js +6 -6
  28. package/dist/scripts/update-eff-violation-expected.js.map +1 -1
  29. package/dist/scripts/verify-capabilities.js +3 -6
  30. package/dist/scripts/verify-capabilities.js.map +1 -1
  31. package/dist/scripts/verify-lexicon-sync.js +10 -0
  32. package/dist/scripts/verify-lexicon-sync.js.map +1 -1
  33. package/dist/src/ai/validator.d.ts +1 -1
  34. package/dist/src/ai/validator.d.ts.map +1 -1
  35. package/dist/src/ai/validator.js +12 -12
  36. package/dist/src/ai/validator.js.map +1 -1
  37. package/dist/src/ast/ast.d.ts +1 -0
  38. package/dist/src/ast/ast.d.ts.map +1 -1
  39. package/dist/src/ast/ast.js.map +1 -1
  40. package/dist/src/browser.d.ts +27 -10
  41. package/dist/src/browser.d.ts.map +1 -1
  42. package/dist/src/browser.js +42 -54
  43. package/dist/src/browser.js.map +1 -1
  44. package/dist/src/cli/policy-converter.js +5 -9
  45. package/dist/src/cli/policy-converter.js.map +1 -1
  46. package/dist/src/compile-pipeline.d.ts +48 -0
  47. package/dist/src/compile-pipeline.d.ts.map +1 -0
  48. package/dist/src/compile-pipeline.js +89 -0
  49. package/dist/src/compile-pipeline.js.map +1 -0
  50. package/dist/src/config/lexicons/diagnostic-messages.d.ts.map +1 -1
  51. package/dist/src/config/lexicons/diagnostic-messages.js +20 -0
  52. package/dist/src/config/lexicons/diagnostic-messages.js.map +1 -1
  53. package/dist/src/config/lexicons/identifiers/casefold-table.generated.d.ts +9 -0
  54. package/dist/src/config/lexicons/identifiers/casefold-table.generated.d.ts.map +1 -0
  55. package/dist/src/config/lexicons/identifiers/casefold-table.generated.js +1467 -0
  56. package/dist/src/config/lexicons/identifiers/casefold-table.generated.js.map +1 -0
  57. package/dist/src/config/lexicons/identifiers/casefold.d.ts +7 -0
  58. package/dist/src/config/lexicons/identifiers/casefold.d.ts.map +1 -0
  59. package/dist/src/config/lexicons/identifiers/casefold.js +37 -0
  60. package/dist/src/config/lexicons/identifiers/casefold.js.map +1 -0
  61. package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.d.ts.map +1 -1
  62. package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.js +8 -0
  63. package/dist/src/config/lexicons/identifiers/domains/finance.loan.de-DE.js.map +1 -1
  64. package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.d.ts.map +1 -1
  65. package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.js +8 -0
  66. package/dist/src/config/lexicons/identifiers/domains/finance.loan.en-US.js.map +1 -1
  67. package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.d.ts.map +1 -1
  68. package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.js +8 -0
  69. package/dist/src/config/lexicons/identifiers/domains/finance.loan.zh-CN.js.map +1 -1
  70. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.d.ts.map +1 -1
  71. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.js +6 -0
  72. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.de-DE.js.map +1 -1
  73. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.d.ts.map +1 -1
  74. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.js +6 -0
  75. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.en-US.js.map +1 -1
  76. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.d.ts.map +1 -1
  77. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.js +6 -0
  78. package/dist/src/config/lexicons/identifiers/domains/insurance.auto.zh-CN.js.map +1 -1
  79. package/dist/src/config/lexicons/identifiers/index.d.ts +7 -9
  80. package/dist/src/config/lexicons/identifiers/index.d.ts.map +1 -1
  81. package/dist/src/config/lexicons/identifiers/index.js +8 -9
  82. package/dist/src/config/lexicons/identifiers/index.js.map +1 -1
  83. package/dist/src/config/lexicons/identifiers/registry.d.ts +11 -5
  84. package/dist/src/config/lexicons/identifiers/registry.d.ts.map +1 -1
  85. package/dist/src/config/lexicons/identifiers/registry.js +20 -14
  86. package/dist/src/config/lexicons/identifiers/registry.js.map +1 -1
  87. package/dist/src/config/lexicons/identifiers/scopes.d.ts +52 -0
  88. package/dist/src/config/lexicons/identifiers/scopes.d.ts.map +1 -0
  89. package/dist/src/config/lexicons/identifiers/scopes.js +166 -0
  90. package/dist/src/config/lexicons/identifiers/scopes.js.map +1 -0
  91. package/dist/src/config/lexicons/identifiers/types.d.ts +15 -29
  92. package/dist/src/config/lexicons/identifiers/types.d.ts.map +1 -1
  93. package/dist/src/config/lexicons/identifiers/types.js +91 -101
  94. package/dist/src/config/lexicons/identifiers/types.js.map +1 -1
  95. package/dist/src/config/lexicons/lsp-ui-texts.d.ts +7 -0
  96. package/dist/src/config/lexicons/lsp-ui-texts.d.ts.map +1 -1
  97. package/dist/src/config/lexicons/lsp-ui-texts.js +12 -0
  98. package/dist/src/config/lexicons/lsp-ui-texts.js.map +1 -1
  99. package/dist/src/config/lexicons/zh-CN.d.ts.map +1 -1
  100. package/dist/src/config/lexicons/zh-CN.js +1 -0
  101. package/dist/src/config/lexicons/zh-CN.js.map +1 -1
  102. package/dist/src/config/semantic.d.ts +5 -0
  103. package/dist/src/config/semantic.d.ts.map +1 -1
  104. package/dist/src/config/semantic.js +12 -0
  105. package/dist/src/config/semantic.js.map +1 -1
  106. package/dist/src/core/inferred_fields.d.ts +10 -0
  107. package/dist/src/core/inferred_fields.d.ts.map +1 -1
  108. package/dist/src/core/inferred_fields.js +9 -0
  109. package/dist/src/core/inferred_fields.js.map +1 -1
  110. package/dist/src/core/interpreter.d.ts.map +1 -1
  111. package/dist/src/core/interpreter.js +37 -16
  112. package/dist/src/core/interpreter.js.map +1 -1
  113. package/dist/src/core/resolution-mark.d.ts +28 -0
  114. package/dist/src/core/resolution-mark.d.ts.map +1 -0
  115. package/dist/src/core/resolution-mark.js +19 -0
  116. package/dist/src/core/resolution-mark.js.map +1 -0
  117. package/dist/src/core/resolve-typed-references.d.ts +36 -0
  118. package/dist/src/core/resolve-typed-references.d.ts.map +1 -0
  119. package/dist/src/core/resolve-typed-references.js +703 -0
  120. package/dist/src/core/resolve-typed-references.js.map +1 -0
  121. package/dist/src/diagnostics/error_codes.d.ts +11 -1
  122. package/dist/src/diagnostics/error_codes.d.ts.map +1 -1
  123. package/dist/src/diagnostics/error_codes.js +80 -0
  124. package/dist/src/diagnostics/error_codes.js.map +1 -1
  125. package/dist/src/frontend/canonicalizer.d.ts +8 -13
  126. package/dist/src/frontend/canonicalizer.d.ts.map +1 -1
  127. package/dist/src/frontend/canonicalizer.js +21 -50
  128. package/dist/src/frontend/canonicalizer.js.map +1 -1
  129. package/dist/src/frontend/resolution-choice.d.ts +34 -0
  130. package/dist/src/frontend/resolution-choice.d.ts.map +1 -0
  131. package/dist/src/frontend/resolution-choice.js +69 -0
  132. package/dist/src/frontend/resolution-choice.js.map +1 -0
  133. package/dist/src/frontend/resolution-context.d.ts +28 -0
  134. package/dist/src/frontend/resolution-context.d.ts.map +1 -0
  135. package/dist/src/frontend/resolution-context.js +7 -0
  136. package/dist/src/frontend/resolution-context.js.map +1 -0
  137. package/dist/src/frontend/resolve-declarations.d.ts +13 -0
  138. package/dist/src/frontend/resolve-declarations.d.ts.map +1 -0
  139. package/dist/src/frontend/resolve-declarations.js +611 -0
  140. package/dist/src/frontend/resolve-declarations.js.map +1 -0
  141. package/dist/src/frontend/resolve-policy-types.d.ts +54 -0
  142. package/dist/src/frontend/resolve-policy-types.d.ts.map +1 -0
  143. package/dist/src/frontend/resolve-policy-types.js +71 -0
  144. package/dist/src/frontend/resolve-policy-types.js.map +1 -0
  145. package/dist/src/frontend/transformers.d.ts +11 -2
  146. package/dist/src/frontend/transformers.d.ts.map +1 -1
  147. package/dist/src/frontend/transformers.js +153 -10
  148. package/dist/src/frontend/transformers.js.map +1 -1
  149. package/dist/src/index.d.ts +14 -7
  150. package/dist/src/index.d.ts.map +1 -1
  151. package/dist/src/index.js +14 -7
  152. package/dist/src/index.js.map +1 -1
  153. package/dist/src/lower_to_core.d.ts +2 -16
  154. package/dist/src/lower_to_core.d.ts.map +1 -1
  155. package/dist/src/lower_to_core.js +101 -44
  156. package/dist/src/lower_to_core.js.map +1 -1
  157. package/dist/src/lsp/canonicalize-options.d.ts +8 -11
  158. package/dist/src/lsp/canonicalize-options.d.ts.map +1 -1
  159. package/dist/src/lsp/canonicalize-options.js +8 -8
  160. package/dist/src/lsp/canonicalize-options.js.map +1 -1
  161. package/dist/src/lsp/completion.d.ts +32 -5
  162. package/dist/src/lsp/completion.d.ts.map +1 -1
  163. package/dist/src/lsp/completion.js +59 -0
  164. package/dist/src/lsp/completion.js.map +1 -1
  165. package/dist/src/lsp/diagnostics.d.ts +2 -0
  166. package/dist/src/lsp/diagnostics.d.ts.map +1 -1
  167. package/dist/src/lsp/diagnostics.js +77 -73
  168. package/dist/src/lsp/diagnostics.js.map +1 -1
  169. package/dist/src/lsp/navigation/hover.d.ts +12 -5
  170. package/dist/src/lsp/navigation/hover.d.ts.map +1 -1
  171. package/dist/src/lsp/navigation/hover.js +136 -90
  172. package/dist/src/lsp/navigation/hover.js.map +1 -1
  173. package/dist/src/lsp/parse-document.d.ts +3 -0
  174. package/dist/src/lsp/parse-document.d.ts.map +1 -1
  175. package/dist/src/lsp/parse-document.js +5 -17
  176. package/dist/src/lsp/parse-document.js.map +1 -1
  177. package/dist/src/lsp/resolution.d.ts +40 -0
  178. package/dist/src/lsp/resolution.d.ts.map +1 -0
  179. package/dist/src/lsp/resolution.js +179 -0
  180. package/dist/src/lsp/resolution.js.map +1 -0
  181. package/dist/src/lsp/server.js +3 -1
  182. package/dist/src/lsp/server.js.map +1 -1
  183. package/dist/src/lsp/source-positions.d.ts +3 -9
  184. package/dist/src/lsp/source-positions.d.ts.map +1 -1
  185. package/dist/src/lsp/source-positions.js +25 -19
  186. package/dist/src/lsp/source-positions.js.map +1 -1
  187. package/dist/src/mapping/candidate-generator.d.ts +19 -9
  188. package/dist/src/mapping/candidate-generator.d.ts.map +1 -1
  189. package/dist/src/mapping/candidate-generator.js +79 -40
  190. package/dist/src/mapping/candidate-generator.js.map +1 -1
  191. package/dist/src/mapping/pipeline.d.ts +6 -0
  192. package/dist/src/mapping/pipeline.d.ts.map +1 -1
  193. package/dist/src/mapping/pipeline.js +69 -75
  194. package/dist/src/mapping/pipeline.js.map +1 -1
  195. package/dist/src/mapping/review-queue.d.ts.map +1 -1
  196. package/dist/src/mapping/review-queue.js +3 -2
  197. package/dist/src/mapping/review-queue.js.map +1 -1
  198. package/dist/src/nodeid/node-id-map.d.ts +7 -0
  199. package/dist/src/nodeid/node-id-map.d.ts.map +1 -1
  200. package/dist/src/nodeid/node-id-map.js +23 -13
  201. package/dist/src/nodeid/node-id-map.js.map +1 -1
  202. package/dist/src/parser/context.d.ts +2 -0
  203. package/dist/src/parser/context.d.ts.map +1 -1
  204. package/dist/src/parser/context.js +1 -0
  205. package/dist/src/parser/context.js.map +1 -1
  206. package/dist/src/parser/decl-parser.d.ts.map +1 -1
  207. package/dist/src/parser/decl-parser.js +1 -0
  208. package/dist/src/parser/decl-parser.js.map +1 -1
  209. package/dist/src/parser/expr-stmt-parser.d.ts.map +1 -1
  210. package/dist/src/parser/expr-stmt-parser.js +2 -16
  211. package/dist/src/parser/expr-stmt-parser.js.map +1 -1
  212. package/dist/src/parser.d.ts.map +1 -1
  213. package/dist/src/parser.js +3 -1
  214. package/dist/src/parser.js.map +1 -1
  215. package/dist/src/typecheck/expression.d.ts.map +1 -1
  216. package/dist/src/typecheck/expression.js +35 -1
  217. package/dist/src/typecheck/expression.js.map +1 -1
  218. package/dist/src/typecheck/generics.d.ts +5 -0
  219. package/dist/src/typecheck/generics.d.ts.map +1 -1
  220. package/dist/src/typecheck/generics.js +15 -8
  221. package/dist/src/typecheck/generics.js.map +1 -1
  222. package/dist/src/typecheck/statement.d.ts +10 -0
  223. package/dist/src/typecheck/statement.d.ts.map +1 -1
  224. package/dist/src/typecheck/statement.js +19 -5
  225. package/dist/src/typecheck/statement.js.map +1 -1
  226. package/dist/src/types.d.ts +45 -13
  227. package/dist/src/types.d.ts.map +1 -1
  228. package/dist/src/types.js.map +1 -1
  229. package/dist/src/version.d.ts +17 -0
  230. package/dist/src/version.d.ts.map +1 -0
  231. package/dist/src/version.js +17 -0
  232. package/dist/src/version.js.map +1 -0
  233. package/dist/test/integration/builtin-enum-vocabulary.test.d.ts +2 -0
  234. package/dist/test/integration/builtin-enum-vocabulary.test.d.ts.map +1 -0
  235. package/dist/test/integration/builtin-enum-vocabulary.test.js +51 -0
  236. package/dist/test/integration/builtin-enum-vocabulary.test.js.map +1 -0
  237. package/dist/test/integration/compliance/compliance-smoke.test.js +16 -9
  238. package/dist/test/integration/compliance/compliance-smoke.test.js.map +1 -1
  239. package/dist/test/integration/lsp/lsp-rename-safety.test.js +0 -13
  240. package/dist/test/integration/lsp/lsp-rename-safety.test.js.map +1 -1
  241. package/dist/test/integration/name-resolution-entrypoints.test.d.ts +2 -0
  242. package/dist/test/integration/name-resolution-entrypoints.test.d.ts.map +1 -0
  243. package/dist/test/integration/name-resolution-entrypoints.test.js +109 -0
  244. package/dist/test/integration/name-resolution-entrypoints.test.js.map +1 -0
  245. package/dist/test/integration/vocabulary-resolution.test.d.ts +2 -0
  246. package/dist/test/integration/vocabulary-resolution.test.d.ts.map +1 -0
  247. package/dist/test/integration/vocabulary-resolution.test.js +291 -0
  248. package/dist/test/integration/vocabulary-resolution.test.js.map +1 -0
  249. package/dist/test/property/property.test.js +2 -1
  250. package/dist/test/property/property.test.js.map +1 -1
  251. package/dist/test/unit/allocation-budget.test.js +41 -0
  252. package/dist/test/unit/allocation-budget.test.js.map +1 -1
  253. package/dist/test/unit/canonicalizer/canonicalizer.test.js +7 -79
  254. package/dist/test/unit/canonicalizer/canonicalizer.test.js.map +1 -1
  255. package/dist/test/unit/canonicalizer/chinese-function-syntax.test.d.ts +2 -0
  256. package/dist/test/unit/canonicalizer/chinese-function-syntax.test.d.ts.map +1 -0
  257. package/dist/test/unit/canonicalizer/chinese-function-syntax.test.js +86 -0
  258. package/dist/test/unit/canonicalizer/chinese-function-syntax.test.js.map +1 -0
  259. package/dist/test/unit/canonicalizer/transformers.test.d.ts +2 -0
  260. package/dist/test/unit/canonicalizer/transformers.test.d.ts.map +1 -0
  261. package/dist/test/unit/canonicalizer/transformers.test.js +25 -0
  262. package/dist/test/unit/canonicalizer/transformers.test.js.map +1 -0
  263. package/dist/test/unit/config/lexicons/identifiers/identifier-mapping.test.js +134 -31
  264. package/dist/test/unit/config/lexicons/identifiers/identifier-mapping.test.js.map +1 -1
  265. package/dist/test/unit/config/lexicons/identifiers/literal-macro.test.js +16 -18
  266. package/dist/test/unit/config/lexicons/identifiers/literal-macro.test.js.map +1 -1
  267. package/dist/test/unit/core/resolve-typed-references.test.d.ts +2 -0
  268. package/dist/test/unit/core/resolve-typed-references.test.d.ts.map +1 -0
  269. package/dist/test/unit/core/resolve-typed-references.test.js +600 -0
  270. package/dist/test/unit/core/resolve-typed-references.test.js.map +1 -0
  271. package/dist/test/unit/diagnostics/resolution-codes.test.d.ts +6 -0
  272. package/dist/test/unit/diagnostics/resolution-codes.test.d.ts.map +1 -0
  273. package/dist/test/unit/diagnostics/resolution-codes.test.js +83 -0
  274. package/dist/test/unit/diagnostics/resolution-codes.test.js.map +1 -0
  275. package/dist/test/unit/formatter-corpus-roundtrip.test.js +9 -0
  276. package/dist/test/unit/formatter-corpus-roundtrip.test.js.map +1 -1
  277. package/dist/test/unit/frontend/resolve-declarations.test.d.ts +2 -0
  278. package/dist/test/unit/frontend/resolve-declarations.test.d.ts.map +1 -0
  279. package/dist/test/unit/frontend/resolve-declarations.test.js +400 -0
  280. package/dist/test/unit/frontend/resolve-declarations.test.js.map +1 -0
  281. package/dist/test/unit/identifiers/casefold.test.d.ts +2 -0
  282. package/dist/test/unit/identifiers/casefold.test.d.ts.map +1 -0
  283. package/dist/test/unit/identifiers/casefold.test.js +77 -0
  284. package/dist/test/unit/identifiers/casefold.test.js.map +1 -0
  285. package/dist/test/unit/identifiers/scopes.test.d.ts +2 -0
  286. package/dist/test/unit/identifiers/scopes.test.d.ts.map +1 -0
  287. package/dist/test/unit/identifiers/scopes.test.js +109 -0
  288. package/dist/test/unit/identifiers/scopes.test.js.map +1 -0
  289. package/dist/test/unit/lambda-capture-parity.test.js +12 -5
  290. package/dist/test/unit/lambda-capture-parity.test.js.map +1 -1
  291. package/dist/test/unit/lsp/lsp-locale-fixes.test.js +10 -11
  292. package/dist/test/unit/lsp/lsp-locale-fixes.test.js.map +1 -1
  293. package/dist/test/unit/lsp/parse-document.test.js +39 -0
  294. package/dist/test/unit/lsp/parse-document.test.js.map +1 -1
  295. package/dist/test/unit/lsp/resolution-completion.test.d.ts +2 -0
  296. package/dist/test/unit/lsp/resolution-completion.test.d.ts.map +1 -0
  297. package/dist/test/unit/lsp/resolution-completion.test.js +79 -0
  298. package/dist/test/unit/lsp/resolution-completion.test.js.map +1 -0
  299. package/dist/test/unit/lsp/resolution-diagnostics.test.d.ts +2 -0
  300. package/dist/test/unit/lsp/resolution-diagnostics.test.d.ts.map +1 -0
  301. package/dist/test/unit/lsp/resolution-diagnostics.test.js +88 -0
  302. package/dist/test/unit/lsp/resolution-diagnostics.test.js.map +1 -0
  303. package/dist/test/unit/lsp/resolution-fixture.d.ts +32 -0
  304. package/dist/test/unit/lsp/resolution-fixture.d.ts.map +1 -0
  305. package/dist/test/unit/lsp/resolution-fixture.js +69 -0
  306. package/dist/test/unit/lsp/resolution-fixture.js.map +1 -0
  307. package/dist/test/unit/lsp/resolution-hover.test.d.ts +2 -0
  308. package/dist/test/unit/lsp/resolution-hover.test.d.ts.map +1 -0
  309. package/dist/test/unit/lsp/resolution-hover.test.js +107 -0
  310. package/dist/test/unit/lsp/resolution-hover.test.js.map +1 -0
  311. package/dist/test/unit/lsp/tenant-vocabulary.test.js +21 -47
  312. package/dist/test/unit/lsp/tenant-vocabulary.test.js.map +1 -1
  313. package/dist/test/unit/mapping/candidate-generator.test.js +54 -1
  314. package/dist/test/unit/mapping/candidate-generator.test.js.map +1 -1
  315. package/dist/test/unit/mapping/pipeline.test.js +22 -1
  316. package/dist/test/unit/mapping/pipeline.test.js.map +1 -1
  317. package/dist/test/unit/parser/parser.test.js +22 -0
  318. package/dist/test/unit/parser/parser.test.js.map +1 -1
  319. package/dist/test/unit/public-api-checked-entries.test.d.ts +2 -0
  320. package/dist/test/unit/public-api-checked-entries.test.d.ts.map +1 -0
  321. package/dist/test/unit/public-api-checked-entries.test.js +28 -0
  322. package/dist/test/unit/public-api-checked-entries.test.js.map +1 -0
  323. package/dist/test/unit/typecheck/e104-block-scope-parity.test.d.ts +2 -0
  324. package/dist/test/unit/typecheck/e104-block-scope-parity.test.d.ts.map +1 -0
  325. package/dist/test/unit/typecheck/e104-block-scope-parity.test.js +82 -0
  326. package/dist/test/unit/typecheck/e104-block-scope-parity.test.js.map +1 -0
  327. package/dist/test/unit/typecheck/qualified-enum-member.test.d.ts +2 -0
  328. package/dist/test/unit/typecheck/qualified-enum-member.test.d.ts.map +1 -0
  329. package/dist/test/unit/typecheck/qualified-enum-member.test.js +73 -0
  330. package/dist/test/unit/typecheck/qualified-enum-member.test.js.map +1 -0
  331. package/dist/test/unit/typecheck/type-inference.test.js +22 -0
  332. package/dist/test/unit/typecheck/type-inference.test.js.map +1 -1
  333. package/dist/test/unit/version.test.d.ts +9 -0
  334. package/dist/test/unit/version.test.d.ts.map +1 -0
  335. package/dist/test/unit/version.test.js +34 -0
  336. package/dist/test/unit/version.test.js.map +1 -0
  337. package/package.json +1 -1
  338. package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.d.ts +0 -47
  339. package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.d.ts.map +0 -1
  340. package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.js +0 -142
  341. package/dist/src/config/lexicons/identifiers/examples/canonicalizer-integration.js.map +0 -1
@@ -0,0 +1,109 @@
1
+ /**
2
+ * @module test/unit/identifiers/scopes.test
3
+ *
4
+ * VocabularyScopes 构建、查找与规范 JSON。
5
+ */
6
+ import { describe, it } from 'node:test';
7
+ import assert from 'node:assert';
8
+ import { readFileSync } from 'node:fs';
9
+ import { dirname, join } from 'node:path';
10
+ import { fileURLToPath } from 'node:url';
11
+ import { VocabularyScopeError, buildVocabularyScopes, canonicalScopesJson, lookup, } from '../../../src/config/lexicons/identifiers/scopes.js';
12
+ import { IdentifierKind } from '../../../src/config/lexicons/identifiers/types.js';
13
+ const repoRoot = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..', '..');
14
+ const dir = join(repoRoot, 'test', 'fixtures', 'scopes');
15
+ const sample = JSON.parse(readFileSync(join(dir, 'sample.vocabulary.json'), 'utf8'));
16
+ const base = (over) => ({
17
+ id: 't', name: 't', locale: 'de-DE', version: '1', structs: [], fields: [], functions: [], ...over,
18
+ });
19
+ describe('buildVocabularyScopes', () => {
20
+ const scopes = buildVocabularyScopes(sample);
21
+ it('struct Stufe 进入 types,field stufe 进入 fields[Level],互不覆盖', () => {
22
+ assert.strictEqual(lookup(scopes.types, 'stufe').folded[0]?.canonical, 'Level');
23
+ assert.strictEqual(scopes.fields.get('Level') && lookup(scopes.fields.get('Level'), 'Stufe').folded[0]?.canonical, 'level');
24
+ });
25
+ it('同 struct 下 Alter/alter 两个字段都保留', () => {
26
+ const r = lookup(scopes.fields.get('Person'), 'Alter');
27
+ assert.deepStrictEqual(r.folded.map((c) => c.canonical).sort(), ['Alter', 'alter']);
28
+ assert.deepStrictEqual(r.exact.map((c) => c.canonical), ['Alter']);
29
+ assert.deepStrictEqual(lookup(scopes.fields.get('Person'), 'alter').exact.map((c) => c.canonical), ['alter']);
30
+ assert.strictEqual(lookup(scopes.fields.get('Person'), 'ALTER').exact.length, 0);
31
+ });
32
+ it('别名为 synonym,主词条为 term', () => {
33
+ const syn = lookup(scopes.types, 'niveau').folded[0];
34
+ assert.strictEqual(syn.source, 'synonym');
35
+ assert.strictEqual(syn.canonical, 'Level');
36
+ assert.strictEqual(lookup(scopes.types, 'Stufe').folded[0].source, 'term');
37
+ });
38
+ it('written 为 NFC,组合字符写法可命中', () => {
39
+ const c = lookup(scopes.types, 'Café').folded[0];
40
+ assert.strictEqual(c.written, 'Café');
41
+ assert.strictEqual(lookup(scopes.types, 'CAFÉ').folded.length, 1);
42
+ });
43
+ it('枚举成员、函数、字面量分桶', () => {
44
+ assert.strictEqual(lookup(scopes.enumMembers.get('Level'), 'hoch').folded[0]?.kind, IdentifierKind.ENUM_VALUE);
45
+ assert.strictEqual(lookup(scopes.functions, 'gesamt').folded[0]?.canonical, 'total');
46
+ assert.strictEqual(scopes.literals.get('nacht'), 'Gute Nacht');
47
+ });
48
+ it('未命中返回空数组', () => {
49
+ assert.deepStrictEqual(lookup(scopes.types, 'nope'), { exact: [], folded: [] });
50
+ });
51
+ it('field 无 parent 抛 field_parent_required', () => {
52
+ const v = base({ fields: [{ canonical: 'x', localized: 'x', kind: IdentifierKind.FIELD }] });
53
+ assert.throws(() => buildVocabularyScopes(v), (e) => e instanceof VocabularyScopeError && e.code === 'field_parent_required');
54
+ });
55
+ it('枚举成员无 parent 抛 member_parent_required', () => {
56
+ const v = base({ enumValues: [{ canonical: 'X', localized: 'X', kind: IdentifierKind.ENUM_VALUE }] });
57
+ assert.throws(() => buildVocabularyScopes(v), (e) => e instanceof VocabularyScopeError && e.code === 'member_parent_required');
58
+ });
59
+ it('同折叠键的字面量内容冲突抛 literal_conflict', () => {
60
+ const v = base({
61
+ literals: [
62
+ { canonical: 'a', localized: 'X', kind: IdentifierKind.LITERAL },
63
+ { canonical: 'b', localized: 'x', kind: IdentifierKind.LITERAL },
64
+ ],
65
+ });
66
+ assert.throws(() => buildVocabularyScopes(v), (e) => e instanceof VocabularyScopeError && e.code === 'literal_conflict');
67
+ });
68
+ });
69
+ describe('canonicalScopesJson', () => {
70
+ const expected = readFileSync(join(dir, 'sample.canonical.json'), 'utf8');
71
+ it('两次构建输出相同', () => {
72
+ assert.strictEqual(canonicalScopesJson(buildVocabularyScopes(sample)), canonicalScopesJson(buildVocabularyScopes(sample)));
73
+ });
74
+ it('与 sample.canonical.json 逐字节一致', () => {
75
+ assert.strictEqual(canonicalScopesJson(buildVocabularyScopes(sample)), expected);
76
+ });
77
+ it('输入顺序不影响输出', () => {
78
+ const rev = { ...sample, structs: [...sample.structs].reverse(), fields: [...sample.fields].reverse() };
79
+ assert.strictEqual(canonicalScopesJson(buildVocabularyScopes(rev)), expected);
80
+ });
81
+ it('无空白且含 schemaVersion,键序按码点', () => {
82
+ assert.ok(!/\s(?=[{}\[\]":,])|[{,]\s/.test(expected.replace(/"[^"]*"/g, '""')));
83
+ assert.ok(expected.includes('"schemaVersion":1'));
84
+ assert.ok(expected.startsWith('{"enumMembers":'));
85
+ });
86
+ it('Alter 排在 alter 之前(码点序)', () => {
87
+ assert.ok(expected.indexOf('"canonical":"Alter"') < expected.indexOf('"canonical":"alter"'));
88
+ });
89
+ });
90
+ describe('折叠键 NFC 闭包与转义', () => {
91
+ it('Ϊ́ 与 ΐ 同桶,两个候选都保留', () => {
92
+ const v = base({
93
+ functions: [
94
+ { canonical: 'a', localized: '\u03AA\u0301', kind: IdentifierKind.FUNCTION },
95
+ { canonical: 'b', localized: '\u0390', kind: IdentifierKind.FUNCTION },
96
+ ],
97
+ });
98
+ const json = canonicalScopesJson(buildVocabularyScopes(v));
99
+ assert.strictEqual(Object.keys(JSON.parse(json).functions).length, 1);
100
+ assert.ok(json.includes('"canonical":"a"') && json.includes('"canonical":"b"'));
101
+ });
102
+ it('制表符转义为 \\t,U+2028 原样输出', () => {
103
+ const v = base({ functions: [{ canonical: 'c', localized: 'a\tb\u2028c', kind: IdentifierKind.FUNCTION }] });
104
+ const json = canonicalScopesJson(buildVocabularyScopes(v));
105
+ assert.ok(json.includes('"written":"a\\tb\u2028c"'));
106
+ assert.ok(json.includes('"a\\tb\u2028c":['));
107
+ });
108
+ });
109
+ //# sourceMappingURL=scopes.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"scopes.test.js","sourceRoot":"","sources":["../../../../test/unit/identifiers/scopes.test.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { describe, it } from 'node:test';
2
2
  import assert from 'node:assert/strict';
3
- import { compile } from '../../src/browser.js';
3
+ import { compile, parseSource } from '../../src/browser.js';
4
+ import { lowerModule } from '../../src/lower_to_core.js';
4
5
  /**
5
6
  * Lambda 闭包捕获的表达式覆盖完整性(2026-08-17 审计修复)。
6
7
  *
@@ -16,11 +17,13 @@ import { compile } from '../../src/browser.js';
16
17
  * `Return [outer, x]` 里的 outer 在 TS 产出的 Core IR 里被静默丢弃——
17
18
  * 同一段源码、两个引擎的 IR 不同,且两侧都不报错。
18
19
  */
19
- /** 取编译产物中第一个 Lambda 的 captures。 */
20
20
  /** 取整段源码里全部 Lambda 的 captures(按遍历序,外层在前)。 */
21
21
  function capturesOf2(src) {
22
22
  const c = compile(src);
23
23
  assert.ok(c.core, `compile 失败: ${JSON.stringify(c.parseErrors ?? [])}`);
24
+ return lambdaCaptures(c.core);
25
+ }
26
+ function lambdaCaptures(core) {
24
27
  const found = [];
25
28
  const walk = (n) => {
26
29
  if (!n || typeof n !== 'object')
@@ -35,7 +38,7 @@ function capturesOf2(src) {
35
38
  walk(v);
36
39
  }
37
40
  };
38
- walk(c.core);
41
+ walk(core);
39
42
  assert.ok(found.length > 0, '源码里应至少有一个 Lambda');
40
43
  return found;
41
44
  }
@@ -170,13 +173,17 @@ describe('lambda 捕获:表达式变体覆盖完整性', () => {
170
173
  // 必须让块内声明**逃逸后被引用**:块结束时 tmp 出栈,块外的 `Return tmp`
171
174
  // 就成了自由变量、必须捕获。删掉 push/pop 则 tmp 仍在栈上 → 不捕获 → 用例红。
172
175
  // Java 侧实测同为 [outer, tmp]。
173
- const captures = capturesOf2(`Module probe.\n\nRule r given outer, produce:\n` +
176
+ // 块外的 tmp 是未定义名字,compile 的名称解析(ADR 0051)以 E802 拒绝整个程序;
177
+ // 捕获计算是 lower 的性质,故这里直接对解析结果 lower。
178
+ const src = `Module probe.\n\nRule r given outer, produce:\n` +
174
179
  ` Let f be function with x, produce:\n` +
175
180
  ` If x:\n` +
176
181
  ` Let tmp be outer.\n` +
177
182
  ` Return tmp.\n` +
178
183
  ` Return tmp.\n` +
179
- ` Return f(outer).\n`);
184
+ ` Return f(outer).\n`;
185
+ assert.ok(compile(src).resolutionDiagnostics?.some((d) => d.code === 'E802'));
186
+ const captures = lambdaCaptures(lowerModule(parseSource(src).ast));
180
187
  assert.deepEqual([...captures[0]].sort(), ['outer', 'tmp'], `块外引用的 tmp 必须视为自由变量(Java 侧为 [outer, tmp]),实际=${JSON.stringify(captures[0])}`);
181
188
  });
182
189
  it('嵌套 lambda 的名字与形参不得污染外层 captures', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"lambda-capture-parity.test.js","sourceRoot":"","sources":["../../../test/unit/lambda-capture-parity.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lambda-capture-parity.test.js","sourceRoot":"","sources":["../../../test/unit/lambda-capture-parity.test.ts"],"names":[],"mappings":"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"}
@@ -83,22 +83,21 @@ describe('取词回退路径(词法失败时)', () => {
83
83
  });
84
84
  });
85
85
  describe('领域词汇 token 的可编辑性', () => {
86
+ // canonicalize 不再把本地化词替换为规范名(ADR 0051 按位置解析),词汇词是用户原写法的普通标识符
86
87
  const text = '模块 demo.p。\n\n规则 评估 给定 甲 作为 申请人 产出 整数:\n 返回 1。\n';
87
88
  const { tokens } = parseDocumentText(text, zh, 'tenant-unit', 'finance.loan');
88
- it('★被翻译的词汇 token 标为 translated,位置是原文「申请人」', () => {
89
- const t = tokens.find((x) => x.value === 'Applicant');
90
- assert.ok(t, '应有 Applicant token(词汇翻译生效)');
91
- assert.equal(t.srcAlign, 'translated');
89
+ it('★词汇词保持原写法,逐字对齐到原文「申请人」', () => {
90
+ assert.equal(tokens.find((x) => x.value === 'Applicant'), undefined, '不应再出现替换后的规范名');
91
+ const t = tokens.find((x) => x.value === '申请人');
92
+ assert.ok(t, '应有原写法 token');
93
+ assert.equal(t.srcAlign, 'exact');
92
94
  const line = text.split('\n')[2];
93
95
  assert.equal(t.start.col - 1, line.indexOf('申请人'));
94
- // 其后的 token 仍逐字对齐
95
- const after = tokens.find((x) => x.start?.line === 3 && x.value === '整数');
96
- assert.equal(after.srcAlign, 'exact');
97
- assert.equal(after.start.col - 1, line.indexOf('整数'));
98
96
  });
99
- it('★光标在词汇词上不可编辑;同名存在非逐字对齐 token 时标记 uncertain', () => {
100
- assert.equal(identifierTokenAt(tokens, text, text.indexOf('申请人') + 1, zh), null);
101
- assert.equal(exactIdentifierPositions(tokens, text, 'Applicant').uncertain, true);
97
+ it('★词汇词与其它标识符一样可编辑,位置确定', () => {
98
+ const hit = identifierTokenAt(tokens, text, text.indexOf('申请人') + 1, zh);
99
+ assert.equal(hit?.name, '申请人');
100
+ assert.equal(exactIdentifierPositions(tokens, text, '申请人').uncertain, false);
102
101
  assert.equal(exactIdentifierPositions(tokens, text, '甲').uncertain, false);
103
102
  });
104
103
  });
@@ -1 +1 @@
1
- {"version":3,"file":"lsp-locale-fixes.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/lsp-locale-fixes.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lsp-locale-fixes.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/lsp-locale-fixes.test.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,45 @@ describe('parseDocumentText', () => {
21
21
  .filter((d) => d.kind === 'Func').map((d) => d.name);
22
22
  assert.deepEqual(funcs, ['twice']);
23
23
  });
24
+ it('★zh-CN 括号函数头(aster-lang-ts#236):参数精确对齐原文,插入的关键字不盖住标识符', () => {
25
+ // 重排成 `Rule 折扣 given 甲 …` 后比原文长;参数须仍为 exact(重命名只基于 exact),
26
+ // 插入的 given 在原文没有对应文本,其区间不得覆盖紧随其后的 甲。
27
+ const zh = LexiconRegistry.get('zh-CN');
28
+ const text = '模块 测试。\n\n规则 折扣(甲 作为 整数,乙 作为 整数),产出 整数:\n 返回 甲。\n';
29
+ const header = text.split('\n')[2];
30
+ const r = parseDocumentText(text, zh, undefined, undefined);
31
+ assert.deepEqual(r.parseDiagnostics, []);
32
+ const onHeader = r.tokens.filter((t) => t.start?.line === 3 && t.end?.line === 3);
33
+ const at = (value) => onHeader.find((t) => t.value === value);
34
+ for (const name of ['折扣', '甲', '乙']) {
35
+ const t = at(name);
36
+ assert.equal(t.srcAlign, 'exact', `${name} 应精确对齐`);
37
+ assert.equal(header.slice(t.start.col - 1, t.end.col - 1), name);
38
+ }
39
+ for (let i = 0; i + 1 < onHeader.length; i++) {
40
+ assert.ok(onHeader[i].end.col <= onHeader[i + 1].start.col, `token ${i} 的区间与下一个重叠`);
41
+ }
42
+ const params = r.ast
43
+ .decls[0].params;
44
+ assert.deepEqual(params.map((p) => [p.name, header[p.span.start.col - 1]]), [['甲', '甲'], ['乙', '乙']]);
45
+ });
46
+ it('de-DE 转写关键字(zurueck → zurück)后的标识符仍精确对齐,所有 token 区间互不重叠', () => {
47
+ // 推算 token 的游标与区间截断对 en/de 同样生效,这里钉住 de 的典型推算场景。
48
+ const de = LexiconRegistry.get('de-DE');
49
+ const text = 'Modul demo.p.\n\nRegel helfer gegeben eine größe als Ganzzahl, liefert Ganzzahl:\n gib zurueck größe plus 1.\n';
50
+ const body = text.split('\n')[3];
51
+ const r = parseDocumentText(text, de, undefined, undefined);
52
+ const onBody = r.tokens.filter((t) => t.start?.line === 4 && t.end?.line === 4);
53
+ const groesse = onBody.find((t) => t.value === 'größe');
54
+ assert.equal(groesse.srcAlign, 'exact');
55
+ assert.equal(body.slice(groesse.start.col - 1, groesse.end.col - 1), 'größe');
56
+ const sameLine = r.tokens.filter((t) => t.start && t.end && t.start.line === t.end.line);
57
+ for (let i = 0; i + 1 < sameLine.length; i++) {
58
+ const [a, b] = [sameLine[i], sameLine[i + 1]];
59
+ if (a.start.line === b.start.line)
60
+ assert.ok(a.end.col <= b.start.col, `第 ${a.start.line} 行 token ${String(a.value)} 与下一个重叠`);
61
+ }
62
+ });
24
63
  it('en-US(无 lexicon)行为不变', () => {
25
64
  const text = 'Module demo.p.\n\nRule twice given x as Int, produce Int:\n Return x times 2.\n';
26
65
  const r = parseDocumentText(text, undefined, undefined, undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"parse-document.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/parse-document.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAEtG,4BAA4B,EAAE,CAAC;AAE/B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,0DAA0D,CAAC;QACxE,MAAM,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5D,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,4BAA4B,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAE,CAAC,CAAC,GAAgC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,CAAE,CAAC,CAAC,GAAgE,EAAE,KAAK,IAAI,EAAE,CAAC;aAC7F,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,IAAI,GAAG,kFAAkF,CAAC;QAChG,MAAM,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACnE,MAAM,CAAC,KAAK,CAAE,CAAC,CAAC,GAAgC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"parse-document.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/parse-document.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=resolution-completion.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolution-completion.test.d.ts","sourceRoot":"","sources":["../../../../test/unit/lsp/resolution-completion.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,79 @@
1
+ /**
2
+ * `x.` 之后的字段补全(ADR 0051 §5「LSP」:FIELD_REF 按接收者类型过滤)。
3
+ *
4
+ * 接收者类型取 R2 的 §4 显式声明规则(参数 / 构造 / 源码函数调用 / 已知类型的点分路径),
5
+ * 只列该 struct 的字段,按文档词汇给出本地化写法,无本地化时给规范名。
6
+ * 语法不完整时 R2 跳过,降级为不提供字段补全(回到普通补全),且不抛异常。
7
+ */
8
+ import { describe, it } from 'node:test';
9
+ import assert from 'node:assert/strict';
10
+ import { CompletionItemKind } from 'vscode-languageserver/node.js';
11
+ import { registerCompletionHandlers } from '../../../src/lsp/completion.js';
12
+ import { ZH_CN } from '../../../src/config/lexicons/zh-CN.js';
13
+ import { DECLS, docOf, documentsOf, getOrParseWith } from './resolution-fixture.js';
14
+ function completeAt(doc, line, character) {
15
+ let handler;
16
+ const connection = {
17
+ onCompletion: (fn) => { handler = fn; },
18
+ onCompletionResolve() { },
19
+ onRequest() { },
20
+ };
21
+ registerCompletionHandlers(connection, documentsOf(doc), getOrParseWith(ZH_CN), () => ZH_CN);
22
+ assert.ok(handler, 'onCompletion 未注册');
23
+ return handler({ textDocument: { uri: doc.uri }, position: { line, character } });
24
+ }
25
+ /** 在 DECLS 之后加一个函数,body 为 lines;返回补全位置为 body 第 0 行末尾。 */
26
+ function completeAfter(params, body, extra = []) {
27
+ const doc = docOf([...DECLS, `规则 f 给定 ${params},产出 整数:`, ...body, '', ...extra]);
28
+ return completeAt(doc, DECLS.length + 1, body[0].length);
29
+ }
30
+ const labels = (items) => items.map((i) => i.label).sort();
31
+ describe('x. 之后的字段补全', () => {
32
+ it('★参数 x 为 司机:只列 Driver 的字段,本地化写法优先、无本地化给规范名', () => {
33
+ const items = completeAfter('x 作为 司机', [' 返回 x.']);
34
+ assert.deepEqual(labels(items), ['alter', 'name']);
35
+ assert.ok(items.every((i) => i.kind === CompletionItemKind.Field));
36
+ assert.equal(items.find((i) => i.label === 'alter')?.detail?.includes('age'), true, '本地化项应注明规范名');
37
+ });
38
+ it('★不混入其它 struct 的字段与关键词', () => {
39
+ const items = labels(completeAfter('x 作为 司机', [' 返回 x.']));
40
+ assert.ok(!items.includes('jahre') && !items.includes('fahrer'), `混入了 Owner 的字段:${items}`);
41
+ assert.ok(!items.includes('返回'), `混入了关键词:${items}`);
42
+ });
43
+ it('★多段路径 h.fahrer.:按 fahrer 的声明类型 Driver 补全', () => {
44
+ assert.deepEqual(labels(completeAfter('h 作为 车主', [' 返回 h.fahrer.'])), ['alter', 'name']);
45
+ });
46
+ it('接收者为 Owner:本地化 jahre / fahrer', () => {
47
+ assert.deepEqual(labels(completeAfter('h 作为 车主', [' 返回 h.'])), ['fahrer', 'jahre']);
48
+ });
49
+ it('构造得到的局部名:令 y 定义为 司机 包含 … 后 y. 补全 Driver 的字段', () => {
50
+ const doc = docOf([
51
+ ...DECLS,
52
+ '规则 f 给定 n 作为 整数,产出 整数:',
53
+ ' 令 y 定义为 司机 包含 alter 将 设为 n,name 将 设为 "a"。',
54
+ ' 返回 y.',
55
+ '',
56
+ ]);
57
+ assert.deepEqual(labels(completeAt(doc, DECLS.length + 2, ' 返回 y.'.length)), ['alter', 'name']);
58
+ });
59
+ it('接收者类型未知:不提供字段补全,回到普通补全', () => {
60
+ const doc = docOf([...DECLS, '规则 f 给定 n 作为 整数,产出 整数:', ' 令 y 定义为 n。', ' 返回 y.', '']);
61
+ const items = labels(completeAt(doc, DECLS.length + 2, ' 返回 y.'.length));
62
+ assert.ok(!items.includes('alter'), `类型未知不应给字段:${items}`);
63
+ assert.ok(items.includes('返回'), '应回到普通(关键词)补全');
64
+ });
65
+ });
66
+ describe('语法不完整时降级', () => {
67
+ it('★文档其它位置有语法错误:R2 跳过,不提供字段补全,不抛异常', () => {
68
+ const items = labels(completeAfter('x 作为 司机', [' 返回 x.'], ['规则 坏 给定 h 作为 车主,产出 整数:', ' 返回 h.fahrer.al']));
69
+ assert.ok(!items.includes('alter'), `语法不完整时不应给字段补全:${items}`);
70
+ assert.ok(items.includes('返回'));
71
+ });
72
+ it('半行输入不抛异常', () => {
73
+ for (const tail of [' 返回 x.al', ' 返回 x', ' 令 y 定义为 司机 包含', ' 返回 .']) {
74
+ const doc = docOf([...DECLS, '规则 f 给定 x 作为 司机,产出 整数:', tail, '']);
75
+ completeAt(doc, DECLS.length + 1, tail.length);
76
+ }
77
+ });
78
+ });
79
+ //# sourceMappingURL=resolution-completion.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolution-completion.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/resolution-completion.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=resolution-diagnostics.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolution-diagnostics.test.d.ts","sourceRoot":"","sources":["../../../../test/unit/lsp/resolution-diagnostics.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,88 @@
1
+ /**
2
+ * 语法不完整时诊断的降级(ADR 0051 Review Focus 1):只对解析器恢复出的部分运行 R1,跳过 R2,
3
+ * 不从未完成代码级联出 E8xx / W8xx;语法完整时 R2 照常报告。
4
+ */
5
+ import { describe, it } from 'node:test';
6
+ import assert from 'node:assert/strict';
7
+ import { computeDiagnostics } from '../../../src/lsp/diagnostics.js';
8
+ import { ZH_CN } from '../../../src/config/lexicons/zh-CN.js';
9
+ import { EN_US } from '../../../src/config/lexicons/en-US.js';
10
+ import { parseDocumentText } from '../../../src/lsp/parse-document.js';
11
+ import { DECLS, docOf, getOrParseWith } from './resolution-fixture.js';
12
+ async function codesOf(lines) {
13
+ const doc = docOf(lines);
14
+ const diags = await computeDiagnostics(doc.document, getOrParseWith(ZH_CN), ZH_CN);
15
+ return diags.map((d) => String(d.code ?? ''));
16
+ }
17
+ const isResolution = (code) => /^[EW]8\d\d$/.test(code);
18
+ const GOOD = ['规则 检查 给定 x 作为 司机,产出 整数:', ' 返回 x.alter。', ''];
19
+ describe('诊断:语法不完整时降级', () => {
20
+ it('★各种半行输入都不产生 E8xx / W8xx', async () => {
21
+ const tails = [
22
+ ' 返回 x.',
23
+ ' 返回 x.al',
24
+ ' 返回 x.alter',
25
+ ' 令 y 定义为 司机 包含 alter 将 设为',
26
+ ' 令 y 定义为 司机 包含 al',
27
+ ' 返回 Ho',
28
+ ' 返回 检',
29
+ '规则 坏 给定 h 作为 车',
30
+ '定义 车主 包含 jah',
31
+ ' 如果 x.alter',
32
+ ];
33
+ for (const tail of tails) {
34
+ const codes = await codesOf([...DECLS, ...GOOD, '规则 坏 给定 x 作为 司机,产出 整数:', tail, '']);
35
+ assert.ok(codes.some((c) => !isResolution(c)), `夹具应含语法错误:${tail}`);
36
+ assert.deepEqual(codes.filter(isResolution), [], `半行 "${tail}" 级联出了名称解析诊断`);
37
+ }
38
+ });
39
+ it('★语法不完整时,完整部分的本地化路径不被误报(R2 跳过,也不拿未解析的 Core 做类型检查)', async () => {
40
+ const codes = await codesOf([...DECLS, ...GOOD, '规则 坏 给定 h 作为 车主,产出 整数:', ' 返回 h.fahrer.al', '']);
41
+ assert.deepEqual(codes.filter((c) => /^E8|^W8|^E0/.test(c) && c !== ''), [], `实际:${codes}`);
42
+ });
43
+ it('★正在编辑的声明被解析器丢弃时,引用它的完整部分不报 E800 / E802', async () => {
44
+ const codes = await codesOf([
45
+ '模块 m。',
46
+ '',
47
+ '定义 Kunde 包含 nam',
48
+ '',
49
+ '规则 g 给定 k 作为 Kunde,产出 Kunde:',
50
+ ' 返回 k。',
51
+ '',
52
+ '规则 hilfe 产出 整数:',
53
+ ' 返回 1 加',
54
+ '',
55
+ '规则 h 产出 整数:',
56
+ ' 令 f 定义为 hilfe。',
57
+ ' 返回 1。',
58
+ '',
59
+ ]);
60
+ assert.ok(codes.some((c) => !isResolution(c)), '夹具应含语法错误');
61
+ assert.deepEqual(codes.filter(isResolution), [], `被丢弃的声明级联出了名称解析诊断:${codes}`);
62
+ });
63
+ it('★无词汇时语法错误不屏蔽其它声明的类型诊断(R2 跳过,R1 输出直接 lower 做检查)', async () => {
64
+ const doc = docOf([
65
+ 'Module m.',
66
+ '',
67
+ 'Rule f given x as Int, produce Text:',
68
+ ' Return x.',
69
+ '',
70
+ 'Rule g given z as Int, produce Int:',
71
+ ' Return z plus',
72
+ '',
73
+ ]);
74
+ const plain = (d) => ({ ...parseDocumentText(d.getText(), EN_US, undefined, undefined), text: d.getText() });
75
+ const codes = (await computeDiagnostics(doc.document, plain, EN_US)).map((d) => String(d.code ?? ''));
76
+ assert.ok(codes.some((c) => c.startsWith('P')), `夹具应含语法错误:${codes}`);
77
+ assert.ok(codes.includes('E003'), `返回类型不匹配应仍被报告:${codes}`);
78
+ assert.deepEqual(codes.filter(isResolution), []);
79
+ });
80
+ it('语法完整时 R2 照常报告:未知字段 E801', async () => {
81
+ const codes = await codesOf([...DECLS, '规则 检查 给定 x 作为 司机,产出 整数:', ' 返回 x.unbekannt。', '']);
82
+ assert.ok(codes.includes('E801'), `实际:${codes}`);
83
+ });
84
+ it('语法完整且全部可解析时无名称解析诊断', async () => {
85
+ assert.deepEqual((await codesOf([...DECLS, ...GOOD])).filter(isResolution), []);
86
+ });
87
+ });
88
+ //# sourceMappingURL=resolution-diagnostics.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolution-diagnostics.test.js","sourceRoot":"","sources":["../../../../test/unit/lsp/resolution-diagnostics.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,32 @@
1
+ /**
2
+ * 名称解析悬停 / 补全测试的共用夹具(ADR 0051):带租户词汇的文档快照与 stub connection。
3
+ *
4
+ * 走真实的 parseDocumentText 与 register*Handlers 接线,只把词汇作用域直接塞进快照
5
+ * (等价于 server 的 CachedDoc),避免依赖租户注册中心的全局状态。
6
+ */
7
+ import { TextDocument } from 'vscode-languageserver-textdocument';
8
+ import { parseDocumentText } from '../../../src/lsp/parse-document.js';
9
+ import type { VocabularyScopes } from '../../../src/config/lexicons/identifiers/scopes.js';
10
+ import type { Lexicon } from '../../../src/config/lexicons/types.js';
11
+ /** Driver(司机)字段 age → alter、name 无本地化;Owner(车主)字段 years → jahre、driver → fahrer;Level 成员 Hoch / Niedrig。 */
12
+ export declare const VOCAB: VocabularyScopes;
13
+ export declare const DECLS: string[];
14
+ export interface Doc {
15
+ readonly uri: string;
16
+ readonly document: TextDocument;
17
+ readonly lines: readonly string[];
18
+ }
19
+ export declare function docOf(lines: readonly string[]): Doc;
20
+ /** 等价 server 的 getOrParse:解析文档并附上租户词汇作用域。 */
21
+ export declare function getOrParseWith(lexicon: Lexicon, vocabulary?: VocabularyScopes): (doc: TextDocument) => ReturnType<typeof parseDocumentText> & {
22
+ text: string;
23
+ };
24
+ /** 第 line 行(0 基)中第 nth 个 needle 的起始列 + offset。 */
25
+ export declare function posOf(doc: Doc, line: number, needle: string, offset?: number, nth?: number): {
26
+ line: number;
27
+ character: number;
28
+ };
29
+ export declare function documentsOf(...docs: Doc[]): {
30
+ get: (uri: string) => TextDocument | undefined;
31
+ };
32
+ //# sourceMappingURL=resolution-fixture.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolution-fixture.d.ts","sourceRoot":"","sources":["../../../../test/unit/lsp/resolution-fixture.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AAG3F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAUrE,4GAA4G;AAC5G,eAAO,MAAM,KAAK,EAAE,gBAMlB,CAAC;AAEH,eAAO,MAAM,KAAK,UASjB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAID,wBAAgB,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,GAAG,CAGnD;AAED,6CAA6C;AAC7C,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,GAAE,gBAAwB,IAE3E,KAAK,YAAY,KAMI,UAAU,CAAC,OAAO,iBAAiB,CAAC,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAErF;AAED,kDAAkD;AAClD,wBAAgB,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,SAAI,EAAE,GAAG,SAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAStH;AAED,wBAAgB,WAAW,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;eAEpB,MAAM;EAC3B"}