Merge pull request #2000 from alixander/fix-underscore-edge-case

d2compiler: fix underscore sibling edge case
terrastruct · Jul 13, 2024 · 4027228 · 4027228
2 parents 9f1092c + d608740
commit 4027228
Show file tree

Hide file tree

Showing 3 changed files with 346 additions and 9 deletions.
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -2933,6 +2933,7 @@ layers: {
 layers: {
   b: {
     d.link: _
+		s.link: _.layers.k
 
     layers: {
       c: {
@@ -2942,13 +2943,17 @@ layers: {
       }
     }
   }
+  k: {
+    k
+  }
 }`,
 			},
 			assertions: func(t *testing.T, g *d2graph.Graph) {
 				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Objects[0].Link.Value)
 				tassert.Equal(t, "root.layers.x.layers.b", g.Layers[0].Layers[0].Layers[0].Objects[0].Link.Value)
 				tassert.Equal(t, "root.layers.x", g.Layers[0].Layers[0].Layers[0].Objects[1].Link.Value)
 				tassert.Equal(t, "root.layers.x.layers.b", g.Layers[0].Layers[0].Layers[0].Objects[2].Link.Value)
+				tassert.Equal(t, "root.layers.x.layers.k", g.Layers[0].Layers[0].Objects[1].Link.Value)
 			},
 		},
 		{

diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -873,6 +873,9 @@ func (c *compiler) updateLinks(m *Map) {
 				prependIDA := aida[:len(aida)-len(bida)]
 				if uplevels > 0 {
 					prependIDA = prependIDA[:len(prependIDA)-uplevels]
+				} else if uplevels == 0 {
+					// It's a sibling, so we go up one level to find it
+					prependIDA = prependIDA[:len(prependIDA)-2]
 				}
 				fullIDA := []string{"root"}
 				// With nested imports, a value may already have been updated with part of the absolute path