Merge main into refactor-weather-weekly - resolve type safety conflicts

2026-02-15 15:59:44 +01:00
parent f2371ec5ce 6872cac00e
commit 690d04f96b
12 changed files with 551 additions and 685 deletions
@@ -1,127 +0,0 @@
-import { type Writable, writable } from 'svelte/store';
-
-import { browser } from '$app/environment';
-import { goto } from '$app/navigation';
-import { page } from '$app/state';
-
-import { debounce, isNumeric } from '$lib/utils';
-
-import type { Parameters } from '$lib/types';
-
-export type UrlHashStore = Writable<Parameters>;
-
-export const urlHashStore = (initialValues: Parameters): UrlHashStore => {
-	const urlHashes: Writable<Parameters> = writable({});
-
-	const defaultValues = JSON.parse(JSON.stringify(initialValues));
-	urlHashes.set(JSON.parse(JSON.stringify(defaultValues)));
-
-	function updateURL() {
-		const searchParams = page.url.searchParams.toString().replaceAll('%2C', ',');
-		const link = `?${searchParams}${page.url.hash ?? ''}`;
-		if (page.url.search !== window.location.search) {
-			goto(link, {
-				noScroll: true,
-				keepFocus: true
-			});
-		}
-	}
-
-	const processURLParamsUpdate = debounce(() => updateURL());
-
-	const updateURLParams = (values: Parameters) => {
-		if (browser) {
-			let changedParams = false;
-
-			for (const [key, value] of Object.entries(values)) {
-				let defaultValue = defaultValues[key];
-
-				// params key is array
-				if (defaultValue && Array === defaultValue.constructor) {
-					if (JSON.stringify(value) === JSON.stringify(defaultValue)) {
-						if (page.url.searchParams.has(key) && page.url.searchParams.get(key) !== value) {
-							page.url.searchParams.delete(key);
-							changedParams = true;
-						}
-					} else {
-						let array = value as any[];
-						// remove empty string when array has more then 1 values
-						if (array.length > 1 && array.includes('')) {
-							array = array.filter((e: string) => e !== '');
-						}
-						page.url.searchParams.set(key, array.join(','));
-						changedParams = true;
-					}
-				} else {
-					let val: number | string = value as number | string;
-					if (isNumeric(defaultValue)) {
-						defaultValue = Number(defaultValue);
-					}
-					if (isNumeric(value as number | string)) {
-						val = Number(value);
-					}
-
-					if (val != defaultValue) {
-						page.url.searchParams.set(key, String(val));
-						changedParams = true;
-					} else {
-						if (page.url.searchParams.has(key) && page.url.searchParams.get(key) !== val) {
-							page.url.searchParams.delete(key);
-							changedParams = true;
-						}
-					}
-				}
-				if (page.url.searchParams.has(key) && page.url.searchParams.get(key) === '') {
-					if (
-						defaultValue === undefined ||
-						(defaultValue && Array === defaultValue.constructor && defaultValue.length === 0) ||
-						defaultValue === '0'
-					) {
-						page.url.searchParams.delete(key);
-						changedParams = true;
-					}
-				}
-			}
-
-			if (changedParams) {
-				processURLParamsUpdate();
-			}
-		}
-	};
-
-	// check if urlParams overrides any default values OR stored values
-	if (browser && page.url.search) {
-		for (const [key, value] of page.url.searchParams.entries()) {
-			let defaultValue = defaultValues[key];
-
-			if (defaultValue && defaultValue.constructor === Array) {
-				if (JSON.stringify(defaultValue) !== JSON.stringify(value)) {
-					urlHashes.update((urlValues) => {
-						urlValues[key] = value.split(/,|%2C/);
-						return urlValues;
-					});
-				}
-			} else {
-				let val: number | string = value;
-				if (isNumeric(defaultValue)) {
-					defaultValue = Number(defaultValue);
-				}
-				if (isNumeric(value)) {
-					val = Number(value);
-				}
-				if (defaultValue !== val) {
-					urlHashes.update((urlValues) => {
-						urlValues[key] = val;
-						return urlValues;
-					});
-				}
-			}
-		}
-	}
-
-	urlHashes.subscribe((values) => {
-		updateURLParams(values);
-	});
-
-	return urlHashes;
-};