fix small chart issues

Author: mProjectsCode

Makefile

@@ -17,6 +17,7 @@ lint:
 	cd data && make lint
 	cd data-lib && make lint
 	cd data-wasm && make lint
+	cd website && bun run check
 
 submodule-update:
 	git submodule update --init --remote

data-lib/src/plugin/packages.rs

@@ -52,7 +52,7 @@ impl PackageManager {
     }
 
     pub fn iter_variants() -> impl Iterator<Item = PackageManager> {
-        PackageManager::variants().into_iter().cloned()
+        PackageManager::variants().iter().cloned()
     }
 
     pub const fn variants() -> &'static [PackageManager] {

data-lib/src/release/data_array.rs

@@ -90,7 +90,7 @@ impl ReleaseDataArray {
                         )
                     })
             })
-            .sort_by(|a, b| a.0.cmp(&b.0))
+            .sort_by(|a, b| a.0.cmp(b.0))
             .map(|(version, os, value)| StackedNamedDataPoint {
                 name: version.to_fancy_string(),
                 layer: os,
@@ -254,7 +254,7 @@ impl ReleaseDataArray {
                         )
                     })
             })
-            .sort_by(|a, b| a.0.cmp(&b.0).then_with(|| b.2.total_cmp(&a.2)))
+            .sort_by(|a, b| a.0.cmp(b.0).then_with(|| b.2.total_cmp(&a.2)))
             .map(|(version, file_type, value)| StackedNamedDataPoint {
                 name: version.to_fancy_string(),
                 layer: file_type,
@@ -315,7 +315,7 @@ impl ReleaseDataArray {
             .iter()
             .filter(|release| release.platform == ObsidianPlatform::Desktop)
             .dedup_by(|a, b| a.version == b.version)
-            .filter_map(|release| {
+            .map(|release| {
                 let mut changes = ChangelogChanges {
                     version: release.version.clone(),
                     version_string: release.version.to_fancy_string(),
@@ -386,7 +386,7 @@ impl ReleaseDataArray {
                     }
                 }
 
-                Some(changes)
+                changes
             })
             .sort_by(|a, b| a.version.cmp(&b.version))
             .collect()

data-wasm/src/lib.rs

@@ -1,9 +1,9 @@
 mod utils;
 
 use data_lib::{
-    plugin::{data_array::PluginDataArray, PluginData, PluginExtraData},
-    release::{data_array::ReleaseDataArray, GithubReleaseInfo, ObsidianReleaseInfo},
-    theme::{data_array::ThemeDataArray, ThemeData},
+    plugin::{PluginData, PluginExtraData, data_array::PluginDataArray},
+    release::{GithubReleaseInfo, ObsidianReleaseInfo, data_array::ReleaseDataArray},
+    theme::{ThemeData, data_array::ThemeDataArray},
 };
 use wasm_bindgen::prelude::*;
 

website/src/components/Plugin.astro

@@ -19,7 +19,7 @@ if (!plugin) {
 	throw new Error(`Plugin with ID ${pluginId} not found.`);
 }
 
-function getFundingLinks(urls: string | Record<string, string> | undefined): { text: string; href: string }[] {
+function getFundingLinks(urls: string | Map<string, string> | undefined): { text: string; href: string }[] {
 	if (!urls) {
 		return [];
 	}
@@ -28,7 +28,7 @@ function getFundingLinks(urls: string | Record<string, string> | undefined): { t
 		return [{ text: 'Support the Author', href: urls }];
 	}
 
-	return Object.entries(urls).map(([text, href]) => ({ text: `Support the Author via ${text}`, href }));
+	return Array.from(urls.entries()).map(([text, href]) => ({ text: `Support the Author via ${text}`, href }));
 }
 
 const helpUrl = plugin.help_url();
@@ -43,7 +43,7 @@ const external_links: { text: string; href: string }[] = [
 	obsidianUrl ? { text: 'View in Obsidian', href: obsidianUrl } : undefined,
 	obsidianHubUrl ? { text: 'View on the Obsidian Hub', href: obsidianHubUrl } : undefined,
 	authorUrl ? { text: 'Author Website', href: authorUrl } : undefined,
-	...getFundingLinks(plugin.funding_url()),
+	...getFundingLinks(fundingUrl),
 ].filter(x => x !== undefined);
 
 const warnings = plugin.warnings();

website/src/components/svelte/charts/StackedBarChart.svelte

@@ -10,9 +10,10 @@
 		skewLabels?: boolean;
 		percentages?: boolean;
 		yDomain?: [number, number];
+		xPadding?: number;
 	}
 
-	const { dataPoints, xLabel, yLabel, yDomain, skewLabels = false, percentages = false }: Props = $props();
+	const { dataPoints, xLabel, yLabel, yDomain, skewLabels = false, percentages = false, xPadding = undefined }: Props = $props();
 
 	const mappedDataPoints = dataPoints.map((point, index) => {
 		return {
@@ -27,7 +28,7 @@
 <ChartWrapper>
 	<Plot
 		color={{ legend: true, scheme: 'tableau10' }}
-		x={{ type: 'band', label: `${xLabel} →`, tickRotate: skewLabels ? 45 : 0 }}
+		x={{ type: 'band', label: `${xLabel} →`, tickRotate: skewLabels ? 45 : 0, padding: xPadding }}
 		y={{ label: `↑ ${yLabel}`, domain: yDomain, tickFormat: percentages ? d => `${String(d)}%` : d => String(d) }}
 		class="no-overflow-clip"
 	>

website/src/components/svelte/charts/release/AssetSizeChart.svelte

@@ -32,7 +32,7 @@
 	>
 		<GridY />
 		<Dot data={mappedDataPoints} x="label" y="value" stroke="stack" sort="index" />
-		<Pointer data={mappedDataPoints} x="label" z="stack" maxDistance={2}>
+		<Pointer data={mappedDataPoints} x="label" z="stack" maxDistance={5}>
 			{#snippet children({ data })}
 				<Text {data} fill="stack" x="label" y="value" text={d => formatSize(d.value)} lineAnchor="bottom" dy={-7} />
 				<Dot {data} x="label" y="value" fill="stack" />

website/src/components/svelte/charts/release/ChangelogChart.svelte

@@ -22,7 +22,7 @@
 <ChartWrapper>
 	<Plot
 		color={{ legend: true, scheme: 'tableau10' }}
-		x={{ type: 'band', label: `Version Number →`, tickRotate: 45 }}
+		x={{ type: 'band', label: `Version Number →`, tickRotate: 45, padding: 0 }}
 		y={{ label: `↑ Changes` }}
 		class="no-overflow-clip"
 	>

website/src/pages/releasestats/downloads.astro

@@ -29,9 +29,9 @@ const downloadsPercentages = dataArray.total_downloads_per_version_by_os_as_perc
 
 	<p>The below graph depicts the total number of downloads for every release, split by OS.</p>
 
-	<StackedBarChart dataPoints={downloads} xLabel="Version Number" yLabel="Downloads" skewLabels client:idle />
+	<StackedBarChart dataPoints={downloads} xLabel="Version Number" yLabel="Downloads" skewLabels xPadding={0} client:idle />
 
 	<p>This graph shows the distribution of downloads among the different operating systems.</p>
 
-	<StackedBarChart dataPoints={downloadsPercentages} xLabel="Version Number" yLabel="Downloads" skewLabels percentages client:idle />
+	<StackedBarChart dataPoints={downloadsPercentages} xLabel="Version Number" yLabel="Downloads" skewLabels percentages xPadding={0} client:idle />
 </StarlightPage>

website/src/pages/releasestats/overview.astro

@@ -74,7 +74,7 @@ const changelogCategories = dataArray.get_changelog_categories();
 					<tr>
 						<td>{item.version_string}</td>
 						{changelogCategories.map(category => (
-							<td>{item.changes[category] || 0}</td>
+							<td>{item.changes.get(category) || 0}</td>
 						))}
 					</tr>
 				))