Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Name every loader load*, gates included (#3331)
Luke Vella2ffd98b082ae
diff --git a/CLAUDE.md b/CLAUDE.mdindex 98fcab376..7995a95cb 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -255,7 +255,7 @@ Reads filtered or grouped by the viewer's present ("upcoming", "past", agenda gr| Reads | `loaders.ts` | `data.ts` || Writes | `actions.ts` | `mutations.ts` |-**Loader placement** — pages, layouts and route-private components never call `data.ts` directly: every read they consume goes through a loader in `features/<domain>/loaders.ts`, so the session gate that proves scope cannot be forgotten at the call site (lint-enforced: `@/features/**/data` is banned in `app/**`; existing violations sit on a shrinking migration allowlist in `apps/web/biome.json`). A loader bundles the gate and the read: `import "server-only"`, named with a `load*` prefix, wrapped in React `cache()` so every consumer in a request shares one read, resolves the actor via the session gates (`requireUser()`, `getActiveSpace()` — both trust the session cookie cache; `getCurrentUser()` is the database-verified read for pages that need DB-fresh user state) and delegates to `data.ts` with proven scope. Reference shape: `features/notifications/loaders.ts` (`loadNotificationPreferences`). Route-private `actions.ts` files are the write side, not pages — they keep calling `data.ts`/`mutations.ts` with proven scope from their safe-action gate (loaders' page semantics, redirects, don't belong in actions) and are exempt from the lint ban.+**Loader placement** — pages, layouts and route-private components never call `data.ts` directly: every read they consume goes through a loader in `features/<domain>/loaders.ts`, so the session gate that proves scope cannot be forgotten at the call site (lint-enforced: `@/features/**/data` is banned in `app/**`; existing violations sit on a shrinking migration allowlist in `apps/web/biome.json`). A loader bundles the gate and the read: `import "server-only"`, named with a `load*` prefix, wrapped in React `cache()` so every consumer in a request shares one read, resolves the actor via the session gates (`loadUser()`, `loadActiveSpace()` — both trust the session cookie cache; `loadOptionalUser()` is the database-verified read for pages that need DB-fresh user state) and delegates to `data.ts` with proven scope. Reference shape: `features/notifications/loaders.ts` (`loadNotificationPreferences`). **Every export from a `loaders.ts` is named `load*`**, gates included (enforced by `pnpm check:structure`). The bare prefix means the loader applies page semantics: it redirects or throws when the actor is missing. A loader that returns null instead is `loadOptional*` (`loadOptionalActiveSpace`, `loadOptionalUser`, `loadOptionalActor`). No `require*`/`get*` prefixes: that behaviour belongs in the return type, which the Effect migration will make explicit. Route-private `actions.ts` files are the write side, not pages — they keep calling `data.ts`/`mutations.ts` with proven scope from their safe-action gate (loaders' page semantics, redirects, don't belong in actions) and are exempt from the lint ban.**DAL enforcement** — `@rallly/database` may only be imported from `features/**/data.ts` and `features/**/mutations.ts` (lint-enforced via `noRestrictedImports`; existing violations sit on a shrinking migration allowlist in `apps/web/biome.json`; `loaders.ts` is absent from the allowlist, so database imports are banned there by default). Parameterized reads take their tenant scope as `spaceId: AuthorizedSpaceId` (from `@/features/space/types`); only the session gate (`createSpaceDTO`) and the API key middleware may cast to it. API routes under `app/api/**` (except tRPC and better-auth) must not import `@/features/**/loaders` — they authenticate their own way and pass proven scope to parameterized reads. The inverse holds for pages: `app/**` (outside `app/api/**` and route-private `actions.ts`) must not import `@/features/**/data` — reads reach pages only through loaders. `api/private` handlers own serialization and must parse response bodies through their zod schemas.diff --git a/apps/web/src/app/[locale]/(optional-space)/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/layout.tsxindex 76152cced..5052fccd1 100644--- a/apps/web/src/app/[locale]/(optional-space)/layout.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/layout.tsx@@ -8,7 +8,7 @@ import { resolveSpaceTier } from "@/features/billing/utils";import { isQuickCreateEnabled } from "@/features/quick-create/constants";import { getActiveSpaceForUser } from "@/features/space/data";import { UserProvider } from "@/features/user/client";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { getLocale } from "@/i18n/server/get-locale";import { getSession } from "@/lib/auth";import { DeviceDateTimeProvider } from "@/lib/datetime/device";@@ -19,7 +19,7 @@ import { getDeviceDateTimeConfig } from "@/lib/datetime/server";async function OptionalSpaceGate({ children }: { children: React.ReactNode }) {// Guests may only enter when quick create is enabled.if (!isQuickCreateEnabled) {- await requireUser();+ await loadUser();}const [locale, deviceDateTimeConfig, session, payWallPricing] =diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsxindex f2f394ce8..962936455 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx@@ -19,7 +19,7 @@ import { CommandMenu } from "@/features/navigation/components/command-menu";import { SpaceDropdown } from "@/features/space/components/space-dropdown";import { listSpacesForUser } from "@/features/space/data";import { NavUser } from "@/features/user/components/nav-user";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { IfFeatureEnabled } from "@/lib/feature-flags/client";import { ControlPanelMenuItem } from "./components/control-panel-menu-item";@@ -33,7 +33,7 @@ export default async function Layout({}: {children: React.ReactNode;}) {- const user = await requireUser();+ const user = await loadUser();const spaces = await listSpacesForUser(user.id);return (diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsxindex 806b21995..5a0d1fe6b 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx@@ -13,13 +13,13 @@ import { PageHeaderActions } from "@/components/page-layout";import { StackedList, StackedListItem } from "@/components/stacked-list";import { defineAbilityForSpace } from "@/features/space/ability";import { SpaceRole } from "@/features/space/components/space-role";-import { getActiveSpace, getSeatUsage } from "@/features/space/loaders";+import { loadActiveSpace, loadSeatUsage } from "@/features/space/loaders";import { defineAbilityForMember } from "@/features/space/member/ability";import {loadPendingInvites,loadSpaceMembers,} from "@/features/space/member/loaders";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { IfFeatureEnabled } from "@/lib/feature-flags/client";import { isFeatureEnabled } from "@/lib/feature-flags/server";@@ -29,7 +29,7 @@ import { PendingInvites } from "./components/pending-invites";import { UpgradeToProButton } from "./components/upgrade-to-pro-button";async function getMemberAbility() {- const [user, space] = await Promise.all([requireUser(), getActiveSpace()]);+ const [user, space] = await Promise.all([loadUser(), loadActiveSpace()]);return defineAbilityForMember({user: { id: user.id },@@ -38,14 +38,14 @@ async function getMemberAbility() {}export async function MembersPageActions() {- const space = await getActiveSpace();+ const space = await loadActiveSpace();if (defineAbilityForSpace(space).cannot("invite", "Member")) {return null;}const [seatUsage, memberAbility] = await Promise.all([- getSeatUsage(),+ loadSeatUsage(),getMemberAbility(),]);const availableSeats = Math.max(seatUsage.total - seatUsage.used, 0);@@ -69,9 +69,9 @@ export async function MembersPageActions() {export async function MembersPageContent() {const [space, members, seatUsage, memberAbility] = await Promise.all([- getActiveSpace(),+ loadActiveSpace(),loadSpaceMembers(),- getSeatUsage(),+ loadSeatUsage(),getMemberAbility(),]);diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsxindex 9e56de7ed..833bd107b 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx@@ -1,19 +1,19 @@import type { Metadata } from "next";import { loadPollStatusCounts } from "@/features/poll/loaders";import {- getActiveSpace,+ loadActiveSpace,loadUpcomingEventCount,} from "@/features/space/loaders";import { defineAbilityForMember } from "@/features/space/member/ability";-import { loadUserHasNoAccounts, requireUser } from "@/features/user/loaders";+import { loadUser, loadUserHasNoAccounts } from "@/features/user/loaders";import { getTranslation } from "@/i18n/server";import { DashboardHome } from "./dashboard-home";export default async function Page() {const [user, space, pollStatusCounts, upcomingEventCount, hasNoAccounts] =await Promise.all([- requireUser(),- getActiveSpace(),+ loadUser(),+ loadActiveSpace(),loadPollStatusCounts(),loadUpcomingEventCount(),loadUserHasNoAccounts(),diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxindex 4dde25368..290089e3e 100644--- a/apps/web/src/app/[locale]/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -5,7 +5,7 @@ import { TierProvider } from "@/features/billing/client";import { PayWall } from "@/features/billing/components/pay-wall";import { loadPayWallPricing } from "@/features/billing/loaders";import { SpaceProvider } from "@/features/space/client";-import { getActiveSpace } from "@/features/space/loaders";+import { loadActiveSpace } from "@/features/space/loaders";import { UserProvider } from "@/features/user/client";import { TimeZoneMismatchDialog } from "@/features/user/components/timezone-mismatch-dialog";import { getLocale } from "@/i18n/server/get-locale";@@ -14,12 +14,12 @@ import { DateTimeProvider } from "@/lib/datetime/client";// The session gate awaits below this boundary so the document shell can// flush before the session store responds; without it, every hard load of-// a space route streams nothing until getActiveSpace resolves.+// a space route streams nothing until loadActiveSpace resolves.async function SpaceGate({ children }: { children: React.ReactNode }) {const [locale, session, space, payWallPricing] = await Promise.all([getLocale(),getSession(),- getActiveSpace(),+ loadActiveSpace(),loadPayWallPricing(),]);diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsxindex 46ac86b11..4d82554c2 100644--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx@@ -14,8 +14,8 @@ import {SettingsPageTitle,} from "@/components/settings-layout";import { getSpaceApiKeys, isApiAccessEnabled } from "@/features/api-keys/data";-import { getActiveSpace } from "@/features/space/loaders";-import { requireUser } from "@/features/user/loaders";+import { loadActiveSpace } from "@/features/space/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { ApiAccessUpgrade } from "./components/api-access-upgrade";@@ -24,9 +24,9 @@ import { ApiUsageLimits } from "./components/api-usage-limits";import { CreateApiKeyButton } from "./components/create-api-key-button";export default async function ApiKeysSettingsPage() {- const user = await requireUser();+ const user = await loadUser();- const space = await getActiveSpace();+ const space = await loadActiveSpace();const enabled = await isApiAccessEnabled(user, space);// "Needs to upgrade" (hobby tier) gets its own screen; every other reason@@ -61,7 +61,7 @@ export default async function ApiKeysSettingsPage() {}async function ApiKeysContent() {- const space = await getActiveSpace();+ const space = await loadActiveSpace();const apiKeys = await getSpaceApiKeys({ spaceId: space.id });return (diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsxindex 68301d317..a81c7abec 100644--- a/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx@@ -19,9 +19,9 @@ import {loadPaymentMethods,loadSubscriptionOverview,} from "@/features/billing/loaders";-import { getActiveSpace, getSeatUsage } from "@/features/space/loaders";+import { loadActiveSpace, loadSeatUsage } from "@/features/space/loaders";import { defineAbilityForMember } from "@/features/space/member/ability";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { isFeatureEnabled } from "@/lib/feature-flags/server";@@ -35,9 +35,9 @@ export default async function BillingSettingsPage() {notFound();}- const user = await requireUser();+ const user = await loadUser();- const space = await getActiveSpace();+ const space = await loadActiveSpace();const ability = defineAbilityForMember({user: { id: user.id },@@ -65,7 +65,7 @@ export default async function BillingSettingsPage() {const [overview, seatUsage, paymentMethods] = await Promise.all([loadSubscriptionOverview(),- getSeatUsage(),+ loadSeatUsage(),loadPaymentMethods(),]);diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsxindex 8d1f0ed74..a67677b01 100644--- a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx@@ -17,12 +17,12 @@ import {SettingsPageHeader,SettingsPageTitle,} from "@/components/settings-layout";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";export default async function Page() {- const user = await requireUser();+ const user = await loadUser();return (<SettingsPage>diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsxindex a9a3f0aad..f37765b8d 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx@@ -2,13 +2,13 @@ import { Alert, AlertDescription } from "@rallly/ui/alert";import { Skeleton } from "@rallly/ui/skeleton";import { BarChart2Icon, CalendarIcon, InfoIcon } from "lucide-react";import { getAccountDeletionSummary } from "@/features/user/account-deletion/data";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";// Streamed into the delete account dialog behind Suspense so opening the// settings page never waits on the counts.export async function AccountDeletionSummary() {- const user = await requireUser();+ const user = await loadUser();const { activePollCount, upcomingEventCount, hasActiveSubscription } =await getAccountDeletionSummary({userId: user.id,diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsxindex f8c1a1a19..c1c381220 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx@@ -18,7 +18,7 @@ import {SettingsPageHeader,SettingsPageTitle,} from "@/components/settings-layout";-import { getCurrentUser } from "@/features/user/loaders";+import { loadOptionalUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { getPathname } from "@/lib/pathname";@@ -37,7 +37,7 @@ import { ProfileSettings } from "./components/profile-settings";export default async function Page() {// Read from the database — the pending deletion notice depends on// deletedAt, which the session snapshot doesn't carry.- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {redirect(diff --git a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsxindex e0c61a361..626b77a81 100644--- a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx@@ -27,7 +27,7 @@ import {SettingsPageTitle,} from "@/components/settings-layout";import { getUserHasPassword } from "@/features/user/data";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { isFeatureEnabled } from "@/lib/feature-flags/server";@@ -35,7 +35,7 @@ import { ChangePasswordDialog } from "./components/change-password-dialog";import { SetupPasswordDialog } from "./components/setup-password-dialog";export default async function SecurityPage() {- const user = await requireUser();+ const user = await loadUser();const isEmailLoginEnabled = isFeatureEnabled("emailLogin");const hasPassword = isEmailLoginEnableddiff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsxindex 32fba483c..1e8847581 100644--- a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx@@ -10,13 +10,13 @@ import {SettingsPageTitle,} from "@/components/settings-layout";import { listSpacesForUser } from "@/features/space/data";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { SpacesList } from "./components/spaces-list";export default async function Page() {- const user = await requireUser();+ const user = await loadUser();const spaces = await listSpacesForUser(user.id);return (diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsxindex 45884ca00..c86e4bdad 100644--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx@@ -4,7 +4,7 @@ import { notFound } from "next/navigation";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import { Logo } from "@/features/branding/components/logo";import { SpaceIcon } from "@/features/space/components/space-icon";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { AcceptInviteButton } from "./components/accept-invite-button";@@ -17,7 +17,7 @@ export default async function JoinPage({}) {const { inviteId } = await params;const [user, invite] = await Promise.all([- requireUser(),+ loadUser(),prisma.spaceMemberInvite.findUnique({where: {id: inviteId,diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsxindex 4f644e9b9..d1c03cc6c 100644--- a/apps/web/src/app/[locale]/admin-setup/page.tsx+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx@@ -12,7 +12,7 @@ import {import { IfCloudHosted, IfSelfHosted } from "@/components/environment";import { Link } from "@/components/link";import { isInitialAdmin } from "@/features/instance-settings/utils";-import { getCurrentUser } from "@/features/user/loaders";+import { loadOptionalUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { getPathname } from "@/lib/pathname";@@ -23,7 +23,7 @@ import { SignedInAs } from "./signed-in-as";export default async function AdminSetupPage() {// Read the role from the database — the session cookie cache can hold// a stale role.- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {redirect(diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsxindex bb87455fa..0789d517e 100644--- a/apps/web/src/app/[locale]/control-panel/layout.tsx+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx@@ -6,7 +6,7 @@ import { RouterLoadingIndicator } from "@/components/router-loading-indicator";import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";import { CommandMenu } from "@/features/navigation/components/command-menu";import { UserProvider } from "@/features/user/client";-import { requireAdmin } from "@/features/user/loaders";+import { loadAdmin } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { getLocale } from "@/i18n/server/get-locale";@@ -17,7 +17,7 @@ import { ControlPanelSidebar } from "./sidebar";// The admin gate awaits below the Suspense boundary in the default export// so the document shell can flush before the session store responds.async function AdminGate({ children }: { children: React.ReactNode }) {- const [locale, user] = await Promise.all([getLocale(), requireAdmin()]);+ const [locale, user] = await Promise.all([getLocale(), loadAdmin()]);return (<UserProvider user={user}>diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsxindex 7a8eae443..dfef7afd3 100644--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx@@ -20,7 +20,7 @@ import {} from "@/components/settings-layout";import { StackedList } from "@/components/stacked-list";import { defineAbilityFor } from "@/features/user/ability";-import { requireAdmin } from "@/features/user/loaders";+import { loadAdmin } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { UserRow } from "./user-row";@@ -38,7 +38,7 @@ async function loadData({q?: string;role?: "admin" | "user";}) {- const user = await requireAdmin();+ const user = await loadAdmin();const where: Prisma.UserWhereInput = {isAnonymous: false,diff --git a/apps/web/src/app/[locale]/nonprofit/page.tsx b/apps/web/src/app/[locale]/nonprofit/page.tsxindex 5d47fa944..6d5fd37b1 100644--- a/apps/web/src/app/[locale]/nonprofit/page.tsx+++ b/apps/web/src/app/[locale]/nonprofit/page.tsx@@ -4,10 +4,10 @@ import { ThemeSwitcher } from "@/components/theme-switcher";import { NonprofitApplicationPage } from "@/features/billing/nonprofit/components/nonprofit-application-page";import { loadNonprofitStatus } from "@/features/billing/nonprofit/loaders";import { Logo } from "@/features/branding/components/logo";-import { getActiveSpace } from "@/features/space/loaders";+import { loadActiveSpace } from "@/features/space/loaders";import { defineAbilityForMember } from "@/features/space/member/ability";import { SignedInFooter } from "@/features/user/components/signed-in-footer";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { getTranslation } from "@/i18n/server";import { isFeatureEnabled } from "@/lib/feature-flags/server";@@ -20,10 +20,10 @@ export default async function NonprofitPage() {notFound();}- // requireUser sends a cold visitor to /login and back here; getActiveSpace+ // loadUser sends a cold visitor to /login and back here; loadActiveSpace// sends an account that has not finished onboarding through /setup first.- const user = await requireUser();- const space = await getActiveSpace();+ const user = await loadUser();+ const space = await loadActiveSpace();const status = await loadNonprofitStatus();const ability = defineAbilityForMember({diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex 94178f8b6..c40d80234 100644--- a/apps/web/src/app/[locale]/setup/page.tsx+++ b/apps/web/src/app/[locale]/setup/page.tsx@@ -5,7 +5,7 @@ import { ThemeSwitcher } from "@/components/theme-switcher";import { Logo } from "@/features/branding/components/logo";import { getOwnedSpace } from "@/features/space/data";import { SignedInFooter } from "@/features/user/components/signed-in-footer";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { getDeviceDateTimeConfig } from "@/lib/datetime/server";@@ -14,7 +14,7 @@ import { validateRedirectUrl } from "@/lib/utils/redirect";export default async function SetupPage(props: {searchParams?: Promise<{ redirectTo?: string }>;}) {- const user = await requireUser();+ const user = await loadUser();const searchParams = await props.searchParams;// Whether onboarding is done is "does a space exist", not "is onediff --git a/apps/web/src/features/api-keys/actions.ts b/apps/web/src/features/api-keys/actions.tsindex 4045d75b4..2307eacb9 100644--- a/apps/web/src/features/api-keys/actions.ts+++ b/apps/web/src/features/api-keys/actions.ts@@ -7,7 +7,7 @@ import {revokeApiKeySchema,} from "@/features/api-keys/schema";import { getActiveSpaceForUser } from "@/features/space/data";-import { getCurrentUser } from "@/features/user/loaders";+import { loadOptionalUser } from "@/features/user/loaders";import { AppError } from "@/lib/errors/app-error";import { track } from "@/lib/posthog";import { authActionClient } from "@/lib/safe-action/server";@@ -15,7 +15,7 @@ import { authActionClient } from "@/lib/safe-action/server";// The UI never offers these actions to users without API access, so a// failed gate is unexpected here — throw for the global error handler.async function requireApiAccess() {- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {throw new AppError({diff --git a/apps/web/src/features/billing/loaders.ts b/apps/web/src/features/billing/loaders.tsindex 166f0fea0..448597725 100644--- a/apps/web/src/features/billing/loaders.ts+++ b/apps/web/src/features/billing/loaders.ts@@ -16,9 +16,9 @@ import {isEarlySupporter,resolvePriceSet,} from "@/features/billing/utils";-import { getActiveSpace } from "@/features/space/loaders";+import { loadActiveSpace } from "@/features/space/loaders";import { defineAbilityForMember } from "@/features/space/member/ability";-import { getCurrentUser, requireUser } from "@/features/user/loaders";+import { loadOptionalUser, loadUser } from "@/features/user/loaders";import { isFeatureEnabled } from "@/lib/feature-flags/server";/**@@ -68,7 +68,10 @@ export const loadPayWallPricing = cache(async () => {* than failing the page.*/export const loadSubscriptionOverview = cache(async () => {- const [user, space] = await Promise.all([getCurrentUser(), getActiveSpace()]);+ const [user, space] = await Promise.all([+ loadOptionalUser(),+ loadActiveSpace(),+ ]);const subscription = await getSpaceSubscription(space.id);if (!subscription) {@@ -151,7 +154,7 @@ export const loadSubscriptionOverview = cache(async () => {* rows written before the customer.created webhook landed.*/export const loadPaymentMethods = cache(async () => {- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {return [];@@ -171,7 +174,7 @@ export const loadIsSubscriptionPastDue = cache(async () => {return false;}- const [user, space] = await Promise.all([requireUser(), getActiveSpace()]);+ const [user, space] = await Promise.all([loadUser(), loadActiveSpace()]);if (!space.subscriptionPastDue) {return false;diff --git a/apps/web/src/features/billing/nonprofit/loaders.ts b/apps/web/src/features/billing/nonprofit/loaders.tsindex d3f141c56..eaa654770 100644--- a/apps/web/src/features/billing/nonprofit/loaders.ts+++ b/apps/web/src/features/billing/nonprofit/loaders.ts@@ -2,9 +2,9 @@ import "server-only";import { cache } from "react";import { getNonprofitStatus } from "@/features/billing/nonprofit/data";-import { getActiveSpace } from "@/features/space/loaders";+import { loadActiveSpace } from "@/features/space/loaders";export const loadNonprofitStatus = cache(async () => {- const space = await getActiveSpace();+ const space = await loadActiveSpace();return getNonprofitStatus(space.id);});diff --git a/apps/web/src/features/notifications/loaders.ts b/apps/web/src/features/notifications/loaders.tsindex d1af28cd6..da327a3e7 100644--- a/apps/web/src/features/notifications/loaders.ts+++ b/apps/web/src/features/notifications/loaders.ts@@ -7,10 +7,10 @@ import {getPollMuteTarget,} from "@/features/notifications/data";import { parseUnsubscribeToken } from "@/features/notifications/utils";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";export const loadNotificationPreferences = cache(async () => {- const user = await requireUser();+ const user = await loadUser();return getNotificationPreferences(user.id);});diff --git a/apps/web/src/features/poll/loaders.ts b/apps/web/src/features/poll/loaders.tsindex b1576e35b..0710ab096 100644--- a/apps/web/src/features/poll/loaders.ts+++ b/apps/web/src/features/poll/loaders.ts@@ -18,16 +18,16 @@ import {filterCommentsForViewer,maskParticipantsForViewer,} from "@/features/poll/utils";-import { getActiveSpaceContentScope } from "@/features/space/loaders";+import { loadActiveSpaceContentScope } from "@/features/space/loaders";import { getSession } from "@/lib/auth";export const loadPollStatusCounts = cache(async () => {- const scope = await getActiveSpaceContentScope();+ const scope = await loadActiveSpaceContentScope();return getPollStatusCounts({ scope });});export const loadPoll = cache(async (pollId: string) => {- const scope = await getActiveSpaceContentScope();+ const scope = await loadActiveSpaceContentScope();const poll = await getPoll({ pollId, scope });if (!poll) {diff --git a/apps/web/src/features/space/loaders.test.ts b/apps/web/src/features/space/loaders.test.tsindex 3ff0451b2..bd1a88907 100644--- a/apps/web/src/features/space/loaders.test.ts+++ b/apps/web/src/features/space/loaders.test.ts@@ -53,15 +53,15 @@ const authenticatedAs = (user: Record<string, unknown>) => {});};-// getActiveSpace is React-cached, so each case needs a fresh module registry+// loadActiveSpace is React-cached, so each case needs a fresh module registry// or the first call's result leaks into the next test.const loadGate = async () => {vi.resetModules();const mod = await import("./loaders");- return mod.getActiveSpace;+ return mod.loadActiveSpace;};-describe("getActiveSpace", () => {+describe("loadActiveSpace", () => {beforeEach(() => {vi.clearAllMocks();});diff --git a/apps/web/src/features/space/loaders.ts b/apps/web/src/features/space/loaders.tsindex 2fb5ca93c..c771e970f 100644--- a/apps/web/src/features/space/loaders.ts+++ b/apps/web/src/features/space/loaders.ts@@ -12,7 +12,7 @@ import {} from "@/features/space/data";import type { SpaceContentScope } from "@/features/space/types";import { createSpaceContentScope } from "@/features/space/utils";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { getSessionState } from "@/lib/auth";import { getDeviceTimeZone } from "@/lib/datetime/server";import { normalizeTimeZone } from "@/lib/datetime/utils";@@ -29,7 +29,7 @@ import { buildSafeRedirectUrl } from "@/lib/utils/redirect";* shares one gate and one query. Server component/page use only — the* redirects make it unsuitable for route handlers and tRPC procedures.*/-export const getActiveSpace = cache(async () => {+export const loadActiveSpace = cache(async () => {const state = await getSessionState();// An unreadable session (store unreachable, transient failure) is not@@ -99,12 +99,12 @@ export const getActiveSpace = cache(async () => {/*** The visibility scope space-scoped content reads must apply for the- * signed-in user in their active space. Same gating as getActiveSpace;+ * signed-in user in their active space. Same gating as loadActiveSpace;* server component/page use only.*/-export const getActiveSpaceContentScope = cache(+export const loadActiveSpaceContentScope = cache(async (): Promise<SpaceContentScope> => {- const [space, user] = await Promise.all([getActiveSpace(), requireUser()]);+ const [space, user] = await Promise.all([loadActiveSpace(), loadUser()]);return createSpaceContentScope({ space, userId: user.id });},);@@ -112,8 +112,8 @@ export const getActiveSpaceContentScope = cache(/*** The active space for the signed-in user, or null when there is none: the* visitor is unauthenticated, a guest, or has no effective membership. For- * routes that admit guests, where getActiveSpace's redirects would be wrong.- * Bans still throw, as in getActiveSpace.+ * routes that admit guests, where loadActiveSpace's redirects would be wrong.+ * Bans still throw, as in loadActiveSpace.*/export const loadOptionalActiveSpace = cache(async () => {const state = await getSessionState();@@ -137,8 +137,8 @@ export const loadOptionalActiveSpace = cache(async () => {*/export const loadUpcomingEventCount = cache(async () => {const [user, scope, deviceTimeZone] = await Promise.all([- requireUser(),- getActiveSpaceContentScope(),+ loadUser(),+ loadActiveSpaceContentScope(),getDeviceTimeZone(),]);@@ -152,10 +152,10 @@ export const loadUpcomingEventCount = cache(async () => {/*** Seat usage for the signed-in user's active space. Session scoped —- * server component/page use only, per getActiveSpace.+ * server component/page use only, per loadActiveSpace.*/-export const getSeatUsage = cache(async () => {- const space = await getActiveSpace();+export const loadSeatUsage = cache(async () => {+ const space = await loadActiveSpace();const [total, used] = await Promise.all([getTotalSeatsForSpace(space.id),diff --git a/apps/web/src/features/space/member/loaders.ts b/apps/web/src/features/space/member/loaders.tsindex dc6686189..d3072bcbb 100644--- a/apps/web/src/features/space/member/loaders.ts+++ b/apps/web/src/features/space/member/loaders.ts@@ -1,18 +1,18 @@import "server-only";import { cache } from "react";-import { getActiveSpace } from "@/features/space/loaders";+import { loadActiveSpace } from "@/features/space/loaders";import {listSpaceInvites,listSpaceMembers,} from "@/features/space/member/data";export const loadSpaceMembers = cache(async () => {- const space = await getActiveSpace();+ const space = await loadActiveSpace();return listSpaceMembers({ spaceId: space.id });});export const loadPendingInvites = cache(async () => {- const space = await getActiveSpace();+ const space = await loadActiveSpace();return listSpaceInvites({ spaceId: space.id });});diff --git a/apps/web/src/features/user/client.tsx b/apps/web/src/features/user/client.tsxindex 618a45065..89e41acc0 100644--- a/apps/web/src/features/user/client.tsx+++ b/apps/web/src/features/user/client.tsx@@ -42,7 +42,7 @@ export function UserProvider({/*** For components rendered on routes gated by a logged-in (non-guest) user- * (e.g. behind requireUser). Throws instead of returning null so consumers+ * (e.g. behind loadUser). Throws instead of returning null so consumers* don't need to handle the unauthenticated case.*/export function useAuthedUser() {diff --git a/apps/web/src/features/user/loaders.ts b/apps/web/src/features/user/loaders.tsindex 18747e5a3..44b74346c 100644--- a/apps/web/src/features/user/loaders.ts+++ b/apps/web/src/features/user/loaders.ts@@ -15,7 +15,7 @@ import { buildSafeRedirectUrl } from "@/lib/utils/redirect";* how to respond (redirect, 401, etc.). Throws InvalidSessionError when* the session references a user that no longer exists or is banned.*/-export const getCurrentUser = cache(async () => {+export const loadOptionalUser = cache(async () => {const session = await getSession();if (!session?.user || session.user.isGuest) {@@ -37,7 +37,7 @@ export const getCurrentUser = cache(async () => {* null when there is no session; throws InvalidSessionError when the* session references a user that no longer exists or is banned.*/-export const getCurrentActor = cache(async () => {+export const loadOptionalActor = cache(async () => {const session = await getSession();if (!session?.user) {@@ -58,10 +58,10 @@ export const getCurrentActor = cache(async () => {* Trusts the session cookie cache (no database read). Redirects to /login* when unauthenticated, fails the render on an unreadable session so a* transient session-store failure can't feed a / ↔ /login redirect loop.- * Use getCurrentUser where the user is optional or must be read from the+ * Use loadOptionalUser where the user is optional or must be read from the* database (mutation gates, stale-role-sensitive pages).*/-export const requireUser = cache(async (): Promise<UserDTO> => {+export const loadUser = cache(async (): Promise<UserDTO> => {const state = await getSessionState();if (state.status === "error") {@@ -92,8 +92,8 @@ export const requireUser = cache(async (): Promise<UserDTO> => {* everyone else — that page either offers the initial admin promotion* or explains that administrator access is missing.*/-export const requireAdmin = cache(async () => {- const user = await getCurrentUser();+export const loadAdmin = cache(async () => {+ const user = await loadOptionalUser();if (!user) {const pathname = await getPathname();@@ -114,6 +114,6 @@ export const requireAdmin = cache(async () => {* link) — OTP-only accounts that should be nudged to set up a password.*/export const loadUserHasNoAccounts = cache(async () => {- const user = await requireUser();+ const user = await loadUser();return getUserHasNoAccounts(user.id);});diff --git a/apps/web/src/features/webhook/actions.ts b/apps/web/src/features/webhook/actions.tsindex 6e1a24fdf..b3a8f76a2 100644--- a/apps/web/src/features/webhook/actions.ts+++ b/apps/web/src/features/webhook/actions.ts@@ -1,7 +1,7 @@"use server";import { getActiveSpaceForUser } from "@/features/space/data";-import { getCurrentUser } from "@/features/user/loaders";+import { loadOptionalUser } from "@/features/user/loaders";import { AppError } from "@/lib/errors/app-error";import { track } from "@/lib/posthog";import { authActionClient } from "@/lib/safe-action/server";@@ -16,7 +16,7 @@ import {// The UI never offers these actions to users without webhook access, so a// failed gate is unexpected here — throw for the global error handler.async function requireWebhookAccess() {- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {throw new AppError({diff --git a/apps/web/src/features/webhook/loaders.ts b/apps/web/src/features/webhook/loaders.tsindex dcac98814..ee68d0bdb 100644--- a/apps/web/src/features/webhook/loaders.ts+++ b/apps/web/src/features/webhook/loaders.ts@@ -1,8 +1,8 @@import "server-only";import { cache } from "react";-import { getActiveSpace } from "@/features/space/loaders";-import { requireUser } from "@/features/user/loaders";+import { loadActiveSpace } from "@/features/space/loaders";+import { loadUser } from "@/features/user/loaders";import { getSpaceWebhooks, getWebhookAccess } from "./data";/**@@ -10,11 +10,11 @@ import { getSpaceWebhooks, getWebhookAccess } from "./data";* when they may not, whether upgrading would change that.*/export const loadWebhookAccess = cache(async () => {- const [user, space] = await Promise.all([requireUser(), getActiveSpace()]);+ const [user, space] = await Promise.all([loadUser(), loadActiveSpace()]);return getWebhookAccess(user, space);});export const loadSpaceWebhooks = cache(async () => {- const space = await getActiveSpace();+ const space = await loadActiveSpace();return getSpaceWebhooks({ spaceId: space.id });});diff --git a/apps/web/src/lib/safe-action/server.ts b/apps/web/src/lib/safe-action/server.tsindex 7d5e698b4..c94c9a07a 100644--- a/apps/web/src/lib/safe-action/server.ts+++ b/apps/web/src/lib/safe-action/server.ts@@ -6,7 +6,7 @@ import { after } from "next/server";import { createMiddleware, createSafeActionClient } from "next-safe-action";import * as z from "zod";import { defineAbilityFor } from "@/features/user/ability";-import { getCurrentActor, getCurrentUser } from "@/features/user/loaders";+import { loadOptionalActor, loadOptionalUser } from "@/features/user/loaders";import { signOut } from "@/lib/auth";import { AppError } from "@/lib/errors/app-error";import { InvalidSessionError } from "@/lib/errors/invalid-session-error";@@ -115,7 +115,7 @@ export const actionClient = createSafeActionClient({});export const authActionClient = actionClient.use(async ({ next }) => {- const user = await getCurrentUser();+ const user = await loadOptionalUser();if (!user) {throw new AppError({@@ -136,7 +136,7 @@ export const authActionClient = actionClient.use(async ({ next }) => {* may be none at all when the credential is a token from an emailed link.*/export const optionalUserActionClient = actionClient.use(async ({ next }) => {- const user = await getCurrentActor();+ const user = await loadOptionalActor();return next({ctx: { user },diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.tsindex 0fda7694d..5b4133100 100644--- a/apps/web/src/trpc/server/create-ssr-helper.ts+++ b/apps/web/src/trpc/server/create-ssr-helper.ts@@ -1,7 +1,7 @@import { createServerSideHelpers } from "@trpc/react-query/server";import { cache } from "react";import superjson from "superjson";-import { requireUser } from "@/features/user/loaders";+import { loadUser } from "@/features/user/loaders";import { getSession } from "@/lib/auth";import type { TRPCContext } from "../context";import { appRouter } from "../routers";@@ -31,7 +31,7 @@ export const createPublicSSRHelper = cache(async () => {* Redirects to /login if the user is not authenticated or is a guest.*/export const createPrivateSSRHelper = cache(async () => {- const user = await requireUser();+ const user = await loadUser();return createServerSideHelpers({router: appRouter,diff --git a/scripts/check-feature-structure.mjs b/scripts/check-feature-structure.mjsindex 611ac7b06..014c91587 100644--- a/scripts/check-feature-structure.mjs+++ b/scripts/check-feature-structure.mjs@@ -6,6 +6,10 @@* contain the allowed file names below, co-located tests, and the directories* `components/` and `assets/` (whose contents are unrestricted).*+ * Every export from a `loaders.ts` is named with a `load*` prefix. Loaders+ * that redirect or throw take the bare prefix; loaders that return null for+ * a missing actor are `loadOptional*`.+ ** A useFilenamingConvention override in apps/web/biome.json mirrors this rule* at warn severity for in-editor feedback (JS/TS files only) — keep the two* in sync when the vocabulary changes.@@ -37,7 +41,46 @@ const TEST_FILE_PATTERN = /\.test\.tsx?$/;const UNRESTRICTED_DIRS = new Set(["components", "assets"]);+const LOADER_DECLARATION_PATTERN =+ /^export\s+(?:const|let|function|async\s+function)\s+([A-Za-z0-9_$]+)/gm;+const LOADER_EXPORT_LIST_PATTERN = /^export\s*\{([^}]*)\}/gm;+const LOADER_STAR_EXPORT_PATTERN = /^export\s*\*/m;+const offenders = [];+const loaderNameOffenders = [];++function loaderExportNames(source) {+ const names = [];+ for (const match of source.matchAll(LOADER_DECLARATION_PATTERN)) {+ names.push(match[1]);+ }+ for (const match of source.matchAll(LOADER_EXPORT_LIST_PATTERN)) {+ for (const entry of match[1].split(",")) {+ const trimmed = entry.trim();+ if (!trimmed || trimmed.startsWith("type ")) {+ continue;+ }+ // `local as exported` exports the alias; a bare name exports itself.+ const parts = trimmed.split(/\s+as\s+/);+ names.push(parts[parts.length - 1]);+ }+ }+ return names;+}++function checkLoaderExports(absolutePath, relativePath) {+ const source = fs.readFileSync(absolutePath, "utf8");+ if (LOADER_STAR_EXPORT_PATTERN.test(source)) {+ loaderNameOffenders.push(+ `${relativePath}: export * (names cannot be checked; export them explicitly)`,+ );+ }+ for (const name of loaderExportNames(source)) {+ if (!name.startsWith("load")) {+ loaderNameOffenders.push(`${relativePath}: ${name}`);+ }+ }+}function walk(dir) {for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {@@ -59,6 +102,8 @@ function walk(dir) {!TEST_FILE_PATTERN.test(entry.name)) {offenders.push(relativePath);+ } else if (entry.name === "loaders.ts") {+ checkLoaderExports(absolutePath, relativePath);}}}@@ -93,4 +138,17 @@ if (offenders.length > 0) {process.exit(1);}+if (loaderNameOffenders.length > 0) {+ console.error(+ `Found ${loaderNameOffenders.length} loader export(s) without the load* prefix:\n`,+ );+ for (const offender of loaderNameOffenders.sort()) {+ console.error(` apps/web/src/features/${offender}`);+ }+ console.error(+ "\nEvery export from a loaders.ts is named load*. Loaders that redirect or throw take the bare prefix; loaders that return null for a missing actor are loadOptional*.",+ );+ process.exit(1);+}+console.log("Feature folder structure OK");