Skip to content

Commit b778db6

Browse files
committed
update package path to v2
1 parent f5ceb57 commit b778db6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+130
-116
lines changed

ast/document_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/stretchr/testify/assert"
77
"github.com/stretchr/testify/require"
88

9-
. "github.com/vektah/gqlparser/ast"
10-
"github.com/vektah/gqlparser/parser"
9+
. "github.com/vektah/gqlparser/v2/ast"
10+
"github.com/vektah/gqlparser/v2/parser"
1111
)
1212

1313
func TestQueryDocMethods(t *testing.T) {

formatter/formatter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sort"
77
"strings"
88

9-
"github.com/vektah/gqlparser/ast"
9+
"github.com/vektah/gqlparser/v2/ast"
1010
)
1111

1212
type Formatter interface {
@@ -524,7 +524,7 @@ func (f *formatter) FormatVariableDefinition(def *ast.VariableDefinition) {
524524
f.FormatValue(def.DefaultValue)
525525
}
526526

527-
// TODO https://github.com/vektah/gqlparser/issues/102
527+
// TODO https://github.com/vektah/gqlparser/v2/issues/102
528528
// VariableDefinition : Variable : Type DefaultValue? Directives[Const]?
529529
}
530530

formatter/formatter_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"unicode/utf8"
1111

1212
"github.com/stretchr/testify/assert"
13-
"github.com/vektah/gqlparser"
14-
"github.com/vektah/gqlparser/ast"
15-
"github.com/vektah/gqlparser/formatter"
16-
"github.com/vektah/gqlparser/parser"
13+
"github.com/vektah/gqlparser/v2"
14+
"github.com/vektah/gqlparser/v2/ast"
15+
"github.com/vektah/gqlparser/v2/formatter"
16+
"github.com/vektah/gqlparser/v2/parser"
1717
)
1818

1919
var update = flag.Bool("u", false, "update golden files")

go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
module github.com/vektah/gqlparser
1+
module github.com/vektah/gqlparser/v2
22

33
go 1.12
44

55
require (
66
github.com/agnivade/levenshtein v1.0.1
77
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
8-
github.com/sergi/go-diff v1.0.0 // indirect
9-
github.com/stretchr/testify v1.3.0
8+
github.com/sergi/go-diff v1.1.0 // indirect
9+
github.com/stretchr/testify v1.4.0
1010
golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6
11-
gopkg.in/yaml.v2 v2.2.2
11+
gopkg.in/yaml.v2 v2.2.4
1212
)

go.sum

+14
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,30 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
44
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
55
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
66
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
10+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
11+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
712
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
813
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
914
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
1015
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
16+
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
17+
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
1118
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1219
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
1320
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
21+
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
22+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
23+
github.com/vektah/gqlparser/v2 v1.3.1 h1:8b0IcD3qZKWJQHSzynbDlrtP3IxVydZ2DZepCGofqfU=
24+
github.com/vektah/gqlparser/v2 v1.3.1/go.mod h1:bkVf0FX+Stjg/MHnm8mEyubuaArhNEqfQhF+OTiAL74=
1425
golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6 h1:iZgcI2DDp6zW5v9Z/5+f0NuqoxNdmzg4hivjk2WLXpY=
1526
golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
1627
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1728
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
29+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1830
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
1931
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
32+
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
33+
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

gqlerror/error.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strconv"
77

8-
"github.com/vektah/gqlparser/ast"
8+
"github.com/vektah/gqlparser/v2/ast"
99
)
1010

1111
// Error is the standard graphql error type described in https://facebook.github.io/graphql/draft/#sec-Errors

gqlerror/error_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
7-
"github.com/vektah/gqlparser/ast"
7+
"github.com/vektah/gqlparser/v2/ast"
88
)
99

