From 5cd43a675b571ed9a79ea12c8e038c7487b16121 Mon Sep 17 00:00:00 2001
From: Alex Dvornikov <advornikov@fb.com>
Date: Fri, 18 Aug 2017 04:56:09 -0700
Subject: [PATCH] Default to "compact: false" in the code generate phase

Reviewed By: davidaurelio

Differential Revision: D5630578

fbshipit-source-id: 5049be735f41f1207b8ca329f4a78fc92f683c23
---
 .../worker/__tests__/transform-module-test.js  | 18 ++++++++++++++++--
 .../src/ModuleGraph/worker/generate.js         |  4 ++--
 .../src/ModuleGraph/worker/optimize-module.js  |  2 +-
 .../src/ModuleGraph/worker/transform-module.js |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
index ae8d3b19..22b1bb58 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
@@ -162,9 +162,11 @@ describe('transforming JS modules:', () => {
   it('creates source maps', done => {
     transformModule(sourceCode, options(), (error, result) => {
       const {code, map} = result.details.transformed.default;
-      const column = code.indexOf('code');
+      const position = findColumnAndLine(code, 'code');
+      expect(position).not.toBeNull();
+
       const consumer = new SourceMapConsumer(map);
-      expect(consumer.originalPositionFor({line: 1, column})).toEqual(
+      expect(consumer.originalPositionFor(position)).toEqual(
         expect.objectContaining({line: 1, column: sourceCode.indexOf('code')}),
       );
       done();
@@ -273,3 +275,15 @@ function createTestData() {
     transformedCode: generate(fileAst).code,
   };
 }
+
+function findColumnAndLine(text, string) {
+  const lines = text.split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    const column = lines[i].indexOf(string);
+    if (column !== -1) {
+      const line = i + 1;
+      return {line, column};
+    }
+  }
+  return null;
+}
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/generate.js b/packages/metro-bundler/src/ModuleGraph/worker/generate.js
index a0f2d755..321ad2b4 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/generate.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/generate.js
@@ -12,10 +12,10 @@
 
 const babelGenerate = require('babel-generator').default;
 
-function generate(ast: Object, filename: string, sourceCode: string) {
+function generate(ast: Object, filename: string, sourceCode: string, compact: boolean) {
   return babelGenerate(ast, {
     comments: false,
-    compact: true,
+    compact,
     filename,
     sourceFileName: filename,
     sourceMaps: true,
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/optimize-module.js b/packages/metro-bundler/src/ModuleGraph/worker/optimize-module.js
index 7c31b3aa..ca4f7214 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/optimize-module.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/optimize-module.js
@@ -73,7 +73,7 @@ function optimize(transformed, file, originalCode, options) {
   }
 
   const inputMap = transformed.map;
-  const gen = generate(optimized.ast, file, originalCode);
+  const gen = generate(optimized.ast, file, originalCode, true);
 
   const min = minify.withSourceMap(
     gen.code,
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/transform-module.js b/packages/metro-bundler/src/ModuleGraph/worker/transform-module.js
index c0ff1ae8..0719f7e9 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/transform-module.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/transform-module.js
@@ -178,7 +178,7 @@ function makeResult(ast, filename, sourceCode, isPolyfill = false) {
     file = JsFileWrapping.wrapModule(ast, dependencyMapName);
   }
 
-  const gen = generate(file, filename, sourceCode);
+  const gen = generate(file, filename, sourceCode, false);
   return {code: gen.code, map: gen.map, dependencies, dependencyMapName};
 }