From bb4bbbdd38593632eb8a2cff7ae39d6c3f1a4627 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Thu, 6 Nov 2025 08:53:20 -0300
Subject: [PATCH] Fix bugs in parsing

---
 duper/src/parser/mod.rs      | 79 +++++++++++++++++++++++++++++++--
 duper/src/parser/temporal.rs | 85 +++++++++++++++++++++++++-----------
 duper_website/docs/index.md  |  6 +--
 3 files changed, 137 insertions(+), 33 deletions(-)

diff --git a/duper/src/parser/mod.rs b/duper/src/parser/mod.rs
index 1ddd750..5c54ab1 100644
--- a/duper/src/parser/mod.rs
+++ b/duper/src/parser/mod.rs
@@ -757,16 +757,76 @@ mod duper_parser_tests {
             '2022-02-28'
         "#;
         let duper = DuperParser::parse_duper_value(input).unwrap();
-        assert!(matches!(duper.inner, DuperInner::Temporal(_)));
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::Unspecified(_))
+        ));
 
         let input = r#"
             '2022-02-28T11:06:00.092121729+08:00[Asia/Shanghai][u-ca=chinese]'
         "#;
         let duper = DuperParser::parse_duper_value(input).unwrap();
-        assert!(matches!(duper.inner, DuperInner::Temporal(_)));
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::Unspecified(_))
+        ));
+
+        let input = r#"
+            ZonedDateTime('2022-02-28T11:06:00.092121729+08:00[Asia/Shanghai][u-ca=chinese]')
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::ZonedDateTime(_))
+        ));
+
+        let input = r#"
+            '  2022-02-28T03:06:00.092121729Z  '
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::Unspecified(_))
+        ));
+
+        let input = r#"
+            PlainDate('  2022-02-28T03:06:00.092121729Z  ')
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::PlainDate(_))
+        ));
+
+        let input = r#"
+            PlainTime('  2022-02-28T03:06:00.092121729Z  ')
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::PlainTime(_))
+        ));
 
         let input = r#"
-            '2022-02-28T03:06:00.092121729Z'
+            PlainMonthDay('--11-03')
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::PlainMonthDay(_))
+        ));
+
+        let input = r#"
+            UnknownIdent('--11-03')
+        "#;
+        let duper = DuperParser::parse_duper_value(input).unwrap();
+        assert!(matches!(
+            duper.inner,
+            DuperInner::Temporal(DuperTemporal::Unspecified(_))
+        ));
+
+        let input = r#"
+            'PT0.0021S'
         "#;
         let duper = DuperParser::parse_duper_value(input).unwrap();
         assert!(matches!(duper.inner, DuperInner::Temporal(_)));
@@ -837,7 +897,18 @@ mod duper_parser_tests {
         assert!(DuperParser::parse_duper_value(input).is_err());
 
         // Temporal
-        // TO-DO: Temporal - Tests for parsing errors
+        let input = r#"
+            'invalid'
+        "#;
+        assert!(DuperParser::parse_duper_value(input).is_err());
+        let input = r#"
+            '2025-02-29'  // Inexistent date
+        "#;
+        assert!(DuperParser::parse_duper_value(input).is_err());
+        let input = r#"
+            ZonedDateTime('2022-02-28T11:06:00.092121729+08:00[u-ca=chinese]')  // Missing timezone
+        "#;
+        assert!(DuperParser::parse_duper_value(input).is_err());
 
         // Floats and decimal
         let input = r#"
diff --git a/duper/src/parser/temporal.rs b/duper/src/parser/temporal.rs
index 45d31df..015dbba 100644
--- a/duper/src/parser/temporal.rs
+++ b/duper/src/parser/temporal.rs
@@ -321,13 +321,39 @@ pub(crate) fn time<'a>() -> impl Parser<'a, &'a str, (), extra::Err<Rich<'a, cha
     hour()
         .then(
             just(':')
-                .then(minute_or_second())
                 .then(
-                    just(':')
-                        .then(minute_or_second().or(just("60").ignored()))
-                        .then(just('.').then(text::digits(10).at_most(9)).or_not())
-                        .or_not(),
+                    minute_or_second().then(
+                        just(':')
+                            .then(
+                                minute_or_second()
+                                    .or(just("60").ignored())
+                                    .then(just('.').then(text::digits(10).at_most(9)).or_not()),
+                            )
+                            .ignored()
+                            .or(minute_or_second()
+                                .or(just("60").ignored())
+                                .then(just('.').then(text::digits(10).at_most(9)).or_not())
+                                .ignored())
+                            .or_not(),
+                    ),
                 )
+                .ignored()
+                .or(minute_or_second()
+                    .then(
+                        just(':')
+                            .then(
+                                minute_or_second()
+                                    .or(just("60").ignored())
+                                    .then(just('.').then(text::digits(10).at_most(9)).or_not()),
+                            )
+                            .ignored()
+                            .or(minute_or_second()
+                                .or(just("60").ignored())
+                                .then(just('.').then(text::digits(10).at_most(9)).or_not())
+                                .ignored())
+                            .or_not(),
+                    )
+                    .ignored())
                 .or_not(),
         )
         .ignored()
@@ -350,12 +376,11 @@ pub(crate) fn month_day<'a>() -> impl Parser<'a, &'a str, (), extra::Err<Rich<'a
     choice((
         just("--").ignored(),
         text::digits(10)
-            .repeated()
             .exactly(4)
             .then(just('-').or_not())
             .ignored(),
         one_of("+-")
-            .then(text::digits(10).repeated().exactly(6))
+            .then(text::digits(10).exactly(6))
             .then(just('-').or_not())
             .ignored(),
     ))
@@ -370,34 +395,41 @@ pub(crate) fn month_day<'a>() -> impl Parser<'a, &'a str, (), extra::Err<Rich<'a
             just("10"),
             just("12"),
         ))
