@eclipse-glsp/server 2.6.0-next.3 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/features/layout/computed-bounds-action-handler.d.ts.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
- package/lib/common/features/model/model-submission-handler.d.ts +5 -3
- package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
- package/lib/common/features/model/model-submission-handler.js +6 -4
- package/lib/common/features/model/model-submission-handler.js.map +1 -1
- package/package.json +4 -4
- package/src/common/features/layout/computed-bounds-action-handler.ts +5 -2
- package/src/common/features/model/model-submission-handler.ts +7 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computed-bounds-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"computed-bounds-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E;;;;GAIG;AACH,qBACa,2BAA4B,YAAW,aAAa;IAE7D,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAGpD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC,WAAW,WAA+B;IAC1C,OAAO,CAAC,MAAM,EAAE,oBAAoB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAa7D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAO3E,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC"}
|
|
@@ -28,7 +28,7 @@ let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
|
|
|
28
28
|
const model = this.modelState.root;
|
|
29
29
|
if (action.revision === model.revision) {
|
|
30
30
|
this.applyBounds(model, action);
|
|
31
|
-
return this.submissionHandler.submitModelDirectly();
|
|
31
|
+
return this.submissionHandler.submitModelDirectly(undefined, protocol_1.LayoutOperation.create([], { canvasBounds: action.canvasBounds, viewport: action.viewport }));
|
|
32
32
|
}
|
|
33
33
|
return [];
|
|
34
34
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAqG;AACrG,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;IAsB9C,CAAC;IArBG,OAAO,CAAC,MAA4B;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAC7C,SAAS,EACT,0BAAe,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAC/F,CAAC;QACN,CAAC;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;AA7BY,kEAA2B;AAE1B;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAG1C;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;sCALxB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA6BvC"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, DirtyStateChangeReason, GModelRootSchema, MaybePromise, RequestModelAction, SetModelAction } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { Action, DirtyStateChangeReason, GModelRootSchema, LayoutOperation, MaybePromise, RequestModelAction, SetModelAction } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { DebouncedFunc } from 'lodash';
|
|
18
18
|
import { ActionDispatcher } from '../../actions/action-dispatcher';
|
|
19
19
|
import { CommandStack } from '../../command/command-stack';
|
|
@@ -66,9 +66,10 @@ export declare class ModelSubmissionHandler {
|
|
|
66
66
|
* to the `ActionDispatcher`, or simply returned as the result of an `ActionHandler.execute()` method.
|
|
67
67
|
*
|
|
68
68
|
* @param reason The optional reason that caused the model update.
|
|
69
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
69
70
|
* @returns A list of actions to be processed in order to submit the model.
|
|
70
71
|
*/
|
|
71
|
-
submitModel(reason?: DirtyStateChangeReason): MaybePromise<Action[]>;
|
|
72
|
+
submitModel(reason?: DirtyStateChangeReason, layout?: LayoutOperation): MaybePromise<Action[]>;
|
|
72
73
|
/**
|
|
73
74
|
* Returns a list of actions to directly update the client-side model without any server- or client-side layouting.
|
|
74
75
|
*
|
|
@@ -81,9 +82,10 @@ export declare class ModelSubmissionHandler {
|
|
|
81
82
|
* `ActionHandler.execute()` method.
|
|
82
83
|
*
|
|
83
84
|
* @param reason The optional reason that caused the model update.
|
|
85
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
84
86
|
* @returns A list of actions to be processed in order to submit the model.
|
|
85
87
|
*/
|
|
86
|
-
submitModelDirectly(reason?: DirtyStateChangeReason): Promise<Action[]>;
|
|
88
|
+
submitModelDirectly(reason?: DirtyStateChangeReason, layout?: LayoutOperation): Promise<Action[]>;
|
|
87
89
|
protected validateModel(validator: ModelValidator): MaybePromise<Action[]>;
|
|
88
90
|
protected scheduleLiveValidation(validator: ModelValidator): void;
|
|
89
91
|
protected performLiveValidation(validator: ModelValidator): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,sBAAsB,EACtB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,EAEf,YAAY,EAEZ,kBAAkB,EAGlB,cAAc,EAGjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAY,MAAM,QAAQ,CAAC;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBACa,sBAAsB;IAE/B,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAGtC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAIjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAIrC,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAGrC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAElD,mBAAmB,SAAO;IAC1B,SAAS,CAAC,uBAAuB,CAAC,EAAE,aAAa,CAAC,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAC,CAAC;IAEvF;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,aAAa,EAAE,kBAAkB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAU7E;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAa9F;;;;;;;;;;;;;;OAcG;IACG,mBAAmB,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBvG,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,cAAc,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAM1E,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;cAMjD,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/E,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc;IAOxE,SAAS,CAAC,eAAe,IAAI,gBAAgB;CAGhD"}
|
|
@@ -79,9 +79,10 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
|
|
|
79
79
|
* to the `ActionDispatcher`, or simply returned as the result of an `ActionHandler.execute()` method.
|
|
80
80
|
*
|
|
81
81
|
* @param reason The optional reason that caused the model update.
|
|
82
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
82
83
|
* @returns A list of actions to be processed in order to submit the model.
|
|
83
84
|
*/
|
|
84
|
-
submitModel(reason) {
|
|
85
|
+
submitModel(reason, layout) {
|
|
85
86
|
this.modelFactory.createModel();
|
|
86
87
|
const revision = this.requestModelAction ? 0 : this.modelState.root.revision + 1;
|
|
87
88
|
this.modelState.root.revision = revision;
|
|
@@ -89,7 +90,7 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
|
|
|
89
90
|
const root = this.serializeGModel();
|
|
90
91
|
return [protocol_1.RequestBoundsAction.create(root), protocol_1.SetDirtyStateAction.create(this.commandStack.isDirty, { reason })];
|
|
91
92
|
}
|
|
92
|
-
return this.submitModelDirectly(reason);
|
|
93
|
+
return this.submitModelDirectly(reason, layout);
|
|
93
94
|
}
|
|
94
95
|
/**
|
|
95
96
|
* Returns a list of actions to directly update the client-side model without any server- or client-side layouting.
|
|
@@ -103,11 +104,12 @@ let ModelSubmissionHandler = class ModelSubmissionHandler {
|
|
|
103
104
|
* `ActionHandler.execute()` method.
|
|
104
105
|
*
|
|
105
106
|
* @param reason The optional reason that caused the model update.
|
|
107
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
106
108
|
* @returns A list of actions to be processed in order to submit the model.
|
|
107
109
|
*/
|
|
108
|
-
async submitModelDirectly(reason) {
|
|
110
|
+
async submitModelDirectly(reason, layout) {
|
|
109
111
|
if (this.diagramConfiguration.layoutKind === diagram_configuration_1.ServerLayoutKind.AUTOMATIC && this.layoutEngine) {
|
|
110
|
-
await this.layoutEngine.layout();
|
|
112
|
+
await this.layoutEngine.layout(layout);
|
|
111
113
|
}
|
|
112
114
|
const root = this.serializeGModel();
|
|
113
115
|
const result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/server",
|
|
3
|
-
"version": "2.6.0
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "A js server framework for Eclipse GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -58,8 +58,8 @@
|
|
|
58
58
|
"watch": "tsc -w"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@eclipse-glsp/graph": "2.6.0
|
|
62
|
-
"@eclipse-glsp/protocol": "
|
|
61
|
+
"@eclipse-glsp/graph": "2.6.0",
|
|
62
|
+
"@eclipse-glsp/protocol": "2.6.0",
|
|
63
63
|
"@types/uuid": "8.3.1",
|
|
64
64
|
"commander": "^8.3.0",
|
|
65
65
|
"fast-json-patch": "^3.1.0",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"publishConfig": {
|
|
79
79
|
"access": "public"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "88356089bae7527c2df6c5331f75504495fe2aa4"
|
|
82
82
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { GModelRoot } from '@eclipse-glsp/graph';
|
|
17
|
-
import { Action, ComputedBoundsAction, MaybePromise } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { Action, ComputedBoundsAction, LayoutOperation, MaybePromise } from '@eclipse-glsp/protocol';
|
|
18
18
|
import { inject, injectable } from 'inversify';
|
|
19
19
|
import { ActionHandler } from '../../actions/action-handler';
|
|
20
20
|
import { applyAlignment, applyElementAndBounds, applyRoute } from '../../utils/layout-util';
|
|
@@ -39,7 +39,10 @@ export class ComputedBoundsActionHandler implements ActionHandler {
|
|
|
39
39
|
const model = this.modelState.root;
|
|
40
40
|
if (action.revision === model.revision) {
|
|
41
41
|
this.applyBounds(model, action);
|
|
42
|
-
return this.submissionHandler.submitModelDirectly(
|
|
42
|
+
return this.submissionHandler.submitModelDirectly(
|
|
43
|
+
undefined,
|
|
44
|
+
LayoutOperation.create([], { canvasBounds: action.canvasBounds, viewport: action.viewport })
|
|
45
|
+
);
|
|
43
46
|
}
|
|
44
47
|
|
|
45
48
|
return [];
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
Action,
|
|
18
18
|
DirtyStateChangeReason,
|
|
19
19
|
GModelRootSchema,
|
|
20
|
+
LayoutOperation,
|
|
20
21
|
MarkersReason,
|
|
21
22
|
MaybePromise,
|
|
22
23
|
RequestBoundsAction,
|
|
@@ -112,9 +113,10 @@ export class ModelSubmissionHandler {
|
|
|
112
113
|
* to the `ActionDispatcher`, or simply returned as the result of an `ActionHandler.execute()` method.
|
|
113
114
|
*
|
|
114
115
|
* @param reason The optional reason that caused the model update.
|
|
116
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
115
117
|
* @returns A list of actions to be processed in order to submit the model.
|
|
116
118
|
*/
|
|
117
|
-
submitModel(reason?: DirtyStateChangeReason): MaybePromise<Action[]> {
|
|
119
|
+
submitModel(reason?: DirtyStateChangeReason, layout?: LayoutOperation): MaybePromise<Action[]> {
|
|
118
120
|
this.modelFactory.createModel();
|
|
119
121
|
|
|
120
122
|
const revision = this.requestModelAction ? 0 : this.modelState.root.revision! + 1;
|
|
@@ -124,7 +126,7 @@ export class ModelSubmissionHandler {
|
|
|
124
126
|
const root = this.serializeGModel();
|
|
125
127
|
return [RequestBoundsAction.create(root), SetDirtyStateAction.create(this.commandStack.isDirty, { reason })];
|
|
126
128
|
}
|
|
127
|
-
return this.submitModelDirectly(reason);
|
|
129
|
+
return this.submitModelDirectly(reason, layout);
|
|
128
130
|
}
|
|
129
131
|
|
|
130
132
|
/**
|
|
@@ -139,11 +141,12 @@ export class ModelSubmissionHandler {
|
|
|
139
141
|
* `ActionHandler.execute()` method.
|
|
140
142
|
*
|
|
141
143
|
* @param reason The optional reason that caused the model update.
|
|
144
|
+
* @param layout The optional layout operation that carries the information for auto-layout.
|
|
142
145
|
* @returns A list of actions to be processed in order to submit the model.
|
|
143
146
|
*/
|
|
144
|
-
async submitModelDirectly(reason?: DirtyStateChangeReason): Promise<Action[]> {
|
|
147
|
+
async submitModelDirectly(reason?: DirtyStateChangeReason, layout?: LayoutOperation): Promise<Action[]> {
|
|
145
148
|
if (this.diagramConfiguration.layoutKind === ServerLayoutKind.AUTOMATIC && this.layoutEngine) {
|
|
146
|
-
await this.layoutEngine.layout();
|
|
149
|
+
await this.layoutEngine.layout(layout);
|
|
147
150
|
}
|
|
148
151
|
|
|
149
152
|
const root = this.serializeGModel();
|