thread-stream 0.15.1 → 1.0.1

package/.github/workflows/ci.yml

@@ -1,4 +1,5 @@
 name: CI
+
 on:
   push:
     paths-ignore:
@@ -8,32 +9,53 @@ on:
     paths-ignore:
         - 'docs/**'
         - '*.md'
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  cancel-in-progress: true
+
 jobs:
+  dependency-review:
+    name: Dependency Review
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Dependency review
+        uses: actions/dependency-review-action@v1
+
   test:
+    name: Test
     runs-on: ${{ matrix.os }}
-
+    permissions:
+      contents: read
     strategy:
       matrix:
-        node-version: [12, 14, 16]
+        node-version: [14, 16, 18]
         os: [macos-latest, ubuntu-latest, windows-latest]
-
     steps:
+      - name: Check out repo
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
-      - uses: actions/checkout@v3
-
-      - name: Use Node.js
+      - name: Setup Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Install
-        run: |
-          npm install --ignore-scripts
+      - name: Install dependencies
+        run: npm i --ignore-scripts
 
       - name: Run tests
-        shell: bash
-        run: |
-          npm run test:ci
+        run: npm run test:ci
 
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@1.1.3
@@ -53,9 +75,16 @@ jobs:
           parallel-finished: true
 
   automerge:
+    name: Automerge Dependabot PRs
+    if: >
+        github.event_name == 'pull_request' &&
+        github.event.pull_request.user.login == 'dependabot[bot]'
     needs: test
+    permissions:
+      pull-requests: write
+      contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: fastify/github-action-merge-dependabot@v3.0.2
+      - uses: fastify/github-action-merge-dependabot@v3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

package/.github/workflows/package-manager-ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest, windows-latest]
-        node-version: [12, 14, 16]
+        node-version: [14, 16, 18]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Use pnpm
-        uses: pnpm/action-setup@v2.2.1
+        uses: pnpm/action-setup@v2.2.2
         with:
           version: ^6.0.0
       - name: Install dependancies
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest]
-        node-version: [12, 14, 16]
+        node-version: [14, 16, 18]
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
@@ -51,6 +51,7 @@ jobs:
           yarn set version berry
           echo "nodeLinker: pnp" >> .yarnrc.yml
           echo "pnpMode: loose" >> .yarnrc.yml
+          echo "pnpEnableEsmLoader: false" >> .yarnrc.yml
           yarn add -D pino-elasticsearch@^6.0.0
           yarn install
         env:

package/README.md

@@ -1,7 +1,6 @@
 # thread-stream
 [![npm version](https://img.shields.io/npm/v/thread-stream)](https://www.npmjs.com/package/thread-stream)
 [![Build Status](https://img.shields.io/github/workflow/status/pinojs/thread-stream/CI)](https://github.com/pinojs/thread-stream/actions)
-[![Known Vulnerabilities](https://snyk.io/test/github/pinojs/thread-stream/badge.svg)](https://snyk.io/test/github/pinojs/thread-stream)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://standardjs.com/)
 
 A streaming way to send data to a Node.js Worker Thread.

package/lib/worker.js

@@ -19,25 +19,19 @@ const data = Buffer.from(dataBuf)
 async function start () {
   let fn
   try {
-    // TODO: fix loading .ts files in Windows. See: ../test/ts.test.ts
     if (filename.endsWith('.ts') || filename.endsWith('.cts')) {
       // TODO: add support for the TSM modules loader ( https://github.com/lukeed/tsm ).
-      if (process[Symbol.for('ts-node.register.instance')]) {
+      if (!process[Symbol.for('ts-node.register.instance')]) {
         realRequire('ts-node/register')
       } else if (process.env.TS_NODE_DEV) {
         realRequire('ts-node-dev')
       }
       // TODO: Support ES imports once tsc, tap & ts-node provide better compatibility guarantees.
-      fn = realRequire(decodeURIComponent(filename.replace('file://', '')))
+      // Remove extra forwardslash on Windows
+      fn = realRequire(decodeURIComponent(filename.replace(process.platform === 'win32' ? 'file:///' : 'file://', '')))
     } else {
       fn = (await realImport(filename))
     }
-
-    // Depending on how the default export is performed, and on how the code is
-    // transpiled, we may find cases of two nested "default" objects.
-    // See https://github.com/pinojs/pino/issues/1243#issuecomment-982774762
-    if (typeof fn === 'object') fn = fn.default
-    if (typeof fn === 'object') fn = fn.default
   } catch (error) {
     // A yarn user that tries to start a ThreadStream for an external module
     // provides a filename pointing to a zip file.
@@ -54,6 +48,13 @@ async function start () {
       throw error
     }
   }
+
+  // Depending on how the default export is performed, and on how the code is
+  // transpiled, we may find cases of two nested "default" objects.
+  // See https://github.com/pinojs/pino/issues/1243#issuecomment-982774762
+  if (typeof fn === 'object') fn = fn.default
+  if (typeof fn === 'object') fn = fn.default
+
   destination = await fn(workerData.workerData)
 
   destination.on('error', function (err) {

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "thread-stream",
-  "version": "0.15.1",
+  "version": "1.0.1",
   "description": "A streaming way to send data to a Node.js Worker Thread",
   "main": "index.js",
+  "types": "index.d.ts",
   "dependencies": {
     "real-require": "^0.1.0"
   },
   "devDependencies": {
-    "@types/node": "^12.0.0",
+    "@types/node": "^18.0.0",
     "@types/tap": "^15.0.0",
-    "desm": "^1.1.0",
+    "desm": "^1.3.0",
     "fastbench": "^1.0.1",
-    "husky": "^7.0.0",
-    "sonic-boom": "^2.0.1",
-    "standard": "^16.0.3",
-    "tap": "^16.0.0",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.0",
-    "why-is-node-running": "^2.2.0"
+    "husky": "^8.0.1",
+    "sonic-boom": "^3.0.0",
+    "standard": "^17.0.0",
+    "tap": "^16.2.0",
+    "ts-node": "^10.8.0",
+    "typescript": "^4.7.2",
+    "why-is-node-running": "^2.2.2"
   },
   "scripts": {
     "test": "standard && npm run transpile && tap test/*.test.*js && tap --ts test/*.test.*ts",

package/test/commonjs-fallback.test.js

@@ -54,3 +54,27 @@ test('yarn module resolution for directories with special characters', { skip: !
 
   t.equal(strings, 'hello world\nsomething else\n')
 })
+
+test('yarn module resolution for typescript commonjs modules', { skip: !isYarnPnp }, async t => {
+  t.plan(3)
+
+  const { port1, port2 } = new MessageChannel()
+  const stream = new ThreadStream({
+    filename: join(__dirname, 'ts-commonjs-default-export.zip', 'worker.js'),
+    workerData: { port: port1 },
+    workerOpts: {
+      transferList: [port1]
+    },
+    sync: false
+  })
+  t.teardown(() => {
+    stream.end()
+  })
+
+  t.ok(stream.write('hello world\n'))
+  t.ok(stream.write('something else\n'))
+
+  const [strings] = await once(port2, 'message')
+
+  t.equal(strings, 'hello world\nsomething else\n')
+})

package/test/ts.test.ts

@@ -6,12 +6,6 @@ import { file } from './helper.js'
 
 
 test('typescript module', function (t) {
-  if (process.platform === 'win32') {
-    // TODO: Implement .ts files loading support for Windows
-    t.plan(0)
-    return
-  }
-
   t.plan(5)
 
   const dest = file()