version 0.9.10

Fixes #104

.github/workflows/ci.yml

@@ -1,20 +0,0 @@
-name: Rust CI
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build
-        run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose --workspace

.github/workflows/cicd.yml

@@ -0,0 +1,57 @@
+name: "CICD"
+on: [push, pull_request]
+permissions:
+  contents: read
+  pull-requests: write
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - run: cargo test --all-features --verbose --workspace
+
+  coverage:
+    name: Test Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run tarpaulin
+        run: cargo tarpaulin --workspace --all-features --exclude xml_derive --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }}
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - run: rustup update
+      - run: rustup component add rustfmt clippy
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
+
+      - name: Run cargo clippy
+        run: cargo clippy -- -D warnings

Cargo.toml

@@ -2,9 +2,10 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.9.1"
+version = "0.9.10"
 edition = "2024"
 description = "A CalDAV server"
+documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -16,7 +17,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = false
+publish = true
 
 [features]
 debug = ["opentelemetry"]
@@ -48,7 +49,7 @@ rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
 lazy_static = "1.5"
-rstest = "0.25"
+rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +62,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.37" }
+quick-xml = { version = "0.38" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.90-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,4 +45,5 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000

Justfile

@@ -12,3 +12,6 @@ docs:
 
 docs-dev:
   mkdocs serve
+
+coverage:
+  cargo tarpaulin --workspace --exclude xml_derive

README.md

@@ -4,14 +4,15 @@ a CalDAV/CardDAV server
 
 > [!WARNING]
   RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
   you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

crates/caldav/src/calendar/methods/get.rs

@@ -8,7 +8,7 @@ use http::{HeaderValue, Method, StatusCode, header};
 use ical::generator::{Emitter, IcalCalendarBuilder};
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject, JournalObject, TodoObject};
+use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -43,24 +43,24 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if calendar.displayname.is_some() {
+    if let Some(displayname) = calendar.meta.displayname {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: calendar.displayname,
+            value: Some(displayname),
             params: None,
         });
     }
-    if calendar.description.is_some() {
+    if let Some(description) = calendar.meta.description {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: calendar.description,
+            value: Some(description),
             params: None,
         });
     }
-    if calendar.timezone_id.is_some() {
+    if let Some(timezone_id) = calendar.timezone_id {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: calendar.timezone_id,
+            value: Some(timezone_id),
             params: None,
         });
     }
@@ -68,19 +68,32 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     for object in &objects {
         vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(EventObject {
+            CalendarObjectComponent::Event(
+                EventObject {
                     event,
                     timezones: object_timezones,
                     ..
-            }) => {
+                },
+                overrides,
+            ) => {
                 timezones.extend(object_timezones);
                 ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
+                for _override in overrides {
+                    ical_calendar_builder =
+                        ical_calendar_builder.add_event(_override.event.clone());
                 }
-            CalendarObjectComponent::Todo(TodoObject(todo)) => {
+            }
+            CalendarObjectComponent::Todo(todo, overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_todo(_override.clone());
                 }
-            CalendarObjectComponent::Journal(JournalObject(journal)) => {
+            }
+            CalendarObjectComponent::Journal(journal, overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_journal(_override.clone());
+                }
             }
         }
     }

crates/caldav/src/calendar/methods/import.rs

@@ -9,8 +9,11 @@ use ical::{
     generator::Emitter,
     parser::{Component, ComponentMut},
 };
+use rustical_dav::header::Overwrite;
 use rustical_ical::{CalendarObject, CalendarObjectType};
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore, auth::Principal};
+use rustical_store::{
+    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
+};
 use std::io::BufReader;
 use tracing::instrument;
 
@@ -19,6 +22,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     Path((principal, cal_id)): Path<(String, String)>,
     user: Principal,
     State(resource_service): State<CalendarResourceService<C, S>>,
+    Overwrite(overwrite): Overwrite,
     body: String,
 ) -> Result<Response, Error> {
     if !user.is_principal(&principal) {
@@ -83,10 +87,12 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     let new_cal = Calendar {
         principal,
         id: cal_id,
+        meta: CalendarMetadata {
             displayname,
             order: 0,
             description,
             color: None,
+        },
         timezone_id,
         deleted_at: None,
         synctoken: 0,
@@ -96,7 +102,9 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     };
 
     let cal_store = resource_service.cal_store;
-    cal_store.import_calendar(new_cal, objects, false).await?;
+    cal_store
+        .import_calendar(new_cal, objects, overwrite)
+        .await?;
 
     Ok(StatusCode::OK.into_response())
 }

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -8,7 +8,7 @@ use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -46,7 +46,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcalendar")]
+#[xml(root = "mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -54,7 +54,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -112,11 +112,13 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
+        meta: CalendarMetadata {
             order: request.calendar_order.unwrap_or(0),
             displayname: request.displayname,
-        timezone_id,
             color: request.calendar_color,
             description: request.calendar_description,
+        },
+        timezone_id,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -1,310 +0,0 @@
-use crate::{Error, calendar_object::CalendarObjectPropWrapperName};
-use rustical_dav::xml::PropfindType;
-use rustical_ical::{CalendarObject, UtcDateTime};
-use rustical_store::{CalendarStore, calendar_store::CalendarQuery};
-use rustical_xml::XmlDeserialize;
-use std::ops::Deref;
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-pub(crate) struct TimeRangeElement {
-    #[xml(ty = "attr")]
-    pub(crate) start: Option<UtcDateTime>,
-    #[xml(ty = "attr")]
-    pub(crate) end: Option<UtcDateTime>,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
-struct ParamFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-struct TextMatchElement {
-    #[xml(ty = "attr")]
-    collation: String,
-    #[xml(ty = "attr")]
-    // "yes" or "no", default: "no"
-    negate_condition: Option<String>,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
-pub(crate) struct PropFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    time_range: Option<TimeRangeElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    text_match: Option<TextMatchElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    param_filter: Vec<ParamFilterElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
-pub(crate) struct CompFilterElement {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) is_not_defined: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) time_range: Option<TimeRangeElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    pub(crate) prop_filter: Vec<PropFilterElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    pub(crate) comp_filter: Vec<CompFilterElement>,
-
-    #[xml(ty = "attr")]
-    pub(crate) name: String,
-}
-
-impl CompFilterElement {
-    // match the VCALENDAR part
-    pub fn matches_root(&self, cal_object: &CalendarObject) -> bool {
-        let comp_vcal = self.name == "VCALENDAR";
-        match (self.is_not_defined, comp_vcal) {
-            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
-            // Client is asking for something different than a vcalendar
-            (None, false) => return false,
-            _ => {}
-        };
-
-        if self.time_range.is_some() {
-            // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
-            return false;
-        }
-
-        // TODO: Implement prop-filter at some point
-
-        // Apply sub-comp-filters on VEVENT/VTODO/VJOURNAL component
-        if self
-            .comp_filter
-            .iter()
-            .all(|filter| filter.matches(cal_object))
-        {
-            return true;
-        }
-
-        false
-    }
-
-    // match the VEVENT/VTODO/VJOURNAL part
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
-        let comp_name_matches = self.name == cal_object.get_component_name();
-        match (self.is_not_defined, comp_name_matches) {
-            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
-            // Client is asking for something different than a vcalendar
-            (None, false) => return false,
-            _ => {}
-        };
-
-        // TODO: Implement prop-filter (and comp-filter?) at some point
-
-        if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start {
-                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
-                    if start.deref() > &last_occurence.utc() {
-                        return false;
-                    }
-                };
-            }
-            if let Some(end) = &time_range.end {
-                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
-                    if end.deref() < &first_occurence.utc() {
-                        return false;
-                    }
-                };
-            }
-        }
-        true
-    }
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
-pub(crate) struct FilterElement {
-    // This comp-filter matches on VCALENDAR
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) comp_filter: CompFilterElement,
-}
-
-impl FilterElement {
-    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
-        self.comp_filter.matches_root(cal_object)
-    }
-}
-
-impl From<&FilterElement> for CalendarQuery {
-    fn from(value: &FilterElement) -> Self {
-        let comp_filter_vcalendar = &value.comp_filter;
-        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
-            // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
-            // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
-                if let Some(time_range) = &comp_filter.time_range {
-                    let start = time_range.start.as_ref().map(|start| start.date_naive());
-                    let end = time_range.end.as_ref().map(|end| end.date_naive());
-                    return CalendarQuery {
-                        time_start: start,
-                        time_end: end,
-                    };
-                }
-            }
-        }
-        Default::default()
-    }
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[allow(dead_code)]
-// <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, filter, timezone?)>
-pub struct CalendarQueryRequest {
-    #[xml(ty = "untagged")]
-    pub prop: PropfindType<CalendarObjectPropWrapperName>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) filter: Option<FilterElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) timezone: Option<String>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) timezone_id: Option<String>,
-}
-
-impl From<&CalendarQueryRequest> for CalendarQuery {
-    fn from(value: &CalendarQueryRequest) -> Self {
-        value
-            .filter
-            .as_ref()
-            .map(CalendarQuery::from)
-            .unwrap_or_default()
-    }
-}
-
-pub async fn get_objects_calendar_query<C: CalendarStore>(
-    cal_query: &CalendarQueryRequest,
-    principal: &str,
-    cal_id: &str,
-    store: &C,
-) -> Result<Vec<CalendarObject>, Error> {
-    let mut objects = store
-        .calendar_query(principal, cal_id, cal_query.into())
-        .await?;
-    if let Some(filter) = &cal_query.filter {
-        objects.retain(|object| filter.matches(object));
-    }
-    Ok(objects)
-}
-
-#[cfg(test)]
-mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
-    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
-                PropFilterElement, TextMatchElement,
-            },
-        },
-        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
-    };
-
-    #[test]
-    fn calendar_query_7_8_7() {
-        const INPUT: &str = r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-                <D:prop xmlns:D="DAV:">
-                    <D:getetag/>
-                    <C:calendar-data/>
-                </D:prop>
-                <C:filter>
-                <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
-                        </C:prop-filter>
-                    </C:comp-filter>
-                </C:comp-filter>
-                </C:filter>
-            </C:calendar-query>
-        "#;
-
-        let report = ReportRequest::parse_str(INPUT).unwrap();
-        let calendar_query: CalendarQueryRequest =
-            if let ReportRequest::CalendarQuery(query) = report {
-                query
-            } else {
-                panic!()
-            };
-        assert_eq!(
-            calendar_query,
-            CalendarQueryRequest {
-                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
-                    vec![
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::Getetag,
-                        ),
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(Default::default())
-                        ),
-                    ],
-                    vec![]
-                )),
-                filter: Some(FilterElement {
-                    comp_filter: CompFilterElement {
-                        is_not_defined: None,
-                        time_range: None,
-                        prop_filter: vec![],
-                        comp_filter: vec![CompFilterElement {
-                            prop_filter: vec![PropFilterElement {
-                                name: "ATTENDEE".to_owned(),
-                                text_match: Some(TextMatchElement {
-                                    collation: "i;ascii-casemap".to_owned(),
-                                    negate_condition: None
-                                }),
-                                is_not_defined: None,
-                                param_filter: vec![ParamFilterElement {
-                                    is_not_defined: None,
-                                    name: "PARTSTAT".to_owned(),
-                                    text_match: Some(TextMatchElement {
-                                        collation: "i;ascii-casemap".to_owned(),
-                                        negate_condition: None
-                                    }),
-                                }],
-                                time_range: None
-                            }],
-                            comp_filter: vec![],
-                            is_not_defined: None,
-                            name: "VEVENT".to_owned(),
-                            time_range: None
-                        }],
-                        name: "VCALENDAR".to_owned()
-                    }
-                }),
-                timezone: None,
-                timezone_id: None
-            }
-        )
-    }
-}

crates/caldav/src/calendar/methods/report/calendar_query/elements.rs

@@ -0,0 +1,194 @@
+use crate::calendar_object::CalendarObjectPropWrapperName;
+use rustical_dav::xml::PropfindType;
+use rustical_ical::{CalendarObject, UtcDateTime};
+use rustical_store::calendar_store::CalendarQuery;
+use rustical_xml::XmlDeserialize;
+use std::ops::Deref;
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+pub(crate) struct TimeRangeElement {
+    #[xml(ty = "attr")]
+    pub(crate) start: Option<UtcDateTime>,
+    #[xml(ty = "attr")]
+    pub(crate) end: Option<UtcDateTime>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
+pub struct ParamFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+pub struct TextMatchElement {
+    #[xml(ty = "attr")]
+    pub(crate) collation: String,
+    #[xml(ty = "attr")]
+    // "yes" or "no", default: "no"
+    pub(crate) negate_condition: Option<String>,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
+pub(crate) struct PropFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) time_range: Option<TimeRangeElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) text_match: Option<TextMatchElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) param_filter: Vec<ParamFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
+pub(crate) struct CompFilterElement {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) is_not_defined: Option<()>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) time_range: Option<TimeRangeElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) prop_filter: Vec<PropFilterElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
+    pub(crate) comp_filter: Vec<CompFilterElement>,
+
+    #[xml(ty = "attr")]
+    pub(crate) name: String,
+}
+
+impl CompFilterElement {
+    // match the VCALENDAR part
+    pub fn matches_root(&self, cal_object: &CalendarObject) -> bool {
+        let comp_vcal = self.name == "VCALENDAR";
+        match (self.is_not_defined, comp_vcal) {
+            // Client wants VCALENDAR to not exist but we are a VCALENDAR
+            (Some(()), true) => return false,
+            // Client is asking for something different than a vcalendar
+            (None, false) => return false,
+            _ => {}
+        };
+
+        if self.time_range.is_some() {
+            // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
+            return false;
+        }
+
+        // TODO: Implement prop-filter at some point
+
+        // Apply sub-comp-filters on VEVENT/VTODO/VJOURNAL component
+        if self
+            .comp_filter
+            .iter()
+            .all(|filter| filter.matches(cal_object))
+        {
+            return true;
+        }
+
+        false
+    }
+
+    // match the VEVENT/VTODO/VJOURNAL part
+    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+        let comp_name_matches = self.name == cal_object.get_component_name();
+        match (self.is_not_defined, comp_name_matches) {
+            // Client wants VCALENDAR to not exist but we are a VCALENDAR
+            (Some(()), true) => return false,
+            // Client is asking for something different than a vcalendar
+            (None, false) => return false,
+            _ => {}
+        };
+
+        // TODO: Implement prop-filter (and comp-filter?) at some point
+
+        if let Some(time_range) = &self.time_range {
+            if let Some(start) = &time_range.start
+                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
+                && start.deref() > &last_occurence.utc()
+            {
+                return false;
+            }
+            if let Some(end) = &time_range.end
+                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
+                && end.deref() < &first_occurence.utc()
+            {
+                return false;
+            }
+        }
+        true
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
+pub(crate) struct FilterElement {
+    // This comp-filter matches on VCALENDAR
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) comp_filter: CompFilterElement,
+}
+
+impl FilterElement {
+    pub fn matches(&self, cal_object: &CalendarObject) -> bool {
+        self.comp_filter.matches_root(cal_object)
+    }
+}
+
+impl From<&FilterElement> for CalendarQuery {
+    fn from(value: &FilterElement) -> Self {
+        let comp_filter_vcalendar = &value.comp_filter;
+        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
+            // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
+            // whatever we get first
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
+                && let Some(time_range) = &comp_filter.time_range
+            {
+                let start = time_range.start.as_ref().map(|start| start.date_naive());
+                let end = time_range.end.as_ref().map(|end| end.date_naive());
+                return CalendarQuery {
+                    time_start: start,
+                    time_end: end,
+                };
+            }
+        }
+        Default::default()
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[allow(dead_code)]
+// <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, filter, timezone?)>
+pub struct CalendarQueryRequest {
+    #[xml(ty = "untagged")]
+    pub prop: PropfindType<CalendarObjectPropWrapperName>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) filter: Option<FilterElement>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) timezone: Option<String>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) timezone_id: Option<String>,
+}
+
+impl From<&CalendarQueryRequest> for CalendarQuery {
+    fn from(value: &CalendarQueryRequest) -> Self {
+        value
+            .filter
+            .as_ref()
+            .map(CalendarQuery::from)
+            .unwrap_or_default()
+    }
+}

crates/caldav/src/calendar/methods/report/calendar_query/mod.rs

@@ -0,0 +1,120 @@
+use crate::Error;
+use rustical_ical::CalendarObject;
+use rustical_store::CalendarStore;
+
+mod elements;
+pub(crate) use elements::*;
+
+pub async fn get_objects_calendar_query<C: CalendarStore>(
+    cal_query: &CalendarQueryRequest,
+    principal: &str,
+    cal_id: &str,
+    store: &C,
+) -> Result<Vec<CalendarObject>, Error> {
+    let mut objects = store
+        .calendar_query(principal, cal_id, cal_query.into())
+        .await?;
+    if let Some(filter) = &cal_query.filter {
+        objects.retain(|object| filter.matches(object));
+    }
+    Ok(objects)
+}
+
+#[cfg(test)]
+mod tests {
+    use rustical_dav::xml::PropElement;
+    use rustical_xml::XmlDocument;
+
+    use crate::{
+        calendar::methods::report::{
+            ReportRequest,
+            calendar_query::{
+                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
+                PropFilterElement, TextMatchElement,
+            },
+        },
+        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
+    };
+
+    #[test]
+    fn calendar_query_7_8_7() {
+        const INPUT: &str = r#"
+            <?xml version="1.0" encoding="utf-8" ?>
+            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
+                <D:prop xmlns:D="DAV:">
+                    <D:getetag/>
+                    <C:calendar-data/>
+                </D:prop>
+                <C:filter>
+                <C:comp-filter name="VCALENDAR">
+                    <C:comp-filter name="VEVENT">
+                        <C:prop-filter name="ATTENDEE">
+                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
+                            <C:param-filter name="PARTSTAT">
+                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
+                            </C:param-filter>
+                        </C:prop-filter>
+                    </C:comp-filter>
+                </C:comp-filter>
+                </C:filter>
+            </C:calendar-query>
+        "#;
+
+        let report = ReportRequest::parse_str(INPUT).unwrap();
+        let calendar_query: CalendarQueryRequest =
+            if let ReportRequest::CalendarQuery(query) = report {
+                query
+            } else {
+                panic!()
+            };
+        assert_eq!(
+            calendar_query,
+            CalendarQueryRequest {
+                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
+                    vec![
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::Getetag,
+                        ),
+                        CalendarObjectPropWrapperName::CalendarObject(
+                            CalendarObjectPropName::CalendarData(Default::default())
+                        ),
+                    ],
+                    vec![]
+                )),
+                filter: Some(FilterElement {
+                    comp_filter: CompFilterElement {
+                        is_not_defined: None,
+                        time_range: None,
+                        prop_filter: vec![],
+                        comp_filter: vec![CompFilterElement {
+                            prop_filter: vec![PropFilterElement {
+                                name: "ATTENDEE".to_owned(),
+                                text_match: Some(TextMatchElement {
+                                    collation: "i;ascii-casemap".to_owned(),
+                                    negate_condition: None
+                                }),
+                                is_not_defined: None,
+                                param_filter: vec![ParamFilterElement {
+                                    is_not_defined: None,
+                                    name: "PARTSTAT".to_owned(),
+                                    text_match: Some(TextMatchElement {
+                                        collation: "i;ascii-casemap".to_owned(),
+                                        negate_condition: None
+                                    }),
+                                }],
+                                time_range: None
+                            }],
+                            comp_filter: vec![],
+                            is_not_defined: None,
+                            name: "VEVENT".to_owned(),
+                            time_range: None
+                        }],
+                        name: "VCALENDAR".to_owned()
+                    }
+                }),
+                timezone: None,
+                timezone_id: None
+            }
+        )
+    }
+}

crates/caldav/src/calendar/resource.rs

@@ -128,10 +128,10 @@ impl Resource for CalendarResource {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.color.clone())
+                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
                     CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
@@ -146,7 +146,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -187,11 +187,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.color = color;
+                    self.cal.meta.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.description = description;
+                    self.cal.meta.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
@@ -225,18 +225,18 @@ impl Resource for CalendarResource {
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id {
+                    if let Some(tzid) = &timezone_id
-                        if !vtimezones_rs::VTIMEZONES.contains_key(tzid) {
+                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
+                    {
                         return Err(rustical_dav::Error::BadRequest(format!(
                             "Invalid timezone-id: {tzid}"
                         )));
                     }
-                    }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.order = order.unwrap_or_default();
+                    self.cal.meta.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
@@ -264,11 +264,11 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.color = None;
+                    self.cal.meta.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.description = None;
+                    self.cal.meta.description = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
@@ -277,7 +277,7 @@ impl Resource for CalendarResource {
                 }
                 CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
-                    self.cal.order = 0;
+                    self.cal.meta.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
@@ -300,10 +300,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.displayname.as_deref()
+        self.cal.meta.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.displayname = name;
+        self.cal.meta.displayname = name;
         Ok(())
     }
 

crates/caldav/src/calendar/test_files/propfind.outputs

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
+<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
     <href>/caldav/principal/user/calendar/</href>
     <propstat>
         <prop>
@@ -33,7 +33,7 @@
 
 
 <?xml version="1.0" encoding="utf-8"?>
-<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
+<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
     <href>/caldav/principal/user/calendar/</href>
     <propstat>
         <prop>

crates/caldav/src/calendar/tests.rs

@@ -4,7 +4,7 @@ use rustical_store::auth::Principal;
 use rustical_xml::XmlSerializeRoot;
 use serde_json::from_str;
 
-// #[tokio::test]
+#[tokio::test]
 async fn test_propfind() {
     let requests: Vec<_> = include_str!("./test_files/propfind.requests")
         .trim()

crates/caldav/src/calendar_object/methods.rs

@@ -11,7 +11,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::instrument;
+use tracing::{debug, instrument};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -78,9 +78,10 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(body) {
+    let object = match CalendarObject::from_ics(body.clone()) {
         Ok(obj) => obj,
         Err(_) => {
+            debug!("invalid calendar data:\n{body}");
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
         }
     };

crates/caldav/src/principal/prop.rs

@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),

crates/caldav/src/principal/tests.rs

@@ -35,6 +35,15 @@ async fn test_principal_resource(
         simplified_home_set: false,
     };
 
+    // We don't have any calendars here
+    assert!(
+        service
+            .get_members(&("user".to_owned(),))
+            .await
+            .unwrap()
+            .is_empty()
+    );
+
     assert!(matches!(
         service
             .get_resource(&("invalid-user".to_owned(),), true)
@@ -79,5 +88,5 @@ async fn test_propfind() {
         )
         .unwrap();
 
-    let output = response.serialize_to_string().unwrap();
+    let _output = response.serialize_to_string().unwrap();
 }

crates/carddav/src/addressbook/methods/mkcol.rs

@@ -22,7 +22,7 @@ pub struct MkcolAddressbookProp {
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = b"addressbook-description")]
+    #[xml(rename = "addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
@@ -34,7 +34,7 @@ pub struct PropElement<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"mkcol")]
+#[xml(root = "mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/carddav/src/principal/prop.rs

