@eclipse-glsp/server 1.1.0-next.44bd1e0.43 → 1.1.0-next.d07c15f.51

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 (174) hide show
  1. package/lib/browser/di/app-module.d.ts +2 -7
  2. package/lib/browser/di/app-module.d.ts.map +1 -1
  3. package/lib/browser/di/app-module.js +5 -30
  4. package/lib/browser/di/app-module.js.map +1 -1
  5. package/lib/browser/index.d.ts +0 -1
  6. package/lib/browser/index.d.ts.map +1 -1
  7. package/lib/browser/index.js +0 -1
  8. package/lib/browser/index.js.map +1 -1
  9. package/lib/browser/launch/worker-server-launcher.d.ts +11 -8
  10. package/lib/browser/launch/worker-server-launcher.d.ts.map +1 -1
  11. package/lib/browser/launch/worker-server-launcher.js +13 -21
  12. package/lib/browser/launch/worker-server-launcher.js.map +1 -1
  13. package/lib/common/actions/client-action-handler.d.ts +1 -2
  14. package/lib/common/actions/client-action-handler.d.ts.map +1 -1
  15. package/lib/common/actions/client-action-handler.js +17 -2
  16. package/lib/common/actions/client-action-handler.js.map +1 -1
  17. package/lib/common/command/command-stack.d.ts +22 -6
  18. package/lib/common/command/command-stack.d.ts.map +1 -1
  19. package/lib/common/command/command-stack.js +6 -21
  20. package/lib/common/command/command-stack.js.map +1 -1
  21. package/lib/common/command/command-stack.spec.js +31 -31
  22. package/lib/common/command/command-stack.spec.js.map +1 -1
  23. package/lib/common/command/command.d.ts +7 -6
  24. package/lib/common/command/command.d.ts.map +1 -1
  25. package/lib/common/command/command.js +19 -15
  26. package/lib/common/command/command.js.map +1 -1
  27. package/lib/common/command/command.spec.js +8 -8
  28. package/lib/common/command/command.spec.js.map +1 -1
  29. package/lib/common/command/recording-command.d.ts +15 -15
  30. package/lib/common/command/recording-command.d.ts.map +1 -1
  31. package/lib/common/command/recording-command.js +10 -10
  32. package/lib/common/command/recording-command.js.map +1 -1
  33. package/lib/common/command/recording-command.spec.js +8 -8
  34. package/lib/common/command/recording-command.spec.js.map +1 -1
  35. package/lib/common/command/undo-redo-action-handler.d.ts +2 -2
  36. package/lib/common/command/undo-redo-action-handler.d.ts.map +1 -1
  37. package/lib/common/command/undo-redo-action-handler.js +4 -4
  38. package/lib/common/command/undo-redo-action-handler.js.map +1 -1
  39. package/lib/common/di/client-session-module.d.ts +1 -1
  40. package/lib/common/di/client-session-module.d.ts.map +1 -1
  41. package/lib/common/di/client-session-module.js +2 -2
  42. package/lib/common/di/client-session-module.js.map +1 -1
  43. package/lib/common/di/glsp-module.d.ts +3 -1
  44. package/lib/common/di/glsp-module.d.ts.map +1 -1
  45. package/lib/common/di/glsp-module.js +0 -15
  46. package/lib/common/di/glsp-module.js.map +1 -1
  47. package/lib/common/di/multi-binding.d.ts +19 -4
  48. package/lib/common/di/multi-binding.d.ts.map +1 -1
  49. package/lib/common/di/multi-binding.js.map +1 -1
  50. package/lib/common/di/server-module.d.ts +1 -6
  51. package/lib/common/di/server-module.d.ts.map +1 -1
  52. package/lib/common/di/server-module.js +21 -17
  53. package/lib/common/di/server-module.js.map +1 -1
  54. package/lib/common/features/layout/computed-bounds-action-handler.js +1 -1
  55. package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
  56. package/lib/common/index.d.ts +4 -3
  57. package/lib/common/index.d.ts.map +1 -1
  58. package/lib/common/index.js +4 -3
  59. package/lib/common/index.js.map +1 -1
  60. package/lib/common/launch/glsp-server-launcher.d.ts +8 -7
  61. package/lib/common/launch/glsp-server-launcher.d.ts.map +1 -1
  62. package/lib/common/launch/glsp-server-launcher.js +27 -4
  63. package/lib/common/launch/glsp-server-launcher.js.map +1 -1
  64. package/lib/common/launch/jsonrpc-server-launcher.d.ts +38 -0
  65. package/lib/common/launch/jsonrpc-server-launcher.d.ts.map +1 -0
  66. package/lib/common/launch/jsonrpc-server-launcher.js +84 -0
  67. package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -0
  68. package/lib/common/operations/operation-action-handler.d.ts +1 -1
  69. package/lib/common/operations/operation-action-handler.d.ts.map +1 -1
  70. package/lib/common/operations/operation-action-handler.js +3 -3
  71. package/lib/common/operations/operation-action-handler.js.map +1 -1
  72. package/lib/common/protocol/glsp-server.d.ts +4 -104
  73. package/lib/common/protocol/glsp-server.d.ts.map +1 -1
  74. package/lib/common/protocol/glsp-server.js +13 -20
  75. package/lib/common/protocol/glsp-server.js.map +1 -1
  76. package/lib/common/protocol/glsp-server.spec.js +18 -5
  77. package/lib/common/protocol/glsp-server.spec.js.map +1 -1
  78. package/lib/common/session/client-session-factory.d.ts +1 -2
  79. package/lib/common/session/client-session-factory.d.ts.map +1 -1
  80. package/lib/common/session/client-session-factory.js +17 -2
  81. package/lib/common/session/client-session-factory.js.map +1 -1
  82. package/lib/common/session/client-session-factory.spec.js +2 -2
  83. package/lib/common/session/client-session-factory.spec.js.map +1 -1
  84. package/lib/common/session/client-session-manager.d.ts +1 -3
  85. package/lib/common/session/client-session-manager.d.ts.map +1 -1
  86. package/lib/common/session/client-session-manager.js.map +1 -1
  87. package/lib/common/test/mock-util.d.ts +9 -6
  88. package/lib/common/test/mock-util.d.ts.map +1 -1
  89. package/lib/common/test/mock-util.js +23 -1
  90. package/lib/common/test/mock-util.js.map +1 -1
  91. package/lib/{browser/di → common/utils}/console-logger.d.ts +7 -1
  92. package/lib/common/utils/console-logger.d.ts.map +1 -0
  93. package/lib/{browser/di → common/utils}/console-logger.js +26 -8
  94. package/lib/common/utils/console-logger.js.map +1 -0
  95. package/lib/common/utils/layout-util.d.ts +1 -1
  96. package/lib/common/utils/layout-util.d.ts.map +1 -1
  97. package/lib/common/utils/layout-util.js +3 -3
  98. package/lib/common/utils/layout-util.js.map +1 -1
  99. package/lib/common/utils/logger.d.ts +21 -0
  100. package/lib/common/utils/logger.d.ts.map +1 -1
  101. package/lib/common/utils/logger.js +12 -1
  102. package/lib/common/utils/logger.js.map +1 -1
  103. package/lib/node/di/app-module.d.ts +2 -2
  104. package/lib/node/di/app-module.d.ts.map +1 -1
  105. package/lib/node/di/app-module.js +10 -35
  106. package/lib/node/di/app-module.js.map +1 -1
  107. package/lib/node/index.d.ts +1 -0
  108. package/lib/node/index.d.ts.map +1 -1
  109. package/lib/node/index.js +1 -0
  110. package/lib/node/index.js.map +1 -1
  111. package/lib/node/launch/cli-parser.d.ts +2 -3
  112. package/lib/node/launch/cli-parser.d.ts.map +1 -1
  113. package/lib/node/launch/cli-parser.js.map +1 -1
  114. package/lib/node/launch/socket-cli-parser.js +1 -1
  115. package/lib/node/launch/socket-cli-parser.js.map +1 -1
  116. package/lib/node/launch/socket-server-launcher.d.ts +4 -24
  117. package/lib/node/launch/socket-server-launcher.d.ts.map +1 -1
  118. package/lib/node/launch/socket-server-launcher.js +15 -34
  119. package/lib/node/launch/socket-server-launcher.js.map +1 -1
  120. package/lib/node/launch/socket-server-launcher.spec.js +5 -0
  121. package/lib/node/launch/socket-server-launcher.spec.js.map +1 -1
  122. package/lib/node/launch/websocket-server-launcher.d.ts +53 -0
  123. package/lib/node/launch/websocket-server-launcher.d.ts.map +1 -0
  124. package/lib/node/launch/websocket-server-launcher.js +121 -0
  125. package/lib/node/launch/websocket-server-launcher.js.map +1 -0
  126. package/package.json +7 -5
  127. package/src/browser/di/app-module.ts +4 -32
  128. package/src/browser/index.ts +0 -1
  129. package/src/browser/launch/worker-server-launcher.ts +20 -22
  130. package/src/common/actions/client-action-handler.ts +1 -2
  131. package/src/common/command/command-stack.spec.ts +32 -32
  132. package/src/common/command/command-stack.ts +10 -9
  133. package/src/common/command/command.spec.ts +9 -10
  134. package/src/common/command/command.ts +23 -19
  135. package/src/common/command/recording-command.spec.ts +8 -8
  136. package/src/common/command/recording-command.ts +19 -19
  137. package/src/common/command/undo-redo-action-handler.ts +4 -4
  138. package/src/common/di/client-session-module.ts +1 -1
  139. package/src/common/di/glsp-module.ts +3 -1
  140. package/src/common/di/multi-binding.ts +4 -5
  141. package/src/common/di/server-module.ts +6 -21
  142. package/src/common/features/layout/computed-bounds-action-handler.ts +2 -2
  143. package/src/common/index.ts +4 -3
  144. package/src/common/launch/glsp-server-launcher.ts +15 -9
  145. package/src/common/launch/jsonrpc-server-launcher.ts +95 -0
  146. package/src/common/operations/operation-action-handler.ts +3 -3
  147. package/src/common/protocol/glsp-server.spec.ts +7 -4
  148. package/src/common/protocol/glsp-server.ts +17 -132
  149. package/src/common/session/client-session-factory.spec.ts +1 -1
  150. package/src/common/session/client-session-factory.ts +1 -2
  151. package/src/common/session/client-session-manager.ts +1 -3
  152. package/src/common/test/mock-util.ts +26 -5
  153. package/src/{browser/di → common/utils}/console-logger.ts +19 -1
  154. package/src/common/utils/layout-util.ts +1 -1
  155. package/src/common/utils/logger.ts +16 -1
  156. package/src/node/di/app-module.ts +4 -13
  157. package/src/node/index.ts +1 -0
  158. package/src/node/launch/cli-parser.ts +2 -3
  159. package/src/node/launch/socket-cli-parser.ts +1 -1
  160. package/src/node/launch/socket-server-launcher.spec.ts +6 -0
  161. package/src/node/launch/socket-server-launcher.ts +19 -35
  162. package/src/node/launch/websocket-server-launcher.ts +138 -0
  163. package/lib/browser/di/console-logger.d.ts.map +0 -1
  164. package/lib/browser/di/console-logger.js.map +0 -1
  165. package/lib/common/protocol/glsp-client-proxy.d.ts +0 -45
  166. package/lib/common/protocol/glsp-client-proxy.d.ts.map +0 -1
  167. package/lib/common/protocol/glsp-client-proxy.js +0 -53
  168. package/lib/common/protocol/glsp-client-proxy.js.map +0 -1
  169. package/lib/common/protocol/glsp-server-listener.d.ts +0 -37
  170. package/lib/common/protocol/glsp-server-listener.d.ts.map +0 -1
  171. package/lib/common/protocol/glsp-server-listener.js +0 -5
  172. package/lib/common/protocol/glsp-server-listener.js.map +0 -1
  173. package/src/common/protocol/glsp-client-proxy.ts +0 -65
  174. package/src/common/protocol/glsp-server-listener.ts +0 -39
