@eclipse-glsp/layout-elk 2.7.0 → 2.8.0-next.1

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.
@@ -15,6 +15,7 @@
15
15
  ********************************************************************************/
16
16
  import { BindingTarget, GLSPModule } from '@eclipse-glsp/server';
17
17
  import { LayoutOptions } from 'elkjs/lib/elk.bundled';
18
+ import { ELK } from 'elkjs/lib/elk-api';
18
19
  import { ContainerModule, interfaces } from 'inversify';
19
20
  import { ElementFilter } from './element-filter';
20
21
  import { ElkFactory, GlspElkLayoutEngine } from './glsp-elk-layout-engine';
@@ -70,6 +71,21 @@ export declare class ElkLayoutModule extends GLSPModule {
70
71
  protected bindElementFilter(): BindingTarget<ElementFilter>;
71
72
  protected bindLayoutConfigurator(): BindingTarget<LayoutConfigurator>;
72
73
  protected bindElkFactory(): BindingTarget<ElkFactory>;
74
+ /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
75
+ protected createElk(options: {
76
+ algorithms: string[];
77
+ defaultLayoutOptions?: LayoutOptions;
78
+ }, isWebWorker?: boolean): ELK;
79
+ /**
80
+ * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
81
+ * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
82
+ * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
83
+ * the in-process worker without touching the server's own `self.onmessage` handler.
84
+ */
85
+ protected createWebWorkerElk(options: {
86
+ algorithms: string[];
87
+ defaultLayoutOptions?: LayoutOptions;
88
+ }): ELK;
73
89
  protected bindGlspElkLayoutEngine(): BindingTarget<GlspElkLayoutEngine>;
74
90
  /** Provide fallbacks so the module works standalone in tests/specs that don't preconfigure logging. */
75
91
  protected bindLoggerFallbacks(bind: interfaces.Bind, isBound: interfaces.IsBound): void;
@@ -1 +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"}
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,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 CHANGED
@@ -72,15 +72,36 @@ let ElkLayoutModule = class ElkLayoutModule extends server_1.GLSPModule {
72
72
  }
73
73
  bindElkFactory() {
74
74
  const { algorithms, defaultLayoutOptions, isWebWorker } = this.options;
75
- const factory = () => new elk_bundled_1.default({
76
- algorithms,
77
- defaultLayoutOptions,
78
- // The node implementation relies on elkjs' `FakeWorker` to set the `workerFactory`. The required file is
79
- // dynamically loaded and not available in a web-worker context, so it has to be mocked manually there.
80
- workerFactory: isWebWorker ? () => ({ postMessage: () => { } }) : undefined
81
- });
75
+ const factory = () => this.createElk({ algorithms, defaultLayoutOptions }, isWebWorker);
82
76
  return { constantValue: factory };
83
77
  }
78
+ /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
79
+ createElk(options, isWebWorker) {
80
+ return isWebWorker ? this.createWebWorkerElk(options) : new elk_bundled_1.default(options);
81
+ }
82
+ /**
83
+ * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
84
+ * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
85
+ * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
86
+ * the in-process worker without touching the server's own `self.onmessage` handler.
87
+ */
88
+ createWebWorkerElk(options) {
89
+ const globalScope = globalThis;
90
+ const hadDocument = 'document' in globalScope;
91
+ const previousDocument = globalScope.document;
92
+ globalScope.document = previousDocument !== null && previousDocument !== void 0 ? previousDocument : {};
93
+ try {
94
+ return new elk_bundled_1.default(options);
95
+ }
96
+ finally {
97
+ if (hadDocument) {
98
+ globalScope.document = previousDocument;
99
+ }
100
+ else {
101
+ delete globalScope.document;
102
+ }
103
+ }
104
+ }
84
105
  bindGlspElkLayoutEngine() {
85
106
  return {
86
107
  dynamicValue: ctx => {
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoJA,4DAEC;AAtJD;;;;;;;;;;;;;;kFAckF;AAClF,iDAS8B;AAC9B,uDAAsE;AACtE,yCAAoE;AACpE,qDAAuE;AACvE,qEAA2E;AAC3E,+DAAuF;AAkCvF;;;;;;;;;;;;;GAaG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,mBAAU;IAC3C,YAA+B,OAAyB;QACpD,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAkB;IAExD,CAAC;IAES,SAAS,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB;QACxH,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,IAAA,2BAAkB,EAAC,OAAO,EAAE,8BAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACxF,IAAA,2BAAkB,EAAC,OAAO,EAAE,wCAAkB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClG,IAAA,2BAAkB,EAAC,OAAO,EAAE,mCAAU,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAC/D,IAAA,2BAAkB,EAAC,OAAO,EAAE,4CAAmB,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACpG,IAAI,CAAC,qBAAY,CAAC,CAAC,SAAS,CAAC,4CAAmB,CAAC,CAAC;QAClD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAES,iBAAiB;;QACvB,OAAO,MAAA,IAAI,CAAC,OAAO,CAAC,aAAa,mCAAI,qCAAoB,CAAC;IAC9D,CAAC;IAES,sBAAsB;QAC5B,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC3C,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,gDAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;IAC9H,CAAC;IAES,cAAc;QACpB,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACvE,MAAM,OAAO,GAAe,GAAG,EAAE,CAC7B,IAAI,qBAAc,CAAC;YACf,UAAU;YACV,oBAAoB;YACpB,yGAAyG;YACzG,uGAAuG;YACvG,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAsB,CAAC,CAAC,CAAC,SAAS;SAClG,CAAC,CAAC;QACP,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;IACtC,CAAC;IAES,uBAAuB;QAC7B,OAAO;YACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBAChB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAa,mCAAU,CAAC,CAAC;gBAC1D,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAgB,8BAAa,CAAC,CAAC;gBAC/D,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAqB,wCAAkB,CAAC,CAAC;gBAC/E,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAa,mBAAU,CAAC,CAAC;gBAC7D,OAAO,IAAI,4CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;YAC9E,CAAC;SACJ,CAAC;IACN,CAAC;IAED,uGAAuG;IAC7F,mBAAmB,CAAC,IAAqB,EAAE,OAA2B;QAC5E,IAAI,CAAC,OAAO,CAAC,eAAM,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,eAAM,CAAC,CAAC,EAAE,CAAC,mBAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,sBAAa,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;gBACpD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;gBACvB,OAAO,MAAM,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACJ,CAAA;AAhEY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,sBAAU,GAAE;;GACA,eAAe,CAgE3B;AAED;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,OAAyB;IAC9D,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC"}
1
+ {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.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": "2.7.0",
3
+ "version": "2.8.0-next.1+ab013b0",
4
4
  "description": "Integration of ELK graph layout algorithms in GLSP Node Server",
5
5
  "keywords": [
6
6
  "eclipse",
@@ -49,7 +49,7 @@
49
49
  "watch": "tsc -w"
50
50
  },
51
51
  "dependencies": {
52
- "@eclipse-glsp/server": "2.7.0",
52
+ "@eclipse-glsp/server": "2.8.0-next.1+ab013b0",
53
53
  "elkjs": "^0.10.1"
54
54
  },
55
55
  "peerDependencies": {
@@ -58,5 +58,5 @@
58
58
  "publishConfig": {
59
59
  "access": "public"
60
60
  },
61
- "gitHead": "009013242e08e679f251b4bb7feceb05314d73b2"
61
+ "gitHead": "ab013b0c1f1fce1734182e324ea9f915d50f92a6"
62
62
  }
package/src/di.config.ts CHANGED
@@ -24,6 +24,7 @@ import {
24
24
  applyBindingTarget
25
25
  } from '@eclipse-glsp/server';
26
26
  import ElkConstructor, { LayoutOptions } from 'elkjs/lib/elk.bundled';
27
+ import { ELK } from 'elkjs/lib/elk-api';
27
28
  import { ContainerModule, injectable, interfaces } from 'inversify';
28
29
  import { DefaultElementFilter, ElementFilter } from './element-filter';
29
30
  import { ElkFactory, GlspElkLayoutEngine } from './glsp-elk-layout-engine';
@@ -104,17 +105,37 @@ export class ElkLayoutModule extends GLSPModule {
104
105
 
105
106
  protected bindElkFactory(): BindingTarget<ElkFactory> {
106
107
  const { algorithms, defaultLayoutOptions, isWebWorker } = this.options;
107
- const factory: ElkFactory = () =>
108
- new ElkConstructor({
109
- algorithms,
110
- defaultLayoutOptions,
111
- // The node implementation relies on elkjs' `FakeWorker` to set the `workerFactory`. The required file is
112
- // dynamically loaded and not available in a web-worker context, so it has to be mocked manually there.
113
- workerFactory: isWebWorker ? () => ({ postMessage: () => {} }) as unknown as Worker : undefined
114
- });
108
+ const factory: ElkFactory = () => this.createElk({ algorithms, defaultLayoutOptions }, isWebWorker);
115
109
  return { constantValue: factory };
116
110
  }
117
111
 
112
+ /** Creates the underlying elkjs {@link ELK} instance, see {@link createWebWorkerElk} for the web-worker case. */
113
+ protected createElk(options: { algorithms: string[]; defaultLayoutOptions?: LayoutOptions }, isWebWorker?: boolean): ELK {
114
+ return isWebWorker ? this.createWebWorkerElk(options) : new ElkConstructor(options);
115
+ }
116
+
117
+ /**
118
+ * Creates an {@link ELK} instance for a web-worker server. elkjs only exposes its in-process fake worker when it
119
+ * doesn't detect a dedicated-worker scope (`self` present, `document` absent) — otherwise it hijacks
120
+ * `self.onmessage` and layout never runs. Briefly presenting a `document` during construction flips elkjs back to
121
+ * the in-process worker without touching the server's own `self.onmessage` handler.
122
+ */
123
+ protected createWebWorkerElk(options: { algorithms: string[]; defaultLayoutOptions?: LayoutOptions }): ELK {
124
+ const globalScope = globalThis as { document?: unknown };
125
+ const hadDocument = 'document' in globalScope;
126
+ const previousDocument = globalScope.document;
127
+ globalScope.document = previousDocument ?? {};
128
+ try {
129
+ return new ElkConstructor(options);
130
+ } finally {
131
+ if (hadDocument) {
132
+ globalScope.document = previousDocument;
133
+ } else {
134
+ delete globalScope.document;
135
+ }
136
+ }
137
+ }
138
+
118
139
  protected bindGlspElkLayoutEngine(): BindingTarget<GlspElkLayoutEngine> {
119
140
  return {
120
141
  dynamicValue: ctx => {