Add map, when to result and option

Author: tenhobi

packages/netglade_utils/lib/src/result/option.dart

@@ -1,5 +1,11 @@
-typedef NoneCallback<TResult> = TResult? Function();
-typedef SomeCallback<TResult, T> = TResult? Function(Some<T> value);
+typedef NoneCallback<TResult> = TResult Function();
+typedef SomeCallback<TResult, T> = TResult Function(Some<T> value);
+
+typedef NullableNoneCallback<TResult> = TResult? Function();
+typedef NullableSomeCallback<TResult, T> = TResult? Function(Some<T> value);
+
+typedef ValueNoneCallback<TResult> = TResult Function();
+typedef ValueSomeCallback<TResult, T> = TResult Function(T some);
 
 /// Returns optionally given type [T] wrapped in [Some].
 ///
@@ -13,34 +19,72 @@ sealed class Option<T> {
   const factory Option.none() = None;
   const factory Option.some(T value) = Some<T>;
 
+  TResult map<TResult extends Object?>({
+    required NoneCallback<TResult> none,
+    required SomeCallback<TResult, T> some,
+  });
+
   TResult? mapOrNull<TResult extends Object?>({
-    NoneCallback<TResult>? none,
-    SomeCallback<TResult, T>? some,
+    NullableNoneCallback<TResult>? none,
+    NullableSomeCallback<TResult, T>? some,
+  });
+
+  TResult when<TResult extends Object?>({
+    required ValueNoneCallback<TResult> none,
+    required ValueSomeCallback<TResult, T> some,
   });
 }
 
 final class None<T> extends Option<T> {
   const None();
 
+  @override
+  TResult map<TResult extends Object?>({
+    required NoneCallback<TResult> none,
+    required SomeCallback<TResult, T> some,
+  }) =>
+      none();
+
   @override
   TResult? mapOrNull<TResult extends Object?>({
-    NoneCallback<TResult>? none,
-    SomeCallback<TResult, T>? some,
+    NullableNoneCallback<TResult>? none,
+    NullableSomeCallback<TResult, T>? some,
   }) =>
       none?.call();
+
+  @override
+  TResult when<TResult extends Object?>({
+    required ValueNoneCallback<TResult> none,
+    required ValueSomeCallback<TResult, T> some,
+  }) =>
+      none();
 }
 
 final class Some<T> extends Option<T> {
   final T value;
 
   const Some(this.value);
 
+  @override
+  TResult map<TResult extends Object?>({
+    required NoneCallback<TResult> none,
+    required SomeCallback<TResult, T> some,
+  }) =>
+      some(this);
+
   @override
   TResult? mapOrNull<TResult extends Object?>({
-    NoneCallback<TResult>? none,
-    SomeCallback<TResult, T>? some,
+    NullableNoneCallback<TResult>? none,
+    NullableSomeCallback<TResult, T>? some,
   }) =>
       some?.call(this);
+
+  @override
+  TResult when<TResult extends Object?>({
+    required ValueNoneCallback<TResult> none,
+    required ValueSomeCallback<TResult, T> some,
+  }) =>
+      some(value);
 }
 
 extension OptionExtension<T> on Option<T> {

packages/netglade_utils/lib/src/result/result_impl.dart

@@ -1,7 +1,13 @@
 // ignore_for_file: prefer-match-file-name
 
-typedef SuccessCallback<T, S, E> = T? Function(Success<S, E> value);
-typedef ErrorCallback<T, S, E> = T? Function(Error<S, E> value);
+typedef SuccessCallback<T, S, E> = T Function(Success<S, E> value);
+typedef ErrorCallback<T, S, E> = T Function(Error<S, E> value);
+
+typedef NullableSuccessCallback<T, S, E> = T? Function(Success<S, E> value);
+typedef NullableErrorCallback<T, S, E> = T? Function(Error<S, E> value);
+
+typedef SuccessValueCallback<T, S> = T Function(S success);
+typedef ErrorValueCallback<T, E> = T Function(E error);
 
 /// Returns either Success [S] or Error [E] type.
 sealed class Result<S, E> {
@@ -10,9 +16,19 @@ sealed class Result<S, E> {
   const factory Result.success(S success) = Success<S, E>;
   const factory Result.error(E error) = Error<S, E>;
 
+  TResult map<TResult extends Object?>({
+    required SuccessCallback<TResult, S, E> success,
+    required ErrorCallback<TResult, S, E> error,
+  });
+
   TResult? mapOrNull<TResult extends Object?>({
-    SuccessCallback<TResult, S, E>? success,
-    ErrorCallback<TResult, S, E>? error,
+    NullableSuccessCallback<TResult, S, E> success,
+    NullableErrorCallback<TResult, S, E> error,
+  });
+
+  TResult when<TResult extends Object?>({
+    required SuccessValueCallback<TResult, S> success,
+    required ErrorValueCallback<TResult, E> error,
   });
 }
 
@@ -21,25 +37,53 @@ final class Success<S, E> extends Result<S, E> {
 
   const Success(this.success);
 
+  @override
+  TResult map<TResult extends Object?>({
+    required SuccessCallback<TResult, S, E> success,
+    required ErrorCallback<TResult, S, E> error,
+  }) =>
+      success(this);
+
   @override
   TResult? mapOrNull<TResult extends Object?>({
-    SuccessCallback<TResult, S, E>? success,
-    ErrorCallback<TResult, S, E>? error,
+    NullableSuccessCallback<TResult, S, E>? success,
+    NullableErrorCallback<TResult, S, E>? error,
   }) =>
       success?.call(this);
+
+  @override
+  TResult when<TResult extends Object?>({
+    required SuccessValueCallback<TResult, S> success,
+    required ErrorValueCallback<TResult, E> error,
+  }) =>
+      success(this.success);
 }
 
 final class Error<S, E> extends Result<S, E> {
   final E error;
 
   const Error(this.error);
 
+  @override
+  TResult map<TResult extends Object?>({
+    required SuccessCallback<TResult, S, E> success,
+    required ErrorCallback<TResult, S, E> error,
+  }) =>
+      error(this);
+
   @override
   TResult? mapOrNull<TResult extends Object?>({
-    SuccessCallback<TResult, S, E>? success,
-    ErrorCallback<TResult, S, E>? error,
+    NullableSuccessCallback<TResult, S, E>? success,
+    NullableErrorCallback<TResult, S, E>? error,
   }) =>
       error?.call(this);
+
+  @override
+  TResult when<TResult extends Object?>({
+    required SuccessValueCallback<TResult, S> success,
+    required ErrorValueCallback<TResult, E> error,
+  }) =>
+      error(this.error);
 }
 
 extension ResultExtension<S, E> on Result<S, E> {