@neo4j-nvl/layout-workers 0.2.48 → 0.2.49

package/lib/__mocks__/index.d.ts

@@ -1,10 +1,16 @@
 export function createCoseBilkentLayoutWorker(): {
-    onmessage: jest.Mock<any, any, any>;
-    postMessage: jest.Mock<any, any, any>;
-    terminate: jest.Mock<any, any, any>;
+    port: {
+        start: jest.Mock<any, any, any>;
+        onmessage: jest.Mock<any, any, any>;
+        postMessage: jest.Mock<any, any, any>;
+        close: jest.Mock<any, any, any>;
+    };
 };
 export function createHierarchicalLayoutWorker(): {
-    onmessage: jest.Mock<any, any, any>;
-    postMessage: jest.Mock<any, any, any>;
-    terminate: jest.Mock<any, any, any>;
+    port: {
+        start: jest.Mock<any, any, any>;
+        onmessage: jest.Mock<any, any, any>;
+        postMessage: jest.Mock<any, any, any>;
+        close: jest.Mock<any, any, any>;
+    };
 };

package/lib/__mocks__/index.js

@@ -1,7 +1,10 @@
-const workerMock = {
-    onmessage: jest.fn(),
-    postMessage: jest.fn(),
-    terminate: jest.fn()
+const sharedWorkerMock = {
+    port: {
+        start: jest.fn(),
+        onmessage: jest.fn(),
+        postMessage: jest.fn(),
+        close: jest.fn()
+    }
 };
-export const createCoseBilkentLayoutWorker = () => workerMock;
-export const createHierarchicalLayoutWorker = () => workerMock;
+export const createCoseBilkentLayoutWorker = () => sharedWorkerMock;
+export const createHierarchicalLayoutWorker = () => sharedWorkerMock;

package/lib/cosebilkent-layout/CoseBilkentLayout.worker.js

@@ -1,9 +1,9 @@
 import { layout } from './cose-bilkent-layout-impl.js';
-const onMessage = ({ data, target }) => {
-    if (target.name === 'CoseBilkentLayout') {
+onconnect = ({ ports }) => {
+    const port = ports[0];
+    port.onmessage = ({ data }) => {
         const { elements, spacingFactor } = data;
         const layoutData = layout(elements, spacingFactor);
-        postMessage(layoutData);
-    }
+        port.postMessage(layoutData);
+    };
 };
-self.addEventListener('message', onMessage);

package/lib/cosebilkent-layout/workerFactory.d.mts

@@ -0,0 +1 @@
+export function createCoseBilkentLayoutWorker(): SharedWorker;

package/lib/cosebilkent-layout/workerFactory.mjs

@@ -0,0 +1,8 @@
+/**
+ * @returns {SharedWorker}
+ * @internal
+ */
+export const createCoseBilkentLayoutWorker = () => new SharedWorker(new URL('./CoseBilkentLayout.worker.js', import.meta.url), {
+    type: 'module',
+    name: 'CoseBilkentLayout'
+});

package/lib/hierarchical-layout/HierarchicalLayout.worker.js

@@ -1,16 +1,16 @@
 import { layout } from './dagre-layout-impl.js';
-const onMessage = ({ data, target }) => {
-    if (target.name === 'HierarchicalLayout') {
+onconnect = ({ ports }) => {
+    const port = ports[0];
+    port.onmessage = ({ data }) => {
         const { nodes, nodeIds, idToPosition, rels, direction, packing, pixelRatio, forcedDelay = 0 } = data;
         const layoutData = layout(nodes, nodeIds, idToPosition, rels, direction, packing, pixelRatio);
         if (forcedDelay) {
             setTimeout(() => {
-                postMessage(layoutData);
+                port.postMessage(layoutData);
             }, forcedDelay);
         }
         else {
-            postMessage(layoutData);
+            port.postMessage(layoutData);
         }
-    }
+    };
 };
-self.addEventListener('message', onMessage);

package/lib/hierarchical-layout/workerFactory.d.mts

@@ -0,0 +1 @@
+export function createHierarchicalLayoutWorker(): SharedWorker;

package/lib/hierarchical-layout/workerFactory.mjs

@@ -0,0 +1,8 @@
+/**
+ * @returns {SharedWorker}
+ * @internal
+ */
+export const createHierarchicalLayoutWorker = () => new SharedWorker(new URL('./HierarchicalLayout.worker.js', import.meta.url), {
+    type: 'module',
+    name: 'HierarchicalLayout'
+});

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-import { createCoseBilkentLayoutWorker } from './cosebilkent-layout/workerFactory.js';
-import { createHierarchicalLayoutWorker } from './hierarchical-layout/workerFactory.js';
+import { createCoseBilkentLayoutWorker } from './cosebilkent-layout/workerFactory.mjs';
+import { createHierarchicalLayoutWorker } from './hierarchical-layout/workerFactory.mjs';
 export { createCoseBilkentLayoutWorker, createHierarchicalLayoutWorker };

package/lib/index.js

@@ -1,3 +1,3 @@
-import { createCoseBilkentLayoutWorker } from './cosebilkent-layout/workerFactory.js';
-import { createHierarchicalLayoutWorker } from './hierarchical-layout/workerFactory.js';
+import { createCoseBilkentLayoutWorker } from './cosebilkent-layout/workerFactory.mjs';
+import { createHierarchicalLayoutWorker } from './hierarchical-layout/workerFactory.mjs';
 export { createCoseBilkentLayoutWorker, createHierarchicalLayoutWorker };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neo4j-nvl/layout-workers",
-  "version": "0.2.48",
+  "version": "0.2.49",
   "license": "SEE LICENSE IN 'Neo4j Early Access Agreement - Visualization Library.pdf'",
   "main": "lib/index.js",
   "type": "module",

package/lib/cosebilkent-layout/workerFactory.d.ts

@@ -1 +0,0 @@
-export function createCoseBilkentLayoutWorker(): Worker;

package/lib/cosebilkent-layout/workerFactory.js

@@ -1,5 +0,0 @@
-/**
- * @returns {Worker}
- * @internal
- */
-export const createCoseBilkentLayoutWorker = () => new Worker(new URL('./CoseBilkentLayout.worker.js', import.meta.url), { type: 'module', name: 'CoseBilkentLayout' });

package/lib/hierarchical-layout/workerFactory.d.ts

@@ -1 +0,0 @@
-export function createHierarchicalLayoutWorker(): Worker;

package/lib/hierarchical-layout/workerFactory.js

@@ -1,5 +0,0 @@
-/**
- * @returns {Worker}
- * @internal
- */
-export const createHierarchicalLayoutWorker = () => new Worker(new URL('./HierarchicalLayout.worker.js', import.meta.url), { type: 'module', name: 'HierarchicalLayout' });