Reorganize files

xPaw · xPaw · commit a3e70682a4a9 · 2026-03-17T15:07:47.000+02:00
diff --git a/scripts/generate-sitemap.ts b/scripts/generate-sitemap.ts
@@ -2,9 +2,9 @@ import { readFileSync, writeFileSync, mkdirSync, rmSync } from "node:fs";
 import { gunzipSync } from "node:zlib";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import type { Declaration, SchemaMetadataEntry } from "../src/components/Docs/api.ts";
-import { parseSchemas, type SchemasJson } from "../src/components/schemas.ts";
-import { GAME_LIST } from "../src/gamesList.ts";
+import type { Declaration, SchemaMetadataEntry } from "../src/data/types.ts";
+import { parseSchemas, type SchemasJson } from "../src/data/schemas.ts";
+import { GAME_LIST } from "../src/games-list.ts";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const schemasDir = resolve(__dirname, "../schemas");
diff --git a/src/components/DeclarationsPage.tsx b/src/components/DeclarationsPage.tsx
@@ -5,13 +5,13 @@ import {
   DeclarationsContextType,
   ReferenceEntry,
   declarationKey,
-} from "./Docs/DeclarationsContext";
-import { Declaration, SchemaClass, SchemaFieldType } from "./Docs/api";
+} from "./schema/DeclarationsContext";
+import { Declaration, SchemaClass, SchemaFieldType } from "../data/types";
 import { GameId } from "../games";
 import { DeclarationsSidebar } from "./DeclarationsSidebar";
-import { ContentList } from "./Docs/ContentList";
+import { ContentList } from "./schema/ContentList";
 import { SidebarFilterContext } from "./layout/SidebarFilterContext";
