@blinkk/root 2.0.10 → 2.1.1

package/dist/node.js

@@ -7,8 +7,8 @@ import {
   loadPackageJson,
   loadRootConfig,
   viteSsrLoadModule
-} from "./chunk-HTBDTUFE.js";
-import "./chunk-MA6MSEP4.js";
+} from "./chunk-KKBUZU3B.js";
+import "./chunk-V2WNR3EX.js";
 export {
   bundleRootConfig,
   createViteServer,

package/dist/render.d.ts

@@ -1,4 +1,4 @@
-export { J as Renderer } from './types-Mr1zFAT1.js';
+export { J as Renderer } from './types-mA-Pt2Qw.js';
 import 'express';
 import 'preact';
 import 'vite';

package/dist/render.js

@@ -13095,6 +13095,10 @@ var Renderer = class {
     this.elementGraph = options.elementGraph;
     this.router = new Router(rootConfig);
   }
+  /** Returns a route from the router. */
+  getRoute(url) {
+    return this.router.get(url);
+  }
   async handle(req, res, next) {
     let url = req.path;
     if (url.includes("%")) {
@@ -13105,7 +13109,7 @@ var Renderer = class {
     }
     const matches = this.router.matchAll(url);
     let matchIndex = 0;
-    const processNextMatch = async () => {
+    const nextRouteHandler = async () => {
       const match = matches[matchIndex++];
       if (!match) {
         next();
@@ -13115,143 +13119,12 @@ var Renderer = class {
       if (route.locale) {
         routeParams.$locale = route.locale;
       }
-      const fallbackLocales = route.isDefaultLocale ? getFallbackLocales(req) : [route.locale];
-      const getPreferredLocale = (availableLocales) => {
-        const lowerLocales = availableLocales.map((l) => l.toLowerCase());
-        for (const fallbackLocale of fallbackLocales) {
-          if (lowerLocales.includes(fallbackLocale.toLowerCase())) {
-            return fallbackLocale;
-          }
-        }
-        return req.rootConfig?.i18n?.defaultLocale || "en";
-      };
-      const render404 = async (options) => {
-        if (options?.nextRoute) {
-          await processNextMatch();
-          return;
-        }
-        next();
-      };
-      const render = async (props2, options) => {
-        if (!route.module.default) {
-          console.error(`no default component exported in route: ${route.src}`);
-          render404();
-          return;
-        }
-        const securityConfig = this.getSecurityConfig();
-        const cspEnabled = !!securityConfig.contentSecurityPolicy;
-        const currentPath = req.path;
-        const locale = options?.locale || route.locale;
-        const translations = options?.translations;
-        const nonce = cspEnabled ? this.generateNonce() : void 0;
-        const output = await this.renderComponent(route.module.default, props2, {
-          currentPath,
-          route,
-          routeParams,
-          locale,
-          translations,
-          nonce
-        });
-        let html = output.html;
-        if (this.rootConfig.prettyHtml) {
-          html = await htmlPretty(html, this.rootConfig.prettyHtmlOptions);
-        } else if (this.rootConfig.minifyHtml !== false) {
-          html = await htmlMinify(html, this.rootConfig.minifyHtmlOptions);
-        }
-        if (req.viteServer) {
-          html = await req.viteServer.transformIndexHtml(currentPath, html);
-          if (nonce) {
-            html = html.replace(
-              '<script type="module" src="/@vite/client"></script>',
-              `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
-            );
-          }
-        }
-        let statusCode = 200;
-        if (route.src === "routes/404.tsx") {
-          statusCode = 404;
-        } else if (route.src === "routes/500.tsx") {
-          statusCode = 500;
-        }
-        req.hooks.trigger("preRender");
-        const plugins = this.rootConfig.plugins || [];
-        for (const plugin of plugins) {
-          if (plugin.hooks?.preRender) {
-            const newHtml = await plugin.hooks.preRender(html);
-            if (newHtml && typeof newHtml === "string") {
-              html = newHtml;
-            }
-          }
-        }
-        res.status(statusCode);
-        res.set({ "Content-Type": "text/html" });
-        this.setSecurityHeaders(res, {
-          securityConfig,
-          nonce
-        });
-        res.end(html);
-      };
-      if (route.module.getStaticContent) {
-        let props2;
-        if (route.module.getStaticProps) {
-          props2 = await route.module.getStaticProps({
-            rootConfig: this.rootConfig,
-            params: routeParams
-          });
-          if (props2?.notFound) {
-            return render404();
-          }
-        } else {
-          props2 = { rootConfig: this.rootConfig, params: routeParams };
-        }
-        const result = await route.module.getStaticContent(props2);
-        let body;
-        let contentType;
-        if (typeof result === "string" || Buffer.isBuffer(result)) {
-          body = result;
-        } else if (result && typeof result === "object") {
-          body = result.body;
-          contentType = result.contentType;
-        } else {
-          body = "";
-        }
-        res.status(200);
-        const ext = path2.extname(route.routePath);
-        res.set({
-          "Content-Type": contentType || guessContentType(ext)
-        });
-        res.end(body);
-        return;
-      }
-      if (route.module.handle) {
-        const handlerContext = {
-          route,
-          params: routeParams,
-          i18nFallbackLocales: fallbackLocales,
-          getPreferredLocale,
-          render,
-          render404
-        };
-        req.handlerContext = handlerContext;
-        return route.module.handle(req, res, next);
-      }
-      let props = {};
-      if (route.module.getStaticProps) {
-        const propsData = await route.module.getStaticProps({
-          rootConfig: this.rootConfig,
-          params: routeParams
-        });
-        if (propsData.notFound) {
-          return render404();
-        }
-        if (propsData.props) {
-          props = propsData.props;
-        }
-      }
-      await render(props);
-      return;
+      await this.handleRoute(req, res, next, route, {
+        routeParams,
+        nextRouteHandler
+      });
     };
-    await processNextMatch();
+    await nextRouteHandler();
   }
   async renderComponent(Component, props, options) {
     const { currentPath, route, routeParams, nonce } = options;
@@ -13394,6 +13267,149 @@ var Renderer = class {
       translations
     });
   }
+  /** Handles the SSR rendering of a route. */
+  async handleRoute(req, res, next, route, options) {
+    const defaultStatusCode = options?.defaultStatusCode || 200;
+    const routeParams = options?.routeParams || {};
+    const nextRouteHandler = options?.nextRouteHandler;
+    const fallbackLocales = route.isDefaultLocale ? getFallbackLocales(req) : [route.locale];
+    const getPreferredLocale = (availableLocales) => {
+      const lowerLocales = availableLocales.map((l) => l.toLowerCase());
+      for (const fallbackLocale of fallbackLocales) {
+        if (lowerLocales.includes(fallbackLocale.toLowerCase())) {
+          return fallbackLocale;
+        }
+      }
+      return req.rootConfig?.i18n?.defaultLocale || "en";
+    };
+    const render404 = async (options2) => {
+      if (options2?.nextRoute && nextRouteHandler) {
+        await nextRouteHandler();
+        return;
+      }
+      next();
+    };
+    const render = async (props2, options2) => {
+      if (!route.module.default) {
+        console.error(`no default component exported in route: ${route.src}`);
+        render404();
+        return;
+      }
+      const securityConfig = this.getSecurityConfig();
+      const cspEnabled = !!securityConfig.contentSecurityPolicy;
+      const currentPath = req.path;
+      const locale = options2?.locale || route.locale;
+      const translations = options2?.translations;
+      const nonce = cspEnabled ? this.generateNonce() : void 0;
+      const output = await this.renderComponent(route.module.default, props2, {
+        currentPath,
+        route,
+        routeParams,
+        locale,
+        translations,
+        nonce
+      });
+      let html = output.html;
+      if (this.rootConfig.prettyHtml) {
+        html = await htmlPretty(html, this.rootConfig.prettyHtmlOptions);
+      } else if (this.rootConfig.minifyHtml !== false) {
+        html = await htmlMinify(html, this.rootConfig.minifyHtmlOptions);
+      }
+      if (req.viteServer) {
+        html = await req.viteServer.transformIndexHtml(currentPath, html);
+        if (nonce) {
+          html = html.replace(
+            '<script type="module" src="/@vite/client"></script>',
+            `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
+          );
+        }
+      }
+      let statusCode = defaultStatusCode;
+      if (route.src === "routes/404.tsx") {
+        statusCode = 404;
+      } else if (route.src === "routes/401.tsx") {
+        statusCode = 401;
+      } else if (route.src === "routes/500.tsx") {
+        statusCode = 500;
+      }
+      req.hooks.trigger("preRender");
+      const plugins = this.rootConfig.plugins || [];
+      for (const plugin of plugins) {
+        if (plugin.hooks?.preRender) {
+          const newHtml = await plugin.hooks.preRender(html);
+          if (newHtml && typeof newHtml === "string") {
+            html = newHtml;
+          }
+        }
+      }
+      res.status(statusCode);
+      res.set({ "Content-Type": "text/html" });
+      this.setSecurityHeaders(res, {
+        securityConfig,
+        nonce
+      });
+      res.end(html);
+    };
+    if (route.module.getStaticContent) {
+      let props2;
+      if (route.module.getStaticProps) {
+        props2 = await route.module.getStaticProps({
+          rootConfig: this.rootConfig,
+          params: routeParams
+        });
+        if (props2?.notFound) {
+          return render404();
+        }
+      } else {
+        props2 = { rootConfig: this.rootConfig, params: routeParams };
+      }
+      const result = await route.module.getStaticContent(props2);
+      let body;
+      let contentType;
+      if (typeof result === "string" || Buffer.isBuffer(result)) {
+        body = result;
+      } else if (result && typeof result === "object") {
+        body = result.body;
+        contentType = result.contentType;
+      } else {
+        body = "";
+      }
+      res.status(defaultStatusCode);
+      const ext = path2.extname(route.routePath);
+      res.set({
+        "Content-Type": contentType || guessContentType(ext)
+      });
+      res.end(body);
+      return;
+    }
+    if (route.module.handle) {
+      const handlerContext = {
+        route,
+        params: routeParams,
+        i18nFallbackLocales: fallbackLocales,
+        getPreferredLocale,
+        render,
+        render404
+      };
+      req.handlerContext = handlerContext;
+      return route.module.handle(req, res, next);
+    }
+    let props = {};
+    if (route.module.getStaticProps) {
+      const propsData = await route.module.getStaticProps({
+        rootConfig: this.rootConfig,
+        params: routeParams
+      });
+      if (propsData.notFound) {
+        return render404();
+      }
+      if (propsData.props) {
+        props = propsData.props;
+      }
+    }
+    await render(props);
+    return;
+  }
   /**
    * Constructs and returns the project's sitemap.
    *