Skip to content

Commit

Permalink
Merge pull request 99designs#251 from 99designs/rewrite-imports
Browse files Browse the repository at this point in the history
Rewrite import paths
  • Loading branch information
vektah committed Aug 3, 2018
2 parents d352800 + b7f23ea commit 0329860
Show file tree
Hide file tree
Showing 73 changed files with 164 additions and 164 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
docker:
- image: golang:1.9
working_directory: /go/src/github.com/vektah/gqlgen
working_directory: /go/src/github.com/99designs/gqlgen
steps: &steps
- checkout
- run: >
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ See the [docs](https://gqlgen.com/) for a getting started guide.
github.com/99designs/gqlgen soon. The next few weeks is going to see some heavy work pushing the new parser and
directive support forward. Expect exciting things!

You can follow along on the [project board](https://github.com/vektah/gqlgen/projects/1).
You can follow along on the [project board](https://github.com/99designs/gqlgen/projects/1).

### Feature comparison

| | [gqlgen](https://github.com/vektah/gqlgen) | [gophers](https://github.com/graph-gophers/graphql-go) | [graphql-go](https://github.com/graphql-go/graphql) | [thunder](https://github.com/samsarahq/thunder) |
| | [gqlgen](https://github.com/99designs/gqlgen) | [gophers](https://github.com/graph-gophers/graphql-go) | [graphql-go](https://github.com/graphql-go/graphql) | [thunder](https://github.com/samsarahq/thunder) |
| --------: | :-------- | :-------- | :-------- | :-------- |
| Kind | schema first | schema first | run time types | struct first |
| Boilerplate | less | more | more | some |
| Docs | [docs](https://gqlgen.com) & [examples](https://github.com/vektah/gqlgen/tree/master/example) | [examples](https://github.com/graph-gophers/graphql-go/tree/master/example/starwars) | [examples](https://github.com/graphql-go/graphql/tree/master/examples) | [examples](https://github.com/samsarahq/thunder/tree/master/example)|
| Docs | [docs](https://gqlgen.com) & [examples](https://github.com/99designs/gqlgen/tree/master/example) | [examples](https://github.com/graph-gophers/graphql-go/tree/master/example/starwars) | [examples](https://github.com/graphql-go/graphql/tree/master/examples) | [examples](https://github.com/samsarahq/thunder/tree/master/example)|
| Query | :+1: | :+1: | :+1: | :+1: |
| Mutation | :+1: | :construction: [pr](https://github.com/graph-gophers/graphql-go/pull/182) | :+1: | :+1: |
| Subscription | :+1: | :construction: [pr](https://github.com/graph-gophers/graphql-go/pull/132) | :no_entry: [is](https://github.com/graphql-go/graphql/issues/207) | :+1: |
Expand All @@ -28,7 +28,7 @@ You can follow along on the [project board](https://github.com/vektah/gqlgen/pro
| Interfaces | :+1: | :+1: | :+1: | :no_entry: [is](https://github.com/samsarahq/thunder/issues/78) |
| Generated Enums | :+1: | :no_entry: | :no_entry: | :no_entry: |
| Generated Inputs | :+1: | :no_entry: | :no_entry: | :no_entry: |
| Stitching gql | :clock1: [is](https://github.com/vektah/gqlgen/issues/5) | :no_entry: | :no_entry: | :no_entry: |
| Stitching gql | :clock1: [is](https://github.com/99designs/gqlgen/issues/5) | :no_entry: | :no_entry: | :no_entry: |
| Opentracing | :+1: | :+1: | :no_entry: | :scissors:[pr](https://github.com/samsarahq/thunder/pull/77) |
| Hooks for error logging | :+1: | :no_entry: | :no_entry: | :no_entry: |
| Dataloading | :+1: | :+1: | :no_entry: | :warning: |
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "{build}"
# Source Config

skip_branch_with_pr: true
clone_folder: c:\gopath\src\github.com\vektah\gqlgen
clone_folder: c:\gopath\src\github.com\99designs\gqlgen

# Build host

Expand Down
2 changes: 1 addition & 1 deletion client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http/httptest"
"testing"

"github.com/99designs/gqlgen/client"
"github.com/stretchr/testify/require"
"github.com/vektah/gqlgen/client"
)

func TestClient(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"io/ioutil"
"os"

"github.com/99designs/gqlgen/codegen"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/vektah/gqlgen/codegen"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"os"
"strings"

"github.com/99designs/gqlgen/codegen"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/vektah/gqlgen/codegen"
"gopkg.in/yaml.v2"
)

Expand Down
28 changes: 14 additions & 14 deletions codegen/codegen.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"regexp"
"syscall"

"github.com/99designs/gqlgen/codegen/templates"
"github.com/pkg/errors"
"github.com/vektah/gqlgen/codegen/templates"
"github.com/vektah/gqlparser"
"github.com/vektah/gqlparser/ast"
"github.com/vektah/gqlparser/gqlerror"
Expand Down Expand Up @@ -127,19 +127,19 @@ func (cfg *Config) normalize() error {
}

builtins := TypeMap{
"__Directive": {Model: "github.com/vektah/gqlgen/graphql/introspection.Directive"},
"__Type": {Model: "github.com/vektah/gqlgen/graphql/introspection.Type"},
"__Field": {Model: "github.com/vektah/gqlgen/graphql/introspection.Field"},
"__EnumValue": {Model: "github.com/vektah/gqlgen/graphql/introspection.EnumValue"},
"__InputValue": {Model: "github.com/vektah/gqlgen/graphql/introspection.InputValue"},
"__Schema": {Model: "github.com/vektah/gqlgen/graphql/introspection.Schema"},
"Int": {Model: "github.com/vektah/gqlgen/graphql.Int"},
"Float": {Model: "github.com/vektah/gqlgen/graphql.Float"},
"String": {Model: "github.com/vektah/gqlgen/graphql.String"},
"Boolean": {Model: "github.com/vektah/gqlgen/graphql.Boolean"},
"ID": {Model: "github.com/vektah/gqlgen/graphql.ID"},
"Time": {Model: "github.com/vektah/gqlgen/graphql.Time"},
"Map": {Model: "github.com/vektah/gqlgen/graphql.Map"},
"__Directive": {Model: "github.com/99designs/gqlgen/graphql/introspection.Directive"},
"__Type": {Model: "github.com/99designs/gqlgen/graphql/introspection.Type"},
"__Field": {Model: "github.com/99designs/gqlgen/graphql/introspection.Field"},
"__EnumValue": {Model: "github.com/99designs/gqlgen/graphql/introspection.EnumValue"},
"__InputValue": {Model: "github.com/99designs/gqlgen/graphql/introspection.InputValue"},
"__Schema": {Model: "github.com/99designs/gqlgen/graphql/introspection.Schema"},
"Int": {Model: "github.com/99designs/gqlgen/graphql.Int"},
"Float": {Model: "github.com/99designs/gqlgen/graphql.Float"},
"String": {Model: "github.com/99designs/gqlgen/graphql.String"},
"Boolean": {Model: "github.com/99designs/gqlgen/graphql.Boolean"},
"ID": {Model: "github.com/99designs/gqlgen/graphql.ID"},
"Time": {Model: "github.com/99designs/gqlgen/graphql.Time"},
"Map": {Model: "github.com/99designs/gqlgen/graphql.Map"},
}

if cfg.Models == nil {
Expand Down
2 changes: 1 addition & 1 deletion codegen/enum_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sort"
"strings"

"github.com/vektah/gqlgen/codegen/templates"
"github.com/99designs/gqlgen/codegen/templates"
"github.com/vektah/gqlparser/ast"
)

Expand Down
4 changes: 2 additions & 2 deletions codegen/import_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ var ambientImports = []string{

"github.com/vektah/gqlparser",
"github.com/vektah/gqlparser/ast",
"github.com/vektah/gqlgen/graphql",
"github.com/vektah/gqlgen/graphql/introspection",
"github.com/99designs/gqlgen/graphql",
"github.com/99designs/gqlgen/graphql/introspection",
}

func buildImports(types NamedTypes, destDir string) *Imports {
Expand Down
4 changes: 2 additions & 2 deletions codegen/import_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestInvalidPackagenames(t *testing.T) {
id: Int!
}
`, TypeMap{
"InvalidIdentifier": {Model: "github.com/vektah/gqlgen/codegen/tests/invalid-packagename.InvalidIdentifier"},
"InvalidIdentifier": {Model: "github.com/99designs/gqlgen/codegen/tests/invalid-packagename.InvalidIdentifier"},
})

require.NoError(t, err)
Expand All @@ -31,7 +31,7 @@ func TestImportCollisions(t *testing.T) {
}
`, TypeMap{
"It": {Model: "github.com/vektah/gqlgen/codegen/tests/introspection.It"},
"It": {Model: "github.com/99designs/gqlgen/codegen/tests/introspection.It"},
})

require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion codegen/input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestRecursiveInputType(t *testing.T) {
self: [RecursiveInputSlice!]
}
`, TypeMap{
"RecursiveInputSlice": {Model: "github.com/vektah/gqlgen/codegen/tests.RecursiveInputSlice"},
"RecursiveInputSlice": {Model: "github.com/99designs/gqlgen/codegen/tests.RecursiveInputSlice"},
})

require.NoError(t, err)
Expand Down
10 changes: 5 additions & 5 deletions codegen/interface_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ func TestShapes(t *testing.T) {
}
union ShapeUnion = Circle | Rectangle
`, TypeMap{
"Shape": {Model: "github.com/vektah/gqlgen/codegen/tests.Shape"},
"ShapeUnion": {Model: "github.com/vektah/gqlgen/codegen/tests.ShapeUnion"},
"Circle": {Model: "github.com/vektah/gqlgen/codegen/tests.Circle"},
"Rectangle": {Model: "github.com/vektah/gqlgen/codegen/tests.Rectangle"},
"Shape": {Model: "github.com/99designs/gqlgen/codegen/tests.Shape"},
"ShapeUnion": {Model: "github.com/99designs/gqlgen/codegen/tests.ShapeUnion"},
"Circle": {Model: "github.com/99designs/gqlgen/codegen/tests.Circle"},
"Rectangle": {Model: "github.com/99designs/gqlgen/codegen/tests.Rectangle"},
})

require.NoError(t, err)
Expand All @@ -54,7 +54,7 @@ func generate(name string, schema string, typemap ...TypeMap) error {
err := Generate(cfg)
if err == nil {
conf := loader.Config{}
conf.Import("github.com/vektah/gqlgen/codegen/tests/gen/" + name)
conf.Import("github.com/99designs/gqlgen/codegen/tests/gen/" + name)

_, err = conf.Load()
if err != nil {
Expand Down
Loading

0 comments on commit 0329860

Please sign in to comment.