@eclipse-glsp/server 2.8.0-next.0 → 2.8.0-next.10
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/browser/launch/worker-server-launcher.js +3 -5
- package/lib/browser/launch/worker-server-launcher.js.map +1 -1
- package/lib/common/actions/action-dispatcher.js +5 -8
- package/lib/common/actions/action-dispatcher.js.map +1 -1
- package/lib/common/actions/action-handler-registry.js +1 -1
- package/lib/common/actions/action-handler-registry.js.map +1 -1
- package/lib/common/actions/global-action-provider.js +1 -2
- package/lib/common/actions/global-action-provider.js.map +1 -1
- package/lib/common/command/command.js +1 -2
- package/lib/common/command/command.js.map +1 -1
- package/lib/common/command/recording-command.js +3 -6
- package/lib/common/command/recording-command.js.map +1 -1
- package/lib/common/di/diagram-module.js +5 -6
- package/lib/common/di/diagram-module.js.map +1 -1
- package/lib/common/di/glsp-module.js +1 -1
- package/lib/common/di/glsp-module.js.map +1 -1
- package/lib/common/di/server-module.js +1 -1
- package/lib/common/di/server-module.js.map +1 -1
- package/lib/common/features/directediting/context-edit-validator.js +3 -3
- package/lib/common/features/directediting/context-edit-validator.js.map +1 -1
- package/lib/common/features/directediting/label-edit-validator.js +1 -1
- package/lib/common/features/directediting/label-edit-validator.js.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.d.ts +16 -1
- package/lib/common/features/layout/computed-bounds-action-handler.d.ts.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js +41 -4
- package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
- package/lib/common/features/layout/layout-operation-handler.js +1 -2
- package/lib/common/features/layout/layout-operation-handler.js.map +1 -1
- package/lib/common/features/model/gmodel-index.js +3 -5
- package/lib/common/features/model/gmodel-index.js.map +1 -1
- package/lib/common/features/model/gmodel-serializer.js +1 -2
- package/lib/common/features/model/gmodel-serializer.js.map +1 -1
- package/lib/common/features/model/model-submission-handler.d.ts +1 -2
- package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
- package/lib/common/features/model/model-submission-handler.js +3 -6
- package/lib/common/features/model/model-submission-handler.js.map +1 -1
- package/lib/common/features/model/request-model-action-handler.js +4 -6
- package/lib/common/features/model/request-model-action-handler.js.map +1 -1
- package/lib/common/features/navigation/navigation-target-resolution.js +1 -1
- package/lib/common/features/navigation/navigation-target-resolution.js.map +1 -1
- package/lib/common/features/progress/progress-service.d.ts.map +1 -1
- package/lib/common/features/progress/progress-service.js +1 -2
- package/lib/common/features/progress/progress-service.js.map +1 -1
- package/lib/common/features/validation/request-markers-handler.js +1 -2
- package/lib/common/features/validation/request-markers-handler.js.map +1 -1
- package/lib/common/gmodel/change-routing-points-operation-handler.js +1 -2
- package/lib/common/gmodel/change-routing-points-operation-handler.js.map +1 -1
- package/lib/common/gmodel/gmodel-create-node-operation-handler.js +3 -5
- package/lib/common/gmodel/gmodel-create-node-operation-handler.js.map +1 -1
- package/lib/common/gmodel/paste-operation-handler.d.ts +1 -1
- package/lib/common/gmodel/paste-operation-handler.d.ts.map +1 -1
- package/lib/common/gmodel/paste-operation-handler.js +8 -11
- package/lib/common/gmodel/paste-operation-handler.js.map +1 -1
- package/lib/common/launch/glsp-server-launcher.d.ts +8 -1
- package/lib/common/launch/glsp-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/glsp-server-launcher.js +11 -1
- package/lib/common/launch/glsp-server-launcher.js.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.d.ts +51 -2
- package/lib/common/launch/jsonrpc-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.js +82 -3
- package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -1
- package/lib/common/operations/compound-operation-handler.js +1 -1
- package/lib/common/operations/compound-operation-handler.js.map +1 -1
- package/lib/common/operations/json-operation-handler.js +2 -3
- package/lib/common/operations/json-operation-handler.js.map +1 -1
- package/lib/common/protocol/glsp-server.js +6 -7
- package/lib/common/protocol/glsp-server.js.map +1 -1
- package/lib/common/session/client-session-manager.js +3 -5
- package/lib/common/session/client-session-manager.js.map +1 -1
- package/lib/common/utils/action-queue.js +2 -4
- package/lib/common/utils/action-queue.js.map +1 -1
- package/lib/common/utils/client-options-util.js +2 -2
- package/lib/common/utils/client-options-util.js.map +1 -1
- package/lib/common/utils/glsp-server-error.d.ts +2 -3
- package/lib/common/utils/glsp-server-error.d.ts.map +1 -1
- package/lib/common/utils/glsp-server-error.js +1 -1
- package/lib/common/utils/glsp-server-error.js.map +1 -1
- package/lib/common/utils/layout-util.d.ts +5 -5
- package/lib/common/utils/layout-util.d.ts.map +1 -1
- package/lib/common/utils/layout-util.js +17 -19
- package/lib/common/utils/layout-util.js.map +1 -1
- package/lib/common/utils/logger.js +1 -2
- package/lib/common/utils/logger.js.map +1 -1
- package/lib/node/abstract-json-model-storage.js +2 -4
- package/lib/node/abstract-json-model-storage.js.map +1 -1
- package/lib/node/launch/socket-server-launcher.d.ts +39 -2
- package/lib/node/launch/socket-server-launcher.d.ts.map +1 -1
- package/lib/node/launch/socket-server-launcher.js +50 -31
- package/lib/node/launch/socket-server-launcher.js.map +1 -1
- package/lib/node/launch/websocket-server-launcher.d.ts +36 -5
- package/lib/node/launch/websocket-server-launcher.d.ts.map +1 -1
- package/lib/node/launch/websocket-server-launcher.js +54 -13
- package/lib/node/launch/websocket-server-launcher.js.map +1 -1
- package/package.json +17 -21
- package/src/common/features/directediting/context-edit-validator.ts +2 -2
- package/src/common/features/layout/computed-bounds-action-handler.ts +52 -4
- package/src/common/features/model/model-submission-handler.ts +3 -2
- package/src/common/features/progress/progress-service.ts +2 -3
- package/src/common/gmodel/paste-operation-handler.ts +6 -6
- package/src/common/launch/glsp-server-launcher.ts +12 -1
- package/src/common/launch/jsonrpc-server-launcher.ts +89 -2
- package/src/common/utils/glsp-server-error.ts +3 -5
- package/src/common/utils/layout-util.ts +13 -12
- package/src/node/launch/socket-server-launcher.ts +54 -31
- package/src/node/launch/websocket-server-launcher.ts +72 -14
- package/src/browser/di/browser-action-dispatch-scope.spec.ts +0 -75
- package/src/common/actions/action-handler-registry.spec.ts +0 -52
- package/src/common/actions/global-action-provider.spec.ts +0 -68
- package/src/common/command/command-stack.spec.ts +0 -239
- package/src/common/command/command.spec.ts +0 -92
- package/src/common/command/recording-command.spec.ts +0 -86
- package/src/common/di/binding-target.spec.ts +0 -147
- package/src/common/di/multi-bindings.spec.ts +0 -133
- package/src/common/features/contextactions/context-actions-provider-registry.spec.ts +0 -69
- package/src/common/features/contextactions/request-context-actions-handler.spec.ts +0 -75
- package/src/common/features/contextactions/tool-palette-item-provider.spec.ts +0 -46
- package/src/common/features/directediting/context-edit-validator-registry.spec.ts +0 -54
- package/src/common/features/directediting/request-edit-validation-handler.spec.ts +0 -131
- package/src/common/features/model/gmodel-serializer.spec.ts +0 -141
- package/src/common/features/type-hints/request-type-hints-action-handler.spec.ts +0 -59
- package/src/common/operations/operation-handler-registry.spec.ts +0 -50
- package/src/common/protocol/glsp-server.spec.ts +0 -154
- package/src/common/session/client-session-factory.spec.ts +0 -60
- package/src/common/session/client-session-manager.spec.ts +0 -83
- package/src/common/test/mock-util.ts +0 -281
- package/src/common/utils/action-queue.spec.ts +0 -133
- package/src/common/utils/promise-queue.spec.ts +0 -142
- package/src/common/utils/registry.spec.ts +0 -225
- package/src/node/actions/action-dispatcher.spec.ts +0 -678
- package/src/node/launch/cli-parser.spec.ts +0 -61
- package/src/node/launch/socket-cli-parser.spec.ts +0 -73
- package/src/node/launch/socket-server-launcher.spec.ts +0 -74
|
@@ -36,9 +36,8 @@ let WorkerServerLauncher = class WorkerServerLauncher extends common_1.JsonRpcGL
|
|
|
36
36
|
this.logger.info('GLSP server worker connection established');
|
|
37
37
|
postMessage(exports.WORKER_START_UP_COMPLETE_MSG);
|
|
38
38
|
return new Promise((resolve, rejects) => {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
(_b = this.connection) === null || _b === void 0 ? void 0 : _b.onError(error => rejects(error));
|
|
39
|
+
this.connection?.onClose(() => resolve(undefined));
|
|
40
|
+
this.connection?.onError(error => rejects(error));
|
|
42
41
|
});
|
|
43
42
|
}
|
|
44
43
|
disposeServerInstance(instance) {
|
|
@@ -46,8 +45,7 @@ let WorkerServerLauncher = class WorkerServerLauncher extends common_1.JsonRpcGL
|
|
|
46
45
|
this.connection = undefined;
|
|
47
46
|
}
|
|
48
47
|
createConnection(options) {
|
|
49
|
-
|
|
50
|
-
return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader((_a = options.context) !== null && _a !== void 0 ? _a : self), new jsonrpc.BrowserMessageWriter((_b = options.context) !== null && _b !== void 0 ? _b : self));
|
|
48
|
+
return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader(options.context ?? self), new jsonrpc.BrowserMessageWriter(options.context ?? self));
|
|
51
49
|
}
|
|
52
50
|
};
|
|
53
51
|
exports.WorkerServerLauncher = WorkerServerLauncher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAClD,yCAA8F;AAKjF,QAAA,4BAA4B,GAAG,kCAAkC,CAAC;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,kCAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,oCAA4B,CAAC,CAAC;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"worker-server-launcher.js","sourceRoot":"","sources":["../../../src/browser/launch/worker-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AACvC,kDAAkD;AAClD,yCAA8F;AAKjF,QAAA,4BAA4B,GAAG,kCAAkC,CAAC;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,kCAA8C;IAG1E,GAAG,CAAC,OAA4B;QACtC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC9D,WAAW,CAAC,oCAA4B,CAAC,CAAC;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACpC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,qBAAqB,CAAC,QAA+B;QACpE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAChC,CAAC;IAES,gBAAgB,CAAC,OAA4B;QACnD,OAAO,OAAO,CAAC,uBAAuB,CAClC,IAAI,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,EACzD,IAAI,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;CACJ,CAAA;AA5BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4BhC"}
|
|
@@ -41,7 +41,7 @@ exports.ActionDispatchScope = Symbol('ActionDispatchScope');
|
|
|
41
41
|
* Default {@link ActionDispatcher}. External dispatches are queued and processed one at a
|
|
42
42
|
* time; dispatches made from within a running handler run inline with the containing action.
|
|
43
43
|
*/
|
|
44
|
-
let DefaultActionDispatcher =
|
|
44
|
+
let DefaultActionDispatcher = class DefaultActionDispatcher {
|
|
45
45
|
constructor() {
|
|
46
46
|
this.actionQueue = new action_queue_1.ActionQueue();
|
|
47
47
|
this.postUpdateQueue = [];
|
|
@@ -49,6 +49,8 @@ let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDis
|
|
|
49
49
|
this.requestTimeouts = new Map();
|
|
50
50
|
this.nextRequestId = 1;
|
|
51
51
|
}
|
|
52
|
+
static { DefaultActionDispatcher_1 = this; }
|
|
53
|
+
static { this.STALE_TIMEOUT_GRACE_MS = 30_000; }
|
|
52
54
|
initialize() {
|
|
53
55
|
// Fire-and-forget: the loop is meant to run for the dispatcher's lifetime; surface any
|
|
54
56
|
// unexpected termination via the logger instead of an unhandled rejection.
|
|
@@ -135,10 +137,7 @@ let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDis
|
|
|
135
137
|
request(action) {
|
|
136
138
|
return this.doRequest(action, undefined, true);
|
|
137
139
|
}
|
|
138
|
-
requestUntil(action, timeoutMs, rejectOnTimeout) {
|
|
139
|
-
var _a;
|
|
140
|
-
if (timeoutMs === void 0) { timeoutMs = (_a = action.timeout) !== null && _a !== void 0 ? _a : 2000; }
|
|
141
|
-
if (rejectOnTimeout === void 0) { rejectOnTimeout = false; }
|
|
140
|
+
requestUntil(action, timeoutMs = action.timeout ?? 2000, rejectOnTimeout = false) {
|
|
142
141
|
return this.doRequest(action, timeoutMs, rejectOnTimeout);
|
|
143
142
|
}
|
|
144
143
|
doRequest(action, timeoutMs, rejectOnTimeout) {
|
|
@@ -152,13 +151,12 @@ let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDis
|
|
|
152
151
|
this.pendingRequests.set(action.requestId, deferred);
|
|
153
152
|
if (timeoutMs !== undefined) {
|
|
154
153
|
const timeout = setTimeout(() => {
|
|
155
|
-
var _a;
|
|
156
154
|
if (this.pendingRequests.delete(action.requestId)) {
|
|
157
155
|
// Keep the requestTimeouts entry briefly as a stale marker so a late response
|
|
158
156
|
// can be filtered, then drop it after a grace period to avoid leaking markers
|
|
159
157
|
// for requests whose late responses never arrive.
|
|
160
158
|
const cleanup = setTimeout(() => this.requestTimeouts.delete(action.requestId), DefaultActionDispatcher_1.STALE_TIMEOUT_GRACE_MS);
|
|
161
|
-
|
|
159
|
+
cleanup.unref?.();
|
|
162
160
|
const message = `Request '${action.requestId}' (${action.kind}) timed out after ${timeoutMs}ms`;
|
|
163
161
|
if (rejectOnTimeout) {
|
|
164
162
|
deferred.reject(new Error(message));
|
|
@@ -263,7 +261,6 @@ let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDis
|
|
|
263
261
|
}
|
|
264
262
|
};
|
|
265
263
|
exports.DefaultActionDispatcher = DefaultActionDispatcher;
|
|
266
|
-
DefaultActionDispatcher.STALE_TIMEOUT_GRACE_MS = 30000;
|
|
267
264
|
__decorate([
|
|
268
265
|
(0, inversify_1.inject)(action_handler_registry_1.ActionHandlerRegistry),
|
|
269
266
|
__metadata("design:type", action_handler_registry_1.ActionHandlerRegistry)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA+aA,0BAKC;AApbD;;;;;;;;;;;;;;kFAckF;AAClF,qDAWgC;AAChC,yCAA8D;AAC9D,mEAAqD;AACrD,wDAAoD;AACpD,kEAA6D;AAC7D,4CAAyC;AAEzC,uEAAkE;AAClE,mEAAgE;AAEnD,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAmF9C,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AA8BjE;;;GAGG;AAEI,IAAM,uBAAuB
|
|
1
|
+
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ let ActionHandlerRegistry = class ActionHandlerRegistry extends registry_1.Multi
|
|
|
29
29
|
*/
|
|
30
30
|
get(key) {
|
|
31
31
|
const result = super.get(key);
|
|
32
|
-
return result.sort((a, b) =>
|
|
32
|
+
return result.sort((a, b) => a.priority ?? 0 - (b.priority ?? 0));
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
exports.ActionHandlerRegistry = ActionHandlerRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"action-handler-registry.js","sourceRoot":"","sources":["../../../src/common/actions/action-handler-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AAEzD,gDAAkD;AAClD,qDAAiG;AAEjG;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,wBAAoC;IAC3E,eAAe,CAAC,OAAsB;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACM,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;CACJ,CAAA;AAhBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgBjC;AAGM,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAMO,wBAAmB,GAA+B,EAAE,CAAC;IASnE,CAAC;IAJG,UAAU,CAAC,KAAY;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AAfY,4EAAgC;AAE/B;IADT,IAAA,kBAAM,EAAC,qCAAoB,CAAC;;iEACW;AAI9B;IAFT,IAAA,kBAAM,EAAC,yCAAwB,CAAC;IAChC,IAAA,oBAAQ,GAAE;;6EACoD;AAGrD;IADT,IAAA,kBAAM,EAAC,qBAAqB,CAAC;8BACV,qBAAqB;kEAAC;2CATjC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAe5C"}
|
|
@@ -57,9 +57,8 @@ let DefaultGlobalActionProvider = class DefaultGlobalActionProvider {
|
|
|
57
57
|
return container;
|
|
58
58
|
}
|
|
59
59
|
loadActionKinds(diagramType, diagramContainer) {
|
|
60
|
-
var _a;
|
|
61
60
|
const handlerRegistry = diagramContainer.get(action_handler_registry_1.ActionHandlerRegistry);
|
|
62
|
-
const diagramServerActions =
|
|
61
|
+
const diagramServerActions = this.actionKinds.get(diagramType) ?? [];
|
|
63
62
|
handlerRegistry.getAll().forEach(handler => (0, protocol_1.distinctAdd)(diagramServerActions, ...handler.actionKinds));
|
|
64
63
|
this.actionKinds.set(diagramType, diagramServerActions);
|
|
65
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,uEAA6F;AAC7F,mEAA+E;AAC/E,sFAAiF;AACjF,uEAAkE;AAErD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAU5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC;YAClD,QAAQ,EAAE,2CAAmB;YAC7B,UAAU,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE;YACjC,iBAAiB,EAAE,EAAE;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,gBAA2B
|
|
1
|
+
{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,uEAA6F;AAC7F,mEAA+E;AAC/E,sFAAiF;AACjF,uEAAkE;AAErD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAU5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC;YAClD,QAAQ,EAAE,2CAAmB;YAC7B,UAAU,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE;YACjC,iBAAiB,EAAE,EAAE;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,gBAA2B;QAC5D,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACrE,eAAe,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAW,EAAC,oBAAoB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AAlCY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAKJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GALtC,2BAA2B,CAkCvC"}
|
|
@@ -20,8 +20,7 @@ const protocol_1 = require("@eclipse-glsp/protocol");
|
|
|
20
20
|
var Command;
|
|
21
21
|
(function (Command) {
|
|
22
22
|
function canUndo(command) {
|
|
23
|
-
|
|
24
|
-
return (_b = (_a = command.canUndo) === null || _a === void 0 ? void 0 : _a.call(command)) !== null && _b !== void 0 ? _b : true;
|
|
23
|
+
return command.canUndo?.() ?? true;
|
|
25
24
|
}
|
|
26
25
|
Command.canUndo = canUndo;
|
|
27
26
|
})(Command || (exports.Command = Command = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/command/command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAA4E;AAsC5E,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,OAAO,CAAC,OAAgB;QACpC,OAAO,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI,CAAC;IACvC,CAAC;IAFe,eAAO,UAEtB,CAAA;AACL,CAAC,EAJgB,OAAO,uBAAP,OAAO,QAIvB;AAED;;GAEG;AACH,MAAa,eAAe;IAKxB,YAAY,GAAG,QAA+B;QAC1C,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,eAAe,GAAc,EAAE,CAAC;QAEtC,IAAI,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;gBACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;gBACpC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC3B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACJ,MAAM;gBACV,CAAC;YACL,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QACpC,IAAI,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACjD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBAClC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACzB,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,IAAI,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBAClC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACzB,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ;AAhED,0CAgEC"}
|
|
@@ -23,13 +23,12 @@ const jsonPatch = require("fast-json-patch");
|
|
|
23
23
|
*/
|
|
24
24
|
class AbstractRecordingCommand {
|
|
25
25
|
async execute() {
|
|
26
|
-
var _a;
|
|
27
26
|
const beforeState = this.deepClone(await this.getJsonObject());
|
|
28
27
|
await this.doExecute();
|
|
29
28
|
const afterState = await this.getJsonObject();
|
|
30
29
|
this.undoPatch = jsonPatch.compare(afterState, beforeState);
|
|
31
30
|
this.redoPatch = jsonPatch.compare(beforeState, afterState);
|
|
32
|
-
await
|
|
31
|
+
await this.postChange?.(afterState);
|
|
33
32
|
}
|
|
34
33
|
applyPatch(object, patch) {
|
|
35
34
|
return jsonPatch.applyPatch(object, patch, false, true);
|
|
@@ -44,17 +43,15 @@ class AbstractRecordingCommand {
|
|
|
44
43
|
return jsonPatch.deepClone(object);
|
|
45
44
|
}
|
|
46
45
|
async undo() {
|
|
47
|
-
var _a;
|
|
48
46
|
if (this.undoPatch) {
|
|
49
47
|
const result = this.applyPatch(await this.getJsonObject(), this.undoPatch);
|
|
50
|
-
await
|
|
48
|
+
await this.postChange?.(result.newDocument);
|
|
51
49
|
}
|
|
52
50
|
}
|
|
53
51
|
async redo() {
|
|
54
|
-
var _a;
|
|
55
52
|
if (this.redoPatch) {
|
|
56
53
|
const result = this.applyPatch(await this.getJsonObject(), this.redoPatch);
|
|
57
|
-
await
|
|
54
|
+
await this.postChange?.(result.newDocument);
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
57
|
canUndo() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recording-command.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAGlF,6CAA6C;AAI7C;;;GAGG;AACH,MAAsB,wBAAwB;IAI1C,KAAK,CAAC,OAAO
|
|
1
|
+
{"version":3,"file":"recording-command.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAGlF,6CAA6C;AAI7C;;;GAGG;AACH,MAAsB,wBAAwB;IAI1C,KAAK,CAAC,OAAO;QACT,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAcS,UAAU,CAAC,MAAkB,EAAE,KAA4B;QACjE,OAAO,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACO,SAAS,CAAC,MAAkB;QAClC,OAAO,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAED,OAAO;QACH,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAChD,CAAC;CAQJ;AA/DD,4DA+DC;AAED;;;GAGG;AACH,MAAa,sBAAuB,SAAQ,wBAA0C;IAClF,YACc,UAAsB,EACtB,UAA4B,EAC5B,SAAmC;QAE7C,KAAK,EAAE,CAAC;QAJE,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAkB;QAC5B,cAAS,GAAT,SAAS,CAA0B;IAGjD,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEkB,UAAU,CAAC,QAA6B;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACJ;AAjBD,wDAiBC"}
|
|
@@ -97,8 +97,8 @@ const service_identifiers_1 = require("./service-identifiers");
|
|
|
97
97
|
* - {@link EdgeCreationChecker} as optional binding
|
|
98
98
|
*/
|
|
99
99
|
class DiagramModule extends glsp_module_1.GLSPModule {
|
|
100
|
+
static { this.FALLBACK_CLIENT_ID = 'FallbackClientId'; }
|
|
100
101
|
configure(bind, unbind, isBound, rebind) {
|
|
101
|
-
var _a, _b, _c, _d;
|
|
102
102
|
const context = { bind, isBound };
|
|
103
103
|
// Configurations
|
|
104
104
|
(0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.DiagramType, this.bindDiagramType());
|
|
@@ -132,7 +132,7 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
132
132
|
(0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.Operations, this.bindOperations()).inSingletonScope();
|
|
133
133
|
(0, binding_target_1.applyBindingTarget)(context, command_stack_1.CommandStack, this.bindCommandStack()).inSingletonScope();
|
|
134
134
|
// Navigation
|
|
135
|
-
(
|
|
135
|
+
(0, binding_target_1.applyOptionalBindingTarget)(context, navigation_target_resolver_1.NavigationTargetResolver, this.bindNavigationTargetResolver())?.inSingletonScope();
|
|
136
136
|
this.configureMultiBinding(new multi_binding_1.MultiBinding(service_identifiers_1.NavigationTargetProviders), binding => this.configureNavigationTargetProviders(binding));
|
|
137
137
|
(0, binding_target_1.applyBindingTarget)(context, navigation_target_provider_registry_1.NavigationTargetProviderRegistry, this.bindNavigationTargetProviderRegistry()).inSingletonScope();
|
|
138
138
|
// Context edit
|
|
@@ -141,9 +141,9 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
141
141
|
// Misc
|
|
142
142
|
this.configureMultiBinding(new multi_binding_1.MultiBinding(client_session_initializer_1.ClientSessionInitializer), binding => this.configureClientSessionInitializers(binding));
|
|
143
143
|
(0, binding_target_1.applyBindingTarget)(context, progress_service_1.ProgressService, this.bindProgressService()).inSingletonScope();
|
|
144
|
-
(
|
|
145
|
-
(
|
|
146
|
-
(
|
|
144
|
+
(0, binding_target_1.applyOptionalBindingTarget)(context, popup_model_factory_1.PopupModelFactory, this.bindPopupModelFactory())?.inSingletonScope();
|
|
145
|
+
(0, binding_target_1.applyOptionalBindingTarget)(context, layout_engine_1.LayoutEngine, this.bindLayoutEngine())?.inSingletonScope();
|
|
146
|
+
(0, binding_target_1.applyOptionalBindingTarget)(context, edge_creation_checker_1.EdgeCreationChecker, this.bindEdgeCreationChecker())?.inSingletonScope();
|
|
147
147
|
}
|
|
148
148
|
configureClientSessionInitializers(binding) {
|
|
149
149
|
binding.add(action_handler_registry_1.ActionHandlerRegistryInitializer);
|
|
@@ -263,5 +263,4 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
263
263
|
}
|
|
264
264
|
}
|
|
265
265
|
exports.DiagramModule = DiagramModule;
|
|
266
|
-
DiagramModule.FALLBACK_CLIENT_ID = 'FallbackClientId';
|
|
267
266
|
//# sourceMappingURL=diagram-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-module.js","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":";;;AAgBA,oEAAyF;AACzF,8DAA2F;AAC3F,gFAA6G;AAC7G,4EAAyE;AACzE,4DAA6E;AAC7E,kFAA4E;AAC5E,4EAAwE;AACxE,gHAA0G;AAE1G,oHAA8G;AAC9G,sGAAgG;AAChG,gHAA0G;AAC1G,sGAAgI;AAEhI,+GAGmE;AACnE,yFAAoF;AACpF,+GAAyG;AACzG,sGAAgG;AAChG,oEAAgE;AAChE,0FAAqF;AACrF,qEAAiE;AACjE,iEAA6D;AAC7D,2EAAgG;AAChG,+DAA2D;AAC3D,yFAAoF;AACpF,iGAA2F;AAC3F,2FAAqF;AACrF,iGAA0F;AAC1F,iFAA4E;AAE5E,oHAGoE;AACpE,kGAA6F;AAC7F,gIAAyH;AACzH,gIAAyH;AACzH,+EAA0E;AAC1E,6GAAsG;AACtG,4EAAgG;AAChG,wFAAmF;AACnF,gHAAyG;AACzG,gHAAyG;AACzG,4EAAwE;AACxE,4FAAuF;AACvF,yFAAoF;AACpF,qFAAgF;AAChF,uEAAuG;AACvG,yFAAyH;AACzH,sFAAiF;AACjF,qDAAiG;AACjG,+CAA2C;AAC3C,mDAAqE;AACrE,+DAO+B;AAE/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AAEH,MAAsB,aAAc,SAAQ,wBAAU;
|
|
1
|
+
{"version":3,"file":"diagram-module.js","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const inversify_1 = require("inversify");
|
|
|
15
15
|
* Common super class for GLSP {@link ContainerModule}s.
|
|
16
16
|
*/
|
|
17
17
|
let GLSPModule = class GLSPModule extends inversify_1.ContainerModule {
|
|
18
|
+
static { this.CLIENT_ACTIONS = 'ClientActions'; }
|
|
18
19
|
constructor() {
|
|
19
20
|
super((bind, unbind, isBound, rebind) => {
|
|
20
21
|
this.context = { bind, unbind, isBound, rebind };
|
|
@@ -36,7 +37,6 @@ let GLSPModule = class GLSPModule extends inversify_1.ContainerModule {
|
|
|
36
37
|
}
|
|
37
38
|
};
|
|
38
39
|
exports.GLSPModule = GLSPModule;
|
|
39
|
-
GLSPModule.CLIENT_ACTIONS = 'ClientActions';
|
|
40
40
|
exports.GLSPModule = GLSPModule = __decorate([
|
|
41
41
|
(0, inversify_1.injectable)(),
|
|
42
42
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-module.js","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAoE;AAepE;;GAEG;AAEI,IAAe,UAAU,GAAzB,MAAe,UAAW,SAAQ,2BAAe;
|
|
1
|
+
{"version":3,"file":"glsp-module.js","sourceRoot":"","sources":["../../../src/common/di/glsp-module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAoE;AAepE;;GAEG;AAEI,IAAe,UAAU,GAAzB,MAAe,UAAW,SAAQ,2BAAe;aACtC,mBAAc,GAAG,eAAe,AAAlB,CAAmB;IAI/C;QACI,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IASD;;;;;;;;OAQG;IACO,qBAAqB,CAAI,OAAgC,EAAE,YAAwD;QACzH,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;;AA/BiB,gCAAU;qBAAV,UAAU;IAD/B,IAAA,sBAAU,GAAE;;GACS,UAAU,CAgC/B"}
|
|
@@ -48,6 +48,7 @@ class ServerModule extends glsp_module_1.GLSPModule {
|
|
|
48
48
|
super(...arguments);
|
|
49
49
|
this.diagramModules = new Map();
|
|
50
50
|
}
|
|
51
|
+
static { this.DIAGRAM_MODULES = 'Diagram_Modules'; }
|
|
51
52
|
/**
|
|
52
53
|
* Configure a new {@link DiagramModule} for this server. A diagram module represents the base configuration artifact
|
|
53
54
|
* for configuring a diagram-language-specific client session container. The diagram type provided
|
|
@@ -106,5 +107,4 @@ class ServerModule extends glsp_module_1.GLSPModule {
|
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
exports.ServerModule = ServerModule;
|
|
109
|
-
ServerModule.DIAGRAM_MODULES = 'Diagram_Modules';
|
|
110
110
|
//# sourceMappingURL=server-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA+F;AAE/F,8EAAsG;AACtG,yDAA4D;AAC5D,8EAAsG;AACtG,8EAAsG;AACtG,qDAAqE;AAErE,+CAA2C;AAC3C,mDAA+C;AAC/C,+DAA2E;AAE3E;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,YAAa,SAAQ,wBAAU;IAA5C;;QAEuB,mBAAc,GAAmC,IAAI,GAAG,EAAE,CAAC;IA0ElF,CAAC;
|
|
1
|
+
{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ValidateLabelEditAdapter = exports.ContextEditValidator = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2022-
|
|
5
|
+
* Copyright (c) 2022-2026 STMicroelectronics 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
|
|
@@ -16,7 +16,7 @@ exports.ValidateLabelEditAdapter = exports.ContextEditValidator = void 0;
|
|
|
16
16
|
*
|
|
17
17
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
18
18
|
********************************************************************************/
|
|
19
|
-
const
|
|
19
|
+
const graph_1 = require("@eclipse-glsp/graph");
|
|
20
20
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
21
21
|
const label_edit_validator_1 = require("./label-edit-validator");
|
|
22
22
|
exports.ContextEditValidator = Symbol('ContextEditValidator');
|
|
@@ -30,7 +30,7 @@ class ValidateLabelEditAdapter {
|
|
|
30
30
|
}
|
|
31
31
|
validate(action) {
|
|
32
32
|
const element = this.modelState.index.get(action.modelElementId);
|
|
33
|
-
if (element instanceof
|
|
33
|
+
if (element instanceof graph_1.GModelElement) {
|
|
34
34
|
return this.labelEditValidator.validate(action.text, element);
|
|
35
35
|
}
|
|
36
36
|
return { severity: protocol_1.ValidationStatus.Severity.OK };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-edit-validator.js","sourceRoot":"","sources":["../../../../src/common/features/directediting/context-edit-validator.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF
|
|
1
|
+
{"version":3,"file":"context-edit-validator.js","sourceRoot":"","sources":["../../../../src/common/features/directediting/context-edit-validator.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,+CAAoD;AACpD,qDAAuF;AAEvF,iEAA4D;AAE/C,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAiBnE,MAAa,wBAAwB;IAEjC,YACa,UAAsB,EAC/B,kBAAsC;QAD7B,eAAU,GAAV,UAAU,CAAY;QAG/B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IACjD,CAAC;IAED,IAAI,SAAS;QACT,OAAO,yCAAkB,CAAC,UAAU,CAAC;IACzC,CAAC;IAED,QAAQ,CAAC,MAAmC;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACjE,IAAI,OAAO,YAAY,qBAAa,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;IACtD,CAAC;CACJ;AApBD,4DAoBC"}
|
|
@@ -12,9 +12,9 @@ const inversify_1 = require("inversify");
|
|
|
12
12
|
* A validator that validates a new label for a given {@link GModelElement}.
|
|
13
13
|
*/
|
|
14
14
|
let LabelEditValidator = class LabelEditValidator {
|
|
15
|
+
static { this.CONTEXT_ID = 'label-edit'; }
|
|
15
16
|
};
|
|
16
17
|
exports.LabelEditValidator = LabelEditValidator;
|
|
17
|
-
LabelEditValidator.CONTEXT_ID = 'label-edit';
|
|
18
18
|
exports.LabelEditValidator = LabelEditValidator = __decorate([
|
|
19
19
|
(0, inversify_1.injectable)()
|
|
20
20
|
], LabelEditValidator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"label-edit-validator.js","sourceRoot":"","sources":["../../../../src/common/features/directediting/label-edit-validator.ts"],"names":[],"mappings":";;;;;;;;;AAiBA,yCAAuC;AAEvC;;GAEG;AAEI,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB
|
|
1
|
+
{"version":3,"file":"label-edit-validator.js","sourceRoot":"","sources":["../../../../src/common/features/directediting/label-edit-validator.ts"],"names":[],"mappings":";;;;;;;;;AAiBA,yCAAuC;AAEvC;;GAEG;AAEI,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;aACpB,eAAU,GAAG,YAAY,AAAf,CAAgB;;AADxB,gDAAkB;6BAAlB,kBAAkB;IADvC,IAAA,sBAAU,GAAE;GACS,kBAAkB,CAWvC"}
|
|
@@ -14,8 +14,9 @@
|
|
|
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, ElementAndAlignment, ElementAndBounds, ElementAndRoutingPoints, MaybePromise } from '@eclipse-glsp/protocol';
|
|
18
18
|
import { ActionHandler } from '../../actions/action-handler';
|
|
19
|
+
import { Logger } from '../../utils/logger';
|
|
19
20
|
import { ModelState } from '../model/model-state';
|
|
20
21
|
import { ModelSubmissionHandler } from '../model/model-submission-handler';
|
|
21
22
|
/**
|
|
@@ -26,9 +27,23 @@ import { ModelSubmissionHandler } from '../model/model-submission-handler';
|
|
|
26
27
|
export declare class ComputedBoundsActionHandler implements ActionHandler {
|
|
27
28
|
protected submissionHandler: ModelSubmissionHandler;
|
|
28
29
|
protected modelState: ModelState;
|
|
30
|
+
protected logger: Logger;
|
|
29
31
|
actionKinds: string[];
|
|
30
32
|
execute(action: ComputedBoundsAction): MaybePromise<Action[]>;
|
|
33
|
+
/**
|
|
34
|
+
* Applies everything the client computed for the given model.
|
|
35
|
+
*
|
|
36
|
+
* An entry that cannot be applied is skipped and logged rather than treated as an error.
|
|
37
|
+
*/
|
|
31
38
|
protected applyBounds(root: GModelRoot, action: ComputedBoundsAction): void;
|
|
39
|
+
protected applyElementBounds(allBounds: ElementAndBounds[]): void;
|
|
40
|
+
protected applyAlignments(alignments: ElementAndAlignment[]): void;
|
|
41
|
+
/**
|
|
42
|
+
* Applies the computed routes.
|
|
43
|
+
*
|
|
44
|
+
* A skipped route is logged at debug level, an edge the client has not finished routing yet is expected.
|
|
45
|
+
*/
|
|
46
|
+
protected applyRoutes(routes: ElementAndRoutingPoints[]): void;
|
|
32
47
|
priority?: number | undefined;
|
|
33
48
|
}
|
|
34
49
|
//# sourceMappingURL=computed-bounds-action-handler.d.ts.map
|
|
@@ -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,
|
|
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,EACH,MAAM,EACN,oBAAoB,EACpB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,EAEvB,YAAY,EACf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,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;IAGjC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,WAAW,WAA+B;IAC1C,OAAO,CAAC,MAAM,EAAE,oBAAoB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAa7D;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAM3E,SAAS,CAAC,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,IAAI;IASjE,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,mBAAmB,EAAE,GAAG,IAAI;IASlE;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAI;IAS9D,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC"}
|
|
@@ -13,6 +13,7 @@ exports.ComputedBoundsActionHandler = void 0;
|
|
|
13
13
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
14
14
|
const inversify_1 = require("inversify");
|
|
15
15
|
const layout_util_1 = require("../../utils/layout-util");
|
|
16
|
+
const logger_1 = require("../../utils/logger");
|
|
16
17
|
const model_state_1 = require("../model/model-state");
|
|
17
18
|
const model_submission_handler_1 = require("../model/model-submission-handler");
|
|
18
19
|
/**
|
|
@@ -32,12 +33,44 @@ let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
|
|
|
32
33
|
}
|
|
33
34
|
return [];
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Applies everything the client computed for the given model.
|
|
38
|
+
*
|
|
39
|
+
* An entry that cannot be applied is skipped and logged rather than treated as an error.
|
|
40
|
+
*/
|
|
35
41
|
applyBounds(root, action) {
|
|
36
|
-
|
|
42
|
+
this.applyElementBounds(action.bounds);
|
|
43
|
+
this.applyAlignments(action.alignments ?? []);
|
|
44
|
+
this.applyRoutes(action.routes ?? []);
|
|
45
|
+
}
|
|
46
|
+
applyElementBounds(allBounds) {
|
|
47
|
+
const index = this.modelState.index;
|
|
48
|
+
allBounds.forEach(bounds => {
|
|
49
|
+
if (!(0, layout_util_1.applyElementAndBounds)(bounds, index)) {
|
|
50
|
+
this.logger.warn(`Skipped computed bounds of element '${bounds.elementId}'`);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
applyAlignments(alignments) {
|
|
37
55
|
const index = this.modelState.index;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
56
|
+
alignments.forEach(alignment => {
|
|
57
|
+
if (!(0, layout_util_1.applyAlignment)(alignment, index)) {
|
|
58
|
+
this.logger.warn(`Skipped computed alignment of element '${alignment.elementId}'`);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Applies the computed routes.
|
|
64
|
+
*
|
|
65
|
+
* A skipped route is logged at debug level, an edge the client has not finished routing yet is expected.
|
|
66
|
+
*/
|
|
67
|
+
applyRoutes(routes) {
|
|
68
|
+
const index = this.modelState.index;
|
|
69
|
+
routes.forEach(route => {
|
|
70
|
+
if (!(0, layout_util_1.applyRoute)(route, index)) {
|
|
71
|
+
this.logger.debug(`Skipped computed route of element '${route.elementId}'`);
|
|
72
|
+
}
|
|
73
|
+
});
|
|
41
74
|
}
|
|
42
75
|
};
|
|
43
76
|
exports.ComputedBoundsActionHandler = ComputedBoundsActionHandler;
|
|
@@ -49,6 +82,10 @@ __decorate([
|
|
|
49
82
|
(0, inversify_1.inject)(model_state_1.ModelState),
|
|
50
83
|
__metadata("design:type", Object)
|
|
51
84
|
], ComputedBoundsActionHandler.prototype, "modelState", void 0);
|
|
85
|
+
__decorate([
|
|
86
|
+
(0, inversify_1.inject)(logger_1.Logger),
|
|
87
|
+
__metadata("design:type", logger_1.Logger)
|
|
88
|
+
], ComputedBoundsActionHandler.prototype, "logger", void 0);
|
|
52
89
|
exports.ComputedBoundsActionHandler = ComputedBoundsActionHandler = __decorate([
|
|
53
90
|
(0, inversify_1.injectable)()
|
|
54
91
|
], ComputedBoundsActionHandler);
|
|
@@ -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,qDAQgC;AAChC,yCAA+C;AAE/C,yDAA4F;AAC5F,+CAA4C;AAC5C,sDAAkD;AAClD,gFAA2E;AAE3E;;;;GAIG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAUH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IA0D9C,CAAC;IAzDG,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;IAED;;;;OAIG;IACO,WAAW,CAAC,IAAgB,EAAE,MAA4B;QAChE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAES,kBAAkB,CAAC,SAA6B;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,IAAI,CAAC,IAAA,mCAAqB,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC;YACjF,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAES,eAAe,CAAC,UAAiC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAA,4BAAc,EAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC;YACvF,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACO,WAAW,CAAC,MAAiC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACnB,IAAI,CAAC,IAAA,wBAAU,EAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;YAChF,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ,CAAA;AApEY,kEAA2B;AAE1B;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAG1C;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;AAGvB;IADT,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;2DAAC;sCARhB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAoEvC"}
|
|
@@ -54,8 +54,7 @@ let LayoutOperationHandler = class LayoutOperationHandler extends operation_hand
|
|
|
54
54
|
return new recording_command_1.GModelRecordingCommand(this.modelState, this.serializer, () => this.executeOperation(operation));
|
|
55
55
|
}
|
|
56
56
|
async executeOperation(operation) {
|
|
57
|
-
|
|
58
|
-
await ((_a = this.layoutEngine) === null || _a === void 0 ? void 0 : _a.layout(operation));
|
|
57
|
+
await this.layoutEngine?.layout(operation);
|
|
59
58
|
}
|
|
60
59
|
};
|
|
61
60
|
exports.LayoutOperationHandler = LayoutOperationHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout-operation-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuE;AACvE,yCAAyD;AAEzD,uEAAyE;AACzE,+EAA6F;AAC7F,0EAAsE;AACtE,+CAA4C;AAC5C,kEAA8D;AAC9D,mDAA+C;AAE/C;;;;GAIG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oCAAgB;IAArD;;QAcM,kBAAa,GAAG,0BAAe,CAAC,IAAI,CAAC;IAgBlD,CAAC;IAdG,aAAa,CAAC,SAA0B;QACpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,MAAM,EAAE,CAAC;YACnE,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YACpF,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,0CAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAChH,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,SAA0B
|
|
1
|
+
{"version":3,"file":"layout-operation-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/layout-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuE;AACvE,yCAAyD;AAEzD,uEAAyE;AACzE,+EAA6F;AAC7F,0EAAsE;AACtE,+CAA4C;AAC5C,kEAA8D;AAC9D,mDAA+C;AAE/C;;;;GAIG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oCAAgB;IAArD;;QAcM,kBAAa,GAAG,0BAAe,CAAC,IAAI,CAAC;IAgBlD,CAAC;IAdG,aAAa,CAAC,SAA0B;QACpC,IAAI,IAAI,CAAC,oBAAoB,CAAC,UAAU,KAAK,wCAAgB,CAAC,MAAM,EAAE,CAAC;YACnE,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YACpF,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,0CAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAChH,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACvD,MAAM,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AA9BY,wDAAsB;AAErB;IADT,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;sDAAC;AAIf;IAFT,IAAA,kBAAM,EAAC,4BAAY,CAAC;IACpB,IAAA,oBAAQ,GAAE;;4DAC2B;AAG5B;IADT,IAAA,kBAAM,EAAC,4CAAoB,CAAC;;oEACwB;AAG3C;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;0DACc;iCAZ9B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA8BlC"}
|
|
@@ -46,15 +46,14 @@ let GModelIndex = class GModelIndex {
|
|
|
46
46
|
this.doIndex(root);
|
|
47
47
|
}
|
|
48
48
|
doIndex(element) {
|
|
49
|
-
var _a, _b;
|
|
50
49
|
if (this.idToElement.has(element.id)) {
|
|
51
50
|
throw new glsp_server_error_1.GLSPServerError('Duplicate ID in model: ' + element.id);
|
|
52
51
|
}
|
|
53
52
|
this.idToElement.set(element.id, element);
|
|
54
|
-
const typeSet =
|
|
53
|
+
const typeSet = this.typeToElements.get(element.type) ?? [];
|
|
55
54
|
typeSet.push(element);
|
|
56
55
|
this.typeToElements.set(element.type, typeSet);
|
|
57
|
-
(
|
|
56
|
+
(element.children ?? []).forEach(child => {
|
|
58
57
|
this.doIndex(child);
|
|
59
58
|
// Double check wether the parent reference of the child is set correctly
|
|
60
59
|
if (!child.parent) {
|
|
@@ -119,8 +118,7 @@ let GModelIndex = class GModelIndex {
|
|
|
119
118
|
* @returns A set containing the elements of the given type.
|
|
120
119
|
*/
|
|
121
120
|
getElements(type) {
|
|
122
|
-
|
|
123
|
-
return (_a = this.typeToElements.get(type)) !== null && _a !== void 0 ? _a : [];
|
|
121
|
+
return this.typeToElements.get(type) ?? [];
|
|
124
122
|
}
|
|
125
123
|
/**
|
|
126
124
|
* Returns the current amount of type occurrences in this instance of the GModelIndex.
|