@eclipse-glsp/server 1.1.0-next.3d7585d.42 → 1.1.0-next.44aae0c.44

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 (175) hide show
  1. package/lib/common/command/command-stack.d.ts +45 -14
  2. package/lib/common/command/command-stack.d.ts.map +1 -1
  3. package/lib/common/command/command-stack.js +78 -9
  4. package/lib/common/command/command-stack.js.map +1 -1
  5. package/lib/common/command/command-stack.spec.d.ts +2 -0
  6. package/lib/common/command/command-stack.spec.d.ts.map +1 -0
  7. package/lib/common/command/command-stack.spec.js +207 -0
  8. package/lib/common/command/command-stack.spec.js.map +1 -0
  9. package/lib/common/command/command.d.ts +34 -7
  10. package/lib/common/command/command.d.ts.map +1 -1
  11. package/lib/common/command/command.js +73 -0
  12. package/lib/common/command/command.js.map +1 -1
  13. package/lib/common/command/command.spec.d.ts +2 -0
  14. package/lib/common/command/command.spec.d.ts.map +1 -0
  15. package/lib/common/command/command.spec.js +86 -0
  16. package/lib/common/command/command.spec.js.map +1 -0
  17. package/lib/common/command/recording-command.d.ts +75 -0
  18. package/lib/common/command/recording-command.d.ts.map +1 -0
  19. package/lib/common/command/recording-command.js +99 -0
  20. package/lib/common/command/recording-command.js.map +1 -0
  21. package/lib/common/command/recording-command.spec.d.ts +17 -0
  22. package/lib/common/command/recording-command.spec.d.ts.map +1 -0
  23. package/lib/common/command/recording-command.spec.js +62 -0
  24. package/lib/common/command/recording-command.spec.js.map +1 -0
  25. package/lib/common/command/undo-redo-action-handler.d.ts +28 -0
  26. package/lib/common/command/undo-redo-action-handler.d.ts.map +1 -0
  27. package/lib/common/command/undo-redo-action-handler.js +72 -0
  28. package/lib/common/command/undo-redo-action-handler.js.map +1 -0
  29. package/lib/common/di/diagram-module.d.ts +3 -0
  30. package/lib/common/di/diagram-module.d.ts.map +1 -1
  31. package/lib/common/di/diagram-module.js +12 -0
  32. package/lib/common/di/diagram-module.js.map +1 -1
  33. package/lib/common/features/contextactions/tool-palette-item-provider.d.ts +1 -1
  34. package/lib/common/features/contextactions/tool-palette-item-provider.d.ts.map +1 -1
  35. package/lib/common/features/contextactions/tool-palette-item-provider.js +2 -4
  36. package/lib/common/features/contextactions/tool-palette-item-provider.js.map +1 -1
  37. package/lib/common/{gmodel → features/layout}/computed-bounds-action-handler.d.ts +8 -3
  38. package/lib/common/features/layout/computed-bounds-action-handler.d.ts.map +1 -0
  39. package/lib/common/{gmodel → features/layout}/computed-bounds-action-handler.js +8 -3
  40. package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -0
  41. package/lib/common/features/layout/layout-operation-handler.d.ts +12 -3
  42. package/lib/common/features/layout/layout-operation-handler.d.ts.map +1 -1
  43. package/lib/common/features/layout/layout-operation-handler.js +26 -10
  44. package/lib/common/features/layout/layout-operation-handler.js.map +1 -1
  45. package/lib/common/features/model/model-state.d.ts +0 -2
  46. package/lib/common/features/model/model-state.d.ts.map +1 -1
  47. package/lib/common/features/model/model-state.js +0 -1
  48. package/lib/common/features/model/model-state.js.map +1 -1
  49. package/lib/common/features/model/model-submission-handler.d.ts +2 -0
  50. package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
  51. package/lib/common/features/model/model-submission-handler.js +7 -2
  52. package/lib/common/features/model/model-submission-handler.js.map +1 -1
  53. package/lib/common/features/model/save-model-action-handler.d.ts +2 -2
  54. package/lib/common/features/model/save-model-action-handler.d.ts.map +1 -1
  55. package/lib/common/features/model/save-model-action-handler.js +5 -5
  56. package/lib/common/features/model/save-model-action-handler.js.map +1 -1
  57. package/lib/common/gmodel/apply-label-edit-operation-handler.d.ts +4 -5
  58. package/lib/common/gmodel/apply-label-edit-operation-handler.d.ts.map +1 -1
  59. package/lib/common/gmodel/apply-label-edit-operation-handler.js +12 -21
  60. package/lib/common/gmodel/apply-label-edit-operation-handler.js.map +1 -1
  61. package/lib/common/gmodel/change-bounds-operation-handler.d.ts +9 -6
  62. package/lib/common/gmodel/change-bounds-operation-handler.d.ts.map +1 -1
  63. package/lib/common/gmodel/change-bounds-operation-handler.js +14 -14
  64. package/lib/common/gmodel/change-bounds-operation-handler.js.map +1 -1
  65. package/lib/common/gmodel/change-routing-points-operation-handler.d.ts +5 -5
  66. package/lib/common/gmodel/change-routing-points-operation-handler.d.ts.map +1 -1
  67. package/lib/common/gmodel/change-routing-points-operation-handler.js +11 -14
  68. package/lib/common/gmodel/change-routing-points-operation-handler.js.map +1 -1
  69. package/lib/common/{operations → gmodel}/cut-operation-handler.d.ts +5 -4
  70. package/lib/common/gmodel/cut-operation-handler.d.ts.map +1 -0
  71. package/lib/common/{operations → gmodel}/cut-operation-handler.js +13 -11
  72. package/lib/common/gmodel/cut-operation-handler.js.map +1 -0
  73. package/lib/common/gmodel/delete-operation-handler.d.ts +6 -6
  74. package/lib/common/gmodel/delete-operation-handler.d.ts.map +1 -1
  75. package/lib/common/gmodel/delete-operation-handler.js +13 -10
  76. package/lib/common/gmodel/delete-operation-handler.js.map +1 -1
  77. package/lib/common/gmodel/gmodel-create-edge-operation-handler.d.ts +11 -7
  78. package/lib/common/gmodel/gmodel-create-edge-operation-handler.d.ts.map +1 -1
  79. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js +12 -13
  80. package/lib/common/gmodel/gmodel-create-edge-operation-handler.js.map +1 -1
  81. package/lib/common/gmodel/gmodel-create-node-operation-handler.d.ts +32 -5
  82. package/lib/common/gmodel/gmodel-create-node-operation-handler.d.ts.map +1 -1
  83. package/lib/common/gmodel/gmodel-create-node-operation-handler.js +45 -3
  84. package/lib/common/gmodel/gmodel-create-node-operation-handler.js.map +1 -1
  85. package/lib/common/gmodel/gmodel-diagram-module.d.ts +8 -8
  86. package/lib/common/gmodel/gmodel-diagram-module.d.ts.map +1 -1
  87. package/lib/common/gmodel/gmodel-diagram-module.js +15 -21
  88. package/lib/common/gmodel/gmodel-diagram-module.js.map +1 -1
  89. package/lib/common/gmodel/gmodel-operation-handler.d.ts +23 -0
  90. package/lib/common/gmodel/gmodel-operation-handler.d.ts.map +1 -0
  91. package/lib/common/gmodel/gmodel-operation-handler.js +43 -0
  92. package/lib/common/gmodel/gmodel-operation-handler.js.map +1 -0
  93. package/lib/common/gmodel/index.d.ts +2 -1
  94. package/lib/common/gmodel/index.d.ts.map +1 -1
  95. package/lib/common/gmodel/index.js +2 -1
  96. package/lib/common/gmodel/index.js.map +1 -1
  97. package/lib/common/gmodel/paste-operation-handler.d.ts +7 -6
  98. package/lib/common/gmodel/paste-operation-handler.d.ts.map +1 -1
  99. package/lib/common/gmodel/paste-operation-handler.js +20 -15
  100. package/lib/common/gmodel/paste-operation-handler.js.map +1 -1
  101. package/lib/common/gmodel/reconnect-edge-operation-handler.d.ts +5 -5
  102. package/lib/common/gmodel/reconnect-edge-operation-handler.d.ts.map +1 -1
  103. package/lib/common/gmodel/reconnect-edge-operation-handler.js +11 -14
  104. package/lib/common/gmodel/reconnect-edge-operation-handler.js.map +1 -1
  105. package/lib/common/index.d.ts +2 -1
  106. package/lib/common/index.d.ts.map +1 -1
  107. package/lib/common/index.js +2 -1
  108. package/lib/common/index.js.map +1 -1
  109. package/lib/common/operations/compound-operation-handler.d.ts +5 -5
  110. package/lib/common/operations/compound-operation-handler.d.ts.map +1 -1
  111. package/lib/common/operations/compound-operation-handler.js +37 -9
  112. package/lib/common/operations/compound-operation-handler.js.map +1 -1
  113. package/lib/common/operations/create-operation-handler.d.ts +8 -40
  114. package/lib/common/operations/create-operation-handler.d.ts.map +1 -1
  115. package/lib/common/operations/create-operation-handler.js +26 -85
  116. package/lib/common/operations/create-operation-handler.js.map +1 -1
  117. package/lib/common/operations/operation-action-handler.d.ts +10 -1
  118. package/lib/common/operations/operation-action-handler.d.ts.map +1 -1
  119. package/lib/common/operations/operation-action-handler.js +37 -22
  120. package/lib/common/operations/operation-action-handler.js.map +1 -1
  121. package/lib/common/operations/operation-handler-registry.d.ts +11 -2
  122. package/lib/common/operations/operation-handler-registry.d.ts.map +1 -1
  123. package/lib/common/operations/operation-handler-registry.js +31 -2
  124. package/lib/common/operations/operation-handler-registry.js.map +1 -1
  125. package/lib/common/operations/operation-handler.d.ts +28 -11
  126. package/lib/common/operations/operation-handler.d.ts.map +1 -1
  127. package/lib/common/operations/operation-handler.js +50 -1
  128. package/lib/common/operations/operation-handler.js.map +1 -1
  129. package/lib/common/test/mock-util.d.ts +14 -1
  130. package/lib/common/test/mock-util.d.ts.map +1 -1
  131. package/lib/common/test/mock-util.js +42 -37
  132. package/lib/common/test/mock-util.js.map +1 -1
  133. package/package.json +4 -3
  134. package/src/common/command/command-stack.spec.ts +239 -0
  135. package/src/common/command/command-stack.ts +106 -20
  136. package/src/common/command/command.spec.ts +92 -0
  137. package/src/common/command/command.ts +96 -7
  138. package/src/common/command/recording-command.spec.ts +74 -0
  139. package/src/common/command/recording-command.ts +119 -0
  140. package/src/common/command/undo-redo-action-handler.ts +57 -0
  141. package/src/common/di/diagram-module.ts +13 -0
  142. package/src/common/features/contextactions/tool-palette-item-provider.ts +2 -4
  143. package/src/common/{gmodel → features/layout}/computed-bounds-action-handler.ts +9 -4
  144. package/src/common/features/layout/layout-operation-handler.ts +26 -11
  145. package/src/common/features/model/model-state.ts +0 -3
  146. package/src/common/features/model/model-submission-handler.ts +6 -2
  147. package/src/common/features/model/save-model-action-handler.ts +5 -6
  148. package/src/common/gmodel/apply-label-edit-operation-handler.ts +13 -15
  149. package/src/common/gmodel/change-bounds-operation-handler.ts +12 -8
  150. package/src/common/gmodel/change-routing-points-operation-handler.ts +8 -7
  151. package/src/common/{operations → gmodel}/cut-operation-handler.ts +9 -8
  152. package/src/common/gmodel/delete-operation-handler.ts +16 -10
  153. package/src/common/gmodel/gmodel-create-edge-operation-handler.ts +16 -10
  154. package/src/common/gmodel/gmodel-create-node-operation-handler.ts +54 -6
  155. package/src/common/gmodel/gmodel-diagram-module.ts +22 -27
  156. package/src/common/gmodel/gmodel-operation-handler.ts +31 -0
  157. package/src/common/gmodel/index.ts +2 -1
  158. package/src/common/gmodel/paste-operation-handler.ts +19 -11
  159. package/src/common/gmodel/reconnect-edge-operation-handler.ts +8 -7
  160. package/src/common/index.ts +2 -1
  161. package/src/common/operations/compound-operation-handler.ts +14 -12
  162. package/src/common/operations/create-operation-handler.ts +17 -74
  163. package/src/common/operations/operation-action-handler.ts +51 -27
  164. package/src/common/operations/operation-handler-registry.ts +18 -3
  165. package/src/common/operations/operation-handler.ts +38 -13
  166. package/src/common/test/mock-util.ts +42 -36
  167. package/lib/common/gmodel/apply-label-edit-operation-handler.spec.d.ts +0 -2
  168. package/lib/common/gmodel/apply-label-edit-operation-handler.spec.d.ts.map +0 -1
  169. package/lib/common/gmodel/apply-label-edit-operation-handler.spec.js +0 -38
  170. package/lib/common/gmodel/apply-label-edit-operation-handler.spec.js.map +0 -1
  171. package/lib/common/gmodel/computed-bounds-action-handler.d.ts.map +0 -1
  172. package/lib/common/gmodel/computed-bounds-action-handler.js.map +0 -1
  173. package/lib/common/operations/cut-operation-handler.d.ts.map +0 -1
  174. package/lib/common/operations/cut-operation-handler.js.map +0 -1
  175. package/src/common/gmodel/apply-label-edit-operation-handler.spec.ts +0 -40
