Merge pull request #20 from mta-solutions/update-to-use-fsharp-plus

Use FSharpPlus
mta-solutions · Oct 8, 2024 · 111b959 · 111b959
2 parents dfaedb1 + 98e5c74
commit 111b959
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 292 deletions.
diff --git a/samples/FSharp.Data.Validation.Samples/FSharp.Data.Validation.Samples.fsproj b/samples/FSharp.Data.Validation.Samples/FSharp.Data.Validation.Samples.fsproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="[6,)" />
+    <PackageReference Update="FSharp.Core" Version="[6.0.6,)" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/FSharp.Data.Validation.Samples/packages.lock.json b/samples/FSharp.Data.Validation.Samples/packages.lock.json
@@ -4,14 +4,23 @@
     "net8.0": {
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "fbv1UwJ2LXVcFCt+GGDPu0sIYA5C6gdDvAupDj3iLQF3clRkua/6J33f+FiGQa8P1tEa+zmz3wrjoTnXZ1UiYg=="
+        "requested": "[6.0.6, )",
+        "resolved": "6.0.6",
+        "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w=="
+      },
+      "FSharpPlus": {
+        "type": "Transitive",
+        "resolved": "1.4.0",
+        "contentHash": "He6WVVTZpeMQNBlFHniemTSCWITKgwLIgmznNt2kw0U9G/xWSx7USdssGXd2FGmcpk2FlHInYZNwUw848tI0SQ==",
+        "dependencies": {
+          "FSharp.Core": "6.0.6"
+        }
       },
       "fsharp.data.validation": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.0, )"
+          "FSharp.Core": "[6.0.6, )",
+          "FSharpPlus": "[1.4.0, )"
         }
       }
     }

diff --git a/samples/GettingStarted/GettingStarted.fsproj b/samples/GettingStarted/GettingStarted.fsproj
@@ -12,6 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="[6,)" />
+    <PackageReference Update="FSharp.Core" Version="[6.0.6,)" />
   </ItemGroup>
 </Project>
diff --git a/samples/GettingStarted/packages.lock.json b/samples/GettingStarted/packages.lock.json
@@ -4,14 +4,23 @@
     "net8.0": {
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "fbv1UwJ2LXVcFCt+GGDPu0sIYA5C6gdDvAupDj3iLQF3clRkua/6J33f+FiGQa8P1tEa+zmz3wrjoTnXZ1UiYg=="
+        "requested": "[6.0.6, )",
+        "resolved": "6.0.6",
+        "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w=="
+      },
+      "FSharpPlus": {
+        "type": "Transitive",
+        "resolved": "1.4.0",
+        "contentHash": "He6WVVTZpeMQNBlFHniemTSCWITKgwLIgmznNt2kw0U9G/xWSx7USdssGXd2FGmcpk2FlHInYZNwUw848tI0SQ==",
+        "dependencies": {
+          "FSharp.Core": "6.0.6"
+        }
       },
       "fsharp.data.validation": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.0, )"
+          "FSharp.Core": "[6.0.6, )",
+          "FSharpPlus": "[1.4.0, )"
         }
       }
     }

diff --git a/src/FSharp.Data.Validation.Giraffe/FSharp.Data.Validation.Giraffe.fsproj b/src/FSharp.Data.Validation.Giraffe/FSharp.Data.Validation.Giraffe.fsproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="[6.0.1,)" />
+    <PackageReference Update="FSharp.Core" Version="[6.0.6,)" />
     <PackageReference Include="Giraffe" Version="[6,)" />
   </ItemGroup>
 </Project>
diff --git a/src/FSharp.Data.Validation/FSharp.Data.Validation.fsproj b/src/FSharp.Data.Validation/FSharp.Data.Validation.fsproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="NonEmptyList.fs" />
     <Compile Include="Types.fs" />
     <Compile Include="ValueCtx.fs" />
     <Compile Include="Utilities.fs" />
@@ -31,6 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="[6,)" />
+    <PackageReference Update="FSharp.Core" Version="[6.0.6,)" />
+    <PackageReference Include="FSharpPlus" Version="[1.4.0,)" />
   </ItemGroup>
 </Project>
diff --git a/src/FSharp.Data.Validation/NonEmptyList.fs b/src/FSharp.Data.Validation/NonEmptyList.fs
diff --git a/src/FSharp.Data.Validation/Proof.fs b/src/FSharp.Data.Validation/Proof.fs
@@ -5,7 +5,7 @@ open System.Text.Json
 open System.Text.Json.Serialization
 
 [<JsonConverter(typeof<ValidationFailuresConverterFactory>)>]
-type ValidationFailures<'F> = 
+type ValidationFailures<'F> =
     { Failures: 'F list
       Fields: FailureMap<'F> }
 and ValidationFailuresConverter<'F>() =
@@ -23,7 +23,8 @@ and ValidationFailuresConverter<'F>() =
             | 0 -> str
             | 1 -> str.ToLower()
             | _ -> sprintf "%c%s" (Char.ToLowerInvariant(str[0])) (str.Substring(1))
-        override this.Read(reader: byref<Utf8JsonReader>, typ, opts) = base.Read(&reader, typ, opts)
+        override this.Read(reader: byref<Utf8JsonReader>, typ, opts) =
+            JsonSerializer.Deserialize<ValidationFailures<'F>>(&reader, opts)
         override this.Write(writer, fs, opts) =
             writer.WriteStartObject()
 
@@ -70,7 +71,8 @@ and ProofConverter<'F, 'A>() =
             | 0 -> str
             | 1 -> str.ToLower()
             | _ -> sprintf "%c%s" (Char.ToLowerInvariant(str[0])) (str.Substring(1))
-        override this.Read(reader: byref<Utf8JsonReader>, typ, opts) = base.Read(&reader, typ, opts)
+        override this.Read(reader: byref<Utf8JsonReader>, typ, opts) =
+            JsonSerializer.Deserialize<Proof<'F, 'A>>(&reader, opts)
         override this.Write(writer, proof, opts) =
             match proof with
             | Valid a           -> JsonSerializer.Serialize(writer, a, opts)
@@ -109,7 +111,7 @@ module Proof =
             match p2 with
             | Valid _               -> Invalid (gfs, lfs)
             | Invalid (gfs', lfs')  -> Invalid (gfs @ gfs', Utilities.mergeFailures lfs lfs')
-    
+
     let toValidationFailures p =
         match p with
         | Valid a           -> None