Pull latest changes from nodejs/node

.github/workflows/ci.yml

@@ -9,10 +9,15 @@ jobs:
     strategy:
       matrix:
         node: ['14', '16', '18']
+        include:
+          - node: '14'
+            env: --experimental-abortcontroller --no-warnings
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
       - run: npm ci
       - run: npm test
+        env:
+          NODE_OPTIONS: ${{ matrix.env }}

README.md

@@ -11,6 +11,7 @@ Minimal dependencies, with full test suite.
 Differences from the core implementation:
 
 - Doesn't hide its own stack frames.
+- Requires `--experimental-abortcontroller` CLI flag to work on Node.js v14.x.
 
 ## Docs
 
@@ -327,12 +328,18 @@ internally.
   does not have a name.
 - `options` {Object} Configuration options for the test. The following
   properties are supported:
-  - `concurrency` {number} The number of tests that can be run at the same time.
+  - `concurrency` {number|boolean} If a number is provided,
+    then that many tests would run in parallel.
+    If truthy, it would run (number of cpu cores - 1)
+    tests in parallel.
+    For subtests, it will be `Infinity` tests in parallel.
+    If falsy, it would only run one test at a time.
     If unspecified, subtests inherit this value from their parent.
-    **Default:** `1`.
+    **Default:** `false`.
   - `only` {boolean} If truthy, and the test context is configured to run
     `only` tests, then this test will be run. Otherwise, the test is skipped.
     **Default:** `false`.
+  * `signal` {AbortSignal} Allows aborting an in-progress test
   - `skip` {boolean|string} If truthy, the test is skipped. If a string is
     provided, that string is displayed in the test results as the reason for
     skipping the test. **Default:** `false`.
@@ -386,8 +393,9 @@ thus prevent the scheduled cancellation.
   does not have a name.
 * `options` {Object} Configuration options for the suite.
   supports the same options as `test([name][, options][, fn])`
-* `fn` {Function} The function under suite.
-  a synchronous function declaring all subtests and subsuites.
+* `fn` {Function|AsyncFunction} The function under suite
+  declaring all subtests and subsuites.
+  The first argument to this function is a [`SuiteContext`][] object.
   **Default:** A no-op function.
 * Returns: `undefined`.
 
@@ -455,6 +463,16 @@ have the `only` option set. Otherwise, all tests are run. If Node.js was not
 started with the [`--test-only`][] command-line option, this function is a
 no-op.
 
+### `context.signal`
+
+* [`AbortSignal`][] Can be used to abort test subtasks when the test has been aborted.
+
+```js
+test('top level test', async (t) => {
+  await fetch('some/uri', { signal: t.signal });
+});
+```
+
 ### `context.skip([message])`
 
 - `message` {string} Optional skip message to be displayed in TAP output.
@@ -503,8 +521,20 @@ execution of the test function. This function does not return a value.
 This function is used to create subtests under the current test. This function
 behaves in the same fashion as the top level [`test()`][] function.
 
-[tap]: https://testanything.org/
-[`testcontext`]: #class-testcontext
+## Class: `SuiteContext`
+
+An instance of `SuiteContext` is passed to each suite function in order to
+interact with the test runner. However, the `SuiteContext` constructor is not
+exposed as part of the API.
+
+### `context.signal`
+
+* [`AbortSignal`][] Can be used to abort test subtasks when the test has been aborted.
+
+[`AbortSignal`]: https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal
+[TAP]: https://testanything.org/
+[`SuiteContext`]: #class-suitecontext
+[`TestContext`]: #class-testcontext
 [`test()`]: #testname-options-fn
 [describe options]: #describename-options-fn
 [it options]: #testname-options-fn

lib/internal/abort_controller.js

@@ -0,0 +1,6 @@
+'use strict'
+
+module.exports = {
+  AbortController,
+  AbortSignal
+}

lib/internal/errors.js

@@ -329,7 +329,16 @@ function hideInternalStackFrames (error) {
   })
 }
 
