@zuplo/cli 7.0.2 → 7.1.1

package/node_modules/thread-stream/lib/worker.js

@@ -2,6 +2,7 @@
 
 const { realImport, realRequire } = require('real-require')
 const { workerData, parentPort } = require('worker_threads')
+const { StringDecoder } = require('string_decoder')
 const { WRITE_INDEX, READ_INDEX, SEQ_INDEX } = require('./indexes')
 const { waitDiff } = require('./wait')
 
@@ -12,26 +13,115 @@ const {
 } = workerData
 
 let destination
+const flushQueue = []
+let flushing = false
 
 const state = new Int32Array(stateBuf)
 const data = Buffer.from(dataBuf)
+const decoder = new StringDecoder('utf8')
+
+// Keep the event loop alive - Atomics.waitAsync promises don't prevent worker exit
+const keepAlive = setInterval(() => {}, 60 * 60 * 1000)
+
+function onParentPortMessage (msg) {
+  if (!msg || msg.code !== 'FLUSH' || msg.context !== 'thread-stream') {
+    return
+  }
+
+  flushQueue.push(msg.id)
+  processFlushQueue()
+}
+
+function processFlushQueue () {
+  if (flushing || !destination) {
+    return
+  }
+
+  const id = flushQueue.shift()
+  if (id === undefined) {
+    return
+  }
+
+  flushing = true
+  flushDestination((err) => {
+    flushing = false
+
+    if (err) {
+      parentPort.postMessage({
+        code: 'ERROR',
+        err
+      })
+      return
+    }
+
+    parentPort.postMessage({
+      code: 'FLUSHED',
+      context: 'thread-stream',
+      id
+    })
+
+    processFlushQueue()
+  })
+}
+
+function flushDestination (cb) {
+  if (typeof destination?.flush === 'function') {
+    if (destination.flush.length === 0) {
+      try {
+        const result = destination.flush()
+        if (result && typeof result.then === 'function') {
+          result.then(() => cb(), cb)
+        } else {
+          cb()
+        }
+      } catch (err) {
+        cb(err)
+      }
+      return
+    }
+
+    let done = false
+    const onDone = (err) => {
+      if (done) {
+        return
+      }
+      done = true
+      cb(err)
+    }
+
+    try {
+      const result = destination.flush(onDone)
+      if (result && typeof result.then === 'function') {
+        result.then(() => onDone(), onDone)
+      }
+    } catch (err) {
+      onDone(err)
+    }
+    return
+  }
+
+  if (typeof destination?.flushSync === 'function') {
+    try {
+      destination.flushSync()
+      cb()
+    } catch (err) {
+      cb(err)
+    }
+    return
+  }
+
+  if (destination?.writableNeedDrain && !destination?.writableEnded) {
+    destination.once('drain', cb)
+    return
+  }
+
+  cb()
+}
 
 async function start () {
   let worker
   try {
-    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')]) {
-        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.
-      // Remove extra forwardslash on Windows
-      worker = realRequire(decodeURIComponent(filename.replace(process.platform === 'win32' ? 'file:///' : 'file://', '')))
-    } else {
-      worker = (await realImport(filename))
-    }
+    worker = (await realImport(filename))
   } catch (error) {
     // A yarn user that tries to start a ThreadStream for an external module
     // provides a filename pointing to a zip file.
@@ -53,6 +143,19 @@ async function start () {
       } catch {
         throw error
       }
+    } else if (filename.endsWith('.ts') || filename.endsWith('.cts')) {
+      // Native TypeScript import failed (type stripping not enabled).
+      // Fall back to ts-node for TypeScript files.
+      try {
+        if (!process[Symbol.for('ts-node.register.instance')]) {
+          realRequire('ts-node/register')
+        } else if (process.env.TS_NODE_DEV) {
+          realRequire('ts-node-dev')
+        }
+        worker = realRequire(decodeURIComponent(filename.replace(process.platform === 'win32' ? 'file:///' : 'file://', '')))
+      } catch {
+        throw error
+      }
     } else {
       throw error
     }
@@ -84,16 +187,21 @@ async function start () {
     const end = Atomics.load(state, WRITE_INDEX)
     Atomics.store(state, READ_INDEX, end)
     Atomics.notify(state, READ_INDEX)
+    clearInterval(keepAlive)
     setImmediate(() => {
       process.exit(0)
     })
   })
