@eclipse-glsp/layout-elk 1.1.0-next.e3f33d3.49 → 1.1.0-next.f692ea4.55

package/lib/element-filter.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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

package/lib/element-filter.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultElementFilter = exports.ElementFilter = void 0;
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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

package/lib/glsp-elk-layout-engine.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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.

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlspElkLayoutEngine = void 0;
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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.

package/lib/layout-configurator.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 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

package/lib/layout-configurator.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FallbackLayoutConfigurator = exports.AbstractLayoutConfigurator = exports.LayoutConfigurator = void 0;
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/layout-elk",
-  "version": "1.1.0-next.e3f33d3.49+e3f33d3",
+  "version": "1.1.0-next.f692ea4.55+f692ea4",
   "description": "Integration of ELK graph layout algorithms in GLSP Node Server",
   "keywords": [
     "eclipse",
@@ -50,12 +50,12 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/server": "1.1.0-next.e3f33d3.49+e3f33d3",
+    "@eclipse-glsp/server": "1.1.0-next.f692ea4.55+f692ea4",
     "elkjs": "^0.7.1",
     "sprotty-elk": "0.12.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3f33d3eff98bbfe4bba8a9a334f9cc7d9354904"
+  "gitHead": "f692ea4c66ddb29f09e8f76738a4a0b63fdf96d8"
 }

package/src/di.config.spec.ts

@@ -13,8 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DefaultModelState, GGraph, GModelElementConstructor, ModelState } from '@eclipse-glsp/server';
-import { StubDiagramConfiguration } from '@eclipse-glsp/server/lib/common/test/mock-util';
+import {
+    DefaultModelState,
+    DiagramConfiguration,
+    EdgeTypeHint,
+    GGraph,
+    GModelElementConstructor,
+    ModelState,
+    ServerLayoutKind,
+    ShapeTypeHint
+} from '@eclipse-glsp/server';
 import { expect } from 'chai';
 import { Container, ContainerModule, injectable } from 'inversify';
 import * as sinon from 'sinon';
@@ -28,6 +36,20 @@ class CustomLayoutConfigurator extends AbstractLayoutConfigurator {}
 @injectable()
 class CustomElementFilter extends DefaultElementFilter {}
 
