Add cjs to list of expected node script extensions (#1449)

* Add cjs to list of expected node script extensions

* Extend file extension tests

* Lint, and simplify code

index.js

@@ -1317,7 +1317,7 @@ class Command extends EventEmitter {
   _executeSubCommand(subcommand, args) {
     args = args.slice();
     let launchWithNode = false; // Use node for source targets so do not need to get permissions correct, and on Windows.
-    const sourceExt = ['.js', '.ts', '.tsx', '.mjs'];
+    const sourceExt = ['.js', '.ts', '.tsx', '.mjs', '.cjs'];
 
     // Not checking for help first. Unlikely to have mandatory and executable, and can't robustly test for help flags in external command.
     this._checkForMissingMandatoryOptions();

tests/command.executableSubcommand.lookup.test.js

@@ -83,11 +83,23 @@ testOrSkipOnWindows('when subcommand file is double symlink then lookup succeeds
 
 test('when subcommand suffix is .ts then lookup succeeds', async() => {
   // We support looking for ts files for ts-node in particular, but don't need to test ts-node itself.
-  // The program and the subcommand `pm-install.ts` are both plain JavaScript code.
-  const binLinkTs = path.join(__dirname, 'fixtures-ts', 'pm.ts');
+  // The subcommand is both plain JavaScript code for this test.
+  const binLinkTs = path.join(__dirname, 'fixtures-extensions', 'pm.js');
   // childProcess.execFile('node', ['-r', 'ts-node/register', binLinkTs, 'install'], function(_error, stdout, stderr) {
-  const { stdout } = await execFileAsync('node', [binLinkTs, 'install']);
-  expect(stdout).toBe('install\n');
+  const { stdout } = await execFileAsync('node', [binLinkTs, 'try-ts']);
+  expect(stdout).toBe('found .ts\n');
+});
+
+test('when subcommand suffix is .cjs then lookup succeeds', async() => {
+  const binLinkTs = path.join(__dirname, 'fixtures-extensions', 'pm.js');
+  const { stdout } = await execFileAsync('node', [binLinkTs, 'try-cjs']);
+  expect(stdout).toBe('found .cjs\n');
+});
+
+test('when subcommand suffix is .mjs then lookup succeeds', async() => {
+  const binLinkTs = path.join(__dirname, 'fixtures-extensions', 'pm.js');
+  const { stdout } = await execFileAsync('node', [binLinkTs, 'try-mjs']);
+  expect(stdout).toBe('found .mjs\n');
 });
 
 test('when subsubcommand then lookup sub-sub-command', async() => {

tests/fixtures-extensions/pm-try-cjs.cjs

@@ -0,0 +1 @@
+console.log('found .cjs');

tests/fixtures-extensions/pm-try-mjs.mjs

@@ -0,0 +1 @@
+console.log('found .mjs');

tests/fixtures-extensions/pm-try-ts.ts

@@ -0,0 +1 @@
+console.log('found .ts');

tests/fixtures-extensions/pm.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+const program = require('../../');
+
+program
+  .command('try-ts', 'test file extension lookup')
+  .command('try-cjs', 'test file extension lookup')
+  .command('try-mjs', 'test file extension lookup')
+  .parse(process.argv);