Fill DateTimeWithZoneId Offset when unpack and use timeZoneOffsetSeconds instead of calculate

Author: bigmontz

packages/bolt-connection/src/bolt/bolt-protocol-v5x0.utc.transformer.js

@@ -67,7 +67,7 @@ function createDateTimeWithZoneIdTransformer (config) {
         localDateTime.minute,
         localDateTime.second,
         int(nano),
-        null,
+        localDateTime.timeZoneOffsetSeconds,
         timeZoneId
       )
       return convertIntegerPropsIfNeeded(result, disableLosslessIntegers, useBigInt)
@@ -83,7 +83,9 @@ function createDateTimeWithZoneIdTransformer (config) {
         value.nanosecond
       )
 
-      const offset = getOffsetFromZoneId(value.timeZoneId, epochSecond, value.nanosecond)
+      const offset = value.timeZoneOffsetSeconds != null
+        ? value.timeZoneOffsetSeconds
+        : getOffsetFromZoneId(value.timeZoneId, epochSecond, value.nanosecond)
       const utc = epochSecond.subtract(offset)
 
       const nano = int(value.nanosecond)
@@ -159,27 +161,46 @@ function getTimeInZoneId (timeZoneId, epochSecond, nano) {
     hour: 'numeric',
     minute: 'numeric',
     second: 'numeric',
-    hourCycle: 'h23'
+    hourCycle: 'h23',
+    timeZoneName: 'short'
   })
 
   const l = epochSecondAndNanoToLocalDateTime(epochSecond, nano)
-
-  const formattedUtc = formatter.formatToParts(Date.UTC(
+  const utc = Date.UTC(
     int(l.year).toNumber(),
     int(l.month).toNumber() - 1,
     int(l.day).toNumber(),
     int(l.hour).toNumber(),
     int(l.minute).toNumber(),
     int(l.second).toNumber()
-  ))
+  )
+
+  const formattedUtcParts = formatter.formatToParts(utc)
+
+  const localDateTime = formattedUtcParts.reduce((obj, currentValue) => {
+    if (currentValue.type === 'timeZoneName') {
+      const parts = currentValue.value.replace('GMT', '').split(':')
+      const divisor = 60
+      const { offset } = parts.reduce((state, value) => {
+        const part = int(value)
+        const signal = part.isPositive() ? int(1) : int(-1)
 
-  const localDateTime = formattedUtc.reduce((obj, currentValue) => {
-    if (currentValue.type !== 'literal') {
+        const offset = part.multiply(state.factor).add(state.offset)
+        const factor = state.factor.div(divisor).multiply(signal)
+
+        return {
+          offset,
+          factor
+        }
+      }, { factor: int(60 * 60), offset: int(0) })
+
+      obj.timeZoneOffsetSeconds = offset
+    } else if (currentValue.type !== 'literal') {
       obj[currentValue.type] = int(currentValue.value)
-      return obj
     }
     return obj
   }, {})
+
   return localDateTime
 }
 

packages/bolt-connection/test/bolt/bolt-protocol-v5x0.test.js

@@ -407,6 +407,42 @@ describe('#unit BoltProtocolV5x0', () => {
       ['Time', new Time(1, 1, 1, 1, 1)],
       ['Date', new Date(1, 1, 1)],
       ['LocalDateTime', new LocalDateTime(1, 1, 1, 1, 1, 1, 1)],
+      [
+        'DateTimeWithZoneOffset',
+        new DateTime(2022, 6, 14, 15, 21, 18, 183_000_000, 120 * 60)
+      ],
+      [
+        'DateTimeWithZoneId / Berlin 2:30 CET',
+        new DateTime(2022, 10, 30, 2, 30, 0, 183_000_000, 2 * 60 * 60, 'Europe/Berlin')
+      ],
+      [
+        'DateTimeWithZoneId / Berlin 2:30 CEST',
+        new DateTime(2022, 10, 30, 2, 30, 0, 183_000_000, 1 * 60 * 60, 'Europe/Berlin')
+      ],
+      ['Point2D', new Point(1, 1, 1)],
+      ['Point3D', new Point(1, 1, 1, 1)]
+    ])('should pack spatial types and temporal types (%s)', (_, object) => {
+      const buffer = alloc(256)
+      const protocol = new BoltProtocolV5x0(
+        new utils.MessageRecordingConnection(),
+        buffer,
+        {
+          disableLosslessIntegers: true
+        }
+      )
+
+      const packable = protocol.packable(object)
+
+      expect(packable).not.toThrow()
+
+      buffer.reset()
+
+      const unpacked = protocol.unpack(buffer)
+
+      expect(unpacked).toEqual(object)
+    })
+
+    it.each([
       [
         'DateTimeWithZoneId / Australia',
         new DateTime(2022, 6, 15, 15, 21, 18, 183_000_000, undefined, 'Australia/Eucla')
@@ -478,14 +514,8 @@ describe('#unit BoltProtocolV5x0', () => {
       [
         'DateTimeWithZoneId / Sao Paulo just 1 after turn winter time',
         new DateTime(2019, 2, 18, 1, 0, 0, 183_000_000, undefined, 'America/Sao_Paulo')
-      ],
-      [
-        'DateTimeWithZoneOffset',
-        new DateTime(2022, 6, 14, 15, 21, 18, 183_000_000, 120 * 60)
-      ],
-      ['Point2D', new Point(1, 1, 1)],
-      ['Point3D', new Point(1, 1, 1, 1)]
-    ])('should pack spatial types and temporal types (%s)', (_, object) => {
+      ]
+    ])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {
       const buffer = alloc(256)
       const protocol = new BoltProtocolV5x0(
         new utils.MessageRecordingConnection(),
@@ -502,7 +532,22 @@ describe('#unit BoltProtocolV5x0', () => {
       buffer.reset()
 
       const unpacked = protocol.unpack(buffer)
-      expect(unpacked).toEqual(object)
+
+      expect(unpacked.timeZoneOffsetSeconds).toBeDefined()
+
+      const unpackedDateTimeWithoutOffset = new DateTime(
+        unpacked.year,
+        unpacked.month,
+        unpacked.day,
+        unpacked.hour,
+        unpacked.minute,
+        unpacked.second,
+        unpacked.nanosecond,
+        undefined,
+        unpacked.timeZoneId
+      )
+
+      expect(unpackedDateTimeWithoutOffset).toEqual(object)
     })
   })
 
@@ -774,14 +819,14 @@ describe('#unit BoltProtocolV5x0', () => {
         new structure.Structure(0x69, [
           1655212878, 183_000_000, 'Europe/Berlin'
         ]),
-        new DateTime(2022, 6, 14, 15, 21, 18, 183_000_000, undefined, 'Europe/Berlin')
+        new DateTime(2022, 6, 14, 15, 21, 18, 183_000_000, 2 * 60 * 60, 'Europe/Berlin')
       ],
       [
         'DateTimeWithZoneId / Australia',
         new structure.Structure(0x69, [
           1655212878, 183_000_000, 'Australia/Eucla'
         ]),
-        new DateTime(2022, 6, 14, 22, 6, 18, 183_000_000, undefined, 'Australia/Eucla')
+        new DateTime(2022, 6, 14, 22, 6, 18, 183_000_000, 8 * 60 * 60 + 45 * 60, 'Australia/Eucla')
       ]
     ])('should unpack spatial types and temporal types (%s)', (_, struct, object) => {
       const buffer = alloc(256)