feat: support wasm & make it can used as a lib

Author: YYCoder

Makefile

@@ -0,0 +1,6 @@
+.PHONY: build
+
+default: build
+
+build:
+	go build -ldflags '-s -w' -o exe/protobuf-thrift exe/main.go

dev

@@ -0,0 +1,5 @@
+#! /bin/bash
+
+cd ./exe
+
+gowatch -args='-t=proto2thrift' -o protobuf-thrift

dev.sh

@@ -1,11 +1,12 @@
 package main
 
 import (
+	pbThrift "github.com/YYCoder/protobuf-thrift"
 	"github.com/YYCoder/protobuf-thrift/utils/logger"
 )
 
 func main() {
-	runner, err := NewRunner()
+	runner, err := pbThrift.NewRunner()
 	if err != nil {
 		logger.Fatal(err)
 	}

main.go exe/main.gomain.go renamed to exe/main.go

@@ -1,4 +1,4 @@
-package main
+package pbthrift
 
 import (
 	"io/fs"
@@ -19,12 +19,14 @@ type FileInfo struct {
 type SubGenerator interface {
 	Parse() (newFiles []FileInfo, err error) // return relative file path to parsed file
 	Sink() (err error)
+	Pipe() (res []byte, err error)
 	FilePath() (res string)
 }
 
 // Main generator for all idl files, responsible for initialize all SubGenerator for each file
 type Generator interface {
 	Generate() (err error)
+	Pipe() (res []byte, err error)
 }
 
 func NewGenerator(conf *RunnerConfig) (res Generator, err error) {
@@ -35,7 +37,7 @@ func NewGenerator(conf *RunnerConfig) (res Generator, err error) {
 	}
 
 	if conf.Task == TASK_CONTENT_PROTO2THRIFT || conf.Task == TASK_CONTENT_THRIFT2PROTO {
-		gen.initSubGeneratorForRawContent()
+		err = gen.initSubGeneratorForRawContent()
 	} else {
 		_, filename := filepath.Split(conf.InputPath)
 
@@ -90,6 +92,22 @@ func (g *generator) Generate() (err error) {
 	return
 }
 
+// Pipe the transformed result to return value, since the scenario for Pipe is using protobuf-thrift as a lib, currently not support recursive transform.
+func (g *generator) Pipe() (res []byte, err error) {
+	for _, sub := range g.subGeneratorMap {
+		if _, err = sub.Parse(); err != nil {
+			logger.Fatalf("Error occurred when parsing file %v", sub.FilePath())
+			return
+		}
+		if res, err = sub.Pipe(); err != nil {
+			logger.Fatalf("Error occurred when generating file %v", sub.FilePath(), err)
+			return
+		}
+		break
+	}
+	return
+}
+
 func (g *generator) absPathIsIdl(absPath string) (res bool, err error) {
 	suffix := ""
 	if g.conf.Task == TASK_CONTENT_PROTO2THRIFT || g.conf.Task == TASK_FILE_PROTO2THRIFT {
@@ -200,7 +218,7 @@ func (g *generator) initSubGenerator(fileInfos []FileInfo) (err error) {
 
 		if g.conf.Task == TASK_FILE_PROTO2THRIFT {
 			var generator SubGenerator
-			conf := &thriftGeneratorConfig{
+			conf := &ThriftGeneratorConfig{
 				taskType:       g.conf.Task,
 				filePath:       path,
 				fileName:       filename,
@@ -219,7 +237,7 @@ func (g *generator) initSubGenerator(fileInfos []FileInfo) (err error) {
 			g.subGeneratorMap[path] = generator
 		} else if g.conf.Task == TASK_FILE_THRIFT2PROTO {
 			var generator SubGenerator
-			conf := &protoGeneratorConfig{
+			conf := &ProtoGeneratorConfig{
 				taskType:       g.conf.Task,
 				filePath:       path,
 				fileName:       filename,
@@ -250,7 +268,7 @@ func (g *generator) initSubGeneratorForRawContent() (err error) {
 	})
 	if g.conf.Task == TASK_CONTENT_PROTO2THRIFT {
 		var generator SubGenerator
-		conf := &thriftGeneratorConfig{
+		conf := &ThriftGeneratorConfig{
 			taskType:       g.conf.Task,
 			rawContent:     g.conf.RawContent,
 			filePath:       path,
@@ -262,12 +280,13 @@ func (g *generator) initSubGeneratorForRawContent() (err error) {
 		}
 		generator, err = NewThriftGenerator(conf)
 		if err != nil {
-			return
+			logger.Errorf("NewThriftGenerator failed, %s", err)
+			return err
 		}
 		g.subGeneratorMap[path] = generator
 	} else if g.conf.Task == TASK_CONTENT_THRIFT2PROTO {
 		var generator SubGenerator
-		conf := &protoGeneratorConfig{
+		conf := &ProtoGeneratorConfig{
 			taskType:       g.conf.Task,
 			rawContent:     g.conf.RawContent,
 			filePath:       path,
@@ -279,7 +298,8 @@ func (g *generator) initSubGeneratorForRawContent() (err error) {
 		}
 		generator, err = NewProtoGenerator(conf)
 		if err != nil {
-			return
+			logger.Errorf("NewProtoGenerator failed, %s", err)
+			return err
 		}
 		g.subGeneratorMap[path] = generator
 	}

generator.go

@@ -1,7 +1,3 @@
-github.com/YYCoder/thrifter v0.0.4 h1:fgJ1Ti3E2lg0YPHNl6vaTpX2VymIsXdzZ9qipDYqDB8=
-github.com/YYCoder/thrifter v0.0.4/go.mod h1:S7jjpbFkt9VYlTUDkhsPhrFi++/wH+S1sJ2NLhDIdZQ=
-github.com/YYCoder/thrifter v0.0.5 h1:VN7KQyddfVqaIu8+cztmiuYZfzuvsxhx5u2S8qnpDUM=
-github.com/YYCoder/thrifter v0.0.5/go.mod h1:S7jjpbFkt9VYlTUDkhsPhrFi++/wH+S1sJ2NLhDIdZQ=
 github.com/YYCoder/thrifter v0.0.6 h1:tEyqNXLfBssRllTExHEEmWI5pFSa9OpyP4V7j1yZE/0=
 github.com/YYCoder/thrifter v0.0.6/go.mod h1:S7jjpbFkt9VYlTUDkhsPhrFi++/wH+S1sJ2NLhDIdZQ=
 github.com/emicklei/proto v1.9.0 h1:l0QiNT6Qs7Yj0Mb4X6dnWBQer4ebei2BFcgQLbGqUDc=

go.sum

@@ -1,4 +1,4 @@
-package main
+package pbthrift
 
 import (
 	"bufio"
@@ -18,15 +18,15 @@ import (
 )
 
 type thriftGenerator struct {
-	conf          *thriftGeneratorConfig
+	conf          *ThriftGeneratorConfig
 	def           *proto.Proto
 	file          *os.File
 	thriftContent bytes.Buffer
 	newFiles      []FileInfo
 	syntax        int
 }
 
-type thriftGeneratorConfig struct {
+type ThriftGeneratorConfig struct {
 	taskType   int
 	filePath   string // absolute path for current file
 	fileName   string // relative filename including path for file to be generated
@@ -42,9 +42,10 @@ type thriftGeneratorConfig struct {
 	syntax int // 2 or 3
 }
 
-func NewThriftGenerator(conf *thriftGeneratorConfig) (res SubGenerator, err error) {
+func NewThriftGenerator(conf *ThriftGeneratorConfig) (res SubGenerator, err error) {
 	var parser *proto.Parser
 	var file *os.File
+	var content string
 	var syntax int
 	if conf.taskType == TASK_FILE_PROTO2THRIFT {
 		file, err = os.Open(conf.filePath)
@@ -60,23 +61,27 @@ func NewThriftGenerator(conf *thriftGeneratorConfig) (res SubGenerator, err erro
 			return nil, err
 		}
 		defer file1.Close()
-		content, err := io.ReadAll(file1)
+		contentBytes, err := io.ReadAll(file1)
 		if err != nil {
 			return nil, err
 		}
-		if strings.Contains(string(content), "syntax = \"proto3\"") {
-			syntax = 3
-		} else {
-			syntax = 2
-		}
+		content = string(contentBytes)
 	} else if conf.taskType == TASK_CONTENT_PROTO2THRIFT {
-		if strings.Contains(conf.rawContent, "syntax = \"proto3\"") {
+		content = conf.rawContent
+		rd := strings.NewReader(conf.rawContent)
+		parser = proto.NewParser(rd)
+	}
+
+	if strings.Contains(content, "syntax =") {
+		if strings.Contains(content, "syntax = \"proto3\"") {
 			syntax = 3
 		} else {
 			syntax = 2
 		}
-		rd := strings.NewReader(conf.rawContent)
-		parser = proto.NewParser(rd)
+	} else if conf.syntax != 0 {
+		syntax = conf.syntax
+	} else {
+		syntax = 3
 	}
 
 	definition, err := parser.Parse()
@@ -541,3 +546,7 @@ func (g *thriftGenerator) writeIndent() {
 		g.thriftContent.WriteString("	")
 	}
 }
+
+func (g *thriftGenerator) Pipe() (res []byte, err error) {
+	return g.thriftContent.Bytes(), nil
+}

proto-2-thrift-gen.go

@@ -1,4 +1,4 @@
-package main
+package pbthrift
 
 import (
 	"flag"
@@ -18,10 +18,11 @@ const (
 )
 
 type Runner struct {
-	config *RunnerConfig
+	Config *RunnerConfig
 }
 
 type RunnerConfig struct {
+	Pipe       bool // return the result from Generator instead of printing to os.Stdout or filesystem
 	RawContent string
 	InputPath  string // absolute path for input idl file
 	OutputDir  string // absolute path for output dir
@@ -111,21 +112,31 @@ func NewRunner() (res *Runner, err error) {
 		Recursive:      recursive,
 	}
 	res = &Runner{
-		config: config,
+		Config: config,
 	}
 	return
 }
 
 func (r *Runner) Run() (err error) {
 	var generator Generator
-	generator, err = NewGenerator(r.config)
+	generator, err = NewGenerator(r.Config)
 	if err != nil {
 		return
 	}
 	err = generator.Generate()
 	return
 }
 
+func (r *Runner) Pipe() (res []byte, err error) {
+	var generator Generator
+	generator, err = NewGenerator(r.Config)
+	if err != nil {
+		return
+	}
+	res, err = generator.Pipe()
+	return
+}
+
 func ValidateTaskType(taskType string) {
 	if taskType != "proto2thrift" && taskType != "thrift2proto" {
 		logger.Fatal("You must specify which task you want to run, proto2thrift or thrift2proto.")

runner.go

@@ -1,4 +1,4 @@
-package main
+package pbthrift
 
 import (
 	"bufio"
@@ -15,15 +15,15 @@ import (
 )
 
 type protoGenerator struct {
-	conf           *protoGeneratorConfig
+	conf           *ProtoGeneratorConfig
 	def            *thrifter.Thrift
 	file           *os.File
 	protoContent   bytes.Buffer
 	currentToken   *thrifter.Token
 	packageDeclare string // used to detect whether has duplicate package
 }
 
-type protoGeneratorConfig struct {
+type ProtoGeneratorConfig struct {
 	taskType   int
 	filePath   string // absolute path for current file
 	fileName   string // output file name, including extension
@@ -39,7 +39,7 @@ type protoGeneratorConfig struct {
 	syntax int // 2 or 3
 }
 
-func NewProtoGenerator(conf *protoGeneratorConfig) (res SubGenerator, err error) {
+func NewProtoGenerator(conf *ProtoGeneratorConfig) (res SubGenerator, err error) {
 	var parser *thrifter.Parser
 	var file *os.File
 	var definition *thrifter.Thrift
@@ -488,3 +488,7 @@ func (g *protoGenerator) writeIndent() {
 	}
 	return
 }
+
+func (g *protoGenerator) Pipe() (res []byte, err error) {
+	return g.protoContent.Bytes(), nil
+}