fix(update to ms): update diff from second to millsecond

Author: iamkun

src/constant.js

@@ -4,4 +4,7 @@ export const SECONDS_A_DAY = SECONDS_A_HOUR * 24
 export const SECONDS_A_WEEK = SECONDS_A_DAY * 7
 
 export const MILLISECONDS_A_SECOND = 1000
+export const MILLISECONDS_A_WEEK = SECONDS_A_WEEK * MILLISECONDS_A_SECOND
 export const MILLISECONDS_A_DAY = SECONDS_A_DAY * MILLISECONDS_A_SECOND
+export const MILLISECONDS_A_HOUR = SECONDS_A_HOUR * MILLISECONDS_A_SECOND
+export const MILLISECONDS_A_MINUTE = SECONDS_A_MINUTE * MILLISECONDS_A_SECOND

src/index.js

@@ -127,25 +127,25 @@ class Dayjs {
     switch (string) {
       case 'm':
       case 'minutes':
-        step = Constant.SECONDS_A_MINUTE
+        step = Constant.MILLISECONDS_A_MINUTE
         break
       case 'h':
       case 'hours':
-        step = Constant.SECONDS_A_HOUR
+        step = Constant.MILLISECONDS_A_HOUR
         break
       case 'd':
       case 'days':
-        step = Constant.SECONDS_A_DAY
+        step = Constant.MILLISECONDS_A_DAY
         break
       case 'w':
       case 'weeks':
-        step = Constant.SECONDS_A_WEEK
+        step = Constant.MILLISECONDS_A_WEEK
         break
       default: // s seconds
-        step = 1
+        step = Constant.MILLISECONDS_A_SECOND
     }
-    const nextTimeStamp = this.unix() + (number * step)
-    return new Dayjs(nextTimeStamp * 1000)
+    const nextTimeStamp = this.valueOf() + (number * step)
+    return new Dayjs(nextTimeStamp)
   }
 
   subtract(number, string) {
@@ -195,10 +195,11 @@ class Dayjs {
 
   diff(otherDate, unit, float = false) {
     const other = otherDate instanceof Dayjs ? otherDate : new Dayjs(otherDate)
-    const returnFloat = result => (float ? result : Math.ceil(result))
+    const returnFloat = result => (result > 0 ? Math.floor(result) : Math.ceil(result))
+    const isReturnFloat = result => (float ? result : returnFloat(result))
     switch (unit) {
       case 'days':
-        return returnFloat((this.valueOf() - other.valueOf()) / Constant.MILLISECONDS_A_DAY)
+        return isReturnFloat((this.valueOf() - other.valueOf()) / Constant.MILLISECONDS_A_DAY)
       default:
         return this.valueOf() - other.valueOf()
     }

test/display.test.js

@@ -79,13 +79,16 @@ describe('Difference', () => {
   })
 
   it('diff -> in day', () => {
-    const dateString = '2018-04-21'
     const dayjsA = dayjs()
-    const dayjsB = new Date(dateString)
+    const dayjsB = dayjs().add(100, 'days')
+    const dayjsC = dayjs().subtract(100, 'days')
     const momentA = moment()
-    const momentB = new Date(dateString)
+    const momentB = moment().add(100, 'days')
+    const momentC = moment().subtract(100, 'days')
     expect(dayjsA.diff(dayjsB, 'days')).toBe(momentA.diff(momentB, 'days'))
     expect(dayjsA.diff(dayjsB, 'days', true)).toBe(momentA.diff(momentB, 'days', true))
+    expect(dayjsA.diff(dayjsC, 'days')).toBe(momentA.diff(momentC, 'days'))
+    expect(dayjsA.diff(dayjsC, 'days', true)).toBe(momentA.diff(momentC, 'days', true))
   })
 })