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

fix: cr, validation for near obj connect to outside

Browse source
This commit is contained in:
donglixiaoche 2023-03-31 22:31:43 +08:00
parent ffa39a0ad8
commit cea4355341
No known key found for this signature in database
GPG key ID: 3190E65EBAD6D6E2
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
d2compiler/compile.go
View file

@ -750,27 +750,31 @@ func (c *compiler) validateNear(g *d2graph.Graph) {
continue
}
var edgeConnectToOutsideOfNear *d2graph.Edge
for _, edge := range g.Edges {
srcNearContainer := edge.Src.OuterNearContainer()
dstNearContainer := edge.Dst.OuterNearContainer()
if srcNearContainer != dstNearContainer {
edgeConnectToOutsideOfNear = edge
break
}
}
if edgeConnectToOutsideOfNear != nil {
c.errorf(edgeConnectToOutsideOfNear.References[0].Edge, "cannot connect objects from within a container, that has near constant set, to objects outside that container")
continue
}
} else {
c.errorf(obj.Attributes.NearKey, "near key %#v must be the absolute path to a shape or one of the following constants: %s", d2format.Format(obj.Attributes.NearKey), strings.Join(d2graph.NearConstantsArray, ", "))
continue
}
}
}
for _, edge := range g.Edges {
srcNearContainer := edge.Src.OuterNearContainer()
dstNearContainer := edge.Dst.OuterNearContainer()
var isSrcNearConst, isDstNearConst bool
if srcNearContainer != nil {
_, isSrcNearConst = d2graph.NearConstants[d2graph.Key(srcNearContainer.Attributes.NearKey)[0]]
}
if dstNearContainer != nil {
_, isDstNearConst = d2graph.NearConstants[d2graph.Key(dstNearContainer.Attributes.NearKey)[0]]
}
if (isSrcNearConst || isDstNearConst) && srcNearContainer != dstNearContainer {
c.errorf(edge.References[0].Edge, "cannot connect objects from within a container, that has near constant set, to objects outside that container")
}
}
}
func (c *compiler) validateBoardLinks(g *d2graph.Graph) {

3
d2graph/d2graph.go
View file

@ -970,7 +970,8 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
func (obj *Object) OuterNearContainer() *Object {
temp := obj
for temp != nil {
// find outer near container that isn't itself
for temp != nil && temp != obj {
if temp.Attributes.NearKey != nil {
return temp
}