@absolutejs/absolute 0.19.0-beta.930 → 0.19.0-beta.932

package/dist/react/index.js

@@ -3415,16 +3415,22 @@ var setConventions = (map) => {
 };
 var isDev = () => true;
 var buildErrorProps = (error) => {
-  const message = error instanceof Error ? error.message : String(error);
-  const stack = isDev() && error instanceof Error ? error.stack : undefined;
-  return { error: { message, stack } };
+  if (error instanceof Error) {
+    return {
+      name: error.name,
+      message: error.message,
+      ...isDev() && error.stack ? { stack: error.stack } : {}
+    };
+  }
+  return { name: "Error", message: String(error) };
 };
 var renderReactError = async (conventionPath, errorProps) => {
   const { createElement } = await import("react");
   const { renderToReadableStream } = await import("react-dom/server");
   const mod = await import(conventionPath);
-  const [firstKey] = Object.keys(mod);
-  const ErrorComponent = mod.default ?? (firstKey ? mod[firstKey] : undefined);
+  const ErrorComponent = mod.default;
+  if (typeof ErrorComponent !== "function")
+    return null;
   const element = createElement(ErrorComponent, errorProps);
   const stream = await renderToReadableStream(element);
   return new Response(stream, {
@@ -3436,6 +3442,8 @@ var renderSvelteError = async (conventionPath, errorProps) => {
   const { render } = await import("svelte/server");
   const mod = await import(conventionPath);
   const ErrorComponent = mod.default;
+  if (!ErrorComponent)
+    return null;
   const { head, body } = render(ErrorComponent, {
     props: errorProps
   });
@@ -3458,6 +3466,8 @@ var renderVueError = async (conventionPath, errorProps) => {
   const { renderToString } = await import("vue/server-renderer");
   const mod = await import(conventionPath);
   const ErrorComponent = mod.default;
+  if (!ErrorComponent)
+    return null;
   const app = createSSRApp({
     render: () => h(ErrorComponent, errorProps)
   });
@@ -3471,10 +3481,20 @@ var renderVueError = async (conventionPath, errorProps) => {
 };
 var renderAngularError = async (conventionPath, errorProps) => {
   const mod = await import(conventionPath);
-  const renderError = mod.default ?? mod.renderError;
-  if (typeof renderError !== "function")
+  const renderFn = mod.default;
+  if (typeof renderFn !== "function")
     return null;
-  const html = renderError(errorProps);
+  const html = renderFn(errorProps);
+  return new Response(html, {
+    headers: { "Content-Type": "text/html" },
+    status: 500
+  });
+};
+var escapeHtml = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+var replaceErrorTokens = (template, errorProps) => template.replace(/\{\{\s*name\s*\}\}/g, escapeHtml(errorProps.name)).replace(/\{\{\s*message\s*\}\}/g, escapeHtml(errorProps.message)).replace(/\{\{\s*stack\s*\}\}/g, errorProps.stack ? escapeHtml(errorProps.stack) : "");
+var renderHtmlError = async (conventionPath, errorProps) => {
+  const template = await Bun.file(conventionPath).text();
+  const html = replaceErrorTokens(template, errorProps);
   return new Response(html, {
     headers: { "Content-Type": "text/html" },
     status: 500
@@ -3493,11 +3513,12 @@ var renderEmberNotFound = async () => null;
 var ERROR_RENDERERS = {
   angular: renderAngularError,
   ember: renderEmberError,
+  html: renderHtmlError,
   react: renderReactError,
   svelte: renderSvelteError,
   vue: renderVueError
 };
-var renderConventionError = async (framework, pageName, error) => {
+var tryFrameworkErrorConvention = async (framework, pageName, errorProps, error) => {
   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)) {
@@ -3511,7 +3532,6 @@ var renderConventionError = async (framework, pageName, error) => {
   }
   if (!conventionPath)
     return null;
-  const errorProps = buildErrorProps(error);
   const renderer = ERROR_RENDERERS[framework];
   if (!renderer)
     return null;
@@ -3522,12 +3542,25 @@ var renderConventionError = async (framework, pageName, error) => {
   }
   return null;
 };
+var renderConventionError = async (framework, pageName, error) => {
+  const errorProps = buildErrorProps(error);
+  const frameworkResponse = await tryFrameworkErrorConvention(framework, pageName, errorProps, error);
+  if (frameworkResponse)
+    return frameworkResponse;
+  if (framework !== "html") {
+    const htmlResponse = await tryFrameworkErrorConvention("html", pageName, errorProps, error);
+    if (htmlResponse)
+      return htmlResponse;
+  }
+  return null;
+};
 var renderReactNotFound = async (conventionPath) => {
   const { createElement } = await import("react");
   const { renderToReadableStream } = await import("react-dom/server");
   const mod = await import(conventionPath);
-  const [nfKey] = Object.keys(mod);
-  const NotFoundComponent = mod.default ?? (nfKey ? mod[nfKey] : undefined);
+  const NotFoundComponent = mod.default;
+  if (typeof NotFoundComponent !== "function")
+    return null;
   const element = createElement(NotFoundComponent);
   const stream = await renderToReadableStream(element);
   return new Response(stream, {
@@ -3539,6 +3572,8 @@ var renderSvelteNotFound = async (conventionPath) => {
   const { render } = await import("svelte/server");
   const mod = await import(conventionPath);
   const NotFoundComponent = mod.default;
+  if (!NotFoundComponent)
+    return null;
   const { head, body } = render(NotFoundComponent);
   const html = `<!DOCTYPE html><html><head>${head}</head><body>${body}</body></html>`;
   return new Response(html, {
@@ -3551,6 +3586,8 @@ var renderVueNotFound = async (conventionPath) => {
   const { renderToString } = await import("vue/server-renderer");
   const mod = await import(conventionPath);
   const NotFoundComponent = mod.default;
+  if (!NotFoundComponent)
+    return null;
   const app = createSSRApp({
     render: () => h(NotFoundComponent)
   });
@@ -3564,10 +3601,17 @@ var renderVueNotFound = async (conventionPath) => {
 };
 var renderAngularNotFound = async (conventionPath) => {
   const mod = await import(conventionPath);
-  const renderNotFound = mod.default ?? mod.renderNotFound;
-  if (typeof renderNotFound !== "function")
+  const renderFn = mod.default;
+  if (typeof renderFn !== "function")
     return null;
-  const html = renderNotFound();
+  const html = renderFn();
+  return new Response(html, {
+    headers: { "Content-Type": "text/html" },
+    status: 404
+  });
+};
+var renderHtmlNotFound = async (conventionPath) => {
+  const html = await Bun.file(conventionPath).text();
   return new Response(html, {
     headers: { "Content-Type": "text/html" },
     status: 404
@@ -3576,6 +3620,7 @@ var renderAngularNotFound = async (conventionPath) => {
 var NOT_FOUND_RENDERERS = {
   angular: renderAngularNotFound,
   ember: renderEmberNotFound,
+  html: renderHtmlNotFound,
   react: renderReactNotFound,
   svelte: renderSvelteNotFound,
   vue: renderVueNotFound
@@ -3598,7 +3643,8 @@ var NOT_FOUND_PRIORITY = [
   "react",
   "svelte",
   "vue",
-  "angular"
+  "angular",
+  "html"
 ];
 var renderFirstNotFound = async () => {
   const renderNext = async (frameworks) => {
@@ -3886,5 +3932,5 @@ export {
   Island
 };
 
-//# debugId=FFD15DAC4462A68964756E2164756E21
+//# debugId=1094272B47C7C77164756E2164756E21
 //# sourceMappingURL=index.js.map