chore: fix typecheck

Author: adrian-ub

src/components/Toc.astro

@@ -1,5 +1,5 @@
 ---
-import { TocHeading } from '../utils/toc'
+import type { TocHeading } from '../utils/toc'
 import TocItem from './TocItem.astro'
 
 export interface Props {

src/components/TocItem.astro

@@ -1,5 +1,5 @@
 ---
-import { TocHeading } from '../utils/toc'
+import type { TocHeading } from '../utils/toc'
 
 export type Props = TocHeading
 

src/components/WrapperPost.astro

@@ -8,7 +8,7 @@ import DraftContentNotice from './DraftContentNotice.astro'
 import FallbackContentNotice from './FallbackContentNotice.astro'
 import Toc from './Toc.astro'
 
-const { entry, hasToc, headins } = Astro.props
+const { entry, hasToc, headings } = Astro.props
 const { data: frontmatter } = entry
 
 let tweetUrl = ''
@@ -64,7 +64,7 @@ if (config.social?.mastodon) {
   {
     hasToc && (
       <section>
-        <Toc headings={headins} />
+        <Toc headings={headings} />
       </section>
     )
   }

src/routes/static/404.astro

@@ -27,6 +27,12 @@ const fallbackEntry: VitessePagesEntry = {
     head: [],
     subtitle: t('404.text'),
     draft: false,
+    layoutFullWidth: false,
+    tocAlwaysOn: false,
+    inperson: false,
+    recording: false,
+    radio: false,
+    video: false,
   },
   render: async () => ({
     Content: EmptyContent,

src/utils/route-data.ts

@@ -18,7 +18,7 @@ export interface VitesseRouteData extends Route {
   /** Site navigation sidebar entries for this page. */
   navBar: NavBarEntry[]
   hasToc: boolean
-  headins: TocHeading[]
+  headings: TocHeading[]
 }
 
 /** Get the site title for a given language. */
@@ -59,6 +59,6 @@ export async function generateRouteData({
     siteTitleHref: getSiteTitleHref(locale),
     isFullWidthLayout: entry?.data.layoutFullWidth,
     hasToc,
-    headins: tocHeading,
+    headings: tocHeading,
   }
 }

src/utils/routing.ts

@@ -49,11 +49,11 @@ const normalizeIndexSlug = (slug: string): string => (slug === 'index' ? '' : sl
 /** All entries in the pages content collection. */
 const pages: VitessePagesEntry[] = (
   // eslint-disable-next-line antfu/no-top-level-await
-  (await getCollection('pages', ({ data }: { data: any }): boolean => {
+  (await getCollection('pages', ({ data }): boolean => {
     // In production, filter out drafts.
     return import.meta.env.MODE !== 'production' || data.draft === false
   })) ?? []
-).map(({ slug, ...entry }: { slug: string, [key: string]: any }) => ({
+).map(({ slug, ...entry }) => ({
   ...entry,
   slug: normalizeIndexSlug(slug),
 }))

src/utils/vitesse-page.ts

@@ -1,5 +1,6 @@
 import type { ContentConfig, SchemaContext } from 'astro:content'
 import type { VitessePagesEntry } from './routing'
+import type { TocHeading } from './toc'
 import type { Prettify, RemoveIndexSignature } from './types'
 import type { VitesseConfig, VitesseUserConfig } from './user-config'
 import { z } from 'astro/zod'
@@ -23,7 +24,8 @@ import { slugToLocaleData, urlToSlug } from './slugs'
  * The frontmatter schema for Vitesse pages cannot include some properties which will be omitted
  * and some others needs to be refined to a stricter type.
  */
-async function VitessePageFrontmatterSchema(context: SchemaContext): Promise<z.ZodEffects<z.ZodObject<any>>> {
+// eslint-disable-next-line ts/explicit-function-return-type
+async function VitessePageFrontmatterSchema(context: SchemaContext) {
   const userPagesSchema = await getUserPagesSchema()
   const schema = typeof userPagesSchema === 'function' ? userPagesSchema(context) : userPagesSchema
 
@@ -58,7 +60,10 @@ async function VitessePageFrontmatterSchema(context: SchemaContext): Promise<z.Z
  * @see VitessePageFrontmatterSchema
  */
 type VitessePageFrontmatter =
-  z.input<Awaited<ReturnType<typeof VitessePageFrontmatterSchema>>>
+  Omit<
+    z.input<Awaited<ReturnType<typeof VitessePageFrontmatterSchema>>>,
+    'navBar'
+  >
 
 /** Parse navBar prop to ensure it's valid. */
 function validateNavBarProp(navBarProp: VitesseUserConfig['navBar']): VitesseConfig['navBar'] {
@@ -75,9 +80,11 @@ function validateNavBarProp(navBarProp: VitesseUserConfig['navBar']): VitesseCon
 export type VitessePageProps = Prettify<
   // Remove the index signature from `Route`, omit undesired properties and make the rest optional.
   Partial<Omit<RemoveIndexSignature<PageProps>, 'entry' | 'entryMeta' | 'id' | 'locale' | 'slug'>> &
-  {
+  // Add the sidebar definitions for a Starlight page.
+  Partial<Pick<VitesseRouteData, 'hasToc'>> & {
     navBar?: VitesseUserConfig['navBar']
-    // And finally add the Vitesse page frontmatter properties in a `frontmatter` property.
+    headings?: TocHeading[]
+    // And finally add the Starlight page frontmatter properties in a `frontmatter` property.
     frontmatter: VitessePageFrontmatter
   }
 >
@@ -119,9 +126,6 @@ export async function generateVitessePageRouteData({
     collection: 'pages',
     data: {
       ...pageFrontmatter,
-      navBar: {
-        attrs: {},
-      },
     },
   }
   const entry = pagePagesEntry as unknown as VitessePagesEntry
@@ -140,6 +144,8 @@ export async function generateVitessePageRouteData({
     siteTitle: getSiteTitle(localeData.lang),
     siteTitleHref: getSiteTitleHref(localeData.locale),
     slug,
+    hasToc: props.hasToc ?? false,
+    headings: props.headings ?? [],
   }
   if (isFallback) {
     routeData.isFallback = true