feat: pass rootConfig as context to getStaticPaths (#229)

blinkk · Dec 12, 2023 · 1f3ab3c · 1f3ab3c
1 parent 2455c96
commit 1f3ab3c
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 134 deletions.
diff --git a/.changeset/wicked-kiwis-marry.md b/.changeset/wicked-kiwis-marry.md
@@ -0,0 +1,5 @@
+---
+'@blinkk/root': patch
+---
+
+feat: pass rootConfig as context to getStaticPaths
diff --git a/packages/root-cms/core/client.ts b/packages/root-cms/core/client.ts
@@ -87,7 +87,7 @@ export class RootCMSClient {
 
   constructor(rootConfig: RootConfig) {
     this.rootConfig = rootConfig;
-    this.cmsPlugin = getCmsPlugin(rootConfig);
+    this.cmsPlugin = getCmsPlugin(this.rootConfig);
 
     const cmsPluginOptions = this.cmsPlugin.getConfig();
     this.projectId = cmsPluginOptions.id || 'default';

diff --git a/packages/root/src/core/types.ts b/packages/root/src/core/types.ts
@@ -47,7 +47,9 @@ export type GetStaticProps<T = unknown> = (ctx: {
  * paths that exist for a given route. This should be used alongside a
  * parameterized route, e.g. `/routes/blog/[slug].tsx`.
  */
-export type GetStaticPaths<T = RouteParams> = () => Promise<{
+export type GetStaticPaths<T = RouteParams> = (ctx: {
+  rootConfig: RootConfig;
+}) => Promise<{
   paths: Array<{params: T}>;
 }>;
 
@@ -117,7 +119,7 @@ export type NextFunction = ExpressNextFunction;
  * A context variable passed to a route's `handle()` method within the req
  * object.
  */
-export interface HandlerContext<T = any> {
+export interface HandlerContext<Props = any> {
   /**
    * The resolved route.
    */
@@ -139,7 +141,7 @@ export interface HandlerContext<T = any> {
    */
   getPreferredLocale: (availableLocales: string[]) => string;
   /** Renders the default exported component from the route. */
-  render: HandlerRenderFn;
+  render: HandlerRenderFn<Props>;
   /** Renders a 404 page. */
   render404: () => Promise<void>;
 }
@@ -210,7 +212,7 @@ export interface HandlerRenderOptions {
   translations?: Record<string, string>;
 }
 
-export type HandlerRenderFn = (
-  props: any,
+export type HandlerRenderFn<Props = any> = (
+  props: Props,
   options?: HandlerRenderOptions
 ) => Promise<void>;
diff --git a/packages/root/src/render/render.tsx b/packages/root/src/render/render.tsx
@@ -25,8 +25,7 @@ import {AssetMap} from './asset-map/asset-map';
 import {htmlMinify} from './html-minify';
 import {htmlPretty} from './html-pretty';
 import {getFallbackLocales} from './i18n-fallbacks';
-import {RouteTrie} from './route-trie';
-import {getRoutes, getAllPathsForRoute, replaceParams} from './router';
+import {replaceParams, Router} from './router';
 
 interface RenderHtmlOptions {
   /** Attrs passed to the <html> tag, e.g. `{lang: 'en'}`. */
@@ -41,23 +40,25 @@ interface RenderHtmlOptions {
 
 export class Renderer {
   private rootConfig: RootConfig;
-  private routes: RouteTrie<Route>;
+  // private routes: RouteTrie<Route>;
   private assetMap: AssetMap;
   private elementGraph: ElementGraph;
+  private router: Router;
 
   constructor(
     rootConfig: RootConfig,
     options: {assetMap: AssetMap; elementGraph: ElementGraph}
   ) {
     this.rootConfig = rootConfig;
-    this.routes = getRoutes(this.rootConfig);
+    // this.routes = getRoutes(this.rootConfig);
     this.assetMap = options.assetMap;
     this.elementGraph = options.elementGraph;
+    this.router = new Router(rootConfig);
   }
 
   async handle(req: Request, res: Response, next: NextFunction) {
     const url = req.path;
-    const [route, routeParams] = this.routes.get(url);
+    const [route, routeParams] = this.router.get(url);
     if (!route) {
       next();
       return;
@@ -313,8 +314,8 @@ export class Renderer {
       string,
       {route: Route; params: Record<string, string>}
     > = {};
-    await this.routes.walk(async (urlPath: string, route: Route) => {
-      const routePaths = await getAllPathsForRoute(urlPath, route);
+    await this.router.walk(async (urlPath: string, route: Route) => {
+      const routePaths = await this.router.getAllPathsForRoute(urlPath, route);
       routePaths.forEach((routePath) => {
         sitemap[routePath.urlPath] = {
           route,
@@ -343,7 +344,7 @@ export class Renderer {
 
   async render404(options?: {currentPath?: string}) {
     const currentPath = options?.currentPath || '/404';
-    const [route, routeParams] = this.routes.get('/404');
+    const [route, routeParams] = this.router.get('/404');
     if (route && route.src === 'routes/404.tsx' && route.module.default) {
       const Component = route.module.default;
       return this.renderComponent(
@@ -375,7 +376,7 @@ export class Renderer {
 
   async renderError(err: any, options?: {currentPath?: string}) {
     const currentPath = options?.currentPath || '/500';
-    const [route, routeParams] = this.routes.get('/500');
+    const [route, routeParams] = this.router.get('/500');
     if (route && route.src === 'routes/500.tsx' && route.module.default) {
       const Component = route.module.default;
       return this.renderComponent(
@@ -417,7 +418,7 @@ export class Renderer {
   }
 
   async renderDevServer500(req: Request, error: unknown) {
-    const [route, routeParams] = this.routes.get(req.path);
+    const [route, routeParams] = this.router.get(req.path);
     const mainHtml = renderToString(
       <DevErrorPage
         req={req}