From 79fd697f69253d44e4b3df2b1edd7a73338d12b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sat, 13 Jan 2024 16:16:24 +0100 Subject: [PATCH] fix: ensure convertToDate() convert null date to undefined MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/utils/Utils.ts | 4 ++-- tests/utils/Utils.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index 6f4517be..9d2b92fa 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -77,9 +77,9 @@ export const isValidDate = (date: Date | number | undefined): date is Date | num export const convertToDate = ( value: Date | string | number | undefined | null -): Date | undefined | null => { +): Date | undefined => { if (value == null) { - return value + return undefined } if (isDate(value)) { return value diff --git a/tests/utils/Utils.test.ts b/tests/utils/Utils.test.ts index 0a8a4882..703bfec0 100644 --- a/tests/utils/Utils.test.ts +++ b/tests/utils/Utils.test.ts @@ -80,7 +80,7 @@ await describe('Utils test suite', async () => { await it('Verify convertToDate()', () => { expect(convertToDate(undefined)).toBe(undefined) - expect(convertToDate(null)).toBe(null) + expect(convertToDate(null)).toBe(undefined) expect(() => convertToDate('')).toThrow(new Error("Cannot convert to date: ''")) expect(() => convertToDate('00:70:61')).toThrow(new Error("Cannot convert to date: '00:70:61'")) expect(convertToDate(0)).toStrictEqual(new Date('1970-01-01T00:00:00.000Z')) -- 2.34.1