@eclipse-glsp/server 1.1.0-next.e3f33d3.49 → 1.1.0-next.ea31916.59

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 (252) hide show
  1. package/lib/browser/launch/worker-server-launcher.js +2 -3
  2. package/lib/browser/launch/worker-server-launcher.js.map +1 -1
  3. package/lib/common/actions/action-dispatcher.js +2 -3
  4. package/lib/common/actions/action-dispatcher.js.map +1 -1
  5. package/lib/common/actions/action-handler-registry.js +4 -6
  6. package/lib/common/actions/action-handler-registry.js.map +1 -1
  7. package/lib/common/actions/client-action-handler.js +2 -3
  8. package/lib/common/actions/client-action-handler.js.map +1 -1
  9. package/lib/common/actions/global-action-provider.js +2 -3
  10. package/lib/common/actions/global-action-provider.js.map +1 -1
  11. package/lib/common/command/command-stack.js +2 -3
  12. package/lib/common/command/command-stack.js.map +1 -1
  13. package/lib/common/command/command.js +1 -1
  14. package/lib/common/command/command.js.map +1 -1
  15. package/lib/common/command/undo-redo-action-handler.js +2 -3
  16. package/lib/common/command/undo-redo-action-handler.js.map +1 -1
  17. package/lib/common/di/binding-target.d.ts.map +1 -1
  18. package/lib/common/di/binding-target.js +3 -2
  19. package/lib/common/di/binding-target.js.map +1 -1
  20. package/lib/common/di/diagram-module.d.ts +3 -0
  21. package/lib/common/di/diagram-module.d.ts.map +1 -1
  22. package/lib/common/di/diagram-module.js +14 -5
  23. package/lib/common/di/diagram-module.js.map +1 -1
  24. package/lib/common/di/glsp-module.js +2 -3
  25. package/lib/common/di/glsp-module.js.map +1 -1
  26. package/lib/common/di/server-module.js.map +1 -1
  27. package/lib/common/diagram/diagram-configuration.js +1 -1
  28. package/lib/common/diagram/diagram-configuration.js.map +1 -1
  29. package/lib/common/diagram/request-type-hints-action-handler.js +2 -3
  30. package/lib/common/diagram/request-type-hints-action-handler.js.map +1 -1
  31. package/lib/common/features/clipboard/request-clipboard-data-action-handler.js +2 -3
  32. package/lib/common/features/clipboard/request-clipboard-data-action-handler.js.map +1 -1
  33. package/lib/common/features/contextactions/command-palette-action-provider.js +2 -3
  34. package/lib/common/features/contextactions/command-palette-action-provider.js.map +1 -1
  35. package/lib/common/features/contextactions/context-actions-provider-registry.js +2 -3
  36. package/lib/common/features/contextactions/context-actions-provider-registry.js.map +1 -1
  37. package/lib/common/features/contextactions/context-menu-item-provider.js +2 -3
  38. package/lib/common/features/contextactions/context-menu-item-provider.js.map +1 -1
  39. package/lib/common/features/contextactions/request-context-actions-handler.js +2 -3
  40. package/lib/common/features/contextactions/request-context-actions-handler.js.map +1 -1
  41. package/lib/common/features/contextactions/tool-palette-item-provider.js +4 -6
  42. package/lib/common/features/contextactions/tool-palette-item-provider.js.map +1 -1
  43. package/lib/common/features/directediting/context-edit-validator-registry.js +2 -3
  44. package/lib/common/features/directediting/context-edit-validator-registry.js.map +1 -1
  45. package/lib/common/features/directediting/label-edit-validator.js +2 -3
  46. package/lib/common/features/directediting/label-edit-validator.js.map +1 -1
  47. package/lib/common/features/directediting/request-edit-validation-handler.js +2 -3
  48. package/lib/common/features/directediting/request-edit-validation-handler.js.map +1 -1
  49. package/lib/common/features/layout/computed-bounds-action-handler.js +2 -3
  50. package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
  51. package/lib/common/features/layout/layout-operation-handler.js +2 -3
  52. package/lib/common/features/layout/layout-operation-handler.js.map +1 -1
  53. package/lib/common/features/model/gmodel-factory.js +2 -3
  54. package/lib/common/features/model/gmodel-factory.js.map +1 -1
  55. package/lib/common/features/model/gmodel-index.js +2 -3
  56. package/lib/common/features/model/gmodel-index.js.map +1 -1
  57. package/lib/common/features/model/gmodel-serializer.js +2 -3
  58. package/lib/common/features/model/gmodel-serializer.js.map +1 -1
  59. package/lib/common/features/model/model-state.js +2 -3
  60. package/lib/common/features/model/model-state.js.map +1 -1
  61. package/lib/common/features/model/model-submission-handler.js +2 -3
  62. package/lib/common/features/model/model-submission-handler.js.map +1 -1
  63. package/lib/common/features/model/request-model-action-handler.d.ts +4 -6
  64. package/lib/common/features/model/request-model-action-handler.d.ts.map +1 -1
  65. package/lib/common/features/model/request-model-action-handler.js +16 -14
  66. package/lib/common/features/model/request-model-action-handler.js.map +1 -1
  67. package/lib/common/features/model/save-model-action-handler.js +2 -3
  68. package/lib/common/features/model/save-model-action-handler.js.map +1 -1
  69. package/lib/common/features/navigation/navigation-target-provider-registry.js +2 -3
  70. package/lib/common/features/navigation/navigation-target-provider-registry.js.map +1 -1
  71. package/lib/common/features/navigation/navigation-target-resolver.js +2 -3
  72. package/lib/common/features/navigation/navigation-target-resolver.js.map +1 -1
  73. package/lib/common/features/navigation/request-navigation-targets-action-handler.js +2 -3
  74. package/lib/common/features/navigation/request-navigation-targets-action-handler.js.map +1 -1
  75. package/lib/common/features/navigation/resolve-navigation-targets-action-handler.js +2 -3
  76. package/lib/common/features/navigation/resolve-navigation-targets-action-handler.js.map +1 -1
  77. package/lib/common/features/popup/request-popup-model-action-handler.js +2 -3
  78. package/lib/common/features/popup/request-popup-model-action-handler.js.map +1 -1
  79. package/lib/common/features/progress/progress-service.d.ts +44 -0
  80. package/lib/common/features/progress/progress-service.d.ts.map +1 -0
  81. package/lib/common/features/progress/progress-service.js +50 -0
  82. package/lib/common/features/progress/progress-service.js.map +1 -0
  83. package/lib/common/features/validation/request-markers-handler.js +2 -3
  84. package/lib/common/features/validation/request-markers-handler.js.map +1 -1
  85. package/lib/common/gmodel/apply-label-edit-operation-handler.js +2 -3
  86. package/lib/common/gmodel/apply-label-edit-operation-handler.js.map +1 -1
  87. package/lib/common/gmodel/change-bounds-operation-handler.js +2 -3
  88. package/lib/common/gmodel/change-bounds-operation-handler.js.map +1 -1
  89. package/lib/common/gmodel/change-routing-points-operation-handler.js +2 -3
  90. package/lib/common/gmodel/change-routing-points-operation-handler.js.map +1 -1
  91. package/lib/common/gmodel/cut-operation-handler.js +2 -3
  92. package/lib/common/gmodel/cut-operation-handler.js.map +1 -1
  93. package/lib/common/gmodel/delete-operation-handler.js +2 -3
  94. package/lib/common/gmodel/delete-operation-handler.js.map +1 -1
  95. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js +2 -3
  96. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js.map +1 -1
  97. package/lib/common/gmodel/gmodel-create-node-operation-handler.js +2 -3
  98. package/lib/common/gmodel/gmodel-create-node-operation-handler.js.map +1 -1
  99. package/lib/common/gmodel/gmodel-diagram-module.js +2 -3
  100. package/lib/common/gmodel/gmodel-diagram-module.js.map +1 -1
  101. package/lib/common/gmodel/gmodel-operation-handler.js +1 -1
  102. package/lib/common/gmodel/gmodel-operation-handler.js.map +1 -1
  103. package/lib/common/gmodel/paste-operation-handler.js +2 -3
  104. package/lib/common/gmodel/paste-operation-handler.js.map +1 -1
  105. package/lib/common/gmodel/reconnect-edge-operation-handler.js +2 -3
  106. package/lib/common/gmodel/reconnect-edge-operation-handler.js.map +1 -1
  107. package/lib/common/launch/glsp-server-launcher.js +2 -3
  108. package/lib/common/launch/glsp-server-launcher.js.map +1 -1
  109. package/lib/common/launch/jsonrpc-server-launcher.js +2 -3
  110. package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -1
  111. package/lib/common/operations/compound-operation-handler.js +6 -12
  112. package/lib/common/operations/compound-operation-handler.js.map +1 -1
  113. package/lib/common/operations/create-operation-handler.js +1 -1
  114. package/lib/common/operations/create-operation-handler.js.map +1 -1
  115. package/lib/common/operations/operation-action-handler.js +2 -3
  116. package/lib/common/operations/operation-action-handler.js.map +1 -1
  117. package/lib/common/operations/operation-handler-registry.js +4 -6
  118. package/lib/common/operations/operation-handler-registry.js.map +1 -1
  119. package/lib/common/operations/operation-handler.js +2 -3
  120. package/lib/common/operations/operation-handler.js.map +1 -1
  121. package/lib/common/protocol/glsp-server.js +2 -3
  122. package/lib/common/protocol/glsp-server.js.map +1 -1
  123. package/lib/common/session/client-session-factory.js +2 -3
  124. package/lib/common/session/client-session-factory.js.map +1 -1
  125. package/lib/common/session/client-session-manager.js +2 -3
  126. package/lib/common/session/client-session-manager.js.map +1 -1
  127. package/lib/common/utils/args-util.js +2 -2
  128. package/lib/common/utils/args-util.js.map +1 -1
  129. package/lib/common/utils/console-logger.d.ts +1 -1
  130. package/lib/common/utils/console-logger.js +3 -4
  131. package/lib/common/utils/console-logger.js.map +1 -1
  132. package/lib/common/utils/logger.d.ts.map +1 -1
  133. package/lib/common/utils/logger.js +5 -5
  134. package/lib/common/utils/logger.js.map +1 -1
  135. package/lib/common/utils/registry.js +4 -6
  136. package/lib/common/utils/registry.js.map +1 -1
  137. package/lib/node/abstract-json-model-storage.js +2 -3
  138. package/lib/node/abstract-json-model-storage.js.map +1 -1
  139. package/lib/node/gmodel/gmodel-storage.js +2 -3
  140. package/lib/node/gmodel/gmodel-storage.js.map +1 -1
  141. package/lib/node/launch/socket-server-launcher.js +2 -3
  142. package/lib/node/launch/socket-server-launcher.js.map +1 -1
  143. package/lib/node/launch/websocket-server-launcher.js +2 -3
  144. package/lib/node/launch/websocket-server-launcher.js.map +1 -1
  145. package/package.json +6 -4
  146. package/src/common/di/binding-target.ts +1 -0
  147. package/src/common/di/diagram-module.ts +20 -7
  148. package/src/common/features/model/request-model-action-handler.ts +16 -15
  149. package/src/common/features/progress/progress-service.ts +74 -0
  150. package/src/common/utils/args-util.ts +1 -1
  151. package/src/common/utils/console-logger.ts +1 -1
  152. package/src/common/utils/logger.ts +2 -1
  153. package/lib/common/actions/action-dispatcher.spec.d.ts +0 -2
  154. package/lib/common/actions/action-dispatcher.spec.d.ts.map +0 -1
  155. package/lib/common/actions/action-dispatcher.spec.js +0 -264
  156. package/lib/common/actions/action-dispatcher.spec.js.map +0 -1
  157. package/lib/common/actions/action-handler-registry.spec.d.ts +0 -2
  158. package/lib/common/actions/action-handler-registry.spec.d.ts.map +0 -1
  159. package/lib/common/actions/action-handler-registry.spec.js +0 -50
  160. package/lib/common/actions/action-handler-registry.spec.js.map +0 -1
  161. package/lib/common/actions/global-action-provider.spec.d.ts +0 -2
  162. package/lib/common/actions/global-action-provider.spec.d.ts.map +0 -1
  163. package/lib/common/actions/global-action-provider.spec.js +0 -70
  164. package/lib/common/actions/global-action-provider.spec.js.map +0 -1
  165. package/lib/common/command/command-stack.spec.d.ts +0 -2
  166. package/lib/common/command/command-stack.spec.d.ts.map +0 -1
  167. package/lib/common/command/command-stack.spec.js +0 -207
  168. package/lib/common/command/command-stack.spec.js.map +0 -1
  169. package/lib/common/command/command.spec.d.ts +0 -2
  170. package/lib/common/command/command.spec.d.ts.map +0 -1
  171. package/lib/common/command/command.spec.js +0 -86
  172. package/lib/common/command/command.spec.js.map +0 -1
  173. package/lib/common/command/recording-command.spec.d.ts +0 -17
  174. package/lib/common/command/recording-command.spec.d.ts.map +0 -1
  175. package/lib/common/command/recording-command.spec.js +0 -62
  176. package/lib/common/command/recording-command.spec.js.map +0 -1
  177. package/lib/common/di/binding-target.spec.d.ts +0 -2
  178. package/lib/common/di/binding-target.spec.d.ts.map +0 -1
  179. package/lib/common/di/binding-target.spec.js +0 -121
  180. package/lib/common/di/binding-target.spec.js.map +0 -1
  181. package/lib/common/di/multi-bindings.spec.d.ts +0 -2
  182. package/lib/common/di/multi-bindings.spec.d.ts.map +0 -1
  183. package/lib/common/di/multi-bindings.spec.js +0 -137
  184. package/lib/common/di/multi-bindings.spec.js.map +0 -1
  185. package/lib/common/diagram/request-type-hints-action-handler.spec.d.ts +0 -2
  186. package/lib/common/diagram/request-type-hints-action-handler.spec.d.ts.map +0 -1
  187. package/lib/common/diagram/request-type-hints-action-handler.spec.js +0 -57
  188. package/lib/common/diagram/request-type-hints-action-handler.spec.js.map +0 -1
  189. package/lib/common/features/contextactions/context-actions-provider-registry.spec.d.ts +0 -2
  190. package/lib/common/features/contextactions/context-actions-provider-registry.spec.d.ts.map +0 -1
  191. package/lib/common/features/contextactions/context-actions-provider-registry.spec.js +0 -34
  192. package/lib/common/features/contextactions/context-actions-provider-registry.spec.js.map +0 -1
  193. package/lib/common/features/contextactions/request-context-actions-handler.spec.d.ts +0 -2
  194. package/lib/common/features/contextactions/request-context-actions-handler.spec.d.ts.map +0 -1
  195. package/lib/common/features/contextactions/request-context-actions-handler.spec.js +0 -63
  196. package/lib/common/features/contextactions/request-context-actions-handler.spec.js.map +0 -1
  197. package/lib/common/features/contextactions/tool-palette-item-provider.spec.d.ts +0 -2
  198. package/lib/common/features/contextactions/tool-palette-item-provider.spec.d.ts.map +0 -1
  199. package/lib/common/features/contextactions/tool-palette-item-provider.spec.js +0 -48
  200. package/lib/common/features/contextactions/tool-palette-item-provider.spec.js.map +0 -1
  201. package/lib/common/features/directediting/context-edit-validator-registry.spec.d.ts +0 -2
  202. package/lib/common/features/directediting/context-edit-validator-registry.spec.d.ts.map +0 -1
  203. package/lib/common/features/directediting/context-edit-validator-registry.spec.js +0 -44
  204. package/lib/common/features/directediting/context-edit-validator-registry.spec.js.map +0 -1
  205. package/lib/common/features/directediting/request-edit-validation-handler.spec.d.ts +0 -2
  206. package/lib/common/features/directediting/request-edit-validation-handler.spec.d.ts.map +0 -1
  207. package/lib/common/features/directediting/request-edit-validation-handler.spec.js +0 -97
  208. package/lib/common/features/directediting/request-edit-validation-handler.spec.js.map +0 -1
  209. package/lib/common/features/model/gmodel-serializer.spec.d.ts +0 -2
  210. package/lib/common/features/model/gmodel-serializer.spec.d.ts.map +0 -1
  211. package/lib/common/features/model/gmodel-serializer.spec.js +0 -124
  212. package/lib/common/features/model/gmodel-serializer.spec.js.map +0 -1
  213. package/lib/common/operations/operation-handler-registry.spec.d.ts +0 -2
  214. package/lib/common/operations/operation-handler-registry.spec.d.ts.map +0 -1
  215. package/lib/common/operations/operation-handler-registry.spec.js +0 -50
  216. package/lib/common/operations/operation-handler-registry.spec.js.map +0 -1
  217. package/lib/common/protocol/glsp-server.spec.d.ts +0 -2
  218. package/lib/common/protocol/glsp-server.spec.d.ts.map +0 -1
  219. package/lib/common/protocol/glsp-server.spec.js +0 -132
  220. package/lib/common/protocol/glsp-server.spec.js.map +0 -1
  221. package/lib/common/session/client-session-factory.spec.d.ts +0 -2
  222. package/lib/common/session/client-session-factory.spec.d.ts.map +0 -1
  223. package/lib/common/session/client-session-factory.spec.js +0 -56
  224. package/lib/common/session/client-session-factory.spec.js.map +0 -1
  225. package/lib/common/session/client-session-manager.spec.d.ts +0 -2
  226. package/lib/common/session/client-session-manager.spec.d.ts.map +0 -1
  227. package/lib/common/session/client-session-manager.spec.js +0 -74
  228. package/lib/common/session/client-session-manager.spec.js.map +0 -1
  229. package/lib/common/test/mock-util.d.ts +0 -120
  230. package/lib/common/test/mock-util.d.ts.map +0 -1
  231. package/lib/common/test/mock-util.js +0 -216
  232. package/lib/common/test/mock-util.js.map +0 -1
  233. package/lib/common/utils/promise-queue.spec.d.ts +0 -2
  234. package/lib/common/utils/promise-queue.spec.d.ts.map +0 -1
  235. package/lib/common/utils/promise-queue.spec.js +0 -117
  236. package/lib/common/utils/promise-queue.spec.js.map +0 -1
  237. package/lib/common/utils/registry.spec.d.ts +0 -2
  238. package/lib/common/utils/registry.spec.d.ts.map +0 -1
  239. package/lib/common/utils/registry.spec.js +0 -199
  240. package/lib/common/utils/registry.spec.js.map +0 -1
  241. package/lib/node/launch/cli-parser.spec.d.ts +0 -2
  242. package/lib/node/launch/cli-parser.spec.d.ts.map +0 -1
  243. package/lib/node/launch/cli-parser.spec.js +0 -56
  244. package/lib/node/launch/cli-parser.spec.js.map +0 -1
  245. package/lib/node/launch/socket-cli-parser.spec.d.ts +0 -2
  246. package/lib/node/launch/socket-cli-parser.spec.d.ts.map +0 -1
  247. package/lib/node/launch/socket-cli-parser.spec.js +0 -66
  248. package/lib/node/launch/socket-cli-parser.spec.js.map +0 -1
  249. package/lib/node/launch/socket-server-launcher.spec.d.ts +0 -17
  250. package/lib/node/launch/socket-server-launcher.spec.d.ts.map +0 -1
  251. package/lib/node/launch/socket-server-launcher.spec.js +0 -75
  252. package/lib/node/launch/socket-server-launcher.spec.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-json-model-storage.js","sourceRoot":"","sources":["../../src/node/abstract-json-model-storage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-json-model-storage.js","sourceRoot":"","sources":["../../src/node/abstract-json-model-storage.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ exports.EMPTY_ROOT = graph_1.GGraph.builder().id('empty').build();
