@eclipse-glsp/client 2.7.0-next.11 → 2.7.0-next.12
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/base/action-dispatcher.d.ts.map +1 -1
- package/lib/base/action-dispatcher.js +9 -3
- package/lib/base/action-dispatcher.js.map +1 -1
- package/lib/base/default.module.d.ts.map +1 -1
- package/lib/base/default.module.js +2 -0
- package/lib/base/default.module.js.map +1 -1
- package/lib/base/editor-context-service.d.ts +4 -3
- package/lib/base/editor-context-service.d.ts.map +1 -1
- package/lib/base/editor-context-service.js +11 -1
- package/lib/base/editor-context-service.js.map +1 -1
- package/lib/base/model/glsp-model-source.d.ts +5 -2
- package/lib/base/model/glsp-model-source.d.ts.map +1 -1
- package/lib/base/model/glsp-model-source.js +28 -1
- package/lib/base/model/glsp-model-source.js.map +1 -1
- package/lib/base/selection-service.d.ts +4 -3
- package/lib/base/selection-service.d.ts.map +1 -1
- package/lib/base/selection-service.js +6 -1
- package/lib/base/selection-service.js.map +1 -1
- package/lib/features/select/select-module.d.ts +1 -1
- package/lib/features/select/select-module.js +1 -1
- package/package.json +3 -3
- package/src/base/action-dispatcher.ts +6 -3
- package/src/base/default.module.ts +4 -0
- package/src/base/editor-context-service.ts +17 -5
- package/src/base/model/glsp-model-source.ts +35 -1
- package/src/base/selection-service.ts +11 -2
- package/src/features/select/select-module.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,QAAQ,EAER,UAAU,EACV,iBAAiB,EAEjB,aAAa,EACb,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAiB,YAAW,mBAAmB,EAAE,iBAAiB;IACxG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAElE,UACmB,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,gGAAgG;IAEhG,UAAgE,6BAA6B,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACpI,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,SAAS,CAAC,kBAAkB,iBAAwB;IAE3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAQpB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7C,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAQ1C,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxD;;;;;;OAMG;IACH,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAInD,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAUpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAI9C,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B3E,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAKvC,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAgBzD,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAexF,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,
|
|
1
|
+
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,QAAQ,EAER,UAAU,EACV,iBAAiB,EAEjB,aAAa,EACb,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAiB,YAAW,mBAAmB,EAAE,iBAAiB;IACxG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAElE,UACmB,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,gGAAgG;IAEhG,UAAgE,6BAA6B,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACpI,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,SAAS,CAAC,kBAAkB,iBAAwB;IAE3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAQpB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7C,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAQ1C,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxD;;;;;;OAMG;IACH,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAInD,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAUpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAI9C,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B3E,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAKvC,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAgBzD,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAexF,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,GAAE,MAA+B,EAC1C,eAAe,UAAQ,GACxB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CA6B9B"}
|
|
@@ -167,7 +167,7 @@ let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDi
|
|
|
167
167
|
await Promise.all(handlerResults);
|
|
168
168
|
}
|
|
169
169
|
request(action) {
|
|
170
|
-
if (!action.requestId
|
|
170
|
+
if (!action.requestId || action.requestId === '') {
|
|
171
171
|
// No request id has been specified. So we use a generated one.
|
|
172
172
|
action.requestId = sprotty_1.RequestAction.generateRequestId();
|
|
173
173
|
}
|
|
@@ -183,11 +183,17 @@ let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDi
|
|
|
183
183
|
* If `rejectOnTimeout` is set to false (default) the returned promise will be resolved with
|
|
184
184
|
* no value, otherwise it will be rejected.
|
|
185
185
|
*/
|
|
186
|
-
requestUntil(action, timeoutMs
|
|
187
|
-
|
|
186
|
+
requestUntil(action, timeoutMs, rejectOnTimeout) {
|
|
187
|
+
var _a;
|
|
188
|
+
if (timeoutMs === void 0) { timeoutMs = (_a = action.timeout) !== null && _a !== void 0 ? _a : 2000; }
|
|
189
|
+
if (rejectOnTimeout === void 0) { rejectOnTimeout = false; }
|
|
190
|
+
if (!action.requestId || action.requestId === '') {
|
|
188
191
|
// No request id has been specified. So we use a generated one.
|
|
189
192
|
action.requestId = sprotty_1.RequestAction.generateRequestId();
|
|
190
193
|
}
|
|
194
|
+
// Stamp the effective timeout onto the action so the receiving side
|
|
195
|
+
// (handleServerRequest/handleClientRequest) can respect it.
|
|
196
|
+
action.timeout = timeoutMs;
|
|
191
197
|
const requestId = action.requestId;
|
|
192
198
|
const timeout = setTimeout(() => {
|
|
193
199
|
const deferred = this.requests.get(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAc+B;AAC/B,yCAA+C;AAC/C,uEAAsE;AAEtE,iEAA2D;AAC3D,6FAAwF;AAGjF,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,0BAAgB;IAAnD;;QACgB,aAAQ,GAAgC,IAAI,GAAG,EAAE,CAAC;QAC3D,0BAAqB,GAAG,KAAK,CAAC;QAW9B,oBAAe,GAAa,EAAE,CAAC;QAE/B,uBAAkB,GAAG,IAAI,kBAAQ,EAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.module.d.ts","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,aAAa,
|
|
1
|
+
{"version":3,"file":"default.module.d.ts","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,aAAa,EAkBhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,mCAAmC,CAAC;AAC3C,OAAO,4BAA4B,CAAC;AA4BpC;;;GAGG;AACH,eAAO,MAAM,aAAa,eA8FzB,CAAC"}
|
|
@@ -61,6 +61,7 @@ exports.defaultModule = new sprotty_1.FeatureModule((bind, unbind, isBound, rebi
|
|
|
61
61
|
bind(sprotty_1.TYPES.IModelChangeService).to(model_change_service_1.ModelChangeService).inSingletonScope();
|
|
62
62
|
(0, sprotty_1.configureActionHandler)(context, sprotty_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
|
|
63
63
|
(0, sprotty_1.configureActionHandler)(context, sprotty_1.SetDirtyStateAction.KIND, editor_context_service_1.EditorContextService);
|
|
64
|
+
(0, sprotty_1.configureActionHandler)(context, sprotty_1.GetEditorContextAction.KIND, editor_context_service_1.EditorContextService);
|
|
64
65
|
bind(focus_tracker_1.FocusTracker).toSelf().inSingletonScope();
|
|
65
66
|
bind(sprotty_1.TYPES.IDiagramStartup).toService(focus_tracker_1.FocusTracker);
|
|
66
67
|
(0, sprotty_1.configureActionHandler)(context, focus_state_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
|
|
@@ -91,6 +92,7 @@ exports.defaultModule = new sprotty_1.FeatureModule((bind, unbind, isBound, rebi
|
|
|
91
92
|
bind(selection_service_1.SelectionService).toSelf().inSingletonScope();
|
|
92
93
|
bind(sprotty_1.TYPES.IGModelRootListener).toService(selection_service_1.SelectionService);
|
|
93
94
|
bind(sprotty_1.TYPES.IDiagramStartup).toService(selection_service_1.SelectionService);
|
|
95
|
+
(0, sprotty_1.configureActionHandler)(context, sprotty_1.GetSelectionAction.KIND, selection_service_1.SelectionService);
|
|
94
96
|
// Feedback Support ------------------------------------
|
|
95
97
|
// Generic re-usable feedback modifying css classes
|
|
96
98
|
(0, sprotty_1.configureCommand)(context, css_feedback_1.ModifyCssFeedbackCommand);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.module.js","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"default.module.js","sourceRoot":"","sources":["../../src/base/default.module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAoB+B;AAC/B,6CAA2C;AAC3C,sCAAoC;AACpC,2DAA2D;AAC3D,uEAAsE;AACtE,uGAAyG;AACzG,mDAAmD;AACnD,qEAAgE;AAChE,0DAAmE;AACnE,sFAAiF;AACjF,oEAA4E;AAC5E,0EAAkF;AAClF,iFAA4E;AAC5E,yDAAqD;AACrD,2DAAuD;AACvD,iEAA4D;AAC5D,uEAAkE;AAClE,6FAA8H;AAC9H,2DAAwD;AACxD,qEAAoE;AACpE,2FAAqF;AACrF,2DAAuD;AACvD,qEAAgE;AAChE,8CAAkF;AAClF,8DAAqH;AACrH,gFAA+E;AAC/E,8CAA8C;AAC9C,kDAAkD;AAClD,wDAAqD;AAErD;;;GAGG;AACU,QAAA,aAAa,GAAG,IAAI,uBAAa,CAC1C,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE;IACvC,wEAAwE;IACxE,8BAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAElD,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;IAE1B,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,6CAAoB,CAAC,CAAC;IAC5D,4DAA4D;IAC5D,IAAI,CAAC,eAAK,CAAC,6BAA6B,CAAC,CAAC,UAAU,CAChD,GAAG,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAC7D,CAAC;IACF,IAAI,CAAC,eAAK,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,yCAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE1E,IAAA,gCAAsB,EAAC,OAAO,EAAE,2BAAiB,CAAC,IAAI,EAAE,6CAAoB,CAAC,CAAC;IAC9E,IAAA,gCAAsB,EAAC,OAAO,EAAE,6BAAmB,CAAC,IAAI,EAAE,6CAAoB,CAAC,CAAC;IAChF,IAAA,gCAAsB,EAAC,OAAO,EAAE,gCAAsB,CAAC,IAAI,EAAE,6CAAoB,CAAC,CAAC;IAEnF,IAAI,CAAC,4BAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/C,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,4BAAY,CAAC,CAAC;IACpD,IAAA,gCAAsB,EAAC,OAAO,EAAE,mDAAuB,CAAC,IAAI,EAAE,4BAAY,CAAC,CAAC;IAE5E,mEAAmE;IACnE,IAAI,CAAC,eAAK,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,qDAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAA,0BAAgB,EAAC,OAAO,EAAE,sDAA+B,CAAC,CAAC;IAC3D,MAAM,CAAC,yBAAe,CAAC,CAAC,EAAE,CAAC,gDAA4B,CAAC,CAAC;IAEzD,IAAI,CAAC,0BAAa,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChD,IAAA,sBAAY,EAAC,OAAO,EAAE,mBAAS,CAAC,CAAC,SAAS,CAAC,0BAAa,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,0BAAa,CAAC,CAAC;IACrD,IAAI,CAAC,iDAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAA,sBAAY,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC,SAAS,CAAC,iDAAwB,CAAC,CAAC;IAChF,IAAI,CAAC,sBAAW,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9C,IAAA,sBAAY,EAAC,OAAO,EAAE,iBAAO,CAAC,CAAC,SAAS,CAAC,sBAAW,CAAC,CAAC;IACtD,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,sBAAW,CAAC,CAAC;IAEnD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,aAAa,EAAE,kEAA8B,CAAC,CAAC;IAC5E,IAAA,sBAAY,EAAC,OAAO,EAAE,eAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,gCAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnF,IAAI,CAAC,wCAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,eAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,wCAAoB,CAAC,CAAC;IAChE,IAAA,sBAAY,EAAC,OAAO,EAAE,eAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,wCAAoB,CAAC,CAAC;IAE/E,IAAA,sBAAY,EAAC,OAAO,EAAE,+BAAqB,CAAC,CAAC,EAAE,CAAC,mDAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE9F,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,WAAW,EAAE,mCAAe,CAAC,CAAC;IAC3D,IAAI,CAAC,8BAAa,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChD,IAAI,CAAC,+DAA6B,CAAC,CAAC,EAAE,CAAC,sEAAoC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEhG,sDAAsD;IACtD,IAAA,sBAAY,EAAC,OAAO,EAAE,eAAK,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,+BAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClF,IAAA,sBAAY,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,6BAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE/E,IAAI,CAAC,oCAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,eAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,oCAAgB,CAAC,CAAC;IAC5D,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,oCAAgB,CAAC,CAAC;IACxD,IAAA,gCAAsB,EAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,oCAAgB,CAAC,CAAC;IAE3E,wDAAwD;IACxD,mDAAmD;IACnD,IAAA,0BAAgB,EAAC,OAAO,EAAE,uCAAwB,CAAC,CAAC;IACpD,wEAAwE;IACxE,IAAA,0BAAgB,EAAC,OAAO,EAAE,qBAAW,CAAC,CAAC;IAEvC,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,mBAAmB,EAAE,+BAAqB,CAAC,CAAC;IACzE,IAAI,CAAC,eAAK,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,+BAAqB,CAAC,CAAC;IAEtE,mEAAmE;IACnE,IAAI,CAAC,eAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,0BAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,eAAK,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,eAAK,CAAC,YAAY,CAAC,CAAC;IAC5D,IAAI,CAAC,8CAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,8CAA+B,CAAC,CAAC;IACnE,IAAI,CAAC,uCAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAA,gCAAsB,EAAC,OAAO,EAAE,+BAAwB,CAAC,IAAI,EAAE,uCAAwB,CAAC,CAAC;IACzF,IAAA,gCAAsB,EAAC,OAAO,EAAE,wBAAiB,CAAC,IAAI,EAAE,uCAAwB,CAAC,CAAC;IAElF,IAAI,CAAC,+CAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAA,sBAAY,EAAC,OAAO,EAAE,eAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,+CAAuB,CAAC,CAAC;IACpF,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,+CAAuB,CAAC,CAAC;IAE/D,IAAI,CAAC,eAAK,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAEhD,uEAAuE;IACvE,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,gBAAgB,EAAE,mCAAe,CAAC,CAAC;IAEhE,uFAAuF;IACvF,IAAI,CAAC,eAAK,CAAC,uCAAuC,CAAC,CAAC,EAAE,CAAC,wEAAqC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACjH,IAAI,CAAC,eAAK,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,eAAK,CAAC,uCAAuC,CAAC,CAAC;AACzF,CAAC,EACD;IACI,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;CAC/B,CACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020-
|
|
2
|
+
* Copyright (c) 2020-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -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, Args, Bounds, Disposable, DisposableCollection, EditorContext, Emitter, Event, GModelElement, GModelRoot, IActionDispatcher, IActionHandler, LazyInjector, MaybePromise, MousePositionTracker, SetDirtyStateAction, SetEditModeAction, ValueChange, Viewport } from '@eclipse-glsp/sprotty';
|
|
16
|
+
import { Action, Args, Bounds, Disposable, DisposableCollection, EditorContext, EditorContextResult, Emitter, Event, GModelElement, GModelRoot, GetEditorContextAction, IActionDispatcher, IActionHandler, LazyInjector, MaybePromise, MousePositionTracker, SetDirtyStateAction, SetEditModeAction, ValueChange, Viewport } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { FocusChange, FocusTracker } from './focus/focus-tracker';
|
|
18
18
|
import { IDiagramOptions, IDiagramStartup } from './model/diagram-loader';
|
|
19
19
|
import { IModelChangeService, ViewportChange } from './model/model-change-service';
|
|
@@ -94,7 +94,8 @@ export declare class EditorContextService implements IActionHandler, Disposable,
|
|
|
94
94
|
preLoadDiagram(): MaybePromise<void>;
|
|
95
95
|
get(args?: Args): EditorContext;
|
|
96
96
|
getWithSelection(selectedElementIds: string[], args?: Args): EditorContext;
|
|
97
|
-
handle(action: Action): void;
|
|
97
|
+
handle(action: Action): Action | void;
|
|
98
|
+
protected handleGetEditorContext(action: GetEditorContextAction): EditorContextResult;
|
|
98
99
|
protected handleSetEditModeAction(action: SetEditModeAction): void;
|
|
99
100
|
protected handleSetDirtyStateAction(action: SetDirtyStateAction): void;
|
|
100
101
|
get sourceUri(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-context-service.d.ts","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,IAAI,EACJ,MAAM,EACN,UAAU,EACV,oBAAoB,EAEpB,aAAa,EACb,OAAO,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"editor-context-service.d.ts","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.EditorContextService = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
|
-
* Copyright (c) 2020-
|
|
14
|
+
* Copyright (c) 2020-2026 EclipseSource and others.
|
|
15
15
|
*
|
|
16
16
|
* This program and the accompanying materials are made available under the
|
|
17
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -106,6 +106,8 @@ let EditorContextService = class EditorContextService {
|
|
|
106
106
|
return {
|
|
107
107
|
selectedElementIds: Array.from(this.selectionService.getSelectedElementIDs()),
|
|
108
108
|
lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
|
|
109
|
+
viewport: this.viewportData,
|
|
110
|
+
canvasBounds: this.canvasBounds,
|
|
109
111
|
args
|
|
110
112
|
};
|
|
111
113
|
}
|
|
@@ -113,6 +115,8 @@ let EditorContextService = class EditorContextService {
|
|
|
113
115
|
return {
|
|
114
116
|
selectedElementIds,
|
|
115
117
|
lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
|
|
118
|
+
viewport: this.viewportData,
|
|
119
|
+
canvasBounds: this.canvasBounds,
|
|
116
120
|
args
|
|
117
121
|
};
|
|
118
122
|
}
|
|
@@ -123,6 +127,12 @@ let EditorContextService = class EditorContextService {
|
|
|
123
127
|
else if (sprotty_1.SetDirtyStateAction.is(action)) {
|
|
124
128
|
this.handleSetDirtyStateAction(action);
|
|
125
129
|
}
|
|
130
|
+
else if (sprotty_1.GetEditorContextAction.is(action)) {
|
|
131
|
+
return this.handleGetEditorContext(action);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
handleGetEditorContext(action) {
|
|
135
|
+
return sprotty_1.EditorContextResult.create(this.get(), { responseId: action.requestId });
|
|
126
136
|
}
|
|
127
137
|
handleSetEditModeAction(action) {
|
|
128
138
|
const oldValue = this._editMode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-context-service.js","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"editor-context-service.js","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2023-
|
|
2
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -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, ActionMessage, Disposable, DisposableCollection, DisposeClientSessionParameters, GLSPClient, GModelRootSchema, ILogger, InitializeClientSessionParameters, InitializeResult, ModelSource } from '@eclipse-glsp/sprotty';
|
|
16
|
+
import { Action, ActionMessage, Disposable, DisposableCollection, DisposeClientSessionParameters, GLSPClient, GModelRootSchema, IActionDispatcher, ILogger, InitializeClientSessionParameters, InitializeResult, ModelSource, RequestAction, ResponseAction } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { GLSPActionHandlerRegistry } from '../action-handler-registry';
|
|
18
18
|
import { IDiagramOptions } from './diagram-loader';
|
|
19
19
|
/**
|
|
@@ -58,6 +58,7 @@ export declare namespace OptionalAction {
|
|
|
58
58
|
export declare class GLSPModelSource extends ModelSource implements Disposable {
|
|
59
59
|
protected logger: ILogger;
|
|
60
60
|
protected options: IDiagramOptions;
|
|
61
|
+
readonly actionDispatcher: IActionDispatcher;
|
|
61
62
|
protected toDispose: DisposableCollection;
|
|
62
63
|
clientId: string;
|
|
63
64
|
protected _currentRoot: GModelRootSchema;
|
|
@@ -78,6 +79,8 @@ export declare class GLSPModelSource extends ModelSource implements Disposable {
|
|
|
78
79
|
protected createDisposeClientSessionParameters(): DisposeClientSessionParameters;
|
|
79
80
|
protected configureServeActions(initializeResult: InitializeResult): void;
|
|
80
81
|
protected messageReceived(message: ActionMessage): void;
|
|
82
|
+
protected handleServerRequest(action: RequestAction<ResponseAction>): Promise<void>;
|
|
83
|
+
protected sendResponseToServer(response: ResponseAction): void;
|
|
81
84
|
initialize(registry: GLSPActionHandlerRegistry): void;
|
|
82
85
|
handle(action: Action): void;
|
|
83
86
|
protected forwardToServer(action: Action): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-model-source.d.ts","sourceRoot":"","sources":["../../../src/base/model/glsp-model-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,UAAU,EACV,gBAAgB,EAChB,OAAO,EACP,iCAAiC,EACjC,gBAAgB,EAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"glsp-model-source.d.ts","sourceRoot":"","sources":["../../../src/base/model/glsp-model-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,OAAO,EACP,iCAAiC,EACjC,gBAAgB,EAChB,WAAW,EAEX,aAAa,EACb,cAAc,EAEjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,MAAM;IACxC,oBAAoB,EAAE,IAAI,CAAC;CAC9B;AAED,yBAAiB,YAAY,CAAC;IAC1B,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAE1D;IAED;;;OAGG;IACH,SAAgB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEzC;CACJ;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM;IAC1C,sBAAsB,EAAE,IAAI,CAAC;CAChC;AAED,yBAAiB,cAAc,CAAC;IAC5B,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAE1D;IAED;;;OAGG;IACH,SAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,cAAc,CAGpE;CACJ;AAED;;;;;;;;;GASG;AACH,qBACa,eAAgB,SAAQ,WAAY,YAAW,UAAU;IAElE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IAEnC,SAAiB,gBAAgB,EAAE,iBAAiB,CAAC;IAErD,SAAS,CAAC,SAAS,uBAA8B;IACjD,QAAQ,EAAE,MAAM,CAAC;IAEjB,SAAS,CAAC,YAAY,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC9C,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAElC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhD,SAAS,CAAC,uCAAuC,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,iCAAiC;IASzH,SAAS,CAAC,oCAAoC,IAAI,8BAA8B;IAMhF,SAAS,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAQzE,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;cAevC,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzF,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAIrD,UAAU,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAU9D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ5B,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAa/C,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIxD,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB;IAUxD,IAAa,KAAK,IAAI,gBAAgB,CAErC;IAGD,OAAO,IAAI,IAAI;CAGlB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/********************************************************************************
|
|
3
|
-
* Copyright (c) 2023-
|
|
3
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made available under the
|
|
6
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -124,8 +124,35 @@ let GLSPModelSource = class GLSPModelSource extends sprotty_1.ModelSource {
|
|
|
124
124
|
const action = message.action;
|
|
125
125
|
ServerAction.mark(action);
|
|
126
126
|
this.logger.log(this, 'receiving', action);
|
|
127
|
+
if (sprotty_1.RequestAction.is(action)) {
|
|
128
|
+
this.handleServerRequest(action);
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
127
131
|
this.actionDispatcher.dispatch(action);
|
|
128
132
|
}
|
|
133
|
+
// Fire-and-forget: intentionally not awaited by messageReceived()
|
|
134
|
+
async handleServerRequest(action) {
|
|
135
|
+
var _a;
|
|
136
|
+
try {
|
|
137
|
+
const response = action.timeout !== undefined
|
|
138
|
+
? await this.actionDispatcher.requestUntil(action, action.timeout, true)
|
|
139
|
+
: await this.actionDispatcher.request(action);
|
|
140
|
+
if (response) {
|
|
141
|
+
this.sendResponseToServer(response);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
this.logger.error(this, `Failed to handle server request '${action.kind}' (${action.requestId})`, error);
|
|
146
|
+
const reject = sprotty_1.RejectAction.create(`Failed to handle request '${action.kind}' (${action.requestId})`, {
|
|
147
|
+
responseId: action.requestId,
|
|
148
|
+
detail: (_a = error === null || error === void 0 ? void 0 : error.toString) === null || _a === void 0 ? void 0 : _a.call(error)
|
|
149
|
+
});
|
|
150
|
+
this.sendResponseToServer(reject);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
sendResponseToServer(response) {
|
|
154
|
+
this.forwardToServer(response);
|
|
155
|
+
}
|
|
129
156
|
initialize(registry) {
|
|
130
157
|
var _a;
|
|
131
158
|
// Registering actions here is discouraged and it's recommended
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-model-source.js","sourceRoot":"","sources":["../../../src/base/model/glsp-model-source.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"glsp-model-source.js","sourceRoot":"","sources":["../../../src/base/model/glsp-model-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -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, Command, CommandExecutionContext, Disposable, DisposableCollection, Emitter, Event, GModelElement, GModelRoot, ILogger, LazyInjector, SelectAction, SelectAllAction } from '@eclipse-glsp/sprotty';
|
|
16
|
+
import { Action, Command, CommandExecutionContext, Disposable, DisposableCollection, Emitter, Event, GModelElement, GModelRoot, IActionHandler, ILogger, LazyInjector, SelectAction, SelectAllAction } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { SelectableElement } from '../utils/gmodel-util';
|
|
18
18
|
import { IGModelRootListener } from './editor-context-service';
|
|
19
19
|
import { IFeedbackActionDispatcher } from './feedback/feedback-action-dispatcher';
|
|
@@ -29,7 +29,7 @@ export interface SelectionChange {
|
|
|
29
29
|
selectedElements: string[];
|
|
30
30
|
deselectedElements: string[];
|
|
31
31
|
}
|
|
32
|
-
export declare class SelectionService implements IGModelRootListener, Disposable, IDiagramStartup {
|
|
32
|
+
export declare class SelectionService implements IGModelRootListener, IActionHandler, Disposable, IDiagramStartup {
|
|
33
33
|
protected feedbackDispatcher: IFeedbackActionDispatcher;
|
|
34
34
|
protected lazyInjector: LazyInjector;
|
|
35
35
|
protected logger: ILogger;
|
|
@@ -38,6 +38,7 @@ export declare class SelectionService implements IGModelRootListener, Disposable
|
|
|
38
38
|
protected toDispose: DisposableCollection;
|
|
39
39
|
protected initialize(): void;
|
|
40
40
|
preLoadDiagram(): void;
|
|
41
|
+
handle(action: Action): Action | void;
|
|
41
42
|
dispose(): void;
|
|
42
43
|
protected onSelectionChangedEmitter: Emitter<SelectionChange>;
|
|
43
44
|
get onSelectionChanged(): Event<SelectionChange>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EAEN,OAAO,EACP,uBAAuB,EACvB,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.SelectFeedbackAction = exports.SelectAllCommand = exports.SelectCommand = exports.SelectionService = exports.ISelectionListener = void 0;
|
|
16
16
|
/********************************************************************************
|
|
17
|
-
* Copyright (c) 2019-
|
|
17
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
18
18
|
*
|
|
19
19
|
* This program and the accompanying materials are made available under the
|
|
20
20
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -50,6 +50,11 @@ let SelectionService = class SelectionService {
|
|
|
50
50
|
preLoadDiagram() {
|
|
51
51
|
this.lazyInjector.getAll(sprotty_1.TYPES.ISelectionListener).forEach(listener => this.addListener(listener));
|
|
52
52
|
}
|
|
53
|
+
handle(action) {
|
|
54
|
+
if (sprotty_1.GetSelectionAction.is(action)) {
|
|
55
|
+
return sprotty_1.SelectionResult.create(this.getSelectedElementIDs(), action.requestId);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
53
58
|
dispose() {
|
|
54
59
|
this.toDispose.dispose();
|
|
55
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.standaloneSelectModule = exports.selectModule = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2019-
|
|
5
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "2.7.0-next.
|
|
3
|
+
"version": "2.7.0-next.12+aa1cf84",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.7.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.7.0-next.12+aa1cf84",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.23",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "aa1cf8426e1a20ad2af3114b22f740cca9e13503"
|
|
67
67
|
}
|
|
@@ -195,7 +195,7 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
|
|
|
195
195
|
}
|
|
196
196
|
|
|
197
197
|
override request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
|
|
198
|
-
if (!action.requestId
|
|
198
|
+
if (!action.requestId || action.requestId === '') {
|
|
199
199
|
// No request id has been specified. So we use a generated one.
|
|
200
200
|
action.requestId = RequestAction.generateRequestId();
|
|
201
201
|
}
|
|
@@ -214,13 +214,16 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
|
|
|
214
214
|
*/
|
|
215
215
|
requestUntil<Res extends ResponseAction>(
|
|
216
216
|
action: RequestAction<Res>,
|
|
217
|
-
timeoutMs = 2000,
|
|
217
|
+
timeoutMs: number = action.timeout ?? 2000,
|
|
218
218
|
rejectOnTimeout = false
|
|
219
219
|
): Promise<Res | undefined> {
|
|
220
|
-
if (!action.requestId
|
|
220
|
+
if (!action.requestId || action.requestId === '') {
|
|
221
221
|
// No request id has been specified. So we use a generated one.
|
|
222
222
|
action.requestId = RequestAction.generateRequestId();
|
|
223
223
|
}
|
|
224
|
+
// Stamp the effective timeout onto the action so the receiving side
|
|
225
|
+
// (handleServerRequest/handleClientRequest) can respect it.
|
|
226
|
+
action.timeout = timeoutMs;
|
|
224
227
|
|
|
225
228
|
const requestId = action.requestId;
|
|
226
229
|
const timeout = setTimeout(() => {
|
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
import {
|
|
17
17
|
ActionHandlerRegistry,
|
|
18
18
|
FeatureModule,
|
|
19
|
+
GetEditorContextAction,
|
|
20
|
+
GetSelectionAction,
|
|
19
21
|
KeyTool,
|
|
20
22
|
LocationPostprocessor,
|
|
21
23
|
MousePositionTracker,
|
|
@@ -83,6 +85,7 @@ export const defaultModule = new FeatureModule(
|
|
|
83
85
|
|
|
84
86
|
configureActionHandler(context, SetEditModeAction.KIND, EditorContextService);
|
|
85
87
|
configureActionHandler(context, SetDirtyStateAction.KIND, EditorContextService);
|
|
88
|
+
configureActionHandler(context, GetEditorContextAction.KIND, EditorContextService);
|
|
86
89
|
|
|
87
90
|
bind(FocusTracker).toSelf().inSingletonScope();
|
|
88
91
|
bind(TYPES.IDiagramStartup).toService(FocusTracker);
|
|
@@ -121,6 +124,7 @@ export const defaultModule = new FeatureModule(
|
|
|
121
124
|
bind(SelectionService).toSelf().inSingletonScope();
|
|
122
125
|
bind(TYPES.IGModelRootListener).toService(SelectionService);
|
|
123
126
|
bind(TYPES.IDiagramStartup).toService(SelectionService);
|
|
127
|
+
configureActionHandler(context, GetSelectionAction.KIND, SelectionService);
|
|
124
128
|
|
|
125
129
|
// Feedback Support ------------------------------------
|
|
126
130
|
// Generic re-usable feedback modifying css classes
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020-
|
|
2
|
+
* Copyright (c) 2020-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -21,14 +21,14 @@ import {
|
|
|
21
21
|
DisposableCollection,
|
|
22
22
|
EditMode,
|
|
23
23
|
EditorContext,
|
|
24
|
+
EditorContextResult,
|
|
24
25
|
Emitter,
|
|
25
26
|
Event,
|
|
26
|
-
findParentByFeature,
|
|
27
27
|
GModelElement,
|
|
28
28
|
GModelRoot,
|
|
29
|
+
GetEditorContextAction,
|
|
29
30
|
IActionDispatcher,
|
|
30
31
|
IActionHandler,
|
|
31
|
-
isViewport,
|
|
32
32
|
LazyInjector,
|
|
33
33
|
MaybePromise,
|
|
34
34
|
MousePositionTracker,
|
|
@@ -37,7 +37,9 @@ import {
|
|
|
37
37
|
SetEditModeAction,
|
|
38
38
|
TYPES,
|
|
39
39
|
ValueChange,
|
|
40
|
-
Viewport
|
|
40
|
+
Viewport,
|
|
41
|
+
findParentByFeature,
|
|
42
|
+
isViewport
|
|
41
43
|
} from '@eclipse-glsp/sprotty';
|
|
42
44
|
import { inject, injectable, postConstruct, preDestroy } from 'inversify';
|
|
43
45
|
import { FocusChange, FocusTracker } from './focus/focus-tracker';
|
|
@@ -177,6 +179,8 @@ export class EditorContextService implements IActionHandler, Disposable, IDiagra
|
|
|
177
179
|
return {
|
|
178
180
|
selectedElementIds: Array.from(this.selectionService.getSelectedElementIDs()),
|
|
179
181
|
lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
|
|
182
|
+
viewport: this.viewportData,
|
|
183
|
+
canvasBounds: this.canvasBounds,
|
|
180
184
|
args
|
|
181
185
|
};
|
|
182
186
|
}
|
|
@@ -185,18 +189,26 @@ export class EditorContextService implements IActionHandler, Disposable, IDiagra
|
|
|
185
189
|
return {
|
|
186
190
|
selectedElementIds,
|
|
187
191
|
lastMousePosition: this.mousePositionTracker.lastPositionOnDiagram,
|
|
192
|
+
viewport: this.viewportData,
|
|
193
|
+
canvasBounds: this.canvasBounds,
|
|
188
194
|
args
|
|
189
195
|
};
|
|
190
196
|
}
|
|
191
197
|
|
|
192
|
-
handle(action: Action): void {
|
|
198
|
+
handle(action: Action): Action | void {
|
|
193
199
|
if (SetEditModeAction.is(action)) {
|
|
194
200
|
this.handleSetEditModeAction(action);
|
|
195
201
|
} else if (SetDirtyStateAction.is(action)) {
|
|
196
202
|
this.handleSetDirtyStateAction(action);
|
|
203
|
+
} else if (GetEditorContextAction.is(action)) {
|
|
204
|
+
return this.handleGetEditorContext(action);
|
|
197
205
|
}
|
|
198
206
|
}
|
|
199
207
|
|
|
208
|
+
protected handleGetEditorContext(action: GetEditorContextAction): EditorContextResult {
|
|
209
|
+
return EditorContextResult.create(this.get(), { responseId: action.requestId });
|
|
210
|
+
}
|
|
211
|
+
|
|
200
212
|
protected handleSetEditModeAction(action: SetEditModeAction): void {
|
|
201
213
|
const oldValue = this._editMode;
|
|
202
214
|
this._editMode = action.editMode;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2023-
|
|
2
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -22,10 +22,14 @@ import {
|
|
|
22
22
|
DisposeClientSessionParameters,
|
|
23
23
|
GLSPClient,
|
|
24
24
|
GModelRootSchema,
|
|
25
|
+
IActionDispatcher,
|
|
25
26
|
ILogger,
|
|
26
27
|
InitializeClientSessionParameters,
|
|
27
28
|
InitializeResult,
|
|
28
29
|
ModelSource,
|
|
30
|
+
RejectAction,
|
|
31
|
+
RequestAction,
|
|
32
|
+
ResponseAction,
|
|
29
33
|
TYPES
|
|
30
34
|
} from '@eclipse-glsp/sprotty';
|
|
31
35
|
import { inject, injectable, preDestroy } from 'inversify';
|
|
@@ -94,6 +98,8 @@ export class GLSPModelSource extends ModelSource implements Disposable {
|
|
|
94
98
|
@inject(TYPES.IDiagramOptions)
|
|
95
99
|
protected options: IDiagramOptions;
|
|
96
100
|
|
|
101
|
+
declare readonly actionDispatcher: IActionDispatcher;
|
|
102
|
+
|
|
97
103
|
protected toDispose = new DisposableCollection();
|
|
98
104
|
clientId: string;
|
|
99
105
|
|
|
@@ -164,9 +170,37 @@ export class GLSPModelSource extends ModelSource implements Disposable {
|
|
|
164
170
|
const action = message.action;
|
|
165
171
|
ServerAction.mark(action);
|
|
166
172
|
this.logger.log(this, 'receiving', action);
|
|
173
|
+
if (RequestAction.is(action)) {
|
|
174
|
+
this.handleServerRequest(action);
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
167
177
|
this.actionDispatcher.dispatch(action);
|
|
168
178
|
}
|
|
169
179
|
|
|
180
|
+
// Fire-and-forget: intentionally not awaited by messageReceived()
|
|
181
|
+
protected async handleServerRequest(action: RequestAction<ResponseAction>): Promise<void> {
|
|
182
|
+
try {
|
|
183
|
+
const response =
|
|
184
|
+
action.timeout !== undefined
|
|
185
|
+
? await this.actionDispatcher.requestUntil(action, action.timeout, true)
|
|
186
|
+
: await this.actionDispatcher.request(action);
|
|
187
|
+
if (response) {
|
|
188
|
+
this.sendResponseToServer(response);
|
|
189
|
+
}
|
|
190
|
+
} catch (error) {
|
|
191
|
+
this.logger.error(this, `Failed to handle server request '${action.kind}' (${action.requestId})`, error);
|
|
192
|
+
const reject = RejectAction.create(`Failed to handle request '${action.kind}' (${action.requestId})`, {
|
|
193
|
+
responseId: action.requestId,
|
|
194
|
+
detail: error?.toString?.()
|
|
195
|
+
});
|
|
196
|
+
this.sendResponseToServer(reject);
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
protected sendResponseToServer(response: ResponseAction): void {
|
|
201
|
+
this.forwardToServer(response);
|
|
202
|
+
}
|
|
203
|
+
|
|
170
204
|
override initialize(registry: GLSPActionHandlerRegistry): void {
|
|
171
205
|
// Registering actions here is discouraged and it's recommended
|
|
172
206
|
// to implemented dedicated action handlers.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -23,12 +23,15 @@ import {
|
|
|
23
23
|
Emitter,
|
|
24
24
|
Event,
|
|
25
25
|
GChildElement,
|
|
26
|
+
GetSelectionAction,
|
|
26
27
|
GModelElement,
|
|
27
28
|
GModelRoot,
|
|
29
|
+
IActionHandler,
|
|
28
30
|
ILogger,
|
|
29
31
|
LazyInjector,
|
|
30
32
|
SelectAction,
|
|
31
33
|
SelectAllAction,
|
|
34
|
+
SelectionResult,
|
|
32
35
|
SprottySelectAllCommand,
|
|
33
36
|
SprottySelectCommand,
|
|
34
37
|
TYPES,
|
|
@@ -60,7 +63,7 @@ export interface SelectionChange {
|
|
|
60
63
|
}
|
|
61
64
|
|
|
62
65
|
@injectable()
|
|
63
|
-
export class SelectionService implements IGModelRootListener, Disposable, IDiagramStartup {
|
|
66
|
+
export class SelectionService implements IGModelRootListener, IActionHandler, Disposable, IDiagramStartup {
|
|
64
67
|
@inject(TYPES.IFeedbackActionDispatcher)
|
|
65
68
|
protected feedbackDispatcher: IFeedbackActionDispatcher;
|
|
66
69
|
|
|
@@ -84,6 +87,12 @@ export class SelectionService implements IGModelRootListener, Disposable, IDiagr
|
|
|
84
87
|
this.lazyInjector.getAll<ISelectionListener>(TYPES.ISelectionListener).forEach(listener => this.addListener(listener));
|
|
85
88
|
}
|
|
86
89
|
|
|
90
|
+
handle(action: Action): Action | void {
|
|
91
|
+
if (GetSelectionAction.is(action)) {
|
|
92
|
+
return SelectionResult.create(this.getSelectedElementIDs(), action.requestId);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
87
96
|
@preDestroy()
|
|
88
97
|
dispose(): void {
|
|
89
98
|
this.toDispose.dispose();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|