mostly finish release stuff

Author: mProjectsCode

data-lib/Cargo.lock

@@ -7,7 +7,6 @@ edition = "2024"
 chrono = "0.4.41"
 chumsky = {version = "0.10.1", features = ["unstable"]}
 hashbrown = {version = "0.15.3", features = ["serde"]}
-itertools = "0.14.0"
 js-sys = "0.3.77"
 rayon = "1.10.0"
 regex = "1.11.1"

data-lib/Cargo.toml

@@ -158,25 +158,3 @@ pub struct StackedNamedDataPoint {
     pub layer: String,
     pub value: f64,
 }
-
-pub fn group_by<'a, T, K: Hash + Eq, TFn: Fn(&T) -> K>(
-    items: impl IntoIterator<Item = &'a T>,
-    key_fn: TFn,
-) -> HashMap<K, Vec<&'a T>> {
-    let mut map: HashMap<K, Vec<&T>> = HashMap::new();
-    for item in items {
-        let key = key_fn(item);
-        map.entry(key).or_default().push(item);
-    }
-    map
-}
-
-pub trait GroupByExt<'a, T, K: Hash + Eq> {
-    fn group_by<F: Fn(&T) -> K>(self, key_fn: F) -> HashMap<K, Vec<&'a T>>;
-}
-
-impl<'a, T: 'a, K: Hash + Eq, I: IntoIterator<Item = &'a T>> GroupByExt<'a, T, K> for I {
-    fn group_by<F: Fn(&T) -> K>(self, key_fn: F) -> HashMap<K, Vec<&'a T>> {
-        group_by(self, key_fn)
-    }
-}

data-lib/src/common.rs

@@ -8,6 +8,16 @@ pub struct Date {
     pub day: u32,
 }
 
+impl Default for Date {
+    fn default() -> Self {
+        Date {
+            year: 0,
+            month: 1,
+            day: 1,
+        }
+    }
+}
+
 impl Date {
     pub fn new(year: u32, month: u32, day: u32) -> Self {
         Date { year, month, day }

data-lib/src/date.rs

@@ -0,0 +1,61 @@
+use hashbrown::HashMap;
+use std::hash::Hash;
+
+pub fn group_by<T, K: Hash + Eq, TFn: Fn(&T) -> K>(
+    items: impl IntoIterator<Item = T>,
+    key_fn: TFn,
+) -> HashMap<K, Vec<T>> {
+    let mut map: HashMap<K, Vec<T>> = HashMap::new();
+    for item in items {
+        let key = key_fn(&item);
+        map.entry(key).or_default().push(item);
+    }
+    map
+}
+
+pub trait GroupByExt<T, K: Hash + Eq> {
+    fn group_by<F: Fn(&T) -> K>(self, key_fn: F) -> impl Iterator<Item = (K, Vec<T>)>;
+}
+
+impl<T, K: Hash + Eq, I: IntoIterator<Item = T>> GroupByExt<T, K> for I {
+    fn group_by<F: Fn(&T) -> K>(self, key_fn: F) -> impl Iterator<Item = (K, Vec<T>)> {
+        group_by(self, key_fn).into_iter()
+    }
+}
+
+pub trait SortExt<T> {
+    /// Sort the items in the iterator using a custom comparison function.
+    /// This collects the items into a vector, sorts them, and returns an iterator over the sorted items.
+    fn sort_by<F: Fn(&T, &T) -> std::cmp::Ordering>(self, compare_fn: F)
+    -> impl Iterator<Item = T>;
+}
+
+impl<T, I: Iterator<Item = T>> SortExt<T> for I {
+    fn sort_by<F: Fn(&T, &T) -> std::cmp::Ordering>(
+        self,
+        compare_fn: F,
+    ) -> impl Iterator<Item = T> {
+        let mut items: Vec<T> = self.collect();
+        items.sort_by(compare_fn);
+        items.into_iter()
+    }
+}
+
+pub trait DedupExt<T> {
+    /// Deduplicate the items in the iterator based on a custom equality function.
+    /// This collects the items into a vector, deduplicates them, and returns an iterator over the unique items.
+    /// This is O(n^2) in the worst case, but I don't care.
+    fn dedup_by<F: Fn(&T, &T) -> bool>(self, eq_fn: F) -> impl Iterator<Item = T>;
+}
+
+impl<T, I: Iterator<Item = T>> DedupExt<T> for I {
+    fn dedup_by<F: Fn(&T, &T) -> bool>(self, eq_fn: F) -> impl Iterator<Item = T> {
+        let mut items: Vec<T> = vec![];
+        for item in self {
+            if items.iter().all(|existing| !eq_fn(existing, &item)) {
+                items.push(item);
+            }
+        }
+        items.into_iter()
+    }
+}

data-lib/src/iter_ext.rs

@@ -2,6 +2,7 @@ pub mod commit;
 pub mod common;
 pub mod date;
 pub mod input_data;
+pub mod iter_ext;
 pub mod license;
 pub mod plugin;
 pub mod release;

data-lib/src/lib.rs

@@ -1,6 +1,5 @@
 use std::ops::Index;
 
-use itertools::Itertools;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 use crate::{
@@ -250,7 +249,7 @@ impl PluginDataArrayView {
 
                 Some((index, downloads_new as u32, downloads_start_date))
             })
-            .collect_vec();
+            .collect::<Vec<_>>();
         tmp.sort_by(|a, b| b.1.cmp(&a.1)); // Sort by downloads_new in descending order
         tmp.truncate(count);
 
@@ -283,7 +282,7 @@ impl PluginDataArrayView {
                     data,
                 }
             })
-            .collect_vec()
+            .collect()
     }
 
     pub fn monthly_count(&self, data: &PluginDataArray) -> Vec<CountMonthlyDataPoint> {