Introduce form to edit Relationship data and attributes

Introduce reference resolution and completion mechanism for elements - Ensure we send the global id as part of each identifiable element - Attach reference data to GLSP elements for property view - Replace specific 'requestDiagramNodeEntityModel' method - Replace specific 'findRootReferenceName' method Create Form for Relationship data - Unify form for property view and editor (also for Entity) - Use MUI components consistently and add theming for them - Remove custom stylesheets - Remove dependency to 'react-tabs' as it is no longer used Refactorings: - Rename 'ExternalId' to 'GlobalId' - Ensure IDs do not contain any invalid characters - Fix issue with attribute serialization for relationships
CrossBreezeNL · Apr 10, 2024 · 789db7e · 789db7e
1 parent d6e9ef8
commit 789db7e
Show file tree

Hide file tree

Showing 59 changed files with 1,943 additions and 1,084 deletions.
diff --git a/...lang/src/glsp-server/mapping-diagram/command-palette/add-source-object-action-provider.ts b/...lang/src/glsp-server/mapping-diagram/command-palette/add-source-object-action-provider.ts
@@ -5,45 +5,24 @@ import { AddSourceObjectOperation } from '@crossbreeze/protocol';
 import { LabeledAction } from '@eclipse-glsp/protocol';
 import { Args, CommandPaletteActionProvider, GModelElement, Point } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
-import { AstNodeDescription } from 'langium';
 import { codiconCSSString } from 'sprotty';
