Separate serve lib

src/pages/honkai3rd/battlesuits/[battlesuitId].tsx

@@ -12,6 +12,8 @@ import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator
 import {
   BattlesuitData,
   BattlesuitSkillGroup,
+} from '../../../lib/honkai3rd/battlesuits'
+import {
   getBattlesuitById,
   listBattlesuits,
 } from '../../../server/data/honkai3rd/battlesuits'

src/pages/honkai3rd/battlesuits/index.tsx

@@ -4,11 +4,13 @@ import { useMemo } from 'react'
 import FilterButton from '../../../components/atoms/FilterButton'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
+import { listBattlesuits } from '../../../server/data/honkai3rd/battlesuits'
 import {
   BattlesuitData,
-  listBattlesuits,
-} from '../../../server/data/honkai3rd/battlesuits'
-import { battlesuitStrengths } from '../../../lib/safeData'
+  battlesuitStrengths,
+  battlesuitTypes,
+  valkyries,
+} from '../../../lib/honkai3rd/battlesuits'
 import BattlesuitCard from '../../../components/molecules/BattlesuitCard'
 import { useRouter } from 'next/router'
 
@@ -24,31 +26,8 @@ interface BattlesuitListPageProps {
 const featureFilterOptions: { value: string; label: string; icon?: string }[] =
   [{ value: 'all', label: 'All' }, ...battlesuitStrengths]
 
-const valkyrieFilterOptions = [
-  { value: 'all', label: 'All' },
-  { value: 'mecha', icon: 'type-icons/mecha', label: 'Mecha' },
-  { value: 'biologic', icon: 'type-icons/biologic', label: 'Biologic' },
-  { value: 'psychic', icon: 'type-icons/psychic', label: 'Psychic' },
-  { value: 'quantum', icon: 'type-icons/quantum', label: 'Quantum' },
-  { value: 'imaginary', icon: 'type-icons/imaginary', label: 'Imaginary' },
-  { value: 'kiana', icon: 'valkyrie-icons/kiana', label: 'Kiana' },
-  { value: 'mei', icon: 'valkyrie-icons/mei', label: 'Mei' },
-  { value: 'bronya', icon: 'valkyrie-icons/bronya', label: 'Bronya' },
-  { value: 'himeko', icon: 'valkyrie-icons/himeko', label: 'Himeko' },
-  { value: 'theresa', icon: 'valkyrie-icons/theresa', label: 'Theresa' },
-  { value: 'fuhua', icon: 'valkyrie-icons/fuhua', label: 'Fu Hua' },
-  { value: 'rita', icon: 'valkyrie-icons/rita', label: 'Rita' },
-  { value: 'sakura', icon: 'valkyrie-icons/sakura', label: 'Sakura' },
-  { value: 'kallen', icon: 'valkyrie-icons/kallen', label: 'Kallen' },
-  { value: 'olenyevas', icon: 'valkyrie-icons/olenyevas', label: 'Olenyevas' },
-  { value: 'seele', icon: 'valkyrie-icons/seele', label: 'Seele' },
-  { value: 'durandal', icon: 'valkyrie-icons/durandal', label: 'Durandal' },
-  { value: 'fischl', icon: 'valkyrie-icons/fischl', label: 'Fischl' },
-  { value: 'elysia', icon: 'valkyrie-icons/elysia', label: 'Elysia' },
-  { value: 'mobius', icon: 'valkyrie-icons/mobius', label: 'Mobius' },
-  { value: 'raven', icon: 'valkyrie-icons/raven', label: 'Raven' },
-  { value: 'carole', icon: 'valkyrie-icons/carole', label: 'Carole' },
-]
+const valkyrieFilterOptions: { value: string; label: string; icon?: string }[] =
+  [{ value: 'all', label: 'All' }, ...battlesuitTypes, ...valkyries]
 
 const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
   const { query } = useRouter()

src/pages/honkai3rd/elfs/[elfId].tsx

@@ -4,11 +4,8 @@ import Image from 'next/image'
 import React from 'react'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
-import {
-  ElfData,
-  getElfById,
-  listElfs,
-} from '../../../server/data/honkai3rd/elfs'
+import { ElfData } from '../../../lib/honkai3rd/elfs'
+import { getElfById, listElfs } from '../../../server/data/honkai3rd/elfs'
 
 interface ElfShowPageProps {
   elf: ElfData

src/pages/honkai3rd/elfs/index.tsx

@@ -5,7 +5,8 @@ import { pick } from 'ramda'
 import React from 'react'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
-import { ElfData, listElfs } from '../../../server/data/honkai3rd/elfs'
+import { ElfData } from '../../../lib/honkai3rd/elfs'
+import { listElfs } from '../../../server/data/honkai3rd/elfs'
 
 interface ElfListPageProps {
   elfs: Pick<ElfData, 'id' | 'name'>[]

src/pages/honkai3rd/stigmata/[stigmataId].tsx

@@ -5,13 +5,12 @@ import Link from 'next/link'
 import React from 'react'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
+import { StigmataData, StigmataSet } from '../../../lib/honkai3rd/stigmata'
 import {
-  StigmataData,
   listStigmata,
   getStigmataById,
   getStigmataListBySetId,
   getStigmataSetBySetId,
-  StigmataSet,
 } from '../../../server/data/honkai3rd/stigmata'
 
 interface StigmataShowPageProps {

src/pages/honkai3rd/stigmata/index.tsx

@@ -5,10 +5,8 @@ import NextLink from 'next/link'
 import { pick } from 'ramda'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
-import {
-  StigmataData,
-  listStigmata,
-} from '../../../server/data/honkai3rd/stigmata'
+import { StigmataData } from '../../../lib/honkai3rd/stigmata'
+import { listStigmata } from '../../../server/data/honkai3rd/stigmata'
 
 interface StigmataListPageProps {
   stigmataDataList: Pick<StigmataData, 'id' | 'name' | 'rarity'>[]

src/pages/honkai3rd/versions/[versionId].tsx

@@ -7,25 +7,19 @@ import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator
 import {
   getVersion,
   listVersionData,
-  VersionData,
 } from '../../../server/data/honkai3rd/versions'
 import { format as formatDate } from 'date-fns'
-import {
-  BattlesuitData,
-  getBattlesuitById,
-} from '../../../server/data/honkai3rd/battlesuits'
+import { getBattlesuitById } from '../../../server/data/honkai3rd/battlesuits'
 import NextLink from 'next/link'
 import SquareImageBox from '../../../components/atoms/SquareImageBox'
-import {
-  getWeaponById,
-  WeaponData,
-} from '../../../server/data/honkai3rd/weapons'
+import { getWeaponById } from '../../../server/data/honkai3rd/weapons'
 import ScrollContainer from 'react-indiana-drag-scroll'
-import {
-  listSupplyEventsByVersion,
-  SupplyEventData,
-} from '../../../server/data/honkai3rd/supply-events'
+import { listSupplyEventsByVersion } from '../../../server/data/honkai3rd/supplyEvents'
 import { addDateToDateString, getDateString } from '../../../lib/string'
+import { BattlesuitData } from '../../../lib/honkai3rd/battlesuits'
+import { WeaponData } from '../../../lib/honkai3rd/weapons'
+import { SupplyEventData } from '../../../lib/honkai3rd/supplyEvents'
+import { VersionData } from '../../../lib/honkai3rd/versions'
 
 interface VersionShowPageProps {
   versionData: VersionData

src/pages/honkai3rd/versions/index.tsx

@@ -5,26 +5,20 @@ import SquareImageBox from '../../../components/atoms/SquareImageBox'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import GanttChart from '../../../components/organisms/GanttChart'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
-import {
-  BattlesuitData,
-  getBattlesuitById,
-} from '../../../server/data/honkai3rd/battlesuits'
-import {
-  listSupplyEventsByVersion,
-  SupplyEventData as SupplyEventData,
-} from '../../../server/data/honkai3rd/supply-events'
+import { getBattlesuitById } from '../../../server/data/honkai3rd/battlesuits'
+import { listSupplyEventsByVersion } from '../../../server/data/honkai3rd/supplyEvents'
 import {
   getCurrentVersion,
   listVersionData,
-  VersionData,
 } from '../../../server/data/honkai3rd/versions'
-import {
-  getWeaponById,
-  WeaponData,
-} from '../../../server/data/honkai3rd/weapons'
+import { getWeaponById } from '../../../server/data/honkai3rd/weapons'
 import { addDateToDateString, getDateString } from '../../../lib/string'
 import ScrollContainer from 'react-indiana-drag-scroll'
 import { format as formatDate } from 'date-fns'
+import { BattlesuitData } from '../../../lib/honkai3rd/battlesuits'
+import { WeaponData } from '../../../lib/honkai3rd/weapons'
+import { VersionData } from '../../../lib/honkai3rd/versions'
+import { SupplyEventData } from '../../../lib/honkai3rd/supplyEvents'
 
 interface VersionIndexPageProps {
   versionDataList: VersionData[]

src/pages/honkai3rd/weapons/[weaponId].tsx

@@ -3,10 +3,10 @@ import { NextPageContext } from 'next'
 import React from 'react'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
+import { WeaponData } from '../../../lib/honkai3rd/weapons'
 import {
   getWeaponById,
   listWeapons,
-  WeaponData,
 } from '../../../server/data/honkai3rd/weapons'
 
 interface WeaponShowPageProps {

src/pages/honkai3rd/weapons/index.tsx

@@ -3,12 +3,13 @@ import { Text, Box, Heading, Flex, Link } from '@theme-ui/components'
 import NextLink from 'next/link'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
-import { listWeapons, WeaponData } from '../../../server/data/honkai3rd/weapons'
+import { listWeapons } from '../../../server/data/honkai3rd/weapons'
 import { pick } from 'ramda'
 import SquareImageBox from '../../../components/atoms/SquareImageBox'
 import { useMemo } from 'react'
 import FilterButton from '../../../components/atoms/FilterButton'
 import { useRouter } from 'next/router'
+import { WeaponData } from '../../../lib/honkai3rd/weapons'
 
 type WeaponListItemData = Pick<
   WeaponData,