Преглед изворни кода

adjust exports of moment and luxon plugins

Adam Shaw пре 5 година
родитељ
комит
30100ccc48

+ 13 - 13
packages/__tests__/src/datelib/luxon.js

@@ -1,6 +1,6 @@
 import { Calendar } from '@fullcalendar/core'
 import esLocale from '@fullcalendar/core/locales/es'
-import LuxonPlugin, { toDateTime, toDuration } from '@fullcalendar/luxon'
+import LuxonPlugin, { toLuxonDateTime, toLuxonDuration } from '@fullcalendar/luxon'
 import DayGridPlugin from '@fullcalendar/daygrid'
 import { testTimeZoneImpl } from '../lib/timeZoneImpl'
 import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
@@ -16,7 +16,7 @@ describe('luxon plugin', function() {
 
   testTimeZoneImpl(LuxonPlugin)
 
-  describe('toDateTime', function() {
+  describe('toLuxonDateTime', function() {
 
     describe('timezone transfering', function() {
 
@@ -27,8 +27,8 @@ describe('luxon plugin', function() {
           timeZone: 'UTC'
         })
         let event = calendar.getEvents()[0]
-        var start = toDateTime(event.start, calendar)
-        var end = toDateTime(event.end, calendar)
+        var start = toLuxonDateTime(event.start, calendar)
+        var end = toLuxonDateTime(event.end, calendar)
         expect(start.toISO()).toBe('2018-09-05T12:00:00.000Z')
         expect(start.zoneName).toBe('UTC')
         expect(end.toISO()).toBe('2018-09-05T18:00:00.000Z')
@@ -42,8 +42,8 @@ describe('luxon plugin', function() {
           timeZone: 'local'
         })
         let event = calendar.getEvents()[0]
-        var start = toDateTime(event.start, calendar)
-        var end = toDateTime(event.end, calendar)
+        var start = toLuxonDateTime(event.start, calendar)
+        var end = toLuxonDateTime(event.end, calendar)
         expect(start.toJSDate()).toEqualLocalDate('2018-09-05T12:00:00')
         expect(start.zoneName).toMatch('/') // has a named timezone
         expect(end.toJSDate()).toEqualLocalDate('2018-09-05T18:00:00')
@@ -57,8 +57,8 @@ describe('luxon plugin', function() {
           timeZone: 'Europe/Moscow'
         })
         let event = calendar.getEvents()[0]
-        var start = toDateTime(event.start, calendar)
-        var end = toDateTime(event.end, calendar)
+        var start = toLuxonDateTime(event.start, calendar)
+        var end = toLuxonDateTime(event.end, calendar)
         expect(start.toJSDate()).toEqualDate('2018-09-05T12:00:00+03:00')
         expect(start.zoneName).toMatch('Europe/Moscow')
         expect(end.toJSDate()).toEqualDate('2018-09-05T18:00:00+03:00')
@@ -74,13 +74,13 @@ describe('luxon plugin', function() {
         locale: esLocale
       })
       let event = calendar.getEvents()[0]
-      var datetime = toDateTime(event.start, calendar)
+      var datetime = toLuxonDateTime(event.start, calendar)
       expect(datetime.locale).toEqual('es')
     })
 
   })
 
-  describe('toDuration', function() {
+  describe('toLuxonDuration', function() {
 
     it('converts numeric values correctly', function() {
       let calendar = new Calendar(document.createElement('div'), {
@@ -90,8 +90,8 @@ describe('luxon plugin', function() {
       })
 
       // hacky way to have a duration parsed
-      let timedDuration = toDuration(calendar.defaultTimedEventDuration, calendar)
-      let allDayDuration = toDuration(calendar.defaultAllDayEventDuration, calendar)
+      let timedDuration = toLuxonDuration(calendar.defaultTimedEventDuration, calendar)
+      let allDayDuration = toLuxonDuration(calendar.defaultAllDayEventDuration, calendar)
 
       expect(timedDuration.as('hours')).toBe(5)
       expect(allDayDuration.as('days')).toBe(3)
@@ -105,7 +105,7 @@ describe('luxon plugin', function() {
       })
 
       // hacky way to have a duration parsed
-      let timedDuration = toDuration(calendar.defaultTimedEventDuration, calendar)
+      let timedDuration = toLuxonDuration(calendar.defaultTimedEventDuration, calendar)
 
       expect(timedDuration.locale).toBe('es')
     })

+ 3 - 3
packages/__tests__/src/datelib/moment.js

@@ -1,5 +1,5 @@
 import { Calendar } from '@fullcalendar/core'
-import MomentPlugin, { toMoment, toDuration } from '@fullcalendar/moment'
+import MomentPlugin, { toMoment, toMomentDuration } from '@fullcalendar/moment'
 import DayGridPlugin from '@fullcalendar/daygrid'
 import 'moment/locale/es' // only test spanish
 import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
@@ -65,8 +65,8 @@ describe('moment plugin', function() {
       })
 
       // hacky way to have a duration parsed
-      let timedDuration = toDuration(calendar.defaultTimedEventDuration)
-      let allDayDuration = toDuration(calendar.defaultAllDayEventDuration)
+      let timedDuration = toMomentDuration(calendar.defaultTimedEventDuration)
+      let allDayDuration = toMomentDuration(calendar.defaultAllDayEventDuration)
 
       expect(timedDuration.asHours()).toBe(5)
       expect(allDayDuration.asDays()).toBe(3)

+ 2 - 2
packages/luxon/src/main.ts

@@ -1,7 +1,7 @@
 import { DateTime as LuxonDateTime, Duration as LuxonDuration } from 'luxon'
 import { Calendar, Duration, NamedTimeZoneImpl, VerboseFormattingArg, createPlugin } from '@fullcalendar/core'
 
-export function toDateTime(date: Date, calendar: Calendar): LuxonDateTime {
+export function toLuxonDateTime(date: Date, calendar: Calendar): LuxonDateTime {
 
   if (!(calendar instanceof Calendar)) {
     throw new Error('must supply a Calendar instance')
@@ -13,7 +13,7 @@ export function toDateTime(date: Date, calendar: Calendar): LuxonDateTime {
   })
 }
 
-export function toDuration(duration: Duration, calendar: Calendar): LuxonDuration {
+export function toLuxonDuration(duration: Duration, calendar: Calendar): LuxonDuration {
 
   if (!(calendar instanceof Calendar)) {
     throw new Error('must supply a Calendar instance')

+ 1 - 1
packages/moment/src/main.ts

@@ -16,7 +16,7 @@ export function toMoment(date: Date, calendar: Calendar): moment.Moment {
   )
 }
 
-export function toDuration(fcDuration: Duration): moment.Duration {
+export function toMomentDuration(fcDuration: Duration): moment.Duration {
   return moment.duration(fcDuration) // moment accepts all the props that fc.Duration already has!
 }