truecourse 0.2.3 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "truecourse",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Visualize your codebase architecture as an interactive graph",
   "type": "module",
   "bin": {

package/server.mjs

@@ -407088,7 +407088,7 @@ function computeLayerContentSize(level, layerModules, methodsByModule) {
     const height = rows * MODULE_NODE_HEIGHT + (rows - 1) * MODULE_GAP;
     return { width: width2, height };
   }
-  let maxModWidth = 0;
+  const moduleWidths = [];
   const moduleHeights = [];
   for (const mod2 of layerModules) {
     const mths = methodsByModule.get(mod2.id) || [];
@@ -407101,11 +407101,19 @@ function computeLayerContentSize(level, layerModules, methodsByModule) {
       MIN_MODULE_WIDTH
     );
     const modHeight = MODULE_NODE_HEIGHT + mthRows * METHOD_NODE_HEIGHT + (mthRows - 1) * METHOD_GAP + 8;
-    if (modWidth > maxModWidth) maxModWidth = modWidth;
+    moduleWidths.push(modWidth);
     moduleHeights.push(modHeight);
   }
   const cols = Math.max(Math.ceil(layerModules.length / MAX_PER_COL), 1);
-  const width = cols * maxModWidth + (cols - 1) * MOD_COL_GAP;
+  const colMaxWidths = new Array(cols).fill(MIN_MODULE_WIDTH);
+  for (let i = 0; i < moduleWidths.length; i++) {
+    const c = Math.floor(i / MAX_PER_COL);
+    if (moduleWidths[i] > colMaxWidths[c]) colMaxWidths[c] = moduleWidths[i];
+  }
+  let width = 0;
+  for (let c = 0; c < cols; c++) {
+    width += colMaxWidths[c] + (c > 0 ? MOD_COL_GAP : 0);
+  }
   let maxColHeight = 0;
   for (let col = 0; col < cols; col++) {
     let colH = 0;
@@ -407120,6 +407128,24 @@ function computeLayerContentSize(level, layerModules, methodsByModule) {
 }
 function placeModulesInGrid(nodes, level, layerModules, methodsByModule, layerNodeId, layer, svc, layerWidth) {
   const cols = Math.max(Math.ceil(layerModules.length / MAX_PER_COL), 1);
+  const colMaxWidths = new Array(cols).fill(MIN_MODULE_WIDTH);
+  if (level === "method") {
+    for (let i = 0; i < layerModules.length; i++) {
+      const c = Math.floor(i / MAX_PER_COL);
+      const mths = methodsByModule.get(layerModules[i].id) || [];
+      const mthCount = mths.length || 1;
+      const mthCols = Math.max(Math.ceil(mthCount / MAX_PER_COL), 1);
+      const w = Math.max(
+        MOD_PAD_X * 2 + mthCols * METHOD_NODE_WIDTH + (mthCols - 1) * METHOD_COL_GAP,
+        MIN_MODULE_WIDTH
+      );
+      if (w > colMaxWidths[c]) colMaxWidths[c] = w;
+    }
+  }
+  const colX = [LAYER_PAD_X];
+  for (let c = 1; c < cols; c++) {
+    colX[c] = colX[c - 1] + colMaxWidths[c - 1] + MOD_COL_GAP;
+  }
   for (let i = 0; i < layerModules.length; i++) {
     const mod2 = layerModules[i];
     const col = Math.floor(i / MAX_PER_COL);
@@ -407169,7 +407195,7 @@ function placeModulesInGrid(nodes, level, layerModules, methodsByModule, layerNo
         const prevRows = Math.min(prevCount, MAX_PER_COL);
         yOffset += MODULE_NODE_HEIGHT + prevRows * METHOD_NODE_HEIGHT + (prevRows - 1) * METHOD_GAP + 8 + MODULE_GAP;
       }
-      const x = LAYER_PAD_X + col * (modWidth + MOD_COL_GAP);
+      const x = colX[col];
       nodes.push({
         id: mod2.id,
         type: "moduleNode",