ignite · ilgooz · Mar 15, 2021 · Mar 15, 2021 · Mar 15, 2021 · ilgooz
diff --git a/starport/pkg/cosmosgen/generate_javascript.go b/starport/pkg/cosmosgen/generate_javascript.go
@@ -185,39 +185,17 @@ func (g *jsGenerator) generateModule(ctx context.Context, tsprotoPluginPath, app
 	}
 
 	// generate the js client wrapper.
-	outclient := filepath.Join(out, "index.ts")
-	f, err := os.OpenFile(outclient, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
 	pp := filepath.Join(appPath, g.g.protoDir)
-	err = templateJSClient(pp).Execute(f, struct{ Module module.Module }{m})
-	if err != nil {
+	if err := templateJSClient.Write(out, pp, struct{ Module module.Module }{m}); err != nil {
 		return err
 	}
 
 	// generate Vuex if enabled.
 	if g.g.o.vuexStoreRootPath != "" {
-		storePath := filepath.Join(storeDirPath, "index.ts")
-		f, err := os.OpenFile(storePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
+		err = templateVuexStore.Write(storeDirPath, pp, struct{ Module module.Module }{m})
 		if err != nil {
 			return err
 		}
-		defer f.Close()
-
-		err = templateVuexStore(pp).Execute(f, struct{ Module module.Module }{m})
-		if err != nil {
-			return err
-		}
-
-		// mark vuex root dir.
-		f, err = os.Create(filepath.Join(storeDirPath, vuexRootMarker))
-		if err != nil {
-			return err
-		}
-		f.Close()
 	}
 
 	// generate .js and .d.ts files for all ts files.
@@ -231,8 +209,10 @@ func (g *jsGenerator) generateVuexModuleLoader() error {
 	}
 
 	type module struct {
-		Name string
-		Path string
+		Name     string
+		Path     string
+		FullName string
+		FullPath string
 	}
 
 	var modules []module
@@ -242,21 +222,23 @@ func (g *jsGenerator) generateVuexModuleLoader() error {
 		if err != nil {
 			return err
 		}
-		pathrel = filepath.Dir(pathrel)
-		name := strcase.ToCamel(strings.ReplaceAll(pathrel, "/", "_"))
-		modules = append(modules, module{name, pathrel})
+		var (
+			fullPath = filepath.Dir(pathrel)
+			fullName = strcase.ToCamel(strings.ReplaceAll(fullPath, "/", "_"))
+			path     = filepath.Base(fullPath)
+			name     = strcase.ToCamel(path)
+		)
+		modules = append(modules, module{
+			Name:     name,
+			Path:     path,
+			FullName: fullName,
+			FullPath: fullPath,
+		})
 	}
 
 	loaderPath := filepath.Join(g.g.o.vuexStoreRootPath, "index.ts")
 
-	f, err := os.OpenFile(loaderPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	err = templateVuexLoader(g.g.o.vuexStoreRootPath).Execute(f, modules)
-	if err != nil {
+	if err := templateVuexRoot.Write(g.g.o.vuexStoreRootPath, "", modules); err != nil {
 		return err
 	}
 

diff --git a/starport/pkg/cosmosgen/template.go b/starport/pkg/cosmosgen/template.go
@@ -2,6 +2,7 @@ package cosmosgen
 
 import (
 	"embed"
+	"os"
 	"path/filepath"
 	"strings"
 	"text/template"
@@ -13,32 +14,72 @@ var (
 	//go:embed templates/*
 	templates embed.FS
 
-	templateJSClient   = tpl("js/client.ts.tpl")   // js wrapper client.
-	templateVuexStore  = tpl("vuex/store.ts.tpl")  // vuex store.
-	templateVuexLoader = tpl("vuex/loader.ts.tpl") // vuex store loader.
+	templateJSClient  = newTemplateWriter("js")         // js wrapper client.
+	templateVuexRoot  = newTemplateWriter("vuex/root")  // vuex store loader.
+	templateVuexStore = newTemplateWriter("vuex/store") // vuex store.
 )
 
+type templateWriter struct {
+	templateDir string
+}
+
 // tpl returns a func for template residing at templatePath to initialize a text template
 // with given protoPath.
-func tpl(templatePath string) func(protoPath string) *template.Template {
-	return func(protoPath string) *template.Template {
-		path := filepath.Join("templates", templatePath)
-
-		funcs := template.FuncMap{
-			"camelCase": strcase.ToLowerCamel,
-			"resolveFile": func(fullPath string) string {
-				rel, _ := filepath.Rel(protoPath, fullPath)
-				rel = strings.TrimSuffix(rel, ".proto")
-				return rel
-			},
-		}
+func newTemplateWriter(templateDir string) templateWriter {
+	return templateWriter{
+		templateDir,
+	}
+}
+
+func (t templateWriter) Write(destDir, protoPath string, data interface{}) error {
+	base := filepath.Join("templates", t.templateDir)
+
+	// find out templates inside the dir.
+	files, err := templates.ReadDir(base)
+	if err != nil {
+		return err
+	}
+
+	var paths []string
+	for _, file := range files {
+		paths = append(paths, filepath.Join(base, file.Name()))
+	}
 
-		return template.
+	funcs := template.FuncMap{
+		"camelCase": strcase.ToLowerCamel,
+		"resolveFile": func(fullPath string) string {
+			rel, _ := filepath.Rel(protoPath, fullPath)
+			rel = strings.TrimSuffix(rel, ".proto")
+			return rel
+		},
+	}
+
+	// render and write the template.
+	write := func(path string) error {
+		tpl := template.
 			Must(
 				template.
 					New(filepath.Base(path)).
 					Funcs(funcs).
-					ParseFS(templates, path),
+					ParseFS(templates, paths...),
 			)
+
+		out := filepath.Join(destDir, strings.TrimSuffix(filepath.Base(path), ".tpl"))
+
+		f, err := os.OpenFile(out, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+
+		return tpl.Execute(f, data)
 	}
+
+	for _, path := range paths {
+		if err := write(path); err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
diff --git a/.../pkg/cosmosgen/templates/js/client.ts.tpl → ...t/pkg/cosmosgen/templates/js/index.ts.tpl b/.../pkg/cosmosgen/templates/js/client.ts.tpl → ...t/pkg/cosmosgen/templates/js/index.ts.tpl
@@ -1,3 +1,5 @@
+// THIS FILE IS GENERATED AUTOMATICALLY. DO NOT MODIFY.
+
 import { coins, StdFee } from "@cosmjs/launchpad";
 import { SigningStargateClient } from "@cosmjs/stargate";
 import { Registry, OfflineSigner, EncodeObject, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";

diff --git a/...kg/cosmosgen/templates/vuex/loader.ts.tpl → ...osmosgen/templates/vuex/root/index.ts.tpl b/...kg/cosmosgen/templates/vuex/loader.ts.tpl → ...osmosgen/templates/vuex/root/index.ts.tpl
@@ -1,11 +1,14 @@
-{{ range . }}import {{ .Name }} from './{{ .Path }}'
+// THIS FILE IS GENERATED AUTOMATICALLY. DO NOT MODIFY.
+
+{{ range . }}import {{ .FullName }} from './{{ .FullPath }}'
 {{ end }}
 
 export default { 
-  {{ range . }}{{ .Name }}: load({{ .Name }}, 'chain/{{ .Path }}'),
+  {{ range . }}{{ .FullName }}: load({{ .FullName }}, 'chain/{{ .FullPath }}'),
   {{ end }}
 }
 
+
 function load(mod, fullns) {
     return function init(store) {
         const fullnsLevels = fullns.split('/')

diff --git a/starport/pkg/cosmosgen/templates/vuex/root/readme.md b/starport/pkg/cosmosgen/templates/vuex/root/readme.md
@@ -0,0 +1 @@
+THIS FOLDER IS GENERATED AUTOMATICALLY. DO NOT MODIFY.
diff --git a/...pkg/cosmosgen/templates/vuex/store.ts.tpl → ...smosgen/templates/vuex/store/index.ts.tpl b/...pkg/cosmosgen/templates/vuex/store.ts.tpl → ...smosgen/templates/vuex/store/index.ts.tpl
diff --git a/starport/pkg/cosmosgen/templates/vuex/store/vuex-root b/starport/pkg/cosmosgen/templates/vuex/store/vuex-root
@@ -0,0 +1 @@
+THIS FILE IS GENERATED AUTOMATICALLY. DO NOT DELETE.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		THIS FOLDER IS GENERATED AUTOMATICALLY. DO NOT MODIFY.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		THIS FILE IS GENERATED AUTOMATICALLY. DO NOT DELETE.