mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

NEW: require() now supports loading JSON too (#474)

Browse Source
This commit is contained in:
Oscar Moreno Garza
2019-05-23 06:26:40 -07:00
committed by Tom Limoncelli
parent 7ed3adb2f1
commit 608dd7af56
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/js/js.go
View File

@ -2,6 +2,7 @@ package js
import (
"encoding/json"
"fmt"
"io/ioutil"
"path/filepath"
"strings"
@ -95,7 +96,16 @@ func require(call otto.FunctionCall) otto.Value {
throw(call.Otto, err.Error())
}
_, err = call.Otto.Run(string(data))
var value otto.Value = otto.TrueValue()
// If its a json file return the json value, else default to true
if strings.HasSuffix(filepath.Ext(relFile), "json") {
cmd := fmt.Sprintf(`JSON.parse(JSON.stringify(%s))`, string(data))
value, err = call.Otto.Run(cmd)
} else {
_, err = call.Otto.Run(string(data))
}
if err != nil {
throw(call.Otto, err.Error())
}
@ -103,7 +113,7 @@ func require(call otto.FunctionCall) otto.Value {
// Pop back to the old directory.
currentDirectory = currentDirectoryOld
return otto.TrueValue()
return value
}
func throw(vm *otto.Otto, str string) {