diff --git a/generator/template/process.go b/generator/template/process.go index 28e6c0ab..493713ff 100644 --- a/generator/template/process.go +++ b/generator/template/process.go @@ -4,11 +4,13 @@ import ( "bytes" "errors" "fmt" - "github.com/go-jet/jet/v2/internal/utils/filesys" + "os" "path/filepath" "strings" "text/template" + "github.com/go-jet/jet/v2/internal/utils/filesys" + "github.com/go-jet/jet/v2/generator/metadata" "github.com/go-jet/jet/v2/internal/jet" ) @@ -24,12 +26,11 @@ func ProcessSchema(dirPath string, schemaMetaData metadata.Schema, generatorTemp fmt.Println("Destination directory:", schemaPath) fmt.Println("Cleaning up destination directory...") - err := filesys.RemoveDir(schemaPath) - if err != nil { + if err := os.RemoveAll(schemaPath); err != nil { return errors.New("failed to cleanup generated files") } - err = processModel(schemaPath, schemaMetaData, schemaTemplate) + err := processModel(schemaPath, schemaMetaData, schemaTemplate) if err != nil { return fmt.Errorf("failed to generate model types: %w", err) } diff --git a/internal/utils/filesys/filesys.go b/internal/utils/filesys/filesys.go index 07244707..5a0be8c1 100644 --- a/internal/utils/filesys/filesys.go +++ b/internal/utils/filesys/filesys.go @@ -56,34 +56,3 @@ func EnsureDirPathExist(dirPath string) error { return nil } - -// RemoveDir deletes everything at folder dir. -func RemoveDir(dir string) error { - exist, err := DirExists(dir) - - if err != nil { - return err - } - - if exist { - err := os.RemoveAll(dir) - - if err != nil { - return err - } - } - - return nil -} - -// DirExists checks if folder at path exist. -func DirExists(path string) (bool, error) { - _, err := os.Stat(path) - if err == nil { - return true, nil - } - if os.IsNotExist(err) { - return false, nil - } - return true, err -}