Merge pull request #1619 from gavin-ts/fix-dagre-id-registration

Fix dagre id registration

d2layouts/d2dagrelayout/layout.go

@@ -140,9 +140,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 	}
 
 	mapper := NewObjectMapper()
-	loadScript := ""
 	for _, obj := range g.Objects {
 		mapper.Register(obj)
+	}
+	loadScript := ""
+	for _, obj := range g.Objects {
 		loadScript += mapper.generateAddNodeLine(obj, int(obj.Width), int(obj.Height))
 		if obj.Parent != g.Root {
 			loadScript += mapper.generateAddParentLine(obj, obj.Parent)

e2etests/regression_test.go

@@ -1046,6 +1046,7 @@ cf many required: {
 		loadFromFile(t, "multiple_constant_nears"),
 		loadFromFile(t, "empty_nested_grid"),
 		loadFromFile(t, "code_font_size"),
+		loadFromFile(t, "disclaimer"),
 	}
 
 	runa(t, tcs)

e2etests/testdata/files/disclaimer.d2

@@ -0,0 +1,16 @@
+vars: {
+  base-constraints: [NOT NULL; UNQ]
+  disclaimer: DISCLAIMER {
+    I am not a lawyer
+    near: top-center
+  }
+}
+
+data: {
+  shape: sql_table
+  a: int {constraint: [PK; ...${base-constraints}]}
+}
+
+custom-disclaimer: DRAFT DISCLAIMER {
+  ...${disclaimer}
+}