Filename detection should respect short flags

packages/babel-node/package.json

@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "@babel/register": "^7.7.7",
-    "commander": "^2.8.1",
+    "commander": "^4.0.1",
     "core-js": "^3.2.1",
     "lodash": "^4.17.13",
     "node-environment-flags": "^1.0.5",

packages/babel-node/src/_babel-node.js

@@ -169,15 +169,15 @@ if (program.eval || program.print) {
       }
 
       if (arg[0] === "-") {
-        const camelArg = arg
-          .slice(2)
-          .replace(/-(\w)/, (s, c) => c.toUpperCase());
-        const parsedArg = program[camelArg];
-        if (
-          arg === "-r" ||
-          arg === "--require" ||
-          (parsedArg && parsedArg !== true)
-        ) {
+        const parsedOption = program.options.find(option => {
+          return option.long === arg || option.short === arg;
+        });
+        if (parsedOption === undefined) {
+          return;
+        }
+        const optionName = parsedOption.attributeName();
+        const parsedArg = program[optionName];
+        if (optionName === "require" || (parsedArg && parsedArg !== true)) {
           ignoreNext = true;
         }
       } else {

packages/babel-node/test/fixtures/babel-node/--presets/in-files/index.js

@@ -0,0 +1 @@
+console.log("foo");

packages/babel-node/test/fixtures/babel-node/--presets/in-files/presetFile.js

@@ -0,0 +1,4 @@
+module.exports = function () {
+  console.log("Preset was loaded, so --presets was used.");
+  return {};
+};

packages/babel-node/test/fixtures/babel-node/--presets/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["--presets", "./presetFile.js", "index"]
+}

packages/babel-node/test/fixtures/babel-node/--presets/stdout.txt

@@ -0,0 +1,2 @@
+Preset was loaded, so --presets was used.
+foo

packages/babel-node/test/fixtures/babel-node/-b/in-files/index.js

@@ -0,0 +1 @@
+console.log("foo");

packages/babel-node/test/fixtures/babel-node/-b/in-files/presetFile.js

@@ -0,0 +1,4 @@
+module.exports = function () {
+  console.log("Preset was loaded, so -b was used.");
+  return {};
+};

packages/babel-node/test/fixtures/babel-node/-b/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["-b", "./presetFile.js", "index"]
+}

packages/babel-node/test/fixtures/babel-node/-b/stdout.txt

@@ -0,0 +1,2 @@
+Preset was loaded, so -b was used.
+foo