@finos/legend-extension-dsl-diagram 0.1.0 → 1.0.2

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

@@ -33,20 +33,24 @@ export const manageInsidePointsDynamically = (
   from: ClassView,
   to: ClassView,
 ): Point[] => {
+  if (!path.length) {
+    return [];
+  }
+
   let start = 0;
-  let startPoint = path[start];
+  let startPoint = path[start] as Point;
 
   while (start < path.length - 1 && from.contains(startPoint.x, startPoint.y)) {
     start++;
-    startPoint = path[start];
+    startPoint = path[start] as Point;
   }
 
   let end = path.length - 1;
-  let endPoint = path[end];
+  let endPoint = path[end] as Point;
 
   while (end > 0 && to.contains(endPoint.x, endPoint.y)) {
     end--;
-    endPoint = path[end];
+    endPoint = path[end] as Point;
   }
 
   return path.slice(start - 1, end + 2);
@@ -123,25 +127,31 @@ export class RelationshipView implements Hashable {
     // if it does we will update the offset
     if (newPath[0] !== fullPath[0]) {
       const center = this.from.classView.value.center();
-      this.from.setOffsetX(newPath[0].x - center.x);
-      this.from.setOffsetY(newPath[0].y - center.y);
+      this.from.setOffsetX((newPath[0] as Point).x - center.x);
+      this.from.setOffsetY((newPath[0] as Point).y - center.y);
     }
 
     if (newPath[newPath.length - 1] !== fullPath[fullPath.length - 1]) {
       const center = this.to.classView.value.center();
-      this.to.setOffsetX(newPath[newPath.length - 1].x - center.x);
-      this.to.setOffsetY(newPath[newPath.length - 1].y - center.y);
+      this.to.setOffsetX((newPath[newPath.length - 1] as Point).x - center.x);
+      this.to.setOffsetY((newPath[newPath.length - 1] as Point).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 v1 = Vector.fromPoints(
+        newPath[i + 1] as Point,
+        newPath[i] as Point,
+      ).norm();
+      const v2 = Vector.fromPoints(
+        newPath[i + 1] as Point,
+        newPath[i + 2] as Point,
+      ).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]);
+        result.push(newPath[i + 1] as Point);
       }
     }
     // here's where we will modify the path, i.e. swallow inside points if we have to
@@ -173,8 +183,8 @@ export class RelationshipView implements Hashable {
     let point;
 
     for (let i = 0; i < fullPath.length - 1; i++) {
-      const a = fullPath[i];
-      const b = fullPath[i + 1];
+      const a = fullPath[i] as Point;
+      const b = fullPath[i + 1] as Point;
       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));
 
@@ -191,7 +201,7 @@ export class RelationshipView implements Hashable {
       }
 
       if (i < fullPath.length - 2) {
-        newPath.push(fullPath[i + 1]);
+        newPath.push(fullPath[i + 1] as Point);
       }
     }
     if (point && allowChange) {

package/src/stores/studio/DiagramEditorState.ts

@@ -22,7 +22,7 @@ import {
 } from '@finos/legend-shared';
 import type { DiagramRenderer } from '../../DiagramRenderer';
 import { DIAGRAM_INTERACTION_MODE } from '../../DiagramRenderer';
-import { PanelDisplayState } from '@finos/legend-art';
+import { HotkeyConfiguration, PanelDisplayState } from '@finos/legend-art';
 import type {
   PackageableElement,
   AbstractProperty,
@@ -37,11 +37,7 @@ import {
   PropertyExplicitReference,
 } from '@finos/legend-graph';
 import type { EditorStore } from '@finos/legend-studio';
-import {
-  ClassEditorState,
-  EditorHotkey,
-  ElementEditorState,
-} from '@finos/legend-studio';
+import { ClassEditorState, ElementEditorState } from '@finos/legend-studio';
 import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/ClassView';
 import type { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/Point';
 import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/Diagram';
@@ -441,7 +437,7 @@ export class DiagramEditorState extends ElementEditorState {
       DIAGRAM_EDITOR_HOTKEY.EJECT_PROPERTY,
     ].forEach((key) => {
       this.editorStore.addHotKey(
-        new EditorHotkey(
+        new HotkeyConfiguration(
           key,
           [DIAGRAM_EDITOR_HOTKEY_MAP[key]],
           this.createDiagramHotKeyAction((event?: KeyboardEvent) => {

package/tsconfig.json

@@ -22,6 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./lib",
@@ -74,8 +75,8 @@
     "./src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDiagram_ProtocolHelper.ts",
     "./src/stores/studio/DiagramEditorState.ts",
     "./src/components/studio/ClassDiagramPreview.tsx",
-    "./src/components/studio/DSLDiagram_StudioPlugin.tsx",
-    "./src/components/studio/DSLDiagram_StudioPlugin_Extension.tsx",
+    "./src/components/studio/DSLDiagram_LegendStudioPlugin.tsx",
+    "./src/components/studio/DSLDiagram_LegendStudioPlugin_Extension.tsx",
     "./src/components/studio/DiagramEditor.tsx"
   ],
   "include": [

package/tsconfig.package.json

@@ -22,6 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./lib",

package/lib/components/studio/DSLDiagram_StudioPlugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_StudioPlugin.d.ts","sourceRoot":"","sources":["../../../src/components/studio/DSLDiagram_StudioPlugin.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAG1B,yBAAyB,EACzB,iBAAiB,EACjB,mCAAmC,EACnC,iBAAiB,EACjB,qBAAqB,EACrB,0BAA0B,EAE1B,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAWpD,qBAAa,uBACX,SAAQ,YACR,YAAW,0BAA0B;;IAMrC,OAAO,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAIxC,6BAA6B,IAAI,oBAAoB,EAAE;IAQhE,6BAA6B,IAAI,MAAM,EAAE;IAIzC,0BAA0B,IAAI,iBAAiB,EAAE;IAWjD,0BAA0B,IAAI,iBAAiB,EAAE;IAejD,8BAA8B,IAAI,qBAAqB,EAAE;IAWzD,mCAAmC,IAAI,0BAA0B,EAAE;IAenE,kCAAkC,IAAI,yBAAyB,EAAE;IAcjE,4CAA4C,IAAI,mCAAmC,EAAE;IAWrF,iCAAiC,IAAI,MAAM,EAAE;IAI7C,sCAAsC,IAAI,6BAA6B,EAAE;IAWzE,sCAAsC,IAAI,6BAA6B,EAAE;CAU1E"}

package/lib/components/studio/DSLDiagram_StudioPlugin.js.map

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

package/lib/components/studio/DSLDiagram_StudioPlugin_Extension.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_StudioPlugin_Extension.d.ts","sourceRoot":"","sources":["../../../src/components/studio/DSLDiagram_StudioPlugin_Extension.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAEH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oEAAoE,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,oBAAY,6CAA6C,GAAG;IAC1D,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,CACR,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,SAAS,GAAG,SAAS,KAC7B,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,iCACf,SAAQ,0BAA0B;IAClC;;OAEG;IACH,sDAAsD,CAAC,IAAI,6CAA6C,EAAE,CAAC;CAC5G"}

package/lib/components/studio/DSLDiagram_StudioPlugin_Extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDiagram_StudioPlugin_Extension.js","sourceRoot":"","sources":["../../../src/components/studio/DSLDiagram_StudioPlugin_Extension.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}