cli: Add support for rendering layers/scenarios/steps

d2compiler/compile.go

@@ -85,6 +85,10 @@ func (c *compiler) compileLayersField(g *d2graph.Graph, ir *d2ir.Map, fieldName
 		if f.Map() == nil {
 			continue
 		}
+		if g.GetLayer(f.Name) != nil {
+			c.errorf(f.References[0].AST(), "layer name %v already used by another layer", f.Name)
+			continue
+		}
 		g2 := c.compileLayer(f.Map())
 		g2.Name = f.Name
 		switch fieldName {

d2compiler/compile_test.go

@@ -2003,6 +2003,24 @@ layers: {
 				assert.Equal(t, 2, len(g.Layers[1].Steps))
 			},
 		},
+		{
+			name: "recursive",
+			run: func(t *testing.T) {
+				assertCompile(t, `base
+
+layers: {
+  one: {
+    santa
+  }
+}
+steps: {
+	one: {
+		clause
+	}
+}
+`, `d2/testdata/d2compiler/TestCompile2/scenarios/recursive#01.d2:9:2: layer name one already used by another layer`)
+			},
+		},
 	}
 
 	for _, tc := range tca {

d2exporter/export.go

@@ -4,18 +4,20 @@ import (
 	"context"
 	"strconv"
 
+	"oss.terrastruct.com/util-go/go2"
+
 	"oss.terrastruct.com/d2/d2graph"
 	"oss.terrastruct.com/d2/d2renderers/d2fonts"
 	"oss.terrastruct.com/d2/d2target"
 	"oss.terrastruct.com/d2/d2themes"
 	"oss.terrastruct.com/d2/d2themes/d2themescatalog"
-	"oss.terrastruct.com/util-go/go2"
 )
 
 func Export(ctx context.Context, g *d2graph.Graph, themeID int64, fontFamily *d2fonts.FontFamily) (*d2target.Diagram, error) {
 	theme := d2themescatalog.Find(themeID)
 
 	diagram := d2target.NewDiagram()
+	diagram.Name = g.Name
 	if fontFamily == nil {
 		fontFamily = go2.Pointer(d2fonts.SourceSansPro)
 	}

d2graph/d2graph.go

@@ -1384,3 +1384,22 @@ func init() {
 		NearConstants[k] = struct{}{}
 	}
 }
+
+func (g *Graph) GetLayer(name string) *Graph {
+	for _, l := range g.Layers {
+		if l.Name == name {
+			return l
+		}
+	}
+	for _, l := range g.Scenarios {
+		if l.Name == name {
+			return l
+		}
+	}
+	for _, l := range g.Steps {
+		if l.Name == name {
+			return l
+		}
+	}
+	return nil
+}

d2lib/d2.go

@@ -44,32 +44,68 @@ func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target
 		return nil, nil, err
 	}
 
