@astryxdesign/core 0.4.6 → 0.4.7-canary.29be96d

package/src/utils/timeParser.test.ts

@@ -135,6 +135,9 @@ describe('parseTimeInput', () => {
   it('parses compact formats', () => {
     expect(parseTimeInput('1430')).toBe('14:30');
     expect(parseTimeInput('0000')).toBe('00:00');
+    expect(parseTimeInput('0230pm')).toBe('14:30');
+    expect(parseTimeInput('1230am')).toBe('00:30');
+    expect(parseTimeInput('023045pm', true)).toBe('14:30:45');
   });
 
   it('parses hour-only with meridiem', () => {
@@ -259,7 +262,9 @@ describe('adjustTime', () => {
 
   it('wraps large negative deltas in constant time', () => {
     expect(adjustTime('10:00' as ISOTimeString, -1440 * 1e7)).toBe('10:00');
-    expect(adjustTime('10:00' as ISOTimeString, -1440 * 1e7 - 30)).toBe('09:30');
+    expect(adjustTime('10:00' as ISOTimeString, -1440 * 1e7 - 30)).toBe(
+      '09:30',
+    );
   });
 
   it('adds minutes', () => {

package/src/utils/timeParser.ts

@@ -4,7 +4,7 @@
  * @file timeParser.ts
  * @input Uses string parsing
  * @output Exports time parsing and formatting utilities
- * @position Shared utility; used by TimePicker
+ * @position Shared utility; used by TimeInput and DateTimeInput
  *
  * SYNC: When modified, update this header
  */
@@ -175,16 +175,29 @@ export function parseTimeInput(
   // Remove AM/PM suffix
   const timeStr = trimmed.replace(/\s*[ap]\.?m?\.?\s*$/i, '').trim();
 
+  const convertHourTo24Hour = (hour: number): number | null => {
+    if (!hasMeridiem) {
+      return hour;
+    }
+    if (hour < 1 || hour > 12) {
+      return null;
+    }
+    if (isPM && hour !== 12) {
+      return hour + 12;
+    }
+    if (isAM && hour === 12) {
+      return 0;
+    }
+    return hour;
+  };
+
   // Handle formats like "2pm" -> "2"
   if (/^\d{1,2}$/.test(timeStr)) {
     const hour = parseInt(timeStr, 10);
-    if (hour >= 1 && hour <= 12 && hasMeridiem) {
-      let hour24 = hour;
-      if (isPM && hour !== 12) {
-        hour24 = hour + 12;
-      }
-      if (isAM && hour === 12) {
-        hour24 = 0;
+    if (hasMeridiem) {
+      const hour24 = convertHourTo24Hour(hour);
+      if (hour24 === null) {
+        return null;
       }
       return formatISOTime(
         {hour: hour24, minute: 0, second: 0},
@@ -201,8 +214,15 @@ export function parseTimeInput(
   if (/^\d{4}$/.test(timeStr)) {
     const hour = parseInt(timeStr.slice(0, 2), 10);
     const minute = parseInt(timeStr.slice(2, 4), 10);
-    if (hour >= 0 && hour <= 23 && minute >= 0 && minute <= 59) {
-      return formatISOTime({hour, minute, second: 0}, includeSeconds);
+    const hour24 = convertHourTo24Hour(hour);
+    if (
+      hour24 !== null &&
+      hour24 >= 0 &&
+      hour24 <= 23 &&
+      minute >= 0 &&
+      minute <= 59
+    ) {
+      return formatISOTime({hour: hour24, minute, second: 0}, includeSeconds);
     }
     return null;
   }
@@ -212,15 +232,17 @@ export function parseTimeInput(
     const hour = parseInt(timeStr.slice(0, 2), 10);
     const minute = parseInt(timeStr.slice(2, 4), 10);
     const second = parseInt(timeStr.slice(4, 6), 10);
+    const hour24 = convertHourTo24Hour(hour);
     if (
-      hour >= 0 &&
-      hour <= 23 &&
+      hour24 !== null &&
+      hour24 >= 0 &&
+      hour24 <= 23 &&
       minute >= 0 &&
       minute <= 59 &&
       second >= 0 &&
       second <= 59
     ) {
-      return formatISOTime({hour, minute, second}, includeSeconds);
+      return formatISOTime({hour: hour24, minute, second}, includeSeconds);
     }
     return null;
   }