Merge pull request #39 from AlexanderGrooff/sequence-diagram-web

add sequence diagram to web interface

Author: AlexanderGrooff

cmd/arrow.go

@@ -159,7 +159,7 @@ func (g *graph) drawPath(path []gridCoord) (*drawing, [][]drawingCoord, []direct
 			continue
 		}
 		dir := determineDirection(genericCoord(previousCoord), genericCoord(nextCoord))
-		s := d.drawLine(previousDrawingCoord, nextDrawingCoord, 1, -1)
+		s := g.drawLine(d, previousDrawingCoord, nextDrawingCoord, 1, -1)
 		if len(s) == 0 {
 			// drawLine may return no coords if offsets collapse the line. Use at least one point so arrow and junction logic
 			// can still infer a direction.
@@ -178,7 +178,7 @@ func (g *graph) drawBoxStart(path []gridCoord, firstLine []drawingCoord) *drawin
 	dir := determineDirection(genericCoord(path[0]), genericCoord(path[1]))
 	log.Debugf("Drawing box start at %v with direction %v for line %v", from, dir, path)
 
-	if useAscii {
+	if g.useAscii {
 		return &d
 	}
 
@@ -208,7 +208,7 @@ func (g *graph) drawArrowHead(line []drawingCoord, fallback direction) *drawing
 	}
 
 	var char string
-	if !useAscii {
+	if !g.useAscii {
 		switch dir {
 		case Up:
 			char = "▲"
@@ -291,7 +291,7 @@ func (g *graph) drawCorners(path []gridCoord) *drawing {
 		nextDir := determineDirection(genericCoord(coord), genericCoord(path[idx+1]))
 
 		var corner string
-		if !useAscii {
+		if !g.useAscii {
 			switch {
 			case (prevDir == Right && nextDir == Down) || (prevDir == Up && nextDir == Left):
 				corner = "┐"

cmd/diagram.go

@@ -83,6 +83,7 @@ func (gd *GraphDiagram) Render(config *diagram.Config) (string, error) {
 		styleType = "cli"
 	}
 	gd.properties.styleType = styleType
+	gd.properties.useAscii = config.UseAscii
 
 	return drawMap(gd.properties), nil
 }

cmd/draw.go

@@ -35,7 +35,7 @@ type styleClass struct {
 
 func (g *graph) drawNode(n *node) {
 	log.Debug("Drawing node ", n.name, " at ", *n.drawingCoord)
-	m := mergeDrawings(g.drawing, *n.drawingCoord, n.drawing)
+	m := g.mergeDrawings(g.drawing, *n.drawingCoord, n.drawing)
 	g.drawing = m
 }
 
@@ -55,12 +55,12 @@ func (d *drawing) drawText(start drawingCoord, text string) {
 	}
 }
 
-func (d *drawing) drawLine(from drawingCoord, to drawingCoord, offsetFrom int, offsetTo int) []drawingCoord {
+func (g *graph) drawLine(d *drawing, from drawingCoord, to drawingCoord, offsetFrom int, offsetTo int) []drawingCoord {
 	// Offset determines how far from the actual coord the line should start/stop.
 	direction := determineDirection(genericCoord(from), genericCoord(to))
 	drawnCoords := make([]drawingCoord, 0)
 	log.Debug("Drawing line from ", from, " to ", to, " direction: ", direction, " offsetFrom: ", offsetFrom, " offsetTo: ", offsetTo)
-	if !useAscii {
+	if !g.useAscii {
 		switch direction {
 		case Up:
 			for y := from.y - offsetFrom; y >= to.y-offsetTo; y-- {
@@ -155,6 +155,7 @@ func drawMap(properties *graphProperties) string {
 	g.setStyleClasses(properties)
 	g.paddingX = properties.paddingX
 	g.paddingY = properties.paddingY
+	g.useAscii = properties.useAscii
 	g.setSubgraphs(properties.subgraphs)
 	g.createMapping()
 	d := g.draw()
@@ -182,7 +183,7 @@ func drawBox(n *node, g graph) *drawing {
 	to := drawingCoord{w, h}
 	boxDrawing := *(mkDrawing(Max(from.x, to.x), Max(from.y, to.y)))
 	log.Debug("Drawing box from ", from, " to ", to)
-	if !useAscii {
+	if !g.useAscii {
 		// Draw top border
 		for x := from.x + 1; x < to.x; x++ {
 			boxDrawing[x][from.y] = "─" // Horizontal line
@@ -252,7 +253,7 @@ func drawSubgraph(sg *subgraph, g graph) *drawing {
 
 	log.Debugf("Drawing subgraph %s from (%d,%d) to (%d,%d)", sg.name, from.x, from.y, to.x, to.y)
 
-	if !useAscii {
+	if !g.useAscii {
 		// Draw top border
 		for x := from.x + 1; x < to.x; x++ {
 			subgraphDrawing[x][from.y] = "─"
@@ -351,7 +352,15 @@ func wrapTextInColor(text, c, styleType string) string {
 func (d *drawing) increaseSize(x int, y int) {
 	currSizeX, currSizeY := getDrawingSize(d)
 	drawingWithNewSize := mkDrawing(Max(x, currSizeX), Max(y, currSizeY))
-	*d = *mergeDrawings(drawingWithNewSize, drawingCoord{0, 0}, d)
+	// For increaseSize, we don't need junction merging, so just copy the drawing
+	for x := 0; x < len(*drawingWithNewSize); x++ {
+		for y := 0; y < len((*drawingWithNewSize)[0]); y++ {
+			if x < len(*d) && y < len((*d)[0]) {
+				(*drawingWithNewSize)[x][y] = (*d)[x][y]
+			}
+		}
+	}
+	*d = *drawingWithNewSize
 }
 
 func (g *graph) setDrawingSizeToGridConstraints() {
@@ -393,7 +402,7 @@ func mergeJunctions(c1, c2 string) string {
 	return c1
 }
 
-func mergeDrawings(baseDrawing *drawing, mergeCoord drawingCoord, drawings ...*drawing) *drawing {
+func (g *graph) mergeDrawings(baseDrawing *drawing, mergeCoord drawingCoord, drawings ...*drawing) *drawing {
 	// Find the maximum dimensions
 	maxX, maxY := getDrawingSize(baseDrawing)
 	for _, d := range drawings {
@@ -421,7 +430,7 @@ func mergeDrawings(baseDrawing *drawing, mergeCoord drawingCoord, drawings ...*d
 				c := (*d)[x][y]
 				if c != " " {
 					currentChar := (*mergedDrawing)[x+mergeCoord.x][y+mergeCoord.y]
-					if !useAscii && isJunctionChar(c) && isJunctionChar(currentChar) {
+					if !g.useAscii && isJunctionChar(c) && isJunctionChar(currentChar) {
 						(*mergedDrawing)[x+mergeCoord.x][y+mergeCoord.y] = mergeJunctions(currentChar, c)
 					} else {
 						(*mergedDrawing)[x+mergeCoord.x][y+mergeCoord.y] = c
@@ -515,7 +524,15 @@ func (d drawing) debugDrawingWrapper() *drawing {
 		debugDrawing[0][y+1] = fmt.Sprintf("%2d", y)
 	}
 
-	return mergeDrawings(&debugDrawing, drawingCoord{1, 1}, &d)
+	// For debug wrapper, we don't need junction merging, so just copy
+	for x := 0; x < len(debugDrawing); x++ {
+		for y := 0; y < len(debugDrawing[0]); y++ {
+			if x >= 2 && y >= 1 && x-2 < len(d) && y-1 < len(d[0]) {
+				debugDrawing[x][y] = d[x-2][y-1]
+			}
+		}
+	}
+	return &debugDrawing
 }
 
 func (d drawing) debugCoordWrapper(g graph) *drawing {
@@ -538,5 +555,5 @@ func (d drawing) debugCoordWrapper(g graph) *drawing {
 		currY += h
 	}
 
-	return mergeDrawings(&debugDrawing, drawingCoord{1, 1}, &d)
+	return g.mergeDrawings(&debugDrawing, drawingCoord{1, 1}, &d)
 }

cmd/graph.go

@@ -43,6 +43,7 @@ type graph struct {
 	subgraphs    []*subgraph
 	offsetX      int
 	offsetY      int
+	useAscii     bool
 }
 
 type subgraph struct {
@@ -550,11 +551,11 @@ func (g *graph) draw() *drawing {
 	}
 
 	// Draw in order
-	g.drawing = mergeDrawings(g.drawing, drawingCoord{0, 0}, lineDrawings...)
-	g.drawing = mergeDrawings(g.drawing, drawingCoord{0, 0}, cornerDrawings...)
-	g.drawing = mergeDrawings(g.drawing, drawingCoord{0, 0}, arrowHeadDrawings...)
-	g.drawing = mergeDrawings(g.drawing, drawingCoord{0, 0}, boxStartDrawings...)
-	g.drawing = mergeDrawings(g.drawing, drawingCoord{0, 0}, labelDrawings...)
+	g.drawing = g.mergeDrawings(g.drawing, drawingCoord{0, 0}, lineDrawings...)
+	g.drawing = g.mergeDrawings(g.drawing, drawingCoord{0, 0}, cornerDrawings...)
+	g.drawing = g.mergeDrawings(g.drawing, drawingCoord{0, 0}, arrowHeadDrawings...)
+	g.drawing = g.mergeDrawings(g.drawing, drawingCoord{0, 0}, boxStartDrawings...)
+	g.drawing = g.mergeDrawings(g.drawing, drawingCoord{0, 0}, labelDrawings...)
 
 	// Draw subgraph labels LAST so they don't get overwritten by arrows
 	g.drawSubgraphLabels()
@@ -571,7 +572,7 @@ func (g *graph) drawSubgraphs() {
 		sgDrawing := drawSubgraph(sg, *g)
 		// Position the drawing at the subgraph's min coordinates
 		offset := drawingCoord{sg.minX, sg.minY}
-		g.drawing = mergeDrawings(g.drawing, offset, sgDrawing)
+		g.drawing = g.mergeDrawings(g.drawing, offset, sgDrawing)
 	}
 }
 
@@ -583,7 +584,7 @@ func (g *graph) drawSubgraphLabels() {
 			continue
 		}
 		labelDrawing, offset := drawSubgraphLabel(sg, *g)
-		g.drawing = mergeDrawings(g.drawing, offset, labelDrawing)
+		g.drawing = g.mergeDrawings(g.drawing, offset, labelDrawing)
 	}
 }
 

cmd/graph_test.go

@@ -6,11 +6,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/AlexanderGrooff/mermaid-ascii/internal/diagram"
 	"github.com/AlexanderGrooff/mermaid-ascii/internal/diagram/testutil"
 	log "github.com/sirupsen/logrus"
 )
 
-func verifyMap(t *testing.T, testCaseFile string) {
+func verifyMap(t *testing.T, testCaseFile string, useAscii bool) {
 	tc, err := testutil.ReadTestCase(testCaseFile)
 	if err != nil {
 		t.Fatalf("Failed to read test case file: %v", err)
@@ -22,6 +23,7 @@ func verifyMap(t *testing.T, testCaseFile string) {
 	}
 	properties.paddingX = tc.PaddingX
 	properties.paddingY = tc.PaddingY
+	properties.useAscii = useAscii
 	actualMap := drawMap(properties)
 	if tc.Expected != actualMap {
 		expectedWithSpaces := testutil.VisualizeWhitespace(tc.Expected)
@@ -31,7 +33,6 @@ func verifyMap(t *testing.T, testCaseFile string) {
 }
 
 func TestASCII(t *testing.T) {
-	useAscii = true
 	dir := "testdata/ascii"
 	files, err := os.ReadDir(dir)
 	if err != nil {
@@ -41,14 +42,13 @@ func TestASCII(t *testing.T) {
 	for _, file := range files {
 		if !file.IsDir() && strings.HasSuffix(file.Name(), ".txt") {
 			t.Run(file.Name(), func(t *testing.T) {
-				verifyMap(t, filepath.Join(dir, file.Name()))
+				verifyMap(t, filepath.Join(dir, file.Name()), true)
 			})
 		}
 	}
 }
 
 func TestExtendedChars(t *testing.T) {
-	useAscii = false
 	dir := "testdata/extended-chars"
 	files, err := os.ReadDir(dir)
 	if err != nil {
@@ -58,10 +58,59 @@ func TestExtendedChars(t *testing.T) {
 	for _, file := range files {
 		if !file.IsDir() && strings.HasSuffix(file.Name(), ".txt") {
 			t.Run(file.Name(), func(t *testing.T) {
-				verifyMap(t, filepath.Join(dir, file.Name()))
+				verifyMap(t, filepath.Join(dir, file.Name()), false)
 			})
 		}
 	}
 }
 
+// TestGraphUseAsciiConfig tests that RenderDiagram respects config.UseAscii for graphs
+func TestGraphUseAsciiConfig(t *testing.T) {
+	mermaidInput := `graph LR
+A --> B`
+
+	// Test with UseAscii = true (should produce ASCII output)
+	asciiConfig := &diagram.Config{
+		UseAscii:         true,
+		BoxBorderPadding: 1,
+		PaddingBetweenX:  5,
+		PaddingBetweenY:  5,
+		GraphDirection:   "LR",
+		StyleType:        "cli",
+	}
+	asciiOutput, err := RenderDiagram(mermaidInput, asciiConfig)
+	if err != nil {
+		t.Fatalf("Failed to render with ASCII config: %v", err)
+	}
+
+	// Test with UseAscii = false (should produce Unicode output)
+	unicodeConfig := &diagram.Config{
+		UseAscii:         false,
+		BoxBorderPadding: 1,
+		PaddingBetweenX:  5,
+		PaddingBetweenY:  5,
+		GraphDirection:   "LR",
+		StyleType:        "cli",
+	}
+	unicodeOutput, err := RenderDiagram(mermaidInput, unicodeConfig)
+	if err != nil {
+		t.Fatalf("Failed to render with Unicode config: %v", err)
+	}
+
+	// Verify outputs are different
+	if asciiOutput == unicodeOutput {
+		t.Errorf("ASCII and Unicode outputs should be different, but they were identical:\n%s", asciiOutput)
+	}
+
+	// Verify ASCII output contains ASCII characters (not Unicode box-drawing)
+	if strings.Contains(asciiOutput, "┌") || strings.Contains(asciiOutput, "─") || strings.Contains(asciiOutput, "│") {
+		t.Errorf("ASCII output should not contain Unicode box-drawing characters, but found:\n%s", asciiOutput)
+	}
+
+	// Verify Unicode output contains Unicode characters
+	if !strings.Contains(unicodeOutput, "┌") && !strings.Contains(unicodeOutput, "─") && !strings.Contains(unicodeOutput, "│") {
+		t.Errorf("Unicode output should contain Unicode box-drawing characters, but found:\n%s", unicodeOutput)
+	}
+}
+
 // Sequence diagram tests moved to sequence_test.go

cmd/parse.go

@@ -18,6 +18,7 @@ type graphProperties struct {
 	paddingX       int
 	paddingY       int
 	subgraphs      []*textSubgraph
+	useAscii       bool
 }
 
 type textNode struct {

cmd/web.go

@@ -75,6 +75,7 @@ func setupRouter() *gin.Engine {
 	r := gin.Default()
 
 	r.LoadHTMLGlob("templates/*")
+	r.Static("/static", "./static")
 	r.GET("/", func(c *gin.Context) {
 		c.HTML(http.StatusOK, "index.tmpl", gin.H{
 			"Version": getGitVersion(),