refactor(jest-worker): use labeled tuple elements in internal types (#…

…13427)
jestjs · Oct 11, 2022 · 2742333 · 2742333
1 parent 7b67ecf
commit 2742333
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 40 deletions.
diff --git a/packages/jest-worker/src/types.ts b/packages/jest-worker/src/types.ts
@@ -6,7 +6,6 @@
  */
 
 import type {ForkOptions} from 'child_process';
-import type {EventEmitter} from 'events';
 import type {ResourceLimits} from 'worker_threads';
 
 type ReservedKeys = 'end' | 'getStderr' | 'getStdout' | 'setup' | 'teardown';
@@ -202,38 +201,27 @@ export type OnStateChangeHandler = (
 
 // Messages passed from the parent to the children.
 
-export type MessagePort = typeof EventEmitter & {
-  postMessage(message: unknown): void;
-};
-
-export type MessageChannel = {
-  port1: MessagePort;
-  port2: MessagePort;
-};
-
 export type ChildMessageInitialize = [
-  typeof CHILD_MESSAGE_INITIALIZE, // type
-  boolean, // processed
-  string, // file
-  Array<unknown> | undefined, // setupArgs
-  MessagePort | undefined, // MessagePort
+  type: typeof CHILD_MESSAGE_INITIALIZE,
+  isProcessed: boolean,
+  fileName: string,
+  setupArgs: Array<unknown>,
+  workerId: string | undefined,
 ];
 
 export type ChildMessageCall = [
-  typeof CHILD_MESSAGE_CALL, // type
-  boolean, // processed
-  string, // method
-  Array<unknown>, // args
+  type: typeof CHILD_MESSAGE_CALL,
+  isProcessed: boolean,
+  methodName: string,
+  args: Array<unknown>,
 ];
 
 export type ChildMessageEnd = [
-  typeof CHILD_MESSAGE_END, // type
-  boolean, // processed
+  type: typeof CHILD_MESSAGE_END,
+  isProcessed: boolean,
 ];
 
-export type ChildMessageMemUsage = [
-  typeof CHILD_MESSAGE_MEM_USAGE, // type
-];
+export type ChildMessageMemUsage = [type: typeof CHILD_MESSAGE_MEM_USAGE];
 
 export type ChildMessage =
   | ChildMessageInitialize
@@ -244,26 +232,23 @@ export type ChildMessage =
 // Messages passed from the children to the parent.
 
 export type ParentMessageCustom = [
-  typeof PARENT_MESSAGE_CUSTOM, // type
-  unknown, // result
+  type: typeof PARENT_MESSAGE_CUSTOM,
+  result: unknown,
 ];
 
-export type ParentMessageOk = [
-  typeof PARENT_MESSAGE_OK, // type
-  unknown, // result
-];
+export type ParentMessageOk = [type: typeof PARENT_MESSAGE_OK, result: unknown];
 
 export type ParentMessageMemUsage = [
-  typeof PARENT_MESSAGE_MEM_USAGE, // type
-  number, // used memory in bytes
+  type: typeof PARENT_MESSAGE_MEM_USAGE,
+  usedMemory: number,
 ];
 
 export type ParentMessageError = [
-  PARENT_MESSAGE_ERROR, // type
-  string, // constructor
-  string, // message
-  string, // stack
-  unknown, // extra
+  type: PARENT_MESSAGE_ERROR,
+  constructorName: string,
+  message: string,
+  stack: string,
+  extra: unknown,
 ];
 
 export type ParentMessage =

diff --git a/packages/jest-worker/src/workers/processChild.ts b/packages/jest-worker/src/workers/processChild.ts
@@ -45,7 +45,7 @@ const messageListener: NodeJS.MessageListener = (request: any) => {
     case CHILD_MESSAGE_INITIALIZE:
       const init: ChildMessageInitialize = request;
       file = init[2];
-      setupArgs = request[3];
+      setupArgs = init[3];
       break;
 
     case CHILD_MESSAGE_CALL:

diff --git a/packages/jest-worker/src/workers/threadChild.ts b/packages/jest-worker/src/workers/threadChild.ts
@@ -46,8 +46,8 @@ const messageListener = (request: any) => {
     case CHILD_MESSAGE_INITIALIZE:
       const init: ChildMessageInitialize = request;
       file = init[2];
-      setupArgs = request[3];
-      process.env.JEST_WORKER_ID = request[4];
+      setupArgs = init[3];
+      process.env.JEST_WORKER_ID = init[4];
       break;
 
     case CHILD_MESSAGE_CALL: