@finos/legend-extension-dsl-diagram 1.0.7 → 1.0.11
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +8 -0
- package/lib/helpers/DiagramHelper.js +3 -3
- package/lib/helpers/DiagramHelper.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js +1 -1
- package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js.map +1 -1
- package/package.json +12 -12
- package/src/helpers/DiagramHelper.ts +4 -4
- package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -30,9 +30,9 @@ export const getElementPosition = (element) => {
|
|
|
30
30
|
export const getClassView = (diagram, sourceViewId) => diagram.classViews.find((classView) => classView.id === sourceViewId);
|
|
31
31
|
export const cleanUpDeadReferencesInDiagram = (diagram, graph) => {
|
|
32
32
|
// Delete orphan property views
|
|
33
|
-
const propertyViewsToRemove = diagram.propertyViews.filter((
|
|
34
|
-
.map((
|
|
35
|
-
.includes(
|
|
33
|
+
const propertyViewsToRemove = diagram.propertyViews.filter((propertyView) => !propertyView.property.ownerReference.value.properties
|
|
34
|
+
.map((property) => property.name)
|
|
35
|
+
.includes(propertyView.property.value.name));
|
|
36
36
|
propertyViewsToRemove.forEach((propertyView) => diagram.deletePropertyView(propertyView));
|
|
37
37
|
// Fix orphan class views
|
|
38
38
|
const classViewsToRemove = diagram.classViews.filter((cv) => !graph.getNullableClass(cv.class.value.path));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiagramHelper.js","sourceRoot":"","sources":["../../src/helpers/DiagramHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,sEAAsE,CAAC;AAE7F;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAS,EAAE;IAChE,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,OAAO,OAAO,CAAC,YAAY,EAAE;QAC3B,SAAS,IAAI,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAC1E,SAAS,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACvE,OAAO,GAAG,OAAO,CAAC,YAA2B,CAAC;KAC/C;IACD,OAAO,IAAI,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,OAAgB,EAChB,YAAoB,EACG,EAAE,CACzB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,OAAgB,EAChB,KAAgB,EACV,EAAE;IACR,+BAA+B;IAC/B,MAAM,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CACxD,CAAC,
|
|
1
|
+
{"version":3,"file":"DiagramHelper.js","sourceRoot":"","sources":["../../src/helpers/DiagramHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,sEAAsE,CAAC;AAE7F;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAS,EAAE;IAChE,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,OAAO,OAAO,CAAC,YAAY,EAAE;QAC3B,SAAS,IAAI,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAC1E,SAAS,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACvE,OAAO,GAAG,OAAO,CAAC,YAA2B,CAAC;KAC/C;IACD,OAAO,IAAI,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,OAAgB,EAChB,YAAoB,EACG,EAAE,CACzB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,OAAgB,EAChB,KAAgB,EACV,EAAE;IACR,+BAA+B;IAC/B,MAAM,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CACxD,CAAC,YAAY,EAAE,EAAE,CACf,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU;SACnD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;SAChC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAChD,CAAC;IACF,qBAAqB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAC7C,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CACzC,CAAC;IAEF,yBAAyB;IACzB,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAClD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CACrD,CAAC;IACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;IAEhE,iCAAiC;IACjC,MAAM,2BAA2B,GAAG,OAAO,CAAC,mBAAmB,CAAC,MAAM,CACpE,CAAC,CAAC,EAAE,EAAE;QACJ,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QACpD,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QACrD,OAAO,CACL,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtC,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;YACzC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,WAAW,CAAC;iBACpE,MAAM,KAAK,CAAC,CAChB,CAAC;IACJ,CAAC,CACF,CAAC;IACF,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CACpC,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/index.css
CHANGED
package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js
CHANGED
|
@@ -39,7 +39,7 @@ const transformPropertyView = (element) => {
|
|
|
39
39
|
const line = new V1_Line();
|
|
40
40
|
line.points = element.fullPath;
|
|
41
41
|
view.line = line;
|
|
42
|
-
view.property = V1_transformPropertyReference(element.property
|
|
42
|
+
view.property = V1_transformPropertyReference(element.property);
|
|
43
43
|
view.sourceView = relationshipEdgeViewTransformer(element.from);
|
|
44
44
|
view.targetView = relationshipEdgeViewTransformer(element.to);
|
|
45
45
|
return view;
|
package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V1_DSLDiagram_TransformerHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAAE,QAAQ,EAAE,MAAM,2DAA2D,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,sDAAsD,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AACtG,OAAO,EAAE,OAAO,EAAE,MAAM,0DAA0D,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,+DAA+D,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAE7B,MAAM,+BAA+B,GAAG,CAAC,KAA2B,EAAU,EAAE,CAC9E,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;AAE3B,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,KAAa,EAAgB,EAAE;IACtE,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IACrC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;IACxB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,CAAS,EAAY,EAAE;IACrD,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC7B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;IACZ,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,OAAqB,EAAmB,EAAE;IACvE,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;IAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACjB,IAAI,CAAC,QAAQ,GAAG,6BAA6B,CAAC,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"V1_DSLDiagram_TransformerHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.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.11",
|
|
4
4
|
"description": "Legend extension for Diagram DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -40,14 +40,14 @@
|
|
|
40
40
|
"test:watch": "jest --watch"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@finos/legend-application": "1.1.
|
|
44
|
-
"@finos/legend-art": "0.3.
|
|
45
|
-
"@finos/legend-graph": "1.0.
|
|
46
|
-
"@finos/legend-model-storage": "0.0.
|
|
47
|
-
"@finos/legend-shared": "1.1.
|
|
48
|
-
"@finos/legend-studio": "2.
|
|
43
|
+
"@finos/legend-application": "1.1.4",
|
|
44
|
+
"@finos/legend-art": "0.3.3",
|
|
45
|
+
"@finos/legend-graph": "1.0.4",
|
|
46
|
+
"@finos/legend-model-storage": "0.0.16",
|
|
47
|
+
"@finos/legend-shared": "1.1.2",
|
|
48
|
+
"@finos/legend-studio": "2.4.1",
|
|
49
49
|
"@types/react": "17.0.38",
|
|
50
|
-
"mobx": "6.3.
|
|
50
|
+
"mobx": "6.3.13",
|
|
51
51
|
"mobx-react-lite": "3.2.3",
|
|
52
52
|
"react": "17.0.2",
|
|
53
53
|
"react-dnd": "14.0.5",
|
|
@@ -56,16 +56,16 @@
|
|
|
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.8",
|
|
60
60
|
"@testing-library/react": "12.1.2",
|
|
61
61
|
"cross-env": "7.0.3",
|
|
62
|
-
"eslint": "8.
|
|
62
|
+
"eslint": "8.8.0",
|
|
63
63
|
"jest": "27.4.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.
|
|
68
|
-
"typescript": "4.5.
|
|
67
|
+
"sass": "1.49.7",
|
|
68
|
+
"typescript": "4.5.5"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
71
|
"react": "^17.0.0"
|
|
@@ -45,10 +45,10 @@ export const cleanUpDeadReferencesInDiagram = (
|
|
|
45
45
|
): void => {
|
|
46
46
|
// Delete orphan property views
|
|
47
47
|
const propertyViewsToRemove = diagram.propertyViews.filter(
|
|
48
|
-
(
|
|
49
|
-
!
|
|
50
|
-
.map((
|
|
51
|
-
.includes(
|
|
48
|
+
(propertyView) =>
|
|
49
|
+
!propertyView.property.ownerReference.value.properties
|
|
50
|
+
.map((property) => property.name)
|
|
51
|
+
.includes(propertyView.property.value.name),
|
|
52
52
|
);
|
|
53
53
|
propertyViewsToRemove.forEach((propertyView) =>
|
|
54
54
|
diagram.deletePropertyView(propertyView),
|
package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts
CHANGED
|
@@ -54,7 +54,7 @@ const transformPropertyView = (element: PropertyView): V1_PropertyView => {
|
|
|
54
54
|
const line = new V1_Line();
|
|
55
55
|
line.points = element.fullPath;
|
|
56
56
|
view.line = line;
|
|
57
|
-
view.property = V1_transformPropertyReference(element.property
|
|
57
|
+
view.property = V1_transformPropertyReference(element.property);
|
|
58
58
|
view.sourceView = relationshipEdgeViewTransformer(element.from);
|
|
59
59
|
view.targetView = relationshipEdgeViewTransformer(element.to);
|
|
60
60
|
return view;
|