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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-diagram",
-  "version": "1.0.2",
+  "version": "1.0.7",
   "description": "Legend extension for Diagram DSL",
   "keywords": [
     "legend",
@@ -27,7 +27,9 @@
     "build": "yarn clean && yarn build:sass && yarn build:tsc",
     "build:sass": "cross-env INIT_CWD=$INIT_CWD node ../../scripts/workflow/buildSass.js",
     "build:tsc": "tsc --project ./tsconfig.build.json",
-    "clean": "rimraf \"lib\" \"build\"",
+    "clean": "npm-run-all clean:cache clean:lib",
+    "clean:cache": "rimraf \"build\"",
+    "clean:lib": "rimraf \"lib\"",
     "dev": "npm-run-all --parallel dev:sass dev:tsc",
     "dev:sass": "sass style lib --watch --load-path=../../node_modules/@finos/legend-art/scss",
     "dev:tsc": "tsc --watch --preserveWatchOutput",
@@ -38,34 +40,32 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "0.2.2",
-    "@finos/legend-art": "0.1.2",
-    "@finos/legend-graph": "0.2.5",
-    "@finos/legend-model-storage": "0.0.9",
-    "@finos/legend-shared": "0.0.9",
-    "@finos/legend-studio": "2.0.2",
-    "@material-ui/core": "4.12.3",
-    "@types/react": "17.0.36",
-    "mobx": "6.3.7",
-    "mobx-react-lite": "3.2.2",
+    "@finos/legend-application": "1.1.0",
+    "@finos/legend-art": "0.3.0",
+    "@finos/legend-graph": "1.0.0",
+    "@finos/legend-model-storage": "0.0.13",
+    "@finos/legend-shared": "1.1.0",
+    "@finos/legend-studio": "2.3.0",
+    "@types/react": "17.0.38",
+    "mobx": "6.3.12",
+    "mobx-react-lite": "3.2.3",
     "react": "17.0.2",
-    "react-dnd": "14.0.4",
+    "react-dnd": "14.0.5",
     "react-dom": "17.0.2",
-    "react-icons": "4.3.1",
-    "react-resize-detector": "6.7.6",
+    "react-resize-detector": "7.0.0",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "0.2.1",
+    "@finos/legend-dev-utils": "0.3.4",
     "@testing-library/react": "12.1.2",
     "cross-env": "7.0.3",
-    "eslint": "8.3.0",
-    "jest": "27.3.1",
+    "eslint": "8.7.0",
+    "jest": "27.4.7",
     "jest-canvas-mock": "2.3.1",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.43.4",
-    "typescript": "4.5.2"
+    "sass": "1.49.0",
+    "typescript": "4.5.4"
   },
   "peerDependencies": {
     "react": "^17.0.0"

package/src/DiagramRenderer.ts

@@ -24,8 +24,8 @@ import {
   findLast,
   uniqBy,
 } from '@finos/legend-shared';
-import type { AbstractProperty } from '@finos/legend-graph';
 import {
+  type AbstractProperty,
   Class,
   Enumeration,
   PrimitiveType,
@@ -45,8 +45,10 @@ import { PositionedRectangle } from './models/metamodels/pure/packageableElement
 import { ClassView } from './models/metamodels/pure/packageableElements/diagram/ClassView';
 import type { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/PropertyHolderView';
 import { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/GeneralizationView';
-import type { RelationshipView } from './models/metamodels/pure/packageableElements/diagram/RelationshipView';
-import { manageInsidePointsDynamically } from './models/metamodels/pure/packageableElements/diagram/RelationshipView';
+import {
+  type RelationshipView,
+  manageInsidePointsDynamically,
+} from './models/metamodels/pure/packageableElements/diagram/RelationshipView';
 import { PropertyView } from './models/metamodels/pure/packageableElements/diagram/PropertyView';
 import { getElementPosition } from './helpers/DiagramHelper';
 import { AssociationView } from './models/metamodels/pure/packageableElements/diagram/AssociationView';
@@ -222,9 +224,22 @@ export class DiagramRenderer {
   // interactions
   onAddClassViewClick: (point: Point) => void = noop();
   onClassViewRightClick: (classView: ClassView, point: Point) => void = noop();
-  onBackgroundDoubleClick: (point: Point) => void = noop();
-  onClassViewDoubleClick: (classView: ClassView, point: Point) => void = noop();
-  onClassNameDoubleClick: (classView: ClassView, point: Point) => void = noop();
+
+  onBackgroundDoubleClick?: ((point: Point) => void) | undefined;
+  onClassViewDoubleClick?:
+    | ((classView: ClassView, point: Point) => void)
+    | undefined;
+  onClassNameDoubleClick?:
+    | ((classView: ClassView, point: Point) => void)
+    | undefined;
+  onClassPropertyDoubleClick?:
+    | ((
+        property: AbstractProperty,
+        point: Point,
+        propertyHolderView: PropertyHolderView | undefined,
+      ) => void)
+    | undefined;
+
   handleEditClassView: (classView: ClassView) => void = noop();
   handleEditProperty: (
     property: AbstractProperty,
@@ -557,11 +572,11 @@ export class DiagramRenderer {
               // Do not allow creating self-inheritance
               startClassView.class.value !== targetClassView.class.value &&
               // Avoid creating inhertance that already existed
-              !startClassView.class.value.allSuperClasses.includes(
+              !startClassView.class.value.allSuperclasses.includes(
                 targetClassView.class.value,
               ) &&
               // Avoid loop (might be expensive)
-              !targetClassView.class.value.allSuperClasses.includes(
+              !targetClassView.class.value.allSuperclasses.includes(
                 startClassView.class.value,
               )
             ) {
@@ -2278,7 +2293,7 @@ export class DiagramRenderer {
     else if ('ArrowDown' === e.key) {
       const views = uniqBy(
         this.selectedClasses.flatMap((x) =>
-          x.class.value._subClasses.flatMap(
+          x.class.value.subclasses.flatMap(
             (c) =>
               new ClassView(
                 this.diagram,
@@ -2477,21 +2492,25 @@ export class DiagramRenderer {
 
     // Check double click on class property
     if (this.mouseOverClassProperty) {
-      this.handleEditProperty(
-        this.mouseOverClassProperty,
-        eventPointInModelCoordinate,
-        undefined,
-      );
-      return;
+      if (this.onClassPropertyDoubleClick) {
+        this.onClassPropertyDoubleClick(
+          this.mouseOverClassProperty,
+          eventPointInModelCoordinate,
+          undefined,
+        );
+        return;
+      }
     }
 
     // Check double click on class name
     if (this.mouseOverClassName) {
-      this.onClassNameDoubleClick(
-        this.mouseOverClassName,
-        eventPointInModelCoordinate,
-      );
-      return;
+      if (this.onClassNameDoubleClick) {
+        this.onClassNameDoubleClick(
+          this.mouseOverClassName,
+          eventPointInModelCoordinate,
+        );
+        return;
+      }
     }
 
     // Check double click on class view
@@ -2502,22 +2521,28 @@ export class DiagramRenderer {
       ),
     );
     if (selectedClass) {
-      this.onClassViewDoubleClick(selectedClass, eventPointInModelCoordinate);
-      return;
+      if (this.onClassViewDoubleClick) {
+        this.onClassViewDoubleClick(selectedClass, eventPointInModelCoordinate);
+        return;
+      }
     }
 
     // Check double click on line property label
     if (this.mouseOverPropertyHolderViewLabel) {
-      this.handleEditProperty(
-        this.mouseOverPropertyHolderViewLabel.property.value,
-        eventPointInModelCoordinate,
-        this.mouseOverPropertyHolderViewLabel,
-      );
-      return;
+      if (this.onClassPropertyDoubleClick) {
+        this.onClassPropertyDoubleClick(
+          this.mouseOverPropertyHolderViewLabel.property.value,
+          eventPointInModelCoordinate,
+          this.mouseOverPropertyHolderViewLabel,
+        );
+        return;
+      }
     }
 
     // Check double click on background
-    this.onBackgroundDoubleClick(eventPointInModelCoordinate);
+    if (this.onBackgroundDoubleClick) {
+      this.onBackgroundDoubleClick(eventPointInModelCoordinate);
+    }
     return;
   }
 

package/src/components/studio/DSLDiagram_LegendStudioPlugin.tsx

@@ -15,23 +15,22 @@
  */
 
 import packageJson from '../../../package.json';
-import type {
-  LegendStudioPluginManager,
-  NewElementFromStateCreator,
-  EditorStore,
-  ElementEditorState,
-  ElementEditorStateCreator,
-  ElementTypeGetter,
-  ElementProjectExplorerDnDTypeGetter,
-  ElementIconGetter,
-  ElementEditorRenderer,
-  DSL_LegendStudioPlugin_Extension,
-  NewElementState,
-  ElementEditorPostDeleteAction,
-  ElementEditorPostRenameAction,
-  ClassPreviewRenderer,
+import {
+  LegendStudioPlugin,
+  type NewElementFromStateCreator,
+  type EditorStore,
+  type ElementEditorState,
+  type ElementEditorStateCreator,
+  type ElementTypeGetter,
+  type ElementProjectExplorerDnDTypeGetter,
+  type ElementIconGetter,
+  type ElementEditorRenderer,
+  type DSL_LegendStudioPlugin_Extension,
+  type NewElementState,
+  type ElementEditorPostDeleteAction,
+  type ElementEditorPostRenameAction,
+  type ClassPreviewRenderer,
 } from '@finos/legend-studio';
-import { LegendStudioPlugin } from '@finos/legend-studio';
 import { ShapesIcon } from '@finos/legend-art';
 import type { Class, PackageableElement } from '@finos/legend-graph';
 import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/Diagram';
@@ -50,10 +49,6 @@ export class DSLDiagram_LegendStudioPlugin
     super(packageJson.extensions.studioPlugin, packageJson.version);
   }
 
-  install(pluginManager: LegendStudioPluginManager): void {
-    pluginManager.registerStudioPlugin(this);
-  }
-
   override getExtraClassPreviewRenderers(): ClassPreviewRenderer[] {
     return [
       (_class: Class): React.ReactNode => (

package/src/components/studio/DiagramEditor.tsx

@@ -16,9 +16,7 @@
 
 import { useRef, useState, useEffect, useCallback, Fragment } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
-import type { DropTargetMonitor } from 'react-dnd';
-import { useDrop } from 'react-dnd';
-import { FaRegKeyboard } from 'react-icons/fa';
+import { type DropTargetMonitor, useDrop } from 'react-dnd';
 import { observer } from 'mobx-react-lite';
 import {
   DiagramRenderer,
@@ -26,18 +24,16 @@ import {
   DIAGRAM_RELATIONSHIP_EDIT_MODE,
   DIAGRAM_ZOOM_LEVELS,
 } from '../../DiagramRenderer';
-import type {
-  DiagramEditorInlineClassCreatorState,
-  DiagramEditorInlineClassRenamerState,
-  DiagramEditorInlinePropertyEditorState,
-} from '../../stores/studio/DiagramEditorState';
 import {
+  type DiagramEditorInlineClassCreatorState,
+  type DiagramEditorInlineClassRenamerState,
+  type DiagramEditorInlinePropertyEditorState,
   DIAGRAM_EDITOR_SIDE_PANEL_TAB,
   DiagramEditorClassViewEditorSidePanelState,
   DiagramEditorState,
 } from '../../stores/studio/DiagramEditorState';
-import type { ResizablePanelHandlerProps } from '@finos/legend-art';
 import {
+  type ResizablePanelHandlerProps,
   ContextMenu,
   getControlledResizablePanelProps,
   BasePopover,
@@ -47,6 +43,7 @@ import {
   clsx,
   createFilter,
   CustomSelectorInput,
+  KeyboardIcon,
   DropdownMenu,
   MenuContent,
   MenuContentDivider,
@@ -56,9 +53,19 @@ import {
   ResizablePanelGroup,
   ResizablePanelSplitter,
   ResizablePanel,
+  ResizeIcon,
+  MinusIcon,
+  MousePointerIcon,
+  MoveIcon,
+  PlusCircleIcon,
+  SidebarIcon,
+  TriangleIcon,
+  ZoomInIcon,
+  ZoomOutIcon,
+  Dialog,
 } from '@finos/legend-art';
-import type { Type } from '@finos/legend-graph';
 import {
+  type Type,
   Class,
   DerivedProperty,
   Property,
@@ -71,26 +78,16 @@ import {
   isValidPathIdentifier,
   resolvePackagePathAndElementName,
 } from '@finos/legend-graph';
-import {
-  FiMinus,
-  FiMousePointer,
-  FiMove,
-  FiPlusCircle,
-  FiSidebar,
-  FiTriangle,
-  FiZoomIn,
-  FiZoomOut,
-} from 'react-icons/fi';
-import { IoResize } from 'react-icons/io5';
-import { Dialog } from '@material-ui/core';
 import {
   guaranteeNonNullable,
   isNonNullable,
   prettyCONSTName,
 } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
-import type { PackageableElementOption } from '@finos/legend-application';
-import { useApplicationStore } from '@finos/legend-application';
+import {
+  type PackageableElementOption,
+  useApplicationStore,
+} from '@finos/legend-application';
 import {
   ClassFormEditor,
   CORE_DND_TYPE,
@@ -148,6 +145,9 @@ const DiagramRendererHotkeyInfosModal = observer(
           container: 'editor-modal__container',
           paper: 'editor-modal__content--scrollable',
         }}
+        TransitionProps={{
+          appear: false, // disable transition
+        }}
       >
         <div className="modal modal--dark modal--scrollable diagram-editor__hotkeys__dialog">
           <div className="modal__header">
@@ -347,7 +347,7 @@ const DiagramEditorToolPanel = observer(
           )}
           title="View Tool (V)"
         >
-          <FiMousePointer className="diagram-editor__icon--layout" />
+          <MousePointerIcon className="diagram-editor__icon--layout" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -361,7 +361,7 @@ const DiagramEditorToolPanel = observer(
           )}
           title="Pan Tool (M)"
         >
-          <FiMove className="diagram-editor__icon--pan" />
+          <MoveIcon className="diagram-editor__icon--pan" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -375,7 +375,7 @@ const DiagramEditorToolPanel = observer(
             DIAGRAM_RELATIONSHIP_EDIT_MODE.NONE,
           )}
         >
-          <FiZoomIn className="diagram-editor__icon--zoom-in" />
+          <ZoomInIcon className="diagram-editor__icon--zoom-in" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -389,7 +389,7 @@ const DiagramEditorToolPanel = observer(
             DIAGRAM_RELATIONSHIP_EDIT_MODE.NONE,
           )}
         >
-          <FiZoomOut className="diagram-editor__icon--zoom-out" />
+          <ZoomOutIcon className="diagram-editor__icon--zoom-out" />
         </button>
         <div className="diagram-editor__tools__divider" />
         <button
@@ -408,7 +408,7 @@ const DiagramEditorToolPanel = observer(
             DIAGRAM_RELATIONSHIP_EDIT_MODE.PROPERTY,
           )}
         >
-          <FiMinus className="diagram-editor__icon--property" />
+          <MinusIcon className="diagram-editor__icon--property" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -426,7 +426,7 @@ const DiagramEditorToolPanel = observer(
             DIAGRAM_RELATIONSHIP_EDIT_MODE.INHERITANCE,
           )}
         >
-          <FiTriangle className="diagram-editor__icon--inheritance" />
+          <TriangleIcon className="diagram-editor__icon--inheritance" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -443,7 +443,7 @@ const DiagramEditorToolPanel = observer(
           //   DIAGRAM_RELATIONSHIP_EDIT_MODE.ASSOCIATION,
           // )}
         >
-          <IoResize className="diagram-editor__icon--association" />
+          <ResizeIcon className="diagram-editor__icon--association" />
         </button>
         <button
           className={clsx('diagram-editor__tool', {
@@ -458,7 +458,7 @@ const DiagramEditorToolPanel = observer(
             DIAGRAM_RELATIONSHIP_EDIT_MODE.NONE,
           )}
         >
-          <FiPlusCircle className="diagram-editor__icon--add-class" />
+          <PlusCircleIcon className="diagram-editor__icon--add-class" />
         </button>
         <div className="diagram-editor__tools__divider" />
         <button
@@ -467,7 +467,7 @@ const DiagramEditorToolPanel = observer(
           title="Show Hotkeys"
           onClick={showDiagramRendererHokeysModal}
         >
-          <FaRegKeyboard className="diagram-editor__icon--hotkey-info" />
+          <KeyboardIcon className="diagram-editor__icon--hotkey-info" />
         </button>
         <DiagramRendererHotkeyInfosModal
           open={diagramEditorState.showHotkeyInfosModal}
@@ -1297,7 +1297,7 @@ const DiagramEditorHeader = observer(
             tabIndex={-1}
             onClick={toggleSidePanel}
           >
-            <FiSidebar className="diagram-editor__icon--sidebar" />
+            <SidebarIcon className="diagram-editor__icon--sidebar" />
           </button>
         </div>
       </>

package/src/components/studio/InheritanceDiagramRenderer.ts

@@ -16,8 +16,10 @@
 
 import { DiagramRenderer } from '../../DiagramRenderer';
 import { uuid } from '@finos/legend-shared';
-import type { Class } from '@finos/legend-graph';
-import { PackageableElementExplicitReference } from '@finos/legend-graph';
+import {
+  type Class,
+  PackageableElementExplicitReference,
+} from '@finos/legend-graph';
 import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/Diagram';
 import { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/ClassView';
 

package/src/graph/DSLDiagram_PureGraphPlugin.ts

@@ -16,13 +16,12 @@
 
 import packageJson from '../../package.json';
 import type { Clazz } from '@finos/legend-shared';
-import type {
-  DeadReferencesCleaner,
-  GraphPluginManager,
-  PackageableElement,
-  PureModel,
+import {
+  PureGraphPlugin,
+  type DeadReferencesCleaner,
+  type PackageableElement,
+  type PureModel,
 } from '@finos/legend-graph';
-import { PureGraphPlugin } from '@finos/legend-graph';
 import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/Diagram';
 import { cleanUpDeadReferencesInDiagram } from '../helpers/DiagramHelper';
 
@@ -31,10 +30,6 @@ export class DSLDiagram_PureGraphPlugin extends PureGraphPlugin {
     super(packageJson.extensions.pureGraphPlugin, packageJson.version);
   }
 
-  install(pluginManager: GraphPluginManager): void {
-    pluginManager.registerPureGraphPlugin(this);
-  }
-
   override getExtraPureGraphExtensionClasses(): Clazz<PackageableElement>[] {
     return [Diagram];
   }

package/src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts

@@ -15,12 +15,11 @@
  */
 
 import packageJson from '../../package.json';
-import type {
-  GraphPluginManager,
-  PackageableElement,
-  PureGrammarElementLabeler,
+import {
+  PureGraphManagerPlugin,
+  type PackageableElement,
+  type PureGrammarElementLabeler,
 } from '@finos/legend-graph';
-import { PureGraphManagerPlugin } from '@finos/legend-graph';
 import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/Diagram';
 
 const PURE_GRAMMAR_DIAGRAM_PARSER_NAME = 'Diagram';
@@ -31,10 +30,6 @@ export class DSLDiagram_PureGraphManagerPlugin extends PureGraphManagerPlugin {
     super(packageJson.extensions.pureGraphManagerPlugin, packageJson.version);
   }
 
-  install(pluginManager: GraphPluginManager): void {
-    pluginManager.registerPureGraphManagerPlugin(this);
-  }
-
   override getExtraPureGrammarParserNames(): string[] {
     return [PURE_GRAMMAR_DIAGRAM_PARSER_NAME];
   }

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

@@ -15,8 +15,7 @@
  */
 
 import { computed, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { PropertyHolderView } from './PropertyHolderView';
 import type { ClassView } from './ClassView';
 import type { Diagram } from './Diagram';

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

@@ -15,8 +15,7 @@
  */
 
 import { computed, observable, action, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { PositionedRectangle } from './geometry/PositionedRectangle';
 import { Rectangle } from './geometry/Rectangle';
 import { Point } from './geometry/Point';

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

@@ -20,10 +20,8 @@ import type { ClassView } from './ClassView';
 import {
   PackageableElementExplicitReference,
   ReferenceWithOwner,
-} from '@finos/legend-graph';
-import type {
-  PackageableElementImplicitReference,
-  PackageableElementReference,
+  type PackageableElementImplicitReference,
+  type PackageableElementReference,
 } from '@finos/legend-graph';
 
 export abstract class ClassViewReference extends ReferenceWithOwner {

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

@@ -15,14 +15,20 @@
  */
 
 import { observable, action, makeObservable, override } from 'mobx';
-import { hashArray, addUniqueEntry, deleteEntry } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import {
+  hashArray,
+  addUniqueEntry,
+  deleteEntry,
+  type Hashable,
+} from '@finos/legend-shared';
 import type { ClassView } from './ClassView';
 import type { PropertyView } from './PropertyView';
 import type { GeneralizationView } from './GeneralizationView';
 import type { AssociationView } from './AssociationView';
-import type { PackageableElementVisitor } from '@finos/legend-graph';
-import { PackageableElement } from '@finos/legend-graph';
+import {
+  type PackageableElementVisitor,
+  PackageableElement,
+} from '@finos/legend-graph';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 
 export class Diagram extends PackageableElement implements Hashable {

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

@@ -15,8 +15,7 @@
  */
 
 import { computed, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { RelationshipView } from './RelationshipView';
 import type { Diagram } from './Diagram';
 import type { ClassView } from './ClassView';

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

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { RelationshipView } from './RelationshipView';
 import type { ClassView } from './ClassView';
 import type { Diagram } from './Diagram';

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

@@ -15,8 +15,7 @@
  */
 
 import { computed, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { PropertyHolderView } from './PropertyHolderView';
 import type { Diagram } from './Diagram';
 import type { ClassView } from './ClassView';

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

@@ -15,8 +15,7 @@
  */
 
 import { observable, action, computed, makeObservable } from 'mobx';
-import { hashArray, changeEntry } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, changeEntry, type Hashable } from '@finos/legend-shared';
 import { RelationShipEdgeView as RelationshipEdgeView } from './RelationshipEdgeView';
 import { Point } from './geometry/Point';
 import type { ClassView } from './ClassView';

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

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';
 
 export class Point implements Hashable {

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

@@ -15,8 +15,7 @@
  */
 
 import { observable, action, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { Point } from './Point';
 import { Rectangle } from './Rectangle';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';