chore: move ui utils to utils/ui

components.json

@@ -6,7 +6,7 @@
 	},
 	"aliases": {
 		"components": "$lib/components",
-		"utils": "$lib/utils",
+		"utils": "$lib/utils/ui",
 		"ui": "$lib/components/ui",
 		"hooks": "$lib/hooks",
 		"lib": "$lib"

src/lib/components/ui/alert/alert-description.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/alert/alert-title.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/alert/alert.svelte

@@ -19,7 +19,7 @@
 </script>
 
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/button/button.svelte

@@ -1,7 +1,7 @@
 <script lang="ts" module>
 	import { type VariantProps, tv } from 'tailwind-variants';
 
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-action.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-content.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-description.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-footer.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-header.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card-title.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/card/card.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/checkbox/checkbox.svelte

@@ -3,7 +3,7 @@
 	import MinusIcon from '@lucide/svelte/icons/minus';
 	import { Checkbox as CheckboxPrimitive } from 'bits-ui';
 
-	import { type WithoutChildrenOrChild, cn } from '$lib/utils.js';
+	import { type WithoutChildrenOrChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/dialog/dialog-content.svelte

@@ -2,7 +2,7 @@
 	import XIcon from '@lucide/svelte/icons/x';
 	import { Dialog as DialogPrimitive } from 'bits-ui';
 
-	import { type WithoutChildrenOrChild, cn } from '$lib/utils.js';
+	import { type WithoutChildrenOrChild, cn } from '$lib/utils/ui.js';
 
 	import DialogPortal from './dialog-portal.svelte';
 	import * as Dialog from './index.js';

src/lib/components/ui/dialog/dialog-description.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/dialog/dialog-footer.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/dialog/dialog-header.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/dialog/dialog-overlay.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/dialog/dialog-title.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/input/input.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLInputAttributes, HTMLInputTypeAttribute } from 'svelte/elements';
 

src/lib/components/ui/label/label.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Label as LabelPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/select/select-content.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { type WithoutChild, cn } from '$lib/utils.js';
+	import { type WithoutChild, cn } from '$lib/utils/ui.js';
 
 	import SelectPortal from './select-portal.svelte';
 	import SelectScrollDownButton from './select-scroll-down-button.svelte';
 	import SelectScrollUpButton from './select-scroll-up-button.svelte';
 
-	import type { WithoutChildrenOrChild } from '$lib/utils.js';
+	import type { WithoutChildrenOrChild } from '$lib/utils/ui.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {

src/lib/components/ui/select/select-group-heading.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	import type { ComponentProps } from 'svelte';
 

src/lib/components/ui/select/select-item.svelte

@@ -2,7 +2,7 @@
 	import CheckIcon from '@lucide/svelte/icons/check';
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { type WithoutChild, cn } from '$lib/utils.js';
+	import { type WithoutChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/select/select-label.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/ui.js';
 
 	import type { HTMLAttributes } from 'svelte/elements';
 

src/lib/components/ui/select/select-scroll-down-button.svelte

@@ -2,7 +2,7 @@
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { type WithoutChildrenOrChild, cn } from '$lib/utils.js';
+	import { type WithoutChildrenOrChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/select/select-scroll-up-button.svelte

@@ -2,7 +2,7 @@
 	import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { type WithoutChildrenOrChild, cn } from '$lib/utils.js';
+	import { type WithoutChildrenOrChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/select/select-separator.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	import { Separator } from '$lib/components/ui/separator/index.js';
 

src/lib/components/ui/select/select-trigger.svelte

@@ -2,7 +2,7 @@
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 	import { Select as SelectPrimitive } from 'bits-ui';
 
-	import { type WithoutChild, cn } from '$lib/utils.js';
+	import { type WithoutChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/separator/separator.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Separator as SeparatorPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/components/ui/switch/switch.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Switch as SwitchPrimitive } from 'bits-ui';
 
-	import { type WithoutChildrenOrChild, cn } from '$lib/utils.js';
+	import { type WithoutChildrenOrChild, cn } from '$lib/utils/ui.js';
 
 	let {
 		ref = $bindable(null),

src/lib/utils/index.ts

@@ -0,0 +1,9 @@
+export * from './ui.ts';
+export * from './meteo.ts';
+
+export const pad = (n: string | number) => {
+	if (n === null || n === undefined) {
+		return '';
+	}
+	return ('0' + n).slice(-2);
+};

src/lib/utils/ui.ts

@@ -11,10 +11,3 @@ export type WithoutChild<T> = T extends { child?: any } ? Omit<T, 'child'> : T;
 export type WithoutChildren<T> = T extends { children?: any } ? Omit<T, 'children'> : T;
 export type WithoutChildrenOrChild<T> = WithoutChildren<WithoutChild<T>>;
 export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & { ref?: U | null };
-
-export const pad = (n: string | number) => {
-	if (n === null || n === undefined) {
-		return '';
-	}
-	return ('0' + n).slice(-2);
-};

src/routes/weather/week/[location]/+page.svelte

@@ -8,7 +8,7 @@
 	import { type GeoLocation, storedLocation } from '$lib/stores/settings';
 	import { urlHashStore } from '$lib/stores/url-hash-store';
 
-	import { pad } from '$lib/utils';
+	import { pad } from '$lib/utils/index';
 
 	import { Label } from '$lib/components/ui/label';
 	import * as Select from '$lib/components/ui/select';