@hydranium/core 1.0.0-next.31 → 1.0.0-next.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 (107) hide show
  1. package/lib/documents/hydranium-text-documents.d.ts.map +1 -1
  2. package/lib/documents/hydranium-text-documents.js +12 -1
  3. package/lib/documents/hydranium-text-documents.js.map +1 -1
  4. package/lib/index.d.ts +1 -0
  5. package/lib/index.d.ts.map +1 -1
  6. package/lib/index.js +1 -0
  7. package/lib/index.js.map +1 -1
  8. package/lib/langium/bootstrap.d.ts.map +1 -1
  9. package/lib/langium/bootstrap.js +8 -1
  10. package/lib/langium/bootstrap.js.map +1 -1
  11. package/lib/langium/document-builder/document-builder.d.ts +33 -1
  12. package/lib/langium/document-builder/document-builder.d.ts.map +1 -1
  13. package/lib/langium/document-builder/document-builder.js +68 -2
  14. package/lib/langium/document-builder/document-builder.js.map +1 -1
  15. package/lib/langium/keys/containment.d.ts +64 -0
  16. package/lib/langium/keys/containment.d.ts.map +1 -0
  17. package/lib/langium/keys/containment.js +53 -0
  18. package/lib/langium/keys/containment.js.map +1 -0
  19. package/lib/langium/keys/index.d.ts +1 -0
  20. package/lib/langium/keys/index.d.ts.map +1 -1
  21. package/lib/langium/keys/index.js +1 -0
  22. package/lib/langium/keys/index.js.map +1 -1
  23. package/lib/langium/keys/name-based-key-provider.d.ts +4 -0
  24. package/lib/langium/keys/name-based-key-provider.d.ts.map +1 -1
  25. package/lib/langium/keys/name-based-key-provider.js +4 -0
  26. package/lib/langium/keys/name-based-key-provider.js.map +1 -1
  27. package/lib/langium/model-service/model-service.d.ts +39 -2
  28. package/lib/langium/model-service/model-service.d.ts.map +1 -1
  29. package/lib/langium/model-service/model-service.js +44 -5
  30. package/lib/langium/model-service/model-service.js.map +1 -1
  31. package/lib/langium/module.d.ts +20 -0
  32. package/lib/langium/module.d.ts.map +1 -1
  33. package/lib/langium/module.js +4 -0
  34. package/lib/langium/module.js.map +1 -1
  35. package/lib/langium/naming/name-provider.d.ts +10 -0
  36. package/lib/langium/naming/name-provider.d.ts.map +1 -1
  37. package/lib/langium/naming/name-provider.js.map +1 -1
  38. package/lib/langium/naming/name-separator-validation.d.ts +23 -1
  39. package/lib/langium/naming/name-separator-validation.d.ts.map +1 -1
  40. package/lib/langium/naming/name-separator-validation.js +22 -0
  41. package/lib/langium/naming/name-separator-validation.js.map +1 -1
  42. package/lib/langium/shared-services.d.ts +13 -2
  43. package/lib/langium/shared-services.d.ts.map +1 -1
  44. package/lib/langium/shared-services.js.map +1 -1
  45. package/lib/langium/validation/document-validator.d.ts +128 -2
  46. package/lib/langium/validation/document-validator.d.ts.map +1 -1
  47. package/lib/langium/validation/document-validator.js +211 -4
  48. package/lib/langium/validation/document-validator.js.map +1 -1
  49. package/lib/langium/workspace/hydranium-workspace-manager.d.ts +21 -1
  50. package/lib/langium/workspace/hydranium-workspace-manager.d.ts.map +1 -1
  51. package/lib/langium/workspace/hydranium-workspace-manager.js +28 -0
  52. package/lib/langium/workspace/hydranium-workspace-manager.js.map +1 -1
  53. package/lib/langium/workspace/initialize-workspace.d.ts +22 -2
  54. package/lib/langium/workspace/initialize-workspace.d.ts.map +1 -1
  55. package/lib/langium/workspace/initialize-workspace.js +13 -5
  56. package/lib/langium/workspace/initialize-workspace.js.map +1 -1
  57. package/lib/locale/index.d.ts +10 -0
  58. package/lib/locale/index.d.ts.map +1 -0
  59. package/lib/locale/index.js +10 -0
  60. package/lib/locale/index.js.map +1 -0
  61. package/lib/locale/server-locale.d.ts +59 -0
  62. package/lib/locale/server-locale.d.ts.map +1 -0
  63. package/lib/locale/server-locale.js +61 -0
  64. package/lib/locale/server-locale.js.map +1 -0
  65. package/lib/messages/carriers.d.ts +15 -7
  66. package/lib/messages/carriers.d.ts.map +1 -1
  67. package/lib/messages/carriers.js +19 -8
  68. package/lib/messages/carriers.js.map +1 -1
  69. package/lib/messages/index.d.ts +3 -0
  70. package/lib/messages/index.d.ts.map +1 -1
  71. package/lib/messages/index.js +3 -0
  72. package/lib/messages/index.js.map +1 -1
  73. package/lib/messages/renderer.d.ts +117 -0
  74. package/lib/messages/renderer.d.ts.map +1 -0
  75. package/lib/messages/renderer.js +159 -0
  76. package/lib/messages/renderer.js.map +1 -0
  77. package/lib/testing/make-noop-shared-services.d.ts +14 -0
  78. package/lib/testing/make-noop-shared-services.d.ts.map +1 -1
  79. package/lib/testing/make-noop-shared-services.js +28 -2
  80. package/lib/testing/make-noop-shared-services.js.map +1 -1
  81. package/lib/testing/make-test-services.d.ts +27 -0
  82. package/lib/testing/make-test-services.d.ts.map +1 -1
  83. package/lib/testing/make-test-services.js +17 -1
  84. package/lib/testing/make-test-services.js.map +1 -1
  85. package/package.json +5 -5
  86. package/src/documents/hydranium-text-documents.ts +12 -1
  87. package/src/index.ts +1 -0
  88. package/src/langium/bootstrap.ts +8 -1
  89. package/src/langium/document-builder/document-builder.ts +70 -2
  90. package/src/langium/keys/containment.ts +87 -0
  91. package/src/langium/keys/index.ts +1 -0
  92. package/src/langium/keys/name-based-key-provider.ts +4 -0
  93. package/src/langium/model-service/model-service.ts +46 -4
  94. package/src/langium/module.ts +22 -0
  95. package/src/langium/naming/name-provider.ts +10 -0
  96. package/src/langium/naming/name-separator-validation.ts +25 -3
  97. package/src/langium/shared-services.ts +13 -2
  98. package/src/langium/validation/document-validator.ts +238 -4
  99. package/src/langium/workspace/hydranium-workspace-manager.ts +30 -1
  100. package/src/langium/workspace/initialize-workspace.ts +34 -5
  101. package/src/locale/index.ts +10 -0
  102. package/src/locale/server-locale.ts +71 -0
  103. package/src/messages/carriers.ts +20 -10
  104. package/src/messages/index.ts +3 -0
  105. package/src/messages/renderer.ts +184 -0
  106. package/src/testing/make-noop-shared-services.ts +50 -2
  107. package/src/testing/make-test-services.ts +43 -1
