@eclipse-glsp/server 1.1.0-RC05 → 1.1.0-RC07
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.d.ts +8 -5
- package/lib/browser/launch/worker-server-launcher.d.ts.map +1 -1
- package/lib/browser/launch/worker-server-launcher.js +9 -11
- package/lib/browser/launch/worker-server-launcher.js.map +1 -1
- package/lib/common/command/command-stack.d.ts +7 -6
- package/lib/common/command/command-stack.d.ts.map +1 -1
- package/lib/common/command/command-stack.js +6 -6
- package/lib/common/command/command-stack.js.map +1 -1
- package/lib/common/command/command-stack.spec.js +31 -31
- package/lib/common/command/command-stack.spec.js.map +1 -1
- package/lib/common/command/command.d.ts +7 -6
- package/lib/common/command/command.d.ts.map +1 -1
- package/lib/common/command/command.js +19 -15
- package/lib/common/command/command.js.map +1 -1
- package/lib/common/command/command.spec.js +8 -8
- package/lib/common/command/command.spec.js.map +1 -1
- package/lib/common/command/recording-command.d.ts +15 -15
- package/lib/common/command/recording-command.d.ts.map +1 -1
- package/lib/common/command/recording-command.js +10 -10
- package/lib/common/command/recording-command.js.map +1 -1
- package/lib/common/command/recording-command.spec.js +8 -8
- package/lib/common/command/recording-command.spec.js.map +1 -1
- package/lib/common/command/undo-redo-action-handler.d.ts +2 -2
- package/lib/common/command/undo-redo-action-handler.d.ts.map +1 -1
- package/lib/common/command/undo-redo-action-handler.js +4 -4
- package/lib/common/command/undo-redo-action-handler.js.map +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js +1 -1
- package/lib/common/features/layout/computed-bounds-action-handler.js.map +1 -1
- package/lib/common/index.d.ts +3 -1
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +3 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/launch/glsp-server-launcher.d.ts +7 -6
- package/lib/common/launch/glsp-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/glsp-server-launcher.js +25 -2
- package/lib/common/launch/glsp-server-launcher.js.map +1 -1
- package/lib/common/operations/operation-action-handler.d.ts +1 -1
- package/lib/common/operations/operation-action-handler.d.ts.map +1 -1
- package/lib/common/operations/operation-action-handler.js +3 -3
- package/lib/common/operations/operation-action-handler.js.map +1 -1
- package/lib/common/test/mock-util.d.ts +7 -1
- package/lib/common/test/mock-util.d.ts.map +1 -1
- package/lib/common/test/mock-util.js +23 -1
- package/lib/common/test/mock-util.js.map +1 -1
- package/lib/common/utils/layout-util.d.ts +1 -1
- package/lib/common/utils/layout-util.d.ts.map +1 -1
- package/lib/common/utils/layout-util.js +3 -3
- package/lib/common/utils/layout-util.js.map +1 -1
- package/lib/node/index.d.ts +1 -0
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +1 -0
- package/lib/node/index.js.map +1 -1
- package/lib/node/launch/socket-server-launcher.d.ts +2 -1
- package/lib/node/launch/socket-server-launcher.d.ts.map +1 -1
- package/lib/node/launch/socket-server-launcher.js +11 -10
- package/lib/node/launch/socket-server-launcher.js.map +1 -1
- package/lib/node/launch/websocket-server-launcher.d.ts +59 -0
- package/lib/node/launch/websocket-server-launcher.d.ts.map +1 -0
- package/lib/node/launch/websocket-server-launcher.js +145 -0
- package/lib/node/launch/websocket-server-launcher.js.map +1 -0
- package/package.json +8 -6
- package/src/browser/launch/worker-server-launcher.ts +16 -12
- package/src/common/command/command-stack.spec.ts +32 -32
- package/src/common/command/command-stack.ts +10 -9
- package/src/common/command/command.spec.ts +9 -10
- package/src/common/command/command.ts +23 -19
- package/src/common/command/recording-command.spec.ts +8 -8
- package/src/common/command/recording-command.ts +19 -19
- package/src/common/command/undo-redo-action-handler.ts +4 -4
- package/src/common/features/layout/computed-bounds-action-handler.ts +2 -2
- package/src/common/index.ts +3 -1
- package/src/common/launch/glsp-server-launcher.ts +13 -7
- package/src/common/operations/operation-action-handler.ts +3 -3
- package/src/common/test/mock-util.ts +21 -0
- package/src/common/utils/layout-util.ts +1 -1
- package/src/node/index.ts +1 -0
- package/src/node/launch/socket-server-launcher.ts +13 -7
- package/src/node/launch/websocket-server-launcher.ts +164 -0
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { GModelRootSchema } from '@eclipse-glsp/graph';
|
|
17
|
-
import { AnyObject } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { AnyObject, MaybePromise } from '@eclipse-glsp/protocol';
|
|
18
18
|
import * as jsonPatch from 'fast-json-patch';
|
|
19
19
|
import { GModelSerializer } from '../features/model/gmodel-serializer';
|
|
20
20
|
import { ModelState } from '../features/model/model-state';
|
|
@@ -26,18 +26,18 @@ import { Command } from './command';
|
|
|
26
26
|
export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObject> implements Command {
|
|
27
27
|
protected undoPatch?: jsonPatch.Operation[];
|
|
28
28
|
protected redoPatch?: jsonPatch.Operation[];
|
|
29
|
-
execute(): void
|
|
29
|
+
execute(): Promise<void>;
|
|
30
30
|
/**
|
|
31
31
|
* Retrieves the current state of the JSON object. Is called right before and
|
|
32
32
|
* right after {@link AbstractRecordingCommand.doExecute} to derive the undo & redo patches.
|
|
33
33
|
* @returns The current state of the JSON object
|
|
34
34
|
*/
|
|
35
|
-
protected abstract getJsonObject(): JsonObject
|
|
35
|
+
protected abstract getJsonObject(): MaybePromise<JsonObject>;
|
|
36
36
|
/**
|
|
37
37
|
* The actual execution i.e. series of changes applied to the JSOn object that should be captured.
|
|
38
38
|
*/
|
|
39
|
-
protected abstract doExecute(): void
|
|
40
|
-
protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): void
|
|
39
|
+
protected abstract doExecute(): MaybePromise<void>;
|
|
40
|
+
protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): MaybePromise<void>;
|
|
41
41
|
/**
|
|
42
42
|
* Captures the original state of the JSON object before executing the command routine.
|
|
43
43
|
* This implementation cannot clone circular structures as it relies on `JSON.stringify`.
|
|
@@ -45,8 +45,8 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
|
|
|
45
45
|
* @returns A deep clone of the given object
|
|
46
46
|
*/
|
|
47
47
|
protected deepClone(object: JsonObject): JsonObject;
|
|
48
|
-
undo(): void
|
|
49
|
-
redo(): void
|
|
48
|
+
undo(): Promise<void>;
|
|
49
|
+
redo(): Promise<void>;
|
|
50
50
|
canUndo(): boolean;
|
|
51
51
|
}
|
|
52
52
|
/**
|
|
@@ -55,9 +55,9 @@ export declare abstract class AbstractRecordingCommand<JsonObject extends AnyObj
|
|
|
55
55
|
*/
|
|
56
56
|
export declare class RecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
|
|
57
57
|
protected jsonObject: JsonObject;
|
|
58
|
-
protected doExecute: () => void
|
|
59
|
-
constructor(jsonObject: JsonObject, doExecute: () => void);
|
|
60
|
-
protected getJsonObject(): JsonObject
|
|
58
|
+
protected doExecute: () => MaybePromise<void>;
|
|
59
|
+
constructor(jsonObject: JsonObject, doExecute: () => MaybePromise<void>);
|
|
60
|
+
protected getJsonObject(): MaybePromise<JsonObject>;
|
|
61
61
|
}
|
|
62
62
|
/**
|
|
63
63
|
* Simple base implementation of {@link AbstractRecordingCommand} that allows recording of changes made
|
|
@@ -66,10 +66,10 @@ export declare class RecordingCommand<JsonObject extends AnyObject = AnyObject>
|
|
|
66
66
|
export declare class GModelRecordingCommand extends AbstractRecordingCommand<GModelRootSchema> {
|
|
67
67
|
protected modelState: ModelState;
|
|
68
68
|
protected serializer: GModelSerializer;
|
|
69
|
-
protected doExecute: () => void
|
|
70
|
-
constructor(modelState: ModelState, serializer: GModelSerializer, doExecute: () => void);
|
|
71
|
-
execute(): void
|
|
72
|
-
protected getJsonObject(): GModelRootSchema
|
|
73
|
-
protected applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): void
|
|
69
|
+
protected doExecute: () => MaybePromise<void>;
|
|
70
|
+
constructor(modelState: ModelState, serializer: GModelSerializer, doExecute: () => MaybePromise<void>);
|
|
71
|
+
execute(): Promise<void>;
|
|
72
|
+
protected getJsonObject(): MaybePromise<GModelRootSchema>;
|
|
73
|
+
protected applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): MaybePromise<void>;
|
|
74
74
|
}
|
|
75
75
|
//# sourceMappingURL=recording-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"recording-command.d.ts","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC;;;GAGG;AACH,8BAAsB,wBAAwB,CAAC,UAAU,SAAS,SAAS,CAAE,YAAW,OAAO;IAC3F,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAC5C,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC;IAEtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;IAI1F;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU;IAI7C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,OAAO,IAAI,OAAO;CAGrB;AAED;;;GAGG;AACH,qBAAa,gBAAgB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,wBAAwB,CAAC,UAAU,CAAC;IACpG,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAArE,UAAU,EAAE,UAAU,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAI3F,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;CAGtD;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB,CAAC,gBAAgB,CAAC;IACtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAAE,SAAS,CAAC,UAAU,EAAE,gBAAgB;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBAA7G,UAAU,EAAE,UAAU,EAAY,UAAU,EAAE,gBAAgB,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAIpH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,SAAS,CAAC,aAAa,IAAI,YAAY,CAAC,gBAAgB,CAAC;cAItC,UAAU,CAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC;CAKhH"}
|
|
@@ -22,10 +22,10 @@ const jsonPatch = require("fast-json-patch");
|
|
|
22
22
|
* These changes are recorded in the form of json patches.
|
|
23
23
|
*/
|
|
24
24
|
class AbstractRecordingCommand {
|
|
25
|
-
execute() {
|
|
26
|
-
const beforeState = this.deepClone(this.getJsonObject());
|
|
27
|
-
this.doExecute();
|
|
28
|
-
const afterState = this.getJsonObject();
|
|
25
|
+
async execute() {
|
|
26
|
+
const beforeState = this.deepClone(await this.getJsonObject());
|
|
27
|
+
await this.doExecute();
|
|
28
|
+
const afterState = await this.getJsonObject();
|
|
29
29
|
this.undoPatch = jsonPatch.compare(afterState, beforeState);
|
|
30
30
|
this.redoPatch = jsonPatch.compare(beforeState, afterState);
|
|
31
31
|
}
|
|
@@ -41,14 +41,14 @@ class AbstractRecordingCommand {
|
|
|
41
41
|
deepClone(object) {
|
|
42
42
|
return jsonPatch.deepClone(object);
|
|
43
43
|
}
|
|
44
|
-
undo() {
|
|
44
|
+
async undo() {
|
|
45
45
|
if (this.undoPatch) {
|
|
46
|
-
this.applyPatch(this.getJsonObject(), this.undoPatch);
|
|
46
|
+
return this.applyPatch(await this.getJsonObject(), this.undoPatch);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
redo() {
|
|
49
|
+
async redo() {
|
|
50
50
|
if (this.redoPatch) {
|
|
51
|
-
this.applyPatch(this.getJsonObject(), this.redoPatch);
|
|
51
|
+
return this.applyPatch(await this.getJsonObject(), this.redoPatch);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
canUndo() {
|
|
@@ -82,8 +82,8 @@ class GModelRecordingCommand extends AbstractRecordingCommand {
|
|
|
82
82
|
this.serializer = serializer;
|
|
83
83
|
this.doExecute = doExecute;
|
|
84
84
|
}
|
|
85
|
-
execute() {
|
|
86
|
-
super.execute();
|
|
85
|
+
async execute() {
|
|
86
|
+
await super.execute();
|
|
87
87
|
this.modelState.index.indexRoot(this.modelState.root);
|
|
88
88
|
}
|
|
89
89
|
getJsonObject() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recording-command.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAIlF,6CAA6C;AAI7C;;;GAGG;AACH,MAAsB,wBAAwB;IAI1C,OAAO;
|
|
1
|
+
{"version":3,"file":"recording-command.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAIlF,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;IAChE,CAAC;IAcS,UAAU,CAAC,MAAkB,EAAE,KAA4B;QACjE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACrD,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;YAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SACtE;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SACtE;IACL,CAAC;IAED,OAAO;QACH,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAChD,CAAC;CACJ;AArDD,4DAqDC;AAED;;;GAGG;AACH,MAAa,gBAA2D,SAAQ,wBAAoC;IAChH,YAAsB,UAAsB,EAAY,SAAmC;QACvF,KAAK,EAAE,CAAC;QADU,eAAU,GAAV,UAAU,CAAY;QAAY,cAAS,GAAT,SAAS,CAA0B;IAE3F,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;CACJ;AARD,4CAQC;AAED;;;GAGG;AACH,MAAa,sBAAuB,SAAQ,wBAA0C;IAClF,YAAsB,UAAsB,EAAY,UAA4B,EAAY,SAAmC;QAC/H,KAAK,EAAE,CAAC;QADU,eAAU,GAAV,UAAU,CAAY;QAAY,eAAU,GAAV,UAAU,CAAkB;QAAY,cAAS,GAAT,SAAS,CAA0B;IAEnI,CAAC;IAEQ,KAAK,CAAC,OAAO;QAClB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEkB,UAAU,CAAC,UAA4B,EAAE,KAA4B;QACpF,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACJ;AAnBD,wDAmBC"}
|
|
@@ -28,34 +28,34 @@ describe('RecordingCommand', () => {
|
|
|
28
28
|
};
|
|
29
29
|
beforeState = JSON.parse(JSON.stringify(jsonObject));
|
|
30
30
|
});
|
|
31
|
-
it('should be undoable after execution', () => {
|
|
31
|
+
it('should be undoable after execution', async () => {
|
|
32
32
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
33
33
|
const command = new recording_command_1.RecordingCommand(jsonObject, () => { });
|
|
34
34
|
(0, chai_1.expect)(command.canUndo()).to.be.false;
|
|
35
|
-
command.execute();
|
|
35
|
+
await command.execute();
|
|
36
36
|
(0, chai_1.expect)(command.canUndo()).to.be.true;
|
|
37
37
|
});
|
|
38
|
-
it('should restore the pre execution state when undo is called', () => {
|
|
38
|
+
it('should restore the pre execution state when undo is called', async () => {
|
|
39
39
|
const command = new recording_command_1.RecordingCommand(jsonObject, () => {
|
|
40
40
|
jsonObject.string = 'bar';
|
|
41
41
|
jsonObject.flag = false;
|
|
42
42
|
jsonObject.maybe = { hello: 'world' };
|
|
43
43
|
});
|
|
44
|
-
command.execute();
|
|
44
|
+
await command.execute();
|
|
45
45
|
(0, chai_1.expect)(jsonObject).to.not.be.deep.equals(beforeState);
|
|
46
|
-
command.undo();
|
|
46
|
+
await command.undo();
|
|
47
47
|
(0, chai_1.expect)(jsonObject).to.be.deep.equals(beforeState);
|
|
48
48
|
});
|
|
49
|
-
it('should restore the post execution state when redo is called', () => {
|
|
49
|
+
it('should restore the post execution state when redo is called', async () => {
|
|
50
50
|
const command = new recording_command_1.RecordingCommand(jsonObject, () => {
|
|
51
51
|
jsonObject.string = 'bar';
|
|
52
52
|
jsonObject.flag = false;
|
|
53
53
|
jsonObject.maybe = { hello: 'world' };
|
|
54
54
|
});
|
|
55
|
-
command.execute();
|
|
55
|
+
await command.execute();
|
|
56
56
|
const afterState = JSON.parse(JSON.stringify(jsonObject));
|
|
57
57
|
jsonObject = JSON.parse(JSON.stringify(afterState));
|
|
58
|
-
command.redo();
|
|
58
|
+
await command.redo();
|
|
59
59
|
(0, chai_1.expect)(jsonObject).to.be.deep.equals(afterState);
|
|
60
60
|
});
|
|
61
61
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recording-command.spec.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAGlF,+BAA8B;AAC9B,2DAAuD;AASvD,IAAI,UAAqB,CAAC;AAE1B,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,IAAI,WAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,UAAU,GAAG;YACT,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,IAAI;SACb,CAAC;QACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"recording-command.spec.js","sourceRoot":"","sources":["../../../src/common/command/recording-command.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAGlF,+BAA8B;AAC9B,2DAAuD;AASvD,IAAI,UAAqB,CAAC;AAE1B,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,IAAI,WAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,UAAU,GAAG;YACT,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,IAAI;SACb,CAAC;QACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAChD,gEAAgE;QAChE,MAAM,OAAO,GAAG,IAAI,oCAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACtC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,IAAA,aAAM,EAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,OAAO,GAAG,IAAI,oCAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;YAClD,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC;YAC1B,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;YACxB,UAAU,CAAC,KAAK,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,OAAO,GAAG,IAAI,oCAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;YAClD,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC;YAC1B,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;YACxB,UAAU,CAAC,KAAK,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1D,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QACpD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -22,7 +22,7 @@ export declare class UndoRedoActionHandler implements ActionHandler {
|
|
|
22
22
|
protected modelSubmissionHandler: ModelSubmissionHandler;
|
|
23
23
|
readonly actionKinds: string[];
|
|
24
24
|
execute(action: Action): MaybePromise<Action[]>;
|
|
25
|
-
protected undo():
|
|
26
|
-
protected redo():
|
|
25
|
+
protected undo(): Promise<Action[]>;
|
|
26
|
+
protected redo(): Promise<Action[]>;
|
|
27
27
|
}
|
|
28
28
|
//# sourceMappingURL=undo-redo-action-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-redo-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/command/undo-redo-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,YAAY,EAA0B,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBACa,qBAAsB,YAAW,aAAa;IAEvD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzD,QAAQ,CAAC,WAAW,WAAsC;IAE1D,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"undo-redo-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/command/undo-redo-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,YAAY,EAA0B,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBACa,qBAAsB,YAAW,aAAa;IAEvD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzD,QAAQ,CAAC,WAAW,WAAsC;IAE1D,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAS/B,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;cAQzB,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAO5C"}
|
|
@@ -42,16 +42,16 @@ let UndoRedoActionHandler = class UndoRedoActionHandler {
|
|
|
42
42
|
}
|
|
43
43
|
return [];
|
|
44
44
|
}
|
|
45
|
-
undo() {
|
|
45
|
+
async undo() {
|
|
46
46
|
if (this.commandStack.canUndo()) {
|
|
47
|
-
this.commandStack.undo();
|
|
47
|
+
await this.commandStack.undo();
|
|
48
48
|
return this.modelSubmissionHandler.submitModel('undo');
|
|
49
49
|
}
|
|
50
50
|
return [];
|
|
51
51
|
}
|
|
52
|
-
redo() {
|
|
52
|
+
async redo() {
|
|
53
53
|
if (this.commandStack.canRedo()) {
|
|
54
|
-
this.commandStack.redo();
|
|
54
|
+
await this.commandStack.redo();
|
|
55
55
|
return this.modelSubmissionHandler.submitModel('redo');
|
|
56
56
|
}
|
|
57
57
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-redo-action-handler.js","sourceRoot":"","sources":["../../../src/common/command/undo-redo-action-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAAsF;AACtF,yCAA+C;AAE/C,yFAAoF;AACpF,mDAA+C;AAGxC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAOM,gBAAW,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,qBAAU,CAAC,IAAI,CAAC,CAAC;IA0B9D,CAAC;IAxBG,OAAO,CAAC,MAAc;QAClB,IAAI,qBAAU,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACtB;aAAM,IAAI,qBAAU,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACtB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,IAAI;
|
|
1
|
+
{"version":3,"file":"undo-redo-action-handler.js","sourceRoot":"","sources":["../../../src/common/command/undo-redo-action-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAAsF;AACtF,yCAA+C;AAE/C,yFAAoF;AACpF,mDAA+C;AAGxC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAOM,gBAAW,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,qBAAU,CAAC,IAAI,CAAC,CAAC;IA0B9D,CAAC;IAxBG,OAAO,CAAC,MAAc;QAClB,IAAI,qBAAU,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACtB;aAAM,IAAI,qBAAU,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;SACtB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,IAAI;QAChB,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,IAAI;QAChB,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAhCG;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;2DACgB;AAErC;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;qEAAC;AALhD,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAiCjC;AAjCY,sDAAqB"}
|
|
@@ -35,7 +35,7 @@ let ComputedBoundsActionHandler = class ComputedBoundsActionHandler {
|
|
|
35
35
|
applyBounds(root, action) {
|
|
36
36
|
var _a, _b;
|
|
37
37
|
const index = this.modelState.index;
|
|
38
|
-
action.bounds.forEach(bounds => (0, layout_util_1.
|
|
38
|
+
action.bounds.forEach(bounds => (0, layout_util_1.applyElementAndBounds)(bounds, index));
|
|
39
39
|
((_a = action.alignments) !== null && _a !== void 0 ? _a : []).forEach(alignment => (0, layout_util_1.applyAlignment)(alignment, index));
|
|
40
40
|
((_b = action.routes) !== null && _b !== void 0 ? _b : []).forEach(route => (0, layout_util_1.applyRoute)(route, index));
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAoF;AACpF,yCAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"computed-bounds-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/layout/computed-bounds-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,qDAAoF;AACpF,yCAA+C;AAE/C,yDAA4F;AAC5F,sDAAkD;AAClD,gFAA2E;AAE3E;;;;GAIG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAOH,gBAAW,GAAG,CAAC,+BAAoB,CAAC,IAAI,CAAC,CAAC;IAmB9C,CAAC;IAlBG,OAAO,CAAC,MAA4B;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;SACvD;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAES,WAAW,CAAC,IAAgB,EAAE,MAA4B;;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,mCAAqB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACtE,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,4BAAc,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,wBAAU,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;CAGJ,CAAA;AAzBG;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;sEAAC;AAEpD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;+DACc;AALxB,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA0BvC;AA1BY,kEAA2B"}
|
package/lib/common/index.d.ts
CHANGED
|
@@ -22,6 +22,8 @@ export * from './actions/client-action-handler';
|
|
|
22
22
|
export * from './actions/global-action-provider';
|
|
23
23
|
export * from './command/command';
|
|
24
24
|
export * from './command/command-stack';
|
|
25
|
+
export * from './command/recording-command';
|
|
26
|
+
export * from './command/undo-redo-action-handler';
|
|
25
27
|
export * from './di/binding-target';
|
|
26
28
|
export * from './di/client-session-module';
|
|
27
29
|
export * from './di/diagram-module';
|
|
@@ -64,7 +66,6 @@ export * from './features/popup/popup-model-factory';
|
|
|
64
66
|
export * from './features/popup/request-popup-model-action-handler';
|
|
65
67
|
export * from './features/validation/model-validator';
|
|
66
68
|
export * from './features/validation/request-markers-handler';
|
|
67
|
-
export * from './gmodel/cut-operation-handler';
|
|
68
69
|
export * from './gmodel/index';
|
|
69
70
|
export * from './launch/glsp-server-launcher';
|
|
70
71
|
export * from './operations/compound-operation-handler';
|
|
@@ -83,6 +84,7 @@ export * from './session/client-session-manager';
|
|
|
83
84
|
export * from './utils/args-util';
|
|
84
85
|
export * from './utils/client-options-util';
|
|
85
86
|
export * from './utils/glsp-server-error';
|
|
87
|
+
export * from './utils/layout-util';
|
|
86
88
|
export * from './utils/logger';
|
|
87
89
|
export * from './utils/promise-queue';
|
|
88
90
|
export * from './utils/registry';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,sDAAsD,CAAC;AACrE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,sDAAsD,CAAC;AACrE,cAAc,iDAAiD,CAAC;AAChE,cAAc,0DAA0D,CAAC;AACzE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iCAAiC,CAAC;AAChD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,kDAAkD,CAAC;AACjE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iEAAiE,CAAC;AAChF,cAAc,iEAAiE,CAAC;AAChF,cAAc,sCAAsC,CAAC;AACrD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,sDAAsD,CAAC;AACrE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,sDAAsD,CAAC;AACrE,cAAc,iDAAiD,CAAC;AAChE,cAAc,0DAA0D,CAAC;AACzE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,0DAA0D,CAAC;AACzE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iCAAiC,CAAC;AAChD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,kDAAkD,CAAC;AACjE,cAAc,2DAA2D,CAAC;AAC1E,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iEAAiE,CAAC;AAChF,cAAc,iEAAiE,CAAC;AAChF,cAAc,sCAAsC,CAAC;AACrD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC"}
|
package/lib/common/index.js
CHANGED
|
@@ -38,6 +38,8 @@ __exportStar(require("./actions/client-action-handler"), exports);
|
|
|
38
38
|
__exportStar(require("./actions/global-action-provider"), exports);
|
|
39
39
|
__exportStar(require("./command/command"), exports);
|
|
40
40
|
__exportStar(require("./command/command-stack"), exports);
|
|
41
|
+
__exportStar(require("./command/recording-command"), exports);
|
|
42
|
+
__exportStar(require("./command/undo-redo-action-handler"), exports);
|
|
41
43
|
__exportStar(require("./di/binding-target"), exports);
|
|
42
44
|
__exportStar(require("./di/client-session-module"), exports);
|
|
43
45
|
__exportStar(require("./di/diagram-module"), exports);
|
|
@@ -80,7 +82,6 @@ __exportStar(require("./features/popup/popup-model-factory"), exports);
|
|
|
80
82
|
__exportStar(require("./features/popup/request-popup-model-action-handler"), exports);
|
|
81
83
|
__exportStar(require("./features/validation/model-validator"), exports);
|
|
82
84
|
__exportStar(require("./features/validation/request-markers-handler"), exports);
|
|
83
|
-
__exportStar(require("./gmodel/cut-operation-handler"), exports);
|
|
84
85
|
__exportStar(require("./gmodel/index"), exports);
|
|
85
86
|
__exportStar(require("./launch/glsp-server-launcher"), exports);
|
|
86
87
|
__exportStar(require("./operations/compound-operation-handler"), exports);
|
|
@@ -99,6 +100,7 @@ __exportStar(require("./session/client-session-manager"), exports);
|
|
|
99
100
|
__exportStar(require("./utils/args-util"), exports);
|
|
100
101
|
__exportStar(require("./utils/client-options-util"), exports);
|
|
101
102
|
__exportStar(require("./utils/glsp-server-error"), exports);
|
|
103
|
+
__exportStar(require("./utils/layout-util"), exports);
|
|
102
104
|
__exportStar(require("./utils/logger"), exports);
|
|
103
105
|
__exportStar(require("./utils/promise-queue"), exports);
|
|
104
106
|
__exportStar(require("./utils/registry"), exports);
|
package/lib/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,sDAAoC;AACpC,yDAAuC;AACvC,8DAA4C;AAC5C,2DAAyC;AACzC,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,oDAAkC;AAClC,0DAAwC;AACxC,sDAAoC;AACpC,6DAA2C;AAC3C,sDAAoC;AACpC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,2DAAyC;AACzC,kEAAgD;AAChD,8EAA4D;AAC5D,6FAA2E;AAC3E,4FAA0E;AAC1E,qFAAmE;AACnE,8FAA4E;AAC5E,uFAAqE;AACrE,4FAA0E;AAC1E,uFAAqE;AACrE,kFAAgE;AAChE,2FAAyE;AACzE,gFAA8D;AAC9D,2FAAyE;AACzE,mFAAiE;AACjE,kEAAgD;AAChD,6EAA2D;AAC3D,kEAAgD;AAChD,gEAA8C;AAC9C,qEAAmD;AACnD,+DAA6C;AAC7C,4EAA0D;AAC1D,gFAA8D;AAC9D,6EAA2D;AAC3D,wEAAsD;AACtD,4EAA0D;AAC1D,mFAAiE;AACjE,4FAA0E;AAC1E,qFAAmE;AACnE,mFAAiE;AACjE,kGAAgF;AAChF,kGAAgF;AAChF,uEAAqD;AACrD,sFAAoE;AACpE,wEAAsD;AACtD,gFAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,sDAAoC;AACpC,yDAAuC;AACvC,8DAA4C;AAC5C,2DAAyC;AACzC,oEAAkD;AAClD,kEAAgD;AAChD,mEAAiD;AACjD,oDAAkC;AAClC,0DAAwC;AACxC,8DAA4C;AAC5C,qEAAmD;AACnD,sDAAoC;AACpC,6DAA2C;AAC3C,sDAAoC;AACpC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,2DAAyC;AACzC,kEAAgD;AAChD,8EAA4D;AAC5D,6FAA2E;AAC3E,4FAA0E;AAC1E,qFAAmE;AACnE,8FAA4E;AAC5E,uFAAqE;AACrE,4FAA0E;AAC1E,uFAAqE;AACrE,kFAAgE;AAChE,2FAAyE;AACzE,gFAA8D;AAC9D,2FAAyE;AACzE,mFAAiE;AACjE,kEAAgD;AAChD,6EAA2D;AAC3D,kEAAgD;AAChD,gEAA8C;AAC9C,qEAAmD;AACnD,+DAA6C;AAC7C,4EAA0D;AAC1D,gFAA8D;AAC9D,6EAA2D;AAC3D,wEAAsD;AACtD,4EAA0D;AAC1D,mFAAiE;AACjE,4FAA0E;AAC1E,qFAAmE;AACnE,mFAAiE;AACjE,kGAAgF;AAChF,kGAAgF;AAChF,uEAAqD;AACrD,sFAAoE;AACpE,wEAAsD;AACtD,gFAA8D;AAC9D,iDAA+B;AAC/B,gEAA8C;AAC9C,0EAAwD;AACxD,wEAAsD;AACtD,wEAAsD;AACtD,iEAA+C;AAC/C,0EAAwD;AACxD,+DAA6C;AAC7C,yDAAuC;AACvC,kEAAgD;AAChD,2DAAyC;AACzC,mEAAiD;AACjD,uEAAqD;AACrD,oEAAkD;AAClD,mEAAiD;AACjD,oDAAkC;AAClC,8DAA4C;AAC5C,4DAA0C;AAC1C,sDAAoC;AACpC,iDAA+B;AAC/B,wDAAsC;AACtC,mDAAiC"}
|
|
@@ -13,22 +13,23 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { MaybePromise } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { Disposable, DisposableCollection, MaybePromise } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { Container, ContainerModule } from 'inversify';
|
|
18
18
|
import { ServerModule } from '../di/server-module';
|
|
19
19
|
import { Logger } from '../utils/logger';
|
|
20
|
-
export declare
|
|
21
|
-
export declare abstract class GLSPServerLauncher<T = undefined> {
|
|
20
|
+
export declare abstract class GLSPServerLauncher<T> implements Disposable {
|
|
22
21
|
protected logger: Logger;
|
|
23
22
|
protected _modules: ContainerModule[];
|
|
24
23
|
protected running: boolean;
|
|
24
|
+
protected toDispose: DisposableCollection;
|
|
25
25
|
protected parentContainer?: Container;
|
|
26
26
|
configure(serverModule: ServerModule, ...additionalModules: ContainerModule[]): void;
|
|
27
27
|
createContainer(): Container;
|
|
28
|
-
start(startParams
|
|
29
|
-
protected abstract run(startParams
|
|
28
|
+
start(startParams: T): MaybePromise<void>;
|
|
29
|
+
protected abstract run(startParams: T): MaybePromise<void>;
|
|
30
30
|
shutdown(): MaybePromise<void>;
|
|
31
|
-
protected
|
|
31
|
+
protected stop(): MaybePromise<void>;
|
|
32
|
+
dispose(): void;
|
|
32
33
|
get modules(): ContainerModule[];
|
|
33
34
|
}
|
|
34
35
|
//# sourceMappingURL=glsp-server-launcher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAgC,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,8BACsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,UAAU;IAC7C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAM;IAC3C,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,uBAA8B;IAET,SAAS,CAAC,eAAe,CAAC,EAAE,SAAS,CAAC;IAE9E,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,IAAI;IAIpF,eAAe,IAAI,SAAS;IAM5B,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAQzC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAE1D,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC;IAU9B,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IAIpC,OAAO,IAAI,IAAI;IAIf,IAAI,OAAO,IAAI,eAAe,EAAE,CAK/B;CACJ"}
|
|
@@ -9,14 +9,30 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.GLSPServerLauncher =
|
|
12
|
+
exports.GLSPServerLauncher = void 0;
|
|
13
|
+
/********************************************************************************
|
|
14
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
15
|
+
*
|
|
16
|
+
* This program and the accompanying materials are made available under the
|
|
17
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
18
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
19
|
+
*
|
|
20
|
+
* This Source Code may also be made available under the following Secondary
|
|
21
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
22
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
23
|
+
* with the GNU Classpath Exception which is available at
|
|
24
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
25
|
+
*
|
|
26
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
|
+
********************************************************************************/
|
|
28
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
13
29
|
const inversify_1 = require("inversify");
|
|
14
30
|
const service_identifiers_1 = require("../di/service-identifiers");
|
|
15
31
|
const logger_1 = require("../utils/logger");
|
|
16
|
-
exports.START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed';
|
|
17
32
|
let GLSPServerLauncher = class GLSPServerLauncher {
|
|
18
33
|
constructor() {
|
|
19
34
|
this._modules = [];
|
|
35
|
+
this.toDispose = new protocol_1.DisposableCollection();
|
|
20
36
|
}
|
|
21
37
|
configure(serverModule, ...additionalModules) {
|
|
22
38
|
this._modules.push(serverModule, ...additionalModules);
|
|
@@ -35,12 +51,19 @@ let GLSPServerLauncher = class GLSPServerLauncher {
|
|
|
35
51
|
}
|
|
36
52
|
shutdown() {
|
|
37
53
|
if (this.running) {
|
|
54
|
+
this.logger.info('Shutdown GLSPServerLauncher');
|
|
38
55
|
const result = this.stop();
|
|
39
56
|
this.running = false;
|
|
40
57
|
return result;
|
|
41
58
|
}
|
|
42
59
|
this.logger.warn('Could not stop launcher. Launcher is not running!');
|
|
43
60
|
}
|
|
61
|
+
stop() {
|
|
62
|
+
this.dispose();
|
|
63
|
+
}
|
|
64
|
+
dispose() {
|
|
65
|
+
this.toDispose.dispose();
|
|
66
|
+
}
|
|
44
67
|
get modules() {
|
|
45
68
|
if (!this._modules) {
|
|
46
69
|
throw new Error('The GLSPServerLauncher has not been configured yet');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"glsp-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/glsp-server-launcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAAqF;AAErF,mEAA+D;AAC/D,4CAAyC;AAGlC,IAAe,kBAAkB,GAAjC,MAAe,kBAAkB;IAAjC;QAGO,aAAQ,GAAsB,EAAE,CAAC;QAEjC,cAAS,GAAG,IAAI,+BAAoB,EAAE,CAAC;IAgDrD,CAAC;IA5CG,SAAS,CAAC,YAA0B,EAAE,GAAG,iBAAoC;QACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe;QACX,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAS,EAAE,CAAC;QAC9F,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,WAAc;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAC/E,CAAC;IAID,QAAQ;QACJ,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IAC1E,CAAC;IAES,IAAI;QACV,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ,CAAA;AApDG;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BAAmB,eAAM;kDAAC;AAMzC;IAAC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAA6B,qBAAS;2DAAC;AAP5D,kBAAkB;IADvC,IAAA,sBAAU,GAAE;GACS,kBAAkB,CAqDvC;AArDqB,gDAAkB"}
|
|
@@ -31,7 +31,7 @@ export declare class OperationActionHandler implements ActionHandler {
|
|
|
31
31
|
execute(action: Operation): MaybePromise<Action[]>;
|
|
32
32
|
protected executeOperation(operation: Operation): MaybePromise<Action[]>;
|
|
33
33
|
protected executeHandler(operation: Operation, handler: OperationHandler): Promise<Action[]>;
|
|
34
|
-
protected executeCommand(command: Command): void
|
|
34
|
+
protected executeCommand(command: Command): Promise<void>;
|
|
35
35
|
protected submitModel(): MaybePromise<Action[]>;
|
|
36
36
|
handles(action: Action): boolean;
|
|
37
37
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAaxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAX9D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAG7D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAclD,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAQxD,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"operation-action-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,qBACa,sBAAuB,YAAW,aAAa;IAaxB,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAX9D,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAG7D,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,MAAM,EAAE;IAE9D,OAAO,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAclD,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;cAQxD,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAQlF,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,SAAS,CAAC,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIhC;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,GAAG,gBAAgB,GAAG,SAAS;CAGrH"}
|
|
@@ -64,12 +64,12 @@ let OperationActionHandler = OperationActionHandler_1 = class OperationActionHan
|
|
|
64
64
|
async executeHandler(operation, handler) {
|
|
65
65
|
const command = await handler.execute(operation);
|
|
66
66
|
if (command) {
|
|
67
|
-
this.executeCommand(command);
|
|
67
|
+
await this.executeCommand(command);
|
|
68
68
|
}
|
|
69
69
|
return this.modelSubmissionHandler.submitModel('operation');
|
|
70
70
|
}
|
|
71
|
-
executeCommand(command) {
|
|
72
|
-
this.commandStack.execute(command);
|
|
71
|
+
async executeCommand(command) {
|
|
72
|
+
return this.commandStack.execute(command);
|
|
73
73
|
}
|
|
74
74
|
submitModel() {
|
|
75
75
|
return this.modelSubmissionHandler.submitModel('operation');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8F;AAC9F,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YAC5B,OAAO;gBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;SACL;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"operation-action-handler.js","sourceRoot":"","sources":["../../../src/common/operations/operation-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8F;AAC9F,yCAA+C;AAG/C,4DAAwD;AACxD,mEAAuD;AACvD,+DAA2D;AAC3D,yFAAoF;AACpF,kEAA6D;AAE7D,6EAAwE;AAGjE,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAa/B,YAAyC,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAElE,OAAO,CAAC,MAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YAC5B,OAAO;gBACH,8BAAmB,CAAC,MAAM,CAAC,4DAA4D,MAAM,CAAC,IAAI,EAAE,EAAE;oBAClG,QAAQ,EAAE,SAAS;iBACtB,CAAC;aACL,CAAC;SACL;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,gBAAgB,CAAC,SAAoB;QAC3C,MAAM,gBAAgB,GAAG,wBAAsB,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9G,IAAI,gBAAgB,EAAE;YAClB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;SAC3D;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,SAAoB,EAAE,OAAyB;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAAgB;QAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAES,WAAW;QACjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,MAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IAEH,MAAM,CAAC,mBAAmB,CAAC,SAAoB,EAAE,QAAkC;QAC/E,OAAO,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AA/DG;IAAC,IAAA,kBAAM,EAAC,qDAAwB,CAAC;8BACG,qDAAwB;wEAAC;AAE7D;IAAC,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACG,iDAAsB;sEAAC;AAEzD;IAAC,IAAA,kBAAM,EAAC,wBAAU,CAAC;;0DACc;AAEjC;IAAC,IAAA,kBAAM,EAAC,4BAAY,CAAC;;4DACgB;AAX5B,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAcI,WAAA,IAAA,kBAAM,EAAC,gCAAU,CAAC,CAAA;;GAbtB,sBAAsB,CAgElC;AAhEY,wDAAsB"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { GEdge, GModelElement, GModelElementConstructor, GNode } from '@eclipse-glsp/graph';
|
|
17
|
-
import { Action, ActionMessage, Args, CreateNodeOperation, EdgeTypeHint, InitializeClientSessionParameters, MaybeArray, Point, RequestEditValidationAction, ShapeTypeHint, ValidationStatus } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { Action, ActionMessage, Args, CreateNodeOperation, EdgeTypeHint, InitializeClientSessionParameters, MaybeArray, MaybePromise, Point, RequestEditValidationAction, ShapeTypeHint, ValidationStatus } from '@eclipse-glsp/protocol';
|
|
18
18
|
import { Container } from 'inversify';
|
|
19
19
|
import { MessageConnection } from 'vscode-jsonrpc';
|
|
20
20
|
import { ActionDispatcher } from '../actions/action-dispatcher';
|
|
@@ -34,6 +34,12 @@ import { ClientSessionListener } from '../session/client-session-listener';
|
|
|
34
34
|
import { ClientSessionManager } from '../session/client-session-manager';
|
|
35
35
|
import { Logger, LogLevel } from '../utils/logger';
|
|
36
36
|
export declare function delay(ms: number): Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Consumes a maybe async function and checks for error
|
|
39
|
+
* @param method - The function to check
|
|
40
|
+
* @param message - Optional message to match with error message
|
|
41
|
+
*/
|
|
42
|
+
export declare function expectToThrowAsync(toEvaluate: () => MaybePromise<void>, message?: string): Promise<void>;
|
|
37
43
|
export declare function createClientSession(id: string, diagramType: string, container?: Container, actionDispatcher?: StubActionDispatcher): ClientSession;
|
|
38
44
|
export declare class StubActionHandler implements ActionHandler {
|
|
39
45
|
actionKinds: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-util.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EACH,MAAM,EACN,aAAa,EACb,IAAI,EACJ,mBAAmB,EACnB,YAAY,EACZ,iCAAiC,EACjC,UAAU,EACV,KAAK,EACL,2BAA2B,EAC3B,aAAa,EACb,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"mock-util.d.ts","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EACH,MAAM,EACN,aAAa,EACb,IAAI,EACJ,mBAAmB,EACnB,YAAY,EACZ,iCAAiC,EACjC,UAAU,EACV,YAAY,EACZ,KAAK,EACL,2BAA2B,EAC3B,aAAa,EACb,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9G;AAED,wBAAgB,mBAAmB,CAC/B,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EACnB,SAAS,YAAkB,EAC3B,gBAAgB,uBAA6B,GAC9C,aAAa,CAUf;AAED,qBAAa,iBAAkB,YAAW,aAAa;IAChC,WAAW,EAAE,MAAM,EAAE;gBAArB,WAAW,EAAE,MAAM,EAAE;IAExC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,gCAAgC;IAGpE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAFlC,cAAc,EAAE,MAAM,EAAE,CAAC;gBAEJ,KAAK,EAAE,MAAM;IAKlC,UAAU,CAAC,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;CAG1F;AAED,qBAAa,8BAA+B,SAAQ,gCAAgC;IAGpE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAFlC,cAAc,EAAE,MAAM,EAAE,CAAC;gBAEJ,KAAK,EAAE,MAAM;IAKlC,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS;CAG9E;AAED,qBAAa,oBAAqB,YAAW,gBAAgB;IACzD,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAE/D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG/D;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;CAInE;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAKlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAItD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAIpF,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAIxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;CAGvD;AAED,qBAAa,UAAW,SAAQ,MAAM;IAClC,QAAQ,WAAiB;IACzB,MAAM,YAAa;IAEnB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAE7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAE7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAE9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;CACjD;AAED,qBAAa,yBAA0B,YAAW,qBAAqB;IACnE,cAAc,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAElD,eAAe,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;CACtD;AAED,qBAAa,mBAAoB,YAAW,sBAAsB;IAC9D,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;IAE5C,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI;CAChD;AAED,qBAAa,sBAAuB,YAAW,kBAAkB;IAC7D,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAE3C,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAC3C;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,WAAW,uDAA+C;IAE1D,cAAc,EAAE,aAAa,EAAE,CAAM;IAErC,aAAa,EAAE,YAAY,EAAE,CAAM;IAEnC,UAAU,mBAAyB;IAEnC,iBAAiB,UAAQ;IAEzB,cAAc,UAAQ;CACzB;AAED,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC1D,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,gBAAgB;CASpE;AAED,qBAAa,wBAAyB,YAAW,oBAAoB;IACjE,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,QAAQ,CAAC,MAAM,EAAE,2BAA2B,GAAG,gBAAgB;CASlE;AAED,eAAO,MAAM,wBAAwB,EAAE,oBAAuD,CAAC;AAE/F,qBAAa,4BAA6B,YAAW,wBAAwB;IACzE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI;CAChC;AAED,qBAAa,WAAY,YAAW,OAAO;IACvC,OAAO,IAAI,IAAI;IACf,IAAI,IAAI,IAAI;IACZ,IAAI,IAAI,IAAI;IACZ,OAAO,CAAC,IAAI,OAAO;CACtB"}
|
|
@@ -17,9 +17,10 @@
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-empty-function */
|
|
18
18
|
// Stub-implementation classes used for unit testing
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.StubCommand = exports.StubClientSessionInitializer = exports.stubActionHandlerFactory = exports.TestContextEditValidator = exports.TestLabelEditValidator = exports.StubDiagramConfiguration = exports.StubGLSPServerListener = exports.StubGLSPClientProxy = exports.StubClientSessionListener = exports.StubLogger = exports.StubClientSessionManager = exports.StubClientSessionFactory = exports.StubActionDispatcher = exports.StubCreateEdgeOperationHandler = exports.StubCreateNodeOperationHandler = exports.StubActionHandler = exports.createClientSession = exports.delay = void 0;
|
|
20
|
+
exports.StubCommand = exports.StubClientSessionInitializer = exports.stubActionHandlerFactory = exports.TestContextEditValidator = exports.TestLabelEditValidator = exports.StubDiagramConfiguration = exports.StubGLSPServerListener = exports.StubGLSPClientProxy = exports.StubClientSessionListener = exports.StubLogger = exports.StubClientSessionManager = exports.StubClientSessionFactory = exports.StubActionDispatcher = exports.StubCreateEdgeOperationHandler = exports.StubCreateNodeOperationHandler = exports.StubActionHandler = exports.createClientSession = exports.expectToThrowAsync = exports.delay = void 0;
|
|
21
21
|
const graph_1 = require("@eclipse-glsp/graph");
|
|
22
22
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
23
|
+
const chai_1 = require("chai");
|
|
23
24
|
const inversify_1 = require("inversify");
|
|
24
25
|
const diagram_configuration_1 = require("../diagram/diagram-configuration");
|
|
25
26
|
const label_edit_validator_1 = require("../features/directediting/label-edit-validator");
|
|
@@ -29,6 +30,27 @@ async function delay(ms) {
|
|
|
29
30
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
30
31
|
}
|
|
31
32
|
exports.delay = delay;
|
|
33
|
+
/**
|
|
34
|
+
* Consumes a maybe async function and checks for error
|
|
35
|
+
* @param method - The function to check
|
|
36
|
+
* @param message - Optional message to match with error message
|
|
37
|
+
*/
|
|
38
|
+
async function expectToThrowAsync(toEvaluate, message) {
|
|
39
|
+
let err = undefined;
|
|
40
|
+
try {
|
|
41
|
+
await toEvaluate();
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
err = error;
|
|
45
|
+
}
|
|
46
|
+
if (message) {
|
|
47
|
+
(0, chai_1.expect)(err === null || err === void 0 ? void 0 : err.message).to.be.equal(message);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
(0, chai_1.expect)(err).to.be.an('Error');
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.expectToThrowAsync = expectToThrowAsync;
|
|
32
54
|
function createClientSession(id, diagramType, container = new inversify_1.Container(), actionDispatcher = new StubActionDispatcher()) {
|
|
33
55
|
return {
|
|
34
56
|
id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-util.js","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yDAAyD;AACzD,oDAAoD;;;AAEpD,+CAA4F;AAC5F,
|
|
1
|
+
{"version":3,"file":"mock-util.js","sourceRoot":"","sources":["../../../src/common/test/mock-util.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yDAAyD;AACzD,oDAAoD;;;AAEpD,+CAA4F;AAC5F,qDAagC;AAChC,+BAA8B;AAC9B,yCAAsC;AAKtC,4EAA0F;AAE1F,yFAAoF;AACpF,2CAAqG;AASrG,4CAAmD;AAE5C,KAAK,UAAU,KAAK,CAAC,EAAU;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAFD,sBAEC;AAED;;;;GAIG;AACI,KAAK,UAAU,kBAAkB,CAAC,UAAoC,EAAE,OAAgB;IAC3F,IAAI,GAAG,GAAsB,SAAS,CAAC;IACvC,IAAI;QACA,MAAM,UAAU,EAAE,CAAC;KACtB;IAAC,OAAO,KAAU,EAAE;QACjB,GAAG,GAAG,KAAK,CAAC;KACf;IACD,IAAI,OAAO,EAAE;QACT,IAAA,aAAM,EAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAC7C;SAAM;QACH,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;KACjC;AACL,CAAC;AAZD,gDAYC;AAED,SAAgB,mBAAmB,CAC/B,EAAU,EACV,WAAmB,EACnB,SAAS,GAAG,IAAI,qBAAS,EAAE,EAC3B,gBAAgB,GAAG,IAAI,oBAAoB,EAAE;IAE7C,OAAO;QACH,EAAE;QACF,WAAW;QACX,SAAS;QACT,gBAAgB;QAChB,OAAO,EAAE,GAAG,EAAE;YACV,EAAE;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAfD,kDAeC;AAED,MAAa,iBAAiB;IAC1B,YAAmB,WAAqB;QAArB,gBAAW,GAAX,WAAW,CAAU;IAAG,CAAC;IAE5C,OAAO,CAAC,MAAc;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAND,8CAMC;AAED,MAAa,8BAA+B,SAAQ,wCAAgC;IAGhF,YAAqB,KAAa;QAC9B,KAAK,EAAE,CAAC;QADS,UAAK,GAAL,KAAK,CAAQ;QAE9B,IAAI,CAAC,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,UAAU,CAAC,SAA8B,EAAE,gBAAwB;QAC/D,OAAO,IAAI,aAAK,EAAE,CAAC;IACvB,CAAC;CACJ;AAXD,wEAWC;AAED,MAAa,8BAA+B,SAAQ,wCAAgC;IAGhF,YAAqB,KAAa;QAC9B,KAAK,EAAE,CAAC;QADS,UAAK,GAAL,KAAK,CAAQ;QAE9B,IAAI,CAAC,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,UAAU,CAAC,MAAqB,EAAE,MAAqB;QACnD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAXD,wEAWC;AAED,MAAa,oBAAoB;IAC7B,uBAAuB,CAAC,GAAG,OAA6B,IAAS,CAAC;IAElE,QAAQ,CAAC,MAAc;QACnB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,GAAG,OAA6B;QACxC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;AAVD,oDAUC;AAED,MAAa,wBAAwB;IACjC,MAAM,CAAC,MAAyC;QAC5C,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAChD,OAAO,mBAAmB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;CACJ;AALD,4DAKC;AAED,MAAa,wBAAwB;IACjC,wBAAwB,CAAC,MAAyC;QAC9D,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAChD,OAAO,mBAAmB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,UAAU,CAAC,eAAuB;QAC9B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,WAAmB;QACjC,OAAO,EAAE,CAAC;IACd,CAAC;IAED,oBAAoB,CAAC,eAAuB;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,QAA+B,EAAE,GAAG,gBAA0B;QACtE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,QAA+B;QAC1C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,GAAG,gBAA0B;QACzC,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA7BD,4DA6BC;AAED,MAAa,UAAW,SAAQ,eAAM;IAAtC;;QACI,aAAQ,GAAG,iBAAQ,CAAC,IAAI,CAAC;QACzB,WAAM,GAAG,SAAS,CAAC;IASvB,CAAC;IAPG,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa,IAAS,CAAC;IAEhD,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa,IAAS,CAAC;IAEhD,KAAK,CAAC,OAAe,EAAE,GAAG,MAAa,IAAS,CAAC;IAEjD,KAAK,CAAC,OAAe,EAAE,GAAG,MAAa,IAAS,CAAC;CACpD;AAXD,gCAWC;AAED,MAAa,yBAAyB;IAClC,cAAc,CAAC,aAA4B,IAAS,CAAC;IAErD,eAAe,CAAC,aAA4B,IAAS,CAAC;CACzD;AAJD,8DAIC;AAED,MAAa,mBAAmB;IAC5B,OAAO,CAAC,UAA6B,IAAS,CAAC;IAE/C,OAAO,CAAC,OAA8B,IAAS,CAAC;CACnD;AAJD,kDAIC;AAED,MAAa,sBAAsB;IAC/B,iBAAiB,CAAC,MAAkB,IAAS,CAAC;IAE9C,cAAc,CAAC,MAAkB,IAAS,CAAC;CAC9C;AAJD,wDAIC;AAED,MAAa,wBAAwB;IAArC;QACI,gBAAW,GAAG,IAAI,GAAG,EAAoC,CAAC;QAE1D,mBAAc,GAAoB,EAAE,CAAC;QAErC,kBAAa,GAAmB,EAAE,CAAC;QAEnC,eAAU,GAAG,wCAAgB,CAAC,IAAI,CAAC;QAEnC,sBAAiB,GAAG,IAAI,CAAC;QAEzB,mBAAc,GAAG,IAAI,CAAC;IAC1B,CAAC;CAAA;AAZD,4DAYC;AAED,MAAa,sBAAuB,SAAQ,yCAAkB;IAC1D,QAAQ,CAAC,KAAa,EAAE,OAAsB;QAC1C,IAAI,KAAK,KAAK,OAAO,EAAE;YACnB,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;SAC1E;QACD,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;SAC9E;QACD,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACrE,CAAC;CACJ;AAVD,wDAUC;AAED,MAAa,wBAAwB;IACjC,IAAI,SAAS;QACT,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,MAAmC;QACxC,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE;YACzB,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;SAC1E;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC3B,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;SAC9E;QACD,OAAO,EAAE,QAAQ,EAAE,2BAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACrE,CAAC;CACJ;AAdD,4DAcC;AAEM,MAAM,wBAAwB,GAAyB,WAAW,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC;AAAlF,QAAA,wBAAwB,4BAA0D;AAE/F,MAAa,4BAA4B;IACrC,UAAU,CAAC,IAAW,IAAS,CAAC;CACnC;AAFD,oEAEC;AAED,MAAa,WAAW;IACpB,OAAO,KAAU,CAAC;IAClB,IAAI,KAAU,CAAC;IACf,IAAI,KAAU,CAAC;CAElB;AALD,kCAKC"}
|