Merge pull request #1998 from alixander/fix-import-nested

d2compiler: fix importing nested boards
terrastruct · Jul 13, 2024 · 7ee1715 · 7ee1715
2 parents 108cf56 + 2c98730
commit 7ee1715
Show file tree

Hide file tree

Showing 4 changed files with 760 additions and 5 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -13,3 +13,4 @@
 - Globs to null connections work [#1965](https://github.com/terrastruct/d2/pull/1965)
 - Edge globs setting styles inherit correctly in child boards [#1967](https://github.com/terrastruct/d2/pull/1967)
 - Board links imported with spread imports work [#1972](https://github.com/terrastruct/d2/pull/1972)
+- Fix importing a file with nested boards [#1998](https://github.com/terrastruct/d2/pull/1998)
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
@@ -108,11 +108,11 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
 }
 
 func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName string) {
-	layers := ir.GetField(fieldName)
-	if layers.Map() == nil {
+	boards := ir.GetField(fieldName)
+	if boards.Map() == nil {
 		return
 	}
-	for _, f := range layers.Map().Fields {
+	for _, f := range boards.Map().Fields {
 		if f.Map() == nil {
 			continue
 		}
@@ -123,7 +123,9 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
 		g2 := d2graph.NewGraph()
 		g2.Parent = g
 		g2.AST = f.Map().AST().(*d2ast.Map)
-		g2.BaseAST = findFieldAST(g.BaseAST, f)
+		if g.BaseAST != nil {
+			g2.BaseAST = findFieldAST(g.BaseAST, f)
+		}
 		c.compileBoard(g2, f.Map())
 		g2.Name = f.Name
 		switch fieldName {
@@ -139,7 +141,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
 
 func findFieldAST(ast *d2ast.Map, f *d2ir.Field) *d2ast.Map {
 	path := []string{}
-	var curr *d2ir.Field = f
+	curr := f
 	for {
 		path = append([]string{curr.Name}, path...)
 		boardKind := d2ir.NodeBoardKind(curr)

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -2915,6 +2915,28 @@ layers: {
   b: {
     d
   }
+}`,
+			},
+		},
+		{
+			name: "import-nested-layers",
+			text: `k
+
+layers: {
+  x: {...@x}
+}`,
+			files: map[string]string{
+				"x.d2": `a
+layers: {
+  b: {
+		d
+
+		layers: {
+		  c: {
+			  c
+			}
+		}
+  }
 }`,
 			},
 		},