@eclipse-glsp/layout-elk 1.1.0-RC07 → 1.1.0-next.146ae06.49
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 +2 -1
- package/lib/di.config.d.ts.map +1 -1
- package/lib/di.config.js +7 -8
- package/lib/di.config.js.map +1 -1
- package/lib/di.config.spec.js +1 -2
- package/lib/di.config.spec.js.map +1 -1
- package/package.json +3 -3
- package/src/di.config.spec.ts +1 -2
- package/src/di.config.ts +3 -4
package/lib/di.config.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { LayoutOptions } from 'elkjs/lib/elk.bundled';
|
|
2
2
|
import { ContainerModule } from 'inversify';
|
|
3
|
-
import { ElementFilter
|
|
3
|
+
import { ElementFilter } from './element-filter';
|
|
4
|
+
import { LayoutConfigurator } from './layout-configurator';
|
|
4
5
|
type Constructor<T> = new (...args: any[]) => T;
|
|
5
6
|
/**
|
|
6
7
|
* Configuration options for the {@link configureELKLayoutModule} function.
|
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,
|
|
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,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
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureELKLayoutModule = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2022 STMicroelectronics and others.
|
|
5
|
+
* Copyright (c) 2022-2023 STMicroelectronics and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -20,7 +20,6 @@ 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");
|
|
23
|
-
const _1 = require(".");
|
|
24
23
|
const element_filter_1 = require("./element-filter");
|
|
25
24
|
const glsp_elk_layout_engine_1 = require("./glsp-elk-layout-engine");
|
|
26
25
|
const layout_configurator_1 = require("./layout-configurator");
|
|
@@ -43,16 +42,16 @@ const layout_configurator_1 = require("./layout-configurator");
|
|
|
43
42
|
function configureELKLayoutModule(options) {
|
|
44
43
|
return new inversify_1.ContainerModule(bind => {
|
|
45
44
|
if (options.elementFilter) {
|
|
46
|
-
bind(
|
|
45
|
+
bind(element_filter_1.ElementFilter).to(options.elementFilter).inSingletonScope();
|
|
47
46
|
}
|
|
48
47
|
else {
|
|
49
|
-
bind(
|
|
48
|
+
bind(element_filter_1.ElementFilter).to(element_filter_1.DefaultElementFilter).inSingletonScope();
|
|
50
49
|
}
|
|
51
50
|
if (options.layoutConfigurator) {
|
|
52
|
-
bind(
|
|
51
|
+
bind(layout_configurator_1.LayoutConfigurator).to(options.layoutConfigurator);
|
|
53
52
|
}
|
|
54
53
|
else {
|
|
55
|
-
bind(
|
|
54
|
+
bind(layout_configurator_1.LayoutConfigurator)
|
|
56
55
|
.toDynamicValue(context => new layout_configurator_1.FallbackLayoutConfigurator(options.algorithms, options.defaultLayoutOptions))
|
|
57
56
|
.inSingletonScope();
|
|
58
57
|
}
|
|
@@ -65,8 +64,8 @@ function configureELKLayoutModule(options) {
|
|
|
65
64
|
.toDynamicValue(context => {
|
|
66
65
|
const container = context.container;
|
|
67
66
|
const factory = container.get(sprotty_elk_1.ElkFactory);
|
|
68
|
-
const filter = container.get(
|
|
69
|
-
const configurator = container.get(
|
|
67
|
+
const filter = container.get(element_filter_1.ElementFilter);
|
|
68
|
+
const configurator = container.get(layout_configurator_1.LayoutConfigurator);
|
|
70
69
|
const modelState = container.get(server_1.ModelState);
|
|
71
70
|
return new glsp_elk_layout_engine_1.GlspElkLayoutEngine(factory, filter, configurator, modelState);
|
|
72
71
|
})
|
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,6CAAyC;AACzC,
|
|
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,qDAAuE;AACvE,qEAA+D;AAC/D,+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,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,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/di.config.spec.js
CHANGED
|
@@ -26,11 +26,10 @@ 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");
|
|
29
|
-
const _1 = require(".");
|
|
30
29
|
const di_config_1 = require("./di.config");
|
|
31
30
|
const element_filter_1 = require("./element-filter");
|
|
32
31
|
const layout_configurator_1 = require("./layout-configurator");
|
|
33
|
-
let CustomLayoutConfigurator = class CustomLayoutConfigurator extends
|
|
32
|
+
let CustomLayoutConfigurator = class CustomLayoutConfigurator extends layout_configurator_1.AbstractLayoutConfigurator {
|
|
34
33
|
};
|
|
35
34
|
CustomLayoutConfigurator = __decorate([
|
|
36
35
|
(0, inversify_1.injectable)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"version":3,"file":"di.config.spec.js","sourceRoot":"","sources":["../src/di.config.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/layout-elk",
|
|
3
|
-
"version": "1.1.0-
|
|
3
|
+
"version": "1.1.0-next.146ae06.49+146ae06",
|
|
4
4
|
"description": "Integration of ELK graph layout algorithms in GLSP Node Server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"watch": "tsc -w"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@eclipse-glsp/server": "1.1.0-
|
|
53
|
+
"@eclipse-glsp/server": "1.1.0-next.146ae06.49+146ae06",
|
|
54
54
|
"elkjs": "^0.7.1",
|
|
55
55
|
"sprotty-elk": "0.12.0"
|
|
56
56
|
},
|
|
57
57
|
"publishConfig": {
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "146ae06fdf2dcaea924873e830a81b0ca4033d85"
|
|
61
61
|
}
|
package/src/di.config.spec.ts
CHANGED
|
@@ -18,10 +18,9 @@ import { StubDiagramConfiguration } from '@eclipse-glsp/server/lib/common/test/m
|
|
|
18
18
|
import { expect } from 'chai';
|
|
19
19
|
import { Container, ContainerModule, injectable } from 'inversify';
|
|
20
20
|
import * as sinon from 'sinon';
|
|
21
|
-
import { AbstractLayoutConfigurator } from '.';
|
|
22
21
|
import { configureELKLayoutModule } from './di.config';
|
|
23
22
|
import { DefaultElementFilter, ElementFilter } from './element-filter';
|
|
24
|
-
import { FallbackLayoutConfigurator, LayoutConfigurator } from './layout-configurator';
|
|
23
|
+
import { AbstractLayoutConfigurator, FallbackLayoutConfigurator, LayoutConfigurator } from './layout-configurator';
|
|
25
24
|
|
|
26
25
|
@injectable()
|
|
27
26
|
class CustomLayoutConfigurator extends AbstractLayoutConfigurator {}
|
package/src/di.config.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
|
|
@@ -17,10 +17,9 @@ 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';
|
|
20
|
-
import {
|
|
21
|
-
import { DefaultElementFilter } from './element-filter';
|
|
20
|
+
import { DefaultElementFilter, ElementFilter } from './element-filter';
|
|
22
21
|
import { GlspElkLayoutEngine } from './glsp-elk-layout-engine';
|
|
23
|
-
import { FallbackLayoutConfigurator } from './layout-configurator';
|
|
22
|
+
import { FallbackLayoutConfigurator, LayoutConfigurator } from './layout-configurator';
|
|
24
23
|
|
|
25
24
|
type Constructor<T> = new (...args: any[]) => T;
|
|
26
25
|
|