fix: worker self spawn

crates/mako/src/generate/group_chunk.rs

@@ -57,20 +57,28 @@ impl Compiler {
             );
             chunk_graph.add_chunk(chunk);
 
+            /* A worker can self-spawn from it's source file, that will leads to a circular dependencies,
+             * a real case is https://unpkg.com/browse/@antv/layout-wasm@1.4.0/pkg-parallel/.
+             * Memorize handled workers to avoid infinite resolving
+             */
+            let mut visited_workers = HashSet::<ModuleId>::new();
+
             // 抽离成两个函数处理动态依赖中可能有 worker 依赖、worker 依赖中可能有动态依赖的复杂情况
             self.handle_dynamic_dependencies(
                 &chunk_name,
                 dynamic_dependencies,
                 &visited,
                 &mut edges,
                 &mut chunk_graph,
+                &mut visited_workers,
             );
             self.handle_worker_dependencies(
                 &chunk_name,
                 worker_dependencies,
                 &visited,
                 &mut edges,
                 &mut chunk_graph,
+                &mut visited_workers,
             );
         }
 
@@ -86,27 +94,33 @@ impl Compiler {
         visited: &HashSet<ModuleId>,
         edges: &mut Vec<(ModuleId, ModuleId)>,
         chunk_graph: &mut ChunkGraph,
+        visited_workers: &mut HashSet<ModuleId>,
     ) {
         visit_modules(dynamic_dependencies, Some(visited.clone()), |head| {
-            let (chunk, dynamic_dependencies, worker_dependencies) = self.create_chunk(
+            let (chunk, dynamic_dependencies, mut worker_dependencies) = self.create_chunk(
                 head,
                 ChunkType::Async,
                 chunk_graph,
                 vec![chunk_name.to_string()],
             );
+
+            worker_dependencies.retain(|w| !visited_workers.contains(w));
+
             edges.extend(
                 [dynamic_dependencies.clone(), worker_dependencies.clone()]
                     .concat()
                     .into_iter()
                     .map(|dep| (chunk.id.clone(), dep.generate(&self.context).into())),
             );
             chunk_graph.add_chunk(chunk);
+
             self.handle_worker_dependencies(
                 chunk_name,
                 worker_dependencies,
                 visited,
                 edges,
                 chunk_graph,
+                visited_workers,
             );
 
             dynamic_dependencies
@@ -120,27 +134,36 @@ impl Compiler {
         visited: &HashSet<ModuleId>,
         edges: &mut Vec<(ModuleId, ModuleId)>,
         chunk_graph: &mut ChunkGraph,
+        visited_workers: &mut HashSet<ModuleId>,
     ) {
         visit_modules(worker_dependencies, Some(visited.clone()), |head| {
-            let (chunk, dynamic_dependencies, worker_dependencies) = self.create_chunk(
+            let (chunk, dynamic_dependencies, mut worker_dependencies) = self.create_chunk(
                 head,
                 ChunkType::Worker(head.clone()),
                 chunk_graph,
                 vec![chunk_name.to_string()],
             );
+
+            worker_dependencies.retain(|w| !visited_workers.contains(w));
+
             edges.extend(
                 [dynamic_dependencies.clone(), worker_dependencies.clone()]
                     .concat()
                     .into_iter()
                     .map(|dep| (chunk.id.clone(), dep.generate(&self.context).into())),
             );
+
             chunk_graph.add_chunk(chunk);
+
+            visited_workers.insert(head.clone());
+
             self.handle_dynamic_dependencies(
                 chunk_name,
                 dynamic_dependencies,
                 visited,
                 edges,
                 chunk_graph,
+                visited_workers,
             );
 
             worker_dependencies

e2e/fixtures/worker.self-spawn/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+

e2e/fixtures/worker.self-spawn/expect.js

@@ -0,0 +1,10 @@
+const assert = require("assert");
+const { parseBuildResult } = require("../../../scripts/test-utils");
+const { files } = parseBuildResult(__dirname);
+
+assert(
+  files["src_workerHelper_ts-worker.js"].includes(
+    'new Worker(new URL("src_workerHelper_ts-async.js",'
+  ),
+  "should have self-spawn codes"
+);

e2e/fixtures/worker.self-spawn/mako.config.json

@@ -0,0 +1 @@
+{}

e2e/fixtures/worker.self-spawn/src/index.ts

@@ -0,0 +1,3 @@
+export default (v: any) => console.log(v);
+
+import("./workerHelper").then((w) => w.startWorkers());

e2e/fixtures/worker.self-spawn/src/workerHelper.ts

@@ -0,0 +1,25 @@
+function waitForMsgType(target, type) {
+  return new Promise((resolve) => {
+    target.addEventListener("message", function onMsg({ data }) {
+      if (data == null || data.type !== type) return;
+      target.removeEventListener("message", onMsg);
+      resolve(data);
+    });
+  });
+}
+
+waitForMsgType(self, "spawn").then(async (data) => {
+  const log = await import(".");
+  log.default("spawn a web worker");
+});
+
+export async function startWorkers() {
+  await Promise.all(
+    Array.from({ length: 2 }, async () => {
+      const worker = new Worker(new URL("./workerHelper", import.meta.url), {
+        type: "module",
+      });
+      worker.postMessage("spawn");
+    })
+  );
+}

examples/react/src/foo.ts

@@ -1,2 +1 @@
-
 export const foo = 1;