From 0169d1af50e7f439ca021a4f6c1b6d597a491ce7 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 14 Jul 2023 14:20:42 +0200 Subject: [PATCH 1/4] fix: use CJS imports --- src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index b62b6121..63e362cf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,12 +1,12 @@ import { Worker, MessageChannel, MessagePort, receiveMessageOnPort } from 'worker_threads'; import { once } from 'events'; -import EventEmitterAsyncResource from 'eventemitter-asyncresource'; +import EventEmitterAsyncResource = require('eventemitter-asyncresource'); import { AsyncResource } from 'async_hooks'; import { cpus } from 'os'; import { fileURLToPath, URL } from 'url'; import { resolve } from 'path'; import { inspect, types } from 'util'; -import assert from 'assert'; +import assert = require('assert'); import { Histogram, build } from 'hdr-histogram-js'; import { performance } from 'perf_hooks'; import hdrobj from 'hdr-histogram-percentiles-obj'; From 9c8c82b4bb0136a2da579795d9f4db24bfcf011d Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 14 Jul 2023 14:18:41 +0200 Subject: [PATCH 2/4] fix: disable `esModuleInterop` --- test/abort-task.ts | 2 +- test/async-context.ts | 2 +- test/atomics-optimization.ts | 2 +- test/fixtures/console-log.ts | 2 +- test/fixtures/move.ts | 2 +- test/fixtures/simple-isworkerthread.ts | 2 +- test/fixtures/simple-workerdata.ts | 2 +- test/histogram.ts | 2 +- test/idle-timeout.ts | 2 +- test/messages.ts | 2 +- test/move-test.ts | 2 +- test/nice.ts | 2 +- test/option-validation.ts | 2 +- test/pool-destroy.ts | 2 +- test/post-task.ts | 2 +- test/simple-test.ts | 2 +- test/task-queue.ts | 2 +- test/test-is-buffer-transferred.ts | 2 +- test/test-resourcelimits.ts | 2 +- test/test-uncaught-exception-from-handler.ts | 2 +- test/thread-count.ts | 2 +- tsconfig.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/abort-task.ts b/test/abort-task.ts index c1f58cba..f3aa763b 100644 --- a/test/abort-task.ts +++ b/test/abort-task.ts @@ -1,6 +1,6 @@ import { AbortController } from 'abort-controller'; import { EventEmitter } from 'events'; -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/async-context.ts b/test/async-context.ts index c331874c..e7d6ae5c 100644 --- a/test/async-context.ts +++ b/test/async-context.ts @@ -1,5 +1,5 @@ import { createHook, executionAsyncId } from 'async_hooks'; -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/atomics-optimization.ts b/test/atomics-optimization.ts index 073ac963..3b8fc054 100644 --- a/test/atomics-optimization.ts +++ b/test/atomics-optimization.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/fixtures/console-log.ts b/test/fixtures/console-log.ts index 80e9e77f..8391999f 100644 --- a/test/fixtures/console-log.ts +++ b/test/fixtures/console-log.ts @@ -1,4 +1,4 @@ -import Piscina from '../..'; +import Piscina = require('../..'); import { resolve } from 'path'; const pool = new Piscina({ diff --git a/test/fixtures/move.ts b/test/fixtures/move.ts index 86ac095e..3f089696 100644 --- a/test/fixtures/move.ts +++ b/test/fixtures/move.ts @@ -1,4 +1,4 @@ -import Piscina from '../..'; +import Piscina = require('../..'); import assert from 'assert'; import { types } from 'util'; diff --git a/test/fixtures/simple-isworkerthread.ts b/test/fixtures/simple-isworkerthread.ts index 3e10e2db..1649ad38 100644 --- a/test/fixtures/simple-isworkerthread.ts +++ b/test/fixtures/simple-isworkerthread.ts @@ -1,4 +1,4 @@ -import Piscina from '../..'; +import Piscina = require('../..'); import assert from 'assert'; assert.strictEqual(Piscina.isWorkerThread, true); diff --git a/test/fixtures/simple-workerdata.ts b/test/fixtures/simple-workerdata.ts index 3cc0f64d..8f56b25a 100644 --- a/test/fixtures/simple-workerdata.ts +++ b/test/fixtures/simple-workerdata.ts @@ -1,4 +1,4 @@ -import Piscina from '../..'; +import Piscina = require('../..'); import assert from 'assert'; assert.strictEqual(Piscina.workerData, 'ABC'); diff --git a/test/histogram.ts b/test/histogram.ts index 044e6c1f..4a83fbed 100644 --- a/test/histogram.ts +++ b/test/histogram.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/idle-timeout.ts b/test/idle-timeout.ts index 20173191..b91a3127 100644 --- a/test/idle-timeout.ts +++ b/test/idle-timeout.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; import { promisify } from 'util'; diff --git a/test/messages.ts b/test/messages.ts index b6e5bdf7..509e0db4 100644 --- a/test/messages.ts +++ b/test/messages.ts @@ -1,4 +1,4 @@ -import Piscina from '../dist/src'; +import Piscina = require('../dist/src'); import { test } from 'tap'; import { resolve } from 'path'; import { once } from 'events'; diff --git a/test/move-test.ts b/test/move-test.ts index e00e82c2..6dd1f3ef 100644 --- a/test/move-test.ts +++ b/test/move-test.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { isMovable, markMovable, diff --git a/test/nice.ts b/test/nice.ts index 3523dd08..9f5f24fe 100644 --- a/test/nice.ts +++ b/test/nice.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { resolve } from 'path'; import { test } from 'tap'; diff --git a/test/option-validation.ts b/test/option-validation.ts index 3c6ed096..80157690 100644 --- a/test/option-validation.ts +++ b/test/option-validation.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; test('filename cannot be non-null/non-string', async ({ throws }) => { diff --git a/test/pool-destroy.ts b/test/pool-destroy.ts index b525ba7f..e43255ca 100644 --- a/test/pool-destroy.ts +++ b/test/pool-destroy.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/post-task.ts b/test/post-task.ts index 79ce1215..23b46ce7 100644 --- a/test/post-task.ts +++ b/test/post-task.ts @@ -1,6 +1,6 @@ import { MessageChannel } from 'worker_threads'; import { cpus } from 'os'; -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/simple-test.ts b/test/simple-test.ts index d405b007..58d3898b 100644 --- a/test/simple-test.ts +++ b/test/simple-test.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { version } from '../package.json'; import { pathToFileURL } from 'url'; diff --git a/test/task-queue.ts b/test/task-queue.ts index 5bf53785..d6789689 100644 --- a/test/task-queue.ts +++ b/test/task-queue.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; import { Task, TaskQueue } from '../dist/src/common'; diff --git a/test/test-is-buffer-transferred.ts b/test/test-is-buffer-transferred.ts index 63bcf13e..32821fa7 100644 --- a/test/test-is-buffer-transferred.ts +++ b/test/test-is-buffer-transferred.ts @@ -1,4 +1,4 @@ -import Piscina from '../dist/src'; +import Piscina = require('../dist/src'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/test-resourcelimits.ts b/test/test-resourcelimits.ts index 3c3b73e2..5e9789b2 100644 --- a/test/test-resourcelimits.ts +++ b/test/test-resourcelimits.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/test-uncaught-exception-from-handler.ts b/test/test-uncaught-exception-from-handler.ts index 5ba93008..e3770cec 100644 --- a/test/test-uncaught-exception-from-handler.ts +++ b/test/test-uncaught-exception-from-handler.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { test } from 'tap'; import { resolve } from 'path'; import { once } from 'events'; diff --git a/test/thread-count.ts b/test/thread-count.ts index 204b460e..405a7fa0 100644 --- a/test/thread-count.ts +++ b/test/thread-count.ts @@ -1,4 +1,4 @@ -import Piscina from '..'; +import Piscina = require('..'); import { cpus } from 'os'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/tsconfig.json b/tsconfig.json index 921da16d..9830a2ba 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,7 @@ "noUnusedParameters": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "esModuleInterop": true, + "esModuleInterop": false, "resolveJsonModule": true, /* Include modules imported with '.json' extension */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ From 123ee838b1fd479a7a97404670a39032fd1ea9e1 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 13 May 2024 09:03:58 +0200 Subject: [PATCH 3/4] strict assert --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 09cf2c54..5ac93dfa 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,7 +5,7 @@ import { availableParallelism } from 'os'; import { fileURLToPath, URL } from 'url'; import { resolve } from 'path'; import { inspect, types } from 'util'; -import assert = require('assert'); +import { strict as assert } from 'assert'; import { Histogram, RecordableHistogram, createHistogram, performance } from 'perf_hooks'; import { READY, From 39acbe30e748df83c7768f5aea0b96bec32e5f72 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 13 May 2024 09:05:53 +0200 Subject: [PATCH 4/4] rollback `require` change --- test/abort-task.ts | 2 +- test/async-context.ts | 2 +- test/atomics-optimization.ts | 2 +- test/fixtures/console-log.ts | 2 +- test/fixtures/move.ts | 2 +- test/fixtures/simple-isworkerthread.ts | 2 +- test/fixtures/simple-workerdata.ts | 2 +- test/histogram.ts | 2 +- test/idle-timeout.ts | 2 +- test/messages.ts | 2 +- test/move-test.ts | 2 +- test/nice.ts | 2 +- test/option-validation.ts | 2 +- test/pool-destroy.ts | 2 +- test/post-task.ts | 2 +- test/simple-test.ts | 2 +- test/task-queue.ts | 2 +- test/test-is-buffer-transferred.ts | 2 +- test/test-resourcelimits.ts | 2 +- test/test-uncaught-exception-from-handler.ts | 2 +- test/thread-count.ts | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/abort-task.ts b/test/abort-task.ts index 8fefa12d..1ab7dab8 100644 --- a/test/abort-task.ts +++ b/test/abort-task.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/async-context.ts b/test/async-context.ts index e7d6ae5c..c331874c 100644 --- a/test/async-context.ts +++ b/test/async-context.ts @@ -1,5 +1,5 @@ import { createHook, executionAsyncId } from 'async_hooks'; -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/atomics-optimization.ts b/test/atomics-optimization.ts index 3b8fc054..073ac963 100644 --- a/test/atomics-optimization.ts +++ b/test/atomics-optimization.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/fixtures/console-log.ts b/test/fixtures/console-log.ts index 8391999f..80e9e77f 100644 --- a/test/fixtures/console-log.ts +++ b/test/fixtures/console-log.ts @@ -1,4 +1,4 @@ -import Piscina = require('../..'); +import Piscina from '../..'; import { resolve } from 'path'; const pool = new Piscina({ diff --git a/test/fixtures/move.ts b/test/fixtures/move.ts index 3f089696..86ac095e 100644 --- a/test/fixtures/move.ts +++ b/test/fixtures/move.ts @@ -1,4 +1,4 @@ -import Piscina = require('../..'); +import Piscina from '../..'; import assert from 'assert'; import { types } from 'util'; diff --git a/test/fixtures/simple-isworkerthread.ts b/test/fixtures/simple-isworkerthread.ts index 1649ad38..3e10e2db 100644 --- a/test/fixtures/simple-isworkerthread.ts +++ b/test/fixtures/simple-isworkerthread.ts @@ -1,4 +1,4 @@ -import Piscina = require('../..'); +import Piscina from '../..'; import assert from 'assert'; assert.strictEqual(Piscina.isWorkerThread, true); diff --git a/test/fixtures/simple-workerdata.ts b/test/fixtures/simple-workerdata.ts index 8f56b25a..3cc0f64d 100644 --- a/test/fixtures/simple-workerdata.ts +++ b/test/fixtures/simple-workerdata.ts @@ -1,4 +1,4 @@ -import Piscina = require('../..'); +import Piscina from '../..'; import assert from 'assert'; assert.strictEqual(Piscina.workerData, 'ABC'); diff --git a/test/histogram.ts b/test/histogram.ts index cc103d50..743bdf53 100644 --- a/test/histogram.ts +++ b/test/histogram.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/idle-timeout.ts b/test/idle-timeout.ts index b91a3127..20173191 100644 --- a/test/idle-timeout.ts +++ b/test/idle-timeout.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; import { promisify } from 'util'; diff --git a/test/messages.ts b/test/messages.ts index 509e0db4..b6e5bdf7 100644 --- a/test/messages.ts +++ b/test/messages.ts @@ -1,4 +1,4 @@ -import Piscina = require('../dist/src'); +import Piscina from '../dist/src'; import { test } from 'tap'; import { resolve } from 'path'; import { once } from 'events'; diff --git a/test/move-test.ts b/test/move-test.ts index 6dd1f3ef..e00e82c2 100644 --- a/test/move-test.ts +++ b/test/move-test.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { isMovable, markMovable, diff --git a/test/nice.ts b/test/nice.ts index 9f5f24fe..3523dd08 100644 --- a/test/nice.ts +++ b/test/nice.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { resolve } from 'path'; import { test } from 'tap'; diff --git a/test/option-validation.ts b/test/option-validation.ts index 80157690..3c6ed096 100644 --- a/test/option-validation.ts +++ b/test/option-validation.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; test('filename cannot be non-null/non-string', async ({ throws }) => { diff --git a/test/pool-destroy.ts b/test/pool-destroy.ts index e43255ca..b525ba7f 100644 --- a/test/pool-destroy.ts +++ b/test/pool-destroy.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/post-task.ts b/test/post-task.ts index 23b46ce7..79ce1215 100644 --- a/test/post-task.ts +++ b/test/post-task.ts @@ -1,6 +1,6 @@ import { MessageChannel } from 'worker_threads'; import { cpus } from 'os'; -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/simple-test.ts b/test/simple-test.ts index c5ce814e..4ee1ba72 100644 --- a/test/simple-test.ts +++ b/test/simple-test.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { version } from '../package.json'; import { pathToFileURL } from 'url'; diff --git a/test/task-queue.ts b/test/task-queue.ts index d6789689..5bf53785 100644 --- a/test/task-queue.ts +++ b/test/task-queue.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; import { Task, TaskQueue } from '../dist/src/common'; diff --git a/test/test-is-buffer-transferred.ts b/test/test-is-buffer-transferred.ts index 32821fa7..63bcf13e 100644 --- a/test/test-is-buffer-transferred.ts +++ b/test/test-is-buffer-transferred.ts @@ -1,4 +1,4 @@ -import Piscina = require('../dist/src'); +import Piscina from '../dist/src'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/test-resourcelimits.ts b/test/test-resourcelimits.ts index 5e9789b2..3c3b73e2 100644 --- a/test/test-resourcelimits.ts +++ b/test/test-resourcelimits.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; diff --git a/test/test-uncaught-exception-from-handler.ts b/test/test-uncaught-exception-from-handler.ts index e3770cec..5ba93008 100644 --- a/test/test-uncaught-exception-from-handler.ts +++ b/test/test-uncaught-exception-from-handler.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { test } from 'tap'; import { resolve } from 'path'; import { once } from 'events'; diff --git a/test/thread-count.ts b/test/thread-count.ts index 069dcfc1..abb8ae45 100644 --- a/test/thread-count.ts +++ b/test/thread-count.ts @@ -1,4 +1,4 @@ -import Piscina = require('..'); +import Piscina from '..'; import { cpus } from 'os'; import { test } from 'tap'; import { resolve } from 'path';