From d7b57b41ff39d7d0c60c60b66e47cdacf0db9753 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sun, 24 Dec 2023 03:03:55 -0800
Subject: refactor(utility): move utilities to module

---
 src/lib/Tools/ActivityHistory.svelte            |  2 +-
 src/lib/Tools/ActivityHistoryGrid.svelte        |  2 +-
 src/lib/Tools/CharacterBirthdays.svelte         |  2 +-
 src/lib/Tools/EpisodeDiscussionCollector.svelte |  2 +-
 src/lib/Tools/SequelSpy.svelte                  |  2 +-
 src/lib/Tools/Wrapped.svelte                    |  3 ++-
 src/lib/Tools/tool.ts                           | 34 -------------------------
 7 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 src/lib/Tools/tool.ts

(limited to 'src/lib/Tools')

diff --git a/src/lib/Tools/ActivityHistory.svelte b/src/lib/Tools/ActivityHistory.svelte
index 903e2924..811241fa 100644
--- a/src/lib/Tools/ActivityHistory.svelte
+++ b/src/lib/Tools/ActivityHistory.svelte
@@ -10,7 +10,7 @@
 		userIdentity as getUserIdentity,
 		type AniListAuthorisation
 	} from '$lib/AniList/identity';
-	import { clearAllParameters } from './tool';
+	import { clearAllParameters } from '../Utility/parameters';
 	import { domToBlob } from 'modern-screenshot';
 	import ActivityHistoryGrid from './ActivityHistoryGrid.svelte';
 
diff --git a/src/lib/Tools/ActivityHistoryGrid.svelte b/src/lib/Tools/ActivityHistoryGrid.svelte
index 6e9f9e53..5cc48d30 100644
--- a/src/lib/Tools/ActivityHistoryGrid.svelte
+++ b/src/lib/Tools/ActivityHistoryGrid.svelte
@@ -10,7 +10,7 @@
 		userIdentity as getUserIdentity,
 		type AniListAuthorisation
 	} from '$lib/AniList/identity';
-	import { clearAllParameters } from './tool';
+	import { clearAllParameters } from '../Utility/parameters';
 
 	export let user: AniListAuthorisation;
 	export let activityData: ActivityHistoryEntry[] | null = null;
diff --git a/src/lib/Tools/CharacterBirthdays.svelte b/src/lib/Tools/CharacterBirthdays.svelte
index c6ac7e7c..d6d032c3 100644
--- a/src/lib/Tools/CharacterBirthdays.svelte
+++ b/src/lib/Tools/CharacterBirthdays.svelte
@@ -5,7 +5,7 @@
 	import { aniSearchBirthdays, type aniSearchBirthday } from '$lib/Birthday/aniSearch';
 	import Error from '$lib/Error.svelte';
 	import { onMount } from 'svelte';
-	import { clearAllParameters, parseOrDefault } from './tool';
+	import { clearAllParameters, parseOrDefault } from '../Utility/parameters';
 
 	interface Birthday {
 		name: string;
diff --git a/src/lib/Tools/EpisodeDiscussionCollector.svelte b/src/lib/Tools/EpisodeDiscussionCollector.svelte
index f6a049f2..64615cde 100644
--- a/src/lib/Tools/EpisodeDiscussionCollector.svelte
+++ b/src/lib/Tools/EpisodeDiscussionCollector.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { threads } from '$lib/AniList/forum';
 	import { onMount } from 'svelte';
-	import { clearAllParameters } from './tool';
+	import { clearAllParameters } from '../Utility/parameters';
 
 	let searchInput = '';
 	let searchInputFinal = '';
diff --git a/src/lib/Tools/SequelSpy.svelte b/src/lib/Tools/SequelSpy.svelte
index 633c5af1..37c2cb0f 100644
--- a/src/lib/Tools/SequelSpy.svelte
+++ b/src/lib/Tools/SequelSpy.svelte
@@ -3,7 +3,7 @@
 	import { prequels, type MediaPrequel } from '$lib/AniList/prequels';
 	import MediaTitle from '$lib/List/MediaTitleDisplay.svelte';
 	import { onMount } from 'svelte';
-	import { clearAllParameters, parseOrDefault } from './tool';
+	import { clearAllParameters, parseOrDefault } from '../Utility/parameters';
 	import { airingTime } from '$lib/Media/Anime/Airing/time';
 	import type { Media } from '$lib/AniList/media';
 	import { page } from '$app/stores';
diff --git a/src/lib/Tools/Wrapped.svelte b/src/lib/Tools/Wrapped.svelte
index 8de9a8a1..24d598f7 100644
--- a/src/lib/Tools/Wrapped.svelte
+++ b/src/lib/Tools/Wrapped.svelte
@@ -18,7 +18,8 @@
 	import { domToBlob } from 'modern-screenshot';
 	import { browser } from '$app/environment';
 	import { page } from '$app/stores';
-	import { clearAllParameters, nbsp } from './tool';
+	import { clearAllParameters } from '../Utility/parameters';
+	import { nbsp } from '../Utility/html';
 	import { env } from '$env/dynamic/public';
 	import { estimatedDayReading } from '$lib/Media/Manga/time';
 	import ActivityHistoryGrid from './ActivityHistoryGrid.svelte';
diff --git a/src/lib/Tools/tool.ts b/src/lib/Tools/tool.ts
deleted file mode 100644
index c116151d..00000000
--- a/src/lib/Tools/tool.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { browser } from '$app/environment';
-import { page } from '$app/stores';
-import { get } from 'svelte/store';
-
-export const clearAllParameters = (saved: string[] = []) => {
-	if (browser) {
-		const parameters = new URLSearchParams();
-
-		if (get(page).url.searchParams.has('tool'))
-			parameters.set('tool', get(page).url.searchParams.get('tool') || '');
-
-		saved.forEach((key) => {
-			if (get(page).url.searchParams.has(key)) {
-				parameters.set(key, get(page).url.searchParams.get(key) || '');
-			}
-		});
-		history.replaceState(null, '', `${get(page).url.pathname}?${parameters}`);
-	}
-};
-
-export const parseOrDefault = <T = string | number>(
-	urlParameters: URLSearchParams | null,
-	parameter: string,
-	fallback: T
-): T =>
-	typeof fallback === 'number'
-		? ((browser && urlParameters?.size !== 0
-				? parseInt(urlParameters?.get(parameter) || '', 10) || fallback
-				: fallback) as T)
-		: ((browser && urlParameters?.size !== 0
-				? urlParameters?.get(parameter) || fallback
-				: fallback) as T);
-
-export const nbsp = (str: string) => str.replace(/ /g, '&nbsp;');
-- 
cgit v1.2.3