@eclipse-glsp/layout-elk 0.9.0-next.66aad6e.3 → 0.9.0-next.95961ba.7

package/lib/glsp-elk-layout-engine.js

@@ -8,14 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlspElkLayoutEngine = exports.BaseElkLayoutEngine = void 0;
+exports.GlspElkLayoutEngine = void 0;
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
- *
+ * Copyright (c) 2018-2022 TypeFox and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -30,51 +26,278 @@ exports.GlspElkLayoutEngine = exports.BaseElkLayoutEngine = void 0;
  ********************************************************************************/
 const server_node_1 = require("@eclipse-glsp/server-node");
 const inversify_1 = require("inversify");
-const inversify_2 = require("sprotty-elk/lib/inversify");
-const basic_type_mapper_1 = require("./basic-type-mapper");
+const sprotty_elk_1 = require("sprotty-elk");
+const element_filter_1 = require("./element-filter");
+const layout_configurator_1 = require("./layout-configurator");
 /**
- * Layout engine that delegates to ELK by transforming the graphical model into an ELK graph.
+ * An implementation of GLSP's {@link LayoutEngine} interface that retrieves the graphical model from the {@link ModelState},
+ * transforms this model into an ELK graph and then invokes the underlying ELK instance for layout computation.
  */
-let BaseElkLayoutEngine = class BaseElkLayoutEngine extends inversify_2.ElkLayoutEngine {
-    constructor(elkFactory, filter, configurator, typeMapper) {
-        super(elkFactory, filter, configurator);
+let GlspElkLayoutEngine = class GlspElkLayoutEngine {
+    constructor(elkFactory, filter, configurator, modelState) {
         this.filter = filter;
         this.configurator = configurator;
-        this.typeMapper = typeMapper;
+        this.modelState = modelState;
+        this.elk = elkFactory();
     }
-    getBasicType(smodel) {
-        return this.typeMapper.getBasicType(smodel);
+    layout() {
+        const root = this.modelState.root;
+        if (!(root instanceof server_node_1.GGraph)) {
+            return root;
+        }
+        this.elkEdges = [];
+        this.idToElkElement = new Map();
+        const elkGraph = this.transformToElk(root);
+        return this.elk.layout(elkGraph).then(result => {
+            this.applyLayout(result);
+            return root;
+        });
     }
-};
-BaseElkLayoutEngine = __decorate([
-    inversify_1.injectable(),
-    __param(0, inversify_1.inject(inversify_2.ElkFactory)),
-    __param(1, inversify_1.inject(inversify_2.IElementFilter)),
-    __param(2, inversify_1.inject(inversify_2.ILayoutConfigurator)),
-    __param(3, inversify_1.inject(basic_type_mapper_1.BasicTypeMapper)),
-    __metadata("design:paramtypes", [Function, Object, Object, basic_type_mapper_1.BasicTypeMapper])
-], BaseElkLayoutEngine);
-exports.BaseElkLayoutEngine = BaseElkLayoutEngine;
-/**
- * A implement of GLSP's {@link LayoutEngine} interface that retrieves the graphical model from the {@link ModelState}
- * and delegates the to an underlying {@link BaseElkLayoutEngine} instance for computing the layout.
- */
-let GlspElkLayoutEngine = class GlspElkLayoutEngine {
-    async layout() {
-        const graph = this.modelState.root;
-        await this.elkLayoutEngine.layout(graph);
+    transformToElk(model) {
+        if (model instanceof server_node_1.GGraph) {
+            const graph = this.transformGraph(model);
+            this.elkEdges.forEach(elkEdge => {
+                const parent = this.findCommonAncestor(elkEdge);
+                if (parent) {
+                    parent.edges.push(elkEdge);
+                }
+            });
+            return graph;
+        }
+        else if (model instanceof server_node_1.GNode) {
+            return this.transformNode(model);
+        }
+        else if (model instanceof server_node_1.GEdge) {
+            return this.transformEdge(model);
+        }
+        else if (model instanceof server_node_1.GLabel) {
+            return this.transformPort(model);
+        }
+        else if (model instanceof server_node_1.GPort) {
+            return this.transformPort(model);
+        }
+        throw new Error('Type not supported: ' + model.type);
+    }
+    /**
+     * Searches for all children of the given element that are an instance of the given {@link GModelElementConstructor}
+     * and are included by the {@link ElementFilter}. Also considers children that are nested inside of {@link GCompartment}s.
+     * @param element The element whose children should be queried.
+     * @param constructor The class instance that should be matched
+     * @returns A list of all matching children.
+     */
+    findChildren(element, constructor) {
+        const result = [];
+        element.children.forEach(child => {
+            if (child instanceof constructor && this.filter.apply(element)) {
+                result.push(child);
+            }
+            else if (child instanceof server_node_1.GCompartment) {
+                result.push(...this.findChildren(child, constructor));
+            }
+        });
+        return result;
+    }
+    findCommonAncestor(elkEdge) {
+        const source = this.modelState.index.get(elkEdge.source);
+        const target = this.modelState.index.get(elkEdge.target);
+        if (!source || !target) {
+            return undefined;
+        }
+        const sourceParent = server_node_1.findParent(source.parent, parent => parent instanceof server_node_1.GNode || parent instanceof server_node_1.GGraph);
+        const targetParent = server_node_1.findParent(target.parent, parent => parent instanceof server_node_1.GNode || parent instanceof server_node_1.GGraph);
+        if (!sourceParent || !targetParent) {
+            return undefined;
+        }
+        if (sourceParent === targetParent) {
+            return this.idToElkElement.get(sourceParent.id);
+        }
+        else if (source === targetParent) {
+            return this.idToElkElement.get(source.id);
+        }
+        else if (target === sourceParent) {
+            return this.idToElkElement.get(target.id);
+        }
+        return undefined;
+    }
+    transformGraph(graph) {
+        const elkGraph = {
+            id: graph.id,
+            layoutOptions: this.configurator.apply(graph)
+        };
+        if (graph.children) {
+            elkGraph.children = this.findChildren(graph, server_node_1.GNode).map(child => this.transformToElk(child));
+            elkGraph.edges = [];
+            this.elkEdges.push(...this.findChildren(graph, server_node_1.GEdge).map(child => this.transformToElk(child)));
+        }
+        this.idToElkElement.set(graph.id, elkGraph);
+        return elkGraph;
+    }
+    transformNode(node) {
+        const elkNode = {
+            id: node.id,
+            layoutOptions: this.configurator.apply(node)
+        };
+        if (node.children) {
+            elkNode.children = this.findChildren(node, server_node_1.GNode).map(child => this.transformToElk(child));
+            elkNode.edges = [];
+            this.elkEdges.push(...this.findChildren(node, server_node_1.GEdge).map(child => this.transformToElk(child)));
+            elkNode.labels = this.findChildren(node, server_node_1.GLabel).map(child => this.transformToElk(child));
+            elkNode.ports = this.findChildren(node, server_node_1.GPort).map(child => this.transformToElk(child));
+        }
+        this.transformShape(elkNode, node);
+        this.idToElkElement.set(node.id, elkNode);
+        return elkNode;
+    }
+    transformShape(elkShape, shape) {
+        if (shape.position) {
+            elkShape.x = shape.position.x;
+            elkShape.y = shape.position.y;
+        }
+        if (shape.size) {
+            elkShape.width = shape.size.width;
+            elkShape.height = shape.size.height;
+        }
+    }
+    transformEdge(edge) {
+        const elkEdge = {
+            id: edge.id,
+            source: edge.sourceId,
+            target: edge.targetId,
+            layoutOptions: this.configurator.apply(edge)
+        };
+        const sourceElement = this.modelState.index.get(edge.sourceId);
+        if (sourceElement instanceof server_node_1.GPort) {
+            const parentNode = server_node_1.findParentByClass(sourceElement, server_node_1.GNode);
+            if (parentNode) {
+                elkEdge.source = parentNode.id;
+                elkEdge.sourcePort = sourceElement.id;
+            }
+        }
+        const targetElement = this.modelState.index.get(edge.targetId);
+        if (sourceElement instanceof server_node_1.GPort) {
+            const parentNode = server_node_1.findParentByClass(targetElement, server_node_1.GNode);
+            if (parentNode) {
+                elkEdge.target = parentNode.id;
+                elkEdge.targetPort = targetElement.id;
+            }
+        }
+        if (edge.children) {
+            elkEdge.labels = this.findChildren(edge, server_node_1.GLabel).map(child => this.transformToElk(child));
+        }
+        const points = edge.routingPoints;
+        if (points && points.length >= 2) {
+            elkEdge.sourcePoint = points[0];
+            elkEdge.bendPoints = points.slice(1, points.length - 1);
+            elkEdge.targetPoint = points[points.length - 1];
+        }
+        this.idToElkElement.set(edge.id, elkEdge);
+        return elkEdge;
+    }
+    transformLabel(label) {
+        const elkLabel = {
+            id: label.id,
+            text: label.text,
+            layoutOptions: this.configurator.apply(label)
+        };
+        this.transformShape(elkLabel, label);
+        this.idToElkElement.set(label.id, elkLabel);
+        return elkLabel;
+    }
+    transformPort(port) {
+        const elkPort = {
+            id: port.id,
+            layoutOptions: this.configurator.apply(port)
+        };
+        if (port.children) {
+            elkPort.labels = this.findChildren(port, server_node_1.GLabel).map(child => this.transformToElk(child));
+        }
+        this.transformShape(elkPort, port);
+        this.idToElkElement.set(port.id, elkPort);
+        return elkPort;
+    }
+    applyLayout(elkNode) {
+        const element = this.modelState.index.get(elkNode.id);
+        if (element instanceof server_node_1.GNode) {
+            this.applyShape(element, elkNode);
+        }
+        if (elkNode.children) {
+            for (const child of elkNode.children) {
+                this.applyLayout(child);
+            }
+        }
+        if (elkNode.edges) {
+            for (const elkEdge of elkNode.edges) {
+                const edge = this.modelState.index.get(elkEdge.id);
+                if (edge instanceof server_node_1.GEdge) {
+                    this.applyEdge(edge, elkEdge);
+                }
+            }
+        }
+        if (elkNode.ports) {
+            for (const elkPort of elkNode.ports) {
+                const port = this.modelState.index.findByClass(elkPort.id, server_node_1.GPort);
+                if (port) {
+                    this.applyShape(port, elkPort);
+                }
+            }
+        }
+    }
+    applyShape(shape, elkShape) {
+        if (elkShape.x !== undefined && elkShape.y !== undefined) {
+            shape.position = { x: elkShape.x, y: elkShape.y };
+        }
+        if (elkShape.width !== undefined && elkShape.height !== undefined) {
+            shape.size = { width: elkShape.width, height: elkShape.height };
+        }
+        if (elkShape.labels) {
+            for (const elkLabel of elkShape.labels) {
+                const label = this.modelState.index.findByClass(elkLabel.id, server_node_1.GLabel);
+                if (label) {
+                    this.applyShape(label, elkLabel);
+                }
+            }
+        }
+    }
+    applyEdge(edge, elkEdge) {
+        const points = [];
+        if (elkEdge.sections && elkEdge.sections.length > 0) {
+            const section = elkEdge.sections[0];
+            if (section.startPoint) {
+                points.push(section.startPoint);
+            }
+            if (section.bendPoints) {
+                points.push(...section.bendPoints);
+            }
+            if (section.endPoint) {
+                points.push(section.endPoint);
+            }
+        }
+        else {
+            const section = elkEdge;
+            if (section.sourcePoint) {
+                points.push(section.sourcePoint);
+            }
+            if (section.bendPoints) {
+                points.push(...section.bendPoints);
+            }
+            if (section.targetPoint) {
+                points.push(section.targetPoint);
+            }
+        }
+        edge.routingPoints = points;
+        if (elkEdge.labels) {
+            elkEdge.labels.forEach(elkLabel => {
+                const label = this.modelState.index.findByClass(elkLabel.id, server_node_1.GLabel);
+                if (label) {
+                    this.applyShape(label, elkLabel);
+                }
+            });
+        }
     }
 };
-__decorate([
-    inversify_1.inject(server_node_1.ModelState),
-    __metadata("design:type", Object)
-], GlspElkLayoutEngine.prototype, "modelState", void 0);
-__decorate([
-    inversify_1.inject(BaseElkLayoutEngine),
-    __metadata("design:type", BaseElkLayoutEngine)
-], GlspElkLayoutEngine.prototype, "elkLayoutEngine", void 0);
 GlspElkLayoutEngine = __decorate([
-    inversify_1.injectable()
+    inversify_1.injectable(),
+    __metadata("design:paramtypes", [Function, Object, Object, Object])
 ], GlspElkLayoutEngine);
 exports.GlspElkLayoutEngine = GlspElkLayoutEngine;
 //# sourceMappingURL=glsp-elk-layout-engine.js.map

package/lib/glsp-elk-layout-engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-elk-layout-engine.js","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2DAAqE;AACrE,yCAA+C;AAC/C,yDAA6G;AAE7G,2DAAsD;AAEtD;;GAEG;AAEH,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,2BAAe;IACpD,YACwB,UAAsB,EACC,MAAsB,EACjB,YAAiC,EAC9C,UAA2B;QAE9D,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAJG,WAAM,GAAN,MAAM,CAAgB;QACjB,iBAAY,GAAZ,YAAY,CAAqB;QAC9C,eAAU,GAAV,UAAU,CAAiB;IAGlE,CAAC;IAES,YAAY,CAAC,MAAqB;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACJ,CAAA;AAbY,mBAAmB;IAD/B,sBAAU,EAAE;IAGJ,WAAA,kBAAM,CAAC,sBAAU,CAAC,CAAA;IAClB,WAAA,kBAAM,CAAC,0BAAc,CAAC,CAAA;IACtB,WAAA,kBAAM,CAAC,+BAAmB,CAAC,CAAA;IAC3B,WAAA,kBAAM,CAAC,mCAAe,CAAC,CAAA;+DAAuB,mCAAe;GALzD,mBAAmB,CAa/B;AAbY,kDAAmB;AAehC;;;GAGG;AAEH,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAO5B,KAAK,CAAC,MAAM;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACnC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACJ,CAAA;AATG;IADC,kBAAM,CAAC,wBAAU,CAAC;;uDACc;AAGjC;IADC,kBAAM,CAAC,mBAAmB,CAAC;8BACD,mBAAmB;4DAAC;AALtC,mBAAmB;IAD/B,sBAAU,EAAE;GACA,mBAAmB,CAW/B;AAXY,kDAAmB"}
+{"version":3,"file":"glsp-elk-layout-engine.js","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from 'sprotty-elk';
-export { SModelIndex } from 'sprotty-protocol/lib/utils/model-utils';
-export * from './basic-type-mapper';
 export * from './di.config';
-export * from './glsp-element-filter';
+export * from './element-filter';
 export * from './glsp-elk-layout-engine';
-export * from './glsp-layout-configurator';
+export * from './layout-configurator';
+export * from './sprotty-elk';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC"}

package/lib/index.js

@@ -11,7 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,12 +25,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-__exportStar(require("sprotty-elk"), exports);
-var model_utils_1 = require("sprotty-protocol/lib/utils/model-utils");
-Object.defineProperty(exports, "SModelIndex", { enumerable: true, get: function () { return model_utils_1.SModelIndex; } });
-__exportStar(require("./basic-type-mapper"), exports);
 __exportStar(require("./di.config"), exports);
-__exportStar(require("./glsp-element-filter"), exports);
+__exportStar(require("./element-filter"), exports);
 __exportStar(require("./glsp-elk-layout-engine"), exports);
-__exportStar(require("./glsp-layout-configurator"), exports);
+__exportStar(require("./layout-configurator"), exports);
+__exportStar(require("./sprotty-elk"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,8CAA4B;AAC5B,sEAAqE;AAA5D,0GAAA,WAAW,OAAA;AACpB,sDAAoC;AACpC,8CAA4B;AAC5B,wDAAsC;AACtC,2DAAyC;AACzC,6DAA2C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,8CAA4B;AAC5B,mDAAiC;AACjC,2DAAyC;AACzC,wDAAsC;AACtC,gDAA8B"}

package/lib/{glsp-layout-configurator.d.ts → layout-configurator.d.ts}

@@ -13,20 +13,35 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LayoutOptions } from 'elkjs';
-import { DefaultLayoutConfigurator } from 'sprotty-elk';
-import { SGraph, SModelElement, SModelIndex } from 'sprotty-protocol';
-import { BasicTypeMapper } from './basic-type-mapper';
+import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server-node';
+import { LayoutOptions } from './sprotty-elk';
+export declare const LayoutConfigurator: unique symbol;
 /**
  * Configurator for ELK layout algorithms; provides mappings of layout options for each model element.
- * For a list of all available layout options checkout the official ELK documentation.
- * A minimal configuration should at least specify the `elk.algorithm` option as
- * return value of {@link GlspLayoutConfigurator.graphOptions}.
+ * For a list of all available layout options checkout the official ELK documentation:
  * {@link https://www.eclipse.org/elk/reference/options.html}
  */
-export declare class GlspLayoutConfigurator extends DefaultLayoutConfigurator {
-    protected typeMapper: BasicTypeMapper;
-    protected getBasicType(smodel: SModelElement): string;
+export interface LayoutConfigurator {
+    /**
+     * Computes the {@link LayoutOptions} for the given {@link GModelElement}.
+     * @param element The element for which the layout options should be computed.
+     * @returns The set of layout options for the given element or `undefined`.
+     */
+    apply(element: GModelElement): LayoutOptions | undefined;
+}
+/**
+ * Abstract default implementation of {@link LayoutConfigurator}.
+ * A minimal configuration should at least specify the `elk.algorithm` option as
+ * return value of {@link DefaultLayoutConfigurator.graphOptions}.
+ */
+export declare abstract class AbstractLayoutConfigurator implements LayoutConfigurator {
+    protected modelState: ModelState;
+    apply(element: GModelElement): LayoutOptions | undefined;
+    protected graphOptions(graph: GGraph): LayoutOptions | undefined;
+    protected nodeOptions(node: GNode): LayoutOptions | undefined;
+    protected edgeOptions(edge: GEdge): LayoutOptions | undefined;
+    protected labelOptions(label: GLabel): LayoutOptions | undefined;
+    protected portOptions(sport: GPort): LayoutOptions | undefined;
 }
 /**
  * A fallback configurator that is used in the `configureELKLayoutModule` utility method.
@@ -34,10 +49,9 @@ export declare class GlspLayoutConfigurator extends DefaultLayoutConfigurator {
  * bound as replacement. Basic layout options for the root graph element are derived from the
  * configuration parameters that haven been passed to the `configureELKLayoutModule` function.
  */
-export declare class FallbackGlspLayoutConfigurator extends GlspLayoutConfigurator {
-    protected typeMapper: BasicTypeMapper;
+export declare class FallbackLayoutConfigurator extends AbstractLayoutConfigurator {
     protected fallbackGraphOptions: LayoutOptions;
-    constructor(typeMapper: BasicTypeMapper, algorithms: string[], defaultLayoutOptions?: LayoutOptions);
-    protected graphOptions(sgraph: SGraph, index: SModelIndex): LayoutOptions | undefined;
+    constructor(algorithms: string[], defaultLayoutOptions?: LayoutOptions);
+    protected graphOptions(sgraph: GGraph): LayoutOptions | undefined;
 }
-//# sourceMappingURL=glsp-layout-configurator.d.ts.map
+//# sourceMappingURL=layout-configurator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"layout-configurator.d.ts","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE3G,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;CAC5D;AAED;;;;GAIG;AACH,8BACsB,0BAA2B,YAAW,kBAAkB;IAE1E,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS;IAexD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAIhE,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAI7D,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAI7D,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAIhE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;CAGjE;AAED;;;;;GAKG;AACH,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,SAAS,CAAC,oBAAoB,EAAE,aAAa,CAAC;gBAClC,UAAU,EAAE,MAAM,EAAE,EAAE,oBAAoB,GAAE,aAAkB;IAQ1E,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;CAGpE"}

package/lib/layout-configurator.js

@@ -0,0 +1,99 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FallbackLayoutConfigurator = exports.AbstractLayoutConfigurator = exports.LayoutConfigurator = void 0;
+/********************************************************************************
+ * Copyright (c) 2022 STMicroelectronics and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * 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 inversify_1 = require("inversify");
+exports.LayoutConfigurator = Symbol('LayoutConfigurator');
+/**
+ * Abstract default implementation of {@link LayoutConfigurator}.
+ * A minimal configuration should at least specify the `elk.algorithm` option as
+ * return value of {@link DefaultLayoutConfigurator.graphOptions}.
+ */
+let AbstractLayoutConfigurator = class AbstractLayoutConfigurator {
+    apply(element) {
+        if (element instanceof server_node_1.GGraph) {
+            return this.graphOptions(element);
+        }
+        else if (element instanceof server_node_1.GNode) {
+            return this.nodeOptions(element);
+        }
+        else if (element instanceof server_node_1.GEdge) {
+            return this.edgeOptions(element);
+        }
+        else if (element instanceof server_node_1.GLabel) {
+            this.labelOptions(element);
+        }
+        else if (element instanceof server_node_1.GPort) {
+            this.portOptions(element);
+        }
+        return undefined;
+    }
+    graphOptions(graph) {
+        return undefined;
+    }
+    nodeOptions(node) {
+        return undefined;
+    }
+    edgeOptions(edge) {
+        return undefined;
+    }
+    labelOptions(label) {
+        return undefined;
+    }
+    portOptions(sport) {
+        return undefined;
+    }
+};
+__decorate([
+    inversify_1.inject(server_node_1.ModelState),
+    __metadata("design:type", Object)
+], AbstractLayoutConfigurator.prototype, "modelState", void 0);
+AbstractLayoutConfigurator = __decorate([
+    inversify_1.injectable()
+], AbstractLayoutConfigurator);
+exports.AbstractLayoutConfigurator = AbstractLayoutConfigurator;
+/**
+ * A fallback configurator that is used in the `configureELKLayoutModule` utility method.
+ * If no explicit layout configurator binding is provided a new instance of the fallback configurator is
+ * bound as replacement. Basic layout options for the root graph element are derived from the
+ * configuration parameters that haven been passed to the `configureELKLayoutModule` function.
+ */
+let FallbackLayoutConfigurator = class FallbackLayoutConfigurator extends AbstractLayoutConfigurator {
+    constructor(algorithms, defaultLayoutOptions = {}) {
+        super();
+        this.fallbackGraphOptions = Object.assign({ 'elk.algorithm': algorithms[0] }, defaultLayoutOptions);
+    }
+    graphOptions(sgraph) {
+        return this.fallbackGraphOptions;
+    }
+};
+FallbackLayoutConfigurator = __decorate([
+    inversify_1.injectable(),
+    __metadata("design:paramtypes", [Array, Object])
+], FallbackLayoutConfigurator);
+exports.FallbackLayoutConfigurator = FallbackLayoutConfigurator;
+//# sourceMappingURL=layout-configurator.js.map

package/lib/layout-configurator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layout-configurator.js","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2DAA2G;AAC3G,yCAA+C;AAGlC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAe/D;;;;GAIG;AAEH,IAAsB,0BAA0B,GAAhD,MAAsB,0BAA0B;IAI5C,KAAK,CAAC,OAAsB;QACxB,IAAI,OAAO,YAAY,oBAAM,EAAE;YAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACrC;aAAM,IAAI,OAAO,YAAY,mBAAK,EAAE;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,mBAAK,EAAE;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,oBAAM,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM,IAAI,OAAO,YAAY,mBAAK,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC7B;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,YAAY,CAAC,KAAa;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,WAAW,CAAC,IAAW;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,WAAW,CAAC,IAAW;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,YAAY,CAAC,KAAa;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,WAAW,CAAC,KAAY;QAC9B,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AApCG;IADC,kBAAM,CAAC,wBAAU,CAAC;;8DACc;AAFf,0BAA0B;IAD/C,sBAAU,EAAE;GACS,0BAA0B,CAsC/C;AAtCqB,gEAA0B;AAwChD;;;;;GAKG;AAEH,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,0BAA0B;IAEtE,YAAY,UAAoB,EAAE,uBAAsC,EAAE;QACtE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,oBAAoB,mBACrB,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,IAC3B,oBAAoB,CAC1B,CAAC;IACN,CAAC;IAES,YAAY,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;CACJ,CAAA;AAbY,0BAA0B;IADtC,sBAAU,EAAE;;GACA,0BAA0B,CAatC;AAbY,gEAA0B"}

package/lib/{basic-type-mapper.d.ts → sprotty-elk.d.ts}

@@ -13,14 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DiagramConfiguration, GModelElementConstructor } from '@eclipse-glsp/server-node';
-import { SModelElement } from 'sprotty-protocol';
-export declare type BasicGModelType = 'graph' | 'node' | 'edge' | 'label' | 'port' | 'unknown';
-export declare class BasicTypeMapper {
-    protected diagramConfiguration: DiagramConfiguration;
-    protected basicTypeMap: Map<string, BasicGModelType>;
-    protected postConstruct(): void;
-    protected toBasicType(constructor: GModelElementConstructor): BasicGModelType;
-    getBasicType(input: SModelElement | string): BasicGModelType;
-}
-//# sourceMappingURL=basic-type-mapper.d.ts.map
+export { LayoutOptions } from 'elkjs';
+export { ElkFactory } from 'sprotty-elk/lib/inversify';
+//# sourceMappingURL=sprotty-elk.d.ts.map

package/lib/sprotty-elk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sprotty-elk.d.ts","sourceRoot":"","sources":["../src/sprotty-elk.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC"}

package/lib/sprotty-elk.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var inversify_1 = require("sprotty-elk/lib/inversify");
+Object.defineProperty(exports, "ElkFactory", { enumerable: true, get: function () { return inversify_1.ElkFactory; } });
+//# sourceMappingURL=sprotty-elk.js.map

package/lib/sprotty-elk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sprotty-elk.js","sourceRoot":"","sources":["../src/sprotty-elk.ts"],"names":[],"mappings":";;AAiBA,uDAAuD;AAA9C,uGAAA,UAAU,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/layout-elk",
-  "version": "0.9.0-next.66aad6e.3+66aad6e",
+  "version": "0.9.0-next.95961ba.7+95961ba",
   "description": "Integration of ELK graph layout algorithms in GLSP Node Server",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -38,7 +38,7 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/server-node": "0.9.0-next.66aad6e.3+66aad6e",
+    "@eclipse-glsp/server-node": "0.9.0-next.95961ba.7+95961ba",
     "elkjs": "^0.7.1",
     "inversify": "^5.0.1",
     "sprotty-elk": "next"
@@ -57,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "66aad6e0e10892b1041522ac165d07f1d3220730"
+  "gitHead": "95961ba417aa103e0a7c59273daa6462ae538dde"
 }