Merge pull request #244 from cakebaker/bump_version_to_0_13_2

chore: bump version to `0.13.2`
chore: bump version to 0.13.2
2026-06-10 16:13:15 -07:00 · 2025-11-09 18:27:31 +01:00 · 2025-11-09 17:49:27 +01:00 · 2025-11-09 15:03:15 +01:00 · 2025-11-07 17:39:07 +01:00 · 2025-11-07 15:41:39 +00:00
26 changed files with 3671 additions and 1820 deletions
@@ -14,7 +14,7 @@ jobs:
      matrix:
        os: [ubuntu-latest, macOS-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: dtolnay/rust-toolchain@stable
      - run: cargo check

@@ -25,7 +25,7 @@ jobs:
      matrix:
        os: [ubuntu-latest, macOS-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: dtolnay/rust-toolchain@stable
      - run: cargo test

@@ -33,7 +33,7 @@ jobs:
    name: cargo fmt --all -- --check
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: dtolnay/rust-toolchain@stable
      - run: rustup component add rustfmt
      - run: cargo fmt --all -- --check
@@ -45,7 +45,7 @@ jobs:
      matrix:
        os: [ubuntu-latest, macOS-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: dtolnay/rust-toolchain@stable
      - run: rustup component add clippy
      - run: cargo clippy --all-targets -- -D warnings
@@ -57,7 +57,7 @@ jobs:
      matrix:
        os: [ubuntu-latest, macOS-latest, windows-latest]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: dtolnay/rust-toolchain@stable
        with:
          toolchain: ${{ env.RUST_MIN_SRV }}
@@ -74,7 +74,7 @@ jobs:
          - { os: macos-latest   , features: macos }
          - { os: windows-latest , features: windows }
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - name: Initialize workflow variables
      id: vars
      shell: bash
@@ -152,7 +152,7 @@ jobs:
    env:
      RUN_FOR: 60
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
    - uses: dtolnay/rust-toolchain@nightly
    - name: Install `cargo-fuzz`
      run: cargo install cargo-fuzz
@@ -1,7 +1,7 @@
 [package]
 name = "parse_datetime"
 description = "parsing human-readable time strings and converting them to a DateTime"
-version = "0.10.0"
+version = "0.13.2"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/uutils/parse_datetime"
@@ -9,7 +9,9 @@ readme = "README.md"
 rust-version = "1.71.1"

 [dependencies]
-regex = "1.10.4"
-chrono = { version="0.4.38", default-features=false, features=["std", "alloc", "clock"] }
 winnow = "0.7.10"
 num-traits = "0.2.19"
+jiff = { version = "0.2.15", default-features = false, features = ["tz-system", "tzdb-bundle-platform", "tzdb-zoneinfo"] }
+
+[dev-dependencies]
+rstest = "0.26"
@@ -4,15 +4,15 @@
 [![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/uutils/parse_datetime/blob/main/LICENSE)
 [![CodeCov](https://codecov.io/gh/uutils/parse_datetime/branch/main/graph/badge.svg)](https://codecov.io/gh/uutils/parse_datetime)

-A Rust crate for parsing human-readable relative time strings and human-readable datetime strings and converting them to a `DateTime`.
+A Rust crate for parsing human-readable relative time strings and human-readable datetime strings and converting them to a jiff's `Zoned` object.

 ## Features

 - Parses a variety of human-readable and standard time formats.
 - Supports positive and negative durations.
- Allows for chaining time units (e.g., "1 hour 2 minutes" or "2 days and 2 hours").
+- Allows for chaining time units (e.g., "1 hour 2 minutes" or "2 days 2 hours ago").
 - Calculate durations relative to a specified date.
- Relies on Chrono
+- Relies on Jiff

 ## Usage

@@ -25,26 +25,26 @@ cargo add parse_datetime
 Then, import the crate and use the `parse_datetime_at_date` function:

 ```rs
-use chrono::{Duration, Local};
+use jiff::{ToSpan, Zoned};
 use parse_datetime::parse_datetime_at_date;

-let now = Local::now();
-let after = parse_datetime_at_date(now, "+3 days");
+let now = Zoned::now();
+let after = parse_datetime_at_date(now.clone(), "+3 days");

 assert_eq!(
-  (now + Duration::days(3)).naive_utc(),
-  after.unwrap().naive_utc()
+  now.checked_add(3.days()).unwrap(),
+  after.unwrap()
 );
 ```

 For DateTime parsing, import the `parse_datetime` function:

 ```rs
+use jiff::{civil::{date, time} ,Zoned};
 use parse_datetime::parse_datetime;
-use chrono::{Local, TimeZone};

 let dt = parse_datetime("2021-02-14 06:37:47");
-assert_eq!(dt.unwrap(), Local.with_ymd_and_hms(2021, 2, 14, 6, 37, 47).unwrap());
+assert_eq!(dt.unwrap(), Zoned::now().with().date(date(2021, 2, 14)).time(time(6, 37, 47, 0)).build().unwrap());
 ```

 ### Supported Formats
@@ -58,7 +58,6 @@ The `parse_datetime` and `parse_datetime_at_date` functions support absolute dat
 - "tomorrow"
 - use "ago" for the past
 - use "next" or "last" with `unit` (e.g., "next week", "last year")
- combined units with "and" or "," (e.g., "2 years and 1 month", "1 day, 2 hours" or "2 weeks 1 second")
 - unix timestamps (for example "@0" "@1344000")

 `num` can be a positive or negative integer.
@@ -70,7 +69,7 @@ The `parse_datetime` and `parse_datetime_at_date` functions support absolute dat

 The `parse_datetime` and `parse_datetime_at_date` function return:

- `Ok(DateTime<FixedOffset>)` - If the input string can be parsed as a datetime
+- `Ok(Zoned)` - If the input string can be parsed as a `Zoned` object
 - `Err(ParseDateTimeError::InvalidInput)` - If the input string cannot be parsed

 ## Fuzzer
@@ -2,54 +2,25 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "aho-corasick"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "arbitrary"
-version = "1.3.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"

 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "cc"
-version = "1.2.10"
+version = "1.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
 dependencies = [
+ "find-msvc-tools",
 "jobserver",
 "libc",
 "shlex",
@@ -57,90 +28,98 @@ dependencies = [

 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

 [[package]]
-name = "chrono"
-version = "0.4.41"
+name = "find-msvc-tools"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "windows-link",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"

 [[package]]
 name = "fuzz_parse_datetime"
 version = "0.2.0"
 dependencies = [
- "chrono",
 "libfuzzer-sys",
 "parse_datetime",
- "regex",
 ]

 [[package]]
-name = "iana-time-zone"
-version = "0.1.61"
+name = "getrandom"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
 ]

 [[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
+name = "jiff"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
 dependencies = [
- "cc",
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
 ]

 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom",
 "libc",
 ]

-[[package]]
-name = "js-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"

 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
 "arbitrary",
 "cc",
@@ -148,15 +127,15 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"

 [[package]]
 name = "memchr"
-version = "2.6.2"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"

 [[package]]
 name = "num-traits"
@@ -167,68 +146,82 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "once_cell"
-version = "1.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-
 [[package]]
 name = "parse_datetime"
-version = "0.10.0"
+version = "0.13.1"
 dependencies = [
- "chrono",
+ "jiff",
 "num-traits",
- "regex",
 "winnow",
 ]

 [[package]]
-name = "proc-macro2"
-version = "1.0.59"
+name = "portable-atomic"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
-name = "regex"
-version = "1.11.1"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
+ "serde_core",
 ]

 [[package]]
-name = "regex-automata"
-version = "0.4.8"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
+ "serde_derive",
 ]

 [[package]]
-name = "regex-syntax"
-version = "0.8.5"
+name = "serde_derive"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

 [[package]]
 name = "shlex"
@@ -238,9 +231,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -249,80 +242,28 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"

 [[package]]
-name = "wasm-bindgen"
-version = "0.2.93"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
+ "wit-bindgen",
 ]

 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.93"
+name = "windows-sys"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
 "windows-targets",
 ]

-[[package]]
-name = "windows-link"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -389,9 +330,15 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
 "memchr",
 ]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
@@ -8,8 +8,6 @@ cargo-fuzz = true

 [dependencies]
 libfuzzer-sys = "0.4.7"
-regex = "1.10.4"
-chrono = { version="0.4", default-features=false, features=["std", "alloc", "clock"] }

 [dependencies.parse_datetime]
 path = "../"
@@ -0,0 +1,321 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+use jiff::{civil, Span, Zoned};
+
+use super::{date, epoch, error, offset, relative, time, weekday, year, Item};
+
+/// The builder is used to construct a DateTime object from various components.
+/// The parser creates a `DateTimeBuilder` object with the parsed components,
+/// but without the baseline date and time. So you normally need to set the base
+/// date and time using the `set_base()` method before calling `build()`, or
+/// leave it unset to use the current date and time as the base.
+#[derive(Debug, Default)]
+pub(crate) struct DateTimeBuilder {
+    base: Option<Zoned>,
+    timestamp: Option<epoch::Timestamp>,
+    date: Option<date::Date>,
+    time: Option<time::Time>,
+    weekday: Option<weekday::Weekday>,
+    offset: Option<offset::Offset>,
+    timezone: Option<jiff::tz::TimeZone>,
+    relative: Vec<relative::Relative>,
+}
+
+impl DateTimeBuilder {
+    pub(super) fn new() -> Self {
+        Self::default()
+    }
+
+    /// Sets the base date and time for the builder. If not set, the current
+    /// date and time will be used.
+    pub(super) fn set_base(mut self, base: Zoned) -> Self {
+        self.base = Some(base);
+        self
+    }
+
+    /// Sets the timezone rule for the builder.
+    ///
+    /// By default, the builder uses the time zone rules indicated by the `TZ`
+    /// environment variable, or the system default rules if `TZ` is not set.
+    /// This method allows overriding the time zone rules.
+    fn set_timezone(mut self, tz: jiff::tz::TimeZone) -> Result<Self, &'static str> {
+        if self.timezone.is_some() {
+            return Err("timezone rule cannot appear more than once");
+        }
+
+        self.timezone = Some(tz);
+        Ok(self)
+    }
+
+    /// Sets a timestamp value. Timestamp values are exclusive to other date/time
+    /// items (date, time, weekday, timezone, relative adjustments).
+    pub(super) fn set_timestamp(mut self, ts: epoch::Timestamp) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot appear more than once");
+        } else if self.date.is_some()
+            || self.time.is_some()
+            || self.weekday.is_some()
+            || self.offset.is_some()
+            || !self.relative.is_empty()
+        {
+            return Err("timestamp cannot be combined with other date/time items");
+        }
+
+        self.timestamp = Some(ts);
+        Ok(self)
+    }
+
+    fn set_date(mut self, date: date::Date) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        } else if self.date.is_some() {
+            return Err("date cannot appear more than once");
+        }
+
+        self.date = Some(date);
+        Ok(self)
+    }
+
+    fn set_time(mut self, time: time::Time) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        } else if self.time.is_some() {
+            return Err("time cannot appear more than once");
+        } else if self.offset.is_some() && time.offset.is_some() {
+            return Err("time offset and timezone are mutually exclusive");
+        }
+
+        self.time = Some(time);
+        Ok(self)
+    }
+
+    fn set_weekday(mut self, weekday: weekday::Weekday) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        } else if self.weekday.is_some() {
+            return Err("weekday cannot appear more than once");
+        }
+
+        self.weekday = Some(weekday);
+        Ok(self)
+    }
+
+    fn set_offset(mut self, timezone: offset::Offset) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        } else if self.offset.is_some()
+            || self.time.as_ref().and_then(|t| t.offset.as_ref()).is_some()
+        {
+            return Err("time offset cannot appear more than once");
+        }
+
+        self.offset = Some(timezone);
+        Ok(self)
+    }
+
+    fn push_relative(mut self, relative: relative::Relative) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        }
+
+        self.relative.push(relative);
+        Ok(self)
+    }
+
+    /// Sets a pure number that can be interpreted as either a year or time
+    /// depending on the current state of the builder.
+    ///
+    /// If a date is already set but lacks a year, the number is interpreted as
+    /// a year. Otherwise, it's interpreted as a time in HHMM, HMM, HH, or H
+    /// format.
+    fn set_pure(mut self, pure: String) -> Result<Self, &'static str> {
+        if self.timestamp.is_some() {
+            return Err("timestamp cannot be combined with other date/time items");
+        }
+
+        if let Some(date) = self.date.as_mut() {
+            if date.year.is_none() {
+                date.year = Some(year::year_from_str(&pure)?);
+                return Ok(self);
+            }
+        }
+
+        let (mut hour_str, mut minute_str) = match pure.len() {
+            1..=2 => (pure.as_str(), "0"),
+            3..=4 => pure.split_at(pure.len() - 2),
+            _ => {
+                return Err("pure number must be 1-4 digits when interpreted as time");
+            }
+        };
+
+        let hour = time::hour24(&mut hour_str).map_err(|_| "invalid hour in pure number")?;
+        let minute = time::minute(&mut minute_str).map_err(|_| "invalid minute in pure number")?;
+
+        let time = time::Time {
+            hour,
+            minute,
+            ..Default::default()
+        };
+        self.set_time(time)
+    }
+
+    /// Build a `Zoned` object from the pieces accumulated in this builder.
+    ///
+    /// Resolution order (mirrors GNU `date` semantics):
+    ///
+    /// 1. Base instant.
+    ///   - a. If `self.base` is provided, start with it.
+    ///   - b. Else if a `timezone` rule is present, start with "now" in that
+    ///     timezone.
+    ///   - c. Else start with current system local time.
+    ///
+    /// 2. Absolute timestamp override.
+    ///   - a. If `self.timestamp` is set, it fully determines the result.
+    ///
+    /// 3. Time of day truncation.
+    ///   - a. If any of date, time, weekday, offset, timezone is set, zero the
+    ///     time of day to 00:00:00 before applying fields.
+    ///
+    /// 4. Fieldwise resolution (applied to the base instant).
+    ///   - a. Apply date. If year is absent in the parsed date, inherit the year
+    ///     from the base instant.
+    ///   - b. Apply time. If time carries an explicit numeric offset, apply the
+    ///     offset before setting time.
+    ///   - c. Apply weekday (e.g., "next Friday" or "last Monday").
+    ///   - d. Apply relative adjustments (e.g., "+3 days", "-2 months").
+    ///   - e. Apply final fixed offset if present.
+    pub(super) fn build(self) -> Result<Zoned, error::Error> {
+        // 1. Choose the base instant.
+        let base = match (self.base, &self.timezone) {
+            (Some(b), _) => b,
+            (None, Some(tz)) => jiff::Timestamp::now().to_zoned(tz.clone()),
+            (None, None) => Zoned::now(),
+        };
+
+        // 2. Absolute timestamp override everything else.
+        if let Some(ts) = self.timestamp {
+            let ts = jiff::Timestamp::try_from(ts)?;
+            return Ok(ts.to_zoned(base.offset().to_time_zone()));
+        }
+
+        // 3. Determine whether to truncate the time of day.
+        let need_midnight = self.date.is_some()
+            || self.time.is_some()
+            || self.weekday.is_some()
+            || self.offset.is_some()
+            || self.timezone.is_some();
+
+        let mut dt = if need_midnight {
+            base.with().time(civil::time(0, 0, 0, 0)).build()?
+        } else {
+            base
+        };
+
+        // 4a. Apply date.
+        if let Some(date) = self.date {
+            let d: civil::Date = if date.year.is_some() {
+                date.try_into()?
+            } else {
+                date.with_year(dt.date().year() as u16).try_into()?
+            };
+            dt = dt.with().date(d).build()?;
+        }
+
+        // 4b. Apply time.
+        if let Some(time) = self.time.clone() {
+            if let Some(offset) = &time.offset {
+                dt = dt.datetime().to_zoned(offset.try_into()?)?;
+            }
+
+            let t: civil::Time = time.try_into()?;
+            dt = dt.with().time(t).build()?;
+        }
+
+        // 4c. Apply weekday.
+        if let Some(weekday::Weekday { mut offset, day }) = self.weekday {
+            if self.time.is_none() {
+                dt = dt.with().time(civil::time(0, 0, 0, 0)).build()?;
+            }
+
+            let target = day.into();
+
+            // If the current day is not the target day, we need to adjust
+            // the x value to ensure we find the correct day.
+            //
+            // Consider this:
+            // Assuming today is Monday, next Friday is actually THIS Friday;
+            // but next Monday is indeed NEXT Monday.
+            if dt.date().weekday() != target && offset > 0 {
+                offset -= 1;
+            }
+
+            // Calculate the delta to the target day.
+            //
+            // Assuming today is Thursday, here are some examples:
+            //
+            // Example 1: last Thursday (x = -1, day = Thursday)
+            //            delta = (3 - 3) % 7 + (-1) * 7 = -7
+            //
+            // Example 2: last Monday (x = -1, day = Monday)
+            //            delta = (0 - 3) % 7 + (-1) * 7 = -3
+            //
+            // Example 3: next Monday (x = 1, day = Monday)
+            //            delta = (0 - 3) % 7 + (0) * 7 = 4
+            // (Note that we have adjusted the x value above)
+            //
+            // Example 4: next Thursday (x = 1, day = Thursday)
+            //            delta = (3 - 3) % 7 + (1) * 7 = 7
+            let delta = (target.since(civil::Weekday::Monday) as i32
+                - dt.date().weekday().since(civil::Weekday::Monday) as i32)
+                .rem_euclid(7)
+                + offset.checked_mul(7).ok_or("multiplication overflow")?;
+
+            dt = dt.checked_add(Span::new().try_days(delta)?)?;
+        }
+
+        // 4d. Apply relative adjustments.
+        for rel in self.relative {
+            dt = dt.checked_add::<Span>(if let relative::Relative::Months(x) = rel {
+                // *NOTE* This is done in this way to conform to GNU behavior.
+                let days = dt.date().last_of_month().day() as i32;
+                Span::new().try_days(days.checked_mul(x).ok_or("multiplication overflow")?)?
+            } else {
+                rel.try_into()?
+            })?;
+        }
+
+        // 4e. Apply final fixed offset.
+        if let Some(offset) = self.offset {
+            let (offset, hour_adjustment) = offset.normalize();
+            dt = dt.checked_add(Span::new().hours(hour_adjustment))?;
+            dt = dt.datetime().to_zoned((&offset).try_into()?)?;
+        }
+
+        Ok(dt)
+    }
+}
+
+impl TryFrom<Vec<Item>> for DateTimeBuilder {
+    type Error = &'static str;
+
+    fn try_from(items: Vec<Item>) -> Result<Self, Self::Error> {
+        let mut builder = DateTimeBuilder::new();
+
+        for item in items {
+            builder = match item {
+                Item::Timestamp(ts) => builder.set_timestamp(ts)?,
+                Item::DateTime(dt) => builder.set_date(dt.date)?.set_time(dt.time)?,
+                Item::Date(d) => builder.set_date(d)?,
+                Item::Time(t) => builder.set_time(t)?,
+                Item::Weekday(weekday) => builder.set_weekday(weekday)?,
+                Item::Offset(offset) => builder.set_offset(offset)?,
+                Item::Relative(rel) => builder.push_relative(rel)?,
+                Item::TimeZone(tz) => builder.set_timezone(tz)?,
+                Item::Pure(pure) => builder.set_pure(pure)?,
+            }
+        }
+
+        Ok(builder)
+    }
+}
@@ -12,7 +12,8 @@
 //! > In this format, the time of day should use 24-hour notation. Fractional
 //! > seconds are allowed, with either comma or period preceding the fraction.
 //! > ISO 8601 fractional minutes and hours are not supported. Typically, hosts