@@ -8,14 +8,14 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = b"principal-URL")]
+    #[xml(rename = "principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),

crates/dav/src/header/overwrite.rs

@@ -14,16 +14,12 @@ impl IntoResponse for InvalidOverwriteHeader {
     }
 }
 
-#[derive(Debug, PartialEq, Default)]
+#[derive(Debug, PartialEq)]
-pub enum Overwrite {
+pub struct Overwrite(pub bool);
-    #[default]
-    T,
-    F,
-}
 
-impl Overwrite {
+impl Default for Overwrite {
-    pub fn is_true(&self) -> bool {
+    fn default() -> Self {
-        matches!(self, Self::T)
+        Self(true)
     }
 }
 
@@ -47,9 +43,48 @@ impl TryFrom<&[u8]> for Overwrite {
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         match value {
-            b"T" => Ok(Overwrite::T),
+            b"T" => Ok(Self(true)),
-            b"F" => Ok(Overwrite::F),
+            b"F" => Ok(Self(false)),
             _ => Err(InvalidOverwriteHeader),
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use axum::{extract::FromRequestParts, response::IntoResponse};
+    use http::Request;
+
+    use crate::header::Overwrite;
+
+    #[tokio::test]
+    async fn test_overwrite_default() {
+        let request = Request::put("asd").body(()).unwrap();
+        let (mut parts, _) = request.into_parts();
+        let overwrite = Overwrite::from_request_parts(&mut parts, &())
+            .await
+            .unwrap();
+        assert_eq!(
+            Overwrite(true),
+            overwrite,
+            "By default we want to overwrite!"
+        );
+    }
+
+    #[test]
+    fn test_overwrite() {
+        assert_eq!(
+            Overwrite(true),
+            Overwrite::try_from(b"T".as_slice()).unwrap()
+        );
+        assert_eq!(
+            Overwrite(false),
+            Overwrite::try_from(b"F".as_slice()).unwrap()
+        );
+        if let Err(err) = Overwrite::try_from(b"aslkdjlad".as_slice()) {
+            let _ = err.into_response();
+        } else {
+            unreachable!("should return error")
+        }
+    }
+}

crates/dav/src/privileges.rs

@@ -20,13 +20,13 @@ impl XmlSerialize for UserPrivilegeSet {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = b"privilege", flatten)]
+            #[xml(rename = "privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 

crates/dav/src/resource/methods/copy.rs

@@ -17,7 +17,7 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

crates/dav/src/resource/methods/delete.rs

@@ -60,12 +60,12 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match {
+    if let Some(if_none_match) = if_none_match
-        if resource.satisfies_if_none_match(&if_none_match) {
+        && resource.satisfies_if_none_match(&if_none_match)
+    {
         // Precondition failed
         return Err(crate::Error::PreconditionFailed.into());
     }
-    }
     resource_service
         .delete_resource(path_components, !no_trash)
         .await?;

crates/dav/src/resource/methods/mv.rs

@@ -17,7 +17,7 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
     State(resource_service): State<R>,
     depth: Option<Depth>,
     principal: R::Principal,
-    overwrite: Overwrite,
+    Overwrite(overwrite): Overwrite,
     matched_path: MatchedPath,
     header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
             .map_err(|_| crate::Error::Forbidden)?;
 
         if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
+            .copy_resource(&path, &dest_path, &principal, overwrite)
             .await?
         {
             // Overwritten

crates/dav/src/resource/methods/proppatch.rs

@@ -57,7 +57,7 @@ enum Operation<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = b"propertyupdate")]
+#[xml(root = "propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 

crates/dav/src/resources/mod.rs

@@ -1,3 +1,72 @@
 pub mod root;
 
 pub use root::{RootResource, RootResourceService};
+
+#[cfg(test)]
+pub mod test {
+    use crate::{
+        Error, Principal,
+        extensions::{CommonPropertiesExtension, CommonPropertiesProp},
+        namespace::NS_DAV,
+        privileges::UserPrivilegeSet,
+        resource::{PrincipalUri, Resource},
+        xml::{Resourcetype, ResourcetypeInner},
+    };
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipal(pub String);
+
+    impl Principal for TestPrincipal {
+        fn get_id(&self) -> &str {
+            &self.0
+        }
+    }
+
+    impl Resource for TestPrincipal {
+        type Prop = CommonPropertiesProp;
+        type Error = Error;
+        type Principal = Self;
+
+        fn is_collection(&self) -> bool {
+            true
+        }
+
+        fn get_resourcetype(&self) -> crate::xml::Resourcetype {
+            Resourcetype(&[ResourcetypeInner(Some(NS_DAV), "collection")])
+        }
+
+        fn get_prop(
+            &self,
+            principal_uri: &impl crate::resource::PrincipalUri,
+            principal: &Self::Principal,
+            prop: &<Self::Prop as rustical_xml::PropName>::Names,
+        ) -> Result<Self::Prop, Self::Error> {
+            <Self as CommonPropertiesExtension>::get_prop(self, principal_uri, principal, prop)
+        }
+
+        fn get_displayname(&self) -> Option<&str> {
+            Some(&self.0)
+        }
+
+        fn get_user_privileges(
+            &self,
+            principal: &Self::Principal,
+        ) -> Result<UserPrivilegeSet, Self::Error> {
+            Ok(UserPrivilegeSet::owner_only(
+                principal.get_id() == self.get_id(),
+            ))
+        }
+    }
+
+    #[derive(Debug, Clone)]
+    pub struct TestPrincipalUri;
+
+    impl PrincipalUri for TestPrincipalUri {
+        fn principal_collection(&self) -> String {
+            "/".to_owned()
+        }
+        fn principal_uri(&self, principal: &str) -> String {
+            format!("/{principal}/")
+        }
+    }
+}

crates/dav/src/resources/root.rs

@@ -105,3 +105,33 @@ impl<PRS: ResourceService<Principal = P> + Clone, P: Principal, PURI: PrincipalU
     for RootResourceService<PRS, P, PURI>
 {
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        resource::Resource,
+        resources::{
+            RootResource,
+            test::{TestPrincipal, TestPrincipalUri},
+        },
+    };
+
+    #[test]
+    fn test_root_resource() {
+        let resource = RootResource::<TestPrincipal, TestPrincipal>::default();
+        let propfind = RootResource::<TestPrincipal, TestPrincipal>::parse_propfind(
+            r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
+        )
+        .unwrap();
+
+        let _response = resource
+            .propfind(
+                "/",
+                &propfind.prop,
+                propfind.include.as_ref(),
+                &TestPrincipalUri,
+                &TestPrincipal("user".to_owned()),
+            )
+            .unwrap();
+    }
+}

crates/dav/src/xml/error.rs

@@ -1,12 +1,12 @@
 use rustical_xml::{XmlRootTag, XmlSerialize};
 
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = b"error")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "error")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T);

crates/dav/src/xml/multistatus.rs

@@ -22,8 +22,8 @@ pub struct PropstatElement<PropType: XmlSerialize> {
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
@@ -40,13 +40,13 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = b"response")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
@@ -59,8 +59,8 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&[u8]>,
+    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &[u8]>,
+    namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
@@ -86,18 +86,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = b"PUSH"
+    crate::namespace::NS_DAVPUSH = "PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = b"response", flatten)]
+    #[xml(rename = "response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }

crates/dav/src/xml/propfind.rs

@@ -7,7 +7,7 @@ use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;
 
 #[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
-#[xml(root = b"propfind", ns = "crate::namespace::NS_DAV")]
+#[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
     pub prop: PropfindType<PN>,
@@ -66,6 +66,9 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 Event::Text(_) | Event::CData(_) => {
                     return Err(XmlError::UnsupportedEvent("Not expecting text here"));
                 }
+                Event::GeneralRef(_) => {
+                    return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                }
                 Event::Decl(_) | Event::Comment(_) | Event::DocType(_) | Event::PI(_) => { /* ignore */
                 }
                 Event::End(_end) => {

crates/dav/src/xml/resourcetype.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::{Resourcetype, ResourcetypeInner};
 
     #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         resourcetype: Resourcetype,
     }

crates/dav/src/xml/sync_collection.rs

@@ -60,7 +60,7 @@ pub struct NresultsElement(#[xml(ty = "text")] u64);
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,

crates/dav/src/xml/tag_list.rs

@@ -13,8 +13,8 @@ impl XmlSerialize for TagList {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -22,24 +22,19 @@ impl XmlSerialize for TagList {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    format!("{prefix}:")
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname
-            .as_ref()
-            .map(|tagname| ::quick_xml::name::QName(tagname));
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            let mut bytes_start = BytesStart::new(tagname);
-            if !has_prefix {
+            if !has_prefix && let Some(ns) = &ns {
-                if let Some(ns) = &ns {
                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
             }
-            }
             writer.write_event(Event::Start(bytes_start))?;
         }
 
@@ -51,8 +46,8 @@ impl XmlSerialize for TagList {
             el.write_empty()?;
         }
 
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname.as_ref() {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/dav_push/src/lib.rs

@@ -25,10 +25,10 @@ pub struct ContentUpdate {
 }
 
 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = b"",
+    rustical_dav::namespace::NS_DAVPUSH = "",
-    rustical_dav::namespace::NS_DAV = b"D",
+    rustical_dav::namespace::NS_DAV = "D",
 ))]
 struct PushMessage {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/dav_push/src/prop.rs

@@ -35,12 +35,12 @@ pub enum Trigger {
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 #[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
     ) -> Result<Self, rustical_xml::XmlError> {
         #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
         struct FakePropertyUpdate(
-            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
         );
         let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
         Ok(Self(depth))

crates/dav_push/src/register.rs

@@ -17,7 +17,7 @@ pub struct WebPushSubscription {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = b"type")]
+    #[xml(ty = "attr", rename = "type")]
     pub ty: String,
     #[xml(ty = "text")]
     pub key: String,
@@ -33,7 +33,7 @@ pub struct SubscriptionElement {
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"push-register")]
+#[xml(root = "push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/frontend/js-components/deno.json

@@ -11,9 +11,8 @@
     ]
   },
   "imports": {
-    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.4",
+    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.5",
-    "lit": "npm:lit@^3.2.1",
+    "lit": "npm:lit@^3.3.1",
-    "vite": "npm:vite@^6.1.1",
+    "vite": "npm:vite@^7.1.7"
-    "webdav": "npm:webdav@^5.8.0"
   }
 }

crates/frontend/js-components/deno.lock

