@hydranium/core 1.0.0-next.8 → 1.0.0-next.85

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 (306) hide show
  1. package/lib/documents/ast-document-manager.d.ts +75 -16
  2. package/lib/documents/ast-document-manager.d.ts.map +1 -1
  3. package/lib/documents/ast-document-manager.js +57 -19
  4. package/lib/documents/ast-document-manager.js.map +1 -1
  5. package/lib/documents/client-ids.d.ts +5 -19
  6. package/lib/documents/client-ids.d.ts.map +1 -1
  7. package/lib/documents/client-ids.js +5 -19
  8. package/lib/documents/client-ids.js.map +1 -1
  9. package/lib/documents/hydranium-text-documents.d.ts +55 -21
  10. package/lib/documents/hydranium-text-documents.d.ts.map +1 -1
  11. package/lib/documents/hydranium-text-documents.js +142 -46
  12. package/lib/documents/hydranium-text-documents.js.map +1 -1
  13. package/lib/documents/language-client-text-shadow.d.ts +41 -9
  14. package/lib/documents/language-client-text-shadow.d.ts.map +1 -1
  15. package/lib/documents/language-client-text-shadow.js +56 -11
  16. package/lib/documents/language-client-text-shadow.js.map +1 -1
  17. package/lib/documents/self-save-registry.d.ts +37 -6
  18. package/lib/documents/self-save-registry.d.ts.map +1 -1
  19. package/lib/documents/self-save-registry.js +28 -15
  20. package/lib/documents/self-save-registry.js.map +1 -1
  21. package/lib/index.d.ts +2 -0
  22. package/lib/index.d.ts.map +1 -1
  23. package/lib/index.js +5 -0
  24. package/lib/index.js.map +1 -1
  25. package/lib/langium/ast-extension/ast-node-builder.d.ts +32 -9
  26. package/lib/langium/ast-extension/ast-node-builder.d.ts.map +1 -1
  27. package/lib/langium/ast-extension/ast-node-builder.js +60 -22
  28. package/lib/langium/ast-extension/ast-node-builder.js.map +1 -1
  29. package/lib/langium/bootstrap.d.ts.map +1 -1
  30. package/lib/langium/bootstrap.js +16 -9
  31. package/lib/langium/bootstrap.js.map +1 -1
  32. package/lib/langium/config/configuration-provider.d.ts +81 -0
  33. package/lib/langium/config/configuration-provider.d.ts.map +1 -0
  34. package/lib/langium/config/configuration-provider.js +112 -0
  35. package/lib/langium/config/configuration-provider.js.map +1 -0
  36. package/lib/langium/config/index.d.ts +1 -0
  37. package/lib/langium/config/index.d.ts.map +1 -1
  38. package/lib/langium/config/index.js +1 -0
  39. package/lib/langium/config/index.js.map +1 -1
  40. package/lib/langium/diagnostics/lsp-logger.d.ts +17 -0
  41. package/lib/langium/diagnostics/lsp-logger.d.ts.map +1 -1
  42. package/lib/langium/diagnostics/lsp-logger.js +40 -6
  43. package/lib/langium/diagnostics/lsp-logger.js.map +1 -1
  44. package/lib/langium/document-builder/build-pipeline-integration.d.ts +13 -1
  45. package/lib/langium/document-builder/build-pipeline-integration.d.ts.map +1 -1
  46. package/lib/langium/document-builder/build-pipeline-integration.js +1 -1
  47. package/lib/langium/document-builder/build-pipeline-integration.js.map +1 -1
  48. package/lib/langium/document-builder/build-session.d.ts +93 -0
  49. package/lib/langium/document-builder/build-session.d.ts.map +1 -0
  50. package/lib/langium/document-builder/build-session.js +72 -0
  51. package/lib/langium/document-builder/build-session.js.map +1 -0
  52. package/lib/langium/document-builder/document-builder.d.ts +150 -7
  53. package/lib/langium/document-builder/document-builder.d.ts.map +1 -1
  54. package/lib/langium/document-builder/document-builder.js +298 -11
  55. package/lib/langium/document-builder/document-builder.js.map +1 -1
  56. package/lib/langium/document-builder/index.d.ts +1 -0
  57. package/lib/langium/document-builder/index.d.ts.map +1 -1
  58. package/lib/langium/document-builder/index.js +1 -0
  59. package/lib/langium/document-builder/index.js.map +1 -1
  60. package/lib/langium/integration-services.d.ts +45 -1
  61. package/lib/langium/integration-services.d.ts.map +1 -1
  62. package/lib/langium/integration-services.js +10 -5
  63. package/lib/langium/integration-services.js.map +1 -1
  64. package/lib/langium/integrity/integrity-service.d.ts +5 -0
  65. package/lib/langium/integrity/integrity-service.d.ts.map +1 -1
  66. package/lib/langium/integrity/integrity-service.js +34 -1
  67. package/lib/langium/integrity/integrity-service.js.map +1 -1
  68. package/lib/langium/keys/containment.d.ts +64 -0
  69. package/lib/langium/keys/containment.d.ts.map +1 -0
  70. package/lib/langium/keys/containment.js +53 -0
  71. package/lib/langium/keys/containment.js.map +1 -0
  72. package/lib/langium/keys/index.d.ts +1 -0
  73. package/lib/langium/keys/index.d.ts.map +1 -1
  74. package/lib/langium/keys/index.js +1 -0
  75. package/lib/langium/keys/index.js.map +1 -1
  76. package/lib/langium/keys/name-based-key-provider.d.ts +4 -0
  77. package/lib/langium/keys/name-based-key-provider.d.ts.map +1 -1
  78. package/lib/langium/keys/name-based-key-provider.js +4 -0
  79. package/lib/langium/keys/name-based-key-provider.js.map +1 -1
  80. package/lib/langium/model-service/model-service.d.ts +149 -10
  81. package/lib/langium/model-service/model-service.d.ts.map +1 -1
  82. package/lib/langium/model-service/model-service.js +120 -93
  83. package/lib/langium/model-service/model-service.js.map +1 -1
  84. package/lib/langium/module.d.ts +84 -15
  85. package/lib/langium/module.d.ts.map +1 -1
  86. package/lib/langium/module.js +26 -12
  87. package/lib/langium/module.js.map +1 -1
  88. package/lib/langium/naming/name-provider.d.ts +25 -4
  89. package/lib/langium/naming/name-provider.d.ts.map +1 -1
  90. package/lib/langium/naming/name-provider.js +2 -1
  91. package/lib/langium/naming/name-provider.js.map +1 -1
  92. package/lib/langium/naming/name-separator-validation.d.ts +23 -0
  93. package/lib/langium/naming/name-separator-validation.d.ts.map +1 -1
  94. package/lib/langium/naming/name-separator-validation.js +30 -1
  95. package/lib/langium/naming/name-separator-validation.js.map +1 -1
  96. package/lib/langium/residency/cst-residency-service.d.ts +31 -9
  97. package/lib/langium/residency/cst-residency-service.d.ts.map +1 -1
  98. package/lib/langium/residency/cst-residency-service.js +13 -56
  99. package/lib/langium/residency/cst-residency-service.js.map +1 -1
  100. package/lib/langium/scope/hydranium-scope-provider.d.ts +32 -13
  101. package/lib/langium/scope/hydranium-scope-provider.d.ts.map +1 -1
  102. package/lib/langium/scope/hydranium-scope-provider.js +37 -20
  103. package/lib/langium/scope/hydranium-scope-provider.js.map +1 -1
  104. package/lib/langium/shared-services.d.ts +15 -2
  105. package/lib/langium/shared-services.d.ts.map +1 -1
  106. package/lib/langium/shared-services.js.map +1 -1
  107. package/lib/langium/transfer/transfer-encoder.d.ts +60 -17
  108. package/lib/langium/transfer/transfer-encoder.d.ts.map +1 -1
  109. package/lib/langium/transfer/transfer-encoder.js +38 -16
  110. package/lib/langium/transfer/transfer-encoder.js.map +1 -1
  111. package/lib/langium/validation/document-validator.d.ts +294 -10
  112. package/lib/langium/validation/document-validator.d.ts.map +1 -1
  113. package/lib/langium/validation/document-validator.js +448 -5
  114. package/lib/langium/validation/document-validator.js.map +1 -1
  115. package/lib/langium/workspace/document-uri-policy.d.ts +3 -4
  116. package/lib/langium/workspace/document-uri-policy.d.ts.map +1 -1
  117. package/lib/langium/workspace/document-uri-policy.js +3 -4
  118. package/lib/langium/workspace/document-uri-policy.js.map +1 -1
  119. package/lib/langium/workspace/hydranium-langium-document-factory.d.ts +25 -0
  120. package/lib/langium/workspace/hydranium-langium-document-factory.d.ts.map +1 -1
  121. package/lib/langium/workspace/hydranium-langium-document-factory.js +25 -0
  122. package/lib/langium/workspace/hydranium-langium-document-factory.js.map +1 -1
  123. package/lib/langium/workspace/hydranium-workspace-manager.d.ts +21 -1
  124. package/lib/langium/workspace/hydranium-workspace-manager.d.ts.map +1 -1
  125. package/lib/langium/workspace/hydranium-workspace-manager.js +28 -0
  126. package/lib/langium/workspace/hydranium-workspace-manager.js.map +1 -1
  127. package/lib/langium/workspace/in-memory-file-system-provider.d.ts +8 -0
  128. package/lib/langium/workspace/in-memory-file-system-provider.d.ts.map +1 -1
  129. package/lib/langium/workspace/in-memory-file-system-provider.js +11 -2
  130. package/lib/langium/workspace/in-memory-file-system-provider.js.map +1 -1
  131. package/lib/langium/workspace/initialize-workspace.d.ts +22 -2
  132. package/lib/langium/workspace/initialize-workspace.d.ts.map +1 -1
  133. package/lib/langium/workspace/initialize-workspace.js +13 -5
  134. package/lib/langium/workspace/initialize-workspace.js.map +1 -1
  135. package/lib/langium/workspace/langium-documents.d.ts +79 -17
  136. package/lib/langium/workspace/langium-documents.d.ts.map +1 -1
  137. package/lib/langium/workspace/langium-documents.js +83 -28
  138. package/lib/langium/workspace/langium-documents.js.map +1 -1
  139. package/lib/locale/index.d.ts +10 -0
  140. package/lib/locale/index.d.ts.map +1 -0
  141. package/lib/locale/index.js +10 -0
  142. package/lib/locale/index.js.map +1 -0
  143. package/lib/locale/server-locale.d.ts +73 -0
  144. package/lib/locale/server-locale.d.ts.map +1 -0
  145. package/lib/locale/server-locale.js +61 -0
  146. package/lib/locale/server-locale.js.map +1 -0
  147. package/lib/lsp/hydranium-document-update-handler.js +1 -1
  148. package/lib/lsp/hydranium-document-update-handler.js.map +1 -1
  149. package/lib/lsp/index.d.ts +1 -1
  150. package/lib/lsp/index.d.ts.map +1 -1
  151. package/lib/lsp/index.js +1 -1
  152. package/lib/lsp/index.js.map +1 -1
  153. package/lib/lsp/lsp-latency.d.ts +39 -0
  154. package/lib/lsp/lsp-latency.d.ts.map +1 -0
  155. package/lib/lsp/lsp-latency.js +58 -0
  156. package/lib/lsp/lsp-latency.js.map +1 -0
  157. package/lib/lsp/semantic-token-provider.d.ts +34 -1
  158. package/lib/lsp/semantic-token-provider.d.ts.map +1 -1
  159. package/lib/lsp/semantic-token-provider.js +55 -8
  160. package/lib/lsp/semantic-token-provider.js.map +1 -1
  161. package/lib/messages/carriers.d.ts +54 -0
  162. package/lib/messages/carriers.d.ts.map +1 -0
  163. package/lib/messages/carriers.js +62 -0
  164. package/lib/messages/carriers.js.map +1 -0
  165. package/lib/messages/index.d.ts +25 -0
  166. package/lib/messages/index.d.ts.map +1 -0
  167. package/lib/messages/index.js +25 -0
  168. package/lib/messages/index.js.map +1 -0
  169. package/lib/messages/renderer.d.ts +136 -0
  170. package/lib/messages/renderer.d.ts.map +1 -0
  171. package/lib/messages/renderer.js +159 -0
  172. package/lib/messages/renderer.js.map +1 -0
  173. package/lib/node/heap-ceiling.d.ts +61 -0
  174. package/lib/node/heap-ceiling.d.ts.map +1 -0
  175. package/lib/node/heap-ceiling.js +72 -0
  176. package/lib/node/heap-ceiling.js.map +1 -0
  177. package/lib/node/index.d.ts +1 -0
  178. package/lib/node/index.d.ts.map +1 -1
  179. package/lib/node/index.js +1 -0
  180. package/lib/node/index.js.map +1 -1
  181. package/lib/node/latency-from-env.d.ts +1 -1
  182. package/lib/node/latency-from-env.js +1 -1
  183. package/lib/node/node-file-system-provider.d.ts.map +1 -1
  184. package/lib/node/node-file-system-provider.js +1 -40
  185. package/lib/node/node-file-system-provider.js.map +1 -1
  186. package/lib/node/profiling-run.d.ts +2 -2
  187. package/lib/node/profiling-run.js +1 -1
  188. package/lib/node/profiling-run.js.map +1 -1
  189. package/lib/node/rename-over-open-readers.d.ts +52 -0
  190. package/lib/node/rename-over-open-readers.d.ts.map +1 -0
  191. package/lib/node/rename-over-open-readers.js +66 -0
  192. package/lib/node/rename-over-open-readers.js.map +1 -0
  193. package/lib/testing/fake-document.d.ts +16 -4
  194. package/lib/testing/fake-document.d.ts.map +1 -1
  195. package/lib/testing/fake-document.js +18 -3
  196. package/lib/testing/fake-document.js.map +1 -1
  197. package/lib/testing/make-noop-shared-services.d.ts +14 -0
  198. package/lib/testing/make-noop-shared-services.d.ts.map +1 -1
  199. package/lib/testing/make-noop-shared-services.js +28 -2
  200. package/lib/testing/make-noop-shared-services.js.map +1 -1
  201. package/lib/testing/make-test-services.d.ts +44 -8
  202. package/lib/testing/make-test-services.d.ts.map +1 -1
  203. package/lib/testing/make-test-services.js +19 -3
  204. package/lib/testing/make-test-services.js.map +1 -1
  205. package/lib/testing/node/spawned-server.d.ts +14 -0
  206. package/lib/testing/node/spawned-server.d.ts.map +1 -1
  207. package/lib/testing/node/spawned-server.js +33 -1
  208. package/lib/testing/node/spawned-server.js.map +1 -1
  209. package/lib/testing/playwright/flaky-network-proxy.d.ts +76 -0
  210. package/lib/testing/playwright/flaky-network-proxy.d.ts.map +1 -0
  211. package/lib/testing/playwright/flaky-network-proxy.js +164 -0
  212. package/lib/testing/playwright/flaky-network-proxy.js.map +1 -0
  213. package/lib/testing/playwright/index.d.ts +1 -0
  214. package/lib/testing/playwright/index.d.ts.map +1 -1
  215. package/lib/testing/playwright/index.js +1 -0
  216. package/lib/testing/playwright/index.js.map +1 -1
  217. package/lib/testing/playwright/server-log-capture.d.ts +14 -4
  218. package/lib/testing/playwright/server-log-capture.d.ts.map +1 -1
  219. package/lib/testing/playwright/server-log-capture.js +21 -4
  220. package/lib/testing/playwright/server-log-capture.js.map +1 -1
  221. package/lib/testing/playwright/server-log-rename-reporter.d.ts.map +1 -1
  222. package/lib/testing/playwright/server-log-rename-reporter.js +10 -1
  223. package/lib/testing/playwright/server-log-rename-reporter.js.map +1 -1
  224. package/lib/testing/stub-ast-document-manager.d.ts +5 -5
  225. package/lib/testing/stub-ast-document-manager.d.ts.map +1 -1
  226. package/lib/testing/stub-ast-document-manager.js +4 -6
  227. package/lib/testing/stub-ast-document-manager.js.map +1 -1
  228. package/lib/testing/stub-document-builder.d.ts +8 -0
  229. package/lib/testing/stub-document-builder.d.ts.map +1 -1
  230. package/lib/testing/stub-document-builder.js +22 -3
  231. package/lib/testing/stub-document-builder.js.map +1 -1
  232. package/lib/testing/stub-langium-documents.d.ts +3 -2
  233. package/lib/testing/stub-langium-documents.d.ts.map +1 -1
  234. package/lib/testing/stub-langium-documents.js.map +1 -1
  235. package/lib/testing/stub-model-service.d.ts +5 -4
  236. package/lib/testing/stub-model-service.d.ts.map +1 -1
  237. package/lib/testing/stub-model-service.js +2 -2
  238. package/lib/testing/stub-model-service.js.map +1 -1
  239. package/package.json +17 -8
  240. package/src/documents/ast-document-manager.ts +129 -36
  241. package/src/documents/client-ids.ts +5 -22
  242. package/src/documents/hydranium-text-documents.ts +167 -61
  243. package/src/documents/language-client-text-shadow.ts +59 -11
  244. package/src/documents/self-save-registry.ts +52 -13
  245. package/src/index.ts +5 -0
  246. package/src/langium/ast-extension/ast-node-builder.ts +66 -22
  247. package/src/langium/bootstrap.ts +16 -9
  248. package/src/langium/config/configuration-provider.ts +119 -0
  249. package/src/langium/config/index.ts +1 -0
  250. package/src/langium/diagnostics/lsp-logger.ts +41 -6
  251. package/src/langium/document-builder/build-pipeline-integration.ts +14 -1
  252. package/src/langium/document-builder/build-session.ts +87 -0
  253. package/src/langium/document-builder/document-builder.ts +339 -11
  254. package/src/langium/document-builder/index.ts +1 -0
  255. package/src/langium/integration-services.ts +67 -6
  256. package/src/langium/integrity/integrity-service.ts +35 -1
  257. package/src/langium/keys/containment.ts +87 -0
  258. package/src/langium/keys/index.ts +1 -0
  259. package/src/langium/keys/name-based-key-provider.ts +4 -0
  260. package/src/langium/model-service/model-service.ts +211 -30
  261. package/src/langium/module.ts +106 -21
  262. package/src/langium/naming/name-provider.ts +27 -5
  263. package/src/langium/naming/name-separator-validation.ts +34 -5
  264. package/src/langium/residency/cst-residency-service.ts +36 -12
  265. package/src/langium/scope/hydranium-scope-provider.ts +40 -22
  266. package/src/langium/shared-services.ts +19 -2
  267. package/src/langium/transfer/transfer-encoder.ts +85 -24
  268. package/src/langium/validation/document-validator.ts +537 -11
  269. package/src/langium/workspace/document-uri-policy.ts +3 -4
  270. package/src/langium/workspace/hydranium-langium-document-factory.ts +34 -0
  271. package/src/langium/workspace/hydranium-workspace-manager.ts +30 -1
  272. package/src/langium/workspace/in-memory-file-system-provider.ts +13 -3
  273. package/src/langium/workspace/initialize-workspace.ts +34 -5
  274. package/src/langium/workspace/langium-documents.ts +106 -33
  275. package/src/locale/index.ts +10 -0
  276. package/src/locale/server-locale.ts +86 -0
  277. package/src/lsp/hydranium-document-update-handler.ts +1 -1
  278. package/src/lsp/index.ts +1 -1
  279. package/src/lsp/lsp-latency.ts +62 -0
  280. package/src/lsp/semantic-token-provider.ts +74 -7
  281. package/src/messages/carriers.ts +78 -0
  282. package/src/messages/index.ts +36 -0
  283. package/src/messages/renderer.ts +204 -0
  284. package/src/node/heap-ceiling.ts +108 -0
  285. package/src/node/index.ts +1 -0
  286. package/src/node/latency-from-env.ts +1 -1
  287. package/src/node/node-file-system-provider.ts +1 -41
  288. package/src/node/profiling-run.ts +3 -3
  289. package/src/node/rename-over-open-readers.ts +78 -0
  290. package/src/testing/fake-document.ts +24 -5
  291. package/src/testing/make-noop-shared-services.ts +50 -2
  292. package/src/testing/make-test-services.ts +73 -18
  293. package/src/testing/node/spawned-server.ts +35 -1
  294. package/src/testing/playwright/flaky-network-proxy.ts +240 -0
  295. package/src/testing/playwright/index.ts +1 -0
  296. package/src/testing/playwright/server-log-capture.ts +24 -5
  297. package/src/testing/playwright/server-log-rename-reporter.ts +12 -1
  298. package/src/testing/stub-ast-document-manager.ts +10 -14
  299. package/src/testing/stub-document-builder.ts +32 -3
  300. package/src/testing/stub-langium-documents.ts +3 -2
  301. package/src/testing/stub-model-service.ts +7 -6
  302. package/lib/lsp/instrument-connection.d.ts +0 -36
  303. package/lib/lsp/instrument-connection.d.ts.map +0 -1
  304. package/lib/lsp/instrument-connection.js +0 -62
  305. package/lib/lsp/instrument-connection.js.map +0 -1
  306. package/src/lsp/instrument-connection.ts +0 -66