-	if len(g.Objects) > 0 {
+	d, err := compile(ctx, g, opts)
-		err = g.SetDimensions(opts.MeasuredTexts, opts.Ruler, opts.FontFamily)
 	if err != nil {
 		return nil, nil, err
 	}
+	return d, g, nil
+}
+
+func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2target.Diagram, error) {
+	if len(g.Objects) > 0 {
+		err := g.SetDimensions(opts.MeasuredTexts, opts.Ruler, opts.FontFamily)
+		if err != nil {
+			return nil, err
+		}
 
 		coreLayout, err := getLayout(opts)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		constantNears := d2near.WithoutConstantNears(ctx, g)
 
 		err = d2sequence.Layout(ctx, g, coreLayout)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		err = d2near.Layout(ctx, g, constantNears)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 	}
 
-	diagram, err := d2exporter.Export(ctx, g, opts.ThemeID, opts.FontFamily)
+	d, err := d2exporter.Export(ctx, g, opts.ThemeID, opts.FontFamily)
-	return diagram, g, err
+	if err != nil {
+		return nil, err
+	}
+
+	for _, l := range g.Layers {
+		ld, err := compile(ctx, l, opts)
+		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
 }
 
 func getLayout(opts *CompileOptions) (func(context.Context, *d2graph.Graph) error, error) {

d2target/d2target.go

@@ -28,11 +28,16 @@ const (
 
 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"`
 }
 
 func (diagram Diagram) HashID() (string, error) {

e2etests/testdata/measured/empty-class/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -45,5 +46,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/measured/empty-shape/dagre/board.exp.json

@@ -1,10 +1,11 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
       "id": "a",
-      "type": "",
+      "type": "rectangle",
       "pos": {
         "x": 0,
         "y": 0
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg

@@ -39,7 +39,7 @@ width="304" height="304" viewBox="-102 -102 304 304"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><mask id="1236167803" maskUnits="userSpaceOnUse" x="-100" y="-100" width="304" height="304">
+]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><mask id="677029166" maskUnits="userSpaceOnUse" x="-100" y="-100" width="304" height="304">
 <rect x="-100" y="-100" width="304" height="304" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[]]></style></svg>

e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -45,5 +46,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -120,5 +121,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -120,5 +121,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -388,5 +389,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -377,5 +378,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -436,5 +437,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -400,5 +401,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -428,5 +429,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -417,5 +418,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_alignment/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -948,5 +949,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_alignment/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -876,5 +877,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -103,5 +104,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -103,5 +104,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -208,5 +209,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,5 +172,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_order/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -671,5 +672,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/elk_order/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -635,5 +636,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/empty_sequence/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/empty_sequence/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/no-lexer/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/no-lexer/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -42,5 +43,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -255,5 +256,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/only_header_class_table/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -237,5 +238,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -171,5 +172,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/opacity-on-label/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -596,5 +597,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -584,5 +585,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/query_param_escape/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/query_param_escape/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -54,5 +55,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -526,5 +527,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -517,5 +518,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -162,5 +163,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -216,5 +217,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -216,5 +217,8 @@
       "icon": null,
       "zIndex": 1
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -396,5 +397,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -378,5 +379,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/1_to_2/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -220,5 +221,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/1_to_2/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -210,5 +211,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/basic/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/basic/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/child_to_child/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -224,5 +225,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/child_to_child/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -203,5 +204,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/connection_label/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/connection_label/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/empty/dagre/board.exp.json

@@ -1,6 +1,10 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/sanity/empty/elk/board.exp.json

@@ -1,6 +1,10 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1212,5 +1213,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1113,5 +1114,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/animated/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -908,5 +909,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/animated/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -860,5 +861,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -451,5 +452,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -390,5 +391,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -132,5 +133,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -123,5 +124,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/binary_tree/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1276,5 +1277,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/binary_tree/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1206,5 +1207,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/border-radius/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -83,5 +84,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/border-radius/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -83,5 +84,8 @@
       "level": 1
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/chaos1/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -300,5 +301,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/chaos1/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -282,5 +283,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/chaos2/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1231,5 +1232,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/chaos2/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -1134,5 +1135,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -371,5 +372,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/child_parent_edges/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -289,5 +290,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -260,5 +261,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -242,5 +243,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/circular_dependency/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -316,5 +317,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/circular_dependency/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -280,5 +281,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/class/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -77,5 +78,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/class/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -77,5 +78,8 @@
       "neutralAccentColor": "#676C7E"
     }
   ],
-  "connections": []
+  "connections": [],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/code_snippet/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -219,5 +220,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/code_snippet/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -201,5 +202,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/connected_container/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -416,5 +417,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/connected_container/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -362,5 +363,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -452,5 +453,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/constant_near_stress/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -443,5 +444,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/constant_near_title/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -496,5 +497,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/constant_near_title/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -455,5 +456,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/container_edges/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -615,5 +616,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/container_edges/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -590,5 +591,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -564,5 +565,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }

e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json

@@ -1,5 +1,6 @@
 {
   "name": "",
+  "type": "",
   "fontFamily": "SourceSansPro",
   "shapes": [
     {
@@ -527,5 +528,8 @@
       "icon": null,
       "zIndex": 0
     }
-  ]
+  ],
+  "layers": null,
+  "scenarios": null,
+  "steps": null
 }