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

error handling

Browse source
This commit is contained in:
Alexander Wang 2023-03-14 12:49:56 -07:00
parent a37c456dfc
commit 330045f6a2
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2layouts/d2elklayout/layout.go
View file

@ -8,6 +8,7 @@ import (
"context"
_ "embed"
"encoding/json"
"errors"
"fmt"
"math"
"strings"
@ -307,7 +308,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
val, err := vm.RunString(`elk.layout(graph)
.then(s => s)
.catch(s => s)
.catch(err => err.message)
`)
if err != nil {
@ -328,7 +329,21 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
continue
}
jsonOut := promise.Result().Export().(map[string]interface{})
if promise.State() == goja.PromiseStateRejected {
return errors.New("ELK: something went wrong")
}
result := promise.Result().Export()
var jsonOut map[string]interface{}
switch out := result.(type) {
case string:
return fmt.Errorf("ELK layout error: %s", out)
case map[string]interface{}:
jsonOut = out
default:
return fmt.Errorf("ELK unexpected return: %v", out)
}
jsonBytes, err := json.Marshal(jsonOut)
if err != nil {