@bagelink/vue 1.0.66 → 1.1.6-beta.1

package/src/utils/timeAgo.ts

@@ -1,15 +1,4 @@
-interface TimeUnit {
-	singular: string
-	plural: string
-}
-
-type TranslationValue = string | TimeUnit
-
-interface LanguageTranslations {
-	[key: string]: TranslationValue
-}
-
-type AvailableTimeLanguages = 'en' | 'es' | 'fr' | 'he'
+import type { AvailableTimeLanguages, DateTimeAcceptedFormats, LanguageTranslations, TimeUnit } from '../types/timeago'
 
 const translations: Record<AvailableTimeLanguages, LanguageTranslations> = {
 	en: {
@@ -125,7 +114,7 @@ function getBrowserNavigatorLocale(): string {
 		: navigator.language
 }
 
-export function formatDate(date?: string | Date, format: string = 'dd.mm.yy', locale?: string) {
+export function formatDate(date?: string | Date, format: DateTimeAcceptedFormats = 'DD.MM.YY', locale?: string) {
 	if (!date) return ''
 	locale = locale || getBrowserNavigatorLocale()
 	try {
@@ -138,31 +127,34 @@ export function formatDate(date?: string | Date, format: string = 'dd.mm.yy', lo
 			return ''
 		}
 
-		// Create a map of all date parts
-		const datePartsMap: Record<string, string> = {
-			dd: String(d.getDate()).padStart(2, '0'),
-			ddd: d.toLocaleString(locale, { weekday: 'short' }),
-			dddd: d.toLocaleString(locale, { weekday: 'long' }),
-			mm: String(d.getMonth() + 1).padStart(2, '0'),
-			mmm: d.toLocaleString(locale, { month: 'short' }),
-			mmmm: d.toLocaleString(locale, { month: 'long' }),
-			yy: String(d.getFullYear()).slice(-2),
-			yyyy: String(d.getFullYear()),
+		/// keep-sorted
+		const datePartsMap = {
+			AmPm: d.toLocaleString(locale, { hour: 'numeric', hour12: true, minute: 'numeric' }).split(' ')[1],
+			DD: String(d.getDate()).padStart(2, '0'),
+			DDD: d.toLocaleString(locale, { weekday: 'short' }),
+			DDDD: d.toLocaleString(locale, { weekday: 'long' }),
 			HH: String(d.getHours()).padStart(2, '0'),
-			MM: String(d.getMinutes()).padStart(2, '0'),
-			ss: String(d.getSeconds()).padStart(2, '0')
+			mm: String(d.getMinutes()).padStart(2, '0'),
+			MM: String(d.getMonth() + 1).padStart(2, '0'),
+			MMM: d.toLocaleString(locale, { month: 'short' }),
+			MMMM: d.toLocaleString(locale, { month: 'long' }),
+			ss: String(d.getSeconds()).padStart(2, '0'),
+			sss: String(d.getMilliseconds()).padStart(3, '0'),
+			YY: String(d.getFullYear()).slice(-2),
+			YYYY: String(d.getFullYear()),
 		}
 
 		// For more complex formats that need localization, use Intl.DateTimeFormat
+		/// keep-sorted
 		const formatter = new Intl.DateTimeFormat(locale, {
-			weekday: 'long',
-			month: 'long',
 			day: 'numeric',
-			year: 'numeric',
 			hour: '2-digit',
+			hour12: true,
 			minute: '2-digit',
+			month: 'long',
 			second: '2-digit',
-			hour12: true
+			weekday: 'long',
+			year: 'numeric',
 		})
 
 		const formattedParts = formatter.formatToParts(d)
@@ -176,24 +168,26 @@ export function formatDate(date?: string | Date, format: string = 'dd.mm.yy', lo
 
 		// Add localized formats to our map
 		if (partsMap.month) {
-			datePartsMap.mmm = partsMap.month.substring(0, 3)
-			datePartsMap.mmmm = partsMap.month
+			datePartsMap.MMM = partsMap.month.substring(0, 3)
+			datePartsMap.MMMM = partsMap.month
 		}
 
 		if (partsMap.weekday) {
-			datePartsMap.ddd = partsMap.weekday.substring(0, 3)
-			datePartsMap.dddd = partsMap.weekday
+			datePartsMap.DDD = partsMap.weekday.substring(0, 3)
+			datePartsMap.DDDD = partsMap.weekday
 		}
 
 		if (partsMap.dayPeriod) {
-			datePartsMap.ampm = partsMap.dayPeriod
+			datePartsMap.AmPm = partsMap.dayPeriod
 		}
 
 		// Process the format string by replacing each token with its value
-		let formattedDate = format
+		let formattedDate: string = format
 
 		// Sort tokens by length (longest first) to avoid partial replacements
-		const tokens = Object.keys(datePartsMap).sort((a, b) => b.length - a.length)
+		const tokens = (
+			Object.keys(datePartsMap).sort((a, b) => b.length - a.length)
+		) as (keyof typeof datePartsMap)[]
 
 		// Replace each token with its value
 		for (const token of tokens) {