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

validate top left

Browse source
This commit is contained in:
Alexander Wang 2023-02-21 20:09:23 -08:00
parent d2a5f4093a
commit 264ce21d60
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
4 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2compiler/compile.go
View file

@ -288,20 +288,28 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
attrs.Height.Value = scalar.ScalarString()
attrs.Height.MapKey = f.LastPrimaryKey()
case "top":
_, err := strconv.Atoi(scalar.ScalarString())
v, err := strconv.Atoi(scalar.ScalarString())
if err != nil {
c.errorf(scalar, "non-integer top %#v: %s", scalar.ScalarString(), err)
return
}
if v < 0 {
c.errorf(scalar, "top must be a non-negative integer: %#v", scalar.ScalarString())
return
}
attrs.Top = &d2graph.Scalar{}
attrs.Top.Value = scalar.ScalarString()
attrs.Top.MapKey = f.LastPrimaryKey()
case "left":
_, err := strconv.Atoi(scalar.ScalarString())
v, err := strconv.Atoi(scalar.ScalarString())
if err != nil {
c.errorf(scalar, "non-integer left %#v: %s", scalar.ScalarString(), err)
return
}
if v < 0 {
c.errorf(scalar, "left must be a non-negative integer: %#v", scalar.ScalarString())
return
}
attrs.Left = &d2graph.Scalar{}
attrs.Left.Value = scalar.ScalarString()
attrs.Left.MapKey = f.LastPrimaryKey()
@ -604,6 +612,13 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) {
}
}
if keyword == "top" && obj.Attributes.Left == nil {
c.errorf(f.LastPrimaryKey(), `keyword "top" currently cannot be set without also setting "left"`)
}
if keyword == "left" && obj.Attributes.Top == nil {
c.errorf(f.LastPrimaryKey(), `keyword "left" currently cannot be set without also setting "top"`)
}
switch f.Name {
case "style":
if obj.Attributes.Style.ThreeDee != nil {

17
d2compiler/compile_test.go
View file

@ -124,6 +124,23 @@ x: {
tassert.Equal(t, "200", g.Objects[0].Attributes.Top.Value)
},
},
{
name: "positions_disjoint",
text: `hey: {
top: 200
}
`,
expErr: `d2/testdata/d2compiler/TestCompile/positions_disjoint.d2:2:2: keyword "top" currently cannot be set without also setting "left"`,
},
{
name: "positions_negative",
text: `hey: {
top: 200
left: -200
}
`,
expErr: `d2/testdata/d2compiler/TestCompile/positions_negative.d2:3:8: left must be a non-negative integer: "-200"`,
},
{
name: "equal_dimensions_on_circle",

12
testdata/d2compiler/TestCompile/positions_disjoint.exp.json generated vendored Normal file
View file

@ -0,0 +1,12 @@
{
"graph": null,
"err": {
"ioerr": null,
"errs": [
{
"range": "d2/testdata/d2compiler/TestCompile/positions_disjoint.d2,1:1:8-1:9:16",
"errmsg": "d2/testdata/d2compiler/TestCompile/positions_disjoint.d2:2:2: keyword \"top\" currently cannot be set without also setting \"left\""
}
]
}
}

12
testdata/d2compiler/TestCompile/positions_negative.exp.json generated vendored Normal file
View file

@ -0,0 +1,12 @@
{
"graph": null,
"err": {
"ioerr": null,
"errs": [
{
"range": "d2/testdata/d2compiler/TestCompile/positions_negative.d2,2:7:24-2:11:28",
"errmsg": "d2/testdata/d2compiler/TestCompile/positions_negative.d2:3:8: left must be a non-negative integer: \"-200\""
}
]
}
}