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

fix logic

Browse source
This commit is contained in:
Daniel Suh 2024-05-31 15:07:16 -04:00 committed by Alexander Wang
parent 60c7c5d1f7
commit b4891900d1
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
d2compiler/compile.go
View file

@ -597,16 +597,6 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
attrs.Link = &d2graph.Scalar{}
attrs.Link.Value = scalar.ScalarString()
attrs.Link.MapKey = f.LastPrimaryKey()
if attrs.Label.Value == "" {
attrs.Label.Value = attrs.Link.Value
} else {
// this works because the Label attribute is set before the Link attribute
u, err := url.ParseRequestURI(attrs.Label.Value)
if err == nil && u.Host != "" {
c.errorf(f.Primary_.Value, "Label cannot be set to URL when link is also set (for security)")
}
}
case "direction":
dirs := []string{"up", "down", "right", "left"}
if !go2.Contains(dirs, scalar.ScalarString()) {
@ -856,6 +846,19 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) {
_, isReserved := d2ast.SimpleReservedKeywords[keyword]
if isReserved {
c.compileReserved(&edge.Attributes, f)
if f.Name != "link" {
return
}
if edge.Label.Value == "" {
edge.Label.Value = edge.Link.Value
} else {
u, err := url.ParseRequestURI(edge.Label.Value)
if err == nil && u.Host != "" {
c.errorf(f.Primary_.Value, "Label cannot be set to URL when link is also set (for security)")
}
}
return
} else if f.Name.ScalarString() == "style" {
if f.Map() == nil {