feat(arch): disconnected graph handling for positioning

packages/mermaid/src/diagrams/architecture/architectureDb.ts

@@ -7,6 +7,7 @@ import type {
   ArchitectureLine,
   ArchitectureDirectionPairMap,
   ArchitectureDirectionPair,
+  ArchitectureSpatialMap,
 } from './architectureTypes.js';
 import { getConfig } from '../../diagram-api/diagramAPI.js';
 import { getArchitectureDirectionPair, isArchitectureDirection, shiftPositionByArchitectureDirectionPair } from './architectureTypes.js';
@@ -135,15 +136,22 @@ const getDataStructures = () => {
       return prev
     }, {});
     
+    // Configuration for the initial pass of BFS
     const [firstId, _] = Object.entries(adjList)[0];
-    const spatialMap = {[firstId]: [0,0]};
     const visited = {[firstId]: 1};
-    const queue = [firstId];
+    const notVisited = Object.keys(adjList).reduce((prev, id) => (
+      id === firstId ? prev : {...prev, [id]: 1}
+    ), {} as Record<string, number>);
+    
     // Perform BFS on adjacency list
+    const BFS = (startingId: string): ArchitectureSpatialMap => {
+      const spatialMap = {[startingId]: [0,0]};
+      const queue = [startingId];
       while(queue.length > 0) {
         const id = queue.shift();
         if (id) {
           visited[id] = 1
+          delete notVisited[id]
           const adj = adjList[id];
           const [posX, posY] = spatialMap[id];
           Object.entries(adj).forEach(([dir, rhsId]) => {
@@ -155,9 +163,17 @@ const getDataStructures = () => {
           })
         }
       }
+      return spatialMap;
+    }
+    const spatialMaps = [BFS(firstId)];
+    
+    // If our diagram is disconnected, keep adding additional spatial maps until all disconnected graphs have been found
+    while (Object.keys(notVisited).length > 0) {
+      spatialMaps.push(BFS(Object.keys(notVisited)[0]))
+    }
     datastructures = {
       adjList,
-      spatialMap
+      spatialMaps
     }
     console.log(datastructures)
   }

packages/mermaid/src/diagrams/architecture/architectureRenderer.ts

@@ -7,16 +7,12 @@ import type { DrawDefinition, SVG } from '../../diagram-api/types.js';
 import { log } from '../../logger.js';
 import { selectSvgElement } from '../../rendering-util/selectSvgElement.js';
 import {
-  isArchitectureDirectionX,
   type ArchitectureDB,
   type ArchitectureDirection,
   type ArchitectureGroup,
   type ArchitectureLine,
   type ArchitectureService,
-  isArchitectureDirectionY,
   ArchitectureDataStructures,
-  ArchitectureDirectionPair,
-  isArchitectureDirectionXY,
   ArchitectureDirectionName,
   getOppositeArchitectureDirection,
 } from './architectureTypes.js';
@@ -25,7 +21,6 @@ import { setupGraphViewbox } from '../../setupGraphViewbox.js';
 import type { D3Element } from '../../mermaidAPI.js';
 import { drawEdges, drawGroups, drawService } from './svgDraw.js';
 import { getConfigField } from './architectureDb.js';
-import { X } from 'vitest/dist/reporters-5f784f42.js';
 
 cytoscape.use(fcose);
 
@@ -104,7 +99,7 @@ function layoutArchitecture(
   services: ArchitectureService[],
   groups: ArchitectureGroup[],
   lines: ArchitectureLine[],
-  {adjList, spatialMap}: ArchitectureDataStructures
+  {adjList, spatialMaps}: ArchitectureDataStructures
 ): Promise<cytoscape.Core> {
   return new Promise((resolve) => {
     const renderEl = select('body').append('div').attr('id', 'cy').attr('style', 'display:none');
@@ -160,6 +155,7 @@ function layoutArchitecture(
 
     // Use the spatial map to create alignment arrays for fcose
     const [horizontalAlignments, verticalAlignments] = (() => {
+      const alignments = spatialMaps.map(spatialMap => {
         const _horizontalAlignments: Record<number, string[]> = {}
         const _verticalAlignments: Record<number, string[]> = {}
         // Group service ids in an object with their x and y coordinate as the key
@@ -169,12 +165,18 @@ function layoutArchitecture(
           _horizontalAlignments[y].push(id);
           _verticalAlignments[x].push(id);
         })
-
         // Merge the values of each object into a list if the inner list has at least 2 elements
-      return [
+        return {
-        Object.values(_horizontalAlignments).filter(arr => arr.length > 1), 
+          horiz: Object.values(_horizontalAlignments).filter(arr => arr.length > 1), 
-        Object.values(_verticalAlignments).filter(arr => arr.length > 1)
+          vert: Object.values(_verticalAlignments).filter(arr => arr.length > 1)
-      ]
+        }
+      })
+
+      // Merge the alginment lists for each spatial map into one 2d array per axis
+      return alignments.reduce(([prevHoriz, prevVert], {horiz, vert}) => {
+        return [[...prevHoriz, ...horiz], [...prevVert, ...vert]]
+      }, [[] as string[][], [] as string[][]])
+
     })();
 
     // Create the relative constraints for fcose by using an inverse of the spatial map and performing BFS on it
@@ -182,6 +184,8 @@ function layoutArchitecture(
       const _relativeConstraints: fcose.FcoseRelativePlacementConstraint[] = []
       const posToStr = (pos: number[]) => `${pos[0]},${pos[1]}`
       const strToPos = (pos: string) => pos.split(',').map(p => parseInt(p));
+
+      spatialMaps.forEach(spatialMap => {
         const invSpatialMap = Object.fromEntries(Object.entries(spatialMap).map(([id, pos]) => [posToStr(pos), id]))
         console.log('===== invSpatialMap =====')
         console.log(invSpatialMap);
@@ -216,10 +220,10 @@ function layoutArchitecture(
                   })
                 }
               })
-            
             }
           }
         } 
+      })
       return _relativeConstraints;
     })();
     console.log(`Horizontal Alignments:`)

packages/mermaid/src/diagrams/architecture/architectureTypes.ts

@@ -148,7 +148,7 @@ export type ArchitectureAdjacencyList = {[id: string]: ArchitectureDirectionPair
 export type ArchitectureSpatialMap = Record<string, number[]>
 export type ArchitectureDataStructures = {
   adjList: ArchitectureAdjacencyList;
-  spatialMap: ArchitectureSpatialMap;
+  spatialMaps: ArchitectureSpatialMap[];
 }
 
 export interface ArchitectureFields {