From 060834374134fe5aae32777fc88ae65eedb5e9a0 Mon Sep 17 00:00:00 2001
From: Elijah Duffy <elijah@thatoneguy.ca>
Date: Thu, 11 Dec 2025 15:42:59 -0800
Subject: [PATCH] DurationInput: limit precision to TimeDuration type

Remove support for 'days', adds support for 'milliseconds'
---
 src/lib/DurationInput.svelte | 51 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/lib/DurationInput.svelte b/src/lib/DurationInput.svelte
index 5b5561e..642caf1 100644
--- a/src/lib/DurationInput.svelte
+++ b/src/lib/DurationInput.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" module>
 	/**
-	 * formatDuration returns a human readable string for a DateTimeDuration.
+	 * formatDuration returns a human readable string for a TimeDuration.
 	 *
 	 * @param duration The duration to format, can be null or undefined.
 	 * @param fallback Optional fallback string to return if duration is null or undefined.
@@ -9,12 +9,11 @@
 	 * @returns The duration in human readable format or the fallback string if undefined.
 	 */
 	export const formatDuration = (
-		duration: DateTimeDuration | null | undefined,
+		duration: TimeDuration | null | undefined,
 		fallback?: string
 	): string => {
 		if (!duration) return fallback ?? '';
 		const parts: string[] = [];
-		if (duration.days) parts.push(`${duration.days}d`);
 		if (duration.hours) parts.push(`${duration.hours}h`);
 		if (duration.minutes) parts.push(`${duration.minutes}m`);
 		if (duration.seconds) parts.push(`${duration.seconds}s`);
@@ -22,13 +21,12 @@
 	};
 
 	/**
-	 * durationToISO8601 converts a DateTimeDuration to an ISO 8601 duration string.
+	 * durationToISO8601 converts a TimeDuration to an ISO 8601 duration string.
 	 * @param duration The duration to convert.
 	 * @returns The ISO 8601 duration string.
 	 */
