@likec4/language-server 1.42.1 → 1.44.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 (303) hide show
  1. package/browser/package.json +1 -1
  2. package/browser-worker/package.json +1 -1
  3. package/dist/LikeC4LanguageServices.d.ts +12 -19
  4. package/dist/LikeC4LanguageServices.js +182 -0
  5. package/dist/Rpc.js +245 -0
  6. package/dist/ast.d.ts +10 -6
  7. package/dist/ast.js +253 -0
  8. package/dist/browser-worker.js +4 -0
  9. package/dist/browser.js +35 -0
  10. package/dist/bundled.js +42 -0
  11. package/dist/bundled.mjs +3830 -4172
  12. package/dist/documentation/documentation-provider.js +51 -0
  13. package/dist/documentation/index.js +1 -0
  14. package/dist/empty.js +2 -0
  15. package/dist/filesystem/ChokidarWatcher.js +97 -0
  16. package/dist/filesystem/FileSystemWatcher.js +14 -0
  17. package/dist/filesystem/LikeC4FileSystem.d.ts +1 -2
  18. package/dist/filesystem/LikeC4FileSystem.js +126 -0
  19. package/dist/filesystem/index.d.ts +26 -0
  20. package/dist/filesystem/index.js +29 -0
  21. package/dist/formatting/LikeC4Formatter.js +637 -0
  22. package/dist/formatting/utils.js +18 -0
  23. package/dist/generated/ast.d.ts +19 -3
  24. package/dist/generated/ast.js +2155 -0
  25. package/dist/generated/grammar.js +7 -0
  26. package/dist/generated/module.d.ts +6 -1
  27. package/dist/generated/module.js +27 -0
  28. package/dist/generated-lib/{icons.mjs → icons.js} +11 -7
  29. package/dist/index.d.ts +7 -0
  30. package/dist/index.js +53 -0
  31. package/dist/{likec4lib.mjs → likec4lib.js} +3 -3
  32. package/dist/logger.js +81 -0
  33. package/dist/lsp/CodeActionProvider.d.ts +14 -0
  34. package/dist/lsp/CodeActionProvider.js +33 -0
  35. package/dist/lsp/CodeLensProvider.js +44 -0
  36. package/dist/lsp/CompletionProvider.d.ts +3 -1
  37. package/dist/lsp/CompletionProvider.js +200 -0
  38. package/dist/lsp/DocumentHighlightProvider.js +10 -0
  39. package/dist/lsp/DocumentLinkProvider.js +58 -0
  40. package/dist/lsp/DocumentSymbolProvider.js +306 -0
  41. package/dist/lsp/HoverProvider.js +106 -0
  42. package/dist/lsp/RenameProvider.js +6 -0
  43. package/dist/lsp/SemanticTokenProvider.d.ts +5 -0
  44. package/dist/lsp/SemanticTokenProvider.js +257 -0
  45. package/dist/lsp/index.d.ts +1 -0
  46. package/dist/lsp/index.js +9 -0
  47. package/dist/mcp/MCPServerFactory.js +73 -0
  48. package/dist/mcp/NoopLikeC4MCPServer.js +17 -0
  49. package/dist/mcp/interfaces.js +5 -0
  50. package/dist/mcp/server/StdioLikeC4MCPServer.js +47 -0
  51. package/dist/mcp/server/StreamableLikeC4MCPServer.js +145 -0
  52. package/dist/mcp/server/WithMCPServer.js +56 -0
  53. package/dist/mcp/tools/_common.d.ts +8 -7
  54. package/dist/mcp/tools/_common.js +49 -0
  55. package/dist/mcp/tools/find-relationships.d.ts +7 -8
  56. package/dist/mcp/tools/find-relationships.js +150 -0
  57. package/dist/mcp/tools/list-projects.d.ts +3 -3
  58. package/dist/mcp/tools/list-projects.js +62 -0
  59. package/dist/mcp/tools/open-view.d.ts +6 -7
  60. package/dist/mcp/tools/open-view.js +52 -0
  61. package/dist/mcp/tools/read-deployment.d.ts +6 -7
  62. package/dist/mcp/tools/read-deployment.js +132 -0
  63. package/dist/mcp/tools/read-element.d.ts +6 -7
  64. package/dist/mcp/tools/read-element.js +194 -0
  65. package/dist/mcp/tools/read-project-summary.d.ts +5 -6
  66. package/dist/mcp/tools/read-project-summary.js +176 -0
  67. package/dist/mcp/tools/read-view.d.ts +6 -7
  68. package/dist/mcp/tools/read-view.js +203 -0
  69. package/dist/mcp/tools/search-element.d.ts +3 -3
  70. package/dist/mcp/tools/search-element.js +177 -0
  71. package/dist/mcp/utils.d.ts +2 -2
  72. package/dist/mcp/utils.js +48 -0
  73. package/dist/model/builder/MergedExtends.d.ts +2 -1
  74. package/dist/model/builder/MergedExtends.js +74 -0
  75. package/dist/model/builder/MergedSpecification.js +175 -0
  76. package/dist/model/builder/buildModel.js +176 -0
  77. package/dist/model/deployments-index.js +102 -0
  78. package/dist/model/fqn-index.js +250 -0
  79. package/dist/model/index.js +6 -0
  80. package/dist/model/model-builder.d.ts +13 -11
  81. package/dist/model/model-builder.js +234 -0
  82. package/dist/model/model-locator.d.ts +6 -5
  83. package/dist/model/model-locator.js +240 -0
  84. package/dist/model/model-parser-where.js +81 -0
  85. package/dist/model/model-parser.d.ts +318 -313
  86. package/dist/model/model-parser.js +119 -0
  87. package/dist/model/parser/Base.d.ts +3 -3
  88. package/dist/model/parser/Base.js +367 -0
  89. package/dist/model/parser/DeploymentModelParser.d.ts +3 -3
  90. package/dist/model/parser/DeploymentModelParser.js +176 -0
  91. package/dist/model/parser/DeploymentViewParser.d.ts +4 -4
  92. package/dist/model/parser/DeploymentViewParser.js +86 -0
  93. package/dist/model/parser/FqnRefParser.d.ts +3 -3
  94. package/dist/model/parser/FqnRefParser.js +382 -0
  95. package/dist/model/parser/GlobalsParser.d.ts +7 -7
  96. package/dist/model/parser/GlobalsParser.js +84 -0
  97. package/dist/model/parser/ImportsParser.d.ts +12 -13
  98. package/dist/model/parser/ImportsParser.js +24 -0
  99. package/dist/model/parser/ModelParser.d.ts +3 -3
  100. package/dist/model/parser/ModelParser.js +165 -0
  101. package/dist/model/parser/PredicatesParser.d.ts +3 -3
  102. package/dist/model/parser/PredicatesParser.js +45 -0
  103. package/dist/model/parser/SpecificationParser.d.ts +3 -3
  104. package/dist/model/parser/SpecificationParser.js +109 -0
  105. package/dist/model/parser/ValueConverter.js +12 -0
  106. package/dist/model/parser/ViewsParser.d.ts +4 -4
  107. package/dist/model/parser/ViewsParser.js +477 -0
  108. package/dist/model-change/ModelChanges.d.ts +6 -3
  109. package/dist/model-change/ModelChanges.js +102 -0
  110. package/dist/model-change/changeElementStyle.js +134 -0
  111. package/dist/model-change/changeViewLayout.d.ts +2 -2
  112. package/dist/model-change/changeViewLayout.js +28 -0
  113. package/dist/model-change/removeManualLayoutV1.d.ts +7 -0
  114. package/dist/model-change/removeManualLayoutV1.js +27 -0
  115. package/dist/module.d.ts +10 -5
  116. package/dist/module.js +143 -0
  117. package/dist/protocol.d.ts +1 -17
  118. package/dist/protocol.js +114 -0
  119. package/dist/references/index.js +3 -0
  120. package/dist/references/name-provider.js +37 -0
  121. package/dist/references/scope-computation.js +288 -0
  122. package/dist/references/scope-provider.d.ts +3 -3
  123. package/dist/references/scope-provider.js +242 -0
  124. package/dist/shared/NodeKindProvider.js +57 -0
  125. package/dist/shared/{WorkspaceSymbolProvider.mjs → WorkspaceSymbolProvider.js} +1 -1
  126. package/dist/shared/index.js +2 -0
  127. package/dist/test/index.js +1 -0
  128. package/dist/test/testServices.d.ts +16 -16
  129. package/dist/test/testServices.js +210 -0
  130. package/dist/utils/disposable.js +26 -0
  131. package/dist/utils/elementRef.d.ts +1 -1
  132. package/dist/utils/elementRef.js +27 -0
  133. package/dist/utils/fqnRef.js +63 -0
  134. package/dist/utils/index.js +35 -0
  135. package/dist/utils/printDocs.js +1 -0
  136. package/dist/utils/projectId.js +16 -0
  137. package/dist/utils/stringHash.js +5 -0
  138. package/dist/validation/DocumentValidator.js +17 -0
  139. package/dist/validation/_shared.js +26 -0
  140. package/dist/validation/deployment-checks.js +140 -0
  141. package/dist/validation/dynamic-view.js +67 -0
  142. package/dist/validation/element-ref.js +12 -0
  143. package/dist/validation/element.js +49 -0
  144. package/dist/validation/imports.js +46 -0
  145. package/dist/validation/index.d.ts +1 -1
  146. package/dist/validation/index.js +157 -0
  147. package/dist/validation/property-checks.js +108 -0
  148. package/dist/validation/relation.js +55 -0
  149. package/dist/validation/specification.js +190 -0
  150. package/dist/validation/view-predicates/fqn-expr-with.js +43 -0
  151. package/dist/validation/view-predicates/fqn-ref-expr.js +51 -0
  152. package/dist/validation/view-predicates/incoming.js +16 -0
  153. package/dist/validation/view-predicates/index.js +6 -0
  154. package/dist/validation/view-predicates/outgoing.js +20 -0
  155. package/dist/validation/view-predicates/relation-expr.js +46 -0
  156. package/dist/validation/view-predicates/relation-with.js +16 -0
  157. package/dist/validation/view.d.ts +1 -1
  158. package/dist/validation/view.js +42 -0
  159. package/dist/view-utils/assignNavigateTo.js +27 -0
  160. package/dist/view-utils/index.d.ts +1 -0
  161. package/dist/view-utils/index.js +2 -0
  162. package/dist/view-utils/manual-layout.d.ts +6 -0
  163. package/dist/view-utils/manual-layout.js +151 -0
  164. package/dist/views/ConfigurableLayouter.js +51 -0
  165. package/dist/views/LikeC4ManualLayouts.d.ts +28 -0
  166. package/dist/views/LikeC4ManualLayouts.js +132 -0
  167. package/dist/views/{likec4-views.d.ts → LikeC4Views.d.ts} +9 -8
  168. package/dist/views/LikeC4Views.js +200 -0
  169. package/dist/views/index.d.ts +4 -1
  170. package/dist/views/index.js +11 -0
  171. package/dist/workspace/AstNodeDescriptionProvider.js +15 -0
  172. package/dist/workspace/IndexManager.js +21 -0
  173. package/dist/workspace/LangiumDocuments.d.ts +1 -1
  174. package/dist/workspace/LangiumDocuments.js +58 -0
  175. package/dist/workspace/ProjectsManager.d.ts +8 -3
  176. package/dist/workspace/ProjectsManager.js +373 -0
  177. package/dist/workspace/WorkspaceManager.d.ts +3 -2
  178. package/dist/workspace/WorkspaceManager.js +93 -0
  179. package/dist/workspace/index.js +5 -0
  180. package/likec4lib/package.json +1 -1
  181. package/package.json +32 -31
  182. package/protocol/package.json +1 -1
  183. package/dist/LikeC4LanguageServices.mjs +0 -197
  184. package/dist/Rpc.mjs +0 -296
  185. package/dist/ast.mjs +0 -221
  186. package/dist/browser-worker.mjs +0 -2
  187. package/dist/browser.mjs +0 -32
  188. package/dist/documentation/documentation-provider.mjs +0 -48
  189. package/dist/documentation/index.mjs +0 -1
  190. package/dist/empty.mjs +0 -1
  191. package/dist/filesystem/ChokidarWatcher.mjs +0 -68
  192. package/dist/filesystem/FileSystemWatcher.mjs +0 -11
  193. package/dist/filesystem/LikeC4FileSystem.mjs +0 -64
  194. package/dist/filesystem/index.mjs +0 -19
  195. package/dist/formatting/LikeC4Formatter.mjs +0 -511
  196. package/dist/formatting/utils.mjs +0 -15
  197. package/dist/generated/ast.mjs +0 -2118
  198. package/dist/generated/grammar.mjs +0 -3
  199. package/dist/generated/module.mjs +0 -23
  200. package/dist/index.mjs +0 -50
  201. package/dist/logger.mjs +0 -82
  202. package/dist/lsp/CodeLensProvider.mjs +0 -42
  203. package/dist/lsp/CompletionProvider.mjs +0 -208
  204. package/dist/lsp/DocumentHighlightProvider.mjs +0 -10
  205. package/dist/lsp/DocumentLinkProvider.mjs +0 -53
  206. package/dist/lsp/DocumentSymbolProvider.mjs +0 -287
  207. package/dist/lsp/HoverProvider.mjs +0 -104
  208. package/dist/lsp/RenameProvider.mjs +0 -6
  209. package/dist/lsp/SemanticTokenProvider.mjs +0 -350
  210. package/dist/lsp/index.mjs +0 -7
  211. package/dist/mcp/MCPServerFactory.mjs +0 -70
  212. package/dist/mcp/NoopLikeC4MCPServer.mjs +0 -17
  213. package/dist/mcp/interfaces.mjs +0 -4
  214. package/dist/mcp/server/StdioLikeC4MCPServer.mjs +0 -46
  215. package/dist/mcp/server/StreamableLikeC4MCPServer.mjs +0 -153
  216. package/dist/mcp/server/WithMCPServer.mjs +0 -58
  217. package/dist/mcp/tools/_common.mjs +0 -42
  218. package/dist/mcp/tools/find-relationships.mjs +0 -151
  219. package/dist/mcp/tools/list-projects.mjs +0 -62
  220. package/dist/mcp/tools/open-view.mjs +0 -52
  221. package/dist/mcp/tools/read-deployment.mjs +0 -130
  222. package/dist/mcp/tools/read-element.mjs +0 -198
  223. package/dist/mcp/tools/read-project-summary.mjs +0 -178
  224. package/dist/mcp/tools/read-view.mjs +0 -205
  225. package/dist/mcp/tools/search-element.mjs +0 -171
  226. package/dist/mcp/utils.mjs +0 -47
  227. package/dist/model/builder/MergedExtends.mjs +0 -67
  228. package/dist/model/builder/MergedSpecification.mjs +0 -205
  229. package/dist/model/builder/assignTagColors.d.ts +0 -7
  230. package/dist/model/builder/assignTagColors.mjs +0 -51
  231. package/dist/model/builder/buildModel.mjs +0 -226
  232. package/dist/model/deployments-index.mjs +0 -100
  233. package/dist/model/fqn-index.mjs +0 -243
  234. package/dist/model/index.mjs +0 -6
  235. package/dist/model/model-builder.mjs +0 -285
  236. package/dist/model/model-locator.mjs +0 -239
  237. package/dist/model/model-parser-where.mjs +0 -81
  238. package/dist/model/model-parser.mjs +0 -127
  239. package/dist/model/parser/Base.mjs +0 -342
  240. package/dist/model/parser/DeploymentModelParser.mjs +0 -212
  241. package/dist/model/parser/DeploymentViewParser.mjs +0 -95
  242. package/dist/model/parser/FqnRefParser.mjs +0 -398
  243. package/dist/model/parser/GlobalsParser.mjs +0 -82
  244. package/dist/model/parser/ImportsParser.mjs +0 -28
  245. package/dist/model/parser/ModelParser.mjs +0 -190
  246. package/dist/model/parser/PredicatesParser.mjs +0 -45
  247. package/dist/model/parser/SpecificationParser.mjs +0 -120
  248. package/dist/model/parser/ValueConverter.mjs +0 -12
  249. package/dist/model/parser/ViewsParser.mjs +0 -490
  250. package/dist/model-change/ModelChanges.mjs +0 -89
  251. package/dist/model-change/changeElementStyle.mjs +0 -143
  252. package/dist/model-change/changeViewLayout.mjs +0 -32
  253. package/dist/model-change/saveManualLayout.d.ts +0 -11
  254. package/dist/model-change/saveManualLayout.mjs +0 -27
  255. package/dist/module.mjs +0 -180
  256. package/dist/protocol.mjs +0 -65
  257. package/dist/references/index.mjs +0 -3
  258. package/dist/references/name-provider.mjs +0 -39
  259. package/dist/references/scope-computation.mjs +0 -312
  260. package/dist/references/scope-provider.mjs +0 -239
  261. package/dist/shared/NodeKindProvider.mjs +0 -110
  262. package/dist/shared/index.mjs +0 -2
  263. package/dist/test/index.mjs +0 -1
  264. package/dist/test/testServices.mjs +0 -200
  265. package/dist/utils/disposable.mjs +0 -25
  266. package/dist/utils/elementRef.mjs +0 -20
  267. package/dist/utils/fqnRef.mjs +0 -57
  268. package/dist/utils/index.mjs +0 -33
  269. package/dist/utils/printDocs.mjs +0 -1
  270. package/dist/utils/projectId.mjs +0 -16
  271. package/dist/utils/stringHash.mjs +0 -5
  272. package/dist/validation/DocumentValidator.mjs +0 -16
  273. package/dist/validation/_shared.mjs +0 -25
  274. package/dist/validation/deployment-checks.mjs +0 -146
  275. package/dist/validation/dynamic-view.mjs +0 -67
  276. package/dist/validation/element-ref.mjs +0 -12
  277. package/dist/validation/element.mjs +0 -50
  278. package/dist/validation/imports.mjs +0 -25
  279. package/dist/validation/index.mjs +0 -180
  280. package/dist/validation/property-checks.mjs +0 -107
  281. package/dist/validation/relation.mjs +0 -53
  282. package/dist/validation/specification.mjs +0 -173
  283. package/dist/validation/view-predicates/fqn-expr-with.mjs +0 -43
  284. package/dist/validation/view-predicates/fqn-ref-expr.mjs +0 -53
  285. package/dist/validation/view-predicates/incoming.mjs +0 -16
  286. package/dist/validation/view-predicates/index.mjs +0 -6
  287. package/dist/validation/view-predicates/outgoing.mjs +0 -20
  288. package/dist/validation/view-predicates/relation-expr.mjs +0 -39
  289. package/dist/validation/view-predicates/relation-with.mjs +0 -16
  290. package/dist/validation/view.mjs +0 -25
  291. package/dist/view-utils/assignNavigateTo.mjs +0 -25
  292. package/dist/view-utils/index.mjs +0 -1
  293. package/dist/view-utils/manual-layout.mjs +0 -99
  294. package/dist/views/configurable-layouter.mjs +0 -51
  295. package/dist/views/index.mjs +0 -1
  296. package/dist/views/likec4-views.mjs +0 -166
  297. package/dist/workspace/AstNodeDescriptionProvider.mjs +0 -17
  298. package/dist/workspace/IndexManager.mjs +0 -17
  299. package/dist/workspace/LangiumDocuments.mjs +0 -53
  300. package/dist/workspace/ProjectsManager.mjs +0 -360
  301. package/dist/workspace/WorkspaceManager.mjs +0 -83
  302. package/dist/workspace/index.mjs +0 -5
  303. /package/dist/views/{configurable-layouter.d.ts → ConfigurableLayouter.d.ts} +0 -0
