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

package/src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts

@@ -15,12 +15,12 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { RelationshipEdgeView } from './DSLDiagram_RelationshipEdgeView';
-import { Point } from './geometry/DSLDiagram_Point';
-import type { ClassView } from './DSLDiagram_ClassView';
-import type { Diagram } from './DSLDiagram_Diagram';
-import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
+import { RelationshipEdgeView } from './DSLDiagram_RelationshipEdgeView.js';
+import { Point } from './geometry/DSLDiagram_Point.js';
+import type { ClassView } from './DSLDiagram_ClassView.js';
+import type { Diagram } from './DSLDiagram_Diagram.js';
+import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
 
 export class RelationshipView implements Hashable {
   readonly _OWNER: Diagram;
@@ -47,6 +47,8 @@ export class RelationshipView implements Hashable {
     this.to = new RelationshipEdgeView(ClassViewExplicitReference.create(to));
   }
 
+  // TODO: to be simplified out of metamodel
+  // we will move these when we move hashing out of metamodel
   /**
    * Calculate the end points of the edge using offset, otherwise, use the center
    */
@@ -56,18 +58,20 @@ export class RelationshipView implements Hashable {
   ): Point {
     const box = edgeView.classView.value;
     const center = edgeView.classView.value.center();
-    const newX = center.x + (edgeView.offsetX ?? 0);
-    const newY = center.y + (edgeView.offsetY ?? 0);
+    const newX = center.x + (edgeView._offsetX ?? 0);
+    const newY = center.y + (edgeView._offsetY ?? 0);
     if (box.contains(newX, newY)) {
       return new Point(newX, newY);
     }
     if (allowChange) {
-      edgeView.offsetX = 0;
-      edgeView.offsetY = 0;
+      edgeView._offsetX = 0;
+      edgeView._offsetY = 0;
     }
     return new Point(center.x, center.y);
   }
 
+  // TODO: to be simplified out of metamodel
+  // we will move these when we move hashing out of metamodel
   /**
    * Compute the full path for the relationship view (including the ends even if these
    * ends lie inside of the classviews)
@@ -83,6 +87,8 @@ export class RelationshipView implements Hashable {
     ];
   }
 
+  // TODO: to be simplified out of metamodel
+  // we will move these when we move hashing out of metamodel
   /**
    * For a path, only keep **at most** 1 point at each end that lies inside the class view.
    * If there is no inside points, none of kept, so the path only contains outside points.
@@ -122,6 +128,8 @@ export class RelationshipView implements Hashable {
     return path.slice(start - 1, end + 2);
   };
 
+  // TODO: to be simplified out of metamodel
+  // we will move these when we move hashing out of metamodel
   /**
    * This method will compute the full path from the offset within class view for serialization and persistence purpose
    */

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

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils.js';
 
 export class Point implements Hashable {
   readonly x: number;
@@ -26,14 +26,6 @@ export class Point implements Hashable {
     this.y = y;
   }
 
-  rotateX(angle: number): number {
-    return this.x * Math.cos(angle) - this.y * Math.sin(angle);
-  }
-
-  rotateY(angle: number): number {
-    return this.x * Math.sin(angle) + this.y * Math.cos(angle);
-  }
-
   get hashCode(): string {
     return hashArray([
       DIAGRAM_HASH_STRUCTURE.POINT,

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

@@ -15,63 +15,31 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { Point } from './DSLDiagram_Point';
-import { Rectangle } from './DSLDiagram_Rectangle';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';
+import { Point } from './DSLDiagram_Point.js';
+import { Rectangle } from './DSLDiagram_Rectangle.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils.js';
 
 export class PositionedRectangle implements Hashable {
+  _dummyObservable = {};
+
   position: Point;
   rectangle: Rectangle;
-  dummyObservable = {};
 
   constructor(position: Point, rectangle: Rectangle) {
     this.position = position;
     this.rectangle = rectangle;
   }
 
-  edgePoint = (): Point =>
-    new Point(
-      this.position.x + this.rectangle.width,
-      this.position.y + this.rectangle.height,
-    );
+  // TODO: to be simplified out of metamodel
+  // to be moved out when we move hashing out
   center = (): Point =>
     new Point(
       this.position.x + this.rectangle.width / 2,
       this.position.y + this.rectangle.height / 2,
     );
 
-  /**
-   * Build a small box at the bottom right corner of the rectangle so we can use that for selection to resize the box
-   */
-  buildBottomRightCornerBox(): PositionedRectangle {
-    const cornerX = this.position.x + this.rectangle.width;
-    const cornerY = this.position.y + this.rectangle.height;
-    const boxSize = 10;
-    return new PositionedRectangle(
-      new Point(cornerX - boxSize / 2, cornerY - boxSize / 2),
-      new Rectangle(boxSize, boxSize),
-    );
-  }
-
-  boxContains(otherBox: PositionedRectangle): boolean {
-    otherBox = this.normalizeBox(otherBox);
-    return (
-      this.contains(otherBox.position.x, otherBox.position.y) ||
-      this.contains(
-        otherBox.position.x + otherBox.rectangle.width,
-        otherBox.position.y,
-      ) ||
-      this.contains(
-        otherBox.position.x,
-        otherBox.position.y + otherBox.rectangle.height,
-      ) ||
-      this.contains(
-        otherBox.position.x + otherBox.rectangle.width,
-        otherBox.position.y + otherBox.rectangle.height,
-      )
-    );
-  }
-
+  // TODO: to be simplified out of metamodel
+  // to be moved out when we move hashing out
   contains(x: number, y: number): boolean {
     const box = this.normalizeBox(this);
     return (
@@ -82,6 +50,8 @@ export class PositionedRectangle implements Hashable {
     );
   }
 
+  // TODO: to be simplified out of metamodel
+  // to be moved out when we move hashing out
   normalizeBox(box: PositionedRectangle): PositionedRectangle {
     let newBox = box;
     if (box.rectangle.width < 0) {
@@ -100,7 +70,7 @@ export class PositionedRectangle implements Hashable {
   }
 
   get hashCode(): string {
-    this.dummyObservable; // manually trigger classview hash code recomputation
+    this._dummyObservable; // manually trigger class-view hash code recomputation
     return hashArray([
       DIAGRAM_HASH_STRUCTURE.POSITIONED_RECTANGLE,
       this.position,

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

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils.js';
 
 export class Rectangle implements Hashable {
   readonly width: number;

package/src/models/protocols/pure/DSLDiagram_PureProtocolProcessorPlugin.ts

@@ -15,13 +15,13 @@
  */
 
 import packageJson from '../../../../package.json';
-import { V1_Diagram } from './v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram';
+import { V1_Diagram } from './v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram.js';
 import { type PlainObject, assertType } from '@finos/legend-shared';
 import { deserialize, serialize } from 'serializr';
 import {
   V1_diagramModelSchema,
   V1_DIAGRAM_ELEMENT_PROTOCOL_TYPE,
-} from './v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper';
+} from './v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper.js';
 import {
   type PackageableElement,
   type V1_ElementProtocolClassifierPathGetter,
@@ -35,14 +35,14 @@ import {
   V1_ElementBuilder,
   V1_buildFullPath,
 } from '@finos/legend-graph';
-import { V1_transformDiagram } from './v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper';
-import { Diagram } from '../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
-import { getOwnDiagram } from '../../../graphManager/DSLDiagram_GraphManagerHelper';
+import { V1_transformDiagram } from './v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.js';
+import { Diagram } from '../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { getOwnDiagram } from '../../../graphManager/DSLDiagram_GraphManagerHelper.js';
 import {
   V1_buildClassView,
   V1_buildGeneralizationView,
   V1_buildPropertyView,
-} from './v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper';
+} from './v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.js';
 
 const DIAGRAM_ELEMENT_CLASSIFIER_PATH =
   'meta::pure::metamodel::diagram::Diagram';

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_ClassView.ts

@@ -15,8 +15,8 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { V1_PositionedRectangle } from './geometry/V1_DSLDiagram_PositionedRectangle';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import { V1_PositionedRectangle } from './geometry/V1_DSLDiagram_PositionedRectangle.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_ClassView extends V1_PositionedRectangle implements Hashable {
   id!: string;

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram.ts

@@ -15,14 +15,14 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { V1_ClassView } from './V1_DSLDiagram_ClassView';
-import type { V1_PropertyView } from './V1_DSLDiagram_PropertyView';
-import type { V1_GeneralizationView } from './V1_DSLDiagram_GeneralizationView';
+import type { V1_ClassView } from './V1_DSLDiagram_ClassView.js';
+import type { V1_PropertyView } from './V1_DSLDiagram_PropertyView.js';
+import type { V1_GeneralizationView } from './V1_DSLDiagram_GeneralizationView.js';
 import {
   type V1_PackageableElementVisitor,
   V1_PackageableElement,
 } from '@finos/legend-graph';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_Diagram extends V1_PackageableElement implements Hashable {
   classViews: V1_ClassView[] = [];

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView.ts

@@ -15,9 +15,9 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { V1_RelationshipView } from './V1_DSLDiagram_RelationshipView';
-import type { V1_Line } from './geometry/V1_DSLDiagram_Line';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import { V1_RelationshipView } from './V1_DSLDiagram_RelationshipView.js';
+import type { V1_Line } from './geometry/V1_DSLDiagram_Line.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_GeneralizationView
   extends V1_RelationshipView

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_PropertyHolderView.ts

@@ -15,8 +15,8 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { V1_RelationshipView } from './V1_DSLDiagram_RelationshipView';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import { V1_RelationshipView } from './V1_DSLDiagram_RelationshipView.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 import type { V1_PropertyPointer } from '@finos/legend-graph';
 
 export class V1_PropertyHolderView

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_PropertyView.ts

@@ -15,8 +15,8 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { V1_PropertyHolderView } from './V1_DSLDiagram_PropertyHolderView';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import { V1_PropertyHolderView } from './V1_DSLDiagram_PropertyHolderView.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 import type { V1_PropertyPointer } from '@finos/legend-graph';
 
 export class V1_PropertyView extends V1_PropertyHolderView implements Hashable {

package/src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_RelationshipView.ts

@@ -15,8 +15,8 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { V1_Line } from './geometry/V1_DSLDiagram_Line';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
+import type { V1_Line } from './geometry/V1_DSLDiagram_Line.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_RelationshipView implements Hashable {
   sourceView!: string;

package/src/models/protocols/pure/v1/model/packageableElements/diagram/geometry/V1_DSLDiagram_Line.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { V1_Point } from './V1_DSLDiagram_Point';
+import type { V1_Point } from './V1_DSLDiagram_Point.js';
 
 export class V1_Line {
   points: V1_Point[] = [];

package/src/models/protocols/pure/v1/model/packageableElements/diagram/geometry/V1_DSLDiagram_Point.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_Point implements Hashable {
   x!: number;

package/src/models/protocols/pure/v1/model/packageableElements/diagram/geometry/V1_DSLDiagram_PositionedRectangle.ts

@@ -15,9 +15,9 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { V1_Point } from './V1_DSLDiagram_Point';
-import type { V1_Rectangle } from './V1_DSLDiagram_Rectangle';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils';
+import type { V1_Point } from './V1_DSLDiagram_Point.js';
+import type { V1_Rectangle } from './V1_DSLDiagram_Rectangle.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_PositionedRectangle implements Hashable {
   rectangle!: V1_Rectangle;

package/src/models/protocols/pure/v1/model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../DSLDiagram_ModelUtils.js';
 
 export class V1_Rectangle implements Hashable {
   width!: number;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { getDiagram } from '../../../../../../graphManager/DSLDiagram_GraphManagerHelper';
+import { getDiagram } from '../../../../../../graphManager/DSLDiagram_GraphManagerHelper.js';
 import type {
   PackageableElementImplicitReference,
   V1_GraphBuilderContext,
@@ -24,21 +24,21 @@ import {
   assertNonNullable,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
-import { ClassView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
-import { Point } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
-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 type { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView';
-import type { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point';
-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 type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { ClassView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import { Point } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import { Rectangle } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
+import { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
+import type { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView.js';
+import type { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point.js';
+import type { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle.js';
+import type { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView.js';
+import type { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView.js';
 import {
   getClassView,
   _relationshipView_simplifyPath,
-} from '../../../../../../helpers/DiagramHelper';
+} from '../../../../../../helpers/DSLDiagram_Helper.js';
 
 const buildPoint = (point: V1_Point): Point => {
   const x = guaranteeNonNullable(point.x, `Point 'x' coordinate is missing`);

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

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import type { ClassView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
-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 { 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';
-import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView';
-import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Line';
-import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle';
-import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView';
+import type { ClassView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
+import type { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import type { RelationshipEdgeView } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.js';
+import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point.js';
+import { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView.js';
+import { V1_Diagram } from '../../model/packageableElements/diagram/V1_DSLDiagram_Diagram.js';
+import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView.js';
+import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Line.js';
+import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle.js';
+import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView.js';
 import {
   V1_initPackageableElement,
   V1_transformElementReference,

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper.ts

@@ -19,13 +19,13 @@ import {
   usingConstantValueSchema,
   usingModelSchema,
 } from '@finos/legend-shared';
-import { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView';
-import { V1_Diagram } from '../../model/packageableElements/diagram/V1_DSLDiagram_Diagram';
-import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point';
-import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle';
-import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Line';
-import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView';
-import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView';
+import { V1_ClassView } from '../../model/packageableElements/diagram/V1_DSLDiagram_ClassView.js';
+import { V1_Diagram } from '../../model/packageableElements/diagram/V1_DSLDiagram_Diagram.js';
+import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Point.js';
+import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Rectangle.js';
+import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_DSLDiagram_Line.js';
+import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_DSLDiagram_PropertyView.js';
+import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView.js';
 import { V1_propertyPointerModelSchema } from '@finos/legend-graph';
 
 export const V1_DIAGRAM_ELEMENT_PROTOCOL_TYPE = 'diagram';

package/src/stores/studio/DSLDiagram_GraphModifierHelper.ts

@@ -16,27 +16,27 @@
 
 import { addUniqueEntry, changeEntry, deleteEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
-import type { AssociationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
-import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
-import type { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
-import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
+import type { AssociationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView.js';
+import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { GeneralizationView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
 import {
   _findOrBuildPoint,
   _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 { 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';
+} from '../../helpers/DSLDiagram_Helper.js';
+import type { PropertyView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import type { RelationshipEdgeView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.js';
+import type { RelationshipView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
+import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import type { PositionedRectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
+import type { Rectangle } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
 import {
   observe_AssociationView,
   observe_ClassView,
   observe_GeneralizationView,
   observe_PropertyView,
-} from '../../graphManager/action/changeDetection/DSLDiagram_ObserverHelper';
+} from '../../graphManager/action/changeDetection/DSLDiagram_ObserverHelper.js';
 
 export const diagram_setClassViews = action(
   (diagram: Diagram, val: ClassView[]): void => {
@@ -114,21 +114,22 @@ export const classView_setHideTaggedValues = action(
 );
 export const relationshipEdgeView_setOffsetX = action(
   (r: RelationshipEdgeView, val: number): void => {
-    r.offsetX = val;
+    r._offsetX = val;
   },
 );
 export const relationshipEdgeView_setOffsetY = action(
   (r: RelationshipEdgeView, val: number): void => {
-    r.offsetY = val;
+    r._offsetY = val;
   },
 );
 
-// To optimize performance we will not observe point (path)
+// NOTE: To optimize performance, for now, 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 relationshipView_simplifyPath = action(
   _relationshipView_simplifyPath,
 );
@@ -136,19 +137,20 @@ export const relationshipView_simplifyPath = action(
 export const findOrBuildPoint = action(_findOrBuildPoint);
 export const relationshipView_setPath = action(_relationshipView_setPath);
 
-// To optimize performance we will not observe rectangle
+// NOTE: To optimize performance, for now, 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)
+// NOTE: To optimize performance, for now, we will not observe point (path)
 export const positionedRectangle_setPosition = action(
   (pR: PositionedRectangle, value: Point): void => {
     pR.position = 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
@@ -159,6 +161,6 @@ export const positionedRectangle_setPosition = action(
  */
 export const positionedRectangle_forceRefreshHash = action(
   (pR: PositionedRectangle): void => {
-    pR.dummyObservable = {};
+    pR._dummyObservable = {};
   },
 );

package/src/stores/studio/DiagramEditorState.ts

@@ -24,7 +24,7 @@ import {
 import {
   type DiagramRenderer,
   DIAGRAM_INTERACTION_MODE,
-} from '../../DiagramRenderer';
+} from '../../DiagramRenderer.js';
 import { HotkeyConfiguration, PanelDisplayState } from '@finos/legend-art';
 import {
   type PackageableElement,
@@ -43,10 +43,10 @@ import {
   ElementEditorState,
   class_addProperty,
 } from '@finos/legend-studio';
-import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
-import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
-import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
-import type { PropertyHolderView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView';
+import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { PropertyHolderView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.js';
 
 enum DIAGRAM_EDITOR_HOTKEY {
   RECENTER = 'RECENTER',

package/tsconfig.json

@@ -12,14 +12,11 @@
     "declarationMap": true,
     "sourceMap": true,
     "target": "esnext",
-    "module": "esnext",
+    "module": "nodenext",
     "skipLibCheck": true,
-    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "importsNotUsedAsValues": "error",
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
@@ -47,7 +44,7 @@
     "./src/graphManager/DSLDiagram_GraphManagerHelper.ts",
     "./src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts",
     "./src/graphManager/action/changeDetection/DSLDiagram_ObserverHelper.ts",
-    "./src/helpers/DiagramHelper.ts",
+    "./src/helpers/DSLDiagram_Helper.ts",
     "./src/models/DSLDiagram_ModelUtils.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.ts",
@@ -61,7 +58,6 @@
     "./src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts",
     "./src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.ts",
-    "./src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.ts",
     "./src/models/protocols/pure/DSLDiagram_PureProtocolProcessorPlugin.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_ClassView.ts",
     "./src/models/protocols/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram.ts",
@@ -89,9 +85,7 @@
     "src/**/*.json"
   ],
   "exclude": [
-    "src/**/__tests__/**/*.ts",
-    "src/**/__tests__/**/*.tsx",
-    "src/**/__mocks__/**/*.ts",
-    "src/**/__mocks__/**/*.tsx"
+    "src/**/__tests__/**/*.*",
+    "src/**/__mocks__/**/*.*"
   ]
 }