From cb17e72f31d8f2188762ed80cbcc5e3672caf12d Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Sat, 24 Feb 2024 22:30:29 +0800
Subject: [PATCH] test: common-utils

---
 .gitignore                                                   | 2 +-
 test/utils/common-utils.js => lib/utils/common-utils.test.ts | 3 ++-
 lib/utils/common-utils.ts                                    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename test/utils/common-utils.js => lib/utils/common-utils.test.ts (95%)

diff --git a/.gitignore b/.gitignore
index c75ce4788..d2abfb301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-.env
+.env*
 .eslintcache
 .idea
 .log
diff --git a/test/utils/common-utils.js b/lib/utils/common-utils.test.ts
similarity index 95%
rename from test/utils/common-utils.js
rename to lib/utils/common-utils.test.ts
index 37c355580..2dd667d68 100644
--- a/test/utils/common-utils.js
+++ b/lib/utils/common-utils.test.ts
@@ -1,4 +1,5 @@
-const utils = require('../../lib/utils/common-utils');
+import { describe, expect, it } from '@jest/globals';
+import utils from './common-utils';
 
 describe('common-utils', () => {
     it('toTitleCase', () => {
diff --git a/lib/utils/common-utils.ts b/lib/utils/common-utils.ts
index 8ef37f1b9..e89ee3fa1 100644
--- a/lib/utils/common-utils.ts
+++ b/lib/utils/common-utils.ts
@@ -8,14 +8,14 @@ const rWhiteSpace = /\s+/;
 const rAllWhiteSpace = /\s+/g;
 
 // collapse all whitespaces into a single space (like "white-space: normal;" would do), and trim
-const collapseWhitespace = (str: string) => {
+const collapseWhitespace = (str?: string | null) => {
     if (str && rWhiteSpace.test(str)) {
         return str.replaceAll(rAllWhiteSpace, ' ').trim();
     }
     return str;
 };
 
-const convertDateToISO8601 = (date: string | Date | number) => {
+const convertDateToISO8601 = (date?: string | Date | number | null) => {
     if (!date) {
         return date;
     }