From e0c2ab58723bafdd7b173c78a10fcf8722761f7b Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sat, 11 Apr 2026 16:29:53 +0100 Subject: [PATCH] Update pages server function(s) --- .../web-pages/generate-web-page-get-cache-page.js | 4 ++-- ...nerate-web-page-response-from-component-return.js | 11 +++++++---- .../server/web-pages/grab-page-error-component.js | 2 +- dist/types/index.d.ts | 9 +++++---- package.json | 2 +- .../web-pages/generate-web-page-get-cache-page.tsx | 4 ++-- ...erate-web-page-response-from-component-return.tsx | 12 ++++++++---- .../server/web-pages/grab-page-error-component.tsx | 2 +- src/types/index.ts | 9 +++++---- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dist/functions/server/web-pages/generate-web-page-get-cache-page.js b/dist/functions/server/web-pages/generate-web-page-get-cache-page.js index 2474574..d8a1eeb 100644 --- a/dist/functions/server/web-pages/generate-web-page-get-cache-page.js +++ b/dist/functions/server/web-pages/generate-web-page-get-cache-page.js @@ -3,8 +3,8 @@ import { log } from "../../../utils/log"; import writeCache from "../../cache/write-cache"; export default async function generateWebPageGetCachePage({ module, routeParams, serverRes, root_module, html, }) { const config = _.merge(root_module?.config, module?.config); - const cache_page = config?.cachePage || serverRes?.cachePage || false; - const expiry_seconds = config?.cacheExpiry || serverRes?.cacheExpiry; + const cache_page = config?.cachePage || serverRes?.cache_page || false; + const expiry_seconds = config?.cacheExpiry || serverRes?.cache_expiry; if (cache_page && routeParams?.url) { try { const is_cache = typeof cache_page == "boolean" diff --git a/dist/functions/server/web-pages/generate-web-page-response-from-component-return.js b/dist/functions/server/web-pages/generate-web-page-response-from-component-return.js index a6497c9..d6253ac 100644 --- a/dist/functions/server/web-pages/generate-web-page-response-from-component-return.js +++ b/dist/functions/server/web-pages/generate-web-page-response-from-component-return.js @@ -23,10 +23,10 @@ export default async function generateWebPageResponseFromComponentReturn({ compo : serverRes.redirect.status_code || 302); } const res_opts = { - ...serverRes?.responseOptions, + ...serverRes?.response_options, headers: { "Content-Type": "text/html", - ...serverRes?.responseOptions?.headers, + ...serverRes?.response_options?.headers, }, }; if (is_dev) { @@ -47,8 +47,11 @@ export default async function generateWebPageResponseFromComponentReturn({ compo }); } const res = new Response(html, res_opts); - if (routeParams?.resTransform) { - return await routeParams.resTransform(res); + if (routeParams?.res_transform) { + return await routeParams.res_transform(res); + } + if (serverRes?.res_transform) { + return await serverRes.res_transform(res); } return res; } diff --git a/dist/functions/server/web-pages/grab-page-error-component.js b/dist/functions/server/web-pages/grab-page-error-component.js index 3f6f7ca..517c589 100644 --- a/dist/functions/server/web-pages/grab-page-error-component.js +++ b/dist/functions/server/web-pages/grab-page-error-component.js @@ -10,7 +10,7 @@ export default async function grabPageErrorComponent({ error, routeParams, is404 ? BUNX_ROOT_404_PRESET_COMPONENT : BUNX_ROOT_500_PRESET_COMPONENT; const default_server_res = { - responseOptions: { + response_options: { status: is404 ? 404 : 500, }, }; diff --git a/dist/types/index.d.ts b/dist/types/index.d.ts index 5252ae7..09f84f9 100644 --- a/dist/types/index.d.ts +++ b/dist/types/index.d.ts @@ -70,7 +70,7 @@ export type BunxRouteParams = { /** * Intercept and Transform the response object */ - resTransform?: (res: Response) => Promise | Response; + res_transform?: (res: Response) => Promise | Response; server?: Server; }; export interface PostInsertReturn { @@ -207,17 +207,18 @@ export type BunextPageModuleServerReturn Promise | Response; }; export type BunextCachePageType = boolean | ((params: { ctx: Omit; diff --git a/package.json b/package.json index 83db493..3a1751d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/bunext", - "version": "1.0.73", + "version": "1.0.74", "main": "dist/index.js", "module": "index.ts", "dependencies": { diff --git a/src/functions/server/web-pages/generate-web-page-get-cache-page.tsx b/src/functions/server/web-pages/generate-web-page-get-cache-page.tsx index 98f7eba..4e720c2 100644 --- a/src/functions/server/web-pages/generate-web-page-get-cache-page.tsx +++ b/src/functions/server/web-pages/generate-web-page-get-cache-page.tsx @@ -24,8 +24,8 @@ export default async function generateWebPageGetCachePage({ }: Params) { const config = _.merge(root_module?.config, module?.config); - const cache_page = config?.cachePage || serverRes?.cachePage || false; - const expiry_seconds = config?.cacheExpiry || serverRes?.cacheExpiry; + const cache_page = config?.cachePage || serverRes?.cache_page || false; + const expiry_seconds = config?.cacheExpiry || serverRes?.cache_expiry; if (cache_page && routeParams?.url) { try { diff --git a/src/functions/server/web-pages/generate-web-page-response-from-component-return.tsx b/src/functions/server/web-pages/generate-web-page-response-from-component-return.tsx index f8d50d3..a5c8d60 100644 --- a/src/functions/server/web-pages/generate-web-page-response-from-component-return.tsx +++ b/src/functions/server/web-pages/generate-web-page-response-from-component-return.tsx @@ -40,10 +40,10 @@ export default async function generateWebPageResponseFromComponentReturn({ } const res_opts: ResponseInit = { - ...serverRes?.responseOptions, + ...serverRes?.response_options, headers: { "Content-Type": "text/html", - ...serverRes?.responseOptions?.headers, + ...serverRes?.response_options?.headers, }, }; @@ -68,8 +68,12 @@ export default async function generateWebPageResponseFromComponentReturn({ const res = new Response(html, res_opts); - if (routeParams?.resTransform) { - return await routeParams.resTransform(res); + if (routeParams?.res_transform) { + return await routeParams.res_transform(res); + } + + if (serverRes?.res_transform) { + return await serverRes.res_transform(res); } return res; diff --git a/src/functions/server/web-pages/grab-page-error-component.tsx b/src/functions/server/web-pages/grab-page-error-component.tsx index 50559bd..2af2f26 100644 --- a/src/functions/server/web-pages/grab-page-error-component.tsx +++ b/src/functions/server/web-pages/grab-page-error-component.tsx @@ -32,7 +32,7 @@ export default async function grabPageErrorComponent({ : BUNX_ROOT_500_PRESET_COMPONENT; const default_server_res = { - responseOptions: { + response_options: { status: is404 ? 404 : 500, }, }; diff --git a/src/types/index.ts b/src/types/index.ts index e2e7bf3..45ded88 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -90,7 +90,7 @@ export type BunxRouteParams = { /** * Intercept and Transform the response object */ - resTransform?: (res: Response) => Promise | Response; + res_transform?: (res: Response) => Promise | Response; server?: Server; }; @@ -238,17 +238,18 @@ export type BunextPageModuleServerReturn< props?: T; query?: Q; redirect?: BunextPageModuleServerRedirect; - responseOptions?: ResponseInit; + response_options?: ResponseInit; /** * Whether to cache the current page */ - cachePage?: BunextCachePageType; + cache_page?: BunextCachePageType; /** * Expiry time of the cache in seconds */ - cacheExpiry?: number; + cache_expiry?: number; url?: BunextPageModuleServerReturnURLObject; error?: string; + res_transform?: (res: Response) => Promise | Response; }; export type BunextCachePageType =