@@ -0,0 +1,117 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the MIT License which is available in the project root.
6
+ *
7
+ * SPDX-License-Identifier: MIT
8
+ ********************************************************************************/
9
+ import { type MessageDefinition, type ParamsArg, type ResolvedMessage, type Tracer } from '@hydranium/protocol';
10
+ import { SimpleCache } from '@hydranium/langium';
11
+ import type { ResponseError } from 'vscode-jsonrpc';
12
+ import { Diagnostic } from 'vscode-languageserver-protocol';
13
+ import { type LogNameOptions } from '../langium/diagnostics/logger.js';
14
+ import type { ServerSharedServicesMinimal } from '../langium/shared-services.js';
15
+ import type { ServerLocale } from '../locale/server-locale.js';
16
+ /** Construction options for {@link ServerMessageRenderer}. */
17
+ export type ServerMessageRendererOptions = LogNameOptions;
18
+ /**
19
+ * Renders every user-facing message the server sends, in the locale the server
20
+ * was handed at init. The framework ships no catalogue, so its own behaviour is
21
+ * a pass-through.
22
+ *
23
+ * Adopters override {@link translationsFor}: the public render methods carry
24
+ * the no-throw contract, and the catalogue lookup they wrap is what can fail.
25
+ *
26
+ * Two render methods rather than one, because what is useful to an adopter is
27
+ * the carrier's structured fields and the two carriers have different ones. A
28
+ * single `render(text)` would force an adopter to match English prose, which
29
+ * breaks on the first Langium reword.
30
+ */
31
+ export declare class ServerMessageRenderer {
32
+ protected readonly tracer: Tracer;
33
+ protected readonly serverLocale: ServerLocale;
34
+ /**
35
+ * {@link translationsFor}'s answer per locale, `undefined` answers included —
36
+ * a `SimpleCache` distinguishes "absent" from "cached as none", which matters
37
+ * because shipping no catalogue is the framework's own hot path.
38
+ *
39
+ * `SimpleCache` rather than Langium's `WorkspaceCache`: the eviction axis
40
+ * there is document change, and a catalogue does not depend on documents, so
41
+ * it would evict on every build AND put a `DocumentBuilder` dependency on a
42
+ * service the shared tier declares free of one. Nothing evicts this: the
43
+ * locale arrives once per process. A subclass whose catalogue can change
44
+ * clears it.
45
+ */
46
+ protected readonly catalogues: SimpleCache<string | undefined, Record<string, string> | undefined>;
47
+ constructor(services: ServerSharedServicesMinimal, options?: ServerMessageRendererOptions);
48
+ /**
49
+ * The sentence to publish for `diagnostic`, replacing its current `message`.
50
+ * Sees lexer and parser errors too, which Langium pushes onto the document
51
+ * without routing them through `toDiagnostic`.
52
+ *
53
+ * **Must not throw**, which is why the guard is here and not at the call
54
+ * site: this runs inside the `Validated` phase, and Langium's
55
+ * `notifyDocumentPhase` rethrows anything that is not a cancellation — so an
56
+ * escaping error leaves the document AT `Validated` with the phase's
57
+ * listeners never run, and the client receives no diagnostics for that file.
58
+ * A subclass overriding this method takes that contract on itself.
59
+ */
60
+ renderDiagnostic(diagnostic: Diagnostic): string;
61
+ /**
62
+ * The sentence to send for `error`, replacing its current `message`. Same
63
+ * no-throw contract as {@link renderDiagnostic}: an escaping error replaces a
64
+ * typed rejection the caller can handle with one it cannot.
65
+ */
66
+ renderError(error: ResponseError<unknown>): string;
67
+ /**
68
+ * The sentence for a declaration the caller holds directly, for a carrier
69
+ * with no slot to put an identity in.
70
+ *
71
+ * GLSP's action protocol is the case: every member of its message, status
72
+ * and reject actions is prose or an enum, so a code cannot travel and the
73
+ * raise site is the last place that still knows which message this is.
74
+ * Prefer {@link renderDiagnostic} / {@link renderError} wherever a carrier
75
+ * does hold the identity — they keep the render off the raise site, so an
76
+ * adopter's own messages ride the same one binding.
77
+ *
78
+ * Same no-throw contract as the carrier methods.
79
+ */
80
+ renderMessage<S extends string>(message: MessageDefinition<S>, ...params: ParamsArg<S>): string;
81
+ /**
82
+ * The catalogue for the current locale, or `undefined` for none — the
83
+ * framework's answer, shipping none. Overriding this leaves every identity
84
+ * decision, every pass-through and the no-throw guard in place.
85
+ *
86
+ * **Called once per locale, not once per message**, so an override may load
87
+ * a file or build a map without that cost landing per diagnostic. The
88
+ * corollary is that a catalogue mutated in place afterwards is not seen;
89
+ * clear {@link catalogues} to invalidate.
90
+ *
91
+ * An adopter wanting Langium's own uncoded sentences instead matches
92
+ * `Diagnostic.data.code` from an overridden {@link renderDiagnostic}, never
93
+ * the sentence.
94
+ */
95
+ protected translationsFor(_locale: string | undefined): Record<string, string> | undefined;
96
+ /**
97
+ * Resolve one identity against the current locale's catalogue.
98
+ *
99
+ * Reads the locale per call. Copying it into a field at construction pins
100
+ * whatever was there before init ran, which is always `undefined` — services
101
+ * compose first.
102
+ *
103
+ * The catalogue behind it is memoized, because a workspace-wide validation
104
+ * renders once per diagnostic and the naive override — parse a JSON file,
105
+ * build a map — then pays that per diagnostic rather than per locale.
106
+ */
107
+ protected render(message: ResolvedMessage): string;
108
+ /**
109
+ * Emit a failed render. Logged rather than swallowed: the fallback output is
110
+ * byte-identical to a correctly-configured default, so a throwing catalogue
111
+ * is otherwise invisible.
112
+ */
113
+ protected reportFailure(err: unknown, carrier: string): void;
114
+ /** Format the failed-render line. Override to name the adopter's catalogue entry. */
115
+ protected formatRenderFailure(err: unknown, carrier: string): string;
116
+ }
117
+ //# sourceMappingURL=renderer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/messages/renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAKJ,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,MAAM,EACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG/D,8DAA8D;AAC9D,MAAM,MAAM,4BAA4B,GAAG,cAAc,CAAC;AAE1D;;;;;;;;;;;;GAYG;AACH,qBAAa,qBAAqB;IAC/B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAC9C;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,sEAA6E;gBAE9F,QAAQ,EAAE,2BAA2B,EAAE,OAAO,GAAE,4BAAiC;IAK7F;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAUhD;;;;OAIG;IACH,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM;IAUlD;;;;;;;;;;;;OAYG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM;IAkB/F;;;;;;;;;;;;;OAaG;IACH,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAI1F;;;;;;;;;;OAUG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM;IAQlD;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5D,qFAAqF;IACrF,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;CAGtE"}
@@ -0,0 +1,159 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the MIT License which is available in the project root.
6
+ *
7
+ * SPDX-License-Identifier: MIT
8
+ ********************************************************************************/
9
+ import { describeError, renderFrameworkMessage, resolve, resolvedFromResponseError } from '@hydranium/protocol';
10
+ import { SimpleCache } from '@hydranium/langium';
11
+ import { Diagnostic } from 'vscode-languageserver-protocol';
12
+ import { resolvedFromDiagnostic } from './carriers.js';
13
+ /**
14
+ * Renders every user-facing message the server sends, in the locale the server
15
+ * was handed at init. The framework ships no catalogue, so its own behaviour is
16
+ * a pass-through.
17
+ *
18
+ * Adopters override {@link translationsFor}: the public render methods carry
19
+ * the no-throw contract, and the catalogue lookup they wrap is what can fail.
20
+ *
21
+ * Two render methods rather than one, because what is useful to an adopter is
22
+ * the carrier's structured fields and the two carriers have different ones. A
23
+ * single `render(text)` would force an adopter to match English prose, which
24
+ * breaks on the first Langium reword.
25
+ */
26
+ export class ServerMessageRenderer {
27
+ tracer;
28
+ serverLocale;
29
+ /**
30
+ * {@link translationsFor}'s answer per locale, `undefined` answers included —
31
+ * a `SimpleCache` distinguishes "absent" from "cached as none", which matters
32
+ * because shipping no catalogue is the framework's own hot path.
33
+ *
34
+ * `SimpleCache` rather than Langium's `WorkspaceCache`: the eviction axis
35
+ * there is document change, and a catalogue does not depend on documents, so
36
+ * it would evict on every build AND put a `DocumentBuilder` dependency on a
37
+ * service the shared tier declares free of one. Nothing evicts this: the
38
+ * locale arrives once per process. A subclass whose catalogue can change
39
+ * clears it.
40
+ */
41
+ catalogues = new SimpleCache();
42
+ constructor(services, options = {}) {
43
+ this.serverLocale = services.ServerLocale;
44
+ this.tracer = services.Tracer.for(options.logName ?? 'MessageRenderer').trace('instantiated');
45
+ }
46
+ /**
47
+ * The sentence to publish for `diagnostic`, replacing its current `message`.
48
+ * Sees lexer and parser errors too, which Langium pushes onto the document
49
+ * without routing them through `toDiagnostic`.
50
+ *
51
+ * **Must not throw**, which is why the guard is here and not at the call
52
+ * site: this runs inside the `Validated` phase, and Langium's
53
+ * `notifyDocumentPhase` rethrows anything that is not a cancellation — so an
54
+ * escaping error leaves the document AT `Validated` with the phase's
55
+ * listeners never run, and the client receives no diagnostics for that file.
56
+ * A subclass overriding this method takes that contract on itself.
57
+ */
58
+ renderDiagnostic(diagnostic) {
59
+ try {
60
+ const resolved = resolvedFromDiagnostic(diagnostic);
61
+ return resolved ? this.render(resolved) : Diagnostic.getMessageString(diagnostic);
62
+ }
63
+ catch (err) {
64
+ this.reportFailure(err, 'a diagnostic');
65
+ return Diagnostic.getMessageString(diagnostic);
66
+ }
67
+ }
68
+ /**
69
+ * The sentence to send for `error`, replacing its current `message`. Same
70
+ * no-throw contract as {@link renderDiagnostic}: an escaping error replaces a
71
+ * typed rejection the caller can handle with one it cannot.
72
+ */
73
+ renderError(error) {
74
+ try {
75
+ const resolved = resolvedFromResponseError(error);
76
+ return resolved ? this.render(resolved) : error.message;
77
+ }
78
+ catch (err) {
79
+ this.reportFailure(err, 'an RPC error');
80
+ return error.message;
81
+ }
82
+ }
83
+ /**
84
+ * The sentence for a declaration the caller holds directly, for a carrier
85
+ * with no slot to put an identity in.
86
+ *
87
+ * GLSP's action protocol is the case: every member of its message, status
88
+ * and reject actions is prose or an enum, so a code cannot travel and the
89
+ * raise site is the last place that still knows which message this is.
90
+ * Prefer {@link renderDiagnostic} / {@link renderError} wherever a carrier
91
+ * does hold the identity — they keep the render off the raise site, so an
92
+ * adopter's own messages ride the same one binding.
93
+ *
94
+ * Same no-throw contract as the carrier methods.
95
+ */
96
+ renderMessage(message, ...params) {
97
+ // `resolve` is inside the guard with the render, not before it: it calls
98
+ // the declaration's own `format`, which for an adopter declaration is
99
+ // arbitrary code, and a throw there would escape a method whose contract
100
+ // says it cannot.
101
+ let resolved;
102
+ try {
103
+ resolved = resolve(message, ...params);
104
+ return this.render(resolved);
105
+ }
106
+ catch (err) {
107
+ this.reportFailure(err, `the message '${message.code}'`);
108
+ // Unset only when `format` ITSELF threw, which leaves the
109
+ // uninterpolated template as the only text there is. A failed render
110
+ // still has the resolved English.
111
+ return resolved?.text ?? message.text;
112
+ }
113
+ }
114
+ /**
115
+ * The catalogue for the current locale, or `undefined` for none — the
116
+ * framework's answer, shipping none. Overriding this leaves every identity
117
+ * decision, every pass-through and the no-throw guard in place.
118
+ *
119
+ * **Called once per locale, not once per message**, so an override may load
120
+ * a file or build a map without that cost landing per diagnostic. The
121
+ * corollary is that a catalogue mutated in place afterwards is not seen;
122
+ * clear {@link catalogues} to invalidate.
123
+ *
124
+ * An adopter wanting Langium's own uncoded sentences instead matches
125
+ * `Diagnostic.data.code` from an overridden {@link renderDiagnostic}, never
126
+ * the sentence.
127
+ */
128
+ translationsFor(_locale) {
129
+ return undefined;
130
+ }
131
+ /**
132
+ * Resolve one identity against the current locale's catalogue.
133
+ *
134
+ * Reads the locale per call. Copying it into a field at construction pins
135
+ * whatever was there before init ran, which is always `undefined` — services
136
+ * compose first.
137
+ *
138
+ * The catalogue behind it is memoized, because a workspace-wide validation
139
+ * renders once per diagnostic and the naive override — parse a JSON file,
140
+ * build a map — then pays that per diagnostic rather than per locale.
141
+ */
142
+ render(message) {
143
+ const locale = this.serverLocale.value;
144
+ return renderFrameworkMessage(message, this.catalogues.get(locale, () => this.translationsFor(locale)));
145
+ }
146
+ /**
147
+ * Emit a failed render. Logged rather than swallowed: the fallback output is
148
+ * byte-identical to a correctly-configured default, so a throwing catalogue
149
+ * is otherwise invisible.
150
+ */
151
+ reportFailure(err, carrier) {
152
+ this.tracer.error(this.formatRenderFailure(err, carrier));
153
+ }
154
+ /** Format the failed-render line. Override to name the adopter's catalogue entry. */
155
+ formatRenderFailure(err, carrier) {
156
+ return `rendering ${carrier} failed; falling back to the server's own text. ${describeError(err)}`;
157
+ }
158
+ }
159
+ //# sourceMappingURL=renderer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/messages/renderer.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,8 @@
8
8
  ********************************************************************************/
