Reclaim main package for public interface to code generator

codegen/ambient.go → ambient.go

@@ -1,4 +1,4 @@
-package codegen
+package gqlgen
 
 import (
 	// Import and ignore the ambient imports listed below so dependency managers

cmd/gen.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/99designs/gqlgen/codegen"
+	"github.com/99designs/gqlgen"
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
@@ -36,8 +36,7 @@ var genCmd = cli.Command{
 			}
 		}
 
-		err = codegen.Generate(cfg)
-		if err != nil {
+		if err = gqlgen.Generate(cfg); err != nil {
 			fmt.Fprintln(os.Stderr, err.Error())
 			os.Exit(3)
 		}

cmd/init.go

@@ -7,7 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/99designs/gqlgen/codegen"
+	"github.com/99designs/gqlgen"
+
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
@@ -70,12 +71,12 @@ var initCmd = cli.Command{
 }
 
 func GenerateGraphServer(cfg *config.Config, serverFilename string) {
-	err := codegen.Generate(cfg)
+	err := gqlgen.Generate(cfg)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 	}
 
-	if err := codegen.GenerateServer(serverFilename, cfg); err != nil {
+	if err := gqlgen.GenerateServer(serverFilename, cfg); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)
 	}

codegen/unified/build.go → codegen/build.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/build_bind.go → codegen/build_bind.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"fmt"

codegen/unified/build_bind_test.go → codegen/build_bind_test.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/ast"

codegen/unified/build_directive.go → codegen/build_directive.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"fmt"

codegen/unified/build_enum.go → codegen/build_enum.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/build_interface.go → codegen/build_interface.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/build_object.go → codegen/build_object.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/build_typedef.go → codegen/build_typedef.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"fmt"

codegen/unified/directive.go → codegen/directive.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"fmt"

codegen/unified/enum.go → codegen/enum.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 type Enum struct {
 	Definition *TypeDefinition

codegen/unified/interface.go → codegen/interface.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 type Interface struct {
 	Definition   *TypeDefinition

codegen/unified/object.go → codegen/object.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"bytes"

codegen/unified/schema.go → codegen/schema.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"github.com/99designs/gqlgen/codegen/config"

codegen/unified/schema_test.go → codegen/schema_test.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"testing"

codegen/testserver/generated_test.go

@@ -1,12 +1,11 @@
 //go:generate rm -f resolver.go
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package testserver
 
 import (
 	"context"
 	"fmt"
-	"github.com/pkg/errors"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
@@ -16,6 +15,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/99designs/gqlgen/graphql/introspection"
 
 	"github.com/99designs/gqlgen/client"

codegen/unified/type_definition.go → codegen/type_definition.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/type_reference.go → codegen/type_reference.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/types"

codegen/unified/util.go → codegen/util.go

@@ -1,4 +1,4 @@
-package unified
+package codegen
 
 import (
 	"go/build"

codegen/codegen_test.go → codegen_test.go

@@ -1,4 +1,4 @@
-package codegen
+package gqlgen
 
 import (
 	"testing"

example/chat/resolvers.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package chat
 

example/config/resolver.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package config
 

example/dataloader/resolvers.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package dataloader
 

example/scalars/resolvers.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package scalars
 

example/selection/.gqlgen.yml

@@ -0,0 +1,5 @@
+schema: schema.graphql
+model:
+  filename: models_gen.go
+exec:
+  filename: generated.go

example/selection/selection.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package selection
 

example/starwars/resolvers.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package starwars
 

example/todo/todo.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package todo
 

example/type-system-extension/resolver.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../../testdata/gqlgen.go
 
 package type_system_extension
 

codegen/exec.go → exec.go

@@ -1,23 +1,23 @@
-package codegen
+package gqlgen
 
 import (
 	"fmt"
 
+	"github.com/99designs/gqlgen/codegen"
 	"github.com/99designs/gqlgen/codegen/templates"
-	"github.com/99designs/gqlgen/codegen/unified"
 )
 
 type ExecBuild struct {
-	*unified.Schema
+	*codegen.Schema
 
 	PackageName      string
-	QueryRoot        *unified.Object
-	MutationRoot     *unified.Object
-	SubscriptionRoot *unified.Object
+	QueryRoot        *codegen.Object
+	MutationRoot     *codegen.Object
+	SubscriptionRoot *codegen.Object
 }
 
 // bind a schema together with some code to generate a Build
-func buildExec(s *unified.Schema) error {
+func buildExec(s *codegen.Schema) error {
 	b := &ExecBuild{
 		Schema:      s,
 		PackageName: s.Config.Exec.Package,

codegen/generate.go → generate.go

@@ -1,19 +1,19 @@
-package codegen
+package gqlgen
 
 import (
 	"path/filepath"
 	"syscall"
 
+	"github.com/99designs/gqlgen/codegen"
 	"github.com/99designs/gqlgen/codegen/config"
-	"github.com/99designs/gqlgen/codegen/unified"
 	"github.com/pkg/errors"
 )
 
 func Generate(cfg *config.Config) error {
 	_ = syscall.Unlink(cfg.Exec.Filename)
 	_ = syscall.Unlink(cfg.Model.Filename)
 
-	schema, err := unified.NewSchema(cfg)
+	schema, err := codegen.NewSchema(cfg)
 	if err != nil {
 		return errors.Wrap(err, "merging failed")
 	}
@@ -23,7 +23,7 @@ func Generate(cfg *config.Config) error {
 	}
 
 	// Merge again now that the generated models have been injected into the typemap
-	schema, err = unified.NewSchema(schema.Config)
+	schema, err = codegen.NewSchema(schema.Config)
 	if err != nil {
 		return errors.Wrap(err, "merging failed")
 	}

integration/resolver.go

@@ -1,4 +1,4 @@
-//go:generate gorunpkg github.com/99designs/gqlgen
+//go:generate go run ../testdata/gqlgen.go
 
 package integration
 

internal/imports/testdata/unused.go

@@ -1,6 +1,5 @@
 package testdata
 
-import "unused"
 import _ "underscore"
 import a "fmt"
 import "time"
@@ -14,8 +13,8 @@ func fn() {
 }
 
 type Message struct {
-	ID string `json:"id"`
-	Text string `json:"text"`
-	CreatedBy string `json:"createdBy"`
+	ID        string    `json:"id"`
+	Text      string    `json:"text"`
+	CreatedBy string    `json:"createdBy"`
 	CreatedAt time.Time `json:"createdAt"`
 }

codegen/model.go → model.go

@@ -1,23 +1,23 @@
-package codegen
+package gqlgen
 
 import (
 	"sort"
 
 	"go/types"
 
+	"github.com/99designs/gqlgen/codegen"
 	"github.com/99designs/gqlgen/codegen/templates"
-	"github.com/99designs/gqlgen/codegen/unified"
 )
 
 type ModelBuild struct {
-	Interfaces  []*unified.Interface
-	Models      unified.Objects
-	Enums       []unified.Enum
+	Interfaces  []*codegen.Interface
+	Models      codegen.Objects
+	Enums       []codegen.Enum
 	PackageName string
 }
 
 // Create a list of models that need to be generated
-func buildModels(s *unified.Schema) error {
+func buildModels(s *codegen.Schema) error {
 	b := &ModelBuild{
 		PackageName: s.Config.Model.Package,
 	}