Parse empty payee/narration as None (#34)

tesujimath · web-flow · commit a4bcb9844466 · 2025-10-06T14:55:32.000+13:00
Fixes #33
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "beancount-parser-lima"
-version = "0.11.1"
+version = "0.11.2"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A zero-copy parser for Beancount"
diff --git a/src/parsers.rs b/src/parsers.rs
@@ -219,12 +219,31 @@ where
             // a single string is narration
             (Some(s1), None) => (None, Some(s1)),
             (s1, s2) => (s1, s2),
+        })
+        .map(|(payee, narration)| {
+            (
+                replace_some_empty_with_none(payee),
+                replace_some_empty_with_none(narration),
+            )
         }),
         tags_links(),
     ))
     .then_ignore(just(Token::Eol))
 }
 
+fn replace_some_empty_with_none(s: Option<Spanned<&str>>) -> Option<Spanned<&str>> {
+    match s {
+        Some(maybe_empty) => {
+            if maybe_empty.is_empty() {
+                None
+            } else {
+                s
+            }
+        }
+        None => None,
+    }
+}
+
 /// Matches a price directive, including metadata, over several lines.
 pub(crate) fn price<'s, I>() -> impl Parser<'s, I, Directive<'s>, Extra<'s>>
 where
diff --git a/test-cases/Balance.TotalCost.txtpb b/test-cases/Balance.TotalCost.txtpb
@@ -2,8 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
@@ -23,8 +21,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/Balance.TotalPrice.txtpb b/test-cases/Balance.TotalPrice.txtpb
@@ -2,8 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/MetaData.MetadataDataTypes.txtpb b/test-cases/MetaData.MetadataDataTypes.txtpb
@@ -12,8 +12,6 @@ directives {
     kv { key: "boolf" value { boolean: false } }
   }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
   }
 }
diff --git a/test-cases/MetaData.MetadataKeySyntax.txtpb b/test-cases/MetaData.MetadataKeySyntax.txtpb
@@ -7,8 +7,6 @@ directives {
     kv { key: "name_on_card" value { text: "John" } }
   }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
   }
 }
diff --git a/test-cases/MetaData.MetadataTransactionBegin.txtpb b/test-cases/MetaData.MetadataTransactionBegin.txtpb
@@ -4,8 +4,6 @@ directives {
     kv { key: "test" value { text: "Something" } }
   }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/MetaData.MetadataTransactionEnd.txtpb b/test-cases/MetaData.MetadataTransactionEnd.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/MetaData.MetadataTransactionIndented.txtpb b/test-cases/MetaData.MetadataTransactionIndented.txtpb
@@ -6,8 +6,6 @@ directives {
     kv { key: "test1" value { text: "Something" } }
   }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/MetaData.MetadataTransactionMany.txtpb b/test-cases/MetaData.MetadataTransactionMany.txtpb
@@ -4,8 +4,6 @@ directives {
     kv { key: "test1" value { text: "Something" } }
   }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       meta {
diff --git a/test-cases/MetaData.MetadataTransactionMiddle.txtpb b/test-cases/MetaData.MetadataTransactionMiddle.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       meta {
diff --git a/test-cases/TotalsAndSigns.CostNegative.txtpb b/test-cases/TotalsAndSigns.CostNegative.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/TotalsAndSigns.PriceNegative.txtpb b/test-cases/TotalsAndSigns.PriceNegative.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalCost.txtpb b/test-cases/TotalsAndSigns.TotalCost.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
@@ -20,7 +19,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
@@ -43,7 +41,6 @@ directives {
   date { year: 2013 month: 6 day: 1 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalCostInvalid.txtpb b/test-cases/TotalsAndSigns.TotalCostInvalid.txtpb
@@ -2,8 +2,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/TotalsAndSigns.TotalCostNegative.txtpb b/test-cases/TotalsAndSigns.TotalCostNegative.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalPriceInverted.txtpb b/test-cases/TotalsAndSigns.TotalPriceInverted.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalPriceNegative.txtpb b/test-cases/TotalsAndSigns.TotalPriceNegative.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalPricePositive.txtpb b/test-cases/TotalsAndSigns.TotalPricePositive.txtpb
@@ -2,7 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    narration: ""
     postings {
       account: "Assets:Investments:MSFT"
       spec {
diff --git a/test-cases/TotalsAndSigns.TotalPriceWithMissing.txtpb b/test-cases/TotalsAndSigns.TotalPriceWithMissing.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/TotalsAndSigns.TotalPriceWithMissing2.txtpb b/test-cases/TotalsAndSigns.TotalPriceWithMissing2.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/TotalsAndSigns.ZeroAmount.txtpb b/test-cases/TotalsAndSigns.ZeroAmount.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/TotalsAndSigns.ZeroCost.txtpb b/test-cases/TotalsAndSigns.ZeroCost.txtpb
@@ -1,8 +1,6 @@
 directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     flag: "*"
     postings {
       account: "Assets:Investments:MSFT"
diff --git a/test-cases/Transactions.EmptyNarration.txtpb b/test-cases/Transactions.EmptyNarration.txtpb
@@ -2,8 +2,6 @@ directives {
   date { year: 2013 month: 5 day: 18 }
   transaction {
     flag: "*"
-    # ANOMALY: Lima distinguishes empty string from no string
-    narration: ""
     postings {
       account: "Expenses:Restaurant"
       spec { units { number { exact: "100" } currency: "USD" } }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ directives {`
`12`	`12`	`kv { key: "boolf" value { boolean: false } }`
`13`	`13`	`}`
`14`	`14`	`transaction {`
`15`		`- # ANOMALY: Lima distinguishes empty string from no string`
`16`		`- narration: ""`
`17`	`15`	`flag: "*"`
`18`	`16`	`}`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ directives {`
`7`	`7`	`kv { key: "name_on_card" value { text: "John" } }`
`8`	`8`	`}`
`9`	`9`	`transaction {`
`10`		`- # ANOMALY: Lima distinguishes empty string from no string`
`11`		`- narration: ""`
`12`	`10`	`flag: "*"`
`13`	`11`	`}`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ directives {`
`4`	`4`	`kv { key: "test" value { text: "Something" } }`
`5`	`5`	`}`
`6`	`6`	`transaction {`
`7`		`- # ANOMALY: Lima distinguishes empty string from no string`
`8`		`- narration: ""`
`9`	`7`	`flag: "*"`
`10`	`8`	`postings {`
`11`	`9`	`account: "Assets:Investments:MSFT"`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ directives {`
`6`	`6`	`kv { key: "test1" value { text: "Something" } }`
`7`	`7`	`}`
`8`	`8`	`transaction {`
`9`		`- # ANOMALY: Lima distinguishes empty string from no string`
`10`		`- narration: ""`
`11`	`9`	`flag: "*"`
`12`	`10`	`postings {`
`13`	`11`	`account: "Assets:Investments:MSFT"`