@@ -1,5 +1,20 @@
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
+ import { BindingContext } from '@eclipse-glsp/protocol';
1
17
  import { BindingTarget } from './binding-target';
2
- import { ModuleContext } from './glsp-module';
3
18
  /**
4
19
  * A helper class used in `GLSPModules` to ease the configuration of multi-injected service identifiers.
5
20
  * Instead of directly binding to the service identifier a new multi binding object can be created. This object
@@ -11,7 +26,7 @@ export declare abstract class AbstractMultiBinding<T> {
11
26
  readonly identifier: string | symbol;
12
27
  protected bindings: T[];
13
28
  constructor(identifier: string | symbol);
14
- abstract applyBindings(context: ModuleContext): void;
29
+ abstract applyBindings(context: BindingContext): void;
15
30
  add(newBinding: T): void;
16
31
  addAll(newBindings: T[]): void;
17
32
  addAll(...newBindings: T[]): void;
@@ -27,7 +42,7 @@ export declare abstract class AbstractMultiBinding<T> {
27
42
  * @typeparam T the base type of {@link BindingTarget}.
28
43
  */
29
44
  export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<T>> {
30
- applyBindings(context: ModuleContext): void;
45
+ applyBindings(context: BindingContext): void;
31
46
  }
32
47
  /**
33
48
  * Implementation of {@link AbstractMultiBinding} for multi-injected values that should be bound to concrete instance using the
@@ -36,6 +51,6 @@ export declare class MultiBinding<T> extends AbstractMultiBinding<BindingTarget<
36
51
  * * @typeparam T the type of the instances
37
52
  */
