@blinkk/root 1.4.11 → 1.4.13

package/dist/render.js

@@ -9,7 +9,7 @@ import {
   htmlMinify,
   htmlPretty,
   parseTagNames
-} from "./chunk-5YDJSEDK.js";
+} from "./chunk-3KGEENDW.js";
 
 // src/render/render.tsx
 import crypto from "node:crypto";
@@ -12886,6 +12886,9 @@ var Router = class {
   get(url) {
     return this.routeTrie.get(url);
   }
+  matchAll(url) {
+    return this.routeTrie.matchAll(url);
+  }
   async walk(cb) {
     await this.routeTrie.walk(cb);
   }
@@ -13056,29 +13059,29 @@ function toSquareBrackets(str) {
 // src/render/render.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "preact/jsx-runtime";
 var CONTENT_TYPES = {
-  "html": "text/html",
-  "htm": "text/html",
-  "css": "text/css",
-  "js": "application/javascript",
-  "json": "application/json",
-  "png": "image/png",
-  "jpg": "image/jpeg",
-  "jpeg": "image/jpeg",
-  "gif": "image/gif",
-  "svg": "image/svg+xml",
-  "txt": "text/plain",
-  "xml": "application/xml",
-  "pdf": "application/pdf",
-  "zip": "application/zip",
-  "mp4": "video/mp4",
-  "webm": "video/webm",
-  "mp3": "audio/mpeg",
-  "wav": "audio/wav",
-  "woff": "font/woff",
-  "woff2": "font/woff2",
-  "ttf": "font/ttf",
-  "otf": "font/otf",
-  "wasm": "application/wasm"
+  html: "text/html",
+  htm: "text/html",
+  css: "text/css",
+  js: "application/javascript",
+  json: "application/json",
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  gif: "image/gif",
+  svg: "image/svg+xml",
+  txt: "text/plain",
+  xml: "application/xml",
+  pdf: "application/pdf",
+  zip: "application/zip",
+  mp4: "video/mp4",
+  webm: "video/webm",
+  mp3: "audio/mpeg",
+  wav: "audio/wav",
+  woff: "font/woff",
+  woff2: "font/woff2",
+  ttf: "font/ttf",
+  otf: "font/otf",
+  wasm: "application/wasm"
 };
 var Renderer = class {
   rootConfig;
@@ -13100,140 +13103,155 @@ var Renderer = class {
       } catch (e) {
       }
     }
-    const [route, routeParams] = this.router.get(url);
-    if (!route) {
-      next();
-      return;
-    }
-    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 () => {
-      next();
-    };
-    const render = async (props2, options) => {
-      if (!route.module.default) {
-        console.error(`no default component exported in route: ${route.src}`);
-        render404();
+    const matches = this.router.matchAll(url);
+    let matchIndex = 0;
+    const processNextMatch = async () => {
+      const match = matches[matchIndex++];
+      if (!match) {
+        next();
         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);
+      const [route, routeParams] = match;
+      if (route.locale) {
+        routeParams.$locale = route.locale;
       }
-      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>`
-          );
+      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;
+          }
         }
-      }
-      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;
+        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;
       }
-      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.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) {
-        props2 = await route.module.getStaticProps({
+        const propsData = await route.module.getStaticProps({
           rootConfig: this.rootConfig,
           params: routeParams
         });
-      } 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)
-      });
-      return res.end(body);
-    }
-    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;
+        if (propsData.notFound) {
+          return render404();
+        }
+        if (propsData.props) {
+          props = propsData.props;
+        }
       }
-    }
-    await render(props);
+      await render(props);
+      return;
+    };
+    await processNextMatch();
   }
   async renderComponent(Component, props, options) {
     const { currentPath, route, routeParams, nonce } = options;