Fix children types on LayoutFunction

Author: bcomnes

lib/build-pages/page-data.js

@@ -41,7 +41,7 @@ export async function resolveLayout (layoutPath) {
   * @param {T} params.vars - All default, global, layout, page, and builder vars shallow merged.
   * @param {string[]} [params.scripts] - Array of script URLs to include.
   * @param {string[]} [params.styles] - Array of stylesheet URLs to include.
-  * @param {any} params.children - The children content, either as a string or a render function.
+  * @param {U} params.children - The children content, either as a string or a render function.
   * @param {PageInfo} params.page - Info about the current page
   * @param {PageData<T, U, V>[]} params.pages - An array of info about every page
   * @param {Object<string, string>} [params.workers] - Map of worker names to their output paths
@@ -249,8 +249,9 @@ export class PageData {
     const builder = pageBuilders[pageInfo.type]
     const { pageLayout } = await builder({ pageInfo, options: builderOptions })
     const renderedPostVars = await this.#renderPostVars({ vars, styles, scripts, pages, page: pageInfo, workers })
-    // @ts-ignore
-    return await pageLayout({ vars: renderedPostVars, styles, scripts, pages, page: pageInfo, workers })
+    // @ts-expect-error - Builder types vary by page type, but the runtime type is correct
+    const results = await pageLayout({ vars: renderedPostVars, styles, scripts, pages, page: pageInfo, workers })
+    return results
   }
 
   /**
@@ -273,6 +274,7 @@ export class PageData {
         scripts,
         page: pageInfo,
         pages,
+        // @ts-expect-error - innerPage type varies by page builder but layout handles it
         children: innerPage,
         workers: this.workers
       })

lib/defaults/default.root.layout.js

@@ -1,23 +1,23 @@
 /**
  * @import { LayoutFunction } from '../build-pages/page-data.js'
+ * @import { VNode } from 'preact'
  */
 import { html } from 'htm/preact'
 import { render } from 'preact-render-to-string'
 
 /**
- * @template {Record<string, any>} T
- * @typedef {LayoutFunction<T>} LayoutFunction
+ * @typedef {{
+ *   title: string,
+ *   siteName: string,
+ *   defaultStyle: boolean,
+ *   basePath: string
+ * }} DefaultRootLayoutVars
  */
 
 /**
  * Build all of the bundles using esbuild.
  *
- * @type {LayoutFunction<{
- *   title: string,
- *   siteName: string,
- *   defaultStyle: boolean,
- *   basePath: string
- * }>}
+ * @type {LayoutFunction<DefaultRootLayoutVars, string | VNode, string>}
  */
 export default function defaultRootLayout ({
   vars: {