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

package/src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.ts

@@ -17,8 +17,8 @@
 import type { Point } from './DSLDiagram_Point';
 
 export class Vector {
-  x: number;
-  y: number;
+  readonly x: number;
+  readonly y: number;
 
   constructor(x: number, y: number) {
     this.x = x;
@@ -29,7 +29,7 @@ export class Vector {
     return new Vector(b.x - a.x, b.y - a.y);
   }
 
-  norm(): Vector {
+  unit(): Vector {
     const norm = Math.sqrt(this.x * this.x + this.y * this.y);
     return new Vector(this.x / norm, this.y / norm);
   }

package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts

@@ -35,8 +35,10 @@ import type { V1_Point } from '../../model/packageableElements/diagram/geometry/
 import type { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle';
 import type { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView';
 import type { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_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: V1_Point): Point => {
   const x = guaranteeNonNullable(point.x, `Point 'x' coordinate is missing`);
@@ -116,7 +118,7 @@ export const V1_buildPropertyView = (
     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;
 };
 
@@ -142,7 +144,7 @@ export const V1_buildGeneralizationView = (
     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;
 };
 

package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts

@@ -18,7 +18,7 @@ import type { ClassView } from '../../../../../metamodels/pure/packageableElemen
 import type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 import type { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
 import type { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
-import type { RelationShipEdgeView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
+import type { RelationshipEdgeView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView';
 import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point';
 import { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView';
 import { V1_Diagram } from '../../model/packageableElements/diagram/V1_DSLDiagram_Diagram';
@@ -32,7 +32,7 @@ import {
   V1_transformPropertyReference,
 } from '@finos/legend-graph';
 
-const relationshipEdgeViewTransformer = (value: RelationShipEdgeView): string =>
+const relationshipEdgeViewTransformer = (value: RelationshipEdgeView): string =>
   value.classView.value.id;
 
 const createRectangle = (height: number, width: number): V1_Rectangle => {
@@ -52,7 +52,7 @@ const createPoint = (x: number, y: number): V1_Point => {
 const transformPropertyView = (element: PropertyView): V1_PropertyView => {
   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);
@@ -65,7 +65,7 @@ const transformGenerationView = (
 ): V1_GeneralizationView => {
   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/src/stores/studio/{DSLDiagram_ModifierHelper.ts → DSLDiagram_GraphModifierHelper.ts}

@@ -22,24 +22,30 @@ import type { Diagram } from '../../models/metamodels/pure/packageableElements/d
 import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
 import {
   _findOrBuildPoint,
-  _relationView_possiblyFlattenPath,
-  _relationView_setPath,
-} from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper';
+  _relationshipView_simplifyPath,
+  _relationshipView_setPath,
+} from '../../helpers/DiagramHelper';
 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';
 import type { Rectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
+import {
+  observe_AssociationView,
+  observe_ClassView,
+  observe_GeneralizationView,
+  observe_PropertyView,
+} from '../../graphManager/action/changeDetection/DSLDiagram_ObserverHelper';
 
 export const diagram_setClassViews = action(
   (diagram: Diagram, val: ClassView[]): void => {
-    diagram.classViews = val;
+    diagram.classViews = val.map(observe_ClassView);
   },
 );
 export const diagram_addClassView = action(
   (diagram: Diagram, val: ClassView): void => {
-    addUniqueEntry(diagram.classViews, val);
+    addUniqueEntry(diagram.classViews, observe_ClassView(val));
   },
 );
 export const diagram_deleteClassView = action(
@@ -49,7 +55,7 @@ export const diagram_deleteClassView = action(
 );
 export const diagram_setAssociationViews = action(
   (diagram: Diagram, val: AssociationView[]): void => {
-    diagram.associationViews = val;
+    diagram.associationViews = val.map(observe_AssociationView);
   },
 );
 export const diagram_deleteAssociationView = action(
@@ -59,12 +65,15 @@ export const diagram_deleteAssociationView = action(
 );
 export const diagram_setGeneralizationViews = action(
   (diagram: Diagram, val: GeneralizationView[]): void => {
-    diagram.generalizationViews = val;
+    diagram.generalizationViews = val.map(observe_GeneralizationView);
   },
 );
 export const diagram_addGeneralizationView = action(
   (diagram: Diagram, val: GeneralizationView): void => {
-    addUniqueEntry(diagram.generalizationViews, val);
+    addUniqueEntry(
+      diagram.generalizationViews,
+      observe_GeneralizationView(val),
+    );
   },
 );
 export const diagram_deleteGeneralizationView = action(
@@ -74,12 +83,12 @@ export const diagram_deleteGeneralizationView = action(
 );
 export const diagram_setPropertyViews = action(
   (diagram: Diagram, val: PropertyView[]): void => {
-    diagram.propertyViews = val;
+    diagram.propertyViews = val.map(observe_PropertyView);
   },
 );
 export const diagram_addPropertyView = action(
   (diagram: Diagram, val: PropertyView): void => {
-    addUniqueEntry(diagram.propertyViews, val);
+    addUniqueEntry(diagram.propertyViews, observe_PropertyView(val));
   },
 );
 export const diagram_deletePropertyView = action(
@@ -103,34 +112,38 @@ export const classView_setHideTaggedValues = action(
     cv.hideTaggedValues = val;
   },
 );
-export const relationShipEdgeView_setOffsetX = action(
-  (r: RelationShipEdgeView, val: number): void => {
+export const relationshipEdgeView_setOffsetX = action(
+  (r: RelationshipEdgeView, val: number): void => {
     r.offsetX = val;
   },
 );
-export const relationShipEdgeView_setOffsetY = action(
-  (r: RelationShipEdgeView, val: number): void => {
+export const relationshipEdgeView_setOffsetY = action(
+  (r: RelationshipEdgeView, val: number): void => {
     r.offsetY = val;
   },
 );
 
+// To optimize performance we will not observe point (path)
 export const relationshipView_changePoint = action(
   (v: RelationshipView, val: Point, newVal: Point): void => {
     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: PositionedRectangle, value: Rectangle): void => {
     pR.rectangle = value;
   },
 );
+
+// To optimize performance we will not observe point (path)
 export const positionedRectangle_setPosition = action(
   (pR: PositionedRectangle, value: Point): void => {
     pR.position = value;
@@ -140,6 +153,9 @@ export const positionedRectangle_setPosition = action(
  * 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: PositionedRectangle): void => {

package/src/stores/studio/DiagramEditorState.ts

@@ -275,18 +275,24 @@ export class DiagramEditorState extends ElementEditorState {
           return 'diagram-editor__cursor--resize';
         } 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';
         } else if (this.renderer.mouseOverClassView) {
@@ -375,7 +381,12 @@ export class DiagramEditorState extends ElementEditorState {
       classView: ClassView,
       point: Point,
     ): void => {
-      if (!this.isReadOnly && !classView.class.value.isReadOnly) {
+      if (
+        !this.isReadOnly &&
+        !this.editorStore.graphManagerState.isElementReadOnly(
+          classView.class.value,
+        )
+      ) {
         this.setInlineClassRenamerState(
           new DiagramEditorInlineClassRenamerState(this, classView, point),
         );
@@ -386,7 +397,10 @@ export class DiagramEditorState extends ElementEditorState {
       point: Point,
       propertyHolderView: PropertyHolderView | undefined,
     ): void => {
-      if (!this.isReadOnly && !property.owner.isReadOnly) {
+      if (
+        !this.isReadOnly &&
+        !this.editorStore.graphManagerState.isElementReadOnly(property.owner)
+      ) {
         this.setInlinePropertyEditorState(
           new DiagramEditorInlinePropertyEditorState(
             this,
@@ -400,7 +414,12 @@ export class DiagramEditorState extends ElementEditorState {
     this.renderer.onClassPropertyDoubleClick = editProperty;
     this.renderer.handleEditProperty = editProperty;
     this.renderer.handleAddSimpleProperty = (classView: ClassView): void => {
-      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,

package/tsconfig.json

@@ -44,6 +44,7 @@
     "./src/graph/DSLDiagram_PureGraphPlugin.ts",
     "./src/graphManager/DSLDiagram_GraphManagerHelper.ts",
     "./src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts",
+    "./src/graphManager/action/changeDetection/DSLDiagram_ObserverHelper.ts",
     "./src/helpers/DiagramHelper.ts",
     "./src/models/DSLDiagram_ModelUtils.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView.ts",
@@ -51,7 +52,6 @@
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.ts",
-    "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.ts",
@@ -74,7 +74,7 @@
     "./src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts",
     "./src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts",
     "./src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper.ts",
-    "./src/stores/studio/DSLDiagram_ModifierHelper.ts",
+    "./src/stores/studio/DSLDiagram_GraphModifierHelper.ts",
     "./src/stores/studio/DiagramEditorState.ts",
     "./src/components/studio/ClassDiagramPreview.tsx",
     "./src/components/studio/DSLDiagram_LegendStudioPlugin.tsx",

package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.d.ts

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { ClassView } from './DSLDiagram_ClassView';
-import type { RelationshipView } from './DSLDiagram_RelationshipView';
-import { Point } from './geometry/DSLDiagram_Point';
-export declare const _relationView_setPath: (relationView: RelationshipView, val: Point[]) => void;
-/**
- * For a path, only counts the points which lie outside of the 2 class views
- */
-export declare const _relationView_manageInsidePointsDynamically: (path: Point[], from: ClassView, to: ClassView) => Point[];
-/**
- * Flatten the path if the angle is wide enough
- * Also `swallow` points in path which lie inside of the rectangle of a view
- */
-export declare const _relationView_possiblyFlattenPath: (relationView: RelationshipView) => void;
-/**
- * Based on the location, find the point on the path that matches or create new point
- * (within a threshold of proximity) from the coordinate and put this in the path array
- * so it doesn't look too weird
- */
-export declare const _findOrBuildPoint: (relationView: RelationshipView, x: number, y: number, zoom: number, allowChange?: boolean) => Point | undefined;
-//# sourceMappingURL=DSLDiagram_GraphModifierHelper.d.ts.map

package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_GraphModifierHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAGpD,eAAO,MAAM,qBAAqB,iBAClB,gBAAgB,OACzB,KAAK,EAAE,KACX,IAEF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2CAA2C,SAChD,KAAK,EAAE,QACP,SAAS,MACX,SAAS,KACZ,KAAK,EAsBP,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iCAAiC,iBAC9B,gBAAgB,KAC7B,IA8CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,iBACd,gBAAgB,KAC3B,MAAM,KACN,MAAM,QACH,MAAM,4BAEX,KAAK,GAAG,SAwCV,CAAC"}

package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.js

@@ -1,118 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Point } from './geometry/DSLDiagram_Point';
-import { Vector } from './geometry/DSLDiagram_Vector';
-export const _relationView_setPath = (relationView, val) => {
-    relationView.path = val;
-};
-/**
- * For a path, only counts the points which lie outside of the 2 class views
- */
-export const _relationView_manageInsidePointsDynamically = (path, from, to) => {
-    if (!path.length) {
-        return [];
-    }
-    let start = 0;
-    let startPoint = path[start];
-    while (start < path.length - 1 && from.contains(startPoint.x, startPoint.y)) {
-        start++;
-        startPoint = path[start];
-    }
-    let end = path.length - 1;
-    let endPoint = path[end];
-    while (end > 0 && to.contains(endPoint.x, endPoint.y)) {
-        end--;
-        endPoint = path[end];
-    }
-    return path.slice(start - 1, end + 2);
-};
-/**
- * Flatten the path if the angle is wide enough
- * Also `swallow` points in path which lie inside of the rectangle of a view
- */
-export const _relationView_possiblyFlattenPath = (relationView) => {
-    const fullPath = relationView.buildFullPath();
-    // NOTE: this method here will `swallow` up points inside of the boxes
-    const newPath = _relationView_manageInsidePointsDynamically(fullPath, relationView.from.classView.value, relationView.to.classView.value);
-    // recompute the offset point from center inside of `from` and `to` classviews.
-    // for each, we first check if `manageInsidePointsDynamically` removes any points from the full path
-    // if it does we will update the offset
-    if (newPath[0] !== fullPath[0]) {
-        const center = relationView.from.classView.value.center();
-        relationView.from.offsetX = newPath[0].x - center.x;
-        relationView.from.offsetY = newPath[0].y - center.y;
-    }
-    if (newPath[newPath.length - 1] !== fullPath[fullPath.length - 1]) {
-        const center = relationView.to.classView.value.center();
-        relationView.to.offsetX =
-            newPath[newPath.length - 1].x - center.x;
-        relationView.to.offsetY =
-            newPath[newPath.length - 1].y - center.y;
-    }
-    // find the point which can be flattened due to its wide angle
-    const result = [];
-    for (let i = 0; i < newPath.length - 2; i++) {
-        const v1 = Vector.fromPoints(newPath[i + 1], newPath[i]).norm();
-        const v2 = Vector.fromPoints(newPath[i + 1], newPath[i + 2]).norm();
-        const dot = v1.dotProduct(v2);
-        const angle = (Math.acos(dot) * 180) / Math.PI;
-        if (Math.abs(angle - 180) > 5) {
-            result.push(newPath[i + 1]);
-        }
-    }
-    // here's where we will modify the path, i.e. swallow inside points if we have to
-    _relationView_setPath(relationView, result);
-};
-/**
- * Based on the location, find the point on the path that matches or create new point
- * (within a threshold of proximity) from the coordinate and put this in the path array
- * so it doesn't look too weird
- */
-export const _findOrBuildPoint = (relationView, x, y, zoom, allowChange = true) => {
-    for (const pt of relationView.path) {
-        if (Math.sqrt((x - pt.x) * (x - pt.x) + (y - pt.y) * (y - pt.y)) <
-            10 / zoom) {
-            return pt;
-        }
-    }
-    const fullPath = relationView.buildFullPath(allowChange);
-    const newPath = [];
-    let point;
-    for (let i = 0; i < fullPath.length - 1; i++) {
-        const a = fullPath[i];
-        const b = fullPath[i + 1];
-        const n = new Vector(a.x, a.y).normal(new Vector(b.x, b.y)).norm();
-        const v = Vector.fromPoints(a, new Point(x, y));
-        if (Math.abs(n.dotProduct(v)) < 5 / zoom) {
-            const lx = (a.x < b.x ? a.x : b.x) - 5 / zoom;
-            const hx = (a.x < b.x ? b.x : a.x) + 5 / zoom;
-            const ly = (a.y < b.y ? a.y : b.y) - 5 / zoom;
-            const hy = (a.y < b.y ? b.y : a.y) + 5 / zoom;
-            if (lx <= x && x <= hx && ly <= y && y <= hy) {
-                point = new Point(x, y);
-                newPath.push(point);
-            }
-        }
-        if (i < fullPath.length - 2) {
-            newPath.push(fullPath[i + 1]);
-        }
-    }
-    if (point && allowChange) {
-        _relationView_setPath(relationView, newPath);
-    }
-    return point;
-};
-//# sourceMappingURL=DSLDiagram_GraphModifierHelper.js.map

package/lib/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GraphModifierHelper.js.map

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_ModifierHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/studio/DSLDiagram_ModifierHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qFAAqF,CAAC;AAC3H,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+EAA+E,CAAC;AAC/G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAC3G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAC;AAMjI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kFAAkF,CAAC;AACrH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0FAA0F,CAAC;AACrI,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sFAAsF,CAAC;AAC7H,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oFAAoF,CAAC;AAChH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kGAAkG,CAAC;AAC5I,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wFAAwF,CAAC;AAExH,eAAO,MAAM,qBAAqB,YACtB,OAAO,OAAO,SAAS,EAAE,KAAG,IAGvC,CAAC;AACF,eAAO,MAAM,oBAAoB,YACrB,OAAO,OAAO,SAAS,KAAG,IAGrC,CAAC;AACF,eAAO,MAAM,uBAAuB,YACxB,OAAO,OAAO,SAAS,KAAG,IAGrC,CAAC;AACF,eAAO,MAAM,2BAA2B,YAC5B,OAAO,OAAO,eAAe,EAAE,KAAG,IAG7C,CAAC;AACF,eAAO,MAAM,6BAA6B,YAC9B,OAAO,OAAO,eAAe,KAAG,IAG3C,CAAC;AACF,eAAO,MAAM,8BAA8B,YAC/B,OAAO,OAAO,kBAAkB,EAAE,KAAG,IAGhD,CAAC;AACF,eAAO,MAAM,6BAA6B,YAC9B,OAAO,OAAO,kBAAkB,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,gCAAgC,YACjC,OAAO,OAAO,kBAAkB,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,wBAAwB,YACzB,OAAO,OAAO,YAAY,EAAE,KAAG,IAG1C,CAAC;AACF,eAAO,MAAM,uBAAuB,YACxB,OAAO,OAAO,YAAY,KAAG,IAGxC,CAAC;AACF,eAAO,MAAM,0BAA0B,YAC3B,OAAO,OAAO,YAAY,KAAG,IAGxC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OACjC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,4BAA4B,OAClC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,6BAA6B,OACnC,SAAS,OAAO,OAAO,KAAG,IAGhC,CAAC;AACF,eAAO,MAAM,+BAA+B,MACtC,oBAAoB,OAAO,MAAM,KAAG,IAGzC,CAAC;AACF,eAAO,MAAM,+BAA+B,MACtC,oBAAoB,OAAO,MAAM,KAAG,IAGzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,MACnC,gBAAgB,OAAO,KAAK,UAAU,KAAK,KAAG,IAGnD,CAAC;AACF,eAAO,MAAM,gCAAgC,0CAE5C,CAAC;AAEF,eAAO,MAAM,gBAAgB,kHAA4B,CAAC;AAC1D,eAAO,MAAM,oBAAoB,wDAAgC,CAAC;AAElE,eAAO,MAAM,gCAAgC,OACtC,mBAAmB,SAAS,SAAS,KAAG,IAG9C,CAAC;AACF,eAAO,MAAM,+BAA+B,OACrC,mBAAmB,SAAS,KAAK,KAAG,IAG1C,CAAC;AACF;;;;GAIG;AACH,eAAO,MAAM,oCAAoC,OAC1C,mBAAmB,KAAG,IAG5B,CAAC"}

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

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