-import { PackageExternalAstNodeDescription, isExternalDescriptionForLocalPackage } from '../../../language-server/cross-model-scope.js';
-import { createSourceObjectReference } from '../../../language-server/util/ast-util.js';
+import { SourceObject } from '../../../language-server/generated/ast.js';
 import { MappingModelState } from '../model/mapping-model-state.js';
 
 @injectable()
 export class MappingDiagramCommandPaletteActionProvider extends CommandPaletteActionProvider {
    @inject(MappingModelState) protected state!: MappingModelState;
 
    getPaletteActions(_selectedElementIds: string[], _selectedElements: GModelElement[], position: Point, args?: Args): LabeledAction[] {
-      const scopeProvider = this.state.services.language.references.ScopeProvider;
-      const refInfo = createSourceObjectReference(this.state.mapping);
-      const actions: LabeledAction[] = [];
-      const scope = scopeProvider.getScope(refInfo);
-      const duplicateStore = new Set<string>();
-
-      const externalTargetId = this.state.idProvider.getExternalId(this.state.mapping.target.entity.ref);
-      const localTargetId = this.state.idProvider.getLocalId(this.state.mapping.target.entity.ref);
-      scope.getAllElements().forEach(description => {
-         if (
-            !duplicateStore.has(description.name) &&
-            !isExternalDescriptionForLocalPackage(description, this.state.packageId) &&
-            !this.isTargetDescription(description, localTargetId, externalTargetId)
-         ) {
-            actions.push({
-               label: description.name,
-               actions: [AddSourceObjectOperation.create(description.name, position || Point.ORIGIN)],
-               icon: codiconCSSString('inspect')
-            });
-            duplicateStore.add(description.name);
-         }
+      const completionItems = this.state.services.language.references.ScopeProvider.complete({
+         container: { globalId: this.state.mapping.id! },
+         syntheticElements: [{ property: 'sources', type: SourceObject }],
+         property: 'entity'
       });
-      return actions;
-   }
-
-   protected isTargetDescription(description: AstNodeDescription, localTargetName?: string, externalTargetName?: string): boolean {
-      return description instanceof PackageExternalAstNodeDescription
-         ? !!externalTargetName && description.name === externalTargetName
-         : !!localTargetName && description.name === localTargetName;
+      return completionItems.map<LabeledAction>(item => ({
+         label: item.label,
+         actions: [AddSourceObjectOperation.create(item.label, position || Point.ORIGIN)],
+         icon: codiconCSSString('inspect')
+      }));
    }
 }
diff --git a/...model-lang/src/glsp-server/mapping-diagram/handler/add-source-object-operation-handler.ts b/...model-lang/src/glsp-server/mapping-diagram/handler/add-source-object-operation-handler.ts
@@ -5,7 +5,8 @@
 import { AddSourceObjectOperation } from '@crossbreeze/protocol';
 import { Command, JsonOperationHandler, ModelState } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
-import { createSourceObject, createSourceObjectReference } from '../../../language-server/util/ast-util.js';
+import { SourceObject } from '../../../language-server/generated/ast.js';
+import { createSourceObject } from '../../../language-server/util/ast-util.js';
 import { CrossModelCommand } from '../../common/cross-model-command.js';
 import { MappingModelState } from '../model/mapping-model-state.js';
 
@@ -23,10 +24,12 @@ export class MappingDiagramAddSourceObjectOperationHandler extends JsonOperation
 
    protected async addSourceObject(operation: AddSourceObjectOperation): Promise<void> {
       const container = this.modelState.mapping;
-      const refInfo = createSourceObjectReference(container);
-      const scope = this.modelState.services.language.references.ScopeProvider.getScope(refInfo);
-      const entityDescription = scope.getElement(operation.entityName);
-
+      const scope = this.modelState.services.language.references.ScopeProvider.getCompletionScope({
+         container: { globalId: this.modelState.mapping.id! },
+         syntheticElements: [{ property: 'sources', type: SourceObject }],
+         property: 'entity'
+      });
+      const entityDescription = scope.elementScope.getElement(operation.entityName);
       if (entityDescription) {
          const sourceObject = createSourceObject(entityDescription, container, this.modelState.idProvider);
          container.sources.push(sourceObject);

diff --git a/extensions/crossmodel-lang/src/glsp-server/mapping-diagram/model/nodes.ts b/extensions/crossmodel-lang/src/glsp-server/mapping-diagram/model/nodes.ts
@@ -112,7 +112,7 @@ export class GTargetObjectNodeBuilder extends GNodeBuilder<GTargetObjectNode> {
       this.addCssClasses('diagram-node', 'target-node');
 
       // Add the label/name of the node
-      this.add(createHeader(node.entity?.ref?.name || 'unresolved', this.proxy.id));
+      this.add(createHeader(node.entity?.ref?.name || node.entity?.ref?.id || 'unresolved', this.proxy.id));
 
       // Add the children of the node
       const attributes = getAttributes(node);

diff --git a/...ssmodel-lang/src/glsp-server/system-diagram/command-palette/add-entity-action-provider.ts b/...ssmodel-lang/src/glsp-server/system-diagram/command-palette/add-entity-action-provider.ts
@@ -6,8 +6,7 @@ import { EditorContext, LabeledAction } from '@eclipse-glsp/protocol';
 import { ContextActionsProvider, ModelState, Point } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import { codiconCSSString } from 'sprotty';
-import { isExternalDescriptionForLocalPackage } from '../../../language-server/cross-model-scope.js';
-import { createEntityNodeReference } from '../../../language-server/util/ast-util.js';
+import { EntityNode } from '../../../language-server/generated/ast.js';
 import { SystemModelState } from '../model/system-model-state.js';
 
 /**
@@ -21,23 +20,15 @@ export class SystemDiagramAddEntityActionProvider implements ContextActionsProvi
    @inject(ModelState) protected state!: SystemModelState;
 
    async getActions(editorContext: EditorContext): Promise<LabeledAction[]> {
-      const scopeProvider = this.state.services.language.references.ScopeProvider;
-      const refInfo = createEntityNodeReference(this.state.systemDiagram);
-      const actions: LabeledAction[] = [];
-      const scope = scopeProvider.getScope(refInfo);
-      const duplicateStore = new Set<string>();
-
-      scope.getAllElements().forEach(description => {
-         if (!duplicateStore.has(description.name) && !isExternalDescriptionForLocalPackage(description, this.state.packageId)) {
-            actions.push({
-               label: description.name,
-               actions: [AddEntityOperation.create(description.name, editorContext.lastMousePosition || Point.ORIGIN)],
-               icon: codiconCSSString('inspect')
-            });
-            duplicateStore.add(description.name);
-         }
+      const completionItems = this.state.services.language.references.ScopeProvider.complete({
+         container: { globalId: this.state.systemDiagram.id! },
+         syntheticElements: [{ property: 'nodes', type: EntityNode }],
+         property: 'entity'
       });
-
-      return actions;
+      return completionItems.map<LabeledAction>(item => ({
+         label: item.label,
+         actions: [AddEntityOperation.create(item.label, editorContext.lastMousePosition || Point.ORIGIN)],
+         icon: codiconCSSString('inspect')
+      }));
    }
 }
diff --git a/...ns/crossmodel-lang/src/glsp-server/system-diagram/handler/add-entity-operation-handler.ts b/...ns/crossmodel-lang/src/glsp-server/system-diagram/handler/add-entity-operation-handler.ts
@@ -6,7 +6,6 @@ import { AddEntityOperation } from '@crossbreeze/protocol';
 import { Command, JsonOperationHandler, ModelState } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import { Entity, EntityNode } from '../../../language-server/generated/ast.js';
-import { createEntityNodeReference } from '../../../language-server/util/ast-util.js';
 import { CrossModelCommand } from '../../common/cross-model-command.js';
 import { SystemModelState } from '../model/system-model-state.js';
 
@@ -23,10 +22,14 @@ export class SystemDiagramAddEntityOperationHandler extends JsonOperationHandler
    }
 
    protected async createEntityNode(operation: AddEntityOperation): Promise<void> {
+      const scope = this.modelState.services.language.references.ScopeProvider.getCompletionScope({
+         container: { globalId: this.modelState.systemDiagram.id! },
+         syntheticElements: [{ property: 'nodes', type: EntityNode }],
+         property: 'entity'
+      });
+
       const container = this.modelState.systemDiagram;
-      const refInfo = createEntityNodeReference(container);
-      const scope = this.modelState.services.language.references.ScopeProvider.getScope(refInfo);
-      const entityDescription = scope.getElement(operation.entityName);
+      const entityDescription = scope.elementScope.getElement(operation.entityName);
 
       if (entityDescription) {
          const node: EntityNode = {

diff --git a/...s/crossmodel-lang/src/glsp-server/system-diagram/handler/create-edge-operation-handler.ts b/...s/crossmodel-lang/src/glsp-server/system-diagram/handler/create-edge-operation-handler.ts
@@ -44,7 +44,7 @@ export class SystemDiagramCreateEdgeOperationHandler extends JsonCreateEdgeOpera
                id: this.modelState.idProvider.findNextId(RelationshipEdge, relationship.id, this.modelState.systemDiagram),
                relationship: {
                   ref: relationship,
-                  $refText: this.modelState.idProvider.getExternalId(relationship) || relationship.id || ''
+                  $refText: this.modelState.idProvider.getGlobalId(relationship) || relationship.id || ''
                },
                sourceNode: {
                   ref: sourceNode,

diff --git a/...s/crossmodel-lang/src/glsp-server/system-diagram/handler/drop-entity-operation-handler.ts b/...s/crossmodel-lang/src/glsp-server/system-diagram/handler/drop-entity-operation-handler.ts
@@ -38,7 +38,7 @@ export class SystemDiagramDropEntityOperationHandler extends JsonOperationHandle
                $container: container,
                id: this.modelState.idProvider.findNextId(EntityNode, root.entity.id + 'Node', this.modelState.systemDiagram),
                entity: {
-                  $refText: this.modelState.idProvider.getExternalId(root.entity) || root.entity.id || '',
+                  $refText: this.modelState.idProvider.getGlobalId(root.entity) || root.entity.id || '',
                   ref: root.entity
                },
                x: (x += 10),

diff --git a/extensions/crossmodel-lang/src/glsp-server/system-diagram/model/edges.ts b/extensions/crossmodel-lang/src/glsp-server/system-diagram/model/edges.ts
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 CrossBreeze.
  ********************************************************************************/
 
-import { RELATIONSHIP_EDGE_TYPE } from '@crossbreeze/protocol';
+import { REFERENCE_CONTAINER_TYPE, REFERENCE_PROPERTY, REFERENCE_VALUE, RELATIONSHIP_EDGE_TYPE } from '@crossbreeze/protocol';
 import { GEdge, GEdgeBuilder } from '@eclipse-glsp/server';
 import { RelationshipEdge } from '../../../language-server/generated/ast.js';
 import { SystemModelIndex } from './system-model-index.js';
@@ -20,6 +20,9 @@ export class GRelationshipEdgeBuilder extends GEdgeBuilder<GRelationshipEdge> {
       this.id(index.createId(edge));
       this.addCssClasses('diagram-edge', 'relationship');
       this.addArg('edgePadding', 5);
+      this.addArg(REFERENCE_CONTAINER_TYPE, RelationshipEdge);
+      this.addArg(REFERENCE_PROPERTY, 'relationship');
+      this.addArg(REFERENCE_VALUE, edge.relationship.$refText);
 
       const sourceId = index.createId(edge.sourceNode?.ref);
       const targetId = index.createId(edge.targetNode?.ref);

diff --git a/extensions/crossmodel-lang/src/glsp-server/system-diagram/model/nodes.ts b/extensions/crossmodel-lang/src/glsp-server/system-diagram/model/nodes.ts
@@ -1,7 +1,7 @@
 /********************************************************************************
  * Copyright (c) 2023 CrossBreeze.
  ********************************************************************************/
-import { ENTITY_NODE_TYPE } from '@crossbreeze/protocol';
+import { ENTITY_NODE_TYPE, REFERENCE_CONTAINER_TYPE, REFERENCE_PROPERTY, REFERENCE_VALUE } from '@crossbreeze/protocol';
 import { ArgsUtil, GNode, GNodeBuilder } from '@eclipse-glsp/server';
 import { EntityNode } from '../../../language-server/generated/ast.js';
 import { getAttributes } from '../../../language-server/util/ast-util.js';
@@ -25,9 +25,12 @@ export class GEntityNodeBuilder extends GNodeBuilder<GEntityNode> {
 
       // Options which are the same for every node
       this.addCssClasses('diagram-node', 'entity');
+      this.addArg(REFERENCE_CONTAINER_TYPE, EntityNode);
+      this.addArg(REFERENCE_PROPERTY, 'entity');
+      this.addArg(REFERENCE_VALUE, node.entity.$refText);
 
       // Add the label/name of the node
-      this.add(createHeader(entityRef?.name || 'unresolved', this.proxy.id));
+      this.add(createHeader(entityRef?.name || entityRef?.id || 'unresolved', this.proxy.id));
 
       // Add the children of the node
       const attributes = getAttributes(node);

diff --git a/extensions/crossmodel-lang/src/language-server/cross-model-completion-provider.ts b/extensions/crossmodel-lang/src/language-server/cross-model-completion-provider.ts
@@ -17,8 +17,7 @@ import { v4 as uuid } from 'uuid';
 import { CompletionItemKind, InsertTextFormat } from 'vscode-languageserver-protocol';
 import type { Range } from 'vscode-languageserver-types';
 import { CrossModelServices } from './cross-model-module.js';
-import { isExternalDescriptionForLocalPackage } from './cross-model-scope.js';
-import { RelationshipAttribute, isRelationshipAttribute } from './generated/ast.js';
+import { RelationshipAttribute } from './generated/ast.js';
 import { fixDocument } from './util/ast-util.js';
 
 /**
@@ -32,7 +31,7 @@ export class CrossModelCompletionProvider extends DefaultCompletionProvider {
    };
 
    constructor(
-      services: CrossModelServices,
+      protected services: CrossModelServices,
       protected packageManager = services.shared.workspace.PackageManager
    ) {
       super(services);
@@ -195,15 +194,12 @@ export class CrossModelCompletionProvider extends DefaultCompletionProvider {
    }
 
    protected override filterCrossReference(context: CompletionContext, description: AstNodeDescription): boolean {
-      if (isRelationshipAttribute(context.node)) {
-         return this.filterRelationshipAttribute(context.node, context, description);
-      }
-      if (isExternalDescriptionForLocalPackage(description, this.packageId)) {
-         // we want to keep fully qualified names in the scope so we can do proper linking
-         // but want to hide it from the user for local options, i.e., if we are in the same project we can skip the project name
-         return false;
-      }
-      return super.filterCrossReference(context, description);
+      return this.services.references.ScopeProvider.filterCompletion(
+         description,
+         this.packageId!,
+         context.node,
+         context.features[context.features.length - 1].property
+      );
    }
 
    protected filterRelationshipAttribute(node: RelationshipAttribute, context: CompletionContext, desc: AstNodeDescription): boolean {

diff --git a/extensions/crossmodel-lang/src/language-server/cross-model-index-manager.ts b/extensions/crossmodel-lang/src/language-server/cross-model-index-manager.ts
@@ -0,0 +1,35 @@
+/********************************************************************************
+ * Copyright (c) 2024 CrossBreeze.
+ ********************************************************************************/
+import { AstNode, AstNodeDescription, DefaultIndexManager, URI } from 'langium';
+import { CrossModelSharedServices } from './cross-model-module.js';
+import { SemanticRoot, findSemanticRoot } from './util/ast-util.js';
+
+export class CrossModelIndexManager extends DefaultIndexManager {
+   constructor(protected services: CrossModelSharedServices) {
+      super(services);
+   }
+
+   getElementById(globalId: string, type?: string): AstNodeDescription | undefined {
+      return this.allElements().find(desc => desc.name === globalId && (!type || desc.type === type));
+   }
+
+   resolveElement(description?: AstNodeDescription): AstNode | undefined {
+      if (!description) {
+         return undefined;
+      }
+      const document = this.services.workspace.LangiumDocuments.getDocument(description.documentUri);
+      return document
+         ? this.serviceRegistry.getServices(document.uri).workspace.AstNodeLocator.getAstNode(document.parseResult.value, description.path)
+         : undefined;
+   }
+
+   resolveElementById(globalId: string, type?: string): AstNode | undefined {
+      return this.resolveElement(this.getElementById(globalId, type));
+   }
+
+   resolveSemanticElement(uri: URI): SemanticRoot | undefined {
+      const document = this.services.workspace.LangiumDocuments.getDocument(uri);
+      return document ? findSemanticRoot(document) : undefined;
+   }
+}
diff --git a/extensions/crossmodel-lang/src/language-server/cross-model-langium-documents.ts b/extensions/crossmodel-lang/src/language-server/cross-model-langium-documents.ts
@@ -1,9 +1,10 @@
 /********************************************************************************
  * Copyright (c) 2023 CrossBreeze.
  ********************************************************************************/
-import { DefaultLangiumDocuments } from 'langium';
+import { DefaultLangiumDocuments, LangiumDocument } from 'langium';
 import { URI } from 'vscode-uri';
 import { isPackageUri } from './cross-model-package-manager.js';
+import { CrossModelRoot } from './generated/ast.js';
 import { Utils } from './util/uri-util.js';
 
 export class CrossModelLangiumDocuments extends DefaultLangiumDocuments {
@@ -12,4 +13,8 @@ export class CrossModelLangiumDocuments extends DefaultLangiumDocuments {
       const realUri = isPackageUri(uri) ? undefined : Utils.toRealURIorUndefined(uri);
       return realUri ? super.getOrCreateDocument(realUri) : undefined;
    }
+
+   getDocument(uri: URI): LangiumDocument<CrossModelRoot> | undefined {
+      return this.documentMap.get(uri.toString()) as LangiumDocument<CrossModelRoot> | undefined;
+   }
 }
diff --git a/extensions/crossmodel-lang/src/language-server/cross-model-module.ts b/extensions/crossmodel-lang/src/language-server/cross-model-module.ts
@@ -27,6 +27,7 @@ import { ClientLogger } from './cross-model-client-logger.js';
 import { CrossModelCompletionProvider } from './cross-model-completion-provider.js';
 import { CrossModelDocumentBuilder } from './cross-model-document-builder.js';
 import { CrossModelModelFormatter } from './cross-model-formatter.js';
+import { CrossModelIndexManager } from './cross-model-index-manager.js';
 import { CrossModelLangiumDocuments } from './cross-model-langium-documents.js';
 import { CrossModelLanguageServer } from './cross-model-language-server.js';
 import { DefaultIdProvider } from './cross-model-naming.js';
@@ -77,6 +78,8 @@ export interface CrossModelAddedSharedServices {
    workspace: {
       /* override */ WorkspaceManager: CrossModelWorkspaceManager;
       PackageManager: CrossModelPackageManager;
+      LangiumDocuments: CrossModelLangiumDocuments;
+      IndexManager: CrossModelIndexManager;
    };
    logger: {
       ClientLogger: ClientLogger;
@@ -89,7 +92,9 @@ export interface CrossModelAddedSharedServices {
 export const CrossModelSharedServices = Symbol('CrossModelSharedServices');
 export type CrossModelSharedServices = Omit<LangiumSharedServices, 'ServiceRegistry'> &
    CrossModelAddedSharedServices &
-   AddedSharedModelServices;
+   AddedSharedModelServices & {
+      CrossModel: CrossModelServices;
+   };
 
 export const CrossModelSharedModule: Module<
    CrossModelSharedServices,
@@ -102,7 +107,8 @@ export const CrossModelSharedModule: Module<
       LangiumDocuments: services => new CrossModelLangiumDocuments(services),
       TextDocuments: services => new OpenableTextDocuments(TextDocument, services),
       TextDocumentManager: services => new OpenTextDocumentManager(services),
-      DocumentBuilder: services => new CrossModelDocumentBuilder(services)
+      DocumentBuilder: services => new CrossModelDocumentBuilder(services),
+      IndexManager: services => new CrossModelIndexManager(services)
    },
    logger: {
       ClientLogger: services => new ClientLogger(services)
@@ -130,6 +136,7 @@ export interface CrossModelAddedServices {
    references: {
       IdProvider: DefaultIdProvider;
       Linker: CrossModelLinker;
+      ScopeProvider: CrossModelScopeProvider;
    };
    validation: {
       CrossModelValidator: CrossModelValidator;
@@ -204,6 +211,7 @@ export function createCrossModelServices(context: DefaultSharedModuleContext): {
    const shared = inject(createDefaultSharedModule(context), CrossModelGeneratedSharedModule, CrossModelSharedModule);
    const CrossModel = inject(createDefaultModule({ shared }), CrossModelGeneratedModule, createCrossModelModule({ shared }));
    shared.ServiceRegistry.register(CrossModel);
+   shared.CrossModel = CrossModel;
    registerValidationChecks(CrossModel);
    return { shared, CrossModel };
 }