Remove moment dependency to reduce bundle sizes

package.json

@@ -51,14 +51,13 @@
   },
   "dependencies": {
     "astronomia": "^1.3.5",
-    "caldate": "^1.0.0",
     "date-chinese": "^1.0.2",
     "date-easter": "^0.2.2",
+    "date-fns": "^1.29.0",
     "lodash.get": "^4.4.2",
     "lodash.merge": "^4.6.0",
     "lodash.omit": "^4.5.0",
-    "lodash.set": "^4.3.2",
-    "moment-timezone": "^0.5.13"
+    "lodash.set": "^4.3.2"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

src/CalEvent.js

@@ -1,25 +1,37 @@
 'use strict'
 
-const {isDate} = require('./internal/utils')
-const CalDate = require('caldate')
+const {isDate, toTimezone} = require('./internal/utils')
+const addDays = require('date-fns/add_days')
+const addHours = require('date-fns/add_hours')
+const compareAsc = require('date-fns/compare_asc')
+const format = require('date-fns/format')
+const isSameDay = require('date-fns/is_same_day')
+const setYear = require('date-fns/set_year')
+const startOfDay = require('date-fns/start_of_day')
 
 class CalEvent {
   constructor (opts) {
     opts = opts || {}
     this.substitute = opts.substitute
     this.opts = opts
-    this.offset = opts.offset
+    this.offset = opts.offset || 0
     this.dates = []
     if (isDate(opts)) {
-      this.opts = new CalDate(opts)
+      this.opts = new Date(opts)
     }
   }
 
   inYear (year) {
-    const d = (new CalDate(this.opts)).setOffset(this.offset)
-    if (!(d.year && d.year !== year)) {
-      d.year = year
-      this.dates.push(d)
+    let d
+    if (this.opts instanceof Date) {
+      d = toTimezone(this.opts)
+    } else {
+      d = new Date(this.opts.year || year, this.opts.month - 1, this.opts.day)
+    }
+
+    if (!(d.getFullYear() && d.getFullYear() !== year)) {
+      d = setYear(d, year)
+      this.dates.push(addDays(d, this.offset))
     }
     return this
   }
@@ -32,7 +44,7 @@ class CalEvent {
     let res = false
     for (const thisDate of this.dates) {
       for (const date of calEvent.dates) {
-        res |= thisDate.isEqualDate(date)
+        res |= isSameDay(thisDate, date)
       }
     }
     return !!res
@@ -46,20 +58,22 @@ class CalEvent {
   filter (year, active) {
     function isActive (date) {
       if (!active) {
-        if (date.year === year) {
+        if (date.getFullYear() === year) {
           return true
         } else {
           return false
         }
       }
-      const _date = date.toDate()
+
       for (let a of active) {
         const {from, to} = a
+        const fromBeforeOrEqualToDate = (compareAsc(from, date) !== 1)
+        const toAfterDate = (compareAsc(to, date) === 1)
         if (
-          date.year === year &&
-          ((from && to && from <= _date && to > _date) ||
-          (from && !to && from <= _date) ||
-          (!from && to && to > _date))
+          date.getFullYear() === year &&
+          ((from && to && fromBeforeOrEqualToDate && toAfterDate) ||
+          (from && !to && fromBeforeOrEqualToDate) ||
+          (!from && to && toAfterDate))
         ) {
           return true
         }
@@ -83,10 +97,17 @@ class CalEvent {
 
   get (timezone) {
     const arr = this.dates.map((date) => {
+      let endDate
+      if (date.duration) {
+        endDate = addHours(date, date.duration)
+      } else {
+        endDate = startOfDay(addDays(date, 1))
+      }
+
       const o = {
-        date: date.toString(),
-        start: date.toTimezone(timezone),
-        end: date.toEndDate().toTimezone(timezone)
+        date: format(date, 'YYYY-MM-DD HH:mm:ss'),
+        start: toTimezone(date, timezone),
+        end: toTimezone(endDate, timezone)
       }
       this._addSubstitute(date, o)
       return o

src/CalEventMap.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const CalEvent = require('./CalEvent')
-const CalDate = require('caldate')
+const addDays = require('date-fns/add_days')
 
 /**
  * Mapper class for mapped calenders like hijri and hebrew
@@ -29,13 +29,12 @@ class CalEventMap extends CalEvent {
             break
           }
         }
-        const d = (new CalDate({
-          year: y,
-          month: firstDays[i] + 1,
-          day: firstDays[i + 1]
-        })).setOffset(this.opts.day - 1)
+        const d = addDays(
+          new Date(y, firstDays[i], (firstDays[i + 1])),
+          this.opts.day - 1
+        )
 
-        if (d.year === year) {
+        if (d.getFullYear() === year) {
           this.dates.push(d)
         }
       }

src/Chinese.js

@@ -2,7 +2,7 @@
 
 const CalChinese = require('date-chinese')
 const CalEvent = require('./CalEvent')
-const CalDate = require('caldate')
+const addDays = require('date-fns/add_days')
 
 class Chinese extends CalEvent {
   /**
@@ -32,12 +32,12 @@ class Chinese extends CalEvent {
     if (opts.solarterm) {
       jde = this.cal.solarTerm(opts.solarterm, year)
       date = this.cal.fromJDE(jde).toGregorian()
-      d = new CalDate(date).setOffset(opts.day - 1)
+      d = addDays(new Date(date.year, date.month - 1, date.day), opts.day - 1)
     } else {
       this.cal.set(opts.cycle, opts.year, opts.month, opts.leapMonth, opts.day)
       jde = this.cal.toJDE(year)
       date = this.cal.fromJDE(jde).toGregorian()
-      d = new CalDate(date)
+      d = new Date(date.year, date.month - 1, date.day)
     }
 
     this.dates.push(d)

src/Easter.js

@@ -2,7 +2,8 @@
 
 const easter = require('date-easter')
 const CalEvent = require('./CalEvent')
-const CalDate = require('caldate')
+const addDays = require('date-fns/add_days')
+const addMinutes = require('date-fns/add_minutes')
 
 class Easter extends CalEvent {
   /**
@@ -21,7 +22,8 @@ class Easter extends CalEvent {
   }
 
   inYear (year) {
-    const d = (new CalDate(this._fn(year))).setOffset(this.offset)
+    let d = addDays(new Date(this._fn(year)), this.offset)
+    d = addMinutes(d, new Date().getTimezoneOffset())
     this.dates.push(d)
     return this
   }

src/Equinox.js

@@ -5,9 +5,11 @@ const julian = require('astronomia/lib/julian')
 const planetpos = require('astronomia/lib/planetposition')
 const earth = new planetpos.Planet(require('astronomia/data/vsop87Bearth'))
 
-const moment = require('moment-timezone')
+const {toTimezone} = require('./internal/utils')
 const CalEvent = require('./CalEvent')
-const CalDate = require('caldate')
+
+const addDays = require('date-fns/add_days')
+const startOfDay = require('date-fns/start_of_day')
 
 class Equinox extends CalEvent {
   /**
@@ -45,20 +47,9 @@ class Equinox extends CalEvent {
     }
 
     const str = new julian.Calendar().fromJDE(jde).toDate().toISOString()
-    let date
-    if (/^[+-]\d{2}:\d{2}?$/.test(this._timezone)) { // for '+08:00' formats
-      date = moment(str).utcOffset(this._timezone)
-    } else { // for 'Asia/Shanghai' formats
-      date = moment(str).tz(this._timezone) // move to timezone
-    }
-
-    const floorDate = {
-      year: year,
-      month: date.month() + 1,
-      day: date.date()
-    }
+    const date = toTimezone(new Date(str), this._timezone) // move to timezone
 
-    const d = new CalDate(floorDate).setOffset(this.offset)
+    const d = addDays(startOfDay(date), this.offset)
     this.dates.push(d)
     return this
   }

src/Hebrew.js

@@ -2,6 +2,11 @@
 
 const CalEventMap = require('./CalEventMap')
 const calendar = require('./internal/hebrew-calendar')
+const {toTimezone} = require('./internal/utils')
+
+const addDays = require('date-fns/add_days')
+const addHours = require('date-fns/add_hours')
+const format = require('date-fns/format')
 
 class Hebrew extends CalEventMap {
   constructor (opts) {
@@ -11,10 +16,11 @@ class Hebrew extends CalEventMap {
 
   get (timezone) {
     const arr = this.dates.map((date) => {
+      const _date = addHours(date, -6)
       const o = {
-        date: date.toString() + ' -0600',
-        start: date.setOffset(-6, 'h').toTimezone(timezone),
-        end: date.toEndDate().toTimezone(timezone)
+        date: format(date, 'YYYY-MM-DD HH:mm:ss -0600'),
+        start: toTimezone(_date, timezone),
+        end: toTimezone(addDays(_date, 1), timezone)
       }
       this._addSubstitute(date, o)
       return o

src/Hijri.js

@@ -2,6 +2,11 @@
 
 const CalEventMap = require('./CalEventMap')
 const calendar = require('./internal/hijri-calendar')
+const {toTimezone} = require('./internal/utils')
+
+const addDays = require('date-fns/add_days')
+const addHours = require('date-fns/add_hours')
+const format = require('date-fns/format')
 
 class Hijri extends CalEventMap {
   constructor (opts) {
@@ -11,10 +16,11 @@ class Hijri extends CalEventMap {
 
   get (timezone) {
     const arr = this.dates.map((date) => {
+      const _date = addHours(date, -6)
       const o = {
-        date: date.toString() + ' -0600',
-        start: date.setOffset(-6, 'h').toTimezone(timezone),
-        end: date.toEndDate().toTimezone(timezone)
+        date: format(date, 'YYYY-MM-DD HH:mm:ss -0600'),
+        start: toTimezone(_date, timezone),
+        end: toTimezone(addDays(_date, 1), timezone)
       }
       this._addSubstitute(date, o)
       return o

src/Julian.js

@@ -2,15 +2,15 @@
 
 const julian = require('astronomia/lib/julian')
 const CalEvent = require('./CalEvent')
-const CalDate = require('caldate')
+const addDays = require('date-fns/add_days')
 
 class Julian extends CalEvent {
   inYear (year) {
     if (this.opts.year && this.opts.year !== year) {
       return this
     }
     const cal = new julian.CalendarJulian(year, this.opts.month, this.opts.day).toGregorian()
-    const d = (new CalDate(cal)).setOffset(this.offset)
+    const d = addDays(new Date(cal.year, cal.month - 1, cal.day), this.offset)
     this.dates.push(d)
     return this
   }