-import { SearchContext } from "./Search/SearchContext";
+import { SearchContext } from "./search/SearchContext";
 import { NavBar } from "./layout/NavBar";
 
 function collectTypeKeys(type: SchemaFieldType, out: Set<string>) {
diff --git a/src/components/DeclarationsSidebar.tsx b/src/components/DeclarationsSidebar.tsx
@@ -3,11 +3,11 @@ import { useParams } from "react-router-dom";
 import { styled } from "@linaria/react";
 import { defaultRangeExtractor, useVirtualizer } from "@tanstack/react-virtual";
 import type { Range } from "@tanstack/react-virtual";
-import { DeclarationsContext } from "./Docs/DeclarationsContext";
-import { Declaration } from "./Docs/api";
+import { DeclarationsContext } from "./schema/DeclarationsContext";
+import { Declaration } from "../data/types";
 import { DeclarationSidebarElement, SidebarGroupHeader, SidebarWrapper } from "./layout/Sidebar";
 import { SidebarFilterContext } from "./layout/SidebarFilterContext";
-import { SearchInput } from "./Search";
+import { SearchInput } from "./search/SearchBox";
 import { GameSwitcher, S2VLogo } from "./layout/NavBar";
 
 type SidebarRow =
diff --git a/src/components/kind-icon/KindIcon.tsx b/src/components/kind-icon/KindIcon.tsx
diff --git a/src/components/kind-icon/metadataIconMap.ts b/src/components/kind-icon/metadataIconMap.ts
@@ -1,4 +1,4 @@
-import type { IconKind } from "./index";
+import type { IconKind } from "./KindIcon";
 
 export const metadataIconMap: Record<string, IconKind> = {
   MPropertyFriendlyName: "meta-tag",
diff --git a/src/components/layout/NavBar.tsx b/src/components/layout/NavBar.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { styled } from "@linaria/react";
 import { useNavigate, useLocation } from "react-router-dom";
 import { AppContext } from "../AppContext";
-import { SearchBox } from "../Search";
+import { SearchBox } from "../search/SearchBox";
 import { GAMES, GameId, getGame } from "../../games";
 
 export const NavBar = ({ baseUrl, onMenuClick }: { baseUrl: string; onMenuClick?: () => void }) => {
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
@@ -1,9 +1,9 @@
 import React, { useContext } from "react";
 import { NavLink } from "react-router-dom";
 import { styled } from "@linaria/react";
-import { IconKind, KindIcon } from "../KindIcon";
-import { Declaration } from "../Docs/api";
-import { DeclarationsContext, declarationPath } from "../Docs/DeclarationsContext";
+import { IconKind, KindIcon } from "../kind-icon/KindIcon";
+import { Declaration } from "../../data/types";
+import { DeclarationsContext, declarationPath } from "../schema/DeclarationsContext";
 
 // @ts-expect-error Linaria styled() doesn't support ForwardRefExoticComponent
 const SidebarLink = styled(NavLink)`
diff --git a/src/components/schema/ClassTree.tsx b/src/components/schema/ClassTree.tsx
@@ -1,7 +1,7 @@
 import { useContext, useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import { styled } from "@linaria/react";
-import { SchemaClass } from "./api";
+import { SchemaClass } from "../../data/types";
 import { DeclarationsContext, declarationKey, declarationPath } from "./DeclarationsContext";
 
 interface TreeNode {
diff --git a/src/components/schema/ColoredSyntax.tsx b/src/components/schema/ColoredSyntax.tsx
diff --git a/src/components/schema/ContentList.tsx b/src/components/schema/ContentList.tsx
@@ -3,19 +3,19 @@ import { useNavigate } from "react-router-dom";
 import { styled } from "@linaria/react";
 import { ContentWrapper, ListItem, TextMessage } from "../layout/Content";
 import { LazyList, ScrollableList } from "../Lists";
-import { useFilteredData, useParsedSearch, searchDeclarations } from "./utils/filtering";
+import { useFilteredData, useParsedSearch, searchDeclarations } from "../../utils/filtering";
 import { SchemaClassView } from "./SchemaClass";
 import { SchemaEnumView } from "./SchemaEnum";
 import { ClassTree } from "./ClassTree";
-import { Declaration } from "./api";
+import { Declaration } from "../../data/types";
 import {
   DeclarationsContext,
   DeclarationsContextType,
   declarationKey,
 } from "./DeclarationsContext";
 import { GAMES, GameId } from "../../games";
-import { SEARCH_TAGS } from "../Search";
-import { KindIcon } from "../KindIcon";
+import { SEARCH_TAGS } from "../search/SearchBox";
+import { KindIcon } from "../kind-icon/KindIcon";
 
 const CardBlock = styled.div`
   max-width: 560px;
diff --git a/src/components/schema/CrossGameRefs.tsx b/src/components/schema/CrossGameRefs.tsx
@@ -1,9 +1,9 @@
 import React, { useContext } from "react";
 import { styled } from "@linaria/react";
-import { Declaration, SchemaClass, SchemaEnum, SchemaFieldType, SchemaMetadataEntry } from "./api";
+import { Declaration, SchemaClass, SchemaEnum, SchemaFieldType, SchemaMetadataEntry } from "../../data/types";
 import { DeclarationsContext, declarationPath } from "./DeclarationsContext";
 import { GAMES, GameId } from "../../games";
-import { SectionWrapper, SectionTitle, SectionList, SectionLink } from "./utils/styles";
+import { SectionWrapper, SectionTitle, SectionList, SectionLink } from "./styles";
 
 type DiffStatus = "identical" | "offsets_only" | "differs";
 
diff --git a/src/components/schema/DeclarationsContext.ts b/src/components/schema/DeclarationsContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from "react";
-import { Declaration, SchemaClass } from "./api";
-import { SchemaMetadata } from "../data";
+import { Declaration, SchemaClass } from "../../data/types";
+import { SchemaMetadata } from "../../data/loader";
 import { GameId } from "../../games";
 
 export type ReferenceEntry = {
diff --git a/src/components/schema/ReferencedBy.tsx b/src/components/schema/ReferencedBy.tsx
@@ -1,14 +1,14 @@
 import { useContext, useEffect, useState } from "react";
 import { styled } from "@linaria/react";
 import { DeclarationsContext, declarationKey, declarationPath } from "./DeclarationsContext";
-import { KindIcon } from "../KindIcon";
+import { KindIcon } from "../kind-icon/KindIcon";
 import {
   SectionWrapper,
   SectionTitle,
   SectionList,
   SectionLink,
   SectionToggle,
-} from "./utils/styles";
+} from "./styles";
 
 const COLLAPSE_THRESHOLD = 8;
 
diff --git a/src/components/schema/SchemaClass.tsx b/src/components/schema/SchemaClass.tsx
@@ -1,17 +1,17 @@
 import React, { useContext, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { styled } from "@linaria/react";
-import * as api from "./api";
+import * as api from "../../data/types";
 import { SchemaTypeView, MetadataTags } from "./SchemaType";
 import { ReferencedBy } from "./ReferencedBy";
 import { CrossGameRefs } from "./CrossGameRefs";
-import { KindIcon } from "../KindIcon";
+import { KindIcon } from "../kind-icon/KindIcon";
 import { DeclarationsContext, declarationKey, declarationPath } from "./DeclarationsContext";
 import { getGame } from "../../games";
-import { useFieldParam } from "./utils/filtering";
-import { formatHexOffset } from "./utils/format";
-import { computeBitfieldInfo, type BitfieldInfo } from "./utils/bitfields";
-import { useAnchoredRow } from "./utils/useAnchoredRow";
+import { useFieldParam } from "../../utils/filtering";
+import { formatHexOffset } from "../../utils/format";
+import { computeBitfieldInfo, type BitfieldInfo } from "../../utils/bitfields";
+import { useAnchoredRow } from "./useAnchoredRow";
 import {
   AnchorName,
   CommonGroupMembers,
@@ -27,7 +27,7 @@ import {
   SectionTitle,
   SectionToggle,
   SectionWrapper,
-} from "./utils/styles";
+} from "./styles";
 
 const ClassMembers = styled(CommonGroupMembers)`
   > :not(:last-child) {
diff --git a/src/components/schema/SchemaEnum.tsx b/src/components/schema/SchemaEnum.tsx
@@ -1,18 +1,18 @@
-import * as api from "./api";
+import * as api from "../../data/types";
 import React, { useContext, useMemo } from "react";
 import { useNavigate } from "react-router-dom";
 import { styled } from "@linaria/react";
-import { ColoredSyntax } from "../ColoredSyntax";
-import { KindIcon } from "../KindIcon";
+import { ColoredSyntax } from "./ColoredSyntax";
+import { KindIcon } from "../kind-icon/KindIcon";
 import { DeclarationsContext, declarationPath } from "./DeclarationsContext";
 import { MetadataTags } from "./SchemaType";
-import { formatEnumHex } from "./utils/format";
-import { isFlagEnum, getBaseFlags, decomposeFlags, type BaseFlags } from "./utils/enum-flags";
+import { formatEnumHex } from "../../utils/format";
+import { isFlagEnum, getBaseFlags, decomposeFlags, type BaseFlags } from "../../utils/enum-flags";
 import { ReferencedBy } from "./ReferencedBy";
 import { CrossGameRefs } from "./CrossGameRefs";
 import { ModuleBadge, GitHubFileLink } from "./SchemaClass";
-import { useFieldParam } from "./utils/filtering";
-import { useAnchoredRow } from "./utils/useAnchoredRow";
+import { useFieldParam } from "../../utils/filtering";
+import { useAnchoredRow } from "./useAnchoredRow";
 import {
   AnchorName,
   CommonGroupMembers,
@@ -24,7 +24,7 @@ import {
   GridIcon,
   MemberSignature,
   SectionBadge,
-} from "./utils/styles";
+} from "./styles";
 
 const AlignmentBadge = styled(SectionBadge)`
   color: var(--syntax-literal);
diff --git a/src/components/schema/SchemaType.tsx b/src/components/schema/SchemaType.tsx
@@ -1,10 +1,10 @@
 import { useContext, useEffect, useMemo, useState } from "react";
 import { NavLink, type NavigateFunction } from "react-router-dom";
 import { styled } from "@linaria/react";
-import { SchemaFieldType, SchemaMetadataEntry } from "./api";
-import { ColoredSyntax } from "../ColoredSyntax";
-import { KindIcon } from "../KindIcon";
-import { metadataIconMap } from "../KindIcon/metadataIconMap";
+import { SchemaFieldType, SchemaMetadataEntry } from "../../data/types";
+import { ColoredSyntax } from "./ColoredSyntax";
+import { KindIcon } from "../kind-icon/KindIcon";
+import { metadataIconMap } from "../kind-icon/metadataIconMap";
 import { DeclarationsContext, declarationPath } from "./DeclarationsContext";
 
 const AngleBracket = styled.span`
diff --git a/src/components/schema/styles.tsx b/src/components/schema/styles.tsx
diff --git a/src/components/schema/useAnchoredRow.ts b/src/components/schema/useAnchoredRow.ts
diff --git a/src/components/search/SearchBox.tsx b/src/components/search/SearchBox.tsx
@@ -2,8 +2,8 @@ import React, { useContext, useEffect, useMemo, useRef, useState, useTransition
 import { useLocation, useNavigate } from "react-router-dom";
 import { styled } from "@linaria/react";
 import { SearchContext } from "./SearchContext";
-import { DeclarationsContext } from "../Docs/DeclarationsContext";
-import { KindIcon, IconKind } from "../KindIcon";
+import { DeclarationsContext } from "../schema/DeclarationsContext";
+import { KindIcon, IconKind } from "../kind-icon/KindIcon";
 
 export function useCtrlFHook<T extends HTMLElement>() {
   const ref = useRef<T | null>(null);
diff --git a/src/components/search/SearchContext.ts b/src/components/search/SearchContext.ts
diff --git a/src/data/loader.ts b/src/data/loader.ts
@@ -1,4 +1,4 @@
-import { Declaration } from "./Docs/api";
+import { Declaration } from "./types";
 import { GameId } from "../games";
 import { parseSchemas, type SchemasJson, type SchemaMetadata } from "./schemas";
 export type { SchemasJson, SchemaMetadata };
diff --git a/src/data/schemas.ts b/src/data/schemas.ts
@@ -1,4 +1,4 @@
-import type { Declaration, SchemaFieldType, SchemaMetadataEntry } from "./Docs/api.ts";
+import type { Declaration, SchemaFieldType, SchemaMetadataEntry } from "./types.ts";
 
 export interface RawSchemaClass {
   name: string;
diff --git a/src/data/types.ts b/src/data/types.ts
diff --git a/src/games-list.ts b/src/games-list.ts
diff --git a/src/games.tsx b/src/games.tsx
@@ -1,8 +1,8 @@
 import React from "react";
-import { GAME_LIST, type GameDef, type GameId } from "./gamesList";
+import { GAME_LIST, type GameDef, type GameId } from "./games-list";
 
 export type { GameId, GameDef };
-export { GAME_LIST, isGameId } from "./gamesList";
+export { GAME_LIST, isGameId } from "./games-list";
 
 export type Game = GameDef & { icon: React.ReactNode };
 
diff --git a/src/index.tsx b/src/index.tsx
@@ -3,9 +3,9 @@ import { createRoot } from "react-dom/client";
 import { HashRouter, Navigate, Route, Routes, useParams } from "react-router-dom";
 import { styled } from "@linaria/react";
 import { AppContext } from "./components/AppContext";
-import { Declaration } from "./components/Docs/api";
+import { Declaration } from "./data/types";
 import { isGameId, GameId, GAMES, getGame } from "./games";
-import { loadGameSchemas, type SchemaMetadata } from "./components/data";
+import { loadGameSchemas, type SchemaMetadata } from "./data/loader";
 import DeclarationsPage from "./components/DeclarationsPage";
 import "./global.css";
 
diff --git a/src/utils/bitfields.test.ts b/src/utils/bitfields.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 import { computeBitfieldInfo } from "./bitfields";
-import type { SchemaField } from "../api";
+import type { SchemaField } from "../data/types";
 
 function makeField(
   name: string,
diff --git a/src/utils/bitfields.ts b/src/utils/bitfields.ts
@@ -1,4 +1,4 @@
-import type { SchemaField } from "../api";
+import type { SchemaField } from "../data/types";
 
 export interface BitfieldInfo {
   bitOffset: number;
diff --git a/src/utils/enum-flags.test.ts b/src/utils/enum-flags.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 import { isFlagEnum, getBaseFlags, decomposeFlags } from "./enum-flags";
-import type { SchemaEnumMember } from "../api";
+import type { SchemaEnumMember } from "../data/types";
 
 const m = (name: string, value: number): SchemaEnumMember => ({
   name,
diff --git a/src/utils/enum-flags.ts b/src/utils/enum-flags.ts
@@ -1,4 +1,4 @@
-import type { SchemaEnumMember } from "../api";
+import type { SchemaEnumMember } from "../data/types";
 
 const isPowerOf2 = (n: number) => n > 0 && (n & (n - 1)) === 0;
 
diff --git a/src/utils/filtering.test.ts b/src/utils/filtering.test.ts
@@ -9,8 +9,8 @@ import {
   searchDeclarations,
   EMPTY_PARSED,
 } from "./filtering";
-import type { SchemaClass, SchemaEnum } from "../api";
-import { parseSchemas, type SchemasJson } from "../../schemas";
+import type { SchemaClass, SchemaEnum } from "../data/types";
+import { parseSchemas, type SchemasJson } from "../data/schemas";
 import testSchemas from "./test-schemas.json";
 
 // -- Load test schema fixture (subset of CS2 schemas, frozen for test stability) --
diff --git a/src/utils/filtering.tsx b/src/utils/filtering.tsx
@@ -1,7 +1,7 @@
 import { useContext, useMemo } from "react";
 import { useLocation, useParams } from "react-router-dom";
-import { SearchContext } from "../../Search/SearchContext";
-import * as api from "../api";
+import { SearchContext } from "../components/search/SearchContext";
+import * as api from "../data/types";
 
 export interface ParsedSearch {
   nameWords: string[];
diff --git a/src/utils/format.test.ts b/src/utils/format.test.ts
diff --git a/src/utils/format.ts b/src/utils/format.ts
diff --git a/src/utils/test-schemas.json b/src/utils/test-schemas.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { IconKind } from "./index";`
	`1`	`+import type { IconKind } from "./KindIcon";`
`2`	`2`
`3`	`3`	`export const metadataIconMap: Record<string, IconKind> = {`
`4`	`4`	`MPropertyFriendlyName: "meta-tag",`