@xylabs/threads 3.6.5 → 3.6.6

package/dist/esm/master/implementation.node.js

@@ -35,11 +35,10 @@ function detectTsNode() {
     return tsNodeAvailable;
 }
 function createTsNodeModule(scriptPath) {
-    const content = `
+    return `
     require("ts-node/register/transpile-only");
     require(${JSON.stringify(scriptPath)});
   `;
-    return content;
 }
 function rebaseScriptPath(scriptPath, ignoreRegex) {
     const parentCallSite = (0, callsites_3_1_0_1.default)().find((callsite) => {
@@ -51,17 +50,15 @@ function rebaseScriptPath(scriptPath, ignoreRegex) {
     if (callerPath && callerPath.startsWith('file:')) {
         callerPath = (0, node_url_1.fileURLToPath)(callerPath);
     }
-    const rebasedScriptPath = callerPath ? node_path_1.default.join(node_path_1.default.dirname(callerPath), scriptPath) : scriptPath;
-    return rebasedScriptPath;
+    return callerPath ? node_path_1.default.join(node_path_1.default.dirname(callerPath), scriptPath) : scriptPath;
 }
 function resolveScriptPath(scriptPath, baseURL) {
     const makeRelative = (filePath) => {
         return node_path_1.default.isAbsolute(filePath) ? filePath : node_path_1.default.join(baseURL || eval('__dirname'), filePath);
     };
-    const workerFilePath = typeof __non_webpack_require__ === 'function' ?
+    return typeof __non_webpack_require__ === 'function' ?
         __non_webpack_require__.resolve(makeRelative(scriptPath))
         : eval('require').resolve(makeRelative(rebaseScriptPath(scriptPath, /[/\\]worker_threads[/\\]/)));
-    return workerFilePath;
 }
 function initWorkerThreadsWorker() {
     const NativeWorker = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__('worker_threads').Worker : eval('require')('worker_threads').Worker;

package/dist/master/implementation.node.js

@@ -35,11 +35,10 @@ function detectTsNode() {
     return tsNodeAvailable;
 }
 function createTsNodeModule(scriptPath) {
-    const content = `
+    return `
     require("ts-node/register/transpile-only");
     require(${JSON.stringify(scriptPath)});
   `;
-    return content;
 }
 function rebaseScriptPath(scriptPath, ignoreRegex) {
     const parentCallSite = (0, callsites_3_1_0_1.default)().find((callsite) => {
@@ -51,17 +50,15 @@ function rebaseScriptPath(scriptPath, ignoreRegex) {
     if (callerPath && callerPath.startsWith('file:')) {
         callerPath = (0, node_url_1.fileURLToPath)(callerPath);
     }
-    const rebasedScriptPath = callerPath ? node_path_1.default.join(node_path_1.default.dirname(callerPath), scriptPath) : scriptPath;
-    return rebasedScriptPath;
+    return callerPath ? node_path_1.default.join(node_path_1.default.dirname(callerPath), scriptPath) : scriptPath;
 }
 function resolveScriptPath(scriptPath, baseURL) {
     const makeRelative = (filePath) => {
         return node_path_1.default.isAbsolute(filePath) ? filePath : node_path_1.default.join(baseURL || eval('__dirname'), filePath);
     };
-    const workerFilePath = typeof __non_webpack_require__ === 'function' ?
+    return typeof __non_webpack_require__ === 'function' ?
         __non_webpack_require__.resolve(makeRelative(scriptPath))
         : eval('require').resolve(makeRelative(rebaseScriptPath(scriptPath, /[/\\]worker_threads[/\\]/)));
-    return workerFilePath;
 }
 function initWorkerThreadsWorker() {
     const NativeWorker = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__('worker_threads').Worker : eval('require')('worker_threads').Worker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/threads",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "description": "Web workers & worker threads as simple as a function call",
   "license": "MIT",
   "main": "dist/index.js",
@@ -83,9 +83,9 @@
     "worker_threads"
   ],
   "dependencies": {
-    "@babel/types": "^7.24.9",
+    "@babel/types": "^7.25.2",
     "callsites-3-1-0": "npm:callsites@3.1.0",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "is-observable-2-1-0": "npm:is-observable@2.1.0",
     "observable-fns": "^0.6.1"
   },
@@ -95,7 +95,7 @@
     "@types/chai": "^4.3.16",
     "@types/debug": "^4.1.12",
     "@types/execa": "^2.0.0",
-    "@types/node": "^20.14.12",
+    "@types/node": "^22.0.0",
     "@types/webpack": "^5.28.5",
     "ava": "^6.1.3",
     "chai": "^5.1.1",
@@ -105,14 +105,14 @@
     "puppet-run": "^0.11.4",
     "puppet-run-plugin-mocha": "^0.1.1",
     "raw-loader": "^4.0.2",
-    "rimraf": "^5.0.9",
-    "rollup": "^4.19.0",
+    "rimraf": "^4.4.1",
+    "rollup": "^4.19.1",
     "threads-plugin": "^1.4.0",
     "tiny-worker": "^2.3.0",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4",
-    "undici-types": "^6.19.4",
+    "undici-types": "^6.19.5",
     "wavy": "^1.0.4",
     "webpack": "^5.93.0",
     "worker-plugin": "^5.0.1"

package/src/master/implementation.node.ts

@@ -1,3 +1,5 @@
+/* eslint-disable unicorn/no-process-exit */
+/* eslint-disable sonarjs/no-identical-functions */
 /* eslint-disable unicorn/prefer-logical-operator-over-ternary */
 /* eslint-disable unicorn/prefer-regexp-test */
 /* eslint-disable @typescript-eslint/no-var-requires */
@@ -5,7 +7,6 @@
 /* eslint-disable unicorn/prefer-event-target */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable unicorn/text-encoding-identifier-case */
-/* eslint-disable unicorn/no-process-exit */
 /// <reference lib="dom" />
 
 import { EventEmitter } from 'node:events'
@@ -56,11 +57,10 @@ function detectTsNode() {
 }
 
 function createTsNodeModule(scriptPath: string) {
-  const content = `
+  return `
     require("ts-node/register/transpile-only");
     require(${JSON.stringify(scriptPath)});
   `
-  return content
 }
 
 function rebaseScriptPath(scriptPath: string, ignoreRegex: RegExp) {
@@ -76,9 +76,7 @@ function rebaseScriptPath(scriptPath: string, ignoreRegex: RegExp) {
   if (callerPath && callerPath.startsWith('file:')) {
     callerPath = fileURLToPath(callerPath)
   }
-  const rebasedScriptPath = callerPath ? path.join(path.dirname(callerPath), scriptPath) : scriptPath
-
-  return rebasedScriptPath
+  return callerPath ? path.join(path.dirname(callerPath), scriptPath) : scriptPath
 }
 
 function resolveScriptPath(scriptPath: string, baseURL?: string | undefined) {
@@ -87,12 +85,9 @@ function resolveScriptPath(scriptPath: string, baseURL?: string | undefined) {
     return path.isAbsolute(filePath) ? filePath : path.join(baseURL || eval('__dirname'), filePath)
   }
 
-  const workerFilePath =
-    typeof __non_webpack_require__ === 'function' ?
+  return typeof __non_webpack_require__ === 'function' ?
       __non_webpack_require__.resolve(makeRelative(scriptPath))
     : eval('require').resolve(makeRelative(rebaseScriptPath(scriptPath, /[/\\]worker_threads[/\\]/)))
-
-  return workerFilePath
 }
 
 function initWorkerThreadsWorker(): ImplementationExport {

package/src/master/invocation-proxy.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/no-all-duplicated-branches */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /*
  * This source file contains the code for proxying calls in the master thread to calls in the workers

package/src/master/pool.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/export */
 /* eslint-disable unicorn/no-thenable */
 
 /* eslint-disable require-await */

package/src/observable.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/prefer-immediate-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Observable, ObservableLike, SubscriptionObserver } from 'observable-fns'
 

package/src/transferable.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/prefer-single-boolean-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { $transferable } from './symbols'
 

package/src/worker/implementation.tiny-worker.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/prefer-immediate-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /// <reference lib="dom" />
 // tslint:disable no-shadowed-variable

package/test/observable-promise.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/no-duplicate-string */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import test from 'ava'
 import { Observable } from 'observable-fns'

package/test/pool.test.ts

@@ -8,6 +8,9 @@ import test from 'ava'
 import { Pool, spawn, Worker } from '../src/index'
 import { PoolEventType, QueuedTask } from '../src/master/pool'
 
+const workerPath = './workers/hello-world'
+const HELLO_WORLD = 'Hello World'
+
 test.serial('thread pool basics work and events are emitted', async (t) => {
   const events: Pool.Event[] = []
   let spawnCalled = 0
@@ -15,7 +18,7 @@ test.serial('thread pool basics work and events are emitted', async (t) => {
 
   const spawnHelloWorld = () => {
     spawnCalled++
-    return spawn<() => string>(new Worker('./workers/hello-world'))
+    return spawn<() => string>(new Worker(workerPath))
   }
   const pool = Pool(spawnHelloWorld, 3)
   pool.events().subscribe((event) => events.push(event))
@@ -32,7 +35,7 @@ test.serial('thread pool basics work and events are emitted', async (t) => {
   await pool.queue(async (helloWorld) => {
     taskFnCalled++
     const result = await helloWorld()
-    t.is(result, 'Hello World')
+    t.is(result, HELLO_WORLD)
     return result
   })
 
@@ -55,7 +58,7 @@ test.serial('thread pool basics work and events are emitted', async (t) => {
       workerID: 1,
     },
     {
-      returnValue: 'Hello World',
+      returnValue: HELLO_WORLD,
       taskID: 1,
       type: Pool.EventType.taskCompleted,
       workerID: 1,
@@ -73,7 +76,7 @@ test.serial('thread pool basics work and events are emitted', async (t) => {
 test.serial('pool.completed() works', async (t) => {
   const returned: any[] = []
 
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 2)
 
   for (let i = 0; i < 3; i++) {
@@ -84,11 +87,11 @@ test.serial('pool.completed() works', async (t) => {
 
   await pool.completed()
 
-  t.deepEqual(returned, ['Hello World', 'Hello World', 'Hello World'])
+  t.deepEqual(returned, [HELLO_WORLD, HELLO_WORLD, HELLO_WORLD])
 })
 
 test.serial('pool.completed() proxies errors', async (t) => {
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 2)
 
   pool.queue(async () => {
@@ -100,7 +103,7 @@ test.serial('pool.completed() proxies errors', async (t) => {
 })
 
 test.serial('pool.completed(true) works', async (t) => {
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 2)
 
   await pool.completed(true)
@@ -108,9 +111,10 @@ test.serial('pool.completed(true) works', async (t) => {
 })
 
 test.serial('pool.settled() does not reject on task failure', async (t) => {
+  // eslint-disable-next-line sonarjs/no-unused-collection
   const returned: any[] = []
 
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 2)
 
   pool.queue(async (helloWorld) => {
@@ -129,7 +133,7 @@ test.serial('pool.settled() does not reject on task failure', async (t) => {
 })
 
 test.serial('pool.settled(true) works', async (t) => {
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 2)
 
   await pool.settled(true)
@@ -138,7 +142,7 @@ test.serial('pool.settled(true) works', async (t) => {
 
 test.serial('task.cancel() works', async (t) => {
   const events: Pool.Event[] = []
-  const spawnHelloWorld = () => spawn(new Worker('./workers/hello-world'))
+  const spawnHelloWorld = () => spawn(new Worker(workerPath))
   const pool = Pool(spawnHelloWorld, 1)
 
   pool.events().subscribe((event) => events.push(event))

package/test-tooling/webpack/app-with-inlined-worker.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-unresolved */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /// <reference types="./raw-loader" />

package/test-tooling/webpack/app.ts

@@ -1,3 +1,4 @@
+/* eslint-disable sonarjs/no-use-of-empty-return-value */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { isWorkerRuntime, Pool, spawn, Worker } from '../../src/index'