Remove luxon

README.md

@@ -35,8 +35,6 @@ Alternatively, download manually:
 
  * [rrule.min.js](https://jakubroztocil.github.io/rrule/dist/es5/rrule.min.js) (bundled, minified)
  * [rrule.js](https://jakubroztocil.github.io/rrule/dist/es5/rrule.js) (bundled, not minified)
- * [rrule-tz.min.js](https://jakubroztocil.github.io/rrule/dist/es5/rrule-tz.min.js) (with timezone support, bundled, minified)
- * [rrule-tz.js](https://jakubroztocil.github.io/rrule/dist/es5/rrule-tz.js) (with timezone support, bundled, not minified)
 
 ```html
 <script src="rrule/dist/es5/rrule.min.js"></script>
@@ -192,7 +190,7 @@ date.getUTCDate() // --> 1
 date.getUTCHours() // --> 18
 ```
 
-If you want to get the same times in true UTC, you may do so eg. using Luxon:
+If you want to get the same times in true UTC, you may do so eg. using [Luxon](https://moment.github.io/luxon/#/):
 
 ```ts
 rule.all().map(date =>
@@ -215,11 +213,11 @@ For more examples see
 
 ### Timezone Support
 
-Optionally, it also supports use of the `TZID` parameter in the
-[RFC](https://tools.ietf.org/html/rfc5545#section-3.2.19)
-when the [Luxon](https://github.com/moment/luxon) library is provided. The 
-[specification](https://moment.github.io/luxon/docs/manual/zones.html#specifying-a-zone)
-and [support matrix](https://moment.github.io/luxon/docs/manual/matrix.html) for Luxon apply.
+Rrule also supports use of the `TZID` parameter in the
+[RFC](https://tools.ietf.org/html/rfc5545#section-3.2.19) using the
+[Intl API](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl).
+Support matrix for the Intl API applies. If you need to support additional environments,
+please consider using a [polyfill](https://formatjs.io/docs/polyfills/).
 
 Example with `TZID`:
 
@@ -336,8 +334,7 @@ iCalendar RFC. Only `freq` is required.
     </tr>
     <tr>
       <td><code>tzid</code></td>
-      <td>If given, this must be a string <a href="https://moment.github.io/luxon/docs/manual/zones.html#specifying-a-zone">supported</a>
-      by Luxon, and the <a href="https://moment.github.io/luxon/">Luxon</a> library must be provided. See
+      <td>If given, this must be a IANA string recognized by the Intl API. See
       discussion under <a href="#timezone-support">Timezone support</a>.
       </td>
     </tr>

package.json

@@ -47,7 +47,6 @@
     "@types/assert": "^1.4.3",
     "@types/chai": "^4.2.7",
     "@types/jquery": "^3.3.29",
-    "@types/luxon": "^1.21.0",
     "@types/mocha": "^5.2.5",
     "@types/mockdate": "^2.0.0",
     "@types/node": "^12.12.18",
@@ -80,9 +79,6 @@
     "dist",
     "README.md"
   ],
-  "optionalDependencies": {
-    "luxon": "^1.21.3"
-  },
   "peerDependencies": {},
   "dependencies": {
     "tslib": "^1.10.0"

src/datewithzone.ts

@@ -1,5 +1,4 @@
 import dateutil from './dateutil'
-import { DateTime } from 'luxon'
 
 export class DateWithZone {
   public date: Date
@@ -32,18 +31,11 @@ export class DateWithZone {
       return this.date
     }
 
-    try {
-      const datetime = DateTime
-        .fromJSDate(this.date)
+    const localTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+    const dateInLocalTZ = new Date(this.date.toLocaleString(undefined, { timeZone: localTimeZone }))
+    const dateInTargetTZ = new Date(this.date.toLocaleString(undefined, { timeZone: this.tzid ?? 'UTC' }))
+    const tzOffset = dateInTargetTZ.getTime() - dateInLocalTZ.getTime()
 
-      const rezoned = datetime.setZone(this.tzid!, { keepLocalTime: true })
-
-      return rezoned.toJSDate()
-    } catch (e) {
-      if (e instanceof TypeError) {
-        console.error('Using TZID without Luxon available is unsupported. Returned times are in UTC, not the requested time zone')
-      }
-      return this.date
-    }
+    return new Date(this.date.getTime() - tzOffset)
   }
 }

test/datewithzone.test.ts

@@ -1,6 +1,5 @@
 import { DateWithZone } from "../src/datewithzone";
 import { expect } from "chai";
-import { DateTime } from "luxon";
 import { set as setMockDate, reset as resetMockDate } from 'mockdate'
 import { expectedDate } from "./lib/utils";
 
@@ -34,33 +33,15 @@ describe('rezonedDate', () => {
 
   it('returns the date in the correct zone when given', () => {
     const targetZone = 'America/New_York'
-    const currentLocalDate = DateTime.local(2000, 2, 6, 1, 0, 0)
-    setMockDate(currentLocalDate.toJSDate())
+    const currentLocalDate = new Date(2000, 1, 6, 1, 0, 0)
+    setMockDate(currentLocalDate)
 
-    const d = DateTime.fromISO('20101005T110000').toJSDate()
+    const d = new Date(Date.parse('20101005T110000'))
     const dt = new DateWithZone(d, targetZone)
     expect(dt.rezonedDate()).to.deep.equal(
-      expectedDate(DateTime.fromISO('20101005T110000'), currentLocalDate, targetZone)
+      expectedDate(new Date(Date.parse('20101005T110000')), currentLocalDate, targetZone)
     )
 
     resetMockDate()
   })
-
-  it('recovers from an error if Luxon is missing', () => {
-    const origfromJSDate = DateTime.fromJSDate
-    DateTime.fromJSDate = () => {
-      throw new TypeError()
-    }
-
-    const targetZone = 'America/New_York'
-    const currentLocalDate = DateTime.local(2000, 2, 6, 1, 0, 0)
-    setMockDate(currentLocalDate.toJSDate())
-
-    const d = DateTime.fromISO('20101005T110000').toJSDate()
-    const dt = new DateWithZone(d, targetZone)
-    expect(dt.rezonedDate()).to.deep.equal(d)
-
-    DateTime.fromJSDate = origfromJSDate
-    resetMockDate()
-  })
 })

test/lib/utils.ts

@@ -1,7 +1,6 @@
 import { expect } from 'chai'
 import { ExclusiveTestFunction, TestFunction } from 'mocha'
 import { RRule, RRuleSet } from '../../src'
-import { DateTime } from 'luxon';
 
 const assertDatesEqual = function (actual: Date | Date[], expected: Date | Date[], msg?: string) {
   msg = msg ? ' [' + msg + '] ' : ''
@@ -195,15 +194,13 @@ testRecurring.skip = function () {
   it.skip.apply(it, arguments)
 }
 
-export function expectedDate(startDate: DateTime, currentLocalDate: DateTime, targetZone: string): Date {
-  const targetOffset = startDate.setZone(targetZone).offset
-  const { zoneName: systemZone } = currentLocalDate
-  const {
-    offset: systemOffset,
-  } = startDate.setZone(systemZone)
-
-  const netOffset = targetOffset - systemOffset
-  const hours = -((netOffset / 60) % 24)
-  const minutes = -(netOffset % 60)
-  return startDate.plus({ hours, minutes }).toJSDate()
+export function expectedDate(startDate: Date, currentLocalDate: Date, targetZone: string): Date {
+  // get the tzoffset between the client tz and the target tz
+  const localTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  const dateInLocalTZ = new Date(startDate.toLocaleString(undefined, { timeZone: localTimeZone }))
+  const dateInTargetTZ = new Date(startDate.toLocaleString(undefined, { timeZone: targetZone }))
+  const tzOffset = dateInTargetTZ.getTime() - dateInLocalTZ.getTime()
+
+  return new Date(startDate.getTime() - tzOffset)
+  // return new Date(new Date(startDate.getTime() + tzOffset).toLocaleDateString(undefined, { timeZone: localTimeZone }))
 }

test/nlp.test.ts

@@ -1,5 +1,4 @@
 import { expect } from 'chai'
-import { DateTime } from 'luxon'
 import RRule from '../src';
 import { optionsToString } from '../src/optionstostring';
 import {DateFormatter} from '../src/nlp/totext'
@@ -94,7 +93,7 @@ describe('NLP', () => {
   it('by default formats \'until\' correctly', () => {
     const rrule = new RRule({
       freq: RRule.WEEKLY,
-      until: DateTime.utc(2012, 11, 10).toJSDate()
+      until: new Date(Date.UTC(2012, 10, 10))
     })
 
     expect(rrule.toText()).to.equal('every week until November 10, 2012')
@@ -103,7 +102,7 @@ describe('NLP', () => {
   it('formats \'until\' as desired if asked', () => {
     const rrule = new RRule({
       freq: RRule.WEEKLY,
-      until: DateTime.utc(2012, 11, 10).toJSDate()
+      until: new Date(Date.UTC(2012, 10, 10))
     })
 
     const dateFormatter: DateFormatter = (year, month, day) => `${day}. ${month}, ${year}`

test/rrule.test.ts

@@ -1,9 +1,7 @@
 import { parse, datetime, testRecurring, expectedDate } from './lib/utils'
 import { expect } from 'chai'
 import { RRule, rrulestr, Frequency } from '../src/index'
-import { DateTime } from 'luxon'
 import { set as setMockDate, reset as resetMockDate } from 'mockdate'
-import { optionsToString } from '../src/optionstostring';
 
 describe('RRule', function () {
   // Enable additional toString() / fromString() tests
@@ -3482,7 +3480,7 @@ describe('RRule', function () {
   )
 
   it('testAfterBefore', function () {
-    'YEARLY,MONTHLY,DAILY,HOURLY,MINUTELY,SECONDLY'.split(',').forEach(function (freqStr: keyof typeof Frequency) {
+    (['YEARLY','MONTHLY','DAILY','HOURLY','MINUTELY','SECONDLY'] as const).forEach(function (freqStr: keyof typeof Frequency) {
       const date = new Date(1356991200001)
       const rr = new RRule({
         freq: RRule[freqStr],
@@ -3649,14 +3647,14 @@ describe('RRule', function () {
     ])
   })
 
-  describe('time zones', () => {
+  describe('time zones, when recurrence is in dst', () => {
     const targetZone = 'America/Los_Angeles'
-    const startDate = DateTime.utc(2013, 8, 6, 11, 0, 0)
-    const dtstart = startDate.toJSDate()
+    const startDate = new Date(Date.UTC(2013, 7, 6, 11, 0, 0))
+    const dtstart = startDate
 
-    it('generates correct recurrences when recurrence is in dst and current time is standard time', () => {
-      const currentLocalDate = DateTime.local(2013, 2, 6, 11, 0, 0)
-      setMockDate(currentLocalDate.toJSDate())
+    it('generates correct recurrences when current time is standard time', () => {
+      const currentLocalDate = new Date(2013, 1, 6, 11, 0, 0)
+      setMockDate(currentLocalDate)
 
       const rule = new RRule({
         dtstart,
@@ -3674,9 +3672,9 @@ describe('RRule', function () {
       resetMockDate()
     })
 
-    it('generates correct recurrences when recurrence is in dst and current time is dst', () => {
-      const currentLocalDate = DateTime.local(2013, 8, 6, 11, 0, 0)
-      setMockDate(currentLocalDate.toJSDate())
+    it('generates correct recurrences when current time is dst', () => {
+      const currentLocalDate = new Date(2013, 7, 6, 11, 0, 0)
+      setMockDate(currentLocalDate)
 
       const rule = new RRule({
         dtstart,
@@ -3694,9 +3692,9 @@ describe('RRule', function () {
       resetMockDate()
     })
 
-    it('generates correct recurrences when recurrence is in dst and current time is standard time', () => {
-      const currentLocalDate = DateTime.local(2013, 2, 6, 11, 0, 0)
-      setMockDate(currentLocalDate.toJSDate())
+    it('generates correct recurrences using after and current time is standard time', () => {
+      const currentLocalDate = new Date(2013, 1, 6, 11, 0, 0)
+      setMockDate(currentLocalDate)
 
       const rule = new RRule({
         dtstart,