fix: add filterable to Either and Result

Signed-off-by: Dr. Carsten Leue <carsten.leue@de.ibm.com>

Author: CarstenLeue

v2/array/array.go

@@ -21,7 +21,7 @@ import (
 	"github.com/IBM/fp-go/v2/internal/array"
 	M "github.com/IBM/fp-go/v2/monoid"
 	"github.com/IBM/fp-go/v2/option"
-	"github.com/IBM/fp-go/v2/tuple"
+	"github.com/IBM/fp-go/v2/pair"
 )
 
 // From constructs an array from a set of variadic arguments
@@ -163,11 +163,11 @@ func FilterMapWithIndex[A, B any](f func(int, A) Option[B]) Operator[A, B] {
 	return G.FilterMapWithIndex[[]A, []B](f)
 }
 
-// FilterChain maps an array with an iterating function that returns an [Option] of an array. It keeps only the Some values discarding the Nones and then flattens the result.
+// ChainOptionK maps an array with an iterating function that returns an [Option] of an array. It keeps only the Some values discarding the Nones and then flattens the result.
 //
 //go:inline
-func FilterChain[A, B any](f option.Kleisli[A, []B]) Operator[A, B] {
-	return G.FilterChain[[]A](f)
+func ChainOptionK[A, B any](f option.Kleisli[A, []B]) Operator[A, B] {
+	return G.ChainOptionK[[]A](f)
 }
 
 // FilterMapRef filters an array using a predicate on pointers and maps the matching elements using a function on pointers.
@@ -453,15 +453,15 @@ func Size[A any](as []A) int {
 // the second contains elements for which it returns true.
 //
 //go:inline
-func MonadPartition[A any](as []A, pred func(A) bool) tuple.Tuple2[[]A, []A] {
+func MonadPartition[A any](as []A, pred func(A) bool) pair.Pair[[]A, []A] {
 	return G.MonadPartition(as, pred)
 }
 
 // Partition creates two new arrays out of one, the left result contains the elements
 // for which the predicate returns false, the right one those for which the predicate returns true
 //
 //go:inline
-func Partition[A any](pred func(A) bool) func([]A) tuple.Tuple2[[]A, []A] {
+func Partition[A any](pred func(A) bool) func([]A) pair.Pair[[]A, []A] {
 	return G.Partition[[]A](pred)
 }
 

v2/array/array_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/IBM/fp-go/v2/internal/utils"
 	N "github.com/IBM/fp-go/v2/number"
 	O "github.com/IBM/fp-go/v2/option"
+	"github.com/IBM/fp-go/v2/pair"
 	S "github.com/IBM/fp-go/v2/string"
-	T "github.com/IBM/fp-go/v2/tuple"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -163,11 +163,11 @@ func TestPartition(t *testing.T) {
 		return n > 2
 	}
 
-	assert.Equal(t, T.MakeTuple2(Empty[int](), Empty[int]()), Partition(pred)(Empty[int]()))
-	assert.Equal(t, T.MakeTuple2(From(1), From(3)), Partition(pred)(From(1, 3)))
+	assert.Equal(t, pair.MakePair(Empty[int](), Empty[int]()), Partition(pred)(Empty[int]()))
+	assert.Equal(t, pair.MakePair(From(1), From(3)), Partition(pred)(From(1, 3)))
 }
 
-func TestFilterChain(t *testing.T) {
+func TestChainOptionK(t *testing.T) {
 	src := From(1, 2, 3)
 
 	f := func(i int) O.Option[[]string] {
@@ -177,7 +177,7 @@ func TestFilterChain(t *testing.T) {
 		return O.None[[]string]()
 	}
 
-	res := FilterChain(f)(src)
+	res := ChainOptionK(f)(src)
 
 	assert.Equal(t, From("a1", "b1", "a3", "b3"), res)
 }

v2/array/generic/array.go

@@ -21,7 +21,7 @@ import (
 	FC "github.com/IBM/fp-go/v2/internal/functor"
 	M "github.com/IBM/fp-go/v2/monoid"
 	O "github.com/IBM/fp-go/v2/option"
-	"github.com/IBM/fp-go/v2/tuple"
+	"github.com/IBM/fp-go/v2/pair"
 )
 
 // Of constructs a single element array
@@ -215,7 +215,7 @@ func Filter[AS ~[]A, PRED ~func(A) bool, A any](pred PRED) func(AS) AS {
 	return FilterWithIndex[AS](F.Ignore1of2[int](pred))
 }
 
-func FilterChain[GA ~[]A, GB ~[]B, A, B any](f func(a A) O.Option[GB]) func(GA) GB {
+func ChainOptionK[GA ~[]A, GB ~[]B, A, B any](f func(a A) O.Option[GB]) func(GA) GB {
 	return F.Flow2(
 		FilterMap[GA, []GB](f),
 		Flatten[[]GB],
@@ -234,7 +234,7 @@ func FilterMapWithIndex[GA ~[]A, GB ~[]B, A, B any](f func(int, A) O.Option[B])
 	return F.Bind2nd(MonadFilterMapWithIndex[GA, GB, A, B], f)
 }
 
-func MonadPartition[GA ~[]A, A any](as GA, pred func(A) bool) tuple.Tuple2[GA, GA] {
+func MonadPartition[GA ~[]A, A any](as GA, pred func(A) bool) pair.Pair[GA, GA] {
 	left := Empty[GA]()
 	right := Empty[GA]()
 	array.Reduce(as, func(c bool, a A) bool {
@@ -246,10 +246,10 @@ func MonadPartition[GA ~[]A, A any](as GA, pred func(A) bool) tuple.Tuple2[GA, G
 		return c
 	}, true)
 	// returns the partition
-	return tuple.MakeTuple2(left, right)
+	return pair.MakePair(left, right)
 }
 
-func Partition[GA ~[]A, A any](pred func(A) bool) func(GA) tuple.Tuple2[GA, GA] {
+func Partition[GA ~[]A, A any](pred func(A) bool) func(GA) pair.Pair[GA, GA] {
 	return F.Bind2nd(MonadPartition[GA, A], pred)
 }
 

v2/array/generic/zip.go

@@ -18,7 +18,7 @@ package generic
 import (
 	F "github.com/IBM/fp-go/v2/function"
 	N "github.com/IBM/fp-go/v2/number"
-	T "github.com/IBM/fp-go/v2/tuple"
+	"github.com/IBM/fp-go/v2/pair"
 )
 
 // ZipWith applies a function to pairs of elements at the same index in two arrays, collecting the results in a new array. If one
@@ -34,19 +34,19 @@ func ZipWith[AS ~[]A, BS ~[]B, CS ~[]C, FCT ~func(A, B) C, A, B, C any](fa AS, f
 
 // Zip takes two arrays and returns an array of corresponding pairs. If one input array is short, excess elements of the
 // longer array are discarded
-func Zip[AS ~[]A, BS ~[]B, CS ~[]T.Tuple2[A, B], A, B any](fb BS) func(AS) CS {
-	return F.Bind23of3(ZipWith[AS, BS, CS, func(A, B) T.Tuple2[A, B]])(fb, T.MakeTuple2[A, B])
+func Zip[AS ~[]A, BS ~[]B, CS ~[]pair.Pair[A, B], A, B any](fb BS) func(AS) CS {
+	return F.Bind23of3(ZipWith[AS, BS, CS, func(A, B) pair.Pair[A, B]])(fb, pair.MakePair[A, B])
 }
 
 // Unzip is the function is reverse of [Zip]. Takes an array of pairs and return two corresponding arrays
-func Unzip[AS ~[]A, BS ~[]B, CS ~[]T.Tuple2[A, B], A, B any](cs CS) T.Tuple2[AS, BS] {
+func Unzip[AS ~[]A, BS ~[]B, CS ~[]pair.Pair[A, B], A, B any](cs CS) pair.Pair[AS, BS] {
 	l := len(cs)
 	as := make(AS, l)
 	bs := make(BS, l)
 	for i := range l {
 		t := cs[i]
-		as[i] = t.F1
-		bs[i] = t.F2
+		as[i] = pair.Head(t)
+		bs[i] = pair.Tail(t)
 	}
-	return T.MakeTuple2(as, bs)
+	return pair.MakePair(as, bs)
 }

v2/array/zip.go

@@ -17,7 +17,7 @@ package array
 
 import (
 	G "github.com/IBM/fp-go/v2/array/generic"
-	T "github.com/IBM/fp-go/v2/tuple"
+	"github.com/IBM/fp-go/v2/pair"
 )
 
 // ZipWith applies a function to pairs of elements at the same index in two arrays,
@@ -55,8 +55,8 @@ func ZipWith[FCT ~func(A, B) C, A, B, C any](fa []A, fb []B, f FCT) []C {
 //	// Result: [(a, 1), (b, 2)]
 //
 //go:inline
-func Zip[A, B any](fb []B) func([]A) []T.Tuple2[A, B] {
-	return G.Zip[[]A, []B, []T.Tuple2[A, B]](fb)
+func Zip[A, B any](fb []B) func([]A) []pair.Pair[A, B] {
+	return G.Zip[[]A, []B, []pair.Pair[A, B]](fb)
 }
 
 // Unzip is the reverse of Zip. It takes an array of pairs (tuples) and returns
@@ -78,6 +78,6 @@ func Zip[A, B any](fb []B) func([]A) []T.Tuple2[A, B] {
 //	ages := result.Tail   // [30, 25, 35]
 //
 //go:inline
-func Unzip[A, B any](cs []T.Tuple2[A, B]) T.Tuple2[[]A, []B] {
+func Unzip[A, B any](cs []pair.Pair[A, B]) pair.Pair[[]A, []B] {
 	return G.Unzip[[]A, []B](cs)
 }

v2/array/zip_test.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	T "github.com/IBM/fp-go/v2/tuple"
+	"github.com/IBM/fp-go/v2/pair"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +40,7 @@ func TestZip(t *testing.T) {
 
 	res := Zip[string](left)(right)
 
-	assert.Equal(t, From(T.MakeTuple2("a", 1), T.MakeTuple2("b", 2), T.MakeTuple2("c", 3)), res)
+	assert.Equal(t, From(pair.MakePair("a", 1), pair.MakePair("b", 2), pair.MakePair("c", 3)), res)
 }
 
 func TestUnzip(t *testing.T) {
@@ -51,6 +51,6 @@ func TestUnzip(t *testing.T) {
 
 	unzipped := Unzip(zipped)
 
-	assert.Equal(t, right, unzipped.F1)
-	assert.Equal(t, left, unzipped.F2)
+	assert.Equal(t, right, pair.Head(unzipped))
+	assert.Equal(t, left, pair.Tail(unzipped))
 }

v2/di/erasure/injector.go

@@ -87,8 +87,8 @@ var (
 	// assembleProviders constructs the provider map for item and non-item providers
 	assembleProviders = F.Flow3(
 		A.Partition(isItemProvider),
-		T.Map2(collectProviders, collectItemProviders),
-		T.Tupled2(mergeProviders.Concat),
+		pair.BiMap(collectProviders, collectItemProviders),
+		pair.Paired(mergeProviders.Concat),
 	)
 )