@eclipse-glsp-examples/workflow-server 0.9.0-next.d6c44bc.2 → 0.9.0-next.fc2c95e.5

package/lib/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAmBA,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAY5C"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAqBA,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAa5C"}

package/lib/app.js

@@ -16,8 +16,10 @@ exports.launch = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+const layout_elk_1 = require("@eclipse-glsp/layout-elk");
 const server_node_1 = require("@eclipse-glsp/server-node");
 const inversify_1 = require("inversify");
+const workflow_layout_configurator_1 = require("./layout/workflow-layout-configurator");
 const workflow_diagram_module_1 = require("./workflow-diagram-module");
 function launch(argv) {
     const options = server_node_1.createSocketCliParser().parse(argv);
@@ -25,7 +27,8 @@ function launch(argv) {
     appContainer.load(server_node_1.createAppModule(options));
     const logger = appContainer.get(server_node_1.LoggerFactory)('WorkflowServerApp');
     const launcher = appContainer.resolve(server_node_1.SocketServerLauncher);
-    const serverModule = new workflow_diagram_module_1.WorkflowServerModule().configureDiagramModule(new workflow_diagram_module_1.WorkflowDiagramModule());
+    const elkLayoutModule = layout_elk_1.configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: workflow_layout_configurator_1.WorkflowLayoutConfigurator });
+    const serverModule = new workflow_diagram_module_1.WorkflowServerModule().configureDiagramModule(new workflow_diagram_module_1.WorkflowDiagramModule(), elkLayoutModule);
     const errorHandler = (error) => logger.error('Error in workflow server launcher:', error);
     launcher.configure(serverModule);
     server_node_1.resolveAndCatch(() => launcher.start({ port: options.port, host: options.host }), errorHandler);

package/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2DAAyI;AACzI,yCAAsC;AACtC,uEAAwF;AAExF,SAAgB,MAAM,CAAC,IAAe;IAClC,MAAM,OAAO,GAAG,mCAAqB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAI,qBAAS,EAAE,CAAC;IACrC,YAAY,CAAC,IAAI,CAAC,6BAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAgB,2BAAa,CAAC,CAAC,mBAAmB,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,kCAAoB,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,IAAI,8CAAoB,EAAE,CAAC,sBAAsB,CAAC,IAAI,+CAAqB,EAAE,CAAC,CAAC;IAEpG,MAAM,YAAY,GAAG,CAAC,KAAU,EAAQ,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACrG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACjC,6BAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;AACpG,CAAC;AAZD,wBAYC"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yDAAoE;AACpE,2DAAyI;AACzI,yCAAsC;AACtC,wFAAmF;AACnF,uEAAwF;AAExF,SAAgB,MAAM,CAAC,IAAe;IAClC,MAAM,OAAO,GAAG,mCAAqB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAI,qBAAS,EAAE,CAAC;IACrC,YAAY,CAAC,IAAI,CAAC,6BAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAgB,2BAAa,CAAC,CAAC,mBAAmB,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,kCAAoB,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,qCAAwB,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,kBAAkB,EAAE,yDAA0B,EAAE,CAAC,CAAC;IAC9H,MAAM,YAAY,GAAG,IAAI,8CAAoB,EAAE,CAAC,sBAAsB,CAAC,IAAI,+CAAqB,EAAE,EAAE,eAAe,CAAC,CAAC;IAErH,MAAM,YAAY,GAAG,CAAC,KAAU,EAAQ,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACrG,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACjC,6BAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;AACpG,CAAC;AAbD,wBAaC"}

package/lib/{workflow-model-index.d.ts → layout/workflow-layout-configurator.d.ts}

