Clean up time formatting utils

Author: jahooma

cli/src/utils/time-format.ts

@@ -1,47 +1,21 @@
+import { formatTimeUntil } from '@codebuff/common/util/dates'
+
 /**
- * Format time until reset in human-readable form
+ * Format time until reset in human-readable form.
  * @param resetDate - The date when the quota/resource resets
  * @returns Human-readable string like "2h 30m" or "45m"
  */
 export const formatResetTime = (resetDate: Date | null): string => {
   if (!resetDate) return ''
-  const now = new Date()
-  const diffMs = resetDate.getTime() - now.getTime()
-  if (diffMs <= 0) return 'now'
-
-  const diffMins = Math.floor(diffMs / (1000 * 60))
-  const diffHours = Math.floor(diffMins / 60)
-  const remainingMins = diffMins % 60
-
-  if (diffHours > 0) {
-    return `${diffHours}h ${remainingMins}m`
-  }
-  return `${diffMins}m`
+  return formatTimeUntil(resetDate, { fallback: 'now' })
 }
 
 /**
- * Format time until reset in human-readable form, including days
+ * Format time until reset in human-readable form, including days.
  * @param resetDate - The date when the quota/resource resets
  * @returns Human-readable string like "4d 7h" or "2h 30m"
  */
 export const formatResetTimeLong = (resetDate: Date | string | null): string => {
   if (!resetDate) return ''
-  const date = typeof resetDate === 'string' ? new Date(resetDate) : resetDate
-  const now = new Date()
-  const diffMs = date.getTime() - now.getTime()
-  if (diffMs <= 0) return 'now'
-
-  const diffMins = Math.floor(diffMs / (1000 * 60))
-  const diffHours = Math.floor(diffMins / 60)
-  const diffDays = Math.floor(diffHours / 24)
-  const remainingHours = diffHours % 24
-  const remainingMins = diffMins % 60
-
-  if (diffDays > 0) {
-    return `${diffDays}d ${remainingHours}h`
-  }
-  if (diffHours > 0) {
-    return `${diffHours}h ${remainingMins}m`
-  }
-  return `${diffMins}m`
+  return formatTimeUntil(resetDate, { fallback: 'now' })
 }

common/src/util/dates.ts

@@ -15,3 +15,67 @@ export const getNextQuotaReset = (referenceDate: Date | null): Date => {
   }
   return nextMonth
 }
+
+export interface FormatTimeUntilOptions {
+  /**
+   * What to return when the date is in the past or invalid.
+   * @default 'now'
+   */
+  fallback?: string
+  /**
+   * Whether to include the smaller unit (hours in "Xd Yh", minutes in "Xh Ym").
+   * @default true
+   */
+  includeSubUnit?: boolean
+}
+
+/**
+ * Format the time until a future date in a human-readable string.
+ *
+ * @param date - The target date (Date object or ISO string)
+ * @param options - Formatting options
+ * @returns Human-readable string like "4d 7h", "2h 30m", or "45m"
+ *
+ * @example
+ * // Date 2 days and 5 hours in the future
+ * formatTimeUntil(futureDate)  // "2d 5h"
+ * formatTimeUntil(futureDate, { includeSubUnit: false })  // "2d"
+ *
+ * // Date 3 hours and 20 minutes in the future
+ * formatTimeUntil(futureDate)  // "3h 20m"
+ *
+ * // Date in the past
+ * formatTimeUntil(pastDate)  // "now"
+ * formatTimeUntil(pastDate, { fallback: '0h' })  // "0h"
+ */
+export const formatTimeUntil = (
+  date: Date | string | null,
+  options: FormatTimeUntilOptions = {},
+): string => {
+  const { fallback = 'now', includeSubUnit = true } = options
+
+  if (!date) return fallback
+
+  const target = typeof date === 'string' ? new Date(date) : date
+  const diffMs = target.getTime() - Date.now()
+
+  if (isNaN(diffMs) || diffMs <= 0) return fallback
+
+  const diffMins = Math.floor(diffMs / (1000 * 60))
+  const diffHours = Math.floor(diffMins / 60)
+  const diffDays = Math.floor(diffHours / 24)
+  const remainingHours = diffHours % 24
+  const remainingMins = diffMins % 60
+
+  if (diffDays > 0) {
+    return includeSubUnit && remainingHours > 0
+      ? `${diffDays}d ${remainingHours}h`
+      : `${diffDays}d`
+  }
+  if (diffHours > 0) {
+    return includeSubUnit && remainingMins > 0
+      ? `${diffHours}h ${remainingMins}m`
+      : `${diffHours}h`
+  }
+  return `${diffMins}m`
+}

web/src/app/profile/components/subscription-section.tsx

@@ -15,21 +15,15 @@ import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { cn } from '@/lib/utils'
 
+import { formatTimeUntil } from '@codebuff/common/util/dates'
+
 import type {
   SubscriptionResponse,
   ActiveSubscriptionResponse,
 } from '@codebuff/common/types/subscription'
 
-function formatDaysHours(dateStr: string): string {
-  const target = new Date(dateStr)
-  const diffMs = target.getTime() - Date.now()
-  if (isNaN(diffMs) || diffMs <= 0) return '0h'
-  const totalHours = Math.ceil(diffMs / (1000 * 60 * 60))
-  const days = Math.floor(totalHours / 24)
-  const hours = totalHours % 24
-  if (days > 0) return hours > 0 ? `${days}d ${hours}h` : `${days}d`
-  return `${hours}h`
-}
+const formatDaysHours = (dateStr: string): string =>
+  formatTimeUntil(dateStr, { fallback: '0h' })
 
 function ProgressBar({ percentAvailable, label }: { percentAvailable: number; label: string }) {
   const percent = Math.min(100, Math.max(0, Math.round(percentAvailable)))