fix: typing for Y combinator

Signed-off-by: Dr. Carsten Leue <carsten.leue@de.ibm.com>
IBM · Dec 21, 2023 · 12ef791 · 12ef791
1 parent 5ac4744
commit 12ef791
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/ioeither/http/builder/builder.go b/ioeither/http/builder/builder.go
@@ -82,6 +82,11 @@ var (
 		O.Of[IOE.IOEither[error, []byte]],
 		Body.Set,
 	)
+	// WithBytes creates a [BuilderBuilder] for a request body using bytes
+	WithBytes = F.Flow2(
+		IOE.Of[error, []byte],
+		WithBody,
+	)
 	// WithContentType adds the [H.ContentType] header
 	WithContentType = WithHeader(H.ContentType)
 	// WithAuthorization adds the [H.Authorization] header

diff --git a/lambda/y.go b/lambda/y.go
@@ -15,16 +15,12 @@
 
 package lambda
 
-type (
-	// RecFct is the function called recursively
-	RecFct[T, R any] func(T) R
+// Y is the Y-combinator based on https://dreamsongs.com/Files/WhyOfY.pdf
+func Y[TRFRM ~func(RecFct) RecFct, RecFct ~func(T) R, T, R any](f TRFRM) RecFct {
 
-	internalCombinator[T, R any] func(internalCombinator[T, R]) RecFct[T, R]
-)
+	type internalCombinator[RecFct ~func(T) R, T, R any] func(internalCombinator[RecFct, T, R]) RecFct
 
-// Y is the Y-combinator based on https://dreamsongs.com/Files/WhyOfY.pdf
-func Y[TRFRM ~func(RecFct[T, R]) RecFct[T, R], T, R any](f TRFRM) RecFct[T, R] {
-	g := func(h internalCombinator[T, R]) RecFct[T, R] {
+	g := func(h internalCombinator[RecFct, T, R]) RecFct {
 		return func(t T) R {
 			return f(h(h))(t)
 		}

diff --git a/lambda/y_test.go b/lambda/y_test.go
@@ -16,19 +16,19 @@
 package lambda
 
 import (
-	"fmt"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFactorial(t *testing.T) {
-	fct := Y(func(r RecFct[int, int]) RecFct[int, int] {
+	fct := Y(func(r func(int) int) func(int) int {
 		return func(n int) int {
 			if n <= 0 {
 				return 1
 			}
 			return n * r(n-1)
 		}
 	})
-
-	fmt.Println(fct(10))
+	assert.Equal(t, 3628800, fct(10))
 }