fix some issue with grouping and add to changlog

Author: florianbgt

packages/cli/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+Implement grouping
+Fix minor UI issue with edges
+
 ## [0.0.6] - 2024-10-27
 
 Update design css

packages/cli/src/api/scan.ts

@@ -1,15 +1,15 @@
 import { z } from "zod";
 import { getDependencyTree } from "../helper/dependencies";
 import { ScanCodebaseResponsePayload } from "../helper/payloads";
-import { iterateOverTree } from "../helper/tree";
+import { getEndpontsFromTree } from "../helper/tree";
 import { scanSchema } from "./helpers/validation";
 
 export function scan(
   payload: z.infer<typeof scanSchema>,
 ): ScanCodebaseResponsePayload {
   const tree = getDependencyTree(payload.entrypointPath);
 
-  const endpoints = iterateOverTree(tree);
+  const endpoints = getEndpontsFromTree(tree);
 
   return { endpoints };
 }

packages/cli/src/api/split.ts

@@ -3,10 +3,11 @@ import path from "path";
 import { getDependencyTree } from "../helper/dependencies";
 import { cleanupOutputDir, createOutputDir } from "../helper/file";
 import { SplitCodebaseResponsePayload } from "../helper/payloads";
-import { getGroupsFromTree, splitPath } from "../helper/tree";
+import { getEndpontsFromTree, splitPath } from "../helper/tree";
 import { splitSchema } from "./helpers/validation";
 import { z } from "zod";
 import { GroupMap } from "../helper/types";
+import { getGroupsFromEndpoints } from "../helper/groups";
 
 export function split(
   payload: z.infer<typeof splitSchema>,
@@ -23,8 +24,11 @@ export function split(
   cleanupOutputDir(payload.outputDir);
   createOutputDir(payload.outputDir);
 
-  // Iterate over the tree and get groups
-  const groups = getGroupsFromTree(tree);
+  // Iterate over the tree and get endpoints
+  const endpoints = getEndpontsFromTree(tree);
+
+  // Get groups from the endpoints
+  const groups = getGroupsFromEndpoints(endpoints);
 
   // Process each endpoint for splitting
   for (const group of groups) {

packages/cli/src/api/sync.ts

@@ -9,12 +9,12 @@ import {
 } from "../helper/file";
 import { getDependencyTree } from "../helper/dependencies";
 import Parser from "tree-sitter";
-import { iterateOverTree } from "../helper/tree";
+import { getEndpontsFromTree } from "../helper/tree";
 
 export function sync(payload: z.infer<typeof syncSchema>) {
   const tree = getDependencyTree(payload.entrypointPath);
 
-  const endpoints = iterateOverTree(tree);
+  const endpoints = getEndpontsFromTree(tree);
 
   const updatedEndpoints = endpoints.map((endpoint) => {
     const updatedEndpoint = payload.endpoints.find(

packages/cli/src/commands/split.ts

@@ -2,8 +2,9 @@ import path from "path";
 import fs from "fs";
 import { getDependencyTree } from "../helper/dependencies";
 import { cleanupOutputDir, createOutputDir } from "../helper/file";
-import { getGroupsFromTree, splitPath } from "../helper/tree";
+import { getEndpontsFromTree, splitPath } from "../helper/tree";
 import { GroupMap } from "../helper/types";
+import { getGroupsFromEndpoints } from "../helper/groups";
 
 export default function splitCommandHandler(
   entrypointPath: string, // Path to the entrypoint file
@@ -17,8 +18,11 @@ export default function splitCommandHandler(
   cleanupOutputDir(outputDir);
   createOutputDir(outputDir);
 
-  // Iterate over the tree and get groups
-  const groups = getGroupsFromTree(tree);
+  // Iterate over the tree and get endpoints
+  const endpoints = getEndpontsFromTree(tree);
+
+  // Get groups from the endpoints
+  const groups = getGroupsFromEndpoints(endpoints);
 
   // Process each endpoint for splitting
   for (const group of groups) {

packages/cli/src/helper/groups.ts

@@ -0,0 +1,19 @@
+import { Endpoint, Group } from "./types";
+
+export function getGroupsFromEndpoints(endpoints: Endpoint[]) {
+  const groups: Group[] = [];
+
+  for (const endpoint of endpoints) {
+    const group = groups.find((group) => group.name === endpoint.group);
+    if (group) {
+      group.endpoints.push(endpoint);
+    } else {
+      groups.push({
+        name: endpoint.group || "",
+        endpoints: [endpoint],
+      });
+    }
+  }
+
+  return groups;
+}

packages/cli/src/helper/tree.ts

@@ -5,7 +5,7 @@ import { getEndpointsFromFile } from "./file";
 import { Dependencies, Endpoint, Group, GroupMap } from "./types";
 
 // Helper function to process the tree and gather endpoints
-export function getGroupsFromTree(
+export function getEndpontsFromTree(
   tree: Dependencies,
   parentFiles: string[] = [],
   endpoints: Endpoint[] = [],
@@ -27,25 +27,11 @@ export function getGroupsFromTree(
     // Recursively process the tree
     if (typeof value !== "string") {
       const updatedParentFiles = [...parentFiles, filePath];
-      getGroupsFromTree(value, updatedParentFiles, endpoints);
+      getEndpontsFromTree(value, updatedParentFiles, endpoints);
     }
   }
 
-  const groups: Group[] = [];
-
-  for (const endpoint of endpoints) {
-    const group = groups.find((group) => group.name === endpoint.group);
-    if (group) {
-      group.endpoints.push(endpoint);
-    } else {
-      groups.push({
-        name: endpoint.group || "",
-        endpoints: [endpoint],
-      });
-    }
-  }
-
-  return groups;
+  return endpoints;
 }
 
 // Function to handle splitting and storing paths based on the split command logic
@@ -73,18 +59,18 @@ export function splitPath(
   );
   fs.copyFileSync(entrypointPath, entrypointCopyPath);
 
-  // Copy other files based on the dependencies, remove duplicates
-  const files = [
-    ...new Set(
-      ...group.endpoints.map((endpoint) => {
-        return [
-          endpoint.filePath,
-          ...endpoint.parentFilePaths,
-          ...endpoint.childrenFilePaths,
-        ];
-      }),
-    ),
-  ];
+  // Copy other files based on the dependencies
+  const endpointsFiles = group.endpoints.map((endpoint) => {
+    return [
+      endpoint.filePath,
+      ...endpoint.parentFilePaths,
+      ...endpoint.childrenFilePaths,
+    ];
+  });
+
+  // Flatten the array and remove duplicates
+  const files = Array.from(new Set(endpointsFiles.flat()));
+
   for (const filePath of files) {
     const relativeFileNamePath = path.relative(targetDir, filePath);
     const destinationPath = path.join(