refactor: types

Author: wackerow

app/[locale]/[...slug]/page.tsx

@@ -6,6 +6,8 @@ import {
   setRequestLocale,
 } from "next-intl/server"
 
+import { SlugPageParams } from "@/lib/types"
+
 import I18nProvider from "@/components/I18nProvider"
 import mdComponents from "@/components/MdComponents"
 
@@ -27,7 +29,7 @@ const loadData = dataLoader([["gfissues", fetchGFIs]])
 export default async function Page({
   params,
 }: {
-  params: Promise<{ locale: string; slug: string[] }>
+  params: Promise<SlugPageParams>
 }) {
   const { locale, slug: slugArray } = await params
 
@@ -109,7 +111,7 @@ export async function generateStaticParams() {
 export async function generateMetadata({
   params,
 }: {
-  params: Promise<{ locale: string; slug: string[] }>
+  params: Promise<SlugPageParams>
 }) {
   const { locale, slug } = await params
 

src/lib/types.ts

@@ -1028,3 +1028,11 @@ export interface ITutorial {
   lang: string
   isExternal: boolean
 }
+
+export type PageParams = {
+  locale: string
+}
+
+export type SlugPageParams = PageParams & {
+  slug: string[]
+}

src/lib/utils/md.ts

@@ -5,7 +5,7 @@ import { extname, join } from "path"
 import matter from "gray-matter"
 import readingTime from "reading-time"
 
-import type { Frontmatter, ITutorial, Skill } from "@/lib/types"
+import type { Frontmatter, ITutorial, Skill, SlugPageParams } from "@/lib/types"
 
 import { dateToString } from "@/lib/utils/date"
 
@@ -100,3 +100,12 @@ export const getTutorialsData = (locale: string): ITutorial[] => {
 
   return tutorialData
 }
+
+export const checkPathValidity = (
+  validPaths: SlugPageParams[],
+  { locale, slug: slugArray }: SlugPageParams
+): boolean =>
+  validPaths.some(
+    (path) =>
+      path.locale === locale && path.slug.join("/") === slugArray.join("/")
+  )