fix: handle parse/format of 12-hour h with one or two digits

fix: handle parse/format of 12-hour h with one or two digits

Author: amirroid

jalalidate/src/commonMain/kotlin/ir/amirroid/jalalidate/formatter/FormatPart.kt

@@ -35,24 +35,26 @@ internal class LiteralPart(val literal: String) : FormatPart {
 internal class NumericPart(
     override val name: String,
     val extractor: (JalaliDateTime) -> Int,
-    val length: Int,
+    val maxLength: Int = 2,
     val padding: Padding = Padding.ZERO
 ) : FormatPart {
     override fun format(date: JalaliDateTime): String {
         val value = extractor(date)
         return when (padding) {
-            Padding.ZERO -> value.toString().padStart(length, '0')
-            Padding.SPACE -> value.toString().padStart(length, ' ')
+            Padding.NONE -> value.toString()
+            Padding.ZERO -> value.toString().padStart(maxLength, '0')
+            Padding.SPACE -> value.toString().padStart(maxLength, ' ')
         }
     }
 
     override fun parse(input: String, pos: Int): ParseResult {
-        val endPos = pos + length
-        if (endPos > input.length) throw IllegalArgumentException("Input too short for numeric part at $pos")
+        val endPos = (pos + maxLength).coerceAtMost(input.length)
         val substring = input.substring(pos, endPos)
-        val number = substring.trim().toIntOrNull()
-            ?: throw IllegalArgumentException("Invalid number at $pos")
-        return ParseResult(number, endPos)
+
+        val numberStr = substring.takeWhile { it.isDigit() }
+        if (numberStr.isEmpty()) throw IllegalArgumentException("Invalid number at $pos")
+        val number = numberStr.toInt()
+        return ParseResult(number, pos + numberStr.length)
     }
 }
 

jalalidate/src/commonMain/kotlin/ir/amirroid/jalalidate/formatter/JalaliDateTimeFormatter.kt

@@ -5,7 +5,7 @@ import ir.amirroid.jalalidate.configuration.JalaliDateGlobalConfiguration
 import ir.amirroid.jalalidate.date.JalaliDateTime
 import kotlin.compareTo
 
-public enum class Padding { ZERO, SPACE }
+public enum class Padding { NONE, ZERO, SPACE }
 
 public enum class Locale { PERSIAN, ENGLISH }
 
@@ -125,10 +125,10 @@ public class JalaliDateTimeFormatter {
         "d" -> NumericPart("day", { it.jalaliDay }, 1, Padding.ZERO)
 
         "HH" -> NumericPart("hour", { it.hour }, 2, Padding.ZERO)
-        "H" -> NumericPart("hour", { it.hour }, 1, Padding.ZERO)
+        "H" -> NumericPart("hour", { it.hour }, 2, Padding.NONE)
 
         "hh" -> NumericPart("hour", { it.hourIn12 }, 2, Padding.ZERO)
-        "h" -> NumericPart("hour", { it.hourIn12 }, 1, Padding.ZERO)
+        "h" -> NumericPart("hour", { it.hourIn12 }, 2, Padding.NONE)
 
         "mm" -> NumericPart("minute", { it.minute }, 2, Padding.ZERO)
         "m" -> NumericPart("minute", { it.minute }, 1, Padding.ZERO)

jalalidate/src/commonTest/kotlin/ir/amirroid/jalalidate/birashk/FormatTest.kt

@@ -184,4 +184,26 @@ class FormatTest {
         val formatted = date.format { byUnicodePattern("yyyy/MM/dd hh:mm a") }
         assertEquals("1402/01/01 11:15 PM", formatted)
     }
+
+    @Test
+    fun formatHourIn12HourFormatWithAmPm() {
+        val date1 = JalaliDateTime(1402, 1, 1, 13, 5, 0) // 1:05 PM
+        val formatted1 = date1.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 1:05 PM", formatted1)
+
+        val date2 = JalaliDateTime(1402, 1, 1, 23, 15, 0) // 11:15 PM
+        val formatted2 = date2.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 11:15 PM", formatted2)
+
+        val date3 = JalaliDateTime(1402, 1, 1, 9, 0, 0) // 9:00 AM
+        val formatted3 = date3.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 9:00 AM", formatted3)
+    }
+
+    @Test
+    fun hour24FormatSingleDigit() {
+        val date = JalaliDateTime(1402, 1, 1, 7, 5, 0)
+        val formatted = date.format { byUnicodePattern("yyyy/MM/dd H:mm") }
+        assertEquals("1402/01/01 7:05", formatted)
+    }
 }

jalalidate/src/commonTest/kotlin/ir/amirroid/jalalidate/birashk/ParseTest.kt

@@ -285,4 +285,18 @@ class ParseTest {
         assertEquals(23, date.hour)
         assertEquals(15, date.minute)
     }
+
+    @Test
+    fun parseHourIn12HourFormatWithVariableLength() {
+        val format = JalaliDateTime.Format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+
+        val date1 = format.parse("1402/01/01 1:05 PM")
+        assertEquals(13, date1.hour) // 1 PM -> 13
+
+        val date2 = format.parse("1402/01/01 11:15 PM")
+        assertEquals(23, date2.hour) // 11 PM -> 23
+
+        val date3 = format.parse("1402/01/01 9:00 AM")
+        assertEquals(9, date3.hour) // 9 AM -> 9
+    }
 }