@@ -13,8 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GEdge, GModelIndex } from '@eclipse-glsp/server-node';
-export declare class WorkflowModelIndex extends GModelIndex {
-    getAllEdges(): GEdge[];
+import { AbstractLayoutConfigurator, LayoutOptions } from '@eclipse-glsp/layout-elk';
+import { GGraph } from '@eclipse-glsp/server-node';
+export declare class WorkflowLayoutConfigurator extends AbstractLayoutConfigurator {
+    protected graphOptions(graph: GGraph): LayoutOptions | undefined;
 }
-//# sourceMappingURL=workflow-model-index.d.ts.map
+//# sourceMappingURL=workflow-layout-configurator.d.ts.map

package/lib/layout/workflow-layout-configurator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-layout-configurator.d.ts","sourceRoot":"","sources":["../../src/layout/workflow-layout-configurator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGnD,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;CAKnE"}

package/lib/{workflow-model-index.js → layout/workflow-layout-configurator.js}

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkflowModelIndex = void 0;
+exports.WorkflowLayoutConfigurator = void 0;
 /********************************************************************************
  * Copyright (c) 2022 STMicroelectronics and others.
  *
@@ -22,22 +22,17 @@ exports.WorkflowModelIndex = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const server_node_1 = require("@eclipse-glsp/server-node");
+const layout_elk_1 = require("@eclipse-glsp/layout-elk");
 const inversify_1 = require("inversify");
-const model_types_1 = require("./util/model-types");
-let WorkflowModelIndex = class WorkflowModelIndex extends server_node_1.GModelIndex {
-    getAllEdges() {
-        const edges = super.getAllEdges();
-        this.getElements(model_types_1.ModelTypes.WEIGHTED_EDGE).forEach(weighted => {
-            if (weighted instanceof server_node_1.GEdge) {
-                edges.push(weighted);
-            }
-        });
-        return edges;
+let WorkflowLayoutConfigurator = class WorkflowLayoutConfigurator extends layout_elk_1.AbstractLayoutConfigurator {
+    graphOptions(graph) {
+        return {
+            'elk.algorithm': 'layered'
+        };
     }
 };
-WorkflowModelIndex = __decorate([
+WorkflowLayoutConfigurator = __decorate([
     inversify_1.injectable()
-], WorkflowModelIndex);
-exports.WorkflowModelIndex = WorkflowModelIndex;
-//# sourceMappingURL=workflow-model-index.js.map
+], WorkflowLayoutConfigurator);
+exports.WorkflowLayoutConfigurator = WorkflowLayoutConfigurator;
+//# sourceMappingURL=workflow-layout-configurator.js.map

package/lib/layout/workflow-layout-configurator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-layout-configurator.js","sourceRoot":"","sources":["../../src/layout/workflow-layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yDAAqF;AAErF,yCAAuC;AAGvC,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,uCAA0B;IAC5D,YAAY,CAAC,KAAa;QAChC,OAAO;YACH,eAAe,EAAE,SAAS;SAC7B,CAAC;IACN,CAAC;CACJ,CAAA;AANY,0BAA0B;IADtC,sBAAU,EAAE;GACA,0BAA0B,CAMtC;AANY,gEAA0B"}

package/lib/workflow-diagram-module.d.ts

@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ClassMultiBinding, GModelDiagramModule, InstanceMultiBinding, OperationHandlerConstructor, ServerModule } from '@eclipse-glsp/server-node';
-import { NavigationTargetProvider } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-provider';
+import { ClassMultiBinding, GModelDiagramModule, InstanceMultiBinding, NavigationTargetProvider, OperationHandlerConstructor, ServerModule } from '@eclipse-glsp/server-node';
 import { interfaces } from 'inversify';
 export declare class WorkflowServerModule extends ServerModule {
     configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;

package/lib/workflow-diagram-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,iBAAiB,EAMjB,mBAAmB,EAEnB,oBAAoB,EAIpB,2BAA2B,EAE3B,YAAY,EAEf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,8EAA8E,CAAC;AAExH,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAuBnD,qBACa,oBAAqB,SAAQ,YAAY;IAClD,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;CAM5H;AAED,qBACa,qBAAsB,SAAQ,mBAAmB;IAC1D,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAanI,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,GAAG,IAAI;IAatG,SAAS,CAAC,kCAAkC,CAAC,OAAO,EAAE,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,IAAI;CAM3G"}
+{"version":3,"file":"workflow-diagram-module.d.ts","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,iBAAiB,EAMjB,mBAAmB,EACnB,oBAAoB,EAIpB,wBAAwB,EAExB,2BAA2B,EAE3B,YAAY,EAEf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAsBnD,qBACa,oBAAqB,SAAQ,YAAY;IAClD,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;CAM5H;AAED,qBACa,qBAAsB,SAAQ,mBAAmB;IAC1D,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAYnI,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,GAAG,IAAI;IAatG,SAAS,CAAC,kCAAkC,CAAC,OAAO,EAAE,iBAAiB,CAAC,wBAAwB,CAAC,GAAG,IAAI;CAM3G"}

package/lib/workflow-diagram-module.js

@@ -23,7 +23,6 @@ exports.WorkflowDiagramModule = exports.WorkflowServerModule = void 0;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const server_node_1 = require("@eclipse-glsp/server-node");
-const navigation_target_resolver_1 = require("@eclipse-glsp/server-node/lib/features/navigation/navigation-target-resolver");
 const inversify_1 = require("inversify");
 const create_automated_task_handler_1 = require("./handler/create-automated-task-handler");
 const create_category_handler_1 = require("./handler/create-category-handler");
@@ -44,7 +43,6 @@ const workflow_command_palette_action_provider_1 = require("./provider/workflow-
 const workflow_context_menu_item_provider_1 = require("./provider/workflow-context-menu-item-provider");
 const workflow_diagram_configuration_1 = require("./workflow-diagram-configuration");
 const workflow_glsp_server_1 = require("./workflow-glsp-server");
-const workflow_model_index_1 = require("./workflow-model-index");
 const workflow_popup_factory_1 = require("./workflow-popup-factory");
 let WorkflowServerModule = class WorkflowServerModule extends server_node_1.ServerModule {
     configure(bind, unbind, isBound, rebind) {
@@ -65,14 +63,13 @@ let WorkflowDiagramModule = class WorkflowDiagramModule extends server_node_1.GM
     configure(bind, unbind, isBound, rebind) {
         super.configure(bind, unbind, isBound, rebind);
         bind(server_node_1.DiagramConfiguration).to(workflow_diagram_configuration_1.WorkflowDiagramConfiguration).inSingletonScope();
-        bind(navigation_target_resolver_1.NavigationTargetResolver).to(workflow_navigation_target_resolver_1.WorkflowNavigationTargetResolver).inSingletonScope();
+        bind(server_node_1.NavigationTargetResolver).to(workflow_navigation_target_resolver_1.WorkflowNavigationTargetResolver).inSingletonScope();
         bind(server_node_1.ContextMenuItemProvider).to(workflow_context_menu_item_provider_1.WorkflowContextMenuItemProvider).inSingletonScope();
         bind(server_node_1.CommandPaletteActionProvider).to(workflow_command_palette_action_provider_1.WorkflowCommandPaletteActionProvider).inSingletonScope();
         bind(server_node_1.LabelEditValidator).to(workflow_label_edit_validator_1.WorkflowLabelEditValidator).inSingletonScope();
         bind(server_node_1.PopupModelFactory).to(workflow_popup_factory_1.WorkflowPopupFactory).inSingletonScope();
         bind(server_node_1.ModelValidator).to(workflow_model_validator_1.WorkflowModelValidator).inSingletonScope();
         bind(server_node_1.ToolPaletteItemProvider).to(server_node_1.DefaultToolPaletteItemProvider).inSingletonScope();
-        rebind(server_node_1.GModelIndex).to(workflow_model_index_1.WorkflowModelIndex).inSingletonScope();
     }
     configureOperationHandlers(binding) {
         super.configureOperationHandlers(binding);

package/lib/workflow-diagram-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-diagram-module.js","sourceRoot":"","sources":["../src/workflow-diagram-module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server",
-  "version": "0.9.0-next.d6c44bc.2+d6c44bc",
+  "version": "0.9.0-next.fc2c95e.5+fc2c95e",
   "description": "GLSP node server for the workflow example",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -37,7 +37,8 @@
     "src"
   ],
   "dependencies": {
-    "@eclipse-glsp/server-node": "0.9.0-next.d6c44bc.2+d6c44bc"
+    "@eclipse-glsp/layout-elk": "0.9.0-next.fc2c95e.5+fc2c95e",
+    "@eclipse-glsp/server-node": "0.9.0-next.fc2c95e.5+fc2c95e"
   },
   "devDependencies": {
     "typescript": "^3.9.2"
@@ -56,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "d6c44bc0711572f8312555ef663d0fbfda0d12ac"
+  "gitHead": "fc2c95ec10af611d66dc40acf89a4e9afaf981b3"
 }

package/src/app.ts

@@ -13,8 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { configureELKLayoutModule } from '@eclipse-glsp/layout-elk';
 import { createAppModule, createSocketCliParser, LoggerFactory, resolveAndCatch, SocketServerLauncher } from '@eclipse-glsp/server-node';
 import { Container } from 'inversify';
+import { WorkflowLayoutConfigurator } from './layout/workflow-layout-configurator';
 import { WorkflowDiagramModule, WorkflowServerModule } from './workflow-diagram-module';
 
 export function launch(argv?: string[]): void {
@@ -24,7 +26,8 @@ export function launch(argv?: string[]): void {
 
     const logger = appContainer.get<LoggerFactory>(LoggerFactory)('WorkflowServerApp');
     const launcher = appContainer.resolve(SocketServerLauncher);
-    const serverModule = new WorkflowServerModule().configureDiagramModule(new WorkflowDiagramModule());
+    const elkLayoutModule = configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: WorkflowLayoutConfigurator });
+    const serverModule = new WorkflowServerModule().configureDiagramModule(new WorkflowDiagramModule(), elkLayoutModule);
 
     const errorHandler = (error: any): void => logger.error('Error in workflow server launcher:', error);
     launcher.configure(serverModule);

package/src/{workflow-model-index.ts → layout/workflow-layout-configurator.ts}

@@ -13,19 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GEdge, GModelIndex } from '@eclipse-glsp/server-node';
+import { AbstractLayoutConfigurator, LayoutOptions } from '@eclipse-glsp/layout-elk';
+import { GGraph } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
-import { ModelTypes } from './util/model-types';
 
 @injectable()
-export class WorkflowModelIndex extends GModelIndex {
-    getAllEdges(): GEdge[] {
-        const edges: GEdge[] = super.getAllEdges();
-        this.getElements(ModelTypes.WEIGHTED_EDGE).forEach(weighted => {
-            if (weighted instanceof GEdge) {
-                edges.push(weighted);
-            }
-        });
-        return edges;
+export class WorkflowLayoutConfigurator extends AbstractLayoutConfigurator {
+    protected graphOptions(graph: GGraph): LayoutOptions | undefined {
+        return {
+            'elk.algorithm': 'layered'
+        };
     }
 }

package/src/workflow-diagram-module.ts

@@ -21,18 +21,17 @@ import {
     DiagramConfiguration,
     GLSPServer,
     GModelDiagramModule,
-    GModelIndex,
     InstanceMultiBinding,
     JsonRpcGLSPServer,
     LabelEditValidator,
     ModelValidator,
+    NavigationTargetProvider,
+    NavigationTargetResolver,
     OperationHandlerConstructor,
     PopupModelFactory,
     ServerModule,
     ToolPaletteItemProvider
 } from '@eclipse-glsp/server-node';
-import { NavigationTargetProvider } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-provider';
-import { NavigationTargetResolver } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-resolver';
 import { injectable, interfaces } from 'inversify';
 import { CreateAutomatedTaskHandler } from './handler/create-automated-task-handler';
 import { CreateCategoryHandler } from './handler/create-category-handler';
@@ -53,7 +52,6 @@ import { WorkflowCommandPaletteActionProvider } from './provider/workflow-comman
 import { WorkflowContextMenuItemProvider } from './provider/workflow-context-menu-item-provider';
 import { WorkflowDiagramConfiguration } from './workflow-diagram-configuration';
 import { WorkflowGLSPServer } from './workflow-glsp-server';
-import { WorkflowModelIndex } from './workflow-model-index';
 import { WorkflowPopupFactory } from './workflow-popup-factory';
 
 @injectable()
@@ -82,7 +80,6 @@ export class WorkflowDiagramModule extends GModelDiagramModule {
         bind(PopupModelFactory).to(WorkflowPopupFactory).inSingletonScope();
         bind(ModelValidator).to(WorkflowModelValidator).inSingletonScope();
         bind(ToolPaletteItemProvider).to(DefaultToolPaletteItemProvider).inSingletonScope();
-        rebind(GModelIndex).to(WorkflowModelIndex).inSingletonScope();
     }
 
     protected configureOperationHandlers(binding: InstanceMultiBinding<OperationHandlerConstructor>): void {

package/lib/workflow-model-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"workflow-model-index.d.ts","sourceRoot":"","sources":["../src/workflow-model-index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAI/D,qBACa,kBAAmB,SAAQ,WAAW;IAC/C,WAAW,IAAI,KAAK,EAAE;CASzB"}

package/lib/workflow-model-index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"workflow-model-index.js","sourceRoot":"","sources":["../src/workflow-model-index.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2DAA+D;AAC/D,yCAAuC;AACvC,oDAAgD;AAGhD,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,yBAAW;IAC/C,WAAW;QACP,MAAM,KAAK,GAAY,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,wBAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1D,IAAI,QAAQ,YAAY,mBAAK,EAAE;gBAC3B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAVY,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAU9B;AAVY,gDAAkB"}