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

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 { RelationshipViewEnd } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.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 => {
@@ -113,22 +113,23 @@ export const classView_setHideTaggedValues = action(
   },
 );
 export const relationshipEdgeView_setOffsetX = action(
-  (r: RelationshipEdgeView, val: number): void => {
-    r.offsetX = val;
+  (r: RelationshipViewEnd, val: number): void => {
+    r._offsetX = val;
   },
 );
 export const relationshipEdgeView_setOffsetY = action(
-  (r: RelationshipEdgeView, val: number): void => {
-    r.offsetY = val;
+  (r: RelationshipViewEnd, val: number): void => {
+    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",
@@ -56,12 +53,11 @@
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.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",
     "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts",
+    "./src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.ts",
     "./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__/**/*.*"
   ]
 }

package/tsconfig.package.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,

package/lib/helpers/DiagramHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DiagramHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/DiagramHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mFAAmF,CAAC;AACrH,OAAO,EAAE,KAAK,EAAE,MAAM,iFAAiF,CAAC;AAExG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4EAA4E,CAAC;AAC5G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0EAA0E,CAAC;AAExG;;GAEG;AACH,eAAO,MAAM,kBAAkB,YAAa,WAAW,KAAG,KASzD,CAAC;AAEF,eAAO,MAAM,YAAY,YACd,OAAO,gBACF,MAAM,KACnB,SAAS,GAAG,SACwD,CAAC;AAExE,eAAO,MAAM,8BAA8B,YAChC,OAAO,SACT,SAAS,KACf,IAkCF,CAAC;AAEF,eAAO,MAAM,yBAAyB,qBAClB,gBAAgB,OAC7B,KAAK,EAAE,KACX,IAEF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,qBACvB,gBAAgB,KACjC,IA8CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,qBACV,gBAAgB,KAC/B,MAAM,KACN,MAAM,QACH,MAAM,eACC,OAAO,KACnB,KAAK,GAAG,SA2CV,CAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_RelationshipEdgeView.d.ts","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,qBAAa,oBAAoB;IAC/B,SAAS,EAAE,kBAAkB,CAAC;IAC9B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEjB,SAAS,EAAE,kBAAkB;CAG1C"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_RelationshipEdgeView.js","sourceRoot":"","sources":["../../../../../../src/models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipEdgeView.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,MAAM,OAAO,oBAAoB;IAC/B,SAAS,CAAqB;IAC9B;;;;OAIG;IACH,OAAO,CAAsB;IAC7B,OAAO,CAAsB;IAE7B,YAAY,SAA6B;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;CACF"}

package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.d.ts

@@ -1,26 +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 { Point } from './DSLDiagram_Point';
-export declare class Vector {
-    readonly x: number;
-    readonly y: number;
-    constructor(x: number, y: number);
-    static fromPoints(a: Point, b: Point): Vector;
-    unit(): Vector;
-    normal(other: Vector): Vector;
-    dotProduct(other: Vector): number;
-}
-//# sourceMappingURL=DSLDiagram_Vector.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_Vector.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,qBAAa,MAAM;IACjB,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;gBAEP,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;IAKhC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM;IAI7C,IAAI,IAAI,MAAM;IAKd,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAGlC"}

package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.js

@@ -1,37 +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.
- */
-export class Vector {
-    x;
-    y;
-    constructor(x, y) {
-        this.x = x;
-        this.y = y;
-    }
-    static fromPoints(a, b) {
-        return new Vector(b.x - a.x, b.y - a.y);
-    }
-    unit() {
-        const norm = Math.sqrt(this.x * this.x + this.y * this.y);
-        return new Vector(this.x / norm, this.y / norm);
-    }
-    normal(other) {
-        return new Vector(other.y - this.y, -(other.x - this.x));
-    }
-    dotProduct(other) {
-        return this.x * other.x + this.y * other.y;
-    }
-}
-//# sourceMappingURL=DSLDiagram_Vector.js.map

package/lib/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_Vector.js","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Vector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,MAAM,OAAO,MAAM;IACR,CAAC,CAAS;IACV,CAAC,CAAS;IAEnB,YAAY,CAAS,EAAE,CAAS;QAC9B,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,CAAQ,EAAE,CAAQ;QAClC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF"}

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

@@ -1,44 +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 { Point } from './DSLDiagram_Point';
-
-export class Vector {
-  readonly x: number;
-  readonly y: number;
-
-  constructor(x: number, y: number) {
-    this.x = x;
-    this.y = y;
-  }
-
-  static fromPoints(a: Point, b: Point): Vector {
-    return new Vector(b.x - a.x, b.y - a.y);
-  }
-
-  unit(): Vector {
-    const norm = Math.sqrt(this.x * this.x + this.y * this.y);
-    return new Vector(this.x / norm, this.y / norm);
-  }
-
-  normal(other: Vector): Vector {
-    return new Vector(other.y - this.y, -(other.x - this.x));
-  }
-
-  dotProduct(other: Vector): number {
-    return this.x * other.x + this.y * other.y;
-  }
-}