@eclipse-glsp/layout-elk 1.1.0-next.cfb461f.25 → 1.1.0-next.dc6b980.47
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 +1 -1
- package/lib/di.config.d.ts.map +1 -1
- package/lib/di.config.js +3 -3
- package/lib/di.config.js.map +1 -1
- package/lib/di.config.spec.js +8 -8
- package/lib/di.config.spec.js.map +1 -1
- package/lib/element-filter.d.ts +1 -1
- package/lib/element-filter.d.ts.map +1 -1
- package/lib/element-filter.js +8 -8
- package/lib/element-filter.js.map +1 -1
- package/lib/glsp-elk-layout-engine.d.ts +1 -1
- package/lib/glsp-elk-layout-engine.d.ts.map +1 -1
- package/lib/glsp-elk-layout-engine.js +28 -27
- package/lib/glsp-elk-layout-engine.js.map +1 -1
- package/lib/index.js +5 -1
- 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 +7 -7
- package/lib/layout-configurator.js.map +1 -1
- package/package.json +22 -22
- package/src/di.config.spec.ts +3 -3
- package/src/di.config.ts +1 -1
- package/src/element-filter.ts +1 -1
- package/src/glsp-elk-layout-engine.ts +2 -1
- package/src/layout-configurator.ts +1 -1
package/lib/di.config.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LayoutOptions } from 'elkjs/lib/elk.bundled';
|
|
2
2
|
import { ContainerModule } from 'inversify';
|
|
3
3
|
import { ElementFilter, LayoutConfigurator } from '.';
|
|
4
|
-
|
|
4
|
+
type Constructor<T> = new (...args: any[]) => T;
|
|
5
5
|
/**
|
|
6
6
|
* Configuration options for the {@link configureELKLayoutModule} function.
|
|
7
7
|
*/
|
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;AAE5C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAKtD,
|
|
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;AAE5C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAKtD,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
|
@@ -16,7 +16,7 @@ exports.configureELKLayoutModule = void 0;
|
|
|
16
16
|
*
|
|
17
17
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
18
18
|
********************************************************************************/
|
|
19
|
-
const
|
|
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
22
|
const sprotty_elk_1 = require("sprotty-elk");
|
|
@@ -67,11 +67,11 @@ function configureELKLayoutModule(options) {
|
|
|
67
67
|
const factory = container.get(sprotty_elk_1.ElkFactory);
|
|
68
68
|
const filter = container.get(_1.ElementFilter);
|
|
69
69
|
const configurator = container.get(_1.LayoutConfigurator);
|
|
70
|
-
const modelState = container.get(
|
|
70
|
+
const modelState = container.get(server_1.ModelState);
|
|
71
71
|
return new glsp_elk_layout_engine_1.GlspElkLayoutEngine(factory, filter, configurator, modelState);
|
|
72
72
|
})
|
|
73
73
|
.inSingletonScope();
|
|
74
|
-
bind(
|
|
74
|
+
bind(server_1.LayoutEngine).toService(glsp_elk_layout_engine_1.GlspElkLayoutEngine);
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
exports.configureELKLayoutModule = configureELKLayoutModule;
|
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,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAgE;AAChE,uDAAsE;AACtE,yCAA4C;AAC5C,6CAAyC;AACzC,wBAAsD;AACtD,qDAAwD;AACxD,qEAA+D;AAC/D,+DAAmE;AA6BnE;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,wBAAwB,CAAC,OAAyB;IAC9D,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;QAC9B,IAAI,OAAO,CAAC,aAAa,EAAE;YACvB,IAAI,CAAC,gBAAa,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;SACpE;aAAM;YACH,IAAI,CAAC,gBAAa,CAAC,CAAC,EAAE,CAAC,qCAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,qBAAkB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SAC3D;aAAM;YACH,IAAI,CAAC,qBAAkB,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,wBAAU,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,wBAAU,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAgB,gBAAa,CAAC,CAAC;YAC3D,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAqB,qBAAkB,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/di.config.spec.js
CHANGED
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
/********************************************************************************
|
|
10
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
10
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
11
11
|
*
|
|
12
12
|
* This program and the accompanying materials are made available under the
|
|
13
13
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -21,8 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
21
21
|
*
|
|
22
22
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
23
23
|
********************************************************************************/
|
|
24
|
-
const
|
|
25
|
-
const mock_util_1 = require("@eclipse-glsp/server
|
|
24
|
+
const server_1 = require("@eclipse-glsp/server");
|
|
25
|
+
const mock_util_1 = require("@eclipse-glsp/server/lib/common/test/mock-util");
|
|
26
26
|
const chai_1 = require("chai");
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
28
|
const sinon = require("sinon");
|
|
@@ -44,11 +44,11 @@ describe('test configureELKLayoutModule', () => {
|
|
|
44
44
|
const sandbox = sinon.createSandbox();
|
|
45
45
|
const mockDiagramConfiguration = new mock_util_1.StubDiagramConfiguration();
|
|
46
46
|
const typeMappings = new Map();
|
|
47
|
-
typeMappings.set('graph',
|
|
47
|
+
typeMappings.set('graph', server_1.GGraph);
|
|
48
48
|
sandbox.stub(mockDiagramConfiguration, 'typeMapping').value(typeMappings);
|
|
49
|
-
const modelState = new
|
|
49
|
+
const modelState = new server_1.DefaultModelState();
|
|
50
50
|
const baseModule = new inversify_1.ContainerModule(bind => {
|
|
51
|
-
bind(
|
|
51
|
+
bind(server_1.ModelState).toConstantValue(modelState);
|
|
52
52
|
});
|
|
53
53
|
it('configure with minimal options', () => {
|
|
54
54
|
const algorithm = 'layered';
|
|
@@ -59,7 +59,7 @@ describe('test configureELKLayoutModule', () => {
|
|
|
59
59
|
(0, chai_1.expect)(filter).to.be.an.instanceOf(element_filter_1.DefaultElementFilter);
|
|
60
60
|
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
61
61
|
(0, chai_1.expect)(configurator).to.be.an.instanceOf(layout_configurator_1.FallbackLayoutConfigurator);
|
|
62
|
-
const graphOptions = configurator.apply(new
|
|
62
|
+
const graphOptions = configurator.apply(new server_1.GGraph());
|
|
63
63
|
(0, chai_1.expect)(graphOptions).not.to.be.undefined;
|
|
64
64
|
(0, chai_1.expect)(graphOptions['elk.algorithm']).to.equal(algorithm);
|
|
65
65
|
});
|
|
@@ -73,7 +73,7 @@ describe('test configureELKLayoutModule', () => {
|
|
|
73
73
|
const container = new inversify_1.Container();
|
|
74
74
|
container.load(baseModule, elkModule);
|
|
75
75
|
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
76
|
-
const graphOptions = configurator.apply(new
|
|
76
|
+
const graphOptions = configurator.apply(new server_1.GGraph());
|
|
77
77
|
(0, chai_1.expect)(graphOptions).not.to.be.undefined;
|
|
78
78
|
(0, chai_1.expect)(graphOptions).to.include(defaultLayoutOptions);
|
|
79
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.spec.js","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"di.config.spec.js","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/element-filter.d.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GEdge, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server
|
|
16
|
+
import { GEdge, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
17
|
export declare const ElementFilter: unique symbol;
|
|
18
18
|
/**
|
|
19
19
|
* Filter used to determine which model elements should be included in the automatic layout.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-filter.d.ts","sourceRoot":"","sources":["../src/element-filter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"element-filter.d.ts","sourceRoot":"","sources":["../src/element-filter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG9F,eAAO,MAAM,aAAa,eAA0B,CAAC;AACrD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC;CAC1C;AAED;;;;;;;GAOG;AACH,qBACa,oBAAqB,YAAW,aAAa;IAEtD,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAEjC,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO;IAatC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAI1C,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;IAe1C,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI7C,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO;CAG7C"}
|
package/lib/element-filter.js
CHANGED
|
@@ -25,7 +25,7 @@ exports.DefaultElementFilter = exports.ElementFilter = void 0;
|
|
|
25
25
|
*
|
|
26
26
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
27
|
********************************************************************************/
|
|
28
|
-
const
|
|
28
|
+
const server_1 = require("@eclipse-glsp/server");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
exports.ElementFilter = Symbol('ElementFilter');
|
|
31
31
|
/**
|
|
@@ -38,16 +38,16 @@ exports.ElementFilter = Symbol('ElementFilter');
|
|
|
38
38
|
*/
|
|
39
39
|
let DefaultElementFilter = class DefaultElementFilter {
|
|
40
40
|
apply(element) {
|
|
41
|
-
if (element instanceof
|
|
41
|
+
if (element instanceof server_1.GNode) {
|
|
42
42
|
return this.filterNode(element);
|
|
43
43
|
}
|
|
44
|
-
else if (element instanceof
|
|
44
|
+
else if (element instanceof server_1.GEdge) {
|
|
45
45
|
return this.filterEdge(element);
|
|
46
46
|
}
|
|
47
|
-
else if (element instanceof
|
|
47
|
+
else if (element instanceof server_1.GLabel) {
|
|
48
48
|
this.filterLabel(element);
|
|
49
49
|
}
|
|
50
|
-
else if (element instanceof
|
|
50
|
+
else if (element instanceof server_1.GPort) {
|
|
51
51
|
this.filterPort(element);
|
|
52
52
|
}
|
|
53
53
|
return true;
|
|
@@ -57,11 +57,11 @@ let DefaultElementFilter = class DefaultElementFilter {
|
|
|
57
57
|
}
|
|
58
58
|
filterEdge(edge) {
|
|
59
59
|
const source = this.modelState.index.get(edge.sourceId);
|
|
60
|
-
if (!source || (source instanceof
|
|
60
|
+
if (!source || (source instanceof server_1.GNode && !this.filterNode(source)) || (source instanceof server_1.GPort && !this.filterPort(source))) {
|
|
61
61
|
return false;
|
|
62
62
|
}
|
|
63
63
|
const target = this.modelState.index.get(edge.targetId);
|
|
64
|
-
if (!target || (target instanceof
|
|
64
|
+
if (!target || (target instanceof server_1.GNode && !this.filterNode(target)) || (target instanceof server_1.GPort && !this.filterPort(target))) {
|
|
65
65
|
return false;
|
|
66
66
|
}
|
|
67
67
|
return true;
|
|
@@ -74,7 +74,7 @@ let DefaultElementFilter = class DefaultElementFilter {
|
|
|
74
74
|
}
|
|
75
75
|
};
|
|
76
76
|
__decorate([
|
|
77
|
-
(0, inversify_1.inject)(
|
|
77
|
+
(0, inversify_1.inject)(server_1.ModelState),
|
|
78
78
|
__metadata("design:type", Object)
|
|
79
79
|
], DefaultElementFilter.prototype, "modelState", void 0);
|
|
80
80
|
DefaultElementFilter = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-filter.js","sourceRoot":"","sources":["../src/element-filter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
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,GAA1B,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;AA1CG;IAAC,IAAA,kBAAM,EAAC,mBAAU,CAAC;;wDACc;AAFxB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA2ChC;AA3CY,oDAAoB"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
*
|
|
13
13
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
14
14
|
********************************************************************************/
|
|
15
|
-
import { GEdge, GGraph, GLabel, GModelElement, GModelElementConstructor, GModelRoot, GNode, GPort, GShapeElement, LayoutEngine, MaybePromise, ModelState } from '@eclipse-glsp/server
|
|
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
17
|
import { ElkFactory } from 'sprotty-elk';
|
|
18
18
|
import { ElementFilter } from './element-filter';
|
|
@@ -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,
|
|
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,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;;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"}
|
|
@@ -24,7 +24,7 @@ exports.GlspElkLayoutEngine = void 0;
|
|
|
24
24
|
*
|
|
25
25
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
26
26
|
********************************************************************************/
|
|
27
|
-
const
|
|
27
|
+
const server_1 = require("@eclipse-glsp/server");
|
|
28
28
|
const inversify_1 = require("inversify");
|
|
29
29
|
const sprotty_elk_1 = require("sprotty-elk");
|
|
30
30
|
const element_filter_1 = require("./element-filter");
|
|
@@ -42,7 +42,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
42
42
|
}
|
|
43
43
|
layout() {
|
|
44
44
|
const root = this.modelState.root;
|
|
45
|
-
if (!(root instanceof
|
|
45
|
+
if (!(root instanceof server_1.GGraph)) {
|
|
46
46
|
return root;
|
|
47
47
|
}
|
|
48
48
|
this.elkEdges = [];
|
|
@@ -54,7 +54,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
transformToElk(model) {
|
|
57
|
-
if (model instanceof
|
|
57
|
+
if (model instanceof server_1.GGraph) {
|
|
58
58
|
const graph = this.transformGraph(model);
|
|
59
59
|
this.elkEdges.forEach(elkEdge => {
|
|
60
60
|
const parent = this.findCommonAncestor(elkEdge);
|
|
@@ -64,16 +64,16 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
64
64
|
});
|
|
65
65
|
return graph;
|
|
66
66
|
}
|
|
67
|
-
else if (model instanceof
|
|
67
|
+
else if (model instanceof server_1.GNode) {
|
|
68
68
|
return this.transformNode(model);
|
|
69
69
|
}
|
|
70
|
-
else if (model instanceof
|
|
70
|
+
else if (model instanceof server_1.GEdge) {
|
|
71
71
|
return this.transformEdge(model);
|
|
72
72
|
}
|
|
73
|
-
else if (model instanceof
|
|
73
|
+
else if (model instanceof server_1.GLabel) {
|
|
74
74
|
return this.transformPort(model);
|
|
75
75
|
}
|
|
76
|
-
else if (model instanceof
|
|
76
|
+
else if (model instanceof server_1.GPort) {
|
|
77
77
|
return this.transformPort(model);
|
|
78
78
|
}
|
|
79
79
|
throw new Error('Type not supported: ' + model.type);
|
|
@@ -91,7 +91,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
91
91
|
if (child instanceof constructor && this.filter.apply(element)) {
|
|
92
92
|
result.push(child);
|
|
93
93
|
}
|
|
94
|
-
else if (child instanceof
|
|
94
|
+
else if (child instanceof server_1.GCompartment) {
|
|
95
95
|
result.push(...this.findChildren(child, constructor));
|
|
96
96
|
}
|
|
97
97
|
});
|
|
@@ -103,8 +103,8 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
103
103
|
if (!source || !target) {
|
|
104
104
|
return undefined;
|
|
105
105
|
}
|
|
106
|
-
const sourceParent = (0,
|
|
107
|
-
const targetParent = (0,
|
|
106
|
+
const sourceParent = (0, server_1.findParent)(source.parent, parent => parent instanceof server_1.GNode || parent instanceof server_1.GGraph);
|
|
107
|
+
const targetParent = (0, server_1.findParent)(target.parent, parent => parent instanceof server_1.GNode || parent instanceof server_1.GGraph);
|
|
108
108
|
if (!sourceParent || !targetParent) {
|
|
109
109
|
return undefined;
|
|
110
110
|
}
|
|
@@ -125,9 +125,9 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
125
125
|
layoutOptions: this.configurator.apply(graph)
|
|
126
126
|
};
|
|
127
127
|
if (graph.children) {
|
|
128
|
-
elkGraph.children = this.findChildren(graph,
|
|
128
|
+
elkGraph.children = this.findChildren(graph, server_1.GNode).map(child => this.transformToElk(child));
|
|
129
129
|
elkGraph.edges = [];
|
|
130
|
-
this.elkEdges.push(...this.findChildren(graph,
|
|
130
|
+
this.elkEdges.push(...this.findChildren(graph, server_1.GEdge).map(child => this.transformToElk(child)));
|
|
131
131
|
}
|
|
132
132
|
this.idToElkElement.set(graph.id, elkGraph);
|
|
133
133
|
return elkGraph;
|
|
@@ -138,11 +138,11 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
138
138
|
layoutOptions: this.configurator.apply(node)
|
|
139
139
|
};
|
|
140
140
|
if (node.children) {
|
|
141
|
-
elkNode.children = this.findChildren(node,
|
|
141
|
+
elkNode.children = this.findChildren(node, server_1.GNode).map(child => this.transformToElk(child));
|
|
142
142
|
elkNode.edges = [];
|
|
143
|
-
this.elkEdges.push(...this.findChildren(node,
|
|
144
|
-
elkNode.labels = this.findChildren(node,
|
|
145
|
-
elkNode.ports = this.findChildren(node,
|
|
143
|
+
this.elkEdges.push(...this.findChildren(node, server_1.GEdge).map(child => this.transformToElk(child)));
|
|
144
|
+
elkNode.labels = this.findChildren(node, server_1.GLabel).map(child => this.transformToElk(child));
|
|
145
|
+
elkNode.ports = this.findChildren(node, server_1.GPort).map(child => this.transformToElk(child));
|
|
146
146
|
}
|
|
147
147
|
this.transformShape(elkNode, node);
|
|
148
148
|
this.idToElkElement.set(node.id, elkNode);
|
|
@@ -166,23 +166,23 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
166
166
|
layoutOptions: this.configurator.apply(edge)
|
|
167
167
|
};
|
|
168
168
|
const sourceElement = this.modelState.index.get(edge.sourceId);
|
|
169
|
-
if (sourceElement instanceof
|
|
170
|
-
const parentNode = (0,
|
|
169
|
+
if (sourceElement instanceof server_1.GPort) {
|
|
170
|
+
const parentNode = (0, server_1.findParentByClass)(sourceElement, server_1.GNode);
|
|
171
171
|
if (parentNode) {
|
|
172
172
|
elkEdge.source = parentNode.id;
|
|
173
173
|
elkEdge.sourcePort = sourceElement.id;
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
const targetElement = this.modelState.index.get(edge.targetId);
|
|
177
|
-
if (sourceElement instanceof
|
|
178
|
-
const parentNode = (0,
|
|
177
|
+
if (sourceElement instanceof server_1.GPort) {
|
|
178
|
+
const parentNode = (0, server_1.findParentByClass)(targetElement, server_1.GNode);
|
|
179
179
|
if (parentNode) {
|
|
180
180
|
elkEdge.target = parentNode.id;
|
|
181
181
|
elkEdge.targetPort = targetElement.id;
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
if (edge.children) {
|
|
185
|
-
elkEdge.labels = this.findChildren(edge,
|
|
185
|
+
elkEdge.labels = this.findChildren(edge, server_1.GLabel).map(child => this.transformToElk(child));
|
|
186
186
|
}
|
|
187
187
|
const points = edge.routingPoints;
|
|
188
188
|
if (points && points.length >= 2) {
|
|
@@ -209,7 +209,8 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
209
209
|
layoutOptions: this.configurator.apply(port)
|
|
210
210
|
};
|
|
211
211
|
if (port.children) {
|
|
212
|
-
elkPort.labels = this.findChildren(port,
|
|
212
|
+
elkPort.labels = this.findChildren(port, server_1.GLabel).map(child => this.transformToElk(child));
|
|
213
|
+
this.elkEdges.push(...this.findChildren(port, server_1.GEdge).map(child => this.transformToElk(child)));
|
|
213
214
|
}
|
|
214
215
|
this.transformShape(elkPort, port);
|
|
215
216
|
this.idToElkElement.set(port.id, elkPort);
|
|
@@ -217,7 +218,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
217
218
|
}
|
|
218
219
|
applyLayout(elkNode) {
|
|
219
220
|
const element = this.modelState.index.get(elkNode.id);
|
|
220
|
-
if (element instanceof
|
|
221
|
+
if (element instanceof server_1.GNode) {
|
|
221
222
|
this.applyShape(element, elkNode);
|
|
222
223
|
}
|
|
223
224
|
if (elkNode.children) {
|
|
@@ -228,14 +229,14 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
228
229
|
if (elkNode.edges) {
|
|
229
230
|
for (const elkEdge of elkNode.edges) {
|
|
230
231
|
const edge = this.modelState.index.get(elkEdge.id);
|
|
231
|
-
if (edge instanceof
|
|
232
|
+
if (edge instanceof server_1.GEdge) {
|
|
232
233
|
this.applyEdge(edge, elkEdge);
|
|
233
234
|
}
|
|
234
235
|
}
|
|
235
236
|
}
|
|
236
237
|
if (elkNode.ports) {
|
|
237
238
|
for (const elkPort of elkNode.ports) {
|
|
238
|
-
const port = this.modelState.index.findByClass(elkPort.id,
|
|
239
|
+
const port = this.modelState.index.findByClass(elkPort.id, server_1.GPort);
|
|
239
240
|
if (port) {
|
|
240
241
|
this.applyShape(port, elkPort);
|
|
241
242
|
}
|
|
@@ -251,7 +252,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
251
252
|
}
|
|
252
253
|
if (elkShape.labels) {
|
|
253
254
|
for (const elkLabel of elkShape.labels) {
|
|
254
|
-
const label = this.modelState.index.findByClass(elkLabel.id,
|
|
255
|
+
const label = this.modelState.index.findByClass(elkLabel.id, server_1.GLabel);
|
|
255
256
|
if (label) {
|
|
256
257
|
this.applyShape(label, elkLabel);
|
|
257
258
|
}
|
|
@@ -287,7 +288,7 @@ let GlspElkLayoutEngine = class GlspElkLayoutEngine {
|
|
|
287
288
|
edge.routingPoints = points;
|
|
288
289
|
if (elkEdge.labels) {
|
|
289
290
|
elkEdge.labels.forEach(elkLabel => {
|
|
290
|
-
const label = this.modelState.index.findByClass(elkLabel.id,
|
|
291
|
+
const label = this.modelState.index.findByClass(elkLabel.id, server_1.GLabel);
|
|
291
292
|
if (label) {
|
|
292
293
|
this.applyShape(label, elkLabel);
|
|
293
294
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-elk-layout-engine.js","sourceRoot":"","sources":["../src/glsp-elk-layout-engine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;kFAakF;AAClF,
|
|
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.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
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":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,8CAA4B;AAC5B,mDAAiC;AACjC,2DAAyC;AACzC,wDAAsC;AACtC,gDAA8B"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server
|
|
16
|
+
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
17
|
import { LayoutOptions } from './sprotty-elk';
|
|
18
18
|
export declare const LayoutConfigurator: unique symbol;
|
|
19
19
|
/**
|
|
@@ -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,
|
|
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;AAEtG,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;cAQvD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;CAG7E"}
|
|
@@ -25,7 +25,7 @@ exports.FallbackLayoutConfigurator = exports.AbstractLayoutConfigurator = export
|
|
|
25
25
|
*
|
|
26
26
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
27
|
********************************************************************************/
|
|
28
|
-
const
|
|
28
|
+
const server_1 = require("@eclipse-glsp/server");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
exports.LayoutConfigurator = Symbol('LayoutConfigurator');
|
|
31
31
|
/**
|
|
@@ -35,19 +35,19 @@ exports.LayoutConfigurator = Symbol('LayoutConfigurator');
|
|
|
35
35
|
*/
|
|
36
36
|
let AbstractLayoutConfigurator = class AbstractLayoutConfigurator {
|
|
37
37
|
apply(element) {
|
|
38
|
-
if (element instanceof
|
|
38
|
+
if (element instanceof server_1.GGraph) {
|
|
39
39
|
return this.graphOptions(element);
|
|
40
40
|
}
|
|
41
|
-
else if (element instanceof
|
|
41
|
+
else if (element instanceof server_1.GNode) {
|
|
42
42
|
return this.nodeOptions(element);
|
|
43
43
|
}
|
|
44
|
-
else if (element instanceof
|
|
44
|
+
else if (element instanceof server_1.GEdge) {
|
|
45
45
|
return this.edgeOptions(element);
|
|
46
46
|
}
|
|
47
|
-
else if (element instanceof
|
|
47
|
+
else if (element instanceof server_1.GLabel) {
|
|
48
48
|
this.labelOptions(element);
|
|
49
49
|
}
|
|
50
|
-
else if (element instanceof
|
|
50
|
+
else if (element instanceof server_1.GPort) {
|
|
51
51
|
this.portOptions(element);
|
|
52
52
|
}
|
|
53
53
|
return undefined;
|
|
@@ -69,7 +69,7 @@ let AbstractLayoutConfigurator = class AbstractLayoutConfigurator {
|
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
71
|
__decorate([
|
|
72
|
-
(0, inversify_1.inject)(
|
|
72
|
+
(0, inversify_1.inject)(server_1.ModelState),
|
|
73
73
|
__metadata("design:type", Object)
|
|
74
74
|
], AbstractLayoutConfigurator.prototype, "modelState", void 0);
|
|
75
75
|
AbstractLayoutConfigurator = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout-configurator.js","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"layout-configurator.js","sourceRoot":"","sources":["../src/layout-configurator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAsG;AACtG,yCAA+C;AAGlC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAe/D;;;;GAIG;AAEI,IAAe,0BAA0B,GAAzC,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;AArCG;IAAC,IAAA,kBAAM,EAAC,mBAAU,CAAC;;8DACc;AAFf,0BAA0B;IAD/C,IAAA,sBAAU,GAAE;GACS,0BAA0B,CAsC/C;AAtCqB,gEAA0B;AAwChD;;;;;GAKG;AAEI,IAAM,0BAA0B,GAAhC,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;AAbY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;;GACA,0BAA0B,CAatC;AAbY,gEAA0B"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/layout-elk",
|
|
3
|
-
"version": "1.1.0-next.
|
|
3
|
+
"version": "1.1.0-next.dc6b980.47+dc6b980",
|
|
4
4
|
"description": "Integration of ELK graph layout algorithms in GLSP Node Server",
|
|
5
|
-
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
6
5
|
"keywords": [
|
|
7
6
|
"eclipse",
|
|
8
7
|
"graphics",
|
|
@@ -12,15 +11,16 @@
|
|
|
12
11
|
"glsp",
|
|
13
12
|
"diagram editor"
|
|
14
13
|
],
|
|
15
|
-
"author": {
|
|
16
|
-
"name": "Eclipse GLSP"
|
|
17
|
-
},
|
|
18
14
|
"homepage": "https://www.eclipse.org/glsp/",
|
|
15
|
+
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
|
|
19
16
|
"repository": {
|
|
20
17
|
"type": "git",
|
|
21
18
|
"url": "https://github.com/eclipse-glsp/glsp-server-node.git"
|
|
22
19
|
},
|
|
23
|
-
"
|
|
20
|
+
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
21
|
+
"author": {
|
|
22
|
+
"name": "Eclipse GLSP"
|
|
23
|
+
},
|
|
24
24
|
"contributors": [
|
|
25
25
|
{
|
|
26
26
|
"name": "STMicroelectronics",
|
|
@@ -32,30 +32,30 @@
|
|
|
32
32
|
"url": "https://projects.eclipse.org/projects/ecd.glsp"
|
|
33
33
|
}
|
|
34
34
|
],
|
|
35
|
+
"main": "lib/index",
|
|
36
|
+
"types": "lib/index",
|
|
35
37
|
"files": [
|
|
36
38
|
"lib",
|
|
37
|
-
"src"
|
|
38
|
-
"css"
|
|
39
|
+
"src"
|
|
39
40
|
],
|
|
40
|
-
"dependencies": {
|
|
41
|
-
"@eclipse-glsp/server-node": "1.1.0-next.cfb461f.25+cfb461f",
|
|
42
|
-
"elkjs": "^0.7.1",
|
|
43
|
-
"inversify": "^5.1.1",
|
|
44
|
-
"sprotty-elk": "0.12.0"
|
|
45
|
-
},
|
|
46
41
|
"scripts": {
|
|
47
|
-
"
|
|
48
|
-
"
|
|
49
|
-
"
|
|
42
|
+
"build": "tsc -b",
|
|
43
|
+
"clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
|
|
44
|
+
"lint": "eslint --ext .ts,.tsx ./src",
|
|
45
|
+
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
|
|
46
|
+
"prepare": "yarn clean && yarn build",
|
|
47
|
+
"test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
|
|
50
48
|
"test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
|
|
51
|
-
"
|
|
52
|
-
"lint:fix": "eslint --fix -c ../../.eslintrc.js --ext .ts,.tsx ./src",
|
|
49
|
+
"test:coverage": "nyc yarn test",
|
|
53
50
|
"watch": "tsc -w"
|
|
54
51
|
},
|
|
52
|
+
"dependencies": {
|
|
53
|
+
"@eclipse-glsp/server": "1.1.0-next.dc6b980.47+dc6b980",
|
|
54
|
+
"elkjs": "^0.7.1",
|
|
55
|
+
"sprotty-elk": "0.12.0"
|
|
56
|
+
},
|
|
55
57
|
"publishConfig": {
|
|
56
58
|
"access": "public"
|
|
57
59
|
},
|
|
58
|
-
"
|
|
59
|
-
"types": "lib/index",
|
|
60
|
-
"gitHead": "cfb461fdc599bb4de5b7936b4bb502083d5ba3b0"
|
|
60
|
+
"gitHead": "dc6b980a473afbce8e304a2b68efe6877069dc97"
|
|
61
61
|
}
|
package/src/di.config.spec.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
|
-
import { DefaultModelState, GGraph, GModelElementConstructor, ModelState } from '@eclipse-glsp/server
|
|
17
|
-
import { StubDiagramConfiguration } from '@eclipse-glsp/server
|
|
16
|
+
import { DefaultModelState, GGraph, GModelElementConstructor, ModelState } from '@eclipse-glsp/server';
|
|
17
|
+
import { StubDiagramConfiguration } from '@eclipse-glsp/server/lib/common/test/mock-util';
|
|
18
18
|
import { expect } from 'chai';
|
|
19
19
|
import { Container, ContainerModule, injectable } from 'inversify';
|
|
20
20
|
import * as sinon from 'sinon';
|
package/src/di.config.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { LayoutEngine, ModelState } from '@eclipse-glsp/server
|
|
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
19
|
import { ElkFactory } from 'sprotty-elk';
|
package/src/element-filter.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GEdge, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server
|
|
16
|
+
import { GEdge, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
17
|
import { inject, injectable } from 'inversify';
|
|
18
18
|
|
|
19
19
|
export const ElementFilter = Symbol('ElementFilter');
|
|
@@ -29,7 +29,7 @@ import {
|
|
|
29
29
|
MaybePromise,
|
|
30
30
|
ModelState,
|
|
31
31
|
Point
|
|
32
|
-
} from '@eclipse-glsp/server
|
|
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
35
|
import { ElkFactory } from 'sprotty-elk';
|
|
@@ -240,6 +240,7 @@ export class GlspElkLayoutEngine implements LayoutEngine {
|
|
|
240
240
|
};
|
|
241
241
|
if (port.children) {
|
|
242
242
|
elkPort.labels = this.findChildren(port, GLabel).map(child => this.transformToElk(child)) as ElkLabel[];
|
|
243
|
+
this.elkEdges.push(...(this.findChildren(port, GEdge).map(child => this.transformToElk(child)) as ElkEdge[]));
|
|
243
244
|
}
|
|
244
245
|
this.transformShape(elkPort, port);
|
|
245
246
|
this.idToElkElement.set(port.id, elkPort);
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server
|
|
16
|
+
import { GEdge, GGraph, GLabel, GModelElement, GNode, GPort, ModelState } from '@eclipse-glsp/server';
|
|
17
17
|
import { inject, injectable } from 'inversify';
|
|
18
18
|
import { LayoutOptions } from './sprotty-elk';
|
|
19
19
|
|