9
9
  import { type Clock, type Logger, type Tracer } from '@hydranium/protocol';
10
10
  import type { ServerSharedServicesMinimal } from '../langium/shared-services.js';
11
+ import { ServerLocale } from '../locale/server-locale.js';
12
+ import { ServerMessageRenderer } from '../messages/renderer.js';
11
13
  /**
12
14
  * Overrides for {@link makeNoopSharedServices}. The three observability slots
13
15
  * are typed (they are the boilerplate this helper exists to default);
@@ -27,6 +29,18 @@ export interface NoopSharedServicesOverrides {
27
29
  Logger?: Logger;
28
30
  /** Bound on the top-level `Tracer` slot. Default: a `DefaultTracer` over `Logger` + `Clock`. */
29
31
  Tracer?: Tracer;
32
+ /** Factory for the `ServerLocale` slot. Default: a real one, reporting no locale. */
33
+ ServerLocale?: (services: ServerSharedServicesMinimal) => ServerLocale;
34
+ /**
35
+ * Factory for the `MessageRenderer` slot. Default: the real
36
+ * {@link ServerMessageRenderer}, whose no-catalogue behaviour is a
37
+ * pass-through — so the default is the framework's own behaviour, not a stub.
38
+ *
39
+ * A factory rather than an instance, because a renderer reads the tree it is
40
+ * bound into. Both slots are resolved lazily, so an override is honoured
41
+ * however late the caller reads them.
42
+ */
43
+ MessageRenderer?: (services: ServerSharedServicesMinimal) => ServerMessageRenderer;
30
44
  /** Per-slot `workspace` overrides. Slots left out resolve to `undefined`. */
