|
@@ -9,17 +9,12 @@ import (
|
|
|
)
|
|
|
|
|
|
type Connection[T connection.Cursor] struct {
|
|
|
- Edges []Edge[T] `json:"edges"`
|
|
|
+ Edges []T `json:"edges"`
|
|
|
PageInfo *PageInfo `json:"page_info"`
|
|
|
}
|
|
|
|
|
|
-type Edge[T connection.Cursor] struct {
|
|
|
- Node T `json:"node"`
|
|
|
- Cursor string `json:"cursor"`
|
|
|
-}
|
|
|
-
|
|
|
func (c *Connection[T]) Reverse() {
|
|
|
- c.Edges = lo.Reverse[Edge[T]](c.Edges)
|
|
|
+ c.Edges = lo.Reverse[T](c.Edges)
|
|
|
}
|
|
|
|
|
|
func (c *Connection[T]) Grain(after, before *string) error {
|
|
@@ -32,8 +27,8 @@ func (c *Connection[T]) Grain(after, before *string) error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
- edges := lo.FlatMap[Edge[T], string](c.Edges, func(item Edge[T], _ int) []string {
|
|
|
- return []string{item.Cursor}
|
|
|
+ edges := lo.FlatMap[T, string](c.Edges, func(item T, _ int) []string {
|
|
|
+ return []string{item.Cursor()}
|
|
|
})
|
|
|
|
|
|
c.PageInfo = &PageInfo{
|
|
@@ -43,13 +38,13 @@ func (c *Connection[T]) Grain(after, before *string) error {
|
|
|
|
|
|
if after != nil {
|
|
|
if idx := lo.IndexOf(edges, *after); idx != -1 {
|
|
|
- c.Edges = lo.Slice[Edge[T]](c.Edges, idx+1, math.MaxUint32)
|
|
|
+ c.Edges = lo.Slice[T](c.Edges, idx+1, math.MaxUint32)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if before != nil {
|
|
|
if idx := lo.IndexOf(edges, *before); idx != -1 {
|
|
|
- c.Edges = lo.Subset[Edge[T]](c.Edges, -idx, math.MaxUint32)
|
|
|
+ c.Edges = lo.Subset[T](c.Edges, -idx, math.MaxUint32)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -62,11 +57,11 @@ func (c *Connection[T]) Slice(first, last *int) error {
|
|
|
}
|
|
|
|
|
|
if first != nil {
|
|
|
- c.Edges = lo.Slice[Edge[T]](c.Edges, 0, *first)
|
|
|
+ c.Edges = lo.Slice[T](c.Edges, 0, *first)
|
|
|
}
|
|
|
|
|
|
if last != nil {
|
|
|
- c.Edges = lo.Subset[Edge[T]](c.Edges, -*last, math.MaxUint32)
|
|
|
+ c.Edges = lo.Subset[T](c.Edges, -*last, math.MaxUint32)
|
|
|
}
|
|
|
|
|
|
if len(c.Edges) < 1 {
|
|
@@ -75,10 +70,10 @@ func (c *Connection[T]) Slice(first, last *int) error {
|
|
|
c.PageInfo.StartCursor = nil
|
|
|
c.PageInfo.EndCursor = nil
|
|
|
} else {
|
|
|
- c.PageInfo.HasPreviousPage = !(*c.PageInfo.StartCursor == c.Edges[0].Cursor)
|
|
|
- c.PageInfo.HasNextPage = !(*c.PageInfo.EndCursor == c.Edges[len(c.Edges)-1].Cursor)
|
|
|
- c.PageInfo.StartCursor = lo.ToPtr(c.Edges[0].Cursor)
|
|
|
- c.PageInfo.EndCursor = lo.ToPtr(c.Edges[len(c.Edges)-1].Cursor)
|
|
|
+ c.PageInfo.HasPreviousPage = !(*c.PageInfo.StartCursor == c.Edges[0].Cursor())
|
|
|
+ c.PageInfo.HasNextPage = !(*c.PageInfo.EndCursor == c.Edges[len(c.Edges)-1].Cursor())
|
|
|
+ c.PageInfo.StartCursor = lo.ToPtr(c.Edges[0].Cursor())
|
|
|
+ c.PageInfo.EndCursor = lo.ToPtr(c.Edges[len(c.Edges)-1].Cursor())
|
|
|
}
|
|
|
|
|
|
return nil
|
|
@@ -93,6 +88,6 @@ func (c *Connection[T]) Unmarshal(data []byte) error {
|
|
|
}
|
|
|
|
|
|
func (c Connection[T]) Key() string {
|
|
|
- var zero T
|
|
|
+ var zero []T
|
|
|
return fmt.Sprintf("connection-edges-%T", zero)
|
|
|
}
|