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

refactor

Browse source
This commit is contained in:
Bernard Xie 2023-06-20 11:40:24 -07:00
parent 2c13a97cdd
commit 456799430d
No known key found for this signature in database
GPG key ID: 3C3E0036CE0F892C
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
d2format/format.go
View file

@ -275,12 +275,24 @@ func (p *printer) _map(m *d2ast.Map) {
} }
} }
layerNodes := []d2ast.MapNodeBox{}
scenarioNodes := []d2ast.MapNodeBox{}
stepNodes := []d2ast.MapNodeBox{}
prev := d2ast.Node(m) prev := d2ast.Node(m)
for i := 0; i < len(m.Nodes); i++ { for i := 0; i < len(m.Nodes); i++ {
nb := m.Nodes[i] nb := m.Nodes[i]
n := nb.Unbox() n := nb.Unbox()
// skip board nodes as we'll write them at the end // extract out layer, scenario, and step nodes and skip
if nb.IsBoardNode() { if nb.IsBoardNode() {
switch nb.MapKey.Key.Path[0].Unbox().ScalarString() {
case "layers":
layerNodes = append(layerNodes, nb)
case "scenarios":
scenarioNodes = append(scenarioNodes, nb)
case "steps":
stepNodes = append(stepNodes, nb)
}
prev = n prev = n
continue continue
} }
@ -311,25 +323,6 @@ func (p *printer) _map(m *d2ast.Map) {
prev = n prev = n
} }
// extract out layer, scenario, and step nodes
layerNodes := []d2ast.MapNodeBox{}
scenarioNodes := []d2ast.MapNodeBox{}
stepNodes := []d2ast.MapNodeBox{}
for i := 0; i < len(m.Nodes); i++ {
node := m.Nodes[i]
if !node.IsBoardNode() {
continue
}
switch node.MapKey.Key.Path[0].Unbox().ScalarString() {
case "layers":
layerNodes = append(layerNodes, node)
case "scenarios":
scenarioNodes = append(scenarioNodes, node)
case "steps":
stepNodes = append(stepNodes, node)
}
}
boards := []d2ast.MapNodeBox{} boards := []d2ast.MapNodeBox{}
boards = append(boards, layerNodes...) boards = append(boards, layerNodes...)
boards = append(boards, scenarioNodes...) boards = append(boards, scenarioNodes...)