diff --git a/go.mod b/go.mod index ca9372b..a55beb9 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/dlclark/regexp2 v1.11.4 github.com/go-sourcemap/sourcemap v2.1.4+incompatible github.com/google/pprof v0.0.0-20230207041349-798e818bf904 - github.com/ssgo/dao v0.1.4 - github.com/ssgo/db v1.7.8 + github.com/ssgo/dao v0.1.5 + github.com/ssgo/db v1.7.9 github.com/ssgo/httpclient v1.7.7 github.com/ssgo/log v1.7.7 github.com/ssgo/tool v0.4.27 @@ -21,7 +21,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect - github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/ssgo/config v1.7.7 // indirect github.com/ssgo/standard v1.7.7 // indirect golang.org/x/sys v0.25.0 // indirect diff --git a/modules/console.go b/modules/console/console.go similarity index 99% rename from modules/console.go rename to modules/console/console.go index 819be72..38da958 100644 --- a/modules/console.go +++ b/modules/console/console.go @@ -1,4 +1,4 @@ -package js +package console import ( "apigo.cc/apigo/gojs" @@ -13,7 +13,7 @@ import ( //go:embed console.ts var consoleTS string -func RegisterConsoleModel() { +func init() { obj := map[string]any{ "print": func(args goja.FunctionCall) goja.Value { consolePrint(args, "print", nil) diff --git a/modules/console.ts b/modules/console/console.ts similarity index 100% rename from modules/console.ts rename to modules/console/console.ts diff --git a/modules/db.go b/modules/db/db.go similarity index 99% rename from modules/db.go rename to modules/db/db.go index fb601a1..863eb7e 100644 --- a/modules/db.go +++ b/modules/db/db.go @@ -1,4 +1,4 @@ -package js +package db import ( "apigo.cc/apigo/gojs" @@ -16,7 +16,7 @@ var dbTS string //go:embed db.md var dbMD string -func RegisterDBModel() { +func init() { obj := map[string]any{ "get": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) diff --git a/modules/db.md b/modules/db/db.md similarity index 100% rename from modules/db.md rename to modules/db/db.md diff --git a/modules/db.ts b/modules/db/db.ts similarity index 100% rename from modules/db.ts rename to modules/db/db.ts diff --git a/modules/file.go b/modules/file/file.go similarity index 98% rename from modules/file.go rename to modules/file/file.go index 6c2ddfb..472a05e 100644 --- a/modules/file.go +++ b/modules/file/file.go @@ -1,4 +1,4 @@ -package js +package file import ( "apigo.cc/apigo/gojs" @@ -11,7 +11,7 @@ import ( //go:embed file.ts var fileTS string -func RegisterFileModel() { +func init() { obj := map[string]any{ "read": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) diff --git a/modules/file.ts b/modules/file/file.ts similarity index 100% rename from modules/file.ts rename to modules/file/file.ts diff --git a/modules/http.go b/modules/http/http.go similarity index 99% rename from modules/http.go rename to modules/http/http.go index 3809e9e..5515a23 100644 --- a/modules/http.go +++ b/modules/http/http.go @@ -1,4 +1,4 @@ -package js +package http import ( "apigo.cc/apigo/gojs" @@ -23,7 +23,7 @@ var h2cHttp = &Http{ client: httpclient.GetClientH2C(0), } -func RegisterHTTPModel() { +func init() { obj := map[string]any{ "get": defaultHttp.Get, "get2C": h2cHttp.Get, diff --git a/modules/http.ts b/modules/http/http.ts similarity index 100% rename from modules/http.ts rename to modules/http/http.ts diff --git a/modules/log.go b/modules/log/log.go similarity index 96% rename from modules/log.go rename to modules/log/log.go index 6e2329b..5d4d8ba 100644 --- a/modules/log.go +++ b/modules/log/log.go @@ -1,4 +1,4 @@ -package js +package log import ( "apigo.cc/apigo/gojs" @@ -12,7 +12,7 @@ var logTS string //go:embed log.md var logMD string -func RegisterLogModel() { +func init() { obj := map[string]any{ "info": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) diff --git a/modules/log.md b/modules/log/log.md similarity index 100% rename from modules/log.md rename to modules/log/log.md diff --git a/modules/log.ts b/modules/log/log.ts similarity index 100% rename from modules/log.ts rename to modules/log/log.ts diff --git a/modules/registers.go b/modules/registers.go index 9721fbb..960efdf 100644 --- a/modules/registers.go +++ b/modules/registers.go @@ -1,10 +1,10 @@ -package js +package modules -func init() { - RegisterConsoleModel() - RegisterDBModel() - RegisterFileModel() - RegisterHTTPModel() - RegisterLogModel() - RegisterUtilModel() -} +import ( + _ "apigo.cc/apigo/gojs/modules/console" + _ "apigo.cc/apigo/gojs/modules/db" + _ "apigo.cc/apigo/gojs/modules/file" + _ "apigo.cc/apigo/gojs/modules/http" + _ "apigo.cc/apigo/gojs/modules/log" + _ "apigo.cc/apigo/gojs/modules/util" +) diff --git a/modules/util.go b/modules/util/util.go similarity index 99% rename from modules/util.go rename to modules/util/util.go index 19fc76c..2bdf899 100644 --- a/modules/util.go +++ b/modules/util/util.go @@ -1,4 +1,4 @@ -package js +package util import ( "apigo.cc/apigo/gojs" @@ -17,7 +17,7 @@ import ( //go:embed util.ts var utilTS string -func RegisterUtilModel() { +func init() { obj := map[string]any{ "json": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) diff --git a/modules/util.ts b/modules/util/util.ts similarity index 100% rename from modules/util.ts rename to modules/util/util.ts