31
45
  workspace?: Record<string, unknown>;
32
46
  /** Any other minimal slot (`ServiceRegistry`, `AstReflection`, `additionalDocuments`, …). */
@@ -1 +1 @@
1
- {"version":3,"file":"make-noop-shared-services.d.ts","sourceRoot":"","sources":["../../src/testing/make-noop-shared-services.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,KAAK,EAAiB,KAAK,MAAM,EAA2B,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACnH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAEjF;;;;;;;GAOG;AACH,MAAM,WAAW,2BAA2B;IACzC,yEAAyE;IACzE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,6FAA6F;IAC7F,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,2BAA2B,GAAG,2BAA2B,EACvG,SAAS,GAAE,2BAAgC,GAC3C,CAAC,CAaH"}
1
+ {"version":3,"file":"make-noop-shared-services.d.ts","sourceRoot":"","sources":["../../src/testing/make-noop-shared-services.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,KAAK,EAAiB,KAAK,MAAM,EAA2B,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACnH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;;;;;GAOG;AACH,MAAM,WAAW,2BAA2B;IACzC,yEAAyE;IACzE,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,YAAY,CAAC;IACvE;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,qBAAqB,CAAC;IACnF,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,6FAA6F;IAC7F,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,2BAA2B,GAAG,2BAA2B,EACvG,SAAS,GAAE,2BAAgC,GAC3C,CAAC,CA8BH"}
@@ -7,6 +7,8 @@
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
9
  import { DefaultTracer, NoopLogger, SystemClock } from '@hydranium/protocol';
10
+ import { ServerLocale } from '../locale/server-locale.js';
11
+ import { ServerMessageRenderer } from '../messages/renderer.js';
10
12
  /**
11
13
  * Build a {@link ServerSharedServicesMinimal} tree backed by no-op defaults for
12
14
  * the observability slots every framework component reads (`Clock` / `Logger` /
@@ -33,11 +35,12 @@ import { DefaultTracer, NoopLogger, SystemClock } from '@hydranium/protocol';
33
35
  * are still undefined and should be overridden if the code under test reads them.
34
36
  */
35
37
  export function makeNoopSharedServices(overrides = {}) {
36
- const { Clock: clock, Logger: logger, Tracer: tracer, workspace, additionalDocuments, ...restTop } = overrides;
38
+ const { Clock: clock, Logger: logger, Tracer: tracer, ServerLocale: serverLocale, MessageRenderer: messageRenderer, workspace, additionalDocuments, ...restTop } = overrides;
37
39
  const resolvedClock = clock ?? new SystemClock();
38
40
  const resolvedLogger = logger ?? new NoopLogger();
39
41
  const resolvedTracer = tracer ?? new DefaultTracer(resolvedLogger, resolvedClock);
40
- return {
42
+ // Assembled in two steps, because both defaults read the tree they belong to.
43
+ const services = {
41
44
  Clock: resolvedClock,
42
45
  Logger: resolvedLogger,
43
46
  Tracer: resolvedTracer,
@@ -45,5 +48,28 @@ export function makeNoopSharedServices(overrides = {}) {
45
48
  ...restTop,
46
49
  workspace: { ...(workspace ?? {}) }
47
50
  };
51
+ // Lazy, like Langium's own per-slot construction — and load-bearing here:
52
+ // both services emit an `instantiated` trace, so building them eagerly puts
53
+ // two lines into the capture of every test that passes a capturing logger
54
+ // and asserts on emptiness.
55
+ defineLazySlot(services, 'ServerLocale', () => serverLocale?.(services) ?? new ServerLocale(services));
56
+ defineLazySlot(services, 'MessageRenderer', () => messageRenderer?.(services) ?? new ServerMessageRenderer(services));
57
+ return services;
58
+ }
59
+ /** Install `name` as a memoized getter, so nothing is constructed until it is read. */
60
+ function defineLazySlot(target, name, create) {
61
+ let resolved;
62
+ let built = false;
63
+ Object.defineProperty(target, name, {
64
+ configurable: true,
65
+ enumerable: true,
66
+ get: () => {
67
+ if (!built) {
68
+ resolved = create();
69
+ built = true;
70
+ }
71
+ return resolved;
72
+ }
73
+ });
48
74
  }
49
75
  //# sourceMappingURL=make-noop-shared-services.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"make-noop-shared-services.js","sourceRoot":"","sources":["../../src/testing/make-noop-shared-services.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAc,aAAa,EAAe,UAAU,EAAE,WAAW,EAAe,MAAM,qBAAqB,CAAC;AA4BnH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,sBAAsB,CACnC,YAAyC,EAAE;IAE3C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,OAAO,EAAE,GAAG,SAAS,CAAC;IAC/G,MAAM,aAAa,GAAG,KAAK,IAAI,IAAI,WAAW,EAAE,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,IAAI,IAAI,aAAa,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAClF,OAAO;QACJ,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,cAAc;QACtB,mBAAmB,EAAE,mBAAmB,IAAI,EAAE;QAC9C,GAAG,OAAO;QACV,SAAS,EAAE,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE;KACrB,CAAC;AACrB,CAAC"}
1
+ {"version":3,"file":"make-noop-shared-services.js","sourceRoot":"","sources":["../../src/testing/make-noop-shared-services.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAc,aAAa,EAAe,UAAU,EAAE,WAAW,EAAe,MAAM,qBAAqB,CAAC;AAEnH,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAuChE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,sBAAsB,CACnC,YAAyC,EAAE;IAE3C,MAAM,EACH,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,SAAS,EACT,mBAAmB,EACnB,GAAG,OAAO,EACZ,GAAG,SAAS,CAAC;IACd,MAAM,aAAa,GAAG,KAAK,IAAI,IAAI,WAAW,EAAE,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,IAAI,IAAI,aAAa,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAClF,8EAA8E;IAC9E,MAAM,QAAQ,GAAG;QACd,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,cAAc;QACtB,MAAM,EAAE,cAAc;QACtB,mBAAmB,EAAE,mBAAmB,IAAI,EAAE;QAC9C,GAAG,OAAO;QACV,SAAS,EAAE,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE;KACrB,CAAC;IAClB,0EAA0E;IAC1E,4EAA4E;IAC5E,0EAA0E;IAC1E,4BAA4B;IAC5B,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvG,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtH,OAAO,QAAQ,CAAC;AACnB,CAAC;AAED,uFAAuF;AACvF,SAAS,cAAc,CAAC,MAAc,EAAE,IAAY,EAAE,MAAqB;IACxE,IAAI,QAAiB,CAAC;IACtB,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE;QACjC,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE,GAAG,EAAE;YACP,IAAI,CAAC,KAAK,EAAE,CAAC;gBACV,QAAQ,GAAG,MAAM,EAAE,CAAC;gBACpB,KAAK,GAAG,IAAI,CAAC;YAChB,CAAC;YACD,OAAO,QAAQ,CAAC;QACnB,CAAC;KACH,CAAC,CAAC;AACN,CAAC"}
@@ -7,6 +7,8 @@
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
9
  import { type Clock, type Logger, type Project, type Tracer, type TransferDiagnostic, type TransferElement } from '@hydranium/protocol';
10
+ import { ServerLocale } from '../locale/server-locale.js';
11
+ import { ServerMessageRenderer } from '../messages/renderer.js';
10
12
  import type { Harness } from '@hydranium/protocol/testing';
11
13
  import { type AstNode, type AstNodeDescription, type WorkspaceLock } from '@hydranium/langium';
12
14
  import type { ModelService, ModelServiceOptions } from '../langium/model-service/model-service.js';
@@ -74,6 +76,15 @@ export interface TestSharedServices<TAst extends AstNode = AstNode, TDiagnostic
74
76
  TransferEncoder: TransferEncoder<unknown, TDiagnostic>;
75
77
  ModelService: ModelService<TAst, TDiagnostic, TTransfer>;
76
78
  };
79
+ /**
80
+ * The REAL services, not stubs — the framework renderer's no-catalogue
81
+ * behaviour is a pass-through, so the stub tree agrees with a production one
82
+ * unless a test installs a catalogue. Bound rather than omitted because
83
+ * `HydraniumDocumentBuilder` renders through the renderer on every
84
+ * `Validated` phase, where an omitted slot is a `TypeError`.
85
+ */
86
+ readonly ServerLocale: ServerLocale;
87
+ readonly MessageRenderer: ServerMessageRenderer;
77
88
  }
78
89
  /** Optional configuration for {@link makeTestServices}. */
79
90
  export interface MakeTestServicesOptions<TAst extends AstNode = AstNode, TDiagnostic extends TransferDiagnostic = TransferDiagnostic, TTransfer extends TransferElement = TransferElement, TProject extends Project = Project> {
@@ -87,6 +98,14 @@ export interface MakeTestServicesOptions<TAst extends AstNode = AstNode, TDiagno
87
98
  * for tests that don't assert on the produced text.
88
99
  */
89
100
  serialize?: (uri: string, root: TTransfer) => string;
101
+ /**
102
+ * Renderer bound on `MessageRenderer`. Default: the framework's own, which
103
+ * passes every sentence through unchanged. Supply one to install a catalogue
104
+ * or to drive the throwing path.
105
+ */
106
+ messageRenderer?: (services: ServerSharedServices<TProject>) => ServerMessageRenderer;
107
+ /** Locale handed to the bundle's {@link ServerLocale}. Default: none, i.e. the framework's English. */
108
+ locale?: string;
90
109
  /**
91
110
  * Languages to register on a {@link StubServiceRegistry} bound on the
92
111
  * `ServiceRegistry` slot. This is how a test gets multi-language routing:
@@ -202,6 +221,14 @@ export interface TestServicesBundle<TAst extends AstNode = AstNode, TDiagnostic
202
221
  readonly logger: Logger;
203
222
  /** The clock bound on the `Clock` slot — a `makeFakeClock()` if one was passed. */
204
223
  readonly clock: Clock;
224
+ /**
225
+ * The service bound on `ServerLocale`, so a test can hand over a locale
226
+ * mid-run — which is also how it verifies the renderer reads the locale per
227
+ * render rather than caching it at construction.
228
+ */
229
+ readonly serverLocale: ServerLocale;
230
+ /** The renderer bound on `MessageRenderer` — the framework's own unless one was supplied. */
231
+ readonly messageRenderer: ServerMessageRenderer;
205
232
  }
206
233
  /**
207
234
  * Build a {@link ServerSharedServices} tree backed by the framework's
@@ -1 +1 @@
1
- {"version":3,"file":"make-test-services.d.ts","sourceRoot":"","sources":["../../src/testing/make-test-services.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"make-test-services.d.ts","sourceRoot":"","sources":["../../src/testing/make-test-services.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,8 @@
7
7
  * SPDX-License-Identifier: MIT
8
8
  ********************************************************************************/
9
9
  import { DefaultTracer, NoopLogger, SystemClock } from '@hydranium/protocol';
10
+ import { ServerLocale } from '../locale/server-locale.js';
11
+ import { ServerMessageRenderer } from '../messages/renderer.js';
10
12
  import { TransferEncoder } from '../langium/transfer/transfer-encoder.js';
11
13
  import { DefaultDocumentUriPolicy } from '../langium/workspace/document-uri-policy.js';
12
14
  import { HydraniumWorkspaceLock } from '../langium/workspace/hydranium-workspace-lock.js';
@@ -88,9 +90,21 @@ export function makeTestServices(options = {}) {
88
90
  ...(indexManager ? { IndexManager: indexManager } : {}),
89
91
  WorkspaceLock: new HydraniumWorkspaceLock()
90
92
  },
91
- model: {}
93
+ model: {},
94
+ ServerLocale: {},
95
+ MessageRenderer: {}
92
96
  };
93
97
  const sharedServices = services;
98
+ // Patched in after the literal, like `model` below: both read the tree they
99
+ // belong to, and the renderer reads the locale service.
100
+ const mutableMessages = services;
101
+ const serverLocale = new ServerLocale(sharedServices);
102
+ if (options.locale) {
103
+ serverLocale.accept(options.locale);
104
+ }
105
+ mutableMessages.ServerLocale = serverLocale;
106
+ const messageRenderer = options.messageRenderer?.(sharedServices) ?? new ServerMessageRenderer(sharedServices);
107
+ mutableMessages.MessageRenderer = messageRenderer;
94
108
  const serialize = options.serialize ?? ((_uri, root) => JSON.stringify(root));
95
109
  const transferEncoder = options.transferEncoder
96
110
  ? options.transferEncoder(sharedServices)
@@ -117,6 +131,8 @@ export function makeTestServices(options = {}) {
117
131
  transferEncoder,
118
132
  logger,
119
133
  clock,
134
+ serverLocale,
135
+ messageRenderer,
120
136
  dispose: () => {
121
137
  // No-op: the bundled stubs hold only in-memory state (maps, arrays),
122
138
  // released with the bundle when it goes out of scope. The hook exists
@@ -1 +1 @@
1
- {"version":3,"file":"make-test-services.js","sourceRoot":"","sources":["../../src/testing/make-test-services.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"make-test-services.js","sourceRoot":"","sources":["../../src/testing/make-test-services.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hydranium/core",
3
- "version": "1.0.0-next.31",
3
+ "version": "1.0.0-next.33",
4
4
  "description": "Foundational runtime of the hydranium framework: AST coordination layer (services, integrity, AST extension, serialization, multi-client documents) plus the LSP textual head at the /lsp subpath. Consumed by protocol-head packages (@hydranium/data-server, @hydranium/glsp-server).",
5
5
  "keywords": [
6
6
  "hydranium",
@@ -104,8 +104,8 @@
104
104
  "diff": "^5.2.0"
105
105
  },
106
106
  "devDependencies": {
107
- "@hydranium/langium": "1.0.0-next.31",
108
- "@hydranium/protocol": "1.0.0-next.31",
107
+ "@hydranium/langium": "1.0.0-next.33",
108
+ "@hydranium/protocol": "1.0.0-next.33",
109
109
  "@playwright/test": "^1.40.0",
110
110
  "@types/diff": "^5.2.0",
111
111
  "rimraf": "^5.0.0",
@@ -117,8 +117,8 @@
117
117
  "vscode-languageserver-types": "^3.17.5"
118
118
  },
119
119
  "peerDependencies": {
120
- "@hydranium/langium": "1.0.0-next.31",
121
- "@hydranium/protocol": "1.0.0-next.31",
120
+ "@hydranium/langium": "1.0.0-next.33",
121
+ "@hydranium/protocol": "1.0.0-next.33",
122
122
  "@playwright/test": "^1.40.0",
123
123
  "vscode-jsonrpc": "9.0.1",
124
124
  "vscode-languageserver": "~10.0.1",
@@ -985,9 +985,20 @@ export class HydraniumTextDocuments<T extends TextDocument = TextDocument> exten
985
985
  // it is exactly what the caller retries with after a rejection, so
986
986
  // gating it there would refuse the recovery too.
987
987
  const version = isFullReplace(edits) ? UNKNOWN_CLIENT_VERSION : this.languageClientVersion(uri);
988
+ // A full `ApplyWorkspaceEditParams`, `edit` and all — NOT a bare
989
+ // `WorkspaceEdit` with a `label` beside it. `applyEdit` takes
990
+ // `ApplyWorkspaceEditParams | WorkspaceEdit` and discriminates on
991
+ // `!!value.edit`, so `{ label, documentChanges }` is wrapped as
992
+ // `{ edit: { label, documentChanges } }` — putting the label inside
993
+ // the edit, where LSP defines no such field and no client reads it.
994
+ // The union is also what hides it at compile time: excess-property
995
+ // checking admits a property present in EITHER member, so an object
996
+ // matching neither type-checks against the union.
988
997
  const result = await connection.workspace.applyEdit({
989
998
  label: options?.label,
990
- documentChanges: [TextDocumentEdit.create(OptionalVersionedTextDocumentIdentifier.create(targetUri, version), edits)]
999
+ edit: {
1000
+ documentChanges: [TextDocumentEdit.create(OptionalVersionedTextDocumentIdentifier.create(targetUri, version), edits)]
1001
+ }
991
1002
  });
992
1003
  if (result && result.applied === false) {
993
1004
  this.__shadow.invalidate(targetUri);
package/src/index.ts CHANGED
@@ -35,5 +35,6 @@ export * from './langium/workspace/index.js';
35
35
  export * from './langium/service-registry.js';
36
36
  export * from './langium/language-types.js';
37
37
  export * from './launcher/index.js';
38
+ export * from './locale/index.js';
38
39
  export * from './documents/index.js';
39
40
  export * from './util/index.js';
@@ -73,7 +73,14 @@ const EXPECTED_SHARED_SLOTS: readonly ExpectedSlot[] = [
73
73
  side: 'shared',
74
74
  path: 'workspace.BuildPipelineIntegration',
75
75
  get: services => nested(services, 'workspace', 'BuildPipelineIntegration')
76
- }
76
+ },
77
+ // Unbound, this fails where the cause is least visible: the render pass runs
78
+ // inside the `Validated` phase, so a `TypeError` there propagates out of
79
+ // `notifyDocumentPhase` and the document reaches `Validated` with Langium's
80
+ // publisher never invoked — the client receives no diagnostics for the file
81
+ // and the stack names the document builder.
82
+ { side: 'shared', path: 'MessageRenderer', get: services => nested(services, 'MessageRenderer') },
83
+ { side: 'shared', path: 'ServerLocale', get: services => nested(services, 'ServerLocale') }
77
84
  ];
78
85
 
79
86
  /**