update for gojs

This commit is contained in:
Star 2025-12-01 00:19:02 +08:00
parent 4137f3a1e7
commit a7a4990a64
2 changed files with 4 additions and 6 deletions

4
go.mod
View File

@ -2,10 +2,8 @@ module apigo.cc/gojs/util
go 1.24.0 go 1.24.0
toolchain go1.24.3
require ( require (
apigo.cc/gojs v0.0.28 apigo.cc/gojs v0.0.30
apigo.cc/gojs/console v0.0.3 apigo.cc/gojs/console v0.0.3
github.com/ZZMarquis/gm v1.3.2 github.com/ZZMarquis/gm v1.3.2
github.com/emmansun/gmsm v0.40.0 github.com/emmansun/gmsm v0.40.0

View File

@ -45,7 +45,7 @@ func init() {
obj := map[string]any{ obj := map[string]any{
"json": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { "json": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
args := gojs.MakeArgs(&argsIn, vm).Check(1) 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)) return vm.ToValue(string(r))
} else { } else {
panic(vm.NewGoError(err)) panic(vm.NewGoError(err))
@ -53,7 +53,7 @@ func init() {
}, },
"jsonP": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { "jsonP": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
args := gojs.MakeArgs(&argsIn, vm).Check(1) 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{} r1 := bytes.Buffer{}
if err2 := json.Indent(&r1, r, "", " "); err2 == nil { if err2 := json.Indent(&r1, r, "", " "); err2 == nil {
return vm.ToValue(string(r)) return vm.ToValue(string(r))
@ -75,7 +75,7 @@ func init() {
}, },
"yaml": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { "yaml": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
args := gojs.MakeArgs(&argsIn, vm).Check(1) 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)) return vm.ToValue(string(r))
} else { } else {
panic(vm.NewGoError(err)) panic(vm.NewGoError(err))