Optional route params

Author: jonkafton

frontends/main/src/app/search/page.tsx

@@ -1,16 +1,9 @@
 import React from "react"
 import { getMetadataAsync } from "@/common/metadata"
 import SearchPage from "@/app-pages/SearchPage/SearchPage"
+import type { PageParams } from "@/app/types"
 
-type SearchParams = {
-  [key: string]: string | string[] | undefined
-}
-
-export async function generateMetadata({
-  searchParams,
-}: {
-  searchParams: Promise<SearchParams>
-}) {
+export async function generateMetadata({ searchParams }: PageParams) {
   return await getMetadataAsync({
     title: "Search",
     searchParams,
@@ -29,7 +22,8 @@ export async function generateMetadata({
  */
 export const dynamic = "force-dynamic"
 
-const Page: React.FC = () => {
+const Page: React.FC = ({ searchParams }: PageParams) => {
+  console.log("searchParams", searchParams)
   return <SearchPage />
 }
 

frontends/main/src/app/types.d.ts

@@ -2,7 +2,16 @@ export type SearchParams = {
   [key: string]: string | string[] | undefined
 }
 
-export type PageParams<RouteParams = Record<string, never>> = {
-  params?: Promise<RouteParams>
+type PageParamsWithRouteParams<RouteParams> = {
+  params: Promise<RouteParams>
   searchParams?: Promise<SearchParams>
 }
+
+type PageParamsWithoutRouteParams = {
+  searchParams?: Promise<SearchParams>
+}
+
+export type PageParams<RouteParams = Record<string, never>> =
+  RouteParams extends Record<string, never>
+    ? PageParamsWithoutRoute
+    : PageParamsWithRoute<RouteParams>