@@ -0,0 +1,23 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2022-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 { Command } from '../command/command';
17
+ import { GModelSerializer } from '../features/model/gmodel-serializer';
18
+ import { OperationHandler } from '../operations/operation-handler';
19
+ export declare abstract class GModelOperationHandler extends OperationHandler {
20
+ protected serializer: GModelSerializer;
21
+ protected commandOf(runnable: () => void): Command;
22
+ }
23
+ //# sourceMappingURL=gmodel-operation-handler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gmodel-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/gmodel-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,8BAAsB,sBAAuB,SAAQ,gBAAgB;IAEjE,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAEvC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO;CAGrD"}
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (c) 2022-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.GModelOperationHandler = void 0;
28
+ const inversify_1 = require("inversify");
29
+ const recording_command_1 = require("../command/recording-command");
30
+ const gmodel_serializer_1 = require("../features/model/gmodel-serializer");
31
+ const operation_handler_1 = require("../operations/operation-handler");
32
+ (0, inversify_1.injectable)();
33
+ class GModelOperationHandler extends operation_handler_1.OperationHandler {
34
+ commandOf(runnable) {
35
+ return new recording_command_1.GModelRecordingCommand(this.modelState, this.serializer, runnable);
36
+ }
37
+ }
38
+ __decorate([
39
+ (0, inversify_1.inject)(gmodel_serializer_1.GModelSerializer),
40
+ __metadata("design:type", Object)
41
+ ], GModelOperationHandler.prototype, "serializer", void 0);
42
+ exports.GModelOperationHandler = GModelOperationHandler;
43
+ //# sourceMappingURL=gmodel-operation-handler.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gmodel-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/gmodel-operation-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yCAA+C;AAE/C,oEAAsE;AACtE,2EAAuE;AACvE,uEAAmE;AAEnE,IAAA,sBAAU,GAAE,CAAC;AACb,MAAsB,sBAAuB,SAAQ,oCAAgB;IAIvD,SAAS,CAAC,QAAoB;QACpC,OAAO,IAAI,0CAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClF,CAAC;CACJ;AANG;IAAC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0DACc;AAF3C,wDAOC"}
@@ -16,11 +16,12 @@
16
16
  export * from './apply-label-edit-operation-handler';
