@finos/legend-extension-dsl-diagram 1.0.28 → 1.0.29
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/DiagramRenderer.d.ts +1 -1
- package/lib/DiagramRenderer.d.ts.map +1 -1
- package/lib/DiagramRenderer.js +52 -51
- package/lib/DiagramRenderer.js.map +1 -1
- package/lib/components/studio/DiagramEditor.d.ts.map +1 -1
- package/lib/components/studio/DiagramEditor.js +4 -3
- package/lib/components/studio/DiagramEditor.js.map +1 -1
- package/lib/helpers/DiagramHelper.d.ts.map +1 -1
- package/lib/helpers/DiagramHelper.js +4 -3
- package/lib/helpers/DiagramHelper.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.d.ts +0 -3
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js +1 -13
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.d.ts +0 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.js +1 -6
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.d.ts +0 -11
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js +2 -46
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.d.ts +35 -0
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.d.ts.map +1 -0
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.js +118 -0
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.js.map +1 -0
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.d.ts +0 -2
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.js +1 -9
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.d.ts +0 -17
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js +6 -109
- package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.d.ts +0 -8
- package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.d.ts.map +1 -1
- package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js +1 -16
- package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js.map +1 -1
- package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.d.ts.map +1 -1
- package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js +3 -2
- package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js.map +1 -1
- package/lib/package.json +4 -4
- package/lib/stores/studio/DSLDiagram_ModifierHelper.d.ts +54 -0
- package/lib/stores/studio/DSLDiagram_ModifierHelper.d.ts.map +1 -0
- package/lib/stores/studio/DSLDiagram_ModifierHelper.js +87 -0
- package/lib/stores/studio/DSLDiagram_ModifierHelper.js.map +1 -0
- package/package.json +10 -10
- package/src/DiagramRenderer.ts +122 -54
- package/src/components/studio/DiagramEditor.tsx +8 -3
- package/src/helpers/DiagramHelper.ts +4 -3
- package/src/index.ts +2 -4
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts +1 -14
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts +1 -7
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.ts +2 -52
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.ts +165 -0
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.ts +1 -10
- package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts +6 -147
- package/src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts +1 -17
- package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts +3 -2
- package/src/stores/studio/DSLDiagram_ModifierHelper.ts +148 -0
- package/tsconfig.json +2 -0
package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js
CHANGED
|
@@ -13,34 +13,13 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { observable,
|
|
17
|
-
import { hashArray
|
|
16
|
+
import { observable, computed, makeObservable } from 'mobx';
|
|
17
|
+
import { hashArray } from '@finos/legend-shared';
|
|
18
18
|
import { RelationShipEdgeView as RelationshipEdgeView } from './DSLDiagram_RelationshipEdgeView';
|
|
19
19
|
import { Point } from './geometry/DSLDiagram_Point';
|
|
20
|
-
import { Vector } from './geometry/DSLDiagram_Vector';
|
|
21
20
|
import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference';
|
|
22
21
|
import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
|
|
23
|
-
|
|
24
|
-
* For a path, only counts the points which lie outside of the 2 class views
|
|
25
|
-
*/
|
|
26
|
-
export const manageInsidePointsDynamically = (path, from, to) => {
|
|
27
|
-
if (!path.length) {
|
|
28
|
-
return [];
|
|
29
|
-
}
|
|
30
|
-
let start = 0;
|
|
31
|
-
let startPoint = path[start];
|
|
32
|
-
while (start < path.length - 1 && from.contains(startPoint.x, startPoint.y)) {
|
|
33
|
-
start++;
|
|
34
|
-
startPoint = path[start];
|
|
35
|
-
}
|
|
36
|
-
let end = path.length - 1;
|
|
37
|
-
let endPoint = path[end];
|
|
38
|
-
while (end > 0 && to.contains(endPoint.x, endPoint.y)) {
|
|
39
|
-
end--;
|
|
40
|
-
endPoint = path[end];
|
|
41
|
-
}
|
|
42
|
-
return path.slice(start - 1, end + 2);
|
|
43
|
-
};
|
|
22
|
+
import { _relationView_manageInsidePointsDynamically } from './DSLDiagram_GraphModifierHelper';
|
|
44
23
|
export class RelationshipView {
|
|
45
24
|
owner;
|
|
46
25
|
from;
|
|
@@ -51,20 +30,12 @@ export class RelationshipView {
|
|
|
51
30
|
constructor(owner, from, to) {
|
|
52
31
|
makeObservable(this, {
|
|
53
32
|
path: observable,
|
|
54
|
-
setPath: action,
|
|
55
|
-
changePoint: action,
|
|
56
33
|
fullPath: computed,
|
|
57
34
|
});
|
|
58
35
|
this.owner = owner;
|
|
59
36
|
this.from = new RelationshipEdgeView(ClassViewExplicitReference.create(from));
|
|
60
37
|
this.to = new RelationshipEdgeView(ClassViewExplicitReference.create(to));
|
|
61
38
|
}
|
|
62
|
-
setPath(val) {
|
|
63
|
-
this.path = val;
|
|
64
|
-
}
|
|
65
|
-
changePoint(val, newVal) {
|
|
66
|
-
changeEntry(this.path, val, newVal);
|
|
67
|
-
}
|
|
68
39
|
/**
|
|
69
40
|
* Compute the full path for an edge, but notice here that the end points are recomputed every time, as such
|
|
70
41
|
* `path` only stores point that matters to the edge but are not end points
|
|
@@ -80,81 +51,7 @@ export class RelationshipView {
|
|
|
80
51
|
* This method will compute the full path from the offset within class view for persistence purpose
|
|
81
52
|
*/
|
|
82
53
|
get fullPath() {
|
|
83
|
-
return
|
|
84
|
-
}
|
|
85
|
-
/**
|
|
86
|
-
* Flatten the path if the angle is wide enough
|
|
87
|
-
* Also `swallow` points in path which lie inside of the rectangle of a view
|
|
88
|
-
*/
|
|
89
|
-
possiblyFlattenPath() {
|
|
90
|
-
const fullPath = this.buildFullPath();
|
|
91
|
-
// NOTE: this method here will `swallow` up points inside of the boxes
|
|
92
|
-
const newPath = manageInsidePointsDynamically(fullPath, this.from.classView.value, this.to.classView.value);
|
|
93
|
-
// recompute the offset point from center inside of `from` and `to` classviews.
|
|
94
|
-
// for each, we first check if `manageInsidePointsDynamically` removes any points from the full path
|
|
95
|
-
// if it does we will update the offset
|
|
96
|
-
if (newPath[0] !== fullPath[0]) {
|
|
97
|
-
const center = this.from.classView.value.center();
|
|
98
|
-
this.from.setOffsetX(newPath[0].x - center.x);
|
|
99
|
-
this.from.setOffsetY(newPath[0].y - center.y);
|
|
100
|
-
}
|
|
101
|
-
if (newPath[newPath.length - 1] !== fullPath[fullPath.length - 1]) {
|
|
102
|
-
const center = this.to.classView.value.center();
|
|
103
|
-
this.to.setOffsetX(newPath[newPath.length - 1].x - center.x);
|
|
104
|
-
this.to.setOffsetY(newPath[newPath.length - 1].y - center.y);
|
|
105
|
-
}
|
|
106
|
-
// find the point which can be flattened due to its wide angle
|
|
107
|
-
const result = [];
|
|
108
|
-
for (let i = 0; i < newPath.length - 2; i++) {
|
|
109
|
-
const v1 = Vector.fromPoints(newPath[i + 1], newPath[i]).norm();
|
|
110
|
-
const v2 = Vector.fromPoints(newPath[i + 1], newPath[i + 2]).norm();
|
|
111
|
-
const dot = v1.dotProduct(v2);
|
|
112
|
-
const angle = (Math.acos(dot) * 180) / Math.PI;
|
|
113
|
-
if (Math.abs(angle - 180) > 5) {
|
|
114
|
-
result.push(newPath[i + 1]);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
// here's where we will modify the path, i.e. swallow inside points if we have to
|
|
118
|
-
this.setPath(result);
|
|
119
|
-
}
|
|
120
|
-
/**
|
|
121
|
-
* Based on the location, find the point on the path that matches or create new point
|
|
122
|
-
* (within a threshold of proximity) from the coordinate and put this in the path array
|
|
123
|
-
* so it doesn't look too weird
|
|
124
|
-
*/
|
|
125
|
-
findOrBuildPoint(x, y, zoom, allowChange = true) {
|
|
126
|
-
for (const pt of this.path) {
|
|
127
|
-
if (Math.sqrt((x - pt.x) * (x - pt.x) + (y - pt.y) * (y - pt.y)) <
|
|
128
|
-
10 / zoom) {
|
|
129
|
-
return pt;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
const fullPath = this.buildFullPath(allowChange);
|
|
133
|
-
const newPath = [];
|
|
134
|
-
let point;
|
|
135
|
-
for (let i = 0; i < fullPath.length - 1; i++) {
|
|
136
|
-
const a = fullPath[i];
|
|
137
|
-
const b = fullPath[i + 1];
|
|
138
|
-
const n = new Vector(a.x, a.y).normal(new Vector(b.x, b.y)).norm();
|
|
139
|
-
const v = Vector.fromPoints(a, new Point(x, y));
|
|
140
|
-
if (Math.abs(n.dotProduct(v)) < 5 / zoom) {
|
|
141
|
-
const lx = (a.x < b.x ? a.x : b.x) - 5 / zoom;
|
|
142
|
-
const hx = (a.x < b.x ? b.x : a.x) + 5 / zoom;
|
|
143
|
-
const ly = (a.y < b.y ? a.y : b.y) - 5 / zoom;
|
|
144
|
-
const hy = (a.y < b.y ? b.y : a.y) + 5 / zoom;
|
|
145
|
-
if (lx <= x && x <= hx && ly <= y && y <= hy) {
|
|
146
|
-
point = new Point(x, y);
|
|
147
|
-
newPath.push(point);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
if (i < fullPath.length - 2) {
|
|
151
|
-
newPath.push(fullPath[i + 1]);
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
if (point && allowChange) {
|
|
155
|
-
this.setPath(newPath);
|
|
156
|
-
}
|
|
157
|
-
return point;
|
|
54
|
+
return _relationView_manageInsidePointsDynamically(this.buildFullPath(), this.from.classView.value, this.to.classView.value);
|
|
158
55
|
}
|
|
159
56
|
/**
|
|
160
57
|
* Calculate the end points of the edge using offset, otherwise, use the center
|
|
@@ -168,8 +65,8 @@ export class RelationshipView {
|
|
|
168
65
|
return new Point(newX, newY);
|
|
169
66
|
}
|
|
170
67
|
if (allowChange) {
|
|
171
|
-
edgeView.
|
|
172
|
-
edgeView.
|
|
68
|
+
edgeView.offsetX = 0;
|
|
69
|
+
edgeView.offsetY = 0;
|
|
173
70
|
}
|
|
174
71
|
return new Point(center.x, center.y);
|
|
175
72
|
}
|
package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DSLDiagram_RelationshipView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"DSLDiagram_RelationshipView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,14 +21,6 @@ export declare class PositionedRectangle implements Hashable {
|
|
|
21
21
|
rectangle: Rectangle;
|
|
22
22
|
dummyObservable: {};
|
|
23
23
|
constructor(position: Point, rectangle: Rectangle);
|
|
24
|
-
setRectangle(value: Rectangle): void;
|
|
25
|
-
setPosition(value: Point): void;
|
|
26
|
-
/**
|
|
27
|
-
* NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
|
|
28
|
-
* so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
|
|
29
|
-
* the class view box or move it.
|
|
30
|
-
*/
|
|
31
|
-
forceRefreshHash(): void;
|
|
32
24
|
edgePoint: () => Point;
|
|
33
25
|
center: () => Point;
|
|
34
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DSLDiagram_PositionedRectangle.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,QAAQ,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,KAAM;gBAET,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"DSLDiagram_PositionedRectangle.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,QAAQ,EAAE,KAAK,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,KAAM;gBAET,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;IASjD,SAAS,QAAO,KAAK,CAIjB;IACJ,MAAM,QAAO,KAAK,CAId;IAEJ;;OAEG;IACH,yBAAyB,IAAI,mBAAmB;IAUhD,WAAW,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO;IAmBnD,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO;IAUvC,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,mBAAmB;IAiB3D,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { observable,
|
|
16
|
+
import { observable, makeObservable } from 'mobx';
|
|
17
17
|
import { hashArray } from '@finos/legend-shared';
|
|
18
18
|
import { Point } from './DSLDiagram_Point';
|
|
19
19
|
import { Rectangle } from './DSLDiagram_Rectangle';
|
|
@@ -25,25 +25,10 @@ export class PositionedRectangle {
|
|
|
25
25
|
constructor(position, rectangle) {
|
|
26
26
|
makeObservable(this, {
|
|
27
27
|
dummyObservable: observable,
|
|
28
|
-
forceRefreshHash: action,
|
|
29
28
|
});
|
|
30
29
|
this.position = position;
|
|
31
30
|
this.rectangle = rectangle;
|
|
32
31
|
}
|
|
33
|
-
setRectangle(value) {
|
|
34
|
-
this.rectangle = value;
|
|
35
|
-
}
|
|
36
|
-
setPosition(value) {
|
|
37
|
-
this.position = value;
|
|
38
|
-
}
|
|
39
|
-
/**
|
|
40
|
-
* NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
|
|
41
|
-
* so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
|
|
42
|
-
* the class view box or move it.
|
|
43
|
-
*/
|
|
44
|
-
forceRefreshHash() {
|
|
45
|
-
this.dummyObservable = {};
|
|
46
|
-
}
|
|
47
32
|
edgePoint = () => new Point(this.position.x + this.rectangle.width, this.position.y + this.rectangle.height);
|
|
48
33
|
center = () => new Point(this.position.x + this.rectangle.width / 2, this.position.y + this.rectangle.height / 2);
|
|
49
34
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DSLDiagram_PositionedRectangle.js","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"DSLDiagram_PositionedRectangle.js","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V1_DSLDiagram_GraphBuilderHelper.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,mCAAmC,EACnC,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+EAA+E,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAE,MAAM,iFAAiF,CAAC;AAG5G,OAAO,EAAE,YAAY,EAAE,MAAM,oFAAoF,CAAC;AAClH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0FAA0F,CAAC;AAC9H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAGpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oEAAoE,CAAC;AAC1G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0EAA0E,CAAC;
|
|
1
|
+
{"version":3,"file":"V1_DSLDiagram_GraphBuilderHelper.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,mCAAmC,EACnC,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+EAA+E,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAE,MAAM,iFAAiF,CAAC;AAG5G,OAAO,EAAE,YAAY,EAAE,MAAM,oFAAoF,CAAC;AAClH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0FAA0F,CAAC;AAC9H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAGpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oEAAoE,CAAC;AAC1G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0EAA0E,CAAC;AAsBtH,eAAO,MAAM,iBAAiB,cACjB,YAAY,WACd,sBAAsB,WACtB,OAAO,KACf,SA4BF,CAAC;AAEF,eAAO,MAAM,oBAAoB,iBACjB,eAAe,WACpB,sBAAsB,WACtB,OAAO,KACf,YAwBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,uBACjB,qBAAqB,WAChC,OAAO,KACf,kBAqBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,SACtB,MAAM,WACH,sBAAsB,KAC9B,oCAAoC,OAAO,CAG3C,CAAC"}
|
package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js
CHANGED
|
@@ -21,6 +21,7 @@ import { Rectangle } from '../../../../../metamodels/pure/packageableElements/di
|
|
|
21
21
|
import { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
|
|
22
22
|
import { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
|
|
23
23
|
import { getClassView } from '../../../../../../helpers/DiagramHelper';
|
|
24
|
+
import { _relationView_possiblyFlattenPath } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
|
|
24
25
|
const buildPoint = (point) => {
|
|
25
26
|
const x = guaranteeNonNullable(point.x, `Point 'x' coordinate is missing`);
|
|
26
27
|
const y = guaranteeNonNullable(point.y, `Point 'y' coordinate is missing`);
|
|
@@ -52,7 +53,7 @@ export const V1_buildPropertyView = (propertyView, context, diagram) => {
|
|
|
52
53
|
const property = context.resolveOwnedProperty(propertyView.property);
|
|
53
54
|
const view = new PropertyView(diagram, property, sourceClassView, targetClassView);
|
|
54
55
|
view.path = propertyView.line.points.map((point) => buildPoint(point));
|
|
55
|
-
view
|
|
56
|
+
_relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
|
|
56
57
|
return view;
|
|
57
58
|
};
|
|
58
59
|
export const V1_buildGeneralizationView = (generalizationView, diagram) => {
|
|
@@ -61,7 +62,7 @@ export const V1_buildGeneralizationView = (generalizationView, diagram) => {
|
|
|
61
62
|
const targetClassView = guaranteeNonNullable(getClassView(diagram, guaranteeNonNullable(generalizationView.targetView)), `Generalization view 'targetView' field is missing`);
|
|
62
63
|
const view = new GeneralizationView(diagram, sourceClassView, targetClassView);
|
|
63
64
|
view.path = generalizationView.line.points.map((point) => buildPoint(point));
|
|
64
|
-
view
|
|
65
|
+
_relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
|
|
65
66
|
return view;
|
|
66
67
|
};
|
|
67
68
|
export const V1_resolveDiagram = (path, context) => context.createImplicitPackageableElementReference(path, (_path) => getDiagram(_path, context.graph));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V1_DSLDiagram_GraphBuilderHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,8DAA8D,CAAC;AAK1F,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,iFAAiF,CAAC;AAC5G,OAAO,EAAE,KAAK,EAAE,MAAM,sFAAsF,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAE,MAAM,0FAA0F,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,oFAAoF,CAAC;AAClH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0FAA0F,CAAC;AAM9H,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"V1_DSLDiagram_GraphBuilderHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts"],"names":[],"mappings":"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"}
|
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-diagram",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.29",
|
|
4
4
|
"description": "Legend extension for Diagram DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"clean:cache": "rimraf \"build\"",
|
|
32
32
|
"clean:lib": "rimraf \"lib\"",
|
|
33
33
|
"dev": "npm-run-all --parallel dev:sass dev:ts",
|
|
34
|
-
"dev:sass": "sass style
|
|
34
|
+
"dev:sass": "sass style:lib --watch --load-path=../../node_modules/@finos/legend-art/scss",
|
|
35
35
|
"dev:ts": "tsc --watch --preserveWatchOutput",
|
|
36
36
|
"lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location ./build/.eslintcache --report-unused-disable-directives --parser-options=project:\"./tsconfig.json\" \"./src/**/*.{js,ts,tsx}\"",
|
|
37
37
|
"publish:prepare": "node ../../scripts/release/preparePublishContent.js",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"mobx": "6.5.0",
|
|
51
51
|
"mobx-react-lite": "3.3.0",
|
|
52
52
|
"react": "17.0.2",
|
|
53
|
-
"react-dnd": "15.1.
|
|
53
|
+
"react-dnd": "15.1.2",
|
|
54
54
|
"react-dom": "17.0.2",
|
|
55
55
|
"react-resize-detector": "7.0.0",
|
|
56
56
|
"serializr": "2.0.5"
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"jest-canvas-mock": "2.3.1",
|
|
65
65
|
"npm-run-all": "4.1.5",
|
|
66
66
|
"rimraf": "3.0.2",
|
|
67
|
-
"sass": "1.49.
|
|
67
|
+
"sass": "1.49.11",
|
|
68
68
|
"typescript": "4.6.3"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020-present, Goldman Sachs
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import type { AssociationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
|
|
17
|
+
import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
|
|
18
|
+
import type { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
|
|
19
|
+
import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
|
|
20
|
+
import type { PropertyView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
|
|
21
|
+
import type { RelationShipEdgeView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
|
|
22
|
+
import type { RelationshipView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
|
|
23
|
+
import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
|
|
24
|
+
import type { PositionedRectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle';
|
|
25
|
+
import type { Rectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
|
|
26
|
+
export declare const diagram_setClassViews: (diagram: Diagram, val: ClassView[]) => void;
|
|
27
|
+
export declare const diagram_addClassView: (diagram: Diagram, val: ClassView) => void;
|
|
28
|
+
export declare const diagram_deleteClassView: (diagram: Diagram, val: ClassView) => void;
|
|
29
|
+
export declare const diagram_setAssociationViews: (diagram: Diagram, val: AssociationView[]) => void;
|
|
30
|
+
export declare const diagram_deleteAssociationView: (diagram: Diagram, val: AssociationView) => void;
|
|
31
|
+
export declare const diagram_setGeneralizationViews: (diagram: Diagram, val: GeneralizationView[]) => void;
|
|
32
|
+
export declare const diagram_addGeneralizationView: (diagram: Diagram, val: GeneralizationView) => void;
|
|
33
|
+
export declare const diagram_deleteGeneralizationView: (diagram: Diagram, val: GeneralizationView) => void;
|
|
34
|
+
export declare const diagram_setPropertyViews: (diagram: Diagram, val: PropertyView[]) => void;
|
|
35
|
+
export declare const diagram_addPropertyView: (diagram: Diagram, val: PropertyView) => void;
|
|
36
|
+
export declare const diagram_deletePropertyView: (diagram: Diagram, val: PropertyView) => void;
|
|
37
|
+
export declare const classView_setHideProperties: (cv: ClassView, val: boolean) => void;
|
|
38
|
+
export declare const classView_setHideStereotypes: (cv: ClassView, val: boolean) => void;
|
|
39
|
+
export declare const classView_setHideTaggedValues: (cv: ClassView, val: boolean) => void;
|
|
40
|
+
export declare const relationShipEdgeView_setOffsetX: (r: RelationShipEdgeView, val: number) => void;
|
|
41
|
+
export declare const relationShipEdgeView_setOffsetY: (r: RelationShipEdgeView, val: number) => void;
|
|
42
|
+
export declare const relationshipView_changePoint: (v: RelationshipView, val: Point, newVal: Point) => void;
|
|
43
|
+
export declare const relationView_possiblyFlattenPath: (relationView: RelationshipView) => void;
|
|
44
|
+
export declare const findOrBuildPoint: (relationView: RelationshipView, x: number, y: number, zoom: number, allowChange?: boolean) => Point | undefined;
|
|
45
|
+
export declare const relationView_setPath: (relationView: RelationshipView, val: Point[]) => void;
|
|
46
|
+
export declare const positionedRectangle_setRectangle: (pR: PositionedRectangle, value: Rectangle) => void;
|
|
47
|
+
export declare const positionedRectangle_setPosition: (pR: PositionedRectangle, value: Point) => void;
|
|
48
|
+
/**
|
|
49
|
+
* NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
|
|
50
|
+
* so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
|
|
51
|
+
* the class view box or move it.
|
|
52
|
+
*/
|
|
53
|
+
export declare const positionedRectangle_forceRefreshHash: (pR: PositionedRectangle) => void;
|
|
54
|
+
//# sourceMappingURL=DSLDiagram_ModifierHelper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DSLDiagram_ModifierHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DSLDiagram_ModifierHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AAC3H,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+EAA+E,CAAC;AAC/G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAC3G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAC;AAMjI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kFAAkF,CAAC;AACrH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0FAA0F,CAAC;AACrI,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sFAAsF,CAAC;AAC7H,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oFAAoF,CAAC;AAChH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kGAAkG,CAAC;AAC5I,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wFAAwF,CAAC;AAExH,eAAO,MAAM,qBAAqB,YACtB,OAAO,OAAO,SAAS,EAAE,KAAG,IAGvC,CAAC;AACF,eAAO,MAAM,oBAAoB,YACrB,OAAO,OAAO,SAAS,KAAG,IAGrC,CAAC;AACF,eAAO,MAAM,uBAAuB,YACxB,OAAO,OAAO,SAAS,KAAG,IAGrC,CAAC;AACF,eAAO,MAAM,2BAA2B,YAC5B,OAAO,OAAO,eAAe,EAAE,KAAG,IAG7C,CAAC;AACF,eAAO,MAAM,6BAA6B,YAC9B,OAAO,OAAO,eAAe,KAAG,IAG3C,CAAC;AACF,eAAO,MAAM,8BAA8B,YAC/B,OAAO,OAAO,kBAAkB,EAAE,KAAG,IAGhD,CAAC;AACF,eAAO,MAAM,6BAA6B,YAC9B,OAAO,OAAO,kBAAkB,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,gCAAgC,YACjC,OAAO,OAAO,kBAAkB,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,wBAAwB,YACzB,OAAO,OAAO,YAAY,EAAE,KAAG,IAG1C,CAAC;AACF,eAAO,MAAM,uBAAuB,YACxB,OAAO,OAAO,YAAY,KAAG,IAGxC,CAAC;AACF,eAAO,MAAM,0BAA0B,YAC3B,OAAO,OAAO,YAAY,KAAG,IAGxC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OACjC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,4BAA4B,OAClC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,6BAA6B,OACnC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,+BAA+B,MACtC,oBAAoB,OAAO,MAAM,KAAG,IAGzC,CAAC;AACF,eAAO,MAAM,+BAA+B,MACtC,oBAAoB,OAAO,MAAM,KAAG,IAGzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,MACnC,gBAAgB,OAAO,KAAK,UAAU,KAAK,KAAG,IAGnD,CAAC;AACF,eAAO,MAAM,gCAAgC,0CAE5C,CAAC;AAEF,eAAO,MAAM,gBAAgB,kHAA4B,CAAC;AAC1D,eAAO,MAAM,oBAAoB,wDAAgC,CAAC;AAElE,eAAO,MAAM,gCAAgC,OACtC,mBAAmB,SAAS,SAAS,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,+BAA+B,OACrC,mBAAmB,SAAS,KAAK,KAAG,IAG1C,CAAC;AACF;;;;GAIG;AACH,eAAO,MAAM,oCAAoC,OAC1C,mBAAmB,KAAG,IAG5B,CAAC"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020-present, Goldman Sachs
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import { addUniqueEntry, changeEntry, deleteEntry } from '@finos/legend-shared';
|
|
17
|
+
import { action } from 'mobx';
|
|
18
|
+
import { _findOrBuildPoint, _relationView_possiblyFlattenPath, _relationView_setPath, } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
|
|
19
|
+
export const diagram_setClassViews = action((diagram, val) => {
|
|
20
|
+
diagram.classViews = val;
|
|
21
|
+
});
|
|
22
|
+
export const diagram_addClassView = action((diagram, val) => {
|
|
23
|
+
addUniqueEntry(diagram.classViews, val);
|
|
24
|
+
});
|
|
25
|
+
export const diagram_deleteClassView = action((diagram, val) => {
|
|
26
|
+
deleteEntry(diagram.classViews, val);
|
|
27
|
+
});
|
|
28
|
+
export const diagram_setAssociationViews = action((diagram, val) => {
|
|
29
|
+
diagram.associationViews = val;
|
|
30
|
+
});
|
|
31
|
+
export const diagram_deleteAssociationView = action((diagram, val) => {
|
|
32
|
+
deleteEntry(diagram.associationViews, val);
|
|
33
|
+
});
|
|
34
|
+
export const diagram_setGeneralizationViews = action((diagram, val) => {
|
|
35
|
+
diagram.generalizationViews = val;
|
|
36
|
+
});
|
|
37
|
+
export const diagram_addGeneralizationView = action((diagram, val) => {
|
|
38
|
+
addUniqueEntry(diagram.generalizationViews, val);
|
|
39
|
+
});
|
|
40
|
+
export const diagram_deleteGeneralizationView = action((diagram, val) => {
|
|
41
|
+
deleteEntry(diagram.generalizationViews, val);
|
|
42
|
+
});
|
|
43
|
+
export const diagram_setPropertyViews = action((diagram, val) => {
|
|
44
|
+
diagram.propertyViews = val;
|
|
45
|
+
});
|
|
46
|
+
export const diagram_addPropertyView = action((diagram, val) => {
|
|
47
|
+
addUniqueEntry(diagram.propertyViews, val);
|
|
48
|
+
});
|
|
49
|
+
export const diagram_deletePropertyView = action((diagram, val) => {
|
|
50
|
+
deleteEntry(diagram.propertyViews, val);
|
|
51
|
+
});
|
|
52
|
+
export const classView_setHideProperties = action((cv, val) => {
|
|
53
|
+
cv.hideProperties = val;
|
|
54
|
+
});
|
|
55
|
+
export const classView_setHideStereotypes = action((cv, val) => {
|
|
56
|
+
cv.hideStereotypes = val;
|
|
57
|
+
});
|
|
58
|
+
export const classView_setHideTaggedValues = action((cv, val) => {
|
|
59
|
+
cv.hideTaggedValues = val;
|
|
60
|
+
});
|
|
61
|
+
export const relationShipEdgeView_setOffsetX = action((r, val) => {
|
|
62
|
+
r.offsetX = val;
|
|
63
|
+
});
|
|
64
|
+
export const relationShipEdgeView_setOffsetY = action((r, val) => {
|
|
65
|
+
r.offsetY = val;
|
|
66
|
+
});
|
|
67
|
+
export const relationshipView_changePoint = action((v, val, newVal) => {
|
|
68
|
+
changeEntry(v.path, val, newVal);
|
|
69
|
+
});
|
|
70
|
+
export const relationView_possiblyFlattenPath = action(_relationView_possiblyFlattenPath);
|
|
71
|
+
export const findOrBuildPoint = action(_findOrBuildPoint);
|
|
72
|
+
export const relationView_setPath = action(_relationView_setPath);
|
|
73
|
+
export const positionedRectangle_setRectangle = action((pR, value) => {
|
|
74
|
+
pR.rectangle = value;
|
|
75
|
+
});
|
|
76
|
+
export const positionedRectangle_setPosition = action((pR, value) => {
|
|
77
|
+
pR.position = value;
|
|
78
|
+
});
|
|
79
|
+
/**
|
|
80
|
+
* NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
|
|
81
|
+
* so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
|
|
82
|
+
* the class view box or move it.
|
|
83
|
+
*/
|
|
84
|
+
export const positionedRectangle_forceRefreshHash = action((pR) => {
|
|
85
|
+
pR.dummyObservable = {};
|
|
86
|
+
});
|
|
87
|
+
//# sourceMappingURL=DSLDiagram_ModifierHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DSLDiagram_ModifierHelper.js","sourceRoot":"","sources":["../../../src/stores/studio/DSLDiagram_ModifierHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-diagram",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.29",
|
|
4
4
|
"description": "Legend extension for Diagram DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"clean:cache": "rimraf \"build\"",
|
|
32
32
|
"clean:lib": "rimraf \"lib\"",
|
|
33
33
|
"dev": "npm-run-all --parallel dev:sass dev:ts",
|
|
34
|
-
"dev:sass": "sass style
|
|
34
|
+
"dev:sass": "sass style:lib --watch --load-path=../../node_modules/@finos/legend-art/scss",
|
|
35
35
|
"dev:ts": "tsc --watch --preserveWatchOutput",
|
|
36
36
|
"lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location ./build/.eslintcache --report-unused-disable-directives --parser-options=project:\"./tsconfig.json\" \"./src/**/*.{js,ts,tsx}\"",
|
|
37
37
|
"publish:prepare": "node ../../scripts/release/preparePublishContent.js",
|
|
@@ -40,23 +40,23 @@
|
|
|
40
40
|
"test:watch": "jest --watch"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@finos/legend-application": "2.0.
|
|
44
|
-
"@finos/legend-art": "0.3.
|
|
45
|
-
"@finos/legend-graph": "2.1.
|
|
46
|
-
"@finos/legend-model-storage": "0.0.
|
|
43
|
+
"@finos/legend-application": "2.0.8",
|
|
44
|
+
"@finos/legend-art": "0.3.13",
|
|
45
|
+
"@finos/legend-graph": "2.1.3",
|
|
46
|
+
"@finos/legend-model-storage": "0.0.26",
|
|
47
47
|
"@finos/legend-shared": "1.2.7",
|
|
48
|
-
"@finos/legend-studio": "5.1.
|
|
48
|
+
"@finos/legend-studio": "5.1.3",
|
|
49
49
|
"@types/react": "17.0.43",
|
|
50
50
|
"mobx": "6.5.0",
|
|
51
51
|
"mobx-react-lite": "3.3.0",
|
|
52
52
|
"react": "17.0.2",
|
|
53
|
-
"react-dnd": "15.1.
|
|
53
|
+
"react-dnd": "15.1.2",
|
|
54
54
|
"react-dom": "17.0.2",
|
|
55
55
|
"react-resize-detector": "7.0.0",
|
|
56
56
|
"serializr": "2.0.5"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@finos/legend-dev-utils": "0.3.
|
|
59
|
+
"@finos/legend-dev-utils": "0.3.17",
|
|
60
60
|
"@testing-library/react": "12.1.4",
|
|
61
61
|
"cross-env": "7.0.3",
|
|
62
62
|
"eslint": "8.12.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"jest-canvas-mock": "2.3.1",
|
|
65
65
|
"npm-run-all": "4.1.5",
|
|
66
66
|
"rimraf": "3.0.2",
|
|
67
|
-
"sass": "1.49.
|
|
67
|
+
"sass": "1.49.11",
|
|
68
68
|
"typescript": "4.6.3"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|