+class StubDiagramConfiguration implements DiagramConfiguration {
+    typeMapping = new Map<string, GModelElementConstructor>();
+
+    shapeTypeHints: ShapeTypeHint[] = [];
+
+    edgeTypeHints: EdgeTypeHint[] = [];
+
+    layoutKind = ServerLayoutKind.NONE;
+
+    needsClientLayout = true;
+
+    animatedUpdate = true;
+}
+
 describe('test configureELKLayoutModule', () => {
     const sandbox = sinon.createSandbox();
     const mockDiagramConfiguration = new StubDiagramConfiguration();

package/src/element-filter.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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

package/src/glsp-elk-layout-engine.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018-2022 TypeFox and others.
+ * Copyright (c) 2018-2023 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.

package/src/layout-configurator.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 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

package/lib/di.config.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=di.config.spec.d.ts.map

package/lib/di.config.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"di.config.spec.d.ts","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":""}

package/lib/di.config.spec.js

@@ -1,96 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/********************************************************************************
- * Copyright (c) 2022-2023 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_1 = require("@eclipse-glsp/server");
-const mock_util_1 = require("@eclipse-glsp/server/lib/common/test/mock-util");
-const chai_1 = require("chai");
-const inversify_1 = require("inversify");
-const sinon = require("sinon");
-const di_config_1 = require("./di.config");
-const element_filter_1 = require("./element-filter");
-const layout_configurator_1 = require("./layout-configurator");
-let CustomLayoutConfigurator = class CustomLayoutConfigurator extends layout_configurator_1.AbstractLayoutConfigurator {
-};
-CustomLayoutConfigurator = __decorate([
-    (0, inversify_1.injectable)()
-], CustomLayoutConfigurator);
-let CustomElementFilter = class CustomElementFilter extends element_filter_1.DefaultElementFilter {
-};
-CustomElementFilter = __decorate([
-    (0, inversify_1.injectable)()
-], CustomElementFilter);
-describe('test configureELKLayoutModule', () => {
-    const sandbox = sinon.createSandbox();
-    const mockDiagramConfiguration = new mock_util_1.StubDiagramConfiguration();
-    const typeMappings = new Map();
-    typeMappings.set('graph', server_1.GGraph);
-    sandbox.stub(mockDiagramConfiguration, 'typeMapping').value(typeMappings);
-    const modelState = new server_1.DefaultModelState();
-    const baseModule = new inversify_1.ContainerModule(bind => {
-        bind(server_1.ModelState).toConstantValue(modelState);
-    });
-    it('configure with minimal options', () => {
-        const algorithm = 'layered';
-        const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm] });
-        const container = new inversify_1.Container();
-        container.load(baseModule, elkModule);
-        const filter = container.get(element_filter_1.ElementFilter);
-        (0, chai_1.expect)(filter).to.be.an.instanceOf(element_filter_1.DefaultElementFilter);
-        const configurator = container.get(layout_configurator_1.LayoutConfigurator);
-        (0, chai_1.expect)(configurator).to.be.an.instanceOf(layout_configurator_1.FallbackLayoutConfigurator);
-        const graphOptions = configurator.apply(new server_1.GGraph());
-        (0, chai_1.expect)(graphOptions).not.to.be.undefined;
-        (0, chai_1.expect)(graphOptions['elk.algorithm']).to.equal(algorithm);
-    });
-    it('configure with additional default layout options', () => {
-        const algorithm = 'layered';
-        const defaultLayoutOptions = {
-            'elk.direction': 'LEFT',
-            'elk.edgeRouting': 'POLYLINE'
-        };
-        const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], defaultLayoutOptions });
-        const container = new inversify_1.Container();
-        container.load(baseModule, elkModule);
-        const configurator = container.get(layout_configurator_1.LayoutConfigurator);
-        const graphOptions = configurator.apply(new server_1.GGraph());
-        (0, chai_1.expect)(graphOptions).not.to.be.undefined;
-        (0, chai_1.expect)(graphOptions).to.include(defaultLayoutOptions);
-    });
-    it('configure with custom layout configurator', () => {
-        const algorithm = 'layered';
-        const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], layoutConfigurator: CustomLayoutConfigurator });
-        const container = new inversify_1.Container();
-        container.load(baseModule, elkModule);
-        const configurator = container.get(layout_configurator_1.LayoutConfigurator);
-        (0, chai_1.expect)(configurator).to.be.an.instanceOf(CustomLayoutConfigurator);
-    });
-    it('configure with custom element filter', () => {
-        const algorithm = 'layered';
-        const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], elementFilter: CustomElementFilter });
-        const container = new inversify_1.Container();
-        container.load(baseModule, elkModule);
-        const filter = container.get(element_filter_1.ElementFilter);
-        (0, chai_1.expect)(filter).to.be.an.instanceOf(CustomElementFilter);
-    });
-});
-//# sourceMappingURL=di.config.spec.js.map

package/lib/di.config.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"di.config.spec.js","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAuG;AACvG,8EAA0F;AAC1F,+BAA8B;AAC9B,yCAAmE;AACnE,+BAA+B;AAC/B,2CAAuD;AACvD,qDAAuE;AACvE,+DAAmH;AAGnH,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,gDAA0B;CAAG,CAAA;AAA9D,wBAAwB;IAD7B,IAAA,sBAAU,GAAE;GACP,wBAAwB,CAAsC;AAGpE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,qCAAoB;CAAG,CAAA;AAAnD,mBAAmB;IADxB,IAAA,sBAAU,GAAE;GACP,mBAAmB,CAAgC;AAEzD,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;IACtC,MAAM,wBAAwB,GAAG,IAAI,oCAAwB,EAAE,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoC,CAAC;IAEjE,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,eAAM,CAAC,CAAC;IAClC,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,IAAI,0BAAiB,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;QAC1C,IAAI,CAAC,mBAAU,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,SAAS,GAAG,SAAS,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAA,oCAAwB,EAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAgB,8BAAa,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,qCAAoB,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAqB,wCAAkB,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,gDAA0B,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,eAAM,EAAE,CAAC,CAAC;QACtD,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACzC,IAAA,aAAM,EAAC,YAAa,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QACxD,MAAM,SAAS,GAAG,SAAS,CAAC;QAC5B,MAAM,oBAAoB,GAAG;YACzB,eAAe,EAAE,MAAM;YACvB,iBAAiB,EAAE,UAAU;SAChC,CAAC;QACF,MAAM,SAAS,GAAG,IAAA,oCAAwB,EAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAC9F,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAqB,wCAAkB,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,eAAM,EAAE,CAAC,CAAC;QACtD,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACzC,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACjD,MAAM,SAAS,GAAG,SAAS,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAA,oCAAwB,EAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,CAAC,CAAC;QACtH,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAqB,wCAAkB,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,MAAM,SAAS,GAAG,SAAS,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAA,oCAAwB,EAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC5G,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAClC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAgB,8BAAa,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}