refactor: Simplify test-runner logic (#196)

Author: pmdartus

bin/sfdx-lwc-jest

@@ -13,8 +13,16 @@ const { error } = require('../src/log');
 
 const args = getArgs();
 const runJest = require('../src/utils/test-runner');
-runJest(args);
 
-process.on('unhandledRejection', reason => {
+runJest(args)
+    .catch((err) => {
+        error(err);
+        return 1;
+    })
+    .then((code) => {
+        process.exit(code);
+    });
+
+process.on('unhandledRejection', (reason) => {
     error(reason);
 });

package.json

@@ -16,7 +16,7 @@
     },
     "scripts": {
         "check-license-headers": "node ./scripts/checkLicenseHeaders.js",
-        "lint": "eslint src/",
+        "lint": "eslint src/ tests/",
         "format": "prettier --write '**/*.{js,json,md,html,css}'",
         "format:check": "prettier --check '**/*.{js,json,md,html,css}'",
         "release": "npm publish --access public",

src/config.js

@@ -37,11 +37,4 @@ const jestConfig = {
 
 const expectedApiVersion = '50.0';
 
-const jestPath = (() => {
-    const packageJsonPath = require.resolve('jest/package.json');
-    const { bin } = require(packageJsonPath);
-
-    return path.resolve(path.dirname(packageJsonPath), bin);
-})();
-
-module.exports = { jestConfig, jestPath, expectedApiVersion };
+module.exports = { jestConfig, expectedApiVersion };

src/log.js

@@ -14,9 +14,8 @@ function info(message) {
     console.log(`${chalk.blue('info')} ${message}`);
 }
 
-function error(message, code = 1) {
+function error(message) {
     console.error(`${chalk.red('error')} ${message}`);
-    process.exit(code);
 }
 
 module.exports = {

src/resolver.js

@@ -10,10 +10,12 @@ const fs = require('fs');
 const path = require('path');
 const lwcResolver = require('@lwc/jest-resolver');
 
-const { PROJECT_ROOT, getModulePaths, DEFAULT_NAMESPACE } = require('./utils/project.js');
+const { PROJECT_ROOT, getModulePaths } = require('./utils/project.js');
 
 const { getInfoFromId } = require('./utils/module.js');
 
+const DEFAULT_NAMESPACE = 'c';
+
 function isFile(file) {
     let result;
 

src/utils/jest.js

@@ -11,7 +11,6 @@ const path = require('path');
 const fg = require('fast-glob');
 
 const PROJECT_ROOT = fs.realpathSync(process.cwd());
-const DEFAULT_NAMESPACE = 'c';
 
 let PATHS = [];
 
@@ -40,6 +39,5 @@ function getModulePaths() {
 module.exports = {
     PROJECT_ROOT,
     getSfdxProjectJson,
-    DEFAULT_NAMESPACE,
     getModulePaths,
 };

src/utils/project.js

@@ -8,34 +8,15 @@
 
 const fs = require('fs');
 const path = require('path');
-const { jestRunner } = require('./jest');
-const shell = require('./shell');
-
-const { error, info } = require('../log');
+const { spawn } = require('child_process');
 
 const { PROJECT_ROOT, getSfdxProjectJson } = require('./project');
 
-const { jestConfig, expectedApiVersion, jestPath } = require('../config');
-
-// CLI options we do not want to pass along to Jest
-// prettier-ignore
-const OPTIONS_DISALLOW_LIST = [
-    '_', 
-    '$0', 
-    'debug', 'd', 
-    'skipApiVersionCheck', 'skip-api-version-check'
-];
-
-function getOptions(argv) {
-    let options = [];
+const { error, info } = require('../log');
+const { jestConfig, expectedApiVersion } = require('../config');
 
-    Object.keys(argv).forEach((arg) => {
-        if (argv[arg] && !OPTIONS_DISALLOW_LIST.includes(arg)) {
-            options.push(`--${arg}`);
-        }
-    });
-    return options.concat(argv._);
-}
+// List of CLI options that should be passthrough to jest.
+const JEST_PASSTHROUGH_OPTIONS = new Set(['coverage', 'updateSnapshot', 'verbose', 'watch']);
 
 function validSourceApiVersion() {
     const sfdxProjectJson = getSfdxProjectJson();
@@ -47,33 +28,61 @@ function validSourceApiVersion() {
     }
 }
 
+function getJestPath() {
+    const packageJsonPath = require.resolve('jest/package.json');
+
+    const { bin } = require(packageJsonPath);
+    return path.resolve(path.dirname(packageJsonPath), bin);
+}
+
+function getJestArgs(argv) {
+    // Extract known options from parsed arguments
+    const knownOptions = Object.keys(argv)
+        .filter((key) => argv[key] && JEST_PASSTHROUGH_OPTIONS.has(key))
+        .map((key) => `--${key}`);
+
+    // Extract remaining options after `--`
+    const rest = argv._;
+
+    const jestArgs = [...knownOptions, ...rest];
+
+    // Force jest to run in band when debugging.
+    if (argv.debug) {
+        jestArgs.unshift('--runInBand');
+    }
+
+    // Provide default configuration when none is present at the project root.
+    const hasCustomConfig = fs.existsSync(path.resolve(PROJECT_ROOT, 'jest.config.js'));
+    if (!hasCustomConfig) {
+        jestArgs.unshift(`--config=${JSON.stringify(jestConfig)}`);
+    }
+
+    return jestArgs;
+}
+
 async function testRunner(argv) {
     if (!argv.skipApiVersionCheck) {
         validSourceApiVersion();
     }
 
-    const hasCustomConfig = fs.existsSync(path.resolve(PROJECT_ROOT, 'jest.config.js'));
-    const config = hasCustomConfig ? [] : ['--config', JSON.stringify(jestConfig)];
+    const spawnCommand = 'node';
+    const spawnArgs = [getJestPath(), ...getJestArgs(argv)];
 
-    const options = getOptions(argv);
     if (argv.debug) {
+        spawnArgs.unshift('--inspect-brk');
+
         info('Running in debug mode...');
-        let commandArgs = ['--inspect-brk', jestPath, '--runInBand'];
-        commandArgs = commandArgs.concat(options);
-        if (!hasCustomConfig) {
-            commandArgs.push('--config=' + JSON.stringify(jestConfig));
-        }
-        const command = 'node';
-        info(command + ' ' + commandArgs.join(' '));
-
-        shell.runCommand(command, commandArgs);
-    } else {
-        // Jest will not set the env if not run from the bin executable
-        if (process.env.NODE_ENV == null) {
-            process.env.NODE_ENV = 'test';
-        }
-        jestRunner.run([...config, ...options]);
+        info(`${spawnCommand} ${spawnArgs.join(' ')}`);
     }
+
+    return new Promise((resolve) => {
+        const jest = spawn(spawnCommand, spawnArgs, {
+            env: process.env,
+            stdio: 'inherit',
+        });
+
+        jest.on('close', (code) => resolve(code));
+    });
 }
 
 module.exports = testRunner;

src/utils/shell.js

@@ -6,10 +6,10 @@
  */
 'use strict';
 
-const options = require('../options/options');
 const yargs = require('yargs');
 
 const { error, info } = require('../log');
+const options = require('../options/options');
 
 const argError = (msg, err, yargs) => {
     if (err) {