@eclipse-glsp-examples/workflow-glsp 1.1.0-next.976795c.271 → 1.1.0-next.97ea035.286

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.
@@ -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 { AbstractUIExtension, Action, AutoCompleteWidget, DOMHelper, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, SModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
16
+ import { AbstractUIExtension, Action, AutoCompleteWidget, DOMHelper, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, GModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
17
17
  import { TaskNode } from '../model';
18
18
  /**
19
19
  * Is send from the {@link TaskEditor} to the GLSP server
@@ -61,8 +61,8 @@ export declare class TaskEditor extends AbstractUIExtension {
61
61
  id(): string;
62
62
  containerClass(): string;
63
63
  protected initializeContents(containerElement: HTMLElement): void;
64
- show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void;
65
- protected onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void;
64
+ show(root: Readonly<GModelRoot>, ...contextElementIds: string[]): void;
65
+ protected onBeforeShow(containerElement: HTMLElement, root: Readonly<GModelRoot>, ...contextElementIds: string[]): void;
66
66
  protected setPosition(containerElement: HTMLElement): void;
67
67
  protected retrieveSuggestions(input: string): Promise<LabeledAction[]>;
68
68
  protected validateInput(input: string): Promise<ValidationStatus>;
package/lib/model.d.ts CHANGED
@@ -13,16 +13,16 @@
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, SChildElement, SModelElement, SShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
16
+ import { DiamondNode, EditableLabel, GEdge, LayoutContainer, Nameable, RectangularNode, GChildElement, GModelElement, GShapeElement, 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;
20
20
  taskType?: string;
21
21
  reference?: string;
22
- get editableLabel(): (SChildElement & EditableLabel) | undefined;
22
+ get editableLabel(): (GChildElement & EditableLabel) | undefined;
23
23
  get name(): string;
24
24
  }
25
- export declare function isTaskNode(element: SModelElement): element is TaskNode;
25
+ export declare function isTaskNode(element: GModelElement): element is TaskNode;
26
26
  export declare class WeightedEdge extends GEdge {
27
27
  probability?: string;
28
28
  }
@@ -45,7 +45,7 @@ export declare namespace ActivityNode {
45
45
  const UNDEFINED = "undefined";
46
46
  }
47
47
  }
48
- export declare class Icon extends SShapeElement implements LayoutContainer {
48
+ export declare class Icon extends GShapeElement implements LayoutContainer {
49
49
  static readonly DEFAULT_FEATURES: symbol[];
50
50
  layout: string;
51
51
  layoutOptions?: {
@@ -59,6 +59,6 @@ export declare class Icon extends SShapeElement implements LayoutContainer {
59
59
  export declare class CategoryNode extends RectangularNode implements Nameable, WithEditableLabel {
60
60
  static readonly DEFAULT_FEATURES: symbol[];
61
61
  name: string;
62
- get editableLabel(): (SChildElement & EditableLabel) | undefined;
62
+ get editableLabel(): (GChildElement & EditableLabel) | undefined;
63
63
  }
64
64
  //# sourceMappingURL=model.d.ts.map
package/lib/model.js CHANGED
@@ -76,7 +76,7 @@ exports.ActivityNode = ActivityNode;
76
76
  Type.UNDEFINED = 'undefined';
77
77
  })(Type = ActivityNode.Type || (ActivityNode.Type = {}));
78
78
  })(ActivityNode || (exports.ActivityNode = ActivityNode = {}));
79
- class Icon extends client_1.SShapeElement {
79
+ class Icon extends client_1.GShapeElement {
80
80
  constructor() {
81
81
  super(...arguments);
82
82
  this.size = {
@@ -1 +1 @@
1
- {"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,sBAAsB,EAyBzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAK5B,eAAO,MAAM,qBAAqB,iBA0BhC,CAAC;AAEH,wBAAgB,8BAA8B,CAAC,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE3G;AAED,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAErI"}
1
+ {"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,sBAAsB,EAwBzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAK5B,eAAO,MAAM,qBAAqB,iBA0BhC,CAAC;AAEH,wBAAgB,8BAA8B,CAAC,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE3G;AAED,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAErI"}
@@ -34,10 +34,10 @@ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, i
34
34
  (0, client_1.configureDefaultModelElements)(context);
35
35
  (0, client_1.configureModelElement)(context, 'task:automated', model_1.TaskNode, client_1.RoundedCornerNodeView);
36
36
  (0, client_1.configureModelElement)(context, 'task:manual', model_1.TaskNode, client_1.RoundedCornerNodeView);
37
- (0, client_1.configureModelElement)(context, 'label:heading', client_1.SLabel, client_1.SLabelView, { enable: [client_1.editLabelFeature] });
38
- (0, client_1.configureModelElement)(context, 'comp:comp', client_1.SCompartment, client_1.SCompartmentView);
39
- (0, client_1.configureModelElement)(context, 'comp:header', client_1.SCompartment, client_1.SCompartmentView);
40
- (0, client_1.configureModelElement)(context, 'label:icon', client_1.SLabel, client_1.SLabelView);
37
+ (0, client_1.configureModelElement)(context, 'label:heading', client_1.GLabel, client_1.GLabelView, { enable: [client_1.editLabelFeature] });
38
+ (0, client_1.configureModelElement)(context, 'comp:comp', client_1.GCompartment, client_1.GCompartmentView);
39
+ (0, client_1.configureModelElement)(context, 'comp:header', client_1.GCompartment, client_1.GCompartmentView);
40
+ (0, client_1.configureModelElement)(context, 'label:icon', client_1.GLabel, client_1.GLabelView);
41
41
  (0, client_1.configureModelElement)(context, client_1.DefaultTypes.EDGE, client_1.GEdge, workflow_views_1.WorkflowEdgeView);
42
42
  (0, client_1.configureModelElement)(context, 'edge:weighted', model_1.WeightedEdge, workflow_views_1.WorkflowEdgeView);
43
43
  (0, client_1.configureModelElement)(context, 'icon', model_1.Icon, workflow_views_1.IconView);
@@ -45,16 +45,16 @@ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, i
45
45
  (0, client_1.configureModelElement)(context, 'activityNode:decision', model_1.ActivityNode, client_1.DiamondNodeView);
46
46
  (0, client_1.configureModelElement)(context, 'activityNode:fork', model_1.ActivityNode, client_1.RectangularNodeView);
47
47
  (0, client_1.configureModelElement)(context, 'activityNode:join', model_1.ActivityNode, client_1.RectangularNodeView);
48
- (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GLSPGraph, client_1.GLSPProjectionView);
48
+ (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GGraph, client_1.GLSPProjectionView);
49
49
  (0, client_1.configureModelElement)(context, 'category', model_1.CategoryNode, client_1.RoundedCornerNodeView);
50
- (0, client_1.configureModelElement)(context, 'struct', client_1.SCompartment, client_1.StructureCompartmentView);
50
+ (0, client_1.configureModelElement)(context, 'struct', client_1.GCompartment, client_1.StructureCompartmentView);
51
51
  });
52
52
  function createWorkflowDiagramContainer(...containerConfiguration) {
53
53
  return initializeWorkflowDiagramContainer(new inversify_1.Container(), ...containerConfiguration);
54
54
  }
55
55
  exports.createWorkflowDiagramContainer = createWorkflowDiagramContainer;
56
56
  function initializeWorkflowDiagramContainer(container, ...containerConfiguration) {
57
- return (0, client_1.initializeDiagramContainer)(container, exports.workflowDiagramModule, di_config_1.directTaskEditor, client_1.accessibilityModule, ...containerConfiguration);
57
+ return (0, client_1.initializeDiagramContainer)(container, exports.workflowDiagramModule, di_config_1.directTaskEditor, ...containerConfiguration);
58
58
  }
59
59
  exports.initializeWorkflowDiagramContainer = initializeWorkflowDiagramContainer;
60
60
  //# sourceMappingURL=workflow-diagram-module.js.map
@@ -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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"}
@@ -13,11 +13,11 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Point, PolylineEdgeViewWithGapsOnIntersections, RenderingContext, SEdge, ShapeView } from '@eclipse-glsp/client';
16
+ import { Point, PolylineEdgeViewWithGapsOnIntersections, RenderingContext, GEdge, ShapeView } from '@eclipse-glsp/client';
17
17
  import { VNode } from 'snabbdom';
18
18
  import { Icon } from './model';
19
19
  export declare class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
20
- protected renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[];
20
+ protected renderAdditionals(edge: GEdge, segments: Point[], context: RenderingContext): VNode[];
21
21
  }
22
22
  export declare class IconView extends ShapeView {
23
23
  render(element: Icon, context: RenderingContext): VNode | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp-examples/workflow-glsp",
3
- "version": "1.1.0-next.976795c.271+976795c",
3
+ "version": "1.1.0-next.97ea035.286+97ea035",
4
4
  "description": "GLSP diagrams for the Workflow DSL",
5
5
  "keywords": [
6
6
  "glsp",
@@ -43,7 +43,7 @@
43
43
  "watch": "tsc -w"
44
44
  },
45
45
  "dependencies": {
46
- "@eclipse-glsp/client": "1.1.0-next.976795c.271+976795c",
46
+ "@eclipse-glsp/client": "1.1.0-next.97ea035.286+97ea035",
47
47
  "balloon-css": "^0.5.0"
48
48
  },
49
49
  "devDependencies": {
@@ -52,5 +52,5 @@
52
52
  "publishConfig": {
53
53
  "access": "public"
54
54
  },
55
- "gitHead": "976795cf74566bacc8c90980b0e81b71087c0c69"
55
+ "gitHead": "97ea035fae88063e09b95dbc0ca914013ce75cef"
56
56
  }
@@ -26,7 +26,7 @@ import {
26
26
  Operation,
27
27
  RequestContextActions,
28
28
  RequestEditValidationAction,
29
- SModelRoot,
29
+ GModelRoot,
30
30
  SetContextActions,
31
31
  SetEditValidationResultAction,
32
32
  TYPES,
@@ -137,12 +137,12 @@ export class TaskEditor extends AbstractUIExtension {
137
137
  this.autoSuggestion.initialize(containerElement);
138
138
  }
139
139
 
140
- override show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
140
+ override show(root: Readonly<GModelRoot>, ...contextElementIds: string[]): void {
141
141
  super.show(root, ...contextElementIds);
142
142
  this.autoSuggestion.open(root);
143
143
  }
144
144
 
145
- protected override onBeforeShow(containerElement: HTMLElement, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
145
+ protected override onBeforeShow(containerElement: HTMLElement, root: Readonly<GModelRoot>, ...contextElementIds: string[]): void {
146
146
  this.task = getTask(contextElementIds, root.index)[0];
147
147
  this.autoSuggestion.inputField.value = '';
148
148
  this.setPosition(containerElement);
package/src/model.ts CHANGED
@@ -31,10 +31,10 @@ import {
31
31
  nameFeature,
32
32
  popupFeature,
33
33
  RectangularNode,
34
- SChildElement,
34
+ GChildElement,
35
35
  selectFeature,
36
- SModelElement,
37
- SShapeElement,
36
+ GModelElement,
37
+ GShapeElement,
38
38
  WithEditableLabel,
39
39
  withEditLabelFeature
40
40
  } from '@eclipse-glsp/client';
@@ -57,7 +57,7 @@ export class TaskNode extends RectangularNode implements Nameable, WithEditableL
57
57
  taskType?: string;
58
58
  reference?: string;
59
59
 
60
- get editableLabel(): (SChildElement & EditableLabel) | undefined {
60
+ get editableLabel(): (GChildElement & EditableLabel) | undefined {
61
61
  const label = this.children.find(element => element.type === 'label:heading');
62
62
  if (label && isEditableLabel(label)) {
63
63
  return label;
@@ -71,7 +71,7 @@ export class TaskNode extends RectangularNode implements Nameable, WithEditableL
71
71
  }
72
72
  }
73
73
 
74
- export function isTaskNode(element: SModelElement): element is TaskNode {
74
+ export function isTaskNode(element: GModelElement): element is TaskNode {
75
75
  return element instanceof TaskNode || false;
76
76
  }
77
77
 
@@ -100,7 +100,7 @@ export namespace ActivityNode {
100
100
  }
101
101
  }
102
102
 
103
- export class Icon extends SShapeElement implements LayoutContainer {
103
+ export class Icon extends GShapeElement implements LayoutContainer {
104
104
  static readonly DEFAULT_FEATURES = [boundsFeature, layoutContainerFeature, layoutableChildFeature, fadeFeature];
105
105
 
106
106
  layout: string;
@@ -127,7 +127,7 @@ export class CategoryNode extends RectangularNode implements Nameable, WithEdita
127
127
 
128
128
  name = '';
129
129
 
130
- get editableLabel(): (SChildElement & EditableLabel) | undefined {
130
+ get editableLabel(): (GChildElement & EditableLabel) | undefined {
131
131
  const label = this.children.find(element => element.type === 'label:heading');
132
132
  if (label && isEditableLabel(label)) {
133
133
  return label;
@@ -20,20 +20,19 @@ import {
20
20
  DeleteElementContextMenuItemProvider,
21
21
  DiamondNodeView,
22
22
  GEdge,
23
- GLSPGraph,
23
+ GGraph,
24
24
  GLSPProjectionView,
25
25
  GridSnapper,
26
26
  LogLevel,
27
27
  RectangularNodeView,
28
28
  RevealNamedElementActionProvider,
29
29
  RoundedCornerNodeView,
30
- SCompartment,
31
- SCompartmentView,
32
- SLabel,
33
- SLabelView,
30
+ GCompartment,
31
+ GCompartmentView,
32
+ GLabel,
33
+ GLabelView,
34
34
  StructureCompartmentView,
35
35
  TYPES,
36
- accessibilityModule,
37
36
  bindAsService,
38
37
  bindOrRebind,
39
38
  configureDefaultModelElements,
@@ -61,10 +60,10 @@ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound,
61
60
  configureDefaultModelElements(context);
62
61
  configureModelElement(context, 'task:automated', TaskNode, RoundedCornerNodeView);
63
62
  configureModelElement(context, 'task:manual', TaskNode, RoundedCornerNodeView);
64
- configureModelElement(context, 'label:heading', SLabel, SLabelView, { enable: [editLabelFeature] });
65
- configureModelElement(context, 'comp:comp', SCompartment, SCompartmentView);
66
- configureModelElement(context, 'comp:header', SCompartment, SCompartmentView);
67
- configureModelElement(context, 'label:icon', SLabel, SLabelView);
63
+ configureModelElement(context, 'label:heading', GLabel, GLabelView, { enable: [editLabelFeature] });
64
+ configureModelElement(context, 'comp:comp', GCompartment, GCompartmentView);
65
+ configureModelElement(context, 'comp:header', GCompartment, GCompartmentView);
66
+ configureModelElement(context, 'label:icon', GLabel, GLabelView);
68
67
  configureModelElement(context, DefaultTypes.EDGE, GEdge, WorkflowEdgeView);
69
68
  configureModelElement(context, 'edge:weighted', WeightedEdge, WorkflowEdgeView);
70
69
  configureModelElement(context, 'icon', Icon, IconView);
@@ -72,9 +71,9 @@ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound,
72
71
  configureModelElement(context, 'activityNode:decision', ActivityNode, DiamondNodeView);
73
72
  configureModelElement(context, 'activityNode:fork', ActivityNode, RectangularNodeView);
74
73
  configureModelElement(context, 'activityNode:join', ActivityNode, RectangularNodeView);
75
- configureModelElement(context, DefaultTypes.GRAPH, GLSPGraph, GLSPProjectionView);
74
+ configureModelElement(context, DefaultTypes.GRAPH, GGraph, GLSPProjectionView);
76
75
  configureModelElement(context, 'category', CategoryNode, RoundedCornerNodeView);
77
- configureModelElement(context, 'struct', SCompartment, StructureCompartmentView);
76
+ configureModelElement(context, 'struct', GCompartment, StructureCompartmentView);
78
77
  });
79
78
 
80
79
  export function createWorkflowDiagramContainer(...containerConfiguration: ContainerConfiguration): Container {
@@ -82,5 +81,5 @@ export function createWorkflowDiagramContainer(...containerConfiguration: Contai
82
81
  }
83
82
 
84
83
  export function initializeWorkflowDiagramContainer(container: Container, ...containerConfiguration: ContainerConfiguration): Container {
85
- return initializeDiagramContainer(container, workflowDiagramModule, directTaskEditor, accessibilityModule, ...containerConfiguration);
84
+ return initializeDiagramContainer(container, workflowDiagramModule, directTaskEditor, ...containerConfiguration);
86
85
  }
@@ -20,7 +20,7 @@ import {
20
20
  Point,
21
21
  PolylineEdgeViewWithGapsOnIntersections,
22
22
  RenderingContext,
23
- SEdge,
23
+ GEdge,
24
24
  setAttr,
25
25
  ShapeView,
26
26
  svg,
@@ -35,7 +35,7 @@ const JSX = { createElement: svg };
35
35
 
36
36
  @injectable()
37
37
  export class WorkflowEdgeView extends PolylineEdgeViewWithGapsOnIntersections {
38
- protected override renderAdditionals(edge: SEdge, segments: Point[], context: RenderingContext): VNode[] {
38
+ protected override renderAdditionals(edge: GEdge, segments: Point[], context: RenderingContext): VNode[] {
39
39
  const additionals = super.renderAdditionals(edge, segments, context);
40
40
  const p1 = segments[segments.length - 2];
41
41
  const p2 = segments[segments.length - 1];