@@ -6,13 +6,13 @@
6
6
  *
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
- import { type Tracer, type TransferDiagnostic, type TransferElement, type TransferDocument, type TransferTypeFor } from '@hydranium/protocol';
9
+ import { type Tracer, type TransferDiagnostic, type TransferElement, TransferDocument, type TransferTypeFor } from '@hydranium/protocol';
10
10
  import { type AstNode, DocumentCache, type LangiumDocument } from '@hydranium/langium';
11
11
  import { Diagnostic } from 'vscode-languageserver-protocol';
12
12
  import { type AstDocument } from '../../documents/ast-document-manager.js';
13
13
  import { type LogNameOptions } from '../diagnostics/logger.js';
14
14
  import { type ServerSharedServicesMinimal } from '../shared-services.js';
15
- import { type TransferLspDiagnostic } from '../validation/document-validator.js';
15
+ import { type AstDiagnostic } from '../validation/document-validator.js';
16
16
  /**
17
17
  * Which set of properties {@link TransferEncoder.toTransfer} emits.
18
18
  *
@@ -20,11 +20,13 @@ import { type TransferLspDiagnostic } from '../validation/document-validator.js'
20
20
  * including AST-extension-derived computed scalars and synthetic child
21
21
  * mirrors. This is the wire shape clients consume, and the default.
22
22
  * - `'grammar'` — only the grammar-declared properties, per
23
- * `AstReflection.getTypeMetaData($type).properties`. Excludes every
24
- * computed / synthetic property by construction (no naming convention,
25
- * no registration). Yields the authored state a serializer round-trips —
26
- * a diffable, acyclic baseline for field-level recording / forward-write
27
- * reconcile.
23
+ * `AstReflection.getTypeMetaData($type).properties`, each carrying the
24
+ * node's own authored value. Excludes every computed / synthetic property
25
+ * by construction (no naming convention, no registration) and bypasses the
26
+ * `resolvePropertyValue` substitution hook, so neither a computed KEY nor a
27
+ * computed VALUE can reach this shape. Yields the authored state a
28
+ * serializer round-trips — a diffable, acyclic baseline for field-level
29
+ * recording / forward-write reconcile.
28
30
  */
