diff --git a/src/PKPass.ts b/src/PKPass.ts index 891e5c5..abfec4e 100644 --- a/src/PKPass.ts +++ b/src/PKPass.ts @@ -3,10 +3,9 @@ import { default as Bundle, filesSymbol } from "./Bundle"; import { getModelFolderContents } from "./parser"; import * as Schemas from "./schemas"; import { Stream } from "stream"; -import { processDate } from "./processDate"; import * as Signature from "./Signature"; import * as Strings from "./StringsUtils"; -import { isValidRGB } from "./utils"; +import { isValidRGB, processDate } from "./utils"; /** Exporting for tests specs */ export const propsSymbol = Symbol("props"); diff --git a/src/processDate.ts b/src/processDate.ts deleted file mode 100644 index 6000436..0000000 --- a/src/processDate.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { dateToW3CString } from "./utils"; -import formatMessage, { ERROR, DEBUG } from "./messages"; - -export function processDate(key: string, date: Date): string | null { - if (!(date instanceof Date)) { - return null; - } - - const dateParse = dateToW3CString(date); - - if (!dateParse) { - console.warn(formatMessage(DEBUG.DATE_FORMAT_UNMATCH, key)); - return null; - } - - return dateParse; -} diff --git a/src/utils.ts b/src/utils.ts index cb1a1bc..38406eb 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -26,6 +26,21 @@ export function isValidRGB(value?: string): boolean { return rgb.slice(1, 4).every((v) => Math.abs(Number(v)) <= 255); } +export function processDate(key: string, date: Date): string | null { + if (!(date instanceof Date)) { + return null; + } + + const dateParse = dateToW3CString(date); + + if (!dateParse) { + console.warn(formatMessage(DEBUG.DATE_FORMAT_UNMATCH, key)); + return null; + } + + return dateParse; +} + /** * Converts a date to W3C Standard format * @@ -35,7 +50,7 @@ export function isValidRGB(value?: string): boolean { * undefined otherwise */ -export function dateToW3CString(date: Date) { +function dateToW3CString(date: Date) { if (!(date instanceof Date)) { return ""; }