Detailed changes
@@ -16,9 +16,9 @@ type EdgeType generic.Type
// ConnectionType define the connection type handled by this relay connection
type ConnectionType generic.Type
-// NodeTypeEdger define a function that take a NodeType and an offset and
+// NodeTypeEdgeMaker define a function that take a NodeType and an offset and
// create an Edge.
-type NodeTypeEdger func(value NodeType, offset int) Edge
+type NodeTypeEdgeMaker func(value NodeType, offset int) Edge
// NodeTypeConMaker define a function that create a ConnectionType
type NodeTypeConMaker func(
@@ -28,9 +28,10 @@ type NodeTypeConMaker func(
totalCount int) (ConnectionType, error)
// NodeTypeCon will paginate a source according to the input of a relay connection
-func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMaker, input models.ConnectionInput) (ConnectionType, error) {
+func NodeTypeCon(source []NodeType, edgeMaker NodeTypeEdgeMaker, conMaker NodeTypeConMaker, input models.ConnectionInput) (ConnectionType, error) {
var nodes []NodeType
var edges []EdgeType
+ var cursors []string
var pageInfo models.PageInfo
emptyCon, _ := conMaker(edges, nodes, pageInfo, 0)
@@ -39,7 +40,7 @@ func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMak
if input.After != nil {
for i, value := range source {
- edge := edger(value, i)
+ edge := edgeMaker(value, i)
if edge.GetCursor() == *input.After {
// remove all previous element including the "after" one
source = source[i+1:]
@@ -51,7 +52,7 @@ func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMak
if input.Before != nil {
for i, value := range source {
- edge := edger(value, i+offset)
+ edge := edgeMaker(value, i+offset)
if edge.GetCursor() == *input.Before {
// remove all after element including the "before" one
@@ -59,14 +60,18 @@ func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMak
}
edges = append(edges, edge.(EdgeType))
+ cursors = append(cursors, edge.GetCursor())
nodes = append(nodes, value)
}
} else {
edges = make([]EdgeType, len(source))
+ cursors = make([]string, len(source))
nodes = source
for i, value := range source {
- edges[i] = edger(value, i+offset).(EdgeType)
+ edge := edgeMaker(value, i+offset)
+ edges[i] = edge.(EdgeType)
+ cursors[i] = edge.GetCursor()
}
}
@@ -78,6 +83,7 @@ func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMak
if len(edges) > *input.First {
// Slice result to be of length first by removing edges from the end
edges = edges[:*input.First]
+ cursors = cursors[:*input.First]
nodes = nodes[:*input.First]
pageInfo.HasNextPage = true
}
@@ -91,10 +97,17 @@ func NodeTypeCon(source []NodeType, edger NodeTypeEdger, conMaker NodeTypeConMak
if len(edges) > *input.Last {
// Slice result to be of length last by removing edges from the start
edges = edges[len(edges)-*input.Last:]
+ cursors = cursors[len(cursors)-*input.Last:]
nodes = nodes[len(nodes)-*input.Last:]
pageInfo.HasPreviousPage = true
}
}
+ // Fill up pageInfo cursors
+ if len(cursors) > 0 {
+ pageInfo.StartCursor = cursors[0]
+ pageInfo.EndCursor = cursors[len(cursors)-1]
+ }
+
return conMaker(edges, nodes, pageInfo, len(source))
}
@@ -10,9 +10,9 @@ import (
"github.com/MichaelMure/git-bug/graphql/models"
)
-// StringEdger define a function that take a string and an offset and
+// StringEdgeMaker define a function that take a string and an offset and
// create an Edge.
-type StringEdger func(value string, offset int) Edge
+type StringEdgeMaker func(value string, offset int) Edge
// StringConMaker define a function that create a models.BugConnection
type StringConMaker func(
@@ -22,9 +22,10 @@ type StringConMaker func(
totalCount int) (models.BugConnection, error)
// StringCon will paginate a source according to the input of a relay connection
-func StringCon(source []string, edger StringEdger, conMaker StringConMaker, input models.ConnectionInput) (models.BugConnection, error) {
+func StringCon(source []string, edgeMaker StringEdgeMaker, conMaker StringConMaker, input models.ConnectionInput) (models.BugConnection, error) {
var nodes []string
var edges []LazyBugEdge
+ var cursors []string
var pageInfo models.PageInfo
emptyCon, _ := conMaker(edges, nodes, pageInfo, 0)
@@ -33,7 +34,7 @@ func StringCon(source []string, edger StringEdger, conMaker StringConMaker, inpu
if input.After != nil {
for i, value := range source {
- edge := edger(value, i)
+ edge := edgeMaker(value, i)
if edge.GetCursor() == *input.After {
// remove all previous element including the "after" one
source = source[i+1:]
@@ -45,7 +46,7 @@ func StringCon(source []string, edger StringEdger, conMaker StringConMaker, inpu
if input.Before != nil {
for i, value := range source {
- edge := edger(value, i+offset)
+ edge := edgeMaker(value, i+offset)
if edge.GetCursor() == *input.Before {
// remove all after element including the "before" one
@@ -53,14 +54,18 @@ func StringCon(source []string, edger StringEdger, conMaker StringConMaker, inpu
}
edges = append(edges, edge.(LazyBugEdge))
+ cursors = append(cursors, edge.GetCursor())
nodes = append(nodes, value)
}
} else {
edges = make([]LazyBugEdge, len(source))
+ cursors = make([]string, len(source))
nodes = source
for i, value := range source {
- edges[i] = edger(value, i+offset).(LazyBugEdge)
+ edge := edgeMaker(value, i+offset)
+ edges[i] = edge.(LazyBugEdge)
+ cursors[i] = edge.GetCursor()
}
}
@@ -72,6 +77,7 @@ func StringCon(source []string, edger StringEdger, conMaker StringConMaker, inpu
if len(edges) > *input.First {
// Slice result to be of length first by removing edges from the end
edges = edges[:*input.First]
+ cursors = cursors[:*input.First]
nodes = nodes[:*input.First]
pageInfo.HasNextPage = true
}
@@ -85,10 +91,17 @@ func StringCon(source []string, edger StringEdger, conMaker StringConMaker, inpu
if len(edges) > *input.Last {
// Slice result to be of length last by removing edges from the start
edges = edges[len(edges)-*input.Last:]
+ cursors = cursors[len(cursors)-*input.Last:]
nodes = nodes[len(nodes)-*input.Last:]
pageInfo.HasPreviousPage = true
}
}
+ // Fill up pageInfo cursors
+ if len(cursors) > 0 {
+ pageInfo.StartCursor = cursors[0]
+ pageInfo.EndCursor = cursors[len(cursors)-1]
+ }
+
return conMaker(edges, nodes, pageInfo, len(source))
}
@@ -11,9 +11,9 @@ import (
"github.com/MichaelMure/git-bug/graphql/models"
)
-// BugCommentEdger define a function that take a bug.Comment and an offset and
+// BugCommentEdgeMaker define a function that take a bug.Comment and an offset and
// create an Edge.
-type BugCommentEdger func(value bug.Comment, offset int) Edge
+type BugCommentEdgeMaker func(value bug.Comment, offset int) Edge
// BugCommentConMaker define a function that create a models.CommentConnection
type BugCommentConMaker func(
@@ -23,9 +23,10 @@ type BugCommentConMaker func(
totalCount int) (models.CommentConnection, error)
// BugCommentCon will paginate a source according to the input of a relay connection
-func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugCommentConMaker, input models.ConnectionInput) (models.CommentConnection, error) {
+func BugCommentCon(source []bug.Comment, edgeMaker BugCommentEdgeMaker, conMaker BugCommentConMaker, input models.ConnectionInput) (models.CommentConnection, error) {
var nodes []bug.Comment
var edges []models.CommentEdge
+ var cursors []string
var pageInfo models.PageInfo
emptyCon, _ := conMaker(edges, nodes, pageInfo, 0)
@@ -34,7 +35,7 @@ func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugComm
if input.After != nil {
for i, value := range source {
- edge := edger(value, i)
+ edge := edgeMaker(value, i)
if edge.GetCursor() == *input.After {
// remove all previous element including the "after" one
source = source[i+1:]
@@ -46,7 +47,7 @@ func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugComm
if input.Before != nil {
for i, value := range source {
- edge := edger(value, i+offset)
+ edge := edgeMaker(value, i+offset)
if edge.GetCursor() == *input.Before {
// remove all after element including the "before" one
@@ -54,14 +55,18 @@ func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugComm
}
edges = append(edges, edge.(models.CommentEdge))
+ cursors = append(cursors, edge.GetCursor())
nodes = append(nodes, value)
}
} else {
edges = make([]models.CommentEdge, len(source))
+ cursors = make([]string, len(source))
nodes = source
for i, value := range source {
- edges[i] = edger(value, i+offset).(models.CommentEdge)
+ edge := edgeMaker(value, i+offset)
+ edges[i] = edge.(models.CommentEdge)
+ cursors[i] = edge.GetCursor()
}
}
@@ -73,6 +78,7 @@ func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugComm
if len(edges) > *input.First {
// Slice result to be of length first by removing edges from the end
edges = edges[:*input.First]
+ cursors = cursors[:*input.First]
nodes = nodes[:*input.First]
pageInfo.HasNextPage = true
}
@@ -86,10 +92,17 @@ func BugCommentCon(source []bug.Comment, edger BugCommentEdger, conMaker BugComm
if len(edges) > *input.Last {
// Slice result to be of length last by removing edges from the start
edges = edges[len(edges)-*input.Last:]
+ cursors = cursors[len(cursors)-*input.Last:]
nodes = nodes[len(nodes)-*input.Last:]
pageInfo.HasPreviousPage = true
}
}
+ // Fill up pageInfo cursors
+ if len(cursors) > 0 {
+ pageInfo.StartCursor = cursors[0]
+ pageInfo.EndCursor = cursors[len(cursors)-1]
+ }
+
return conMaker(edges, nodes, pageInfo, len(source))
}
@@ -11,9 +11,9 @@ import (
"github.com/MichaelMure/git-bug/graphql/models"
)
-// BugOperationEdger define a function that take a bug.Operation and an offset and
+// BugOperationEdgeMaker define a function that take a bug.Operation and an offset and
// create an Edge.
-type BugOperationEdger func(value bug.Operation, offset int) Edge
+type BugOperationEdgeMaker func(value bug.Operation, offset int) Edge
// BugOperationConMaker define a function that create a models.OperationConnection
type BugOperationConMaker func(
@@ -23,9 +23,10 @@ type BugOperationConMaker func(
totalCount int) (models.OperationConnection, error)
// BugOperationCon will paginate a source according to the input of a relay connection
-func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker BugOperationConMaker, input models.ConnectionInput) (models.OperationConnection, error) {
+func BugOperationCon(source []bug.Operation, edgeMaker BugOperationEdgeMaker, conMaker BugOperationConMaker, input models.ConnectionInput) (models.OperationConnection, error) {
var nodes []bug.Operation
var edges []models.OperationEdge
+ var cursors []string
var pageInfo models.PageInfo
emptyCon, _ := conMaker(edges, nodes, pageInfo, 0)
@@ -34,7 +35,7 @@ func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker B
if input.After != nil {
for i, value := range source {
- edge := edger(value, i)
+ edge := edgeMaker(value, i)
if edge.GetCursor() == *input.After {
// remove all previous element including the "after" one
source = source[i+1:]
@@ -46,7 +47,7 @@ func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker B
if input.Before != nil {
for i, value := range source {
- edge := edger(value, i+offset)
+ edge := edgeMaker(value, i+offset)
if edge.GetCursor() == *input.Before {
// remove all after element including the "before" one
@@ -54,14 +55,18 @@ func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker B
}
edges = append(edges, edge.(models.OperationEdge))
+ cursors = append(cursors, edge.GetCursor())
nodes = append(nodes, value)
}
} else {
edges = make([]models.OperationEdge, len(source))
+ cursors = make([]string, len(source))
nodes = source
for i, value := range source {
- edges[i] = edger(value, i+offset).(models.OperationEdge)
+ edge := edgeMaker(value, i+offset)
+ edges[i] = edge.(models.OperationEdge)
+ cursors[i] = edge.GetCursor()
}
}
@@ -73,6 +78,7 @@ func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker B
if len(edges) > *input.First {
// Slice result to be of length first by removing edges from the end
edges = edges[:*input.First]
+ cursors = cursors[:*input.First]
nodes = nodes[:*input.First]
pageInfo.HasNextPage = true
}
@@ -86,10 +92,17 @@ func BugOperationCon(source []bug.Operation, edger BugOperationEdger, conMaker B
if len(edges) > *input.Last {
// Slice result to be of length last by removing edges from the start
edges = edges[len(edges)-*input.Last:]
+ cursors = cursors[len(cursors)-*input.Last:]
nodes = nodes[len(nodes)-*input.Last:]
pageInfo.HasPreviousPage = true
}
}
+ // Fill up pageInfo cursors
+ if len(cursors) > 0 {
+ pageInfo.StartCursor = cursors[0]
+ pageInfo.EndCursor = cursors[len(cursors)-1]
+ }
+
return conMaker(edges, nodes, pageInfo, len(source))
}
@@ -1884,6 +1884,10 @@ func (ec *executionContext) _PageInfo(ctx context.Context, sel []query.Selection
out.Values[i] = ec._PageInfo_hasNextPage(ctx, field, obj)
case "hasPreviousPage":
out.Values[i] = ec._PageInfo_hasPreviousPage(ctx, field, obj)
+ case "startCursor":
+ out.Values[i] = ec._PageInfo_startCursor(ctx, field, obj)
+ case "endCursor":
+ out.Values[i] = ec._PageInfo_endCursor(ctx, field, obj)
default:
panic("unknown field " + strconv.Quote(field.Name))
}
@@ -1914,6 +1918,28 @@ func (ec *executionContext) _PageInfo_hasPreviousPage(ctx context.Context, field
return graphql.MarshalBoolean(res)
}
+func (ec *executionContext) _PageInfo_startCursor(ctx context.Context, field graphql.CollectedField, obj *models.PageInfo) graphql.Marshaler {
+ rctx := graphql.GetResolverContext(ctx)
+ rctx.Object = "PageInfo"
+ rctx.Args = nil
+ rctx.Field = field
+ rctx.PushField(field.Alias)
+ defer rctx.Pop()
+ res := obj.StartCursor
+ return graphql.MarshalString(res)
+}
+
+func (ec *executionContext) _PageInfo_endCursor(ctx context.Context, field graphql.CollectedField, obj *models.PageInfo) graphql.Marshaler {
+ rctx := graphql.GetResolverContext(ctx)
+ rctx.Object = "PageInfo"
+ rctx.Args = nil
+ rctx.Field = field
+ rctx.PushField(field.Alias)
+ defer rctx.Pop()
+ res := obj.EndCursor
+ return graphql.MarshalString(res)
+}
+
var personImplementors = []string{"Person"}
// nolint: gocyclo, errcheck, gas, goconst
@@ -3222,9 +3248,9 @@ type PageInfo {
# When paginating backwards, are there more items?
hasPreviousPage: Boolean!
# When paginating backwards, the cursor to continue.
-# startCursor: String
+ startCursor: String!
# When paginating forwards, the cursor to continue.
-# endCursor: String
+ endCursor: String!
}
# Represents an person in a git object.
@@ -42,8 +42,10 @@ type OperationEdge struct {
Node bug.Operation `json:"node"`
}
type PageInfo struct {
- HasNextPage bool `json:"hasNextPage"`
- HasPreviousPage bool `json:"hasPreviousPage"`
+ HasNextPage bool `json:"hasNextPage"`
+ HasPreviousPage bool `json:"hasPreviousPage"`
+ StartCursor string `json:"startCursor"`
+ EndCursor string `json:"endCursor"`
}
type Status string
@@ -9,9 +9,9 @@ type PageInfo {
# When paginating backwards, are there more items?
hasPreviousPage: Boolean!
# When paginating backwards, the cursor to continue.
-# startCursor: String
+ startCursor: String!
# When paginating forwards, the cursor to continue.
-# endCursor: String
+ endCursor: String!
}
# Represents an person in a git object.