@eclipse-glsp-examples/workflow-glsp 2.2.0-next.336 → 2.2.0-next.338

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/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2024 EclipseSource and others.
2
+ * Copyright (c) 2024 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,8 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- export * from './direct-task-editing';
16
+ export * from './direct-task-editing/di.config';
17
+ export * from './direct-task-editing/direct-task-editor';
17
18
  export * from './model';
18
19
  export * from './workflow-diagram-module';
19
20
  export * from './workflow-snapper';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,uBAAuB,CAAC;AACtC,cAAc,SAAS,CAAC;AACxB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iCAAiC,CAAC;AAChD,cAAc,0CAA0C,CAAC;AACzD,cAAc,SAAS,CAAC;AACxB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC"}
package/lib/index.js CHANGED
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  /********************************************************************************
18
- * Copyright (c) 2019-2024 EclipseSource and others.
18
+ * Copyright (c) 2024 EclipseSource and others.
19
19
  *
20
20
  * This program and the accompanying materials are made available under the
21
21
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,7 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
29
29
  *
30
30
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
31
31
  ********************************************************************************/
32
- __exportStar(require("./direct-task-editing"), exports);
32
+ __exportStar(require("./direct-task-editing/di.config"), exports);
33
+ __exportStar(require("./direct-task-editing/direct-task-editor"), exports);
33
34
  __exportStar(require("./model"), exports);
34
35
  __exportStar(require("./workflow-diagram-module"), exports);
