slightly better string handling extensions

TheEightBot · Dec 31, 2023 · d3c17f9 · d3c17f9
1 parent a3a43a1
commit d3c17f9
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/Stellar/Extensions/IObservableExtensions.cs b/Stellar/Extensions/IObservableExtensions.cs
@@ -59,11 +59,24 @@ public static IObservable<TSource> IsNotDefault<TSource>(this IObservable<TSourc
         return source.Where(x => x.HasValue && EqualityComparer<T>.Default.Equals(x.Value, comparison));
     }
 
-    public static IObservable<string> IsNotNullOrEmpty(this IObservable<string> source)
+    public static IObservable<string> IsNotEmpty(this IObservable<string> source)
     {
         return source.Where(static str => !string.IsNullOrEmpty(str));
     }
 
+    public static IObservable<string> IsNotNullOrEmpty(this IObservable<string?> source)
+    {
+        return source.Where(static str => !string.IsNullOrEmpty(str))
+            .Select(str => str!);
+    }
+
+    public static IObservable<string> IsNotNull(this IObservable<string?> source)
+    {
+        return source
+            .Where(static str => str is not null)
+            .Select(str => str!);
+    }
+
     public static IObservable<T> GetValueOrDefault<T>(this IObservable<T?> source, T defaultValue = default(T))
         where T : struct
     {
@@ -525,4 +538,4 @@ public static IObservable<T> ObserveLatestOn<T>(this IObservable<T> source, ISch
                         .TakeUntil(o.IgnoreElements().Concat(Observable.Return(default(T), schedulerOrDefault)));
                 });
     }
-}
+}