commit before ast changes

Author: jackHedaya

_testproj/grr.gen.go

@@ -21,8 +21,13 @@ func CleanEntry(directory string) error {
 			return grr.Errorf("FailedToWalk: Failed to walk %s", path).AddError(err)
 		}
 
-		if filepath.Ext(path) == ".gen.go" {
+		if info.IsDir() && info.Name() == ".git" {
+			return filepath.SkipDir
+		}
+
+		if filepath.Base(path) == "grr.gen.go" {
 			err := os.Remove(path)
+
 			if err != nil {
 				return grr.Errorf("FailedToDelete: Failed to delete %s", path).AddError(err)
 			}

clean/clean.go

@@ -17,7 +17,7 @@ type ErrFailedToClean struct {
 
 var _ grr.Error = &ErrFailedToClean{}
 
-func NewErrFailedToClean() grr.Error {
+func NewErrFailedToClean() *ErrFailedToClean {
 	return &ErrFailedToClean{}
 }
 
@@ -86,7 +86,7 @@ type ErrFailedToDelete struct {
 
 var _ grr.Error = &ErrFailedToDelete{}
 
-func NewErrFailedToDelete(path string) grr.Error {
+func NewErrFailedToDelete(path string) *ErrFailedToDelete {
 	return &ErrFailedToDelete{
 		path: path,
 	}
@@ -156,7 +156,7 @@ type ErrFailedToResolveDir struct {
 
 var _ grr.Error = &ErrFailedToResolveDir{}
 
-func NewErrFailedToResolveDir() grr.Error {
+func NewErrFailedToResolveDir() *ErrFailedToResolveDir {
 	return &ErrFailedToResolveDir{}
 }
 
@@ -225,7 +225,7 @@ type ErrFailedToWalk struct {
 
 var _ grr.Error = &ErrFailedToWalk{}
 
-func NewErrFailedToWalk(path string) grr.Error {
+func NewErrFailedToWalk(path string) *ErrFailedToWalk {
 	return &ErrFailedToWalk{
 		path: path,
 	}

clean/grr.gen.go

@@ -18,7 +18,7 @@ type ErrPathNotFound struct {
 
 var _ grr.Error = &ErrPathNotFound{}
 
-func NewErrPathNotFound(path string) grr.Error {
+func NewErrPathNotFound(path string) *ErrPathNotFound {
 	return &ErrPathNotFound{
 		path: path,
 	}

cmd/grr.gen.go

@@ -11,7 +11,7 @@ type {{ .ErrName }} struct {
 
 var _ grr.Error = &{{ .ErrName }}{}
 
-func New{{ .ErrName }}({{ range $i, $pair := .Vars }}{{ $pair.Name }} {{ $pair.Type }}{{ if notlast $i $varlen}}, {{ end }}{{ end }}) grr.Error {
+func New{{ .ErrName }}({{ range $i, $pair := .Vars }}{{ $pair.Name }} {{ $pair.Type }}{{ if notlast $i $varlen}}, {{ end }}{{ end }}) *{{ .ErrName }} {
   return &{{ .ErrName }}{
     {{- range .Vars }}
     {{ .Name }}: {{ .Name }},

gen/errorStruct.tmpl

@@ -3,6 +3,8 @@ package gen
 import (
 	"fmt"
 	"go/ast"
+	"go/printer"
+	"go/token"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -94,11 +96,39 @@ func GenerateEntry(directory string) error {
 
 		fmt.Printf("Writing to: %s\n", writePath)
 
-		err = os.WriteFile(writePath, code, fs.FileMode(os.O_APPEND)|fs.FileMode(os.O_CREATE)|fs.FileMode(os.O_WRONLY))
+		err = os.WriteFile(writePath, code, fs.FileMode(os.O_APPEND)|fs.FileMode(os.O_CREATE))
 
 		if err != nil {
 			return grr.Errorf("FailedToWriteFile: failed to write generated file").AddError(err)
 		}
+
+		writeFiles(pkg.Fset, pkg, pkgPath)
+	}
+
+	return nil
+}
+
+func writeFiles(fset *token.FileSet, pkg *packages.Package, outputDir string) error {
+
+	for _, file := range pkg.GoFiles {
+		outputFile := outputDir + "/" + file
+
+		// Create file
+		out, err := os.Create(outputFile)
+		if err != nil {
+			return err
+		}
+
+		// Print the AST back to source code
+		if err := printer.Fprint(out, fset, file); err != nil {
+			out.Close() // Close file on error
+			return err
+		}
+
+		// Close the file
+		if err := out.Close(); err != nil {
+			return err
+		}
 	}
 
 	return nil

gen/gen.go

@@ -19,7 +19,7 @@ type ErrAlreadyDefined struct {
 
 var _ grr.Error = &ErrAlreadyDefined{}
 
-func NewErrAlreadyDefined(errName string) grr.Error {
+func NewErrAlreadyDefined(errName string) *ErrAlreadyDefined {
 	return &ErrAlreadyDefined{
 		errName: errName,
 	}
@@ -90,7 +90,7 @@ type ErrConflict struct {
 
 var _ grr.Error = &ErrConflict{}
 
-func NewErrConflict(errName string) grr.Error {
+func NewErrConflict(errName string) *ErrConflict {
 	return &ErrConflict{
 		errName: errName,
 	}
@@ -161,7 +161,7 @@ type ErrFailedToExecuteTemplate struct {
 
 var _ grr.Error = &ErrFailedToExecuteTemplate{}
 
-func NewErrFailedToExecuteTemplate(stringsBuilder strings.Builder) grr.Error {
+func NewErrFailedToExecuteTemplate(stringsBuilder strings.Builder) *ErrFailedToExecuteTemplate {
 	return &ErrFailedToExecuteTemplate{
 		stringsBuilder: stringsBuilder,
 	}
@@ -231,7 +231,7 @@ type ErrFailedToFormat struct {
 
 var _ grr.Error = &ErrFailedToFormat{}
 
-func NewErrFailedToFormat() grr.Error {
+func NewErrFailedToFormat() *ErrFailedToFormat {
 	return &ErrFailedToFormat{}
 }
 
@@ -299,7 +299,7 @@ type ErrFailedToGenerateStruct struct {
 
 var _ grr.Error = &ErrFailedToGenerateStruct{}
 
-func NewErrFailedToGenerateStruct() grr.Error {
+func NewErrFailedToGenerateStruct() *ErrFailedToGenerateStruct {
 	return &ErrFailedToGenerateStruct{}
 }
 
@@ -367,7 +367,7 @@ type ErrFailedToGetPackagePath struct {
 
 var _ grr.Error = &ErrFailedToGetPackagePath{}
 
-func NewErrFailedToGetPackagePath() grr.Error {
+func NewErrFailedToGetPackagePath() *ErrFailedToGetPackagePath {
 	return &ErrFailedToGetPackagePath{}
 }
 
@@ -435,7 +435,7 @@ type ErrFailedToLoad struct {
 
 var _ grr.Error = &ErrFailedToLoad{}
 
-func NewErrFailedToLoad() grr.Error {
+func NewErrFailedToLoad() *ErrFailedToLoad {
 	return &ErrFailedToLoad{}
 }
 
@@ -503,7 +503,7 @@ type ErrFailedToLoadPackages struct {
 
 var _ grr.Error = &ErrFailedToLoadPackages{}
 
-func NewErrFailedToLoadPackages() grr.Error {
+func NewErrFailedToLoadPackages() *ErrFailedToLoadPackages {
 	return &ErrFailedToLoadPackages{}
 }
 
@@ -571,7 +571,7 @@ type ErrFailedToLoadPreviousErrors struct {
 
 var _ grr.Error = &ErrFailedToLoadPreviousErrors{}
 
-func NewErrFailedToLoadPreviousErrors() grr.Error {
+func NewErrFailedToLoadPreviousErrors() *ErrFailedToLoadPreviousErrors {
 	return &ErrFailedToLoadPreviousErrors{}
 }
 
@@ -639,7 +639,7 @@ type ErrFailedToWriteFile struct {
 
 var _ grr.Error = &ErrFailedToWriteFile{}
 
-func NewErrFailedToWriteFile() grr.Error {
+func NewErrFailedToWriteFile() *ErrFailedToWriteFile {
 	return &ErrFailedToWriteFile{}
 }
 
@@ -707,7 +707,7 @@ type ErrGenerateErrorFile struct {
 
 var _ grr.Error = &ErrGenerateErrorFile{}
 
-func NewErrGenerateErrorFile() grr.Error {
+func NewErrGenerateErrorFile() *ErrGenerateErrorFile {
 	return &ErrGenerateErrorFile{}
 }
 
@@ -775,7 +775,7 @@ type ErrNoErrorMessage struct {
 
 var _ grr.Error = &ErrNoErrorMessage{}
 
-func NewErrNoErrorMessage() grr.Error {
+func NewErrNoErrorMessage() *ErrNoErrorMessage {
 	return &ErrNoErrorMessage{}
 }
 
@@ -843,7 +843,7 @@ type ErrNoErrorName struct {
 
 var _ grr.Error = &ErrNoErrorName{}
 
-func NewErrNoErrorName() grr.Error {
+func NewErrNoErrorName() *ErrNoErrorName {
 	return &ErrNoErrorName{}
 }
 
@@ -912,7 +912,7 @@ type ErrNoPackagesFound struct {
 
 var _ grr.Error = &ErrNoPackagesFound{}
 
-func NewErrNoPackagesFound(stringsBuilder strings.Builder) grr.Error {
+func NewErrNoPackagesFound(stringsBuilder strings.Builder) *ErrNoPackagesFound {
 	return &ErrNoPackagesFound{
 		stringsBuilder: stringsBuilder,
 	}
@@ -983,7 +983,7 @@ type ErrOneExpected struct {
 
 var _ grr.Error = &ErrOneExpected{}
 
-func NewErrOneExpected(arg int) grr.Error {
+func NewErrOneExpected(arg int) *ErrOneExpected {
 	return &ErrOneExpected{
 		arg: arg,
 	}