Moving to async/await: lib/Runner.js

lib/Runner.js

@@ -9,7 +9,7 @@ function findTests(
   isPackageProject /*: boolean */
 ) /*: Promise<Array<{ moduleName: string, possiblyTests: Array<string> }>> */ {
   return Promise.all(
-    testFilePaths.map((filePath) => {
+    testFilePaths.map(async (filePath) => {
       const matchingSourceDirs = sourceDirs.filter((dir) =>
         filePath.startsWith(`${dir}${path.sep}`)
       );
@@ -51,12 +51,11 @@ function findTests(
         );
       }
 
-      return Parser.extractExposedPossiblyTests(filePath).then(
-        (possiblyTests) => ({
-          moduleName,
-          possiblyTests,
-        })
-      );
+      const possiblyTests = await Parser.extractExposedPossiblyTests(filePath);
+      return { 
+        moduleName, 
+        possiblyTests 
+      }
     })
   );
 }

lib/elm-test.js

@@ -187,7 +187,7 @@ if (args._[0] === 'install') {
 
 let runsExecuted = 0;
 
-function runTests(generatedCodeDir /*: string */, testFile /*: string */) {
+async function runTests(generatedCodeDir /*: string */, testFile /*: string */) {
   const dest = path.resolve(path.join(generatedCodeDir, 'elmTestOutput.js'));
 
   // Incorporate the process PID into the socket name, so elm-test processes can
@@ -205,32 +205,29 @@ function runTests(generatedCodeDir /*: string */, testFile /*: string */) {
       ? '\\\\.\\pipe\\elm_test-' + process.pid + '-' + runsExecuted
       : '/tmp/elm_test-' + process.pid + '.sock';
 
-  return Compile.compile(
+  await Compile.compile(
     testFile,
     dest,
     args.verbose,
     pathToElmBinary,
     args.report
   )
-    .then(function () {
-      return Generate.prepareCompiledJsFile(pipeFilename, dest).then(
-        function () {
-          return Supervisor.run(
-            packageInfo.version,
-            pipeFilename,
-            report,
-            processes,
-            dest,
-            args.watch,
-            Compile.isMachineReadableReporter(report)
-          );
-        }
-      );
-    })
-    .catch(function (error) {
+  await Generate.prepareCompiledJsFile(pipeFilename, dest)
+  try {
+      return Supervisor.run(
+        packageInfo.version,
+        pipeFilename,
+        report,
+        processes,
+          dest,
+          args.watch,
+          Compile.isMachineReadableReporter(report)
+        );
+  }
+  catch (error) {
       console.error('Compilation failed for', testFile);
       return Promise.reject(error);
-    });
+  }
 }
 
 function globify(filename) {
@@ -333,19 +330,22 @@ if (isMake) {
     projectElmJson
   );
 
-  Compile.compileSources(
-    testFilePaths,
-    generatedCodeDir,
-    args.verbose,
-    pathToElmBinary,
-    args.report
-  )
-    .then(function () {
-      process.exit(0);
-    })
-    .catch(function () {
-      process.exit(1);
-    });
+  (async () => {
+    await Compile.compileSources(
+      testFilePaths,
+      generatedCodeDir,
+      args.verbose,
+      pathToElmBinary,
+      args.report
+    )
+    try {
+        process.exit(0);
+      }
+    catch {
+        process.exit(1);
+    }
+  })();
+
 } else {
   if (testFilePaths.length === 0) {
     console.error(noFilesFoundError(testFileGlobs));
@@ -360,35 +360,33 @@ if (isMake) {
     projectElmJson
   );
 
-  function run() {
+  async function run() {
     // This compiles all the tests so that we generate *.elmi files for them,
     // which we can then read to determine which tests need to be run.
-    return Runner.findTests(testFilePaths, sourceDirs, isPackageProject)
-      .then(function (testModules) {
-        process.chdir(generatedCodeDir);
-
-        const mainFile = Generate.generateMainModule(
-          parseInt(args.fuzz),
-          parseInt(args.seed),
-          args.report,
-          testFileGlobs,
-          testFilePaths,
-          testModules,
-          generatedSrc,
-          processes
-        );
+    const testModules = await Runner.findTests(testFilePaths, sourceDirs, isPackageProject)
+    try {
+      process.chdir(generatedCodeDir);
+
+      const mainFile = Generate.generateMainModule(
+        parseInt(args.fuzz),
+        parseInt(args.seed),
+        args.report,
+        testFileGlobs,
+        testFilePaths,
+        testModules,
+        generatedSrc,
+        processes
+      );
 
-        return runTests(generatedCodeDir, mainFile);
-      })
-      .catch(function (err) {
-        console.error(err.message);
-        if (!args.watch) {
-          process.exit(1);
-        }
-      })
-      .then(function () {
-        console.log(chalk.blue('Watching for changes...'));
-      });
+      return runTests(generatedCodeDir, mainFile);
+    }
+    catch (err) {
+      console.error(err.message);
+      if (!args.watch) {
+        process.exit(1);
+      }
+    }
+    console.log(chalk.blue('Watching for changes...'));
   }
 
   var currentRun = run();