@@ -1,205 +1,276 @@
 {
-  "version": "4",
+  "version": "5",
   "specifiers": {
-    "npm:@deno/vite-plugin@^1.0.4": "1.0.4_vite@6.3.5__picomatch@4.0.2",
+    "npm:@deno/vite-plugin@^1.0.5": "1.0.5_vite@7.1.7__picomatch@4.0.3",
-    "npm:lit@^3.2.1": "3.3.0",
+    "npm:lit@^3.3.1": "3.3.1",
-    "npm:vite@*": "6.3.5_picomatch@4.0.2",
+    "npm:vite@*": "7.1.7_picomatch@4.0.3",
-    "npm:vite@^6.1.1": "6.3.5_picomatch@4.0.2",
+    "npm:vite@^7.1.7": "7.1.7_picomatch@4.0.3"
-    "npm:webdav@^5.8.0": "5.8.0"
   },
   "npm": {
-    "@buttercup/fetch@0.2.1": {
+    "@deno/vite-plugin@1.0.5_vite@7.1.7__picomatch@4.0.3": {
-      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
+      "integrity": "sha512-tLja5n4dyMhcze1NzvSs2iiriBymfBlDCZIrjMTxb9O2ru0gvmV6mn5oBD2teNw5Sd92cj3YJzKwsAs8tMJXlg==",
-      "dependencies": [
-        "node-fetch"
-      ]
-    },
-    "@deno/vite-plugin@1.0.4_vite@6.3.5__picomatch@4.0.2": {
-      "integrity": "sha512-xg8YT8Wn2sGXSnJgiGTpBGX1Dov0c6fd1rAp8VsfrCUtyBRRWzwVMAnd3fQ4yq8h7LSVvJUxEFN4U421k/DQLA==",
       "dependencies": [
         "vite"
       ]
     },
-    "@esbuild/aix-ppc64@0.25.5": {
+    "@esbuild/aix-ppc64@0.25.10": {
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA=="
+      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
+      "os": ["aix"],
+      "cpu": ["ppc64"]
     },
-    "@esbuild/android-arm64@0.25.5": {
+    "@esbuild/android-arm64@0.25.10": {
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg=="
+      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
+      "os": ["android"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/android-arm@0.25.5": {
+    "@esbuild/android-arm@0.25.10": {
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA=="
+      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
+      "os": ["android"],
+      "cpu": ["arm"]
     },
-    "@esbuild/android-x64@0.25.5": {
+    "@esbuild/android-x64@0.25.10": {
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw=="
+      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
+      "os": ["android"],
+      "cpu": ["x64"]
     },
-    "@esbuild/darwin-arm64@0.25.5": {
+    "@esbuild/darwin-arm64@0.25.10": {
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ=="
+      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
+      "os": ["darwin"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/darwin-x64@0.25.5": {
+    "@esbuild/darwin-x64@0.25.10": {
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ=="
+      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
+      "os": ["darwin"],
+      "cpu": ["x64"]
     },
-    "@esbuild/freebsd-arm64@0.25.5": {
+    "@esbuild/freebsd-arm64@0.25.10": {
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw=="
+      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
+      "os": ["freebsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/freebsd-x64@0.25.5": {
+    "@esbuild/freebsd-x64@0.25.10": {
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw=="
+      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
+      "os": ["freebsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/linux-arm64@0.25.5": {
+    "@esbuild/linux-arm64@0.25.10": {
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg=="
+      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/linux-arm@0.25.5": {
+    "@esbuild/linux-arm@0.25.10": {
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw=="
+      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@esbuild/linux-ia32@0.25.5": {
+    "@esbuild/linux-ia32@0.25.10": {
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA=="
+      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
+      "os": ["linux"],
+      "cpu": ["ia32"]
     },
-    "@esbuild/linux-loong64@0.25.5": {
+    "@esbuild/linux-loong64@0.25.10": {
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg=="
+      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
+      "os": ["linux"],
+      "cpu": ["loong64"]
     },
-    "@esbuild/linux-mips64el@0.25.5": {
+    "@esbuild/linux-mips64el@0.25.10": {
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg=="
+      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
+      "os": ["linux"],
+      "cpu": ["mips64el"]
     },
-    "@esbuild/linux-ppc64@0.25.5": {
+    "@esbuild/linux-ppc64@0.25.10": {
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ=="
+      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
+      "os": ["linux"],
+      "cpu": ["ppc64"]
     },
-    "@esbuild/linux-riscv64@0.25.5": {
+    "@esbuild/linux-riscv64@0.25.10": {
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA=="
+      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@esbuild/linux-s390x@0.25.5": {
+    "@esbuild/linux-s390x@0.25.10": {
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ=="
+      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
+      "os": ["linux"],
+      "cpu": ["s390x"]
     },
-    "@esbuild/linux-x64@0.25.5": {
+    "@esbuild/linux-x64@0.25.10": {
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw=="
+      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@esbuild/netbsd-arm64@0.25.5": {
+    "@esbuild/netbsd-arm64@0.25.10": {
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw=="
+      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
+      "os": ["netbsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/netbsd-x64@0.25.5": {
+    "@esbuild/netbsd-x64@0.25.10": {
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ=="
+      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
+      "os": ["netbsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/openbsd-arm64@0.25.5": {
+    "@esbuild/openbsd-arm64@0.25.10": {
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw=="
+      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
+      "os": ["openbsd"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/openbsd-x64@0.25.5": {
+    "@esbuild/openbsd-x64@0.25.10": {
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg=="
+      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
+      "os": ["openbsd"],
+      "cpu": ["x64"]
     },
-    "@esbuild/sunos-x64@0.25.5": {
+    "@esbuild/openharmony-arm64@0.25.10": {
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA=="
+      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "os": ["openharmony"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/win32-arm64@0.25.5": {
+    "@esbuild/sunos-x64@0.25.10": {
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw=="
+      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
+      "os": ["sunos"],
+      "cpu": ["x64"]
     },
-    "@esbuild/win32-ia32@0.25.5": {
+    "@esbuild/win32-arm64@0.25.10": {
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ=="
+      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
+      "os": ["win32"],
+      "cpu": ["arm64"]
     },
-    "@esbuild/win32-x64@0.25.5": {
+    "@esbuild/win32-ia32@0.25.10": {
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g=="
+      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
+      "os": ["win32"],
+      "cpu": ["ia32"]
     },
-    "@lit-labs/ssr-dom-shim@1.3.0": {
+    "@esbuild/win32-x64@0.25.10": {
-      "integrity": "sha512-nQIWonJ6eFAvUUrSlwyHDm/aE8PBDu5kRpL0vHMg6K8fK3Diq1xdPjTnsJSwxABhaZ+5eBi1btQB5ShUTKo4nQ=="
+      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
+      "os": ["win32"],
+      "cpu": ["x64"]
     },
-    "@lit/reactive-element@2.1.0": {
+    "@lit-labs/ssr-dom-shim@1.4.0": {
-      "integrity": "sha512-L2qyoZSQClcBmq0qajBVbhYEcG6iK0XfLn66ifLe/RfC0/ihpc+pl0Wdn8bJ8o+hj38cG0fGXRgSS20MuXn7qA==",
+      "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw=="
+    },
+    "@lit/reactive-element@2.1.1": {
+      "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
       "dependencies": [
         "@lit-labs/ssr-dom-shim"
       ]
     },
-    "@rollup/rollup-android-arm-eabi@4.43.0": {
+    "@rollup/rollup-android-arm-eabi@4.52.2": {
-      "integrity": "sha512-Krjy9awJl6rKbruhQDgivNbD1WuLb8xAclM4IR4cN5pHGAs2oIMMQJEiC3IC/9TZJ+QZkmZhlMO/6MBGxPidpw=="
+      "integrity": "sha512-o3pcKzJgSGt4d74lSZ+OCnHwkKBeAbFDmbEm5gg70eA8VkyCuC/zV9TwBnmw6VjDlRdF4Pshfb+WE9E6XY1PoQ==",
+      "os": ["android"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-android-arm64@4.43.0": {
+    "@rollup/rollup-android-arm64@4.52.2": {
-      "integrity": "sha512-ss4YJwRt5I63454Rpj+mXCXicakdFmKnUNxr1dLK+5rv5FJgAxnN7s31a5VchRYxCFWdmnDWKd0wbAdTr0J5EA=="
+      "integrity": "sha512-cqFSWO5tX2vhC9hJTK8WAiPIm4Q8q/cU8j2HQA0L3E1uXvBYbOZMhE2oFL8n2pKB5sOCHY6bBuHaRwG7TkfJyw==",
+      "os": ["android"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-darwin-arm64@4.43.0": {
+    "@rollup/rollup-darwin-arm64@4.52.2": {
-      "integrity": "sha512-eKoL8ykZ7zz8MjgBenEF2OoTNFAPFz1/lyJ5UmmFSz5jW+7XbH1+MAgCVHy72aG59rbuQLcJeiMrP8qP5d/N0A=="
+      "integrity": "sha512-vngduywkkv8Fkh3wIZf5nFPXzWsNsVu1kvtLETWxTFf/5opZmflgVSeLgdHR56RQh71xhPhWoOkEBvbehwTlVA==",
+      "os": ["darwin"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-darwin-x64@4.43.0": {
+    "@rollup/rollup-darwin-x64@4.52.2": {
-      "integrity": "sha512-SYwXJgaBYW33Wi/q4ubN+ldWC4DzQY62S4Ll2dgfr/dbPoF50dlQwEaEHSKrQdSjC6oIe1WgzosoaNoHCdNuMg=="
+      "integrity": "sha512-h11KikYrUCYTrDj6h939hhMNlqU2fo/X4NB0OZcys3fya49o1hmFaczAiJWVAFgrM1NCP6RrO7lQKeVYSKBPSQ==",
+      "os": ["darwin"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-freebsd-arm64@4.43.0": {
+    "@rollup/rollup-freebsd-arm64@4.52.2": {
-      "integrity": "sha512-SV+U5sSo0yujrjzBF7/YidieK2iF6E7MdF6EbYxNz94lA+R0wKl3SiixGyG/9Klab6uNBIqsN7j4Y/Fya7wAjQ=="
+      "integrity": "sha512-/eg4CI61ZUkLXxMHyVlmlGrSQZ34xqWlZNW43IAU4RmdzWEx0mQJ2mN/Cx4IHLVZFL6UBGAh+/GXhgvGb+nVxw==",
+      "os": ["freebsd"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-freebsd-x64@4.43.0": {
+    "@rollup/rollup-freebsd-x64@4.52.2": {
-      "integrity": "sha512-J7uCsiV13L/VOeHJBo5SjasKiGxJ0g+nQTrBkAsmQBIdil3KhPnSE9GnRon4ejX1XDdsmK/l30IYLiAaQEO0Cg=="
+      "integrity": "sha512-QOWgFH5X9+p+S1NAfOqc0z8qEpJIoUHf7OWjNUGOeW18Mx22lAUOiA9b6r2/vpzLdfxi/f+VWsYjUOMCcYh0Ng==",
+      "os": ["freebsd"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-linux-arm-gnueabihf@4.43.0": {
+    "@rollup/rollup-linux-arm-gnueabihf@4.52.2": {
-      "integrity": "sha512-gTJ/JnnjCMc15uwB10TTATBEhK9meBIY+gXP4s0sHD1zHOaIh4Dmy1X9wup18IiY9tTNk5gJc4yx9ctj/fjrIw=="
+      "integrity": "sha512-kDWSPafToDd8LcBYd1t5jw7bD5Ojcu12S3uT372e5HKPzQt532vW+rGFFOaiR0opxePyUkHrwz8iWYEyH1IIQA==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-linux-arm-musleabihf@4.43.0": {
+    "@rollup/rollup-linux-arm-musleabihf@4.52.2": {
-      "integrity": "sha512-ZJ3gZynL1LDSIvRfz0qXtTNs56n5DI2Mq+WACWZ7yGHFUEirHBRt7fyIk0NsCKhmRhn7WAcjgSkSVVxKlPNFFw=="
+      "integrity": "sha512-gKm7Mk9wCv6/rkzwCiUC4KnevYhlf8ztBrDRT9g/u//1fZLapSRc+eDZj2Eu2wpJ+0RzUKgtNijnVIB4ZxyL+w==",
+      "os": ["linux"],
+      "cpu": ["arm"]
     },
-    "@rollup/rollup-linux-arm64-gnu@4.43.0": {
+    "@rollup/rollup-linux-arm64-gnu@4.52.2": {
-      "integrity": "sha512-8FnkipasmOOSSlfucGYEu58U8cxEdhziKjPD2FIa0ONVMxvl/hmONtX/7y4vGjdUhjcTHlKlDhw3H9t98fPvyA=="
+      "integrity": "sha512-66lA8vnj5mB/rtDNwPgrrKUOtCLVQypkyDa2gMfOefXK6rcZAxKLO9Fy3GkW8VkPnENv9hBkNOFfGLf6rNKGUg==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-linux-arm64-musl@4.43.0": {
+    "@rollup/rollup-linux-arm64-musl@4.52.2": {
-      "integrity": "sha512-KPPyAdlcIZ6S9C3S2cndXDkV0Bb1OSMsX0Eelr2Bay4EsF9yi9u9uzc9RniK3mcUGCLhWY9oLr6er80P5DE6XA=="
+      "integrity": "sha512-s+OPucLNdJHvuZHuIz2WwncJ+SfWHFEmlC5nKMUgAelUeBUnlB4wt7rXWiyG4Zn07uY2Dd+SGyVa9oyLkVGOjA==",
+      "os": ["linux"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-linux-loongarch64-gnu@4.43.0": {
+    "@rollup/rollup-linux-loong64-gnu@4.52.2": {
-      "integrity": "sha512-HPGDIH0/ZzAZjvtlXj6g+KDQ9ZMHfSP553za7o2Odegb/BEfwJcR0Sw0RLNpQ9nC6Gy8s+3mSS9xjZ0n3rhcYg=="
+      "integrity": "sha512-8wTRM3+gVMDLLDdaT6tKmOE3lJyRy9NpJUS/ZRWmLCmOPIJhVyXwjBo+XbrrwtV33Em1/eCTd5TuGJm4+DmYjw==",
+      "os": ["linux"],
+      "cpu": ["loong64"]
     },
-    "@rollup/rollup-linux-powerpc64le-gnu@4.43.0": {
+    "@rollup/rollup-linux-ppc64-gnu@4.52.2": {
-      "integrity": "sha512-gEmwbOws4U4GLAJDhhtSPWPXUzDfMRedT3hFMyRAvM9Mrnj+dJIFIeL7otsv2WF3D7GrV0GIewW0y28dOYWkmw=="
+      "integrity": "sha512-6yqEfgJ1anIeuP2P/zhtfBlDpXUb80t8DpbYwXQ3bQd95JMvUaqiX+fKqYqUwZXqdJDd8xdilNtsHM2N0cFm6A==",
+      "os": ["linux"],
+      "cpu": ["ppc64"]
     },
-    "@rollup/rollup-linux-riscv64-gnu@4.43.0": {
+    "@rollup/rollup-linux-riscv64-gnu@4.52.2": {
-      "integrity": "sha512-XXKvo2e+wFtXZF/9xoWohHg+MuRnvO29TI5Hqe9xwN5uN8NKUYy7tXUG3EZAlfchufNCTHNGjEx7uN78KsBo0g=="
+      "integrity": "sha512-sshYUiYVSEI2B6dp4jMncwxbrUqRdNApF2c3bhtLAU0qA8Lrri0p0NauOsTWh3yCCCDyBOjESHMExonp7Nzc0w==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@rollup/rollup-linux-riscv64-musl@4.43.0": {
+    "@rollup/rollup-linux-riscv64-musl@4.52.2": {
-      "integrity": "sha512-ruf3hPWhjw6uDFsOAzmbNIvlXFXlBQ4nk57Sec8E8rUxs/AI4HD6xmiiasOOx/3QxS2f5eQMKTAwk7KHwpzr/Q=="
+      "integrity": "sha512-duBLgd+3pqC4MMwBrKkFxaZerUxZcYApQVC5SdbF5/e/589GwVvlRUnyqMFbM8iUSb1BaoX/3fRL7hB9m2Pj8Q==",
+      "os": ["linux"],
+      "cpu": ["riscv64"]
     },
-    "@rollup/rollup-linux-s390x-gnu@4.43.0": {
+    "@rollup/rollup-linux-s390x-gnu@4.52.2": {
-      "integrity": "sha512-QmNIAqDiEMEvFV15rsSnjoSmO0+eJLoKRD9EAa9rrYNwO/XRCtOGM3A5A0X+wmG+XRrw9Fxdsw+LnyYiZWWcVw=="
+      "integrity": "sha512-tzhYJJidDUVGMgVyE+PmxENPHlvvqm1KILjjZhB8/xHYqAGeizh3GBGf9u6WdJpZrz1aCpIIHG0LgJgH9rVjHQ==",
+      "os": ["linux"],
+      "cpu": ["s390x"]
     },
-    "@rollup/rollup-linux-x64-gnu@4.43.0": {
+    "@rollup/rollup-linux-x64-gnu@4.52.2": {
-      "integrity": "sha512-jAHr/S0iiBtFyzjhOkAics/2SrXE092qyqEg96e90L3t9Op8OTzS6+IX0Fy5wCt2+KqeHAkti+eitV0wvblEoQ=="
+      "integrity": "sha512-opH8GSUuVcCSSyHHcl5hELrmnk4waZoVpgn/4FDao9iyE4WpQhyWJ5ryl5M3ocp4qkRuHfyXnGqg8M9oKCEKRA==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-linux-x64-musl@4.43.0": {
+    "@rollup/rollup-linux-x64-musl@4.52.2": {
-      "integrity": "sha512-3yATWgdeXyuHtBhrLt98w+5fKurdqvs8B53LaoKD7P7H7FKOONLsBVMNl9ghPQZQuYcceV5CDyPfyfGpMWD9mQ=="
+      "integrity": "sha512-LSeBHnGli1pPKVJ79ZVJgeZWWZXkEe/5o8kcn23M8eMKCUANejchJbF/JqzM4RRjOJfNRhKJk8FuqL1GKjF5oQ==",
+      "os": ["linux"],
+      "cpu": ["x64"]
     },
-    "@rollup/rollup-win32-arm64-msvc@4.43.0": {
+    "@rollup/rollup-openharmony-arm64@4.52.2": {
-      "integrity": "sha512-wVzXp2qDSCOpcBCT5WRWLmpJRIzv23valvcTwMHEobkjippNf+C3ys/+wf07poPkeNix0paTNemB2XrHr2TnGw=="
+      "integrity": "sha512-uPj7MQ6/s+/GOpolavm6BPo+6CbhbKYyZHUDvZ/SmJM7pfDBgdGisFX3bY/CBDMg2ZO4utfhlApkSfZ92yXw7Q==",
+      "os": ["openharmony"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-win32-ia32-msvc@4.43.0": {
+    "@rollup/rollup-win32-arm64-msvc@4.52.2": {
-      "integrity": "sha512-fYCTEyzf8d+7diCw8b+asvWDCLMjsCEA8alvtAutqJOJp/wL5hs1rWSqJ1vkjgW0L2NB4bsYJrpKkiIPRR9dvw=="
+      "integrity": "sha512-Z9MUCrSgIaUeeHAiNkm3cQyst2UhzjPraR3gYYfOjAuZI7tcFRTOD+4cHLPoS/3qinchth+V56vtqz1Tv+6KPA==",
+      "os": ["win32"],
+      "cpu": ["arm64"]
     },
-    "@rollup/rollup-win32-x64-msvc@4.43.0": {
+    "@rollup/rollup-win32-ia32-msvc@4.52.2": {
-      "integrity": "sha512-SnGhLiE5rlK0ofq8kzuDkM0g7FN1s5VYY+YSMTibP7CqShxCQvqtNxTARS4xX4PFJfHjG0ZQYX9iGzI3FQh5Aw=="
+      "integrity": "sha512-+GnYBmpjldD3XQd+HMejo+0gJGwYIOfFeoBQv32xF/RUIvccUz20/V6Otdv+57NE70D5pa8W/jVGDoGq0oON4A==",
+      "os": ["win32"],
+      "cpu": ["ia32"]
     },
-    "@types/estree@1.0.7": {
+    "@rollup/rollup-win32-x64-gnu@4.52.2": {
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
+      "integrity": "sha512-ApXFKluSB6kDQkAqZOKXBjiaqdF1BlKi+/eqnYe9Ee7U2K3pUDKsIyr8EYm/QDHTJIM+4X+lI0gJc3TTRhd+dA==",
+      "os": ["win32"],
+      "cpu": ["x64"]
+    },
+    "@rollup/rollup-win32-x64-msvc@4.52.2": {
+      "integrity": "sha512-ARz+Bs8kY6FtitYM96PqPEVvPXqEZmPZsSkXvyX19YzDqkCaIlhCieLLMI5hxO9SRZ2XtCtm8wxhy0iJ2jxNfw==",
+      "os": ["win32"],
+      "cpu": ["x64"]
+    },
+    "@types/estree@1.0.8": {
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
     },
     "@types/trusted-types@2.0.7": {
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
     },
-    "balanced-match@1.0.2": {
+    "esbuild@0.25.10": {
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
-    },
+      "optionalDependencies": [
-    "base-64@1.0.0": {
-      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
-    },
-    "brace-expansion@2.0.2": {
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dependencies": [
-        "balanced-match"
-      ]
-    },
-    "byte-length@1.0.2": {
-      "integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q=="
-    },
-    "charenc@0.0.2": {
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
-    },
-    "crypt@0.0.2": {
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
-    },
-    "data-uri-to-buffer@4.0.1": {
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
-    },
-    "entities@6.0.1": {
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="
-    },
-    "esbuild@0.25.5": {
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
-      "dependencies": [
         "@esbuild/aix-ppc64",
         "@esbuild/android-arm",
         "@esbuild/android-arm64",
@@ -221,128 +292,75 @@
         "@esbuild/netbsd-x64",
         "@esbuild/openbsd-arm64",
         "@esbuild/openbsd-x64",
+        "@esbuild/openharmony-arm64",
         "@esbuild/sunos-x64",
         "@esbuild/win32-arm64",
         "@esbuild/win32-ia32",
         "@esbuild/win32-x64"
-      ]
+      ],
+      "scripts": true,
+      "bin": true
     },
-    "fast-xml-parser@4.5.3": {
+    "fdir@6.5.0_picomatch@4.0.3": {
-      "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dependencies": [
-        "strnum"
-      ]
-    },
-    "fdir@6.4.6_picomatch@4.0.2": {
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "dependencies": [
         "picomatch"
+      ],
+      "optionalPeers": [
+        "picomatch"
       ]
     },
-    "fetch-blob@3.2.0": {
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
-      "dependencies": [
-        "node-domexception",
-        "web-streams-polyfill"
-      ]
-    },
-    "formdata-polyfill@4.0.10": {
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "dependencies": [
-        "fetch-blob"
-      ]
-    },
     "fsevents@2.3.3": {
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "os": ["darwin"],
+      "scripts": true
     },
-    "hot-patcher@2.0.1": {
+    "lit-element@4.2.1": {
-      "integrity": "sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q=="
+      "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
-    },
-    "is-buffer@1.1.6": {
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "layerr@3.0.0": {
-      "integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA=="
-    },
-    "lit-element@4.2.0": {
-      "integrity": "sha512-MGrXJVAI5x+Bfth/pU9Kst1iWID6GHDLEzFEnyULB/sFiRLgkd8NPK/PeeXxktA3T6EIIaq8U3KcbTU5XFcP2Q==",
       "dependencies": [
         "@lit-labs/ssr-dom-shim",
         "@lit/reactive-element",
         "lit-html"
       ]
     },
-    "lit-html@3.3.0": {
+    "lit-html@3.3.1": {
-      "integrity": "sha512-RHoswrFAxY2d8Cf2mm4OZ1DgzCoBKUKSPvA1fhtSELxUERq2aQQ2h05pO9j81gS1o7RIRJ+CePLogfyahwmynw==",
+      "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
       "dependencies": [
         "@types/trusted-types"
       ]
     },
-    "lit@3.3.0": {
+    "lit@3.3.1": {
-      "integrity": "sha512-DGVsqsOIHBww2DqnuZzW7QsuCdahp50ojuDaBPC7jUDRpYoH0z7kHBBYZewRzer75FwtrkmkKk7iOAwSaWdBmw==",
+      "integrity": "sha512-Ksr/8L3PTapbdXJCk+EJVB78jDodUMaP54gD24W186zGRARvwrsPfS60wae/SSCTCNZVPd1chXqio1qHQmu4NA==",
       "dependencies": [
         "@lit/reactive-element",
         "lit-element",
         "lit-html"
       ]
     },
-    "md5@2.3.0": {
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dependencies": [
-        "charenc",
-        "crypt",
-        "is-buffer"
-      ]
-    },
-    "minimatch@9.0.5": {
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dependencies": [
-        "brace-expansion"
-      ]
-    },
     "nanoid@3.3.11": {
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-    },
+      "bin": true
-    "nested-property@4.0.0": {
-      "integrity": "sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA=="
-    },
-    "node-domexception@1.0.0": {
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
-    },
-    "node-fetch@3.3.2": {
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-      "dependencies": [
-        "data-uri-to-buffer",
-        "fetch-blob",
-        "formdata-polyfill"
-      ]
-    },
-    "path-posix@1.0.0": {
-      "integrity": "sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA=="
     },
     "picocolors@1.1.1": {
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
-    "picomatch@4.0.2": {
+    "picomatch@4.0.3": {
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
     },
-    "postcss@8.5.5": {
+    "postcss@8.5.6": {
-      "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dependencies": [
         "nanoid",
         "picocolors",
         "source-map-js"
       ]
     },
-    "querystringify@2.2.0": {
+    "rollup@4.52.2": {
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+      "integrity": "sha512-I25/2QgoROE1vYV+NQ1En9T9UFB9Cmfm2CJ83zZOlaDpvz29wGQSZXWKw7MiNXau7wYgB/T9fVIdIuEQ+KbiiA==",
-    },
-    "requires-port@1.0.0": {
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "rollup@4.43.0": {
-      "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==",
       "dependencies": [
+        "@types/estree"
+      ],
+      "optionalDependencies": [
         "@rollup/rollup-android-arm-eabi",
         "@rollup/rollup-android-arm64",
         "@rollup/rollup-darwin-arm64",
@@ -353,84 +371,53 @@
         "@rollup/rollup-linux-arm-musleabihf",
         "@rollup/rollup-linux-arm64-gnu",
         "@rollup/rollup-linux-arm64-musl",
-        "@rollup/rollup-linux-loongarch64-gnu",
+        "@rollup/rollup-linux-loong64-gnu",
-        "@rollup/rollup-linux-powerpc64le-gnu",
+        "@rollup/rollup-linux-ppc64-gnu",
         "@rollup/rollup-linux-riscv64-gnu",
         "@rollup/rollup-linux-riscv64-musl",
         "@rollup/rollup-linux-s390x-gnu",
         "@rollup/rollup-linux-x64-gnu",
         "@rollup/rollup-linux-x64-musl",
+        "@rollup/rollup-openharmony-arm64",
         "@rollup/rollup-win32-arm64-msvc",
         "@rollup/rollup-win32-ia32-msvc",
+        "@rollup/rollup-win32-x64-gnu",
         "@rollup/rollup-win32-x64-msvc",
-        "@types/estree",
         "fsevents"
-      ]
+      ],
+      "bin": true
     },
     "source-map-js@1.2.1": {
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
     },
-    "strnum@1.1.2": {
+    "tinyglobby@0.2.15_picomatch@4.0.3": {
-      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA=="
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-    },
-    "tinyglobby@0.2.14_picomatch@4.0.2": {
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dependencies": [
         "fdir",
         "picomatch"
       ]
     },
-    "url-join@5.0.0": {
+    "vite@7.1.7_picomatch@4.0.3": {
-      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA=="
+      "integrity": "sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==",
-    },
-    "url-parse@1.5.10": {
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": [
-        "querystringify",
-        "requires-port"
-      ]
-    },
-    "vite@6.3.5_picomatch@4.0.2": {
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
       "dependencies": [
         "esbuild",
         "fdir",
-        "fsevents",
         "picomatch",
         "postcss",
         "rollup",
         "tinyglobby"
-      ]
+      ],
-    },
+      "optionalDependencies": [
-    "web-streams-polyfill@3.3.3": {
+        "fsevents"
-      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="
+      ],
-    },
+      "bin": true
-    "webdav@5.8.0": {
-      "integrity": "sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==",
-      "dependencies": [
-        "@buttercup/fetch",
-        "base-64",
-        "byte-length",
-        "entities",
-        "fast-xml-parser",
-        "hot-patcher",
-        "layerr",
-        "md5",
-        "minimatch",
-        "nested-property",
-        "node-fetch",
-        "path-posix",
-        "url-join",
-        "url-parse"
-      ]
     }
   },
   "workspace": {
     "dependencies": [
-      "npm:@deno/vite-plugin@^1.0.4",
+      "npm:@deno/vite-plugin@^1.0.5",
-      "npm:lit@^3.2.1",
+      "npm:lit@^3.3.1",
-      "npm:vite@^6.1.1",
+      "npm:vite@^7.1.7"
-      "npm:webdav@^5.8.0"
     ]
   }
 }

crates/frontend/js-components/lib/delete-button.ts

@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
   }
 
   protected render() {
-    let text = this.trash ? 'Move to trash' : 'Delete'
+    let text = this.trash ? 'Trash' : 'Delete'
     return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
   }
 

crates/frontend/js-components/lib/edit-addressbook-form.ts

@@ -28,9 +28,9 @@ export class EditAddressbookForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/js-components/lib/edit-calendar-form.ts

@@ -40,9 +40,9 @@ export class EditCalendarForm extends LitElement {
 
   override render() {
     return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname

crates/frontend/js-components/vite.config.ts

@@ -27,7 +27,6 @@ export default defineConfig({
         format: "es",
         manualChunks: {
           lit: ["lit"],
-          // webdav: ["webdav"],
         }
       }
     },

crates/frontend/public/assets/js/create-addressbook-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

crates/frontend/public/assets/js/create-calendar-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

crates/frontend/public/assets/js/delete-button.mjs

@@ -1,5 +1,5 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n, t } from "./property-D0NJdseG.mjs";
+import { n, t } from "./property-B8WoKf1Y.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -19,7 +19,7 @@ let DeleteButton = class extends i {
     return this;
   }
   render() {
-    let text = this.trash ? "Move to trash" : "Delete";
+    let text = this.trash ? "Trash" : "Delete";
     return x`<button class="delete" @click=${(e) => this._onClick(e)}>${text}</button>`;
   }
   async _onClick(event) {

crates/frontend/public/assets/js/edit-addressbook-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -27,9 +27,9 @@ let EditAddressbookForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/edit-calendar-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -28,9 +28,9 @@ let EditCalendarForm = class extends i {
   }
   render() {
     return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
+      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname

crates/frontend/public/assets/js/import-addressbook-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -59,7 +59,7 @@ let ImportAddressbookForm = class extends i {
   }
   async submit(e2) {
     e2.preventDefault();
-    this.principal || (this.principal = this.user);
+    this.principal ||= this.user;
     if (!this.principal) {
       alert("Empty principal");
       return;

crates/frontend/public/assets/js/import-calendar-form.mjs

@@ -1,6 +1,6 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
+import { i, x } from "./lit-DkXrt_Iv.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
+import { n as n$1, t } from "./property-B8WoKf1Y.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
+import { e, n } from "./ref-BwbQvJBB.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -59,7 +59,7 @@ let ImportCalendarForm = class extends i {
   }
   async submit(e2) {
     e2.preventDefault();
-    this.principal || (this.principal = this.user);
+    this.principal ||= this.user;
     if (!this.principal) {
       alert("Empty principal");
       return;

crates/frontend/public/assets/js/lit-DkXrt_Iv.mjs

@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-var _a;
 const t$1 = globalThis, e$2 = t$1.ShadowRoot && (void 0 === t$1.ShadyCSS || t$1.ShadyCSS.nativeShadow) && "adoptedStyleSheets" in Document.prototype && "replace" in CSSStyleSheet.prototype, s$2 = Symbol(), o$3 = /* @__PURE__ */ new WeakMap();
 let n$2 = class n {
   constructor(t2, e2, o2) {
@@ -24,7 +23,7 @@ let n$2 = class n {
   }
 };
 const r$2 = (t2) => new n$2("string" == typeof t2 ? t2 : t2 + "", void 0, s$2), S$1 = (s2, o2) => {
-  if (e$2) s2.adoptedStyleSheets = o2.map((t2) => t2 instanceof CSSStyleSheet ? t2 : t2.styleSheet);
+  if (e$2) s2.adoptedStyleSheets = o2.map(((t2) => t2 instanceof CSSStyleSheet ? t2 : t2.styleSheet));
   else for (const e2 of o2) {
     const o3 = document.createElement("style"), n3 = t$1.litNonce;
     void 0 !== n3 && o3.setAttribute("nonce", n3), o3.textContent = e2.cssText, s2.appendChild(o3);
@@ -68,10 +67,10 @@ const { is: i$2, defineProperty: e$1, getOwnPropertyDescriptor: h$1, getOwnPrope
   }
   return i2;
 } }, f$1 = (t2, s2) => !i$2(t2, s2), b = { attribute: true, type: String, converter: u$1, reflect: false, useDefault: false, hasChanged: f$1 };
-Symbol.metadata ?? (Symbol.metadata = Symbol("metadata")), a$1.litPropertyMetadata ?? (a$1.litPropertyMetadata = /* @__PURE__ */ new WeakMap());
+Symbol.metadata ??= Symbol("metadata"), a$1.litPropertyMetadata ??= /* @__PURE__ */ new WeakMap();
 let y$1 = class y extends HTMLElement {
   static addInitializer(t2) {
-    this._$Ei(), (this.l ?? (this.l = [])).push(t2);
+    this._$Ei(), (this.l ??= []).push(t2);
   }
   static get observedAttributes() {
     return this.finalize(), this._$Eh && [...this._$Eh.keys()];
@@ -89,8 +88,8 @@ let y$1 = class y extends HTMLElement {
       this[s2] = t3;
     } };
     return { get: e2, set(s3) {
-      const h2 = e2 == null ? void 0 : e2.call(this);
+      const h2 = e2?.call(this);
-      r2 == null ? void 0 : r2.call(this, s3), this.requestUpdate(t2, h2, i2);
+      r2?.call(this, s3), this.requestUpdate(t2, h2, i2);
     }, configurable: true, enumerable: true };
   }
   static getPropertyOptions(t2) {
@@ -135,16 +134,13 @@ let y$1 = class y extends HTMLElement {
     super(), this._$Ep = void 0, this.isUpdatePending = false, this.hasUpdated = false, this._$Em = null, this._$Ev();
   }
   _$Ev() {
-    var _a2;
+    this._$ES = new Promise(((t2) => this.enableUpdating = t2)), this._$AL = /* @__PURE__ */ new Map(), this._$E_(), this.requestUpdate(), this.constructor.l?.forEach(((t2) => t2(this)));
-    this._$ES = new Promise((t2) => this.enableUpdating = t2), this._$AL = /* @__PURE__ */ new Map(), this._$E_(), this.requestUpdate(), (_a2 = this.constructor.l) == null ? void 0 : _a2.forEach((t2) => t2(this));
   }
   addController(t2) {
-    var _a2;
+    (this._$EO ??= /* @__PURE__ */ new Set()).add(t2), void 0 !== this.renderRoot && this.isConnected && t2.hostConnected?.();
-    (this._$EO ?? (this._$EO = /* @__PURE__ */ new Set())).add(t2), void 0 !== this.renderRoot && this.isConnected && ((_a2 = t2.hostConnected) == null ? void 0 : _a2.call(t2));
   }
   removeController(t2) {
-    var _a2;
+    this._$EO?.delete(t2);
-    (_a2 = this._$EO) == null ? void 0 : _a2.delete(t2);
   }
   _$E_() {
     const t2 = /* @__PURE__ */ new Map(), s2 = this.constructor.elementProperties;
@@ -156,51 +152,42 @@ let y$1 = class y extends HTMLElement {
     return S$1(t2, this.constructor.elementStyles), t2;
   }
   connectedCallback() {
-    var _a2;
+    this.renderRoot ??= this.createRenderRoot(), this.enableUpdating(true), this._$EO?.forEach(((t2) => t2.hostConnected?.()));
-    this.renderRoot ?? (this.renderRoot = this.createRenderRoot()), this.enableUpdating(true), (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t2) => {
-      var _a3;
-      return (_a3 = t2.hostConnected) == null ? void 0 : _a3.call(t2);
-    });
   }
   enableUpdating(t2) {
   }
   disconnectedCallback() {
-    var _a2;
+    this._$EO?.forEach(((t2) => t2.hostDisconnected?.()));
-    (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t2) => {
-      var _a3;
-      return (_a3 = t2.hostDisconnected) == null ? void 0 : _a3.call(t2);
-    });
   }
   attributeChangedCallback(t2, s2, i2) {
     this._$AK(t2, i2);
   }
   _$ET(t2, s2) {
-    var _a2;
     const i2 = this.constructor.elementProperties.get(t2), e2 = this.constructor._$Eu(t2, i2);
     if (void 0 !== e2 && true === i2.reflect) {
-      const h2 = (void 0 !== ((_a2 = i2.converter) == null ? void 0 : _a2.toAttribute) ? i2.converter : u$1).toAttribute(s2, i2.type);
+      const h2 = (void 0 !== i2.converter?.toAttribute ? i2.converter : u$1).toAttribute(s2, i2.type);
       this._$Em = t2, null == h2 ? this.removeAttribute(e2) : this.setAttribute(e2, h2), this._$Em = null;
     }
   }
   _$AK(t2, s2) {
-    var _a2, _b;
     const i2 = this.constructor, e2 = i2._$Eh.get(t2);
     if (void 0 !== e2 && this._$Em !== e2) {
-      const t3 = i2.getPropertyOptions(e2), h2 = "function" == typeof t3.converter ? { fromAttribute: t3.converter } : void 0 !== ((_a2 = t3.converter) == null ? void 0 : _a2.fromAttribute) ? t3.converter : u$1;
+      const t3 = i2.getPropertyOptions(e2), h2 = "function" == typeof t3.converter ? { fromAttribute: t3.converter } : void 0 !== t3.converter?.fromAttribute ? t3.converter : u$1;
-      this._$Em = e2, this[e2] = h2.fromAttribute(s2, t3.type) ?? ((_b = this._$Ej) == null ? void 0 : _b.get(e2)) ?? null, this._$Em = null;
+      this._$Em = e2;
+      const r2 = h2.fromAttribute(s2, t3.type);
+      this[e2] = r2 ?? this._$Ej?.get(e2) ?? r2, this._$Em = null;
     }
   }
   requestUpdate(t2, s2, i2) {
-    var _a2;
     if (void 0 !== t2) {
       const e2 = this.constructor, h2 = this[t2];
-      if (i2 ?? (i2 = e2.getPropertyOptions(t2)), !((i2.hasChanged ?? f$1)(h2, s2) || i2.useDefault && i2.reflect && h2 === ((_a2 = this._$Ej) == null ? void 0 : _a2.get(t2)) && !this.hasAttribute(e2._$Eu(t2, i2)))) return;
+      if (i2 ??= e2.getPropertyOptions(t2), !((i2.hasChanged ?? f$1)(h2, s2) || i2.useDefault && i2.reflect && h2 === this._$Ej?.get(t2) && !this.hasAttribute(e2._$Eu(t2, i2)))) return;
       this.C(t2, s2, i2);
     }
     false === this.isUpdatePending && (this._$ES = this._$EP());
   }
   C(t2, s2, { useDefault: i2, reflect: e2, wrapped: h2 }, r2) {
-    i2 && !(this._$Ej ?? (this._$Ej = /* @__PURE__ */ new Map())).has(t2) && (this._$Ej.set(t2, r2 ?? s2 ?? this[t2]), true !== h2 || void 0 !== r2) || (this._$AL.has(t2) || (this.hasUpdated || i2 || (s2 = void 0), this._$AL.set(t2, s2)), true === e2 && this._$Em !== t2 && (this._$Eq ?? (this._$Eq = /* @__PURE__ */ new Set())).add(t2));
+    i2 && !(this._$Ej ??= /* @__PURE__ */ new Map()).has(t2) && (this._$Ej.set(t2, r2 ?? s2 ?? this[t2]), true !== h2 || void 0 !== r2) || (this._$AL.has(t2) || (this.hasUpdated || i2 || (s2 = void 0), this._$AL.set(t2, s2)), true === e2 && this._$Em !== t2 && (this._$Eq ??= /* @__PURE__ */ new Set()).add(t2));
   }
   async _$EP() {
     this.isUpdatePending = true;
@@ -216,10 +203,9 @@ let y$1 = class y extends HTMLElement {
     return this.performUpdate();
   }
   performUpdate() {
-    var _a2;
     if (!this.isUpdatePending) return;
     if (!this.hasUpdated) {
-      if (this.renderRoot ?? (this.renderRoot = this.createRenderRoot()), this._$Ep) {
+      if (this.renderRoot ??= this.createRenderRoot(), this._$Ep) {
         for (const [t4, s3] of this._$Ep) this[t4] = s3;
         this._$Ep = void 0;
       }
@@ -232,10 +218,7 @@ let y$1 = class y extends HTMLElement {
     let t2 = false;
     const s2 = this._$AL;
     try {
-      t2 = this.shouldUpdate(s2), t2 ? (this.willUpdate(s2), (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t3) => {
+      t2 = this.shouldUpdate(s2), t2 ? (this.willUpdate(s2), this._$EO?.forEach(((t3) => t3.hostUpdate?.())), this.update(s2)) : this._$EM();
-        var _a3;
-        return (_a3 = t3.hostUpdate) == null ? void 0 : _a3.call(t3);
-      }), this.update(s2)) : this._$EM();
     } catch (s3) {
       throw t2 = false, this._$EM(), s3;
     }
@@ -244,11 +227,7 @@ let y$1 = class y extends HTMLElement {
   willUpdate(t2) {
   }
   _$AE(t2) {
-    var _a2;
+    this._$EO?.forEach(((t3) => t3.hostUpdated?.())), this.hasUpdated || (this.hasUpdated = true, this.firstUpdated(t2)), this.updated(t2);
-    (_a2 = this._$EO) == null ? void 0 : _a2.forEach((t3) => {
-      var _a3;
-      return (_a3 = t3.hostUpdated) == null ? void 0 : _a3.call(t3);
-    }), this.hasUpdated || (this.hasUpdated = true, this.firstUpdated(t2)), this.updated(t2);
   }
   _$EM() {
     this._$AL = /* @__PURE__ */ new Map(), this.isUpdatePending = false;
@@ -263,20 +242,20 @@ let y$1 = class y extends HTMLElement {
     return true;
   }
   update(t2) {
-    this._$Eq && (this._$Eq = this._$Eq.forEach((t3) => this._$ET(t3, this[t3]))), this._$EM();
+    this._$Eq &&= this._$Eq.forEach(((t3) => this._$ET(t3, this[t3]))), this._$EM();
   }
   updated(t2) {
   }
   firstUpdated(t2) {
   }
 };
-y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$1("elementProperties")] = /* @__PURE__ */ new Map(), y$1[d$1("finalized")] = /* @__PURE__ */ new Map(), p$1 == null ? void 0 : p$1({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ?? (a$1.reactiveElementVersions = [])).push("2.1.0");
+y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$1("elementProperties")] = /* @__PURE__ */ new Map(), y$1[d$1("finalized")] = /* @__PURE__ */ new Map(), p$1?.({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ??= []).push("2.1.1");
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
-const t = globalThis, i$1 = t.trustedTypes, s$1 = i$1 ? i$1.createPolicy("lit-html", { createHTML: (t2) => t2 }) : void 0, e = "$lit$", h = `lit$${Math.random().toFixed(9).slice(2)}$`, o$1 = "?" + h, n2 = `<${o$1}>`, r = document, l = () => r.createComment(""), c = (t2) => null === t2 || "object" != typeof t2 && "function" != typeof t2, a = Array.isArray, u = (t2) => a(t2) || "function" == typeof (t2 == null ? void 0 : t2[Symbol.iterator]), d = "[ 	\n\f\r]", f = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v = /-->/g, _ = />/g, m = RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ 	
+const t = globalThis, i$1 = t.trustedTypes, s$1 = i$1 ? i$1.createPolicy("lit-html", { createHTML: (t2) => t2 }) : void 0, e = "$lit$", h = `lit$${Math.random().toFixed(9).slice(2)}$`, o$1 = "?" + h, n2 = `<${o$1}>`, r = document, l = () => r.createComment(""), c = (t2) => null === t2 || "object" != typeof t2 && "function" != typeof t2, a = Array.isArray, u = (t2) => a(t2) || "function" == typeof t2?.[Symbol.iterator], d = "[ 	\n\f\r]", f = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v = /-->/g, _ = />/g, m = RegExp(`>|${d}(?:([^\\s"'>=/]+)(${d}*=${d}*(?:[^ 	
 \f\r"'\`<>=]|("|')|))|$)`, "g"), p = /'/g, g = /"/g, $ = /^(?:script|style|textarea|title)$/i, y2 = (t2) => (i2, ...s2) => ({ _$litType$: t2, strings: i2, values: s2 }), x = y2(1), T = Symbol.for("lit-noChange"), E = Symbol.for("lit-nothing"), A = /* @__PURE__ */ new WeakMap(), C = r.createTreeWalker(r, 129);
 function P(t2, i2) {
   if (!a(t2) || !t2.hasOwnProperty("raw")) throw Error("invalid template strings array");
@@ -332,11 +311,10 @@ class N {
   }
 }
 function S(t2, i2, s2 = t2, e2) {
-  var _a2, _b;
   if (i2 === T) return i2;
-  let h2 = void 0 !== e2 ? (_a2 = s2._$Co) == null ? void 0 : _a2[e2] : s2._$Cl;
+  let h2 = void 0 !== e2 ? s2._$Co?.[e2] : s2._$Cl;
   const o2 = c(i2) ? void 0 : i2._$litDirective$;
-  return (h2 == null ? void 0 : h2.constructor) !== o2 && ((_b = h2 == null ? void 0 : h2._$AO) == null ? void 0 : _b.call(h2, false), void 0 === o2 ? h2 = void 0 : (h2 = new o2(t2), h2._$AT(t2, s2, e2)), void 0 !== e2 ? (s2._$Co ?? (s2._$Co = []))[e2] = h2 : s2._$Cl = h2), void 0 !== h2 && (i2 = S(t2, h2._$AS(t2, i2.values), h2, e2)), i2;
+  return h2?.constructor !== o2 && (h2?._$AO?.(false), void 0 === o2 ? h2 = void 0 : (h2 = new o2(t2), h2._$AT(t2, s2, e2)), void 0 !== e2 ? (s2._$Co ??= [])[e2] = h2 : s2._$Cl = h2), void 0 !== h2 && (i2 = S(t2, h2._$AS(t2, i2.values), h2, e2)), i2;
 }
 class M {
   constructor(t2, i2) {
@@ -349,7 +327,7 @@ class M {
     return this._$AM._$AU;
   }
   u(t2) {
-    const { el: { content: i2 }, parts: s2 } = this._$AD, e2 = ((t2 == null ? void 0 : t2.creationScope) ?? r).importNode(i2, true);
+    const { el: { content: i2 }, parts: s2 } = this._$AD, e2 = (t2?.creationScope ?? r).importNode(i2, true);
     C.currentNode = e2;
     let h2 = C.nextNode(), o2 = 0, n3 = 0, l2 = s2[0];
     for (; void 0 !== l2; ) {
@@ -357,7 +335,7 @@ class M {
         let i3;
         2 === l2.type ? i3 = new R(h2, h2.nextSibling, this, t2) : 1 === l2.type ? i3 = new l2.ctor(h2, l2.name, l2.strings, this, t2) : 6 === l2.type && (i3 = new z(h2, this, t2)), this._$AV.push(i3), l2 = s2[++n3];
       }
-      o2 !== (l2 == null ? void 0 : l2.index) && (h2 = C.nextNode(), o2++);
+      o2 !== l2?.index && (h2 = C.nextNode(), o2++);
     }
     return C.currentNode = r, e2;
   }
@@ -368,16 +346,15 @@ class M {
 }
 class R {
   get _$AU() {
-    var _a2;
+    return this._$AM?._$AU ?? this._$Cv;
-    return ((_a2 = this._$AM) == null ? void 0 : _a2._$AU) ?? this._$Cv;
   }
   constructor(t2, i2, s2, e2) {
-    this.type = 2, this._$AH = E, this._$AN = void 0, this._$AA = t2, this._$AB = i2, this._$AM = s2, this.options = e2, this._$Cv = (e2 == null ? void 0 : e2.isConnected) ?? true;
+    this.type = 2, this._$AH = E, this._$AN = void 0, this._$AA = t2, this._$AB = i2, this._$AM = s2, this.options = e2, this._$Cv = e2?.isConnected ?? true;
   }
   get parentNode() {
     let t2 = this._$AA.parentNode;
     const i2 = this._$AM;
-    return void 0 !== i2 && 11 === (t2 == null ? void 0 : t2.nodeType) && (t2 = i2.parentNode), t2;
+    return void 0 !== i2 && 11 === t2?.nodeType && (t2 = i2.parentNode), t2;
   }
   get startNode() {
     return this._$AA;
@@ -398,9 +375,8 @@ class R {
     this._$AH !== E && c(this._$AH) ? this._$AA.nextSibling.data = t2 : this.T(r.createTextNode(t2)), this._$AH = t2;
   }
   $(t2) {
-    var _a2;
     const { values: i2, _$litType$: s2 } = t2, e2 = "number" == typeof s2 ? this._$AC(t2) : (void 0 === s2.el && (s2.el = N.createElement(P(s2.h, s2.h[0]), this.options)), s2);
-    if (((_a2 = this._$AH) == null ? void 0 : _a2._$AD) === e2) this._$AH.p(i2);
+    if (this._$AH?._$AD === e2) this._$AH.p(i2);
     else {
       const t3 = new M(e2, this), s3 = t3.u(this.options);
       t3.p(i2), this.T(s3), this._$AH = t3;
@@ -418,15 +394,13 @@ class R {
     e2 < i2.length && (this._$AR(s2 && s2._$AB.nextSibling, e2), i2.length = e2);
   }
   _$AR(t2 = this._$AA.nextSibling, i2) {
-    var _a2;
+    for (this._$AP?.(false, true, i2); t2 !== this._$AB; ) {
-    for ((_a2 = this._$AP) == null ? void 0 : _a2.call(this, false, true, i2); t2 && t2 !== this._$AB; ) {
       const i3 = t2.nextSibling;
       t2.remove(), t2 = i3;
     }
   }
   setConnected(t2) {
-    var _a2;
+    void 0 === this._$AM && (this._$Cv = t2, this._$AP?.(t2));
-    void 0 === this._$AM && (this._$Cv = t2, (_a2 = this._$AP) == null ? void 0 : _a2.call(this, t2));
   }
 }
 class k {
@@ -446,7 +420,7 @@ class k {
     else {
       const e3 = t2;
       let n3, r2;
-      for (t2 = h2[0], n3 = 0; n3 < h2.length - 1; n3++) r2 = S(this, e3[s2 + n3], i2, n3), r2 === T && (r2 = this._$AH[n3]), o2 || (o2 = !c(r2) || r2 !== this._$AH[n3]), r2 === E ? t2 = E : t2 !== E && (t2 += (r2 ?? "") + h2[n3 + 1]), this._$AH[n3] = r2;
+      for (t2 = h2[0], n3 = 0; n3 < h2.length - 1; n3++) r2 = S(this, e3[s2 + n3], i2, n3), r2 === T && (r2 = this._$AH[n3]), o2 ||= !c(r2) || r2 !== this._$AH[n3], r2 === E ? t2 = E : t2 !== E && (t2 += (r2 ?? "") + h2[n3 + 1]), this._$AH[n3] = r2;
     }
     o2 && !e2 && this.j(t2);
   }
@@ -480,8 +454,7 @@ class L extends k {
     e2 && this.element.removeEventListener(this.name, this, s2), h2 && this.element.addEventListener(this.name, this, t2), this._$AH = t2;
   }
   handleEvent(t2) {
-    var _a2;
+    "function" == typeof this._$AH ? this._$AH.call(this.options?.host ?? this.element, t2) : this._$AH.handleEvent(t2);
-    "function" == typeof this._$AH ? this._$AH.call(((_a2 = this.options) == null ? void 0 : _a2.host) ?? this.element, t2) : this._$AH.handleEvent(t2);
   }
 }
 class z {
@@ -496,12 +469,12 @@ class z {
   }
 }
 const j = t.litHtmlPolyfillSupport;
-j == null ? void 0 : j(N, R), (t.litHtmlVersions ?? (t.litHtmlVersions = [])).push("3.3.0");
+j?.(N, R), (t.litHtmlVersions ??= []).push("3.3.1");
 const B = (t2, i2, s2) => {
-  const e2 = (s2 == null ? void 0 : s2.renderBefore) ?? i2;
+  const e2 = s2?.renderBefore ?? i2;
   let h2 = e2._$litPart$;
   if (void 0 === h2) {
-    const t3 = (s2 == null ? void 0 : s2.renderBefore) ?? null;
+    const t3 = s2?.renderBefore ?? null;
     e2._$litPart$ = h2 = new R(i2.insertBefore(l(), t3), t3, void 0, s2 ?? {});
   }
   return h2._$AI(t2), h2;
@@ -517,30 +490,27 @@ class i extends y$1 {
     super(...arguments), this.renderOptions = { host: this }, this._$Do = void 0;
   }
   createRenderRoot() {
-    var _a2;
     const t2 = super.createRenderRoot();
-    return (_a2 = this.renderOptions).renderBefore ?? (_a2.renderBefore = t2.firstChild), t2;
+    return this.renderOptions.renderBefore ??= t2.firstChild, t2;
   }
   update(t2) {
     const r2 = this.render();
     this.hasUpdated || (this.renderOptions.isConnected = this.isConnected), super.update(t2), this._$Do = B(r2, this.renderRoot, this.renderOptions);
   }
   connectedCallback() {
-    var _a2;
+    super.connectedCallback(), this._$Do?.setConnected(true);
-    super.connectedCallback(), (_a2 = this._$Do) == null ? void 0 : _a2.setConnected(true);
   }
   disconnectedCallback() {
-    var _a2;
+    super.disconnectedCallback(), this._$Do?.setConnected(false);
-    super.disconnectedCallback(), (_a2 = this._$Do) == null ? void 0 : _a2.setConnected(false);
   }
   render() {
     return T;
   }
 }
-i._$litElement$ = true, i["finalized"] = true, (_a = s.litElementHydrateSupport) == null ? void 0 : _a.call(s, { LitElement: i });
+i._$litElement$ = true, i["finalized"] = true, s.litElementHydrateSupport?.({ LitElement: i });
 const o = s.litElementPolyfillSupport;
-o == null ? void 0 : o({ LitElement: i });
+o?.({ LitElement: i });
-(s.litElementVersions ?? (s.litElementVersions = [])).push("4.2.0");
+(s.litElementVersions ??= []).push("4.2.1");
 export {
   E,
   f$1 as f,

crates/frontend/public/assets/js/property-B8WoKf1Y.mjs

@@ -1,13 +1,13 @@
-import { f, u } from "./lit-z6_uA4GX.mjs";
+import { f, u } from "./lit-DkXrt_Iv.mjs";
 /**
  * @license
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: BSD-3-Clause
  */
 const t = (t2) => (e, o2) => {
-  void 0 !== o2 ? o2.addInitializer(() => {
+  void 0 !== o2 ? o2.addInitializer((() => {
     customElements.define(t2, e);
-  }) : customElements.define(t2, e);
+  })) : customElements.define(t2, e);
 };
 /**
  * @license

crates/frontend/public/assets/js/ref-BwbQvJBB.mjs

@@ -1,4 +1,4 @@
-import { E } from "./lit-z6_uA4GX.mjs";
+import { E } from "./lit-DkXrt_Iv.mjs";
 /**
  * @license
  * Copyright 2020 Google LLC
@@ -33,17 +33,16 @@ class i {
  * SPDX-License-Identifier: BSD-3-Clause
  */
 const s = (i2, t2) => {
-  var _a;
   const e2 = i2._$AN;
   if (void 0 === e2) return false;
-  for (const i3 of e2) (_a = i3._$AO) == null ? void 0 : _a.call(i3, t2, false), s(i3, t2);
+  for (const i3 of e2) i3._$AO?.(t2, false), s(i3, t2);
   return true;
 }, o$1 = (i2) => {
   let t2, e2;
   do {
     if (void 0 === (t2 = i2._$AM)) break;
     e2 = t2._$AN, e2.delete(i2), i2 = t2;
-  } while (0 === (e2 == null ? void 0 : e2.size));
+  } while (0 === e2?.size);
 }, r = (i2) => {
   for (let t2; t2 = i2._$AM; i2 = t2) {
     let e2 = t2._$AN;
@@ -62,7 +61,7 @@ function n$1(i2, t2 = false, e2 = 0) {
   else s(this, i2);
 }
 const c = (i2) => {
-  i2.type == t.CHILD && (i2._$AP ?? (i2._$AP = n$1), i2._$AQ ?? (i2._$AQ = h$1));
+  i2.type == t.CHILD && (i2._$AP ??= n$1, i2._$AQ ??= h$1);
 };
 class f extends i {
   constructor() {
@@ -72,8 +71,7 @@ class f extends i {
     super._$AT(i2, t2, e2), r(this), this.isConnected = i2._$AU;
   }
   _$AO(i2, t2 = true) {
-    var _a, _b;
+    i2 !== this.isConnected && (this.isConnected = i2, i2 ? this.reconnected?.() : this.disconnected?.()), t2 && (s(this, i2), o$1(this));
-    i2 !== this.isConnected && (this.isConnected = i2, i2 ? (_a = this.reconnected) == null ? void 0 : _a.call(this) : (_b = this.disconnected) == null ? void 0 : _b.call(this)), t2 && (s(this, i2), o$1(this));
   }
   setValue(t2) {
     if (f$1(this._$Ct)) this._$Ct._$AI(t2, this);
@@ -100,9 +98,8 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     return E;
   }
   update(i2, [s2]) {
-    var _a;
     const e2 = s2 !== this.G;
-    return e2 && void 0 !== this.G && this.rt(void 0), (e2 || this.lt !== this.ct) && (this.G = s2, this.ht = (_a = i2.options) == null ? void 0 : _a.host, this.rt(this.ct = i2.element)), E;
+    return e2 && void 0 !== this.G && this.rt(void 0), (e2 || this.lt !== this.ct) && (this.G = s2, this.ht = i2.options?.host, this.rt(this.ct = i2.element)), E;
   }
   rt(t2) {
     if (this.isConnected || (t2 = void 0), "function" == typeof this.G) {
@@ -112,8 +109,7 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     } else this.G.value = t2;
   }
   get lt() {
-    var _a, _b;
+    return "function" == typeof this.G ? o.get(this.ht ?? globalThis)?.get(this.G) : this.G?.value;
-    return "function" == typeof this.G ? (_a = o.get(this.ht ?? globalThis)) == null ? void 0 : _a.get(this.G) : (_b = this.G) == null ? void 0 : _b.value;
   }
   disconnected() {
     this.lt === this.ct && this.rt(void 0);

crates/frontend/public/assets/licenses.html

@@ -45,7 +45,7 @@
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
             <li><a href="#Apache-2.0">Apache License 2.0</a> (321)</li>
-            <li><a href="#MIT">MIT License</a> (84)</li>
+            <li><a href="#MIT">MIT License</a> (78)</li>
             <li><a href="#Unicode-3.0">Unicode License v3</a> (19)</li>
             <li><a href="#AGPL-3.0">GNU Affero General Public License v3.0</a> (12)</li>
             <li><a href="#BSD-3-Clause">BSD 3-Clause &quot;New&quot; or &quot;Revised&quot; License</a> (5)</li>
@@ -62,7 +62,7 @@
                 <h3 id="AGPL-3.0">GNU Affero General Public License v3.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical 0.9.8</a></li>
                 </ul>
                 <pre class="license-text">                    GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
@@ -731,16 +731,16 @@ For more information on this, and how to apply and follow the GNU AGPL, see
                 <h3 id="AGPL-3.0">GNU Affero General Public License v3.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_caldav 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_caldav 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_carddav 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_carddav 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav_push 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav_push 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_frontend 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_frontend 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_ical 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_ical 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_oidc 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_oidc 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store_sqlite 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store_sqlite 0.9.8</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_xml 0.9.0</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_xml 0.9.8</a></li>
                     <li><a href=" https://crates.io/crates/xml_derive ">xml_derive 0.1.0</a></li>
                 </ul>
                 <pre class="license-text">GNU AFFERO GENERAL PUBLIC LICENSE
@@ -1199,9 +1199,8 @@ You should also get your employer (if you work as a programmer) or school, if an
                     <li><a href=" https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide ">miniz_oxide 0.8.9</a></li>
                     <li><a href=" https://github.com/taiki-e/pin-project-lite ">pin-project-lite 0.2.16</a></li>
                     <li><a href=" https://github.com/Actyx/sync_wrapper ">sync_wrapper 1.0.2</a></li>
-                    <li><a href=" https://github.com/time-rs/time ">time-core 0.1.4</a></li>
+                    <li><a href=" https://github.com/time-rs/time ">time-core 0.1.6</a></li>
-                    <li><a href=" https://github.com/time-rs/time ">time-macros 0.2.22</a></li>
+                    <li><a href=" https://github.com/time-rs/time ">time-macros 0.2.24</a></li>
-                    <li><a href=" https://github.com/time-rs/time ">time 0.3.41</a></li>
                 </ul>
                 <pre class="license-text">
                                  Apache License
@@ -1806,7 +1805,7 @@ You should also get your employer (if you work as a programmer) or school, if an
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/jhpratt/deranged ">deranged 0.4.0</a></li>
+                    <li><a href=" https://github.com/jhpratt/deranged ">deranged 0.5.4</a></li>
                 </ul>
                 <pre class="license-text">
                                  Apache License
@@ -2229,10 +2228,9 @@ You should also get your employer (if you work as a programmer) or school, if an
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys 0.9.4</a></li>
+                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys 0.11.0</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix 1.0.8</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix 1.1.2</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.1+wasi-snapshot-preview1</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasi 0.14.2+wasi-0.2.4</a></li>
                 </ul>
                 <pre class="license-text">
                                  Apache License
@@ -2460,8 +2458,8 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/la10736/rstest ">rstest 0.25.0</a></li>
+                    <li><a href=" https://github.com/la10736/rstest ">rstest 0.26.1</a></li>
-                    <li><a href=" https://github.com/la10736/rstest ">rstest_macros 0.25.0</a></li>
+                    <li><a href=" https://github.com/la10736/rstest ">rstest_macros 0.26.1</a></li>
                     <li><a href=" https://github.com/la10736/rstest ">rstest_reuse 0.7.0</a></li>
                 </ul>
                 <pre class="license-text">
@@ -3042,15 +3040,17 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-core 0.61.2</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-core 0.62.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-implement 0.60.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-interface 0.59.1</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-link 0.1.3</a></li>
-                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-result 0.3.4</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-link 0.2.0</a></li>
-                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-strings 0.4.2</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-result 0.4.0</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-strings 0.5.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-sys 0.52.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-sys 0.59.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-sys 0.60.2</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-sys 0.61.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-targets 0.52.6</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-targets 0.53.3</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows_aarch64_gnullvm 0.52.6</a></li>
@@ -3486,7 +3486,7 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/google/zerocopy ">zerocopy 0.8.26</a></li>
+                    <li><a href=" https://github.com/google/zerocopy ">zerocopy 0.8.27</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
                            Version 2.0, January 2004
@@ -4097,215 +4097,6 @@ Software.
 
    Copyright 2017 Juniper Networks, Inc.
 
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/retep998/winapi-rs ">winapi 0.3.9</a></li>
-                </ul>
-                <pre class="license-text">                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;{}&quot;
-      replaced with your own identifying information. (Don&#x27;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
    Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
@@ -4328,9 +4119,9 @@ Software.
                     <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-query 1.1.4</a></li>
                     <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-wincon 3.0.10</a></li>
                     <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle 1.0.11</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap 4.5.45</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap 4.5.48</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap_builder 4.5.44</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap_builder 4.5.48</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap_derive 4.5.45</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap_derive 4.5.47</a></li>
                     <li><a href=" https://github.com/clap-rs/clap ">clap_lex 0.7.5</a></li>
                     <li><a href=" https://github.com/rust-cli/anstyle.git ">colorchoice 1.0.4</a></li>
                     <li><a href=" https://github.com/sfackler/foreign-types ">foreign-types-shared 0.1.1</a></li>
@@ -4341,15 +4132,16 @@ Software.
                     <li><a href=" https://crates.io/crates/openssl-macros ">openssl-macros 0.1.1</a></li>
                     <li><a href=" https://github.com/sfackler/rust-openssl ">openssl 0.10.73</a></li>
                     <li><a href=" https://github.com/toml-rs/toml ">serde_spanned 0.6.9</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">serde_spanned 1.0.0</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">serde_spanned 1.0.2</a></li>
                     <li><a href=" https://github.com/toml-rs/toml ">toml 0.8.23</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml 0.9.5</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml 0.9.7</a></li>
                     <li><a href=" https://github.com/toml-rs/toml ">toml_datetime 0.6.11</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_datetime 0.7.0</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_datetime 0.7.2</a></li>
                     <li><a href=" https://github.com/toml-rs/toml ">toml_edit 0.22.27</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_parser 1.0.2</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_edit 0.23.6</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_parser 1.0.3</a></li>
                     <li><a href=" https://github.com/toml-rs/toml ">toml_write 0.1.2</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_writer 1.0.2</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_writer 1.0.3</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
                            Version 2.0, January 2004
@@ -4553,215 +4345,6 @@ Software.
    See the License for the specific language governing permissions and
    limitations under the License.
 
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/RumovZ/android-tzdata ">android-tzdata 0.1.1</a></li>
-                </ul>
-                <pre class="license-text">                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  Definitions.
-
-    &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    &quot;control&quot; means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    &quot;Source&quot; form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    &quot;Object&quot; form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    &quot;Work&quot; shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    &quot;Contribution&quot; shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-    &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3.  Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4.  Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-    Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-    stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-    that You distribute, all copyright, patent, trademark, and
-    attribution notices from the Source form of the Work,
-    excluding those notices that do not pertain to any part of
-    the Derivative Works; and
-
-    (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-    distribution, then any Derivative Works that You distribute must
-    include a readable copy of the attribution notices contained
-    within such NOTICE file, excluding those notices that do not
-    pertain to any part of the Derivative Works, in at least one
-    of the following places: within a NOTICE text file distributed
-    as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or,
-    within a display generated by the Derivative Works, if and
-    wherever such third-party notices normally appear. The contents
-    of the NOTICE file are for informational purposes only and
-    do not modify the License. You may add Your own attribution
-    notices within Derivative Works that You distribute, alongside
-    or as an addendum to the NOTICE text from the Work, provided
-    that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5.  Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6.  Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9.  Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&#x27;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 </pre>
             </li>
             <li class="license">
@@ -5359,25 +4942,29 @@ END OF TERMS AND CONDITIONS</pre>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/dtolnay/anyhow ">anyhow 1.0.99</a></li>
+                    <li><a href=" https://github.com/dtolnay/anyhow ">anyhow 1.0.100</a></li>
+                    <li><a href=" https://github.com/dtolnay/async-trait ">async-trait 0.1.89</a></li>
                     <li><a href=" https://github.com/dtolnay/basic-toml ">basic-toml 0.1.10</a></li>
                     <li><a href=" https://github.com/dtolnay/dyn-clone ">dyn-clone 1.0.20</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Figment ">figment 0.10.19</a></li>
                     <li><a href=" https://github.com/dtolnay/itoa ">itoa 1.0.15</a></li>
-                    <li><a href=" https://github.com/rust-lang/libc ">libc 0.2.175</a></li>
                     <li><a href=" https://github.com/SergioBenitez/proc-macro2-diagnostics ">proc-macro2-diagnostics 0.10.1</a></li>
+                    <li><a href=" https://github.com/dtolnay/proc-macro2 ">proc-macro2 1.0.101</a></li>
                     <li><a href=" https://github.com/dtolnay/quote ">quote 1.0.40</a></li>
                     <li><a href=" https://github.com/dtolnay/rustversion ">rustversion 1.0.22</a></li>
                     <li><a href=" https://github.com/dtolnay/ryu ">ryu 1.0.20</a></li>
-                    <li><a href=" https://github.com/dtolnay/semver ">semver 1.0.26</a></li>
+                    <li><a href=" https://github.com/serde-rs/serde ">serde 1.0.226</a></li>
-                    <li><a href=" https://github.com/serde-rs/serde ">serde 1.0.219</a></li>
+                    <li><a href=" https://github.com/serde-rs/serde ">serde_core 1.0.226</a></li>
-                    <li><a href=" https://github.com/serde-rs/serde ">serde_derive 1.0.219</a></li>
+                    <li><a href=" https://github.com/serde-rs/serde ">serde_derive 1.0.226</a></li>
-                    <li><a href=" https://github.com/dtolnay/path-to-error ">serde_path_to_error 0.1.17</a></li>
+                    <li><a href=" https://github.com/serde-rs/json ">serde_json 1.0.145</a></li>
                     <li><a href=" https://github.com/nox/serde_urlencoded ">serde_urlencoded 0.7.1</a></li>
+                    <li><a href=" https://github.com/dtolnay/syn ">syn 2.0.106</a></li>
                     <li><a href=" https://github.com/dtolnay/thiserror ">thiserror-impl 1.0.69</a></li>
+                    <li><a href=" https://github.com/dtolnay/thiserror ">thiserror-impl 2.0.16</a></li>
                     <li><a href=" https://github.com/dtolnay/thiserror ">thiserror 1.0.69</a></li>
+                    <li><a href=" https://github.com/dtolnay/thiserror ">thiserror 2.0.16</a></li>
                     <li><a href=" https://github.com/SergioBenitez/uncased ">uncased 0.9.10</a></li>
-                    <li><a href=" https://github.com/dtolnay/unicode-ident ">unicode-ident 1.0.18</a></li>
+                    <li><a href=" https://github.com/dtolnay/unicode-ident ">unicode-ident 1.0.19</a></li>
                     <li><a href=" https://github.com/alacritty/vte ">utf8parse 0.2.2</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
@@ -7034,7 +6621,7 @@ limitations under the License.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/rustls/tokio-rustls ">tokio-rustls 0.26.2</a></li>
+                    <li><a href=" https://github.com/rustls/tokio-rustls ">tokio-rustls 0.26.3</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
@@ -8295,7 +7882,7 @@ limitations under the License.
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/strawlab/iana-time-zone ">iana-time-zone-haiku 0.1.2</a></li>
-                    <li><a href=" https://github.com/strawlab/iana-time-zone ">iana-time-zone 0.1.63</a></li>
+                    <li><a href=" https://github.com/strawlab/iana-time-zone ">iana-time-zone 0.1.64</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
@@ -8713,7 +8300,7 @@ limitations under the License.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/chronotope/chrono ">chrono 0.4.41</a></li>
+                    <li><a href=" https://github.com/chronotope/chrono ">chrono 0.4.42</a></li>
                     <li><a href=" https://github.com/RustCrypto/RSA ">rsa 0.9.8</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
@@ -8925,9 +8512,9 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/gimli-rs/addr2line ">addr2line 0.24.2</a></li>
                     <li><a href=" https://github.com/smol-rs/async-channel ">async-channel 1.9.0</a></li>
                     <li><a href=" https://github.com/smol-rs/async-channel ">async-channel 2.5.0</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-executor ">async-executor 1.13.2</a></li>
+                    <li><a href=" https://github.com/smol-rs/async-executor ">async-executor 1.13.3</a></li>
                     <li><a href=" https://github.com/Keruspe/async-global-executor ">async-global-executor 2.4.1</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-io ">async-io 2.5.0</a></li>
+                    <li><a href=" https://github.com/smol-rs/async-io ">async-io 2.6.0</a></li>
                     <li><a href=" https://github.com/smol-rs/async-lock ">async-lock 3.4.1</a></li>
                     <li><a href=" https://github.com/async-rs/async-std ">async-std 1.13.2</a></li>
                     <li><a href=" https://github.com/smol-rs/async-task ">async-task 4.7.1</a></li>
@@ -8937,10 +8524,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-lang/backtrace-rs ">backtrace 0.3.75</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.21.7</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.22.1</a></li>
-                    <li><a href=" https://github.com/bitflags/bitflags ">bitflags 2.9.3</a></li>
+                    <li><a href=" https://github.com/bitflags/bitflags ">bitflags 2.9.4</a></li>
                     <li><a href=" https://github.com/smol-rs/blocking ">blocking 1.6.2</a></li>
                     <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo 3.19.0</a></li>
-                    <li><a href=" https://github.com/rust-lang/cc-rs ">cc 1.2.34</a></li>
+                    <li><a href=" https://github.com/rust-lang/cc-rs ">cc 1.2.38</a></li>
                     <li><a href=" https://github.com/rust-lang/cfg-if ">cfg-if 1.0.3</a></li>
                     <li><a href=" https://github.com/smol-rs/concurrent-queue ">concurrent-queue 2.5.0</a></li>
                     <li><a href=" https://github.com/servo/core-foundation-rs ">core-foundation-sys 0.8.7</a></li>
@@ -8950,11 +8537,12 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/yaahc/displaydoc ">displaydoc 0.2.5</a></li>
                     <li><a href=" https://github.com/rayon-rs/either ">either 1.15.0</a></li>
                     <li><a href=" https://github.com/indexmap-rs/equivalent ">equivalent 1.0.2</a></li>
-                    <li><a href=" https://github.com/lambda-fairy/rust-errno ">errno 0.3.13</a></li>
+                    <li><a href=" https://github.com/lambda-fairy/rust-errno ">errno 0.3.14</a></li>
                     <li><a href=" https://github.com/smol-rs/event-listener-strategy ">event-listener-strategy 0.5.4</a></li>
                     <li><a href=" https://github.com/smol-rs/event-listener ">event-listener 2.5.3</a></li>
                     <li><a href=" https://github.com/smol-rs/event-listener ">event-listener 5.4.1</a></li>
                     <li><a href=" https://github.com/smol-rs/fastrand ">fastrand 2.3.0</a></li>
+                    <li><a href=" https://github.com/rust-lang/cc-rs ">find-msvc-tools 0.1.2</a></li>
                     <li><a href=" https://github.com/servo/rust-fnv ">fnv 1.0.7</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">form_urlencoded 1.2.2</a></li>
                     <li><a href=" https://github.com/smol-rs/futures-lite ">futures-lite 2.6.1</a></li>
@@ -8963,21 +8551,22 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-lang/glob ">glob 0.3.3</a></li>
                     <li><a href=" https://github.com/zkcrypto/group ">group 0.13.0</a></li>
                     <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown 0.15.5</a></li>
+                    <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown 0.16.0</a></li>
                     <li><a href=" https://github.com/withoutboats/heck ">heck 0.5.0</a></li>
                     <li><a href=" https://github.com/hermit-os/hermit-rs ">hermit-abi 0.5.2</a></li>
                     <li><a href=" https://github.com/seanmonstar/httparse ">httparse 1.10.1</a></li>
                     <li><a href=" https://github.com/rustls/hyper-rustls ">hyper-rustls 0.27.7</a></li>
                     <li><a href=" https://github.com/servo/rust-url/ ">idna 1.1.0</a></li>
                     <li><a href=" https://github.com/hsivonen/idna_adapter ">idna_adapter 1.2.1</a></li>
-                    <li><a href=" https://github.com/indexmap-rs/indexmap ">indexmap 2.11.0</a></li>
+                    <li><a href=" https://github.com/indexmap-rs/indexmap ">indexmap 2.11.4</a></li>
                     <li><a href=" https://github.com/fitzgen/inlinable_string ">inlinable_string 0.1.15</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools 0.10.5</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools 0.14.0</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys ">js-sys 0.3.77</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys ">js-sys 0.3.81</a></li>
                     <li><a href=" https://github.com/rust-lang-nursery/lazy-static.rs ">lazy_static 1.5.0</a></li>
-                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys 0.9.4</a></li>
+                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys 0.11.0</a></li>
                     <li><a href=" https://github.com/Amanieu/parking_lot ">lock_api 0.4.13</a></li>
-                    <li><a href=" https://github.com/rust-lang/log ">log 0.4.27</a></li>
+                    <li><a href=" https://github.com/rust-lang/log ">log 0.4.28</a></li>
                     <li><a href=" https://github.com/hyperium/mime ">mime 0.3.17</a></li>
                     <li><a href=" https://github.com/dignifiedquire/num-bigint ">num-bigint-dig 0.8.4</a></li>
                     <li><a href=" https://github.com/rust-num/num-integer ">num-integer 0.1.46</a></li>
@@ -8993,20 +8582,19 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/servo/rust-url/ ">percent-encoding 2.3.2</a></li>
                     <li><a href=" https://github.com/smol-rs/piper ">piper 0.2.4</a></li>
                     <li><a href=" https://github.com/rust-lang/pkg-config-rs ">pkg-config 0.3.32</a></li>
-                    <li><a href=" https://github.com/smol-rs/polling ">polling 3.10.0</a></li>
+                    <li><a href=" https://github.com/smol-rs/polling ">polling 3.11.0</a></li>
-                    <li><a href=" https://github.com/rust-lang/regex/tree/master/regex-automata ">regex-automata 0.4.9</a></li>
+                    <li><a href=" https://github.com/rust-lang/regex ">regex-automata 0.4.11</a></li>
-                    <li><a href=" https://github.com/rust-lang/regex ">regex-syntax 0.6.29</a></li>
+                    <li><a href=" https://github.com/rust-lang/regex ">regex-syntax 0.8.6</a></li>
-                    <li><a href=" https://github.com/rust-lang/regex/tree/master/regex-syntax ">regex-syntax 0.8.5</a></li>
+                    <li><a href=" https://github.com/rust-lang/regex ">regex 1.11.3</a></li>
-                    <li><a href=" https://github.com/rust-lang/regex ">regex 1.11.1</a></li>
                     <li><a href=" https://github.com/briansmith/ring ">ring 0.17.14</a></li>
                     <li><a href=" https://github.com/rust-lang/rustc-demangle ">rustc-demangle 0.1.26</a></li>
                     <li><a href=" https://github.com/djc/rustc-version-rs ">rustc_version 0.4.1</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix 1.0.8</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix 1.1.2</a></li>
-                    <li><a href=" https://github.com/rustls/rustls ">rustls 0.23.31</a></li>
+                    <li><a href=" https://github.com/rustls/rustls ">rustls 0.23.32</a></li>
                     <li><a href=" https://github.com/bluss/scopeguard ">scopeguard 1.2.0</a></li>
                     <li><a href=" https://github.com/mitsuhiko/serde-plain ">serde_plain 1.0.2</a></li>
-                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with 3.14.0</a></li>
+                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with 3.14.1</a></li>
-                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with_macros 3.14.0</a></li>
+                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with_macros 3.14.1</a></li>
                     <li><a href=" https://github.com/vorner/signal-hook ">signal-hook-registry 1.4.6</a></li>
                     <li><a href=" https://github.com/servo/rust-smallvec ">smallvec 1.15.1</a></li>
                     <li><a href=" https://github.com/rust-lang/socket2 ">socket2 0.6.0</a></li>
@@ -9016,18 +8604,19 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/seanmonstar/unicase ">unicase 2.8.1</a></li>
                     <li><a href=" https://github.com/unicode-rs/unicode-xid ">unicode-xid 0.2.6</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">url 2.5.7</a></li>
-                    <li><a href=" https://github.com/uuid-rs/uuid ">uuid 1.18.0</a></li>
+                    <li><a href=" https://github.com/uuid-rs/uuid ">uuid 1.18.1</a></li>
                     <li><a href=" https://github.com/sval-rs/value-bag ">value-bag 1.11.1</a></li>
                     <li><a href=" https://github.com/SergioBenitez/version_check ">version_check 0.9.5</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.1+wasi-snapshot-preview1</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasi 0.14.2+wasi-0.2.4</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasi 0.14.7+wasi-0.2.4</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend ">wasm-bindgen-backend 0.2.100</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/backend ">wasm-bindgen-backend 0.2.104</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures ">wasm-bindgen-futures 0.4.50</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/futures ">wasm-bindgen-futures 0.4.54</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support ">wasm-bindgen-macro-support 0.2.100</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/macro-support ">wasm-bindgen-macro-support 0.2.104</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro ">wasm-bindgen-macro 0.2.100</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/macro ">wasm-bindgen-macro 0.2.104</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/shared ">wasm-bindgen-shared 0.2.100</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/shared ">wasm-bindgen-shared 0.2.104</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen ">wasm-bindgen 0.2.100</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen ">wasm-bindgen 0.2.104</a></li>
-                    <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys ">web-sys 0.3.77</a></li>
+                    <li><a href=" https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/web-sys ">web-sys 0.3.81</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/wit-bindgen ">wit-bindgen 0.46.0</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
@@ -10691,7 +10280,7 @@ limitations under the License.
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/oyvindln/adler2 ">adler2 2.0.1</a></li>
-                    <li><a href=" https://github.com/bkchr/proc-macro-crate ">proc-macro-crate 3.3.0</a></li>
+                    <li><a href=" https://github.com/bkchr/proc-macro-crate ">proc-macro-crate 3.4.0</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
@@ -11497,19 +11086,6 @@ limitations under the License.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/retep998/winapi-rs ">winapi 0.3.9</a></li>
-                </ul>
-                <pre class="license-text">// Licensed under the Apache License, Version 2.0
-// &lt;LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0&gt; or the MIT license
-// &lt;LICENSE-MIT or http://opensource.org/licenses/MIT&gt;, at your option.
-// All files in the project carrying such notice may not be copied, modified, or distributed
-// except according to those terms.
-</pre>
             </li>
             <li class="license">
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
@@ -12005,24 +11581,20 @@ limitations under the License.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/dtolnay/async-trait ">async-trait 0.1.89</a></li>
                     <li><a href=" https://github.com/chronotope/chrono-tz ">chrono-tz 0.10.4</a></li>
                     <li><a href=" https://github.com/rustwasm/gloo/tree/master/crates/timers ">gloo-timers 0.3.0</a></li>
                     <li><a href=" https://github.com/TedDriggs/ident_case ">ident_case 1.0.1</a></li>
+                    <li><a href=" https://github.com/rust-lang/libc ">libc 0.2.176</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Pear ">pear 0.2.9</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Pear ">pear_codegen 0.2.9</a></li>
-                    <li><a href=" https://github.com/dtolnay/proc-macro2 ">proc-macro2 1.0.101</a></li>
                     <li><a href=" https://github.com/r-efi/r-efi ">r-efi 5.3.0</a></li>
                     <li><a href=" https://github.com/udoprog/relative-path ">relative-path 1.9.3</a></li>
                     <li><a href=" https://github.com/fmeringdal/rust-rrule ">rrule 0.14.0</a></li>
-                    <li><a href=" https://github.com/serde-rs/json ">serde_json 1.0.143</a></li>
+                    <li><a href=" https://github.com/dtolnay/semver ">semver 1.0.27</a></li>
+                    <li><a href=" https://github.com/dtolnay/path-to-error ">serde_path_to_error 0.1.20</a></li>
                     <li><a href=" https://github.com/jedisct1/rust-siphash ">siphasher 1.0.1</a></li>
-                    <li><a href=" https://github.com/dtolnay/syn ">syn 2.0.106</a></li>
+                    <li><a href=" https://github.com/time-rs/time ">time 0.3.44</a></li>
-                    <li><a href=" https://github.com/dtolnay/thiserror ">thiserror-impl 2.0.16</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasip2 1.0.1+wasi-0.2.4</a></li>
-                    <li><a href=" https://github.com/dtolnay/thiserror ">thiserror 2.0.16</a></li>
-                    <li><a href=" https://github.com/retep998/winapi-rs ">winapi-i686-pc-windows-gnu 0.4.0</a></li>
-                    <li><a href=" https://github.com/retep998/winapi-rs ">winapi-x86_64-pc-windows-gnu 0.4.0</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/wit-bindgen ">wit-bindgen-rt 0.39.0</a></li>
                 </ul>
                 <pre class="license-text">Apache License
 Version 2.0, January 2004
@@ -12782,16 +12354,27 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
                 <h3 id="ISC">ISC License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/rustls/webpki ">rustls-webpki 0.103.4</a></li>
+                    <li><a href=" https://github.com/rustls/webpki ">rustls-webpki 0.103.6</a></li>
                 </ul>
-                <pre class="license-text">ISC License:
+                <pre class="license-text">Except as otherwise noted, this project is licensed under the following
+(ISC-style) terms:
 
-Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. (&quot;ISC&quot;)
+Copyright 2015 Brian Smith.
-Copyright (c) 1995-2003 by Internet Software Consortium
 
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot; AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot; AND THE AUTHORS DISCLAIM ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The files under third-party/chromium are licensed as described in
+third-party/chromium/LICENSE.
 </pre>
             </li>
             <li class="license">
@@ -13269,7 +12852,7 @@ THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/hawkw/matchers ">matchers 0.1.0</a></li>
+                    <li><a href=" https://github.com/hawkw/matchers ">matchers 0.2.0</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2019 Eliza Weisman
 
@@ -13299,7 +12882,7 @@ SOFTWARE.
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-attributes 0.1.30</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core 0.1.34</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-log 0.2.0</a></li>
-                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber 0.3.19</a></li>
+                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber 0.3.20</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing 0.1.41</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2019 Tokio Contributors
@@ -13500,7 +13083,7 @@ DEALINGS IN THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/hyperium/hyper-util ">hyper-util 0.1.16</a></li>
+                    <li><a href=" https://github.com/hyperium/hyper-util ">hyper-util 0.1.17</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2023-2025 Sean McArthur
 
@@ -13587,11 +13170,8 @@ SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/TedDriggs/darling ">darling 0.20.11</a></li>
                     <li><a href=" https://github.com/TedDriggs/darling ">darling 0.21.3</a></li>
-                    <li><a href=" https://github.com/TedDriggs/darling ">darling_core 0.20.11</a></li>
                     <li><a href=" https://github.com/TedDriggs/darling ">darling_core 0.21.3</a></li>
-                    <li><a href=" https://github.com/TedDriggs/darling ">darling_macro 0.20.11</a></li>
                     <li><a href=" https://github.com/TedDriggs/darling ">darling_macro 0.21.3</a></li>
                 </ul>
                 <pre class="license-text">MIT License
@@ -13851,34 +13431,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 </pre>
-            </li>
-            <li class="license">
-                <h3 id="MIT">MIT License</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/danaugrs/overload ">overload 0.1.1</a></li>
-                </ul>
-                <pre class="license-text">MIT License
-
-Copyright (c) 2019 Daniel Augusto Rizzi Salvadori
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the &quot;Software&quot;), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.</pre>
             </li>
             <li class="license">
                 <h3 id="MIT">MIT License</h3>
@@ -13910,7 +13462,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/nushell/nu-ansi-term ">nu-ansi-term 0.46.0</a></li>
+                    <li><a href=" https://github.com/nushell/nu-ansi-term ">nu-ansi-term 0.50.1</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 
@@ -14030,8 +13582,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BurntSushi/aho-corasick ">aho-corasick 1.1.3</a></li>
                     <li><a href=" https://github.com/BurntSushi/byteorder ">byteorder 1.5.0</a></li>
-                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.5</a></li>
+                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.6</a></li>
-                    <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata 0.1.10</a></li>
                     <li><a href=" https://github.com/BurntSushi/walkdir ">walkdir 2.5.0</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
@@ -14123,7 +13674,7 @@ SOFTWARE.
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BurntSushi/same-file ">same-file 1.0.6</a></li>
-                    <li><a href=" https://github.com/BurntSushi/winapi-util ">winapi-util 0.1.10</a></li>
+                    <li><a href=" https://github.com/BurntSushi/winapi-util ">winapi-util 0.1.11</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 
@@ -14242,7 +13793,7 @@ SOFTWARE.</pre>
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tafia/quick-xml ">quick-xml 0.37.5</a></li>
+                    <li><a href=" https://github.com/tafia/quick-xml ">quick-xml 0.38.3</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 
@@ -14275,10 +13826,9 @@ THE SOFTWARE.
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BurntSushi/aho-corasick ">aho-corasick 1.1.3</a></li>
                     <li><a href=" https://github.com/BurntSushi/byteorder ">byteorder 1.5.0</a></li>
-                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.5</a></li>
-                    <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata 0.1.10</a></li>
                     <li><a href=" https://github.com/BurntSushi/same-file ">same-file 1.0.6</a></li>
                     <li><a href=" https://github.com/BurntSushi/walkdir ">walkdir 2.5.0</a></li>
+                    <li><a href=" https://github.com/BurntSushi/winapi-util ">winapi-util 0.1.11</a></li>
                 </ul>
                 <pre class="license-text">This project is dual-licensed under the Unlicense and MIT licenses.
 
@@ -14678,9 +14228,9 @@ Exhibit B - &quot;Incompatible With Secondary Licenses&quot; Notice
                     <li><a href=" https://github.com/unicode-org/icu4x ">icu_properties_data 2.0.1</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">icu_provider 2.0.0</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">litemap 0.8.0</a></li>
-                    <li><a href=" https://github.com/unicode-org/icu4x ">potential_utf 0.1.2</a></li>
+                    <li><a href=" https://github.com/unicode-org/icu4x ">potential_utf 0.1.3</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">tinystr 0.8.1</a></li>
-                    <li><a href=" https://github.com/dtolnay/unicode-ident ">unicode-ident 1.0.18</a></li>
+                    <li><a href=" https://github.com/dtolnay/unicode-ident ">unicode-ident 1.0.19</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">writeable 0.6.1</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">yoke-derive 0.8.0</a></li>
                     <li><a href=" https://github.com/unicode-org/icu4x ">yoke 0.8.0</a></li>

crates/frontend/public/assets/style.css

@@ -290,6 +290,7 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
+        margin-left: 8px;
       }
 
       .actions {
@@ -346,6 +347,17 @@ select {
   }
 }
 
+form {
+
+  input[type="text"],
+  input[type="password"],
+  input[type="color"],
+  textarea,
+  select {
+    width: 100%;
+  }
+}
+
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);

crates/frontend/public/templates/components/sections/calendars_section.html

@@ -1,13 +1,13 @@
 <h2>{{ user.id }}'s Calendars</h2>
 <ul class="collection-list">
   {% for (meta, calendar) in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -15,7 +15,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       {% if let Some(subscription_url) = calendar.subscription_url %}
       <span class="subscription-url">{{ subscription_url }}</span>
@@ -29,9 +29,9 @@
           principal="{{ calendar.principal }}"
           cal_id="{{ calendar.id }}"
           timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
+          displayname="{{ calendar.meta.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
+          description="{{ calendar.meta.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
+          color="{{ calendar.meta.color.as_deref().unwrap_or_default() }}"
           components="{{ calendar.components | json }}"
         ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
@@ -51,13 +51,13 @@
 <h3>Deleted Calendars</h3>
 <ul class="collection-list">
   {% for (meta, calendar) in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
         <div class="comps">
           {% for comp in calendar.components %}
           <span>{{ comp }}</span>
@@ -65,7 +65,7 @@
         </div>
       </span>
       <span class="description">
-        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
       </span>
       <div class="actions">
         <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"

crates/frontend/public/templates/pages/calendar.html

@@ -4,9 +4,9 @@
 {% endblock %}
 
 {% block content %}
-{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
 <h1>{{ calendar.principal }}/{{ name }}</h1>
-{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
+{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
 
 {% if let Some(subscription_url) = calendar.subscription_url %}
 <h2>Subscription URL</h2>
@@ -25,9 +25,6 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.get_vtimezone() %}
-<textarea rows="16" readonly>{{ timezone }}</textarea>
-{% endif %}
 
 <pre>{{ calendar|json }}</pre>
 

crates/frontend/src/assets.rs

@@ -13,6 +13,7 @@ use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
 #[folder = "public/assets"]
+#[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
 #[derive(Clone, Default)]

crates/ical/src/icalendar/event.rs

@@ -15,6 +15,10 @@ pub struct EventObject {
 }
 
 impl EventObject {
+    pub fn get_uid(&self) -> &str {
+        self.event.get_uid()
+    }
+
     pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
         if let Some(dtstart) = self.event.get_dtstart() {
             Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
@@ -92,6 +96,7 @@ impl EventObject {
         &self,
         start: Option<DateTime<Utc>>,
         end: Option<DateTime<Utc>>,
+        overrides: &[EventObject],
     ) -> Result<Vec<IcalEvent>, Error> {
         if let Some(mut rrule_set) = self.recurrence_ruleset()? {
             if let Some(start) = start {
@@ -107,13 +112,30 @@ impl EventObject {
                 .get_dtend()?
                 .map(|dtend| dtend.as_datetime().into_owned() - dtstart.as_datetime().into_owned());
 
-            for date in dates {
+            'recurrence: for date in dates {
                 let date = CalDateTime::from(date);
                 let dateformat = if dtstart.is_date() {
                     date.format_date()
                 } else {
                     date.format()
                 };
+
+                for _override in overrides {
+                    if let Some(override_id) = &_override
+                        .event
+                        .get_recurrence_id()
+                        .as_ref()
+                        .expect("overrides have a recurrence id")
+                        .value
+                        && override_id == &dateformat
+                    {
+                        // We have an override for this occurence
+                        //
+                        events.push(_override.event.clone());
+                        continue 'recurrence;
+                    }
+                }
+
                 let mut ev = self.event.clone().mutable();
                 ev.remove_property("RRULE");
                 ev.remove_property("RDATE");
@@ -229,10 +251,18 @@ END:VEVENT\r\n",
     #[test]
     fn test_expand_recurrence() {
         let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
-        let event = event.event().unwrap();
+        let (event, overrides) = if let crate::CalendarObjectComponent::Event(
+            main_event,
+            overrides,
+        ) = event.get_data()
+        {
+            (main_event, overrides)
+        } else {
+            panic!()
+        };
 
         let events: Vec<String> = event
-            .expand_recurrence(None, None)
+            .expand_recurrence(None, None, overrides)
             .unwrap()
             .into_iter()
             .map(|event| Emitter::generate(&event))

crates/ical/src/icalendar/journal.rs

@@ -1,5 +0,0 @@
-use derive_more::From;
-use ical::parser::ical::component::IcalJournal;
-
-#[derive(Debug, Clone, From)]
-pub struct JournalObject(pub IcalJournal);

crates/ical/src/icalendar/mod.rs

@@ -1,9 +1,5 @@
 mod event;
-mod journal;
 mod object;
-mod todo;
 
 pub use event::*;
-pub use journal::*;
 pub use object::*;
-pub use todo::*;

crates/ical/src/icalendar/object.rs

@@ -1,11 +1,13 @@
-use super::{EventObject, JournalObject, TodoObject};
+use super::EventObject;
 use crate::CalDateTime;
 use crate::Error;
 use chrono::DateTime;
 use chrono::Utc;
 use derive_more::Display;
 use ical::generator::{Emitter, IcalCalendar};
+use ical::parser::ical::component::IcalJournal;
 use ical::parser::ical::component::IcalTimeZone;
+use ical::parser::ical::component::IcalTodo;
 use ical::property::Property;
 use serde::Deserialize;
 use serde::Serialize;
@@ -56,18 +58,85 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
 
 #[derive(Debug, Clone)]
 pub enum CalendarObjectComponent {
-    Event(EventObject),
+    Event(EventObject, Vec<EventObject>),
-    Todo(TodoObject),
+    Todo(IcalTodo, Vec<IcalTodo>),
-    Journal(JournalObject),
+    Journal(IcalJournal, Vec<IcalJournal>),
 }
 
-impl Default for CalendarObjectComponent {
+impl From<&CalendarObjectComponent> for CalendarObjectType {
-    fn default() -> Self {
+    fn from(value: &CalendarObjectComponent) -> Self {
-        Self::Event(EventObject::default())
+        match value {
+            CalendarObjectComponent::Event(..) => CalendarObjectType::Event,
+            CalendarObjectComponent::Todo(..) => CalendarObjectType::Todo,
+            CalendarObjectComponent::Journal(..) => CalendarObjectType::Journal,
+        }
     }
 }
 
-#[derive(Debug, Clone, Default)]
+impl CalendarObjectComponent {
+    fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
+        let main_event = events
+            .extract_if(.., |event| event.event.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = events;
+        for event in &overrides {
+            if event.get_uid() != main_event.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if event.event.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Event(main_event, overrides))
+    }
+    fn from_todos(mut todos: Vec<IcalTodo>) -> Result<Self, Error> {
+        let main_todo = todos
+            .extract_if(.., |todo| todo.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = todos;
+        for todo in &overrides {
+            if todo.get_uid() != main_todo.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if todo.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Todo(main_todo, overrides))
+    }
+    fn from_journals(mut journals: Vec<IcalJournal>) -> Result<Self, Error> {
+        let main_journal = journals
+            .extract_if(.., |journal| journal.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = journals;
+        for journal in &overrides {
+            if journal.get_uid() != main_journal.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if journal.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Journal(main_journal, overrides))
+    }
+}
+
+#[derive(Debug, Clone)]
 pub struct CalendarObject {
     data: CalendarObjectComponent,
     properties: Vec<Property>,
@@ -84,16 +153,16 @@ impl CalendarObject {
                 "multiple calendars, only one allowed".to_owned(),
             ));
         }
-        if cal.events.len()
+
-            + cal.alarms.len()
+        if !cal.events.is_empty() as u8
-            + cal.todos.len()
+            + !cal.todos.is_empty() as u8
-            + cal.journals.len()
+            + !cal.journals.is_empty() as u8
-            + cal.free_busys.len()
+            + !cal.free_busys.is_empty() as u8
             != 1
         {
             // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
             return Err(Error::InvalidData(
-                "iCalendar object is only allowed to have exactly one component".to_owned(),
+                "iCalendar object must have exactly one component type".to_owned(),
             ));
         }
 
@@ -111,12 +180,20 @@ impl CalendarObject {
             .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
             .collect();
 
-        let data = if let Some(event) = cal.events.into_iter().next() {
+        let data = if !cal.events.is_empty() {
-            CalendarObjectComponent::Event(EventObject { event, timezones })
+            CalendarObjectComponent::from_events(
-        } else if let Some(todo) = cal.todos.into_iter().next() {
+                cal.events
-            CalendarObjectComponent::Todo(todo.into())
+                    .into_iter()
-        } else if let Some(journal) = cal.journals.into_iter().next() {
+                    .map(|event| EventObject {
-            CalendarObjectComponent::Journal(journal.into())
+                        event,
+                        timezones: timezones.clone(),
+                    })
+                    .collect(),
+            )?
+        } else if !cal.todos.is_empty() {
+            CalendarObjectComponent::from_todos(cal.todos)?
+        } else if !cal.journals.is_empty() {
+            CalendarObjectComponent::from_journals(cal.journals)?
         } else {
             return Err(Error::InvalidData(
                 "iCalendar component type not supported :(".to_owned(),
@@ -141,9 +218,11 @@ impl CalendarObject {
 
     pub fn get_id(&self) -> &str {
         match &self.data {
-            CalendarObjectComponent::Todo(todo) => todo.0.get_uid(),
+            // We've made sure before that the first component exists and all components share the
-            CalendarObjectComponent::Event(event) => event.event.get_uid(),
+            // same UID
-            CalendarObjectComponent::Journal(journal) => journal.0.get_uid(),
+            CalendarObjectComponent::Todo(todo, _) => todo.get_uid(),
+            CalendarObjectComponent::Event(event, _) => event.event.get_uid(),
+            CalendarObjectComponent::Journal(journal, _) => journal.get_uid(),
         }
     }
 
@@ -163,34 +242,37 @@ impl CalendarObject {
     }
 
     pub fn get_object_type(&self) -> CalendarObjectType {
-        match self.data {
+        (&self.data).into()
-            CalendarObjectComponent::Todo(_) => CalendarObjectType::Todo,
-            CalendarObjectComponent::Event(_) => CalendarObjectType::Event,
-            CalendarObjectComponent::Journal(_) => CalendarObjectType::Journal,
-        }
     }
 
     pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_dtstart(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_dtstart())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .min()),
             _ => Ok(None),
         }
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
         match &self.data {
-            CalendarObjectComponent::Event(event) => event.get_last_occurence(),
+            CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain([main_event].into_iter())
+                .map(|event| event.get_last_occurence())
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .max()),
             _ => Ok(None),
         }
     }
 
-    pub fn event(&self) -> Option<&EventObject> {
-        match &self.data {
-            CalendarObjectComponent::Event(event) => Some(event),
-            _ => None,
-        }
-    }
-
     pub fn expand_recurrence(
         &self,
         start: Option<DateTime<Utc>>,
@@ -198,10 +280,10 @@ impl CalendarObject {
     ) -> Result<String, Error> {
         // Only events can be expanded
         match &self.data {
-            CalendarObjectComponent::Event(event) => {
+            CalendarObjectComponent::Event(main_event, overrides) => {
                 let cal = IcalCalendar {
                     properties: self.properties.clone(),
-                    events: event.expand_recurrence(start, end)?,
+                    events: main_event.expand_recurrence(start, end, overrides)?,
                     ..Default::default()
                 };
                 Ok(cal.generate())

crates/ical/src/icalendar/todo.rs

@@ -1,5 +0,0 @@
-use derive_more::From;
-use ical::parser::ical::component::IcalTodo;
-
-#[derive(Debug, Clone, From)]
-pub struct TodoObject(pub IcalTodo);

crates/ical/tests/test_cal_object.rs

@@ -0,0 +1,30 @@
+use rustical_ical::CalendarObject;
+
+const MULTI_VEVENT: &str = r#"
+BEGIN:VCALENDAR
+PRODID:-//Example Corp.//CalDAV Client//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:2@example.com
+SUMMARY:Weekly Meeting
+DTSTAMP:20041210T183838Z
+DTSTART:20041206T120000Z
+DTEND:20041206T130000Z
+RRULE:FREQ=WEEKLY
+END:VEVENT
+BEGIN:VEVENT
+UID:2@example.com
+SUMMARY:Weekly Meeting
+RECURRENCE-ID:20041213T120000Z
+DTSTAMP:20041210T183838Z
+DTSTART:20041213T130000Z
+DTEND:20041213T140000Z
+END:VEVENT
+END:VCALENDAR
+"#;
+
+#[test]
+fn parse_calendar_object() {
+    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
+    object.expand_recurrence(None, None).unwrap();
+}

crates/oidc/Cargo.toml

@@ -17,3 +17,4 @@ axum.workspace = true
 tower-sessions = "0.14"
 axum-extra.workspace = true
 headers.workspace = true
+tracing.workspace = true

crates/oidc/src/lib.rs

@@ -76,7 +76,10 @@ async fn get_oidc_client(
 > {
     let provider_metadata = CoreProviderMetadata::discover_async(issuer, http_client)
         .await
-        .map_err(|_| OidcError::Other("Failed to discover OpenID provider"))?;
+        .map_err(|err| {
+            tracing::error!("An error occured trying to discover OpenID provider: {err}");
+            OidcError::Other("Failed to discover OpenID provider")
+        })?;
 
     Ok(CoreClient::from_provider_metadata(
         provider_metadata.clone(),
@@ -192,8 +195,8 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         .await
         .map_err(|e| OidcError::UserInfo(e.to_string()))?;
 
-    if let Some(require_group) = &oidc_config.require_group {
+    if let Some(require_group) = &oidc_config.require_group
-        if !user_info_claims
+        && !user_info_claims
             .additional_claims()
             .groups
             .clone()
@@ -206,7 +209,6 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         )
             .into_response());
     }
-    }
 
     let user_id = match oidc_config.claim_userid {
         UserIdClaim::Sub => user_info_claims.subject().to_string(),

crates/store/src/auth/middleware.rs

@@ -72,13 +72,12 @@ where
         let mut inner = self.inner.clone();
 
         Box::pin(async move {
-            if let Some(session) = request.extensions().get::<Session>() {
+            if let Some(session) = request.extensions().get::<Session>()
-                if let Ok(Some(user_id)) = session.get::<String>("user").await {
+                && let Ok(Some(user_id)) = session.get::<String>("user").await
-                    if let Ok(Some(user)) = ap.get_principal(&user_id).await {
+                && let Ok(Some(user)) = ap.get_principal(&user_id).await
+            {
                 request.extensions_mut().insert(user);
             }
-                }
-            }
 
             if let Some(auth) = auth_header {
                 let user_id = auth.username();

crates/store/src/calendar.rs

@@ -6,13 +6,23 @@ use rustical_ical::CalendarObjectType;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
-pub struct Calendar {
+pub struct CalendarMetadata {
-    pub principal: String,
+    // Attributes that may be outsourced
-    pub id: String,
     pub displayname: Option<String>,
     pub order: i64,
     pub description: Option<String>,
     pub color: Option<String>,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct Calendar {
+    // Attributes that may be outsourced
+    #[serde(flatten)]
+    pub meta: CalendarMetadata,
+
+    // Common calendar attributes
+    pub principal: String,
+    pub id: String,
     pub timezone_id: Option<String>,
     pub deleted_at: Option<NaiveDateTime>,
     pub synctoken: i64,

crates/store/src/combined_calendar_store.rs

@@ -1,282 +1,208 @@
+use crate::CalendarStore;
 use async_trait::async_trait;
-use derive_more::Constructor;
+use std::{collections::HashMap, sync::Arc};
-use rustical_ical::CalendarObject;
-use std::sync::Arc;
 
-use crate::{
+pub trait PrefixedCalendarStore: CalendarStore {
-    Calendar, CalendarStore, Error, calendar_store::CalendarQuery,
+    const PREFIX: &'static str;
-    contact_birthday_store::BIRTHDAYS_PREFIX,
-};
-
-#[derive(Debug, Constructor)]
-pub struct CombinedCalendarStore<CS: CalendarStore, BS: CalendarStore> {
-    cal_store: Arc<CS>,
-    birthday_store: Arc<BS>,
 }
 
-impl<CS: CalendarStore, BS: CalendarStore> Clone for CombinedCalendarStore<CS, BS> {
+#[derive(Clone)]
-    fn clone(&self) -> Self {
+pub struct CombinedCalendarStore {
+    stores: HashMap<&'static str, Arc<dyn CalendarStore>>,
+    default: Arc<dyn CalendarStore>,
+}
+
+impl CombinedCalendarStore {
+    pub fn new(default: Arc<dyn CalendarStore>) -> Self {
         Self {
-            cal_store: self.cal_store.clone(),
+            stores: HashMap::new(),
-            birthday_store: self.birthday_store.clone(),
+            default,
         }
     }
+
+    pub fn with_store<CS: PrefixedCalendarStore>(mut self, store: Arc<CS>) -> Self {
+        let store: Arc<dyn CalendarStore> = store;
+        self.stores.insert(CS::PREFIX, store);
+        self
+    }
+
+    fn store_for_id(&self, id: &str) -> Arc<dyn CalendarStore> {
+        self.stores
+            .iter()
+            .find(|&(prefix, _store)| id.starts_with(prefix))
+            .map(|(_prefix, store)| store.clone())
+            .unwrap_or(self.default.clone())
+    }
 }
 
 #[async_trait]
-impl<CS: CalendarStore, BS: CalendarStore> CalendarStore for CombinedCalendarStore<CS, BS> {
+impl CalendarStore for CombinedCalendarStore {
     #[inline]
     async fn get_calendar(
         &self,
         principal: &str,
         id: &str,
         show_deleted: bool,
-    ) -> Result<Calendar, Error> {
+    ) -> Result<crate::Calendar, crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(id)
-            self.birthday_store
             .get_calendar(principal, id, show_deleted)
             .await
-        } else {
-            self.cal_store
-                .get_calendar(principal, id, show_deleted)
-                .await
-        }
     }
 
-    #[inline]
     async fn update_calendar(
         &self,
         principal: String,
         id: String,
-        calendar: Calendar,
+        calendar: crate::Calendar,
     ) -> Result<(), crate::Error> {
-        if id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(&id)
-            self.birthday_store
-                .update_calendar(principal, id, calendar)
-                .await
-        } else {
-            self.cal_store
             .update_calendar(principal, id, calendar)
             .await
     }
+
+    async fn insert_calendar(&self, calendar: crate::Calendar) -> Result<(), crate::Error> {
+        self.store_for_id(&calendar.id)
+            .insert_calendar(calendar)
+            .await
     }
 
-    #[inline]
+    async fn delete_calendar(
-    async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error> {
+        &self,
-        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
+        principal: &str,
-            Err(Error::ReadOnly)
+        name: &str,
-        } else {
+        use_trashbin: bool,
-            self.cal_store.insert_calendar(calendar).await
+    ) -> Result<(), crate::Error> {
-        }
+        self.store_for_id(name)
+            .delete_calendar(principal, name, use_trashbin)
+            .await
     }
 
-    #[inline]
+    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), crate::Error> {
-    async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
+        self.store_for_id(name)
-        Ok([
+            .restore_calendar(principal, name)
-            self.cal_store.get_calendars(principal).await?,
+            .await
-            self.birthday_store.get_calendars(principal).await?,
+    }
-        ]
+
-        .concat())
+    async fn sync_changes(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        synctoken: i64,
+    ) -> Result<(Vec<rustical_ical::CalendarObject>, Vec<String>, i64), crate::Error> {
+        self.store_for_id(cal_id)
+            .sync_changes(principal, cal_id, synctoken)
+            .await
+    }
+
+    async fn import_calendar(
+        &self,
+        calendar: crate::Calendar,
+        objects: Vec<rustical_ical::CalendarObject>,
+        merge_existing: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&calendar.id)
+            .import_calendar(calendar, objects, merge_existing)
+            .await
+    }
+
+    async fn calendar_query(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        query: crate::calendar_store::CalendarQuery,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_query(principal, cal_id, query)
+            .await
+    }
+
+    async fn restore_object(
+        &self,
+        principal: &str,
+        cal_id: &str,
+        object_id: &str,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(cal_id)
+            .restore_object(principal, cal_id, object_id)
+            .await
+    }
+
+    async fn calendar_metadata(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<crate::CollectionMetadata, crate::Error> {
+        self.store_for_id(cal_id)
+            .calendar_metadata(principal, cal_id)
+            .await
+    }
+
+    async fn get_objects(
+        &self,
+        principal: &str,
+        cal_id: &str,
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
+        self.store_for_id(cal_id)
+            .get_objects(principal, cal_id)
+            .await
+    }
+
+    async fn put_object(
+        &self,
+        principal: String,
+        cal_id: String,
+        object: rustical_ical::CalendarObject,
+        overwrite: bool,
+    ) -> Result<(), crate::Error> {
+        self.store_for_id(&cal_id)
+            .put_object(principal, cal_id, object, overwrite)
+            .await
     }
 
-    #[inline]
     async fn delete_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         use_trashbin: bool,
-    ) -> Result<(), Error> {
+    ) -> Result<(), crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
             .delete_object(principal, cal_id, object_id, use_trashbin)
             .await
-        } else {
-            self.cal_store
-                .delete_object(principal, cal_id, object_id, use_trashbin)
-                .await
-        }
     }
 
-    #[inline]
     async fn get_object(
         &self,
         principal: &str,
         cal_id: &str,
         object_id: &str,
         show_deleted: bool,
-    ) -> Result<CalendarObject, Error> {
+    ) -> Result<rustical_ical::CalendarObject, crate::Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id)
-            self.birthday_store
-                .get_object(principal, cal_id, object_id, show_deleted)
-                .await
-        } else {
-            self.cal_store
             .get_object(principal, cal_id, object_id, show_deleted)
             .await
     }
+
+    async fn get_calendars(&self, principal: &str) -> Result<Vec<crate::Calendar>, crate::Error> {
+        let mut calendars = self.default.get_calendars(principal).await?;
+        for store in self.stores.values() {
+            calendars.extend(store.get_calendars(principal).await?);
+        }
+        Ok(calendars)
     }
 
-    #[inline]
+    async fn get_deleted_calendars(
-    async fn sync_changes(
         &self,
         principal: &str,
-        cal_id: &str,
+    ) -> Result<Vec<crate::Calendar>, crate::Error> {
-        synctoken: i64,
+        let mut calendars = self.default.get_deleted_calendars(principal).await?;
-    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
+        for store in self.stores.values() {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+            calendars.extend(store.get_deleted_calendars(principal).await?);
-            self.birthday_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
-        } else {
-            self.cal_store
-                .sync_changes(principal, cal_id, synctoken)
-                .await
         }
+        Ok(calendars)
     }
 
-    #[inline]
-    async fn calendar_metadata(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<crate::CollectionMetadata, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_metadata(principal, cal_id)
-                .await
-        } else {
-            self.cal_store.calendar_metadata(principal, cal_id).await
-        }
-    }
-    #[inline]
-    async fn get_objects(
-        &self,
-        principal: &str,
-        cal_id: &str,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.get_objects(principal, cal_id).await
-        } else {
-            self.cal_store.get_objects(principal, cal_id).await
-        }
-    }
-
-    #[inline]
-    async fn calendar_query(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        query: CalendarQuery,
-    ) -> Result<Vec<CalendarObject>, Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        } else {
-            self.cal_store
-                .calendar_query(principal, cal_id, query)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn restore_calendar(&self, principal: &str, name: &str) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.restore_calendar(principal, name).await
-        } else {
-            self.cal_store.restore_calendar(principal, name).await
-        }
-    }
-
-    #[inline]
-    async fn import_calendar(
-        &self,
-        calendar: Calendar,
-        objects: Vec<CalendarObject>,
-        merge_existing: bool,
-    ) -> Result<(), Error> {
-        if calendar.id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .import_calendar(calendar, objects, merge_existing)
-                .await
-        } else {
-            self.cal_store
-                .import_calendar(calendar, objects, merge_existing)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn delete_calendar(
-        &self,
-        principal: &str,
-        name: &str,
-        use_trashbin: bool,
-    ) -> Result<(), Error> {
-        if name.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        } else {
-            self.cal_store
-                .delete_calendar(principal, name, use_trashbin)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
-        Ok([
-            self.birthday_store.get_deleted_calendars(principal).await?,
-            self.cal_store.get_deleted_calendars(principal).await?,
-        ]
-        .concat())
-    }
-
-    #[inline]
-    async fn restore_object(
-        &self,
-        principal: &str,
-        cal_id: &str,
-        object_id: &str,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        } else {
-            self.cal_store
-                .restore_object(principal, cal_id, object_id)
-                .await
-        }
-    }
-
-    #[inline]
-    async fn put_object(
-        &self,
-        principal: String,
-        cal_id: String,
-        object: CalendarObject,
-        overwrite: bool,
-    ) -> Result<(), Error> {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        } else {
-            self.cal_store
-                .put_object(principal, cal_id, object, overwrite)
-                .await
-        }
-    }
-
-    #[inline]
     fn is_read_only(&self, cal_id: &str) -> bool {
-        if cal_id.starts_with(BIRTHDAYS_PREFIX) {
+        self.store_for_id(cal_id).is_read_only(cal_id)
-            self.birthday_store.is_read_only(cal_id)
-        } else {
-            self.cal_store.is_read_only(cal_id)
-        }
     }
 }

crates/store/src/contact_birthday_store.rs

@@ -1,4 +1,7 @@
-use crate::{Addressbook, AddressbookStore, Calendar, CalendarStore, Error};
+use crate::{
+    Addressbook, AddressbookStore, Calendar, CalendarStore, Error, calendar::CalendarMetadata,
+    combined_calendar_store::PrefixedCalendarStore,
+};
 use async_trait::async_trait;
 use derive_more::derive::Constructor;
 use rustical_ical::{AddressObject, CalendarObject, CalendarObjectType};
@@ -10,16 +13,22 @@ pub(crate) const BIRTHDAYS_PREFIX: &str = "_birthdays_";
 #[derive(Constructor, Clone)]
 pub struct ContactBirthdayStore<AS: AddressbookStore>(Arc<AS>);
 
+impl<AS: AddressbookStore> PrefixedCalendarStore for ContactBirthdayStore<AS> {
+    const PREFIX: &'static str = BIRTHDAYS_PREFIX;
+}
+
 fn birthday_calendar(addressbook: Addressbook) -> Calendar {
     Calendar {
         principal: addressbook.principal,
         id: format!("{}{}", BIRTHDAYS_PREFIX, addressbook.id),
+        meta: CalendarMetadata {
             displayname: addressbook
                 .displayname
                 .map(|name| format!("{name} birthdays")),
             order: 0,
             description: None,
             color: None,
+        },
         timezone_id: None,
         deleted_at: addressbook.deleted_at,
         synctoken: addressbook.synctoken,

crates/store/src/lib.rs

@@ -22,7 +22,7 @@ pub use secret::Secret;
 pub use subscription_store::*;
 
 pub use addressbook::Addressbook;
-pub use calendar::Calendar;
+pub use calendar::{Calendar, CalendarMetadata};
 
 #[derive(Debug, Clone)]
 pub enum CollectionOperationInfo {

crates/store/src/tests/mod.rs

@@ -0,0 +1 @@
+

crates/store_sqlite/src/addressbook_store.rs

@@ -433,14 +433,14 @@ impl AddressbookStore for SqliteAddressbookStore {
         Self::_delete_addressbook(&mut *tx, principal, addressbook_id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(addressbook) = addressbook {
+        if let Some(addressbook) = addressbook
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: addressbook.push_topic,
-            }) {
+            })
+        {
             error!("Push notification about deleted addressbook failed: {err}");
         };
-        }
 
         Ok(())
     }

crates/store_sqlite/src/calendar_store.rs

@@ -5,7 +5,7 @@ use derive_more::derive::Constructor;
 use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
-use rustical_store::{Calendar, CalendarStore, CollectionMetadata, Error};
+use rustical_store::{Calendar, CalendarMetadata, CalendarStore, CollectionMetadata, Error};
 use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
@@ -69,10 +69,12 @@ impl From<CalendarRow> for Calendar {
         Self {
             principal: value.principal,
             id: value.id,
+            meta: CalendarMetadata {
                 displayname: value.displayname,
                 order: value.order,
                 description: value.description,
                 color: value.color,
+            },
             timezone_id: value.timezone_id,
             deleted_at: value.deleted_at,
             synctoken: value.synctoken,
@@ -159,10 +161,10 @@ impl SqliteCalendarStore {
                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.subscription_url,
             calendar.timezone_id,
             calendar.push_topic,
@@ -189,10 +191,10 @@ impl SqliteCalendarStore {
                 WHERE (principal, id) = (?, ?)"#,
             calendar.principal,
             calendar.id,
-            calendar.displayname,
+            calendar.meta.displayname,
-            calendar.description,
+            calendar.meta.description,
-            calendar.order,
+            calendar.meta.order,
-            calendar.color,
+            calendar.meta.color,
             calendar.timezone_id,
             calendar.push_topic,
             comp_event, comp_todo, comp_journal,
@@ -351,7 +353,6 @@ impl SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let (object_id, ics) = (object.get_id(), object.get_ics());
 
         let first_occurence = object
@@ -554,14 +555,14 @@ impl CalendarStore for SqliteCalendarStore {
         Self::_delete_calendar(&mut *tx, principal, id, use_trashbin).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        if let Some(cal) = cal {
+        if let Some(cal) = cal
-            if let Err(err) = self.sender.try_send(CollectionOperation {
+            && let Err(err) = self.sender.try_send(CollectionOperation {
                 data: CollectionOperationInfo::Delete,
                 topic: cal.push_topic,
-            }) {
+            })
+        {
             error!("Push notification about deleted calendar failed: {err}");
         };
-        }
         Ok(())
     }
 
@@ -667,11 +668,16 @@ impl CalendarStore for SqliteCalendarStore {
         object: CalendarObject,
         overwrite: bool,
     ) -> Result<(), Error> {
-        // TODO: Prevent objects from being commited to a subscription calendar
         let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
 
         let object_id = object.get_id().to_owned();
 
+        let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
+        if calendar.subscription_url.is_some() {
+            // We cannot commit an object to a subscription calendar
+            return Err(Error::ReadOnly);
+        }
+
         Self::_put_object(
             &mut *tx,
             principal.to_owned(),

crates/xml/derive/Cargo.toml

@@ -13,3 +13,4 @@ quote.workspace = true
 proc-macro2.workspace = true
 heck.workspace = true
 darling.workspace = true
+itertools.workspace = true

crates/xml/derive/src/attrs.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use darling::{FromDeriveInput, FromField, FromMeta, FromVariant, util::Flag};
-use syn::{Ident, LitByteStr};
+use syn::{Ident, LitStr};
 
 #[derive(Debug, Default, FromMeta, Clone)]
 pub struct TagAttrs {
-    pub rename: Option<LitByteStr>,
+    pub rename: Option<LitStr>,
     pub ns: Option<syn::Path>,
 }
 
@@ -30,10 +30,10 @@ pub struct EnumAttrs {
 #[derive(Default, FromDeriveInput, Clone)]
 #[darling(attributes(xml))]
 pub struct StructAttrs {
-    pub root: Option<LitByteStr>,
+    pub root: Option<LitStr>,
     pub ns: Option<syn::Path>,
     #[darling(default)]
-    pub ns_prefix: HashMap<syn::Path, LitByteStr>,
+    pub ns_prefix: HashMap<syn::Path, LitStr>,
     pub allow_invalid: Flag,
 }
 

crates/xml/derive/src/field.rs

@@ -35,7 +35,7 @@ impl Field {
     }
 
     /// Field name in XML
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         if let Some(rename) = self.attrs.common.rename.to_owned() {
             rename
         } else {
@@ -43,7 +43,7 @@ impl Field {
                 .field_ident()
                 .as_ref()
                 .expect("unnamed tag fields need a rename attribute");
-            syn::LitByteStr::new(ident.to_string().to_kebab_case().as_bytes(), ident.span())
+            syn::LitStr::new(ident.to_string().to_kebab_case().as_str(), ident.span())
         }
     }
 
@@ -174,6 +174,8 @@ impl Field {
             .map(|ns| quote! { if ns == #ns });
 
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
         let builder_field_ident = self.builder_field_ident();
         let deserializer = self.deserializer_type();
         let value = quote! { <#deserializer as rustical_xml::XmlDeserialize>::deserialize(reader, &start, empty)? };
@@ -186,7 +188,7 @@ impl Field {
         };
 
         Some(quote! {
-            (#namespace_match, #field_name) #namespace_condition => { #assignment; }
+            (#namespace_match, #b_field_name) #namespace_condition => { #assignment; }
         })
     }
 
@@ -231,6 +233,8 @@ impl Field {
         }
         let builder_field_ident = self.builder_field_ident();
         let field_name = self.xml_name();
+        let b_field_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), field_name.span());
 
         let value = wrap_option_if_no_default(
             quote! {
@@ -240,7 +244,7 @@ impl Field {
         );
 
         Some(quote! {
-            #field_name => {
+            #b_field_name => {
                 builder.#builder_field_ident = #value;
             }
         })
@@ -255,7 +259,6 @@ impl Field {
         let value = quote! {
             if let ::quick_xml::name::ResolveResult::Bound(ns) = &ns {
                 Some(ns.into())
-                // Some(rustical_xml::ValueDeserialize::deserialize(&String::from_utf8_lossy(ns.0.as_ref()))?)
             } else {
                 None
             }

crates/xml/derive/src/generic.rs

@@ -1,16 +1,12 @@
 pub(crate) fn get_generic_type(ty: &syn::Type) -> Option<&syn::Type> {
-    if let syn::Type::Path(syn::TypePath { path, .. }) = ty {
+    if let syn::Type::Path(syn::TypePath { path, .. }) = ty
-        if let Some(seg) = path.segments.last() {
+        && let Some(seg) = path.segments.last()
-            if let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+        && let syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
-                args,
+            args, ..
-                ..
         }) = &seg.arguments
+        && let Some(syn::GenericArgument::Type(t)) = &args.first()
     {
-                if let Some(syn::GenericArgument::Type(t)) = &args.first() {
         return Some(t);
     }
-            }
-        }
-    }
     None
 }

crates/xml/derive/src/variant.rs

@@ -14,13 +14,13 @@ impl Variant {
         &self.variant.ident
     }
 
-    pub fn xml_name(&self) -> syn::LitByteStr {
+    pub fn xml_name(&self) -> syn::LitStr {
         self.attrs
             .common
             .rename
             .to_owned()
-            .unwrap_or(syn::LitByteStr::new(
+            .unwrap_or(syn::LitStr::new(
-                self.ident().to_string().to_kebab_case().as_bytes(),
+                self.ident().to_string().to_kebab_case().as_str(),
                 self.ident().span(),
             ))
     }
@@ -75,6 +75,8 @@ impl Variant {
         }
         let ident = self.ident();
         let variant_name = self.xml_name();
+        let b_variant_name =
+            syn::LitByteStr::new(self.xml_name().value().as_bytes(), variant_name.span());
         let deserializer_type = self.deserializer_type();
 
         Some(
@@ -93,7 +95,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = Some(<#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?);
                             Ok(Self::#ident(val))
                         }
@@ -104,7 +106,7 @@ impl Variant {
                         panic!("tuple variants should contain exactly one element");
                     }
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             let val = <#deserializer_type as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident(val))
                         }
@@ -112,7 +114,7 @@ impl Variant {
                 }
                 (false, Fields::Unit, _) => {
                     quote! {
-                        #variant_name => {
+                        #b_variant_name => {
                             // Make sure that content is still consumed
                             <() as ::rustical_xml::XmlDeserialize>::deserialize(reader, start, empty)?;
                             Ok(Self::#ident)

crates/xml/derive/src/xml_enum/impl_prop_name.rs

@@ -111,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 let out = quote! {(#ns, #xml_name)};
 
                 let ident = &variant.variant.ident;
@@ -134,8 +133,7 @@ impl Enum {
 
             let str_to_unit_branches = tagged_variants.iter().map(|variant| {
                 let ident = &variant.variant.ident;
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 if variant.attrs.prop.is_some() {
                     quote! { #xml_name => Ok(Self::#ident (Default::default())) }
                 } else {

crates/xml/derive/src/xml_enum/impl_se.rs

@@ -16,8 +16,8 @@ impl Enum {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -25,19 +25,20 @@ impl Enum {
                     let prefix = ns
                         .map(|ns| namespaces.get(&ns))
                         .unwrap_or(None)
-                        .map(|prefix| if !prefix.is_empty() {
+                         .map(|prefix| {
-                            [*prefix, b":"].concat()
+                             if !prefix.is_empty() {
+                                format!("{prefix}:")
                              } else {
-                            vec![]
+                                String::new()
+                             }
                          });
                     let has_prefix = prefix.is_some();
                     let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                    let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
 
                     const enum_untagged: bool = #enum_untagged;
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
+                        let mut bytes_start = BytesStart::new(tagname);
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -48,8 +49,8 @@ impl Enum {
 
                     #(#variant_serializers);*
 
-                    if let Some(qname) = &qname {
+                    if let Some(tagname) = tagname.as_ref() {
-                        writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                        writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                     }
                     Ok(())
                 }

crates/xml/derive/src/xml_enum/mod.rs

@@ -66,6 +66,9 @@ impl Enum {
                             Event::CData(cdata) => {
                                 return Err(::rustical_xml::XmlError::UnsupportedEvent("CDATA"));
                             }
+                            Event::GeneralRef(_) => {
+                                return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
+                            }
                             Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                             Event::Comment(_) => { /* ignore */ }
                             Event::DocType(_) => { /* ignore */ }
@@ -108,8 +111,7 @@ impl Enum {
                     Some(ns) => quote! { Some(#ns) },
                     None => quote! { None },
                 };
-                let b_xml_name = variant.xml_name().value();
+                let xml_name = variant.xml_name().value();
-                let xml_name = String::from_utf8_lossy(&b_xml_name);
                 quote! {(#ns, #xml_name)}
             });
 

crates/xml/derive/src/xml_struct/impl_se.rs

@@ -1,3 +1,4 @@
+use itertools::Itertools;
 use quote::quote;
 
 use crate::{Field, attrs::FieldType};
@@ -33,7 +34,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     ::quick_xml::events::attributes::Attribute {
-                        key: ::quick_xml::name::QName(#field_name),
+                        key: ::quick_xml::name::QName(#field_name.as_bytes()),
                         value: ::std::borrow::Cow::from(::rustical_xml::ValueSerialize::serialize(&self.#field_index).into_bytes())
                     }
                 }
@@ -47,7 +48,7 @@ impl NamedStruct {
                 let field_index = field.target_field_index();
                 quote! {
                     let tag_str = self.#field_index.to_string();
-                    let tag = Some(tag.unwrap_or(tag_str.as_bytes()));
+                    let tag = Some(tag.unwrap_or(tag_str.as_str()));
                 }
             });
 
@@ -69,14 +70,14 @@ impl NamedStruct {
             self.attrs
                 .ns_prefix
                 .iter()
+                .sorted_by_key(|(_ns, prefix)| prefix.value())
                 .map(|(ns, prefix)| {
-                    let sep = if !prefix.value().is_empty() {
+                    let attr_name = if prefix.value().is_empty() {
-                        b":".to_vec()
+                        "xmlns".to_owned()
                     } else {
-                        b"".to_vec()
+                        format!("xmlns:{}", prefix.value())
                     };
-                    let attr_name = [b"xmlns".as_ref(), &sep, &prefix.value()].concat();
+                    let a = syn::LitByteStr::new(attr_name.as_bytes(), prefix.span());
-                    let a = syn::LitByteStr::new(&attr_name, prefix.span());
                     quote! {
                          bytes_start.push_attribute((#a.as_ref(), #ns.as_ref()));
                     }
@@ -91,8 +92,8 @@ impl NamedStruct {
                 fn serialize(
                     &self,
                     ns: Option<::quick_xml::name::Namespace>,
-                    tag: Option<&[u8]>,
+                    tag: Option<&str>,
-                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &[u8]>,
+                    namespaces: &::std::collections::HashMap<::quick_xml::name::Namespace, &str>,
                     writer: &mut ::quick_xml::Writer<&mut Vec<u8>>
                 ) -> ::std::io::Result<()> {
                     use ::quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
@@ -105,17 +106,16 @@ impl NamedStruct {
                          .unwrap_or(None)
                          .map(|prefix| {
                              if !prefix.is_empty() {
-                                 [*prefix, b":"].concat()
+                                format!("{prefix}:")
                              } else {
-                                 Vec::new()
+                                String::new()
                              }
                          });
                      let has_prefix = prefix.is_some();
                      let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-                     let qname = tagname.as_ref().map(|tagname| ::quick_xml::name::QName(tagname));
+
-                    //
+                    if let Some(tagname) = tagname.as_ref() {
-                    if let Some(qname) = &qname {
+                        let mut bytes_start = BytesStart::new(tagname);
-                        let mut bytes_start = BytesStart::from(qname.to_owned());
                         if !has_prefix {
                             if let Some(ns) = &ns {
                                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
@@ -134,8 +134,8 @@ impl NamedStruct {
                     }
                     if !#is_empty {
                         #(#tag_writers);*
-                        if let Some(qname) = &qname {
+                        if let Some(tagname) = tagname.as_ref() {
-                            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+                            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
                         }
                     }
                     Ok(())

crates/xml/derive/src/xml_struct/mod.rs

@@ -68,7 +68,7 @@ impl NamedStruct {
                 .ns_prefix
                 .iter()
                 .map(|(ns, prefix)| {
-                    quote! { (#ns, #prefix.as_ref()) }
+                    quote! { (#ns, #prefix) }
                 })
                 .collect()
         } else {
@@ -77,9 +77,9 @@ impl NamedStruct {
 
         quote! {
             impl #impl_generics ::rustical_xml::XmlRootTag for #ident #type_generics #where_clause {
-                fn root_tag() -> &'static [u8] { #root }
+                fn root_tag() -> &'static str { #root }
                 fn root_ns() -> Option<::quick_xml::name::Namespace<'static>> { #ns }
-                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static [u8]> {
+                fn root_ns_prefixes() -> ::std::collections::HashMap<::quick_xml::name::Namespace<'static>, &'static str> {
                     ::std::collections::HashMap::from_iter(vec![
                         #(#prefixes),*
                     ])
@@ -148,6 +148,8 @@ impl NamedStruct {
                         }
                     }
 
+                    let mut string = String::new();
+
                     if !empty {
                         loop {
                             let event = reader.read_event_into(&mut buf)?;
@@ -167,12 +169,23 @@ impl NamedStruct {
                                     }
                                 }
                                 Event::Text(bytes_text) => {
-                                    let text = bytes_text.unescape()?;
+                                    let text = bytes_text.decode()?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
                                 }
                                 Event::CData(cdata) => {
                                     let text = String::from_utf8(cdata.to_vec())?;
-                                    #(#text_field_branches)*
+                                    string.push_str(&text);
+                                }
+                                Event::GeneralRef(gref) => {
+                                    if let Some(char) = gref.resolve_char_ref()? {
+                                        string.push(char);
+                                    } else if let Some(text) =
+                                        quick_xml::escape::resolve_xml_entity(&gref.xml_content()?)
+                                    {
+                                        string.push_str(text);
+                                    } else {
+                                        return Err(XmlError::UnsupportedEvent("invalid XML ref"));
+                                    }
                                 }
                                 Event::Decl(_) => { /* <?xml ... ?> ignore this */ }
                                 Event::Comment(_) => { /* ignore */ }
@@ -185,6 +198,9 @@ impl NamedStruct {
                         }
                     }
 
+                    let text = string;
+                    #(#text_field_branches)*
+
                     Ok(Self {
                         #(#builder_field_builds),*
                     })

crates/xml/src/de.rs

@@ -49,7 +49,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                     let (ns, name) = reader.resolve_element(start.name());
                     let matches = match (Self::root_ns(), &ns, name) {
                         // Wrong tag
-                        (_, _, name) if name.as_ref() != Self::root_tag() => false,
+                        (_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,
                         // Wrong namespace
                         (Some(root_ns), ns, _) if &ResolveResult::Bound(root_ns) != ns => false,
                         _ => true,
@@ -60,7 +60,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
                             format!("{ns:?}"),
                             String::from_utf8_lossy(name.as_ref()).to_string(),
                             format!("{root_ns:?}"),
-                            String::from_utf8_lossy(Self::root_tag()).to_string(),
+                            Self::root_tag().to_owned(),
                         ));
                     };
 

crates/xml/src/error.rs

@@ -8,6 +8,8 @@ pub enum XmlError {
     #[error(transparent)]
     QuickXmlError(#[from] quick_xml::Error),
     #[error(transparent)]
+    QuickXmlEncodingError(#[from] quick_xml::encoding::EncodingError),
+    #[error(transparent)]
     QuickXmlAttrError(#[from] quick_xml::events::attributes::AttrError),
     #[error(transparent)]
     FromUtf8Error(#[from] FromUtf8Error),

crates/xml/src/lib.rs

@@ -23,9 +23,9 @@ pub use xml_derive::PropName;
 pub use xml_derive::XmlRootTag;
 
 pub trait XmlRootTag {
-    fn root_tag() -> &'static [u8];
+    fn root_tag() -> &'static str;
     fn root_ns() -> Option<Namespace<'static>>;
-    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static [u8]>;
+    fn root_ns_prefixes() -> HashMap<Namespace<'static>, &'static str>;
 }
 
 #[derive(Debug)]

crates/xml/src/namespace.rs

@@ -28,7 +28,7 @@ impl<'a> From<&'a Namespace<'a>> for NamespaceOwned {
 }
 
 impl NamespaceOwned {
-    pub fn as_ref(&self) -> Namespace {
+    pub fn as_ref(&self) -> Namespace<'_> {
         Namespace(&self.0)
     }
 }

crates/xml/src/se.rs

@@ -1,7 +1,7 @@
 use crate::XmlRootTag;
 use quick_xml::{
     events::{BytesStart, Event, attributes::Attribute},
-    name::{Namespace, QName},
+    name::Namespace,
 };
 use std::collections::HashMap;
 pub use xml_derive::XmlSerialize;
@@ -10,8 +10,8 @@ pub trait XmlSerialize {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()>;
 
@@ -22,8 +22,8 @@ impl<T: XmlSerialize> XmlSerialize for Option<T> {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         if let Some(some) = self {
@@ -60,8 +60,8 @@ impl XmlSerialize for () {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -69,21 +69,18 @@ impl XmlSerialize for () {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname.as_ref().map(|tagname| QName(tagname));
+        if let Some(tagname) = tagname.as_ref() {
-        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::new(tagname);
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix && let Some(ns) = &ns {
-            if !has_prefix {
-                if let Some(ns) = &ns {
                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
             }
-            }
             writer.write_event(Event::Empty(bytes_start))?;
         }
         Ok(())

crates/xml/src/value.rs

@@ -1,6 +1,6 @@
 use crate::{XmlDeserialize, XmlError, XmlSerialize};
 use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
-use quick_xml::name::{Namespace, QName};
+use quick_xml::name::Namespace;
 use std::collections::HashMap;
 use std::num::{ParseFloatError, ParseIntError};
 use std::{convert::Infallible, io::BufRead};
@@ -77,20 +77,23 @@ impl<T: ValueDeserialize> XmlDeserialize for T {
             loop {
                 match reader.read_event_into(&mut buf)? {
                     Event::Text(bytes_text) => {
-                        let text = bytes_text.unescape()?;
+                        let text = bytes_text.decode()?;
-                        if !string.is_empty() {
+                        string.push_str(&text);
-                            // Content already written
-                            return Err(XmlError::UnsupportedEvent("content already written"));
-                        }
-                        string = text.to_string();
                     }
                     Event::CData(cdata) => {
                         let text = String::from_utf8(cdata.to_vec())?;
-                        if !string.is_empty() {
+                        string.push_str(&text);
-                            // Content already written
+                    }
-                            return Err(XmlError::UnsupportedEvent("content already written"));
+                    Event::GeneralRef(gref) => {
+                        if let Some(char) = gref.resolve_char_ref()? {
+                            string.push(char);
+                        } else if let Some(text) =
+                            quick_xml::escape::resolve_xml_entity(&gref.xml_content()?)
+                        {
+                            string.push_str(text);
+                        } else {
+                            return Err(XmlError::UnsupportedEvent("invalid XML ref"));
                         }
-                        string = text;
                     }
                     Event::End(_) => break,
                     Event::Eof => return Err(XmlError::Eof),
@@ -107,8 +110,8 @@ impl<T: ValueSerialize> XmlSerialize for T {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -116,26 +119,23 @@ impl<T: ValueSerialize> XmlSerialize for T {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    [*prefix, b":"].concat()
+                    [*prefix, ":"].concat()
                 } else {
-                    Vec::new()
+                    String::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
-        let qname = tagname.as_ref().map(|tagname| QName(tagname));
+        if let Some(tagname) = tagname.as_ref() {
-        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::new(tagname);
-            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix && let Some(ns) = &ns {
-            if !has_prefix {
-                if let Some(ns) = &ns {
                 bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
             }
-            }
             writer.write_event(Event::Start(bytes_start))?;
         }
         writer.write_event(Event::Text(BytesText::new(&self.serialize())))?;
-        if let Some(qname) = &qname {
+        if let Some(tagname) = tagname {
-            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
+            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
         }
         Ok(())
     }

crates/xml/tests/de_enum.rs

@@ -1,9 +1,9 @@
-use rustical_xml::{de::XmlDocument, XmlDeserialize, XmlRootTag};
+use rustical_xml::{XmlDeserialize, XmlRootTag, de::XmlDocument};
 
 #[test]
 fn test_struct_tagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: Prop,
     }
@@ -58,7 +58,7 @@ fn test_struct_tagged_enum() {
 #[test]
 fn test_tagged_enum_complex() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Propfind {
         prop: PropStruct,
     }
@@ -116,7 +116,7 @@ fn test_enum_document() {
 #[test]
 fn test_untagged_enum() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         prop: PropElement,
     }

crates/xml/tests/de_struct.rs

@@ -6,7 +6,7 @@ use std::collections::HashSet;
 #[test]
 fn test_struct_text_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         text: String,
@@ -27,7 +27,7 @@ fn test_struct_text_field() {
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -52,9 +52,9 @@ fn test_struct_document() {
 #[test]
 fn test_struct_rename_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"ok-wow")]
+        #[xml(rename = "ok-wow")]
         child: Child,
     }
 
@@ -78,7 +78,7 @@ fn test_struct_rename_field() {
 #[test]
 fn test_struct_optional_field() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Option<Child>,
     }
@@ -96,9 +96,9 @@ fn test_struct_optional_field() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: Vec<Child>,
     }
 
@@ -124,9 +124,9 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_set() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(rename = b"child", flatten)]
+        #[xml(rename = "child", flatten)]
         children: HashSet<Child>,
     }
 
@@ -154,7 +154,7 @@ fn test_struct_ns() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -169,7 +169,7 @@ fn test_struct_attr() {
     const NS_HELLO: Namespace = Namespace(b"hello");
 
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ns = "NS_HELLO")]
         child: (),
@@ -196,7 +196,7 @@ fn test_struct_attr() {
 #[test]
 fn test_struct_generics() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document<T: XmlDeserialize> {
         #[allow(dead_code)]
         child: T,
@@ -217,7 +217,7 @@ fn test_struct_generics() {
 #[test]
 fn test_struct_unparsed() {
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[allow(dead_code)]
         child: Unparsed,
@@ -238,7 +238,7 @@ fn test_struct_unparsed() {
 #[test]
 fn test_xml_values() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
     }
@@ -262,7 +262,7 @@ fn test_xml_values() {
 #[test]
 fn test_xml_cdata() {
     #[derive(XmlDeserialize, XmlRootTag, PartialEq, Debug)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "text")]
         hello: String,
@@ -275,7 +275,7 @@ fn test_xml_cdata() {
         <document>
             <![CDATA[some text]]>
             <href><![CDATA[some stuff]]></href>
-            <okay>&gt;</okay>
+            <okay>nice&gt;text</okay>
         </document>
     "#,
     )
@@ -285,15 +285,29 @@ fn test_xml_cdata() {
         Document {
             hello: "some text".to_owned(),
             href: "some stuff".to_owned(),
-            okay: ">".to_owned()
+            okay: "nice>text".to_owned()
         }
     );
 }
 
+#[test]
+fn test_quickxml_bytesref() {
+    let gt = quick_xml::events::BytesRef::new("gt");
+    assert!(!gt.is_char_ref());
+    let result = if !gt.is_char_ref() {
+        quick_xml::escape::resolve_xml_entity(&gt.xml_content().unwrap())
+            .unwrap()
+            .to_string()
+    } else {
+        gt.xml_content().unwrap().to_string()
+    };
+    assert_eq!(result, ">");
+}
+
 #[test]
 fn test_struct_xml_decl() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -307,14 +321,14 @@ fn test_struct_xml_decl() {
     let doc = Document::parse_str(
         r#"
     <?xml version="1.0" encoding="utf-8"?>
-    <document><child>Hello!</child></document>"#,
+    <document><child>Hello!&amp;</child></document>"#,
     )
     .unwrap();
     assert_eq!(
         doc,
         Document {
             child: Child {
-                text: "Hello!".to_owned()
+                text: "Hello!&".to_owned()
             }
         }
     );
@@ -323,7 +337,7 @@ fn test_struct_xml_decl() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -348,7 +362,7 @@ fn test_struct_tuple() {
 #[test]
 fn test_struct_untagged_ns() {
     #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         child: Child,

crates/xml/tests/enum_variants.rs

@@ -29,7 +29,7 @@ enum CalendarProp {
     #[allow(dead_code)]
     Getcontenttype(&'static str),
 
-    #[xml(ns = "NS_DAV", rename = b"principal-URL")]
+    #[xml(ns = "NS_DAV", rename = "principal-URL")]
     #[allow(dead_code)]
     PrincipalUrl,
     #[allow(dead_code)]

crates/xml/tests/propertyupdate.rs

@@ -36,7 +36,7 @@ fn test_propertyupdate() {
     }
 
     #[derive(XmlDeserialize, XmlRootTag)]
-    #[xml(root = b"propertyupdate")]
+    #[xml(root = "propertyupdate")]
     struct PropertyupdateElement<T: XmlDeserialize> {
         #[xml(ty = "untagged", flatten)]
         #[allow(dead_code)]

crates/xml/tests/se_enum.rs

@@ -3,7 +3,7 @@ use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"propfind")]
+    #[xml(root = "propfind")]
     struct Document {
         prop: Prop,
     }

crates/xml/tests/se_struct.rs

@@ -7,7 +7,7 @@ use xml_derive::XmlDeserialize;
 #[test]
 fn test_struct_document() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -30,7 +30,7 @@ fn test_struct_document() {
 #[test]
 fn test_struct_untagged_attr() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "attr")]
         name: String,
@@ -57,7 +57,7 @@ fn test_struct_untagged_attr() {
 #[test]
 fn test_struct_value_tagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         href: String,
         num: usize,
@@ -82,7 +82,7 @@ fn test_struct_value_tagged() {
 #[test]
 fn test_struct_value_untagged() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged")]
         href: String,
@@ -103,7 +103,7 @@ fn test_struct_value_untagged() {
 #[test]
 fn test_struct_vec() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(flatten)]
         href: Vec<String>,
@@ -127,7 +127,7 @@ fn test_struct_vec() {
 #[test]
 fn test_struct_serialize_with() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(serialize_with = "serialize_href")]
         href: String,
@@ -136,8 +136,8 @@ fn test_struct_serialize_with() {
     fn serialize_href(
         val: &str,
         ns: Option<Namespace>,
-        tag: Option<&[u8]>,
+        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &[u8]>,
+        namespaces: &HashMap<Namespace, &str>,
         writer: &mut Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         val.to_uppercase().serialize(ns, tag, namespaces, writer)
@@ -160,7 +160,7 @@ fn test_struct_serialize_with() {
 #[test]
 fn test_struct_tag_list() {
     #[derive(Debug, XmlRootTag, XmlSerialize, XmlDeserialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         #[xml(ty = "untagged", flatten)]
         tags: Vec<Tag>,
@@ -194,9 +194,9 @@ fn test_struct_ns() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
-        #[xml(ns = "NS", rename = b"okay")]
+        #[xml(ns = "NS", rename = "okay")]
         child: String,
     }
 
@@ -210,7 +210,7 @@ fn test_struct_ns() {
 #[test]
 fn test_struct_tuple() {
     #[derive(Debug, XmlRootTag, XmlSerialize, PartialEq)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
     struct Document {
         child: Child,
     }
@@ -230,8 +230,8 @@ fn test_tuple_struct() {
     const NS: Namespace = quick_xml::name::Namespace(b"NS:TEST:");
 
     #[derive(Debug, XmlRootTag, XmlSerialize)]
-    #[xml(root = b"document")]
+    #[xml(root = "document")]
-    struct Document(#[xml(ns = "NS", rename = b"okay")] String);
+    struct Document(#[xml(ns = "NS", rename = "okay")] String);
 
     Document("hello!".to_string())
         .serialize_to_string()

docs/index.md

@@ -4,9 +4,9 @@ a CalDAV/CardDAV server
 
 !!! warning
   RustiCal is under **active development**!
-    While I've been successfully using RustiCal productively for a few weeks now,
+  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
   you'd still be one of the first testers so expect bugs and rough edges.
-    If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 [Installation](installation/index.md){ .md-button }
 
@@ -14,6 +14,7 @@ a CalDAV/CardDAV server
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
+- Import your existing calendars in the frontend
 - **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)

docs/installation/index.md

@@ -9,7 +9,7 @@ docker run \
   -p 4000:4000 \
   -v YOUR_DATA_DIR:/var/lib/rustical/ \
   -v OPTIONAL_YOUR_CONFIG_TOML:/etc/rustical/config.toml \ # (1)!
-  -e RUSTICAL__CONFIG_OPTION="asd" \  # (2)!
+  -e RUSTICAL_CONFIG_OPTION="asd" \  # (2)!
   ghcr.io/lennart-k/rustical
 ```
 

docs/installation/notes.md

@@ -0,0 +1,11 @@
+# Notes
+
+## Kubernetes setup
+
+If you setup RustiCal with Kubernetes and call the deployment `rustical`
+Kubernetes will by default expose some environment variables starting with `RUSTICAL_`
+that will be rejected by RustiCal.
+So for now the solutions are either not calling the deployment `rustical` or setting
+`enableServiceLinks: false`, see <https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service>.
+
+For the corresponding issue see <https://github.com/lennart-k/rustical/issues/122>