From 36b27a739c855d9b72761a6576e81eafc1ee23eb Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Fri, 9 Sep 2022 17:26:59 -0500
Subject: [PATCH] fix breakages
---
utils/convert.go | 15 +++++++--------
utils/utils.go | 16 ----------------
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/utils/convert.go b/utils/convert.go
index 293e5f37..aad9d8a1 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 817700bf..15dcc579 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
--
GitLab