Enable compact option in Babel generator

package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-reflow",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Babel plugin to transpile Flow code to TypeScript",
   "author": "Jonathan Gruber <gruberjonathan@gmail.com>",
   "license": "MIT",

src/plugin/__tests__/__fixtures__/formatting/react/input.js

@@ -63,7 +63,7 @@ type Props = {
   },
 };
 
-class Foo extends Component<Props> {
+class RealWorld extends Component<Props> {
   get transitions(): Array<TransitionStyle> {
     const { children, enterStyle } = this.props;
 

src/plugin/__tests__/__fixtures__/formatting/react/output.tsx

@@ -1,3 +1,4 @@
+
 import React, { Component, Children, ReactNode } from 'react';
 import { TransitionMotion } from 'react-motion';
 import {
@@ -62,7 +63,7 @@ type Props = {
   };
 };
 
-class Foo extends Component<Props> {
+class RealWorld extends Component<Props> {
   get transitions(): Array<TransitionStyle> {
     const { children, enterStyle } = this.props;
 

src/plugin/__tests__/__fixtures__/optimizations/index.test.ts

@@ -11,7 +11,12 @@ const pluginOptions: ReflowOptions = {
 describe('Optimizations', () => {
   runFixtureTests(
     resolve('src/plugin/__tests__/__fixtures__/optimizations/'),
-    getTransformOptions({ pluginOptions }),
+    getTransformOptions({
+      transformOptions: {
+        compact: false,
+      },
+      pluginOptions,
+    }),
     pluginOptions,
   );
 });

src/plugin/__tests__/__fixtures__/react/index.test.ts

@@ -6,6 +6,10 @@ import { runFixtureTests } from '../../../util/test-runner';
 describe('React', () => {
   runFixtureTests(
     resolve('src/plugin/__tests__/__fixtures__/react/'),
-    getTransformOptions(),
+    getTransformOptions({
+      transformOptions: {
+        compact: false,
+      }
+    }),
   );
 });

src/plugin/__tests__/__fixtures__/types/index.test.ts

@@ -6,6 +6,10 @@ import { runFixtureTests } from '../../../util/test-runner';
 describe('Types', () => {
   runFixtureTests(
     resolve('src/plugin/__tests__/__fixtures__/types/'),
-    getTransformOptions(),
+    getTransformOptions({
+      transformOptions: {
+        compact: false,
+      }
+    }),
   );
 });

src/plugin/options.ts

@@ -7,19 +7,20 @@ import reflowPlugin, { ReflowOptions } from '.';
  * Create the Babel configuration for runners using the plugin
  */
 export function getTransformOptions(
-  args: {
+  overwrites: {
     pluginOptions?: ReflowOptions;
     transformOptions?: TransformOptions;
   } = {},
 ): TransformOptions {
   const defaultOptions: TransformOptions = {
     babelrc: false,
-    configFile: false,
     comments: false,
-    plugins: [[reflowPlugin, args.pluginOptions]],
+    compact: true,
+    configFile: false,
+    plugins: [[reflowPlugin, overwrites.pluginOptions]],
   };
 
-  return Object.assign({}, defaultOptions, args.transformOptions);
+  return Object.assign({}, defaultOptions, overwrites.transformOptions);
 }
 
 /**

src/plugin/util/format.ts

@@ -91,7 +91,7 @@ function copyComments(
  * Since Babel uses an *abstract* synax tree, all information about whitespace
  * is lost after parsing. Also Babel's `retainLines` option is not working as
  * expected and will produce broken syntax in some cases. Neither will Prettier
- * help concerning blank lines, because it won't add additional blank lines:
+ * help here, because it does not add additional blank lines:
  *
  * https://prettier.io/docs/en/rationale.html#empty-lines
  *
@@ -101,7 +101,7 @@ function copyComments(
  * the source to the output. Comments are also handled here, because Babel does
  * not reliably retain their position in the generated code. This approach
  * naively assumes that all code transformations will result in (roughly) the
- * same amount of lines. It's not perfect, but the best I came up with and it
+ * same amount of lines. It iss not perfect, but the best I came up with and it
  * seems to work reasonably well in practice.
  */
 export function syncBlankLinesAndComments(
@@ -114,11 +114,11 @@ export function syncBlankLinesAndComments(
     .split(LINE_BREAK)
     .filter(line => !FLOW_DIRECTIVE.test(line));
 
-  let outputLines = outputCode.split(LINE_BREAK).filter(line => !BLANK_LINE.test(line));
-
   const flowAst = parseAst(originalLines.join('\n'));
   const decoratorList = getDecorators(flowAst);
 
+  let outputLines = outputCode.split(LINE_BREAK);
+
   originalLines.forEach((flowLine, lineNumber) => {
     if (outputLines[lineNumber] === undefined || flowLine === outputLines[lineNumber]) {
       return;
@@ -177,7 +177,14 @@ export function formatOutputCode(
     }),
   );
 
-  outputCode = prettier.format(outputCode, getPrettierConfig(prettierOptions));
+  outputCode = prettier.format(
+    outputCode,
+    getPrettierConfig({
+      parser: 'typescript',
+      ...prettierOptions,
+    }),
+  );
+
   outputCode = syncBlankLinesAndComments(outputCode, originalCode, pluginOptions);
 
   // Run Prettier one more time to iron out any remaining bad formatting.