Check for env before assigning the new render func

Signed-off-by: Marcos Candeia <marrcooos@gmail.com>
deco-cx · Aug 4, 2024 · efadad3 · efadad3
1 parent 57ff539
commit efadad3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/runtime/app.ts b/runtime/app.ts
@@ -49,6 +49,7 @@ export interface DecoOptions<TAppManifest extends AppManifest = AppManifest> {
 }
 
 export class Deco<TAppManifest extends AppManifest = AppManifest> {
+  private _handler: ReturnType<typeof handlerFor> | null = null;
   private constructor(
     public site: string,
     private ctx: DecoContext<TAppManifest>,
@@ -82,7 +83,10 @@ export class Deco<TAppManifest extends AppManifest = AppManifest> {
   }
 
   get handler() {
-    return handlerFor(this);
+    return this._handler ??= handlerFor(this);
+  }
+  get fetch() {
+    return (req: Request) => this.handler(req);
   }
 
   async resolve<T, TContext extends BaseContext>(

diff --git a/runtime/handler.tsx b/runtime/handler.tsx
@@ -92,7 +92,7 @@ export const handlerFor = <TAppManifest extends AppManifest = AppManifest>(
   const bindings = deco.bindings;
   const hono = bindings?.server ?? new Hono<DecoRouteState<TAppManifest>>();
   hono.use(async (ctx, next) => {
-    const renderFn = ctx.env.RENDER_FN ?? bindings?.renderer?.renderFn;
+    const renderFn = ctx.env?.RENDER_FN ?? bindings?.renderer?.renderFn;
     renderFn && ctx.setRenderer(
       renderFn,
     );