35
36
  __exportStar(require("./workflow-snapper"), exports);
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,wDAAsC;AACtC,0CAAwB;AACxB,4DAA0C;AAC1C,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kEAAgD;AAChD,2EAAyD;AACzD,0CAAwB;AACxB,4DAA0C;AAC1C,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC"}
package/lib/model.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2023 EclipseSource and others.
2
+ * Copyright (c) 2020-2024 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { DiamondNode, EditableLabel, GEdge, LayoutContainer, Nameable, RectangularNode, GChildElement, GModelElement, GShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
16
+ import { DiamondNode, EditableLabel, GChildElement, GEdge, GModelElement, GShapeElement, LayoutContainer, Nameable, RectangularNode, ResizableModelElement, ResizeHandleLocation, WithEditableLabel } from '@eclipse-glsp/client';
17
17
  export declare class TaskNode extends RectangularNode implements Nameable, WithEditableLabel {
18
18
  static readonly DEFAULT_FEATURES: symbol[];
19
19
  duration?: number;
@@ -26,7 +26,7 @@ export declare function isTaskNode(element: GModelElement): element is TaskNode;
26
26
  export declare class WeightedEdge extends GEdge {
27
27
  probability?: string;
28
28
  }
29
- export declare class ActivityNode extends DiamondNode {
29
+ export declare class ControlNode extends DiamondNode implements ResizableModelElement {
30
30
  nodeType: string;
31
31
  size: {
32
32
  width: number;
@@ -34,6 +34,11 @@ export declare class ActivityNode extends DiamondNode {
34
34
  };
35
35
  strokeWidth: number;
36
36
  }
37
+ export declare class BranchingNode extends ControlNode {
38
+ resizeLocations: ResizeHandleLocation[];
39
+ }
40
+ export declare class SynchronizationNode extends ControlNode {
41
+ }
37
42
  export declare namespace ActivityNode {
38
43
  namespace Type {
39
44
  const INITIAL = "initialNode";
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAIH,WAAW,EACX,aAAa,EAEb,KAAK,EAIL,eAAe,EAGf,QAAQ,EAGR,eAAe,EACf,aAAa,EAEb,aAAa,EACb,aAAa,EACb,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,QAAS,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IAChF,gBAAyB,gBAAgB,WAYvC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;CACJ;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,QAAQ,CAEtE;AAED,qBAAa,YAAa,SAAQ,KAAK;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,YAAa,SAAQ,WAAW;IACzC,QAAQ,EAAE,MAAM,CAA+B;IACtC,IAAI;;;MAGX;IACO,WAAW,SAAK;CAC5B;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,IAAI,CAAC;QACX,MAAM,OAAO,gBAAgB,CAAC;QAC9B,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,QAAQ,iBAAiB,CAAC;QAChC,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,SAAS,cAAc,CAAC;KACxC;CACJ;AAED,qBAAa,IAAK,SAAQ,aAAc,YAAW,eAAe;IAC9D,MAAM,CAAC,QAAQ,CAAC,gBAAgB,WAAgF;IAEhH,MAAM,EAAE,MAAM,CAAC;IACN,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC7D,IAAI;;;MAGX;CACL;AAED,qBAAa,YAAa,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IACpF,gBAAyB,gBAAgB,WAWvC;IAEF,IAAI,SAAM;IAEV,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;CACJ"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,WAAW,EACX,aAAa,EACb,aAAa,EACb,KAAK,EACL,aAAa,EACb,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EAcpB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,QAAS,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IAChF,gBAAyB,gBAAgB,WAYvC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;CACJ;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,QAAQ,CAEtE;AAED,qBAAa,YAAa,SAAQ,KAAK;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,WAAY,SAAQ,WAAY,YAAW,qBAAqB;IACzE,QAAQ,EAAE,MAAM,CAA+B;IACtC,IAAI;;;MAGX;IACO,WAAW,SAAK;CAC5B;AAED,qBAAa,aAAc,SAAQ,WAAW;IAC1C,eAAe,yBAA8B;CAChD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AAEvD,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,IAAI,CAAC;QACX,MAAM,OAAO,gBAAgB,CAAC;QAC9B,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,QAAQ,iBAAiB,CAAC;QAChC,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,SAAS,cAAc,CAAC;KACxC;CACJ;AAED,qBAAa,IAAK,SAAQ,aAAc,YAAW,eAAe;IAC9D,MAAM,CAAC,QAAQ,CAAC,gBAAgB,WAAgF;IAEhH,MAAM,EAAE,MAAM,CAAC;IACN,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC7D,IAAI;;;MAGX;CACL;AAED,qBAAa,YAAa,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IACpF,gBAAyB,gBAAgB,WAWvC;IAEF,IAAI,SAAM;IAEV,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;CACJ"}
package/lib/model.js CHANGED
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CategoryNode = exports.Icon = exports.ActivityNode = exports.WeightedEdge = exports.isTaskNode = exports.TaskNode = void 0;
3
+ exports.CategoryNode = exports.Icon = exports.ActivityNode = exports.SynchronizationNode = exports.BranchingNode = exports.ControlNode = exports.WeightedEdge = exports.isTaskNode = exports.TaskNode = void 0;
4
4
  /********************************************************************************
5
- * Copyright (c) 2020-2023 EclipseSource and others.
5
+ * Copyright (c) 2020-2024 EclipseSource and others.
6
6
  *
7
7
  * This program and the accompanying materials are made available under the
8
8
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,7 +52,7 @@ exports.isTaskNode = isTaskNode;
52
52
  class WeightedEdge extends client_1.GEdge {
53
53
  }
54
54
  exports.WeightedEdge = WeightedEdge;
55
- class ActivityNode extends client_1.DiamondNode {
55
+ class ControlNode extends client_1.DiamondNode {
56
56
  constructor() {
57
57
  super(...arguments);
58
58
  this.nodeType = ActivityNode.Type.UNDEFINED;
@@ -63,7 +63,18 @@ class ActivityNode extends client_1.DiamondNode {
63
63
  this.strokeWidth = 1;
64
64
  }
65
65
  }
66
- exports.ActivityNode = ActivityNode;
66
+ exports.ControlNode = ControlNode;
67
+ class BranchingNode extends ControlNode {
68
+ constructor() {
69
+ super(...arguments);
70
+ this.resizeLocations = client_1.ResizeHandleLocation.CROSS;
71
+ }
72
+ }
73
+ exports.BranchingNode = BranchingNode;
74
+ class SynchronizationNode extends ControlNode {
75
+ }
76
+ exports.SynchronizationNode = SynchronizationNode;
77
+ var ActivityNode;
67
78
  (function (ActivityNode) {
68
79
  let Type;
69
80
  (function (Type) {
package/lib/model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAwB8B;AAE9B,MAAa,QAAS,SAAQ,wBAAe;IAkBzC,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,IAAI;;QACJ,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,CAAC;QAC3C,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/C,CAAC;;AA7BL,4BA8BC;AA7B4B,yBAAgB,GAAG;IACxC,2BAAkB;IAClB,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,CAAC;AAmBN,SAAgB,UAAU,CAAC,OAAsB;IAC7C,OAAO,OAAO,YAAY,QAAQ,IAAI,KAAK,CAAC;AAChD,CAAC;AAFD,gCAEC;AAED,MAAa,YAAa,SAAQ,cAAK;CAEtC;AAFD,oCAEC;AAED,MAAa,YAAa,SAAQ,oBAAW;IAA7C;;QACI,aAAQ,GAAW,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;QACtC,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;QACO,gBAAW,GAAG,CAAC,CAAC;IAC7B,CAAC;CAAA;AAPD,oCAOC;AAED,WAAiB,YAAY;IACzB,IAAiB,IAAI,CAQpB;IARD,WAAiB,IAAI;QACJ,YAAO,GAAG,aAAa,CAAC;QACxB,UAAK,GAAG,WAAW,CAAC;QACpB,aAAQ,GAAG,cAAc,CAAC;QAC1B,UAAK,GAAG,WAAW,CAAC;QACpB,SAAI,GAAG,UAAU,CAAC;QAClB,SAAI,GAAG,UAAU,CAAC;QAClB,cAAS,GAAG,WAAW,CAAC;IACzC,CAAC,EARgB,IAAI,GAAJ,iBAAI,KAAJ,iBAAI,QAQpB;AACL,CAAC,EAVgB,YAAY,4BAAZ,YAAY,QAU5B;AAED,MAAa,IAAK,SAAQ,sBAAa;IAAvC;;QAKa,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;;AATD,oBASC;AARmB,qBAAgB,GAAG,CAAC,sBAAa,EAAE,+BAAsB,EAAE,+BAAsB,EAAE,oBAAW,CAAC,AAA/E,CAAgF;AAUpH,MAAa,YAAa,SAAQ,wBAAe;IAAjD;;QAcI,SAAI,GAAG,EAAE,CAAC;IASd,CAAC;IAPG,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;;AAtBL,oCAuBC;AAtB4B,6BAAgB,GAAG;IACxC,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,AAXwC,CAWvC"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
@@ -42,10 +42,10 @@ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, i
42
42
  (0, client_1.configureModelElement)(context, client_1.DefaultTypes.EDGE, client_1.GEdge, workflow_views_1.WorkflowEdgeView);
43
43
  (0, client_1.configureModelElement)(context, 'edge:weighted', model_1.WeightedEdge, workflow_views_1.WorkflowEdgeView);
44
44
  (0, client_1.configureModelElement)(context, 'icon', model_1.Icon, workflow_views_1.IconView);
45
- (0, client_1.configureModelElement)(context, 'activityNode:merge', model_1.ActivityNode, client_1.DiamondNodeView);
46
- (0, client_1.configureModelElement)(context, 'activityNode:decision', model_1.ActivityNode, client_1.DiamondNodeView);
47
- (0, client_1.configureModelElement)(context, 'activityNode:fork', model_1.ActivityNode, client_1.RectangularNodeView);
48
- (0, client_1.configureModelElement)(context, 'activityNode:join', model_1.ActivityNode, client_1.RectangularNodeView);
45
+ (0, client_1.configureModelElement)(context, 'activityNode:merge', model_1.BranchingNode, client_1.DiamondNodeView);
46
+ (0, client_1.configureModelElement)(context, 'activityNode:decision', model_1.BranchingNode, client_1.DiamondNodeView);
47
+ (0, client_1.configureModelElement)(context, 'activityNode:fork', model_1.SynchronizationNode, client_1.RectangularNodeView);
48
+ (0, client_1.configureModelElement)(context, 'activityNode:join', model_1.SynchronizationNode, client_1.RectangularNodeView);
49
49
  (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GGraph, client_1.GLSPProjectionView);
50
50
  (0, client_1.configureModelElement)(context, 'category', model_1.CategoryNode, client_1.RoundedCornerNodeView);
51
51
  (0, client_1.configureModelElement)(context, 'struct', client_1.GCompartment, client_1.StructureCompartmentView);
@@ -1 +1 @@
1
- {"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"workflow-startup.d.ts","sourceRoot":"","sources":["../src/workflow-startup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAS,MAAM,uBAAuB,CAAC;AAG5D,qBACa,eAAgB,YAAW,eAAe;IACnD,IAAI,SAAM;IAE8B,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAE5E,eAAe,IAAI,YAAY,CAAC,IAAI,CAAC;CAGxC"}
1
+ {"version":3,"file":"workflow-startup.d.ts","sourceRoot":"","sources":["../src/workflow-startup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,qBACa,eAAgB,YAAW,eAAe;IACnD,IAAI,SAAM;IAEuB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAErE,eAAe,IAAI,YAAY,CAAC,IAAI,CAAC;CAGxC"}
@@ -26,7 +26,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.WorkflowStartup = void 0;
28
28
  const client_1 = require("@eclipse-glsp/client");
29
- const sprotty_1 = require("@eclipse-glsp/sprotty");
30
29
  const inversify_1 = require("inversify");
31
30
  let WorkflowStartup = class WorkflowStartup {
32
31
  constructor() {
@@ -39,7 +38,7 @@ let WorkflowStartup = class WorkflowStartup {
39
38
  };
40
39
  exports.WorkflowStartup = WorkflowStartup;
41
40
  __decorate([
42
- (0, inversify_1.inject)(sprotty_1.TYPES.IGridManager),
41
+ (0, inversify_1.inject)(client_1.GridManager),
43
42
  (0, inversify_1.optional)(),
44
43
  __metadata("design:type", client_1.GridManager)
45
44
  ], WorkflowStartup.prototype, "gridManager", void 0);
@@ -1 +1 @@
1
- {"version":3,"file":"workflow-startup.js","sourceRoot":"","sources":["../src/workflow-startup.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,iDAAoE;AACpE,mDAA4D;AAC5D,yCAAyD;AAGlD,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QACH,SAAI,GAAG,CAAC,CAAC,CAAC;IAOd,CAAC;IAHG,eAAe;;QACX,MAAA,IAAI,CAAC,WAAW,0CAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;AARY,0CAAe;AAG0B;IAAjD,IAAA,kBAAM,EAAC,eAAK,CAAC,YAAY,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyB,oBAAW;oDAAC;0BAHnE,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CAQ3B"}
1
+ {"version":3,"file":"workflow-startup.js","sourceRoot":"","sources":["../src/workflow-startup.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,iDAAoE;AAEpE,yCAAyD;AAGlD,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QACH,SAAI,GAAG,CAAC,CAAC,CAAC;IAOd,CAAC;IAHG,eAAe;;QACX,MAAA,IAAI,CAAC,WAAW,0CAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;AARY,0CAAe;AAGmB;IAA1C,IAAA,kBAAM,EAAC,oBAAW,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyB,oBAAW;oDAAC;0BAH5D,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CAQ3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp-examples/workflow-glsp",
3
- "version": "2.2.0-next.336+c45d827",
3
+ "version": "2.2.0-next.338+379f507",
4
4
  "description": "GLSP diagrams for the Workflow DSL",
5
5
  "keywords": [
6
6
  "glsp",
@@ -35,12 +35,12 @@
35
35
  "scripts": {
36
36
  "build": "tsc -b",
37
37
  "clean": "rimraf *.tsbuildinfo lib",
38
- "generate:index": "glsp generateIndex src -f",
38
+ "generate:index": "glsp generateIndex src -f -s",
39
39
  "lint": "eslint --ext .ts,.tsx ./src",
40
40
  "watch": "tsc -w"
41
41
  },
42
42
  "dependencies": {
43
- "@eclipse-glsp/client": "2.2.0-next.336+c45d827",
43
+ "@eclipse-glsp/client": "2.2.0-next.338+379f507",
44
44
  "balloon-css": "^0.5.0"
45
45
  },
46
46
  "devDependencies": {
@@ -49,5 +49,5 @@
49
49
  "publishConfig": {
50
50
  "access": "public"
51
51
  },
52
- "gitHead": "c45d827fdd923e2009d1814bd939df80bce4fb66"
52
+ "gitHead": "379f50764c02e73d255e8692f52f9be09e7bab67"
53
53
  }
package/src/index.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2024 EclipseSource and others.
2
+ * Copyright (c) 2024 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,8 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- export * from './direct-task-editing';
16
+ export * from './direct-task-editing/di.config';
17
+ export * from './direct-task-editing/direct-task-editor';
17
18
  export * from './model';
18
19
  export * from './workflow-diagram-module';
19
20
  export * from './workflow-snapper';
package/src/model.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2023 EclipseSource and others.
2
+ * Copyright (c) 2020-2024 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,28 +14,30 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
  import {
17
+ DiamondNode,
18
+ EditableLabel,
19
+ GChildElement,
20
+ GEdge,
21
+ GModelElement,
22
+ GShapeElement,
23
+ LayoutContainer,
24
+ Nameable,
25
+ RectangularNode,
26
+ ResizableModelElement,
27
+ ResizeHandleLocation,
28
+ WithEditableLabel,
17
29
  boundsFeature,
18
30
  connectableFeature,
19
31
  deletableFeature,
20
- DiamondNode,
21
- EditableLabel,
22
32
  fadeFeature,
23
- GEdge,
24
33
  hoverFeedbackFeature,
25
34
  isEditableLabel,
26
- layoutableChildFeature,
27
- LayoutContainer,
28
35
  layoutContainerFeature,
36
+ layoutableChildFeature,
29
37
  moveFeature,
30
- Nameable,
31
38
  nameFeature,
32
39
  popupFeature,
33
- RectangularNode,
34
- GChildElement,
35
40
  selectFeature,
36
- GModelElement,
37
- GShapeElement,
38
- WithEditableLabel,
39
41
  withEditLabelFeature
40
42
  } from '@eclipse-glsp/client';
41
43
 
@@ -79,7 +81,7 @@ export class WeightedEdge extends GEdge {
79
81
  probability?: string;
80
82
  }
81
83
 
82
- export class ActivityNode extends DiamondNode {
84
+ export class ControlNode extends DiamondNode implements ResizableModelElement {
83
85
  nodeType: string = ActivityNode.Type.UNDEFINED;
84
86
  override size = {
85
87
  width: 32,
@@ -88,6 +90,12 @@ export class ActivityNode extends DiamondNode {
88
90
  override strokeWidth = 1;
89
91
  }
90
92
 
93
+ export class BranchingNode extends ControlNode {
94
+ resizeLocations = ResizeHandleLocation.CROSS;
95
+ }
96
+
97
+ export class SynchronizationNode extends ControlNode {}
98
+
91
99
  export namespace ActivityNode {
92
100
  export namespace Type {
93
101
  export const INITIAL = 'initialNode';
@@ -49,7 +49,7 @@ import { Container, ContainerModule } from 'inversify';
49
49
  import 'sprotty/css/edit-label.css';
50
50
  import '../css/diagram.css';
51
51
  import { directTaskEditor } from './direct-task-editing/di.config';
52
- import { ActivityNode, CategoryNode, Icon, TaskNode, WeightedEdge } from './model';
52
+ import { BranchingNode, CategoryNode, Icon, SynchronizationNode, TaskNode, WeightedEdge } from './model';
53
53
  import { WorkflowSnapper } from './workflow-snapper';
54
54
  import { WorkflowStartup } from './workflow-startup';
55
55
  import { IconView, WorkflowEdgeView } from './workflow-views';
@@ -72,10 +72,10 @@ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound,
72
72
  configureModelElement(context, DefaultTypes.EDGE, GEdge, WorkflowEdgeView);
73
73
  configureModelElement(context, 'edge:weighted', WeightedEdge, WorkflowEdgeView);
74
74
  configureModelElement(context, 'icon', Icon, IconView);
75
- configureModelElement(context, 'activityNode:merge', ActivityNode, DiamondNodeView);
76
- configureModelElement(context, 'activityNode:decision', ActivityNode, DiamondNodeView);
77
- configureModelElement(context, 'activityNode:fork', ActivityNode, RectangularNodeView);
78
- configureModelElement(context, 'activityNode:join', ActivityNode, RectangularNodeView);
75
+ configureModelElement(context, 'activityNode:merge', BranchingNode, DiamondNodeView);
76
+ configureModelElement(context, 'activityNode:decision', BranchingNode, DiamondNodeView);
77
+ configureModelElement(context, 'activityNode:fork', SynchronizationNode, RectangularNodeView);
78
+ configureModelElement(context, 'activityNode:join', SynchronizationNode, RectangularNodeView);
79
79
  configureModelElement(context, DefaultTypes.GRAPH, GGraph, GLSPProjectionView);
80
80
  configureModelElement(context, 'category', CategoryNode, RoundedCornerNodeView);
81
81
  configureModelElement(context, 'struct', GCompartment, StructureCompartmentView);
@@ -15,14 +15,14 @@
15
15
  ********************************************************************************/
16
16
 
17
17
  import { GridManager, IDiagramStartup } from '@eclipse-glsp/client';
18
- import { MaybePromise, TYPES } from '@eclipse-glsp/sprotty';
18
+ import { MaybePromise } from '@eclipse-glsp/sprotty';
19
19
  import { inject, injectable, optional } from 'inversify';
20
20
 
21
21
  @injectable()
22
22
  export class WorkflowStartup implements IDiagramStartup {
23
23
  rank = -1;
24
24
 
25
- @inject(TYPES.IGridManager) @optional() protected gridManager?: GridManager;
25
+ @inject(GridManager) @optional() protected gridManager?: GridManager;
26
26
 
27
27
  preRequestModel(): MaybePromise<void> {
28
28
  this.gridManager?.setGridVisible(true);
@@ -1,18 +0,0 @@
1
- /********************************************************************************
2
- * Copyright (c) 2024 EclipseSource and others.
3
- *
4
- * This program and the accompanying materials are made available under the
5
- * terms of the Eclipse Public License v. 2.0 which is available at
6
- * http://www.eclipse.org/legal/epl-2.0.
7
- *
8
- * This Source Code may also be made available under the following Secondary
9
- * Licenses when the conditions for such availability set forth in the Eclipse
10
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- * with the GNU Classpath Exception which is available at
12
- * https://www.gnu.org/software/classpath/license.html.
13
- *
14
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
- ********************************************************************************/
16
- export * from './di.config';
17
- export * from './direct-task-editor';
18
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}
@@ -1,34 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- /********************************************************************************
18
- * Copyright (c) 2024 EclipseSource and others.
19
- *
20
- * This program and the accompanying materials are made available under the
21
- * terms of the Eclipse Public License v. 2.0 which is available at
22
- * http://www.eclipse.org/legal/epl-2.0.
23
- *
24
- * This Source Code may also be made available under the following Secondary
25
- * Licenses when the conditions for such availability set forth in the Eclipse
26
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
27
- * with the GNU Classpath Exception which is available at
28
- * https://www.gnu.org/software/classpath/license.html.
29
- *
30
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
31
- ********************************************************************************/
32
- __exportStar(require("./di.config"), exports);
33
- __exportStar(require("./direct-task-editor"), exports);
34
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/direct-task-editing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,8CAA4B;AAC5B,uDAAqC"}
@@ -1,17 +0,0 @@
1
- /********************************************************************************
2
- * Copyright (c) 2024 EclipseSource and others.
3
- *
4
- * This program and the accompanying materials are made available under the
5
- * terms of the Eclipse Public License v. 2.0 which is available at
6
- * http://www.eclipse.org/legal/epl-2.0.
7
- *
8
- * This Source Code may also be made available under the following Secondary
9
- * Licenses when the conditions for such availability set forth in the Eclipse
10
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- * with the GNU Classpath Exception which is available at
12
- * https://www.gnu.org/software/classpath/license.html.
13
- *
14
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
- ********************************************************************************/
16
- export * from './di.config';
17
- export * from './direct-task-editor';