fix: Return null in toJSON if not valid (#633)

* fix: toJSON returns null if not valid * fix: typo in locale * fix: adding test on toJSON
splashwizard · Jul 16, 2019 · 19affc8 · 19affc8
1 parent fef135e
commit 19affc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -374,7 +374,7 @@ class Dayjs {
   }
 
   toJSON() {
-    return this.toISOString()
+    return this.isValid() ? this.toISOString() : null
   }
 
   toISOString() {

diff --git a/src/locale/pt-br.js b/src/locale/pt-br.js
@@ -3,7 +3,7 @@ import dayjs from 'dayjs'
 const locale = {
   name: 'pt-br',
   weekdays: 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-  weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+  weekdaysMin: 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
   weekStart: 1,
   months: 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
   ordinal: n => `${n}º`,

diff --git a/test/display.test.js b/test/display.test.js
@@ -248,6 +248,8 @@ it('As Javascript Date -> toDate', () => {
 
 it('As JSON -> toJSON', () => {
   expect(dayjs().toJSON()).toBe(moment().toJSON())
+  expect(dayjs('otherString').toJSON()).toBe(moment('otherString').toJSON())
+  expect(dayjs('otherString').toJSON()).toBe(null)
 })
 
 it('As ISO 8601 String -> toISOString e.g. 2013-02-04T22:44:30.652Z', () => {