Version 5 of language-ext merging into main

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2022 Paul Louth
+Copyright (c) 2014-2024 Paul Louth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LanguageExt.Benchmarks/HashMapAddBenchmarks.cs

@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using Sasa.Collections;
 using static LanguageExt.Prelude;
 
@@ -12,7 +12,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashMapAddBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashMapContainsKeyBenchmarks.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using Sasa.Collections;
 
 namespace LanguageExt.Benchmarks
@@ -12,7 +12,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashMapContainsKeyBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashMapIterateBenchmarks.cs

@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using Sasa.Collections;
 
 namespace LanguageExt.Benchmarks
@@ -11,7 +11,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashMapIterateBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashMapRandomRemovalBenchmarks.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using Sasa.Collections;
 
 namespace LanguageExt.Benchmarks
@@ -12,7 +12,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashMapRandomRemovalBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashSetAddBenchmarks.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Benchmarks
@@ -10,7 +10,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashSetAddBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashSetContainsBenchmarks.cs

@@ -1,15 +1,15 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 
 namespace LanguageExt.Benchmarks
 {
     [RPlotExporter, RankColumn]
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashSetContainsBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashSetIterationBenchmarks.cs

@@ -1,15 +1,15 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 
 namespace LanguageExt.Benchmarks
 {
     [RPlotExporter, RankColumn]
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashSetIterationBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/HashSetRandomRemovalBenchmarks.cs

@@ -1,15 +1,15 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 
 namespace LanguageExt.Benchmarks
 {
     [RPlotExporter, RankColumn]
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class HashSetRandomRemovalBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/LanguageExt.Benchmarks.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

LanguageExt.Benchmarks/ListAddBenchmarks.cs

@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Benchmarks
@@ -11,7 +11,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class ListAddBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;

LanguageExt.Benchmarks/ListIterationBenchmarks.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using BenchmarkDotNet.Attributes;
 using LanguageExt.ClassInstances;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Benchmarks
@@ -10,7 +10,7 @@ namespace LanguageExt.Benchmarks
     [GenericTypeArguments(typeof(int), typeof(OrdInt))]
     [GenericTypeArguments(typeof(string), typeof(OrdString))]
     public class ListIterationBenchmarks<T, TOrd>
-        where TOrd : struct, Ord<T>
+        where TOrd : Ord<T>
     {
         [Params(100, 1000, 10000, 100000)]
         public int N;
@@ -25,7 +25,7 @@ public void Setup()
         {
             values = ValuesGenerator.Default.GenerateUniqueValues<T>(N);
             immutableList = ImmutableList.CreateRange(ValuesGenerator.Default.GenerateUniqueValues<T>(N));
-            lst = ValuesGenerator.Default.GenerateUniqueValues<T>(N).Freeze();
+            lst = ValuesGenerator.Default.GenerateUniqueValues<T>(N).AsEnumerableM().ToLst();
             seq = toSeq(ValuesGenerator.Default.GenerateUniqueValues<T>(N)).Strict();
         }
 

LanguageExt.Benchmarks/ValuesGenerator.MapSetup.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using Sasa.Collections;
 using static LanguageExt.Prelude;
 
@@ -52,7 +52,7 @@ public static Dictionary<T, T> SysColDictionarySetup<T>(Dictionary<T, T> values)
         }
 
         public static HashMap<TEq, T, T> LangExtHashMapSetup<T, TEq>(Dictionary<T, T> values)
-            where TEq : struct, Eq<T>
+            where TEq : Eq<T>
         {
             var hashMap = HashMap<TEq, T, T>();
             foreach (var kvp in values)
@@ -64,7 +64,7 @@ public static HashMap<TEq, T, T> LangExtHashMapSetup<T, TEq>(Dictionary<T, T> va
         }
 
         public static Map<TOrd, T, T> LangExtMapSetup<T, TOrd>(Dictionary<T, T> values)
-            where TOrd : struct, Ord<T>
+            where TOrd : Ord<T>
         {
             var hashMap = Map<TOrd, T, T>();
             foreach (var kvp in values)

LanguageExt.Benchmarks/ValuesGenerator.SetSetup.cs

@@ -1,5 +1,5 @@
 using System.Collections.Immutable;
-using LanguageExt.TypeClasses;
+using LanguageExt.Traits;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Benchmarks
@@ -40,7 +40,7 @@ public static System.Collections.Generic.HashSet<T> SysColHashSetSetup<T>(T[] va
         }
 
         public static HashSet<TEq, T> LangExtHashSetSetup<T, TEq>(T[] values)
-            where TEq : struct, Eq<T>
+            where TEq : Eq<T>
         {
             var hashSet = HashSet<TEq, T>();
             foreach (var value in values)
@@ -52,7 +52,7 @@ public static HashSet<TEq, T> LangExtHashSetSetup<T, TEq>(T[] values)
         }
 
         public static Set<TOrd, T> LangExtSetSetup<T, TOrd>(T[] values)
-            where TOrd : struct, Ord<T>
+            where TOrd : Ord<T>
         {
             var set = Set<TOrd, T>();
             foreach (var value in values)

LanguageExt.Core/Catch.cs

@@ -1,23 +1,66 @@
 using System;
 using LanguageExt.Common;
+using LanguageExt.Traits;
 
-namespace LanguageExt
+namespace LanguageExt;
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchValue<A>(Func<Error, bool> Match, Func<Error, A> Value)
+{
+    public CatchValue<Error, A> As() =>
+        new (Match, Value);
+}
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchValue<E, A>(Func<E, bool> Match, Func<E, A> Value);
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchError(Func<Error, bool> Match, Func<Error, Error> Value)
+{
+    public CatchError<Error> As() =>
+        new (Match, Value);
+}
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchError<E>(Func<E, bool> Match, Func<E, E> Value);
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchIO<A>(Func<Error, bool> Match, Func<Error, IO<A>> Value)
 {
-    public readonly struct CatchValue<A>
-    {
-        public readonly Func<Error, bool> Match;
-        public readonly Func<Error, A> Value;
-
-        public CatchValue(Func<Error, bool> match, Func<Error, A> value) =>
-            (Match, Value) = (match, value);
-    }
-
-    public readonly struct CatchError
-    {
-        public readonly Func<Error, bool> Match;
-        public readonly Func<Error, Error> Value;
-
-        public CatchError(Func<Error, bool> match, Func<Error, Error> value) =>
-            (Match, Value) = (match, value);
-    }
+    public CatchIO<Error, A> As() =>
+        new (Match, Value);
 }
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchIO<E, A>(Func<E, bool> Match, Func<E, IO<A>> Value);
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchM<M, A>(Func<Error, bool> Match, Func<Error, K<M, A>> Value)
+{
+    public K<M, A> Run(Error error, K<M, A> otherwise) =>
+        Match(error) ? Value(error) : otherwise;
+}
+
+/// <summary>
+/// Used by `@catch`, `@exceptional`, `@expected` to represent the catching of errors
+/// </summary>
+public readonly record struct CatchM<M, E, A>(Func<E, bool> Match, Func<E, K<M, A>> Value)
+{
+    public K<M, A> Run(E error, K<M, A> otherwise) =>
+        Match(error) ? Value(error) : otherwise;
+}
+