feat(core): add variable for default account to use in filters (#42)

janssen-io · Feb 16, 2025 · 9f5e85b · 9f5e85b
1 parent 6e14ac3
commit 9f5e85b
Show file tree

Hide file tree

Showing 34 changed files with 227 additions and 145 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -38,9 +38,9 @@ jobs:
       - name: Build
         run: >
             dotnet run
-            --project ./src/TransactionQL.Build/TransactionQL.Build.fsproj
-            -e parallel-jobs=4
-            -e VERSION=${{ steps.version.outputs.VERSION }}
+            --project "./src/TransactionQL.Build/TransactionQL.Build.fsproj"
+            -e VERSION="${{ steps.version.outputs.VERSION }}"
+            --parallel 4
 
       - name: Publish
         uses: softprops/action-gh-release@v1

diff --git a/build.ps1 b/build.ps1
@@ -1 +1 @@
-dotnet run --project .\src\TransactionQL.Build\TransactionQL.Build.fsproj -t Complete
+dotnet run --project .\src\TransactionQL.Build\TransactionQL.Build.fsproj -t Complete --parallel 4
diff --git a/src/TransactionQL.Application/API.fs b/src/TransactionQL.Application/API.fs
@@ -4,8 +4,6 @@ open System
 open TransactionQL.Input.Converters
 open TransactionQL.Parser.Interpretation
 
-
-
 module API =
     open FParsec
     open TransactionQL.Input
@@ -26,10 +24,11 @@ module API =
         | Some reader -> Left reader
         | None -> Right $"Unable to load plugin from directory %s{pluginDirectory}"
 
-    let filter (reader: IConverter) (queries: Query array) rows =
+    let filter (reader: IConverter) (queries: Query array) (variables: Map<string, string>) rows =
         rows
         |> Seq.map (fun row ->
             { Variables = Map.empty
+              EnvVars = variables
               Row = row
               DateFormat = reader.DateFormat })
         |> Seq.map (fun env -> QLInterpreter.evalProgram env (List.ofArray queries))
@@ -45,7 +44,7 @@ module API =
         let lines =
             trx
             |> Array.map (fun (account, (currency: string), (amount: Nullable<decimal>)) ->
-                let acc = Account(account :: [])
+                let acc = (account :: [])
 
                 match (String.IsNullOrEmpty currency, Option.ofNullable amount) with
                 | true, _
@@ -55,7 +54,7 @@ module API =
                       Tag = None }
                 | _, Some a ->
                     { Account = acc
-                      Amount = Some(Commodity currency, float a)
+                      Amount = Some(currency, float a)
                       Tag = None })
             |> List.ofArray
 

diff --git a/src/TransactionQL.Application/Formatter.fs b/src/TransactionQL.Application/Formatter.fs
@@ -25,7 +25,7 @@ module Formatter =
     let sprintLine
         format
         floatWidth
-        ({ Account = Account accountParts
+        ({ Account = accountParts
            Amount = amount
            Tag = tag }: Line)
         =
@@ -34,7 +34,7 @@ module Formatter =
 
         let line =
             match amount with
-            | Some(Commodity commodity, sum) ->
+            | Some(commodity, sum) ->
                 // Accounts and commodities must be separated by atleast two spaces
                 sprintf "%s  %*s %*.*f" account numOfSpaces commodity floatWidth format.Precision sum
             | None -> account
@@ -54,7 +54,7 @@ module Formatter =
             lines
             |> List.map (fun ({ Amount = amount }: Line) ->
                 match amount with
-                | Some(Commodity _, number) -> (sprintf "%.*f" format.Precision number).Length
+                | Some(_, number) -> (sprintf "%.*f" format.Precision number).Length
                 | None -> 0)
             |> List.max
 

diff --git a/src/TransactionQL.Application/TransactionQL.Application.fsproj b/src/TransactionQL.Application/TransactionQL.Application.fsproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="9.0.101" />
+    <PackageReference Update="FSharp.Core" Version="9.0.201" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TransactionQL.Build/TransactionQL.Build.fsproj b/src/TransactionQL.Build/TransactionQL.Build.fsproj
@@ -16,11 +16,11 @@
     <PackageReference Include="Fake.DotNet.Cli" Version="6.1.3" />
     <PackageReference Include="Fake.Installer.InnoSetup" Version="6.1.3" />
     <PackageReference Include="Fake.IO.Zip" Version="6.1.3" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.386" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.441" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="9.0.101" />
+    <PackageReference Update="FSharp.Core" Version="9.0.201" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TransactionQL.Console.Tests/FormatterTests.fs b/src/TransactionQL.Console.Tests/FormatterTests.fs
@@ -41,7 +41,7 @@ let ``Header: ends with the payee`` () =
 
 [<Fact>]
 let ``Line: is indented`` () =
-    let line = line (Account [ "A"; "B" ], None, None)
+    let line = line ([ "A"; "B" ], None, None)
 
     let result =
         Formatter.sprintLine
@@ -55,7 +55,7 @@ let ``Line: is indented`` () =
 
 [<Fact>]
 let ``Line: concatenates accounts with colon`` () =
-    let line = line (Account [ "A"; "B" ], None, None)
+    let line = line ([ "A"; "B" ], None, None)
 
     let result =
         Formatter.sprintLine
@@ -69,7 +69,7 @@ let ``Line: concatenates accounts with colon`` () =
 
 [<Fact>]
 let ``Line: separates accounts and commodity with at least two spaces`` () =
-    let line = line (Account [ "A"; "B" ], Some(Commodity "$", 25.00), None)
+    let line = line ([ "A"; "B" ], Some("$", 25.00), None)
 
     let result =
         Formatter.sprintLine
@@ -95,7 +95,7 @@ let ``Line: prints the float with the given precision`` () =
           Comment = "# " }
 
     let amount = 25.12345678
-    let line = line (Account [ "A"; "B" ], Some(Commodity "€", amount), None)
+    let line = line ([ "A"; "B" ], Some("€", amount), None)
     let result = Formatter.sprintLine format 0 line
     Assert.EndsWith("25.123", result)
 
@@ -107,7 +107,7 @@ let ``Line: Adds tags (if any) after two spaces`` () =
           Comment = "; " }
 
     let amount = 25.12345678
