diff --git a/utils/convert.go b/utils/convert.go index 293e5f3703b92028747781120ac29290be5faf2e..aad9d8a153845f18f8b6590559e3870cfbbf14ff 100644 --- a/utils/convert.go +++ b/utils/convert.go @@ -28,16 +28,15 @@ func CopyBytesToJS(src []byte) js.Value { return dst } -// JsonToJS converts a marshalled JSON bytes to a Javascript object. -func JsonToJS(src []byte) (js.Value, error) { - var inInterface map[string]interface{} - err := json.Unmarshal(src, &inInterface) +// JsonToJS is a helper that converts JSON bytes input +// to a [js.Value] of the object subtype. +func JsonToJS(inputJson []byte) (js.Value, error) { + jsObj := make(map[string]interface{}) + err := json.Unmarshal(inputJson, &jsObj) if err != nil { - Throw(TypeError, err) - return js.ValueOf(nil), err + return js.Value{}, err } - - return js.ValueOf(inInterface), nil + return js.ValueOf(jsObj), nil } // JsToJson converts the Javascript value to JSON. diff --git a/utils/utils.go b/utils/utils.go index 817700bf25ed8b4544323f0daff57d0800a90627..15dcc579dbc323d99e6b20b74664ce779d0c7193 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -38,22 +38,6 @@ func WrapCB(parent js.Value, m string) func(args ...interface{}) js.Value { } } -// JsonToJS is a helper that converts JSON bytes input -// to a [js.Value] of the object subtype. -func JsonToJS(inputJson []byte) (js.Value, error) { - jsObj := make(map[string]interface{}) - err := json.Unmarshal(inputJson, &jsObj) - if err != nil { - return js.Value{}, err - } - return js.ValueOf(jsObj), nil -} - -// JsToJson converts the Javascript value to JSON. -func JsToJson(value js.Value) string { - return JSON.Call("stringify", value).String() -} - type PromiseFn func(resolve, reject func(args ...interface{}) js.Value) // CreatePromise creates a Javascript promise to return the value of a blocking