compiler: override composite substitutions

terrastruct · Dec 8, 2023 · d956083 · d956083
1 parent 7a85946
commit d956083
Show file tree

Hide file tree

Showing 3 changed files with 317 additions and 1 deletion.
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -3715,6 +3715,21 @@ a: {
 					assert.Equal(t, "im nested var", g.Objects[1].Label.Value)
 				},
 			},
+			{
+				name: "label-map",
+				run: func(t *testing.T) {
+					g, _ := assertCompile(t, `
+vars: {
+  x: {
+    label: hi
+  }
+}
+a: ${x}
+a.label: hello
+`, "")
+					assert.Equal(t, "hello", g.Objects[0].Label.Value)
+				},
+			},
 			{
 				name: "var-in-var",
 				run: func(t *testing.T) {

diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -294,7 +294,11 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) {
 				if resolvedField.Composite != nil {
 					switch n := node.(type) {
 					case *Field:
-						n.Composite = resolvedField.Composite
+						if n.Composite != nil {
+							n.Composite = n.Composite.Copy(resolvedField.Composite).(Composite)
+						} else {
+							n.Composite = resolvedField.Composite
+						}
 					case *Edge:
 						if resolvedField.Composite.Map() == nil {
 							c.errorf(node.LastRef().AST(), `cannot substitute array variable "%s" to an edge`, strings.Join(box.Substitution.IDA(), "."))

diff --git a/testdata/d2compiler/TestCompile2/vars/override/label-map.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label-map.exp.json