Refactor: move LocalDateTime<->Instant conversion functions closer to TimeZone

Author: ilya-g

core/commonMain/src/LocalDate.kt

@@ -37,10 +37,12 @@ public expect class LocalDate : Comparable<LocalDate> {
  */
 public fun String.toLocalDate(): LocalDate = LocalDate.parse(this)
 
+/**
+ * @see LocalDate.atStartOfDayIn
+ */
 public fun LocalDate.atTime(hour: Int, minute: Int, second: Int = 0, nanosecond: Int = 0): LocalDateTime =
     LocalDateTime(year, monthNumber, dayOfMonth, hour, minute, second, nanosecond)
 
-public expect fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant
 
 /**
  * @throws DateTimeArithmeticException if arithmetic overflow occurs or the boundaries of [LocalDate] are exceeded at

core/commonMain/src/LocalDateTime.kt

@@ -46,14 +46,3 @@ public expect class LocalDateTime : Comparable<LocalDateTime> {
  */
 public fun String.toLocalDateTime(): LocalDateTime = LocalDateTime.parse(this)
 
-/**
- * @throws DateTimeArithmeticException if this value is too large to fit in [LocalDateTime].
- */
-public expect fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime
-
-/** */
-public expect fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset
-
-/** */
-public expect fun LocalDateTime.toInstant(timeZone: TimeZone): Instant
-

core/commonMain/src/TimeZone.kt

@@ -38,4 +38,18 @@ public expect open class TimeZone {
 
 public expect class ZoneOffset : TimeZone {
     val totalSeconds: Int
-}
+}
+
+
+/**
+ * @throws DateTimeArithmeticException if this value is too large to fit in [LocalDateTime].
+ */
+public expect fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime
+
+/** */
+public expect fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset
+
+/** */
+public expect fun LocalDateTime.toInstant(timeZone: TimeZone): Instant
+
+public expect fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant

core/jsMain/src/LocalDate.kt

@@ -46,9 +46,6 @@ public actual class LocalDate internal constructor(internal val value: jtLocalDa
     actual override fun compareTo(other: LocalDate): Int = this.value.compareTo(other.value).toInt()
 }
 
-public actual fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant =
-        this.value.atStartOfDay(timeZone.zoneId).toInstant().let(::Instant)
-
 public actual fun LocalDate.plus(unit: DateTimeUnit.DateBased): LocalDate = plusNumber(1, unit)
 public actual fun LocalDate.plus(value: Int, unit: DateTimeUnit.DateBased): LocalDate = plusNumber(value, unit)
 public actual fun LocalDate.plus(value: Long, unit: DateTimeUnit.DateBased): LocalDate = plusNumber(value, unit)

core/jsMain/src/LocalDateTime.kt

@@ -54,16 +54,3 @@ public actual class LocalDateTime internal constructor(internal val value: jtLoc
 
 }
 
-
-public actual fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime = try {
-    jtLocalDateTime.ofInstant(this.value, timeZone.zoneId).let(::LocalDateTime)
-} catch (e: Throwable) {
-    if (e.isJodaDateTimeException()) throw DateTimeArithmeticException(e)
-    throw e
-}
-
-public actual fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset =
-        timeZone.zoneId.rules().offsetOfInstant(this.value).let(::ZoneOffset)
-
-public actual fun LocalDateTime.toInstant(timeZone: TimeZone): Instant =
-        this.value.atZone(timeZone.zoneId).toInstant().let(::Instant)

core/jsMain/src/TimeZone.kt

@@ -42,4 +42,21 @@ public actual class ZoneOffset internal constructor(zoneOffset: jtZoneOffset): T
     internal val zoneOffset get() = zoneId as jtZoneOffset
 
     actual val totalSeconds: Int get() = zoneOffset.totalSeconds().toInt()
-}
+}
+
+
+public actual fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime = try {
+    kotlinx.datetime.internal.JSJoda.LocalDateTime.ofInstant(this.value, timeZone.zoneId).let(::LocalDateTime)
+} catch (e: Throwable) {
+    if (e.isJodaDateTimeException()) throw DateTimeArithmeticException(e)
+    throw e
+}
+
+public actual fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset =
+        timeZone.zoneId.rules().offsetOfInstant(this.value).let(::ZoneOffset)
+
+public actual fun LocalDateTime.toInstant(timeZone: TimeZone): Instant =
+        this.value.atZone(timeZone.zoneId).toInstant().let(::Instant)
+
+public actual fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant =
+        this.value.atStartOfDay(timeZone.zoneId).toInstant().let(::Instant)

core/jvmMain/src/LocalDate.kt

@@ -47,9 +47,6 @@ public actual class LocalDate internal constructor(internal val value: jtLocalDa
     actual override fun compareTo(other: LocalDate): Int = this.value.compareTo(other.value)
 }
 
-public actual fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant =
-        this.value.atStartOfDay(timeZone.zoneId).toInstant().let(::Instant)
-
 public actual fun LocalDate.plus(unit: DateTimeUnit.DateBased): LocalDate =
         plus(1L, unit)
 

core/jvmMain/src/LocalDateTime.kt

@@ -58,15 +58,3 @@ public actual class LocalDateTime internal constructor(internal val value: jtLoc
 
 }
 
-
-public actual fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime = try {
-    jtLocalDateTime.ofInstant(this.value, timeZone.zoneId).let(::LocalDateTime)
-} catch (e: DateTimeException) {
-    throw DateTimeArithmeticException(e)
-}
-
-public actual fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset =
-        timeZone.zoneId.rules.getOffset(this.value).let(::ZoneOffset)
-
-public actual fun LocalDateTime.toInstant(timeZone: TimeZone): Instant =
-        this.value.atZone(timeZone.zoneId).toInstant().let(::Instant)

core/jvmMain/src/TimeZone.kt

@@ -45,4 +45,20 @@ public actual class ZoneOffset internal constructor(zoneOffset: jtZoneOffset): T
     internal val zoneOffset get() = zoneId as jtZoneOffset
 
     actual val totalSeconds: Int get() = zoneOffset.totalSeconds
-}
+}
+
+
+public actual fun Instant.toLocalDateTime(timeZone: TimeZone): LocalDateTime = try {
+    java.time.LocalDateTime.ofInstant(this.value, timeZone.zoneId).let(::LocalDateTime)
+} catch (e: DateTimeException) {
+    throw DateTimeArithmeticException(e)
+}
+
+public actual fun Instant.offsetAt(timeZone: TimeZone): ZoneOffset =
+        timeZone.zoneId.rules.getOffset(this.value).let(::ZoneOffset)
+
+public actual fun LocalDateTime.toInstant(timeZone: TimeZone): Instant =
+        this.value.atZone(timeZone.zoneId).toInstant().let(::Instant)
+
+public actual fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant =
+        this.value.atStartOfDay(timeZone.zoneId).toInstant().let(::Instant)

core/nativeMain/src/LocalDate.kt

@@ -242,9 +242,6 @@ public actual class LocalDate actual constructor(actual val year: Int, actual va
     }
 }
 
-public actual fun LocalDate.atStartOfDayIn(timeZone: TimeZone): Instant =
-        timeZone.atStartOfDay(this)
-
 public actual fun LocalDate.plus(unit: DateTimeUnit.DateBased): LocalDate =
         plus(1, unit)