Skip to content

compiler: override composite substitutions #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

compiler: override composite substitutions #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions d2compiler/compile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 5 additions & 1 deletion d2ir/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(), "."))
Expand Down
297 changes: 297 additions & 0 deletions testdata/d2compiler/TestCompile2/vars/override/label-map.exp.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.