Replace //go:generate statik with //go:embed (#89)

Author: VojtechVitek

embed/static.go

@@ -1,42 +1,32 @@
-//go:generate statik -src=./templates -dest=. -f -Z -p=embed
 package javascript
 
 import (
 	"bytes"
-	"io/ioutil"
-	"os"
+	"embed"
 	"text/template"
 
-	"github.com/goware/statik/fs"
+	"github.com/pkg/errors"
 	"github.com/webrpc/webrpc/gen"
-	"github.com/webrpc/webrpc/gen/javascript/embed"
 	"github.com/webrpc/webrpc/schema"
 )
 
 func init() {
 	gen.Register("js", &generator{})
 }
 
+//go:embed templates/*.js.tmpl
+var templatesFS embed.FS
+
 type generator struct{}
 
 func (g *generator) Gen(proto *schema.WebRPCSchema, opts gen.TargetOptions) (string, error) {
-	// Get templates from `embed` asset package
-	// NOTE: make sure to `go generate` whenever you change the files in `templates/` folder
-	templates, err := getTemplates()
-	if err != nil {
-		return "", err
-	}
-
 	// Load templates
-	tmpl := template.
+	tmpl, err := template.
 		New("webrpc-gen-js").
-		Funcs(templateFuncMap(opts))
-
-	for _, tmplData := range templates {
-		_, err = tmpl.Parse(tmplData)
-		if err != nil {
-			return "", err
-		}
+		Funcs(templateFuncMap(opts)).
+		ParseFS(templatesFS, "templates/*.js.tmpl")
+	if err != nil {
+		return "", errors.Wrap(err, "failed to parse javascript templates")
 	}
 
 	// generate deterministic schema hash of the proto file
@@ -63,30 +53,3 @@ func (g *generator) Gen(proto *schema.WebRPCSchema, opts gen.TargetOptions) (str
 
 	return string(genBuf.Bytes()), nil
 }
-
-func getTemplates() (map[string]string, error) {
-	data := map[string]string{}
-
-	statikFS, err := fs.New(embed.Asset)
-	if err != nil {
-		return nil, err
-	}
-
-	fs.Walk(statikFS, "/", func(path string, info os.FileInfo, err error) error {
-		if path == "/" {
-			return nil
-		}
-		f, err := statikFS.Open(path)
-		if err != nil {
-			return err
-		}
-		buf, err := ioutil.ReadAll(f)
-		if err != nil {
-			return err
-		}
-		data[path] = string(buf)
-		return nil
-	})
-
-	return data, nil
-}