@eclipse-glsp/layout-elk 2.8.0-next.0 → 2.8.0-next.10

package/lib/di.config.d.ts

@@ -15,6 +15,7 @@
  ********************************************************************************/
 import { BindingTarget, GLSPModule } from '@eclipse-glsp/server';
 import { LayoutOptions } from 'elkjs/lib/elk.bundled';
+import { ELK } from 'elkjs/lib/elk-api';
 import { ContainerModule, interfaces } from 'inversify';
 import { ElementFilter } from './element-filter';
 import { ElkFactory, GlspElkLayoutEngine } from './glsp-elk-layout-engine';
@@ -70,6 +71,21 @@ export declare class ElkLayoutModule extends GLSPModule {
     protected bindElementFilter(): BindingTarget<ElementFilter>;
     protected bindLayoutConfigurator(): BindingTarget<LayoutConfigurator>;
     protected bindElkFactory(): BindingTarget<ElkFactory>;
+    /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
+    protected createElk(options: {
+        algorithms: string[];
+        defaultLayoutOptions?: LayoutOptions;
+    }, isWebWorker?: boolean): ELK;
+    /**
+     * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
+     * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
+     * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
+     * the in-process worker without touching the server's own `self.onmessage` handler.
+     */
+    protected createWebWorkerElk(options: {
+        algorithms: string[];
+        defaultLayoutOptions?: LayoutOptions;
+    }): ELK;
     protected bindGlspElkLayoutEngine(): BindingTarget<GlspElkLayoutEngine>;
     /** Provide fallbacks so the module works standalone in tests/specs that don't preconfigure logging. */
     protected bindLoggerFallbacks(bind: interfaces.Bind, isBound: interfaces.IsBound): void;

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,UAAU,EAOb,MAAM,sBAAsB,CAAC;AAC9B,OAAuB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACpE,OAAO,EAAwB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,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;IAC3C;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;;;;GAaG;AACH,qBACa,eAAgB,SAAQ,UAAU;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB;gBAAzB,OAAO,EAAE,gBAAgB;IAIxD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAUnI,SAAS,CAAC,iBAAiB,IAAI,aAAa,CAAC,aAAa,CAAC;IAI3D,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,kBAAkB,CAAC;IAOrE,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAarD,SAAS,CAAC,uBAAuB,IAAI,aAAa,CAAC,mBAAmB,CAAC;IAYvE,uGAAuG;IACvG,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,IAAI;CAY1F;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAEnF"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,UAAU,EAOb,MAAM,sBAAsB,CAAC;AAC9B,OAAuB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACpE,OAAO,EAAwB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,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;IAC3C;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;;;;GAaG;AACH,qBACa,eAAgB,SAAQ,UAAU;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB;gBAAzB,OAAO,EAAE,gBAAgB;IAIxD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAUnI,SAAS,CAAC,iBAAiB,IAAI,aAAa,CAAC,aAAa,CAAC;IAI3D,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,kBAAkB,CAAC;IAOrE,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAMrD,iHAAiH;IACjH,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,oBAAoB,CAAC,EAAE,aAAa,CAAA;KAAE,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,GAAG;IAIxH;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,oBAAoB,CAAC,EAAE,aAAa,CAAA;KAAE,GAAG,GAAG;IAgB1G,SAAS,CAAC,uBAAuB,IAAI,aAAa,CAAC,mBAAmB,CAAC;IAYvE,uGAAuG;IACvG,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,IAAI;CAY1F;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAEnF"}

package/lib/di.config.js

