feat: restructuring.

httpx/module.go

@@ -1,2 +0,0 @@
-package httpx
-

tests/dogs.xgo

@@ -0,0 +1,8 @@
+
+export {
+	"new": func(name) {
+		return {
+			name: name
+		}
+	}
+}

tests/import.xgo

@@ -0,0 +1,6 @@
+fmt := import("fmt")
+dogs := import("./tests/dogs")
+
+dog := dogs.new("check")
+fmt.println(dog)
+

xmodules/httpx/module.go

@@ -0,0 +1,7 @@
+package httpx
+
+import "github.com/d5/tengo/v2"
+
+var Module = map[string] tengo.Object {
+}
+

xmodules/modules.go

@@ -0,0 +1,18 @@
+package xmodules
+
+import "github.com/d5/tengo/v2/stdlib"
+import "surdeus.su/core/xgo/xmodules/cjson"
+import "surdeus.su/core/xgo/xmodules/logx"
+import "surdeus.su/core/xgo/xmodules/paths"
+import "surdeus.su/core/xgo/xmodules/httpx"
+import "github.com/d5/tengo/v2"
+
+// The main map to import all the implemented modules.
+var Modules = func() *tengo.ModuleMap {
+	ret := stdlib.GetModuleMap(stdlib.AllModuleNames()...)
+	ret.AddBuiltinModule("cjson", cjson.Module)
+	ret.AddBuiltinModule("log", logx.Module)
+	ret.AddBuiltinModule("paths", paths.Module)
+	ret.AddBuiltinModule("http", httpx.Module)
+	return ret
+}()

xtool/main.go

@@ -14,14 +14,11 @@ import (
 
 	"github.com/d5/tengo/v2"
 	"github.com/d5/tengo/v2/parser"
-	"github.com/d5/tengo/v2/stdlib"
 
 )
 
 import "surdeus.su/core/cli/mtool"
-import "surdeus.su/core/xgo/cjson"
+import "surdeus.su/core/xgo/xmodules"
-import "surdeus.su/core/xgo/logx"
-import "surdeus.su/core/xgo/paths"
 
 const (
 	sourceFileExt = ".xgo"
@@ -54,10 +51,8 @@ func Run(flags *mtool.Flags) {
 		fmt.Println(version)
 		return
 	}
-	modules := stdlib.GetModuleMap(stdlib.AllModuleNames()...)
+
-	modules.AddBuiltinModule("cjson", cjson.Module)
+	modules := xmodules.Modules
-	modules.AddBuiltinModule("log", logx.Module)
-	modules.AddBuiltinModule("paths", paths.Module)
 	if len(iargs) == 0 {
 		// REPL
 		RunREPL(modules, os.Stdin, os.Stdout)
@@ -216,7 +211,14 @@ func RunREPL(modules *tengo.ModuleMap, in io.Reader, out io.Writer) {
 		}
 
 		file = addPrints(file)
-		c := tengo.NewCompiler(srcFile, symbolTable, constants, modules, nil)
+		c := tengo.NewCompiler(
+			srcFile,
+			symbolTable,
+			constants,
+			modules,
+			nil,
+		)
+		c.SetImportFileExt(sourceFileExt)
 		if err := c.Compile(file); err != nil {
 			_, _ = fmt.Fprintln(out, err.Error())
 			continue
@@ -247,6 +249,7 @@ func compileSrc(
 	}
 
 	c := tengo.NewCompiler(srcFile, nil, nil, modules, nil)
+	c.SetImportFileExt(sourceFileExt)
 	c.EnableFileImport(true)
 	if resolvePath {
 		c.SetImportDir(filepath.Dir(inputFile))