@@ -41,21 +41,14 @@ func NewFclJSGenerator() *FclJSGenerator {
41
41
42
42
return & FclJSGenerator {
43
43
TemplateDir : templateDir ,
44
- // initialize other fields if needed
45
44
}
46
45
}
47
46
48
47
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 )
50
49
if err != nil {
51
50
return "" , err
52
51
}
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
- }
59
52
tmpl , err := template .ParseFiles (templateFiles ... )
60
53
if err != nil {
61
54
return "" , err
@@ -120,7 +113,7 @@ func convertCadenceTypeToJS(cadenceType string) string {
120
113
case "Bool" :
121
114
return "boolean"
122
115
case "Void" :
123
- return "void" // return type only
116
+ return "void"
124
117
case "Dictionary" :
125
118
return "object"
126
119
case "Struct" :
@@ -131,3 +124,22 @@ func convertCadenceTypeToJS(cadenceType string) string {
131
124
return "string"
132
125
}
133
126
}
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