one 1.1.380 → 1.1.382

package/dist/esm/server/getServerManifest.native.js

@@ -55,14 +55,32 @@ function getServerManifest(route) {
         throw _iteratorError;
     }
   }
-  var apiRoutes = [], pageRoutes = [], _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
+  var apiRoutes = [], middlewareRoutes = [], pageRoutes = [], addedMiddlewares = {}, _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
   try {
     for (var _iterator1 = flat[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
-      var [path1, node] = _step1.value;
+      var [path1, node] = _step1.value, _node_middlewares;
       if (node.type === "api") {
         apiRoutes.push(getGeneratedNamedRouteRegex(path1, node));
         continue;
       }
+      if (!((_node_middlewares = node.middlewares) === null || _node_middlewares === void 0) && _node_middlewares.length) {
+        var _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
+        try {
+          for (var _iterator2 = node.middlewares[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
+            var middleware = _step2.value;
+            addedMiddlewares[middleware.contextKey] || (addedMiddlewares[middleware.contextKey] = !0, middlewareRoutes.push(getGeneratedNamedRouteRegex(path1, middleware)));
+          }
+        } catch (err) {
+          _didIteratorError2 = !0, _iteratorError2 = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
+          } finally {
+            if (_didIteratorError2)
+              throw _iteratorError2;
+          }
+        }
+      }
       pageRoutes.push(getGeneratedNamedRouteRegex(path1, node));
     }
   } catch (err) {
@@ -77,6 +95,7 @@ function getServerManifest(route) {
   }
   return {
     apiRoutes,
+    middlewareRoutes,
     pageRoutes
   };
 }
@@ -95,7 +114,8 @@ function getNamedRouteRegex(normalizedRoute, node) {
     type: node.type,
     namedRegex: result.namedRegex,
     routeKeys: result.routeKeys,
-    layouts: node.layouts
+    layouts: node.layouts,
+    middlewares: node.middlewares
   };
 }
 function buildGetSafeRouteKey() {

package/dist/esm/server/getServerManifest.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/server/Users/n8/one/packages/one/src/server/getServerManifest.ts"],
-  "mappings": "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",
-  "names": ["getContextKey", "matchGroupName", "sortRoutes", "isNotFoundRoute", "route", "Boolean", "dynamic", "length", "notFound", "getServerManifest", "getFlatNodes", "layouts", "children", "flatMap", "child", "key", "type", "contextKey", "replace", "parentSegments", "startsWith", "flat", "sort", "a", "b", "reverse", "pathToRoute", "path", "console", "warn", "apiRoutes", "pageRoutes", "node", "push", "getGeneratedNamedRouteRegex", "normalizedRoute", "getNamedRouteRegex", "generated", "isNotFound", "result", "getNamedRegex", "file", "page", "namedRegex", "routeKeys", "buildGetSafeRouteKey", "currentCharCode", "currentLength", "incrementNext", "i", "String", "fromCharCode", "removeTrailingSlash", "segments", "slice", "split", "getSafeRouteKey", "routeSegments", "map", "segment", "index", "test", "name", "optional", "repeat", "parseParam", "cleanedKey", "invalidKey", "Number", "isNaN", "parseInt", "insideParensRegex", "groupName", "group", "trim", "filter", "optionalSegment", "escapeStringRegexp", "join", "insideBracketsRegex", "tripleDotRegex", "replaceRegex", "hasRegExpRegex", "str", "param"]
+  "mappings": "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",
+  "names": ["getContextKey", "matchGroupName", "sortRoutes", "isNotFoundRoute", "route", "Boolean", "dynamic", "length", "notFound", "getServerManifest", "getFlatNodes", "layouts", "children", "flatMap", "child", "key", "type", "contextKey", "replace", "parentSegments", "startsWith", "flat", "sort", "a", "b", "reverse", "pathToRoute", "path", "console", "warn", "apiRoutes", "middlewareRoutes", "pageRoutes", "addedMiddlewares", "node", "push", "getGeneratedNamedRouteRegex", "middlewares", "middleware", "normalizedRoute", "getNamedRouteRegex", "generated", "isNotFound", "result", "getNamedRegex", "file", "page", "namedRegex", "routeKeys", "buildGetSafeRouteKey", "currentCharCode", "currentLength", "incrementNext", "i", "String", "fromCharCode", "removeTrailingSlash", "segments", "slice", "split", "getSafeRouteKey", "routeSegments", "map", "segment", "index", "test", "name", "optional", "repeat", "parseParam", "cleanedKey", "invalidKey", "Number", "isNaN", "parseInt", "insideParensRegex", "groupName", "group", "trim", "filter", "optionalSegment", "escapeStringRegexp", "join", "insideBracketsRegex", "tripleDotRegex", "replaceRegex", "hasRegExpRegex", "str", "param"]
 }

