@eclipse-glsp/server 2.1.0-next.78 → 2.2.0-next.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/operations/json-operation-handler.d.ts +1 -1
- package/lib/common/operations/json-operation-handler.d.ts.map +1 -1
- package/lib/common/operations/json-operation-handler.js +4 -1
- package/lib/common/operations/json-operation-handler.js.map +1 -1
- package/package.json +4 -4
- package/src/common/operations/json-operation-handler.ts +9 -4
|
@@ -48,7 +48,7 @@ export declare class JsonRecordingCommand<JsonObject extends AnyObject = AnyObje
|
|
|
48
48
|
*
|
|
49
49
|
*/
|
|
50
50
|
export declare abstract class JsonOperationHandler extends OperationHandler {
|
|
51
|
-
protected commandOf(runnable: () => void): Command;
|
|
51
|
+
protected commandOf(runnable: () => MaybePromise<void>): Command;
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
54
|
* Reusable {@link CreateNodeOperationHandler} base implementation for diagram languages that use a (serializable) JSON-based source model.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/json-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACH,SAAS,EACT,IAAI,EACJ,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,yBAAyB,EACzB,yBAAyB,EAG5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,UAAU;IACxF,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAC/C,iBAAiB,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,yBAAiB,cAAc,CAAC;IAC5B,SAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,IAAI,cAAc,CAEvE;CACJ;AAED;;;GAGG;AACH,qBAAa,oBAAoB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,wBAAwB,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"json-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/json-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACH,SAAS,EACT,IAAI,EACJ,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,KAAK,EACL,yBAAyB,EACzB,yBAAyB,EAG5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,cAAc,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,UAAU;IACxF,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAC/C,iBAAiB,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,yBAAiB,cAAc,CAAC;IAC5B,SAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,IAAI,cAAc,CAEvE;CACJ;AAED;;;GAGG;AACH,qBAAa,oBAAoB,CAAC,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,wBAAwB,CAAC,UAAU,CAAC;IAEhH,SAAS,CAAC,UAAU,EAAE,cAAc,CAAC,UAAU,CAAC;IAChD,SAAS,CAAC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;gBADnC,UAAU,EAAE,cAAc,CAAC,UAAU,CAAC,EACtC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;cAK9B,aAAa,IAAI,YAAY,CAAC,UAAU,CAAC;cAIzC,UAAU,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC;CAG1E;AAED;;;;GAIG;AACH,8BACsB,oBAAqB,SAAQ,gBAAgB;IAC/D,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO;CAMnE;AAED;;GAEG;AACH,8BACsB,8BAA+B,SAAQ,oBAAqB,YAAW,0BAA0B;IACnH,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,SAAkB,KAAK,EAAE,MAAM,CAAC;IAChC,SAAkB,aAAa,gBAA4B;aAEzC,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAElG,iBAAiB,IAAI,yBAAyB,EAAE;IAIhD,SAAS,CAAC,+BAA+B,CAAC,aAAa,EAAE,MAAM,GAAG,yBAAyB;IAO3F,SAAS,CAAC,yBAAyB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIpF,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIpE;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,GAAG,SAAS;IAKvE,WAAW,CAAC,SAAS,EAAE,mBAAmB,GAAG,KAAK,GAAG,SAAS;IAI9D;;;;;;;;;OASG;IACH,mBAAmB,CAAC,SAAS,EAAE,mBAAmB,GAAG,KAAK,GAAG,SAAS;CAKzE;AAED;;GAEG;AACH,8BACsB,8BAA+B,SAAQ,oBAAqB,YAAW,0BAA0B;IACnH,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,SAAkB,KAAK,EAAE,MAAM,CAAC;IAChC,SAAkB,aAAa,gBAA4B;aAEzC,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC;IAElG,iBAAiB,IAAI,yBAAyB,EAAE;CAGnD"}
|
|
@@ -66,7 +66,10 @@ let JsonCreateNodeOperationHandler = class JsonCreateNodeOperationHandler extend
|
|
|
66
66
|
return this.elementTypeIds.map(elementTypeId => this.createTriggerNodeCreationAction(elementTypeId));
|
|
67
67
|
}
|
|
68
68
|
createTriggerNodeCreationAction(elementTypeId) {
|
|
69
|
-
return protocol_1.TriggerNodeCreationAction.create(elementTypeId, {
|
|
69
|
+
return protocol_1.TriggerNodeCreationAction.create(elementTypeId, {
|
|
70
|
+
ghostElement: this.createTriggerGhostElement(elementTypeId),
|
|
71
|
+
args: this.createTriggerArgs(elementTypeId)
|
|
72
|
+
});
|
|
70
73
|
}
|
|
71
74
|
createTriggerGhostElement(elementTypeId) {
|
|
72
75
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/json-operation-handler.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,qDAYgC;AAChC,yCAAuC;AAEvC,oEAAwE;AAExE,sDAA2D;AAE3D,2DAAuD;AAWvD,IAAiB,cAAc,CAI9B;AAJD,WAAiB,cAAc;IAC3B,SAAgB,EAAE,CAAC,UAAsB;QACrC,OAAO,IAAA,wBAAa,EAAC,UAAU,EAAE,aAAa,CAAC,IAAI,IAAA,0BAAe,EAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACxG,CAAC;IAFe,iBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,cAAc,8BAAd,cAAc,QAI9B;AAED;;;GAGG;AACH,MAAa,oBAA+D,SAAQ,4CAAoC;IACpH,
|
|
1
|
+
{"version":3,"file":"json-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/json-operation-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/server",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0-next.81+d8400a0",
|
|
4
4
|
"description": "A js server framework for Eclipse GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
"watch": "tsc -w"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@eclipse-glsp/graph": "2.
|
|
63
|
-
"@eclipse-glsp/protocol": "
|
|
62
|
+
"@eclipse-glsp/graph": "2.2.0-next.81+d8400a0",
|
|
63
|
+
"@eclipse-glsp/protocol": "2.1.0",
|
|
64
64
|
"@types/uuid": "8.3.1",
|
|
65
65
|
"commander": "^8.3.0",
|
|
66
66
|
"fast-json-patch": "^3.1.0",
|
|
@@ -76,5 +76,5 @@
|
|
|
76
76
|
"publishConfig": {
|
|
77
77
|
"access": "public"
|
|
78
78
|
},
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "d8400a09c7b9a2ecd5b0d5b57ca4726ce6622eb2"
|
|
80
80
|
}
|
|
@@ -55,7 +55,10 @@ export namespace JsonModelState {
|
|
|
55
55
|
* to the `sourceModel` of the given {@link JsonModelState} during the given `doExecute` function
|
|
56
56
|
*/
|
|
57
57
|
export class JsonRecordingCommand<JsonObject extends AnyObject = AnyObject> extends AbstractRecordingCommand<JsonObject> {
|
|
58
|
-
constructor(
|
|
58
|
+
constructor(
|
|
59
|
+
protected modelState: JsonModelState<JsonObject>,
|
|
60
|
+
protected doExecute: () => MaybePromise<void>
|
|
61
|
+
) {
|
|
59
62
|
super();
|
|
60
63
|
}
|
|
61
64
|
|
|
@@ -75,7 +78,7 @@ export class JsonRecordingCommand<JsonObject extends AnyObject = AnyObject> exte
|
|
|
75
78
|
*/
|
|
76
79
|
@injectable()
|
|
77
80
|
export abstract class JsonOperationHandler extends OperationHandler {
|
|
78
|
-
protected commandOf(runnable: () => void): Command {
|
|
81
|
+
protected commandOf(runnable: () => MaybePromise<void>): Command {
|
|
79
82
|
if (!JsonModelState.is(this.modelState)) {
|
|
80
83
|
throw new Error('Cannot create command. The underlying model state does not implement the `JsonModelState` interface');
|
|
81
84
|
}
|
|
@@ -99,8 +102,10 @@ export abstract class JsonCreateNodeOperationHandler extends JsonOperationHandle
|
|
|
99
102
|
}
|
|
100
103
|
|
|
101
104
|
protected createTriggerNodeCreationAction(elementTypeId: string): TriggerNodeCreationAction {
|
|
102
|
-
return TriggerNodeCreationAction.create(elementTypeId,
|
|
103
|
-
|
|
105
|
+
return TriggerNodeCreationAction.create(elementTypeId, {
|
|
106
|
+
ghostElement: this.createTriggerGhostElement(elementTypeId),
|
|
107
|
+
args: this.createTriggerArgs(elementTypeId)
|
|
108
|
+
});
|
|
104
109
|
}
|
|
105
110
|
|
|
106
111
|
protected createTriggerGhostElement(elementTypeId: string): GhostElement | undefined {
|