17
17
  export * from './change-bounds-operation-handler';
18
18
  export * from './change-routing-points-operation-handler';
19
- export * from './computed-bounds-action-handler';
19
+ export * from './cut-operation-handler';
20
20
  export * from './delete-operation-handler';
21
21
  export * from './gmodel-create-edge-operation-handler';
22
22
  export * from './gmodel-create-node-operation-handler';
23
23
  export * from './gmodel-diagram-module';
24
+ export * from './gmodel-operation-handler';
24
25
  export * from './paste-operation-handler';
25
26
  export * from './reconnect-edge-operation-handler';
26
27
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC"}
@@ -32,11 +32,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
32
32
  __exportStar(require("./apply-label-edit-operation-handler"), exports);
33
33
  __exportStar(require("./change-bounds-operation-handler"), exports);
34
34
  __exportStar(require("./change-routing-points-operation-handler"), exports);
35
- __exportStar(require("./computed-bounds-action-handler"), exports);
35
+ __exportStar(require("./cut-operation-handler"), exports);
36
36
  __exportStar(require("./delete-operation-handler"), exports);
37
37
  __exportStar(require("./gmodel-create-edge-operation-handler"), exports);
38
38
  __exportStar(require("./gmodel-create-node-operation-handler"), exports);
39
39
  __exportStar(require("./gmodel-diagram-module"), exports);
