@finos/legend-extension-dsl-diagram 2.0.2 → 2.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. package/lib/DiagramRenderer.d.ts.map +1 -1
  2. package/lib/DiagramRenderer.js +16 -14
  3. package/lib/DiagramRenderer.js.map +1 -1
  4. package/lib/components/studio/ClassDiagramPreview.d.ts +0 -1
  5. package/lib/components/studio/ClassDiagramPreview.d.ts.map +1 -1
  6. package/lib/components/studio/DiagramEditor.d.ts +0 -1
  7. package/lib/components/studio/DiagramEditor.d.ts.map +1 -1
  8. package/lib/index.css +1 -1
  9. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.d.ts +1 -1
  10. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.d.ts.map +1 -1
  11. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js +2 -2
  12. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js.map +1 -1
  13. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.js +1 -1
  14. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.js.map +1 -1
  15. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.d.ts +1 -1
  16. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.d.ts.map +1 -1
  17. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js +2 -2
  18. package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js.map +1 -1
  19. package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js +1 -1
  20. package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js.map +1 -1
  21. package/lib/package.json +10 -10
  22. package/lib/stores/studio/DiagramEditorState.d.ts +1 -1
  23. package/lib/stores/studio/DiagramEditorState.d.ts.map +1 -1
  24. package/lib/stores/studio/DiagramEditorState.js +3 -3
  25. package/lib/stores/studio/DiagramEditorState.js.map +1 -1
  26. package/package.json +17 -17
  27. package/src/DiagramRenderer.ts +25 -17
  28. package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts +3 -2
  29. package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts +1 -1
  30. package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts +3 -2
  31. package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts +1 -1
  32. package/src/stores/studio/DiagramEditorState.ts +4 -4
@@ -13,7 +13,6 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- /// <reference types="react" />
17
16
  export declare const DiagramEditor: (() => JSX.Element) & {
18
17
  displayName: string;
19
18
  };
