@rpcbase/server 0.444.0 → 0.446.0

package/dist/applyRouteLoaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAA;AAsDxB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAkG/B"}
+{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAA;AAoExB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAqH/B"}

package/dist/index.js

@@ -362,6 +362,15 @@ function getShortCircuitMatches(routes) {
     route
   };
 }
+const NOT_FOUND_STATUS = 404;
+const getErrorStatus = (error) => {
+  if (!error) return void 0;
+  const candidate = error?.reason ?? error;
+  if (typeof candidate?.status === "number") return candidate.status;
+  if (typeof candidate?.statusCode === "number") return candidate.statusCode;
+  if (typeof candidate?.response?.status === "number") return candidate.response.status;
+  return void 0;
+};
 async function applyRouteLoaders(req, dataRoutes) {
   const baseUrl = `${req.protocol}://${req.get("host")}`;
   const url = new URL(req.originalUrl, baseUrl);
@@ -418,6 +427,8 @@ async function applyRouteLoaders(req, dataRoutes) {
   );
   const loaderData = {};
   let errors = null;
+  let hasNotFoundError = false;
+  let hasNonNotFoundError = false;
   for (const result of loaderPromisesResults) {
     if (result.status === "fulfilled") {
       if (result.value) {
@@ -431,16 +442,32 @@ async function applyRouteLoaders(req, dataRoutes) {
       if (!errors) {
         errors = {};
       }
+      const status = getErrorStatus(result.reason);
+      if (status === NOT_FOUND_STATUS) {
+        hasNotFoundError = true;
+      } else {
+        hasNonNotFoundError = true;
+      }
       errors[id] = result.reason;
     }
   }
+  let statusCode = 200;
+  if (errors) {
+    if (hasNonNotFoundError) {
+      statusCode = 500;
+    } else if (hasNotFoundError) {
+      statusCode = NOT_FOUND_STATUS;
+    } else {
+      statusCode = 500;
+    }
+  }
   return {
     ...baseContext,
     matches,
     loaderData,
     actionData: null,
     errors,
-    statusCode: Object.keys(errors || {}).length > 0 ? 500 : 200
+    statusCode
   };
 }
 async function renderSSR(req, dataRoutes) {
@@ -470,7 +497,7 @@ async function renderSSR(req, dataRoutes) {
     }
   ) });
   const isMatched = routerContext.matches.length > 0;
-  return { element, isMatched };
+  return { element, isMatched, statusCode: routerContext.statusCode ?? (routerContext.errors ? 500 : 200) };
 }
 const ABORT_DELAY_MS = 1e4;
 const APP_HTML_PLACEHOLDER = "<!--app-html-->";
@@ -538,7 +565,7 @@ const sendErrorResponse = ({
       null,
       createElement(SsrErrorFallback, {
         state,
-        renderErrorExtra: (payload) => createElement(errorExtraComponent, { state: payload })
+        renderErrorExtra: errorExtraComponent ? (payload) => createElement(errorExtraComponent, { state: payload }) : void 0
       })
     )
   );
@@ -591,7 +618,7 @@ const ssrMiddleware = ({
       htmlStart = templateStart;
     }
     htmlEnd = template.slice(placeholderIndex + APP_HTML_PLACEHOLDER.length);
-    const { element, isMatched } = await renderSSR(req, dataRoutes);
+    const { element, isMatched, statusCode } = await renderSSR(req, dataRoutes);
     if (!isMatched) {
       next();
       return;
@@ -624,7 +651,8 @@ const ssrMiddleware = ({
             return;
           }
           responseCommitted = true;
-          res.status(didError ? 500 : 200);
+          const responseStatus = didError ? 500 : statusCode || 200;
+          res.status(responseStatus);
           res.set({ "Content-Type": "text/html" });
           const transformStream = new Transform({
             transform(chunk, encoding, callback) {

package/dist/renderSSR.d.ts

@@ -4,5 +4,6 @@ import * as express from "express";
 export declare function renderSSR(req: express.Request, dataRoutes: StaticHandler["dataRoutes"]): Promise<{
     element: ReactNode;
     isMatched: boolean;
+    statusCode: number;
 }>;
 //# sourceMappingURL=renderSSR.d.ts.map

package/dist/renderSSR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,CAAC,CAuCnD"}
+{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,CAAC,CAuCvE"}

package/dist/ssrMiddleware.d.ts

@@ -1,12 +1,15 @@
+import { SsrErrorStatePayload } from '../../client/src';
 import { StaticHandler } from '../../router/src';
 import { createServer } from 'vite';
-import { ReactNode } from 'react';
+import { ComponentType } from 'react';
 import { NextFunction, Request, Response } from 'express';
 type ViteDevServer = Awaited<ReturnType<typeof createServer>>;
 export declare const ssrMiddleware: ({ viteInstance, dataRoutes, errorExtraComponent, renderTemplateStart, }: {
     viteInstance: ViteDevServer;
     dataRoutes: StaticHandler["dataRoutes"];
-    errorExtraComponent: ReactNode;
+    errorExtraComponent?: ComponentType<{
+        state?: SsrErrorStatePayload;
+    }>;
     renderTemplateStart?: (req: Request, templateStart: string) => Promise<string>;
 }) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export {};

package/dist/ssrMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssrMiddleware.d.ts","sourceRoot":"","sources":["../src/ssrMiddleware.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAKzD,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC;AAuG9D,eAAO,MAAM,aAAa,GAAI,yEAK3B;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,mBAAmB,EAAE,SAAS,CAAC;IAC/B,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChF,MAAW,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBAyH1D,CAAA"}
+{"version":3,"file":"ssrMiddleware.d.ts","sourceRoot":"","sources":["../src/ssrMiddleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACjI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAErE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAKzD,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC;AAyG9D,eAAO,MAAM,aAAa,GAAI,yEAK3B;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAC;QAAE,KAAK,CAAC,EAAE,oBAAoB,CAAA;KAAE,CAAC,CAAC;IACtE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChF,MAAW,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA0H1D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.444.0",
+  "version": "0.446.0",
   "type": "module",
   "files": [
     "dist"
@@ -32,8 +32,9 @@
         "build"
       ],
       "files": [
+        "../../scripts/publish.js",
         "package.json",
-        "src/**/*"
+        "dist/**/*"
       ],
       "output": [],
       "env": {