d2ir: Review fixes #714

d2ast/d2ast.go

@@ -151,6 +151,10 @@ func (r *Range) UnmarshalText(b []byte) (err error) {
 	return r.End.UnmarshalText(end)
 }
 
+func (r Range) Before(r2 Range) bool {
+	return r.Start.Before(r2.Start)
+}
+
 // Position represents a line:column and byte position in a file.
 //
 // note: Line and Column are zero indexed.
@@ -259,6 +263,10 @@ func (p Position) SubtractString(s string, byUTF16 bool) Position {
 	return p
 }
 
+func (p Position) Before(p2 Position) bool {
+	return p.Byte < p2.Byte
+}
+
 // MapNode is implemented by nodes that may be children of Maps.
 type MapNode interface {
 	Node

d2compiler/compile.go

@@ -42,7 +42,8 @@ func Compile(path string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph
 	if err != nil {
 		return nil, err
 	}
-	return g, err
+	g = g.SortEdgesByAST()
+	return g, nil
 }
 
 func compileIR(ast *d2ast.Map, m *d2ir.Map) (*d2graph.Graph, error) {
@@ -203,6 +204,7 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) {
 		} else {
 			attrs.Shape.Value = d2target.ShapeCode
 		}
+		attrs.Label.Value = scalar.ScalarString()
 	default:
 		attrs.Label.Value = scalar.ScalarString()
 	}

d2graph/d2graph.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math"
 	"net/url"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -1436,3 +1437,18 @@ func (g *Graph) GetBoard(name string) *Graph {
 	}
 	return nil
 }
+
+func (g *Graph) SortEdgesByAST() *Graph {
+	edges := append([]*Edge(nil), g.Edges...)
+	sort.Slice(edges, func(i, j int) bool {
+		e1 := edges[i]
+		e2 := edges[j]
+		if len(e1.References) == 0 || len(e2.References) == 0 {
+			return i < j
+		}
+		return e1.References[0].Edge.Range.Before(edges[j].References[0].Edge.Range)
+	})
+	g2 := *g
+	g2.Edges = edges
+	return &g2
+}

d2layouts/d2sequence/layout.go

@@ -5,11 +5,12 @@ import (
 	"sort"
 	"strings"
 
+	"oss.terrastruct.com/util-go/go2"
+
 	"oss.terrastruct.com/d2/d2graph"
 	"oss.terrastruct.com/d2/d2target"
 	"oss.terrastruct.com/d2/lib/geo"
 	"oss.terrastruct.com/d2/lib/label"
-	"oss.terrastruct.com/util-go/go2"
 )
 
 func WithoutSequenceDiagrams(ctx context.Context, g *d2graph.Graph) (map[string]*sequenceDiagram, map[string]int, map[string]int, error) {
@@ -113,6 +114,7 @@ func layoutSequenceDiagram(g *d2graph.Graph, obj *d2graph.Object) (*sequenceDiag
 func getLayoutEdges(g *d2graph.Graph, toRemove map[*d2graph.Edge]struct{}) ([]*d2graph.Edge, map[string]int) {
 	edgeOrder := make(map[string]int)
 	layoutEdges := make([]*d2graph.Edge, 0, len(g.Edges)-len(toRemove))
+
 	for i, edge := range g.Edges {
 		edgeOrder[edge.AbsID()] = i
 		if _, exists := toRemove[edge]; !exists {

d2lib/d2.go

@@ -86,23 +86,20 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta
 		if err != nil {
 			return nil, err
 		}
-		ld.Type = "layer"
 		d.Layers = append(d.Layers, ld)
 	}
 	for _, l := range g.Scenarios {
 		ld, err := compile(ctx, l, opts)
 		if err != nil {
 			return nil, err
 		}
-		ld.Type = "scenario"
 		d.Scenarios = append(d.Scenarios, ld)
 	}
 	for _, l := range g.Steps {
 		ld, err := compile(ctx, l, opts)
 		if err != nil {
 			return nil, err
 		}
-		ld.Type = "step"
 		d.Steps = append(d.Steps, ld)
 	}
 	return d, nil

d2target/d2target.go

@@ -32,16 +32,15 @@ var BorderOffset = geo.NewVector(5, 5)
 
 type Diagram struct {
 	Name        string              `json:"name"`
-	Type        string              `json:"type"`
 	Description string              `json:"description,omitempty"`
 	FontFamily  *d2fonts.FontFamily `json:"fontFamily,omitempty"`
 
 	Shapes      []Shape      `json:"shapes"`
 	Connections []Connection `json:"connections"`
 
-	Layers    []*Diagram `json:"layers"`
-	Scenarios []*Diagram `json:"scenarios"`
-	Steps     []*Diagram `json:"steps"`
+	Layers    []*Diagram `json:"layers,omitempty"`
+	Scenarios []*Diagram `json:"scenarios,omitempty"`
+	Steps     []*Diagram `json:"steps,omitempty"`
 }
 
 func (diagram Diagram) HashID() (string, error) {