Fix covariant result error (#238)

* Fix sorting of exports

* Make result error covariant

Author: dbrattli

.pre-commit-config.yaml

@@ -14,5 +14,5 @@ repos:
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ["[email protected].391"]
+        additional_dependencies: ["[email protected].394"]
     repo: local

expression/__init__.py

@@ -65,6 +65,20 @@
 __all__ = [
     "AsyncReplyChannel",
     "Builder",
+    "EffectError",
+    "Error",
+    "Failure",
+    "MailboxProcessor",
+    "Nothing",
+    "Ok",
+    "Option",
+    "Result",
+    "Some",
+    "Success",
+    "TailCall",
+    "TailCallResult",
+    "Try",
+    "__version__",
     "case",
     "collections",
     "compose",
@@ -75,9 +89,6 @@
     "default_arg",
     "downcast",
     "effect",
-    "EffectError",
-    "Error",
-    "Failure",
     "failwith",
     "flip",
     "fst",
@@ -86,27 +97,16 @@
     "is_none",
     "is_ok",
     "is_some",
-    "MailboxProcessor",
-    "Nothing",
-    "Ok",
     "option",
-    "Option",
     "pipe",
     "pipe2",
     "pipe3",
     "result",
-    "Result",
     "snd",
-    "Some",
-    "Success",
+    "tag",
     "tagged_union",
-    "TailCall",
-    "TailCallResult",
     "tailrec",
     "tailrec_async",
-    "Try",
-    "tag",
     "try_downcast",
     "upcast",
-    "__version__",
 ]

expression/collections/__init__.py

@@ -8,13 +8,13 @@
 
 
 __all__ = [
+    "Block",
+    "Map",
+    "Seq",
+    "TypedArray",
     "array",
     "asyncseq",
-    "Block",
     "block",
-    "Map",
     "map",
-    "Seq",
     "seq",
-    "TypedArray",
 ]

expression/collections/array.py

@@ -656,22 +656,22 @@ def unfold(state: _TState, generator: Callable[[_TState], Option[tuple[_TSource,
 
 
 __all__ = [
+    "TypedArray",
     "empty",
     "filter",
     "fold",
     "indexed",
     "is_empty",
     "item",
     "map",
+    "of",
     "of_option",
     "of_seq",
-    "of",
+    "singleton",
     "sum",
     "sum_by",
-    "singleton",
     "take",
     "take_last",
     "try_head",
-    "TypedArray",
     "unfold",
 ]

expression/collections/asyncseq.py

@@ -99,8 +99,8 @@ async def _map(source: AsyncIterable[TSource]) -> AsyncIterable[TResult]:
 
 __all__ = [
     "AsyncSeq",
-    "range",
     "filter",
     "map",
+    "range",
     "repeat",
 ]

expression/collections/block.py

@@ -1048,12 +1048,12 @@ def zip(
     "fold",
     "head",
     "indexed",
-    "item",
     "is_empty",
+    "item",
     "map",
     "mapi",
-    "of_seq",
     "of_option",
+    "of_seq",
     "partition",
     "singleton",
     "skip",

expression/collections/map.py

@@ -494,9 +494,9 @@ def try_find(table: Map[_Key, _Value], key: _Key) -> Option[_Value]:
     "Map",
     "add",
     "change",
-    "create",
     "contains_key",
     "count",
+    "create",
     "empty",
     "exists",
     "filter",

expression/collections/seq.py

@@ -977,8 +977,8 @@ def _zip(source2: Iterable[_TResult]) -> Iterable[tuple[_TSource, _TResult]]:
     "Seq",
     "append",
     "choose",
-    "concat",
     "collect",
+    "concat",
     "delay",
     "empty",
     "filter",
@@ -992,12 +992,12 @@ def _zip(source2: Iterable[_TResult]) -> Iterable[tuple[_TSource, _TResult]]:
     "min",
     "min_by",
     "of",
-    "of_list",
     "of_iterable",
+    "of_list",
     "range",
     "scan",
-    "skip",
     "singleton",
+    "skip",
     "sum",
     "sum_by",
     "tail",

expression/core/__init__.py

@@ -25,17 +25,33 @@
 
 
 __all__ = [
-    "aiotools",
     "AsyncReplyChannel",
     "Builder",
+    "EffectError",
+    "Error",
+    "Failure",
+    "MailboxProcessor",
+    "Nothing",
+    "Ok",
+    "Option",
+    "PipeMixin",
+    "Result",
+    "Some",
+    "Success",
+    "SupportsGreaterThan",
+    "SupportsLessThan",
+    "SupportsMatch",
+    "SupportsSum",
+    "TailCall",
+    "TailCallResult",
+    "Try",
+    "aiotools",
+    "case",
     "compose",
     "curry",
     "curry_flip",
     "default_arg",
     "downcast",
-    "EffectError",
-    "Error",
-    "Failure",
     "failwith",
     "flip",
     "fst",
@@ -44,33 +60,17 @@
     "is_none",
     "is_ok",
     "is_some",
-    "MailboxProcessor",
-    "Nothing",
-    "Ok",
-    "Option",
     "option",
     "pipe",
     "pipe2",
     "pipe3",
-    "PipeMixin",
     "result",
-    "Result",
-    "tagged_union",
     "snd",
-    "Some",
-    "Success",
-    "SupportsLessThan",
-    "SupportsGreaterThan",
-    "SupportsMatch",
-    "SupportsSum",
     "tag",
-    "case",
-    "TailCall",
-    "TailCallResult",
+    "tag",
+    "tagged_union",
     "tailrec",
     "tailrec_async",
-    "Try",
-    "tag",
     "try_downcast",
     "upcast",
 ]

expression/core/aiotools.py

@@ -164,9 +164,9 @@ async def from_result(result: _TSource) -> _TSource:
     "Continuation",
     "empty",
     "from_continuations",
+    "run_synchronously",
     "singleton",
     "sleep",
     "start",
     "start_immediate",
-    "run_synchronously",
 ]

expression/core/misc.py

@@ -48,4 +48,4 @@ def fst(value: tuple[_TSource, Any]) -> _TSource:
     return a
 
 
-__all__ = ["fst", "identity", "starid", "flip", "snd"]
+__all__ = ["flip", "fst", "identity", "snd", "starid"]

expression/core/option.py

@@ -528,24 +528,24 @@ def default_arg(value: Option[_TSource], default_value: _T1) -> _TSource | _T1:
 
 
 __all__ = [
+    "Nothing",
     "Option",
     "Some",
-    "Nothing",
     "bind",
     "default_arg",
     "default_value",
     "default_with",
-    "map",
-    "map2",
     "is_none",
     "is_some",
+    "map",
+    "map2",
+    "model_dump",
+    "of_obj",
+    "of_optional",
+    "of_result",
     "or_else",
     "to_list",
-    "model_dump",
-    "to_seq",
     "to_optional",
-    "of_optional",
     "to_result",
-    "of_result",
-    "of_obj",
+    "to_seq",
 ]

expression/core/pipe.py

@@ -316,4 +316,4 @@ def pipe(self, *args: Any) -> Any:
         return pipe(self, *args)
 
 
-__all__ = ["pipe", "pipe2", "pipe3", "PipeMixin", "starpipe"]
+__all__ = ["PipeMixin", "pipe", "pipe2", "pipe3", "starpipe"]