-//! > support nanosecond timestamp resolution; excess precision is silently discarded.
+//! > support nanosecond timestamp resolution; excess precision is silently
+//! > discarded.
 use winnow::{
    combinator::{alt, trace},
    seq, ModalResult, Parser,
@@ -20,24 +21,20 @@ use winnow::{

 use crate::items::space;

-use super::{
-    date::{self, Date},
-    s,
-    time::{self, Time},
-};
+use super::{date, primitive::s, time};

 #[derive(PartialEq, Debug, Clone, Default)]
-pub struct DateTime {
-    pub(crate) date: Date,
-    pub(crate) time: Time,
+pub(crate) struct DateTime {
+    pub(crate) date: date::Date,
+    pub(crate) time: time::Time,
 }

-pub fn parse(input: &mut &str) -> ModalResult<DateTime> {
+pub(crate) fn parse(input: &mut &str) -> ModalResult<DateTime> {
    seq!(DateTime {
-        date: trace("date iso", alt((date::iso1, date::iso2))),
+        date: trace("iso_date", alt((date::iso1, date::iso2))),
        // Note: the `T` is lowercased by the main parse function
        _: alt((s('t').void(), (' ', space).void())),
-        time: trace("time iso", time::iso),
+        time: trace("iso_time", time::iso),
    })
    .parse_next(input)
 }
@@ -58,7 +55,8 @@ mod tests {
            time: Time {
                hour: 10,
                minute: 10,
-                second: 55.0,
+                second: 55,
+                nanosecond: 0,
                offset: None,
            },
        });
@@ -0,0 +1,137 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+//! Parse a timestamp item.
+//!
+//! From the GNU docs:
+//!
+//! > If you precede a number with ‘@’, it represents an internal timestamp as
+//! > a count of seconds.  The number can contain an internal decimal point
+//! > (either ‘.’ or ‘,’); any excess precision not supported by the internal
+//! > representation is truncated toward minus infinity.  Such a number cannot
+//! > be combined with any other date item, as it specifies a complete
+//! > timestamp.
+//! >
+//! >    On most hosts, these counts ignore the presence of leap seconds.  For
+//! > example, on most hosts ‘@1483228799’ represents 2016-12-31 23:59:59 UTC,
+//! > ‘@1483228800’ represents 2017-01-01 00:00:00 UTC, and there is no way to
+//! > represent the intervening leap second 2016-12-31 23:59:60 UTC.
+
+use winnow::{
+    ascii::digit1,
+    combinator::{opt, preceded},
+    token::one_of,
+    ModalResult, Parser,
+};
+
+use super::primitive::{dec_uint, plus_or_minus, s};
+
+/// Represents a timestamp with nanosecond accuracy.
+///
+/// # Invariants
+///
+/// - `nanosecond` is always in the range of `0..1_000_000_000`.
+/// - Negative timestamps are represented by a negative `second` value and a
+///   positive `nanosecond` value.
+#[derive(Debug, PartialEq)]
+pub(super) struct Timestamp {
+    second: i64,
+    nanosecond: u32,
+}
+
+impl TryFrom<Timestamp> for jiff::Timestamp {
+    type Error = &'static str;
+
+    fn try_from(ts: Timestamp) -> Result<Self, Self::Error> {
+        jiff::Timestamp::new(
+            ts.second,
+            i32::try_from(ts.nanosecond).map_err(|_| "nanosecond in timestamp exceeds i32::MAX")?,
+        )
+        .map_err(|_| "timestamp value is out of valid range")
+    }
+}
+
+/// Parse a timestamp in the form of `@1234567890` or `@-1234567890.12345` or
+/// `@1234567890,12345`.
+pub(super) fn parse(input: &mut &str) -> ModalResult<Timestamp> {
+    (s("@"), opt(plus_or_minus), s(sec_and_nsec))
+        .verify_map(|(_, sign, (sec, nsec))| {
+            let sec = i64::try_from(sec).ok()?;
+            let (second, nanosecond) = match (sign, nsec) {
+                (Some('-'), 0) => (-sec, 0),
+                // Truncate towards minus infinity.
+                (Some('-'), _) => ((-sec).checked_sub(1)?, 1_000_000_000 - nsec),
+                _ => (sec, nsec),
+            };
+            Some(Timestamp { second, nanosecond })
+        })
+        .parse_next(input)
+}
+
+/// Parse a second value in the form of `1234567890` or `1234567890.12345` or
+/// `1234567890,12345`.
+///
+/// The first part represents whole seconds. The optional second part represents
+/// fractional seconds, parsed as a nanosecond value from up to 9 digits
+/// (padded with zeros on the right if fewer digits are present). If the second
+/// part is omitted, it defaults to 0 nanoseconds.
+pub(super) fn sec_and_nsec(input: &mut &str) -> ModalResult<(u64, u32)> {
+    (dec_uint, opt(preceded(one_of(['.', ',']), digit1)))
+        .verify_map(|(sec, opt_nsec_str)| match opt_nsec_str {
+            Some(nsec_str) if nsec_str.len() >= 9 => Some((sec, nsec_str[..9].parse().ok()?)),
+            Some(nsec_str) => {
+                let multiplier = 10_u32.pow(9 - nsec_str.len() as u32);
+                Some((sec, nsec_str.parse::<u32>().ok()?.checked_mul(multiplier)?))
+            }
+            None => Some((sec, 0)),
+        })
+        .parse_next(input)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn ts(second: i64, nanosecond: u32) -> Timestamp {
+        Timestamp { second, nanosecond }
+    }
+
+    #[test]
+    fn parse_sec_and_nsec() {
+        for (input, expected) in [
+            ("1234567890", (1234567890, 0)),                       // only seconds
+            ("1234567890.12345", (1234567890, 123450000)), // seconds and nanoseconds, '.' as floating point
+            ("1234567890,12345", (1234567890, 123450000)), // seconds and nanoseconds, ',' as floating point
+            ("1234567890.1234567890123", (1234567890, 123456789)), // nanoseconds with more than 9 digits, truncated
+        ] {
+            let mut s = input;
+            assert_eq!(sec_and_nsec(&mut s).unwrap(), expected, "{input}");
+        }
+
+        for input in [
+            ".1234567890", // invalid: no leading seconds
+            "-1234567890", // invalid: negative input not allowed
+        ] {
+            let mut s = input;
+            assert!(sec_and_nsec(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn timestamp() {
+        for (input, expected) in [
+            ("@1234567890", ts(1234567890, 0)), // positive seconds, no nanoseconds
+            ("@ 1234567890", ts(1234567890, 0)), // space after '@', positive seconds, no nanoseconds
+            ("@-1234567890", ts(-1234567890, 0)), // negative seconds, no nanoseconds
+            ("@ -1234567890", ts(-1234567890, 0)), // space after '@', negative seconds, no nanoseconds
+            ("@ - 1234567890", ts(-1234567890, 0)), // space after '@' and after '-', negative seconds, no nanoseconds
+            ("@1234567890.12345", ts(1234567890, 123450000)), // positive seconds with nanoseconds, '.' as floating point
+            ("@1234567890,12345", ts(1234567890, 123450000)), // positive seconds with nanoseconds, ',' as floating point
+            ("@-1234567890.12345", ts(-1234567891, 876550000)), // negative seconds with nanoseconds, '.' as floating point
+            ("@1234567890.1234567890123", ts(1234567890, 123456789)), // nanoseconds with more than 9 digits, truncated
+        ] {
+            let mut s = input;
+            assert_eq!(parse(&mut s).unwrap(), expected, "{input}");
+        }
+    }
+}
@@ -0,0 +1,38 @@
+use std::fmt;
+
+use winnow::error::{ContextError, ErrMode};
+
+#[derive(Debug)]
+pub(crate) enum Error {
+    ParseError(String),
+}
+
+impl std::error::Error for Error {}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::ParseError(reason) => {
+                write!(f, "{reason}")
+            }
+        }
+    }
+}
+
+impl From<&'static str> for Error {
+    fn from(reason: &'static str) -> Self {
+        Error::ParseError(reason.to_owned())
+    }
+}
+
+impl From<ErrMode<ContextError>> for Error {
+    fn from(err: ErrMode<ContextError>) -> Self {
+        Error::ParseError(err.to_string())
+    }
+}
+
+impl From<jiff::Error> for Error {
+    fn from(err: jiff::Error) -> Self {
+        Error::ParseError(err.to_string())
+    }
+}
@@ -0,0 +1,468 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+//! Parse an offset item.
+//!
+//! From the GNU docs:
+//!
+//! > A “time zone item” specifies an international time zone, indicated by a
+//! > small set of letters, e.g., ‘UTC’ or ‘Z’ for Coordinated Universal Time.
+//! > Any included periods are ignored.  By following a non-daylight-saving
+//! > time zone by the string ‘DST’ in a separate word (that is, separated by
+//! > some white space), the corresponding daylight saving time zone may be
+//! > specified.  Alternatively, a non-daylight-saving time zone can be
+//! > followed by a time zone correction, to add the two values.  This is
+//! > normally done only for ‘UTC’; for example, ‘UTC+05:30’ is equivalent to
+//! > ‘+05:30’.
+//! >
+//! >    Time zone items other than ‘UTC’ and ‘Z’ are obsolescent and are not
+//! > recommended, because they are ambiguous; for example, ‘EST’ has a
+//! > different meaning in Australia than in the United States, and ‘A’ has
+//! > different meaning as a military time zone than as an obsolete RFC 822
+//! > time zone.  Instead, it's better to use unambiguous numeric time zone
+//! > corrections like ‘-0500’, as described in the previous section.
+//! >
+//! >    If neither a time zone item nor a time zone correction is supplied,
+//! > timestamps are interpreted using the rules of the default time zone.
+
+use std::fmt::Display;
+
+use winnow::{
+    combinator::{alt, peek},
+    error::{ContextError, ErrMode},
+    stream::{AsChar, Stream},
+    token::take_while,
+    ModalResult, Parser,
+};
+
+use super::{
+    primitive::{colon, ctx_err, dec_uint, dec_uint_str, plus_or_minus, s},
+    relative,
+};
+
+/// Represents a time zone offset from UTC.
+///
+/// This struct is used to represent a time zone offset in hours and minutes,
+/// with a boolean indicating whether the offset is negative (i.e., west of
+/// UTC).
+#[derive(PartialEq, Debug, Clone, Default)]
+pub(super) struct Offset {
+    negative: bool,
+    hours: u8,
+    minutes: u8,
+}
+
+impl Offset {
+    /// Merge two timezone offsets.
+    ///
+    /// Note: when parsing an offset from a string (e.g., "+08:00"), the hours
+    /// and minutes are validated to ensure they fall within valid bounds. In
+    /// contrast, merging two offsets does not perform such validation. This
+    /// behavior is intentional to match GNU date.
+    fn merge(self, offset: Offset) -> Offset {
+        fn combine(a: u16, neg_a: bool, b: u16, neg_b: bool) -> (u16, bool) {
+            if neg_a == neg_b {
+                (a + b, neg_a)
+            } else if a > b {
+                (a - b, neg_a)
+            } else {
+                (b - a, neg_b)
+            }
+        }
+        let (total_minutes, negative) = combine(
+            (self.hours as u16) * 60 + (self.minutes as u16),
+            self.negative,
+            (offset.hours as u16) * 60 + (offset.minutes as u16),
+            offset.negative,
+        );
+        let hours = (total_minutes / 60) as u8;
+        let minutes = (total_minutes % 60) as u8;
+
+        Offset {
+            negative,
+            hours,
+            minutes,
+        }
+    }
+
+    /// Normalize the offset so that the hour field is within the accepted range.
+    ///
+    /// - If the hour field is less than 24, or exactly 24 with a zero minute,
+    ///   the offset is already normalized, and the function returns the offset
+    ///   itself along with a zero hour adjustment.
+    /// - Otherwise, the hour field is reduced to 23 while preserving the minute
+    ///   field, and the function returns the normalized offset along with the
+    ///   hour adjustment needed to reach the original offset.
+    pub(super) fn normalize(self) -> (Offset, i8) {
+        if self.hours < 24 || (self.hours == 24 && self.minutes == 0) {
+            return (self, 0);
+        }
+
+        let hour_adjustment = (self.hours as i8 - 23) * if self.negative { 1 } else { -1 };
+        (
+            Offset {
+                negative: self.negative,
+                hours: 23,
+                minutes: self.minutes,
+            },
+            hour_adjustment,
+        )
+    }
+}
+
+impl TryFrom<(bool, u8, u8)> for Offset {
+    type Error = &'static str;
+
+    fn try_from((negative, hours, minutes): (bool, u8, u8)) -> Result<Self, Self::Error> {
+        if hours > 24 {
+            return Err("timezone hour must be between 0 and 24");
+        }
+        if minutes > 60 || (hours == 24 && minutes != 0) {
+            return Err("timezone minute must be between 0 and 60");
+        }
+
+        Ok(Offset {
+            negative,
+            hours,
+            minutes,
+        })
+    }
+}
+
+impl TryFrom<&Offset> for jiff::tz::TimeZone {
+    type Error = &'static str;
+
+    fn try_from(
+        Offset {
+            negative,
+            hours,
+            minutes,
+        }: &Offset,
+    ) -> Result<Self, Self::Error> {
+        let secs = (*hours as i32) * 3600 + (*minutes as i32) * 60;
+        let secs = if *negative { -secs } else { secs };
+
+        let offset = jiff::tz::Offset::from_seconds(secs).map_err(|_| "offset is invalid")?;
+        Ok(jiff::tz::TimeZone::fixed(offset))
+    }
+}
+
+impl Display for Offset {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        write!(
+            fmt,
+            "{}{:02}:{:02}",
+            if self.negative { "-" } else { "+" },
+            self.hours,
+            self.minutes
+        )
+    }
+}
+
+pub(super) fn parse(input: &mut &str) -> ModalResult<Offset> {
+    timezone_name_offset.parse_next(input)
+}
+
+/// Parse a timezone starting with `+` or `-`.
+pub(super) fn timezone_offset(input: &mut &str) -> ModalResult<Offset> {
+    // Strings like "+8 years" are ambiguous, they can either be parsed as a
+    // timezone offset "+8" and a relative time "years", or just a relative time
+    // "+8 years". GNU date parses them the second way, so we do the same here.
+    //
+    // Return early if the input can be parsed as a relative time.
+    if peek(relative::parse).parse_next(input).is_ok() {
+        return Err(ErrMode::Backtrack(ContextError::new()));
+    }
+
+    alt((timezone_offset_colon, timezone_offset_colonless)).parse_next(input)
+}
+
+/// Parse a timezone by name, with an optional numeric offset appended.
+fn timezone_name_offset(input: &mut &str) -> ModalResult<Offset> {
+    /// I'm assuming there are no timezone abbreviations with more
+    /// than 6 charactres
+    const MAX_TZ_SIZE: usize = 6;
+    let nextword = s(take_while(1..=MAX_TZ_SIZE, AsChar::is_alpha)).parse_next(input)?;
+    let tz = timezone_name_to_offset(nextword)?;
+
+    // Strings like "UTC +8 years" are ambiguous, they can either be parsed as
+    // "UTC+8" and "years", or "UTC" and "+8 years". GNU date parses them the
+    // second way, so we do the same here.
+    //
+    // Only process if the input cannot be parsed as a relative time.
+    if peek(relative::parse).parse_next(input).is_err() {
+        let start = input.checkpoint();
+        if let Ok(other_tz) = timezone_offset.parse_next(input) {
+            let new_tz = tz.merge(other_tz);
+
+            return Ok(new_tz);
+        };
+        input.reset(&start);
+    }
+
+    Ok(tz)
+}
+
+/// Parse a timezone offset with a colon separating hours and minutes, e.g.,
+/// `+08:00`, `+8:00`, `+8:0`.
+fn timezone_offset_colon(input: &mut &str) -> ModalResult<Offset> {
+    (plus_or_minus, s(dec_uint), s(colon), s(dec_uint))
+        .parse_next(input)
+        .and_then(|(sign, hours, _, minutes)| {
+            (sign == '-', hours, minutes)
+                .try_into()
+                .map_err(|e| ErrMode::Cut(ctx_err(e)))
+        })
+}
+
+/// Parse a timezone offset without colon, e.g., `+0800`, `+800`, `+08`, `+8`.
+fn timezone_offset_colonless(input: &mut &str) -> ModalResult<Offset> {
+    (plus_or_minus, s(dec_uint_str))
+        .verify_map(|(sign, s)| {
+            // GNU date accepts numeric offset strings with leading zeroes. For
+            // example, `+000000110` is valid. In such cases, the string is
+            // truncated to the last four characters. Thus, `+000000110` becomes
+            // `+0110` (note that one leading zero is kept).
+            let s = if s.len() > 4 && s.trim_start_matches('0').len() <= 4 {
+                &s[s.len() - 4..]
+            } else {
+                s
+            };
+
+            // Hour and minute values are dependent on the length of the string.
+            // For example:
+            //
+            // - "5"   -> 05:00
+            // - "05"  -> 05:00
+            // - "530" -> 05:30 (the minute is the last two characters here)
+            // - "0530"-> 05:30
+            // - "0000530" -> 05:30
+            let (h_str, m_str) = match s.len() {
+                1 | 2 => (s, "0"),
+                3 => s.split_at(1),
+                4 => s.split_at(2),
+                _ => return None,
+            };
+
+            let hours = h_str.parse::<u8>().ok()?;
+            let minutes = m_str.parse::<u8>().ok()?;
+            Some((sign, hours, minutes))
+        })
+        .parse_next(input)
+        .and_then(|(sign, hours, minutes)| {
+            (sign == '-', hours, minutes)
+                .try_into()
+                .map_err(|e| ErrMode::Cut(ctx_err(e)))
+        })
+}
+
+/// Named timezone list.
+///
+/// The full list of timezones can be extracted from
+/// https://www.timeanddate.com/time/zones/. GNU date only supports a subset of
+/// these. We support the same subset as GNU date.
+fn timezone_name_to_offset(input: &str) -> ModalResult<Offset> {
+    let mut offset_str = match input {
+        "z" => Ok("+0"),
+        "y" => Ok("-12"),
+        "x" => Ok("-11"),
+        "wet" => Ok("+0"),
+        "west" => Ok("+1"),
+        "wat" => Ok("+1"),
+        "w" => Ok("-10"),
+        "v" => Ok("-9"),
+        "utc" => Ok("+0"),
+        "u" => Ok("-8"),
+        "t" => Ok("-7"),
+        "sst" => Ok("-11"),
+        "sgt" => Ok("+8"),
+        "sast" => Ok("+2"),
+        "s" => Ok("-6"),
+        "r" => Ok("-5"),
+        "q" => Ok("-4"),
+        "pst" => Ok("-8"),
+        "pdt" => Ok("-7"),
+        "p" => Ok("-3"),
+        "o" => Ok("-2"),
+        "nzst" => Ok("+12"),
+        "nzdt" => Ok("+13"),
+        "nst" => Ok("-3:30"),
+        "ndt" => Ok("-2:30"),
+        "n" => Ok("-1"),
+        "mst" => Ok("-7"),
+        "msk" => Ok("+3"),
+        "msd" => Ok("+4"),
+        "mdt" => Ok("-6"),
+        "m" => Ok("+12"),
+        "l" => Ok("+11"),
+        "k" => Ok("+10"),
+        "jst" => Ok("+9"),
+        "ist" => Ok("+5:30"),
+        "i" => Ok("+9"),
+        "hst" => Ok("-10"),
+        "h" => Ok("+8"),
+        "gst" => Ok("+4"),
+        "gmt" => Ok("+0"),
+        "g" => Ok("+7"),
+        "f" => Ok("+6"),
+        "est" => Ok("-5"),
+        "eet" => Ok("+2"),
+        "eest" => Ok("+3"),
+        "edt" => Ok("-4"),
+        "eat" => Ok("+3"),
+        "e" => Ok("+5"),
+        "d" => Ok("+4"),
+        "cst" => Ok("-6"),
+        "clt" => Ok("-4"),
+        "clst" => Ok("-3"),
+        "cet" => Ok("+1"),
+        "cest" => Ok("+2"),
+        "cdt" => Ok("-5"),
+        "cat" => Ok("+2"),
+        "c" => Ok("+3"),
+        "bst" => Ok("+6"),
+        "brt" => Ok("-3"),
+        "brst" => Ok("-2"),
+        "b" => Ok("+2"),
+        "ast" => Ok("-3"),
+        "art" => Ok("-3"),
+        "akst" => Ok("-9"),
+        "akdt" => Ok("-8"),
+        "adt" => Ok("+4"),
+        "a" => Ok("+1"),
+        _ => Err(ErrMode::Backtrack(ContextError::new())),
+    }?;
+
+    timezone_offset(&mut offset_str)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn off(negative: bool, hours: u8, minutes: u8) -> Offset {
+        Offset {
+            negative,
+            hours,
+            minutes,
+        }
+    }
+
+    #[test]
+    fn timezone_offset_with_colon() {
+        for (input, expected) in [
+            ("+00:00", off(false, 0, 0)),        // UTC
+            ("-00:00", off(true, 0, 0)),         // UTC
+            ("+01:00", off(false, 1, 0)),        // positive offset
+            ("-06:00", off(true, 6, 0)),         // negative offset
+            ("+05:30", off(false, 5, 30)),       // positive offset with non-zero minutes
+            ("-03:30", off(true, 3, 30)),        // negative offset with non-zero minutes
+            ("- 06:00", off(true, 6, 0)),        // space after sign
+            ("- 06 : 00", off(true, 6, 0)),      // space around colon
+            ("+5:3", off(false, 5, 3)),          // single-digit hours and single-digit minutes
+            ("+5:03", off(false, 5, 3)),         // single-digit hours
+            ("+05:3", off(false, 5, 3)),         // single-digit minutes
+            ("+00005:00030", off(false, 5, 30)), // leading zeroes in hours and minutes
+            ("+00:00abc", off(false, 0, 0)), // space separator can be ignored if immediately followed by alphas (GNU date behavior)
+        ] {
+            let mut s = input;
+            assert_eq!(timezone_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        for input in [
+            "+25:00", // invalid: hours > 24
+            "-23:61", // invalid: minutes > 60
+            "+24:01", // invalid: minutes > 0 when hours == 24
+        ] {
+            let mut s = input;
+            assert!(timezone_offset(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn timezone_offset_without_colon() {
+        for (input, expected) in [
+            ("+0000", off(false, 0, 0)),      // UTC
+            ("-0000", off(true, 0, 0)),       // UTC
+            ("+0100", off(false, 1, 0)),      // positive offset
+            ("-0600", off(true, 6, 0)),       // negative offset
+            ("+0530", off(false, 5, 30)),     // positive offset with non-zero minutes
+            ("-0330", off(true, 3, 30)),      // negative offset with non-zero minutes
+            ("- 0330", off(true, 3, 30)),     // space after sign
+            ("+530", off(false, 5, 30)),      // single-digit hours
+            ("+05", off(false, 5, 0)),        // double-digit hours and no minutes
+            ("+5", off(false, 5, 0)),         // single-digit hours and no minutes
+            ("+00000530", off(false, 5, 30)), // leading zeroes
+            ("+0000abc", off(false, 0, 0)), // space separator can be ignored if immediately followed by alphas (GNU date behavior)
+        ] {
+            let mut s = input;
+            assert_eq!(timezone_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        for input in [
+            "+2500",    // invalid: hours > 24
+            "-2361",    // invalid: minutes > 60
+            "+2401",    // invalid: minutes > 0 when hours == 24
+            "+23 days", // invalid: ambiguous with relative time parsing
+        ] {
+            let mut s = input;
+            assert!(timezone_offset(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn timezone_name_without_offset() {
+        for (input, expected) in [
+            ("utc", off(false, 0, 0)),  // UTC
+            ("gmt", off(false, 0, 0)),  // UTC
+            ("z", off(false, 0, 0)),    // UTC
+            ("west", off(false, 1, 0)), // positive offset
+            ("cst", off(true, 6, 0)),   // negative offset
+            ("ist", off(false, 5, 30)), // positive offset with non-zero minutes
+            ("nst", off(true, 3, 30)),  // negative offset with non-zero minutes
+            ("z123", off(false, 0, 0)), // space separator can be ignored if immediately followed by digits (GNU date behavior)
+        ] {
+            let mut s = input;
+            assert_eq!(timezone_name_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        for input in [
+            "abc",    // invalid: non-existent timezone
+            "utcabc", // invalid: non-existent timezone
+        ] {
+            let mut s = input;
+            assert!(timezone_name_offset(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn timezone_name_with_offset() {
+        for (input, expected) in [
+            ("utc+5:30", off(false, 5, 30)),     // UTC with possitive offset
+            ("utc-5:30", off(true, 5, 30)),      // UTC with negative offset
+            ("utc +5:30", off(false, 5, 30)),    // space after timezone name
+            ("utc + 5 : 30", off(false, 5, 30)), // spaces
+            ("a+5:30", off(false, 6, 30)),       // merge two positive offsets (a=+1)
+            ("a-5:30", off(true, 4, 30)),        // merge positive and negative offsets (a=+1)
+            ("n-5:30", off(true, 6, 30)),        // merge two negative offsets (n=-1)
+            ("n+5:30", off(false, 4, 30)),       // merge negative and positive offsets (n=-1)
+            ("m+24", off(false, 36, 0)),         // maximum possible positive offset (m=+12)
+            ("y-24", off(true, 36, 0)),          // maximum possible negative offset (y=-12)
+        ] {
+            let mut s = input;
+            assert_eq!(timezone_name_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        for input in [
+            "abc+08:00",   // invalid: non-existent timezone
+            "utc+25",      // invalid: invalid offset
+            "utc+23 days", // invalid: ambiguous with relative time parsing
+        ] {
+            let mut s = input;
+            assert!(
+                timezone_name_offset(&mut s).is_err() || !s.is_empty(),
+                "{input}"
+            );
+        }
+    }
+}
@@ -1,14 +1,15 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.

-use super::s;
 use winnow::{
-    ascii::{alpha1, dec_uint},
+    ascii::alpha1,
    combinator::{alt, opt},
    ModalResult, Parser,
 };

-pub fn ordinal(input: &mut &str) -> ModalResult<i32> {
+use super::primitive::{dec_uint, s};
+
+pub(super) fn ordinal(input: &mut &str) -> ModalResult<i32> {
    alt((text_ordinal, number_ordinal)).parse_next(input)
 }

@@ -0,0 +1,144 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+//! Primitive combinators.
+
+use std::str::FromStr;
+
+use winnow::{
+    ascii::{digit1, multispace0, Uint},
+    combinator::{alt, delimited, not, opt, peek, preceded, repeat, separated},
+    error::{ContextError, ParserError, StrContext, StrContextValue},
+    stream::AsChar,
+    token::{none_of, one_of, take_while},
+    Parser,
+};
+
+/// Allow spaces and comments before a parser
+///
+/// Every token parser should be wrapped in this to allow spaces and comments.
+/// It is only preceding, because that allows us to check mandatory whitespace
+/// after running the parser.
+pub(super) fn s<'a, O, E>(p: impl Parser<&'a str, O, E>) -> impl Parser<&'a str, O, E>
+where
+    E: ParserError<&'a str>,
+{
+    preceded(space, p)
+}
+
+/// Parse the space in-between tokens
+///
+/// You probably want to use the [`s`] combinator instead.
+pub(super) fn space<'a, E>(input: &mut &'a str) -> winnow::Result<(), E>
+where
+    E: ParserError<&'a str>,
+{
+    separated(0.., multispace0, alt((comment, ignored_hyphen_or_plus))).parse_next(input)
+}
+
+/// A hyphen or plus is ignored when it is not followed by a digit
+///
+/// This includes being followed by a comment! Compare these inputs:
+/// ```txt
+/// - 12 weeks
+/// - (comment) 12 weeks
+/// ```
+/// The last comment should be ignored.
+///
+/// The plus is undocumented, but it seems to be ignored.
+fn ignored_hyphen_or_plus<'a, E>(input: &mut &'a str) -> winnow::Result<(), E>
+where
+    E: ParserError<&'a str>,
+{
+    (
+        alt(('-', '+')),
+        multispace0,
+        peek(not(take_while(1, AsChar::is_dec_digit))),
+    )
+        .void()
+        .parse_next(input)
+}
+
+/// Parse a comment
+///
+/// A comment is given between parentheses, which must be balanced. Any other
+/// tokens can be within the comment.
+fn comment<'a, E>(input: &mut &'a str) -> winnow::Result<(), E>
+where
+    E: ParserError<&'a str>,
+{
+    delimited(
+        '(',
+        repeat(0.., alt((none_of(['(', ')']).void(), comment))),
+        ')',
+    )
+    .parse_next(input)
+}
+
+/// Parse a signed decimal integer.
+///
+/// Rationale for not using `winnow::ascii::dec_int`: When upgrading winnow from
+/// 0.5 to 0.7, we discovered that `winnow::ascii::dec_int` now accepts only the
+/// following two forms:
+///
+/// - 0
+/// - [+-]?[1-9][0-9]*
+///
+/// Inputs like [+-]?0[0-9]* (e.g., `+012`) are therefore rejected. We provide a
+/// custom implementation to support such zero-prefixed integers.
+#[allow(unused)]
+pub(super) fn dec_int<'a, E>(input: &mut &'a str) -> winnow::Result<i32, E>
+where
+    E: ParserError<&'a str>,
+{
+    (opt(one_of(['+', '-'])), digit1)
+        .void()
+        .take()
+        .verify_map(|s: &str| s.parse().ok())
+        .parse_next(input)
+}
+
+/// Parse an unsigned decimal integer.
+///
+/// See the rationale for `dec_int` for why we don't use
+/// `winnow::ascii::dec_uint`.
+pub(super) fn dec_uint<'a, O, E>(input: &mut &'a str) -> winnow::Result<O, E>
+where
+    O: Uint + FromStr,
+    E: ParserError<&'a str>,
+{
+    dec_uint_str
+        .verify_map(|s: &str| s.parse().ok())
+        .parse_next(input)
+}
+
+/// Parse an unsigned decimal integer as a string slice.
+pub(super) fn dec_uint_str<'a, E>(input: &mut &'a str) -> winnow::Result<&'a str, E>
+where
+    E: ParserError<&'a str>,
+{
+    digit1.void().take().parse_next(input)
+}
+
+/// Parse a colon preceded by whitespace.
+pub(super) fn colon<'a, E>(input: &mut &'a str) -> winnow::Result<(), E>
+where
+    E: ParserError<&'a str>,
+{
+    s(':').void().parse_next(input)
+}
+
+/// Parse a plus or minus character optionally preceeded by whitespace.
+pub(super) fn plus_or_minus<'a, E>(input: &mut &'a str) -> winnow::Result<char, E>
+where
+    E: ParserError<&'a str>,
+{
+    s(alt(('+', '-'))).parse_next(input)
+}
+
+/// Create a context error with a reason.
+pub(super) fn ctx_err(reason: &'static str) -> ContextError {
+    let mut err = ContextError::new();
+    err.push(StrContext::Expected(StrContextValue::Description(reason)));
+    err
+}
@@ -0,0 +1,37 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+//! Parse a pure number string.
+//!
+//! From the GNU docs:
+//!
+//! > The precise interpretation of a pure decimal number depends on the
+//! > context in the date string.
+//! >
+//! >    If the decimal number is of the form YYYYMMDD and no other calendar
+//! > date item (*note Calendar date items::) appears before it in the date
+//! > string, then YYYY is read as the year, MM as the month number and DD as
+//! > the day of the month, for the specified calendar date.
+//! >
+//! >    If the decimal number is of the form HHMM and no other time of day
+//! > item appears before it in the date string, then HH is read as the hour
+//! > of the day and MM as the minute of the hour, for the specified time of
+//! > day.  MM can also be omitted.
+//! >
+//! >    If both a calendar date and a time of day appear to the left of a
+//! > number in the date string, but no relative item, then the number
+//! > overrides the year.
+
+use winnow::{ModalResult, Parser};
+
+use super::primitive::{dec_uint_str, s};
+
+/// Parse a pure number string and return it as an owned `String`. We return a
+/// `String` here because the interpretation of the number depends on the
+/// parsing context in which it appears. The interpretation is deferred to the
+/// result building phase.
+pub(super) fn parse(input: &mut &str) -> ModalResult<String> {
+    s(dec_uint_str)
+        .map(|s: &str| s.to_owned())
+        .parse_next(input)
+}
@@ -32,38 +32,42 @@
 //! > ‘this thursday’.

 use winnow::{
-    ascii::{alpha1, float},
+    ascii::alpha1,
    combinator::{alt, opt},
    ModalResult, Parser,
 };

-use super::{ordinal::ordinal, s};
+use super::{epoch::sec_and_nsec, ordinal::ordinal, primitive::s};

 #[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Relative {
+pub(crate) enum Relative {
    Years(i32),
    Months(i32),
    Days(i32),
    Hours(i32),
    Minutes(i32),
-    // Seconds are special because they can be given as a float
-    Seconds(f64),
+    Seconds(i64, u32),
 }

-impl Relative {
-    fn mul(self, n: i32) -> Self {
-        match self {
-            Self::Years(x) => Self::Years(n * x),
-            Self::Months(x) => Self::Months(n * x),
-            Self::Days(x) => Self::Days(n * x),
-            Self::Hours(x) => Self::Hours(n * x),
-            Self::Minutes(x) => Self::Minutes(n * x),
-            Self::Seconds(x) => Self::Seconds(f64::from(n) * x),
+impl TryFrom<Relative> for jiff::Span {
+    type Error = &'static str;
+
+    fn try_from(relative: Relative) -> Result<Self, Self::Error> {
+        match relative {
+            Relative::Years(years) => jiff::Span::new().try_years(years),
+            Relative::Months(months) => jiff::Span::new().try_months(months),
+            Relative::Days(days) => jiff::Span::new().try_days(days),
+            Relative::Hours(hours) => jiff::Span::new().try_hours(hours),
+            Relative::Minutes(minutes) => jiff::Span::new().try_minutes(minutes),
+            Relative::Seconds(seconds, nanoseconds) => jiff::Span::new()
+                .try_seconds(seconds)
+                .and_then(|span| span.try_nanoseconds(nanoseconds)),
        }
+        .map_err(|_| "relative value is invalid")
    }
 }

-pub fn parse(input: &mut &str) -> ModalResult<Relative> {
+pub(super) fn parse(input: &mut &str) -> ModalResult<Relative> {
    alt((
        s("tomorrow").value(Relative::Days(1)),
        s("yesterday").value(Relative::Days(-1)),
@@ -71,24 +75,48 @@ pub fn parse(input: &mut &str) -> ModalResult<Relative> {
        s("today").value(Relative::Days(0)),
        s("now").value(Relative::Days(0)),
        seconds,
-        other,
+        displacement,
    ))
    .parse_next(input)
 }

 fn seconds(input: &mut &str) -> ModalResult<Relative> {
    (
-        opt(alt((s(float), ordinal.map(|x| x as f64)))),
+        opt(alt((s('+').value(1), s('-').value(-1)))),
+        sec_and_nsec,
        s(alpha1).verify(|s: &str| matches!(s, "seconds" | "second" | "sec" | "secs")),
        ago,
    )
-        .map(|(n, _, ago)| Relative::Seconds(n.unwrap_or(1.0) * if ago { -1.0 } else { 1.0 }))
+        .verify_map(|(sign, (sec, nsec), _, ago)| {
+            let sec = i64::try_from(sec).ok()?;
+            let sign = sign.unwrap_or(1) * if ago { -1 } else { 1 };
+            let (second, nanosecond) = match (sign, nsec) {
+                (-1, 0) => (-sec, 0),
+                // Truncate towards minus infinity.
+                (-1, _) => ((-sec).checked_sub(1)?, 1_000_000_000 - nsec),
+                _ => (sec, nsec),
+            };
+            Some(Relative::Seconds(second, nanosecond))
+        })
        .parse_next(input)
 }

-fn other(input: &mut &str) -> ModalResult<Relative> {
-    (opt(ordinal), integer_unit, ago)
-        .map(|(n, unit, ago)| unit.mul(n.unwrap_or(1) * if ago { -1 } else { 1 }))
+fn displacement(input: &mut &str) -> ModalResult<Relative> {
+    (opt(ordinal), s(alpha1), ago)
+        .verify_map(|(n, unit, ago): (Option<i32>, &str, bool)| {
+            let multiplier = n.unwrap_or(1) * if ago { -1 } else { 1 };
+            Some(match unit.strip_suffix('s').unwrap_or(unit) {
+                "year" => Relative::Years(multiplier),
+                "month" => Relative::Months(multiplier),
+                "fortnight" => Relative::Days(multiplier.checked_mul(14)?),
+                "week" => Relative::Days(multiplier.checked_mul(7)?),
+                "day" => Relative::Days(multiplier),
+                "hour" => Relative::Hours(multiplier),
+                "minute" | "min" => Relative::Minutes(multiplier),
+                "second" | "sec" => Relative::Seconds(multiplier as i64, 0),
+                _ => return None,
+            })
+        })
        .parse_next(input)
 }

@@ -96,23 +124,6 @@ fn ago(input: &mut &str) -> ModalResult<bool> {
    opt(s("ago")).map(|o| o.is_some()).parse_next(input)
 }

-fn integer_unit(input: &mut &str) -> ModalResult<Relative> {
-    s(alpha1)
-        .verify_map(|s: &str| {
-            Some(match s.strip_suffix('s').unwrap_or(s) {
-                "year" => Relative::Years(1),
-                "month" => Relative::Months(1),
-                "fortnight" => Relative::Days(14),
-                "week" => Relative::Days(7),
-                "day" => Relative::Days(1),
-                "hour" => Relative::Hours(1),
-                "minute" | "min" => Relative::Minutes(1),
-                _ => return None,
-            })
-        })
-        .parse_next(input)
-}
-
 #[cfg(test)]
 mod tests {
    use super::{parse, Relative};
@@ -121,16 +132,17 @@ mod tests {
    fn all() {
        for (s, rel) in [
            // Seconds
-            ("second", Relative::Seconds(1.0)),
-            ("sec", Relative::Seconds(1.0)),
-            ("seconds", Relative::Seconds(1.0)),
-            ("secs", Relative::Seconds(1.0)),
-            ("second ago", Relative::Seconds(-1.0)),
-            ("3 seconds", Relative::Seconds(3.0)),
-            ("3.5 seconds", Relative::Seconds(3.5)),
-            // ("+3.5 seconds", Relative::Seconds(3.5)),
-            ("3.5 seconds ago", Relative::Seconds(-3.5)),
-            ("-3.5 seconds ago", Relative::Seconds(3.5)),
+            ("second", Relative::Seconds(1, 0)),
+            ("sec", Relative::Seconds(1, 0)),
+            ("seconds", Relative::Seconds(1, 0)),
+            ("secs", Relative::Seconds(1, 0)),
+            ("second ago", Relative::Seconds(-1, 0)),
+            ("3 seconds", Relative::Seconds(3, 0)),
+            ("3.5 seconds", Relative::Seconds(3, 500_000_000)),
+            ("-3.5 seconds", Relative::Seconds(-4, 500_000_000)),
+            ("+3.5 seconds", Relative::Seconds(3, 500_000_000)),
+            ("3.5 seconds ago", Relative::Seconds(-4, 500_000_000)),
+            ("-3.5 seconds ago", Relative::Seconds(3, 500_000_000)),
            // Minutes
            ("minute", Relative::Minutes(1)),
            ("minutes", Relative::Minutes(1)),
@@ -176,7 +188,7 @@ mod tests {
            ("now", Relative::Days(0)),
            // This something
            ("this day", Relative::Days(0)),
-            ("this second", Relative::Seconds(0.0)),
+            ("this second", Relative::Seconds(0, 0)),
            ("this year", Relative::Years(0)),
            // Weird stuff
            ("next week ago", Relative::Days(-7)),
@@ -0,0 +1,340 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+//! Parse a timezone item. The timezone item must be at the beginning of the
+//! input string and in the `TZ="..."` format.
+//!
+//! From the GNU docs:
+//!
+//! > Normally, dates are interpreted using the rules of the current time zone,
+//! > which in turn are specified by the ‘TZ’ environment variable, or by a
+//! > system default if ‘TZ’ is not set. To specify a different set of default
+//! > time zone rules that apply just to one date, start the date with a string
+//! > of the form ‘TZ="RULE"’. The two quote characters (‘"’) must be present in
+//! > the date, and any quotes or backslashes within RULE must be escaped by a
+//! > backslash.
+
+use jiff::tz::{Offset, TimeZone};
+use winnow::{
+    combinator::{alt, delimited, opt, preceded, repeat},
+    stream::AsChar,
+    token::{one_of, take_while},
+    ModalResult, Parser,
+};
+
+use super::primitive::{dec_uint, plus_or_minus};
+
+pub(super) fn parse(input: &mut &str) -> ModalResult<TimeZone> {
+    delimited("TZ=\"", preceded(opt(':'), alt((posix, iana))), '"').parse_next(input)
+}
+
+/// Parse a posix (proleptic) timezone string (e.g., "UTC7", "JST-9").
+///
+/// TODO: This implementation is incomplete. It currently only parses the
+/// `STDOFFSET` part of the format.
+///
+/// From the GNU docs:
+///
+/// > The proleptic format is:
+/// >
+/// >   STDOFFSET[DST[OFFSET][,START[/TIME],END[/TIME]]]
+/// >
+/// > The STD string specifies the time zone abbreviation, which must be at
+/// > least three bytes long. ...
+/// >
+/// > The OFFSET specifies the time value you must add to the local time to
+/// > get a UTC value.  It has syntax like:
+/// >
+/// >   [+|-]HH[:MM[:SS]]
+/// >
+/// > This is positive if the local time zone is west of the Prime Meridian
+/// > and negative if it is east; this is opposite from the usual convention
+/// > that positive time zone offsets are east of the Prime Meridian.  The
+/// > hour HH must be between 0 and 24 and may be a single digit, and the
+/// > minutes MM and seconds SS, if present, must be between 0 and 59.
+fn posix(input: &mut &str) -> ModalResult<TimeZone> {
+    (take_while(3.., AsChar::is_alpha), posix_offset)
+        .verify_map(|(_, offset)| Offset::from_seconds(offset).ok().map(|o| o.to_time_zone()))
+        .parse_next(input)
+}
+
+/// Parse an IANA (geographical) timezone string (e.g., "Europe/Paris"). If the
+/// string is not a valid IANA timezone name, the UTC timezone is returned.
+///
+/// Compatibility notes:
+///
+/// - The implementation uses `jiff::tz::TimeZone::get()` to resolve time zones.
+///   Only canonical/aliased IANA names are accepted. Absolute file paths are
+///   not supported.
+/// - GNU `date` resolves time zones from the tzdata files under
+///   `/usr/share/zoneinfo` (respecting `TZDIR`) and also accepts an absolute
+///   path when the string starts with `/`.
+///
+/// From the GNU docs:
+///
+/// > If the format's CHARACTERS begin with ‘/’ it is an absolute file
+/// > name; otherwise the library looks for the file
+/// > ‘/usr/share/zoneinfo/CHARACTERS’.  The ‘zoneinfo’ directory contains
+/// > data files describing time zone rulesets in many different parts of the
+/// > world.  The names represent major cities, with subdirectories for
+/// > geographical areas; for example, ‘America/New_York’, ‘Europe/London’,
+/// > ‘Asia/Tokyo’.  These data files are installed by the system
+/// > administrator, who also sets ‘/etc/localtime’ to point to the data file
+/// > for the local time zone ruleset.
+fn iana(input: &mut &str) -> ModalResult<TimeZone> {
+    repeat(
+        0..,
+        alt((
+            preceded('\\', one_of(['\\', '"'])).map(|c: char| c.to_string()),
+            take_while(1, |c| c != '"' && c != '\\').map(str::to_string),
+        )),
+    )
+    .map(|parts: Vec<String>| parts.concat())
+    .map(|s| TimeZone::get(&s).unwrap_or(TimeZone::UTC))
+    .parse_next(input)
+}
+
+fn posix_offset(input: &mut &str) -> ModalResult<i32> {
+    let uint = dec_uint::<u32, _>;
+
+    (
+        opt(plus_or_minus),
+        alt((
+            (uint, preceded(':', uint), preceded(':', uint)).map(|(h, m, s)| (h, m, s)),
+            (uint, preceded(':', uint)).map(|(h, m)| (h, m, 0)),
+            uint.map(|h| (h, 0, 0)),
+        )),
+    )
+        .map(|(sign, (h, m, s))| {
+            // The sign is opposite from the usual convention:
+            // - Positive offsets are west of UTC.
+            // - Negative offsets are east of UTC.
+            let sign = if sign == Some('-') { 1 } else { -1 };
+
+            // - If hour is greater than 24, clamp it to 24.
+            // - If minute is greater than 59, clamp it to 59.
+            // - If second is greater than 59, clamp it to 59.
+            let h = h.min(24) as i32;
+            let m = m.min(59) as i32;
+            let s = s.min(59) as i32;
+
+            sign * (h * 3600 + m * 60 + s)
+        })
+        .parse_next(input)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn tz_rule() {
+        // empty string
+        for (input, expected) in [
+            (r#"TZ="""#, "UTC"),
+            (r#"TZ=":""#, "UTC"),
+            (r#"TZ="  ""#, "UTC"),
+            (r#"TZ=":  ""#, "UTC"),
+        ] {
+            let mut s = input;
+            assert_eq!(
+                parse(&mut s).unwrap().iana_name(),
+                Some(expected),
+                "{input}"
+            );
+        }
+
+        // iana
+        for (input, expected) in [
+            (r#"TZ="Etc/Zulu""#, "Etc/Zulu"),
+            (r#"TZ=":Etc/Zulu""#, "Etc/Zulu"),
+            (r#"TZ="America/New_York""#, "America/New_York"),
+            (r#"TZ=":America/New_York""#, "America/New_York"),
+            (r#"TZ="Asia/Tokyo""#, "Asia/Tokyo"),
+            (r#"TZ=":Asia/Tokyo""#, "Asia/Tokyo"),
+            (r#"TZ="Unknown/Timezone""#, "UTC"),
+            (r#"TZ=":Unknown/Timezone""#, "UTC"),
+        ] {
+            let mut s = input;
+            assert_eq!(
+                parse(&mut s).unwrap().iana_name(),
+                Some(expected),
+                "{input}"
+            );
+        }
+
+        // posix
+        for (input, expected) in [
+            (r#"TZ="UTC0""#, 0),
+            (r#"TZ=":UTC0""#, 0),
+            (r#"TZ="UTC+5""#, -5 * 3600),
+            (r#"TZ=":UTC+5""#, -5 * 3600),
+            (r#"TZ="UTC-5""#, 5 * 3600),
+            (r#"TZ=":UTC-5""#, 5 * 3600),
+            (r#"TZ="UTC+5:20""#, -(5 * 3600 + 20 * 60)),
+            (r#"TZ=":UTC+5:20""#, -(5 * 3600 + 20 * 60)),
+            (r#"TZ="UTC-5:20""#, 5 * 3600 + 20 * 60),
+            (r#"TZ=":UTC-5:20""#, 5 * 3600 + 20 * 60),
+            (r#"TZ="UTC+5:20:15""#, -(5 * 3600 + 20 * 60 + 15)),
+            (r#"TZ=":UTC+5:20:15""#, -(5 * 3600 + 20 * 60 + 15)),
+            (r#"TZ="UTC-5:20:15""#, 5 * 3600 + 20 * 60 + 15),
+            (r#"TZ=":UTC-5:20:15""#, 5 * 3600 + 20 * 60 + 15),
+        ] {
+            let mut s = input;
+            assert_eq!(
+                parse(&mut s).unwrap().to_fixed_offset().unwrap().seconds(),
+                expected,
+                "{input}"
+            );
+        }
+
+        // invalid
+        for input in [
+            r#"UTC"#,      // missing "TZ="
+            r#"tz="UTC""#, // lowercase "tz"
+            r#"TZ=UTC"#,   // missing quotes
+        ] {
+            let mut s = input;
+            assert!(parse(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn parse_iana() {
+        for (input, expected) in [
+            ("UTC", "UTC"),                           // utc timezone
+            ("Etc/Zulu", "Etc/Zulu"),                 // etc timezone
+            ("America/New_York", "America/New_York"), // named timezone
+            ("Asia/Tokyo", "Asia/Tokyo"),             // named timezone
+            ("Unknown/Timezone", "UTC"),              // unknown timezone
+        ] {
+            let mut s = input;
+            assert_eq!(iana(&mut s).unwrap().iana_name(), Some(expected), "{input}");
+        }
+    }
+
+    #[test]
+    fn parse_posix() {
+        let to_seconds = |input: &str| {
+            let mut s = input;
+            posix(&mut s).unwrap().to_fixed_offset().unwrap().seconds()
+        };
+
+        // hour
+        for (input, expected) in [
+            ("UTC0", 0),
+            ("UTC+0", 0),
+            ("UTC-0", 0),
+            ("UTC000", 0),
+            ("UTC+5", -5 * 3600),
+            ("UTC-5", 5 * 3600),
+            ("ABC0", 0),
+            ("ABC+5", -5 * 3600),
+            ("ABC-5", 5 * 3600),
+        ] {
+            assert_eq!(to_seconds(input), expected, "{input}");
+        }
+
+        // hour:minute
+        for (input, expected) in [
+            ("UTC0:0", 0),
+            ("UTC+0:0", 0),
+            ("UTC-0:0", 0),
+            ("UTC00:00", 0),
+            ("UTC+5:20", -(5 * 3600 + 20 * 60)),
+            ("UTC-5:20", 5 * 3600 + 20 * 60),
+            ("ABC0:0", 0),
+            ("ABC+5:20", -(5 * 3600 + 20 * 60)),
+            ("ABC-5:20", 5 * 3600 + 20 * 60),
+        ] {
+            assert_eq!(to_seconds(input), expected, "{input}");
+        }
+
+        // hour:minute:second
+        for (input, expected) in [
+            ("UTC0:0:0", 0),
+            ("UTC+0:0:0", 0),
+            ("UTC-0:0:0", 0),
+            ("UTC00:00:00", 0),
+            ("UTC+5:20:15", -(5 * 3600 + 20 * 60 + 15)),
+            ("UTC-5:20:15", 5 * 3600 + 20 * 60 + 15),
+            ("ABC0:0:0", 0),
+            ("ABC+5:20:15", -(5 * 3600 + 20 * 60 + 15)),
+            ("ABC-5:20:15", 5 * 3600 + 20 * 60 + 15),
+        ] {
+            assert_eq!(to_seconds(input), expected, "{input}");
+        }
+
+        // invalid
+        for input in [
+            "AB",  // too short
+            "A1C", // not just letters
+        ] {
+            let mut s = input;
+            assert!(posix(&mut s).is_err(), "{input}");
+        }
+    }
+
+    #[test]
+    fn parse_posix_offset() {
+        // hour
+        for (input, expected) in [
+            ("0", 0),           // zero hour
+            ("00", 0),          // zero hour, two digits
+            ("000", 0),         // zero hour, three digits
+            ("+0", 0),          // zero hour, explicit plus
+            ("-0", 0),          // zero hour, explicit minus
+            ("5", -5 * 3600),   // positive hour
+            ("-5", 5 * 3600),   // negative hour
+            ("005", -5 * 3600), // positive hour with leading zeros
+            ("-05", 5 * 3600),  // negative hour with leading zeros
+            ("25", -24 * 3600), // hour > 24, clamps to 24
+            ("-25", 24 * 3600), // hour > 24, clamps to 24
+        ] {
+            let mut s = input;
+            assert_eq!(posix_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        // hour:minute
+        for (input, expected) in [
+            ("0:0", 0),                         // zero hour and minute
+            ("00:00", 0),                       // zero hour and minute, two digits
+            ("000:000", 0),                     // zero hour and minute, three digits
+            ("+0:0", 0),                        // zero hour and minute, explicit plus
+            ("-0:0", 0),                        // zero hour and minute, explicit minus
+            ("5:20", -(5 * 3600 + 20 * 60)),    // positive hour and minute
+            ("-5:20", 5 * 3600 + 20 * 60),      // negative hour and minute
+            ("005:020", -(5 * 3600 + 20 * 60)), // positive hour and minute with leading zeros
+            ("-05:20", 5 * 3600 + 20 * 60),     // negative hour and minute with leading zeros
+            ("25:20", -(24 * 3600 + 20 * 60)),  // hour > 24, clamps to 24
+            ("-25:20", 24 * 3600 + 20 * 60),    // hour > 24, clamps to 24
+            ("5:60", -(5 * 3600 + 59 * 60)),    // minute > 59, clamps to 59
+            ("-5:60", 5 * 3600 + 59 * 60),      // minute > 59, clamps to 59
+        ] {
+            let mut s = input;
+            assert_eq!(posix_offset(&mut s).unwrap(), expected, "{input}");
+        }
+
+        // hour:minute:second
+        for (input, expected) in [
+            ("0:0:0", 0),                                // zero hour, minute, and second
+            ("00:00:00", 0),    // zero hour, minute, and second, two digits
+            ("000:000:000", 0), // zero hour, minute, and second, three digits
+            ("+0:0:0", 0),      // zero hour, minute, and second, explicit plus
+            ("-0:0:0", 0),      // zero hour, minute, and second, explicit minus
+            ("5:20:15", -(5 * 3600 + 20 * 60 + 15)), // positive hour, minute, and second
+            ("-5:20:15", 5 * 3600 + 20 * 60 + 15), // negative hour, minute, and second
+            ("005:020:015", -(5 * 3600 + 20 * 60 + 15)), // positive hour, minute, and second with leading zeros
+            ("-05:20:15", 5 * 3600 + 20 * 60 + 15), // negative hour, minute, and second with leading zeros
+            ("25:20:15", -(24 * 3600 + 20 * 60 + 15)), // hour > 24, clamps to 24
+            ("-25:20:15", 24 * 3600 + 20 * 60 + 15), // hour > 24, clamps to 24
+            ("5:60:15", -(5 * 3600 + 59 * 60 + 15)), // minute > 59, clamps to 59
+            ("-5:60:15", 5 * 3600 + 59 * 60 + 15),  // minute > 59, clamps to 59
+            ("5:20:60", -(5 * 3600 + 20 * 60 + 59)), // second > 59, clamps to 59
+            ("-5:20:60", 5 * 3600 + 20 * 60 + 59),  // second > 59, clamps to 59
+        ] {
+            let mut s = input;
+            assert_eq!(posix_offset(&mut s).unwrap(), expected, "{input}");
+        }
+    }
+}
@@ -21,11 +21,15 @@
 //! >
 //! > A comma following a day of the week item is ignored.

-use winnow::{ascii::alpha1, combinator::opt, seq, ModalResult, Parser};
+use winnow::{
+    ascii::alpha1,
+    combinator::{opt, terminated},
+    seq, ModalResult, Parser,
+};

-use super::{ordinal::ordinal, s};
+use super::{ordinal::ordinal, primitive::s};

-#[derive(PartialEq, Eq, Debug)]
+#[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub(crate) enum Day {
    Monday,
    Tuesday,
@@ -37,28 +41,30 @@ pub(crate) enum Day {
 }

 #[derive(PartialEq, Eq, Debug)]
-pub struct Weekday {
+pub(crate) struct Weekday {
    pub(crate) offset: i32,
    pub(crate) day: Day,
 }

-impl From<Day> for chrono::Weekday {
+impl From<Day> for jiff::civil::Weekday {
    fn from(value: Day) -> Self {
        match value {
-            Day::Monday => chrono::Weekday::Mon,
-            Day::Tuesday => chrono::Weekday::Tue,
-            Day::Wednesday => chrono::Weekday::Wed,
-            Day::Thursday => chrono::Weekday::Thu,
-            Day::Friday => chrono::Weekday::Fri,
-            Day::Saturday => chrono::Weekday::Sat,
-            Day::Sunday => chrono::Weekday::Sun,
+            Day::Monday => jiff::civil::Weekday::Monday,
+            Day::Tuesday => jiff::civil::Weekday::Tuesday,
+            Day::Wednesday => jiff::civil::Weekday::Wednesday,
+            Day::Thursday => jiff::civil::Weekday::Thursday,
+            Day::Friday => jiff::civil::Weekday::Friday,
+            Day::Saturday => jiff::civil::Weekday::Saturday,
+            Day::Sunday => jiff::civil::Weekday::Sunday,
        }
    }
 }
-pub fn parse(input: &mut &str) -> ModalResult<Weekday> {
+
+/// Parse a weekday item.
+pub(super) fn parse(input: &mut &str) -> ModalResult<Weekday> {
    seq!(Weekday {
        offset: opt(ordinal).map(|o| o.unwrap_or_default()),
-        day: day,
+        day: terminated(day, opt(s(","))),
    })
    .parse_next(input)
 }
@@ -134,4 +140,17 @@ mod tests {
            );
        }
    }
+
+    #[test]
+    fn optional_comma() {
+        for mut s in ["monday,", "mon,", "mon.,", "mon. ,"] {
+            assert_eq!(
+                parse(&mut s).unwrap(),
+                Weekday {
+                    offset: 0,
+                    day: Day::Monday,
+                }
+            );
+        }
+    }
 }
--- a/Show More
+++ b/Show More