@eclipse-glsp/server 1.1.0-next.f692ea4.55 → 2.1.0-next.70

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 (279) hide show
  1. package/lib/browser/launch/worker-server-launcher.js +2 -2
  2. package/lib/browser/launch/worker-server-launcher.js.map +1 -1
  3. package/lib/common/actions/action-dispatcher.d.ts +2 -1
  4. package/lib/common/actions/action-dispatcher.d.ts.map +1 -1
  5. package/lib/common/actions/action-dispatcher.js +9 -7
  6. package/lib/common/actions/action-dispatcher.js.map +1 -1
  7. package/lib/common/actions/action-handler-registry.js +4 -4
  8. package/lib/common/actions/action-handler-registry.js.map +1 -1
  9. package/lib/common/actions/client-action-handler.d.ts +17 -8
  10. package/lib/common/actions/client-action-handler.d.ts.map +1 -1
  11. package/lib/common/actions/client-action-handler.js +32 -22
  12. package/lib/common/actions/client-action-handler.js.map +1 -1
  13. package/lib/common/actions/global-action-provider.d.ts +6 -21
  14. package/lib/common/actions/global-action-provider.d.ts.map +1 -1
  15. package/lib/common/actions/global-action-provider.js +17 -22
  16. package/lib/common/actions/global-action-provider.js.map +1 -1
  17. package/lib/common/command/command-stack.js +2 -2
  18. package/lib/common/command/command-stack.js.map +1 -1
  19. package/lib/common/command/command.js +1 -1
  20. package/lib/common/command/command.js.map +1 -1
  21. package/lib/common/command/recording-command.d.ts +9 -15
  22. package/lib/common/command/recording-command.d.ts.map +1 -1
  23. package/lib/common/command/recording-command.js +12 -26
  24. package/lib/common/command/recording-command.js.map +1 -1
  25. package/lib/common/command/undo-redo-action-handler.js +2 -2
  26. package/lib/common/command/undo-redo-action-handler.js.map +1 -1
  27. package/lib/common/di/binding-target.d.ts.map +1 -1
  28. package/lib/common/di/binding-target.js +3 -2
  29. package/lib/common/di/binding-target.js.map +1 -1
  30. package/lib/common/di/client-session-module.d.ts +9 -1
  31. package/lib/common/di/client-session-module.d.ts.map +1 -1
  32. package/lib/common/di/client-session-module.js +9 -9
  33. package/lib/common/di/client-session-module.js.map +1 -1
  34. package/lib/common/di/diagram-module.d.ts +23 -1
  35. package/lib/common/di/diagram-module.d.ts.map +1 -1
  36. package/lib/common/di/diagram-module.js +23 -53
  37. package/lib/common/di/diagram-module.js.map +1 -1
  38. package/lib/common/di/glsp-module.js +2 -2
  39. package/lib/common/di/glsp-module.js.map +1 -1
  40. package/lib/common/di/server-module.d.ts +0 -1
  41. package/lib/common/di/server-module.d.ts.map +1 -1
  42. package/lib/common/di/server-module.js +0 -1
  43. package/lib/common/di/server-module.js.map +1 -1
  44. package/lib/common/diagram/diagram-configuration.js +1 -1
  45. package/lib/common/diagram/diagram-configuration.js.map +1 -1
  46. package/lib/common/features/clipboard/request-clipboard-data-action-handler.d.ts.map +1 -1
  47. package/lib/common/features/clipboard/request-clipboard-data-action-handler.js +2 -2
  48. package/lib/common/features/clipboard/request-clipboard-data-action-handler.js.map +1 -1
  49. package/lib/common/features/contextactions/command-palette-action-provider.js +2 -2
  50. package/lib/common/features/contextactions/command-palette-action-provider.js.map +1 -1
  51. package/lib/common/features/contextactions/context-actions-provider-registry.js +2 -2
  52. package/lib/common/features/contextactions/context-actions-provider-registry.js.map +1 -1
  53. package/lib/common/features/contextactions/context-menu-item-provider.js +2 -2
  54. package/lib/common/features/contextactions/context-menu-item-provider.js.map +1 -1
  55. package/lib/common/features/contextactions/request-context-actions-handler.js +2 -2
  56. package/lib/common/features/contextactions/request-context-actions-handler.js.map +1 -1
  57. package/lib/common/features/contextactions/tool-palette-item-provider.js +4 -4
  58. package/lib/common/features/contextactions/tool-palette-item-provider.js.map +1 -1
  59. package/lib/common/features/directediting/context-edit-validator-registry.js +2 -2
  60. package/lib/common/features/directediting/context-edit-validator-registry.js.map +1 -1
  61. package/lib/common/features/directediting/label-edit-validator.js +2 -2
  62. package/lib/common/features/directediting/label-edit-validator.js.map +1 -1
  63. package/lib/common/features/directediting/request-edit-validation-handler.js +2 -2
  64. package/lib/common/features/directediting/request-edit-validation-handler.js.map +1 -1
  65. package/lib/common/features/layout/computed-bounds-action-handler.js +2 -2
  66. package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
  67. package/lib/common/features/layout/layout-operation-handler.js +2 -2
  68. package/lib/common/features/layout/layout-operation-handler.js.map +1 -1
  69. package/lib/common/features/model/gmodel-factory.js +2 -2
  70. package/lib/common/features/model/gmodel-factory.js.map +1 -1
  71. package/lib/common/features/model/gmodel-index.js +2 -2
  72. package/lib/common/features/model/gmodel-index.js.map +1 -1
  73. package/lib/common/features/model/gmodel-serializer.d.ts +10 -10
  74. package/lib/common/features/model/gmodel-serializer.d.ts.map +1 -1
  75. package/lib/common/features/model/gmodel-serializer.js +2 -2
  76. package/lib/common/features/model/gmodel-serializer.js.map +1 -1
  77. package/lib/common/features/model/model-state.d.ts.map +1 -1
  78. package/lib/common/features/model/model-state.js +5 -2
  79. package/lib/common/features/model/model-state.js.map +1 -1
  80. package/lib/common/features/model/model-submission-handler.d.ts +30 -3
  81. package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
  82. package/lib/common/features/model/model-submission-handler.js +73 -9
  83. package/lib/common/features/model/model-submission-handler.js.map +1 -1
  84. package/lib/common/features/model/request-model-action-handler.d.ts +5 -6
  85. package/lib/common/features/model/request-model-action-handler.d.ts.map +1 -1
  86. package/lib/common/features/model/request-model-action-handler.js +37 -15
  87. package/lib/common/features/model/request-model-action-handler.js.map +1 -1
  88. package/lib/common/features/model/save-model-action-handler.js +2 -2
  89. package/lib/common/features/model/save-model-action-handler.js.map +1 -1
  90. package/lib/common/features/navigation/navigation-target-provider-registry.js +2 -2
  91. package/lib/common/features/navigation/navigation-target-provider-registry.js.map +1 -1
  92. package/lib/common/features/navigation/navigation-target-resolver.js +2 -2
  93. package/lib/common/features/navigation/navigation-target-resolver.js.map +1 -1
  94. package/lib/common/features/navigation/request-navigation-targets-action-handler.js +2 -2
  95. package/lib/common/features/navigation/request-navigation-targets-action-handler.js.map +1 -1
  96. package/lib/common/features/navigation/resolve-navigation-targets-action-handler.js +2 -2
  97. package/lib/common/features/navigation/resolve-navigation-targets-action-handler.js.map +1 -1
  98. package/lib/common/features/popup/request-popup-model-action-handler.js +2 -2
  99. package/lib/common/features/popup/request-popup-model-action-handler.js.map +1 -1
  100. package/lib/common/features/progress/progress-service.d.ts +44 -0
  101. package/lib/common/features/progress/progress-service.d.ts.map +1 -0
  102. package/lib/common/features/progress/progress-service.js +51 -0
  103. package/lib/common/features/progress/progress-service.js.map +1 -0
  104. package/lib/common/features/type-hints/edge-creation-checker.d.ts +42 -0
  105. package/lib/common/features/type-hints/edge-creation-checker.d.ts.map +1 -0
  106. package/lib/common/features/type-hints/edge-creation-checker.js +20 -0
  107. package/lib/common/features/type-hints/edge-creation-checker.js.map +1 -0
  108. package/lib/common/features/type-hints/request-check-edge-action-handler.d.ts +29 -0
  109. package/lib/common/features/type-hints/request-check-edge-action-handler.d.ts.map +1 -0
  110. package/lib/common/features/type-hints/request-check-edge-action-handler.js +72 -0
  111. package/lib/common/features/type-hints/request-check-edge-action-handler.js.map +1 -0
  112. package/lib/common/{diagram → features/type-hints}/request-type-hints-action-handler.d.ts +2 -3
  113. package/lib/common/features/type-hints/request-type-hints-action-handler.d.ts.map +1 -0
  114. package/lib/common/{diagram → features/type-hints}/request-type-hints-action-handler.js +3 -4
  115. package/lib/common/features/type-hints/request-type-hints-action-handler.js.map +1 -0
  116. package/lib/common/features/validation/model-validator.d.ts +47 -2
  117. package/lib/common/features/validation/model-validator.d.ts.map +1 -1
  118. package/lib/common/features/validation/model-validator.js +80 -1
  119. package/lib/common/features/validation/model-validator.js.map +1 -1
  120. package/lib/common/features/validation/request-markers-handler.d.ts +15 -0
  121. package/lib/common/features/validation/request-markers-handler.d.ts.map +1 -1
  122. package/lib/common/features/validation/request-markers-handler.js +5 -11
  123. package/lib/common/features/validation/request-markers-handler.js.map +1 -1
  124. package/lib/common/gmodel/apply-label-edit-operation-handler.js +2 -2
  125. package/lib/common/gmodel/apply-label-edit-operation-handler.js.map +1 -1
  126. package/lib/common/gmodel/change-bounds-operation-handler.js +2 -2
  127. package/lib/common/gmodel/change-bounds-operation-handler.js.map +1 -1
  128. package/lib/common/gmodel/change-routing-points-operation-handler.js +2 -2
  129. package/lib/common/gmodel/change-routing-points-operation-handler.js.map +1 -1
  130. package/lib/common/gmodel/cut-operation-handler.d.ts.map +1 -1
  131. package/lib/common/gmodel/cut-operation-handler.js +7 -5
  132. package/lib/common/gmodel/cut-operation-handler.js.map +1 -1
  133. package/lib/common/gmodel/delete-operation-handler.d.ts +1 -1
  134. package/lib/common/gmodel/delete-operation-handler.d.ts.map +1 -1
  135. package/lib/common/gmodel/delete-operation-handler.js +7 -7
  136. package/lib/common/gmodel/delete-operation-handler.js.map +1 -1
  137. package/lib/common/gmodel/gmodel-create-edge-operation-handler.d.ts +3 -3
  138. package/lib/common/gmodel/gmodel-create-edge-operation-handler.d.ts.map +1 -1
  139. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js +2 -2
  140. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js.map +1 -1
  141. package/lib/common/gmodel/gmodel-create-node-operation-handler.d.ts +3 -3
  142. package/lib/common/gmodel/gmodel-create-node-operation-handler.d.ts.map +1 -1
  143. package/lib/common/gmodel/gmodel-create-node-operation-handler.js +2 -2
  144. package/lib/common/gmodel/gmodel-create-node-operation-handler.js.map +1 -1
  145. package/lib/common/gmodel/gmodel-diagram-module.js +2 -2
  146. package/lib/common/gmodel/gmodel-diagram-module.js.map +1 -1
  147. package/lib/common/gmodel/gmodel-operation-handler.js +1 -1
  148. package/lib/common/gmodel/gmodel-operation-handler.js.map +1 -1
  149. package/lib/common/gmodel/paste-operation-handler.d.ts.map +1 -1
  150. package/lib/common/gmodel/paste-operation-handler.js +2 -2
  151. package/lib/common/gmodel/paste-operation-handler.js.map +1 -1
  152. package/lib/common/gmodel/reconnect-edge-operation-handler.js +2 -2
  153. package/lib/common/gmodel/reconnect-edge-operation-handler.js.map +1 -1
  154. package/lib/common/index.d.ts +3 -1
  155. package/lib/common/index.d.ts.map +1 -1
  156. package/lib/common/index.js +3 -1
  157. package/lib/common/index.js.map +1 -1
  158. package/lib/common/launch/glsp-server-launcher.js +2 -2
  159. package/lib/common/launch/glsp-server-launcher.js.map +1 -1
  160. package/lib/common/launch/jsonrpc-server-launcher.js +2 -2
  161. package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -1
  162. package/lib/common/operations/compound-operation-handler.d.ts +5 -0
  163. package/lib/common/operations/compound-operation-handler.d.ts.map +1 -1
  164. package/lib/common/operations/compound-operation-handler.js +12 -12
  165. package/lib/common/operations/compound-operation-handler.js.map +1 -1
  166. package/lib/common/operations/create-operation-handler.d.ts +19 -5
  167. package/lib/common/operations/create-operation-handler.d.ts.map +1 -1
  168. package/lib/common/operations/create-operation-handler.js +3 -2
  169. package/lib/common/operations/create-operation-handler.js.map +1 -1
  170. package/lib/common/operations/json-operation-handler.d.ts +94 -0
  171. package/lib/common/operations/json-operation-handler.d.ts.map +1 -0
  172. package/lib/common/operations/json-operation-handler.js +120 -0
  173. package/lib/common/operations/json-operation-handler.js.map +1 -0
  174. package/lib/common/operations/operation-action-handler.d.ts.map +1 -1
  175. package/lib/common/operations/operation-action-handler.js +3 -3
  176. package/lib/common/operations/operation-action-handler.js.map +1 -1
  177. package/lib/common/operations/operation-handler-registry.d.ts +1 -9
  178. package/lib/common/operations/operation-handler-registry.d.ts.map +1 -1
  179. package/lib/common/operations/operation-handler-registry.js +4 -14
  180. package/lib/common/operations/operation-handler-registry.js.map +1 -1
  181. package/lib/common/operations/operation-handler.d.ts +2 -2
  182. package/lib/common/operations/operation-handler.d.ts.map +1 -1
  183. package/lib/common/operations/operation-handler.js +2 -2
  184. package/lib/common/operations/operation-handler.js.map +1 -1
  185. package/lib/common/protocol/client-action.d.ts +31 -0
  186. package/lib/common/protocol/client-action.d.ts.map +1 -0
  187. package/lib/common/protocol/client-action.js +35 -0
  188. package/lib/common/protocol/client-action.js.map +1 -0
  189. package/lib/common/protocol/glsp-server.d.ts +1 -1
  190. package/lib/common/protocol/glsp-server.d.ts.map +1 -1
  191. package/lib/common/protocol/glsp-server.js +9 -11
  192. package/lib/common/protocol/glsp-server.js.map +1 -1
  193. package/lib/common/session/client-session-factory.js +5 -5
  194. package/lib/common/session/client-session-factory.js.map +1 -1
  195. package/lib/common/session/client-session-manager.js +2 -2
  196. package/lib/common/session/client-session-manager.js.map +1 -1
  197. package/lib/common/utils/args-util.js +2 -2
  198. package/lib/common/utils/args-util.js.map +1 -1
  199. package/lib/common/utils/client-options-util.d.ts +3 -0
  200. package/lib/common/utils/client-options-util.d.ts.map +1 -1
  201. package/lib/common/utils/client-options-util.js +5 -15
  202. package/lib/common/utils/client-options-util.js.map +1 -1
  203. package/lib/common/utils/console-logger.js +2 -2
  204. package/lib/common/utils/console-logger.js.map +1 -1
  205. package/lib/common/utils/logger.d.ts.map +1 -1
  206. package/lib/common/utils/logger.js +5 -4
  207. package/lib/common/utils/logger.js.map +1 -1
  208. package/lib/common/utils/promise-queue.d.ts.map +1 -1
  209. package/lib/common/utils/promise-queue.js +3 -6
  210. package/lib/common/utils/promise-queue.js.map +1 -1
  211. package/lib/common/utils/registry.d.ts +3 -1
  212. package/lib/common/utils/registry.d.ts.map +1 -1
  213. package/lib/common/utils/registry.js +15 -6
  214. package/lib/common/utils/registry.js.map +1 -1
  215. package/lib/node/abstract-json-model-storage.d.ts.map +1 -1
  216. package/lib/node/abstract-json-model-storage.js +10 -4
  217. package/lib/node/abstract-json-model-storage.js.map +1 -1
  218. package/lib/node/gmodel/gmodel-storage.d.ts.map +1 -1
  219. package/lib/node/gmodel/gmodel-storage.js +4 -3
  220. package/lib/node/gmodel/gmodel-storage.js.map +1 -1
  221. package/lib/node/launch/cli-parser.js +1 -1
  222. package/lib/node/launch/cli-parser.js.map +1 -1
  223. package/lib/node/launch/socket-server-launcher.js +2 -2
  224. package/lib/node/launch/socket-server-launcher.js.map +1 -1
  225. package/lib/node/launch/websocket-server-launcher.js +2 -2
  226. package/lib/node/launch/websocket-server-launcher.js.map +1 -1
  227. package/package.json +7 -6
  228. package/src/common/actions/action-dispatcher.spec.ts +3 -2
  229. package/src/common/actions/action-dispatcher.ts +8 -5
  230. package/src/common/actions/client-action-handler.ts +28 -18
  231. package/src/common/actions/global-action-provider.spec.ts +4 -15
  232. package/src/common/actions/global-action-provider.ts +21 -25
  233. package/src/common/command/recording-command.spec.ts +15 -5
  234. package/src/common/command/recording-command.ts +16 -27
  235. package/src/common/di/binding-target.ts +1 -0
  236. package/src/common/di/client-session-module.ts +17 -10
  237. package/src/common/di/diagram-module.ts +31 -70
  238. package/src/common/di/server-module.ts +0 -1
  239. package/src/common/features/clipboard/request-clipboard-data-action-handler.ts +3 -3
  240. package/src/common/features/model/gmodel-serializer.ts +11 -11
  241. package/src/common/features/model/model-state.ts +3 -0
  242. package/src/common/features/model/model-submission-handler.ts +64 -7
  243. package/src/common/features/model/request-model-action-handler.ts +37 -17
  244. package/src/common/features/progress/progress-service.ts +74 -0
  245. package/src/common/features/type-hints/edge-creation-checker.ts +44 -0
  246. package/src/common/features/type-hints/request-check-edge-action-handler.ts +62 -0
  247. package/src/common/{diagram → features/type-hints}/request-type-hints-action-handler.spec.ts +2 -2
  248. package/src/common/{diagram → features/type-hints}/request-type-hints-action-handler.ts +2 -3
  249. package/src/common/features/validation/model-validator.ts +75 -3
  250. package/src/common/features/validation/request-markers-handler.ts +4 -10
  251. package/src/common/gmodel/cut-operation-handler.ts +5 -3
  252. package/src/common/gmodel/delete-operation-handler.ts +6 -5
  253. package/src/common/gmodel/gmodel-create-edge-operation-handler.ts +3 -3
  254. package/src/common/gmodel/gmodel-create-node-operation-handler.ts +3 -3
  255. package/src/common/gmodel/paste-operation-handler.ts +2 -2
  256. package/src/common/index.ts +3 -1
  257. package/src/common/operations/compound-operation-handler.ts +6 -1
  258. package/src/common/operations/create-operation-handler.ts +22 -5
  259. package/src/common/operations/json-operation-handler.ts +147 -0
  260. package/src/common/operations/operation-action-handler.ts +2 -2
  261. package/src/common/operations/operation-handler-registry.ts +1 -12
  262. package/src/common/operations/operation-handler.ts +2 -2
  263. package/src/common/protocol/client-action.ts +38 -0
  264. package/src/common/protocol/glsp-server.spec.ts +11 -10
  265. package/src/common/protocol/glsp-server.ts +11 -14
  266. package/src/common/session/client-session-factory.spec.ts +2 -2
  267. package/src/common/session/client-session-factory.ts +3 -3
  268. package/src/common/session/client-session-manager.spec.ts +4 -3
  269. package/src/common/utils/args-util.ts +1 -1
  270. package/src/common/utils/client-options-util.ts +8 -0
  271. package/src/common/utils/logger.ts +2 -1
  272. package/src/common/utils/promise-queue.ts +4 -5
  273. package/src/common/utils/registry.spec.ts +3 -1
  274. package/src/common/utils/registry.ts +8 -3
  275. package/src/node/abstract-json-model-storage.ts +8 -2
  276. package/src/node/gmodel/gmodel-storage.ts +3 -3
  277. package/src/node/launch/cli-parser.ts +1 -1
  278. package/lib/common/diagram/request-type-hints-action-handler.d.ts.map +0 -1
  279. package/lib/common/diagram/request-type-hints-action-handler.js.map +0 -1
