@eclipse-glsp/layout-elk 1.1.0-next.d47240f.50 → 1.1.0-next.de91dcd.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/di.config.d.ts.map +1 -1
- package/lib/di.config.js +2 -3
- package/lib/di.config.js.map +1 -1
- package/lib/element-filter.js +2 -3
- package/lib/element-filter.js.map +1 -1
- package/lib/glsp-elk-layout-engine.d.ts +8 -1
- package/lib/glsp-elk-layout-engine.d.ts.map +1 -1
- package/lib/glsp-elk-layout-engine.js +4 -5
- package/lib/glsp-elk-layout-engine.js.map +1 -1
- package/lib/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +0 -16
- package/lib/index.js.map +1 -1
- package/lib/layout-configurator.d.ts +1 -1
- package/lib/layout-configurator.d.ts.map +1 -1
- package/lib/layout-configurator.js +4 -6
- package/lib/layout-configurator.js.map +1 -1
- package/package.json +7 -5
- package/src/di.config.spec.ts +24 -2
- package/src/di.config.ts +1 -2
- package/src/glsp-elk-layout-engine.ts +9 -1
- package/src/index.ts +2 -2
- package/src/layout-configurator.ts +1 -2
- package/lib/di.config.spec.d.ts +0 -2
- package/lib/di.config.spec.d.ts.map +0 -1
- package/lib/di.config.spec.js +0 -96
- package/lib/di.config.spec.js.map +0 -1
- package/lib/sprotty-elk.d.ts +0 -18
- package/lib/sprotty-elk.d.ts.map +0 -1
- package/lib/sprotty-elk.js +0 -6
- package/lib/sprotty-elk.js.map +0 -1
- package/src/sprotty-elk.ts +0 -18
package/lib/di.config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAgBA,OAAuB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAgBA,OAAuB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAwB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAA8B,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvF,KAAK,WAAW,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,aAAa,CAAC;IACrC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;IACrD;;;OAGG;IACH,aAAa,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAC9C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAoCnF"}
|
package/lib/di.config.js
CHANGED
|
@@ -19,7 +19,6 @@ exports.configureELKLayoutModule = void 0;
|
|
|
19
19
|
const server_1 = require("@eclipse-glsp/server");
|
|
20
20
|
const elk_bundled_1 = require("elkjs/lib/elk.bundled");
|
|
21
21
|
const inversify_1 = require("inversify");
|
|
22
|
-
const sprotty_elk_1 = require("sprotty-elk");
|
|
23
22
|
const element_filter_1 = require("./element-filter");
|
|
24
23
|
const glsp_elk_layout_engine_1 = require("./glsp-elk-layout-engine");
|
|
25
24
|
const layout_configurator_1 = require("./layout-configurator");
|
|
@@ -59,11 +58,11 @@ function configureELKLayoutModule(options) {
|
|
|
59
58
|
algorithms: options.algorithms,
|
|
60
59
|
defaultLayoutOptions: options.defaultLayoutOptions
|
|
61
60
|
});
|
|
62
|
-
bind(
|
|
61
|
+
bind(glsp_elk_layout_engine_1.ElkFactory).toConstantValue(elkFactory);
|
|
63
62
|
bind(glsp_elk_layout_engine_1.GlspElkLayoutEngine)
|
|
64
63
|
.toDynamicValue(context => {
|
|
65
64
|
const container = context.container;
|
|
66
|
-
const factory = container.get(
|
|
65
|
+
const factory = container.get(glsp_elk_layout_engine_1.ElkFactory);
|
|
67
66
|
const filter = container.get(element_filter_1.ElementFilter);
|
|
68
67
|
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
69
68
|
const modelState = container.get(server_1.ModelState);
|
package/lib/di.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAgE;AAChE,uDAAsE;AACtE,yCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAgE;AAChE,uDAAsE;AACtE,yCAA4C;AAC5C,qDAAuE;AACvE,qEAA2E;AAC3E,+DAAuF;AA6BvF;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,wBAAwB,CAAC,OAAyB;IAC9D,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;QAC9B,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,8BAAa,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;SACpE;aAAM;YACH,IAAI,CAAC,8BAAa,CAAC,CAAC,EAAE,CAAC,qCAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,wCAAkB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SAC3D;aAAM;YACH,IAAI,CAAC,wCAAkB,CAAC;iBACnB,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,gDAA0B,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;iBAC3G,gBAAgB,EAAE,CAAC;SAC3B;QAED,MAAM,UAAU,GAAe,GAAG,EAAE,CAChC,IAAI,qBAAc,CAAC;YACf,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SACrD,CAAC,CAAC;QAEP,IAAI,CAAC,mCAAU,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE7C,IAAI,CAAC,4CAAmB,CAAC;aACpB,cAAc,CAAC,OAAO,CAAC,EAAE;YACtB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YACpC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAa,mCAAU,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAgB,8BAAa,CAAC,CAAC;YAC3D,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAqB,wCAAkB,CAAC,CAAC;YAC3E,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAa,mBAAU,CAAC,CAAC;YACzD,OAAO,IAAI,4CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAC9E,CAAC,CAAC;aACD,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,qBAAY,CAAC,CAAC,SAAS,CAAC,4CAAmB,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC;AApCD,4DAoCC"}
|
package/lib/element-filter.js
CHANGED
|
@@ -36,7 +36,7 @@ exports.ElementFilter = Symbol('ElementFilter');
|
|
|
36
36
|
* as well. The filter behavior for each of the basic types can be customized by overriding the corresponding `filter` method.
|
|
37
37
|
* (e.g. {@link DefaultElementFilter.filterNode})
|
|
38
38
|
*/
|
|
39
|
-
let DefaultElementFilter = class DefaultElementFilter {
|
|
39
|
+
let DefaultElementFilter = exports.DefaultElementFilter = class DefaultElementFilter {
|
|
40
40
|
apply(element) {
|
|
41
41
|
if (element instanceof server_1.GNode) {
|
|
42
42
|
return this.filterNode(element);
|
|
@@ -77,8 +77,7 @@ __decorate([
|
|
|
77
77
|
(0, inversify_1.inject)(server_1.ModelState),
|
|
78
78
|
__metadata("design:type", Object)
|
|
79
79
|
], DefaultElementFilter.prototype, "modelState", void 0);
|
|
80
|
-
DefaultElementFilter = __decorate([
|
|
80
|
+
exports.DefaultElementFilter = DefaultElementFilter = __decorate([
|
|
81
81
|
(0, inversify_1.injectable)()
|
|
82
82
|
], DefaultElementFilter);
|
|
83
|
-
exports.DefaultElementFilter = DefaultElementFilter;
|
|
84
83
|
//# sourceMappingURL=element-filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-filter.js","sourceRoot":"","sources":["../src/element-filter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA8F;AAC9F,yCAA+C;AAElC,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAarD;;;;;;;GAOG;AAEI,IAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"element-filter.js","sourceRoot":"","sources":["../src/element-filter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA8F;AAC9F,yCAA+C;AAElC,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAarD;;;;;;;GAOG;AAEI,IAAM,oBAAoB,kCAA1B,MAAM,oBAAoB;IAI7B,KAAK,CAAC,OAAsB;QACxB,IAAI,OAAO,YAAY,cAAK,EAAE;YAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;SACnC;aAAM,IAAI,OAAO,YAAY,cAAK,EAAE;YACjC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;SACnC;aAAM,IAAI,OAAO,YAAY,eAAM,EAAE;YAClC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC7B;aAAM,IAAI,OAAO,YAAY,cAAK,EAAE;YACjC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,UAAU,CAAC,IAAW;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,UAAU,CAAC,IAAW;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,cAAK,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,YAAY,cAAK,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YAC3H,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,cAAK,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,YAAY,cAAK,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YAC3H,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW,CAAC,KAAa;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,UAAU,CAAC,IAAW;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAzCa;IADT,IAAA,kBAAM,EAAC,mBAAU,CAAC;;wDACc;+BAFxB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA2ChC"}
|
|
@@ -14,9 +14,16 @@
|
|
|
14
14
|
********************************************************************************/
|
|
15
15
|
import { GEdge, GGraph, GLabel, GModelElement, GModelElementConstructor, GModelRoot, GNode, GPort, GShapeElement, LayoutEngine, MaybePromise, ModelState } from '@eclipse-glsp/server';
|
|
16
16
|
import { ELK, ElkEdge, ElkGraphElement, ElkLabel, ElkNode, ElkPort, ElkPrimitiveEdge, ElkShape } from 'elkjs/lib/elk-api';
|
|
17
|
-
import { ElkFactory } from 'sprotty-elk';
|
|
18
17
|
import { ElementFilter } from './element-filter';
|
|
19
18
|
import { LayoutConfigurator } from './layout-configurator';
|
|
19
|
+
/**
|
|
20
|
+
* Factory for ELK instances. Follow the elkjs package documentation on how to configure ELK
|
|
21
|
+
* instances. For example, the bundled version can be used by importing the ELK constructor
|
|
22
|
+
* from `"elkjs/lib/elk.bundled"`. For the webworker version, import the constructor from
|
|
23
|
+
* `"elkjs/lib/elk-api"` and add the option `workerUrl: "elk/elk-worker.min.js"`.
|
|
24
|
+
*/
|
|
25
|
+
export type ElkFactory = () => ELK;
|
|
26
|
+
export declare const ElkFactory: unique symbol;
|
|
20
27
|
/**
|
|
21
28
|
* An implementation of GLSP's {@link LayoutEngine} interface that retrieves the graphical model from the {@link ModelState},
|
|
22
29
|
* transforms this model into an ELK graph and then invokes the underlying ELK instance for layout computation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-elk-layout-engine.d.ts","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;kFAakF;AAClF,OAAO,EAIH,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,wBAAwB,EACxB,UAAU,EACV,KAAK,EACL,KAAK,EACL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,UAAU,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAmB,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE3I,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"glsp-elk-layout-engine.d.ts","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;kFAakF;AAClF,OAAO,EAIH,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,wBAAwB,EACxB,UAAU,EACV,KAAK,EACL,KAAK,EACL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,UAAU,EAEb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAmB,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE3I,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC;AACnC,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C;;;GAGG;AACH,qBACa,mBAAoB,YAAW,YAAY;IAQhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IACxC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB;IACnD,SAAS,CAAC,UAAU,EAAE,UAAU;IATpC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE5B,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;IAC9B,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;gBAGnD,UAAU,EAAE,UAAU,EACH,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,kBAAkB,EACzC,UAAU,EAAE,UAAU;IAIpC,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC;IAelC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe;IAuB/D;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAatH,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,GAAG,SAAS;IAwB5E,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe;IAexD,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAqB7C,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAWxE,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAsC7C,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;IAWjD,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAc7C,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IA6B7C,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAkBpE,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;CAoC3D"}
|
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.GlspElkLayoutEngine = void 0;
|
|
12
|
+
exports.GlspElkLayoutEngine = exports.ElkFactory = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
14
|
* Copyright (c) 2018-2023 TypeFox and others.
|
|
15
15
|
* This program and the accompanying materials are made available under the
|
|
@@ -26,14 +26,14 @@ exports.GlspElkLayoutEngine = void 0;
|
|
|
26
26
|
********************************************************************************/
|
|
27
27
|
const server_1 = require("@eclipse-glsp/server");
|
|
28
28
|
const inversify_1 = require("inversify");
|
|
29
|
-
const sprotty_elk_1 = require("sprotty-elk");
|
|
30
29
|
const element_filter_1 = require("./element-filter");
|
|
31
30
|
const layout_configurator_1 = require("./layout-configurator");
|
|
31
|
+
exports.ElkFactory = Symbol('ElkFactory');
|
|
32
32
|
/**
|
|
33
33
|
* An implementation of GLSP's {@link LayoutEngine} interface that retrieves the graphical model from the {@link ModelState},
|
|
34
34
|
* transforms this model into an ELK graph and then invokes the underlying ELK instance for layout computation.
|
|
35
35
|
*/
|
|
36
|
-
let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
36
|
+
let GlspElkLayoutEngine = exports.GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
37
37
|
constructor(elkFactory, filter, configurator, modelState) {
|
|
38
38
|
this.filter = filter;
|
|
39
39
|
this.configurator = configurator;
|
|
@@ -296,9 +296,8 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
298
|
};
|
|
299
|
-
GlspElkLayoutEngine = __decorate([
|
|
299
|
+
exports.GlspElkLayoutEngine = GlspElkLayoutEngine = __decorate([
|
|
300
300
|
(0, inversify_1.injectable)(),
|
|
301
301
|
__metadata("design:paramtypes", [Function, Object, Object, Object])
|
|
302
302
|
], GlspElkLayoutEngine);
|
|
303
|
-
exports.GlspElkLayoutEngine = GlspElkLayoutEngine;
|
|
304
303
|
//# sourceMappingURL=glsp-elk-layout-engine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-elk-layout-engine.js","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;kFAakF;AAClF,iDAiB8B;AAE9B,yCAAuC;AACvC,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
2
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
+
export { LayoutOptions } from 'elkjs';
|
|
16
17
|
export * from './di.config';
|
|
17
18
|
export * from './element-filter';
|
|
18
19
|
export * from './glsp-elk-layout-engine';
|
|
19
20
|
export * from './layout-configurator';
|
|
20
|
-
export * from './sprotty-elk';
|
|
21
21
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -14,24 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
/********************************************************************************
|
|
18
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
19
|
-
*
|
|
20
|
-
* This program and the accompanying materials are made available under the
|
|
21
|
-
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
22
|
-
* http://www.eclipse.org/legal/epl-2.0.
|
|
23
|
-
*
|
|
24
|
-
* This Source Code may also be made available under the following Secondary
|
|
25
|
-
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
26
|
-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
27
|
-
* with the GNU Classpath Exception which is available at
|
|
28
|
-
* https://www.gnu.org/software/classpath/license.html.
|
|
29
|
-
*
|
|
30
|
-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
31
|
-
********************************************************************************/
|
|
32
17
|
__exportStar(require("./di.config"), exports);
|
|
33
18
|
__exportStar(require("./element-filter"), exports);
|
|
34
19
|
__exportStar(require("./glsp-elk-layout-engine"), exports);
|
|
35
20
|
__exportStar(require("./layout-configurator"), exports);
|
|
36
|
-
__exportStar(require("./sprotty-elk"), exports);
|
|
37
21
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAgBA,8CAA4B;AAC5B,mDAAiC;AACjC,2DAAyC;AACzC,wDAAsC"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
|
-
import { LayoutOptions } from '
|
|
17
|
+
import { LayoutOptions } from 'elkjs';
|
|
18
18
|
export declare const LayoutConfigurator: unique symbol;
|
|
19
19
|
/**
|
|
20
20
|
* Configurator for ELK layout algorithms; provides mappings of layout options for each model element.
|
|
@@ -1 +1 @@
|
|
|
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,sBAAsB,CAAC;
|
|
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,sBAAsB,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,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;cAQvD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;CAG7E"}
|
|
@@ -33,7 +33,7 @@ exports.LayoutConfigurator = Symbol('LayoutConfigurator');
|
|
|
33
33
|
* A minimal configuration should at least specify the `elk.algorithm` option as
|
|
34
34
|
* return value of {@link DefaultLayoutConfigurator.graphOptions}.
|
|
35
35
|
*/
|
|
36
|
-
let AbstractLayoutConfigurator = class AbstractLayoutConfigurator {
|
|
36
|
+
let AbstractLayoutConfigurator = exports.AbstractLayoutConfigurator = class AbstractLayoutConfigurator {
|
|
37
37
|
apply(element) {
|
|
38
38
|
if (element instanceof server_1.GGraph) {
|
|
39
39
|
return this.graphOptions(element);
|
|
@@ -72,17 +72,16 @@ __decorate([
|
|
|
72
72
|
(0, inversify_1.inject)(server_1.ModelState),
|
|
73
73
|
__metadata("design:type", Object)
|
|
74
74
|
], AbstractLayoutConfigurator.prototype, "modelState", void 0);
|
|
75
|
-
AbstractLayoutConfigurator = __decorate([
|
|
75
|
+
exports.AbstractLayoutConfigurator = AbstractLayoutConfigurator = __decorate([
|
|
76
76
|
(0, inversify_1.injectable)()
|
|
77
77
|
], AbstractLayoutConfigurator);
|
|
78
|
-
exports.AbstractLayoutConfigurator = AbstractLayoutConfigurator;
|
|
79
78
|
/**
|
|
80
79
|
* A fallback configurator that is used in the `configureELKLayoutModule` utility method.
|
|
81
80
|
* If no explicit layout configurator binding is provided a new instance of the fallback configurator is
|
|
82
81
|
* bound as replacement. Basic layout options for the root graph element are derived from the
|
|
83
82
|
* configuration parameters that haven been passed to the `configureELKLayoutModule` function.
|
|
84
83
|
*/
|
|
85
|
-
let FallbackLayoutConfigurator = class FallbackLayoutConfigurator extends AbstractLayoutConfigurator {
|
|
84
|
+
let FallbackLayoutConfigurator = exports.FallbackLayoutConfigurator = class FallbackLayoutConfigurator extends AbstractLayoutConfigurator {
|
|
86
85
|
constructor(algorithms, defaultLayoutOptions = {}) {
|
|
87
86
|
super();
|
|
88
87
|
this.fallbackGraphOptions = Object.assign({ 'elk.algorithm': algorithms[0] }, defaultLayoutOptions);
|
|
@@ -91,9 +90,8 @@ let FallbackLayoutConfigurator = class FallbackLayoutConfigurator extends Abstra
|
|
|
91
90
|
return this.fallbackGraphOptions;
|
|
92
91
|
}
|
|
93
92
|
};
|
|
94
|
-
FallbackLayoutConfigurator = __decorate([
|
|
93
|
+
exports.FallbackLayoutConfigurator = FallbackLayoutConfigurator = __decorate([
|
|
95
94
|
(0, inversify_1.injectable)(),
|
|
96
95
|
__metadata("design:paramtypes", [Array, Object])
|
|
97
96
|
], FallbackLayoutConfigurator);
|
|
98
|
-
exports.FallbackLayoutConfigurator = FallbackLayoutConfigurator;
|
|
99
97
|
//# sourceMappingURL=layout-configurator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout-configurator.js","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAsG;
|
|
1
|
+
{"version":3,"file":"layout-configurator.js","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAsG;AAEtG,yCAA+C;AAClC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAe/D;;;;GAIG;AAEI,IAAe,0BAA0B,wCAAzC,MAAe,0BAA0B;IAI5C,KAAK,CAAC,OAAsB;QACxB,IAAI,OAAO,YAAY,eAAM,EAAE;YAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACrC;aAAM,IAAI,OAAO,YAAY,cAAK,EAAE;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,cAAK,EAAE;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,eAAM,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM,IAAI,OAAO,YAAY,cAAK,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;AApCa;IADT,IAAA,kBAAM,EAAC,mBAAU,CAAC;;8DACc;qCAFf,0BAA0B;IAD/C,IAAA,sBAAU,GAAE;GACS,0BAA0B,CAsC/C;AAED;;;;;GAKG;AAEI,IAAM,0BAA0B,wCAAhC,MAAM,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;IAEkB,YAAY,CAAC,MAAc;QAC1C,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;CACJ,CAAA;qCAbY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;;GACA,0BAA0B,CAatC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/layout-elk",
|
|
3
|
-
"version": "1.1.0-next.
|
|
3
|
+
"version": "1.1.0-next.de91dcd.60+de91dcd",
|
|
4
4
|
"description": "Integration of ELK graph layout algorithms in GLSP Node Server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -50,12 +50,14 @@
|
|
|
50
50
|
"watch": "tsc -w"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@eclipse-glsp/server": "1.1.0-next.
|
|
54
|
-
"elkjs": "^0.7.1"
|
|
55
|
-
|
|
53
|
+
"@eclipse-glsp/server": "1.1.0-next.de91dcd.60+de91dcd",
|
|
54
|
+
"elkjs": "^0.7.1"
|
|
55
|
+
},
|
|
56
|
+
"peerDependencies": {
|
|
57
|
+
"inversify": "^6.0.0"
|
|
56
58
|
},
|
|
57
59
|
"publishConfig": {
|
|
58
60
|
"access": "public"
|
|
59
61
|
},
|
|
60
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "de91dcd22122b3f46536a9581dd9ed498b311659"
|
|
61
63
|
}
|
package/src/di.config.spec.ts
CHANGED
|
@@ -13,8 +13,16 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import {
|
|
17
|
-
|
|
16
|
+
import {
|
|
17
|
+
DefaultModelState,
|
|
18
|
+
DiagramConfiguration,
|
|
19
|
+
EdgeTypeHint,
|
|
20
|
+
GGraph,
|
|
21
|
+
GModelElementConstructor,
|
|
22
|
+
ModelState,
|
|
23
|
+
ServerLayoutKind,
|
|
24
|
+
ShapeTypeHint
|
|
25
|
+
} from '@eclipse-glsp/server';
|
|
18
26
|
import { expect } from 'chai';
|
|
19
27
|
import { Container, ContainerModule, injectable } from 'inversify';
|
|
20
28
|
import * as sinon from 'sinon';
|
|
@@ -28,6 +36,20 @@ class CustomLayoutConfigurator extends AbstractLayoutConfigurator {}
|
|
|
28
36
|
@injectable()
|
|
29
37
|
class CustomElementFilter extends DefaultElementFilter {}
|
|
30
38
|
|
|
39
|
+
class StubDiagramConfiguration implements DiagramConfiguration {
|
|
40
|
+
typeMapping = new Map<string, GModelElementConstructor>();
|
|
41
|
+
|
|
42
|
+
shapeTypeHints: ShapeTypeHint[] = [];
|
|
43
|
+
|
|
44
|
+
edgeTypeHints: EdgeTypeHint[] = [];
|
|
45
|
+
|
|
46
|
+
layoutKind = ServerLayoutKind.NONE;
|
|
47
|
+
|
|
48
|
+
needsClientLayout = true;
|
|
49
|
+
|
|
50
|
+
animatedUpdate = true;
|
|
51
|
+
}
|
|
52
|
+
|
|
31
53
|
describe('test configureELKLayoutModule', () => {
|
|
32
54
|
const sandbox = sinon.createSandbox();
|
|
33
55
|
const mockDiagramConfiguration = new StubDiagramConfiguration();
|
package/src/di.config.ts
CHANGED
|
@@ -16,9 +16,8 @@
|
|
|
16
16
|
import { LayoutEngine, ModelState } from '@eclipse-glsp/server';
|
|
17
17
|
import ElkConstructor, { LayoutOptions } from 'elkjs/lib/elk.bundled';
|
|
18
18
|
import { ContainerModule } from 'inversify';
|
|
19
|
-
import { ElkFactory } from 'sprotty-elk';
|
|
20
19
|
import { DefaultElementFilter, ElementFilter } from './element-filter';
|
|
21
|
-
import { GlspElkLayoutEngine } from './glsp-elk-layout-engine';
|
|
20
|
+
import { ElkFactory, GlspElkLayoutEngine } from './glsp-elk-layout-engine';
|
|
22
21
|
import { FallbackLayoutConfigurator, LayoutConfigurator } from './layout-configurator';
|
|
23
22
|
|
|
24
23
|
type Constructor<T> = new (...args: any[]) => T;
|
|
@@ -32,10 +32,18 @@ import {
|
|
|
32
32
|
} from '@eclipse-glsp/server';
|
|
33
33
|
import { ELK, ElkEdge, ElkExtendedEdge, ElkGraphElement, ElkLabel, ElkNode, ElkPort, ElkPrimitiveEdge, ElkShape } from 'elkjs/lib/elk-api';
|
|
34
34
|
import { injectable } from 'inversify';
|
|
35
|
-
import { ElkFactory } from 'sprotty-elk';
|
|
36
35
|
import { ElementFilter } from './element-filter';
|
|
37
36
|
import { LayoutConfigurator } from './layout-configurator';
|
|
38
37
|
|
|
38
|
+
/**
|
|
39
|
+
* Factory for ELK instances. Follow the elkjs package documentation on how to configure ELK
|
|
40
|
+
* instances. For example, the bundled version can be used by importing the ELK constructor
|
|
41
|
+
* from `"elkjs/lib/elk.bundled"`. For the webworker version, import the constructor from
|
|
42
|
+
* `"elkjs/lib/elk-api"` and add the option `workerUrl: "elk/elk-worker.min.js"`.
|
|
43
|
+
*/
|
|
44
|
+
export type ElkFactory = () => ELK;
|
|
45
|
+
export const ElkFactory = Symbol('ElkFactory');
|
|
46
|
+
|
|
39
47
|
/**
|
|
40
48
|
* An implementation of GLSP's {@link LayoutEngine} interface that retrieves the graphical model from the {@link ModelState},
|
|
41
49
|
* transforms this model into an ELK graph and then invokes the underlying ELK instance for layout computation.
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
2
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
+
export { LayoutOptions } from 'elkjs';
|
|
16
17
|
export * from './di.config';
|
|
17
18
|
export * from './element-filter';
|
|
18
19
|
export * from './glsp-elk-layout-engine';
|
|
19
20
|
export * from './layout-configurator';
|
|
20
|
-
export * from './sprotty-elk';
|
|
@@ -14,9 +14,8 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
|
+
import { LayoutOptions } from 'elkjs';
|
|
17
18
|
import { inject, injectable } from 'inversify';
|
|
18
|
-
import { LayoutOptions } from './sprotty-elk';
|
|
19
|
-
|
|
20
19
|
export const LayoutConfigurator = Symbol('LayoutConfigurator');
|
|
21
20
|
/**
|
|
22
21
|
* Configurator for ELK layout algorithms; provides mappings of layout options for each model element.
|
package/lib/di.config.spec.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.spec.d.ts","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":""}
|
package/lib/di.config.spec.js
DELETED
|
@@ -1,96 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
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;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
/********************************************************************************
|
|
10
|
-
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
11
|
-
*
|
|
12
|
-
* This program and the accompanying materials are made available under the
|
|
13
|
-
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
14
|
-
* http://www.eclipse.org/legal/epl-2.0.
|
|
15
|
-
*
|
|
16
|
-
* This Source Code may also be made available under the following Secondary
|
|
17
|
-
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
18
|
-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
19
|
-
* with the GNU Classpath Exception which is available at
|
|
20
|
-
* https://www.gnu.org/software/classpath/license.html.
|
|
21
|
-
*
|
|
22
|
-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
23
|
-
********************************************************************************/
|
|
24
|
-
const server_1 = require("@eclipse-glsp/server");
|
|
25
|
-
const mock_util_1 = require("@eclipse-glsp/server/lib/common/test/mock-util");
|
|
26
|
-
const chai_1 = require("chai");
|
|
27
|
-
const inversify_1 = require("inversify");
|
|
28
|
-
const sinon = require("sinon");
|
|
29
|
-
const di_config_1 = require("./di.config");
|
|
30
|
-
const element_filter_1 = require("./element-filter");
|
|
31
|
-
const layout_configurator_1 = require("./layout-configurator");
|
|
32
|
-
let CustomLayoutConfigurator = class CustomLayoutConfigurator extends layout_configurator_1.AbstractLayoutConfigurator {
|
|
33
|
-
};
|
|
34
|
-
CustomLayoutConfigurator = __decorate([
|
|
35
|
-
(0, inversify_1.injectable)()
|
|
36
|
-
], CustomLayoutConfigurator);
|
|
37
|
-
let CustomElementFilter = class CustomElementFilter extends element_filter_1.DefaultElementFilter {
|
|
38
|
-
};
|
|
39
|
-
CustomElementFilter = __decorate([
|
|
40
|
-
(0, inversify_1.injectable)()
|
|
41
|
-
], CustomElementFilter);
|
|
42
|
-
describe('test configureELKLayoutModule', () => {
|
|
43
|
-
const sandbox = sinon.createSandbox();
|
|
44
|
-
const mockDiagramConfiguration = new mock_util_1.StubDiagramConfiguration();
|
|
45
|
-
const typeMappings = new Map();
|
|
46
|
-
typeMappings.set('graph', server_1.GGraph);
|
|
47
|
-
sandbox.stub(mockDiagramConfiguration, 'typeMapping').value(typeMappings);
|
|
48
|
-
const modelState = new server_1.DefaultModelState();
|
|
49
|
-
const baseModule = new inversify_1.ContainerModule(bind => {
|
|
50
|
-
bind(server_1.ModelState).toConstantValue(modelState);
|
|
51
|
-
});
|
|
52
|
-
it('configure with minimal options', () => {
|
|
53
|
-
const algorithm = 'layered';
|
|
54
|
-
const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm] });
|
|
55
|
-
const container = new inversify_1.Container();
|
|
56
|
-
container.load(baseModule, elkModule);
|
|
57
|
-
const filter = container.get(element_filter_1.ElementFilter);
|
|
58
|
-
(0, chai_1.expect)(filter).to.be.an.instanceOf(element_filter_1.DefaultElementFilter);
|
|
59
|
-
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
60
|
-
(0, chai_1.expect)(configurator).to.be.an.instanceOf(layout_configurator_1.FallbackLayoutConfigurator);
|
|
61
|
-
const graphOptions = configurator.apply(new server_1.GGraph());
|
|
62
|
-
(0, chai_1.expect)(graphOptions).not.to.be.undefined;
|
|
63
|
-
(0, chai_1.expect)(graphOptions['elk.algorithm']).to.equal(algorithm);
|
|
64
|
-
});
|
|
65
|
-
it('configure with additional default layout options', () => {
|
|
66
|
-
const algorithm = 'layered';
|
|
67
|
-
const defaultLayoutOptions = {
|
|
68
|
-
'elk.direction': 'LEFT',
|
|
69
|
-
'elk.edgeRouting': 'POLYLINE'
|
|
70
|
-
};
|
|
71
|
-
const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], defaultLayoutOptions });
|
|
72
|
-
const container = new inversify_1.Container();
|
|
73
|
-
container.load(baseModule, elkModule);
|
|
74
|
-
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
75
|
-
const graphOptions = configurator.apply(new server_1.GGraph());
|
|
76
|
-
(0, chai_1.expect)(graphOptions).not.to.be.undefined;
|
|
77
|
-
(0, chai_1.expect)(graphOptions).to.include(defaultLayoutOptions);
|
|
78
|
-
});
|
|
79
|
-
it('configure with custom layout configurator', () => {
|
|
80
|
-
const algorithm = 'layered';
|
|
81
|
-
const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], layoutConfigurator: CustomLayoutConfigurator });
|
|
82
|
-
const container = new inversify_1.Container();
|
|
83
|
-
container.load(baseModule, elkModule);
|
|
84
|
-
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
85
|
-
(0, chai_1.expect)(configurator).to.be.an.instanceOf(CustomLayoutConfigurator);
|
|
86
|
-
});
|
|
87
|
-
it('configure with custom element filter', () => {
|
|
88
|
-
const algorithm = 'layered';
|
|
89
|
-
const elkModule = (0, di_config_1.configureELKLayoutModule)({ algorithms: [algorithm], elementFilter: CustomElementFilter });
|
|
90
|
-
const container = new inversify_1.Container();
|
|
91
|
-
container.load(baseModule, elkModule);
|
|
92
|
-
const filter = container.get(element_filter_1.ElementFilter);
|
|
93
|
-
(0, chai_1.expect)(filter).to.be.an.instanceOf(CustomElementFilter);
|
|
94
|
-
});
|
|
95
|
-
});
|
|
96
|
-
//# sourceMappingURL=di.config.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.spec.js","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/sprotty-elk.d.ts
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
3
|
-
*
|
|
4
|
-
* This program and the accompanying materials are made available under the
|
|
5
|
-
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
-
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
-
*
|
|
8
|
-
* This Source Code may also be made available under the following Secondary
|
|
9
|
-
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
-
* with the GNU Classpath Exception which is available at
|
|
12
|
-
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
-
*
|
|
14
|
-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
-
********************************************************************************/
|
|
16
|
-
export { LayoutOptions } from 'elkjs';
|
|
17
|
-
export { ElkFactory } from 'sprotty-elk/lib/inversify';
|
|
18
|
-
//# sourceMappingURL=sprotty-elk.d.ts.map
|
package/lib/sprotty-elk.d.ts.map
DELETED
|
@@ -1 +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
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ElkFactory = void 0;
|
|
4
|
-
var inversify_1 = require("sprotty-elk/lib/inversify");
|
|
5
|
-
Object.defineProperty(exports, "ElkFactory", { enumerable: true, get: function () { return inversify_1.ElkFactory; } });
|
|
6
|
-
//# sourceMappingURL=sprotty-elk.js.map
|
package/lib/sprotty-elk.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sprotty-elk.js","sourceRoot":"","sources":["../src/sprotty-elk.ts"],"names":[],"mappings":";;;AAiBA,uDAAuD;AAA9C,uGAAA,UAAU,OAAA"}
|
package/src/sprotty-elk.ts
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
3
|
-
*
|
|
4
|
-
* This program and the accompanying materials are made available under the
|
|
5
|
-
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
-
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
-
*
|
|
8
|
-
* This Source Code may also be made available under the following Secondary
|
|
9
|
-
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
-
* with the GNU Classpath Exception which is available at
|
|
12
|
-
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
-
*
|
|
14
|
-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
-
********************************************************************************/
|
|
16
|
-
// Reexport of the relevant sprotty-elk typings
|
|
17
|
-
export { LayoutOptions } from 'elkjs';
|
|
18
|
-
export { ElkFactory } from 'sprotty-elk/lib/inversify';
|