40
+ __exportStar(require("./gmodel-operation-handler"), exports);
40
41
  __exportStar(require("./paste-operation-handler"), exports);
41
42
  __exportStar(require("./reconnect-edge-operation-handler"), exports);
42
43
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,uEAAqD;AACrD,oEAAkD;AAClD,4EAA0D;AAC1D,mEAAiD;AACjD,6DAA2C;AAC3C,yEAAuD;AACvD,yEAAuD;AACvD,0DAAwC;AACxC,4DAA0C;AAC1C,qEAAmD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/gmodel/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,uEAAqD;AACrD,oEAAkD;AAClD,4EAA0D;AAC1D,0DAAwC;AACxC,6DAA2C;AAC3C,yEAAuD;AACvD,yEAAuD;AACvD,0DAAwC;AACxC,6DAA2C;AAC3C,4DAA0C;AAC1C,qEAAmD"}
@@ -14,16 +14,17 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
  import { GBoundsAware, GModelElement } from '@eclipse-glsp/graph';
17
- import { MaybePromise, PasteOperation, Point } from '@eclipse-glsp/protocol';
17
+ import { EditorContext, MaybePromise, PasteOperation, Point } from '@eclipse-glsp/protocol';
18
+ import { Command } from '../command/command';
18
19
  import { GModelSerializer } from '../features/model/gmodel-serializer';