@@ -0,0 +1,102 @@
1
+ import { ancestorsFqn, Fqn } from '@likec4/core';
2
+ import { MultiMap } from '@likec4/core/utils';
3
+ import { isDefined, isTruthy } from 'remeda';
4
+ import { ast, ElementOps, } from '../ast';
5
+ import { logWarnError } from '../logger';
6
+ import { readStrictFqn } from '../utils/elementRef';
7
+ import { DocumentFqnIndex, FqnIndex } from './fqn-index';
8
+ export class DeploymentsIndex extends FqnIndex {
9
+ services;
10
+ Names;
11
+ constructor(services) {
12
+ super(services, 'deployments-index');
13
+ this.services = services;
14
+ this.Names = services.references.NameProvider;
15
+ }
16
+ createDocumentIndex(document) {
17
+ const rootNodes = document.parseResult.value.deployments.flatMap(m => m.elements);
18
+ if (rootNodes.length === 0) {
19
+ return DocumentFqnIndex.EMPTY;
20
+ }
21
+ const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
22
+ const root = new Array();
23
+ const children = new MultiMap();
24
+ const descendants = new MultiMap();
25
+ const byfqn = new MultiMap();
26
+ const Names = this.Names;
27
+ const Descriptions = this.services.workspace.AstNodeDescriptionProvider;
28
+ const createAndSaveDescription = (node, name, fqn) => {
29
+ const desc = {
30
+ ...Descriptions.createDescription(node, name, document),
31
+ id: fqn,
32
+ likec4ProjectId: projectId,
33
+ };
34
+ ElementOps.writeId(node, fqn);
35
+ byfqn.set(fqn, desc);
36
+ return desc;
37
+ };
38
+ const traverseNode = (node, parentFqn) => {
39
+ let thisFqn;
40
+ if (ast.isExtendDeployment(node)) {
41
+ thisFqn = readStrictFqn(node.deploymentNode);
42
+ }
43
+ else {
44
+ const name = Names.getName(node);
45
+ if (!isTruthy(name)) {
46
+ return [];
47
+ }
48
+ thisFqn = Fqn(name, parentFqn);
49
+ const desc = createAndSaveDescription(node, name, thisFqn);
50
+ if (!parentFqn) {
51
+ root.push(desc);
52
+ }
53
+ else {
54
+ children.set(parentFqn, desc);
55
+ }
56
+ if (ast.isDeployedInstance(node)) {
57
+ return [];
58
+ }
59
+ }
60
+ let _nested = [];
61
+ if (isDefined(node.body)) {
62
+ for (const child of node.body.elements) {
63
+ if (!ast.isDeploymentRelation(child)) {
64
+ try {
65
+ _nested.push(...traverseNode(child, thisFqn));
66
+ }
67
+ catch (e) {
68
+ logWarnError(e);
69
+ }
70
+ }
71
+ }
72
+ }
73
+ _nested = [
74
+ ...children.get(thisFqn) ?? [],
75
+ ..._nested,
76
+ ];
77
+ for (const child of _nested) {
78
+ descendants.set(thisFqn, child);
79
+ }
80
+ if (ast.isExtendDeployment(node)) {
81
+ for (const ancestor of ancestorsFqn(thisFqn)) {
82
+ for (const child of _nested) {
83
+ descendants.set(ancestor, child);
84
+ }
85
+ }
86
+ }
87
+ return descendants.get(thisFqn) ?? [];
88
+ };
89
+ for (const node of rootNodes) {
90
+ try {
91
+ if (ast.isDeploymentRelation(node)) {
92
+ continue;
93
+ }
94
+ traverseNode(node, null);
95
+ }
96
+ catch (e) {
97
+ logWarnError(e);
98
+ }
99
+ }
100
+ return new DocumentFqnIndex(root, children, descendants, byfqn, projectId);
101
+ }
102
+ }
@@ -0,0 +1,250 @@
1
+ import { invariant, nonNullable } from '@likec4/core';
2
+ import { Fqn } from '@likec4/core/types';
3
+ import { ancestorsFqn, compareNatural, DefaultWeakMap, MultiMap, sortNaturalByFqn } from '@likec4/core/utils';
4
+ import { AstUtils, DocumentState, stream, WorkspaceCache, } from 'langium';
5
+ import { isDefined, isEmpty, isTruthy } from 'remeda';
6
+ import { ast, ElementOps, isLikeC4LangiumDocument, } from '../ast';
7
+ import { logWarnError } from '../logger';
8
+ import { ADisposable } from '../utils';
9
+ import { readStrictFqn } from '../utils/elementRef';
10
+ import { ProjectsManager } from '../workspace';
11
+ export class FqnIndex extends ADisposable {
12
+ services;
13
+ cachePrefix;
14
+ projects;
15
+ langiumDocuments;
16
+ documentCache;
17
+ workspaceCache;
18
+ constructor(services, cachePrefix = 'fqn-index') {
19
+ super();
20
+ this.services = services;
21
+ this.cachePrefix = cachePrefix;
22
+ this.langiumDocuments = services.shared.workspace.LangiumDocuments;
23
+ this.projects = services.shared.workspace.ProjectsManager;
24
+ this.documentCache = new DefaultWeakMap(doc => this.createDocumentIndex(doc));
25
+ this.workspaceCache = new WorkspaceCache(services.shared, DocumentState.IndexedContent);
26
+ this.onDispose(services.shared.workspace.DocumentBuilder.onDocumentPhase(DocumentState.IndexedContent, (doc) => {
27
+ if (isLikeC4LangiumDocument(doc)) {
28
+ this.documentCache.set(doc, this.createDocumentIndex(doc));
29
+ }
30
+ }));
31
+ }
32
+ documents(projectId) {
33
+ return this.langiumDocuments.projectDocuments(projectId).filter((d) => isLikeC4LangiumDocument(d)
34
+ && d.state >= DocumentState.IndexedContent);
35
+ }
36
+ get(document) {
37
+ if (document.state < DocumentState.IndexedContent) {
38
+ logWarnError(`Document ${document.uri.path} is not indexed`);
39
+ }
40
+ return this.documentCache.get(document);
41
+ }
42
+ resolve(reference) {
43
+ if (reference.$type === 'Imported') {
44
+ return this.getFqn(reference.imported.ref);
45
+ }
46
+ if (reference.$type === 'Element') {
47
+ return this.getFqn(reference);
48
+ }
49
+ return this.services.likec4.DeploymentsIndex.getFqn(reference);
50
+ }
51
+ getFqn(el) {
52
+ invariant(ast.isElement(el) || ast.isDeploymentElement(el));
53
+ let id = ElementOps.readId(el);
54
+ if (isTruthy(id)) {
55
+ return id;
56
+ }
57
+ // Document index is not yet created
58
+ const doc = AstUtils.getDocument(el);
59
+ invariant(isLikeC4LangiumDocument(doc));
60
+ logWarnError(`Document ${doc.uri.path} is not indexed, but getFqn was called`);
61
+ // This will create the document index
62
+ this.get(doc);
63
+ return nonNullable(ElementOps.readId(el), 'Element fqn must be set, invalid state');
64
+ }
65
+ byFqn(projectId, fqn) {
66
+ return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:fqn:${fqn}`, () => {
67
+ return this
68
+ .documents(projectId)
69
+ .toArray()
70
+ .flatMap(doc => {
71
+ return this.get(doc).byFqn(fqn);
72
+ });
73
+ }));
74
+ }
75
+ rootElements(projectId) {
76
+ return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:rootElements`, () => {
77
+ const allchildren = this.documents(projectId)
78
+ .reduce((map, doc) => {
79
+ this.get(doc).rootElements().forEach(desc => {
80
+ map.set(desc.name, desc);
81
+ });
82
+ return map;
83
+ }, new MultiMap());
84
+ return uniqueByName(allchildren);
85
+ }));
86
+ }
87
+ directChildrenOf(projectId, parent) {
88
+ return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:directChildrenOf:${parent}`, () => {
89
+ const allchildren = this.documents(projectId)
90
+ .reduce((map, doc) => {
91
+ this.get(doc).children(parent).forEach(desc => {
92
+ map.set(desc.name, desc);
93
+ });
94
+ return map;
95
+ }, new MultiMap());
96
+ return uniqueByName(allchildren);
97
+ }));
98
+ }
99
+ /**
100
+ * Returns descedant elements with unique names in the scope
101
+ */
102
+ uniqueDescedants(projectId, parent) {
103
+ return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:uniqueDescedants:${parent}`, () => {
104
+ const { children, descendants } = this.documents(projectId)
105
+ .reduce((map, doc) => {
106
+ const docIndex = this.get(doc);
107
+ docIndex.children(parent).forEach(desc => {
108
+ map.children.set(desc.name, desc);
109
+ });
110
+ docIndex.descendants(parent).forEach(desc => {
111
+ map.descendants.set(desc.name, desc);
112
+ });
113
+ return map;
114
+ }, {
115
+ children: new MultiMap(),
116
+ descendants: new MultiMap(),
117
+ });
118
+ const uniqueChildren = uniqueByName(children);
119
+ const uniqueDescendants = [...descendants.associations()]
120
+ .flatMap(([_name, descs]) => descs.length === 1 && !children.has(_name) ? descs : []);
121
+ return [
122
+ ...uniqueChildren,
123
+ ...sortNaturalByFqn(uniqueDescendants),
124
+ ];
125
+ }));
126
+ }
127
+ createDocumentIndex(document) {
128
+ const rootElements = document.parseResult.value.models.flatMap(m => m.elements);
129
+ if (rootElements.length === 0) {
130
+ return DocumentFqnIndex.EMPTY;
131
+ }
132
+ const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
133
+ const root = new Array();
134
+ const children = new MultiMap();
135
+ const descendants = new MultiMap();
136
+ const byfqn = new MultiMap();
137
+ const Descriptions = this.services.workspace.AstNodeDescriptionProvider;
138
+ const createAndSaveDescription = (node, name, fqn) => {
139
+ const desc = {
140
+ ...Descriptions.createDescription(node, name, document),
141
+ id: fqn,
142
+ likec4ProjectId: projectId,
143
+ };
144
+ ElementOps.writeId(node, fqn);
145
+ byfqn.set(fqn, desc);
146
+ return desc;
147
+ };
148
+ const traverseNode = (el, parentFqn) => {
149
+ let thisFqn;
150
+ if (ast.isElement(el)) {
151
+ thisFqn = Fqn(el.name, parentFqn);
152
+ const desc = createAndSaveDescription(el, el.name, thisFqn);
153
+ if (!parentFqn) {
154
+ root.push(desc);
155
+ }
156
+ else {
157
+ children.set(parentFqn, desc);
158
+ }
159
+ }
160
+ else {
161
+ thisFqn = readStrictFqn(el.element);
162
+ }
163
+ let _nested = [];
164
+ if (isDefined(el.body) && !isEmpty(el.body.elements)) {
165
+ for (const child of el.body.elements) {
166
+ if (!ast.isRelation(child)) {
167
+ try {
168
+ _nested.push(...traverseNode(child, thisFqn));
169
+ }
170
+ catch (e) {
171
+ logWarnError(e);
172
+ }
173
+ }
174
+ }
175
+ }
176
+ const directChildren = children.get(thisFqn) ?? [];
177
+ _nested = [
178
+ ...directChildren,
179
+ ..._nested,
180
+ ];
181
+ for (const child of _nested) {
182
+ descendants.set(thisFqn, child);
183
+ }
184
+ if (ast.isExtendElement(el)) {
185
+ for (const ancestor of ancestorsFqn(thisFqn)) {
186
+ for (const child of _nested) {
187
+ descendants.set(ancestor, child);
188
+ }
189
+ }
190
+ }
191
+ return descendants.get(thisFqn) ?? [];
192
+ };
193
+ for (const node of rootElements) {
194
+ try {
195
+ if (ast.isRelation(node)) {
196
+ continue;
197
+ }
198
+ traverseNode(node, null);
199
+ }
200
+ catch (e) {
201
+ logWarnError(e);
202
+ }
203
+ }
204
+ return new DocumentFqnIndex(root, children, descendants, byfqn, projectId);
205
+ }
206
+ }
207
+ function uniqueByName(multimap) {
208
+ return [...multimap.associations()]
209
+ .flatMap(([_name, descs]) => (descs.length === 1 ? descs : []))
210
+ .sort((a, b) => compareNatural(a.name, b.name));
211
+ }
212
+ export class DocumentFqnIndex {
213
+ _rootElements;
214
+ _children;
215
+ _descendants;
216
+ _byfqn;
217
+ projectId;
218
+ static EMPTY = new DocumentFqnIndex([], new MultiMap(), new MultiMap(), new MultiMap(), ProjectsManager.DefaultProjectId);
219
+ constructor(_rootElements,
220
+ /**
221
+ * direct children of elements
222
+ */
223
+ _children,
224
+ /**
225
+ * All descendants of an element (unique by name)
226
+ */
227
+ _descendants,
228
+ /**
229
+ * All elements by FQN
230
+ */
231
+ _byfqn, projectId) {
232
+ this._rootElements = _rootElements;
233
+ this._children = _children;
234
+ this._descendants = _descendants;
235
+ this._byfqn = _byfqn;
236
+ this.projectId = projectId;
237
+ }
238
+ rootElements() {
239
+ return this._rootElements;
240
+ }
241
+ byFqn(fqn) {
242
+ return this._byfqn.get(fqn) ?? [];
243
+ }
244
+ children(parent) {
245
+ return this._children.get(parent) ?? [];
246
+ }
247
+ descendants(nodeName) {
248
+ return this._descendants.get(nodeName) ?? [];
249
+ }
250
+ }
@@ -0,0 +1,6 @@
1
+ export * from './deployments-index';
2
+ export * from './fqn-index';
3
+ export * from './model-builder';
4
+ export * from './model-locator';
5
+ export * from './model-parser';
6
+ export * from './parser/ValueConverter';
@@ -1,17 +1,18 @@
1
- import { type ViewId } from '@likec4/core';
1
+ import { type LayoutedView, type ProjectId, type UnknownComputed, type UnknownParsed, type ViewId } from '@likec4/core';
2
2
  import { LikeC4Model } from '@likec4/core/model';
