jeasx 1.2.2 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "description": "Jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "@fastify/cookie": "11.0.2",
-    "@fastify/formbody": "8.0.1",
-    "@fastify/multipart": "9.0.1",
-    "@fastify/static": "8.0.3",
-    "@types/node": "22.10.5",
+    "@fastify/formbody": "8.0.2",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/static": "8.1.0",
+    "@types/node": "22.13.1",
     "dotenv-flow": "4.1.0",
-    "esbuild": "0.24.2",
+    "esbuild": "0.25.0",
     "fastify": "5.2.1",
-    "jsx-async-runtime": "0.6.2",
+    "jsx-async-runtime": "0.7.1",
     "pm2": "5.4.3"
   },
   "scripts": {

package/serverless.js

@@ -37,6 +37,7 @@ serverless.register(fastifyStatic, {
     }
   } : void 0
 });
+serverless.decorateRequest("route", "");
 serverless.decorateRequest("path", "");
 serverless.addHook("onRequest", async (request, reply) => {
   const index = request.url.indexOf("?");
@@ -49,7 +50,7 @@ serverless.all("*", async (request, reply) => {
   const context = {};
   const path = request.path;
   for (const route of generateRoutes(path)) {
-    const modulePath = join(cwd, "dist", route);
+    const modulePath = join(cwd, "dist", `routes${route}.js`);
     let module = modulesCache[modulePath];
     if (module === null) {
       continue;
@@ -69,6 +70,7 @@ serverless.all("*", async (request, reply) => {
         module = modulesCache[modulePath] = await import(`file://${modulePath}`);
       }
     }
+    request.route = route;
     response = await module.default.call(context, {
       request,
       reply,
@@ -78,9 +80,9 @@ serverless.all("*", async (request, reply) => {
       return;
     } else if (typeof response === "string" || Buffer.isBuffer(response)) {
       break;
-    } else if (route.endsWith("/[...guard].js") && (response === void 0 || !isJSX(response))) {
+    } else if (route.endsWith("/[...guard]") && (response === void 0 || !isJSX(response))) {
       continue;
-    } else if (route.endsWith("/[404].js")) {
+    } else if (route.endsWith("/[404]")) {
       reply.status(404);
       break;
     } else if (reply.statusCode === 404) {
@@ -100,10 +102,10 @@ function generateRoutes(path) {
   const segments = generateSegments(path);
   const edges = generateEdges(segments[0]);
   return [
-    ...segments.toReversed().map((segment) => `routes${segment}/[...guard].js`),
-    ...edges.map((edge) => `routes${edge}.js`),
-    ...segments.map((segment) => `routes${segment}/[...path].js`),
-    ...segments.map((segment) => `routes${segment}/[404].js`)
+    ...segments.toReversed().map((segment) => `${segment}/[...guard]`),
+    ...edges.map((edge) => `${edge}`),
+    ...segments.map((segment) => `${segment}/[...path]`),
+    ...segments.map((segment) => `${segment}/[404]`)
   ];
 }
 function generateSegments(path) {

package/serverless.ts

@@ -50,13 +50,14 @@ serverless.register(fastifyStatic, {
     : undefined,
 });
 
-// Add path without query parameters to request
 declare module "fastify" {
   interface FastifyRequest {
-    path: string;
+    path: string; // Path without query parameters
+    route: string; // Path to resolved route handler
   }
 }
 
+serverless.decorateRequest("route", "");
 serverless.decorateRequest("path", "");
 serverless.addHook("onRequest", async (request, reply) => {
   const index = request.url.indexOf("?");
@@ -81,7 +82,7 @@ serverless.all("*", async (request, reply) => {
 
   // Execute route handlers for current request
   for (const route of generateRoutes(path)) {
-    const modulePath = join(cwd, "dist", route);
+    const modulePath = join(cwd, "dist", `routes${route}.js`);
 
     // Resolve module via cache
     let module = modulesCache[modulePath];
@@ -119,6 +120,9 @@ serverless.all("*", async (request, reply) => {
       }
     }
 
+    // Store current route in request
+    request.route = route;
+
     // Call the handler with request, reply and optional props
     response = await module.default.call(context, {
       request,
@@ -131,11 +135,11 @@ serverless.all("*", async (request, reply) => {
     } else if (typeof response === "string" || Buffer.isBuffer(response)) {
       break;
     } else if (
-      route.endsWith("/[...guard].js") &&
+      route.endsWith("/[...guard]") &&
       (response === undefined || !isJSX(response))
     ) {
       continue;
-    } else if (route.endsWith("/[404].js")) {
+    } else if (route.endsWith("/[404]")) {
       reply.status(404);
       break;
     } else if (reply.statusCode === 404) {
@@ -174,10 +178,10 @@ function generateRoutes(path: string): string[] {
   return [
     ...segments
       .toReversed() // [...guard]s are evaluated from top to bottom
-      .map((segment) => `routes${segment}/[...guard].js`),
-    ...edges.map((edge) => `routes${edge}.js`),
-    ...segments.map((segment) => `routes${segment}/[...path].js`),
-    ...segments.map((segment) => `routes${segment}/[404].js`),
+      .map((segment) => `${segment}/[...guard]`),
+    ...edges.map((edge) => `${edge}`),
+    ...segments.map((segment) => `${segment}/[...path]`),
+    ...segments.map((segment) => `${segment}/[404]`),
   ];
 }