Restore the old API and add the missing combinators

Cargo.toml

@@ -1,12 +1,16 @@
 [package]
 name = "parse_datetime"
-description = " parsing human-readable relative time strings and converting them to a Duration"
-version = "0.4.0"
+description = "parsing human-readable relative time strings and converting them to a Duration"
+version = "0.7.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/uutils/parse_datetime"
 readme = "README.md"
 
 [dependencies]
 chrono = { version="0.4", default-features=false, features=["std", "alloc", "clock"] }
+num-traits = "0.2.19"
 winnow = "0.5.34"
+
+[dev-dependencies]
+anyhow = "1.0.86"

src/items/combined.rs

@@ -14,8 +14,11 @@
 //! > ISO 8601 fractional minutes and hours are not supported. Typically, hosts
 //! > support nanosecond timestamp resolution; excess precision is silently discarded.
 
+use winnow::ascii::dec_uint;
+use winnow::token::take;
 use winnow::{combinator::alt, seq, PResult, Parser};
 
+use crate::items::combined;
 use crate::items::space;
 
 use super::{
@@ -24,13 +27,17 @@ use super::{
     time::{self, Time},
 };
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Debug, Clone, Default)]
 pub struct DateTime {
-    date: Date,
-    time: Time,
+    pub(crate) date: Date,
+    pub(crate) time: Time,
 }
 
 pub fn parse(input: &mut &str) -> PResult<DateTime> {
+    alt((parse_basic, parse_8digits)).parse_next(input)
+}
+
+fn parse_basic(input: &mut &str) -> PResult<DateTime> {
     seq!(DateTime {
         date: date::iso,
         // Note: the `T` is lowercased by the main parse function
@@ -40,6 +47,31 @@ pub fn parse(input: &mut &str) -> PResult<DateTime> {
     .parse_next(input)
 }
 
+fn parse_8digits(input: &mut &str) -> PResult<DateTime> {
+    s((
+        take(2usize).and_then(dec_uint),
+        take(2usize).and_then(dec_uint),
+        take(2usize).and_then(dec_uint),
+        take(2usize).and_then(dec_uint),
+    ))
+    .map(
+        |(hour, minute, day, month): (u32, u32, u32, u32)| combined::DateTime {
+            date: date::Date {
+                day,
+                month,
+                year: None,
+            },
+            time: time::Time {
+                hour,
+                minute,
+                second: 0.0,
+                offset: None,
+            },
+        },
+    )
+    .parse_next(input)
+}
+
 #[cfg(test)]
 mod tests {
     use super::{parse, DateTime};

src/items/date.rs

@@ -37,7 +37,7 @@ use winnow::{
 use super::s;
 use crate::ParseDateTimeError;
 
-#[derive(PartialEq, Eq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug, Default)]
 pub struct Date {
     pub day: u32,
     pub month: u32,
@@ -96,7 +96,7 @@ fn literal2(input: &mut &str) -> PResult<Date> {
     .parse_next(input)
 }
 
-fn year(input: &mut &str) -> PResult<u32> {
+pub fn year(input: &mut &str) -> PResult<u32> {
     s(alt((
         take(4usize).try_map(|x: &str| x.parse()),
         take(3usize).try_map(|x: &str| x.parse()),
@@ -116,7 +116,8 @@ fn year(input: &mut &str) -> PResult<u32> {
 fn month(input: &mut &str) -> PResult<u32> {
     s(dec_uint)
         .try_map(|x| {
-            (x >= 1 && x <= 12)
+            (1..=12)
+                .contains(&x)
                 .then_some(x)
                 .ok_or(ParseDateTimeError::InvalidInput)
         })
@@ -126,7 +127,8 @@ fn month(input: &mut &str) -> PResult<u32> {
 fn day(input: &mut &str) -> PResult<u32> {
     s(dec_uint)
         .try_map(|x| {
-            (x >= 1 && x <= 31)
+            (1..=31)
+                .contains(&x)
                 .then_some(x)
                 .ok_or(ParseDateTimeError::InvalidInput)
         })