Add import/export functionality for a single system/package

- Model files and the 'package.json' are stored in a single YAML file -- The official YAML document delimiter is used between documents -- We store some additional metadata as comments for now - Import always creates a folder on workspace root-level -- User is asked to overwrite if folder already exists
CrossBreezeNL · May 21, 2024 · 3fc5ab8 · 3fc5ab8
1 parent f0b6dc8
commit 3fc5ab8
Show file tree

Hide file tree

Showing 15 changed files with 544 additions and 34 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -180,7 +180,8 @@
         "NODE_NO_WARNINGS": "1"
       },
       "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen"
+      "internalConsoleOptions": "neverOpen",
+      "outFiles": []
     }
   ],
   "compounds": [

diff --git a/extensions/crossmodel-lang/esbuild.mjs b/extensions/crossmodel-lang/esbuild.mjs
@@ -41,7 +41,7 @@ const ctx = await esbuild.context({
       '.js': '.cjs'
    },
    loader: { '.ts': 'ts' },
-   external: ['vscode'],
+   external: ['vscode', 'prettier'],
    platform: 'node',
    sourcemap: !minify,
    minify,

diff --git a/extensions/crossmodel-lang/package.json b/extensions/crossmodel-lang/package.json
@@ -100,7 +100,8 @@
     "chevrotain": "~11.0.3",
     "commander": "~10.0.0",
     "langium": "~2.1.3",
-    "type-fest": "^3.6.1",
+    "prettier": "^3.1.0",
+    "type-fest": "^4.18.2",
     "vscode-languageclient": "9.0.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "^3.17.5",

diff --git a/extensions/crossmodel-lang/src/glsp-server/common/cross-model-index.ts b/extensions/crossmodel-lang/src/glsp-server/common/cross-model-index.ts
@@ -46,7 +46,6 @@ export class CrossModelIndex extends GModelIndex {
 
    protected indexAstNode(node: AstNode): void {
       const id = this.findId(node);
-      console.log('INDEX', node.$type, id);
       if (id) {
          this.indexSemanticElement(id, node);
       }

diff --git a/extensions/crossmodel-lang/src/model-server/model-server.ts b/extensions/crossmodel-lang/src/model-server/model-server.ts
@@ -15,10 +15,13 @@ import {
    OpenModelArgs,
    ReferenceableElement,
    RequestModel,
+   RequestSystemInfo,
    ResolveReference,
    ResolvedElement,
    SaveModel,
    SaveModelArgs,
+   SystemInfo,
+   SystemInfoArgs,
    UpdateModel,
    UpdateModelArgs
 } from '@crossbreeze/protocol';
@@ -52,6 +55,11 @@ export class ModelServer implements Disposable {
       this.toDispose.push(connection.onRequest(ResolveReference, args => this.resolve(args)));
       this.toDispose.push(connection.onRequest(UpdateModel, args => this.updateModel(args)));
       this.toDispose.push(connection.onRequest(SaveModel, args => this.saveModel(args)));
+      this.toDispose.push(connection.onRequest(RequestSystemInfo, args => this.systemInfo(args)));
+   }
+
+   protected systemInfo(args: SystemInfoArgs): Promise<SystemInfo | undefined> {
+      return this.modelService.getSystemInfo(args);
    }
 
    protected complete(args: CrossReferenceContext): Promise<ReferenceableElement[]> {

diff --git a/extensions/crossmodel-lang/src/model-server/model-service.ts b/extensions/crossmodel-lang/src/model-server/model-service.ts
@@ -11,12 +11,15 @@ import {
    OpenModelArgs,
    ReferenceableElement,
    SaveModelArgs,
+   SystemInfo,
+   SystemInfoArgs,
    UpdateModelArgs
 } from '@crossbreeze/protocol';
 import { AstNode, Deferred, DocumentState, isAstNode } from 'langium';
 import { Disposable, OptionalVersionedTextDocumentIdentifier, Range, TextDocumentEdit, TextEdit, uinteger } from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
 import { CrossModelServices, CrossModelSharedServices } from '../language-server/cross-model-module.js';
+import { PackageAstNodeDescription } from '../language-server/cross-model-scope.js';
 import { findDocument } from '../language-server/util/ast-util.js';
 import { LANGUAGE_CLIENT_ID } from './openable-text-documents.js';
 
@@ -206,4 +209,20 @@ export class ModelService {
    async resolveCrossReference(args: CrossReference): Promise<AstNode | undefined> {
       return this.shared.CrossModel.references.ScopeProvider.resolveCrossReference(args);
    }
+
+   async getSystemInfo(args: SystemInfoArgs): Promise<SystemInfo | undefined> {
+      const packageInfo = this.shared.workspace.PackageManager.getPackageInfoByURI(URI.parse(args.contextUri!));
+      if (!packageInfo) {
+         return undefined;
+      }
+      const packageId = packageInfo.id;
+      return {
+         packageFilePath: packageInfo.uri.fsPath,
+         modelFilePaths: this.shared.workspace.IndexManager.allElements()
+            .filter(desc => desc instanceof PackageAstNodeDescription && desc.packageId === packageId)
+            .map(desc => desc.documentUri.fsPath)
+            .distinct()
+            .toArray()
+      };
+   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -35,7 +35,9 @@
     "@theia/core": "1.43.1",
     "@theia/markers": "1.43.1",
     "@theia/outline-view": "1.43.1",
-    "@theia/plugin-ext": "1.43.1"
+    "@theia/plugin-ext": "1.43.1",
+    "type-fest": "^4.18.2",
+    "yaml": "^2.4.1"
   },
   "theiaExtensions": [
     {

diff --git a/packages/core/src/browser/core-frontend-module.ts b/packages/core/src/browser/core-frontend-module.ts
@@ -1,14 +1,15 @@
 /********************************************************************************
  * Copyright (c) 2023 CrossBreeze.
  ********************************************************************************/
-import { MenuContribution } from '@theia/core';
+import { CommandContribution, MenuContribution } from '@theia/core';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { FileNavigatorWidget } from '@theia/navigator/lib/browser';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
 import { WorkspaceCommandContribution } from '@theia/workspace/lib/browser/workspace-commands';
 import '../../style/index.css';
 import { createCrossModelFileNavigatorWidget } from './cm-file-navigator-tree-widget';
 import { CrossModelFileNavigatorContribution, CrossModelWorkspaceContribution } from './new-element-contribution';
+import { ImportExportContribution } from './import-export-contribution';
 
 export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
    bind(CrossModelWorkspaceContribution).toSelf().inSingletonScope();
@@ -19,4 +20,8 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
    rebind(FileNavigatorContribution).toService(CrossModelFileNavigatorContribution);
 
    rebind(FileNavigatorWidget).toDynamicValue(ctx => createCrossModelFileNavigatorWidget(ctx.container));
+
+   bind(ImportExportContribution).toSelf().inSingletonScope();
+   bind(CommandContribution).toService(ImportExportContribution);
+   bind(MenuContribution).toService(ImportExportContribution);
 });