package/dist/esm/server/oneServe.js

@@ -1,7 +1,12 @@
-import { join } from "node:path";
+import { extname, join } from "node:path";
 import { getServerEntry } from "vxrn/serve";
-async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !0) {
-  const { createHandleRequest } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), { resolveAPIRequest } = await import("../vite/resolveAPIRequest"), isAPIRequest = /* @__PURE__ */ new WeakMap(), root = vxrnOptions.root || ".", redirects = oneOptions.web?.redirects;
+import { getPathFromLoaderPath } from "../cleanUrl";
+import { LOADER_JS_POSTFIX_UNCACHED } from "../constants";
+import { compileManifest, getURLfromRequestURL } from "../createHandleRequest";
+import { toAbsolute } from "../utils/toAbsolute";
+import { default as FSExtra } from "fs-extra";
+async function oneServe(oneOptions, buildInfo, app, serveStatic = !0) {
+  const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = oneOptions.web?.redirects;
   if (redirects)
     for (const redirect of redirects)
       app.get(redirect.source, (context) => {
@@ -13,123 +18,108 @@ async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !
       });
   if (!buildInfo)
     throw new Error("No build info found, have you run build?");
-  const { routeMap, builtRoutes } = buildInfo, routeToBuildInfo = {};
-  for (const route of builtRoutes) {
-    routeToBuildInfo[route.cleanPath] = route;
-    const bracketRoutePath = route.cleanPath.split("/").map((part) => part[0] === ":" ? `[${part.slice(1)}]` : part).join("/");
-    routeToBuildInfo[bracketRoutePath] = route;
-  }
-  const serverOptions = {
+  const { routeToBuildInfo, routeMap } = buildInfo, serverOptions = {
     ...oneOptions,
-    root
-  }, render = (await import(getServerEntry(serverOptions))).default.render, apiCJS = oneOptions.build?.api?.outputFormat === "cjs", handleRequest = createHandleRequest(
-    {},
-    {
-      async handleAPI({ route, request, loaderProps }) {
-        const apiFile = join(
-          process.cwd(),
-          "dist",
-          "api",
-          route.page.replace("[", "_").replace("]", "_") + (apiCJS ? ".cjs" : ".js")
-        );
-        return isAPIRequest.set(request, !0), resolveAPIRequest(
-          async () => {
-            try {
-              return await import(apiFile);
-            } catch (err) {
-              return console.error(`
- [one] Error importing API route at ${apiFile}:
-
-  ${err}
-
-  If this is an import error, you can likely fix this by adding this dependency to
-  the "optimizeDeps.include" array in your vite.config.ts.
-
-  \u{1F41E} For a better error message run "node" and enter:
-
-  import('${apiFile}')
-
-`), {};
-            }
-          },
-          request,
-          loaderProps?.params || {}
-        );
-      },
-      async handleSSR({ route, url, loaderProps }) {
-        if (route.type === "ssr") {
-          const buildInfo2 = routeToBuildInfo[route.page];
-          if (!buildInfo2)
-            throw new Error(
-              `No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
-            );
-          try {
-            const loaderData = await (await import(buildInfo2.serverJsPath)).loader?.(loaderProps), preloads = buildInfo2.preloads, headers = new Headers();
-            return headers.set("content-type", "text/html"), new Response(
-              await render({
-                loaderData,
-                loaderProps,
-                path: loaderProps?.path || "/",
-                preloads
-              }),
-              {
-                headers
-              }
-            );
-          } catch (err) {
-            console.error(`[one] Error rendering SSR route ${route.page}
+    root: "."
+  }, render = (await import(getServerEntry(serverOptions))).default.render, apiCJS = oneOptions.build?.api?.outputFormat === "cjs", requestHandlers = {
+    async handleAPI({ route }) {
+      return await import(join(
+        process.cwd(),
+        "dist",
+        "api",
+        route.page.replace("[", "_").replace("]", "_") + (apiCJS ? ".cjs" : ".js")
+      ));
+    },
+    async loadMiddleware(route) {
+      return await import(toAbsolute(route.contextKey));
+    },
+    async handlePage({ route, url, loaderProps }) {
+      if (route.type === "ssr") {
+        const buildInfo2 = routeToBuildInfo[route.page];
+        if (!buildInfo2)
+          throw new Error(
+            `No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
+          );
+        try {
+          const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps), preloads = buildInfo2.preloads, headers = new Headers();
+          headers.set("content-type", "text/html");
+          const rendered = await render({
+            loaderData,
+            loaderProps,
+            path: loaderProps?.path || "/",
+            preloads
+          });
+          return new Response(rendered, {
+            headers,
+            status: route.isNotFound ? 404 : 200
+          });
+        } catch (err) {
+          console.error(`[one] Error rendering SSR route ${route.page}
 
-  ${err?.stack ?? err}
+${err?.stack ?? err}
 
-  url: ${url}`);
-          }
+url: ${url}`);
         }
+      } else if (routeMap[route.honoPath]) {
+        const html = await FSExtra.readFile(
+          join("dist/client", routeMap[route.honoPath]),
+          "utf-8"
+        ), headers = new Headers();
+        return headers.set("content-type", "text/html"), new Response(html, { headers, status: route.isNotFound ? 404 : 200 });
       }
     }
-  ), htmlFiles = {};
-  if (serveStatic) {
-    const { readFile } = await import("node:fs/promises");
-    for (const key in routeMap)
-      routeToBuildInfo[key]?.type !== "ssr" && (htmlFiles[key] = await readFile(join("dist/client", routeMap[key]), "utf-8"));
-  }
-  app.use(async (context, next) => {
-    const html = htmlFiles[context.req.path];
-    if (html)
-      return context.html(html);
-    try {
-      const request = context.req.raw, response = await handleRequest.handler(request);
-      if (response) {
-        if (isResponse(response)) {
-          if (isStatusRedirect(response.status)) {
-            const location = `${response.headers.get("location") || ""}`;
-            return response.headers.forEach((value, key) => {
-              context.header(key, value);
-            }), context.redirect(location, response.status);
+  };
+  function createHonoHandler(route) {
+    return async (context, next) => {
+      if (extname(context.req.path))
+        return await next();
+      try {
+        const request = context.req.raw, url = getURLfromRequestURL(request), response = await (() => {
+          if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
+            const originalUrl = getPathFromLoaderPath(url.pathname), finalUrl = new URL(originalUrl, url.origin);
+            return resolveLoaderRoute(requestHandlers, request, finalUrl, route);
           }
-          if (isAPIRequest.get(request))
-            try {
-              response.headers.set("Cache-Control", "no-store");
-            } catch (err) {
-              console.info(
-                `Error udpating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`,
-                err
-              );
+          switch (route.type) {
+            case "api":
+              return resolveAPIRoute(requestHandlers, request, url, route);
+            case "ssg":
+            case "spa":
+            case "ssr":
+              return resolvePageRoute(requestHandlers, request, url, route);
+          }
+        })();
+        if (response) {
+          if (isResponse(response)) {
+            if (isStatusRedirect(response.status)) {
+              const location = `${response.headers.get("location") || ""}`;
+              return response.headers.forEach((value, key) => {
+                context.header(key, value);
+              }), context.redirect(location, response.status);
             }
-          return response;
+            if (isAPIRequest.get(request))
+              try {
+                return response.headers.set("Cache-Control", "no-store"), response;
+              } catch (err) {
+                console.info(
+                  `Error udpating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`,
+                  err
+                );
+              }
+            return response;
+          }
+          return await next();
         }
-        return context.json(
-          response,
-          200,
-          isAPIRequest.get(request) ? {
-            "Cache-Control": "no-store"
-          } : void 0
-        );
+      } catch (err) {
+        console.error(` [one] Error handling request: ${err.stack}`);
       }
-    } catch (err) {
-      console.error(` [one] Error handling request: ${err.stack}`);
-    }
-    await next();
-  });
+      return await next();
+    };
+  }
+  const compiledManifest = compileManifest(buildInfo.manifest);
+  for (const route of compiledManifest.apiRoutes)
+    app.get(route.honoPath, createHonoHandler(route)), app.put(route.honoPath, createHonoHandler(route)), app.post(route.honoPath, createHonoHandler(route)), app.delete(route.honoPath, createHonoHandler(route)), app.patch(route.honoPath, createHonoHandler(route));
+  for (const route of compiledManifest.pageRoutes)
+    console.log("add", route.honoPath), app.get(route.honoPath, createHonoHandler(route));
 }
 export {
   oneServe

package/dist/esm/server/oneServe.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/server/oneServe.ts"],
-  "mappings": "AACA,SAAS,YAAY;AAErB,SAAS,sBAAsB;AAI/B,eAAsB,SACpB,YACA,aACA,WACA,KACA,cAAc,IACd;AACA,QAAM,EAAE,oBAAoB,IAAI,MAAM,OAAO,wBAAwB,GAC/D,EAAE,WAAW,IAAI,MAAM,OAAO,qBAAqB,GACnD,EAAE,iBAAiB,IAAI,MAAM,OAAO,mBAAmB,GACvD,EAAE,kBAAkB,IAAI,MAAM,OAAO,2BAA2B,GAEhE,eAAe,oBAAI,QAAsB,GACzC,OAAO,YAAY,QAAQ,KAG3B,YAAY,WAAW,KAAK;AAClC,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,eAAO,QAAQ,SAAS,gBAAgB,SAAS,YAAY,MAAM,GAAG;AAAA,MACxE,CAAC;AAIL,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,0CAA0C;AAG5D,QAAM,EAAE,UAAU,YAAY,IAAI,WAE5B,mBAAuD,CAAC;AAC9D,aAAW,SAAS,aAAa;AAC/B,qBAAiB,MAAM,SAAS,IAAI;AAGpC,UAAM,mBAAmB,MAAM,UAC5B,MAAM,GAAG,EACT,IAAI,CAAC,SACG,KAAK,CAAC,MAAM,MAAM,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM,IACjD,EACA,KAAK,GAAG;AACX,qBAAiB,gBAAgB,IAAI;AAAA,EACvC;AAEA,QAAM,gBAAgB;AAAA,IACpB,GAAG;AAAA,IACH;AAAA,EACF,GAKM,UAFQ,MAAM,OADA,eAAe,aAAa,IAG3B,QAAQ,QACvB,SAAS,WAAW,OAAO,KAAK,iBAAiB,OAEjD,gBAAgB;AAAA,IACpB,CAAC;AAAA,IACD;AAAA,MACE,MAAM,UAAU,EAAE,OAAO,SAAS,YAAY,GAAG;AAC/C,cAAM,UAAU;AAAA,UACd,QAAQ,IAAI;AAAA,UACZ;AAAA,UACA;AAAA,UACA,MAAM,KAAK,QAAQ,KAAK,GAAG,EAAE,QAAQ,KAAK,GAAG,KAAK,SAAS,SAAS;AAAA,QACtE;AAEA,4BAAa,IAAI,SAAS,EAAI,GAEvB;AAAA,UACL,YAAY;AACV,gBAAI;AACF,qBAAO,MAAM,OAAO;AAAA,YACtB,SAAS,KAAK;AACZ,6BAAQ,MAAM;AAAA,sCAAyC,OAAO;AAAA;AAAA,IAExE,GAAG;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,YAOK,OAAO;AAAA;AAAA,CAAQ,GACN,CAAC;AAAA,YACV;AAAA,UACF;AAAA,UACA;AAAA,UACA,aAAa,UAAU,CAAC;AAAA,QAC1B;AAAA,MACF;AAAA,MAEA,MAAM,UAAU,EAAE,OAAO,KAAK,YAAY,GAAG;AAC3C,YAAI,MAAM,SAAS,OAAO;AACxB,gBAAMA,aAAY,iBAAiB,MAAM,IAAI;AAC7C,cAAI,CAACA;AACH,kBAAM,IAAI;AAAA,cACR,0BAA0B,GAAG,YAAY,MAAM,IAAI,cAAc,OAAO,KAAK,gBAAgB,CAAC;AAAA,YAChG;AAGF,cAAI;AAEF,kBAAM,aAAa,OADF,MAAM,OAAOA,WAAU,eACN,SAAS,WAAW,GAChD,WAAWA,WAAU,UAErB,UAAU,IAAI,QAAQ;AAC5B,2BAAQ,IAAI,gBAAgB,WAAW,GAEhC,IAAI;AAAA,cACT,MAAM,OAAO;AAAA,gBACX;AAAA,gBACA;AAAA,gBACA,MAAM,aAAa,QAAQ;AAAA,gBAC3B;AAAA,cACF,CAAC;AAAA,cACD;AAAA,gBACE;AAAA,cACF;AAAA,YACF;AAAA,UACF,SAAS,KAAK;AACZ,oBAAQ,MAAM,mCAAmC,MAAM,IAAI;AAAA;AAAA,IAEnE,KAAM,SAAY,GAAG;AAAA;AAAA,SAEhB,GAAG,EAAE;AAAA,UACJ;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAGM,YAAoC,CAAC;AAE3C,MAAI,aAAa;AACf,UAAM,EAAE,SAAS,IAAI,MAAM,OAAO,kBAAkB;AAEpD,eAAW,OAAO;AAGhB,MAFa,iBAAiB,GAAG,GAEvB,SAAS,UAKnB,UAAU,GAAG,IAAI,MAAM,SAAS,KAAK,eAAe,SAAS,GAAG,CAAC,GAAG,OAAO;AAAA,EAE/E;AAEA,MAAI,IAAI,OAAO,SAAS,SAAS;AAE/B,UAAM,OAAO,UAAU,QAAQ,IAAI,IAAI;AACvC,QAAI;AACF,aAAO,QAAQ,KAAK,IAAI;AAG1B,QAAI;AACF,YAAM,UAAU,QAAQ,IAAI,KACtB,WAAW,MAAM,cAAc,QAAQ,OAAO;AAEpD,UAAI,UAAU;AACZ,YAAI,WAAW,QAAQ,GAAG;AACxB,cAAI,iBAAiB,SAAS,MAAM,GAAG;AACrC,kBAAM,WAAW,GAAG,SAAS,QAAQ,IAAI,UAAU,KAAK,EAAE;AAC1D,4BAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,sBAAQ,OAAO,KAAK,KAAK;AAAA,YAC3B,CAAC,GACM,QAAQ,SAAS,UAAU,SAAS,MAAM;AAAA,UACnD;AAEA,cAAI,aAAa,IAAI,OAAO;AAC1B,gBAAI;AAEF,uBAAS,QAAQ,IAAI,iBAAiB,UAAU;AAAA,YAClD,SAAS,KAAK;AACZ,sBAAQ;AAAA,gBACN,6CACE,QAAQ,IAAI,IACd,wBAAwB,SAAS,QAAQ,IAAI,eAAe,CAAC;AAAA,gBAC7D;AAAA,cACF;AAAA,YACF;AAGF,iBAAO;AAAA,QACT;AAEA,eAAO,QAAQ;AAAA,UACb;AAAA,UACA;AAAA,UACA,aAAa,IAAI,OAAO,IACpB;AAAA,YACE,iBAAiB;AAAA,UACnB,IACA;AAAA,QACN;AAAA,MACF;AAAA,IACF,SAAS,KAAK;AACZ,cAAQ,MAAM,kCAAmC,IAAY,KAAQ,EAAE;AAAA,IACzE;AAEA,UAAM,KAAK;AAAA,EACb,CAAC;AACH;",
+  "mappings": "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",
   "names": ["buildInfo"]
 }

package/dist/esm/server/oneServe.mjs

@@ -1,8 +1,15 @@
-import { join } from "node:path";
+import { extname, join } from "node:path";
 import { getServerEntry } from "vxrn/serve";
-async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !0) {
+import { getPathFromLoaderPath } from "../cleanUrl.mjs";
+import { LOADER_JS_POSTFIX_UNCACHED } from "../constants.mjs";
+import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
+import { toAbsolute } from "../utils/toAbsolute.mjs";
+import { default as FSExtra } from "fs-extra";
+async function oneServe(oneOptions, buildInfo, app, serveStatic = !0) {
   const {
-      createHandleRequest
+      resolveAPIRoute,
+      resolveLoaderRoute,
+      resolvePageRoute
     } = await import("../createHandleRequest.mjs"),
     {
       isResponse
@@ -10,11 +17,7 @@ async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !
     {
       isStatusRedirect
     } = await import("../utils/isStatus.mjs"),
-    {
-      resolveAPIRequest
-    } = await import("../vite/resolveAPIRequest.mjs"),
     isAPIRequest = /* @__PURE__ */new WeakMap(),
-    root = vxrnOptions.root || ".",
     redirects = oneOptions.web?.redirects;
   if (redirects) for (const redirect of redirects) app.get(redirect.source, context => {
     const destinationUrl = redirect.destination.replace(/:\w+/g, param => {
@@ -25,49 +28,25 @@ async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !
   });
   if (!buildInfo) throw new Error("No build info found, have you run build?");
   const {
-      routeMap,
-      builtRoutes
+      routeToBuildInfo,
+      routeMap
     } = buildInfo,
-    routeToBuildInfo = {};
-  for (const route of builtRoutes) {
-    routeToBuildInfo[route.cleanPath] = route;
-    const bracketRoutePath = route.cleanPath.split("/").map(part => part[0] === ":" ? `[${part.slice(1)}]` : part).join("/");
-    routeToBuildInfo[bracketRoutePath] = route;
-  }
-  const serverOptions = {
+    serverOptions = {
       ...oneOptions,
-      root
+      root: "."
     },
     render = (await import(getServerEntry(serverOptions))).default.render,
     apiCJS = oneOptions.build?.api?.outputFormat === "cjs",
-    handleRequest = createHandleRequest({}, {
+    requestHandlers = {
       async handleAPI({
-        route,
-        request,
-        loaderProps
+        route
       }) {
-        const apiFile = join(process.cwd(), "dist", "api", route.page.replace("[", "_").replace("]", "_") + (apiCJS ? ".cjs" : ".js"));
-        return isAPIRequest.set(request, !0), resolveAPIRequest(async () => {
-          try {
-            return await import(apiFile);
-          } catch (err) {
-            return console.error(`
- [one] Error importing API route at ${apiFile}:
-
-  ${err}
-
-  If this is an import error, you can likely fix this by adding this dependency to
-  the "optimizeDeps.include" array in your vite.config.ts.
-
-  \u{1F41E} For a better error message run "node" and enter:
-
-  import('${apiFile}')
-
-`), {};
-          }
-        }, request, loaderProps?.params || {});
+        return await import(join(process.cwd(), "dist", "api", route.page.replace("[", "_").replace("]", "_") + (apiCJS ? ".cjs" : ".js")));
+      },
+      async loadMiddleware(route) {
+        return await import(toAbsolute(route.contextKey));
       },
-      async handleSSR({
+      async handlePage({
         route,
         url,
         loaderProps
@@ -76,64 +55,84 @@ async function oneServe(oneOptions, vxrnOptions, buildInfo, app, serveStatic = !
           const buildInfo2 = routeToBuildInfo[route.page];
           if (!buildInfo2) throw new Error(`No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`);
           try {
-            const loaderData = await (await import(buildInfo2.serverJsPath)).loader?.(loaderProps),
+            const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps),
               preloads = buildInfo2.preloads,
               headers = new Headers();
-            return headers.set("content-type", "text/html"), new Response(await render({
+            headers.set("content-type", "text/html");
+            const rendered = await render({
               loaderData,
               loaderProps,
               path: loaderProps?.path || "/",
               preloads
-            }), {
-              headers
+            });
+            return new Response(rendered, {
+              headers,
+              status: route.isNotFound ? 404 : 200
             });
           } catch (err) {
             console.error(`[one] Error rendering SSR route ${route.page}
 
-  ${err?.stack ?? err}
+${err?.stack ?? err}
 
-  url: ${url}`);
+url: ${url}`);
           }
+        } else if (routeMap[route.honoPath]) {
+          const html = await FSExtra.readFile(join("dist/client", routeMap[route.honoPath]), "utf-8"),
+            headers = new Headers();
+          return headers.set("content-type", "text/html"), new Response(html, {
+            headers,
+            status: route.isNotFound ? 404 : 200
+          });
         }
       }
-    }),
-    htmlFiles = {};
-  if (serveStatic) {
-    const {
-      readFile
-    } = await import("node:fs/promises");
-    for (const key in routeMap) routeToBuildInfo[key]?.type !== "ssr" && (htmlFiles[key] = await readFile(join("dist/client", routeMap[key]), "utf-8"));
-  }
-  app.use(async (context, next) => {
-    const html = htmlFiles[context.req.path];
-    if (html) return context.html(html);
-    try {
-      const request = context.req.raw,
-        response = await handleRequest.handler(request);
-      if (response) {
-        if (isResponse(response)) {
-          if (isStatusRedirect(response.status)) {
-            const location = `${response.headers.get("location") || ""}`;
-            return response.headers.forEach((value, key) => {
-              context.header(key, value);
-            }), context.redirect(location, response.status);
+    };
+  function createHonoHandler(route) {
+    return async (context, next) => {
+      if (extname(context.req.path)) return await next();
+      try {
+        const request = context.req.raw,
+          url = getURLfromRequestURL(request),
+          response = await (() => {
+            if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
+              const originalUrl = getPathFromLoaderPath(url.pathname),
+                finalUrl = new URL(originalUrl, url.origin);
+              return resolveLoaderRoute(requestHandlers, request, finalUrl, route);
+            }
+            switch (route.type) {
+              case "api":
+                return resolveAPIRoute(requestHandlers, request, url, route);
+              case "ssg":
+              case "spa":
+              case "ssr":
+                return resolvePageRoute(requestHandlers, request, url, route);
+            }
+          })();
+        if (response) {
+          if (isResponse(response)) {
+            if (isStatusRedirect(response.status)) {
+              const location = `${response.headers.get("location") || ""}`;
+              return response.headers.forEach((value, key) => {
+                context.header(key, value);
+              }), context.redirect(location, response.status);
+            }
+            if (isAPIRequest.get(request)) try {
+              return response.headers.set("Cache-Control", "no-store"), response;
+            } catch (err) {
+              console.info(`Error udpating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
+            }
+            return response;
           }
-          if (isAPIRequest.get(request)) try {
-            response.headers.set("Cache-Control", "no-store");
-          } catch (err) {
-            console.info(`Error udpating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
-          }
-          return response;
+          return await next();
         }
-        return context.json(response, 200, isAPIRequest.get(request) ? {
-          "Cache-Control": "no-store"
-        } : void 0);
+      } catch (err) {
+        console.error(` [one] Error handling request: ${err.stack}`);
       }
-    } catch (err) {
-      console.error(` [one] Error handling request: ${err.stack}`);
-    }
-    await next();
-  });
+      return await next();
+    };
+  }
+  const compiledManifest = compileManifest(buildInfo.manifest);
+  for (const route of compiledManifest.apiRoutes) app.get(route.honoPath, createHonoHandler(route)), app.put(route.honoPath, createHonoHandler(route)), app.post(route.honoPath, createHonoHandler(route)), app.delete(route.honoPath, createHonoHandler(route)), app.patch(route.honoPath, createHonoHandler(route));
+  for (const route of compiledManifest.pageRoutes) console.log("add", route.honoPath), app.get(route.honoPath, createHonoHandler(route));
 }
 export { oneServe };
 //# sourceMappingURL=oneServe.mjs.map

package/dist/esm/server/oneServe.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["join","getServerEntry","oneServe","oneOptions","vxrnOptions","buildInfo","app","serveStatic","createHandleRequest","isResponse","isStatusRedirect","resolveAPIRequest","isAPIRequest","WeakMap","root","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeMap","builtRoutes","routeToBuildInfo","route","cleanPath","bracketRoutePath","split","map","part","slice","serverOptions","render","default","apiCJS","build","api","outputFormat","handleRequest","handleAPI","request","loaderProps","apiFile","process","cwd","page","set","err","console","error","params","handleSSR","url","type","buildInfo2","Object","keys","loaderData","serverJsPath","loader","preloads","headers","Headers","Response","path","stack","htmlFiles","readFile","key","use","next","html","raw","response","handler","status","location","forEach","value","header","info","json"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["extname","join","getServerEntry","getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","compileManifest","getURLfromRequestURL","toAbsolute","default","FSExtra","oneServe","oneOptions","buildInfo","app","serveStatic","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handlePage","url","loaderProps","type","buildInfo2","Object","keys","loaderData","serverJsPath","loader","preloads","headers","Headers","set","rendered","path","Response","status","isNotFound","err","console","error","stack","honoPath","html","readFile","createHonoHandler","next","request","raw","response","pathname","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","info","compiledManifest","manifest","apiRoutes","put","post","delete","patch","pageRoutes","log"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}