29
31
  export type TransferMode = 'full' | 'grammar';
30
32
  /**
@@ -68,6 +70,34 @@ export interface TransferEnvelopeSource<TDiagnostic> {
68
70
  readonly version: number;
69
71
  readonly diagnostics: readonly (TDiagnostic | Diagnostic)[];
70
72
  }
73
+ /**
74
+ * The AST→transfer contract a DI slot holds, implemented by
75
+ * {@link DefaultTransferEncoder}.
76
+ *
77
+ * **This is an interface and not the class, and that is load-bearing.** A class
78
+ * in a slot drags its `protected` members into every assignability check, which
79
+ * TypeScript compares NOMINALLY — so the slot type could not be satisfied by a
80
+ * subclass declared against a second physical copy of this package, and an
81
+ * adopter narrowing the slot had to intersect with the framework's declaration
82
+ * rather than replace it, leaving method resolution dependent on declaration
83
+ * order. An interface has no protected members and is compared structurally, so
84
+ * neither applies.
85
+ *
86
+ * **The transfer returns are the structural base ({@link TransferElement}), not
87
+ * the per-grammar overlay.** The overlay cannot parameterise this contract:
88
+ * `TransferTypeFor` reaches `keyof TTransferMap`, which makes that parameter
89
+ * measured-INVARIANT, and invariant parameters relate only when their arguments
90
+ * are mutually assignable — so a map-parameterised contract admits no adopter
91
+ * instantiation at all. Heads read this contract and do not know adopter maps;
92
+ * an adopter recovers the precise type by declaring its own slot, which it can
93
+ * now do by replacement.
94
+ */
95
+ export interface TransferEncoder<TDiagnostic extends TransferDiagnostic = TransferDiagnostic> {
96
+ toTransfer<T extends AstNode>(ast: T, mode?: TransferMode): TransferElement;
97
+ toTransferDocument(langiumDocument: LangiumDocument): TransferDocument<TransferElement, TDiagnostic>;
98
+ astDocumentToTransferDocument<TAst extends AstNode>(document: AstDocument<TAst, AstDiagnostic>): TransferDocument<TransferElement, TDiagnostic>;
99
+ toTransferDiagnostic(diagnostic: AstDiagnostic): TDiagnostic;
100
+ }
71
101
  /**
72
102
  * One-directional structural mapper from a Langium AST into the wire
73
103
  * transfer-model shape ({@link TransferElement}-based JSON).
@@ -101,7 +131,8 @@ export interface TransferEnvelopeSource<TDiagnostic> {
101
131
  * - {@link propertyKeys} — which property names the walk visits.
102
132
  * - {@link shouldEmitProperty} — per-key filter on top of the default
103
133
  * `$`-internals strip.
104
- * - {@link resolvePropertyValue} — value substitution per property.
134
+ * - {@link resolvePropertyValue} — value substitution per property, `'full'`
135
+ * mode only (see there for why `'grammar'` bypasses it).
105
136
  * - {@link finalizeTransferNode} — post-decoration per encoded node.
106
137
  * - {@link toTransferValue} — recursion seam per property value. Override
107
138
  * to special-case reference encoding or to drop specific value shapes.
@@ -109,10 +140,10 @@ export interface TransferEnvelopeSource<TDiagnostic> {
109
140
  * - {@link toTransferDocument} — bundle root + diagnostics into the wire
110
141
  * {@link TransferDocument} envelope. Override to filter / merge
111
142
  * diagnostics from auxiliary sources or to project a synthesised root.
112
- * - {@link toTransferDiagnostic} — project a {@link TransferLspDiagnostic}
143
+ * - {@link toTransferDiagnostic} — project a {@link AstDiagnostic}
113
144
  * (the framework validator's output) to {@link TDiagnostic}.
114
145
  */