36
36
  * A {@link SourceModelStorage} that reads and writes the graph model directly from / into
37
37
  * a JSON file and uses it as source model.
38
38
  */
39
- let GModelStorage = class GModelStorage extends abstract_json_model_storage_1.AbstractJsonModelStorage {
39
+ let GModelStorage = exports.GModelStorage = class GModelStorage extends abstract_json_model_storage_1.AbstractJsonModelStorage {
40
40
  loadSourceModel(action) {
41
41
  const sourceUri = this.getSourceUri(action);
42
42
  const rootSchema = this.loadFromFile(sourceUri, graph_1.GModelElementSchema.is);
@@ -61,8 +61,7 @@ __decorate([
61
61
  (0, inversify_1.inject)(model_state_1.ModelState),
62
62
  __metadata("design:type", Object)
63
63
  ], GModelStorage.prototype, "modelState", void 0);
64
- GModelStorage = __decorate([
64
+ exports.GModelStorage = GModelStorage = __decorate([
65
65
  (0, inversify_1.injectable)()
66
66
  ], GModelStorage);
67
- exports.GModelStorage = GModelStorage;
68
67
  //# sourceMappingURL=gmodel-storage.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gmodel-storage.js","sourceRoot":"","sources":["../../../src/node/gmodel/gmodel-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAkE;AAElE,yCAA+C;AAC/C,qFAAiF;AACjF,yEAAqE;AACrE,sDAAmD;AACnD,gFAA0E;AAE7D,QAAA,UAAU,GAAG,cAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;AAE/D;;;GAGG;AAEI,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,sDAAwB;IAUvD,eAAe,CAAC,MAA0B;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,2BAAmB,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,eAAe,CAAC,MAAuB;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AArBG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;6CAAC;AAEzB;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;sDACmB;AAE5C;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;iDACuB;AARjC,aAAa;IADzB,IAAA,sBAAU,GAAE;GACA,aAAa,CAsBzB;AAtBY,sCAAa"}
1
+ {"version":3,"file":"gmodel-storage.js","sourceRoot":"","sources":["../../../src/node/gmodel/gmodel-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAkE;AAElE,yCAA+C;AAC/C,qFAAiF;AACjF,yEAAqE;AACrE,sDAAmD;AACnD,gFAA0E;AAE7D,QAAA,UAAU,GAAG,cAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;AAE/D;;;GAGG;AAEI,IAAM,aAAa,2BAAnB,MAAM,aAAc,SAAQ,sDAAwB;IAUvD,eAAe,CAAC,MAA0B;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,2BAAmB,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,eAAe,CAAC,MAAuB;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AApBa;IADT,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;6CAAC;AAGf;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;sDACmB;AAGzB;IADlB,IAAA,kBAAM,EAAC,wBAAU,CAAC;;iDACuB;wBARjC,aAAa;IADzB,IAAA,sBAAU,GAAE;GACA,aAAa,CAsBzB"}
@@ -32,7 +32,7 @@ const jsonrpc = require("vscode-jsonrpc/node");
32
32
  const jsonrpc_server_launcher_1 = require("../../common/launch/jsonrpc-server-launcher");
33
33
  const logger_1 = require("../../common/utils/logger");
34
34
  exports.START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
35
- let SocketServerLauncher = class SocketServerLauncher extends jsonrpc_server_launcher_1.JsonRpcGLSPServerLauncher {
35
+ let SocketServerLauncher = exports.SocketServerLauncher = class SocketServerLauncher extends jsonrpc_server_launcher_1.JsonRpcGLSPServerLauncher {
36
36
  constructor() {
37
37
  super();
38
38
  this.toDispose.push(protocol_1.Disposable.create(() => {
@@ -77,9 +77,8 @@ __decorate([
77
77
  (0, inversify_1.inject)(logger_1.Logger),
78
78
  __metadata("design:type", logger_1.Logger)
79
79
  ], SocketServerLauncher.prototype, "logger", void 0);
80
- SocketServerLauncher = __decorate([
80
+ exports.SocketServerLauncher = SocketServerLauncher = __decorate([
81
81
  (0, inversify_1.injectable)(),
82
82
  __metadata("design:paramtypes", [])
83
83
  ], SocketServerLauncher);
84
- exports.SocketServerLauncher = SocketServerLauncher;
85
84
  //# sourceMappingURL=socket-server-launcher.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"socket-server-launcher.js","sourceRoot":"","sources":["../../../src/node/launch/socket-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoD;AACpD,yCAA+C;AAC/C,2BAA2B;AAC3B,+CAA+C;AAC/C,yFAAwF;AACxF,sDAAmD;AAEtC,QAAA,qBAAqB,GAAG,8DAA8D,CAAC;AAG7F,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAAmD;IAKzF;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,qBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAES,GAAG,CAAC,IAA8B;QACxC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACvC,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC7C,IAAI,CAAC,WAAW,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO;aACV;iBAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,WAAW,mBAAmB,CAAC,CAAC;gBACrH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO;aACV;YACD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,WAAW,EAAE,CAAC,CAAC;YACnG,mFAAmF;YACnF,2FAA2F;YAC3F,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrD,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,gBAAgB,CAAC,MAAkB;QACzC,OAAO,OAAO,CAAC,uBAAuB,CAAC,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IACtI,CAAC;CACJ,CAAA;AA/CG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAA4B,eAAM;oDAAC;AADzC,oBAAoB;IADhC,IAAA,sBAAU,GAAE;;GACA,oBAAoB,CAgDhC;AAhDY,oDAAoB"}
1
+ {"version":3,"file":"socket-server-launcher.js","sourceRoot":"","sources":["../../../src/node/launch/socket-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoD;AACpD,yCAA+C;AAC/C,2BAA2B;AAC3B,+CAA+C;AAC/C,yFAAwF;AACxF,sDAAmD;AAEtC,QAAA,qBAAqB,GAAG,8DAA8D,CAAC;AAG7F,IAAM,oBAAoB,kCAA1B,MAAM,oBAAqB,SAAQ,mDAAmD;IAKzF;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,qBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAES,GAAG,CAAC,IAA8B;QACxC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACvC,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC7C,IAAI,CAAC,WAAW,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO;aACV;iBAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,WAAW,mBAAmB,CAAC,CAAC;gBACrH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,OAAO;aACV;YACD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,WAAW,EAAE,CAAC,CAAC;YACnG,mFAAmF;YACnF,2FAA2F;YAC3F,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACrD,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,gBAAgB,CAAC,MAAkB;QACzC,OAAO,OAAO,CAAC,uBAAuB,CAAC,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IACtI,CAAC;CACJ,CAAA;AA/CsC;IAAlC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAA4B,eAAM;oDAAC;+BADzC,oBAAoB;IADhC,IAAA,sBAAU,GAAE;;GACA,oBAAoB,CAgDhC"}
@@ -33,7 +33,7 @@ const ws_1 = require("ws");
33
33
  const jsonrpc_server_launcher_1 = require("../../common/launch/jsonrpc-server-launcher");
34
34
  const logger_1 = require("../../common/utils/logger");
35
35
  const STATUS_UPGRADE_REQUIRED = 426;
36
- let WebSocketServerLauncher = class WebSocketServerLauncher extends jsonrpc_server_launcher_1.JsonRpcGLSPServerLauncher {
36
+ let WebSocketServerLauncher = exports.WebSocketServerLauncher = class WebSocketServerLauncher extends jsonrpc_server_launcher_1.JsonRpcGLSPServerLauncher {
37
37
  constructor() {
38
38
  super();
39
39
  this.toDispose.push(protocol_1.Disposable.create(() => {
@@ -86,11 +86,10 @@ __decorate([
86
86
  (0, inversify_1.inject)(logger_1.Logger),
87
87
  __metadata("design:type", logger_1.Logger)
88
88
  ], WebSocketServerLauncher.prototype, "logger", void 0);
89
- WebSocketServerLauncher = __decorate([
89
+ exports.WebSocketServerLauncher = WebSocketServerLauncher = __decorate([
90
90
  (0, inversify_1.injectable)(),
91
91
  __metadata("design:paramtypes", [])
92
92
  ], WebSocketServerLauncher);
93
- exports.WebSocketServerLauncher = WebSocketServerLauncher;
94
93
  async function getFreePort() {
95
94
  return new Promise((resolve, reject) => {
96
95
  const srv = net.createServer();
@@ -1 +1 @@
1
- {"version":3,"file":"websocket-server-launcher.js","sourceRoot":"","sources":["../../../src/node/launch/websocket-server-launcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"websocket-server-launcher.js","sourceRoot":"","sources":["../../../src/node/launch/websocket-server-launcher.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp/server",
3
- "version": "1.1.0-next.e3f33d3.49+e3f33d3",
3
+ "version": "1.1.0-next.ea31916.59+ea31916",
4
4
  "description": "A js server framework for Eclipse GLSP",
5
5
  "keywords": [
6
6
  "eclipse",
@@ -59,12 +59,11 @@
59
59
  "watch": "tsc -w"
60
60
  },
61
61
  "dependencies": {
62
- "@eclipse-glsp/graph": "1.1.0-next.e3f33d3.49+e3f33d3",
62
+ "@eclipse-glsp/graph": "1.1.0-next.ea31916.59+ea31916",
63
63
  "@eclipse-glsp/protocol": "next",
64
64
  "@types/uuid": "8.3.1",
65
65
  "commander": "^8.3.0",
66
66
  "fast-json-patch": "^3.1.0",
67
- "inversify": "^5.1.1",
68
67
  "winston": "^3.3.3",
69
68
  "ws": "^8.12.1"
70
69
  },
@@ -72,8 +71,11 @@
72
71
  "@types/fs-extra": "^9.0.13",
73
72
  "@types/ws": "^8.5.4"
74
73
  },
74
+ "peerDependencies": {
75
+ "inversify": "^6.0.0"
76
+ },
75
77
  "publishConfig": {
76
78
  "access": "public"
77
79
  },
78
- "gitHead": "e3f33d3eff98bbfe4bba8a9a334f9cc7d9354904"
80
+ "gitHead": "ea31916a7ee02acfce20671b2ebf4b53e02d25e4"
79
81
  }
@@ -152,6 +152,7 @@ namespace NoOPSyntax {
152
152
  };
153
153
  const syntax = {
154
154
  onActivation: noOpReturn,
155
+ onDeactivation: noOpReturn,
155
156
  when: noOpReturn,
156
157
  whenAnyAncestorIs: noOpReturn,
157
158
  whenAnyAncestorMatches: noOpReturn,
@@ -16,6 +16,7 @@
16
16
  import {
17
17
  CenterAction,
18
18
  DeleteMarkersAction,
19
+ EndProgressAction,
19
20
  ExportSvgAction,
20
21
  FitToScreenAction,
21
22
  NavigateToExternalTargetAction,
@@ -39,9 +40,11 @@ import {
39
40
  SetTypeHintsAction,
40
41
  SetViewportAction,
41
42
  SourceModelChangedAction,
43
+ StartProgressAction,
42
44
  TriggerEdgeCreationAction,
43
45
  TriggerNodeCreationAction,
44
- UpdateModelAction
46
+ UpdateModelAction,
47
+ UpdateProgressAction
45
48
  } from '@eclipse-glsp/protocol';
46
49
  import { interfaces } from 'inversify';
47
50
  import { ActionDispatcher, DefaultActionDispatcher } from '../actions/action-dispatcher';
@@ -86,6 +89,7 @@ import { RequestNavigationTargetsActionHandler } from '../features/navigation/re
86
89
  import { ResolveNavigationTargetsActionHandler } from '../features/navigation/resolve-navigation-targets-action-handler';
87
90
  import { PopupModelFactory } from '../features/popup/popup-model-factory';
88
91
  import { RequestPopupModelActionHandler } from '../features/popup/request-popup-model-action-handler';
92
+ import { DefaultProgressService, ProgressService } from '../features/progress/progress-service';
89
93
  import { ModelValidator } from '../features/validation/model-validator';
90
94
  import { RequestMarkersHandler } from '../features/validation/request-markers-handler';
91
95
  import { CompoundOperationHandler } from '../operations/compound-operation-handler';
@@ -93,7 +97,7 @@ import { OperationActionHandler } from '../operations/operation-action-handler';
93
97
  import { OperationHandlerConstructor, OperationHandlerFactory } from '../operations/operation-handler';
94
98
  import { OperationHandlerRegistry, OperationHandlerRegistryInitializer } from '../operations/operation-handler-registry';
95
99
  import { ClientSessionInitializer } from '../session/client-session-initializer';
96
- import { applyBindingTarget, applyOptionalBindingTarget, BindingTarget } from './binding-target';
100
+ import { BindingTarget, applyBindingTarget, applyOptionalBindingTarget } from './binding-target';
97
101
  import { GLSPModule } from './glsp-module';
98
102
  import { InstanceMultiBinding, MultiBinding } from './multi-binding';
99
103
  import {
@@ -133,6 +137,7 @@ import {
133
137
  * - {@link ContextActionsProviders} as {@link ClassMultiBinding<ContextActionsProvider>} (empty)
134
138
  * - {@link ContextActionsProviderRegistry}
135
139
  * - {@link ActionDispatcher}
140
+ * - {@link ProgressService}
136
141
  * - {@link ClientActionKinds} as {@link InstanceMultiBinding<string>}
137
142
  * - {@link ActionHandler} as {@link InstanceMultiBinding<ActionHandlerConstructor>}
138
143
  * - {@link ActionHandlerFactory}
@@ -217,6 +222,7 @@ export abstract class DiagramModule extends GLSPModule {
217
222
  this.configureMultiBinding(new MultiBinding<ClientSessionInitializer>(ClientSessionInitializer), binding =>
218
223
  this.configureClientSessionInitializers(binding)
219
224
  );
225
+ applyBindingTarget(context, ProgressService, this.bindProgressService()).inSingletonScope();
220
226
  applyOptionalBindingTarget(context, PopupModelFactory, this.bindPopupModelFactory());
221
227
  applyOptionalBindingTarget(context, LayoutEngine, this.bindLayoutEngine?.());
222
228
  }
@@ -308,6 +314,10 @@ export abstract class DiagramModule extends GLSPModule {
308
314
  binding.add(LayoutOperationHandler);
309
315
  }
310
316
 
317
+ protected bindProgressService(): BindingTarget<ProgressService> {
318
+ return DefaultProgressService;
319
+ }
320
+
311
321
  protected configureContextActionProviders(binding: MultiBinding<ContextActionsProvider>): void {
312
322
  // empty as default
313
323
  }
@@ -322,16 +332,17 @@ export abstract class DiagramModule extends GLSPModule {
322
332
 
323
333
  protected configureClientActions(binding: InstanceMultiBinding<string>): void {
324
334
  binding.add(CenterAction.KIND);
325
- binding.add(ExportSvgAction.KIND);
326
335
  binding.add(DeleteMarkersAction.KIND);
336
+ binding.add(EndProgressAction.KIND);
337
+ binding.add(ExportSvgAction.KIND);
327
338
  binding.add(FitToScreenAction.KIND);
328
- binding.add(SourceModelChangedAction.KIND);
329
- binding.add(NavigateToTargetAction.KIND);
330
339
  binding.add(NavigateToExternalTargetAction.KIND);
340
+ binding.add(NavigateToTargetAction.KIND);
331
341
  binding.add(RequestBoundsAction.KIND);
332
342
  binding.add(SelectAction.KIND);
333
343
  binding.add(SelectAllAction.KIND);
334
344
  binding.add(ServerMessageAction.KIND);
345
+ binding.add(ServerStatusAction.KIND);
335
346
  binding.add(SetBoundsAction.KIND);
336
347
  binding.add(SetClipboardDataAction.KIND);
337
348
  binding.add(SetContextActions.KIND);
@@ -345,10 +356,12 @@ export abstract class DiagramModule extends GLSPModule {
345
356
  binding.add(SetResolvedNavigationTargetAction.KIND);
346
357
  binding.add(SetTypeHintsAction.KIND);
347
358
  binding.add(SetViewportAction.KIND);
348
- binding.add(ServerStatusAction.KIND);
349
- binding.add(TriggerNodeCreationAction.KIND);
359
+ binding.add(SourceModelChangedAction.KIND);
360
+ binding.add(StartProgressAction.KIND);
350
361
  binding.add(TriggerEdgeCreationAction.KIND);
362
+ binding.add(TriggerNodeCreationAction.KIND);
351
363
  binding.add(UpdateModelAction.KIND);
364
+ binding.add(UpdateProgressAction.KIND);
352
365
  }
353
366
 
354
367
  protected bindContextActionsProviderRegistry(): BindingTarget<ContextActionsProviderRegistry> {
@@ -13,11 +13,12 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Action, RequestModelAction, ServerMessageAction, ServerStatusAction } from '@eclipse-glsp/protocol';
16
+ import { Action, RequestModelAction, ServerStatusAction } from '@eclipse-glsp/protocol';
17
17
  import { inject, injectable } from 'inversify';
18
18
  import { ActionDispatcher } from '../../actions/action-dispatcher';
19
19
  import { ActionHandler } from '../../actions/action-handler';
20
20
  import { Logger } from '../../utils/logger';
21
+ import { ProgressMonitor, ProgressService } from '../progress/progress-service';
21
22
  import { ModelState } from './model-state';
22
23
  import { ModelSubmissionHandler } from './model-submission-handler';
23
24
  import { SourceModelStorage } from './source-model-storage';
@@ -41,27 +42,27 @@ export class RequestModelActionHandler implements ActionHandler {
41
42
  @inject(ModelSubmissionHandler)
42
43
  protected submissionHandler: ModelSubmissionHandler;
43
44
 
45
+ @inject(ProgressService)
46
+ protected progressService: ProgressService;
47
+
44
48
  async execute(action: RequestModelAction): Promise<Action[]> {
45
49
  this.logger.debug('Execute RequestModelAction:', action);
46
50
  this.modelState.setAll(action.options ?? {});
47
51
 
48
- this.notifyClient('Model loading in progress');
52
+ const progress = this.reportModelLoading('Model loading in progress');
49
53
  await this.sourceModelStorage.loadSourceModel(action);
50
- // Clear the previous notification.
51
- this.notifyClient();
54
+ this.reportModelLoadingFinished(progress);
55
+
52
56
  return this.submissionHandler.submitModel();
53
57
  }
54
58
 
55
- /**
56
- * Send a message and status notification with the given message to the client.
57
- * An empty message is an indication for the client to clear previously received notifications.
58
- * @param message The message that should be sent to the client
59
- */
60
- protected notifyClient(message = ''): void {
61
- const severity = message.length > 0 ? 'INFO' : 'NONE';
62
- this.actionDispatcher.dispatchAll(
63
- ServerMessageAction.create(message, { severity }),
64
- ServerStatusAction.create(message, { severity })
65
- );
59
+ protected reportModelLoading(message: string): ProgressMonitor {
60
+ this.actionDispatcher.dispatch(ServerStatusAction.create(message, { severity: 'INFO' }));
61
+ return this.progressService.start(message);
62
+ }
63
+
64
+ protected reportModelLoadingFinished(monitor: ProgressMonitor): void {
65
+ this.actionDispatcher.dispatch(ServerStatusAction.create('', { severity: 'NONE' }));
66
+ monitor.end();
66
67
  }
67
68
  }
@@ -0,0 +1,74 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2023 EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import { EndProgressAction, StartProgressAction, UpdateProgressAction } from '@eclipse-glsp/protocol';
17
+ import { inject, injectable } from 'inversify';
18
+ import * as uuid from 'uuid';
19
+ import { ActionDispatcher } from '../../actions/action-dispatcher';
20
+
21
+ export const ProgressService = Symbol('ProgressService');
22
+
23
+ /**
24
+ * Service for starting and monitoring progress reporting to the client.
25
+ */
26
+ export interface ProgressService {
27
+ /**
28
+ * Start a progress reporting.
29
+ * @param title The title shown in the UI for the progress reporting.
30
+ * @param options Additional optional options for the progress reporting.
31
+ * @returns a monitor to update and end the progress reporting later.
32
+ */
33
+ start(title: string, options?: ProgressOptions): ProgressMonitor;
34
+ }
35
+
36
+ /**
37
+ * Optional progress reporting options.
38
+ */
39
+ export interface ProgressOptions {
40
+ /** A message shown in the UI. */
41
+ message?: string;
42
+ /* The percentage (value range: 0 to 100) to show in the progress reporting. */
43
+ percentage?: number;
44
+ }
45
+
46
+ /**
47
+ * The monitor of a progress reporting, which can be used to update and end the reporting.
48
+ */
49
+ export interface ProgressMonitor {
50
+ /**
51
+ * Updates an ongoing progress reporting.
52
+ * @param options Updated message and/or percentage (value range: 0 to 100).
53
+ */
54
+ update(options: { message?: string; percentage?: number }): void;
55
+ /**
56
+ * Ends an ongoing progress reporting.
57
+ */
58
+ end(): void;
59
+ }
60
+
61
+ @injectable()
62
+ export class DefaultProgressService implements ProgressService {
63
+ @inject(ActionDispatcher)
64
+ protected actionDispatcher: ActionDispatcher;
65
+
66
+ start(title: string, options?: ProgressOptions): ProgressMonitor {
67
+ const progressId = uuid.v4();
68
+ this.actionDispatcher.dispatch(StartProgressAction.create({ progressId, title, ...options }));
69
+ return {
70
+ update: updateOptions => this.actionDispatcher.dispatch(UpdateProgressAction.create(progressId, updateOptions)),
71
+ end: () => this.actionDispatcher.dispatch(EndProgressAction.create(progressId))
72
+ };
73
+ }
74
+ }
@@ -48,7 +48,7 @@ export namespace ArgsUtil {
48
48
  }
49
49
 
50
50
  return {
51
- [KEY_RADIUS_TOP_RIGHT]: topLeft,
51
+ [KEY_RADIUS_TOP_LEFT]: topLeft,
52
52
  [KEY_RADIUS_BOTTOM_LEFT]: bottomLeft,
53
53
  [KEY_RADIUS_BOTTOM_RIGHT]: bottomRight,
54
54
  [KEY_RADIUS_TOP_RIGHT]: topRight
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2023 EclipseSource and others.
2
+ * Copyright (c) 2022-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,7 +80,8 @@ export function getRequestParentName(context: interfaces.Context): string | unde
80
80
  if (context.currentRequest.parentRequest) {
81
81
  const bindings = context.currentRequest.parentRequest.bindings;
82
82
  if (bindings.length > 0) {
83
- return bindings[0].implementationType?.name;
83
+ const binding = bindings[0] as interfaces.Binding<{ name?: string }>;
84
+ return binding.implementationType?.name;
84
85
  }
85
86
  }
86
87
  return undefined;
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=action-dispatcher.spec.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"action-dispatcher.spec.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.spec.ts"],"names":[],"mappings":""}