fix: async module in circular dependence

crates/mako/src/generate/transform.rs

@@ -78,8 +78,9 @@ pub fn transform_modules_in_thread(
         let module_id = module_id.clone();
         let async_deps = async_deps_by_module_id
             .get(&module_id)
-            .expect(&module_id.id)
-            .clone();
+            .cloned()
+            .unwrap_or(vec![]);
+
         thread_pool::spawn(move || {
             let module_graph = context.module_graph.read().unwrap();
             let deps = module_graph.get_dependencies(&module_id);

crates/mako/src/visitors/async_module.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet, VecDeque};
 use std::sync::Arc;
 
 use swc_core::common::util::take::Take;
@@ -211,23 +211,61 @@ pub fn mark_async(
 ) -> HashMap<ModuleId, Vec<Dependency>> {
     let mut async_deps_by_module_id = HashMap::new();
     let mut module_graph = context.module_graph.write().unwrap();
-    // TODO: 考虑成环的场景
+
+    let mut to_visit_queue = module_graph
+        .modules()
+        .iter()
+        .filter_map(|m| {
+            m.info
+                .as_ref()
+                .and_then(|i| if i.is_async { Some(m.id.clone()) } else { None })
+        })
+        .collect::<VecDeque<_>>();
+    let mut visited = HashSet::new();
+
+    // polluted async to dependants
+    while let Some(module_id) = to_visit_queue.pop_front() {
+        if visited.contains(&module_id) {
+            continue;
+        }
+
+        module_graph
+            .get_dependents(&module_id)
+            .iter()
+            .filter_map(|(dependant, dependency)| {
+                if !dependency.resolve_type.is_sync_esm() {
+                    return None;
+                }
+                if !visited.contains(*dependant) {
+                    Some((*dependant).clone())
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>()
+            .iter()
+            .for_each(|module_id| {
+                let m = module_graph.get_module_mut(module_id).unwrap();
+                m.info.as_mut().unwrap().is_async = true;
+
+                to_visit_queue.push_back(module_id.clone());
+            });
+
+        visited.insert(module_id.clone());
+    }
+
     module_ids.iter().for_each(|module_id| {
         let deps = module_graph.get_dependencies_info(module_id);
         let async_deps: Vec<Dependency> = deps
             .into_iter()
             .filter(|(_, dep, is_async)| dep.resolve_type.is_sync_esm() && *is_async)
             .map(|(_, dep, _)| dep.clone())
             .collect();
-        let module = module_graph.get_module_mut(module_id).unwrap();
-        if let Some(info) = module.info.as_mut() {
-            // a module with async deps need to be polluted into async module
-            if !info.is_async && !async_deps.is_empty() {
-                info.is_async = true;
-            }
+        if !async_deps.is_empty() {
             async_deps_by_module_id.insert(module_id.clone(), async_deps);
         }
     });
+
     async_deps_by_module_id
 }
 
@@ -255,8 +293,8 @@ add(1, 2);
         "#
         .trim());
         assert_eq!(
-            code,
-            r#"
+      code,
+      r#"
 __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     "use strict";
     Object.defineProperty(exports, "__esModule", {
@@ -273,7 +311,7 @@ __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     asyncResult();
 }, true);
             "#.trim()
-        );
+    );
     }
 
     #[test]
@@ -286,8 +324,8 @@ console.log(foo)
         "#
         .trim());
         assert_eq!(
-            code,
-            r#"
+      code,
+      r#"
 __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     "use strict";
     Object.defineProperty(exports, "__esModule", {
@@ -308,8 +346,8 @@ __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     asyncResult();
 }, true);
 "#
-                .trim()
-        );
+        .trim()
+    );
     }
 
     #[test]
@@ -321,8 +359,8 @@ add(1, 2);
                 "#
         .trim());
         assert_eq!(
-            code,
-            r#"
+      code,
+      r#"
 __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     "use strict";
     Object.defineProperty(exports, "__esModule", {
@@ -340,8 +378,8 @@ __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     asyncResult();
 }, true);
 "#
-                .trim()
-        );
+        .trim()
+    );
     }
 
     #[test]
@@ -374,8 +412,8 @@ const async = require('./miexed_async');
                 "#
         .trim());
         assert_eq!(
-            code,
-            r#"
+      code,
+      r#"
 __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     "use strict";
     Object.defineProperty(exports, "__esModule", {
@@ -393,7 +431,7 @@ __mako_require__._async(module, async (handleAsyncDeps, asyncResult)=>{
     asyncResult();
 }, true);
 "#.trim()
-        );
+    );
     }
 
     fn run(js_code: &str) -> String {

e2e/fixtures/javascript.async_module_in_loop/async.js

@@ -0,0 +1,11 @@
+let x = await new Promise((resolve)=>{
+    resolve("default")
+})
+
+let named = await new Promise((resolve)=>{
+    resolve("named")
+})
+
+export default x;
+
+export {named}

e2e/fixtures/javascript.async_module_in_loop/component.js

@@ -0,0 +1,11 @@
+import { listKeys } from "./utils"
+
+import { named } from "./async"
+
+export const config = {
+    key: "value"
+}
+
+export function displayConfig() {
+    return listKeys()
+}

e2e/fixtures/javascript.async_module_in_loop/expect.js

@@ -0,0 +1,9 @@
+const {
+  injectSimpleJest,
+  parseBuildResult,
+  moduleDefinitionOf,
+} = require("../../../scripts/test-utils");
+const { files } = parseBuildResult(__dirname);
+injectSimpleJest();
+
+require("./dist/index.js");

e2e/fixtures/javascript.async_module_in_loop/index.js

@@ -0,0 +1,6 @@
+import {displayConfig} from "./component";
+
+it("should require looped async moule", () => {
+    expect(displayConfig()).toStrictEqual(["key"])
+})
+

e2e/fixtures/javascript.async_module_in_loop/mako.config.json

@@ -0,0 +1,5 @@
+{
+  "entry": {
+    "index": "./index.js"
+  }
+}

e2e/fixtures/javascript.async_module_in_loop/utils.js

@@ -0,0 +1,9 @@
+import {config} from "./component"
+
+export function listKeys() {
+    if(config){
+
+    return Object.keys(config)
+    }
+    return ["oops"]
+}