19
- import { ModelState } from '../features/model/model-state';
20
- import { OperationHandler } from '../operations/operation-handler';
21
- export declare class PasteOperationHandler implements OperationHandler {
20
+ import { GModelOperationHandler } from './gmodel-operation-handler';
21
+ export declare class GModelPasteOperationHandler extends GModelOperationHandler {
22
22
  operationType: string;
23
23
  protected readonly DEFAULT_OFFSET = 20;
24
- protected modelState: ModelState;
25
24
  protected modelSerializer: GModelSerializer;
26
- execute(operation: PasteOperation): MaybePromise<void>;
25
+ createCommand(operation: PasteOperation): MaybePromise<Command | undefined>;
26
+ protected getCopiedElements(jsonString: string): GModelElement[];
27
+ protected executePaste(elements: GModelElement[], context: EditorContext): MaybePromise<void>;
27
28
  protected computeOffset(elements: GModelElement[], lastMousePosition?: Point): Point;
28
29
  protected getReferenceElementForPasteOffset(elements: GModelElement[]): GBoundsAware | undefined;
29
30
  protected reassignIds(elements: GModelElement[]): Map<string, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"paste-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAS,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAuB,MAAM,wBAAwB,CAAC;AAGlG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBACa,qBAAsB,YAAW,gBAAgB;IAC1D,aAAa,SAAuB;IAEpC,SAAS,CAAC,QAAQ,CAAC,cAAc,MAAM;IAGvC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAE5C,OAAO,CAAC,SAAS,EAAE,cAAc,GAAG,YAAY,CAAC,IAAI,CAAC;IAWtD,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK;IAapF,SAAS,CAAC,iCAAiC,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,YAAY,GAAG,SAAS;IAchG,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAcrE,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIrF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO;IAI3F,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAarF;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,CAQpE"}
1
+ {"version":3,"file":"paste-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAS,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAuB,MAAM,wBAAwB,CAAC;AAGjH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,qBACa,2BAA4B,SAAQ,sBAAsB;IACnE,aAAa,SAAuB;IAEpC,SAAS,CAAC,QAAQ,CAAC,cAAc,MAAM;IAGvC,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAE5C,aAAa,CAAC,SAAS,EAAE,cAAc,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAO3E,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,EAAE;IAKhE,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;IAU7F,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK;IAapF,SAAS,CAAC,iCAAiC,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,YAAY,GAAG,SAAS;IAchG,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAcrE,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIrF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO;IAI3F,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAarF;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,CAQpE"}
@@ -9,7 +9,7 @@ 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.shift = exports.PasteOperationHandler = void 0;
12
+ exports.shift = exports.GModelPasteOperationHandler = void 0;
13
13
  /********************************************************************************
14
14
  * Copyright (c) 2022-2023 STMicroelectronics and others.
15
15
  *
@@ -30,16 +30,25 @@ const protocol_1 = require("@eclipse-glsp/protocol");
30
30
  const inversify_1 = require("inversify");
31
31
  const uuid = require("uuid");
32
32
  const gmodel_serializer_1 = require("../features/model/gmodel-serializer");
33
- const model_state_1 = require("../features/model/model-state");
34
- let PasteOperationHandler = class PasteOperationHandler {
33
+ const gmodel_operation_handler_1 = require("./gmodel-operation-handler");
34
+ let GModelPasteOperationHandler = class GModelPasteOperationHandler extends gmodel_operation_handler_1.GModelOperationHandler {
35
35
  constructor() {
36
+ super(...arguments);
36
37
  this.operationType = protocol_1.PasteOperation.KIND;
37
38
  this.DEFAULT_OFFSET = 20;
38
39
  }
39
- execute(operation) {
40
- const schemas = JSON.parse(operation.clipboardData['application/json']);
41
- const elements = schemas.map(schema => this.modelSerializer.createElement(schema, this.modelState.root));
42
- shift(elements, this.computeOffset(elements, operation.editorContext.lastMousePosition));
40
+ createCommand(operation) {
41
+ const elements = this.getCopiedElements(operation.clipboardData['application/json']);
42
+ return elements.length > 0 //
43
+ ? this.commandOf(() => this.executePaste(elements, operation.editorContext))
44
+ : undefined;
45
+ }
46
+ getCopiedElements(jsonString) {
47
+ const schemas = JSON.parse(jsonString);
48
+ return schemas.map(schema => this.modelSerializer.createElement(schema, this.modelState.root));
49
+ }
50
+ executePaste(elements, context) {
51
+ shift(elements, this.computeOffset(elements, context.lastMousePosition));
43
52
  const idMap = this.reassignIds(elements);
44
53
  this.filterElements(elements, idMap);
45
54
  this.rewireEdges(elements, idMap);
@@ -105,18 +114,14 @@ let PasteOperationHandler = class PasteOperationHandler {
105
114
  });
106
115
  }
107
116
  };
108
- __decorate([
109
- (0, inversify_1.inject)(model_state_1.ModelState),
110
- __metadata("design:type", Object)
111
- ], PasteOperationHandler.prototype, "modelState", void 0);
112
117
  __decorate([
113
118
  (0, inversify_1.inject)(gmodel_serializer_1.GModelSerializer),
114
119
  __metadata("design:type", Object)
115
- ], PasteOperationHandler.prototype, "modelSerializer", void 0);
116
- PasteOperationHandler = __decorate([
120
+ ], GModelPasteOperationHandler.prototype, "modelSerializer", void 0);
121
+ GModelPasteOperationHandler = __decorate([
117
122
  (0, inversify_1.injectable)()
118
- ], PasteOperationHandler);
119
- exports.PasteOperationHandler = PasteOperationHandler;
123
+ ], GModelPasteOperationHandler);
124
+ exports.GModelPasteOperationHandler = GModelPasteOperationHandler;
120
125
  function shift(elements, offset) {
121
126
  elements
122
127
  .filter(element => (0, graph_1.isGBoundsAware)(element))
@@ -1 +1 @@
1
- {"version":3,"file":"paste-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"paste-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/paste-operation-handler.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import { MaybePromise, ReconnectEdgeOperation } from '@eclipse-glsp/protocol';
2
- import { ModelState } from '../features/model/model-state';
3
- import { OperationHandler } from '../operations/operation-handler';
4
- export declare class ReconnectEdgeOperationHandler implements OperationHandler {
2
+ import { Command } from '../command/command';
3
+ import { GModelOperationHandler } from './gmodel-operation-handler';
4
+ export declare class GModelReconnectEdgeOperationHandler extends GModelOperationHandler {
5
5
  operationType: string;
6
- protected readonly modelState: ModelState;
7
- execute(operation: ReconnectEdgeOperation): MaybePromise<void>;
6
+ createCommand(operation: ReconnectEdgeOperation): MaybePromise<Command | undefined>;
7
+ executeReconnect(operation: ReconnectEdgeOperation): MaybePromise<void>;
8
8
  }
9
9
  //# sourceMappingURL=reconnect-edge-operation-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"reconnect-edge-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/reconnect-edge-operation-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,qBACa,6BAA8B,YAAW,gBAAgB;IAClE,aAAa,SAA+B;IAG5C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAE1C,OAAO,CAAC,SAAS,EAAE,sBAAsB,GAAG,YAAY,CAAC,IAAI,CAAC;CAyBjE"}
1
+ {"version":3,"file":"reconnect-edge-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/gmodel/reconnect-edge-operation-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,qBACa,mCAAoC,SAAQ,sBAAsB;IAC3E,aAAa,SAA+B;IAE5C,aAAa,CAAC,SAAS,EAAE,sBAAsB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAInF,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,YAAY,CAAC,IAAI,CAAC;CAyB1E"}
@@ -5,11 +5,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  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;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
8
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.ReconnectEdgeOperationHandler = void 0;
9
+ exports.GModelReconnectEdgeOperationHandler = void 0;
13
10
  /********************************************************************************
14
11
  * Copyright (c) 2022-2023 STMicroelectronics and others.
15
12
  *
@@ -28,13 +25,17 @@ exports.ReconnectEdgeOperationHandler = void 0;
28
25
  const graph_1 = require("@eclipse-glsp/graph");
29
26
  const protocol_1 = require("@eclipse-glsp/protocol");
30
27
  const inversify_1 = require("inversify");
31
- const model_state_1 = require("../features/model/model-state");
32
28
  const glsp_server_error_1 = require("../utils/glsp-server-error");
33
- let ReconnectEdgeOperationHandler = class ReconnectEdgeOperationHandler {
29
+ const gmodel_operation_handler_1 = require("./gmodel-operation-handler");
30
+ let GModelReconnectEdgeOperationHandler = class GModelReconnectEdgeOperationHandler extends gmodel_operation_handler_1.GModelOperationHandler {
34
31
  constructor() {
32
+ super(...arguments);
35
33
  this.operationType = protocol_1.ReconnectEdgeOperation.KIND;
36
34
  }
37
- execute(operation) {
35
+ createCommand(operation) {
36
+ return this.commandOf(() => this.executeReconnect(operation));
37
+ }
38
+ executeReconnect(operation) {
38
39
  if (!operation.edgeElementId || !operation.sourceElementId || !operation.targetElementId) {
39
40
  throw new glsp_server_error_1.GLSPServerError('Incomplete reconnect connection action');
40
41
  }
@@ -56,12 +57,8 @@ let ReconnectEdgeOperationHandler = class ReconnectEdgeOperationHandler {
56
57
  edge.routingPoints = [];
57
58
  }
58
59
  };
59
- __decorate([
60
- (0, inversify_1.inject)(model_state_1.ModelState),
61
- __metadata("design:type", Object)
62
- ], ReconnectEdgeOperationHandler.prototype, "modelState", void 0);
63
- ReconnectEdgeOperationHandler = __decorate([
60
+ GModelReconnectEdgeOperationHandler = __decorate([
64
61
  (0, inversify_1.injectable)()
65
- ], ReconnectEdgeOperationHandler);
66
- exports.ReconnectEdgeOperationHandler = ReconnectEdgeOperationHandler;
62
+ ], GModelReconnectEdgeOperationHandler);
63
+ exports.GModelReconnectEdgeOperationHandler = GModelReconnectEdgeOperationHandler;
67
64
  //# sourceMappingURL=reconnect-edge-operation-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"reconnect-edge-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/reconnect-edge-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAA0D;AAC1D,qDAA8E;AAC9E,yCAA+C;AAC/C,+DAA2D;AAE3D,kEAA6D;AAGtD,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAAnC;QACH,kBAAa,GAAG,iCAAsB,CAAC,IAAI,CAAC;IA8BhD,CAAC;IAzBG,OAAO,CAAC,SAAiC;QACrC,IAAI,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE;YACtF,MAAM,IAAI,mCAAe,CAAC,wCAAwC,CAAC,CAAC;SACvE;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAEpC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,aAAa,EAAE,aAAK,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,EAAE,aAAK,IAAI,aAAK,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,EAAE,aAAK,IAAI,aAAK,CAAC,CAAC;QAE5E,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7E;QAED,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;CACJ,CAAA;AA5BG;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;iEACuB;AAJjC,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CA+BzC;AA/BY,sEAA6B"}
1
+ {"version":3,"file":"reconnect-edge-operation-handler.js","sourceRoot":"","sources":["../../../src/common/gmodel/reconnect-edge-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAA0D;AAC1D,qDAA8E;AAC9E,yCAAuC;AAEvC,kEAA6D;AAC7D,yEAAoE;AAG7D,IAAM,mCAAmC,GAAzC,MAAM,mCAAoC,SAAQ,iDAAsB;IAAxE;;QACH,kBAAa,GAAG,iCAAsB,CAAC,IAAI,CAAC;IA+BhD,CAAC;IA7BG,aAAa,CAAC,SAAiC;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,gBAAgB,CAAC,SAAiC;QAC9C,IAAI,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE;YACtF,MAAM,IAAI,mCAAe,CAAC,wCAAwC,CAAC,CAAC;SACvE;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAEpC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,aAAa,EAAE,aAAK,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,EAAE,aAAK,IAAI,aAAK,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,EAAE,aAAK,IAAI,aAAK,CAAC,CAAC;QAE5E,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;SACvE;QACD,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7E;QAED,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;CACJ,CAAA;AAhCY,mCAAmC;IAD/C,IAAA,sBAAU,GAAE;GACA,mCAAmC,CAgC/C;AAhCY,kFAAmC"}
@@ -42,6 +42,7 @@ export * from './features/directediting/context-edit-validator';
42
42
  export * from './features/directediting/context-edit-validator-registry';
43
43
  export * from './features/directediting/label-edit-validator';
44
44
  export * from './features/directediting/request-edit-validation-handler';
45
+ export * from './features/layout/computed-bounds-action-handler';
45
46
  export * from './features/layout/layout-engine';
46
47
  export * from './features/layout/layout-operation-handler';
47
48
  export * from './features/model/gmodel-factory';
@@ -63,11 +64,11 @@ export * from './features/popup/popup-model-factory';
63
64
  export * from './features/popup/request-popup-model-action-handler';
64
65
  export * from './features/validation/model-validator';
65
66
  export * from './features/validation/request-markers-handler';
67
+ export * from './gmodel/cut-operation-handler';
66
68
  export * from './gmodel/index';
67
69
  export * from './launch/glsp-server-launcher';
68
70
  export * from './operations/compound-operation-handler';
69
71
  export * from './operations/create-operation-handler';
70
- export * from './operations/cut-operation-handler';
71
72
  export * from './operations/operation-action-handler';
72
73
  export * from './operations/operation-handler';
73
74
  export * from './operations/operation-handler-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,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,oCAAoC,CAAC;AACnD,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,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"}
@@ -58,6 +58,7 @@ __exportStar(require("./features/directediting/context-edit-validator"), exports
58
58
  __exportStar(require("./features/directediting/context-edit-validator-registry"), exports);
59
59
  __exportStar(require("./features/directediting/label-edit-validator"), exports);
60
60
  __exportStar(require("./features/directediting/request-edit-validation-handler"), exports);
61
+ __exportStar(require("./features/layout/computed-bounds-action-handler"), exports);
61
62
  __exportStar(require("./features/layout/layout-engine"), exports);
62
63
  __exportStar(require("./features/layout/layout-operation-handler"), exports);
63
64
  __exportStar(require("./features/model/gmodel-factory"), exports);
@@ -79,11 +80,11 @@ __exportStar(require("./features/popup/popup-model-factory"), exports);
79
80
  __exportStar(require("./features/popup/request-popup-model-action-handler"), exports);
80
81
  __exportStar(require("./features/validation/model-validator"), exports);
81
82
  __exportStar(require("./features/validation/request-markers-handler"), exports);
83
+ __exportStar(require("./gmodel/cut-operation-handler"), exports);
82
84
  __exportStar(require("./gmodel/index"), exports);
83
85
  __exportStar(require("./launch/glsp-server-launcher"), exports);
84
86
  __exportStar(require("./operations/compound-operation-handler"), exports);
85
87
  __exportStar(require("./operations/create-operation-handler"), exports);
86
- __exportStar(require("./operations/cut-operation-handler"), exports);
87
88
  __exportStar(require("./operations/operation-action-handler"), exports);
88
89
  __exportStar(require("./operations/operation-handler"), exports);
89
90
  __exportStar(require("./operations/operation-handler-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,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,qEAAmD;AACnD,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,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"}
@@ -13,13 +13,13 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { CompoundOperation, MaybePromise, Operation } from '@eclipse-glsp/protocol';
16
+ import { CompoundOperation } from '@eclipse-glsp/protocol';
17
+ import { Command } from '../command/command';
17
18
  import { OperationHandler } from './operation-handler';
18
19
  import { OperationHandlerRegistry } from './operation-handler-registry';
19
- export declare class CompoundOperationHandler implements OperationHandler {
20
- operationType: string;
20
+ export declare class CompoundOperationHandler extends OperationHandler {
21
21
  protected operationHandlerRegistry: OperationHandlerRegistry;
22
- execute(operation: CompoundOperation): void;
23
- executeNestedOperation(operation: Operation): MaybePromise<void>;
22
+ operationType: string;
23
+ createCommand(operation: CompoundOperation): Promise<Command | undefined>;
24
24
  }
25
25
  //# sourceMappingURL=compound-operation-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"compound-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,wBAAyB,YAAW,gBAAgB;IAC7D,aAAa,SAA0B;IAEL,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAE/F,OAAO,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAI3C,sBAAsB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;CAMnE"}
1
+ {"version":3,"file":"compound-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAmB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,wBAAyB,SAAQ,gBAAgB;IAE1D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAE7D,aAAa,SAA0B;IAEjC,aAAa,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;CAWlF"}
@@ -8,6 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  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
+ var __asyncValues = (this && this.__asyncValues) || function (o) {
12
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
13
+ var m = o[Symbol.asyncIterator], i;
14
+ return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
15
+ function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
16
+ function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
17
+ };
11
18
  Object.defineProperty(exports, "__esModule", { value: true });
12
19
  exports.CompoundOperationHandler = void 0;
13
20
  /********************************************************************************
@@ -27,20 +34,41 @@ exports.CompoundOperationHandler = void 0;
27
34
  ********************************************************************************/
28
35
  const protocol_1 = require("@eclipse-glsp/protocol");
29
36
  const inversify_1 = require("inversify");
30
- const operation_action_handler_1 = require("./operation-action-handler");
37
+ const command_1 = require("../command/command");
38
+ const operation_handler_1 = require("./operation-handler");
31
39
  const operation_handler_registry_1 = require("./operation-handler-registry");
32
- let CompoundOperationHandler = class CompoundOperationHandler {
40
+ let CompoundOperationHandler = class CompoundOperationHandler extends operation_handler_1.OperationHandler {
33
41
  constructor() {
42
+ super(...arguments);
34
43
  this.operationType = protocol_1.CompoundOperation.KIND;
35
44
  }
36
- execute(operation) {
37
- operation.operationList.forEach(nestedOperation => this.executeNestedOperation(nestedOperation));
38
- }
39
- executeNestedOperation(operation) {
40
- const operationHandler = operation_action_handler_1.OperationActionHandler.getOperationHandler(operation, this.operationHandlerRegistry);
41
- if (operationHandler) {
42
- operationHandler.execute(operation);
45
+ async createCommand(operation) {
46
+ var _a, e_1, _b, _c;
47
+ const maybeCommands = operation.operationList.map(op => this.operationHandlerRegistry.getExecutableCommand(op));
48
+ const commands = [];
49
+ try {
50
+ for (var _d = true, maybeCommands_1 = __asyncValues(maybeCommands), maybeCommands_1_1; maybeCommands_1_1 = await maybeCommands_1.next(), _a = maybeCommands_1_1.done, !_a;) {
51
+ _c = maybeCommands_1_1.value;
52
+ _d = false;
53
+ try {
54
+ const command = _c;
55
+ if (command) {
56
+ commands.push(command);
57
+ }
58
+ }
59
+ finally {
60
+ _d = true;
61
+ }
62
+ }
63
+ }
64
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
65
+ finally {
66
+ try {
67
+ if (!_d && !_a && (_b = maybeCommands_1.return)) await _b.call(maybeCommands_1);
68
+ }
69
+ finally { if (e_1) throw e_1.error; }
43
70
  }
71
+ return new command_1.CompoundCommand(commands);
44
72
  }
45
73
  };
46
74
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"compound-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoF;AACpF,yCAA+C;AAC/C,yEAAoE;AAEpE,6EAAwE;AAGjE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACH,kBAAa,GAAG,4BAAiB,CAAC,IAAI,CAAC;IAc3C,CAAC;IAVG,OAAO,CAAC,SAA4B;QAChC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC;IACrG,CAAC;IAED,sBAAsB,CAAC,SAAoB;QACvC,MAAM,gBAAgB,GAAG,iDAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACvC;IACL,CAAC;CACJ,CAAA;AAZG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BAAqC,qDAAwB;0EAAC;AAHtF,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAepC;AAfY,4DAAwB"}
1
+ {"version":3,"file":"compound-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/compound-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA2D;AAC3D,yCAA+C;AAC/C,gDAA8D;AAC9D,2DAAuD;AACvD,6EAAwE;AAGjE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,oCAAgB;IAAvD;;QAIH,kBAAa,GAAG,4BAAiB,CAAC,IAAI,CAAC;IAa3C,CAAC;IAXG,KAAK,CAAC,aAAa,CAAC,SAA4B;;QAC5C,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;QAChH,MAAM,QAAQ,GAAc,EAAE,CAAC;;YAE/B,KAA4B,eAAA,kBAAA,cAAA,aAAa,CAAA,mBAAA;gBAAb,6BAAa;gBAAb,WAAa;;oBAA9B,MAAM,OAAO,KAAA,CAAA;oBACpB,IAAI,OAAO,EAAE;wBACT,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC1B;;;;;aACJ;;;;;;;;;QACD,OAAO,IAAI,yBAAe,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;CACJ,CAAA;AAhBG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;0EAAC;AAFpD,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAiBpC;AAjBY,4DAAwB"}
@@ -13,52 +13,20 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { GModelElement } from '@eclipse-glsp/graph';
17
- import { CreateNodeOperation, CreateOperation, MaybePromise, Operation, Point, TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
18
- import { ModelState } from '../features/model/model-state';
16
+ import { CreateEdgeOperation, CreateNodeOperation, TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
19
17
  import { OperationHandler } from './operation-handler';
20
18
  /**
21
19
  * A special {@link OperationHandler} that is responsible for the handling of {@link CreateOperation}s. Depending on its
22
20
  * operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
23
21
  */
24
- export declare abstract class CreateOperationHandler implements OperationHandler {
25
- abstract operationType: string;
26
- abstract readonly label: string;
27
- abstract elementTypeIds: string[];
28
- abstract execute(operation: Operation): MaybePromise<void>;
29
- /**
30
- * Returns a list of {@link TriggerElementCreationAction}s for registered element types.
31
- *
32
- * @returns A list of {@link TriggerElementCreationAction}s.
33
- */
22
+ export interface CreateOperationHandler extends OperationHandler {
23
+ readonly label: string;
24
+ elementTypeIds: string[];
25
+ operationType: CreateOperationKind;
34
26
  getTriggerActions(): (TriggerEdgeCreationAction | TriggerNodeCreationAction)[];
35
- handles(operation: CreateOperation): boolean;
36
27
  }
37
- /**
38
- * Abstract base implementation for {@link CreateOperationHandler} that
39
- * create an element that is represented with a {@link GNode} in the graphical model.
40
- */
41
- export declare abstract class CreateNodeOperationHandler extends CreateOperationHandler {
42
- protected modelState: ModelState;
43
- get operationType(): string;
44
- /**
45
- * Retrieve the graphical model element that should contain the newly created {@link GNode}.
46
- * If `undefined` is returned the {@link GNode} should be added directly to the diagram root.
47
- * @param operation The currently handled operation.
48
- * @returns The container {@link GModeElement} or `undefined`.
49
- */
50
- getContainer(operation: CreateNodeOperation): GModelElement | undefined;
51
- getLocation(operation: CreateNodeOperation): Point | undefined;
52
- /**
53
- * Retrieves the diagram absolute location and the target container from the given {@link CreateNodeOperation}
54
- * and converts the absolute location to coordinates relative to the given container.
55
- * Relative coordinates can only be retrieved if the given container element is part of
56
- * a hierarchy of {@link GBoundsAware} elements. This means each (recursive) parent element need to
57
- * implement {@link GBoundsAware}. If that is not the case this method returns `undefined`.
58
- * @param absoluteLocation The diagram absolute position.
59
- * @param container The container element.
60
- * @returns The relative position or `undefined`.
61
- */
62
- getRelativeLocation(operation: CreateNodeOperation): Point | undefined;
28
+ export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
29
+ export declare namespace CreateOperationHandler {
30
+ function is(object: unknown): object is CreateOperationHandler;
63
31
  }
64
32
  //# sourceMappingURL=create-operation-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"create-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAEH,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,SAAS,EACT,KAAK,EACL,yBAAyB,EACzB,yBAAyB,EAC5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,8BACsB,sBAAuB,YAAW,gBAAgB;IACpE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAElC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;IAE1D;;;;OAIG;IACH,iBAAiB,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC,EAAE;IAS9E,OAAO,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;CAG/C;AAED;;;GAGG;AACH,8BACsB,0BAA2B,SAAQ,sBAAsB;IAE3E,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,GAAG,SAAS;IAKvE,WAAW,CAAC,SAAS,EAAE,mBAAmB,GAAG,KAAK,GAAG,SAAS;IAI9D;;;;;;;;;OASG;IACH,mBAAmB,CAAC,SAAS,EAAE,mBAAmB,GAAG,KAAK,GAAG,SAAS;CAKzE"}
1
+ {"version":3,"file":"create-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EAInB,yBAAyB,EACzB,yBAAyB,EAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC5D,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,mBAAmB,CAAC;IACnC,iBAAiB,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC,EAAE,CAAC;CAClF;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC,IAAI,GAAG,OAAO,mBAAmB,CAAC,IAAI,CAAC;AAEpG,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,sBAAsB,CAOpE;CACJ"}