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

refactor

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

29
d2compiler/compile.go
View file

@ -597,6 +597,16 @@ 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()) {
@ -777,7 +787,6 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) {
}
if e.Map() != nil {
c.compileEdgeLinks(edge, e.Map())
c.compileEdgeMap(edge, e.Map())
}
@ -836,24 +845,6 @@ func (c *compiler) compileEdgeMap(edge *d2graph.Edge, m *d2ir.Map) {
}
}
func (c *compiler) compileEdgeLinks(edge *d2graph.Edge, m *d2ir.Map) {
if m == nil {
return
}
for _, field := range m.Fields {
if field.Name == "link" && field.Primary_ != nil {
if edge.Label.Value == "" {
edge.Label.Value = field.Primary_.String()
} else if edge.Label.Value != "" {
u, err := url.ParseRequestURI(edge.Label.Value)
if err == nil && u.Host != "" {
c.errorf(field.Primary_.Value, "Label cannot be set to URL when link is also set (for security)")
}
}
}
}
}
func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) {
keyword := strings.ToLower(f.Name.ScalarString())
_, isStyleReserved := d2ast.StyleKeywords[keyword]