Updating NPM dependencies

node_modules/jest-worker/build/workers/ChildProcessWorker.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, '__esModule', {
 exports.default = void 0;
 
 function _child_process() {
-  const data = _interopRequireDefault(require('child_process'));
+  const data = require('child_process');
 
-  _child_process = function _child_process() {
+  _child_process = function () {
     return data;
   };
 
@@ -18,7 +18,7 @@ function _child_process() {
 function _stream() {
   const data = require('stream');
 
-  _stream = function _stream() {
+  _stream = function () {
     return data;
   };
 
@@ -28,7 +28,7 @@ function _stream() {
 function _mergeStream() {
   const data = _interopRequireDefault(require('merge-stream'));
 
-  _mergeStream = function _mergeStream() {
+  _mergeStream = function () {
     return data;
   };
 
@@ -36,39 +36,29 @@ function _mergeStream() {
 }
 
 function _supportsColor() {
-  const data = _interopRequireDefault(require('supports-color'));
+  const data = require('supports-color');
 
-  _supportsColor = function _supportsColor() {
+  _supportsColor = function () {
     return data;
   };
 
   return data;
 }
 
-var _types = require('../types');
+function _types() {
+  const data = require('../types');
+
+  _types = function () {
+    return data;
+  };
+
+  return data;
+}
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {default: obj};
 }
 
-function _objectSpread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(
-        Object.getOwnPropertySymbols(source).filter(function(sym) {
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-        })
-      );
-    }
-    ownKeys.forEach(function(key) {
-      _defineProperty(target, key, source[key]);
-    });
-  }
-  return target;
-}
-
 function _defineProperty(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
@@ -83,6 +73,11 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+const SIGNAL_BASE_EXIT_CODE = 128;
+const SIGKILL_EXIT_CODE = SIGNAL_BASE_EXIT_CODE + 9;
+const SIGTERM_EXIT_CODE = SIGNAL_BASE_EXIT_CODE + 15; // How long to wait after SIGTERM before sending SIGKILL
+
+const SIGKILL_DELAY = 500;
 /**
  * This class wraps the child process and provides a nice interface to
  * communicate with. It takes care of:
@@ -101,59 +96,64 @@ function _defineProperty(obj, key, value) {
  * field is changed to "true", so that other workers which might encounter the
  * same call skip it.
  */
+
 class ChildProcessWorker {
   constructor(options) {
     _defineProperty(this, '_child', void 0);
 
     _defineProperty(this, '_options', void 0);
 
-    _defineProperty(this, '_onProcessEnd', void 0);
-
-    _defineProperty(this, '_fakeStream', void 0);
-
     _defineProperty(this, '_request', void 0);
 
     _defineProperty(this, '_retries', void 0);
 
-    _defineProperty(this, '_stderr', void 0);
+    _defineProperty(this, '_onProcessEnd', void 0);
+
+    _defineProperty(this, '_onCustomMessage', void 0);
+
+    _defineProperty(this, '_fakeStream', void 0);
 
     _defineProperty(this, '_stdout', void 0);
 
+    _defineProperty(this, '_stderr', void 0);
+
+    _defineProperty(this, '_exitPromise', void 0);
+
+    _defineProperty(this, '_resolveExitPromise', void 0);
+
     this._options = options;
-    this._fakeStream = null;
     this._request = null;
-    this._stderr = null;
+    this._fakeStream = null;
     this._stdout = null;
+    this._stderr = null;
+    this._exitPromise = new Promise(resolve => {
+      this._resolveExitPromise = resolve;
+    });
     this.initialize();
   }
 
   initialize() {
-    const forceColor = _supportsColor().default.stdout
+    const forceColor = _supportsColor().stdout
       ? {
           FORCE_COLOR: '1'
         }
       : {};
-
-    const child = _child_process().default.fork(
+    const child = (0, _child_process().fork)(
       require.resolve('./processChild'),
       [],
-      _objectSpread(
-        {
-          cwd: process.cwd(),
-          env: _objectSpread(
-            {},
-            process.env,
-            {
-              JEST_WORKER_ID: String(this._options.workerId + 1)
-            },
-            forceColor
-          ),
-          // Suppress --debug / --inspect flags while preserving others (like --harmony).
-          execArgv: process.execArgv.filter(v => !/^--(debug|inspect)/.test(v)),
-          silent: true
+      {
+        cwd: process.cwd(),
+        env: {
+          ...process.env,
+          JEST_WORKER_ID: String(this._options.workerId + 1),
+          // 0-indexed workerId, 1-indexed JEST_WORKER_ID
+          ...forceColor
         },
-        this._options.forkOptions
-      )
+        // Suppress --debug / --inspect flags while preserving others (like --harmony).
+        execArgv: process.execArgv.filter(v => !/^--(debug|inspect)/.test(v)),
+        silent: true,
+        ...this._options.forkOptions
+      }
     );
 
     if (child.stdout) {
@@ -176,10 +176,10 @@ class ChildProcessWorker {
       this._stderr.add(child.stderr);
     }
 
-    child.on('message', this.onMessage.bind(this));
-    child.on('exit', this.onExit.bind(this));
+    child.on('message', this._onMessage.bind(this));
+    child.on('exit', this._onExit.bind(this));
     child.send([
-      _types.CHILD_MESSAGE_INITIALIZE,
+      _types().CHILD_MESSAGE_INITIALIZE,
       false,
       this._options.workerPath,
       this._options.setupArgs
@@ -191,8 +191,9 @@ class ChildProcessWorker {
 
     if (this._retries > this._options.maxRetries) {
       const error = new Error('Call retries were exceeded');
-      this.onMessage([
-        _types.PARENT_MESSAGE_CLIENT_ERROR,
+
+      this._onMessage([
+        _types().PARENT_MESSAGE_CLIENT_ERROR,
         error.name,
         error.message,
         error.stack,
@@ -210,22 +211,25 @@ class ChildProcessWorker {
 
       this._fakeStream = null;
     }
+
+    this._resolveExitPromise();
   }
 
-  onMessage(response) {
+  _onMessage(response) {
+    // TODO: Add appropriate type check
     let error;
 
     switch (response[0]) {
-      case _types.PARENT_MESSAGE_OK:
+      case _types().PARENT_MESSAGE_OK:
         this._onProcessEnd(null, response[1]);
 
         break;
 
-      case _types.PARENT_MESSAGE_CLIENT_ERROR:
+      case _types().PARENT_MESSAGE_CLIENT_ERROR:
         error = response[4];
 
         if (error != null && typeof error === 'object') {
-          const extra = error; // @ts-ignore: no index
+          const extra = error; // @ts-expect-error: no index
 
           const NativeCtor = global[response[1]];
           const Ctor = typeof NativeCtor === 'function' ? NativeCtor : Error;
@@ -234,7 +238,6 @@ class ChildProcessWorker {
           error.stack = response[3];
 
           for (const key in extra) {
-            // @ts-ignore: adding custom properties to errors.
             error[key] = extra[key];
           }
         }
@@ -243,9 +246,8 @@ class ChildProcessWorker {
 
         break;
 
-      case _types.PARENT_MESSAGE_SETUP_ERROR:
-        error = new Error('Error when calling setup: ' + response[2]); // @ts-ignore: adding custom properties to errors.
-
+      case _types().PARENT_MESSAGE_SETUP_ERROR:
+        error = new Error('Error when calling setup: ' + response[2]);
         error.type = response[1];
         error.stack = response[3];
 
@@ -253,13 +255,22 @@ class ChildProcessWorker {
 
         break;
 
+      case _types().PARENT_MESSAGE_CUSTOM:
+        this._onCustomMessage(response[1]);
+
+        break;
+
       default:
         throw new TypeError('Unexpected response from worker: ' + response[0]);
     }
   }
 
-  onExit(exitCode) {
-    if (exitCode !== 0) {
+  _onExit(exitCode) {
+    if (
+      exitCode !== 0 &&
+      exitCode !== SIGTERM_EXIT_CODE &&
+      exitCode !== SIGKILL_EXIT_CODE
+    ) {
       this.initialize();
 
       if (this._request) {
@@ -270,7 +281,7 @@ class ChildProcessWorker {
     }
   }
 
-  send(request, onProcessStart, onProcessEnd) {
+  send(request, onProcessStart, onProcessEnd, onCustomMessage) {
     onProcessStart(this);
 
     this._onProcessEnd = (...args) => {
@@ -280,12 +291,29 @@ class ChildProcessWorker {
       return onProcessEnd(...args);
     };
 
+    this._onCustomMessage = (...arg) => onCustomMessage(...arg);
+
     this._request = request;
     this._retries = 0;
 
     this._child.send(request);
   }
 
+  waitForExit() {
+    return this._exitPromise;
+  }
+
+  forceExit() {
+    this._child.kill('SIGTERM');
+
+    const sigkillTimeout = setTimeout(
+      () => this._child.kill('SIGKILL'),
+      SIGKILL_DELAY
+    );
+
+    this._exitPromise.then(() => clearTimeout(sigkillTimeout));
+  }
+
   getWorkerId() {
     return this._options.workerId;
   }
@@ -300,7 +328,7 @@ class ChildProcessWorker {
 
   _getFakeStream() {
     if (!this._fakeStream) {
-      this._fakeStream = new (_stream()).PassThrough();
+      this._fakeStream = new (_stream().PassThrough)();
     }
 
     return this._fakeStream;