38
53
  export declare class InstanceMultiBinding<T> extends AbstractMultiBinding<T> {
39
- applyBindings(context: ModuleContext): void;
54
+ applyBindings(context: BindingContext): void;
40
55
  }
41
56
  //# sourceMappingURL=multi-binding.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAEpD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAG9C"}
1
+ {"version":3,"file":"multi-binding.d.ts","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,cAAc,EAA6C,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE;;;;;;GAMG;AACH,8BAAsB,oBAAoB,CAAC,CAAC;IAG5B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAFhD,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAM;gBAER,UAAU,EAAE,MAAM,GAAG,MAAM;IAEhD,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAErD,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAIxB,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,GAAG,IAAI;IAOjC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;IAIzB,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,IAAI;IAI9B,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI;IAK1C,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO;IAI7B,MAAM,IAAI,CAAC,EAAE;CAGhB;AAED;;;;GAIG;AACH,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACvE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAG/C"}
@@ -1 +1 @@
1
- {"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmF;AACnF,qDAAqE;AAGrE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAsB;QAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAsB;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}
1
+ {"version":3,"file":"multi-binding.js","sourceRoot":"","sources":["../../../src/common/di/multi-binding.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmG;AACnG,qDAAqE;AAErE;;;;;;GAMG;AACH,MAAsB,oBAAoB;IAGtC,YAAqB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAFtC,aAAQ,GAAQ,EAAE,CAAC;IAEsB,CAAC;IAIpD,GAAG,CAAC,UAAa;QACb,IAAA,sBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAID,MAAM,CAAC,GAAG,WAA4B;QAClC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,IAAA,mBAAQ,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,QAAW;QACd,IAAA,iBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,QAAa;QACnB,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,UAAa,EAAE,UAAa;QAC/B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,OAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAvCD,oDAuCC;AAED;;;;GAIG;AACH,MAAa,YAAgB,SAAQ,oBAAsC;IACvE,aAAa,CAAC,OAAuB;QACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;CACJ;AAJD,oCAIC;AAED;;;;;GAKG;AACH,MAAa,oBAAwB,SAAQ,oBAAuB;IAChE,aAAa,CAAC,OAAuB;QACjC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACJ;AAJD,oDAIC"}
@@ -13,11 +13,9 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
+ import { GLSPServer, GLSPServerListener } from '@eclipse-glsp/protocol';
16
17
  import { ContainerModule, interfaces } from 'inversify';
17
18
  import { GlobalActionProvider } from '../actions/global-action-provider';
18
- import { GLSPClientProxy, JsonRpcGLSPClientProxy } from '../protocol/glsp-client-proxy';
19
- import { GLSPServer, JsonRpcGLSPServer } from '../protocol/glsp-server';
20
- import { GLSPServerListener } from '../protocol/glsp-server-listener';
21
19
  import { ClientSessionFactory } from '../session/client-session-factory';
22
20
  import { ClientSessionManager } from '../session/client-session-manager';
23
21
  import { BindingTarget } from './binding-target';
@@ -61,13 +59,10 @@ export declare class ServerModule extends GLSPModule {
61
59
  configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;
62
60
  protected bindDiagramModules(): BindingTarget<Map<string, ContainerModule[]>>;
63
61
  protected bindGLSPServer(): BindingTarget<GLSPServer>;
64
- protected bindJsonRpcGLSPServer(): BindingTarget<JsonRpcGLSPServer>;
65
62
  protected bindClientSessionFactory(): BindingTarget<ClientSessionFactory>;
66
63
  protected bindClientSessionManager(): BindingTarget<ClientSessionManager>;
67
64
  protected bindGlobalActionProvider(): BindingTarget<GlobalActionProvider>;
68
65
  protected bindInjectionContainer(): BindingTarget<interfaces.Container>;
69
- protected bindGLSPClientProxy(): BindingTarget<GLSPClientProxy>;
70
- protected bindJsonRpcGLSPClientProxy(): BindingTarget<JsonRpcGLSPClientProxy>;
71
66
  protected configureGLSPServerListeners(binding: MultiBinding<GLSPServerListener>): void;
72
67
  }
73
68
  //# sourceMappingURL=server-module.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAA0B,eAAe,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAChH,OAAO,EAAqB,UAAU,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAsB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAoBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,qBAAqB,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAInE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,mBAAmB,IAAI,aAAa,CAAC,eAAe,CAAC;IAI/D,SAAS,CAAC,0BAA0B,IAAI,aAAa,CAAC,sBAAsB,CAAC;IAI7E,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}
1
+ {"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAkBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;CAG1F"}
@@ -1,10 +1,24 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ServerModule = void 0;
4
+ /********************************************************************************
5
+ * Copyright (c) 2022-2023 STMicroelectronics and others.
6
+ *
7
+ * This program and the accompanying materials are made available under the
8
+ * terms of the Eclipse Public License v. 2.0 which is available at
9
+ * http://www.eclipse.org/legal/epl-2.0.
10
+ *
11
+ * This Source Code may also be made available under the following Secondary
12
+ * Licenses when the conditions for such availability set forth in the Eclipse
13
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
14
+ * with the GNU Classpath Exception which is available at
15
+ * https://www.gnu.org/software/classpath/license.html.
16
+ *
17
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
18
+ ********************************************************************************/
19
+ const protocol_1 = require("@eclipse-glsp/protocol");
4
20
  const global_action_provider_1 = require("../actions/global-action-provider");
5
- const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
6
21
  const glsp_server_1 = require("../protocol/glsp-server");
7
- const glsp_server_listener_1 = require("../protocol/glsp-server-listener");
8
22
  const client_session_factory_1 = require("../session/client-session-factory");
9
23
  const client_session_manager_1 = require("../session/client-session-manager");
10
24
  const binding_target_1 = require("./binding-target");
@@ -57,15 +71,14 @@ class ServerModule extends glsp_module_1.GLSPModule {
57
71
  configure(bind, unbind, isBound, rebind) {
58
72
  const context = this.context;
59
73
  (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.DiagramModules, this.bindDiagramModules());
60
- (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
61
- (0, binding_target_1.applyBindingTarget)(context, glsp_server_1.JsonRpcGLSPServer, this.bindJsonRpcGLSPServer());
74
+ (0, binding_target_1.applyBindingTarget)(context, protocol_1.GLSPServer, this.bindGLSPServer()).inSingletonScope();
62
75
  (0, binding_target_1.applyBindingTarget)(context, client_session_factory_1.ClientSessionFactory, this.bindClientSessionFactory()).inSingletonScope();
63
76
  (0, binding_target_1.applyBindingTarget)(context, client_session_manager_1.ClientSessionManager, this.bindClientSessionManager()).inSingletonScope();
64
- this.configureMultiBinding(new multi_binding_1.MultiBinding(glsp_server_listener_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
77
+ this.configureMultiBinding(new multi_binding_1.MultiBinding(protocol_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
65
78
  (0, binding_target_1.applyBindingTarget)(context, global_action_provider_1.GlobalActionProvider, this.bindGlobalActionProvider()).inSingletonScope();
66
- (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
67
- (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.GLSPClientProxy, this.bindGLSPClientProxy()).inSingletonScope();
68
- (0, binding_target_1.applyBindingTarget)(context, glsp_client_proxy_1.JsonRpcGLSPClientProxy, this.bindJsonRpcGLSPClientProxy());
79
+ if (!isBound(service_identifiers_1.InjectionContainer)) {
80
+ (0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
81
+ }
69
82
  }
70
83
  bindDiagramModules() {
71
84
  return { constantValue: this.diagramModules };
@@ -73,9 +86,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
73
86
  bindGLSPServer() {
74
87
  return glsp_server_1.DefaultGLSPServer;
75
88
  }
76
- bindJsonRpcGLSPServer() {
77
- return { service: glsp_server_1.GLSPServer };
78
- }
79
89
  bindClientSessionFactory() {
80
90
  return client_session_factory_1.DefaultClientSessionFactory;
81
91
  }
@@ -88,12 +98,6 @@ class ServerModule extends glsp_module_1.GLSPModule {
88
98
  bindInjectionContainer() {
89
99
  return { dynamicValue: context => context.container };
90
100
  }
91
- bindGLSPClientProxy() {
92
- return glsp_client_proxy_1.DefaultGLSPClientProxy;
93
- }
94
- bindJsonRpcGLSPClientProxy() {
95
- return { service: glsp_client_proxy_1.GLSPClientProxy };
96
- }
97
101
  configureGLSPServerListeners(binding) {
98
102
  binding.add({ service: client_session_manager_1.ClientSessionManager });
99
103
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAgBA,8EAAsG;AACtG,qEAAgH;AAChH,yDAA2F;AAC3F,2EAAsE;AACtE,8EAAsG;AACtG,8EAAsG;AACtG,qDAAqE;AAErE,+CAA2C;AAC3C,mDAA+C;AAC/C,+DAA2E;AAE3E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,YAAa,SAAQ,wBAAU;IAA5C;;QAEuB,mBAAc,GAAmC,IAAI,GAAG,EAAE,CAAC;IAiFlF,CAAC;IA/EG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAA4B,EAAE,GAAG,iBAAoC;QACxF,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC9C,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gEAAgE,WAAW,GAAG,CAAC,CAAC;SACnG;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB;QAC9G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAA,mCAAkB,EAAC,OAAO,EAAE,oCAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEvE,IAAA,mCAAkB,EAAC,OAAO,EAAE,wBAAU,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClF,IAAA,mCAAkB,EAAC,OAAO,EAAE,+BAAiB,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAC7E,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAI,CAAC,qBAAqB,CAAC,IAAI,4BAAY,CAAqB,yCAAkB,CAAC,EAAE,OAAO,CAAC,EAAE,CAC3F,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAC7C,CAAC;QAEF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,wCAAkB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;QAE/E,IAAA,mCAAkB,EAAC,OAAO,EAAE,mCAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC5F,IAAA,mCAAkB,EAAC,OAAO,EAAE,0CAAsB,EAAE,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAC3F,CAAC;IAES,kBAAkB;QACxB,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IAClD,CAAC;IAES,cAAc;QACpB,OAAO,+BAAiB,CAAC;IAC7B,CAAC;IAES,qBAAqB;QAC3B,OAAO,EAAE,OAAO,EAAE,wBAAU,EAAE,CAAC;IACnC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,sBAAsB;QAC5B,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IAES,mBAAmB;QACzB,OAAO,0CAAsB,CAAC;IAClC,CAAC;IAES,0BAA0B;QAChC,OAAO,EAAE,OAAO,EAAE,mCAAe,EAAE,CAAC;IACxC,CAAC;IAES,4BAA4B,CAAC,OAAyC;QAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,6CAAoB,EAAE,CAAC,CAAC;IACnD,CAAC;;AAlFL,oCAmFC;AAlFiB,4BAAe,GAAG,iBAAiB,CAAC"}
1
+ {"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwE;AAExE,8EAAsG;AACtG,yDAA4D;AAC5D,8EAAsG;AACtG,8EAAsG;AACtG,qDAAqE;AAErE,+CAA2C;AAC3C,mDAA+C;AAC/C,+DAA2E;AAE3E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,YAAa,SAAQ,wBAAU;IAA5C;;QAEuB,mBAAc,GAAmC,IAAI,GAAG,EAAE,CAAC;IAmElF,CAAC;IAjEG;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAA4B,EAAE,GAAG,iBAAoC;QACxF,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC9C,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gEAAgE,WAAW,GAAG,CAAC,CAAC;SACnG;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB;QAC9G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAA,mCAAkB,EAAC,OAAO,EAAE,oCAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAEvE,IAAA,mCAAkB,EAAC,OAAO,EAAE,qBAAU,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACtG,IAAI,CAAC,qBAAqB,CAAC,IAAI,4BAAY,CAAqB,6BAAkB,CAAC,EAAE,OAAO,CAAC,EAAE,CAC3F,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAC7C,CAAC;QAEF,IAAA,mCAAkB,EAAC,OAAO,EAAE,6CAAoB,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEtG,IAAI,CAAC,OAAO,CAAC,wCAAkB,CAAC,EAAE;YAC9B,IAAA,mCAAkB,EAAC,OAAO,EAAE,wCAAkB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;SAClF;IACL,CAAC;IAES,kBAAkB;QACxB,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IAClD,CAAC;IAES,cAAc;QACpB,OAAO,+BAAiB,CAAC;IAC7B,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,wBAAwB;QAC9B,OAAO,oDAA2B,CAAC;IACvC,CAAC;IAES,sBAAsB;QAC5B,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1D,CAAC;IAES,4BAA4B,CAAC,OAAyC;QAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,6CAAoB,EAAE,CAAC,CAAC;IACnD,CAAC;;AApEL,oCAqEC;AApEiB,4BAAe,GAAG,iBAAiB,CAAC"}
@@ -35,7 +35,7 @@ let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
35
35
  applyBounds(root, action) {
36
36
  var _a, _b;
37
37
  const index = this.modelState.index;
38
- action.bounds.forEach(bounds => (0, layout_util_1.applyBounds)(bounds, index));
38
+ action.bounds.forEach(bounds => (0, layout_util_1.applyElementAndBounds)(bounds, index));
39
39
  ((_a = action.alignments) !== null && _a !== void 0 ? _a : []).forEach(alignment => (0, layout_util_1.applyAlignment)(alignment, index));
40
40
  ((_b = action.routes) !== null && _b !== void 0 ? _b : []).forEach(route => (0, layout_util_1.applyRoute)(route, index));
41
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAoF;AACpF,yCAA+C;AAE/C,yDAAkF;AAClF,sDAAkD;AAClD,gFAA2E;AAE3E;;;;GAIG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAOH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAmB9C,CAAC;IAlBG,OAAO,CAAC,MAA4B;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;SACvD;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAES,WAAW,CAAC,IAAgB,EAAE,MAA4B;;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,yBAAW,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5D,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,4BAAc,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,wBAAU,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;CAGJ,CAAA;AAzBG;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAEpD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;AALxB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA0BvC;AA1BY,kEAA2B"}
1
+ {"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAoF;AACpF,yCAA+C;AAE/C,yDAA4F;AAC5F,sDAAkD;AAClD,gFAA2E;AAE3E;;;;GAIG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAOH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAmB9C,CAAC;IAlBG,OAAO,CAAC,MAA4B;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;SACvD;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAES,WAAW,CAAC,IAAgB,EAAE,MAA4B;;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,mCAAqB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACtE,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,4BAAc,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,wBAAU,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;CAGJ,CAAA;AAzBG;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAEpD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;AALxB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA0BvC;AA1BY,kEAA2B"}
@@ -22,6 +22,8 @@ export * from './actions/client-action-handler';
22
22
  export * from './actions/global-action-provider';
23
23
  export * from './command/command';
24
24
  export * from './command/command-stack';
25
+ export * from './command/recording-command';
26
+ export * from './command/undo-redo-action-handler';
25
27
  export * from './di/binding-target';
26
28
  export * from './di/client-session-module';
27
29
  export * from './di/diagram-module';
@@ -64,7 +66,6 @@ export * from './features/popup/popup-model-factory';
64
66
  export * from './features/popup/request-popup-model-action-handler';
65
67
  export * from './features/validation/model-validator';
66
68
  export * from './features/validation/request-markers-handler';
67
- export * from './gmodel/cut-operation-handler';
68
69
  export * from './gmodel/index';
69
70
  export * from './launch/glsp-server-launcher';
70
71
  export * from './operations/compound-operation-handler';
@@ -72,9 +73,7 @@ export * from './operations/create-operation-handler';
72
73
  export * from './operations/operation-action-handler';
73
74
  export * from './operations/operation-handler';
74
75
  export * from './operations/operation-handler-registry';
75
- export * from './protocol/glsp-client-proxy';
76
76
  export * from './protocol/glsp-server';
77
- export * from './protocol/glsp-server-listener';
78
77
  export * from './session/client-session';
79
78
  export * from './session/client-session-factory';
80
79
  export * from './session/client-session-initializer';
@@ -82,7 +81,9 @@ export * from './session/client-session-listener';
82
81
  export * from './session/client-session-manager';
83
82
  export * from './utils/args-util';
84
83
  export * from './utils/client-options-util';
84
+ export * from './utils/console-logger';
85
85
  export * from './utils/glsp-server-error';
86
+ export * from './utils/layout-util';
86
87
  export * from './utils/logger';
87
88
  export * from './utils/promise-queue';
88
89
  export * from './utils/registry';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,sDAAsD,CAAC;AACrE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,sDAAsD,CAAC;AACrE,cAAc,iDAAiD,CAAC;AAChE,cAAc,0DAA0D,CAAC;AACzE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iCAAiC,CAAC;AAChD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,kDAAkD,CAAC;AACjE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iEAAiE,CAAC;AAChF,cAAc,iEAAiE,CAAC;AAChF,cAAc,sCAAsC,CAAC;AACrD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,sDAAsD,CAAC;AACrE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,sDAAsD,CAAC;AACrE,cAAc,iDAAiD,CAAC;AAChE,cAAc,0DAA0D,CAAC;AACzE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iCAAiC,CAAC;AAChD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,kDAAkD,CAAC;AACjE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iEAAiE,CAAC;AAChF,cAAc,iEAAiE,CAAC;AAChF,cAAc,sCAAsC,CAAC;AACrD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC"}
@@ -38,6 +38,8 @@ __exportStar(require("./actions/client-action-handler"), exports);
38
38
  __exportStar(require("./actions/global-action-provider"), exports);
39
39
  __exportStar(require("./command/command"), exports);
40
40
  __exportStar(require("./command/command-stack"), exports);
41
+ __exportStar(require("./command/recording-command"), exports);
42
+ __exportStar(require("./command/undo-redo-action-handler"), exports);
41
43
  __exportStar(require("./di/binding-target"), exports);
42
44
  __exportStar(require("./di/client-session-module"), exports);
43
45
  __exportStar(require("./di/diagram-module"), exports);
@@ -80,7 +82,6 @@ __exportStar(require("./features/popup/popup-model-factory"), exports);
80
82
  __exportStar(require("./features/popup/request-popup-model-action-handler"), exports);
81
83
  __exportStar(require("./features/validation/model-validator"), exports);
82
84
  __exportStar(require("./features/validation/request-markers-handler"), exports);
83
- __exportStar(require("./gmodel/cut-operation-handler"), exports);
84
85
  __exportStar(require("./gmodel/index"), exports);
85
86
  __exportStar(require("./launch/glsp-server-launcher"), exports);
86
87
  __exportStar(require("./operations/compound-operation-handler"), exports);
@@ -88,9 +89,7 @@ __exportStar(require("./operations/create-operation-handler"), exports);
88
89
  __exportStar(require("./operations/operation-action-handler"), exports);
89
90
  __exportStar(require("./operations/operation-handler"), exports);
90
91
  __exportStar(require("./operations/operation-handler-registry"), exports);
91
- __exportStar(require("./protocol/glsp-client-proxy"), exports);
92
92
  __exportStar(require("./protocol/glsp-server"), exports);
93
- __exportStar(require("./protocol/glsp-server-listener"), exports);
94
93
  __exportStar(require("./session/client-session"), exports);
95
94
  __exportStar(require("./session/client-session-factory"), exports);
96
95
  __exportStar(require("./session/client-session-initializer"), exports);
@@ -98,7 +97,9 @@ __exportStar(require("./session/client-session-listener"), exports);
98
97
  __exportStar(require("./session/client-session-manager"), exports);
99
98
  __exportStar(require("./utils/args-util"), exports);
100
99
  __exportStar(require("./utils/client-options-util"), exports);
100
+ __exportStar(require("./utils/console-logger"), exports);
101
101
  __exportStar(require("./utils/glsp-server-error"), exports);
102
+ __exportStar(require("./utils/layout-util"), exports);
102
103
  __exportStar(require("./utils/logger"), exports);
103
104
  __exportStar(require("./utils/promise-queue"), exports);
104
105
  __exportStar(require("./utils/registry"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,sDAAoC;AACpC,yDAAuC;AACvC,8DAA4C;AAC5C,2DAAyC;AACzC,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,oDAAkC;AAClC,0DAAwC;AACxC,sDAAoC;AACpC,6DAA2C;AAC3C,sDAAoC;AACpC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,2DAAyC;AACzC,kEAAgD;AAChD,8EAA4D;AAC5D,6FAA2E;AAC3E,4FAA0E;AAC1E,qFAAmE;AACnE,8FAA4E;AAC5E,uFAAqE;AACrE,4FAA0E;AAC1E,uFAAqE;AACrE,kFAAgE;AAChE,2FAAyE;AACzE,gFAA8D;AAC9D,2FAAyE;AACzE,mFAAiE;AACjE,kEAAgD;AAChD,6EAA2D;AAC3D,kEAAgD;AAChD,gEAA8C;AAC9C,qEAAmD;AACnD,+DAA6C;AAC7C,4EAA0D;AAC1D,gFAA8D;AAC9D,6EAA2D;AAC3D,wEAAsD;AACtD,4EAA0D;AAC1D,mFAAiE;AACjE,4FAA0E;AAC1E,qFAAmE;AACnE,mFAAiE;AACjE,kGAAgF;AAChF,kGAAgF;AAChF,uEAAqD;AACrD,sFAAoE;AACpE,wEAAsD;AACtD,gFAA8D;AAC9D,iEAA+C;AAC/C,iDAA+B;AAC/B,gEAA8C;AAC9C,0EAAwD;AACxD,wEAAsD;AACtD,wEAAsD;AACtD,iEAA+C;AAC/C,0EAAwD;AACxD,+DAA6C;AAC7C,yDAAuC;AACvC,kEAAgD;AAChD,2DAAyC;AACzC,mEAAiD;AACjD,uEAAqD;AACrD,oEAAkD;AAClD,mEAAiD;AACjD,oDAAkC;AAClC,8DAA4C;AAC5C,4DAA0C;AAC1C,iDAA+B;AAC/B,wDAAsC;AACtC,mDAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,sDAAoC;AACpC,yDAAuC;AACvC,8DAA4C;AAC5C,2DAAyC;AACzC,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,oDAAkC;AAClC,0DAAwC;AACxC,8DAA4C;AAC5C,qEAAmD;AACnD,sDAAoC;AACpC,6DAA2C;AAC3C,sDAAoC;AACpC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,2DAAyC;AACzC,kEAAgD;AAChD,8EAA4D;AAC5D,6FAA2E;AAC3E,4FAA0E;AAC1E,qFAAmE;AACnE,8FAA4E;AAC5E,uFAAqE;AACrE,4FAA0E;AAC1E,uFAAqE;AACrE,kFAAgE;AAChE,2FAAyE;AACzE,gFAA8D;AAC9D,2FAAyE;AACzE,mFAAiE;AACjE,kEAAgD;AAChD,6EAA2D;AAC3D,kEAAgD;AAChD,gEAA8C;AAC9C,qEAAmD;AACnD,+DAA6C;AAC7C,4EAA0D;AAC1D,gFAA8D;AAC9D,6EAA2D;AAC3D,wEAAsD;AACtD,4EAA0D;AAC1D,mFAAiE;AACjE,4FAA0E;AAC1E,qFAAmE;AACnE,mFAAiE;AACjE,kGAAgF;AAChF,kGAAgF;AAChF,uEAAqD;AACrD,sFAAoE;AACpE,wEAAsD;AACtD,gFAA8D;AAC9D,iDAA+B;AAC/B,gEAA8C;AAC9C,0EAAwD;AACxD,wEAAsD;AACtD,wEAAsD;AACtD,iEAA+C;AAC/C,0EAAwD;AACxD,yDAAuC;AACvC,2DAAyC;AACzC,mEAAiD;AACjD,uEAAqD;AACrD,oEAAkD;AAClD,mEAAiD;AACjD,oDAAkC;AAClC,8DAA4C;AAC5C,yDAAuC;AACvC,4DAA0C;AAC1C,sDAAoC;AACpC,iDAA+B;AAC/B,wDAAsC;AACtC,mDAAiC"}
@@ -13,22 +13,23 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { MaybePromise } from '@eclipse-glsp/protocol';
16
+ import { Disposable, DisposableCollection, MaybePromise } from '@eclipse-glsp/protocol';
17
17
  import { Container, ContainerModule } from 'inversify';
18
18
  import { ServerModule } from '../di/server-module';
19
19
  import { Logger } from '../utils/logger';
20
- export declare const START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed";
21
- export declare abstract class GLSPServerLauncher<T = undefined> {
20
+ export declare abstract class GLSPServerLauncher<T> implements Disposable {
22
21
  protected logger: Logger;
23
22
  protected _modules: ContainerModule[];
24
23
  protected running: boolean;
24
+ protected toDispose: DisposableCollection;
25
25
  protected parentContainer?: Container;
26
26
  configure(serverModule: ServerModule, ...additionalModules: ContainerModule[]): void;
27
- createContainer(): Container;
28
- start(startParams?: T): MaybePromise<void>;
29
- protected abstract run(startParams?: T): MaybePromise<void>;
27
+ createContainer(...additionalModules: ContainerModule[]): Container;
28
+ start(startParams: T): MaybePromise<void>;
29
+ protected abstract run(startParams: T): MaybePromise<void>;
30
30
  shutdown(): MaybePromise<void>;
31
- protected abstract stop(): MaybePromise<void>;
31
+ protected stop(): MaybePromise<void>;
32
+ dispose(): void;
32
33
  get modules(): ContainerModule[];
33
34
  }
34
35
  //# sourceMappingURL=glsp-server-launcher.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAgC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,eAAO,MAAM,qBAAqB,oCAAoC,CAAC;AAEvE,8BACsB,kBAAkB,CAAC,CAAC,GAAG,SAAS;IAClC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC3C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAEa,SAAS,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC;IAE9E,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAI;IAIpF,eAAe,IAAI,SAAS;IAM5B,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAQ1C,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAE3D,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC;IAS9B,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IAE7C,IAAI,OAAO,IAAI,eAAe,EAAE,CAK/B;CACJ"}
1
+ {"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAgC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BACsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,UAAU;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC3C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,uBAA8B;IAET,SAAS,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC;IAE9E,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAI;IAIpF,eAAe,CAAC,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,SAAS;IAMnE,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAQzC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAE1D,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC;IAU9B,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IAIpC,OAAO,IAAI,IAAI;IAIf,IAAI,OAAO,IAAI,eAAe,EAAE,CAK/B;CACJ"}
@@ -9,21 +9,37 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.GLSPServerLauncher = exports.START_UP_COMPLETE_MSG = void 0;
12
+ exports.GLSPServerLauncher = void 0;
13
+ /********************************************************************************
14
+ * Copyright (c) 2022-2023 STMicroelectronics and others.
15
+ *
16
+ * This program and the accompanying materials are made available under the
17
+ * terms of the Eclipse Public License v. 2.0 which is available at
18
+ * http://www.eclipse.org/legal/epl-2.0.
19
+ *
20
+ * This Source Code may also be made available under the following Secondary
21
+ * Licenses when the conditions for such availability set forth in the Eclipse
22
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
23
+ * with the GNU Classpath Exception which is available at
24
+ * https://www.gnu.org/software/classpath/license.html.
25
+ *
26
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
27
+ ********************************************************************************/
28
+ const protocol_1 = require("@eclipse-glsp/protocol");
13
29
  const inversify_1 = require("inversify");
14
30
  const service_identifiers_1 = require("../di/service-identifiers");
15
31
  const logger_1 = require("../utils/logger");
16
- exports.START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed';
17
32
  let GLSPServerLauncher = class GLSPServerLauncher {
18
33
  constructor() {
19
34
  this._modules = [];
35
+ this.toDispose = new protocol_1.DisposableCollection();
20
36
  }
21
37
  configure(serverModule, ...additionalModules) {
22
38
  this._modules.push(serverModule, ...additionalModules);
23
39
  }
24
- createContainer() {
40
+ createContainer(...additionalModules) {
25
41
  const container = this.parentContainer ? this.parentContainer.createChild() : new inversify_1.Container();
26
- container.load(...this._modules);
42
+ container.load(...this._modules, ...additionalModules);
27
43
  return container;
28
44
  }
29
45
  start(startParams) {
@@ -35,12 +51,19 @@ let GLSPServerLauncher = class GLSPServerLauncher {
35
51
  }
36
52
  shutdown() {
37
53
  if (this.running) {
54
+ this.logger.info('Shutdown GLSPServerLauncher');
38
55
  const result = this.stop();
39
56
  this.running = false;
40
57
  return result;
41
58
  }
42
59
  this.logger.warn('Could not stop launcher. Launcher is not running!');
43
60
  }
61
+ stop() {
62
+ this.dispose();
63
+ }
64
+ dispose() {
65
+ this.toDispose.dispose();
66
+ }
44
67
  get modules() {
45
68
  if (!this._modules) {
46
69
  throw new Error('The GLSPServerLauncher has not been configured yet');
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAqF;AAErF,mEAA+D;AAC/D,4CAAyC;AAE5B,QAAA,qBAAqB,GAAG,iCAAiC,CAAC;AAGhE,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAAjC;QAGO,aAAQ,GAAsB,EAAE,CAAC;IA0C/C,CAAC;IArCG,SAAS,CAAC,YAA0B,EAAE,GAAG,iBAAoC;QACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe;QACX,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAS,EAAE,CAAC;QAC9F,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,WAAe;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC/E,CAAC;IAID,QAAQ;QACJ,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IAC1E,CAAC;IAID,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ,CAAA;AA5CG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAAmB,eAAM;kDAAC;AAKzC;IAAC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAA6B,qBAAS;2DAAC;AAN5D,kBAAkB;IADvC,IAAA,sBAAU,GAAE;GACS,kBAAkB,CA6CvC;AA7CqB,gDAAkB"}
1
+ {"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAAqF;AAErF,mEAA+D;AAC/D,4CAAyC;AAGlC,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAAjC;QAGO,aAAQ,GAAsB,EAAE,CAAC;QAEjC,cAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;IAgDrD,CAAC;IA5CG,SAAS,CAAC,YAA0B,EAAE,GAAG,iBAAoC;QACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe,CAAC,GAAG,iBAAoC;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAS,EAAE,CAAC;QAC9F,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,iBAAiB,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,WAAc;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC/E,CAAC;IAID,QAAQ;QACJ,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IAC1E,CAAC;IAES,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ,CAAA;AApDG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAAmB,eAAM;kDAAC;AAMzC;IAAC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAA6B,qBAAS;2DAAC;AAP5D,kBAAkB;IADvC,IAAA,sBAAU,GAAE;GACS,kBAAkB,CAqDvC;AArDqB,gDAAkB"}
@@ -0,0 +1,38 @@
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 { GLSPClientProxy, GLSPServer } from '@eclipse-glsp/protocol';
17
+ import { Container, ContainerModule } from 'inversify';
18
+ import * as jsonrpc from 'vscode-jsonrpc';
19
+ import { Logger } from '../utils/logger';
20
+ import { GLSPServerLauncher } from './glsp-server-launcher';
21
+ export declare const START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed. Accepting requests on port:";
22
+ export interface JsonRpcServerInstance {
23
+ server: GLSPServer;
24
+ clientConnection: jsonrpc.MessageConnection;
25
+ container: Container;
26
+ }
27
+ export declare abstract class JsonRpcGLSPServerLauncher<T> extends GLSPServerLauncher<T> {
28
+ protected logger: Logger;
29
+ protected serverInstances: Map<jsonrpc.MessageConnection, JsonRpcServerInstance>;
30
+ protected startupCompleteMessage: string;
31
+ constructor();
32
+ protected disposeServerInstance(instance: JsonRpcServerInstance): void;
33
+ protected createServerInstance(clientConnection: jsonrpc.MessageConnection): void;
34
+ protected createJsonRpcModule(clientConnection: jsonrpc.MessageConnection): ContainerModule;
35
+ protected configureClientConnection(serverInstance: JsonRpcServerInstance): void;
36
+ protected createClientProxy(serverInstance: JsonRpcServerInstance): GLSPClientProxy;
37
+ }
38
+ //# sourceMappingURL=jsonrpc-server-launcher.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonrpc-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAEH,eAAe,EACf,UAAU,EAIb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,qBAAqB,iEAAiE,CAAC;AAEpG,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAC5C,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,8BACsB,yBAAyB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC5E,UACmB,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,eAAe,wDAA+D;IACxF,SAAS,CAAC,sBAAsB,SAAyB;;IAWzD,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOtE,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,IAAI;IAQjF,SAAS,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,eAAe;IAU3F,SAAS,CAAC,yBAAyB,CAAC,cAAc,EAAE,qBAAqB,GAAG,IAAI;IAUhF,SAAS,CAAC,iBAAiB,CAAC,cAAc,EAAE,qBAAqB,GAAG,eAAe;CAKtF"}
@@ -0,0 +1,84 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2023 EclipseSource and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the Eclipse Public License v. 2.0 which is available at
7
+ * http://www.eclipse.org/legal/epl-2.0.
8
+ *
9
+ * This Source Code may also be made available under the following Secondary
10
+ * Licenses when the conditions for such availability set forth in the Eclipse
11
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ * with the GNU Classpath Exception which is available at
13
+ * https://www.gnu.org/software/classpath/license.html.
14
+ *
15
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ ********************************************************************************/
17
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
18
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
19
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
20
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
21
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
22
+ };
23
+ var __metadata = (this && this.__metadata) || function (k, v) {
24
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
25
+ };
26
+ Object.defineProperty(exports, "__esModule", { value: true });
27
+ exports.JsonRpcGLSPServerLauncher = exports.START_UP_COMPLETE_MSG = void 0;
28
+ const protocol_1 = require("@eclipse-glsp/protocol");
29
+ const inversify_1 = require("inversify");
30
+ const logger_1 = require("../utils/logger");
31
+ const glsp_server_launcher_1 = require("./glsp-server-launcher");
32
+ exports.START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
33
+ let JsonRpcGLSPServerLauncher = class JsonRpcGLSPServerLauncher extends glsp_server_launcher_1.GLSPServerLauncher {
34
+ constructor() {
35
+ super();
36
+ this.serverInstances = new Map();
37
+ this.startupCompleteMessage = exports.START_UP_COMPLETE_MSG;
38
+ this.toDispose.push(protocol_1.Disposable.create(() => {
39
+ this.serverInstances.forEach(instance => this.disposeServerInstance(instance));
40
+ }));
41
+ }
42
+ disposeServerInstance(instance) {
43
+ this.serverInstances.delete(instance.clientConnection);
44
+ instance.server.shutdown();
45
+ instance.container.unbindAll();
46
+ instance.clientConnection.dispose();
47
+ }
48
+ createServerInstance(clientConnection) {
49
+ const container = this.createContainer(this.createJsonRpcModule(clientConnection));
50
+ const server = container.get(protocol_1.GLSPServer);
51
+ const instance = { container, clientConnection, server };
52
+ this.serverInstances.set(clientConnection, instance);
53
+ this.configureClientConnection(instance);
54
+ }
55
+ createJsonRpcModule(clientConnection) {
56
+ return new inversify_1.ContainerModule(bind => {
57
+ bind(protocol_1.GLSPClientProxy).toDynamicValue(ctx => {
58
+ const proxy = ctx.container.resolve(protocol_1.JsonrpcClientProxy);
59
+ proxy.initialize(clientConnection);
60
+ return proxy;
61
+ });
62
+ });
63
+ }
64
+ configureClientConnection(serverInstance) {
65
+ (0, protocol_1.configureClientConnection)(serverInstance.clientConnection, serverInstance.server);
66
+ serverInstance.clientConnection.onNotification(protocol_1.JsonrpcGLSPClient.ShutdownNotification, () => this.disposeServerInstance(serverInstance));
67
+ this.logger.info('Starting GLSP server connection');
68
+ }
69
+ createClientProxy(serverInstance) {
70
+ const proxy = serverInstance.container.resolve(protocol_1.JsonrpcClientProxy);
71
+ proxy.initialize(serverInstance.clientConnection);
72
+ return proxy;
73
+ }
74
+ };
75
+ __decorate([
76
+ (0, inversify_1.inject)(logger_1.Logger),
77
+ __metadata("design:type", logger_1.Logger)
78
+ ], JsonRpcGLSPServerLauncher.prototype, "logger", void 0);
79
+ JsonRpcGLSPServerLauncher = __decorate([
80
+ (0, inversify_1.injectable)(),
81
+ __metadata("design:paramtypes", [])
82
+ ], JsonRpcGLSPServerLauncher);
83
+ exports.JsonRpcGLSPServerLauncher = JsonRpcGLSPServerLauncher;
84
+ //# sourceMappingURL=jsonrpc-server-launcher.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jsonrpc-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAOgC;AAChC,yCAA2E;AAE3E,4CAAyC;AACzC,iEAA4D;AAE/C,QAAA,qBAAqB,GAAG,8DAA8D,CAAC;AAS7F,IAAe,yBAAyB,GAAxC,MAAe,yBAA6B,SAAQ,yCAAqB;IAO5E;QACI,KAAK,EAAE,CAAC;QAJF,oBAAe,GAAG,IAAI,GAAG,EAAoD,CAAC;QAC9E,2BAAsB,GAAG,6BAAqB,CAAC;QAIrD,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,qBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnF,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAES,qBAAqB,CAAC,QAA+B;QAC3D,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACvD,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QAC/B,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAES,oBAAoB,CAAC,gBAA2C;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAa,qBAAU,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC;QACzD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAES,mBAAmB,CAAC,gBAA2C;QACrE,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,0BAAe,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBACvC,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAC;gBACxD,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAES,yBAAyB,CAAC,cAAqC;QACrE,IAAA,oCAAyB,EAAC,cAAc,CAAC,gBAAgB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;QAElF,cAAc,CAAC,gBAAgB,CAAC,cAAc,CAAC,4BAAiB,CAAC,oBAAoB,EAAE,GAAG,EAAE,CACxF,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAES,iBAAiB,CAAC,cAAqC;QAC7D,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAC;QACnE,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAvDG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACY,eAAM;yDAAC;AAFhB,yBAAyB;IAD9C,IAAA,sBAAU,GAAE;;GACS,yBAAyB,CAwD9C;AAxDqB,8DAAyB"}
@@ -31,7 +31,7 @@ export declare class OperationActionHandler implements ActionHandler {
31
31
  execute(action: Operation): MaybePromise<Action[]>;
32
32
  protected executeOperation(operation: Operation): MaybePromise<Action[]>;
33
33
  protected executeHandler(operation: Operation, handler: OperationHandler): Promise<Action[]>;
34
- protected executeCommand(command: Command): void;
34
+ protected executeCommand(command: Command): Promise<void>;
35
35
  protected submitModel(): MaybePromise<Action[]>;
36
36
  handles(action: Action): boolean;
37
37
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAaxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAX9D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAG7D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAclD,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAQxD,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQlG,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhD,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIhC;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS;CAGrH"}
1
+ {"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAaxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAX9D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAG7D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAclD,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAQxD,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAQlF,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIhC;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS;CAGrH"}
@@ -64,12 +64,12 @@ let OperationActionHandler = OperationActionHandler_1 = class OperationActionHan
64
64
  async executeHandler(operation, handler) {
65
65
  const command = await handler.execute(operation);
66
66
  if (command) {
67
- this.executeCommand(command);
67
+ await this.executeCommand(command);
68
68
  }
69
69
  return this.modelSubmissionHandler.submitModel('operation');
70
70
  }
71
- executeCommand(command) {
72
- this.commandStack.execute(command);
71
+ async executeCommand(command) {
72
+ return this.commandStack.execute(command);
73
73
  }
74
74
  submitModel() {
75
75
  return this.modelSubmissionHandler.submitModel('operation');
@@ -1 +1 @@
1
- {"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8F;AAC9F,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YAC5B,OAAO;gBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;SACL;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAES,cAAc,CAAC,OAAgB;QACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AA/DG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAE7D;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAEzD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAgElC;AAhEY,wDAAsB"}
1
+ {"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8F;AAC9F,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YAC5B,OAAO;gBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;SACL;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAAgB;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AA/DG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAE7D;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAEzD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAgElC;AAhEY,wDAAsB"}