Merge pull request #8 from TypedUseCase/feature/update-dependencies

Update domain resolver

Author: MortalFlesh

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 <!-- There is always Unreleased section on the top. Subsections (Add, Changed, Fix, Removed) should be Add as needed. -->
 ## Unreleased
+- Update dependencies
 
 ## 4.1.0 - 2021-08-12
 - Update dependencies

paket.dependencies

@@ -5,7 +5,7 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core ~> 5.0
 nuget FSharp.Data ~> 4.1
 nuget MF.ConsoleApplication ~> 2.0
-nuget Tuc.DomainResolver ~> 2.1
+nuget Tuc.DomainResolver ~> 3.0
 
 nuget Expecto
 nuget YoloDev.Expecto.TestSdk

paket.lock

@@ -583,12 +583,12 @@ NUGET
       System.Runtime.Handles (>= 4.3)
     System.Windows.Extensions (5.0)
       System.Drawing.Common (>= 5.0)
-    Tuc.DomainResolver (2.1)
+    Tuc.DomainResolver (3.0.1)
       FSharp.Compiler.Service (>= 40.0)
       FSharp.Core (>= 5.0.2)
       FSharp.Data (>= 4.2.2)
       MF.ConsoleApplication (>= 2.0)
-    YoloDev.Expecto.TestSdk (0.12.5)
+    YoloDev.Expecto.TestSdk (0.12.6)
       Expecto (>= 9.0 < 10.0)
       FSharp.Core (>= 4.6)
       System.Collections.Immutable (>= 1.5 < 5.1)
@@ -769,21 +769,21 @@ NUGET
       Microsoft.Build.Tasks.Core (>= 16.4) - restriction: >= netstandard2.0
       Microsoft.Build.Utilities.Core (>= 16.4) - restriction: >= netstandard2.0
     Newtonsoft.Json (13.0.1) - restriction: >= netstandard2.0
-    NuGet.Common (5.10) - restriction: >= netstandard2.0
-      NuGet.Frameworks (>= 5.10) - restriction: || (>= net45) (>= netstandard2.0)
-    NuGet.Configuration (5.10) - restriction: >= netstandard2.0
-      NuGet.Common (>= 5.10) - restriction: || (>= net45) (>= netstandard2.0)
+    NuGet.Common (5.11) - restriction: >= netstandard2.0
+      NuGet.Frameworks (>= 5.11) - restriction: || (>= net45) (>= netstandard2.0)
+    NuGet.Configuration (5.11) - restriction: >= netstandard2.0
+      NuGet.Common (>= 5.11) - restriction: || (>= net45) (>= netstandard2.0)
       System.Security.Cryptography.ProtectedData (>= 4.4) - restriction: && (< net45) (>= netstandard2.0)
-    NuGet.Frameworks (5.10) - restriction: >= netstandard2.0
-    NuGet.Packaging (5.10) - restriction: >= netstandard2.0
+    NuGet.Frameworks (5.11) - restriction: >= netstandard2.0
+    NuGet.Packaging (5.11) - restriction: >= netstandard2.0
       Newtonsoft.Json (>= 9.0.1) - restriction: >= netstandard2.0
-      NuGet.Configuration (>= 5.10) - restriction: >= netstandard2.0
-      NuGet.Versioning (>= 5.10) - restriction: >= netstandard2.0
+      NuGet.Configuration (>= 5.11) - restriction: >= netstandard2.0
+      NuGet.Versioning (>= 5.11) - restriction: >= netstandard2.0
       System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (< net472) (>= netstandard2.0)) (>= net50)
       System.Security.Cryptography.Pkcs (>= 5.0) - restriction: || (&& (< net472) (>= netstandard2.0)) (>= net50)
-    NuGet.Protocol (5.10) - restriction: >= netstandard2.0
-      NuGet.Packaging (>= 5.10) - restriction: >= netstandard2.0
-    NuGet.Versioning (5.10) - restriction: >= netstandard2.0
+    NuGet.Protocol (5.11) - restriction: >= netstandard2.0
+      NuGet.Packaging (>= 5.11) - restriction: >= netstandard2.0
+    NuGet.Versioning (5.11) - restriction: >= netstandard2.0
     System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= net50) (< netcoreapp2.0)) (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= net50) (< netcoreapp2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= net50)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= net461) (>= net50)) (&& (>= net461) (>= netstandard2.0)) (>= net472) (&& (>= net50) (< netstandard2.0) (>= xamarintvos)) (&& (>= net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= xamarintvos)) (&& (>= netstandard2.0) (>= xamarinwatchos)) (>= xamarinios) (>= xamarinmac)
     System.CodeDom (5.0) - restriction: && (< net472) (>= netstandard2.0)
     System.Collections.Immutable (5.0) - restriction: >= netstandard2.0

