catch error in gen future

SandroMaglione · Mar 25, 2024 · 3e72bf5 · 3e72bf5
1 parent 07bfa82
commit 3e72bf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/examples/poke_api/lib/main.dart b/examples/poke_api/lib/main.dart
@@ -7,12 +7,12 @@ import 'package:poke_api/pokemon.dart';
 import 'package:poke_api/pokemon_error.dart';
 
 abstract interface class HttpClient {
-  Effect<E, PokemonError, String> get<E>(Uri uri);
+  Effect<Null, PokemonError, String> get(Uri uri);
 }
 
 class Http implements HttpClient {
   @override
-  Effect<E, PokemonError, String> get<E>(Uri uri) => Effect.gen(
+  Effect<Null, PokemonError, String> get(Uri uri) => Effect.gen(
         ($) async {
           final response = await $.async(Effect.tryCatch(
             execute: () => http.get(uri),
@@ -42,7 +42,7 @@ Effect<Env, PokemonError, Pokemon> program(
       }
 
       final uri = Uri.parse(Constants.requestAPIUrl(id));
-      final body = await $.async(client.get(uri));
+      final body = await $.async(client.get(uri).withEnv());
 
       final bodyJson = $.sync(
         Either.tryCatch(

diff --git a/packages/fpdart/lib/src/extension/future_or_extension.dart b/packages/fpdart/lib/src/extension/future_or_extension.dart
@@ -1,13 +1,14 @@
 import 'dart:async';
 
 extension FutureOrThenExtension<A> on FutureOr<A> {
-  FutureOr<B> then<B>(FutureOr<B> Function(A a) f,
-      {B Function(Object error, StackTrace stackTrace)? onError}) {
+  FutureOr<B> then<B>(
+    FutureOr<B> Function(A a) f, {
+    B Function(Object error, StackTrace stackTrace)? onError,
+  }) {
     switch (this) {
       case Future<A> self:
-        return self.then(
-          f,
-          onError: (Object error, StackTrace stackTrace) {
+        return self.then(f).catchError(
+          (Object error, StackTrace stackTrace) {
             if (onError != null) onError(error, stackTrace);
           },
         );