Fix worker script issues and await in api

packages/cli/src/api/index.ts

@@ -1,10 +1,10 @@
 import { json, Router } from "express";
+import { z } from "zod";
+import { napiConfigSchema } from "../config";
+import { scanSchema, splitSchema, syncSchema } from "./helpers/validation";
 import { scan } from "./scan";
 import { split } from "./split";
 import { sync } from "./sync";
-import { scanSchema, splitSchema, syncSchema } from "./helpers/validation";
-import { napiConfigSchema } from "../config";
-import { z } from "zod";
 
 export function getApi(napiConfig: z.infer<typeof napiConfigSchema>) {
   const api = Router();
@@ -42,13 +42,13 @@ export function getApi(napiConfig: z.infer<typeof napiConfigSchema>) {
     res.status(200).json({ success: true });
   });
 
-  api.post("/api/split", (req, res) => {
+  api.post("/api/split", async (req, res) => {
     const result = splitSchema.safeParse(req.body);
     if (!result.success) {
       res.status(400).json(result.error.issues);
       return;
     }
-    const splitResult = split(result.data);
+    const splitResult = await split(result.data);
     res.status(200).json(splitResult);
   });
 

packages/cli/src/api/split.ts

@@ -7,13 +7,13 @@ import { cleanupOutputDir, createOutputDir } from "../helper/file";
 import SplitRunner from "../splitRunner/splitRunner";
 import { splitSchema } from "./helpers/validation";
 
-export function split(payload: z.infer<typeof splitSchema>) {
+export async function split(payload: z.infer<typeof splitSchema>) {
   console.time("split command");
   const groupMap: Record<number, Group> = {};
 
   // Get the dependency tree
   const dependencyTreeManager = new DependencyTreeManager(
-    payload.entrypointPath,
+    payload.entrypointPath
   );
 
   const outputDir = payload.outputDir || path.dirname(payload.entrypointPath);
@@ -26,30 +26,26 @@ export function split(payload: z.infer<typeof splitSchema>) {
   const groups = dependencyTreeManager.getGroups();
 
   // Process each group for splitting
-  groups.forEach((group, index) => {
-    const splitRunner = new SplitRunner(dependencyTreeManager, group);
-    const files = splitRunner.run();
-
-    const targetDir = path.dirname(payload.entrypointPath);
-    const annotationDirectory = path.join(outputDir, index.toString());
-
-    files
-      .then((files) => {
-        files.forEach((file) => {
-          const relativeFileNamePath = path.relative(targetDir, file.path);
-          const destinationPath = path.join(
-            annotationDirectory,
-            relativeFileNamePath,
-          );
-          fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
-          fs.writeFileSync(destinationPath, file.sourceCode, "utf8");
-        });
-      })
-      .catch((error) => {
-        console.error(error);
-        throw error;
+  await Promise.all(
+    groups.map(async (group, index) => {
+      const splitRunner = new SplitRunner(dependencyTreeManager, group);
+      const files = await splitRunner.run();
+
+      const targetDir = path.dirname(payload.entrypointPath);
+      const annotationDirectory = path.join(outputDir, index.toString());
+
+      files.forEach((file) => {
+        const relativeFileNamePath = path.relative(targetDir, file.path);
+        const destinationPath = path.join(
+          annotationDirectory,
+          relativeFileNamePath
+        );
+        fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+        fs.writeFileSync(destinationPath, file.sourceCode, "utf8");
       });
-  });
+      return files;
+    })
+  );
 
   // Store the processed annotations in the output directory
   groups.forEach((group, index) => {

packages/cli/src/commands/split.ts

@@ -5,9 +5,9 @@ import { Group } from "../dependencyManager/types";
 import { cleanupOutputDir, createOutputDir } from "../helper/file";
 import SplitRunner from "../splitRunner/splitRunner";
 
-export default function splitCommandHandler(
+export default async function splitCommandHandler(
   entrypointPath: string, // Path to the entrypoint file
-  outputDir: string, // Path to the output directory
+  outputDir: string // Path to the output directory
 ) {
   const groupMap: Record<number, Group> = {};
 
@@ -20,30 +20,25 @@ export default function splitCommandHandler(
   const groups = dependencyTreeManager.getGroups();
 
   // Process each group for splitting
-  groups.forEach((group, index) => {
-    const splitRunner = new SplitRunner(dependencyTreeManager, group);
-    const files = splitRunner.run();
-
-    const targetDir = path.dirname(entrypointPath);
-    const annotationDirectory = path.join(outputDir, index.toString());
-
-    files
-      .then((files) => {
-        files.forEach((file) => {
-          const relativeFileNamePath = path.relative(targetDir, file.path);
-          const destinationPath = path.join(
-            annotationDirectory,
-            relativeFileNamePath,
-          );
-          fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
-          fs.writeFileSync(destinationPath, file.sourceCode, "utf8");
-        });
-      })
-      .catch((error) => {
-        console.error(error);
-        throw error;
+  await Promise.all(
+    groups.map(async (group, index) => {
+      const splitRunner = new SplitRunner(dependencyTreeManager, group);
+      const files = await splitRunner.run();
+
+      const targetDir = path.dirname(entrypointPath);
+      const annotationDirectory = path.join(outputDir, index.toString());
+
+      files.forEach((file) => {
+        const relativeFileNamePath = path.relative(targetDir, file.path);
+        const destinationPath = path.join(
+          annotationDirectory,
+          relativeFileNamePath
+        );
+        fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+        fs.writeFileSync(destinationPath, file.sourceCode, "utf8");
       });
-  });
+    })
+  );
 
   // Store the processed annotations in the output directory
   groups.forEach((group, index) => {

packages/cli/src/splitRunner/splitRunner.ts

@@ -17,7 +17,7 @@ class SplitRunner {
     console.info(`Splitting group: ${this.group.name}`);
     console.time("Total Splitting Time");
 
-    const worker = new Worker(path.resolve(__dirname, "worker.js"), {
+    const worker = new Worker(path.resolve(__dirname, "worker"), {
       workerData: {
         entrypointPath: this.dependencyTreeManager.dependencyTree.path,
         group: this.group,

packages/cli/src/splitRunner/worker.ts

@@ -25,7 +25,7 @@ function removeAnnotationFromOtherGroups() {
 
     const updatedSourceCode = languagePlugin.removeAnnotationFromOtherGroups(
       file.sourceCode,
-      group,
+      group
     );
     return { ...file, sourceCode: updatedSourceCode };
   });
@@ -51,7 +51,7 @@ function removeInvalidImportsAndUsages(exportMap: Map<string, DepExport[]>) {
     const updatedSourceCode = languagePlugin.cleanupInvalidImports(
       file.path,
       file.sourceCode,
-      exportMap,
+      exportMap
     );
 
     return { ...file, sourceCode: updatedSourceCode };
@@ -64,7 +64,7 @@ function removeUnusedImports() {
 
     const updatedSourceCode = languagePlugin.cleanupUnusedImports(
       file.path,
-      file.sourceCode,
+      file.sourceCode
     );
 
     return { ...file, sourceCode: updatedSourceCode };
@@ -135,7 +135,7 @@ function removeErrors() {
 
     const query = new Parser.Query(
       languagePlugin.parser.getLanguage(),
-      "(ERROR) @error",
+      "(ERROR) @error"
     );
     const errorCaptures = query.captures(tree.rootNode);
     errorCaptures.forEach((capture) => {
@@ -147,7 +147,7 @@ function removeErrors() {
 
     const updatedSourceCode = removeIndexesFromSourceCode(
       file.sourceCode,
-      indexesToRemove,
+      indexesToRemove
     );
 
     return { ...file, sourceCode: updatedSourceCode };