fix: dayjs(null) throws error, not return dayjs object as invalid date (

#2334) Co-authored-by: iamkun <[email protected]>
iamkun · Jun 22, 2023 · c79e2f5 · c79e2f5
1 parent 24e3038
commit c79e2f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/plugin/objectSupport/index.js b/src/plugin/objectSupport/index.js
@@ -1,7 +1,7 @@
 export default (o, c, dayjs) => {
   const proto = c.prototype
-  const isObject = obj => !(obj instanceof Date) && !(obj instanceof Array)
-        && !proto.$utils().u(obj) && obj !== null && (obj.constructor.name === 'Object')
+  const isObject = obj => obj !== null && !(obj instanceof Date) && !(obj instanceof Array)
+        && !proto.$utils().u(obj) && (obj.constructor.name === 'Object')
   const prettyUnit = (u) => {
     const unit = proto.$utils().p(u)
     return unit === 'date' ? 'day' : unit

diff --git a/test/plugin/objectSupport.test.js b/test/plugin/objectSupport.test.js
@@ -140,6 +140,12 @@ it('Constructor from Object UTC', () => {
     expect(moment.utc(tests[i][0]).format(fmt)).toBe(result)
   }
 })
+
+it('Constructor from null should return Invalid Date', () => {
+  expect(dayjs(null).isValid()).toBe(false)
+  expect(moment(null).isValid()).toBe(false)
+})
+
 it('Set from Object', () => {
   for (let i = 0; i < tests.length; i += 1) {
     expect(dayjs(now).set(tests[i][0]).format(fmt)).toBe(moment(now).set(tests[i][0]).format(fmt))