luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix shape composite

Browse source
This commit is contained in:
Alexander Wang 2023-06-16 16:50:16 -07:00
parent fffb08a250
commit b30f9702bd
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2compiler/compile.go
View file

@ -176,8 +176,12 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) {
} }
shape := m.GetField("shape") shape := m.GetField("shape")
if shape != nil { if shape != nil {
if shape.Composite != nil {
c.errorf(shape.LastPrimaryKey(), "reserved field shape does not accept composite")
} else {
c.compileField(obj, shape) c.compileField(obj, shape)
} }
}
for _, f := range m.Fields { for _, f := range m.Fields {
if f.Name == "shape" { if f.Name == "shape" {
continue continue

9
d2compiler/compile_test.go
View file

@ -2614,6 +2614,15 @@ object: {
`, `,
expErr: `d2/testdata/d2compiler/TestCompile/classes-internal-edge.d2:8:3: classes cannot contain an edge`, expErr: `d2/testdata/d2compiler/TestCompile/classes-internal-edge.d2:8:3: classes cannot contain an edge`,
}, },
{
name: "reserved-composite",
text: `shape: sequence_diagram {
alice -> bob: What does it mean\nto be well-adjusted?
bob -> alice: The ability to play bridge or\ngolf as if they were games.
}
`,
expErr: `d2/testdata/d2compiler/TestCompile/reserved-composite.d2:1:1: reserved field shape does not accept composite`,
},
} }
for _, tc := range testCases { for _, tc := range testCases {

11
testdata/d2compiler/TestCompile/reserved-composite.exp.json generated vendored Normal file
View file

@ -0,0 +1,11 @@
{
"graph": null,
"err": {
"errs": [
{
"range": "d2/testdata/d2compiler/TestCompile/reserved-composite.d2,0:0:0-3:1:158",
"errmsg": "d2/testdata/d2compiler/TestCompile/reserved-composite.d2:1:1: reserved field shape does not accept composite"
}
]
}
}