fixed imports and gofmted files

README.md

@@ -1,4 +1,4 @@
-[![Go Report Card](https://goreportcard.com/badge/github.com/jkrajniak/graphql-codegen-go)](https://goreportcard.com/report/github.com/jkrajniak/graphql-codegen-go)
+[![Go Report Card](https://goreportcard.com/badge/github.com/VerTox/graphql-codegen-go)](https://goreportcard.com/report/github.com/VerTox/graphql-codegen-go)
 
 # graphql-codegen-go
 Generate Go structs from your GraphQL schema.
@@ -9,7 +9,7 @@ can be located either locally or can be fetched from GIT repository.
 Install it using `go get`:
 
 ```bash
-$ go get -u github.com/jkrajniak/graphql-codegen-go
+$ go get -u github.com/VerTox/graphql-codegen-go
 ```
 ## Quick start
 
@@ -116,7 +116,7 @@ generates: A key-value map, where key is the name of the output Go file
 schema:
     - ./schema.graphql
     - ./types.graphql
-    - https://github.com/jkrajniak/sc.git/schema1.gql
+    - https://github.com/VerTox/sc.git/schema1.gql
 generates:
     internal/models.go:
       config:

examples/config/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/jkrajniak/graphql-codegen-go/examples/config/internal"
+	"github.com/VerTox/graphql-codegen-go/examples/config/internal"
 )
 
 func main() {
@@ -14,4 +14,4 @@ func main() {
 		Address:   nil,
 	}
 	fmt.Println(person)
-}
+}

examples/git-schema/internal/appsync/schema.go

@@ -1,6 +1,6 @@
 package appsync
 
-//go:generate go run ../../../../. -schemas https://github.com/jkrajniak/sc.git/schema1.gql -out models.go -entities Entity1
+//go:generate go run ../../../../. -schemas https://github.com/VerTox/sc.git/schema1.gql -out models.go -entities Entity1
 
 type RawEntity struct {
 	ID string

examples/local-schema/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/jkrajniak/graphql-codegen-go/examples/local-schema/internal/appsync"
+	"github.com/VerTox/graphql-codegen-go/examples/local-schema/internal/appsync"
 )
 
 func main() {

internal/config.go

@@ -35,8 +35,8 @@ type GOGenerate struct {
 }
 
 type Config struct {
-	Schemas   []string
-	Outputs   []OutputItem
+	Schemas []string
+	Outputs []OutputItem
 
 	InPlace     bool
 	GoGenConfig *GOGenerate
@@ -54,8 +54,8 @@ func ReadConfigFromFile(f io.Reader) (Config, error) {
 	}
 
 	c := Config{
-		Schemas:   yamlConfig.Schema,
-		Outputs:   []OutputItem{},
+		Schemas: yamlConfig.Schema,
+		Outputs: []OutputItem{},
 	}
 	for outPath, item := range yamlConfig.Generates {
 		c.Outputs = append(c.Outputs, OutputItem{

internal/generator.go

@@ -53,14 +53,7 @@ func NewGoGenerator(output Outputer, entities []string, packageName string) *GoG
 	return &GoGenerator{output: output, entities: entities, packageName: packageName}
 }
 
-func (g *GoGenerator) Generate(doc *ast.SchemaDocument) error {
-	declaredKeywords := keywordMap{}
-
-	//remap enums
-	enumMap := buildEnumMap(doc)
-	reqEntities := resolveEntityDependencies(doc, g.entities, enumMap)
-
-	// Write enum const
+func (g *GoGenerator) writeEnums(enumMap map[string]enum, reqEntities []string, declaredKeywords *keywordMap) error {
 	for _, e := range enumMap {
 		if len(reqEntities) > 0 && !inArray(e.TypeName, reqEntities) {
 			continue
@@ -87,6 +80,22 @@ func (g *GoGenerator) Generate(doc *ast.SchemaDocument) error {
 		}
 	}
 
+	return nil
+}
+
+func (g *GoGenerator) Generate(doc *ast.SchemaDocument) error {
+	declaredKeywords := keywordMap{}
+
+	//remap enums
+	enumMap := buildEnumMap(doc)
+	reqEntities := resolveEntityDependencies(doc, g.entities, enumMap)
+
+	// Write enum const
+	err := g.writeEnums(enumMap, reqEntities, &declaredKeywords)
+	if err != nil {
+		return err
+	}
+
 	imports := make(map[string]bool, 0)
 
 	for _, i := range doc.Definitions {
@@ -144,7 +153,7 @@ func (g *GoGenerator) Generate(doc *ast.SchemaDocument) error {
 
 	importsStr += "\n"
 
-	err := g.output.WriteToStart(fmt.Sprintf(Header, g.packageName, importsStr))
+	err = g.output.WriteToStart(fmt.Sprintf(Header, g.packageName, importsStr))
 	if err != nil {
 		return err
 	}

internal/readers/reader.go

@@ -15,5 +15,3 @@ func DiscoverReader(schemaPath string) SchemaReader {
 		return NewLocalReader(schemaPath)
 	}
 }
-
-

internal/readers/vsc_test.go

@@ -13,10 +13,10 @@ func TestNewGitReader(t *testing.T) {
 }
 
 func TestNewGitReader_SSHPath(t *testing.T) {
-	s := NewGitReader("git@github.com:jkrajniak/sc-priv.git/schema.sql")
+	s := NewGitReader("git@github.com:VerTox/sc-priv.git/schema.sql")
 	assert.Equal(t, "master", s.branchName)
 	assert.Equal(t, "/schema.sql", s.path)
-	assert.Equal(t, "git@github.com:jkrajniak/sc-priv.git", s.repoURL)
+	assert.Equal(t, "git@github.com:VerTox/sc-priv.git", s.repoURL)
 }
 
 func TestNewGitReader_BranchName(t *testing.T) {

main.go

@@ -8,15 +8,14 @@ import (
 	"strings"
 )
 
-func main() {
+func initConfig() internal.Config {
+	var config internal.Config
 	configYaml := flag.String("config", "", "config yaml")
 	schemasFile := flag.String("schemas", "", "schema file (comma separated list)")
 	entitiesString := flag.String("entities", "", "comma separated list of entities (optional)")
 	packageNameString := flag.String("packageName", "", "package name")
 	outFile := flag.String("out", "", "file output name (optional, default: stdout)")
 	flag.Parse()
-
-	var config internal.Config
 	if configYaml != nil && *configYaml != "" {
 		configFile, err := os.Open(*configYaml)
 		if err != nil {
@@ -57,6 +56,12 @@ func main() {
 		}
 	}
 
+	return config
+}
+
+func main() {
+	config := initConfig()
+
 	// Combine all schemas.
 	inputSchemas, err := internal.ReadSchemas(config.Schemas)
 	if err != nil {