115
- export declare class TransferEncoder<TTransferMap = Record<string, TransferElement>, TDiagnostic extends TransferDiagnostic = TransferDiagnostic> {
146
+ export declare class DefaultTransferEncoder<TTransferMap = Record<string, TransferElement>, TDiagnostic extends TransferDiagnostic = TransferDiagnostic> {
116
147
  protected readonly services: ServerSharedServicesMinimal;
117
148
  protected readonly tracer: Tracer;
118
149
  /**
@@ -194,8 +225,17 @@ export declare class TransferEncoder<TTransferMap = Record<string, TransferEleme
194
225
  */
195
226
  protected shouldEmitProperty(_ast: AstNode, key: string, _context: EncodeContext): boolean;
196
227
  /**
197
- * Which value the walk emits under `key`. Default: the node's own value.
198
- * Override to substitute a derived value under a grammar property name.
228
+ * Which value the walk emits under `key`, in `'full'` mode ONLY. Default:
229
+ * the node's own value.
230
+ *
231
+ * Override to substitute a derived value under a grammar property name — an
232
+ * inheritance-resolved field, a preference-dependent label. `'grammar'`
233
+ * bypasses this hook and reads the node directly: that mode's contract is
234
+ * the authored state a serializer round-trips, and a substituted value is by
235
+ * construction not the one the document declared. An override that applied
236
+ * in both modes would leave the grammar shape carrying derived values under
237
+ * declared property names — diffable and acyclic still, but no longer
238
+ * authored, which is the property every consumer of that mode relies on.
199
239
  */
200
240
  protected resolvePropertyValue(ast: AstNode, key: string, _context: EncodeContext): unknown;
201
241
  /**
@@ -253,7 +293,7 @@ export declare class TransferEncoder<TTransferMap = Record<string, TransferEleme
253
293
  * second `LangiumDocuments.getDocument` lookup.
254
294
  *
255
295
  * The `diagnostic` projection assumes the snapshot's diagnostics carry
256
- * the `TransferLspDiagnostic` shape ({@link Diagnostic} plus the
296
+ * the `AstDiagnostic` shape ({@link Diagnostic} plus the
257
297
  * framework validator's `element` / `property` decoration). Snapshots
258
298
  * built from raw Langium diagnostics structurally satisfy this — the
259
299
  * extra fields are optional in the projection.
@@ -263,10 +303,10 @@ export declare class TransferEncoder<TTransferMap = Record<string, TransferEleme
263
303
  * {@link TransferEnvelopeSource} structurally), so this path shares the
264
304
  * assembly seam rather than duplicating it.
265
305
  */
266
- astDocumentToTransferDocument<TAst extends AstNode>(document: AstDocument<TAst, TDiagnostic | TransferLspDiagnostic>): TransferDocument<TransferTypeFor<TAst, TTransferMap>, TDiagnostic>;
306
+ astDocumentToTransferDocument<TAst extends AstNode>(document: AstDocument<TAst, AstDiagnostic>): TransferDocument<TransferTypeFor<TAst, TTransferMap>, TDiagnostic>;
267
307
  /**
268
308
  * Project an LSP-shaped diagnostic (typically a
269
- * {@link TransferLspDiagnostic} produced by
309
+ * {@link AstDiagnostic} produced by
270
310
  * `HydraniumDocumentValidator` — adds `element` + optional `property`
271
311
  * to the standard {@link Diagnostic} shape) to the wire-diagnostic
272
312
  * shape.
@@ -275,14 +315,17 @@ export declare class TransferEncoder<TTransferMap = Record<string, TransferEleme
275
315
  * LSP severity enum to the wire string union, discriminates the
276
316
  * diagnostic type from Langium's `data.code` (`'lexing-error'` /
277
317
  * `'parsing-error'` else `'validation-error'`), passes through
278
- * message / element / property / code. Adopters whose validator
318
+ * message / element / property / code, and lifts the framework message
319
+ * params out of `data` so a translating surface can render a
320
+ * parameterised diagnostic rather than a template with its placeholders
321
+ * left standing. Adopters whose validator
279
322
  * doesn't decorate diagnostics with `element` still get a valid
280
323
  * `TransferDiagnostic` — the field falls back to `''`.
281
324
  *
282
325
  * Override only if the wire-diagnostic shape needs fields beyond
283
326
  * what {@link TransferDiagnostic} carries.
284
327
  */
285
- toTransferDiagnostic(diagnostic: TransferLspDiagnostic): TDiagnostic;
328
+ toTransferDiagnostic(diagnostic: AstDiagnostic): TDiagnostic;
286
329
  /**
287
330
  * Recursion seam — converts a single property value during the AST
288
331
  * walk. Arrays recurse element-wise; cross-references collapse to
@@ -1 +1 @@
1
- {"version":3,"file":"transfer-encoder.d.ts","sourceRoot":"","sources":["../../../src/langium/transfer/transfer-encoder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transfer-encoder.d.ts","sourceRoot":"","sources":["../../../src/langium/transfer/transfer-encoder.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@
6
6
  *
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
+ import { hasMessageIdentity, TransferDocument } from '@hydranium/protocol';
9
10
  import { AstUtils, DocumentCache, DocumentState, isAstNode, isReference } from '@hydranium/langium';
10
11
  import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-protocol';
11
12
  /**
@@ -41,7 +42,8 @@ import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-protocol';
41
42
  * - {@link propertyKeys} — which property names the walk visits.
42
43
  * - {@link shouldEmitProperty} — per-key filter on top of the default
43
44
  * `$`-internals strip.
44
- * - {@link resolvePropertyValue} — value substitution per property.
45
+ * - {@link resolvePropertyValue} — value substitution per property, `'full'`
46
+ * mode only (see there for why `'grammar'` bypasses it).
45
47
  * - {@link finalizeTransferNode} — post-decoration per encoded node.
46
48
  * - {@link toTransferValue} — recursion seam per property value. Override
47
49
  * to special-case reference encoding or to drop specific value shapes.
@@ -49,10 +51,10 @@ import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-protocol';
49
51
  * - {@link toTransferDocument} — bundle root + diagnostics into the wire
50
52
  * {@link TransferDocument} envelope. Override to filter / merge
51
53
  * diagnostics from auxiliary sources or to project a synthesised root.
52
- * - {@link toTransferDiagnostic} — project a {@link TransferLspDiagnostic}
54
+ * - {@link toTransferDiagnostic} — project a {@link AstDiagnostic}
53
55
  * (the framework validator's output) to {@link TDiagnostic}.
54
56
  */
55
- export class TransferEncoder {
57
+ export class DefaultTransferEncoder {
56
58
  services;
57
59
  tracer;
58
60
  /**
@@ -141,7 +143,13 @@ export class TransferEncoder {
141
143
  if (!this.shouldEmitProperty(ast, key, context)) {
142
144
  continue;
143
145
  }
144
- const value = this.resolvePropertyValue(ast, key, context);
146
+ // `'grammar'` reads the authored value straight off the node rather than
147
+ // through `resolvePropertyValue`. The mode promises a shape the serializer
148
+ // round-trips, and a value-substitution hook cannot honour that: what it
149
+ // returns is by construction not what the document declared. Scoping the
150
+ // hook to `'full'` is what makes that guarantee structural instead of a
151
+ // rule every override has to remember.
152
+ const value = context.mode === 'grammar' ? ast[key] : this.resolvePropertyValue(ast, key, context);
145
153
  // `'grammar'` lists every declared property, including those absent on
146
154
  // this node; skip the absent ones. (`'full'` enumerates only own
147
155
  // properties, so absent properties never surface there.) Part of the
@@ -179,8 +187,17 @@ export class TransferEncoder {
179
187
  return !key.startsWith('$');
180
188
  }
181
189
  /**
182
- * Which value the walk emits under `key`. Default: the node's own value.
183
- * Override to substitute a derived value under a grammar property name.
190
+ * Which value the walk emits under `key`, in `'full'` mode ONLY. Default:
191
+ * the node's own value.
192
+ *
193
+ * Override to substitute a derived value under a grammar property name — an
194
+ * inheritance-resolved field, a preference-dependent label. `'grammar'`
195
+ * bypasses this hook and reads the node directly: that mode's contract is
196
+ * the authored state a serializer round-trips, and a substituted value is by
197
+ * construction not the one the document declared. An override that applied
198
+ * in both modes would leave the grammar shape carrying derived values under
199
+ * declared property names — diffable and acyclic still, but no longer
200
+ * authored, which is the property every consumer of that mode relies on.
184
201
  */
185
202
  resolvePropertyValue(ast, key, _context) {
186
203
  return ast[key];
@@ -239,12 +256,7 @@ export class TransferEncoder {
239
256
  * so the snapshot path can reach it without a `LangiumDocuments` lookup.
240
257
  */
241
258
  assembleTransferDocument(source, root) {
242
- return {
243
- uri: source.uri,
244
- version: source.version,
245
- root,
246
- diagnostics: source.diagnostics.map(diagnostic => this.toTransferDiagnostic(diagnostic))
247
- };
259
+ return TransferDocument.create(source.uri, source.version, root, source.diagnostics.map(diagnostic => this.toTransferDiagnostic(diagnostic)));
248
260
  }
249
261
  /**
250
262
  * Build a wire {@link TransferDocument} envelope from a server-internal
@@ -257,7 +269,7 @@ export class TransferEncoder {
257
269
  * second `LangiumDocuments.getDocument` lookup.
258
270
  *
259
271
  * The `diagnostic` projection assumes the snapshot's diagnostics carry
260
- * the `TransferLspDiagnostic` shape ({@link Diagnostic} plus the
272
+ * the `AstDiagnostic` shape ({@link Diagnostic} plus the
261
273
  * framework validator's `element` / `property` decoration). Snapshots
262
274
  * built from raw Langium diagnostics structurally satisfy this — the
263
275
  * extra fields are optional in the projection.
@@ -273,7 +285,7 @@ export class TransferEncoder {
273
285
  }
274
286
  /**
275
287
  * Project an LSP-shaped diagnostic (typically a
276
- * {@link TransferLspDiagnostic} produced by
288
+ * {@link AstDiagnostic} produced by
277
289
  * `HydraniumDocumentValidator` — adds `element` + optional `property`
278
290
  * to the standard {@link Diagnostic} shape) to the wire-diagnostic
279
291
  * shape.
@@ -282,7 +294,10 @@ export class TransferEncoder {
282
294
  * LSP severity enum to the wire string union, discriminates the
283
295
  * diagnostic type from Langium's `data.code` (`'lexing-error'` /
284
296
  * `'parsing-error'` else `'validation-error'`), passes through
285
- * message / element / property / code. Adopters whose validator
297
+ * message / element / property / code, and lifts the framework message
298
+ * params out of `data` so a translating surface can render a
299
+ * parameterised diagnostic rather than a template with its placeholders
300
+ * left standing. Adopters whose validator
286
301
  * doesn't decorate diagnostics with `element` still get a valid
287
302
  * `TransferDiagnostic` — the field falls back to `''`.
288
303
  *
@@ -291,6 +306,12 @@ export class TransferEncoder {
291
306
  */
292
307
  toTransferDiagnostic(diagnostic) {
293
308
  const langiumCode = diagnostic.data?.code;
309
+ // The same `data` the Langium code comes out of also carries the framework
310
+ // message identity, under its own key so the two conventions co-exist.
311
+ // Taking the params from there rather than from `code` is what lets a
312
+ // translating surface render a PARAMETERISED diagnostic: `code` survives on
313
+ // its own and yields a template with its placeholders left standing.
314
+ const identity = hasMessageIdentity(diagnostic.data) ? diagnostic.data.hydranium : undefined;
294
315
  const result = {
295
316
  type: langiumCode === 'lexing-error' ? 'lexing-error' : langiumCode === 'parsing-error' ? 'parsing-error' : 'validation-error',
296
317
  element: diagnostic.element ?? '',
@@ -302,7 +323,8 @@ export class TransferEncoder {
302
323
  : diagnostic.severity === DiagnosticSeverity.Warning
303
324
  ? 'warning'
304
325
  : 'info',
305
- code: typeof diagnostic.code === 'number' || typeof diagnostic.code === 'string' ? diagnostic.code : langiumCode
326
+ code: typeof diagnostic.code === 'number' || typeof diagnostic.code === 'string' ? diagnostic.code : langiumCode,
327
+ params: identity?.params
306
328
  };
307
329
  return result;
308
330
  }
@@ -1 +1 @@
1
- {"version":3,"file":"transfer-encoder.js","sourceRoot":"","sources":["../../../src/langium/transfer/transfer-encoder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transfer-encoder.js","sourceRoot":"","sources":["../../../src/langium/transfer/transfer-encoder.ts"],"names":[],"mappings":"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"}