src/ErrorHandling/Result.fs

@@ -473,7 +473,7 @@ module internal AsyncResult =
 /// The `asyncResult` computation expression is available globally without qualification
 /// See https://github.com/cmeeren/Cvdm.ErrorHandling/blob/master/src/Cvdm.ErrorHandling/AsyncResultBuilder.fs
 [<AutoOpen>]
-module AsyncResultComputationExpression =
+module internal AsyncResultComputationExpression =
     type AsyncResultBuilder() =
         member __.Return (value: 'Success): AsyncResult<'Success, 'Error> =
             async.Return <| result.Return value

src/Tuc/Parser/Parser.fs

@@ -17,7 +17,7 @@ module Parser =
             Lines: Line list
         }
 
-        type private ParseLines<'TucItem> = MF.ConsoleApplication.Output -> IndentationLevel -> Line list -> Result<ParseResult<'TucItem>, ParseError list>
+        type private ParseLines<'TucItem> = MF.ConsoleApplication.Output -> IndentationLevel -> Line list -> Result<ParseResult<'TucItem>, Tuc.ParseError list>
 
         [<RequireQualifiedAccess>]
         module private KeyWords =
@@ -97,7 +97,7 @@ module Parser =
 
         [<RequireQualifiedAccess>]
         module private Participants =
-            type private ParseParticipants = MF.ConsoleApplication.Output -> DomainTypes -> IndentationLevel -> Line list -> Result<ParsedParticipant list, ParseError list>
+            type private ParseParticipants = MF.ConsoleApplication.Output -> DomainTypes -> IndentationLevel -> Line list -> Result<ParsedParticipant list, Tuc.ParseError list>
 
             [<RequireQualifiedAccess>]
             module private Participants =
@@ -334,7 +334,7 @@ module Parser =
                     | error -> error
                 )
 
-            let private parseParticipant location (domainTypes: DomainTypes) indentationLevel lines line: Result<ParsedParticipant * Line list, ParseError list> =
+            let private parseParticipant location (domainTypes: DomainTypes) indentationLevel lines line: Result<ParsedParticipant * Line list, Tuc.ParseError list> =
                 let participantIndentation = indentationLevel |> IndentationLevel.indentation
 
                 match line with
@@ -475,7 +475,7 @@ module Parser =
         [<RequireQualifiedAccess>]
         module private Parts =
             type private Participants = Participants of Map<string, ActiveParticipant>
-            type private ParseParts = MF.ConsoleApplication.Output -> ParsedTucName -> Participants -> DomainTypes -> IndentationLevel -> Line list -> Result<ParsedTucPart list, ParseError>
+            type private ParseParts = MF.ConsoleApplication.Output -> ParsedTucName -> Participants -> DomainTypes -> IndentationLevel -> Line list -> Result<ParsedTucPart list, Tuc.ParseError>
 
             let private (|IsParticipant|_|) (Participants participants) token =
                 participants |> Map.tryFind token
@@ -1324,7 +1324,7 @@ module Parser =
                     | [] -> Ok ()
                     | wrongLines -> Error <| WrongIndentationLevel (indentationLevel, wrongLines |> List.map RawLine.valuei)
 
-        let rec parseLines (output: MF.ConsoleApplication.Output) location domainTypes indentationLevel (tucAcc: Result<ParsedTuc, ParseError list> list) = function
+        let rec parseLines (output: MF.ConsoleApplication.Output) location domainTypes indentationLevel (tucAcc: Result<ParsedTuc, Tuc.ParseError list> list) = function
             | [] ->
                 match tucAcc with
                 | [] -> Error [ MissingTucName ]

tests/Tuc/ParserTest.fs

@@ -42,7 +42,7 @@ module Common =
     type Case = {
         Description: string
         Tuc: string
-        Expected: Result<ParsedTuc list, ParseError list>
+        Expected: Result<ParsedTuc list, Tuc.ParseError list>
     }
 
     let case path description tuc expected =
@@ -70,20 +70,21 @@ module Common =
         | Ok _, Error error -> failtestf "%s - Success was expected, but it results in error.\n%A" description error
 
 module Domain =
-    open Tuc.Domain
     open ErrorHandling
 
     let private parseDomain output domain =
         result {
             let! resolvedTypes =
                 domain
                 |> Parser.parse output
-                |> List.singleton
-                |> Resolver.resolve output
+                |> Resolver.resolveOneAsync output
+                |> Async.RunSynchronously
+                |> Result.mapError (function
+                    | AsyncResolveError.UnresolvedTypes types -> types
+                    | _ -> []
+                )
 
-            return!
-                resolvedTypes
-                |> Checker.check output
+            return! resolvedTypes |> Checker.check output
         }
         |> orFail (List.map TypeName.value >> String.concat "\n  - " >> sprintf "Unresolved types:\n%s")