Skip to content

Commit 6619788

Browse files
committed
use filepath.Walk to get files from template dir
1 parent 5ad7e6a commit 6619788

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

bindings/fcl-js.go

+21-9
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,14 @@ func NewFclJSGenerator() *FclJSGenerator {
4141

4242
return &FclJSGenerator{
4343
TemplateDir: templateDir,
44-
// initialize other fields if needed
4544
}
4645
}
4746

4847
func (g FclJSGenerator) Generate(flix *flixkit.FlowInteractionTemplate, templateLocation string, isLocal bool) (string, error) {
49-
files, err := os.ReadDir(g.TemplateDir)
48+
templateFiles, err := getAllFiles(g.TemplateDir)
5049
if err != nil {
5150
return "", err
5251
}
53-
templateFiles := make([]string, 0)
54-
for _, file := range files {
55-
if !file.IsDir() {
56-
templateFiles = append(templateFiles, filepath.Join(g.TemplateDir, "/", file.Name()))
57-
}
58-
}
5952
tmpl, err := template.ParseFiles(templateFiles...)
6053
if err != nil {
6154
return "", err
@@ -120,7 +113,7 @@ func convertCadenceTypeToJS(cadenceType string) string {
120113
case "Bool":
121114
return "boolean"
122115
case "Void":
123-
return "void" // return type only
116+
return "void"
124117
case "Dictionary":
125118
return "object"
126119
case "Struct":
@@ -131,3 +124,22 @@ func convertCadenceTypeToJS(cadenceType string) string {
131124
return "string"
132125
}
133126
}
127+
128+
func getAllFiles(dir string) ([]string, error) {
129+
var files []string
130+
err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
131+
if err != nil {
132+
return err
133+
}
134+
// If it's a directory, skip it
135+
if info.IsDir() {
136+
return nil
137+
}
138+
files = append(files, path)
139+
return nil
140+
})
141+
if err != nil {
142+
return nil, err
143+
}
144+
return files, nil
145+
}

0 commit comments

Comments
 (0)