@@ -50,8 +50,8 @@ let WorkerServerLauncher = class WorkerServerLauncher extends jsonrpc_server_lau
50
50
  return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader((_a = options.context) !== null && _a !== void 0 ? _a : self), new jsonrpc.BrowserMessageWriter((_b = options.context) !== null && _b !== void 0 ? _b : self));
51
51
  }
52
52
  };
53
- WorkerServerLauncher = __decorate([
53
+ exports.WorkerServerLauncher = WorkerServerLauncher;
54
+ exports.WorkerServerLauncher = WorkerServerLauncher = __decorate([
54
55
  (0, inversify_1.injectable)()
55
56
  ], WorkerServerLauncher);
56
- exports.WorkerServerLauncher = WorkerServerLauncher;
57
57
  //# sourceMappingURL=worker-server-launcher.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAElD,yFAA+G;AAKlG,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC;AA5BY,oDAAoB"}
1
+ {"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAElD,yFAA+G;AAKlG,QAAA,qBAAqB,GAAG,kCAAkC,CAAC;AAGjE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mDAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,6BAAqB,CAAC,CAAC;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;;YACpC,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,MAAA,IAAI,CAAC,UAAU,0CAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC"}
@@ -17,6 +17,7 @@ import { Action, Disposable, MaybeArray } from '@eclipse-glsp/protocol';
17
17
  import { PromiseQueue } from '../utils/promise-queue';
18
18
  import { ActionHandler } from './action-handler';
19
19
  import { ActionHandlerRegistry } from './action-handler-registry';
20
+ import { ClientActionForwarder } from './client-action-handler';
20
21
  export declare const ActionDispatcher: unique symbol;
21
22
  /**
22
23
  * The central component that process all {@link Action}s by dispatching them to their designated
@@ -50,7 +51,7 @@ export interface ActionDispatcher {
50
51
  }
51
52
  export declare class DefaultActionDispatcher implements ActionDispatcher, Disposable {
52
53
  protected actionHandlerRegistry: ActionHandlerRegistry;
53
- protected clientActionKinds: string[];
54
+ protected clientActionForwarder: ClientActionForwarder;
54
55
  private logger;
55
56
  protected clientId: string;
56
57
  protected actionQueue: PromiseQueue<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,UAAU,EAAoD,MAAM,wBAAwB,CAAC;AAKpI,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IAExE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAGtC,OAAO,CAAC,MAAM,CAAS;IAGvB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,qBAAsB;IAC3C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAQvB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAqBzC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK1F,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAM/D,OAAO,IAAI,IAAI;CAGlB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE"}
1
+ {"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAY,UAAU,EAAoD,MAAM,wBAAwB,CAAC;AAKpI,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IAExE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,OAAO,CAAC,MAAM,CAAS;IAGvB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,qBAAsB;IAC3C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAQvB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAuBzC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK1F,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAM/D,OAAO,IAAI,IAAI;CAGlB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE"}
@@ -32,6 +32,7 @@ const glsp_server_error_1 = require("../utils/glsp-server-error");
32
32
  const logger_1 = require("../utils/logger");
33
33
  const promise_queue_1 = require("../utils/promise-queue");
34
34
  const action_handler_registry_1 = require("./action-handler-registry");
35
+ const client_action_handler_1 = require("./client-action-handler");
35
36
  exports.ActionDispatcher = Symbol('ActionDispatcher');
36
37
  let DefaultActionDispatcher = class DefaultActionDispatcher {
37
38
  constructor() {
@@ -40,15 +41,16 @@ let DefaultActionDispatcher = class DefaultActionDispatcher {
40
41
  }
41
42
  dispatch(action) {
42
43
  // Dont queue actions that are just delegated to the client
43
- if (this.clientActionKinds.includes(action.kind)) {
44
+ if (this.clientActionForwarder.shouldForwardToClient(action)) {
44
45
  return this.doDispatch(action);
45
46
  }
46
47
  return this.actionQueue.enqueue(() => this.doDispatch(action));
47
48
  }
48
49
  async doDispatch(action) {
49
50
  this.logger.debug('Dispatch action:', action.kind);
51
+ const handledOnClient = this.clientActionForwarder.handle(action);
50
52
  const actionHandlers = this.actionHandlerRegistry.get(action.kind);
51
- if (actionHandlers.length === 0) {
53
+ if (!handledOnClient && actionHandlers.length === 0) {
52
54
  throw new glsp_server_error_1.GLSPServerError(`No handler registered for action kind: ${action.kind}`);
53
55
  }
54
56
  const responses = [];
@@ -91,14 +93,15 @@ let DefaultActionDispatcher = class DefaultActionDispatcher {
91
93
  this.actionQueue.clear();
92
94
  }
93
95
  };
96
+ exports.DefaultActionDispatcher = DefaultActionDispatcher;
94
97
  __decorate([
95
98
  (0, inversify_1.inject)(action_handler_registry_1.ActionHandlerRegistry),
96
99
  __metadata("design:type", action_handler_registry_1.ActionHandlerRegistry)
97
100
  ], DefaultActionDispatcher.prototype, "actionHandlerRegistry", void 0);
98
101
  __decorate([
99
- (0, inversify_1.inject)(service_identifiers_1.ClientActionKinds),
100
- __metadata("design:type", Array)
101
- ], DefaultActionDispatcher.prototype, "clientActionKinds", void 0);
102
+ (0, inversify_1.inject)(client_action_handler_1.ClientActionForwarder),
103
+ __metadata("design:type", client_action_handler_1.ClientActionForwarder)
104
+ ], DefaultActionDispatcher.prototype, "clientActionForwarder", void 0);
102
105
  __decorate([
103
106
  (0, inversify_1.inject)(logger_1.Logger),
104
107
  __metadata("design:type", logger_1.Logger)
@@ -107,10 +110,9 @@ __decorate([
107
110
  (0, inversify_1.inject)(service_identifiers_1.ClientId),
108
111
  __metadata("design:type", String)
109
112
  ], DefaultActionDispatcher.prototype, "clientId", void 0);
110
- DefaultActionDispatcher = __decorate([
113
+ exports.DefaultActionDispatcher = DefaultActionDispatcher = __decorate([
111
114
  (0, inversify_1.injectable)()
112
115
  ], DefaultActionDispatcher);
113
- exports.DefaultActionDispatcher = DefaultActionDispatcher;
114
116
  /**
115
117
  * Transfers the {@link RequestAction.requestId id} from request to response if applicable.
116
118
  *
@@ -1 +1 @@
1
- {"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
@@ -32,10 +32,10 @@ let ActionHandlerRegistry = class ActionHandlerRegistry extends registry_1.Multi
32
32
  return result.sort((a, b) => { var _a, _b; return (_a = a.priority) !== null && _a !== void 0 ? _a : 0 - ((_b = b.priority) !== null && _b !== void 0 ? _b : 0); });
33
33
  }
34
34
  };
35
- ActionHandlerRegistry = __decorate([
35
+ exports.ActionHandlerRegistry = ActionHandlerRegistry;
36
+ exports.ActionHandlerRegistry = ActionHandlerRegistry = __decorate([
36
37
  (0, inversify_1.injectable)()
37
38
  ], ActionHandlerRegistry);
38
- exports.ActionHandlerRegistry = ActionHandlerRegistry;
39
39
  let ActionHandlerRegistryInitializer = class ActionHandlerRegistryInitializer {
40
40
  constructor() {
41
41
  this.handlerConstructors = [];
@@ -45,6 +45,7 @@ let ActionHandlerRegistryInitializer = class ActionHandlerRegistryInitializer {
45
45
  handlers.forEach(handler => this.registry.registerHandler(handler));
46
46
  }
47
47
  };
48
+ exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer;
48
49
  __decorate([
49
50
  (0, inversify_1.inject)(action_handler_1.ActionHandlerFactory),
50
51
  __metadata("design:type", Function)
@@ -58,8 +59,7 @@ __decorate([
58
59
  (0, inversify_1.inject)(ActionHandlerRegistry),
59
60
  __metadata("design:type", ActionHandlerRegistry)
60
61
  ], ActionHandlerRegistryInitializer.prototype, "registry", void 0);
61
- ActionHandlerRegistryInitializer = __decorate([
62
+ exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer = __decorate([
62
63
  (0, inversify_1.injectable)()
63
64
  ], ActionHandlerRegistryInitializer);
64
- exports.ActionHandlerRegistryInitializer = ActionHandlerRegistryInitializer;
65
65
  //# sourceMappingURL=action-handler-registry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC;IACtE,CAAC;CACJ,CAAA;AAhBY,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgBjC;AAhBY,sDAAqB;AAmB3B,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAMO,wBAAmB,GAA+B,EAAE,CAAC;IASnE,CAAC;IAJG,UAAU,CAAC,KAAY;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAdG;IAAC,IAAA,kBAAM,EAAC,qCAAoB,CAAC;;iEACW;AAExC;IAAC,IAAA,kBAAM,EAAC,yCAAwB,CAAC;IAChC,IAAA,oBAAQ,GAAE;;6EACoD;AAE/D;IAAC,IAAA,kBAAM,EAAC,qBAAqB,CAAC;8BACV,qBAAqB;kEAAC;AATjC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAe5C;AAfY,4EAAgC"}
1
+ {"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC;IACtE,CAAC;CACJ,CAAA;AAhBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgBjC;AAGM,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAMO,wBAAmB,GAA+B,EAAE,CAAC;IASnE,CAAC;IAJG,UAAU,CAAC,KAAY;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAfY,4EAAgC;AAE/B;IADT,IAAA,kBAAM,EAAC,qCAAoB,CAAC;;iEACW;AAI9B;IAFT,IAAA,kBAAM,EAAC,yCAAwB,CAAC;IAChC,IAAA,oBAAQ,GAAE;;6EACoD;AAGrD;IADT,IAAA,kBAAM,EAAC,qBAAqB,CAAC;8BACV,qBAAqB;kEAAC;2CATjC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAe5C"}
@@ -15,15 +15,24 @@
15
15
  ********************************************************************************/
16
16
  import { Action, GLSPClientProxy } from '@eclipse-glsp/protocol';
17
17
  /**
18
- * The client action handler is responsible of handling action kinds that are intended for the
19
- * GLSP client, by sending them to the client over json-rpc.
18
+ * Component responsible for forwarding actions that are (also) handled by the
19
+ * client
20
20
  */
21
- export declare class ClientActionHandler implements ClientActionHandler {
22
- actionKinds: string[];
23
- protected glspClient?: GLSPClientProxy;
21
+ export declare class ClientActionForwarder {
22
+ actionKinds: Set<string>;
23
+ protected glspClient: GLSPClientProxy;
24
24
  protected readonly clientId: string;
25
- constructor(actionKinds?: string[]);
26
- execute(action: Action): [];
27
- protected send(action: Action): void;
25
+ constructor(actionKinds: Set<string>);
26
+ /**
27
+ * Processes the given action and checks wether it is a
28
+ * `clientAction` i.e. an action that should be forwarded to
29
+ * the client to be handled there. If the check is successful
30
+ * the action is wrapped in an {@link ActionMessage} and sent to the client.
31
+ *
32
+ * @param action The action to check and forward
33
+ * @return `true` if the action was forwarded to the client, `false` otherwise
34
+ */
35
+ handle(action: Action): boolean;
36
+ shouldForwardToClient(action: Action): boolean;
28
37
  }
29
38
  //# sourceMappingURL=client-action-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIhF;;;GAGG;AAEH,qBACa,mBAAoB,YAAW,mBAAmB;IAQD,WAAW,EAAE,MAAM,EAAE;IAL/E,SAAS,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEsB,WAAW,GAAE,MAAM,EAAO;IAEpF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;IAK3B,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAQvC"}
1
+ {"version":3,"file":"client-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAiB,eAAe,EAAkB,MAAM,wBAAwB,CAAC;AAKhG;;;GAGG;AACH,qBACa,qBAAqB;IAOgB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;IALtE,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IAGtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEU,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;IAEtE;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAS/B,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAMjD"}
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
12
12
  return function (target, key) { decorator(target, key, paramIndex); }
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.ClientActionHandler = void 0;
15
+ exports.ClientActionForwarder = void 0;
16
16
  /********************************************************************************
17
17
  * Copyright (c) 2022-2023 STMicroelectronics and others.
18
18
  *
@@ -31,41 +31,51 @@ exports.ClientActionHandler = void 0;
31
31
  const protocol_1 = require("@eclipse-glsp/protocol");
32
32
  const inversify_1 = require("inversify");
33
33
  const service_identifiers_1 = require("../di/service-identifiers");
34
+ const client_action_1 = require("../protocol/client-action");
34
35
  /**
35
- * The client action handler is responsible of handling action kinds that are intended for the
36
- * GLSP client, by sending them to the client over json-rpc.
36
+ * Component responsible for forwarding actions that are (also) handled by the
37
+ * client
37
38
  */
38
- let ClientActionHandler = class ClientActionHandler {
39
- constructor(actionKinds = []) {
39
+ let ClientActionForwarder = class ClientActionForwarder {
40
+ constructor(actionKinds) {
40
41
  this.actionKinds = actionKinds;
41
42
  }
42
- execute(action) {
43
- this.send(action);
44
- return [];
45
- }
46
- send(action) {
47
- const message = { action, clientId: this.clientId };
48
- if (this.glspClient) {
43
+ /**
44
+ * Processes the given action and checks wether it is a
45
+ * `clientAction` i.e. an action that should be forwarded to
46
+ * the client to be handled there. If the check is successful
47
+ * the action is wrapped in an {@link ActionMessage} and sent to the client.
48
+ *
49
+ * @param action The action to check and forward
50
+ * @return `true` if the action was forwarded to the client, `false` otherwise
51
+ */
52
+ handle(action) {
53
+ if (this.shouldForwardToClient(action)) {
54
+ const message = { action, clientId: this.clientId };
49
55
  this.glspClient.process(message);
50
- return;
56
+ return true;
57
+ }
58
+ return false;
59
+ }
60
+ shouldForwardToClient(action) {
61
+ if (client_action_1.ClientAction.is(action)) {
62
+ return false;
51
63
  }
52
- throw new Error('Could not send message to client. No GLSPClientProxy is defined');
64
+ return this.actionKinds.has(action.kind) || protocol_1.ResponseAction.is(action);
53
65
  }
54
66
  };
67
+ exports.ClientActionForwarder = ClientActionForwarder;
55
68
  __decorate([
56
69
  (0, inversify_1.inject)(protocol_1.GLSPClientProxy),
57
- (0, inversify_1.optional)(),
58
70
  __metadata("design:type", Object)
59
- ], ClientActionHandler.prototype, "glspClient", void 0);
71
+ ], ClientActionForwarder.prototype, "glspClient", void 0);
60
72
  __decorate([
61
73
  (0, inversify_1.inject)(service_identifiers_1.ClientId),
62
74
  __metadata("design:type", String)
63
- ], ClientActionHandler.prototype, "clientId", void 0);
64
- ClientActionHandler = __decorate([
75
+ ], ClientActionForwarder.prototype, "clientId", void 0);
76
+ exports.ClientActionForwarder = ClientActionForwarder = __decorate([
65
77
  (0, inversify_1.injectable)(),
66
78
  __param(0, (0, inversify_1.inject)(service_identifiers_1.ClientActionKinds)),
67
- __param(0, (0, inversify_1.optional)()),
68
- __metadata("design:paramtypes", [Array])
69
- ], ClientActionHandler);
70
- exports.ClientActionHandler = ClientActionHandler;
79
+ __metadata("design:paramtypes", [Set])
80
+ ], ClientActionForwarder);
71
81
  //# sourceMappingURL=client-action-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgF;AAChF,yCAAyD;AACzD,mEAAwE;AAExE;;;GAGG;AAGI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAQ5B,YAA0D,cAAwB,EAAE;QAA1B,gBAAW,GAAX,WAAW,CAAe;IAAG,CAAC;IAExF,OAAO,CAAC,MAAc;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IAES,IAAI,CAAC,MAAc;QACzB,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO;SACV;QACD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACvF,CAAC;CACJ,CAAA;AAtBG;IAAC,IAAA,kBAAM,EAAC,0BAAe,CAAC;IACvB,IAAA,oBAAQ,GAAE;;uDAC4B;AAEvC;IAAC,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;qDACmB;AAN3B,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IASI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GARzC,mBAAmB,CAuB/B;AAvBY,kDAAmB"}
1
+ {"version":3,"file":"client-action-handler.js","sourceRoot":"","sources":["../../../src/common/actions/client-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgG;AAChG,yCAA+C;AAC/C,mEAAwE;AACxE,6DAAyD;AAEzD;;;GAGG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAO9B,YAA8C,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAc;QACjB,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;YACpC,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,qBAAqB,CAAC,MAAc;QAChC,IAAI,4BAAY,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAc,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;CACJ,CAAA;AAjCY,sDAAqB;AAEpB;IADT,IAAA,kBAAM,EAAC,0BAAe,CAAC;;yDACc;AAGnB;IADlB,IAAA,kBAAM,EAAC,8BAAQ,CAAC;;uDACmB;gCAL3B,qBAAqB;IADjC,IAAA,sBAAU,GAAE;IAQI,WAAA,IAAA,kBAAM,EAAC,uCAAiB,CAAC,CAAA;qCAAqB,GAAG;GAPrD,qBAAqB,CAiCjC"}
@@ -1,30 +1,15 @@
1
- /********************************************************************************
2
- * Copyright (c) 2022-2023 STMicroelectronics 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
1
  import { Container, ContainerModule } from 'inversify';
17
2
  export declare const GlobalActionProvider: unique symbol;
3
+ /**
4
+ * Provides a map of handled action kinds grouped by `diagramType`
5
+ */
18
6
  export interface GlobalActionProvider {
19
- readonly serverActionKinds: Map<string, string[]>;
20
- readonly clientActionKinds: Map<string, string[]>;
7
+ readonly actionKinds: Map<string, string[]>;
21
8
  }
22
9
  export declare class DefaultGlobalActionProvider implements GlobalActionProvider {
23
- readonly serverActionKinds: Map<string, string[]>;
24
- readonly clientActionKinds: Map<string, string[]>;
10
+ readonly actionKinds: Map<string, string[]>;
25
11
  constructor(serverContainer: Container, diagramModules: Map<string, ContainerModule[]>);
26
12
  createDiagramContainer(serverContainer: Container, modules: ContainerModule[]): Container;
27
- loadServerActionKinds(diagramType: string, diagramContainer: Container): void;
28
- loadClientActionKinds(diagramType: string, diagramContainer: Container): void;
13
+ loadActionKinds(diagramType: string, diagramContainer: Container): void;
29
14
  }
30
15
  //# sourceMappingURL=global-action-provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACrD;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,SAAgB,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGzB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAc1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;IAMzF,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;IAU7E,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;CAMhF"}
1
+ {"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC/C;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGnB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAY1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;IAYzF,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;CAM1E"}
@@ -28,54 +28,49 @@ exports.DefaultGlobalActionProvider = exports.GlobalActionProvider = void 0;
28
28
  *
29
29
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
30
30
  ********************************************************************************/
31
+ const protocol_1 = require("@eclipse-glsp/protocol");
31
32
  const inversify_1 = require("inversify");
33
+ const client_session_module_1 = require("../di/client-session-module");
32
34
  const service_identifiers_1 = require("../di/service-identifiers");
33
35
  const client_session_initializer_1 = require("../session/client-session-initializer");
34
36
  const action_handler_registry_1 = require("./action-handler-registry");
35
- const client_action_handler_1 = require("./client-action-handler");
36
37
  exports.GlobalActionProvider = Symbol('GlobalActionProvider');
37
38
  let DefaultGlobalActionProvider = class DefaultGlobalActionProvider {
38
39
  constructor(serverContainer, diagramModules) {
39
- this.serverActionKinds = new Map();
40
- this.clientActionKinds = new Map();
40
+ this.actionKinds = new Map();
41
41
  diagramModules.forEach((modules, diagramType) => {
42
42
  const container = this.createDiagramContainer(serverContainer, modules);
43
43
  const initializers = container.getAll(client_session_initializer_1.ClientSessionInitializer);
44
44
  initializers.forEach(service => service.initialize());
45
- this.loadServerActionKinds(diagramType, container);
46
- this.loadClientActionKinds(diagramType, container);
45
+ this.loadActionKinds(diagramType, container);
47
46
  container.unbindAll();
48
47
  });
49
48
  }
50
49
  createDiagramContainer(serverContainer, modules) {
51
50
  const container = serverContainer.createChild();
52
- container.load(...modules);
51
+ const clientSessionModule = (0, client_session_module_1.createClientSessionModule)({
52
+ clientId: 'tempId',
53
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
54
+ glspClient: { process: () => { } },
55
+ clientActionKinds: []
56
+ });
57
+ container.load(...modules, clientSessionModule);
53
58
  return container;
54
59
  }
55
- loadServerActionKinds(diagramType, diagramContainer) {
60
+ loadActionKinds(diagramType, diagramContainer) {
56
61
  var _a;
57
62
  const handlerRegistry = diagramContainer.get(action_handler_registry_1.ActionHandlerRegistry);
58
- const diagramServerActions = (_a = this.serverActionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
59
- handlerRegistry
60
- .getAll()
61
- .filter(handler => !(handler instanceof client_action_handler_1.ClientActionHandler))
62
- .forEach(handler => diagramServerActions.push(...handler.actionKinds));
63
- this.serverActionKinds.set(diagramType, [...new Set(diagramServerActions)]);
64
- }
65
- loadClientActionKinds(diagramType, diagramContainer) {
66
- var _a;
67
- const clientActionKinds = diagramContainer.getAll(service_identifiers_1.ClientActionKinds);
68
- const diagramClientActions = (_a = this.clientActionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
69
- diagramClientActions.push(...clientActionKinds);
70
- this.clientActionKinds.set(diagramType, diagramClientActions);
63
+ const diagramServerActions = (_a = this.actionKinds.get(diagramType)) !== null && _a !== void 0 ? _a : [];
64
+ handlerRegistry.getAll().forEach(handler => (0, protocol_1.distinctAdd)(diagramServerActions, ...handler.actionKinds));
65
+ this.actionKinds.set(diagramType, diagramServerActions);
71
66
  }
72
67
  };
73
- DefaultGlobalActionProvider = __decorate([
68
+ exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider;
69
+ exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider = __decorate([
74
70
  (0, inversify_1.injectable)(),
75
71
  __param(0, (0, inversify_1.inject)(service_identifiers_1.InjectionContainer)),
76
72
  __param(1, (0, inversify_1.inject)(service_identifiers_1.DiagramModules)),
77
73
  __metadata("design:paramtypes", [inversify_1.Container,
78
74
  Map])
79
75
  ], DefaultGlobalActionProvider);
80
- exports.DefaultGlobalActionProvider = DefaultGlobalActionProvider;
81
76
  //# sourceMappingURL=global-action-provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA2E;AAC3E,mEAAkG;AAClG,sFAAiF;AACjF,uEAAkE;AAClE,mEAA8D;AAEjD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAQ5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAIpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;QACnC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACnD,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACnD,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,gBAA2B;;QAClE,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QAC3E,eAAe;aACV,MAAM,EAAE;aACR,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,YAAY,2CAAmB,CAAC,CAAC;aAC5D,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,gBAA2B;;QAClE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,MAAM,CAAS,uCAAiB,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QAC3E,oBAAoB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;QAChD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAClE,CAAC;CACJ,CAAA;AA1CY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAMJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GANtC,2BAA2B,CA0CvC;AA1CY,kEAA2B"}
1
+ {"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,uEAAwE;AACxE,mEAA+E;AAC/E,sFAAiF;AACjF,uEAAkE;AAErD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAU5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC;YAClD,QAAQ,EAAE,QAAQ;YAClB,gEAAgE;YAChE,UAAU,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE;YACjC,iBAAiB,EAAE,EAAE;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,gBAA2B;;QAC5D,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACrE,eAAe,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAW,EAAC,oBAAoB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AAnCY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAKJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GALtC,2BAA2B,CAmCvC"}
@@ -91,12 +91,12 @@ let DefaultCommandStack = class DefaultCommandStack {
91
91
  throw error;
92
92
  }
93
93
  };
94
+ exports.DefaultCommandStack = DefaultCommandStack;
94
95
  __decorate([
95
96
  (0, inversify_1.inject)(logger_1.Logger),
96
97
  __metadata("design:type", logger_1.Logger)
97
98
  ], DefaultCommandStack.prototype, "logger", void 0);
98
- DefaultCommandStack = __decorate([
99
+ exports.DefaultCommandStack = DefaultCommandStack = __decorate([
99
100
  (0, inversify_1.injectable)()
100
101
  ], DefaultCommandStack);
101
- exports.DefaultCommandStack = DefaultCommandStack;
102
102
  //# sourceMappingURL=command-stack.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../../src/common/command/command-stack.ts"],"names":[],"mappings":"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"}
@@ -24,7 +24,7 @@ var Command;
24
24
  return (_b = (_a = command.canUndo) === null || _a === void 0 ? void 0 : _a.call(command)) !== null && _b !== void 0 ? _b : true;
25
25
  }
26
26
  Command.canUndo = canUndo;
27
- })(Command = exports.Command || (exports.Command = {}));
27
+ })(Command || (exports.Command = Command = {}));
28
28
  /**
29
29
  * A command that comprises a sequence of subcommands.
30
30
  */
@@ -1 +1 @@
1
- {"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB;;QACpC,OAAO,MAAA,MAAA,OAAO,CAAC,OAAO,uDAAI,mCAAI,IAAI,CAAC;IACvC,CAAC;IAFe,eAAO,UAEtB,CAAA;AACL,CAAC,EAJgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAIvB;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,GAAG,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,eAAe,GAAc,EAAE,CAAC;QAEtC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACpC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC1B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;iBACxB;qBAAM;oBACH,MAAM;iBACT;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QACpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ;AAhED,0CAgEC"}
1
+ {"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB;;QACpC,OAAO,MAAA,MAAA,OAAO,CAAC,OAAO,uDAAI,mCAAI,IAAI,CAAC;IACvC,CAAC;IAFe,eAAO,UAEtB,CAAA;AACL,CAAC,EAJgB,OAAO,uBAAP,OAAO,QAIvB;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,GAAG,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,eAAe,GAAc,EAAE,CAAC;QAEtC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACpC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;gBACnC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC1B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;iBACxB;qBAAM;oBACH,MAAM;iBACT;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QACpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,IAAI;YACA,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;aACxB;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ;AAhED,0CAgEC"}
@@ -13,8 +13,7 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { GModelRootSchema } from '@eclipse-glsp/graph';
17
- import { AnyObject, MaybePromise } from '@eclipse-glsp/protocol';
16
+ import { AnyObject, GModelElementSchema, GModelRootSchema, MaybePromise } from '@eclipse-glsp/protocol';
18
17
  import * as jsonPatch from 'fast-json-patch';
19
18
  import { GModelSerializer } from '../features/model/gmodel-serializer';
20
19
  import { ModelState } from '../features/model/model-state';
@@ -37,7 +36,7 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
37
36
  * The actual execution i.e. series of changes applied to the JSOn object that should be captured.
38
37
  */
39
38
  protected abstract doExecute(): MaybePromise<void>;
40
- protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): MaybePromise<void>;
39
+ protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): jsonPatch.PatchResult<JsonObject>;
41
40
  /**
42
41
  * Captures the original state of the JSON object before executing the command routine.
43
42
  * This implementation cannot clone circular structures as it relies on `JSON.stringify`.
@@ -48,16 +47,12 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
48
47
  undo(): Promise<void>;
49
48
  redo(): Promise<void>;
50
49
  canUndo(): boolean;
51
- }
52
- /**
53
- * Simple base implementation of {@link AbstractRecordingCommand} that records the changes made to the given JSON object during
54
- * the the given `doExecute` function.
55
- */
56
- export declare class RecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
57
- protected jsonObject: JsonObject;
58
- protected doExecute: () => MaybePromise<void>;
59
- constructor(jsonObject: JsonObject, doExecute: () => MaybePromise<void>);
60
- protected getJsonObject(): MaybePromise<JsonObject>;
50
+ /**
51
+ * Optional hook that (if implemented) will be
52
+ * executed after every command-driven action that changed
53
+ * the underlying model i.e. command execute, undo and redo.
54
+ */
55
+ protected postChange?(newModel: JsonObject): MaybePromise<void>;
61
56
  }
62
57
  /**
63
58
  * Simple base implementation of {@link AbstractRecordingCommand} that allows recording of changes made
@@ -68,8 +63,7 @@ export declare class GModelRecordingCommand extends AbstractRecordingCommand<GMo
68
63
  protected serializer: GModelSerializer;
69
64
  protected doExecute: () => MaybePromise<void>;
70
65
  constructor(modelState: ModelState, serializer: GModelSerializer, doExecute: () => MaybePromise<void>);
71
- execute(): Promise<void>;
72
66
  protected getJsonObject(): MaybePromise<GModelRootSchema>;
73
- protected applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): MaybePromise<void>;
67
+ protected postChange(newModel: GModelElementSchema): MaybePromise<void>;
74
68
  }
75
69
  //# sourceMappingURL=recording-command.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC;;;GAGG;AACH,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,SAAS,CAAE,YAAW,OAAO;IAC3F,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;IAI1F;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,OAAO,IAAI,OAAO;CAGrB;AAED;;;GAGG;AACH,qBAAa,gBAAgB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,wBAAwB,CAAC,UAAU,CAAC;IACpG,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAArE,UAAU,EAAE,UAAU,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAI3F,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;CAGtD;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;IACtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,UAAU,EAAE,gBAAgB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAA7G,UAAU,EAAE,UAAU,EAAY,UAAU,EAAE,gBAAgB,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAIpH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,gBAAgB,CAAC;cAItC,UAAU,CAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;CAKhH"}
1
+ {"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC;;;GAGG;AACH,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,SAAS,CAAE,YAAW,OAAO;IAC3F,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC;IAIzG;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,SAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;CAClE;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;IACtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,UAAU,EAAE,gBAAgB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAA7G,UAAU,EAAE,UAAU,EAAY,UAAU,EAAE,gBAAgB,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAInI,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,gBAAgB,CAAC;cAItC,UAAU,CAAC,QAAQ,EAAE,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC;CAInF"}