fix: support timezoneOffset for date from scope, #401

docs/themes/navy/layout/partial/all-contributors.swig

@@ -47,6 +47,7 @@
     <td align="center"><a href="https://digitalinspiration.com/"><img src="https://avatars.githubusercontent.com/u/1344071?v=4?s=100" width="100px;" alt=""/></a></td>
     <td align="center"><a href="https://n1ru4l.cloud/"><img src="https://avatars.githubusercontent.com/u/14338007?v=4?s=100" width="100px;" alt=""/></a></td>
     <td align="center"><a href="https://github.com/mattvague"><img src="https://avatars.githubusercontent.com/u/64985?v=4?s=100" width="100px;" alt=""/></a></td>
+    <td align="center"><a href="https://github.com/bglw"><img src="https://avatars.githubusercontent.com/u/40188355?v=4?s=100" width="100px;" alt=""/></a></td>
   </tr>
 </table>
 

src/builtin/filters/date.ts

@@ -1,8 +1,10 @@
-import strftime, { createDateFixedToTimezone } from '../../util/strftime'
+import strftime from '../../util/strftime'
 import { isString, isNumber } from '../../util/underscore'
 import { FilterImpl } from '../../template/filter/filter-impl'
+import { TimezoneDate } from '../../util/timezone-date'
 
 export function date (this: FilterImpl, v: string | Date, arg: string) {
+  const opts = this.context.opts
   let date: Date
   if (v === 'now' || v === 'today') {
     date = new Date()
@@ -11,15 +13,19 @@ export function date (this: FilterImpl, v: string | Date, arg: string) {
   } else if (isString(v)) {
     if (/^\d+$/.test(v)) {
       date = new Date(+v * 1000)
-    } else if (this.context.opts.preserveTimezones) {
+    } else if (opts.preserveTimezones) {
-      date = createDateFixedToTimezone(v)
+      date = TimezoneDate.createDateFixedToTimezone(v)
     } else {
       date = new Date(v)
     }
   } else {
     date = v
   }
-  return isValidDate(date) ? strftime(date, arg) : v
+  if (!isValidDate(date)) return v
+  if (opts.hasOwnProperty('timezoneOffset')) {
+    date = new TimezoneDate(date, opts.timezoneOffset!)
+  }
+  return strftime(date, arg)
 }
 
 function isValidDate (date: any): date is Date {

src/liquid-options.ts

@@ -6,7 +6,6 @@ import { FS } from './fs/fs'
 import * as fs from './fs/node'
 import { defaultOperators, Operators } from './render/operator'
 import { createTrie, Trie } from './util/operator-trie'
-import { timezoneOffset } from './util/strftime'
 
 export interface LiquidOptions {
   /** A directory or an array of directories from where to resolve layout and include templates, and the filename passed to `.renderFile()`. If it's an array, the files are looked up in the order they occur in the array. Defaults to `["."]` */
@@ -123,7 +122,6 @@ export const defaultOptions: NormalizedFullOptions = {
   lenientIf: false,
   globals: {},
   keepOutputType: false,
-  timezoneOffset: timezoneOffset,
   operators: defaultOperators,
   operatorsTrie: createTrie(defaultOperators)
 }

src/util/strftime.ts

@@ -1,7 +1,5 @@
 import { changeCase, padStart, padEnd } from './underscore'
 
-export const timezoneOffset = new Date().getTimezoneOffset()
-const ISO8601_TIMEZONE_PATTERN = /([zZ]|([+-])(\d{2}):(\d{2}))$/
 const rFormat = /%([-_0^#:]+)?(\d+)?([EO])?(.)/
 const monthNames = [
   'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August',
@@ -127,10 +125,10 @@ const formatCodes = {
   y: (d: Date) => d.getFullYear().toString().substring(2, 4),
   Y: (d: Date) => d.getFullYear(),
   z: (d: Date, opts: FormatOptions) => {
-    const nOffset = Math.abs(timezoneOffset)
+    const nOffset = Math.abs(d.getTimezoneOffset())
     const h = Math.floor(nOffset / 60)
     const m = nOffset % 60
-    return (timezoneOffset > 0 ? '-' : '+') +
+    return (d.getTimezoneOffset() > 0 ? '-' : '+') +
       padStart(h, 2, '0') +
       (opts.flags[':'] ? ':' : '') +
       padStart(m, 2, '0')
@@ -169,31 +167,3 @@ function format (d: Date, match: RegExpExecArray) {
   if (flags['-']) padWidth = 0
   return padStart(ret, padWidth, padChar)
 }
-
-/**
- * Create a Date object fixed to it's declared Timezone. Both
- * - 2021-08-06T02:29:00.000Z and
- * - 2021-08-06T02:29:00.000+08:00
- * will always be displayed as
- * - 2021-08-06 02:29:00
- * regardless timezoneOffset in JavaScript realm
- *
- * The implementation hack:
- * Instead of calling `.getMonth()`/`.getUTCMonth()` respect to `preserveTimezones`,
- * we create a different Date to trick strftime, it's both simpler and more performant.
- * Given that a template is expected to be parsed fewer times than rendered.
- */
-export function createDateFixedToTimezone (dateString: string) {
-  const m = dateString.match(ISO8601_TIMEZONE_PATTERN)
-  // representing a UTC datetime
-  if (m && m[1] === 'Z') {
-    return new Date(+new Date(dateString) + timezoneOffset * 60000)
-  }
-  // has a timezone specified
-  if (m && m[2] && m[3] && m[4]) {
-    const [, , sign, hours, minutes] = m
-    const delta = (sign === '+' ? 1 : -1) * (parseInt(hours, 10) * 60 + parseInt(minutes, 10))
-    return new Date(+new Date(dateString) + (timezoneOffset + delta) * 60000)
-  }
-  return new Date(dateString)
-}

src/util/timezone-date.ts

@@ -0,0 +1,53 @@
+// one minute in milliseconds
+const OneMinute = 60000
+const hostTimezoneOffset = new Date().getTimezoneOffset()
+const ISO8601_TIMEZONE_PATTERN = /([zZ]|([+-])(\d{2}):(\d{2}))$/
+
+/**
+ * A date implementation with timezone info, just like Ruby date
+ *
+ * Implementation:
+ * - create a Date offset by it's timezone difference, avoiding overriding a bunch of methods
+ * - rewrite getTimezoneOffset() to trick strftime
+ */
+export class TimezoneDate extends Date {
+  private timezoneOffset?: number
+  constructor (init: string | number | Date, timezoneOffset: number) {
+    if (init instanceof TimezoneDate) return init
+    const diff = (hostTimezoneOffset - timezoneOffset) * OneMinute
+    const time = new Date(init).getTime() + diff
+    super(time)
+    this.timezoneOffset = timezoneOffset
+  }
+  getTimezoneOffset () {
+    return this.timezoneOffset!
+  }
+
+  /**
+   * Create a Date object fixed to it's declared Timezone. Both
+   * - 2021-08-06T02:29:00.000Z and
+   * - 2021-08-06T02:29:00.000+08:00
+   * will always be displayed as
+   * - 2021-08-06 02:29:00
+   * regardless timezoneOffset in JavaScript realm
+   *
+   * The implementation hack:
+   * Instead of calling `.getMonth()`/`.getUTCMonth()` respect to `preserveTimezones`,
+   * we create a different Date to trick strftime, it's both simpler and more performant.
+   * Given that a template is expected to be parsed fewer times than rendered.
+   */
+  static createDateFixedToTimezone (dateString: string) {
+    const m = dateString.match(ISO8601_TIMEZONE_PATTERN)
+    // representing a UTC timestamp
+    if (m && m[1] === 'Z') {
+      return new TimezoneDate(+new Date(dateString), 0)
+    }
+    // has a timezone specified
+    if (m && m[2] && m[3] && m[4]) {
+      const [, , sign, hours, minutes] = m
+      const delta = (sign === '+' ? -1 : 1) * (parseInt(hours, 10) * 60 + parseInt(minutes, 10))
+      return new TimezoneDate(+new Date(dateString), delta)
+    }
+    return new Date(dateString)
+  }
+}

test/e2e/issues.ts

@@ -108,4 +108,10 @@ describe('Issues', function () {
     const html = await engine.parseAndRender(tpl)
     expect(html).to.equal('\r\ntrue\r\n')
   })
+  it('#401 Timezone Offset Issue', async () => {
+    const engine = new Liquid({ timezoneOffset: -600 })
+    const tpl = engine.parse('{{ date | date: "%Y-%m-%d %H:%M %p %z" }}')
+    const html = await engine.render(tpl, { date: '2021-10-06T15:31:00+08:00' })
+    expect(html).to.equal('2021-10-06 17:31 PM +1000')
+  })
 })

test/integration/builtin/filters/date.ts

@@ -54,4 +54,30 @@ describe('filters/date', function () {
       '2017-02-28T12:00:00'
     )
   })
+  describe('timezoneOffset', function () {
+    // -06:00
+    const opts: LiquidOptions = { timezoneOffset: 360 }
+
+    it('should offset UTC date literal', function () {
+      return test('{{ "1990-12-31T23:00:00Z" | date: "%Y-%m-%dT%H:%M:%S"}}', '1990-12-31T17:00:00', undefined, opts)
+    })
+    it('should offset date literal with timezone 00:00 specified', function () {
+      return test('{{ "1990-12-31T23:00:00+00:00" | date: "%Y-%m-%dT%H:%M:%S"}}', '1990-12-31T17:00:00', undefined, opts)
+    })
+    it('should offset date literal with timezone -01:00 specified', function () {
+      return test('{{ "1990-12-31T23:00:00-01:00" | date: "%Y-%m-%dT%H:%M:%S"}}', '1990-12-31T18:00:00', undefined, opts)
+    })
+    it('should offset date from scope', function () {
+      const scope = { date: new Date('1990-12-31T23:00:00Z') }
+      return test('{{ date | date: "%Y-%m-%dT%H:%M:%S"}}', scope, '1990-12-31T17:00:00', opts)
+    })
+    it('should reflect timezoneOffset', function () {
+      const scope = { date: new Date('1990-12-31T23:00:00Z') }
+      return test('{{ date | date: "%z"}}', scope, '-0600', opts)
+    })
+    it('should ignore this setting when `preserveTimezones` also specified', function () {
+      const opts: LiquidOptions = { timezoneOffset: 600, preserveTimezones: true }
+      return test('{{ "1990-12-31T23:00:00+02:30" | date: "%Y-%m-%dT%H:%M:%S"}}', '1990-12-31T23:00:00', undefined, opts)
+    })
+  })
 })

test/stub/date-with-timezone.ts

@@ -0,0 +1,6 @@
+export class DateWithTimezone extends Date {
+  constructor (init: string, timezone: number) {
+    super(init)
+    this.getTimezoneOffset = () => timezone
+  }
+}

test/stub/render.ts

@@ -8,11 +8,11 @@ export function render (src: string, ctx?: object) {
   return liquid.parseAndRender(src, ctx)
 }
 
-export async function test (src: string, ctx: object | string, dst?: string, opts?: LiquidOptions) {
+export async function test (src: string, ctx: object | string, expected?: string, opts?: LiquidOptions) {
-  if (dst === undefined) {
+  if (expected === undefined) {
-    dst = ctx as string
+    expected = ctx as string
     ctx = {}
   }
   const engine = opts ? new Liquid(opts) : liquid
-  return expect(await engine.parseAndRender(src, ctx as object)).to.equal(dst)
+  return expect(await engine.parseAndRender(src, ctx as object)).to.equal(expected)
 }

test/unit/util/strftime.ts

@@ -1,5 +1,6 @@
 import * as chai from 'chai'
-import t, { timezoneOffset } from '../../../src/util/strftime'
+import t from '../../../src/util/strftime'
+import { DateWithTimezone } from '../../stub/date-with-timezone'
 const expect = chai.expect
 
 describe('util/strftime', function () {
@@ -118,18 +119,14 @@ describe('util/strftime', function () {
   })
 
   describe('Time zone', () => {
-    afterEach(() => {
-      (timezoneOffset as any) = (new Date()).getTimezoneOffset()
-    })
     it('should format %z as time zone', function () {
-      const now = new Date('2016-01-04 13:15:23');
+      // suppose we're in +8:00
-
+      const now = new DateWithTimezone('2016-01-04 13:15:23', -480)
-      (timezoneOffset as any) = -480 // suppose we're in +8:00
       expect(t(now, '%z')).to.equal('+0800')
     })
     it('should format %z as negative time zone', function () {
-      const date = new Date('2016-01-04T13:15:23.000Z');
+      // suppose we're in -8:00
-      (timezoneOffset as any) = 480 // suppose we're in -8:00
+      const date = new DateWithTimezone('2016-01-04T13:15:23.000Z', 480)
       expect(t(date, '%z')).to.equal('-0800')
     })
   })
@@ -210,8 +207,8 @@ describe('util/strftime', function () {
       expect(t(now, '%#P')).to.equal('PM')
     })
     it('should support : flag', () => {
-      const date = new Date('2016-01-04T13:15:23.000Z');
+      // suppose we're in +8:00
-      (timezoneOffset as any) = -480 // suppose we're in +8:00
+      const date = new DateWithTimezone('2016-01-04T13:15:23.000Z', -480)
       expect(t(date, '%:z')).to.equal('+08:00')
       expect(t(date, '%z')).to.equal('+0800')
     })

test/unit/util/timezon-date.ts

@@ -0,0 +1,16 @@
+import { TimezoneDate } from '../../../src/util/timezone-date'
+import { expect } from 'chai'
+
+describe('TimezoneDate', () => {
+  it('should respect timezone set to 00:00', () => {
+    const date = new TimezoneDate('2021-10-06T14:26:00.000+08:00', 0)
+    expect(date.getTimezoneOffset()).to.equal(0)
+    expect(date.getHours()).to.equal(6)
+    expect(date.getMinutes()).to.equal(26)
+  })
+  it('should respect timezone set to -06:00', () => {
+    const date = new TimezoneDate('2021-10-06T14:26:00.000+08:00', -360)
+    expect(date.getTimezoneOffset()).to.equal(-360)
+    expect(date.getMinutes()).to.equal(26)
+  })
+})