Refactor process import - improve readability

Author: samvimes01

lib/process-exports.js

@@ -41,7 +41,6 @@ const processExports = (content, exportRegistry) => {
 const generateExportStatements = (exportRegistry) => {
   if (exportRegistry.size === 0) return '';
   const names = Array.from(exportRegistry);
-  if (names.length === 1) return `export { ${names[0]} };\n`;
   const exportsList = names.map((name) => `  ${name}`).join(',\n');
   return `export {\n${exportsList},\n};\n`;
 };

lib/process-imports.js

@@ -69,19 +69,6 @@ const parseNamedImports = (bindings) => {
   return parts;
 };
 
-const ensureImportEntry = (importRegistry, specifier) => {
-  if (importRegistry.has(specifier)) return importRegistry.get(specifier);
-
-  const entry = {
-    defaultNames: new Set(),
-    named: new Set(),
-    isSideEffect: false,
-  };
-  importRegistry.set(specifier, entry);
-
-  return entry;
-};
-
 const isValidSpecifier = (specifier, filename, importStatement) => {
   if (specifier.startsWith('node:') || NODE_BUILTINS.has(specifier)) {
     console.error(
@@ -106,7 +93,14 @@ const processImports = (content, filename, importRegistry) => {
       const { specifier, defaultName, namedImports } = groups;
 
       if (isValidSpecifier(specifier, filename, match)) {
-        const entry = ensureImportEntry(importRegistry, specifier);
+        if (!importRegistry.has(specifier)) {
+          importRegistry.set(specifier, {
+            defaultNames: new Set(),
+            named: new Set(),
+            isSideEffect: false,
+          });
+        }
+        const entry = importRegistry.get(specifier);
 
         if (pattern.type === 'default') {
           entry.defaultNames.add(defaultName);
@@ -124,49 +118,31 @@ const processImports = (content, filename, importRegistry) => {
   return result;
 };
 
+const generateEntryStatements = (
+  specifier,
+  { isSideEffect, defaultNames, named },
+) => {
+  const namedParts = Array.from(named);
+  const sideEffect = isSideEffect ? [`import '${specifier}';`] : [];
+  const defaultStmts = Array.from(defaultNames).map(
+    (name) => `import ${name} from '${specifier}';`,
+  );
+  const namedStmt =
+    namedParts.length > 0
+      ? [`import { ${namedParts.join(', ')} } from '${specifier}';`]
+      : [];
+  return [...sideEffect, ...defaultStmts, ...namedStmt];
+};
+
 const generateImportStatements = (importRegistry) => {
   if (importRegistry.size === 0) return '';
-  const importStatements = [];
-
-  for (const [depName, entry] of importRegistry.entries()) {
-    const specifier = `./${depName}.js`;
-    const { isSideEffect, defaultNames, named } = entry;
-
-    if (isSideEffect) importStatements.push(`import '${specifier}';`);
-
-    const namedParts = Array.from(named);
-
-    if (defaultNames.size === 0 && namedParts.length === 0) continue;
-
-    // when different files import the same module with different default names
-    if (defaultNames.size > 1) {
-      // respect each defaultName to not break concatenated code
-      for (const defaultName of defaultNames) {
-        importStatements.push(`import ${defaultName} from '${specifier}';`);
-      }
-      if (namedParts.length > 0) {
-        importStatements.push(
-          `import { ${namedParts.join(', ')} } from '${specifier}';`,
-        );
-      }
-      continue;
-    }
-
-    const [defaultName] = defaultNames;
-    let stmt;
-    if (defaultName && namedParts.length > 0) {
-      stmt =
-        `import ${defaultName}, { ${namedParts.join(', ')} } ` +
-        `from '${specifier}';`;
-    } else if (defaultName) {
-      stmt = `import ${defaultName} from '${specifier}';`;
-    } else {
-      stmt = `import { ${namedParts.join(', ')} } from '${specifier}';`;
-    }
-    importStatements.push(stmt);
-  }
-
-  return importStatements.join('\n') + '\n\n';
+  return (
+    Array.from(importRegistry.entries())
+      .flatMap(([depName, entry]) =>
+        generateEntryStatements(`./${depName}.js`, entry),
+      )
+      .join('\n') + '\n\n'
+  );
 };
 
 module.exports = {