jeasx 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeasx",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "jeasx - the ease of JSX with the power of SSR",
   "keywords": [
     "jsx",
@@ -35,7 +35,7 @@
     "dotenv": "16.4.5",
     "esbuild": "0.20.2",
     "fastify": "4.26.2",
-    "jsx-async-runtime": "0.2.0",
+    "jsx-async-runtime": "0.2.1",
     "pm2": "5.3.1"
   },
   "scripts": {

package/serverless.js

@@ -1 +1 @@
-import fastifyAccepts from"@fastify/accepts";import fastifyCookie from"@fastify/cookie";import fastifyFormbody from"@fastify/formbody";import fastifyMultipart from"@fastify/multipart";import fastifyRequestContext from"@fastify/request-context";import fastifyStatic from"@fastify/static";import fastifyUrlData from"@fastify/url-data";import"dotenv/config";import Fastify from"fastify";import{renderToString}from"jsx-async-runtime";import{createHash}from"node:crypto";import{readFile,stat}from"node:fs/promises";import{join}from"node:path";const NODE_ENV_IS_DEVELOPMENT=process.env.NODE_ENV==="development";const serverless=Fastify({logger:true,disableRequestLogging:NODE_ENV_IS_DEVELOPMENT,bodyLimit:Number(process.env.FASTIFY_BODY_LIMIT)||void 0});serverless.register(fastifyAccepts);serverless.register(fastifyCookie);serverless.register(fastifyFormbody);serverless.register(fastifyMultipart);serverless.register(fastifyRequestContext);serverless.register(fastifyUrlData);const FASTIFY_STATIC_HEADERS=!NODE_ENV_IS_DEVELOPMENT&&process.env.FASTIFY_STATIC_HEADERS?JSON.parse(String(process.env.FASTIFY_STATIC_HEADERS)):void 0;serverless.register(fastifyStatic,{root:["public","dist/browser"].map(dir=>join(process.cwd(),dir)),prefix:"/",wildcard:false,setHeaders:FASTIFY_STATIC_HEADERS?(reply,path)=>{for(const[suffix,headers]of Object.entries(FASTIFY_STATIC_HEADERS)){if(path.endsWith(suffix)){for(const[key,value]of Object.entries(headers)){reply.setHeader(key,value)}return}}}:void 0});serverless.all("*",async(request,reply)=>{let response;const requestPath=request.urlData().path;const pathSegments=requestPath.split("/").filter(segment=>segment!=="").reduce((acc,segment)=>{acc.push((acc.length>0?acc[acc.length-1]:"")+"/"+segment);return acc},[]).reverse().concat("");const generateEdges=path=>{const edges=[];if(path){const lastSegment=path.lastIndexOf("/")+1;edges.push(`${path.substring(0,lastSegment)}[${path.substring(lastSegment)}]`)}edges.push(`${path}/[index]`);return edges};for(const pathname of[...pathSegments.slice().reverse().map(segment=>`routes${segment}/[...guard].js`),...generateEdges(pathSegments[0]).map(segment=>`routes${segment}.js`),...pathSegments.map(segment=>`routes${segment}/[...path].js`),...pathSegments.map(segment=>`routes${segment}/[404].js`)]){const modulePath=join(process.cwd(),"dist",pathname);try{(await stat(modulePath)).isFile()}catch{continue}const hash=NODE_ENV_IS_DEVELOPMENT?"?"+createHash("sha1").update(await readFile(modulePath,"utf-8")).digest("hex"):"";response=await(await import(`file://${modulePath}${hash}`)).default({request,reply,...typeof response==="object"?response:{}});if(reply.sent){return}else if(pathname.endsWith("/[...guard].js")&&(response===void 0||!isJSX(response))){continue}else if(pathname.endsWith("/[404].js")){reply.status(404);break}else if(reply.statusCode===404){continue}else{break}}if(!reply.hasHeader("Content-Type")){reply.header("Content-Type","text/html; charset=utf-8")}if(isJSX(response)){return await renderToString(response)}else{return response}function isJSX(obj){return typeof obj==="object"&&"type"in obj&&"props"in obj}});var serverless_default=serverless;export{serverless_default as default};
+import fastifyAccepts from"@fastify/accepts";import fastifyCookie from"@fastify/cookie";import fastifyFormbody from"@fastify/formbody";import fastifyMultipart from"@fastify/multipart";import fastifyRequestContext,{requestContext}from"@fastify/request-context";import fastifyStatic from"@fastify/static";import fastifyUrlData from"@fastify/url-data";import"dotenv/config";import Fastify from"fastify";import{renderToString}from"jsx-async-runtime";import{createHash}from"node:crypto";import{readFile,stat}from"node:fs/promises";import{join}from"node:path";const NODE_ENV_IS_DEVELOPMENT=process.env.NODE_ENV==="development";const serverless=Fastify({logger:true,disableRequestLogging:NODE_ENV_IS_DEVELOPMENT,bodyLimit:Number(process.env.FASTIFY_BODY_LIMIT)||void 0});serverless.register(fastifyAccepts);serverless.register(fastifyCookie);serverless.register(fastifyFormbody);serverless.register(fastifyMultipart);serverless.register(fastifyRequestContext);serverless.register(fastifyUrlData);const FASTIFY_STATIC_HEADERS=!NODE_ENV_IS_DEVELOPMENT&&process.env.FASTIFY_STATIC_HEADERS?JSON.parse(String(process.env.FASTIFY_STATIC_HEADERS)):void 0;serverless.register(fastifyStatic,{root:["public","dist/browser"].map(dir=>join(process.cwd(),dir)),prefix:"/",wildcard:false,setHeaders:FASTIFY_STATIC_HEADERS?(reply,path)=>{for(const[suffix,headers]of Object.entries(FASTIFY_STATIC_HEADERS)){if(path.endsWith(suffix)){for(const[key,value]of Object.entries(headers)){reply.setHeader(key,value)}return}}}:void 0});serverless.all("*",async(request,reply)=>{let response;const requestPath=request.urlData().path;const pathSegments=requestPath.split("/").filter(segment=>segment!=="").reduce((acc,segment)=>{acc.push((acc.length>0?acc[acc.length-1]:"")+"/"+segment);return acc},[]).reverse().concat("");const generateEdges=path=>{const edges=[];if(path){const lastSegment=path.lastIndexOf("/")+1;edges.push(`${path.substring(0,lastSegment)}[${path.substring(lastSegment)}]`)}edges.push(`${path}/[index]`);return edges};for(const pathname of[...pathSegments.slice().reverse().map(segment=>`routes${segment}/[...guard].js`),...generateEdges(pathSegments[0]).map(segment=>`routes${segment}.js`),...pathSegments.map(segment=>`routes${segment}/[...path].js`),...pathSegments.map(segment=>`routes${segment}/[404].js`)]){const modulePath=join(process.cwd(),"dist",pathname);try{(await stat(modulePath)).isFile()}catch{continue}const hash=NODE_ENV_IS_DEVELOPMENT?"?"+createHash("sha1").update(await readFile(modulePath,"utf-8")).digest("hex"):"";response=await(await import(`file://${modulePath}${hash}`)).default({request,reply,...typeof response==="object"?response:{}});if(reply.sent){return}else if(pathname.endsWith("/[...guard].js")&&(response===void 0||!isJSX(response))){continue}else if(pathname.endsWith("/[404].js")){reply.status(404);break}else if(reply.statusCode===404){continue}else{break}}if(!reply.hasHeader("Content-Type")){reply.header("Content-Type","text/html; charset=utf-8")}const payload=isJSX(response)?await renderToString(response):response;const responseHandler=requestContext.get("response");return typeof responseHandler==="function"?await responseHandler(payload):payload;function isJSX(obj){return typeof obj==="object"&&"type"in obj&&"props"in obj}});var serverless_default=serverless;export{serverless_default as default};

package/serverless.ts

@@ -2,7 +2,9 @@ import fastifyAccepts from "@fastify/accepts";
 import fastifyCookie from "@fastify/cookie";
 import fastifyFormbody from "@fastify/formbody";
 import fastifyMultipart from "@fastify/multipart";
-import fastifyRequestContext from "@fastify/request-context";
+import fastifyRequestContext, {
+  requestContext,
+} from "@fastify/request-context";
 import fastifyStatic from "@fastify/static";
 import fastifyUrlData from "@fastify/url-data";
 import "dotenv/config";
@@ -12,6 +14,12 @@ import { createHash } from "node:crypto";
 import { readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
 
+declare module "@fastify/request-context" {
+  interface RequestContextData {
+    response?: (payload: unknown) => Promise<unknown>;
+  }
+}
+
 const NODE_ENV_IS_DEVELOPMENT = process.env.NODE_ENV === "development";
 
 // Create a Fastify app instance
@@ -57,7 +65,7 @@ serverless.register(fastifyStatic, {
 
 // Handle all requests
 serverless.all("*", async (request, reply) => {
-  let response;
+  let response: any;
 
   // Extract pathname without query parameters
   const requestPath = request.urlData().path;
@@ -74,7 +82,7 @@ serverless.all("*", async (request, reply) => {
     .concat("");
 
   // Transform "/a/b/c" into ["/a/b/[c]", "/a/b/c/[index]"]
-  const generateEdges = (path) => {
+  const generateEdges = (path: string) => {
     const edges = [];
     if (path) {
       const lastSegment = path.lastIndexOf("/") + 1;
@@ -143,14 +151,13 @@ serverless.all("*", async (request, reply) => {
     reply.header("Content-Type", "text/html; charset=utf-8");
   }
 
-  // Render JSX or return raw response
-  if (isJSX(response)) {
-    return await renderToString(response);
-  } else {
-    return response;
-  }
+  const payload = isJSX(response) ? await renderToString(response) : response;
+  const responseHandler = requestContext.get("response");
+  return typeof responseHandler === "function"
+    ? await responseHandler(payload)
+    : payload;
 
-  function isJSX(obj) {
+  function isJSX(obj: any) {
     return typeof obj === "object" && "type" in obj && "props" in obj;
   }
 });