simplify types

Author: fabiosantoscode

src/interfaces.ts

@@ -56,9 +56,3 @@ export interface ICLICompilers {
   compilers: string[];
   extensions: string[];
 }
-
-export type Task = () => Promise<any>;
-export interface ITaskOutput<T> {
-  task: Task;
-  output?: T;
-}

src/main/mocha.ts

@@ -18,7 +18,6 @@ import {
   ISubprocessRunnerMessage,
   ISubprocessSyncedData,
   ISuite,
-  ITaskOutput,
 } from '../interfaces';
 
 const debugLog = debug('mocha-parallel-tests');
@@ -84,9 +83,9 @@ export default class MochaWrapper extends Mocha {
     runner.fullStackTrace = fullStackTrace;
     runner.asyncOnly = asyncOnly;
 
-    const tasks: Array<() => Promise<ITaskOutput<ISubprocessResult>>> = [];
+    const tasks: Array<() => Promise<ISubprocessResult>> = [];
     for (const file of this.files) {
-      const task = () => this.spawnTestProcess(file, task);
+      const task = () => this.spawnTestProcess(file);
       tasks.push(task);
     }
 
@@ -135,11 +134,7 @@ export default class MochaWrapper extends Mocha {
 
     Promise.all(tasks.map(async (task) => {
       const res = await task();
-      const output = res.output;
-      assert(output);
-      if (output) {
-        onTaskFinished(output);
-      }
+      onTaskFinished(res);
     })).then(() => {
       debugLog('All tests finished processing');
 
@@ -177,8 +172,8 @@ export default class MochaWrapper extends Mocha {
     return retriesTests as IRetriedTest[];
   }
 
-  private async spawnTestProcess(file: string, task: any): Promise<ITaskOutput<ISubprocessResult>> {
-    const output: ISubprocessResult = await new Promise<ISubprocessResult>(async (resolve, reject) => {
+  private async spawnTestProcess(file: string): Promise<ISubprocessResult> {
+    return new Promise<ISubprocessResult>(async (resolve, reject) => {
       const resolvedFilePath = pathResolve(file);
 
       const testOptions: {[key: string]: any} = { test: resolvedFilePath };
@@ -284,9 +279,5 @@ export default class MochaWrapper extends Mocha {
         return null;
       }
     });
-    return {
-      output,
-      task,
-    };
   }
 }