-        .then(just('-').or_not())
-        .then(days_31)
+        .then(just('-').ignore_then(days_31.clone()).or(days_31))
+        .ignored()
         .or(choice((just("04"), just("06"), just("09"), just("11")))
-            .then(just('-').or_not())
-            .then(days_30))
-        .or(just("02").then(just('-').or_not()).then(days_29))
-        .ignored(),
+            .then(just('-').ignore_then(days_30.clone()).or(days_30))
+            .ignored())
+        .or(just("02")
+            .then(just('-').ignore_then(days_29.clone()).or(days_29))
+            .ignored()),
     )
 }
 
 pub(crate) fn year_month<'a>()
 -> impl Parser<'a, &'a str, (u32, u32), extra::Err<Rich<'a, char>>> + Clone {
     choice((
-        text::digits(10).repeated().exactly(4).to_slice(),
-        one_of("+-")
-            .then(text::digits(10).repeated().exactly(6))
-            .to_slice(),
+        text::digits(10).exactly(4).to_slice(),
+        one_of("+-").then(text::digits(10).exactly(6)).to_slice(),
     ))
     .from_str::<u32>()
     .unwrapped()
-    .then_ignore(just('-').or_not())
     .then(
-        just('0')
-            .then(one_of('0'..='9'))
-            .to_slice()
-            .or(just('1').then(one_of('0'..='2')).to_slice())
-            .from_str::<u32>()
-            .unwrapped(),
+        just('-')
+            .ignore_then(
+                just('0')
+                    .then(one_of('0'..='9'))
+                    .to_slice()
+                    .or(just('1').then(one_of('0'..='2')).to_slice())
+                    .from_str::<u32>()
+                    .unwrapped(),
+            )
+            .or(just('0')
+                .then(one_of('0'..='9'))
+                .to_slice()
+                .or(just('1').then(one_of('0'..='2')).to_slice())
+                .from_str::<u32>()
+                .unwrapped()),
     )
 }
 
@@ -426,8 +458,9 @@ pub(crate) fn date<'a>() -> impl Parser<'a, &'a str, (), extra::Err<Rich<'a, cha
     ));
 
     year_month()
-        .then_ignore(just('-').or_not())
-        .ignore_with_ctx(day)
+        .then_ignore(just('-'))
+        .ignore_with_ctx(day.clone())
+        .or(year_month().ignore_with_ctx(day))
 }
 
 pub(crate) fn date_time<'a>() -> impl Parser<'a, &'a str, (), extra::Err<Rich<'a, char>>> + Clone {
diff --git a/duper_website/docs/index.md b/duper_website/docs/index.md
index c3c845c..5d7a6e8 100644
--- a/duper_website/docs/index.md
+++ b/duper_website/docs/index.md
@@ -79,11 +79,11 @@ Duper excels in a variety of use cases:
 | Raw strings      | ✅                | ❌   | ❌    | ✅                | ✅                | ✅  |
 | Identifiers/tags | ✅                | ❌   | ❌    | ✅                | ❌                | ✅  |
 | Unambiguous      | ✅                | ✅   | ✅    | ❌<sup>\[3]</sup> | ⚠️<sup>\[4]</sup> | ✅  |
-| Simple           | ✅                | ✅   | ✅    | ❌                | ✅                | ✅  |
+| Simple           | ⚠️<sup>\[2]</sup> | ✅   | ✅    | ❌                | ✅                | ✅  |
 | JSON-compatible  | ✅                | ✅   | ✅    | ✅                | ❌                | ❌  |
 | Popular          | ❌                | ✅   | ⚠️    | ✅                | ✅                | ⚠️  |
 
 - <sup>[1]</sup> Using the [`!!binary` scalar type](https://yaml.org/type/binary.html) and base64 text; limited support in implementations.
-- <sup>[2]</sup> Compliant with the [Temporal specification](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal).
-- <sup>[3]</sup> Unquoted strings can get confused with other scalars and [vice-versa](https://www.bram.us/2022/01/11/yaml-the-norway-problem/).
+- <sup>[2]</sup> Fully compliant with the [Temporal specification](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal).
+- <sup>[3]</sup> Unquoted strings can get [confused with other scalars](https://www.bram.us/2022/01/11/yaml-the-norway-problem/) and vice-versa.
 - <sup>[4]</sup> Tabs allowed in [strings](https://toml.io/en/v1.0.0#string).
-- 
2.51.2