Cleanup

Author: CompuIves

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule/index.ts

@@ -11,6 +11,7 @@ import {
   generateExportStatement,
   generateEsModuleSpecifier,
   generateInteropRequire,
+  generateInteropRequireExpression,
 } from './utils';
 import { customGenerator } from './generator';
 
@@ -193,45 +194,16 @@ export function convertEsModule(code: string) {
         if (specifier.type === n.ImportDefaultSpecifier) {
           // import Test from 'test';
           // const _test = require('test');
-          // var Test = interopRequireDefault(_test);
+          // var Test = interopRequireDefault(_test).default;
           localName = specifier.local.name;
           importName = 'default';
           addDefaultInterop();
 
-          program.body.splice(i, 0, {
-            type: 'VariableDeclaration',
-            kind: 'var',
-            declarations: [
-              {
-                type: 'VariableDeclarator',
-                init: {
-                  type: 'MemberExpression',
-                  object: {
-                    type: 'CallExpression',
-                    callee: {
-                      type: 'Identifier',
-                      name: '$_csb__interopRequireDefault',
-                    },
-                    arguments: [
-                      {
-                        type: 'Identifier',
-                        name: varName,
-                      },
-                    ],
-                  },
-                  computed: false,
-                  property: {
-                    type: 'Identifier',
-                    name: 'default',
-                  },
-                },
-                id: {
-                  type: 'Identifier',
-                  name: localName,
-                },
-              },
-            ],
-          });
+          program.body.splice(
+            i,
+            0,
+            generateInteropRequireExpression(varName, localName)
+          );
           return;
         }
         if (specifier.type === n.ImportSpecifier) {

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule/utils.ts

@@ -363,3 +363,43 @@ export function generateInteropRequire() {
     },
   };
 }
+
+export function generateInteropRequireExpression(
+  varName: string,
+  localName: string
+) {
+  return {
+    type: n.VariableDeclaration,
+    kind: 'var' as 'var',
+    declarations: [
+      {
+        type: n.VariableDeclarator,
+        init: {
+          type: n.MemberExpression,
+          object: {
+            type: n.CallExpression,
+            callee: {
+              type: n.Identifier,
+              name: '$_csb__interopRequireDefault',
+            },
+            arguments: [
+              {
+                type: n.Identifier,
+                name: varName,
+              },
+            ],
+          },
+          computed: false,
+          property: {
+            type: n.Identifier,
+            name: 'default',
+          },
+        },
+        id: {
+          type: n.Identifier,
+          name: localName,
+        },
+      },
+    ],
+  };
+}