@finos/legend-extension-dsl-diagram 4.1.6 → 5.0.1

package/src/components/studio/{DSLDiagram_LegendStudioPlugin_Extension.tsx → DSLDiagram_LegendStudioApplicationPlugin_Extension.tsx}

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { DSL_LegendStudioPlugin_Extension } from '@finos/legend-studio';
-import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { DSL_LegendStudioApplicationPlugin_Extension } from '@finos/legend-application-studio';
+import type { ClassView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
 import type { DiagramEditorState } from '../../stores/studio/DiagramEditorState.js';
 
 export type ClassViewContextMenuItemRendererConfiguration = {
@@ -26,8 +26,8 @@ export type ClassViewContextMenuItemRendererConfiguration = {
   ) => React.ReactNode | undefined;
 };
 
-export interface DSLDiagram_LegendStudioPlugin_Extension
-  extends DSL_LegendStudioPlugin_Extension {
+export interface DSLDiagram_LegendStudioApplicationPlugin_Extension
+  extends DSL_LegendStudioApplicationPlugin_Extension {
   /**
    * Get the list of items to be rendered in the context menu of a class view.
    */

package/src/components/studio/DiagramEditor.tsx

@@ -113,10 +113,10 @@ import {
   property_setName,
   property_setGenericType,
   property_setMultiplicity,
-} from '@finos/legend-studio';
-import { cleanUpDeadReferencesInDiagram } from '../../helpers/DSLDiagram_Helper.js';
-import { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
-import type { DSLDiagram_LegendStudioPlugin_Extension } from './DSLDiagram_LegendStudioPlugin_Extension.js';
+} from '@finos/legend-application-studio';
+import { cleanUpDeadReferencesInDiagram } from '../../graph/helpers/DSLDiagram_Helper.js';
+import { Point } from '../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import type { DSLDiagram_LegendStudioApplicationPlugin_Extension } from './DSLDiagram_LegendStudioApplicationPlugin_Extension.js';
 import {
   classView_setHideProperties,
   classView_setHideStereotypes,
@@ -136,11 +136,11 @@ const DiagramEditorContextMenu = observer(
     const extraClassViewContextMenuItems =
       diagramEditorState.contextMenuClassView
         ? editorStore.pluginManager
-            .getStudioPlugins()
+            .getApplicationPlugins()
             .flatMap(
               (plugin) =>
                 (
-                  plugin as DSLDiagram_LegendStudioPlugin_Extension
+                  plugin as DSLDiagram_LegendStudioApplicationPlugin_Extension
                 ).getExtraClassViewContextMenuItemRendererConfigurations?.() ??
                 [],
             )
@@ -716,7 +716,7 @@ const DiagramEditorOverlay = observer(
   },
 );
 
-const DiagramEditorInlineClassRenamerInner = observer(
+const DiagramEditorInlineClassRenamerContent = observer(
   (props: {
     inlineClassRenamerState: DiagramEditorInlineClassRenamerState;
   }) => {
@@ -823,7 +823,7 @@ const DiagramEditorInlineClassRenamer = observer(
       >
         <div className="diagram-editor__inline-class-creator__container">
           {inlineClassRenamerState && (
-            <DiagramEditorInlineClassRenamerInner
+            <DiagramEditorInlineClassRenamerContent
               inlineClassRenamerState={inlineClassRenamerState}
             />
           )}
@@ -833,7 +833,7 @@ const DiagramEditorInlineClassRenamer = observer(
   },
 );
 
-const DiagramEditorInlineClassCreatorInner = observer(
+const DiagramEditorInlineClassCreatorContent = observer(
   (props: {
     inlineClassCreatorState: DiagramEditorInlineClassCreatorState;
   }) => {
@@ -953,7 +953,7 @@ const DiagramEditorInlineClassCreator = observer(
       >
         <div className="diagram-editor__inline-class-creator__container">
           {inlineClassCreatorState && (
-            <DiagramEditorInlineClassCreatorInner
+            <DiagramEditorInlineClassCreatorContent
               inlineClassCreatorState={inlineClassCreatorState}
             />
           )}
@@ -1028,7 +1028,7 @@ const DiagramEditorInlinePropertyMultiplicityEditor = observer(
   },
 );
 
-const DiagramEditorInlinePropertyEditorInner = observer(
+const DiagramEditorInlinePropertyEditorContent = observer(
   (props: {
     inlinePropertyEditorState: DiagramEditorInlinePropertyEditorState;
   }) => {
@@ -1157,7 +1157,7 @@ const DiagramEditorInlinePropertyEditor = observer(
       >
         <div className="diagram-editor__inline-property-editor__container">
           {inlinePropertyEditorState && (
-            <DiagramEditorInlinePropertyEditorInner
+            <DiagramEditorInlinePropertyEditorContent
               inlinePropertyEditorState={inlinePropertyEditorState}
             />
           )}

package/src/components/studio/InheritanceDiagramRenderer.ts

@@ -20,8 +20,8 @@ import {
   type Class,
   PackageableElementExplicitReference,
 } from '@finos/legend-graph';
-import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
-import { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import { Diagram } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { ClassView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
 
 export class InheritanceDiagramRenderer extends DiagramRenderer {
   constructor(div: HTMLDivElement, _class: Class) {

package/src/graph/DSLDiagram_PureGraphPlugin.ts

@@ -22,8 +22,8 @@ import {
   type PackageableElement,
   type PureModel,
 } from '@finos/legend-graph';
-import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
-import { cleanUpDeadReferencesInDiagram } from '../helpers/DSLDiagram_Helper.js';
+import { Diagram } from '../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { cleanUpDeadReferencesInDiagram } from '../graph/helpers/DSLDiagram_Helper.js';
 
 export class DSLDiagram_PureGraphPlugin extends PureGraphPlugin {
   constructor() {

package/src/{helpers → graph/helpers}/DSLDiagram_Helper.ts

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import { RelationshipView } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
-import { Point } from '../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import { RelationshipView } from '../metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
+import { Point } from '../metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
 import {
   type PureModel,
   Class,
   getAllOwnClassProperties,
 } from '@finos/legend-graph';
 import { deleteEntry } from '@finos/legend-shared';
-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 { PositionedRectangle } from '../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
-import { Rectangle } from '../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
+import type { ClassView } from '../metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Diagram } from '../metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { PositionedRectangle } from '../metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
+import { Rectangle } from '../metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
 
 export class Vector {
   readonly x: number;

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_AssociationView.ts

@@ -18,7 +18,7 @@ import { hashArray, type Hashable } from '@finos/legend-shared';
 import { PropertyHolderView } from './DSLDiagram_PropertyHolderView.js';
 import type { ClassView } from './DSLDiagram_ClassView.js';
 import type { Diagram } from './DSLDiagram_Diagram.js';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 import type {
   Association,
   PackageableElementReference,

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_ClassView.ts

@@ -19,7 +19,7 @@ import { PositionedRectangle } from './geometry/DSLDiagram_PositionedRectangle.j
 import { Rectangle } from './geometry/DSLDiagram_Rectangle.js';
 import { Point } from './geometry/DSLDiagram_Point.js';
 import type { Diagram } from './DSLDiagram_Diagram.js';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 import type { Class, PackageableElementReference } from '@finos/legend-graph';
 
 export class ClassView extends PositionedRectangle implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_Diagram.ts

@@ -23,7 +23,7 @@ import {
   type PackageableElementVisitor,
   PackageableElement,
 } from '@finos/legend-graph';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 
 export class Diagram extends PackageableElement implements Hashable {
   classViews: ClassView[] = [];

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.ts

@@ -16,7 +16,7 @@
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
 import { RelationshipView } from './DSLDiagram_RelationshipView.js';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 
 export class GeneralizationView extends RelationshipView implements Hashable {
   override get hashCode(): string {

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.ts

@@ -19,7 +19,7 @@ import { RelationshipView } from './DSLDiagram_RelationshipView.js';
 import type { ClassView } from './DSLDiagram_ClassView.js';
 import type { Diagram } from './DSLDiagram_Diagram.js';
 import type { PropertyReference } from '@finos/legend-graph';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 
 export class PropertyHolderView extends RelationshipView implements Hashable {
   property: PropertyReference;

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_PropertyView.ts

@@ -16,7 +16,7 @@
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
 import { PropertyHolderView } from './DSLDiagram_PropertyHolderView.js';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 
 export class PropertyView extends PropertyHolderView implements Hashable {
   override get hashCode(): string {

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/DSLDiagram_RelationshipView.ts

@@ -20,7 +20,7 @@ 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';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_HashUtils.js';
 
 export class RelationshipView implements Hashable {
   readonly _OWNER: Diagram;

package/src/{models/metamodels → graph/metamodel}/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.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_HashUtils.js';
 
 export class Point implements Hashable {
   readonly x: number;

package/src/{models/metamodels → graph/metamodel}/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.ts

@@ -17,7 +17,7 @@
 import { hashArray, type Hashable } from '@finos/legend-shared';
 import { Point } from './DSLDiagram_Point.js';
 import { Rectangle } from './DSLDiagram_Rectangle.js';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_HashUtils.js';
 
 export class PositionedRectangle implements Hashable {
   _dummyObservable = {};

package/src/{models/metamodels → graph/metamodel}/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.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_HashUtils.js';
 
 export class Rectangle implements Hashable {
   readonly width: number;

package/src/graphManager/DSLDiagram_GraphManagerHelper.ts

@@ -16,7 +16,7 @@
 
 import type { BasicModel, PureModel } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { Diagram } from '../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
 
 export const getDiagram = (path: string, graph: PureModel): Diagram =>
   graph.getExtensionElement(path, Diagram, `Can't find diagram '${path}'`);

package/src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts

@@ -22,7 +22,7 @@ import {
   type PackageableElement,
   type PureGrammarElementLabeler,
 } from '@finos/legend-graph';
-import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { Diagram } from '../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
 import { observe_Diagram } from './action/changeDetection/DSLDiagram_ObserverHelper.js';
 
 export const PURE_GRAMMAR_DIAGRAM_PARSER_NAME = 'Diagram';

package/src/graphManager/action/changeDetection/DSLDiagram_ObserverHelper.ts

@@ -21,15 +21,15 @@ import {
   skipObserved,
 } from '@finos/legend-graph';
 import { computed, makeObservable, observable, override } from 'mobx';
-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 { ClassViewReference } from '../../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.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 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 { PositionedRectangle } from '../../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
+import type { AssociationView } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_AssociationView.js';
+import type { ClassView } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { ClassViewReference } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassViewReference.js';
+import type { Diagram } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { GeneralizationView } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
+import type { PropertyView } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import type { RelationshipViewEnd } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.js';
+import type { RelationshipView } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
+import type { PositionedRectangle } from '../../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
 
 export const observe_PositionedRectangle = skipObserved(
   (metamodel: PositionedRectangle): PositionedRectangle =>

package/src/{models/protocols → graphManager/protocol}/pure/DSLDiagram_PureProtocolProcessorPlugin.ts

@@ -36,8 +36,8 @@ import {
   V1_buildFullPath,
 } from '@finos/legend-graph';
 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 { Diagram } from '../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import { getOwnDiagram } from '../../DSLDiagram_GraphManagerHelper.js';
 import {
   V1_buildClassView,
   V1_buildGeneralizationView,

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_ClassView.ts

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

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram.ts

@@ -22,7 +22,7 @@ import {
   type V1_PackageableElementVisitor,
   V1_PackageableElement,
 } from '@finos/legend-graph';
-import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../graph/DSLDiagram_HashUtils.js';
 
 export class V1_Diagram extends V1_PackageableElement implements Hashable {
   classViews: V1_ClassView[] = [];

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_GeneralizationView.ts

@@ -17,7 +17,7 @@
 import { hashArray, type Hashable } from '@finos/legend-shared';
 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';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../graph/DSLDiagram_HashUtils.js';
 
 export class V1_GeneralizationView
   extends V1_RelationshipView

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_PropertyHolderView.ts

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

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_PropertyView.ts

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

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/V1_DSLDiagram_RelationshipView.ts

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

package/src/{models/protocols → graphManager/protocol}/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.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../../graph/DSLDiagram_HashUtils.js';
 
 export class V1_Point implements Hashable {
   x!: number;

package/src/{models/protocols → graphManager/protocol}/pure/v1/model/packageableElements/diagram/geometry/V1_DSLDiagram_PositionedRectangle.ts

@@ -17,7 +17,7 @@
 import { hashArray, type Hashable } from '@finos/legend-shared';
 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';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../../graph/DSLDiagram_HashUtils.js';
 
 export class V1_PositionedRectangle implements Hashable {
   rectangle!: V1_Rectangle;

package/src/{models/protocols → graphManager/protocol}/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.js';
+import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../../../graph/DSLDiagram_HashUtils.js';
 
 export class V1_Rectangle implements Hashable {
   width!: number;

package/src/{models/protocols → graphManager/protocol}/pure/v1/transformation/pureGraph/V1_DSLDiagram_GraphBuilderHelper.ts

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

package/src/{models/protocols → graphManager/protocol}/pure/v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-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 { RelationshipViewEnd } from '../../../../../metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.js';
+import type { ClassView } from '../../../../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Diagram } from '../../../../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { GeneralizationView } from '../../../../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
+import type { PropertyView } from '../../../../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import type { RelationshipViewEnd } from '../../../../../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.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';

package/src/index.ts

@@ -15,8 +15,8 @@
  */
 
 export * from './DSLDiagram_Extension.js';
-export { DSLDiagram_LegendStudioPlugin } from './components/studio/DSLDiagram_LegendStudioPlugin.js';
-export * from './components/studio/DSLDiagram_LegendStudioPlugin_Extension.js';
+export { DSLDiagram_LegendStudioApplicationPlugin } from './components/studio/DSLDiagram_LegendStudioApplicationPlugin.js';
+export * from './components/studio/DSLDiagram_LegendStudioApplicationPlugin_Extension.js';
 
 export { DiagramEditorState } from './stores/studio/DiagramEditorState.js';
 
@@ -25,17 +25,17 @@ export {
   DIAGRAM_INTERACTION_MODE,
 } from './DiagramRenderer.js';
 
-export { Diagram } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
-export { ClassView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
-export { RelationshipView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
-export { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.js';
-export { PropertyView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
-export { AssociationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView.js';
-export { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
-export { Point } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
-export { Rectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
-export { PositionedRectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
+export { Diagram } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+export { ClassView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+export { RelationshipView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
+export { PropertyHolderView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.js';
+export { PropertyView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+export { AssociationView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_AssociationView.js';
+export { GeneralizationView } from './graph/metamodel/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
+export { Point } from './graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+export { Rectangle } from './graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
+export { PositionedRectangle } from './graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
 
-export * from './helpers/DSLDiagram_Helper.js';
+export * from './graph/helpers/DSLDiagram_Helper.js';
 export * from './graphManager/DSLDiagram_GraphManagerHelper.js';
-export { V1_DSLDiagram_PackageableElementPointerType } from './models/protocols/pure/DSLDiagram_PureProtocolProcessorPlugin.js';
+export { V1_DSLDiagram_PackageableElementPointerType } from './graphManager/protocol/pure/DSLDiagram_PureProtocolProcessorPlugin.js';

package/src/stores/studio/DSLDiagram_GraphModifierHelper.ts

@@ -16,21 +16,21 @@
 
 import { addUniqueEntry, changeEntry, deleteEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
-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 type { AssociationView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_AssociationView.js';
+import type { ClassView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Diagram } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { GeneralizationView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_GeneralizationView.js';
 import {
   _findOrBuildPoint,
   _relationshipView_simplifyPath,
   _relationshipView_setPath,
-} 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';
+} from '../../graph/helpers/DSLDiagram_Helper.js';
+import type { PropertyView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyView.js';
+import type { RelationshipViewEnd } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipViewEnd.js';
+import type { RelationshipView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_RelationshipView.js';
+import type { Point } from '../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import type { PositionedRectangle } from '../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle.js';
+import type { Rectangle } from '../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle.js';
 import {
   observe_AssociationView,
   observe_ClassView,

package/src/stores/studio/DiagramEditorState.ts

@@ -42,11 +42,11 @@ import {
   ClassEditorState,
   ElementEditorState,
   class_addProperty,
-} from '@finos/legend-studio';
-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';
+} from '@finos/legend-application-studio';
+import type { ClassView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_ClassView.js';
+import type { Point } from '../../graph/metamodel/pure/packageableElements/diagram/geometry/DSLDiagram_Point.js';
+import { Diagram } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_Diagram.js';
+import type { PropertyHolderView } from '../../graph/metamodel/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView.js';
 
 enum DIAGRAM_EDITOR_HOTKEY {
   RECENTER = 'RECENTER',