🎨 Organize functions

Author: NatoBoram

src/env.ts

@@ -16,6 +16,24 @@ export function envBool(key: string, fallback?: boolean): boolean {
 	return toBool(key, value)
 }
 
+/**
+ * Obtains an environment variable as a Date.
+ *
+ * @example
+ *
+ * export const START_DATE = envDate("START_DATE")
+ */
+export function envDate(key: string, fallback?: Date): Date {
+	const str = process.env[key]?.trim() || fallback?.toISOString().trim()
+	if (str === undefined) throw new Error(`$${key} is missing`)
+
+	const date = new Date(str)
+	if (isNaN(date.getTime()))
+		throw new Error(`$${key} is not a valid Date: ${str}`)
+
+	return date
+}
+
 /**
  * Obtains an environment variable as a floating-point number.
  *
@@ -112,35 +130,35 @@ export function envUuid(key: string, fallback?: UUID): UUID {
 }
 
 /**
- * Obtains an environment variable as a Date.
+ * Obtains an optional environment variable as a boolean.
  *
  * @example
  *
- * export const START_DATE = envDate("START_DATE")
+ * export const CI = maybeEnvBool("CI")
  */
-export function envDate(key: string, fallback?: Date): Date {
-	const str = process.env[key]?.trim() || fallback?.toISOString().trim()
-	if (str === undefined) throw new Error(`$${key} is missing`)
-
-	const date = new Date(str)
-	if (isNaN(date.getTime()))
-		throw new Error(`$${key} is not a valid Date: ${str}`)
+export function maybeEnvBool(key: string): boolean | undefined {
+	const str = process.env[key]?.trim()
+	if (!str) return undefined
 
-	return date
+	return toBool(key, str)
 }
 
 /**
- * Obtains an optional environment variable as a boolean.
+ * Obtains an optional environment variable as a Date.
  *
  * @example
  *
- * export const CI = maybeEnvBool("CI")
+ * export const END_DATE = maybeEnvDate("END_DATE")
  */
-export function maybeEnvBool(key: string): boolean | undefined {
+export function maybeEnvDate(key: string): Date | undefined {
 	const str = process.env[key]?.trim()
 	if (!str) return undefined
 
-	return toBool(key, str)
+	const date = new Date(str)
+	if (isNaN(date.getTime()))
+		throw new Error(`$${key} is not a valid Date: ${str}`)
+
+	return date
 }
 
 /**
@@ -236,21 +254,3 @@ export function maybeEnvUuid(key: string): UUID | undefined {
 	if (!isUuid(str)) throw new Error(`$${key} is not a UUID: ${str}`)
 	return str
 }
-
-/**
- * Obtains an optional environment variable as a Date.
- *
- * @example
- *
- * export const END_DATE = maybeEnvDate("END_DATE")
- */
-export function maybeEnvDate(key: string): Date | undefined {
-	const str = process.env[key]?.trim()
-	if (!str) return undefined
-
-	const date = new Date(str)
-	if (isNaN(date.getTime()))
-		throw new Error(`$${key} is not a valid Date: ${str}`)
-
-	return date
-}

src/load_env.ts

@@ -3,6 +3,11 @@ import { config } from "dotenv"
 import { join } from "path"
 import type { LoadedEnv } from "./loaded_env.ts"
 
+export interface LoadEnvOptions extends Omit<DotenvConfigOptions, "path"> {
+	/** Where to find `.env` files. */
+	readonly path?: string | undefined
+}
+
 /** Loads environment variables from the `.env` files. `NODE_ENV` has to be set
  * in the environment and will not be picked up from the filesystem.
  *
@@ -43,8 +48,3 @@ export function loadEnv(options?: LoadEnvOptions): LoadedEnv {
 function prepend(file: string, path: string | undefined): string {
 	return path ? join(path, file) : file
 }
-
-export interface LoadEnvOptions extends Omit<DotenvConfigOptions, "path"> {
-	/** Where to find `.env` files. */
-	readonly path?: string | undefined
-}