@@ -203,12 +203,43 @@ export type RelativeTimeState =
203203 | { status : "invalid" }
204204 | { status : "relative" ; value : string ; suffix : string | null } ;
205205
206- export function formatRelativeTime ( isoDate : string ) : RelativeTimeParts | null {
206+ const MINUTE_MS = 60_000 ;
207+ const HOUR_MS = 3_600_000 ;
208+ const DAY_MS = 86_400_000 ;
209+
210+ function relativeTimeUnitMs ( elapsedMs : number ) : number {
211+ if ( elapsedMs < HOUR_MS ) return MINUTE_MS ;
212+ if ( elapsedMs < DAY_MS ) return HOUR_MS ;
213+ return DAY_MS ;
214+ }
215+
216+ /**
217+ * Elapsed time floored to the precision `formatRelativeTime` shows, so two
218+ * instants with the same label return the same number.
219+ */
220+ export function relativeTimeElapsedMs ( isoDate : string , nowMs : number = Date . now ( ) ) : number | null {
207221 const date = parseTimestampDate ( isoDate ) ;
208222 if ( ! date ) return null ;
209- const diffMs = Date . now ( ) - date . getTime ( ) ;
210- if ( diffMs < 0 ) return { value : "just now" , suffix : null } ;
211- const seconds = Math . floor ( diffMs / 1000 ) ;
223+ const elapsedMs = Math . max ( 0 , nowMs - date . getTime ( ) ) ;
224+ const unitMs = relativeTimeUnitMs ( elapsedMs ) ;
225+ return Math . floor ( elapsedMs / unitMs ) * unitMs ;
226+ }
227+
228+ /** Milliseconds until the `formatRelativeTime` label for `isoDate` next changes. */
229+ export function msUntilRelativeTimeChange (
230+ isoDate : string ,
231+ nowMs : number = Date . now ( ) ,
232+ ) : number | null {
233+ const date = parseTimestampDate ( isoDate ) ;
234+ if ( ! date ) return null ;
235+ const elapsedMs = Math . max ( 0 , nowMs - date . getTime ( ) ) ;
236+ const unitMs = relativeTimeUnitMs ( elapsedMs ) ;
237+ const nextChangeMs = date . getTime ( ) + ( Math . floor ( elapsedMs / unitMs ) + 1 ) * unitMs ;
238+ return nextChangeMs - nowMs ;
239+ }
240+
241+ export function formatRelativeElapsed ( elapsedMs : number ) : RelativeTimeParts {
242+ const seconds = Math . floor ( elapsedMs / 1000 ) ;
212243 if ( seconds < 60 ) return { value : "just now" , suffix : null } ;
213244 const minutes = Math . floor ( seconds / 60 ) ;
214245 if ( minutes < 60 ) return { value : `${ minutes } m` , suffix : "ago" } ;
@@ -218,19 +249,17 @@ export function formatRelativeTime(isoDate: string): RelativeTimeParts | null {
218249 return { value : `${ days } d` , suffix : "ago" } ;
219250}
220251
252+ export function formatRelativeTime ( isoDate : string ) : RelativeTimeParts | null {
253+ const elapsedMs = relativeTimeElapsedMs ( isoDate ) ;
254+ return elapsedMs === null ? null : formatRelativeElapsed ( elapsedMs ) ;
255+ }
256+
221257export function formatRelativeTimeLabel ( isoDate : string ) {
222258 const relative = formatRelativeTime ( isoDate ) ;
223259 if ( ! relative ) return "" ;
224260 return relative . suffix ? `${ relative . value } ${ relative . suffix } ` : relative . value ;
225261}
226262
227- export function getRelativeTimeState ( isoDate : string | null ) : RelativeTimeState {
228- if ( ! isoDate ) return { status : "missing" } ;
229- const relative = formatRelativeTime ( isoDate ) ;
230- if ( ! relative ) return { status : "invalid" } ;
231- return { status : "relative" , ...relative } ;
232- }
233-
234263export function formatElapsedDurationLabel ( isoDate : string , nowMs : number = Date . now ( ) ) : string {
235264 const date = parseTimestampDate ( isoDate ) ;
236265 if ( ! date ) return "" ;
0 commit comments