@@ -1 +1 @@
1
- {"version":3,"file":"DiagramEditor.d.ts","sourceRoot":"","sources":["../../../src/components/studio/DiagramEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAyxCH,eAAO,MAAM,aAAa;;CAmDxB,CAAC"}
1
+ {"version":3,"file":"DiagramEditor.d.ts","sourceRoot":"","sources":["../../../src/components/studio/DiagramEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAyxCH,eAAO,MAAM,aAAa;;CAmDxB,CAAC"}
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-extension-dsl-diagram v2.0.2
1
+ /** @license @finos/legend-extension-dsl-diagram v2.0.3
2
2
  * Copyright (c) 2020-present, Goldman Sachs
3
3
  *
4
4
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@ import { PositionedRectangle } from './geometry/DSLDiagram_PositionedRectangle';
18
18
  import type { Diagram } from './DSLDiagram_Diagram';
19
19
  import type { Class, PackageableElementReference } from '@finos/legend-graph';
20
20
  export declare class ClassView extends PositionedRectangle implements Hashable {
21
- owner: Diagram;
21
+ readonly _OWNER: Diagram;
22
22
  class: PackageableElementReference<Class>;
23
23
  id: string;
24
24
  hideProperties?: boolean | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"DSLDiagram_ClassView.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAGhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAE9E,qBAAa,SAAU,SAAQ,mBAAoB,YAAW,QAAQ;IACpE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGpC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,2BAA2B,CAAC,KAAK,CAAC;IAQ5C,IAAa,QAAQ,IAAI,MAAM,CAU9B;CACF"}
1
+ {"version":3,"file":"DSLDiagram_ClassView.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAGhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAE9E,qBAAa,SAAU,SAAQ,mBAAoB,YAAW,QAAQ;IACpE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGpC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,2BAA2B,CAAC,KAAK,CAAC;IAQ5C,IAAa,QAAQ,IAAI,MAAM,CAU9B;CACF"}
@@ -19,7 +19,7 @@ import { Rectangle } from './geometry/DSLDiagram_Rectangle';
19
19
  import { Point } from './geometry/DSLDiagram_Point';
20
20
  import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
21
21
  export class ClassView extends PositionedRectangle {
22
- owner;
22
+ _OWNER;
23
23
  class;
24
24
  id;
25
25
  hideProperties;
@@ -27,7 +27,7 @@ export class ClassView extends PositionedRectangle {
27
27
  hideStereotypes;
28
28
  constructor(owner, id, _class) {
29
29
  super(new Point(0, 0), new Rectangle(0, 0));
30
- this.owner = owner;
30
+ this._OWNER = owner;
31
31
  this.id = id;
32
32
  this.class = _class;
33
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DSLDiagram_ClassView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAG3E,MAAM,OAAO,SAAU,SAAQ,mBAAmB;IAChD,KAAK,CAAU;IACf,KAAK,CAAqC;IAC1C,EAAE,CAAS;IACX,cAAc,CAAuB;IACrC,gBAAgB,CAAuB;IACvC,eAAe,CAAuB;IAEtC,YACE,KAAc,EACd,EAAU,EACV,MAA0C;QAE1C,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,sBAAsB,CAAC,UAAU;YACjC,KAAK,CAAC,QAAQ;YACd,IAAI,CAAC,EAAE;YACP,IAAI,CAAC,KAAK,CAAC,SAAS;YACpB,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE;SACvC,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"DSLDiagram_ClassView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAG3E,MAAM,OAAO,SAAU,SAAQ,mBAAmB;IACvC,MAAM,CAAU;IAEzB,KAAK,CAAqC;IAC1C,EAAE,CAAS;IACX,cAAc,CAAuB;IACrC,gBAAgB,CAAuB;IACvC,eAAe,CAAuB;IAEtC,YACE,KAAc,EACd,EAAU,EACV,MAA0C;QAE1C,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,sBAAsB,CAAC,UAAU;YACjC,KAAK,CAAC,QAAQ;YACd,IAAI,CAAC,EAAE;YACP,IAAI,CAAC,KAAK,CAAC,SAAS;YACpB,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE;YACvC,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE;SACvC,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -26,7 +26,7 @@ export class ClassViewReference extends ReferenceWithOwner {
26
26
  export class ClassViewExplicitReference extends ClassViewReference {
27
27
  ownerReference;
28
28
  constructor(value) {
29
- const ownerReference = PackageableElementExplicitReference.create(value.owner);
29
+ const ownerReference = PackageableElementExplicitReference.create(value._OWNER);
30
30
  super(ownerReference, value);
31
31
  this.ownerReference = ownerReference;
32
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DSLDiagram_ClassViewReference.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EACL,mCAAmC,EACnC,kBAAkB,GAGnB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAgB,kBAAmB,SAAQ,kBAAkB;IAC/C,cAAc,CAAuC;IACvE,KAAK,CAAY;IAEjB,YACE,cAAoD,EACpD,KAAgB;QAEhB,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAC9C,cAAc,CAA+C;IAE/E,YAAoB,KAAgB;QAClC,MAAM,cAAc,GAAG,mCAAmC,CAAC,MAAM,CAC/D,KAAK,CAAC,KAAK,CACZ,CAAC;QACF,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAgB;QAC5B,OAAO,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAC9C,cAAc,CAA+C;IAE/E,YACE,cAA4D,EAC5D,KAAgB;QAEhB,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,MAAM,CACX,cAA4D,EAC5D,KAAgB;QAEhB,OAAO,IAAI,0BAA0B,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;CACF"}
1
+ {"version":3,"file":"DSLDiagram_ClassViewReference.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EACL,mCAAmC,EACnC,kBAAkB,GAGnB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAgB,kBAAmB,SAAQ,kBAAkB;IAC/C,cAAc,CAAuC;IACvE,KAAK,CAAY;IAEjB,YACE,cAAoD,EACpD,KAAgB;QAEhB,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAC9C,cAAc,CAA+C;IAE/E,YAAoB,KAAgB;QAClC,MAAM,cAAc,GAAG,mCAAmC,CAAC,MAAM,CAC/D,KAAK,CAAC,MAAM,CACb,CAAC;QACF,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAgB;QAC5B,OAAO,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,kBAAkB;IAC9C,cAAc,CAA+C;IAE/E,YACE,cAA4D,EAC5D,KAAgB;QAEhB,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,MAAM,CACX,cAA4D,EAC5D,KAAgB;QAEhB,OAAO,IAAI,0BAA0B,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;CACF"}
@@ -19,7 +19,7 @@ import { Point } from './geometry/DSLDiagram_Point';
19
19
  import type { ClassView } from './DSLDiagram_ClassView';
20
20
  import type { Diagram } from './DSLDiagram_Diagram';
21
21
  export declare class RelationshipView implements Hashable {
22
- owner: Diagram;
22
+ readonly _OWNER: Diagram;
23
23
  from: RelationshipEdgeView;
24
24
  to: RelationshipEdgeView;
25
25
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"DSLDiagram_RelationshipView.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIpD,qBAAa,gBAAiB,YAAW,QAAQ;IAC/C,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,oBAAoB,CAAC;IAC3B,EAAE,EAAE,oBAAoB,CAAC;IACzB;;;;;;;;;OASG;IACH,IAAI,EAAE,KAAK,EAAE,CAAM;gBAEP,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;IAQ1D;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;;;;;OAMG;IACH,aAAa,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE;IAQ1C;;;OAGG;IACH,MAAM,CAAC,4BAA4B,SAC3B,KAAK,EAAE,QACP,SAAS,MACX,SAAS,KACZ,KAAK,EAAE,CA6BR;IAEF;;OAEG;IACH,IAAI,oBAAoB,IAAI,KAAK,EAAE,CAMlC;IAED,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}
1
+ {"version":3,"file":"DSLDiagram_RelationshipView.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIpD,qBAAa,gBAAiB,YAAW,QAAQ;IAC/C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,EAAE,EAAE,oBAAoB,CAAC;IACzB;;;;;;;;;OASG;IACH,IAAI,EAAE,KAAK,EAAE,CAAM;gBAEP,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS;IAQ1D;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;;;;;OAMG;IACH,aAAa,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE;IAQ1C;;;OAGG;IACH,MAAM,CAAC,4BAA4B,SAC3B,KAAK,EAAE,QACP,SAAS,MACX,SAAS,KACZ,KAAK,EAAE,CA6BR;IAEF;;OAEG;IACH,IAAI,oBAAoB,IAAI,KAAK,EAAE,CAMlC;IAED,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}
@@ -19,7 +19,7 @@ import { Point } from './geometry/DSLDiagram_Point';
19
19
  import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference';
20
20
  import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
21
21
  export class RelationshipView {
22
- owner;
22
+ _OWNER;
23
23
  from;
24
24
  to;
25
25
  /**
@@ -34,7 +34,7 @@ export class RelationshipView {
34
34
  */
35
35
  path = [];
36
36
  constructor(owner, from, to) {
37
- this.owner = owner;
37
+ this._OWNER = owner;
38
38
  this.from = new RelationshipEdgeView(ClassViewExplicitReference.create(from));
39
39
  this.to = new RelationshipEdgeView(ClassViewExplicitReference.create(to));
40
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DSLDiagram_RelationshipView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts"],"names":[],"mappings":"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"}
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,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAGpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,MAAM,OAAO,gBAAgB;IAClB,MAAM,CAAU;IAEzB,IAAI,CAAuB;IAC3B,EAAE,CAAuB;IACzB;;;;;;;;;OASG;IACH,IAAI,GAAY,EAAE,CAAC;IAEnB,YAAY,KAAc,EAAE,IAAe,EAAE,EAAa;QACxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,oBAAoB,CAClC,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,CACxC,CAAC;QACF,IAAI,CAAC,EAAE,GAAG,IAAI,oBAAoB,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED;;OAEG;IACK,mBAAmB,CACzB,QAA8B,EAC9B,WAAW,GAAG,IAAI;QAElB,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC;QACrC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC5B,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC9B;QACD,IAAI,WAAW,EAAE;YACf,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC;YACrB,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC;SACtB;QACD,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,WAAW,GAAG,IAAI;QAC9B,OAAO;YACL,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;YAChD,GAAG,IAAI,CAAC,IAAI;YACZ,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,4BAA4B,GAAG,CACpC,IAAa,EACb,IAAe,EACf,EAAa,EACJ,EAAE;QACX,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,EAAE,CAAC;SACX;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAU,CAAC;QAEtC,OACE,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EACzC;YACA,KAAK,EAAE,CAAC;YACR,UAAU,GAAG,IAAI,CAAC,KAAK,CAAU,CAAC;SACnC;QAED,gFAAgF;QAChF,+BAA+B;QAE/B,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1B,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAU,CAAC;QAElC,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE;YACrD,GAAG,EAAE,CAAC;YACN,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAU,CAAC;SAC/B;QAED,mEAAmE;QACnE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC;IAEF;;OAEG;IACH,IAAI,oBAAoB;QACtB,OAAO,gBAAgB,CAAC,4BAA4B,CAClD,IAAI,CAAC,aAAa,EAAE,EACpB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EACzB,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CACxB,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,sBAAsB,CAAC,iBAAiB;YACxC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC;SACrC,CAAC,CAAC;IACL,CAAC"}
@@ -49,7 +49,7 @@ export const V1_buildPropertyView = (propertyView, context, diagram) => {
49
49
  assertNonNullable(propertyView.line, `Property view 'line' field is missing`);
50
50
  const sourceClassView = guaranteeNonNullable(getClassView(diagram, guaranteeNonNullable(propertyView.sourceView)), `Property view 'sourceView' field is missing`);
51
51
  const targetClassView = guaranteeNonNullable(getClassView(diagram, guaranteeNonNullable(propertyView.targetView)), `Property view 'targetView' field is missing`);
52
- const property = context.resolveOwnedProperty(propertyView.property);
52
+ const property = context.resolveOwnProperty(propertyView.property);
53
53
  const view = new PropertyView(diagram, property, sourceClassView, targetClassView);
54
54
  view.path = propertyView.line.points.map((point) => buildPoint(point));
55
55
  _relationshipView_simplifyPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
@@ -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":"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"}
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": "2.0.2",
3
+ "version": "2.0.3",
4
4
  "description": "Legend extension for Diagram DSL",
5
5
  "keywords": [
6
6
  "legend",
@@ -49,21 +49,21 @@
49
49
  "@finos/legend-model-storage": "workspace:*",
50
50
  "@finos/legend-shared": "workspace:*",
51
51
  "@finos/legend-studio": "workspace:*",
52
- "@types/react": "17.0.44",
52
+ "@types/react": "18.0.9",
53
53
  "mobx": "6.5.0",
54
- "mobx-react-lite": "3.3.0",
55
- "react": "17.0.2",
56
- "react-dnd": "15.1.2",
57
- "react-dom": "17.0.2",
54
+ "mobx-react-lite": "3.4.0",
55
+ "react": "18.1.0",
56
+ "react-dnd": "16.0.1",
57
+ "react-dom": "18.1.0",
58
58
  "react-resize-detector": "7.0.0",
59
59
  "serializr": "2.0.5"
60
60
  },
61
61
  "devDependencies": {
62
62
  "@finos/legend-dev-utils": "workspace:*",
63
- "@testing-library/react": "12.1.5",
63
+ "@testing-library/react": "13.2.0",
64
64
  "cross-env": "7.0.3",
65
- "eslint": "8.14.0",
66
- "jest": "28.0.3",
65
+ "eslint": "8.15.0",
66
+ "jest": "28.1.0",
67
67
  "jest-canvas-mock": "2.4.0",
68
68
  "npm-run-all": "4.1.5",
69
69
  "rimraf": "3.0.2",
@@ -71,7 +71,7 @@
71
71
  "typescript": "4.6.4"
72
72
  },
73
73
  "peerDependencies": {
74
- "react": "^17.0.0"
74
+ "react": "^18.0.0"
75
75
  },
76
76
  "publishConfig": {
77
77
  "directory": "build/publishContent"
@@ -21,7 +21,7 @@ import type { ClassView } from '../../models/metamodels/pure/packageableElements
21
21
  import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
22
22
  import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
23
23
  export declare abstract class DiagramEditorSidePanelState {
24
- uuid: string;
24
+ readonly uuid: string;
25
25
  editorStore: EditorStore;
26
26
  diagramEditorState: DiagramEditorState;
27
27
  constructor(editorStore: EditorStore, diagramEditorState: DiagramEditorState);
@@ -1 +1 @@
1
- {"version":3,"file":"DiagramEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DiagramEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"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"}
@@ -197,14 +197,14 @@ export class DiagramEditorState extends ElementEditorState {
197
197
  }
198
198
  else if (this.renderer.mouseOverClassProperty) {
199
199
  return this.isReadOnly ||
200
- this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverClassProperty.owner)
200
+ this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverClassProperty._OWNER)
201
201
  ? 'diagram-editor__cursor--not-allowed'
202
202
  : 'diagram-editor__cursor--text';
203
203
  }
204
204
  else if (this.renderer.mouseOverPropertyHolderViewLabel) {
205
205
  return this.isReadOnly ||
206
206
  this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverPropertyHolderViewLabel.property.value
207
- .owner)
207
+ ._OWNER)
208
208
  ? 'diagram-editor__cursor--not-allowed'
209
209
  : 'diagram-editor__cursor--text';
210
210
  }
@@ -277,7 +277,7 @@ export class DiagramEditorState extends ElementEditorState {
277
277
  };
278
278
  const editProperty = (property, point, propertyHolderView) => {
279
279
  if (!this.isReadOnly &&
280
- !this.editorStore.graphManagerState.isElementReadOnly(property.owner)) {
280
+ !this.editorStore.graphManagerState.isElementReadOnly(property._OWNER)) {
281
281
  this.setInlinePropertyEditorState(new DiagramEditorInlinePropertyEditorState(this, property, point, Boolean(propertyHolderView)));
282
282
  }
283
283
  };
@@ -1 +1 @@
1
- {"version":3,"file":"DiagramEditorState.js","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DiagramEditorState.js","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.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": "2.0.2",
3
+ "version": "2.0.3",
4
4
  "description": "Legend extension for Diagram DSL",
5
5
  "keywords": [
6
6
  "legend",
@@ -43,27 +43,27 @@
43
43
  "test:watch": "jest --watch"
44
44
  },
45
45
  "dependencies": {
46
- "@finos/legend-application": "3.0.2",
47
- "@finos/legend-art": "1.0.0",
48
- "@finos/legend-graph": "6.0.1",
49
- "@finos/legend-model-storage": "1.0.0",
50
- "@finos/legend-shared": "2.0.0",
51
- "@finos/legend-studio": "9.0.2",
52
- "@types/react": "17.0.44",
46
+ "@finos/legend-application": "3.0.3",
47
+ "@finos/legend-art": "1.0.1",
48
+ "@finos/legend-graph": "7.0.0",
49
+ "@finos/legend-model-storage": "1.0.1",
50
+ "@finos/legend-shared": "2.0.1",
51
+ "@finos/legend-studio": "9.1.0",
52
+ "@types/react": "18.0.9",
53
53
  "mobx": "6.5.0",
54
- "mobx-react-lite": "3.3.0",
55
- "react": "17.0.2",
56
- "react-dnd": "15.1.2",
57
- "react-dom": "17.0.2",
54
+ "mobx-react-lite": "3.4.0",
55
+ "react": "18.1.0",
56
+ "react-dnd": "16.0.1",
57
+ "react-dom": "18.1.0",
58
58
  "react-resize-detector": "7.0.0",
59
59
  "serializr": "2.0.5"
60
60
  },
61
61
  "devDependencies": {
62
- "@finos/legend-dev-utils": "1.0.0",
63
- "@testing-library/react": "12.1.5",
62
+ "@finos/legend-dev-utils": "1.0.1",
63
+ "@testing-library/react": "13.2.0",
64
64
  "cross-env": "7.0.3",
65
- "eslint": "8.14.0",
66
- "jest": "28.0.3",
65
+ "eslint": "8.15.0",
66
+ "jest": "28.1.0",
67
67
  "jest-canvas-mock": "2.4.0",
68
68
  "npm-run-all": "4.1.5",
69
69
  "rimraf": "3.0.2",
@@ -71,7 +71,7 @@
71
71
  "typescript": "4.6.4"
72
72
  },
73
73
  "peerDependencies": {
74
- "react": "^17.0.0"
74
+ "react": "^18.0.0"
75
75
  },
76
76
  "publishConfig": {
77
77
  "directory": "build/publishContent"
@@ -36,6 +36,10 @@ import {
36
36
  GenericType,
37
37
  Property,
38
38
  Multiplicity,
39
+ getAllSuperclasses,
40
+ getAllOwnClassProperties,
41
+ generateMultiplicityString,
42
+ getRawGenericType,
39
43
  } from '@finos/legend-graph';
40
44
  import { action, makeObservable, observable } from 'mobx';
41
45
  import type { Diagram } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
@@ -595,11 +599,11 @@ export class DiagramRenderer {
595
599
  // Do not allow creating self-inheritance
596
600
  startClassView.class.value !== targetClassView.class.value &&
597
601
  // Avoid creating inhertance that already existed
598
- !startClassView.class.value.allSuperclasses.includes(
602
+ !getAllSuperclasses(startClassView.class.value).includes(
599
603
  targetClassView.class.value,
600
604
  ) &&
601
605
  // Avoid loop (might be expensive)
602
- !targetClassView.class.value.allSuperclasses.includes(
606
+ !getAllSuperclasses(targetClassView.class.value).includes(
603
607
  startClassView.class.value,
604
608
  )
605
609
  ) {
@@ -924,7 +928,7 @@ export class DiagramRenderer {
924
928
  );
925
929
  }
926
930
  // Add property view
927
- addedClass.getAllOwnedProperties().forEach((property) => {
931
+ getAllOwnClassProperties(addedClass).forEach((property) => {
928
932
  if (property.genericType.value.rawType === _class) {
929
933
  diagram_addPropertyView(
930
934
  this.diagram,
@@ -938,7 +942,7 @@ export class DiagramRenderer {
938
942
  );
939
943
  }
940
944
  });
941
- _class.getAllOwnedProperties().forEach((property) => {
945
+ getAllOwnClassProperties(_class).forEach((property) => {
942
946
  if (property.genericType.value.rawType === addedClass) {
943
947
  diagram_addPropertyView(
944
948
  this.diagram,
@@ -1394,14 +1398,14 @@ export class DiagramRenderer {
1394
1398
  this.ctx.font = `${(this.fontSize - 1) * (measureOnly ? 1 : this.zoom)}px ${
1395
1399
  this.fontFamily
1396
1400
  }`;
1401
+ const multiplicityString = generateMultiplicityString(
1402
+ property.multiplicity.lowerBound,
1403
+ property.multiplicity.upperBound,
1404
+ );
1397
1405
  if (!measureOnly) {
1398
- this.ctx.fillText(
1399
- `[${property.multiplicity.str}]`,
1400
- propX + txtMeasure,
1401
- propY,
1402
- );
1406
+ this.ctx.fillText(`[${multiplicityString}]`, propX + txtMeasure, propY);
1403
1407
  }
1404
- txtMeasure += this.ctx.measureText(`[${property.multiplicity.str}]`).width;
1408
+ txtMeasure += this.ctx.measureText(`[${multiplicityString}]`).width;
1405
1409
  return txtMeasure;
1406
1410
  }
1407
1411
 
@@ -1451,7 +1455,7 @@ export class DiagramRenderer {
1451
1455
 
1452
1456
  // Calculate box for properties
1453
1457
  if (!classView.hideProperties) {
1454
- classView.class.value.getAllOwnedProperties().forEach((property) => {
1458
+ getAllOwnClassProperties(classView.class.value).forEach((property) => {
1455
1459
  if (!this.hasPropertyView(classView, property)) {
1456
1460
  const propertyTextMeasure = this.drawClassViewProperty(
1457
1461
  classView,
@@ -1632,7 +1636,7 @@ export class DiagramRenderer {
1632
1636
  );
1633
1637
  this.ctx.stroke();
1634
1638
 
1635
- for (const property of classView.class.value.getAllOwnedProperties()) {
1639
+ for (const property of getAllOwnClassProperties(classView.class.value)) {
1636
1640
  if (!this.hasPropertyView(classView, property)) {
1637
1641
  this.ctx.fillStyle =
1638
1642
  property instanceof DerivedProperty
@@ -1671,8 +1675,12 @@ export class DiagramRenderer {
1671
1675
  ): PositionedRectangle {
1672
1676
  this.ctx.font = `${this.fontSize}px ${this.fontFamily}`;
1673
1677
  const propertyName = getPropertyDisplayName(property);
1678
+ const multiplictyString = generateMultiplicityString(
1679
+ property.multiplicity.lowerBound,
1680
+ property.multiplicity.upperBound,
1681
+ );
1674
1682
  const textSize = this.ctx.measureText(propertyName).width;
1675
- const mulSize = this.ctx.measureText(property.multiplicity.str).width;
1683
+ const mulSize = this.ctx.measureText(multiplictyString).width;
1676
1684
  this.ctx.font = `${this.fontSize * this.zoom}px ${this.fontFamily}`;
1677
1685
  const posX = textPositionX(textSize);
1678
1686
  const posY = textPositionY(textSize);
@@ -1689,7 +1697,7 @@ export class DiagramRenderer {
1689
1697
  );
1690
1698
  if (!measureOnly) {
1691
1699
  this.ctx.fillText(
1692
- property.multiplicity.str,
1700
+ multiplictyString,
1693
1701
  multiplicityPosition.x,
1694
1702
  multiplicityPosition.y,
1695
1703
  );
@@ -2341,7 +2349,7 @@ export class DiagramRenderer {
2341
2349
  else if ('ArrowDown' === e.key) {
2342
2350
  const views = uniqBy(
2343
2351
  this.selectedClasses.flatMap((x) =>
2344
- x.class.value.subclasses.flatMap(
2352
+ x.class.value._subclasses.flatMap(
2345
2353
  (c) =>
2346
2354
  new ClassView(
2347
2355
  this.diagram,
@@ -3115,7 +3123,7 @@ export class DiagramRenderer {
3115
3123
  cursorY += this.classViewSpaceY;
3116
3124
 
3117
3125
  // Check hover class property
3118
- for (const property of _class.getAllOwnedProperties()) {
3126
+ for (const property of getAllOwnClassProperties(_class)) {
3119
3127
  if (!this.hasPropertyView(classView, property)) {
3120
3128
  this.ctx.font = `${(this.fontSize - 1) * this.zoom}px ${
3121
3129
  this.fontFamily
@@ -3204,7 +3212,7 @@ export class DiagramRenderer {
3204
3212
  diagram,
3205
3213
  uuid(),
3206
3214
  PackageableElementExplicitReference.create(
3207
- generation.value.getRawType(Class),
3215
+ getRawGenericType(generation.value, Class),
3208
3216
  ),
3209
3217
  ),
3210
3218
  ),
@@ -23,7 +23,8 @@ import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
23
23
  import type { Class, PackageableElementReference } from '@finos/legend-graph';
24
24
 
25
25
  export class ClassView extends PositionedRectangle implements Hashable {
26
- owner: Diagram;
26
+ readonly _OWNER: Diagram;
27
+
27
28
  class: PackageableElementReference<Class>;
28
29
  id: string;
29
30
  hideProperties?: boolean | undefined;
@@ -36,7 +37,7 @@ export class ClassView extends PositionedRectangle implements Hashable {
36
37
  _class: PackageableElementReference<Class>,
37
38
  ) {
38
39
  super(new Point(0, 0), new Rectangle(0, 0));
39
- this.owner = owner;
40
+ this._OWNER = owner;
40
41
  this.id = id;
41
42
  this.class = _class;
42
43
  }
@@ -42,7 +42,7 @@ export class ClassViewExplicitReference extends ClassViewReference {
42
42
 
43
43
  private constructor(value: ClassView) {
44
44
  const ownerReference = PackageableElementExplicitReference.create(
45
- value.owner,
45
+ value._OWNER,
46
46
  );
47
47
  super(ownerReference, value);
48
48
  this.ownerReference = ownerReference;
@@ -23,7 +23,8 @@ import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference';
23
23
  import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
24
24
 
25
25
  export class RelationshipView implements Hashable {
26
- owner: Diagram;
26
+ readonly _OWNER: Diagram;
27
+
27
28
  from: RelationshipEdgeView;
28
29
  to: RelationshipEdgeView;
29
30
  /**
@@ -39,7 +40,7 @@ export class RelationshipView implements Hashable {
39
40
  path: Point[] = [];
40
41
 
41
42
  constructor(owner: Diagram, from: ClassView, to: ClassView) {
42
- this.owner = owner;
43
+ this._OWNER = owner;
43
44
  this.from = new RelationshipEdgeView(
44
45
  ClassViewExplicitReference.create(from),
45
46
  );
@@ -110,7 +110,7 @@ export const V1_buildPropertyView = (
110
110
  getClassView(diagram, guaranteeNonNullable(propertyView.targetView)),
111
111
  `Property view 'targetView' field is missing`,
112
112
  );
113
- const property = context.resolveOwnedProperty(propertyView.property);
113
+ const property = context.resolveOwnProperty(propertyView.property);
114
114
  const view = new PropertyView(
115
115
  diagram,
116
116
  property,
@@ -71,7 +71,7 @@ const DIAGRAM_EDITOR_HOTKEY_MAP = Object.freeze({
71
71
  });
72
72
 
73
73
  export abstract class DiagramEditorSidePanelState {
74
- uuid = uuid();
74
+ readonly uuid = uuid();
75
75
  editorStore: EditorStore;
76
76
  diagramEditorState: DiagramEditorState;
77
77
 
@@ -277,7 +277,7 @@ export class DiagramEditorState extends ElementEditorState {
277
277
  } else if (this.renderer.mouseOverClassProperty) {
278
278
  return this.isReadOnly ||
279
279
  this.editorStore.graphManagerState.isElementReadOnly(
280
- this.renderer.mouseOverClassProperty.owner,
280
+ this.renderer.mouseOverClassProperty._OWNER,
281
281
  )
282
282
  ? 'diagram-editor__cursor--not-allowed'
283
283
  : 'diagram-editor__cursor--text';
@@ -285,7 +285,7 @@ export class DiagramEditorState extends ElementEditorState {
285
285
  return this.isReadOnly ||
286
286
  this.editorStore.graphManagerState.isElementReadOnly(
287
287
  this.renderer.mouseOverPropertyHolderViewLabel.property.value
288
- .owner,
288
+ ._OWNER,
289
289
  )
290
290
  ? 'diagram-editor__cursor--not-allowed'
291
291
  : 'diagram-editor__cursor--text';
@@ -400,7 +400,7 @@ export class DiagramEditorState extends ElementEditorState {
400
400
  ): void => {
401
401
  if (
402
402
  !this.isReadOnly &&
403
- !this.editorStore.graphManagerState.isElementReadOnly(property.owner)
403
+ !this.editorStore.graphManagerState.isElementReadOnly(property._OWNER)
404
404
  ) {
405
405
  this.setInlinePropertyEditorState(
406
406
  new DiagramEditorInlinePropertyEditorState(