Merge pull request #1294 from 99designs/fix-init

Allow rewriter to work on empty but potentially importable packages
99designs · Aug 18, 2020 · eb424a2 · eb424a2
2 parents 08eee0f + a87c54a
commit eb424a2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/internal/code/imports_test.go b/internal/code/imports_test.go
@@ -24,6 +24,9 @@ func TestImportPathForDir(t *testing.T) {
 	// directory does not exist
 	assert.Equal(t, "github.com/99designs/gqlgen/dos", ImportPathForDir(filepath.Join(wd, "..", "..", "dos")))
 
+	// out of module
+	assert.Equal(t, "", ImportPathForDir(filepath.Join(wd, "..", "..", "..")))
+
 	if runtime.GOOS == "windows" {
 		assert.Equal(t, "", ImportPathForDir("C:/doesnotexist"))
 	} else {

diff --git a/internal/rewrite/rewriter.go b/internal/rewrite/rewriter.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/99designs/gqlgen/internal/code"
 	"golang.org/x/tools/go/packages"
 )
 
@@ -19,7 +20,11 @@ type Rewriter struct {
 	copied map[ast.Decl]bool
 }
 
-func New(importPath string) (*Rewriter, error) {
+func New(dir string) (*Rewriter, error) {
+	importPath := code.ImportPathForDir(dir)
+	if importPath == "" {
+		return nil, fmt.Errorf("import path not found for directory: %q", dir)
+	}
 	pkgs, err := packages.Load(&packages.Config{
 		Mode: packages.NeedSyntax | packages.NeedTypes,
 	}, importPath)
@@ -29,13 +34,6 @@ func New(importPath string) (*Rewriter, error) {
 	if len(pkgs) == 0 {
 		return nil, fmt.Errorf("package not found for importPath: %s", importPath)
 	}
-	if len(pkgs[0].Errors) != 0 {
-		for _, e := range pkgs[0].Errors {
-			if e.Kind == packages.ListError {
-				return nil, e
-			}
-		}
-	}
 
 	return &Rewriter{
 		pkg:    pkgs[0],

diff --git a/internal/rewrite/rewriter_test.go b/internal/rewrite/rewriter_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestRewriter(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
-		r, err := New("github.com/99designs/gqlgen/internal/rewrite/testdata")
+		r, err := New("testdata")
 		require.NoError(t, err)
 
 		body := r.GetMethodBody("Foo", "Method")

diff --git a/plugin/resolvergen/resolver.go b/plugin/resolvergen/resolver.go
@@ -79,7 +79,7 @@ func (m *Plugin) generateSingleFile(data *codegen.Data) error {
 }
 
 func (m *Plugin) generatePerSchema(data *codegen.Data) error {
-	rewriter, err := rewrite.New(data.Config.Resolver.ImportPath())
+	rewriter, err := rewrite.New(data.Config.Resolver.Dir())
 	if err != nil {
 		return err
 	}