1010
func TestErrorFormatting(t *testing.T) {

gqlparser.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package gqlparser
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
"github.com/vektah/gqlparser/gqlerror"
6-
"github.com/vektah/gqlparser/parser"
7-
"github.com/vektah/gqlparser/validator"
8-
_ "github.com/vektah/gqlparser/validator/rules"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
"github.com/vektah/gqlparser/v2/gqlerror"
6+
"github.com/vektah/gqlparser/v2/parser"
7+
"github.com/vektah/gqlparser/v2/validator"
8+
_ "github.com/vektah/gqlparser/v2/validator/rules"
99
)
1010

1111
func LoadSchema(str ...*ast.Source) (*ast.Schema, *gqlerror.Error) {

lexer/lexer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"bytes"
55
"unicode/utf8"
66

7-
"github.com/vektah/gqlparser/ast"
8-
"github.com/vektah/gqlparser/gqlerror"
7+
"github.com/vektah/gqlparser/v2/ast"
8+
"github.com/vektah/gqlparser/v2/gqlerror"
99
)
1010

1111
// Lexer turns graphql request and schema strings into tokens

lexer/lexer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package lexer
33
import (
44
"testing"
55

6-
"github.com/vektah/gqlparser/ast"
7-
"github.com/vektah/gqlparser/parser/testrunner"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
"github.com/vektah/gqlparser/v2/parser/testrunner"
88
)
99

