feat(module-source): Preserve format with Babel integration

endojs · Sep 3, 2024 · a0aa5ec · a0aa5ec
1 parent f82d5c1
commit a0aa5ec
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/packages/module-source/package.json b/packages/module-source/package.json
@@ -37,7 +37,7 @@
     "test": "ava"
   },
   "dependencies": {
-    "@agoric/babel-generator": "^7.17.6",
+    "@babel/generator": "^7.17.6",
     "@babel/parser": "^7.23.6",
     "@babel/traverse": "^7.23.6",
     "@babel/types": "^7.24.0",

diff --git a/packages/module-source/src/transformSource.js b/packages/module-source/src/transformSource.js
@@ -1,6 +1,6 @@
 // @ts-nocheck XXX Babel types
 import * as babelParser from '@babel/parser';
-import babelGenerate from '@agoric/babel-generator';
+import babelGenerate from '@babel/generator';
 import babelTraverse from '@babel/traverse';
 import * as babelTypes from '@babel/types';
 
@@ -26,22 +26,30 @@ export const makeTransformSource = (makeModulePlugins, babel = null) => {
     const { sourceUrl, sourceMapUrl, sourceType, sourceMap, sourceMapHook } =
       sourceOptions;
 
-    const ast = parseBabel(source, { sourceType });
+    const ast = parseBabel(source, {
+      sourceType,
+      tokens: true,
+      createParenthesizedExpression: true,
+    });
 
     traverseBabel(ast, visitorFromPlugin(analyzePlugin));
     traverseBabel(ast, visitorFromPlugin(transformPlugin));
 
     const sourceMaps = sourceOptions.sourceMapHook !== undefined;
 
     const { code: transformedSource, map: transformedSourceMap } =
-      generateBabel(ast, {
-        sourceFileName: sourceMapUrl,
-        sourceMaps,
-        inputSourceMap: sourceMap,
-        retainLines: true,
-        compact: true,
-        verbatim: true,
-      });
+      generateBabel(
+        ast,
+        {
+          sourceFileName: sourceMapUrl,
+          sourceMaps,
+          inputSourceMap: sourceMap,
+          retainLines: true,
+          preserveFormat: true,
+          verbatim: true,
+        },
+        source,
+      );
 
     if (sourceMaps) {
       sourceMapHook(transformedSourceMap, {