From 905f6348eb8f16d37a1843db9b57e4c29fb289ac Mon Sep 17 00:00:00 2001 From: Star Date: Mon, 1 Dec 2025 00:19:02 +0800 Subject: [PATCH] update for gojs --- go.mod | 4 +--- util.go | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5f349eb..bbae65e 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,8 @@ module apigo.cc/gojs/util go 1.24.0 -toolchain go1.24.3 - require ( - apigo.cc/gojs v0.0.28 + apigo.cc/gojs v0.0.30 apigo.cc/gojs/console v0.0.3 github.com/ZZMarquis/gm v1.3.2 github.com/emmansun/gmsm v0.40.0 diff --git a/util.go b/util.go index 2932498..3332b4e 100644 --- a/util.go +++ b/util.go @@ -45,7 +45,7 @@ func init() { obj := map[string]any{ "json": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) - if r, err := json.Marshal(args.Arguments[0].Export()); err == nil { + if r, err := json.Marshal(gojs.FixObject(args.Arguments[0].Export())); err == nil { return vm.ToValue(string(r)) } else { panic(vm.NewGoError(err)) @@ -53,7 +53,7 @@ func init() { }, "jsonP": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) - if r, err := json.Marshal(args.Arguments[0].Export()); err == nil { + if r, err := json.Marshal(gojs.FixObject(args.Arguments[0].Export())); err == nil { r1 := bytes.Buffer{} if err2 := json.Indent(&r1, r, "", " "); err2 == nil { return vm.ToValue(string(r)) @@ -75,7 +75,7 @@ func init() { }, "yaml": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) - if r, err := yaml.Marshal(args.Arguments[0].Export()); err == nil { + if r, err := yaml.Marshal(gojs.FixObject(args.Arguments[0].Export())); err == nil { return vm.ToValue(string(r)) } else { panic(vm.NewGoError(err))