Error evaluating $toMillis('2024-08-27T22:43:15.78133') #47

dashjoin · Sep 2, 2024 · f528267 · f528267
1 parent 3a92c2b
commit f528267
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/com/dashjoin/jsonata/Functions.java b/src/main/java/com/dashjoin/jsonata/Functions.java
@@ -32,9 +32,11 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
@@ -2224,8 +2226,15 @@ public static Long dateTimeToMillis(String timestamp, String picture) throws Par
             return OffsetDateTime.parse(timestamp).toInstant().toEpochMilli();
           }
           catch (RuntimeException e) {
-            LocalDate ldt = LocalDate.parse(timestamp, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            return ldt.atStartOfDay().atZone(ZoneId.of("UTC")).toInstant().toEpochMilli();
+            try {
+              LocalDate ldt = LocalDate.parse(timestamp, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+              return ldt.atStartOfDay().atZone(ZoneId.of("UTC")).toInstant().toEpochMilli();
+            }
+            catch (DateTimeParseException noZone) {
+              // Implementations usually default to the local time zone when the date string is non-standard
+              // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse#non-standard_date_strings
+              return LocalDateTime.parse(timestamp).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+            }
           }
         } else {
             return DateTimeUtils.parseDateTime(timestamp, picture);

diff --git a/src/test/java/com/dashjoin/jsonata/DateTimeTest.java b/src/test/java/com/dashjoin/jsonata/DateTimeTest.java
@@ -9,4 +9,13 @@ public void testFormatInteger() {
     Jsonata expr = Jsonata.jsonata("$toMillis('2018th', '[Y0001;o]')");
     Assertions.assertEquals(1514764800000L, expr.evaluate(null));
   }
+
+  @Test
+  public void testToMillis() {
+    String noZoneTooPrecise = "2024-08-27T22:43:15.78133";
+    Jsonata expr = Jsonata.jsonata("$fromMillis($toMillis($))");
+    String timestamp = (String) expr.evaluate(noZoneTooPrecise);
+    Assertions.assertTrue(timestamp.startsWith("2024-08-2"));
+    Assertions.assertTrue(timestamp.endsWith(":43:15.781Z"));
+  }
 }