111

Author: lvan100

gen/gen.go

@@ -19,7 +19,6 @@ package gen
 import (
 	"github.com/go-spring/gs-http-gen/gen/generator"
 	"github.com/go-spring/gs-http-gen/gen/generator/golang"
-	"github.com/go-spring/gs-http-gen/lib/tidl"
 	"github.com/lvan100/errutil"
 )
 
@@ -33,15 +32,5 @@ func Gen(language string, config *generator.Config) error {
 	if !ok {
 		return errutil.Explain(nil, "unsupported language: %s", language)
 	}
-	files, meta, err := tidl.ParseDir(config.IDLSrcDir)
-	if err != nil {
-		return err
-	}
-	if meta == nil {
-		return errutil.Explain(nil, "no meta file")
-	}
-	if len(files) == 0 {
-		return errutil.Explain(nil, "no idl file")
-	}
-	return g.Gen(config, files, meta)
+	return g.Gen(config)
 }

gen/generator/generator.go

@@ -37,7 +37,7 @@ var generators = map[string]Generator{}
 // must implement. The Gen method generates code based on the given
 // configuration, documents, and metadata.
 type Generator interface {
-	Gen(config *Config, files map[string]tidl.Document, meta *tidl.MetaInfo) error
+	Gen(config *Config) error
 }
 
 // GetGenerator retrieves a registered generator for a given language.
@@ -53,3 +53,17 @@ func RegisterGenerator(language string, g Generator) {
 	}
 	generators[language] = g
 }
+
+func ParseDir(dir string) ( /* files */ map[string]tidl.Document /* meta */, *tidl.MetaInfo, error) {
+	files, meta, err := tidl.ParseDir(dir)
+	if err != nil {
+		return nil, nil, err
+	}
+	if meta == nil {
+		return nil, nil, errutil.Explain(nil, "no meta file")
+	}
+	if len(files) == 0 {
+		return nil, nil, errutil.Explain(nil, "no idl file")
+	}
+	return files, meta, nil
+}

gen/generator/golang/main.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/go-spring/gs-http-gen/gen/generator"
 	"github.com/go-spring/gs-http-gen/lib/tidl"
 	"github.com/go-spring/gs-http-gen/lib/vidl"
 	"github.com/lvan100/errutil"
@@ -117,7 +118,12 @@ type Go struct {
 	Funcs  map[string]ValidateFunc // Collected validation functions
 }
 
-func Convert(files map[string]tidl.Document, meta *tidl.MetaInfo) (Go, error) {
+func Convert(dir string) (Go, error) {
+	files, meta, err := generator.ParseDir(dir)
+	if err != nil {
+		return Go{}, err
+	}
+
 	g := Go{
 		Files:  files,
 		Meta:   meta,