@finos/legend-extension-dsl-diagram 1.0.29 → 1.0.30

package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js

@@ -20,8 +20,7 @@ import { Point } from '../../../../../metamodels/pure/packageableElements/diagra
 import { Rectangle } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
 import { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
 import { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
-import { getClassView } from '../../../../../../helpers/DiagramHelper';
-import { _relationView_possiblyFlattenPath } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
+import { getClassView, _relationshipView_simplifyPath, } from '../../../../../../helpers/DiagramHelper';
 const buildPoint = (point) => {
     const x = guaranteeNonNullable(point.x, `Point 'x' coordinate is missing`);
     const y = guaranteeNonNullable(point.y, `Point 'y' coordinate is missing`);
@@ -53,7 +52,7 @@ export const V1_buildPropertyView = (propertyView, context, diagram) => {
     const property = context.resolveOwnedProperty(propertyView.property);
     const view = new PropertyView(diagram, property, sourceClassView, targetClassView);
     view.path = propertyView.line.points.map((point) => buildPoint(point));
-    _relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
+    _relationshipView_simplifyPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
     return view;
 };
 export const V1_buildGeneralizationView = (generalizationView, diagram) => {
@@ -62,7 +61,7 @@ export const V1_buildGeneralizationView = (generalizationView, diagram) => {
     const targetClassView = guaranteeNonNullable(getClassView(diagram, guaranteeNonNullable(generalizationView.targetView)), `Generalization view 'targetView' field is missing`);
     const view = new GeneralizationView(diagram, sourceClassView, targetClassView);
     view.path = generalizationView.line.points.map((point) => buildPoint(point));
-    _relationView_possiblyFlattenPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
+    _relationshipView_simplifyPath(view); // transform the line because we store only 2 end points that are inside points and we will calculate the offset
     return view;
 };
 export const V1_resolveDiagram = (path, context) => context.createImplicitPackageableElementReference(path, (_path) => getDiagram(_path, context.graph));

package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js.map

@@ -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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"}
+{"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/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js

@@ -37,7 +37,7 @@ const createPoint = (x, y) => {
 const transformPropertyView = (element) => {
     const view = new V1_PropertyView();
     const line = new V1_Line();
-    line.points = element.fullPath;
+    line.points = element.pathForSerialization;
     view.line = line;
     view.property = V1_transformPropertyReference(element.property);
     view.sourceView = relationshipEdgeViewTransformer(element.from);
@@ -47,7 +47,7 @@ const transformPropertyView = (element) => {
 const transformGenerationView = (element) => {
     const view = new V1_GeneralizationView();
     const line = new V1_Line();
-    line.points = element.fullPath;
+    line.points = element.pathForSerialization;
     view.line = line;
     view.sourceView = relationshipEdgeViewTransformer(element.from);
     view.targetView = relationshipEdgeViewTransformer(element.to);

package/lib/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js.map

@@ -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,sEAAsE,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,0EAA0E,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,qEAAqE,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,0EAA0E,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,oEAAoE,CAAC;AACrG,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,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,GAAG,+BAA+B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,GAAG,+BAA+B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,OAA2B,EACJ,EAAE;IACzB,MAAM,IAAI,GAAG,IAAI,qBAAqB,EAAE,CAAC;IACzC,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,UAAU,GAAG,+BAA+B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,GAAG,+BAA+B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAkB,EAAgB,EAAE;IAC9D,MAAM,UAAU,GAAG,IAAI,YAAY,EAAE,CAAC;IACtC,UAAU,CAAC,KAAK,GAAG,4BAA4B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/D,UAAU,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IACnD,UAAU,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IACrD,UAAU,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACvD,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAC3B,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1E,UAAU,CAAC,SAAS,GAAG,eAAe,CACpC,OAAO,CAAC,SAAS,CAAC,MAAM,EACxB,OAAO,CAAC,SAAS,CAAC,KAAK,CACxB,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAc,EAAE;IAClE,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;IACjC,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAChE,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAC3D,uBAAuB,CACxB,CAAC;IACF,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACzE,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
+{"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/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-extension-dsl-diagram",
-    "version": "1.0.29",
+    "version": "1.0.30",
     "description": "Legend extension for Diagram DSL",
     "keywords": [
         "legend",
@@ -64,7 +64,7 @@
         "jest-canvas-mock": "2.3.1",
         "npm-run-all": "4.1.5",
         "rimraf": "3.0.2",
-        "sass": "1.49.11",
+        "sass": "1.50.0",
         "typescript": "4.6.3"
     },
     "peerDependencies": {

package/lib/stores/studio/{DSLDiagram_ModifierHelper.d.ts → DSLDiagram_GraphModifierHelper.d.ts}

@@ -18,7 +18,7 @@ import type { ClassView } from '../../models/metamodels/pure/packageableElements
 import type { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
 import type { PropertyView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
-import type { RelationShipEdgeView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
+import type { RelationshipEdgeView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
 import type { RelationshipView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
 import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
 import type { PositionedRectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle';
@@ -37,18 +37,21 @@ export declare const diagram_deletePropertyView: (diagram: Diagram, val: Propert
 export declare const classView_setHideProperties: (cv: ClassView, val: boolean) => void;
 export declare const classView_setHideStereotypes: (cv: ClassView, val: boolean) => void;
 export declare const classView_setHideTaggedValues: (cv: ClassView, val: boolean) => void;
-export declare const relationShipEdgeView_setOffsetX: (r: RelationShipEdgeView, val: number) => void;
-export declare const relationShipEdgeView_setOffsetY: (r: RelationShipEdgeView, val: number) => void;
+export declare const relationshipEdgeView_setOffsetX: (r: RelationshipEdgeView, val: number) => void;
+export declare const relationshipEdgeView_setOffsetY: (r: RelationshipEdgeView, val: number) => void;
 export declare const relationshipView_changePoint: (v: RelationshipView, val: Point, newVal: Point) => void;
-export declare const relationView_possiblyFlattenPath: (relationView: RelationshipView) => void;
-export declare const findOrBuildPoint: (relationView: RelationshipView, x: number, y: number, zoom: number, allowChange?: boolean) => Point | undefined;
-export declare const relationView_setPath: (relationView: RelationshipView, val: Point[]) => void;
+export declare const relationshipView_simplifyPath: (relationshipView: RelationshipView) => void;
+export declare const findOrBuildPoint: (relationshipView: RelationshipView, x: number, y: number, zoom: number, allowChange: boolean) => Point | undefined;
+export declare const relationshipView_setPath: (relationshipView: RelationshipView, val: Point[]) => void;
 export declare const positionedRectangle_setRectangle: (pR: PositionedRectangle, value: Rectangle) => void;
 export declare const positionedRectangle_setPosition: (pR: PositionedRectangle, value: Point) => void;
 /**
  * NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
  * so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
  * the class view box or move it.
+ *
+ * We should re-consider the usefulness of this method, maybe it's more worthwhile to recompute hash
+ * for the whole diagram instead?
  */
 export declare const positionedRectangle_forceRefreshHash: (pR: PositionedRectangle) => void;
-//# sourceMappingURL=DSLDiagram_ModifierHelper.d.ts.map
+//# sourceMappingURL=DSLDiagram_GraphModifierHelper.d.ts.map

package/lib/stores/studio/DSLDiagram_GraphModifierHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DSLDiagram_GraphModifierHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DSLDiagram_GraphModifierHelper.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;AAQxH,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,IAM9C,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;AAGF,eAAO,MAAM,4BAA4B,MACnC,gBAAgB,OAAO,KAAK,UAAU,KAAK,KAAG,IAGnD,CAAC;AACF,eAAO,MAAM,6BAA6B,8CAEzC,CAAC;AAEF,eAAO,MAAM,gBAAgB,qHAA4B,CAAC;AAC1D,eAAO,MAAM,wBAAwB,4DAAoC,CAAC;AAG1E,eAAO,MAAM,gCAAgC,OACtC,mBAAmB,SAAS,SAAS,KAAG,IAG9C,CAAC;AAGF,eAAO,MAAM,+BAA+B,OACrC,mBAAmB,SAAS,KAAK,KAAG,IAG1C,CAAC;AACF;;;;;;;GAOG;AACH,eAAO,MAAM,oCAAoC,OAC1C,mBAAmB,KAAG,IAG5B,CAAC"}

package/lib/stores/studio/{DSLDiagram_ModifierHelper.js → DSLDiagram_GraphModifierHelper.js}

@@ -15,36 +15,37 @@
  */
 import { addUniqueEntry, changeEntry, deleteEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
-import { _findOrBuildPoint, _relationView_possiblyFlattenPath, _relationView_setPath, } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
+import { _findOrBuildPoint, _relationshipView_simplifyPath, _relationshipView_setPath, } from '../../helpers/DiagramHelper';
+import { observe_AssociationView, observe_ClassView, observe_GeneralizationView, observe_PropertyView, } from '../../graphManager/action/changeDetection/DSLDiagram_ObserverHelper';
 export const diagram_setClassViews = action((diagram, val) => {
-    diagram.classViews = val;
+    diagram.classViews = val.map(observe_ClassView);
 });
 export const diagram_addClassView = action((diagram, val) => {
-    addUniqueEntry(diagram.classViews, val);
+    addUniqueEntry(diagram.classViews, observe_ClassView(val));
 });
 export const diagram_deleteClassView = action((diagram, val) => {
     deleteEntry(diagram.classViews, val);
 });
 export const diagram_setAssociationViews = action((diagram, val) => {
-    diagram.associationViews = val;
+    diagram.associationViews = val.map(observe_AssociationView);
 });
 export const diagram_deleteAssociationView = action((diagram, val) => {
     deleteEntry(diagram.associationViews, val);
 });
 export const diagram_setGeneralizationViews = action((diagram, val) => {
-    diagram.generalizationViews = val;
+    diagram.generalizationViews = val.map(observe_GeneralizationView);
 });
 export const diagram_addGeneralizationView = action((diagram, val) => {
-    addUniqueEntry(diagram.generalizationViews, val);
+    addUniqueEntry(diagram.generalizationViews, observe_GeneralizationView(val));
 });
 export const diagram_deleteGeneralizationView = action((diagram, val) => {
     deleteEntry(diagram.generalizationViews, val);
 });
 export const diagram_setPropertyViews = action((diagram, val) => {
-    diagram.propertyViews = val;
+    diagram.propertyViews = val.map(observe_PropertyView);
 });
 export const diagram_addPropertyView = action((diagram, val) => {
-    addUniqueEntry(diagram.propertyViews, val);
+    addUniqueEntry(diagram.propertyViews, observe_PropertyView(val));
 });
 export const diagram_deletePropertyView = action((diagram, val) => {
     deleteEntry(diagram.propertyViews, val);
@@ -58,21 +59,24 @@ export const classView_setHideStereotypes = action((cv, val) => {
 export const classView_setHideTaggedValues = action((cv, val) => {
     cv.hideTaggedValues = val;
 });
-export const relationShipEdgeView_setOffsetX = action((r, val) => {
+export const relationshipEdgeView_setOffsetX = action((r, val) => {
     r.offsetX = val;
 });
-export const relationShipEdgeView_setOffsetY = action((r, val) => {
+export const relationshipEdgeView_setOffsetY = action((r, val) => {
     r.offsetY = val;
 });
+// To optimize performance we will not observe point (path)
 export const relationshipView_changePoint = action((v, val, newVal) => {
     changeEntry(v.path, val, newVal);
 });
-export const relationView_possiblyFlattenPath = action(_relationView_possiblyFlattenPath);
+export const relationshipView_simplifyPath = action(_relationshipView_simplifyPath);
 export const findOrBuildPoint = action(_findOrBuildPoint);
-export const relationView_setPath = action(_relationView_setPath);
+export const relationshipView_setPath = action(_relationshipView_setPath);
+// To optimize performance we will not observe rectangle
 export const positionedRectangle_setRectangle = action((pR, value) => {
     pR.rectangle = value;
 });
+// To optimize performance we will not observe point (path)
 export const positionedRectangle_setPosition = action((pR, value) => {
     pR.position = value;
 });
@@ -80,8 +84,11 @@ export const positionedRectangle_setPosition = action((pR, value) => {
  * NOTE: Having `position` and `rectangle` as observables compromises the performance of diagram
  * so we want to have a way to refresh the hash for change detection to pick up new hash when we resize
  * the class view box or move it.
+ *
+ * We should re-consider the usefulness of this method, maybe it's more worthwhile to recompute hash
+ * for the whole diagram instead?
  */
 export const positionedRectangle_forceRefreshHash = action((pR) => {
     pR.dummyObservable = {};
 });
-//# sourceMappingURL=DSLDiagram_ModifierHelper.js.map
+//# sourceMappingURL=DSLDiagram_GraphModifierHelper.js.map

package/lib/stores/studio/DSLDiagram_GraphModifierHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DSLDiagram_GraphModifierHelper.js","sourceRoot":"","sources":["../../../src/stores/studio/DSLDiagram_GraphModifierHelper.ts"],"names":[],"mappings":"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"}

package/lib/stores/studio/DiagramEditorState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiagramEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiagramEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"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"}

package/lib/stores/studio/DiagramEditorState.js

@@ -197,20 +197,20 @@ export class DiagramEditorState extends ElementEditorState {
                 }
                 else if (this.renderer.mouseOverClassProperty) {
                     return this.isReadOnly ||
-                        this.renderer.mouseOverClassProperty.owner.isReadOnly
+                        this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverClassProperty.owner)
                         ? 'diagram-editor__cursor--not-allowed'
                         : 'diagram-editor__cursor--text';
                 }
                 else if (this.renderer.mouseOverPropertyHolderViewLabel) {
                     return this.isReadOnly ||
-                        this.renderer.mouseOverPropertyHolderViewLabel.property.value.owner
-                            .isReadOnly
+                        this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverPropertyHolderViewLabel.property.value
+                            .owner)
                         ? 'diagram-editor__cursor--not-allowed'
                         : 'diagram-editor__cursor--text';
                 }
                 else if (this.renderer.mouseOverClassName) {
                     return this.isReadOnly ||
-                        this.renderer.mouseOverClassName.class.value.isReadOnly
+                        this.editorStore.graphManagerState.isElementReadOnly(this.renderer.mouseOverClassName.class.value)
                         ? 'diagram-editor__cursor--not-allowed'
                         : 'diagram-editor__cursor--text';
                 }
@@ -270,19 +270,22 @@ export class DiagramEditorState extends ElementEditorState {
             this.setContextMenuClassView(classView);
         };
         this.renderer.onClassNameDoubleClick = (classView, point) => {
-            if (!this.isReadOnly && !classView.class.value.isReadOnly) {
+            if (!this.isReadOnly &&
+                !this.editorStore.graphManagerState.isElementReadOnly(classView.class.value)) {
                 this.setInlineClassRenamerState(new DiagramEditorInlineClassRenamerState(this, classView, point));
             }
         };
         const editProperty = (property, point, propertyHolderView) => {
-            if (!this.isReadOnly && !property.owner.isReadOnly) {
+            if (!this.isReadOnly &&
+                !this.editorStore.graphManagerState.isElementReadOnly(property.owner)) {
                 this.setInlinePropertyEditorState(new DiagramEditorInlinePropertyEditorState(this, property, point, Boolean(propertyHolderView)));
             }
         };
         this.renderer.onClassPropertyDoubleClick = editProperty;
         this.renderer.handleEditProperty = editProperty;
         this.renderer.handleAddSimpleProperty = (classView) => {
-            if (!this.isReadOnly && !classView.class.value.isReadOnly) {
+            if (!this.isReadOnly &&
+                !this.editorStore.graphManagerState.isElementReadOnly(classView.class.value)) {
                 const _class = classView.class.value;
                 class_addProperty(_class, new Property(`property_${_class.properties.length + 1}`, this.editorStore.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE), GenericTypeExplicitReference.create(new GenericType(this.editorStore.graphManagerState.graph.getPrimitiveType(PRIMITIVE_TYPE.STRING))), _class));
                 this.renderer.render();

package/lib/stores/studio/DiagramEditorState.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiagramEditorState.js","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAIL,4BAA4B,EAC5B,cAAc,EACd,yBAAyB,EACzB,QAAQ,EACR,WAAW,EACX,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAGtG,IAAK,qBASJ;AATD,WAAK,qBAAqB;IACxB,8CAAqB,CAAA;IACrB,wDAA+B,CAAA;IAC/B,wDAA+B,CAAA;IAC/B,sDAA6B,CAAA;IAC7B,gEAAuC,CAAA;IACvC,sEAA6C,CAAA;IAC7C,gDAAuB,CAAA;IACvB,0DAAiC,CAAA;AACnC,CAAC,EATI,qBAAqB,KAArB,qBAAqB,QASzB;AAED,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,GAAG;IACrC,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG;IAC1C,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG;IAC1C,CAAC,qBAAqB,CAAC,YAAY,CAAC,EAAE,GAAG;IACzC,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,EAAE,GAAG;IAC9C,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,GAAG;IACjD,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,GAAG;IACtC,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE,YAAY;CACrD,CAAC,CAAC;AAEH,MAAM,OAAgB,2BAA2B;IAC/C,IAAI,GAAG,IAAI,EAAE,CAAC;IACd,WAAW,CAAc;IACzB,kBAAkB,CAAqB;IAEvC,YACE,WAAwB,EACxB,kBAAsC;QAEtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,CAAN,IAAY,6BAGX;AAHD,WAAY,6BAA6B;IACvC,oDAAmB,CAAA;IACnB,8CAAa,CAAA;AACf,CAAC,EAHW,6BAA6B,KAA7B,6BAA6B,QAGxC;AAED,MAAM,OAAO,0CAA2C,SAAQ,2BAA2B;IACzF,gBAAgB,CAAmB;IACnC,SAAS,CAAY;IACrB,WAAW,GAAG,6BAA6B,CAAC,OAAO,CAAC;IAEpD,YACE,WAAwB,EACxB,kBAAsC,EACtC,SAAoB;QAEpB,KAAK,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAEvC,cAAc,CAAC,IAAI,EAAE;YACnB,WAAW,EAAE,UAAU;YACvB,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,aAAa,CACnC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CACtC,CAAC,YAAY,EAAoC,EAAE,CACjD,YAAY,YAAY,gBAAgB;YACxC,YAAY,CAAC,OAAO,KAAK,SAAS,CAAC,KAAK,CAAC,KAAK,CACjD,IAAI,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/D,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,GAAkC;QAC/C,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;CACF;AAED,MAAM,OAAO,oCAAoC;IAC/C,kBAAkB,CAAqB;IACvC,KAAK,CAAQ;IAEb,YAAY,kBAAsC,EAAE,KAAY;QAC9D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,oCAAoC;IAC/C,kBAAkB,CAAqB;IACvC,SAAS,CAAY;IACrB,KAAK,CAAQ;IAEb,YACE,kBAAsC,EACtC,SAAoB,EACpB,KAAY;QAEZ,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,sCAAsC;IACjD,kBAAkB,CAAqB;IACvC,QAAQ,CAAoB;IAC5B,KAAK,CAAQ;IACb,qBAAqB,CAAU;IAE/B,YACE,kBAAsC,EACtC,QAA0B,EAC1B,KAAY,EACZ,qBAA8B;QAE9B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,kBAAkB;IACxD,SAAS,CAA+B;IACxC,oBAAoB,GAAG,KAAK,CAAC;IAC7B,qBAAqB,GAAG,IAAI,iBAAiB,CAAC;QAC5C,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,GAAG;KACV,CAAC,CAAC;IACH,cAAc,CAA2C;IACzD,yBAAyB,CAEX;IACd,uBAAuB,CAAoD;IAC3E,uBAAuB,CAAoD;IAC3E,eAAe,GAAG,KAAK,CAAC;IACxB,oBAAoB,CAAyB;IAE7C,YAAY,WAAwB,EAAE,OAA2B;QAC/D,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAE5B,cAAc,CAAC,IAAI,EAAE;YACnB,SAAS,EAAE,UAAU;YACrB,oBAAoB,EAAE,UAAU;YAChC,qBAAqB,EAAE,UAAU;YACjC,cAAc,EAAE,UAAU;YAC1B,yBAAyB,EAAE,UAAU;YACrC,uBAAuB,EAAE,UAAU;YACnC,uBAAuB,EAAE,UAAU;YACnC,eAAe,EAAE,UAAU;YAC3B,oBAAoB,EAAE,UAAU;YAChC,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;YACjB,4BAA4B,EAAE,QAAQ;YACtC,uBAAuB,EAAE,MAAM;YAC/B,WAAW,EAAE,MAAM;YACnB,iBAAiB,EAAE,MAAM;YACzB,4BAA4B,EAAE,MAAM;YACpC,0BAA0B,EAAE,MAAM;YAClC,0BAA0B,EAAE,MAAM;YAClC,kBAAkB,EAAE,MAAM;YAC1B,uBAAuB,EAAE,MAAM;YAC/B,SAAS,EAAE,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,aAAa,CAClB,IAAI,CAAC,OAAO,EACZ,OAAO,EACP,uDAAuD,CACxD,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,oBAAoB,CACzB,IAAI,CAAC,SAAS,EACd,wGAAwG,CACzG,CAAC;IACJ,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,6DAA6D;IAC7D,gFAAgF;IAChF,gDAAgD;IAChD,8DAA8D;IAC9D,IAAI,kBAAkB;QACpB,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE;YACtC,OAAO,EAAE,CAAC;SACX;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;YACzD,OAAO,kCAAkC,CAAC;SAC3C;QACD,QAAQ,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YACrC,KAAK,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBACvC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9D;YACD,KAAK,wBAAwB,CAAC,GAAG,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS;oBAC5B,CAAC,CAAC,kCAAkC;oBACpC,CAAC,CAAC,8BAA8B,CAAC;aACpC;YACD,KAAK,wBAAwB,CAAC,OAAO,CAAC,CAAC;gBACrC,OAAO,iCAAiC,CAAC;aAC1C;YACD,KAAK,wBAAwB,CAAC,QAAQ,CAAC,CAAC;gBACtC,OAAO,kCAAkC,CAAC;aAC3C;YACD,KAAK,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;gBAC9C,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,OAAO,EAAE,CAAC;iBACX;gBACD,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;oBACpE,OAAO,6BAA6B,CAAC;iBACtC;gBACD,OAAO,mCAAmC,CAAC;aAC5C;YACD,KAAK,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;oBAChC,OAAO,mCAAmC,CAAC;iBAC5C;qBAAM,IACL,IAAI,CAAC,QAAQ,CAAC,oBAAoB;oBAClC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EACjC;oBACA,OAAO,gCAAgC,CAAC;iBACzC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE;oBAC/C,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU;wBACrD,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE;oBACzD,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK;6BAChE,UAAU;wBACb,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE;oBAC3C,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU;wBACvD,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE;oBAC3C,OAAO,iCAAiC,CAAC;iBAC1C;gBACD,OAAO,EAAE,CAAC;aACX;YACD;gBACE,OAAO,EAAE,CAAC;SACb;IACH,CAAC;IAED,WAAW,CAAC,GAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,uBAAuB,CAAC,GAAY;QAClC,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;IAClC,CAAC;IAED,iBAAiB,CAAC,GAA4C;QAC5D,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;IAC5B,CAAC;IAED,4BAA4B,CAC1B,GAAuD;QAEvD,IAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED,0BAA0B,CACxB,GAAqD;QAErD,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,0BAA0B,CACxB,GAAqD;QAErD,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAY;QAC7B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;IAC7B,CAAC;IAED,uBAAuB,CAAC,GAA0B;QAChD,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;IAClC,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,mBAAmB,GAAG,CAAC,SAAoB,EAAQ,EAAE;YACzD,IAAI,CAAC,iBAAiB,CACpB,IAAI,0CAA0C,CAC5C,IAAI,CAAC,WAAW,EAChB,IAAI,EACJ,SAAS,CACV,CACF,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QACpC,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,sBAAsB,GAAG,mBAAmB,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QACxD,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAQ,EAAE;YAChD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,IAAI,CAAC,0BAA0B,CAC7B,IAAI,oCAAoC,CAAC,IAAI,EAAE,KAAK,CAAC,CACtD,CAAC;aACH;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,uBAAuB,GAAG,kBAAkB,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,qBAAqB,GAAG,CACpC,SAAoB,EACpB,KAAY,EACN,EAAE;YACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,sBAAsB,GAAG,CACrC,SAAoB,EACpB,KAAY,EACN,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE;gBACzD,IAAI,CAAC,0BAA0B,CAC7B,IAAI,oCAAoC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CACjE,CAAC;aACH;QACH,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,CACnB,QAA0B,EAC1B,KAAY,EACZ,kBAAkD,EAC5C,EAAE;YACR,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE;gBAClD,IAAI,CAAC,4BAA4B,CAC/B,IAAI,sCAAsC,CACxC,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,OAAO,CAAC,kBAAkB,CAAC,CAC5B,CACF,CAAC;aACH;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,0BAA0B,GAAG,YAAY,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,GAAG,YAAY,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,GAAG,CAAC,SAAoB,EAAQ,EAAE;YACrE,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE;gBACzD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;gBACrC,iBAAiB,CACf,MAAM,EACN,IAAI,QAAQ,CACV,YAAY,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,EAC1C,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,sBAAsB,CAC7D,yBAAyB,CAAC,GAAG,CAC9B,EACD,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CACb,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,gBAAgB,CACvD,cAAc,CAAC,MAAM,CACtB,CACF,CACF,EACD,MAAM,CACP,CACF,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aACxB;QACH,CAAC,CAAC;QAEF;;;;;;;;;WASG;QACH;YACE,qBAAqB,CAAC,QAAQ;YAC9B,qBAAqB,CAAC,aAAa;YACnC,qBAAqB,CAAC,aAAa;YACnC,qBAAqB,CAAC,YAAY;YAClC,qBAAqB,CAAC,iBAAiB;YACvC,qBAAqB,CAAC,oBAAoB;YAC1C,qBAAqB,CAAC,SAAS;YAC/B,qBAAqB,CAAC,cAAc;SACrC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,IAAI,CAAC,WAAW,CAAC,SAAS,CACxB,IAAI,mBAAmB,CACrB,GAAG,EACH,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAChC,IAAI,CAAC,yBAAyB,CAAC,CAAC,KAAqB,EAAE,EAAE;gBACvD,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC,CACH,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IAClC,CAAC;IAEO,yBAAyB,GAAG,CAClC,OAAwC,EACL,EAAE,CACrC,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,KAAqB,EAAQ,EAAE;QACxE;QACE,6DAA6D;QAC7D,IAAI,CAAC,WAAW,CAAC,kBAAkB,KAAK,IAAI;YAC5C,wCAAwC;YACxC,IAAI,CAAC,4BAA4B;YACjC,kEAAkE;YAClE,8EAA8E;YAC9E,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,aAAa;YAC5C,wDAAwD;YACxD,oEAAoE;YACpE,0CAA0C;YAC1C,CAAC,CAAC,QAAQ,CAAC,aAAa;gBACtB,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACvC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,CAC7C,CAAC,EACJ;YACA,OAAO,CAAC,KAAK,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,KAAK,CAAC,CAAC;IAEZ,SAAS,CACP,UAA8B,EAC9B,WAAwB;QAExB,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC3E,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"DiagramEditorState.js","sourceRoot":"","sources":["../../../src/stores/studio/DiagramEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAIL,4BAA4B,EAC5B,cAAc,EACd,yBAAyB,EACzB,QAAQ,EACR,WAAW,EACX,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAGtG,IAAK,qBASJ;AATD,WAAK,qBAAqB;IACxB,8CAAqB,CAAA;IACrB,wDAA+B,CAAA;IAC/B,wDAA+B,CAAA;IAC/B,sDAA6B,CAAA;IAC7B,gEAAuC,CAAA;IACvC,sEAA6C,CAAA;IAC7C,gDAAuB,CAAA;IACvB,0DAAiC,CAAA;AACnC,CAAC,EATI,qBAAqB,KAArB,qBAAqB,QASzB;AAED,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,GAAG;IACrC,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG;IAC1C,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG;IAC1C,CAAC,qBAAqB,CAAC,YAAY,CAAC,EAAE,GAAG;IACzC,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,EAAE,GAAG;IAC9C,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,GAAG;IACjD,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,GAAG;IACtC,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE,YAAY;CACrD,CAAC,CAAC;AAEH,MAAM,OAAgB,2BAA2B;IAC/C,IAAI,GAAG,IAAI,EAAE,CAAC;IACd,WAAW,CAAc;IACzB,kBAAkB,CAAqB;IAEvC,YACE,WAAwB,EACxB,kBAAsC;QAEtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,CAAN,IAAY,6BAGX;AAHD,WAAY,6BAA6B;IACvC,oDAAmB,CAAA;IACnB,8CAAa,CAAA;AACf,CAAC,EAHW,6BAA6B,KAA7B,6BAA6B,QAGxC;AAED,MAAM,OAAO,0CAA2C,SAAQ,2BAA2B;IACzF,gBAAgB,CAAmB;IACnC,SAAS,CAAY;IACrB,WAAW,GAAG,6BAA6B,CAAC,OAAO,CAAC;IAEpD,YACE,WAAwB,EACxB,kBAAsC,EACtC,SAAoB;QAEpB,KAAK,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAEvC,cAAc,CAAC,IAAI,EAAE;YACnB,WAAW,EAAE,UAAU;YACvB,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,aAAa,CACnC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CACtC,CAAC,YAAY,EAAoC,EAAE,CACjD,YAAY,YAAY,gBAAgB;YACxC,YAAY,CAAC,OAAO,KAAK,SAAS,CAAC,KAAK,CAAC,KAAK,CACjD,IAAI,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAC/D,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,GAAkC;QAC/C,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IACzB,CAAC;CACF;AAED,MAAM,OAAO,oCAAoC;IAC/C,kBAAkB,CAAqB;IACvC,KAAK,CAAQ;IAEb,YAAY,kBAAsC,EAAE,KAAY;QAC9D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,oCAAoC;IAC/C,kBAAkB,CAAqB;IACvC,SAAS,CAAY;IACrB,KAAK,CAAQ;IAEb,YACE,kBAAsC,EACtC,SAAoB,EACpB,KAAY;QAEZ,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,sCAAsC;IACjD,kBAAkB,CAAqB;IACvC,QAAQ,CAAoB;IAC5B,KAAK,CAAQ;IACb,qBAAqB,CAAU;IAE/B,YACE,kBAAsC,EACtC,QAA0B,EAC1B,KAAY,EACZ,qBAA8B;QAE9B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,kBAAkB;IACxD,SAAS,CAA+B;IACxC,oBAAoB,GAAG,KAAK,CAAC;IAC7B,qBAAqB,GAAG,IAAI,iBAAiB,CAAC;QAC5C,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,GAAG;KACV,CAAC,CAAC;IACH,cAAc,CAA2C;IACzD,yBAAyB,CAEX;IACd,uBAAuB,CAAoD;IAC3E,uBAAuB,CAAoD;IAC3E,eAAe,GAAG,KAAK,CAAC;IACxB,oBAAoB,CAAyB;IAE7C,YAAY,WAAwB,EAAE,OAA2B;QAC/D,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAE5B,cAAc,CAAC,IAAI,EAAE;YACnB,SAAS,EAAE,UAAU;YACrB,oBAAoB,EAAE,UAAU;YAChC,qBAAqB,EAAE,UAAU;YACjC,cAAc,EAAE,UAAU;YAC1B,yBAAyB,EAAE,UAAU;YACrC,uBAAuB,EAAE,UAAU;YACnC,uBAAuB,EAAE,UAAU;YACnC,eAAe,EAAE,UAAU;YAC3B,oBAAoB,EAAE,UAAU;YAChC,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,QAAQ;YACjB,4BAA4B,EAAE,QAAQ;YACtC,uBAAuB,EAAE,MAAM;YAC/B,WAAW,EAAE,MAAM;YACnB,iBAAiB,EAAE,MAAM;YACzB,4BAA4B,EAAE,MAAM;YACpC,0BAA0B,EAAE,MAAM;YAClC,0BAA0B,EAAE,MAAM;YAClC,kBAAkB,EAAE,MAAM;YAC1B,uBAAuB,EAAE,MAAM;YAC/B,SAAS,EAAE,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,aAAa,CAClB,IAAI,CAAC,OAAO,EACZ,OAAO,EACP,uDAAuD,CACxD,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,oBAAoB,CACzB,IAAI,CAAC,SAAS,EACd,wGAAwG,CACzG,CAAC;IACJ,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,6DAA6D;IAC7D,gFAAgF;IAChF,gDAAgD;IAChD,8DAA8D;IAC9D,IAAI,kBAAkB;QACpB,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE;YACtC,OAAO,EAAE,CAAC;SACX;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;YACzD,OAAO,kCAAkC,CAAC;SAC3C;QACD,QAAQ,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YACrC,KAAK,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBACvC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9D;YACD,KAAK,wBAAwB,CAAC,GAAG,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS;oBAC5B,CAAC,CAAC,kCAAkC;oBACpC,CAAC,CAAC,8BAA8B,CAAC;aACpC;YACD,KAAK,wBAAwB,CAAC,OAAO,CAAC,CAAC;gBACrC,OAAO,iCAAiC,CAAC;aAC1C;YACD,KAAK,wBAAwB,CAAC,QAAQ,CAAC,CAAC;gBACtC,OAAO,kCAAkC,CAAC;aAC3C;YACD,KAAK,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;gBAC9C,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,OAAO,EAAE,CAAC;iBACX;gBACD,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;oBACpE,OAAO,6BAA6B,CAAC;iBACtC;gBACD,OAAO,mCAAmC,CAAC;aAC5C;YACD,KAAK,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBACpC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;oBAChC,OAAO,mCAAmC,CAAC;iBAC5C;qBAAM,IACL,IAAI,CAAC,QAAQ,CAAC,oBAAoB;oBAClC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EACjC;oBACA,OAAO,gCAAgC,CAAC;iBACzC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE;oBAC/C,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CAClD,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAC3C;wBACD,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE;oBACzD,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CAClD,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CAAC,QAAQ,CAAC,KAAK;6BAC1D,KAAK,CACT;wBACD,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE;oBAC3C,OAAO,IAAI,CAAC,UAAU;wBACpB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CAClD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAC7C;wBACD,CAAC,CAAC,qCAAqC;wBACvC,CAAC,CAAC,8BAA8B,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE;oBAC3C,OAAO,iCAAiC,CAAC;iBAC1C;gBACD,OAAO,EAAE,CAAC;aACX;YACD;gBACE,OAAO,EAAE,CAAC;SACb;IACH,CAAC;IAED,WAAW,CAAC,GAAoB;QAC9B,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,uBAAuB,CAAC,GAAY;QAClC,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;IAClC,CAAC;IAED,iBAAiB,CAAC,GAA4C;QAC5D,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC;IAC5B,CAAC;IAED,4BAA4B,CAC1B,GAAuD;QAEvD,IAAI,CAAC,yBAAyB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED,0BAA0B,CACxB,GAAqD;QAErD,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,0BAA0B,CACxB,GAAqD;QAErD,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAY;QAC7B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;IAC7B,CAAC;IAED,uBAAuB,CAAC,GAA0B;QAChD,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC;IAClC,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,mBAAmB,GAAG,CAAC,SAAoB,EAAQ,EAAE;YACzD,IAAI,CAAC,iBAAiB,CACpB,IAAI,0CAA0C,CAC5C,IAAI,CAAC,WAAW,EAChB,IAAI,EACJ,SAAS,CACV,CACF,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QACpC,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,sBAAsB,GAAG,mBAAmB,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QACxD,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAQ,EAAE;YAChD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,IAAI,CAAC,0BAA0B,CAC7B,IAAI,oCAAoC,CAAC,IAAI,EAAE,KAAK,CAAC,CACtD,CAAC;aACH;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,uBAAuB,GAAG,kBAAkB,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,qBAAqB,GAAG,CACpC,SAAoB,EACpB,KAAY,EACN,EAAE;YACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,sBAAsB,GAAG,CACrC,SAAoB,EACpB,KAAY,EACN,EAAE;YACR,IACE,CAAC,IAAI,CAAC,UAAU;gBAChB,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CACnD,SAAS,CAAC,KAAK,CAAC,KAAK,CACtB,EACD;gBACA,IAAI,CAAC,0BAA0B,CAC7B,IAAI,oCAAoC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CACjE,CAAC;aACH;QACH,CAAC,CAAC;QACF,MAAM,YAAY,GAAG,CACnB,QAA0B,EAC1B,KAAY,EACZ,kBAAkD,EAC5C,EAAE;YACR,IACE,CAAC,IAAI,CAAC,UAAU;gBAChB,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,EACrE;gBACA,IAAI,CAAC,4BAA4B,CAC/B,IAAI,sCAAsC,CACxC,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,OAAO,CAAC,kBAAkB,CAAC,CAC5B,CACF,CAAC;aACH;QACH,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,0BAA0B,GAAG,YAAY,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,GAAG,YAAY,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,GAAG,CAAC,SAAoB,EAAQ,EAAE;YACrE,IACE,CAAC,IAAI,CAAC,UAAU;gBAChB,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB,CACnD,SAAS,CAAC,KAAK,CAAC,KAAK,CACtB,EACD;gBACA,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;gBACrC,iBAAiB,CACf,MAAM,EACN,IAAI,QAAQ,CACV,YAAY,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,EAC1C,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,sBAAsB,CAC7D,yBAAyB,CAAC,GAAG,CAC9B,EACD,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CACb,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,gBAAgB,CACvD,cAAc,CAAC,MAAM,CACtB,CACF,CACF,EACD,MAAM,CACP,CACF,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aACxB;QACH,CAAC,CAAC;QAEF;;;;;;;;;WASG;QACH;YACE,qBAAqB,CAAC,QAAQ;YAC9B,qBAAqB,CAAC,aAAa;YACnC,qBAAqB,CAAC,aAAa;YACnC,qBAAqB,CAAC,YAAY;YAClC,qBAAqB,CAAC,iBAAiB;YACvC,qBAAqB,CAAC,oBAAoB;YAC1C,qBAAqB,CAAC,SAAS;YAC/B,qBAAqB,CAAC,cAAc;SACrC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,IAAI,CAAC,WAAW,CAAC,SAAS,CACxB,IAAI,mBAAmB,CACrB,GAAG,EACH,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAChC,IAAI,CAAC,yBAAyB,CAAC,CAAC,KAAqB,EAAE,EAAE;gBACvD,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC,CACH,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IAClC,CAAC;IAEO,yBAAyB,GAAG,CAClC,OAAwC,EACL,EAAE,CACrC,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,KAAqB,EAAQ,EAAE;QACxE;QACE,6DAA6D;QAC7D,IAAI,CAAC,WAAW,CAAC,kBAAkB,KAAK,IAAI;YAC5C,wCAAwC;YACxC,IAAI,CAAC,4BAA4B;YACjC,kEAAkE;YAClE,8EAA8E;YAC9E,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,aAAa;YAC5C,wDAAwD;YACxD,oEAAoE;YACpE,0CAA0C;YAC1C,CAAC,CAAC,QAAQ,CAAC,aAAa;gBACtB,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACvC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,CAC7C,CAAC,EACJ;YACA,OAAO,CAAC,KAAK,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,KAAK,CAAC,CAAC;IAEZ,SAAS,CACP,UAA8B,EAC9B,WAAwB;QAExB,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC3E,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-diagram",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Legend extension for Diagram DSL",
   "keywords": [
     "legend",
@@ -40,12 +40,12 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "2.0.8",
-    "@finos/legend-art": "0.3.13",
-    "@finos/legend-graph": "2.1.3",
-    "@finos/legend-model-storage": "0.0.26",
-    "@finos/legend-shared": "1.2.7",
-    "@finos/legend-studio": "5.1.3",
+    "@finos/legend-application": "2.0.9",
+    "@finos/legend-art": "0.3.14",
+    "@finos/legend-graph": "3.0.0",
+    "@finos/legend-model-storage": "0.0.27",
+    "@finos/legend-shared": "1.2.8",
+    "@finos/legend-studio": "5.1.4",
     "@types/react": "17.0.43",
     "mobx": "6.5.0",
     "mobx-react-lite": "3.3.0",
@@ -56,7 +56,7 @@
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "0.3.17",
+    "@finos/legend-dev-utils": "0.3.18",
     "@testing-library/react": "12.1.4",
     "cross-env": "7.0.3",
     "eslint": "8.12.0",
@@ -64,7 +64,7 @@
     "jest-canvas-mock": "2.3.1",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.49.11",
+    "sass": "1.50.0",
     "typescript": "4.6.3"
   },
   "peerDependencies": {

package/src/DiagramRenderer.ts

@@ -45,7 +45,7 @@ import { PositionedRectangle } from './models/metamodels/pure/packageableElement
 import { ClassView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 import type { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView';
 import { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
-import type { RelationshipView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
+import { RelationshipView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
 import { PropertyView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
 import { getElementPosition } from './helpers/DiagramHelper';
 import { AssociationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
@@ -69,13 +69,12 @@ import {
   positionedRectangle_forceRefreshHash,
   positionedRectangle_setPosition,
   positionedRectangle_setRectangle,
-  relationShipEdgeView_setOffsetX,
-  relationShipEdgeView_setOffsetY,
+  relationshipEdgeView_setOffsetX,
+  relationshipEdgeView_setOffsetY,
   relationshipView_changePoint,
-  relationView_possiblyFlattenPath,
-  relationView_setPath,
-} from './stores/studio/DSLDiagram_ModifierHelper';
-import { _relationView_manageInsidePointsDynamically } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
+  relationshipView_simplifyPath,
+  relationshipView_setPath,
+} from './stores/studio/DSLDiagram_GraphModifierHelper';
 
 export enum DIAGRAM_INTERACTION_MODE {
   LAYOUT,
@@ -746,9 +745,8 @@ export class DiagramRenderer {
         .concat(this.diagram.generalizationViews)
         .concat(this.diagram.propertyViews);
       for (const relationshipView of relationshipViews) {
-        let fullPath = relationshipView.buildFullPath();
-        fullPath = _relationView_manageInsidePointsDynamically(
-          fullPath,
+        const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+          relationshipView.buildFullPath(),
           relationshipView.from.classView.value,
           relationshipView.to.classView.value,
         );
@@ -1823,9 +1821,8 @@ export class DiagramRenderer {
   }
 
   private drawPropertyOrAssociation(propertyView: PropertyView): void {
-    let fullPath = propertyView.buildFullPath();
-    fullPath = _relationView_manageInsidePointsDynamically(
-      fullPath,
+    const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+      propertyView.buildFullPath(),
       propertyView.from.classView.value,
       propertyView.to.classView.value,
     );
@@ -1914,9 +1911,8 @@ export class DiagramRenderer {
 
   private drawInheritance(inheritance: GeneralizationView): void {
     const rect = inheritance.to.classView.value.rectangle;
-    let fullPath = inheritance.buildFullPath();
-    fullPath = _relationView_manageInsidePointsDynamically(
-      fullPath,
+    const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+      inheritance.buildFullPath(),
       inheritance.from.classView.value,
       inheritance.to.classView.value,
     );
@@ -2061,21 +2057,23 @@ export class DiagramRenderer {
     return newClasses;
   }
 
-  // TODO: add doc
+  /**
+   * Shift relationship views if both ends' classviews are moved.
+   */
   private potentiallyShiftRelationships(
-    assoViews: RelationshipView[],
+    relationshipViews: RelationshipView[],
     selectedClasses: ClassView[],
     newMovingDeltaX: number,
     newMovingDeltaY: number,
   ): void {
-    assoViews.forEach((assoView) => {
+    relationshipViews.forEach((view) => {
       if (
-        selectedClasses.indexOf(assoView.from.classView.value) !== -1 &&
-        selectedClasses.indexOf(assoView.to.classView.value) !== -1
+        selectedClasses.indexOf(view.from.classView.value) !== -1 &&
+        selectedClasses.indexOf(view.to.classView.value) !== -1
       ) {
-        relationView_setPath(
-          assoView,
-          assoView.path.map(
+        relationshipView_setPath(
+          view,
+          view.path.map(
             (point) =>
               new Point(point.x - newMovingDeltaX, point.y - newMovingDeltaY),
           ),
@@ -2379,13 +2377,13 @@ export class DiagramRenderer {
       switch (this.interactionMode) {
         case DIAGRAM_INTERACTION_MODE.LAYOUT: {
           this.diagram.generalizationViews.forEach((generalizationView) =>
-            relationView_possiblyFlattenPath(generalizationView),
+            relationshipView_simplifyPath(generalizationView),
           );
           this.diagram.associationViews.forEach((associationView) =>
-            relationView_possiblyFlattenPath(associationView),
+            relationshipView_simplifyPath(associationView),
           );
           this.diagram.propertyViews.forEach((propertyView) =>
-            relationView_possiblyFlattenPath(propertyView),
+            relationshipView_simplifyPath(propertyView),
           );
           break;
         }
@@ -2473,7 +2471,7 @@ export class DiagramRenderer {
                 );
 
                 if (gview) {
-                  relationShipEdgeView_setOffsetX(
+                  relationshipEdgeView_setOffsetX(
                     gview.from,
                     -(
                       this.startClassView.position.x +
@@ -2481,7 +2479,7 @@ export class DiagramRenderer {
                       this.selectionStart.x
                     ),
                   );
-                  relationShipEdgeView_setOffsetY(
+                  relationshipEdgeView_setOffsetY(
                     gview.from,
                     -(
                       this.startClassView.position.y +
@@ -2489,7 +2487,7 @@ export class DiagramRenderer {
                       this.selectionStart.y
                     ),
                   );
-                  relationShipEdgeView_setOffsetX(
+                  relationshipEdgeView_setOffsetX(
                     gview.to,
                     -(
                       targetClassView.position.x +
@@ -2497,7 +2495,7 @@ export class DiagramRenderer {
                       eventPointInModelCoordinate.x
                     ),
                   );
-                  relationShipEdgeView_setOffsetY(
+                  relationshipEdgeView_setOffsetY(
                     gview.to,
                     -(
                       targetClassView.position.y +
@@ -3164,9 +3162,8 @@ export class DiagramRenderer {
         ...this.diagram.associationViews,
       ];
       for (const propertyHolderView of propertyHolderViews) {
-        let fullPath = propertyHolderView.buildFullPath();
-        fullPath = _relationView_manageInsidePointsDynamically(
-          fullPath,
+        const fullPath = RelationshipView.pruneUnnecessaryInsidePoints(
+          propertyHolderView.buildFullPath(),
           propertyHolderView.from.classView.value,
           propertyHolderView.to.classView.value,
         );

package/src/components/studio/ClassDiagramPreview.tsx

@@ -21,11 +21,13 @@ import { useApplicationStore } from '@finos/legend-application';
 import type { Class } from '@finos/legend-graph';
 import { InheritanceDiagramRenderer } from './InheritanceDiagramRenderer';
 import { DSL_DIAGRAM_TEST_ID } from './DSLDiagram_TestID';
+import { useEditorStore } from '@finos/legend-studio';
 
 export const ClassDiagramPreview = observer((props: { _class: Class }) => {
   const { _class } = props;
   const applicationStore = useApplicationStore();
-  const classHash = _class.isReadOnly
+  const editorStore = useEditorStore();
+  const classHash = editorStore.graphManagerState.isElementReadOnly(_class)
     ? undefined
     : applicationStore.notifyAndReturnAlternativeOnError(
         () => _class.hashCode,

package/src/components/studio/DiagramEditor.tsx

@@ -112,7 +112,7 @@ import {
   classView_setHideProperties,
   classView_setHideStereotypes,
   classView_setHideTaggedValues,
-} from '../../stores/studio/DSLDiagram_ModifierHelper';
+} from '../../stores/studio/DSLDiagram_GraphModifierHelper';
 
 const DiagramEditorContextMenu = observer(
   forwardRef<
@@ -865,6 +865,7 @@ const DiagramEditorInlineClassCreatorInner = observer(
         package_addElement(
           editorStore.graphManagerState.graph.getOrCreatePackage(packagePath),
           _class,
+          editorStore.changeDetectionState.observerContext,
         );
         editorStore.graphManagerState.graph.addElement(_class);
         editorStore.explorerTreeState.reprocess();