-    let line = line (Account [ "A"; "B" ], Some(Commodity "€", amount), Some "My: Tag")
+    let line = line ([ "A"; "B" ], Some("€", amount), Some "My: Tag")
     let result = Formatter.sprintLine format 0 line
     Assert.EndsWith("  ; My: Tag", result)
 
@@ -116,8 +116,8 @@ let ``Posting: prints header and lines on separate lines`` () =
     let posting =
         { Header = Header(new DateTime(2019, 1, 1), "Payee")
           Lines =
-            [ line (Account [ "A"; "B" ], Some(Commodity "€", 10.00), None)
-              line (Account [ "C"; "D" ], None, None) ]
+            [ line ([ "A"; "B" ], Some("€", 10.00), None)
+              line ([ "C"; "D" ], None, None) ]
           Comments = [] }
 
     let result =
@@ -137,8 +137,8 @@ let ``Posting: aligns amounts to the right`` () =
     let posting =
         { Header = Header(new DateTime(2019, 1, 1), "Payee")
           Lines =
-            [ line (Account [ "Assets"; "Checking" ], Some(Commodity "€", 10.), None)
-              line (Account [ "Expenses"; "Vacation" ], Some(Commodity "$", -1000.), None) ]
+            [ line ([ "Assets"; "Checking" ], Some("€", 10.), None)
+              line ([ "Expenses"; "Vacation" ], Some("$", -1000.), None) ]
           Comments = [] }
 
     let result =
@@ -160,8 +160,8 @@ let ``Missing posting: adds comment before each line`` () =
     let posting =
         { Header = Header(new DateTime(2019, 1, 1), "Payee")
           Lines =
-            [ line (Account [ "A"; "B" ], Some(Commodity "€", 10.00), None)
-              line (Account [ "C"; "D" ], None, None) ]
+            [ line ([ "A"; "B" ], Some("€", 10.00), None)
+              line ([ "C"; "D" ], None, None) ]
           Comments = [] }
 
     let format: Format =
@@ -178,8 +178,8 @@ let ``Comments: comments are added between the header and transactions`` () =
     let posting =
         { Header = Header(new DateTime(2019, 1, 1), "Payee")
           Lines =
-            [ line (Account [ "A"; "B" ], Some(Commodity "€", 10.00), None)
-              line (Account [ "C"; "D" ], None, None) ]
+            [ line ([ "A"; "B" ], Some("€", 10.00), None)
+              line ([ "C"; "D" ], None, None) ]
           Comments = [ "Two lines"; "Of comments" ] }
 
     let format: Format =

diff --git a/src/TransactionQL.Console.Tests/TransactionQL.Console.Tests.fsproj b/src/TransactionQL.Console.Tests/TransactionQL.Console.Tests.fsproj
@@ -12,9 +12,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -30,7 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="FSharp.Core" Version="9.0.100" />
+      <PackageReference Update="FSharp.Core" Version="9.0.201" />
     </ItemGroup>
 
 </Project>
diff --git a/src/TransactionQL.Console/Program.fs b/src/TransactionQL.Console/Program.fs
@@ -106,6 +106,7 @@ module Program =
         |> options.Reader.Read
         |> Seq.map (fun row ->
             { Variables = Map.empty
+              EnvVars = Map.empty
               Row = row
               DateFormat = options.Reader.DateFormat })
         |> Seq.map (fun env -> QLInterpreter.evalProgram env parsedFilters)

diff --git a/src/TransactionQL.Console/TransactionQL.Console.fsproj b/src/TransactionQL.Console/TransactionQL.Console.fsproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="9.0.101" />
+    <PackageReference Update="FSharp.Core" Version="9.0.201" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TransactionQL.DesktopApp.Tests/TransactionQL.DesktopApp.Tests.csproj b/src/TransactionQL.DesktopApp.Tests/TransactionQL.DesktopApp.Tests.csproj
@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
-    <PackageReference Include="FSharp.Core" Version="9.0.101" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.4" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
+    <PackageReference Include="FSharp.Core" Version="9.0.201" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dotnet run --project .\src\TransactionQL.Build\TransactionQL.Build.fsproj -t Complete
		dotnet run --project .\src\TransactionQL.Build\TransactionQL.Build.fsproj -t Complete --parallel 4