+
+  processFlushQueue()
 }
 
 // No .catch() handler,
 // in case there is an error it goes
 // to unhandledRejection
 start().then(function () {
+  parentPort.on('message', onParentPortMessage)
+
   parentPort.postMessage({
     code: 'READY'
   })
@@ -132,11 +240,15 @@ function run () {
 
   if (end === -1) {
     // process._rawDebug('end')
+    const remaining = decoder.end()
+    if (remaining.length > 0) {
+      destination.write(remaining)
+    }
     destination.end()
     return
   }
 
-  const toWrite = data.toString('utf8', current, end)
+  const toWrite = decoder.write(data.subarray(current, end))
   // process._rawDebug('worker writing: ' + toWrite)
 
   const res = destination.write(toWrite)

package/node_modules/thread-stream/node_modules/real-require/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Paolo Insogna and the real-require contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/node_modules/thread-stream/node_modules/real-require/README.md

@@ -0,0 +1,51 @@
+# real-require
+
+Keep require and import consistent after bundling or transpiling.
+
+## Installation
+
+Just run:
+
+```bash
+npm install real-require
+```
+
+## Usage
+
+The package provides two drop-ins functions, `realRequire` and `realImport`,
+which can be used in scenarios where tools like transpilers or bundlers change
+the native `require` or `await import` calls.
+
+The current `realRequire` functions only handles webpack at the moment, wrapping
+the `__non_webpack__require__` implementation that webpack provides for the
+final bundle.
+
+### Example
+
+```js
+// After bundling, real-require will be embedded in the bundle
+const { realImport, realRequire } = require('real-require')
+
+/*
+  By using realRequire, at build time the module will not be embedded and at runtime it will try to load path from the local filesytem.
+  This is useful in situations where the build tool does not support skipping modules to embed.
+*/
+const { join } = realRequire('path')
+
+async function main() {
+  // Similarly, this make sure the import call is not modified by the build tools
+  const localFunction = await realImport('./source.js')
+
+  localFunction()
+}
+
+main().catch(console.error)
+```
+
+## Contributing
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md)
+
+## License
+
+Copyright Paolo Insogna and real-require contributors 2021. Licensed under the [MIT License](http://www.apache.org/licenses/MIT).

package/node_modules/thread-stream/node_modules/real-require/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "real-require",
+  "version": "1.0.0",
+  "description": "Keep require and import consistent after bundling or transpiling",
+  "author": "Paolo Insogna <shogun@cowtech.it>",
+  "homepage": "https://github.com/pinojs/real-require",
+  "contributors": [
+    {
+      "name": "Paolo Insogna",
+      "url": "https://github.com/ShogunPanda"
+    }
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pinojs/real-require.git"
+  },
+  "bugs": {
+    "url": "https://github.com/pinojs/real-require/issues"
+  },
+  "main": "src/index.js",
+  "files": [
+    "src"
+  ],
+  "scripts": {
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
+    "test": "c8 --reporter=text --reporter=html borp 'test/*.test.js'",
+    "test:ci": "c8 --reporter=text --reporter=json --check-coverage --branches 90 --functions 90 --lines 90 --statements 90 borp 'test/*.test.js'",
+    "ci": "npm run lint && npm run test:ci"
+  },
+  "devDependencies": {
+    "borp": "^1.0.0",
+    "c8": "^8.0.0",
+    "eslint": "^9.39.4",
+    "neostandard": "^0.13.0"
+  }
+}

package/node_modules/thread-stream/node_modules/real-require/src/index.js

@@ -0,0 +1,14 @@
+/* eslint-disable no-new-func */
+/* globals __non_webpack__require__ */
+
+const realImport = new Function('modulePath', 'return import(modulePath)')
+
+function realRequire (modulePath) {
+  if (typeof __non_webpack__require__ === 'function') {
+    return __non_webpack__require__(modulePath)
+  }
+
+  return require(modulePath)
+}
+
+module.exports = { realImport, realRequire }

package/node_modules/thread-stream/package.json

@@ -1,42 +1,35 @@
 {
   "name": "thread-stream",
-  "version": "3.2.0",
+  "version": "4.2.0",
   "description": "A streaming way to send data to a Node.js Worker Thread",
   "main": "index.js",
   "types": "index.d.ts",
+  "engines": {
+    "node": ">=20"
+  },
   "dependencies": {
-    "real-require": "^0.2.0"
+    "real-require": "^1.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.1.0",
-    "@types/tap": "^15.0.0",
-    "@yao-pkg/pkg": "^5.11.5",
+    "@types/node": "^25.0.2",
+    "@yao-pkg/pkg": "^6.0.0",
+    "borp": "^1.0.0",
     "desm": "^1.3.0",
+    "eslint": "^9.39.1",
     "fastbench": "^1.0.1",
-    "husky": "^9.0.6",
-    "pino-elasticsearch": "^8.0.0",
-    "sonic-boom": "^4.0.1",
-    "standard": "^17.0.0",
-    "tap": "^16.2.0",
+    "neostandard": "^0.13.0",
+    "pino-elasticsearch": "^9.0.0",
+    "sonic-boom": "^5.0.0",
     "ts-node": "^10.8.0",
-    "typescript": "^5.3.2",
-    "why-is-node-running": "^2.2.2"
+    "typescript": "~5.7.3"
   },
   "scripts": {
     "build": "tsc --noEmit",
-    "test": "standard && npm run build && npm run transpile && tap \"test/**/*.test.*js\" && tap --ts test/*.test.*ts",
-    "test:ci": "standard && npm run transpile && npm run test:ci:js && npm run test:ci:ts",
-    "test:ci:js": "tap --no-check-coverage --timeout=120 --coverage-report=lcovonly \"test/**/*.test.*js\"",
-    "test:ci:ts": "tap --ts --no-check-coverage --coverage-report=lcovonly \"test/**/*.test.*ts\"",
-    "test:yarn": "npm run transpile && tap \"test/**/*.test.js\" --no-check-coverage",
-    "transpile": "sh ./test/ts/transpile.sh",
-    "prepare": "husky install"
-  },
-  "standard": {
-    "ignore": [
-      "test/ts/**/*",
-      "test/syntax-error.mjs"
-    ]
+    "lint": "eslint",
+    "test": "npm run lint && npm run build && npm run transpile && borp --pattern \"test/*.test.{js,mjs}\"",
+    "test:ci": "npm run lint && npm run transpile && borp --pattern \"test/*.test.{js,mjs}\"",
+    "test:yarn": "npm run transpile && borp --pattern \"test/*.test.js\"",
+    "transpile": "sh ./test/ts/transpile.sh"
   },
   "repository": {
     "type": "git",