From 88eec4b852d19ddd1dc31960870c99c515d310ab Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel@tschinder.de>
Date: Mon, 18 Jul 2016 16:36:03 +0200
Subject: [PATCH] Support all variations of v8Flags (#3578)

This adds support for specifying v8Flags with dashes. Previously only underscores
were allowed.
Also allows specifying values for v8Flags in the from --flag=value, which was not supported till now.
Also add --inspect support.
---
 packages/babel-cli/src/babel-node.js          | 23 +++++++++++++++----
 .../v8Flag-dashed-with-param/options.json     |  4 ++++
 .../babel-node/v8Flag-dashed/options.json     |  4 ++++
 .../options.json                              |  4 ++++
 .../v8Flag-underscored/options.json           |  4 ++++
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json
 create mode 100644 packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed/options.json
 create mode 100644 packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json
 create mode 100644 packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored/options.json

diff --git a/packages/babel-cli/src/babel-node.js b/packages/babel-cli/src/babel-node.js
index c45af6c4da..d162cef972 100755
--- a/packages/babel-cli/src/babel-node.js
+++ b/packages/babel-cli/src/babel-node.js
@@ -20,9 +20,24 @@ if (argSeparator > -1) {
   babelArgs = babelArgs.slice(0, argSeparator);
 }
 
+/**
+ * Replace dashes with underscores in the v8Flag name
+ * Also ensure that if the arg contains a value (e.g. --arg=true)
+ * that only the flag is returned.
+ */
+function getNormalizedV8Flag(arg) {
+  const matches = arg.match(/--(.+)/);
+
+  if (matches) {
+    return `--${matches[1].replace(/-/g, "_")}`;
+  }
+
+  return arg;
+}
+
 getV8Flags(function (err, v8Flags) {
   babelArgs.forEach(function(arg) {
-    let flag = arg.split("=")[0];
+    const flag = arg.split("=")[0];
 
     switch (flag) {
       case "-d":
@@ -36,16 +51,16 @@ getV8Flags(function (err, v8Flags) {
         break;
 
       case "-gc":
-      case "--expose-gc":
         args.unshift("--expose-gc");
         break;
 
+      case "--inspect":
       case "--nolazy":
-        args.unshift("--nolazy");
+        args.unshift(flag);
         break;
 
       default:
-        if (v8Flags.indexOf(arg) >= 0 || arg.indexOf("--trace") === 0) {
+        if (v8Flags.indexOf(getNormalizedV8Flag(flag)) >= 0 || arg.indexOf("--trace") === 0) {
           args.unshift(arg);
         } else {
           args.push(arg);
diff --git a/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json b/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json
new file mode 100644
index 0000000000..456285d633
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed-with-param/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["--expose-debug-as=customDebug", "--eval", "console.log(customDebug.Debug.DebugEvent.Break)"],
+  "stdout": "1"
+}
diff --git a/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed/options.json b/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed/options.json
new file mode 100644
index 0000000000..82ff74d156
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel-node/v8Flag-dashed/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["--expose-gc", "--eval", "console.log(typeof global.gc)"],
+  "stdout": "function"
+}
diff --git a/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json b/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json
new file mode 100644
index 0000000000..751b406659
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored-with-param/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["--expose_debug_as=customDebug", "--eval", "console.log(customDebug.Debug.DebugEvent.Break)"],
+  "stdout": "1"
+}
diff --git a/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored/options.json b/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored/options.json
new file mode 100644
index 0000000000..c279b0e13d
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel-node/v8Flag-underscored/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["--expose_gc", "--eval", "console.log(typeof global.gc)"],
+  "stdout": "function"
+}