@@ -61,8 +61,7 @@ let ElkLayoutModule = class ElkLayoutModule extends server_1.GLSPModule {
         this.bindLoggerFallbacks(bind, isBound);
     }
     bindElementFilter() {
-        var _a;
-        return (_a = this.options.elementFilter) !== null && _a !== void 0 ? _a : element_filter_1.DefaultElementFilter;
+        return this.options.elementFilter ?? element_filter_1.DefaultElementFilter;
     }
     bindLayoutConfigurator() {
         if (this.options.layoutConfigurator) {
@@ -72,15 +71,36 @@ let ElkLayoutModule = class ElkLayoutModule extends server_1.GLSPModule {
     }
     bindElkFactory() {
         const { algorithms, defaultLayoutOptions, isWebWorker } = this.options;
-        const factory = () => new elk_bundled_1.default({
-            algorithms,
-            defaultLayoutOptions,
-            // The node implementation relies on elkjs' `FakeWorker` to set the `workerFactory`. The required file is
-            // dynamically loaded and not available in a web-worker context, so it has to be mocked manually there.
-            workerFactory: isWebWorker ? () => ({ postMessage: () => { } }) : undefined
-        });
+        const factory = () => this.createElk({ algorithms, defaultLayoutOptions }, isWebWorker);
         return { constantValue: factory };
     }
+    /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
+    createElk(options, isWebWorker) {
+        return isWebWorker ? this.createWebWorkerElk(options) : new elk_bundled_1.default(options);
+    }
+    /**
+     * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
+     * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
+     * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
+     * the in-process worker without touching the server's own `self.onmessage` handler.
+     */
+    createWebWorkerElk(options) {
+        const globalScope = globalThis;
+        const hadDocument = 'document' in globalScope;
+        const previousDocument = globalScope.document;
+        globalScope.document = previousDocument ?? {};
+        try {
+            return new elk_bundled_1.default(options);
+        }
+        finally {
+            if (hadDocument) {
+                globalScope.document = previousDocument;
+            }
+            else {
+                delete globalScope.document;
+            }
+        }
+    }
     bindGlspElkLayoutEngine() {
         return {
             dynamicValue: ctx => {

package/lib/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/layout-elk",
-  "version": "2.8.0-next.0+bb0b4e8",
+  "version": "2.8.0-next.10",
   "description": "Integration of ELK graph layout algorithms in GLSP Node Server",
   "keywords": [
     "eclipse",
@@ -36,27 +36,25 @@
   "types": "lib/index",
   "files": [
     "lib",
-    "src"
+    "src",
+    "!**/*.spec.ts",
+    "!**/*.spec.tsx"
   ],
-  "scripts": {
-    "build": "tsc -b",
-    "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
-    "generate:index": "glsp generateIndex src -f -s",
-    "lint": "eslint ./src",
-    "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
-    "test:ci": "yarn test --reporter mocha-ctrf-json-reporter",
-    "test:coverage": "nyc yarn test",
-    "watch": "tsc -w"
-  },
   "dependencies": {
-    "@eclipse-glsp/server": "2.8.0-next.0+bb0b4e8",
-    "elkjs": "^0.10.1"
+    "elkjs": "^0.11.1",
+    "@eclipse-glsp/server": "2.8.0-next.10"
   },
   "peerDependencies": {
-    "inversify": "^6.1.3"
+    "inversify": "^6.1.3",
+    "reflect-metadata": "^0.2.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bb0b4e86909b0c6ea8ba805a9aba68e4afd2decb"
-}
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rimraf lib *.tsbuildinfo coverage",
+    "generate:index": "glsp generateIndex src -f -s",
+    "lint": "eslint ./src"
+  }
+}

package/src/di.config.ts

@@ -24,6 +24,7 @@ import {
     applyBindingTarget
 } from '@eclipse-glsp/server';
 import ElkConstructor, { LayoutOptions } from 'elkjs/lib/elk.bundled';
+import { ELK } from 'elkjs/lib/elk-api';
 import { ContainerModule, injectable, interfaces } from 'inversify';
 import { DefaultElementFilter, ElementFilter } from './element-filter';
 import { ElkFactory, GlspElkLayoutEngine } from './glsp-elk-layout-engine';
@@ -104,17 +105,37 @@ export class ElkLayoutModule extends GLSPModule {
 
     protected bindElkFactory(): BindingTarget<ElkFactory> {
         const { algorithms, defaultLayoutOptions, isWebWorker } = this.options;
-        const factory: ElkFactory = () =>
-            new ElkConstructor({
-                algorithms,
-                defaultLayoutOptions,
-                // The node implementation relies on elkjs' `FakeWorker` to set the `workerFactory`. The required file is
-                // dynamically loaded and not available in a web-worker context, so it has to be mocked manually there.
-                workerFactory: isWebWorker ? () => ({ postMessage: () => {} }) as unknown as Worker : undefined
-            });
+        const factory: ElkFactory = () => this.createElk({ algorithms, defaultLayoutOptions }, isWebWorker);
         return { constantValue: factory };
     }
 
+    /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
+    protected createElk(options: { algorithms: string[]; defaultLayoutOptions?: LayoutOptions }, isWebWorker?: boolean): ELK {
+        return isWebWorker ? this.createWebWorkerElk(options) : new ElkConstructor(options);
+    }
+
+    /**
+     * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
+     * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
+     * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
+     * the in-process worker without touching the server's own `self.onmessage` handler.
+     */
+    protected createWebWorkerElk(options: { algorithms: string[]; defaultLayoutOptions?: LayoutOptions }): ELK {
+        const globalScope = globalThis as { document?: unknown };
+        const hadDocument = 'document' in globalScope;
+        const previousDocument = globalScope.document;
+        globalScope.document = previousDocument ?? {};
+        try {
+            return new ElkConstructor(options);
+        } finally {
+            if (hadDocument) {
+                globalScope.document = previousDocument;
+            } else {
+                delete globalScope.document;
+            }
+        }
+    }
+
     protected bindGlspElkLayoutEngine(): BindingTarget<GlspElkLayoutEngine> {
         return {
             dynamicValue: ctx => {

package/src/di.config.spec.ts

@@ -1,110 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-import {
-    DefaultModelState,
-    DiagramConfiguration,
-    EdgeTypeHint,
-    GGraph,
-    GModelElementConstructor,
-    ModelState,
-    ServerLayoutKind,
-    ShapeTypeHint
-} from '@eclipse-glsp/server';
-import { expect } from 'chai';
-import { Container, ContainerModule, injectable } from 'inversify';
-import * as sinon from 'sinon';
-import { configureELKLayoutModule } from './di.config';
-import { DefaultElementFilter, ElementFilter } from './element-filter';
-import { AbstractLayoutConfigurator, FallbackLayoutConfigurator, LayoutConfigurator } from './layout-configurator';
-
-@injectable()
-class CustomLayoutConfigurator extends AbstractLayoutConfigurator {}
-
-@injectable()
-class CustomElementFilter extends DefaultElementFilter {}
-
-class StubDiagramConfiguration implements DiagramConfiguration {
-    typeMapping = new Map<string, GModelElementConstructor>();
-
-    shapeTypeHints: ShapeTypeHint[] = [];
-
-    edgeTypeHints: EdgeTypeHint[] = [];
-
-    layoutKind = ServerLayoutKind.NONE;
-
-    needsClientLayout = true;
-
-    animatedUpdate = true;
-}
-
-describe('test configureELKLayoutModule', () => {
-    const sandbox = sinon.createSandbox();
-    const mockDiagramConfiguration = new StubDiagramConfiguration();
-    const typeMappings = new Map<string, GModelElementConstructor>();
-
-    typeMappings.set('graph', GGraph);
-    sandbox.stub(mockDiagramConfiguration, 'typeMapping').value(typeMappings);
-    const modelState = new DefaultModelState();
-    const baseModule = new ContainerModule(bind => {
-        bind(ModelState).toConstantValue(modelState);
-    });
-    it('configure with minimal options', () => {
-        const algorithm = 'layered';
-        const elkModule = configureELKLayoutModule({ algorithms: [algorithm] });
-        const container = new Container();
-        container.load(baseModule, elkModule);
-        const filter = container.get<ElementFilter>(ElementFilter);
-        expect(filter).to.be.an.instanceOf(DefaultElementFilter);
-        const configurator = container.get<LayoutConfigurator>(LayoutConfigurator);
-        expect(configurator).to.be.an.instanceOf(FallbackLayoutConfigurator);
-        const graphOptions = configurator.apply(new GGraph());
-        expect(graphOptions).not.to.be.undefined;
-        expect(graphOptions!['elk.algorithm']).to.equal(algorithm);
-    });
-
-    it('configure with additional default layout options', () => {
-        const algorithm = 'layered';
-        const defaultLayoutOptions = {
-            'elk.direction': 'LEFT',
-            'elk.edgeRouting': 'POLYLINE'
-        };
-        const elkModule = configureELKLayoutModule({ algorithms: [algorithm], defaultLayoutOptions });
-        const container = new Container();
-        container.load(baseModule, elkModule);
-        const configurator = container.get<LayoutConfigurator>(LayoutConfigurator);
-        const graphOptions = configurator.apply(new GGraph());
-        expect(graphOptions).not.to.be.undefined;
-        expect(graphOptions).to.include(defaultLayoutOptions);
-    });
-
-    it('configure with custom layout configurator', () => {
-        const algorithm = 'layered';
-        const elkModule = configureELKLayoutModule({ algorithms: [algorithm], layoutConfigurator: CustomLayoutConfigurator });
-        const container = new Container();
-        container.load(baseModule, elkModule);
-        const configurator = container.get<LayoutConfigurator>(LayoutConfigurator);
-        expect(configurator).to.be.an.instanceOf(CustomLayoutConfigurator);
-    });
-
-    it('configure with custom element filter', () => {
-        const algorithm = 'layered';
-        const elkModule = configureELKLayoutModule({ algorithms: [algorithm], elementFilter: CustomElementFilter });
-        const container = new Container();
-        container.load(baseModule, elkModule);
-        const filter = container.get<ElementFilter>(ElementFilter);
-        expect(filter).to.be.an.instanceOf(CustomElementFilter);
-    });
-});