v3: src/ gets one layout rule and keeps to it — each layer holds one kind of module, and every layer is split into the same domains — the previous pass sorted components into folders but left hooks, helpers and a barrel inside them, kept hooks/, utils/ and contexts/ flat, and still grouped most tests by theme. The rule: components/ holds only components (.tsx), contexts/ holds FooContext.ts + FooProvider.tsx pairs, hooks/ every hook, utils/ every non-React module, pages/ one component per route and nothing else. Each of components/, contexts/, hooks/ and utils/ is split into the same domains — auth, category, chat, comment, dump, editor, feed, form, layout, player, playlist, profile, social, theme, ws — plus shared/ for what belongs to no one domain, so the chat is components/chat, contexts/chat, hooks/chat and utils/chat. components/ui becomes components/shared to match. Out of components/: useApiForm goes to hooks/form, chat's message.ts and time.ts to utils/chat (with chatDraft and chatText, now draft.ts and text.ts), the emoji skin tone to utils/editor, the remembered volume to utils/player; player/icons.tsx is PlayerIcons.tsx. components/form/index.ts is gone: everything is imported from its own file, FormProvider straight from react-hook-form, and expectOk sits beside friendlyFetchError in utils/shared/api.ts (apiError.ts), since pages that have no form used it too. Out of pages/: the index's feed views, tab bar and presence row move to components/feed; HotFeed and NewFeed, identical but for the sort, are one DumpFeed with an order prop, which also takes over MainFeedProps from pages/index/types.ts. App is a named export like everything else. Tests mirror the tree one file per module — test/<layer>/<domain>/<Module>.test.tsx — so the themed files (hooks/misc, data, editor, sync; utils/misc, text, storage, remote, journal; contexts/providers; pages/auth and UserSubpages; layout/Fabs) are split by subject, the setup each piece needs kept and the rest dropped; the floating-button test becomes one test per button, 627 tests now. The README states the rule. No behaviour changes; the catalogues only move their source references.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,8 +5,8 @@ import { i18n } from "@lingui/core";
|
||||
import { MemoryRouter, Route, Routes, useLocation } from "react-router";
|
||||
|
||||
import type { AuthResponse, Category } from "../model.ts";
|
||||
import { AuthContext } from "../contexts/AuthContext.ts";
|
||||
import { AuthProvider } from "../contexts/AuthProvider.tsx";
|
||||
import { AuthContext } from "../contexts/auth/AuthContext.ts";
|
||||
import { AuthProvider } from "../contexts/auth/AuthProvider.tsx";
|
||||
import {
|
||||
defaultWSChatValue,
|
||||
defaultWSPresenceValue,
|
||||
@@ -17,19 +17,19 @@ import {
|
||||
type WSContextValue,
|
||||
WSPresenceContext,
|
||||
type WSPresenceContextValue,
|
||||
} from "../contexts/WSContext.ts";
|
||||
import { WSProvider } from "../contexts/WSProvider.tsx";
|
||||
} from "../contexts/ws/WSContext.ts";
|
||||
import { WSProvider } from "../contexts/ws/WSProvider.tsx";
|
||||
import {
|
||||
defaultFollowValue,
|
||||
FollowContext,
|
||||
type FollowContextValue,
|
||||
} from "../contexts/FollowContext.ts";
|
||||
import { FollowProvider } from "../contexts/FollowProvider.tsx";
|
||||
} from "../contexts/social/FollowContext.ts";
|
||||
import { FollowProvider } from "../contexts/social/FollowProvider.tsx";
|
||||
import {
|
||||
CategoriesContext,
|
||||
type CategoriesContextValue,
|
||||
} from "../contexts/CategoriesContext.ts";
|
||||
import { CategoriesProvider } from "../contexts/CategoriesProvider.tsx";
|
||||
} from "../contexts/category/CategoriesContext.ts";
|
||||
import { CategoriesProvider } from "../contexts/category/CategoriesProvider.tsx";
|
||||
import {
|
||||
defaultPlayerTimeValue,
|
||||
defaultPlayerValue,
|
||||
@@ -37,10 +37,10 @@ import {
|
||||
type PlayerContextValue,
|
||||
PlayerTimeContext,
|
||||
type PlayerTimeValue,
|
||||
} from "../contexts/PlayerContext.ts";
|
||||
import { PlayerProvider } from "../contexts/PlayerProvider.tsx";
|
||||
import { ThemeProvider } from "../contexts/ThemeProvider.tsx";
|
||||
import { ChatProvider } from "../contexts/ChatProvider.tsx";
|
||||
} from "../contexts/player/PlayerContext.ts";
|
||||
import { PlayerProvider } from "../contexts/player/PlayerProvider.tsx";
|
||||
import { ThemeProvider } from "../contexts/theme/ThemeProvider.tsx";
|
||||
import { ChatProvider } from "../contexts/chat/ChatProvider.tsx";
|
||||
import { route } from "./fetch.ts";
|
||||
import { storeSession } from "./fixtures.ts";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user