Add support for formatting from closure compiler

Author: kristoferbaxter

src/parsing/preserve-default-export.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ExpressionStatement, AssignmentExpression, MemberExpression } from 'estree';
+import { ExpressionStatement, AssignmentExpression } from 'estree';
 import { ExportDetails, Range } from '../types';
 import MagicString from 'magic-string';
 
@@ -26,14 +26,11 @@ export function PreserveDefault(
   exportInline: boolean,
 ): boolean {
   const assignmentExpression = ancestor.expression as AssignmentExpression;
-  const memberExpression = assignmentExpression.left as MemberExpression;
-  const [memberExpressionStart, memberExpressionEnd]: Range = memberExpression.range as Range;
+  const [leftStart]: Range = assignmentExpression.left.range as Range;
+  const [rightStart]: Range = assignmentExpression.right.range as Range;
 
-  source.overwrite(
-    memberExpressionStart,
-    memberExpressionEnd + assignmentExpression.operator.length,
-    'export default ',
-  );
+  // console.log(code.substring(leftStart, rightStart));
+  source.overwrite(leftStart, rightStart, 'export default ');
 
   return false;
 }

src/parsing/preserve-named-constant-export.ts

@@ -69,6 +69,7 @@ function PreserveIdentifier(
   const left = assignmentExpression.left;
   const right = assignmentExpression.right;
   const [ancestorStart, ancestorEnd]: Range = ancestor.range as Range;
+  const [leftStart] = left.range as Range;
   const [rightStart, rightEnd]: Range = right.range as Range;
 
   if (exportInline) {
@@ -80,10 +81,9 @@ function PreserveIdentifier(
   } else if (exportDetails.source === null && 'name' in right) {
     // This is a locally defined identifier with a name we can use.
     exportDetails.local = right.name;
-    source.remove((left.range as Range)[0], rightEnd + 1);
+    source.remove(leftStart, ancestorEnd);
     return true;
   } else {
-    // exportDetails.local =
     source.overwrite(
       ancestorStart,
       ancestorEnd,

src/transformers/exports.ts

@@ -238,7 +238,9 @@ export default class ExportTransform extends Transform implements TransformInter
             }
 
             if (!exportIsLocal) {
-              source.remove((left.range as Range)[0], (expression.right.range as Range)[1] + 1);
+              const [leftStart] = left.range as Range;
+              const { 1: ancestorEnd } = ancestor.range as Range;
+              source.remove(leftStart, ancestorEnd);
             }
           }
         }

test/arrow-function/fixtures/multiple-arguments.esm.pretty.js

@@ -0,0 +1,2 @@
+
+export var multipleArguments=(a, b) => console.log(a, b);

test/arrow-function/fixtures/single-argument.esm.pretty.js

@@ -0,0 +1,2 @@
+
+export var singleArgument=a => console.log(a);

test/const-rename/fixtures/rename.esm.pretty.js

@@ -0,0 +1,5 @@
+
+let b = [3, 4], c = [5, 6];
+export function yes(a) {
+  return 0 <= c.indexOf(a) && 0 <= b.indexOf(a);
+};

test/export-all/fixtures/all.esm.pretty.js

@@ -0,0 +1,5 @@
+
+var export1=1;
+function export2(){
+  return 2;
+};export{export1,export2}

test/export-default/fixtures/array.esm.pretty.js

@@ -0,0 +1,2 @@
+
+export default [];

test/export-default/fixtures/arrow-function.esm.pretty.js

@@ -0,0 +1,2 @@
+
+export default a => console.log(a);

test/export-default/fixtures/class.esm.pretty.js

@@ -0,0 +1,10 @@
+
+class a {
+  constructor(b) {
+    this.name_ = b;
+  }
+  console() {
+    console.log(this.name_);
+  }
+}
+export default a;