Merge pull request #16 from zolplay-cn/cali

fix(utils): add nullish value for parseDateTime
zolplay-cn · Oct 24, 2022 · 685a148 · 685a148
2 parents fb546d3 + 2670013
commit 685a148
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @zolplay/react
 
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @zolplay/utils@1.3.3
+
 ## 0.2.3
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zolplay/react",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.mjs",

diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @zolplay/utils
 
+## 1.3.3
+
+### Patch Changes
+
+- fix(utils): add nullish value for parseDateTime
+
 ## 1.3.2
 
 ### Patch Changes

diff --git a/packages/utils/__test__/datetime.test.ts b/packages/utils/__test__/datetime.test.ts
@@ -28,5 +28,13 @@ describe('datetime utils', () => {
 
       expect(parsed?.toISOString()).toBe('2023-01-01T00:00:00.000Z')
     })
+
+    test('should handle nullish values', () => {
+      expect(parseDateTime(null)).toBe(null)
+      expect(parseDateTime({ date: null })).toBe(null)
+      expect(parseDateTime(undefined)).toBe(null)
+      expect(parseDateTime({ date: undefined })).toBe(null)
+      expect(parseDateTime()).toBe(null)
+    })
   })
 })
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zolplay/utils",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.mjs",

diff --git a/packages/utils/src/datetime.ts b/packages/utils/src/datetime.ts
@@ -4,6 +4,8 @@ import relativeTime from 'dayjs/plugin/relativeTime'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'
 
+import type { Nullish } from '.'
+
 export type DateTime = Dayjs
 export type DateTimeProps = {
   date: DateTime | null | undefined
@@ -41,8 +43,12 @@ type ParseOptions = {
  * @ref https://day.js.org/docs/en/parse/utc
  */
 export const parseDateTime = (
-  options: string | ParseOptions
+  options?: Nullish<string> | Nullish<ParseOptions>
 ): DateTime | null => {
+  if (!options) {
+    return null
+  }
+
   // take either a string or an object
   const { date, timezone = null } =
     typeof options === 'string' ? { date: options } : options