-	export const durationToISO8601 = (duration: DateTimeDuration): string => {
+	export const durationToISO8601 = (duration: TimeDuration): string => {
 		let str = 'P';
-		if (duration.days) str += `${duration.days}D`;
 		if (duration.hours || duration.minutes || duration.seconds) str += 'T';
 		if (duration.hours) str += `${duration.hours}H`;
 		if (duration.minutes) str += `${duration.minutes}M`;
@@ -37,18 +35,17 @@
 	};
 
 	/**
-	 * iso8601ToDuration converts an ISO 8601 duration string to a DateTimeDuration.
+	 * iso8601ToDuration converts an ISO 8601 duration string to a TimeDuration.
 	 * @param str The ISO 8601 duration string.
-	 * @returns The DateTimeDuration object.
+	 * @returns The TimeDuration object.
 	 */
-	export const iso8601ToDuration = (str: string): DateTimeDuration => {
+	export const iso8601ToDuration = (str: string): TimeDuration => {
 		const regex = /^P(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/;
 		const matches = str.match(regex);
 		if (!matches) {
 			throw new Error('Invalid ISO 8601 duration string');
 		}
 		return {
-			days: matches[1] ? parseInt(matches[1], 10) : 0,
 			hours: matches[2] ? parseInt(matches[2], 10) : 0,
 			minutes: matches[3] ? parseInt(matches[3], 10) : 0,
 			seconds: matches[4] ? parseInt(matches[4], 10) : 0
@@ -57,10 +54,10 @@
 </script>
 
 <script lang="ts">
-	import type { DateTimeDuration } from '@internationalized/date';
+	import type { TimeDuration } from '@internationalized/date';
 	import type { ClassValue } from 'svelte/elements';
 	import { FocusManager } from './focus';
-	import { generateIdentifier, prefixZero, targetMust } from './util';
+	import { generateIdentifier, targetMust } from './util';
 	import { decrementValue, incrementValue } from './numeric-utils';
 	import Label from './Label.svelte';
 	import { liveValidator, validate } from '@svelte-toolkit/validate';
@@ -76,8 +73,8 @@
 		label?: string;
 		/** Precision for duration input */
 		precision?: { min: componentKey; max: componentKey };
-		/** Bindable DateTimeDuration value */
-		value?: DateTimeDuration | null;
+		/** Bindable TimeDuration value */
+		value?: TimeDuration | null;
 		/** Bindable formatted duration string, always matches current value and cannot be set */
 		formattedValue?: string;
 		/** Whether the input is required */
@@ -89,7 +86,7 @@
 		/** Additional classes are applied to the root container (div element) */
 		class?: ClassValue | null;
 		/** Triggered whenever the duration value is changed by the user */
-		onchange?: (details: { duration: DateTimeDuration | null; formattedDuration: string }) => void;
+		onchange?: (details: { duration: TimeDuration | null; formattedDuration: string }) => void;
 	}
 
 	let {
@@ -105,7 +102,7 @@
 		onchange
 	}: Props = $props();
 
-	const COMPONENT_KEYS = ['days', 'hours', 'minutes', 'seconds'] as const;
+	const COMPONENT_KEYS = ['hours', 'minutes', 'seconds', 'milliseconds'] as const;
 	type componentKey = (typeof COMPONENT_KEYS)[number];
 	/** selected components are controlled by min and max precision */
 	let selectedComponents: componentKey[] = $derived.by(() => {
@@ -128,7 +125,7 @@
 				if (!value || value[key] === 0) {
 					acc[key] = '';
 				} else {
-					acc[key] = prefixZero(value[key]?.toString() || '0');
+					acc[key] = value[key]?.toString() || '0';
 				}
 				return acc;
 			},
@@ -141,10 +138,10 @@
 	/** updateValue updates `value` with the current values from the input fields */
 	const updateValue = (override?: Partial<Record<componentKey, string>>) => {
 		const newValues: Record<componentKey, number> = {
-			days: parseInt(override?.days ?? values.days) || 0,
 			hours: parseInt(override?.hours ?? values.hours) || 0,
 			minutes: parseInt(override?.minutes ?? values.minutes) || 0,
-			seconds: parseInt(override?.seconds ?? values.seconds) || 0
+			seconds: parseInt(override?.seconds ?? values.seconds) || 0,
+			milliseconds: parseInt(override?.milliseconds ?? values.milliseconds) || 0
 		};
 
 		let zero = true;
@@ -178,11 +175,9 @@
 	 * detect the change.
 	 */
 	const updateHiddenInput = () => {
-		// TODO: Make sure this formats correctly
 		hiddenInput.value = value ? durationToISO8601(value) : '';
 		hiddenInput.dispatchEvent(new KeyboardEvent('keyup'));
 		onchange?.({ duration: value, formattedDuration: formattedValue });
-		console.log('updated hidden input', hiddenInput.value);
 	};
 
 	/**
@@ -217,6 +212,7 @@
 	const components: Record<
 		componentKey,
 		{
+			label?: string;
 			pattern: RegExp;
 			onkeydown?: (e: KeyboardEvent) => void;
 			oninput?: (e: Event) => void;
@@ -225,10 +221,6 @@
 			placeholder?: string;
 		}
 	> = {
-		days: {
-			pattern: numericPattern,
-			...buildEventHandlers('days')
-		},
 		hours: {
 			pattern: numericPattern,
 			divider: ':',
@@ -243,8 +235,15 @@
 		},
 		seconds: {
 			pattern: numericPattern,
+			divider: '.',
 			placeholder: '0',
 			...buildEventHandlers('seconds')
+		},
+		milliseconds: {
+			label: 'MS',
+			pattern: numericPattern,
+			placeholder: '000',
+			...buildEventHandlers('milliseconds')
 		}
 	};
 </script>
@@ -287,7 +286,7 @@
 					{@attach focusList.input({ selectAll: true })}
 				/>
 
-				<Label for={partID} class={['capitalize', compact && '-mt-0.5']}>{key}</Label>
+				<Label for={partID} class={['capitalize', compact && '-mt-0.5']}>{opts.label ?? key}</Label>
 			</div>
 
 			{#if opts.divider && index < selectedComponents.length - 1}