Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Decouple TimeFormat from @rallly/database in the formatting layer (#2532)

Luke Vellae94a46b0e641
diff --git a/apps/web/src/features/scheduled-event/utils.ts b/apps/web/src/features/scheduled-event/utils.ts
index 8ca60c8a8..afb8fa81e 100644
--- a/apps/web/src/features/scheduled-event/utils.ts
+++ b/apps/web/src/features/scheduled-event/utils.ts
@@ -1,9 +1,9 @@
-import type { TimeFormat } from "@rallly/database";
import {
formatDateParts,
formatDateTime,
formatDateTimeRange,
} from "@/lib/datetime/format";
+import type { TimeFormat } from "@/lib/datetime/schema";
export interface FormattedEventDateTime {
date: string;
diff --git a/apps/web/src/lib/datetime/client.tsx b/apps/web/src/lib/datetime/client.tsx
index 036159bce..e4ad32d1c 100644
--- a/apps/web/src/lib/datetime/client.tsx
+++ b/apps/web/src/lib/datetime/client.tsx
@@ -1,6 +1,5 @@
"use client";
-import type { TimeFormat } from "@rallly/database";
import { defaultLocale } from "@rallly/languages";
import React from "react";
import type { DateInput, DateTimePreset } from "@/lib/datetime/format";
@@ -10,6 +9,7 @@ import {
formatRelativeTime,
} from "@/lib/datetime/format";
import { getLocaleDefaults, getWeekdayNames } from "@/lib/datetime/locales";
+import type { TimeFormat } from "@/lib/datetime/schema";
import { normalizeTimeZone } from "@/lib/datetime/utils";
import { getBrowserTimeZone } from "@/utils/date-time-utils";
diff --git a/apps/web/src/lib/datetime/device.tsx b/apps/web/src/lib/datetime/device.tsx
index e0ae9020c..432565048 100644
--- a/apps/web/src/lib/datetime/device.tsx
+++ b/apps/web/src/lib/datetime/device.tsx
@@ -1,6 +1,5 @@
"use client";
-import type { TimeFormat } from "@rallly/database";
import Cookies from "js-cookie";
import React from "react";
import { DateTimeProvider } from "@/lib/datetime/client";
@@ -9,6 +8,7 @@ import {
TIME_ZONE_COOKIE_NAME,
TIME_ZONE_OVERRIDE_COOKIE_NAME,
} from "@/lib/datetime/constants";
+import type { TimeFormat } from "@/lib/datetime/schema";
const cookieAttributes = {
path: "/",
diff --git a/apps/web/src/lib/datetime/format.test.ts b/apps/web/src/lib/datetime/format.test.ts
index 061f29d06..ac794ec07 100644
--- a/apps/web/src/lib/datetime/format.test.ts
+++ b/apps/web/src/lib/datetime/format.test.ts
@@ -1,4 +1,3 @@
-import type { TimeFormat } from "@rallly/database";
import { describe, expect, it } from "vitest";
import {
formatDate,
@@ -6,6 +5,7 @@ import {
formatDateTimeRange,
formatRelativeTime,
} from "@/lib/datetime/format";
+import type { TimeFormat } from "@/lib/datetime/schema";
// Fri 26 Jun 2026, in UTC.
const at = (hour: number, minute = 0) =>
diff --git a/apps/web/src/lib/datetime/format.ts b/apps/web/src/lib/datetime/format.ts
index 746c20049..91c95606f 100644
--- a/apps/web/src/lib/datetime/format.ts
+++ b/apps/web/src/lib/datetime/format.ts
@@ -1,4 +1,4 @@
-import type { TimeFormat } from "@rallly/database";
+import type { TimeFormat } from "@/lib/datetime/schema";
export type DateInput = Date | string | number;
diff --git a/apps/web/src/lib/datetime/locales.ts b/apps/web/src/lib/datetime/locales.ts
index b14c8aa0a..35bafb753 100644
--- a/apps/web/src/lib/datetime/locales.ts
+++ b/apps/web/src/lib/datetime/locales.ts
@@ -1,4 +1,4 @@
-import type { TimeFormat } from "@rallly/database";
+import type { TimeFormat } from "@/lib/datetime/schema";
type LocaleDefaults = {
weekStart: number;
diff --git a/apps/web/src/lib/datetime/schema.ts b/apps/web/src/lib/datetime/schema.ts
index ec4efcacc..1c327fccd 100644
--- a/apps/web/src/lib/datetime/schema.ts
+++ b/apps/web/src/lib/datetime/schema.ts
@@ -3,6 +3,10 @@ import { normalizeTimeZone } from "./utils";
export const timeFormatSchema = z.enum(["hours12", "hours24"]);
+// The formatting layer's own TimeFormat; same literals as the Prisma enum so
+// user records assign directly, without coupling this layer to the database.
+export type TimeFormat = z.infer<typeof timeFormatSchema>;
+
export const timeZoneSchema = z
.string()
.refine((value) => normalizeTimeZone(value) !== undefined, {
diff --git a/apps/web/src/lib/datetime/utils.ts b/apps/web/src/lib/datetime/utils.ts
index 4b0ccbe91..38c6ab9a6 100644
--- a/apps/web/src/lib/datetime/utils.ts
+++ b/apps/web/src/lib/datetime/utils.ts
@@ -1,5 +1,5 @@
-import type { TimeFormat } from "@rallly/database";
import type { DateInput } from "@/lib/datetime/format";
+import type { TimeFormat } from "@/lib/datetime/schema";
function toDate(value: DateInput) {
return value instanceof Date ? value : new Date(value);