Fix preserving imports

kylecarbs · kylecarbs · commit 8501c937983c · 2023-06-12T21:13:11.000Z
diff --git a/Makefile b/Makefile
@@ -486,7 +486,7 @@ coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/dat
 	go run ./coderd/database/gen/dump/main.go
 
 # Generates Go code for querying the database.
-coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql) coderd/database/gen/enum/main.go coderd/database/gen/fake/main.go
+coderd/database/querier.go: coderd/database/dbfake/dbfake.go coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql) coderd/database/gen/enum/main.go coderd/database/gen/fake/main.go
 	./coderd/database/generate.sh
 
 
diff --git a/coderd/database/gen/fake/main.go b/coderd/database/gen/fake/main.go
@@ -1,11 +1,15 @@
 package main
 
 import (
+	"go/format"
+	"go/token"
 	"log"
 	"os"
 
 	"github.com/dave/dst"
 	"github.com/dave/dst/decorator"
+	"github.com/dave/dst/decorator/resolver/goast"
+	"github.com/dave/dst/decorator/resolver/guess"
 	"golang.org/x/xerrors"
 )
 
@@ -27,11 +31,13 @@ func run() error {
 	}
 	declByName := map[string]*dst.FuncDecl{}
 
-	dbfake, err := os.ReadFile("../../dbfake/dbfake.go")
+	dbfake, err := os.ReadFile("./dbfake/dbfake.go")
 	if err != nil {
 		return xerrors.Errorf("read dbfake: %w", err)
 	}
-	f, err := decorator.Parse(dbfake)
+
+	// Required to preserve imports!
+	f, err := decorator.NewDecoratorWithImports(token.NewFileSet(), "dbfake", goast.New()).Parse(dbfake)
 	if err != nil {
 		return xerrors.Errorf("parse dbfake: %w", err)
 	}
@@ -64,7 +70,13 @@ func run() error {
 			// Not implemented!
 			decl = &dst.FuncDecl{
 				Name: dst.NewIdent(fn.Name),
-				Type: fn.Func,
+				Type: &dst.FuncType{
+					Func:       true,
+					TypeParams: fn.Func.TypeParams,
+					Params:     fn.Func.Params,
+					Results:    fn.Func.Results,
+					Decs:       fn.Func.Decs,
+				},
 				Recv: &dst.FieldList{
 					List: []*dst.Field{{
 						Names: []*dst.Ident{dst.NewIdent("q")},
@@ -81,7 +93,7 @@ func run() error {
 					Decs: dst.BlockStmtDecorations{
 						Lbrace: dst.Decorations{
 							"\n",
-							"// Implement me!",
+							"// Not implemented",
 						},
 					},
 				},
@@ -90,18 +102,20 @@ func run() error {
 		f.Decls = append(f.Decls, decl)
 	}
 
-	file, err := os.OpenFile("../../dbfake/dbfake.go", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
+	file, err := os.OpenFile("./dbfake/dbfake.go", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o755)
 	if err != nil {
 		return xerrors.Errorf("open dbfake: %w", err)
 	}
 	defer file.Close()
 
-	err = decorator.Fprint(file, f)
+	// Required to preserve imports!
+	restorer := decorator.NewRestorerWithImports("dbfake", guess.New())
+	restored, err := restorer.RestoreFile(f)
 	if err != nil {
-		return xerrors.Errorf("write dbfake: %w", err)
+		return xerrors.Errorf("restore dbfake: %w", err)
 	}
-
-	return nil
+	err = format.Node(file, restorer.Fset, restored)
+	return err
 }
 
 type storeMethod struct {
@@ -110,7 +124,7 @@ type storeMethod struct {
 }
 
 func readStoreInterface() ([]storeMethod, error) {
-	querier, err := os.ReadFile("../../querier.go")
+	querier, err := os.ReadFile("./querier.go")
 	if err != nil {
 		return nil, xerrors.Errorf("read querier: %w", err)
 	}
@@ -150,6 +164,23 @@ func readStoreInterface() ([]storeMethod, error) {
 		if !ok {
 			continue
 		}
+
+		for _, t := range []*dst.FieldList{funcType.Params, funcType.Results} {
+			if t == nil {
+				continue
+			}
+			for _, f := range t.List {
+				ident, ok := f.Type.(*dst.Ident)
+				if !ok {
+					continue
+				}
+				if !ident.IsExported() {
+					continue
+				}
+				ident.Path = "github.com/coder/coder/coderd/database"
+			}
+		}
+
 		funcs = append(funcs, storeMethod{
 			Name: method.Names[0].Name,
 			Func: funcType,
diff --git a/coderd/database/generate.sh b/coderd/database/generate.sh
@@ -59,6 +59,6 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 	# Generate enums (e.g. unique constraints).
 	go run gen/enum/main.go
 
-    # Generate the database fake!
+	# Generate the database fake!
 	go run gen/fake/main.go
 )

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")`
`59`	`59`	`# Generate enums (e.g. unique constraints).`
`60`	`60`	`go run gen/enum/main.go`
`61`	`61`
`62`		`- # Generate the database fake!`
	`62`	`+ # Generate the database fake!`
`63`	`63`	`go run gen/fake/main.go`
`64`	`64`	`)`