Merge branch 'main' into arrow-2

arrow-kt · Nov 17, 2022 · 5a03760 · 5a03760
2 parents f4054c7 + cf0add9
commit 5a03760
Show file tree

Hide file tree

Showing 45 changed files with 962 additions and 536 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -25,6 +25,12 @@ jobs:
           distribution: 'zulu'
           java-version: 11
 
+      # For watchOS x86 simulator. Remove with Kotlin 1.8.
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: matrix.os == 'macos-latest'
+        with:
+          xcode-version: '13.4.1'
+
       - name: build
         uses: gradle/[email protected]
         if: matrix.os != 'windows-latest'

diff --git a/arrow-libs/core/arrow-core/api/arrow-core.api b/arrow-libs/core/arrow-core/api/arrow-core.api
@@ -166,6 +166,8 @@ public abstract class arrow/core/Either {
 	public final fun foldLeft (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 	public final fun foldMap (Larrow/typeclasses/Monoid;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun fromNullable (Ljava/lang/Object;)Larrow/core/Either;
+	public final fun getOrNone ()Larrow/core/Option;
+	public final fun getOrNull ()Ljava/lang/Object;
 	public final fun isEmpty ()Z
 	public final fun isLeft ()Z
 	public final fun isNotEmpty ()Z
@@ -174,6 +176,8 @@ public abstract class arrow/core/Either {
 	public static final fun lift (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1;
 	public final fun map (Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
 	public final fun mapLeft (Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
+	public final fun onLeft (Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
+	public final fun onRight (Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
 	public final fun orNone ()Larrow/core/Option;
 	public final fun orNull ()Ljava/lang/Object;
 	public final fun replicate (I)Larrow/core/Either;
@@ -240,6 +244,8 @@ public final class arrow/core/Either$Right$Companion {
 }
 
 public final class arrow/core/EitherKt {
+	public static final field NicheAPI Ljava/lang/String;
+	public static final field RedundantAPI Ljava/lang/String;
 	public static final fun bisequence (Larrow/core/Either;)Ljava/util/List;
 	public static final fun bisequenceNullable (Larrow/core/Either;)Larrow/core/Either;
 	public static final fun bisequenceOption (Larrow/core/Either;)Larrow/core/Option;
@@ -254,7 +260,8 @@ public final class arrow/core/EitherKt {
 	public static final fun filterOrOther (Larrow/core/Either;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
 	public static final fun flatMap (Larrow/core/Either;Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
 	public static final fun flatten (Larrow/core/Either;)Larrow/core/Either;
-	public static final fun getOrElse (Larrow/core/Either;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final synthetic fun getOrElse (Larrow/core/Either;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final fun getOrElse (Larrow/core/Either;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun getOrHandle (Larrow/core/Either;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 	public static final fun handleError (Larrow/core/Either;Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
 	public static final fun handleErrorWith (Larrow/core/Either;Lkotlin/jvm/functions/Function1;)Larrow/core/Either;
@@ -762,6 +769,7 @@ public final class arrow/core/NonEmptyListKt {
 	public static final fun sequenceEither (Larrow/core/NonEmptyList;)Larrow/core/Either;
 	public static final fun sequenceOption (Larrow/core/NonEmptyList;)Larrow/core/Option;
 	public static final fun sequenceValidated (Larrow/core/NonEmptyList;Larrow/typeclasses/Semigroup;)Larrow/core/Validated;
+	public static final fun toNonEmptyListOrNone (Ljava/lang/Iterable;)Larrow/core/Option;
 	public static final fun toNonEmptyListOrNull (Ljava/lang/Iterable;)Larrow/core/NonEmptyList;
 	public static final fun traverse (Larrow/core/NonEmptyList;Larrow/typeclasses/Semigroup;Lkotlin/jvm/functions/Function1;)Larrow/core/Validated;
 	public static final fun traverse (Larrow/core/NonEmptyList;Lkotlin/jvm/functions/Function1;)Larrow/core/Either;

diff --git a/arrow-libs/core/arrow-core/knit.properties b/arrow-libs/core/arrow-core/knit.properties
@@ -2,4 +2,5 @@ knit.package=arrow.core.examples
 knit.dir=src/jvmTest/kotlin/examples/
 
 test.package=arrow.core.examples.test
-test.dir=src/jvmTest/kotlin/examples/autogenerated/
+test.dir=src/jvmTest/kotlin/examples/test/
+test.template=knit.test.template
diff --git a/arrow-libs/core/arrow-core/knit.test.template b/arrow-libs/core/arrow-core/knit.test.template
@@ -0,0 +1,15 @@
+// This file was automatically generated from ${file.name} by Knit tool. Do not edit.
+package ${test.package}
+
+import io.kotest.core.spec.style.StringSpec
+
+class ${test.name} : StringSpec({
+<#list cases as case>
+  "${case.name}" {
+    ${case.knit.package}.${case.knit.name}.test()
+  }
+
+</#list>
+}) {
+  override fun timeout(): Long = 1000
+}