+class AbortError extends Error {
+  constructor (message = 'The operation was aborted', options = undefined) {
+    super(message, options)
+    this.code = 'ABORT_ERR'
+    this.name = 'AbortError'
+  }
+}
+
 module.exports = {
+  AbortError,
   codes,
   inspectWithNoCustomRetry,
   kIsNodeError

lib/internal/main/test_runner.js

@@ -1,36 +1,35 @@
-// https://github.com/nodejs/node/blob/e2225ba8e1c00995c0f8bd56e607ea7c5b463ab9/lib/internal/main/test_runner.js
+// https://github.com/nodejs/node/blob/2fd4c013c221653da2a7921d08fe1aa96aaba504/lib/internal/main/test_runner.js
 'use strict'
 const {
   ArrayFrom,
   ArrayPrototypeFilter,
   ArrayPrototypeIncludes,
+  ArrayPrototypeJoin,
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   ArrayPrototypeSort,
-  Promise,
-  PromiseAll,
-  SafeArrayIterator,
+  SafePromiseAll,
   SafeSet
 } = require('#internal/per_context/primordials')
 const {
   prepareMainThreadExecution
 } = require('#internal/bootstrap/pre_execution')
 const { spawn } = require('child_process')
 const { readdirSync, statSync } = require('fs')
-const { finished } = require('#internal/streams/end-of-stream')
-const console = require('#internal/console/global')
 const {
   codes: {
     ERR_TEST_FAILURE
   }
 } = require('#internal/errors')
+const { toArray } = require('#internal/streams/operators').promiseReturningOperators
 const { test } = require('#internal/test_runner/harness')
 const { kSubtestsFailed } = require('#internal/test_runner/test')
 const {
   isSupportedFileType,
   doesPathMatchFilter
 } = require('#internal/test_runner/utils')
 const { basename, join, resolve } = require('path')
+const { once } = require('events')
 const kFilterArgs = ['--test']
 
 prepareMainThreadExecution(false)
@@ -104,53 +103,39 @@ function filterExecArgv (arg) {
 }
 
 function runTestFile (path) {
-  return test(path, () => {
-    return new Promise((resolve, reject) => {
-      const args = ArrayPrototypeFilter(process.execArgv, filterExecArgv)
-      ArrayPrototypePush(args, path)
-
-      const child = spawn(process.execPath, args)
-      // TODO(cjihrig): Implement a TAP parser to read the child's stdout
-      // instead of just displaying it all if the child fails.
-      let stdout = ''
-      let stderr = ''
-      let err
-
-      child.on('error', (error) => {
-        err = error
-      })
-
-      child.stdout.setEncoding('utf8')
-      child.stderr.setEncoding('utf8')
-
-      child.stdout.on('data', (chunk) => {
-        stdout += chunk
-      })
-
-      child.stderr.on('data', (chunk) => {
-        stderr += chunk
-      })
-
-      child.once('exit', async (code, signal) => {
-        if (code !== 0 || signal !== null) {
-          if (!err) {
-            await PromiseAll(new SafeArrayIterator([finished(child.stderr), finished(child.stdout)]))
-            err = new ERR_TEST_FAILURE('test failed', kSubtestsFailed)
-            err.exitCode = code
-            err.signal = signal
-            err.stdout = stdout
-            err.stderr = stderr
-            // The stack will not be useful since the failures came from tests
-            // in a child process.
-            err.stack = undefined
-          }
-
-          return reject(err)
-        }
-
-        resolve()
-      })
+  return test(path, async (t) => {
+    const args = ArrayPrototypeFilter(process.execArgv, filterExecArgv)
+    ArrayPrototypePush(args, path)
+
+    const child = spawn(process.execPath, args, { signal: t.signal, encoding: 'utf8' })
+    // TODO(cjihrig): Implement a TAP parser to read the child's stdout
+    // instead of just displaying it all if the child fails.
+    let err
+
+    child.on('error', (error) => {
+      err = error
     })
+
+    const { 0: { 0: code, 1: signal }, 1: stdout, 2: stderr } = await SafePromiseAll([
+      once(child, 'exit', { signal: t.signal }),
+      toArray.call(child.stdout, { signal: t.signal }),
+      toArray.call(child.stderr, { signal: t.signal })
+    ])
+
+    if (code !== 0 || signal !== null) {
+      if (!err) {
+        err = new ERR_TEST_FAILURE('test failed', kSubtestsFailed)
+        err.exitCode = code
+        err.signal = signal
+        err.stdout = ArrayPrototypeJoin(stdout, '')
+        err.stderr = ArrayPrototypeJoin(stderr, '')
+        // The stack will not be useful since the failures came from tests
+        // in a child process.
+        err.stack = undefined
+      }
+
+      throw err
+    }
   })
 }
 

lib/internal/per_context/primordials.js

@@ -17,6 +17,7 @@ exports.Error = Error
 exports.ErrorCaptureStackTrace = (...args) => Error.captureStackTrace(...args)
 exports.FunctionPrototype = Function.prototype
 exports.FunctionPrototypeBind = (fn, obj, ...args) => fn.bind(obj, ...args)
+exports.MathMax = (...args) => Math.max(...args)
 exports.Number = Number
 exports.ObjectCreate = obj => Object.create(obj)
 exports.ObjectDefineProperties = (obj, props) => Object.defineProperties(obj, props)
@@ -29,11 +30,13 @@ exports.ObjectPrototypeHasOwnProperty = (obj, property) => Object.prototype.hasO
 exports.ReflectApply = (target, self, args) => Reflect.apply(target, self, args)
 exports.Promise = Promise
 exports.PromiseAll = iterator => Promise.all(iterator)
+exports.PromisePrototypeThen = (promise, thenFn, catchFn) => promise.then(thenFn, catchFn)
 exports.PromiseResolve = val => Promise.resolve(val)
 exports.PromiseRace = val => Promise.race(val)
 exports.SafeArrayIterator = class ArrayIterator {constructor (array) { this.array = array }[Symbol.iterator] () { return this.array.values() }}
 exports.SafeMap = Map
-exports.SafePromiseAll = (array, mapFn) => Promise.all(array.map(mapFn))
+exports.SafePromiseAll = (array, mapFn) => Promise.all(mapFn ? array.map(mapFn) : array)
+exports.SafePromiseRace = (array, mapFn) => Promise.race(mapFn ? array.map(mapFn) : array)
 exports.SafeSet = Set
 exports.SafeWeakMap = WeakMap
 exports.StringPrototypeMatch = (str, reg) => str.match(reg)

lib/internal/streams/operators.js

@@ -0,0 +1,24 @@
+const {
+  ArrayPrototypePush
+} = require('#internal/per_context/primordials')
+const { validateAbortSignal } = require('#internal/validators')
+const { AbortError } = require('#internal/errors')
+
+async function toArray (options) {
+  if (options?.signal != null) {
+    validateAbortSignal(options.signal, 'options.signal')
+  }
+
+  const result = []
+  for await (const val of this) {
+    if (options?.signal?.aborted) {
+      throw new AbortError(undefined, { cause: options.signal.reason })
+    }
+    ArrayPrototypePush(result, val)
+  }
+  return result
+}
+
+module.exports.promiseReturningOperators = {
+  toArray
+}