@finos/legend-extension-dsl-diagram 1.0.18 → 1.0.21

package/src/DiagramRenderer.ts

@@ -38,20 +38,20 @@ import {
   Multiplicity,
 } from '@finos/legend-graph';
 import { action, makeObservable, observable } from 'mobx';
-import type { Diagram } from './models/metamodels/pure/packageableElements/diagram/Diagram';
-import { Rectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/Rectangle';
-import { Point } from './models/metamodels/pure/packageableElements/diagram/geometry/Point';
-import { PositionedRectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/PositionedRectangle';
-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 { Diagram } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+import { Rectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
+import { Point } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
+import { PositionedRectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle';
+import { ClassView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
+import type { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView';
+import { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
 import {
   type RelationshipView,
   manageInsidePointsDynamically,
-} from './models/metamodels/pure/packageableElements/diagram/RelationshipView';
-import { PropertyView } from './models/metamodels/pure/packageableElements/diagram/PropertyView';
+} from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
+import { PropertyView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
 import { getElementPosition } from './helpers/DiagramHelper';
-import { AssociationView } from './models/metamodels/pure/packageableElements/diagram/AssociationView';
+import { AssociationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
 
 export enum DIAGRAM_INTERACTION_MODE {
   LAYOUT,
@@ -2543,7 +2543,6 @@ export class DiagramRenderer {
     if (this.onBackgroundDoubleClick) {
       this.onBackgroundDoubleClick(eventPointInModelCoordinate);
     }
-    return;
   }
 
   mousedown(e: MouseEvent): void {
@@ -3249,7 +3248,7 @@ export class DiagramRenderer {
     });
 
     const generalizationViews = (
-      superType ? classViewLevels : classViewLevels.reverse()
+      superType ? classViewLevels : classViewLevels.slice().reverse()
     )
       .slice(0, classViewLevels.length - 1)
       .flatMap((level, idx) =>

package/src/components/studio/DSLDiagram_LegendStudioPlugin.tsx

@@ -33,7 +33,7 @@ import {
 } 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';
+import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 import { DiagramEditorState } from '../../stores/studio/DiagramEditorState';
 import { DiagramEditor } from './DiagramEditor';
 import { ClassDiagramPreview } from './ClassDiagramPreview';

package/src/components/studio/DSLDiagram_LegendStudioPlugin_Extension.tsx

@@ -15,7 +15,7 @@
  */
 
 import type { DSL_LegendStudioPlugin_Extension } from '@finos/legend-studio';
-import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/ClassView';
+import type { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 import type { DiagramEditorState } from '../../stores/studio/DiagramEditorState';
 
 export type ClassViewContextMenuItemRendererConfiguration = {

package/src/components/studio/DiagramEditor.tsx

@@ -102,7 +102,7 @@ import {
   useEditorStore,
 } from '@finos/legend-studio';
 import { cleanUpDeadReferencesInDiagram } from '../../helpers/DiagramHelper';
-import { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/Point';
+import { Point } from '../../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
 import type { DSLDiagram_LegendStudioPlugin_Extension } from './DSLDiagram_LegendStudioPlugin_Extension';
 
 const DiagramEditorContextMenu = observer(
@@ -195,7 +195,7 @@ const DiagramRendererHotkeyInfosModal = observer(
                   Remove selected element(s)
                 </div>
                 <div className="hotkey__combination diagram-editor__hotkey__keys">
-                  <div className="hotkey__key">Delete</div>
+                  <div className="hotkey__key">Remove</div>
                 </div>
               </div>
               <div className="diagram-editor__hotkey__group">

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/Diagram';
-import { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/ClassView';
+import { Diagram } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+import { ClassView } from '../../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 
 export class InheritanceDiagramRenderer extends DiagramRenderer {
   constructor(div: HTMLDivElement, _class: Class) {

package/src/graph/DSLDiagram_PureGraphPlugin.ts

@@ -22,7 +22,7 @@ import {
   type PackageableElement,
   type PureModel,
 } from '@finos/legend-graph';
-import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/Diagram';
+import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 import { cleanUpDeadReferencesInDiagram } from '../helpers/DiagramHelper';
 
 export class DSLDiagram_PureGraphPlugin extends PureGraphPlugin {

package/src/graphManager/DSLDiagram_GraphManagerHelper.ts

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

package/src/graphManager/DSLDiagram_PureGraphManagerPlugin.ts

@@ -20,7 +20,7 @@ import {
   type PackageableElement,
   type PureGrammarElementLabeler,
 } from '@finos/legend-graph';
-import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/Diagram';
+import { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 
 const PURE_GRAMMAR_DIAGRAM_PARSER_NAME = 'Diagram';
 const PURE_GRAMMAR_DIAGRAM_ELEMENT_TYPE_LABEL = 'Diagram';

package/src/helpers/DiagramHelper.ts

@@ -15,9 +15,9 @@
  */
 
 import type { PureModel } from '@finos/legend-graph';
-import type { ClassView } from '../models/metamodels/pure/packageableElements/diagram/ClassView';
-import type { Diagram } from '../models/metamodels/pure/packageableElements/diagram/Diagram';
-import { Point } from '../models/metamodels/pure/packageableElements/diagram/geometry/Point';
+import type { ClassView } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
+import type { Diagram } from '../models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+import { Point } from '../models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
 
 /**
  * Get absolute position of element on the screen by recursively walking up element tree

package/src/index.ts

@@ -22,19 +22,19 @@ export { DiagramEditorState } from './stores/studio/DiagramEditorState';
 
 export { DiagramRenderer, DIAGRAM_INTERACTION_MODE } from './DiagramRenderer';
 
-export { Diagram } from './models/metamodels/pure/packageableElements/diagram/Diagram';
-export { ClassView } from './models/metamodels/pure/packageableElements/diagram/ClassView';
+export { Diagram } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
+export { ClassView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_ClassView';
 export {
   RelationshipView,
   manageInsidePointsDynamically,
-} from './models/metamodels/pure/packageableElements/diagram/RelationshipView';
-export { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/PropertyHolderView';
-export { PropertyView } from './models/metamodels/pure/packageableElements/diagram/PropertyView';
-export { AssociationView } from './models/metamodels/pure/packageableElements/diagram/AssociationView';
-export { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/GeneralizationView';
-export { Point } from './models/metamodels/pure/packageableElements/diagram/geometry/Point';
-export { Rectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/Rectangle';
-export { PositionedRectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/PositionedRectangle';
+} from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_RelationshipView';
+export { PropertyHolderView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyHolderView';
+export { PropertyView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_PropertyView';
+export { AssociationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_AssociationView';
+export { GeneralizationView } from './models/metamodels/pure/packageableElements/diagram/DSLDiagram_GeneralizationView';
+export { Point } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Point';
+export { Rectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_Rectangle';
+export { PositionedRectangle } from './models/metamodels/pure/packageableElements/diagram/geometry/DSLDiagram_PositionedRectangle';
 
 export * from './helpers/DiagramHelper';
 export { V1_DSLDiagram_PackageableElementPointerType } from './models/protocols/pure/DSLDiagram_PureProtocolProcessorPlugin';

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

@@ -16,9 +16,9 @@
 
 import { computed, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { PropertyHolderView } from './PropertyHolderView';
-import type { ClassView } from './ClassView';
-import type { Diagram } from './Diagram';
+import { PropertyHolderView } from './DSLDiagram_PropertyHolderView';
+import type { ClassView } from './DSLDiagram_ClassView';
+import type { Diagram } from './DSLDiagram_Diagram';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 import type {
   Association,

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

@@ -16,10 +16,10 @@
 
 import { computed, observable, action, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { PositionedRectangle } from './geometry/PositionedRectangle';
-import { Rectangle } from './geometry/Rectangle';
-import { Point } from './geometry/Point';
-import type { Diagram } from './Diagram';
+import { PositionedRectangle } from './geometry/DSLDiagram_PositionedRectangle';
+import { Rectangle } from './geometry/DSLDiagram_Rectangle';
+import { Point } from './geometry/DSLDiagram_Point';
+import type { Diagram } from './DSLDiagram_Diagram';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 import type { Class, PackageableElementReference } from '@finos/legend-graph';
 

package/src/models/metamodels/pure/packageableElements/diagram/{ClassViewReference.ts → DSLDiagram_ClassViewReference.ts}

@@ -15,8 +15,8 @@
  */
 
 import { observable, action, makeObservable } from 'mobx';
-import type { Diagram } from './Diagram';
-import type { ClassView } from './ClassView';
+import type { Diagram } from './DSLDiagram_Diagram';
+import type { ClassView } from './DSLDiagram_ClassView';
 import {
   PackageableElementExplicitReference,
   ReferenceWithOwner,

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

@@ -21,10 +21,10 @@ import {
   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 { ClassView } from './DSLDiagram_ClassView';
+import type { PropertyView } from './DSLDiagram_PropertyView';
+import type { GeneralizationView } from './DSLDiagram_GeneralizationView';
+import type { AssociationView } from './DSLDiagram_AssociationView';
 import {
   type PackageableElementVisitor,
   PackageableElement,

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

@@ -16,9 +16,9 @@
 
 import { computed, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { RelationshipView } from './RelationshipView';
-import type { Diagram } from './Diagram';
-import type { ClassView } from './ClassView';
+import { RelationshipView } from './DSLDiagram_RelationshipView';
+import type { Diagram } from './DSLDiagram_Diagram';
+import type { ClassView } from './DSLDiagram_ClassView';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 
 export class GeneralizationView extends RelationshipView implements Hashable {

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

@@ -15,9 +15,9 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { RelationshipView } from './RelationshipView';
-import type { ClassView } from './ClassView';
-import type { Diagram } from './Diagram';
+import { RelationshipView } from './DSLDiagram_RelationshipView';
+import type { ClassView } from './DSLDiagram_ClassView';
+import type { Diagram } from './DSLDiagram_Diagram';
 import type { PropertyReference } from '@finos/legend-graph';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 

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

@@ -16,9 +16,9 @@
 
 import { computed, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { PropertyHolderView } from './PropertyHolderView';
-import type { Diagram } from './Diagram';
-import type { ClassView } from './ClassView';
+import { PropertyHolderView } from './DSLDiagram_PropertyHolderView';
+import type { Diagram } from './DSLDiagram_Diagram';
+import type { ClassView } from './DSLDiagram_ClassView';
 import type { PropertyReference } from '@finos/legend-graph';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 

package/src/models/metamodels/pure/packageableElements/diagram/{RelationshipEdgeView.ts → DSLDiagram_RelationshipEdgeView.ts}

@@ -15,7 +15,7 @@
  */
 
 import { observable, action, makeObservable } from 'mobx';
-import type { ClassViewReference } from './ClassViewReference';
+import type { ClassViewReference } from './DSLDiagram_ClassViewReference';
 
 export class RelationShipEdgeView {
   classView: ClassViewReference;

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

@@ -16,12 +16,12 @@
 
 import { observable, action, computed, makeObservable } from 'mobx';
 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';
-import { Vector } from './geometry/Vector';
-import type { Diagram } from './Diagram';
-import { ClassViewExplicitReference } from './ClassViewReference';
+import { RelationShipEdgeView as RelationshipEdgeView } from './DSLDiagram_RelationshipEdgeView';
+import { Point } from './geometry/DSLDiagram_Point';
+import type { ClassView } from './DSLDiagram_ClassView';
+import { Vector } from './geometry/DSLDiagram_Vector';
+import type { Diagram } from './DSLDiagram_Diagram';
+import { ClassViewExplicitReference } from './DSLDiagram_ClassViewReference';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../DSLDiagram_ModelUtils';
 
 /**

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

@@ -16,8 +16,8 @@
 
 import { observable, action, makeObservable } from 'mobx';
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { Point } from './Point';
-import { Rectangle } from './Rectangle';
+import { Point } from './DSLDiagram_Point';
+import { Rectangle } from './DSLDiagram_Rectangle';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../../DSLDiagram_ModelUtils';
 
 export class PositionedRectangle implements Hashable {

package/src/models/metamodels/pure/packageableElements/diagram/geometry/{Vector.ts → DSLDiagram_Vector.ts}

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Point } from './Point';
+import type { Point } from './DSLDiagram_Point';
 
 export class Vector {
   x: number;

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

@@ -15,7 +15,7 @@
  */
 
 import packageJson from '../../../../package.json';
-import { V1_Diagram } from './v1/model/packageableElements/diagram/V1_Diagram';
+import { V1_Diagram } from './v1/model/packageableElements/diagram/V1_DSLDiagram_Diagram';
 import { type PlainObject, assertType } from '@finos/legend-shared';
 import { deserialize, serialize } from 'serializr';
 import {
@@ -35,7 +35,7 @@ import {
   V1_ElementBuilder,
 } from '@finos/legend-graph';
 import { V1_transformDiagram } from './v1/transformation/pureGraph/V1_DSLDiagram_TransformerHelper';
-import { Diagram } from '../../metamodels/pure/packageableElements/diagram/Diagram';
+import { Diagram } from '../../metamodels/pure/packageableElements/diagram/DSLDiagram_Diagram';
 import { getDiagram } from '../../../graphManager/DSLDiagram_GraphManagerHelper';
 import {
   V1_buildClassView,

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

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

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

@@ -15,9 +15,9 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import type { V1_ClassView } from './V1_ClassView';
-import type { V1_PropertyView } from './V1_PropertyView';
-import type { V1_GeneralizationView } from './V1_GeneralizationView';
+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_PackageableElementVisitor,
   V1_PackageableElement,

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

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

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

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

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

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { V1_PropertyHolderView } from './V1_PropertyHolderView';
+import { V1_PropertyHolderView } from './V1_DSLDiagram_PropertyHolderView';
 import { DIAGRAM_HASH_STRUCTURE } from '../../../../../../DSLDiagram_ModelUtils';
 import type { V1_PropertyPointer } from '@finos/legend-graph';
 

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

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

package/src/models/protocols/pure/v1/model/packageableElements/diagram/geometry/{V1_Line.ts → V1_DSLDiagram_Line.ts}

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

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

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

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

@@ -24,17 +24,17 @@ import {
   assertNonNullable,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/Diagram';
-import { ClassView } from '../../../../../metamodels/pure/packageableElements/diagram/ClassView';
-import { Point } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/Point';
-import { Rectangle } from '../../../../../metamodels/pure/packageableElements/diagram/geometry/Rectangle';
-import { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/PropertyView';
-import { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/GeneralizationView';
-import type { V1_ClassView } from '../../model/packageableElements/diagram/V1_ClassView';
-import type { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_Point';
-import type { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_Rectangle';
-import type { V1_PropertyView } from '../../model/packageableElements/diagram/V1_PropertyView';
-import type { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_GeneralizationView';
+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 { getClassView } from '../../../../../../helpers/DiagramHelper';
 
 const buildPoint = (point: V1_Point): Point => {

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/ClassView';
-import type { Diagram } from '../../../../../metamodels/pure/packageableElements/diagram/Diagram';
-import type { GeneralizationView } from '../../../../../metamodels/pure/packageableElements/diagram/GeneralizationView';
-import type { PropertyView } from '../../../../../metamodels/pure/packageableElements/diagram/PropertyView';
-import type { RelationShipEdgeView } from '../../../../../metamodels/pure/packageableElements/diagram/RelationshipEdgeView';
-import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_Point';
-import { V1_ClassView } from '../../model/packageableElements/diagram/V1_ClassView';
-import { V1_Diagram } from '../../model/packageableElements/diagram/V1_Diagram';
-import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_GeneralizationView';
-import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_Line';
-import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_Rectangle';
-import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_PropertyView';
+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 {
   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_ClassView';
-import { V1_Diagram } from '../../model/packageableElements/diagram/V1_Diagram';
-import { V1_Point } from '../../model/packageableElements/diagram/geometry/V1_Point';
-import { V1_Rectangle } from '../../model/packageableElements/diagram/geometry/V1_Rectangle';
-import { V1_Line } from '../../model/packageableElements/diagram/geometry/V1_Line';
-import { V1_PropertyView } from '../../model/packageableElements/diagram/V1_PropertyView';
-import { V1_GeneralizationView } from '../../model/packageableElements/diagram/V1_GeneralizationView';
+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_propertyPointerModelSchema } from '@finos/legend-graph';
 
 export const V1_DIAGRAM_ELEMENT_PROTOCOL_TYPE = 'diagram';

package/src/stores/studio/DiagramEditorState.ts

@@ -41,10 +41,10 @@ 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';
-import type { PropertyHolderView } from '../../models/metamodels/pure/packageableElements/diagram/PropertyHolderView';
+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';
 
 enum DIAGRAM_EDITOR_HOTKEY {
   RECENTER = 'RECENTER',