@absolutejs/absolute 0.19.0-beta.766 → 0.19.0-beta.768

package/dist/react/index.js

@@ -3183,13 +3183,31 @@ var derivePageName = (pagePath) => {
   const name = dotIndex > 0 ? base.slice(0, dotIndex) : base;
   return toPascal(name);
 };
+var normalizeConventionPageName = (name) => toPascal(name).replace(/\d+$/, "");
 var resolveErrorConventionPath = (framework, pageName) => {
   const conventions = getMap()[framework];
   if (!conventions)
     return;
-  return conventions.pages?.[pageName]?.error ?? conventions.defaults?.error;
+  const exact = conventions.pages?.[pageName]?.error;
+  if (exact)
+    return exact;
+  const normalizedPageName = normalizeConventionPageName(pageName);
+  for (const [candidate, page] of Object.entries(conventions.pages ?? {})) {
+    if (normalizeConventionPageName(candidate) === normalizedPageName) {
+      return page.error ?? conventions.defaults?.error;
+    }
+  }
+  return conventions.defaults?.error;
 };
 var resolveNotFoundConventionPath = (framework) => getMap()[framework]?.defaults?.notFound;
+var hasErrorConvention = (framework) => {
+  const conventions = getMap()[framework];
+  if (!conventions)
+    return false;
+  if (conventions.defaults?.error)
+    return true;
+  return Object.values(conventions.pages ?? {}).some((page) => Boolean(page.error));
+};
 var setConventions = (map) => {
   Reflect.set(globalThis, CONVENTIONS_KEY, map);
 };
@@ -3275,7 +3293,17 @@ var ERROR_RENDERERS = {
   vue: renderVueError
 };
 var renderConventionError = async (framework, pageName, error) => {
-  const conventionPath = resolveErrorConventionPath(framework, pageName);
+  let conventionPath = resolveErrorConventionPath(framework, pageName);
+  if (!conventionPath && error instanceof Error && error.stack) {
+    for (const match of error.stack.matchAll(/^\s*at\s+([A-Za-z_$][\w$]*)/gm)) {
+      const candidate = match[1];
+      if (!candidate)
+        continue;
+      conventionPath = resolveErrorConventionPath(framework, candidate);
+      if (conventionPath)
+        break;
+    }
+  }
   if (!conventionPath)
     return null;
   const errorProps = buildErrorProps(error);
@@ -3404,6 +3432,7 @@ var handleReactPageRequest = async (input) => {
   const resolvedIndex = input.index;
   const options = input;
   const maybeProps = input.props;
+  const pageName = Page.name || Page.displayName || "";
   if (isSsrCacheDirty("react")) {
     return buildDirtyResponse(resolvedIndex, maybeProps);
   }
@@ -3423,14 +3452,19 @@ var handleReactPageRequest = async (input) => {
         }
       });
       const htmlStream = injectIslandPageContextStream(stream);
+      if (resolveErrorConventionPath("react", pageName) || hasErrorConvention("react")) {
+        const html = await new Response(htmlStream).text();
+        return new Response(html, {
+          headers: { "Content-Type": "text/html" }
+        });
+      }
       return new Response(htmlStream, {
         headers: { "Content-Type": "text/html" }
       });
     };
-    return runWithStreamingSlotWarningScope(() => options?.collectStreamingSlots === true ? withRegisteredStreamingSlots(renderPageResponse, options) : renderPageResponse(), { handlerCallsite });
+    return await runWithStreamingSlotWarningScope(() => options?.collectStreamingSlots === true ? withRegisteredStreamingSlots(renderPageResponse, options) : renderPageResponse(), { handlerCallsite });
   } catch (error) {
     console.error("[SSR] React render error:", error);
-    const pageName = Page.name || Page.displayName || "";
     const conventionResponse = await renderConventionError("react", pageName, error);
     if (conventionResponse)
       return conventionResponse;
@@ -3604,5 +3638,5 @@ export {
   Island
 };
 
-//# debugId=6DB9A702F811A8FF64756E2164756E21
+//# debugId=798CBDC2502C88F264756E2164756E21
 //# sourceMappingURL=index.js.map