3
3
  import type * as c4 from '@likec4/core/types';
4
4
  import { type URI, Disposable } from 'langium';
5
- import { CancellationToken } from 'vscode-jsonrpc';
5
+ import type { CancellationToken } from 'vscode-jsonrpc';
6
6
  import type { LikeC4Services } from '../module';
7
7
  import { ADisposable } from '../utils';
8
8
  type ModelParsedListener = (docs: URI[]) => void;
9
+ type ManualLayouts = Record<ViewId, LayoutedView> | null;
9
10
  export interface LikeC4ModelBuilder extends Disposable {
10
- parseModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Parsed | null>;
11
- unsafeSyncBuildModel(projectId: c4.ProjectId): LikeC4Model.Computed;
12
- buildLikeC4Model(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Computed>;
13
- computeView(viewId: ViewId, projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<c4.ComputedView | null>;
11
+ parseModel(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownParsed> | null>;
12
+ unsafeSyncComputeModel(projectId: ProjectId): LikeC4Model<UnknownComputed>;
13
+ computeModel(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
14
14
  onModelParsed(callback: ModelParsedListener): Disposable;
15
+ clearCache(): void;
15
16
  }
16
17
  export declare class DefaultLikeC4ModelBuilder extends ADisposable implements LikeC4ModelBuilder {
17
18
  private projects;
@@ -19,6 +20,7 @@ export declare class DefaultLikeC4ModelBuilder extends ADisposable implements Li
19
20
  private listeners;
20
21
  private cache;
21
22
  private DocumentBuilder;
23
+ private manualLayouts;
22
24
  private mutex;
23
25
  constructor(services: LikeC4Services);
24
26
  /**
@@ -32,18 +34,18 @@ export declare class DefaultLikeC4ModelBuilder extends ADisposable implements Li
32
34
  /**
33
35
  * To avoid circular dependencies, first we parse all documents and then we join them.
34
36
  */
35
- private unsafeSyncJoinedModelData;
36
- parseModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Parsed | null>;
37
+ private unsafeSyncJoinedModel;
38
+ parseModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownParsed> | null>;
37
39
  private previousViews;
38
40
  /**
39
41
  * WARNING:
40
42
  * This method is internal and should to be called only when all documents are known to be parsed.
41
43
  * Otherwise, the model may be incomplete.
42
44
  */
43
- unsafeSyncBuildModel(projectId: c4.ProjectId): LikeC4Model.Computed;
44
- buildLikeC4Model(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model.Computed>;
45
- computeView(viewId: ViewId, projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<c4.ComputedView | null>;
45
+ unsafeSyncComputeModel(projectId: c4.ProjectId, manualLayouts?: ManualLayouts): LikeC4Model<UnknownComputed>;
46
+ computeModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
46
47
  onModelParsed(callback: ModelParsedListener): Disposable;
48
+ clearCache(): void;
47
49
  private documents;
48
50
  private notifyListeners;
49
51
  }
@@ -0,0 +1,234 @@
1
+ import { _stage, } from '@likec4/core';
2
+ import { computeView } from '@likec4/core/compute-view';
3
+ import { LikeC4Model } from '@likec4/core/model';
4
+ import { loggable } from '@likec4/log';
5
+ import { deepEqual as eq } from 'fast-equals';
6
+ import { Disposable, DocumentState, interruptAndCheck, WorkspaceCache, } from 'langium';
7
+ import { flatMap, hasAtLeast, isEmpty, mapToObj, pipe, values, } from 'remeda';
8
+ import { isLikeC4Builtin } from '../likec4lib';
9
+ import { logger as mainLogger } from '../logger';
10
+ import { ADisposable, performanceMark } from '../utils';
11
+ import { assignNavigateTo } from '../view-utils';
12
+ import { buildModelData } from './builder/buildModel';
13
+ const parsedWithoutImportsCacheKey = (projectId) => `parsed-without-imports-${projectId}`;
14
+ const parsedModelCacheKey = (projectId) => `parsed-model-${projectId}`;
15
+ const computedModelCacheKey = (projectId) => `computed-model-${projectId}`;
16
+ const builderLogger = mainLogger.getChild('model-builder');
17
+ export class DefaultLikeC4ModelBuilder extends ADisposable {
18
+ projects;
19
+ parser;
20
+ listeners = [];
21
+ cache;
22
+ DocumentBuilder;
23
+ manualLayouts;
24
+ mutex;
25
+ constructor(services) {
26
+ super();
27
+ this.projects = services.shared.workspace.ProjectsManager;
28
+ this.parser = services.likec4.ModelParser;
29
+ this.cache = services.shared.workspace.Cache;
30
+ this.DocumentBuilder = services.shared.workspace.DocumentBuilder;
31
+ this.mutex = services.shared.workspace.WorkspaceLock;
32
+ this.manualLayouts = services.likec4.ManualLayouts;
33
+ this.onDispose(this.DocumentBuilder.onUpdate((_changed, deleted) => {
34
+ if (deleted.length > 0) {
35
+ this.notifyListeners(deleted);
36
+ }
37
+ }));
38
+ this.onDispose(this.DocumentBuilder.onBuildPhase(DocumentState.Validated, (docs, _cancelToken) => {
39
+ const validated = docs.flatMap(d => isLikeC4Builtin(d.uri) || this.projects.isExcluded(d) ? [] : d.uri);
40
+ if (validated.length > 0) {
41
+ this.notifyListeners(validated);
42
+ }
43
+ }));
44
+ builderLogger.debug `created`;
45
+ }
46
+ /**
47
+ * WARNING:
48
+ * This method is internal and should to be called only when all documents are known to be parsed.
49
+ * Otherwise, the model may be incomplete.
50
+ *
51
+ * To avoid circular dependencies, we do not resolve imports here.
52
+ */
53
+ unsafeSyncParseModelData(projectId) {
54
+ const cache = this.cache;
55
+ const logger = builderLogger.getChild(projectId);
56
+ const key = parsedWithoutImportsCacheKey(projectId);
57
+ if (cache.has(key)) {
58
+ logger.debug `unsafeSyncParseModelData from cache`;
59
+ }
60
+ return cache.get(key, () => {
61
+ try {
62
+ const project = this.projects.getProject(projectId);
63
+ const docs = this.documents(projectId);
64
+ if (docs.length === 0) {
65
+ logger.debug `no documents to build model`;
66
+ return null;
67
+ }
68
+ logger.debug `unsafeSyncParseModelData`;
69
+ return buildModelData(project, docs);
70
+ }
71
+ catch (err) {
72
+ builderLogger.warn(`unsafeSyncParseModelData failed for project ${projectId}`, { err });
73
+ return null;
74
+ }
75
+ });
76
+ }
77
+ /**
78
+ * To avoid circular dependencies, first we parse all documents and then we join them.
79
+ */
80
+ unsafeSyncJoinedModel(projectId) {
81
+ const logger = builderLogger.getChild(projectId);
82
+ const cache = this.cache;
83
+ const key = parsedModelCacheKey(projectId);
84
+ if (cache.has(key)) {
85
+ logger.debug `unsafeSyncJoinedModel from cache`;
86
+ }
87
+ return cache.get(key, () => {
88
+ const result = this.unsafeSyncParseModelData(projectId);
89
+ if (!result) {
90
+ return null;
91
+ }
92
+ let parsedData = result.data;
93
+ if (result.imports.size > 0) {
94
+ logger.debug `processing imports of ${projectId}`;
95
+ const imports = [...result.imports.associations()].reduce((acc, [projectId, fqns]) => {
96
+ const anotherProject = this.unsafeSyncParseModelData(projectId);
97
+ if (anotherProject) {
98
+ const imported = pipe([...fqns], flatMap(fqn => anotherProject.data.elements[fqn] ?? []));
99
+ if (hasAtLeast(imported, 1)) {
100
+ acc[projectId] = imported;
101
+ }
102
+ }
103
+ return acc;
104
+ }, {});
105
+ parsedData = {
106
+ ...result.data,
107
+ imports,
108
+ };
109
+ }
110
+ return LikeC4Model.create(parsedData);
111
+ });
112
+ }
113
+ async parseModel(projectId, cancelToken) {
114
+ projectId = this.projects.ensureProjectId(projectId);
115
+ const logger = builderLogger.getChild(projectId);
116
+ const t0 = performanceMark();
117
+ return await this.mutex.read(async () => {
118
+ if (cancelToken?.isCancellationRequested) {
119
+ await interruptAndCheck(cancelToken);
120
+ }
121
+ const parsedModel = this.unsafeSyncJoinedModel(projectId);
122
+ logger.debug `parseModel in ${t0.pretty}`;
123
+ return parsedModel;
124
+ });
125
+ }
126
+ previousViews = {};
127
+ /**
128
+ * WARNING:
129
+ * This method is internal and should to be called only when all documents are known to be parsed.
130
+ * Otherwise, the model may be incomplete.
131
+ */
132
+ unsafeSyncComputeModel(projectId, manualLayouts) {
133
+ const logger = builderLogger.getChild(projectId);
134
+ const cache = this.cache;
135
+ const viewsCache = this.cache;
136
+ const hasManualLayouts = !!manualLayouts && !isEmpty(manualLayouts);
137
+ const key = computedModelCacheKey(projectId) + (hasManualLayouts ? '+manualLayouts' : '');
138
+ if (cache.has(key)) {
139
+ logger.debug `unsafeSyncBuildModel from cache`;
140
+ }
141
+ return cache.get(key, () => {
142
+ const parsedModel = this.unsafeSyncJoinedModel(projectId);
143
+ if (!parsedModel) {
144
+ return LikeC4Model.EMPTY.asComputed;
145
+ }
146
+ const allViews = [];
147
+ for (const view of values(parsedModel.$data.views)) {
148
+ const result = computeView(view, parsedModel);
149
+ if (!result.isSuccess) {
150
+ logger.warn(loggable(result.error));
151
+ continue;
152
+ }
153
+ if (manualLayouts?.[view.id]) {
154
+ Object.assign(result.view,
155
+ // satisfies enforces that the object has the property
156
+ { hasManualLayout: true });
157
+ }
158
+ allViews.push(result.view);
159
+ }
160
+ assignNavigateTo(allViews);
161
+ const views = mapToObj(allViews, v => {
162
+ const key = computedViewKey(projectId, v.id);
163
+ const previous = this.previousViews[key];
164
+ const view = previous && eq(v, previous) ? previous : v;
165
+ this.previousViews[key] = view;
166
+ viewsCache.set(key, view);
167
+ return [v.id, view];
168
+ });
169
+ const data = {
170
+ ...parsedModel.$data,
171
+ [_stage]: 'computed',
172
+ views,
173
+ };
174
+ if (hasManualLayouts) {
175
+ data.manualLayouts = manualLayouts;
176
+ }
177
+ return LikeC4Model.create(data);
178
+ });
179
+ }
180
+ async computeModel(projectId, cancelToken) {
181
+ projectId = this.projects.ensureProjectId(projectId);
182
+ const logger = builderLogger.getChild(projectId);
183
+ const t0 = performanceMark();
184
+ return await this.mutex.read(async () => {
185
+ if (cancelToken?.isCancellationRequested) {
186
+ await interruptAndCheck(cancelToken);
187
+ }
188
+ const project = this.projects.getProject(projectId);
189
+ const manualLayouts = await this.manualLayouts.read(project);
190
+ const result = this.unsafeSyncComputeModel(projectId, manualLayouts);
191
+ logger.debug(`buildLikeC4Model in ${t0.pretty}`);
192
+ return result;
193
+ });
194
+ }
195
+ // public async rebuildProject(projectId?: c4.ProjectId | undefined): Promise<void> {
196
+ // await this.mutex.write(async (token) => {
197
+ // projectId = this.projects.ensureProjectId(projectId)
198
+ // this.clearCache()
199
+ // builderLogger.debug(`rebuildProject ${projectId}`)
200
+ // const docs = this.documents(projectId).map(doc => doc.uri)
201
+ // await this.DocumentBuilder.update(docs, [], token)
202
+ // })
203
+ // }
204
+ onModelParsed(callback) {
205
+ this.listeners.push(callback);
206
+ return Disposable.create(() => {
207
+ const index = this.listeners.indexOf(callback);
208
+ if (index >= 0) {
209
+ this.listeners.splice(index, 1);
210
+ }
211
+ });
212
+ }
213
+ clearCache() {
214
+ builderLogger.debug(`clearCache`);
215
+ this.cache.clear();
216
+ this.previousViews = {};
217
+ }
218
+ documents(projectId) {
219
+ return this.parser.documents(projectId).toArray();
220
+ }
221
+ notifyListeners(docs) {
222
+ for (const listener of this.listeners) {
223
+ try {
224
+ listener(docs);
225
+ }
226
+ catch (e) {
227
+ builderLogger.warn(loggable(e));
228
+ }
229
+ }
230
+ }
231
+ }
232
+ function computedViewKey(projectId, viewId) {
233
+ return `computed-view-${projectId}-${viewId}`;
234
+ }
@@ -5,6 +5,11 @@ import { URI } from 'vscode-uri';
5
5
  import type { ParsedAstElement, ParsedAstView, ParsedLikeC4LangiumDocument } from '../ast';
6
6
  import { ast } from '../ast';
7
7
  import type { LikeC4Services } from '../module';
8
+ export type ViewLocateResult = {
9
+ doc: ParsedLikeC4LangiumDocument;
10
+ view: ParsedAstView;
11
+ viewAst: ast.LikeC4View;
12
+ };
8
13
  export declare class LikeC4ModelLocator {
9
14
  private services;
10
15
  private fqnIndex;
@@ -18,11 +23,7 @@ export declare class LikeC4ModelLocator {
18
23
  locateElement(fqn: c4.Fqn, projectId?: c4.ProjectId | undefined): Location | null;
19
24
  locateDeploymentElement(deploymentFqn: c4.DeploymentFqn, projectId?: c4.ProjectId | undefined): Location | null;
20
25
  locateRelation(relationId: c4.RelationId, projectId?: c4.ProjectId): Location | null;
21
- locateViewAst(viewId: c4.ViewId, projectId?: c4.ProjectId | undefined): null | {
22
- doc: ParsedLikeC4LangiumDocument;
23
- view: ParsedAstView;
24
- viewAst: ast.LikeC4View;
25
- };
26
+ locateViewAst(viewId: c4.ViewId, projectId?: c4.ProjectId | undefined): null | ViewLocateResult;
26
27
  locateView(viewId: c4.ViewId, projectId?: c4.ProjectId): Location | null;
27
28
  locateDocumentTags(documentUri: URI, cancelToken?: Cancellation.CancellationToken): Promise<Array<{
28
29
  name: string;