1010
func TestLexer(t *testing.T) {

lexer/token.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package lexer
33
import (
44
"strconv"
55

6-
"github.com/vektah/gqlparser/ast"
6+
"github.com/vektah/gqlparser/v2/ast"
77
)
88

99
const (

parser/parser.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package parser
33
import (
44
"strconv"
55

6-
"github.com/vektah/gqlparser/ast"
7-
"github.com/vektah/gqlparser/gqlerror"
8-
"github.com/vektah/gqlparser/lexer"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
"github.com/vektah/gqlparser/v2/gqlerror"
8+
"github.com/vektah/gqlparser/v2/lexer"
99
)
1010

1111
type parser struct {

parser/parser_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
7-
"github.com/vektah/gqlparser/ast"
8-
"github.com/vektah/gqlparser/lexer"
7+
"github.com/vektah/gqlparser/v2/ast"
8+
"github.com/vektah/gqlparser/v2/lexer"
99
)
1010

1111
func TestParserUtils(t *testing.T) {

parser/query.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package parser
22

33
import (
4-
"github.com/vektah/gqlparser/gqlerror"
5-
"github.com/vektah/gqlparser/lexer"
4+
"github.com/vektah/gqlparser/v2/gqlerror"
5+
"github.com/vektah/gqlparser/v2/lexer"
66

7-
. "github.com/vektah/gqlparser/ast"
7+
. "github.com/vektah/gqlparser/v2/ast"
88
)
99

1010
func ParseQuery(source *Source) (*QueryDocument, *gqlerror.Error) {

parser/query_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package parser
33
import (
44
"testing"
55

6-
"github.com/vektah/gqlparser/ast"
7-
"github.com/vektah/gqlparser/parser/testrunner"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
"github.com/vektah/gqlparser/v2/parser/testrunner"
88
)
99

1010
func TestQueryDocument(t *testing.T) {

parser/schema.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package parser
22

33
import (
4-
. "github.com/vektah/gqlparser/ast"
5-
"github.com/vektah/gqlparser/gqlerror"
6-
"github.com/vektah/gqlparser/lexer"
4+
. "github.com/vektah/gqlparser/v2/ast"
5+
"github.com/vektah/gqlparser/v2/gqlerror"
6+
"github.com/vektah/gqlparser/v2/lexer"
77
)
88

99
func ParseSchema(source *Source) (*SchemaDocument, *gqlerror.Error) {

parser/schema_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package parser
33
import (
44
"testing"
55

6-
"github.com/vektah/gqlparser/ast"
7-
"github.com/vektah/gqlparser/parser/testrunner"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
"github.com/vektah/gqlparser/v2/parser/testrunner"
88
)
99

1010
func TestSchemaDocument(t *testing.T) {

parser/testrunner/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/andreyvit/diff"
10-
"github.com/vektah/gqlparser/gqlerror"
10+
"github.com/vektah/gqlparser/v2/gqlerror"
1111
"gopkg.in/yaml.v2"
1212
)
1313

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gqlparser [![CircleCI](https://badgen.net/circleci/github/vektah/gqlparser/master)](https://circleci.com/gh/vektah/gqlparser) [![Go Report Card](https://goreportcard.com/badge/github.com/vektah/gqlparser)](https://goreportcard.com/report/github.com/vektah/gqlparser) [![Coverage Status](https://badgen.net/coveralls/c/github/vektah/gqlparser)](https://coveralls.io/github/vektah/gqlparser?branch=master)
1+
gqlparser [![CircleCI](https://badgen.net/circleci/github/vektah/gqlparser/master)](https://circleci.com/gh/vektah/gqlparser) [![Go Report Card](https://goreportcard.com/badge/github.com/vektah/gqlparser/v2)](https://goreportcard.com/report/github.com/vektah/gqlparser/v2) [![Coverage Status](https://badgen.net/coveralls/c/github/vektah/gqlparser)](https://coveralls.io/github/vektah/gqlparser?branch=master)
22
===
33

44
This is a parser for graphql, written to mirror the graphql-js reference implementation as closely while remaining idiomatic and easy to use.

validator/error.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package validator
33
import (
44
"fmt"
55

6-
"github.com/vektah/gqlparser/ast"
7-
"github.com/vektah/gqlparser/gqlerror"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
"github.com/vektah/gqlparser/v2/gqlerror"
88
)
99

1010
type ErrorOption func(err *gqlerror.Error)

validator/imported_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"testing"
1313

1414
"github.com/stretchr/testify/require"
15-
"github.com/vektah/gqlparser"
16-
"github.com/vektah/gqlparser/ast"
17-
"github.com/vektah/gqlparser/gqlerror"
15+
"github.com/vektah/gqlparser/v2"
16+
"github.com/vektah/gqlparser/v2/ast"
17+
"github.com/vektah/gqlparser/v2/gqlerror"
1818
"gopkg.in/yaml.v2"
1919
)
2020

validator/prelude.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package validator
22

3-
import "github.com/vektah/gqlparser/ast"
3+
import "github.com/vektah/gqlparser/v2/ast"
44

55
var Prelude = &ast.Source{
66
Name: "prelude.graphql",

validator/rules/fields_on_correct_type.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"sort"
66

7-
"github.com/vektah/gqlparser/ast"
8-
. "github.com/vektah/gqlparser/validator"
7+
"github.com/vektah/gqlparser/v2/ast"
8+
. "github.com/vektah/gqlparser/v2/validator"
99
)
1010

1111
func init() {

validator/rules/fragments_on_composite_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package validator
33
import (
44
"fmt"
55

6-
"github.com/vektah/gqlparser/ast"
7-
. "github.com/vektah/gqlparser/validator"
6+
"github.com/vektah/gqlparser/v2/ast"
7+
. "github.com/vektah/gqlparser/v2/validator"
88
)
99

1010
func init() {

validator/rules/known_argument_names.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/known_directives.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/known_fragment_names.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/known_type_names.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/lone_anonymous_operation.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/no_fragment_cycles.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/vektah/gqlparser/ast"
8-
. "github.com/vektah/gqlparser/validator"
7+
"github.com/vektah/gqlparser/v2/ast"
8+
. "github.com/vektah/gqlparser/v2/validator"
99
)
1010

1111
func init() {

validator/rules/no_undefined_variables.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/no_unused_fragments.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

validator/rules/no_unused_variables.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package validator
22

33
import (
4-
"github.com/vektah/gqlparser/ast"
5-
. "github.com/vektah/gqlparser/validator"
4+
"github.com/vektah/gqlparser/v2/ast"
5+
. "github.com/vektah/gqlparser/v2/validator"
66
)
77

88
func init() {

0 commit comments

Comments
 (0)