jalalidate/src/commonTest/kotlin/ir/amirroid/jalalidate/khayyam/FormatTest.kt

@@ -182,4 +182,26 @@ class FormatTest {
         val formatted = date.format { byUnicodePattern("yyyy/MM/dd hh:mm a") }
         assertEquals("1402/01/01 11:15 PM", formatted)
     }
+
+    @Test
+    fun formatHourIn12HourFormatWithAmPm() {
+        val date1 = JalaliDateTime(1402, 1, 1, 13, 5, 0) // 1:05 PM
+        val formatted1 = date1.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 1:05 PM", formatted1)
+
+        val date2 = JalaliDateTime(1402, 1, 1, 23, 15, 0) // 11:15 PM
+        val formatted2 = date2.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 11:15 PM", formatted2)
+
+        val date3 = JalaliDateTime(1402, 1, 1, 9, 0, 0) // 9:00 AM
+        val formatted3 = date3.format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+        assertEquals("1402/01/01 9:00 AM", formatted3)
+    }
+
+    @Test
+    fun hour24FormatSingleDigit() {
+        val date = JalaliDateTime(1402, 1, 1, 7, 5, 0)
+        val formatted = date.format { byUnicodePattern("yyyy/MM/dd H:mm") }
+        assertEquals("1402/01/01 7:05", formatted)
+    }
 }

jalalidate/src/commonTest/kotlin/ir/amirroid/jalalidate/khayyam/ParseTest.kt

@@ -1,6 +1,8 @@
 package ir.amirroid.jalalidate.khayyam
 
 import ir.amirroid.jalalidate.algorithm.defaults.KhayyamAlgorithm
+import ir.amirroid.jalalidate.date.JalaliDateTime
+import ir.amirroid.jalalidate.format
 import ir.amirroid.jalalidate.formatter.JalaliDateTimeFormatter
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -283,4 +285,18 @@ class ParseTest {
         assertEquals(23, date.hour)
         assertEquals(15, date.minute)
     }
+
+    @Test
+    fun parseHourIn12HourFormatWithVariableLength() {
+        val format = JalaliDateTime.Format { byUnicodePattern("yyyy/MM/dd h:mm a") }
+
+        val date1 = format.parse("1402/01/01 1:05 PM")
+        assertEquals(13, date1.hour) // 1 PM -> 13
+
+        val date2 = format.parse("1402/01/01 11:15 PM")
+        assertEquals(23, date2.hour) // 11 PM -> 23
+
+        val date3 = format.parse("1402/01/01 9:00 AM")
+        assertEquals(9, date3.hour) // 9 AM -> 9
+    }
 }