Improve project structure.

ava.config.js

@@ -7,7 +7,7 @@ module.exports = {
     "ts-node/register/transpile-only",
     "reflect-metadata",
     "./src/server/lib/env.ts",
-    "./src/server/__helper__/polyfills.ts"
+    "./src/server/__helpers__/polyfills.ts"
   ],
   environmentVariables: {
     "TS_NODE_PROJECT": "tsconfig.ava.json"

src/component/Anchor/Anchor.tsx → src/components/Anchor/Anchor.tsx

@@ -4,9 +4,9 @@ import {forwardRef, useMemo} from "react"
 import Link from "next/link"
 import cn from "clsx"
 
-import {isInternalUrl} from "lib/util/isInternalUrl"
+import {isInternalUrl} from "lib/utils/isInternalUrl"
 
-import {ExternalAnchor} from "component/Anchor/ExternalAnchor"
+import {ExternalAnchor} from "components/Anchor/ExternalAnchor"
 
 interface Props extends ComponentPropsWithoutRef<"a"> {
   href: string

src/component/ConfirmationDialog.tsx → src/components/ConfirmationDialog.tsx

@@ -2,11 +2,11 @@ import {useEvent} from "react-use-event-hook"
 import {useRef, createElement} from "react"
 import type {FC, ReactNode} from "react"
 
-import type {MaybePromise} from "lib/type/MaybePromise"
+import type {MaybePromise} from "lib/types/MaybePromise"
 
-import type {ModalRef, BaseModalProps} from "component/Modal"
-import {Modal, ModalPanel, ModalTitle} from "component/Modal"
-import {Button} from "component/Button"
+import type {ModalRef, BaseModalProps} from "components/Modal"
+import {Modal, ModalPanel, ModalTitle} from "components/Modal"
+import {Button} from "components/Button"
 
 interface ConfirmButtonProps {
   confirm(): void

src/component/FloatingButton.tsx → src/components/FloatingButton.tsx

@@ -3,7 +3,7 @@ import {Plus} from "lucide-react"
 
 import cn from "clsx"
 
-import {Button} from "component/Button"
+import {Button} from "components/Button"
 
 interface Props extends Omit<ComponentPropsWithoutRef<"button">, "type" | "color"> { }
 

src/component/Modal/Modal.tsx → src/components/Modal/Modal.tsx

@@ -10,7 +10,7 @@ import type {FC, ReactNode} from "react"
 import {useEvent} from "react-use-event-hook"
 import {Dialog} from "@headlessui/react"
 
-import type {MaybeUndefined} from "lib/type/MaybeUndefined"
+import type {MaybeUndefined} from "lib/types/MaybeUndefined"
 
 import {ModalContext} from "./ModalContext"
 

src/component/NoteCard.tsx → src/components/NoteCard.tsx

@@ -6,13 +6,13 @@ import type {FC} from "react"
 import cn from "clsx"
 import Link from "next/link"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "server/trpc/types/common/NoteStatus"
 
-import {patchNodeStatus} from "lib/util/patchNoteStatus"
+import {patchNodeStatus} from "lib/utils/patchNoteStatus"
 import {client} from "lib/trpc/client"
 
-import {Card} from "component/Card"
-import {useNoteStateSnapshot, useNoteStateProxy} from "context/NoteStateContext"
+import {Card} from "components/Card"
+import {useNoteStateSnapshot, useNoteStateProxy} from "contexts/NoteStateContext"
 
 interface Props { }
 

src/component/NoteCompleteButton.tsx → src/components/NoteCompleteButton.tsx

@@ -5,15 +5,15 @@ import type {FC} from "react"
 
 import cn from "clsx"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "../server/trpc/types/common/NoteStatus"
 
-import {patchNodeStatus} from "lib/util/patchNoteStatus"
-import {client} from "lib/trpc/client"
+import {patchNodeStatus} from "../lib/utils/patchNoteStatus"
+import {client} from "../lib/trpc/client"
 
 import {
   useNoteStateSnapshot,
   useNoteStateProxy
-} from "context/NoteStateContext"
+} from "../contexts/NoteStateContext"
 
 interface Props {
   className?: string

src/component/NoteControls/NoteControls.tsx → src/components/NoteControls/NoteControls.tsx

@@ -2,7 +2,7 @@ import type {FC} from "react"
 
 import cn from "clsx"
 
-import {useNoteStateSnapshot} from "context/NoteStateContext"
+import {useNoteStateSnapshot} from "contexts/NoteStateContext"
 
 import {PauseButton} from "./PauseButton"
 import {PlayButton} from "./PlayButton"

src/component/NoteControls/PauseButton.tsx → src/components/NoteControls/PauseButton.tsx

@@ -1,6 +1,6 @@
 import {Pause} from "lucide-react"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "server/trpc/types/common/NoteStatus"
 
 import {createControlButton} from "./createControlButton"
 

src/component/NoteControls/PlayButton.tsx → src/components/NoteControls/PlayButton.tsx

@@ -1,6 +1,6 @@
 import {Play} from "lucide-react"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "server/trpc/types/common/NoteStatus"
 
 import {createControlButton} from "./createControlButton"
 

src/component/NoteControls/StopButton.tsx → src/components/NoteControls/StopButton.tsx

@@ -1,6 +1,6 @@
 import {Square} from "lucide-react"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "server/trpc/types/common/NoteStatus"
 
 import {createControlButton} from "./createControlButton"
 

src/component/NoteControls/createControlButton.tsx → src/components/NoteControls/createControlButton.tsx

@@ -3,12 +3,12 @@ import type {ComponentPropsWithoutRef} from "react"
 import type {LucideIcon} from "lucide-react"
 import {toast} from "react-hot-toast"
 
-import {NoteStatus} from "server/trpc/type/common/NoteStatus"
+import {NoteStatus} from "server/trpc/types/common/NoteStatus"
 
 import {client} from "lib/trpc/client"
-import {patchNodeStatus} from "lib/util/patchNoteStatus"
+import {patchNodeStatus} from "lib/utils/patchNoteStatus"
 
-import {useNoteStateProxy, useNoteStateSnapshot} from "context/NoteStateContext"
+import {useNoteStateProxy, useNoteStateSnapshot} from "contexts/NoteStateContext"
 
 import cn from "clsx"
 

src/component/NoteModal/NoteCreateModal/NoteCreateModal.tsx → src/components/NoteModal/NoteCreateModal/NoteCreateModal.tsx

@@ -6,12 +6,12 @@ import type {FC} from "react"
 
 import isString from "lodash/isString"
 
-import {NoteCreateInput} from "server/trpc/type/input/NoteCreateInput"
-import type {INoteCreateInput} from "server/trpc/type/input/NoteCreateInput"
+import {NoteCreateInput} from "server/trpc/types/note/NoteCreateInput"
+import type {INoteCreateInput} from "server/trpc/types/note/NoteCreateInput"
 
 import {client} from "lib/trpc/client"
 
-import {useNotesStateProxy} from "context/NotesStateContext"
+import {useNotesStateProxy} from "contexts/NotesStateContext"
 
 import {createNoteModal} from "../createNoteModal"
 

src/component/NoteModal/NoteCreateModal/Open.tsx → src/components/NoteModal/NoteCreateModal/Open.tsx

@@ -1,6 +1,6 @@
-import type {OpenModalButton} from "component/Modal"
+import type {OpenModalButton} from "components/Modal"
 
-import {FloatingButton} from "component/FloatingButton"
+import {FloatingButton} from "components/FloatingButton"
 
 export const Open: OpenModalButton = ({open}) => (
   <FloatingButton onClick={open} aria-label="Create a note" />

src/component/NoteModal/NoteUpdateModal/NoteUpdateModal.tsx → src/components/NoteModal/NoteUpdateModal/NoteUpdateModal.tsx

@@ -5,12 +5,12 @@ import type {FC} from "react"
 
 import merge from "lodash/merge"
 
-import {NoteUpdateInput} from "server/trpc/type/input/NoteUpdateInput"
-import type {INoteUpdateInput} from "server/trpc/type/input/NoteUpdateInput"
+import {NoteUpdateInput} from "server/trpc/types/note/NoteUpdateInput"
+import type {INoteUpdateInput} from "server/trpc/types/note/NoteUpdateInput"
 
 import {client} from "lib/trpc/client"
 
-import {useNoteStateProxy, useNoteStateSnapshot} from "context/NoteStateContext"
+import {useNoteStateProxy, useNoteStateSnapshot} from "contexts/NoteStateContext"
 
 import {createNoteModal} from "../createNoteModal"
 

src/component/NoteModal/NoteUpdateModal/Open.tsx → src/components/NoteModal/NoteUpdateModal/Open.tsx

@@ -1,6 +1,6 @@
 import {Pencil} from "lucide-react"
 
-import type {OpenModalButton} from "component/Modal"
+import type {OpenModalButton} from "components/Modal"
 
 export const Open: OpenModalButton = ({open}) => (
   <button type="button" aria-label="Edit the note" onClick={open}>

src/component/NoteModal/createNoteModal.tsx → src/components/NoteModal/createNoteModal.tsx

@@ -9,11 +9,11 @@ import TextArea from "react-textarea-autosize"
 import isEmpty from "lodash/isEmpty"
 import omitBy from "lodash/omitBy"
 
-import {INoteCreateInput} from "server/trpc/type/input/NoteCreateInput"
+import {INoteCreateInput} from "server/trpc/types/note/NoteCreateInput"
 
-import type {ModalRef, BaseModalProps} from "component/Modal"
-import {Modal, ModalPanel, ModalTitle} from "component/Modal"
-import {Button} from "component/Button"
+import type {ModalRef, BaseModalProps} from "components/Modal"
+import {Modal, ModalPanel, ModalTitle} from "components/Modal"
+import {Button} from "components/Button"
 
 type BlockReturnHandler = KeyboardEventHandler<HTMLTextAreaElement>
 

src/component/NoteRemoveDialog/Cancel.tsx → src/components/NoteRemoveDialog/Cancel.tsx

@@ -1,8 +1,8 @@
 /* eslint-disable react/prop-types */
 
-import type {CancelButton} from "component/ConfirmationDialog"
+import type {CancelButton} from "components/ConfirmationDialog"
 
-import {Button} from "component/Button"
+import {Button} from "components/Button"
 
 export const Cancel: CancelButton = ({close}) => (
   <Button onClick={close} variant="primary" aria-label="Cancel">

src/component/NoteRemoveDialog/Confirm.tsx → src/components/NoteRemoveDialog/Confirm.tsx

@@ -1,8 +1,8 @@
 /* eslint-disable react/prop-types */
 
-import type {ConfirmButton} from "component/ConfirmationDialog"
+import type {ConfirmButton} from "components/ConfirmationDialog"
 
-import {Button} from "component/Button"
+import {Button} from "components/Button"
 
 export const Confirm: ConfirmButton = ({confirm}) => (
   <Button onClick={confirm} variant="secondary" color="red" aria-label="Confirm">

src/component/NoteRemoveDialog/NoteRemoveDialog.tsx → src/components/NoteRemoveDialog/NoteRemoveDialog.tsx

@@ -6,9 +6,9 @@ import type {FC} from "react"
 
 import {client} from "lib/trpc/client"
 
-import {useNoteStateSnapshot} from "context/NoteStateContext"
+import {useNoteStateSnapshot} from "contexts/NoteStateContext"
 
-import {ConfirmationDialog} from "component/ConfirmationDialog"
+import {ConfirmationDialog} from "components/ConfirmationDialog"
 
 import {Open} from "./Open"
 import {Cancel} from "./Cancel"

src/component/NoteRemoveDialog/Open.tsx → src/components/NoteRemoveDialog/Open.tsx

@@ -2,7 +2,7 @@
 
 import {Trash} from "lucide-react"
 
-import type {OpenModalButton} from "component/Modal"
+import type {OpenModalButton} from "components/Modal"
 
 export const Open: OpenModalButton = ({open}) => (
   <button type="button" onClick={open} aria-label="Remove the note">

src/context/FakeNotesContext.tsx → src/contexts/FakeNotesContext.tsx

@@ -1,7 +1,7 @@
 import type {FC, ReactNode} from "react"
 import {useRef} from "react"
 
-import type {ONotesPageOutput} from "server/trpc/type/output/NotesPageOutput"
+import type {ONotesPageOutput} from "../server/trpc/types/note/NotesPageOutput"
 
 import {NotesStateContextProvider} from "./NotesStateContext"
 

src/context/NoteStateContext.tsx → src/contexts/NoteStateContext.tsx

@@ -1,6 +1,6 @@
-import type {ONoteOutput} from "server/trpc/type/output/NoteOutput"
+import type {ONoteOutput} from "../server/trpc/types/note/NoteOutput"
 
-import {createStateContext} from "lib/context/createStateContext"
+import {createStateContext} from "../lib/contexts/createStateContext"
 
 export const {
   StateContext: NoteStateContext,

src/context/NotesStateContext.tsx → src/contexts/NotesStateContext.tsx

@@ -1,6 +1,6 @@
-import type {ONotesPageOutput} from "server/trpc/type/output/NotesPageOutput"
+import type {ONotesPageOutput} from "../server/trpc/types/note/NotesPageOutput"
 
-import {createStateContext} from "lib/context/createStateContext"
+import {createStateContext} from "../lib/contexts/createStateContext"
 
 export const {
   StateContext: NotesStateContext,

src/lib/context/createStateContext.tsx → src/lib/contexts/createStateContext.tsx

@@ -3,7 +3,7 @@ import {useMemo, useContext, createContext} from "react"
 import type {FC, ReactNode, Context} from "react"
 import {proxy, useSnapshot} from "valtio"
 
-import {MaybeUndefined} from "lib/type/MaybeUndefined"
+import {MaybeUndefined} from "../types/MaybeUndefined"
 
 type UseSnapshotOptions = Parameters<typeof useSnapshot>[1]
 

src/lib/hook/useSearchParams.ts → src/lib/hooks/useSearchParams.ts

@@ -1,15 +1,13 @@
 import {useRouter} from "next/router"
 import {useMemo} from "react"
 
-import isEmpty from "lodash/isEmpty"
-
 export function useSearchParams(): URLSearchParams | null {
   const router = useRouter()
 
   return useMemo<URLSearchParams | null>(() => {
     const {searchParams} = new URL(router.asPath, "https://localhost")
 
-    if (isEmpty([...searchParams])) {
+    if (!searchParams.size) {
       return null
     }
 

src/lib/trpc/client.ts

@@ -2,9 +2,9 @@ import {httpBatchLink, createTRPCProxyClient} from "@trpc/client"
 
 import Superjson from "superjson"
 
-import {serverAddress} from "lib/util/serverAddress"
+import {serverAddress} from "../utils/serverAddress"
 
-import type {Router} from "server/trpc/router"
+import type {Router} from "../../server/trpc/router"
 
 export const client = createTRPCProxyClient<Router>({
   transformer: Superjson,

src/lib/trpc/server.ts

@@ -1,5 +1,5 @@
-import type {Caller} from "server/trpc/router"
-import {router} from "server/trpc/router"
+import {createCaller as routerCreateCaller} from "../../server/trpc/router"
+import type {Caller} from "../../server/trpc/router"
 
 interface CallerImplementation<TResult, TArgs extends readonly unknown[]> {
   (trpc: Caller, ...args: TArgs): TResult
@@ -19,7 +19,7 @@ interface DecoratedCaller<TResult, TArgs extends readonly unknown[]> {
 export function createCaller<TResult, TArgs extends readonly unknown[]>(
   caller: CallerImplementation<TResult, TArgs>
 ): DecoratedCaller<TResult, TArgs> {
-  const trpc = router.createCaller({})
+  const trpc = routerCreateCaller({})
 
   return function decoratedCaller(...args: TArgs): TResult {
     return caller(trpc, ...args)

src/lib/util/formatRelative.ts → src/lib/utils/formatRelative.ts

@@ -11,7 +11,7 @@ import {
   differenceInHours
 } from "date-fns"
 
-import type {RawDate} from "lib/type/RawDate"
+import type {RawDate} from "lib/types/RawDate"
 
 import {formatTime, TIME_FORMAT} from "./formatTime"
 

src/lib/util/getPageDataStaticProps.ts → src/lib/utils/getPageDataStaticProps.ts

@@ -5,7 +5,7 @@ import {stringify} from "superjson"
 import type {
   PageDataProps,
   SerializedPageDataProps
-} from "lib/type/PageDataProps"
+} from "lib/types/PageDataProps"
 
 export interface GetPageDataStaticProps {
   <

src/lib/util/patchNoteStatus.ts → src/lib/utils/patchNoteStatus.ts

@@ -1,9 +1,9 @@
 import merge from "lodash/merge"
 import pick from "lodash/pick"
 
-import type {PickKeys} from "lib/type/PickKeys"
+import type {PickKeys} from "lib/types/PickKeys"
 
-import type {ONoteBaseOutput} from "server/trpc/type/output/NoteBaseOutput"
+import type {ONoteBaseOutput} from "server/trpc/types/note/NoteBaseOutput"
 
 type Statuses = PickKeys<ONoteBaseOutput, "status" | "isCompleted" | "isInProgress" | "isRejected" | "isPaused">
 

src/pages/404.tsx

@@ -2,7 +2,7 @@ import type {FC} from "react"
 
 import Link from "next/link"
 
-import {BaseLayout} from "layout/BaseLayout"
+import {BaseLayout} from "../layouts/BaseLayout"
 
 const NotFound: FC = () => (
   <BaseLayout>

src/pages/_app.tsx

@@ -7,10 +7,10 @@ import type {FC} from "react"
 import Head from "next/head"
 import isString from "lodash/isString"
 
-import "style/tailwind.css"
-import "style/global.css"
+import "styles/tailwind.css"
+import "styles/global.css"
 
-import type {SerializedPageDataProps} from "lib/type/PageDataProps"
+import type {SerializedPageDataProps} from "../lib/types/PageDataProps"
 
 interface PageProps extends SerializedPageDataProps { }
 

src/pages/api/trpc/[trpc].ts

@@ -1,6 +1,6 @@
 import {createNextApiHandler} from "@trpc/server/adapters/next"
 
-import {createContext} from "server/trpc/context"
-import {router} from "server/trpc/router"
+import {createContext} from "../../../server/trpc/context"
+import {router} from "../../../server/trpc/router"
 
 export default createNextApiHandler({router, createContext})