lambder 2.0.5 → 2.0.8

package/dist/Lambder.d.ts

@@ -1,43 +1,12 @@
 import { z } from "zod";
-import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
+import type { APIGatewayProxyEvent, Context } from "aws-lambda";
 import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 import LambderUtils from "./LambderUtils.js";
-import { type LambderSessionContext } from "./LambderSessionManager.js";
 import LambderSessionController from "./LambderSessionController.js";
 import type { MergeContract } from "./LambderApiContract.js";
+import { type LambderRenderContext, type LambderSessionRenderContext } from "./LambderContext.js";
 type Path = `/${string}`;
-export type LambderRenderContext<TApiPayload = any> = {
-    host: string;
-    path: string;
-    pathParams: Record<string, any> | null;
-    method: string;
-    get: Record<string, any>;
-    post: Record<string, any>;
-    cookie: Record<string, any>;
-    session: null;
-    apiName: string;
-    apiPayload: TApiPayload;
-    headers: APIGatewayProxyEventHeaders;
-    event: APIGatewayProxyEvent;
-    lambdaContext: Context;
-    _otherInternal: {
-        isApiCall: boolean;
-        requestVersion: string | null;
-        setHeaderFnAccumulator: {
-            key: string;
-            value: string | string[];
-        }[];
-        addHeaderFnAccumulator: {
-            key: string;
-            value: string;
-        }[];
-        logToApiResponseAccumulator: any[];
-    };
-};
-export type LambderSessionRenderContext<TApiPayload = any, SessionData = any> = Omit<LambderRenderContext<TApiPayload>, 'session'> & {
-    session: LambderSessionContext<SessionData>;
-};
 type ConditionFunction = (ctx: LambderRenderContext<any>) => boolean;
 type ActionFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
 type SessionActionFunction<SessionData = any> = (ctx: LambderSessionRenderContext<any, SessionData>, resolver: LambderResolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
@@ -48,7 +17,7 @@ type HookFallbackFunction = (ctx: LambderRenderContext<any>, resolver: LambderRe
 type GlobalErrorHandlerFunction = (err: Error, ctx: LambderRenderContext<any> | null, response: LambderResponseBuilder, logListToApiResponse?: any[]) => LambderResolverResponse | Promise<LambderResolverResponse>;
 type RouteFallbackHandlerFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse;
 type ApiFallbackHandlerFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse;
-export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context, apiPath: string) => LambderRenderContext<any>;
+type ApiInputValidationErrorHandlerFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver, zodError: z.ZodError) => LambderResolverResponse | Promise<LambderResolverResponse>;
 /**
  * Main Lambder class for building type-safe serverless APIs
  *
@@ -86,6 +55,7 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
     private globalErrorHandler;
     private routeFallbackHandler;
     private apiFallbackHandler;
+    private apiInputValidationErrorHandler;
     utils: LambderUtils;
     private lambderSessionManager?;
     private sessionTokenCookieKey;
@@ -109,6 +79,7 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
     setSessionCookieKey(sessionTokenCookieKey: string, sessionCsrfCookieKey: string): this;
     setRouteFallbackHandler(routeFallbackHandler: RouteFallbackHandlerFunction): this;
     setApiFallbackHandler(apiFallbackHandler: ApiFallbackHandlerFunction): this;
+    setApiInputValidationErrorHandler(apiInputValidationErrorHandler: ApiInputValidationErrorHandlerFunction): this;
     setGlobalErrorHandler(globalErrorHandler: GlobalErrorHandlerFunction): this;
     private getPatternMatch;
     private testPatternMatch;

package/dist/Lambder.js

@@ -1,53 +1,10 @@
-import cookieParser from "cookie";
 import { match } from "path-to-regexp";
 import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder from "./LambderResponseBuilder.js";
 import LambderUtils from "./LambderUtils.js";
 import LambderSessionManager from "./LambderSessionManager.js";
 import LambderSessionController from "./LambderSessionController.js";
-export const createContext = (event, lambdaContext, apiPath) => {
-    const host = event.headers.Host || event.headers.host || "";
-    const path = event.path;
-    const pathParams = null;
-    const get = event.queryStringParameters || {};
-    const method = event.httpMethod;
-    const cookie = cookieParser.parse(event.headers.Cookie || event.headers.cookie || "");
-    const headers = event.headers;
-    // Decode body for the post
-    let post = {};
-    try {
-        const decodedBody = event.isBase64Encoded ? (event.body ? Buffer.from(event.body, "base64").toString() : "{}") : (event.body || "{}");
-        try {
-            post = JSON.parse(decodedBody) || {};
-        }
-        catch (e) {
-            const params = new URLSearchParams(decodedBody);
-            post = {};
-            for (const [key, value] of params.entries()) {
-                post[key] = value;
-            }
-        }
-    }
-    catch (e) { }
-    // Parse api variables
-    const isApiCall = method === "POST" && apiPath && path === apiPath && post.apiName;
-    const apiName = isApiCall ? post.apiName : null;
-    const apiPayload = isApiCall ? post.payload : null;
-    const requestVersion = isApiCall ? post.version : null;
-    return {
-        host, path, pathParams, method,
-        get, post, cookie, event,
-        session: null,
-        apiName, apiPayload,
-        headers, lambdaContext,
-        _otherInternal: {
-            isApiCall, requestVersion,
-            setHeaderFnAccumulator: [],
-            addHeaderFnAccumulator: [],
-            logToApiResponseAccumulator: [],
-        }
-    };
-};
+import { createContext } from "./LambderContext.js";
 /**
  * Main Lambder class for building type-safe serverless APIs
  *
@@ -85,6 +42,7 @@ export default class Lambder {
     globalErrorHandler = null;
     routeFallbackHandler = null;
     apiFallbackHandler = null;
+    apiInputValidationErrorHandler = null;
     utils;
     lambderSessionManager;
     sessionTokenCookieKey = "LMDRSESSIONTKID";
@@ -125,6 +83,10 @@ export default class Lambder {
         this.apiFallbackHandler = apiFallbackHandler;
         return this;
     }
+    setApiInputValidationErrorHandler(apiInputValidationErrorHandler) {
+        this.apiInputValidationErrorHandler = apiInputValidationErrorHandler;
+        return this;
+    }
     setGlobalErrorHandler(globalErrorHandler) {
         this.globalErrorHandler = globalErrorHandler;
         return this;
@@ -211,6 +173,9 @@ export default class Lambder {
                 // Validate Input
                 const inputResult = schema.input.safeParse(ctx.apiPayload);
                 if (!inputResult.success) {
+                    if (this.apiInputValidationErrorHandler) {
+                        return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
+                    }
                     return resolver.raw({
                         statusCode: 400,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),
@@ -237,6 +202,9 @@ export default class Lambder {
                 // Validate Input
                 const inputResult = schema.input.safeParse(ctx.apiPayload);
                 if (!inputResult.success) {
+                    if (this.apiInputValidationErrorHandler) {
+                        return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
+                    }
                     return resolver.raw({
                         statusCode: 400,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),

package/dist/LambderContext.d.ts

@@ -0,0 +1,34 @@
+import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
+import type { LambderSessionContext } from "./LambderSessionManager.js";
+export type LambderRenderContext<TApiPayload = any> = {
+    host: string;
+    path: string;
+    pathParams: Record<string, any> | null;
+    method: string;
+    get: Record<string, any>;
+    post: Record<string, any>;
+    cookie: Record<string, any>;
+    session: null;
+    apiName: string;
+    apiPayload: TApiPayload;
+    headers: APIGatewayProxyEventHeaders;
+    event: APIGatewayProxyEvent;
+    lambdaContext: Context;
+    _otherInternal: {
+        isApiCall: boolean;
+        requestVersion: string | null;
+        setHeaderFnAccumulator: {
+            key: string;
+            value: string | string[];
+        }[];
+        addHeaderFnAccumulator: {
+            key: string;
+            value: string;
+        }[];
+        logToApiResponseAccumulator: any[];
+    };
+};
+export type LambderSessionRenderContext<TApiPayload = any, SessionData = any> = Omit<LambderRenderContext<TApiPayload>, 'session'> & {
+    session: LambderSessionContext<SessionData>;
+};
+export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context, apiPath: string) => LambderRenderContext<any>;

package/dist/LambderContext.js

@@ -0,0 +1,44 @@
+import cookieParser from "cookie";
+export const createContext = (event, lambdaContext, apiPath) => {
+    const host = event.headers.Host || event.headers.host || "";
+    const path = event.path;
+    const pathParams = null;
+    const get = event.queryStringParameters || {};
+    const method = event.httpMethod;
+    const cookie = cookieParser.parse(event.headers.Cookie || event.headers.cookie || "");
+    const headers = event.headers;
+    // Decode body for the post
+    let post = {};
+    try {
+        const decodedBody = event.isBase64Encoded ? (event.body ? Buffer.from(event.body, "base64").toString() : "{}") : (event.body || "{}");
+        try {
+            post = JSON.parse(decodedBody) || {};
+        }
+        catch (e) {
+            const params = new URLSearchParams(decodedBody);
+            post = {};
+            for (const [key, value] of params.entries()) {
+                post[key] = value;
+            }
+        }
+    }
+    catch (e) { }
+    // Parse api variables
+    const isApiCall = method === "POST" && apiPath && path === apiPath && post.apiName;
+    const apiName = isApiCall ? post.apiName : null;
+    const apiPayload = isApiCall ? post.payload : null;
+    const requestVersion = isApiCall ? post.version : null;
+    return {
+        host, path, pathParams, method,
+        get, post, cookie, event,
+        session: null,
+        apiName, apiPayload,
+        headers, lambdaContext,
+        _otherInternal: {
+            isApiCall, requestVersion,
+            setHeaderFnAccumulator: [],
+            addHeaderFnAccumulator: [],
+            logToApiResponseAccumulator: [],
+        }
+    };
+};

package/dist/LambderResolver.d.ts

@@ -1,4 +1,4 @@
-import type { LambderRenderContext } from "./Lambder.js";
+import type { LambderRenderContext } from "./LambderContext.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 import LambderUtils from "./LambderUtils.js";
 type MethodType<T, M extends keyof T> = T[M] extends (...args: any[]) => any ? T[M] : never;

package/dist/LambderResponseBuilder.d.ts

@@ -1,5 +1,5 @@
 import LambderUtils from "./LambderUtils.js";
-import { LambderRenderContext } from "./Lambder.js";
+import { LambderRenderContext } from "./LambderContext.js";
 export type LambderResolverResponse = {
     statusCode: number;
     multiValueHeaders?: Record<string, string[]>;

package/dist/LambderResponseBuilder.js

@@ -68,7 +68,7 @@ export default class LambderResponseBuilder {
             throw new Error(".setHeader function is not available within this hook");
         else {
             this.ctx._otherInternal.addHeaderFnAccumulator = this.ctx._otherInternal.addHeaderFnAccumulator
-                .filter(header => header.key !== key);
+                .filter((header) => header.key !== key);
             this.ctx._otherInternal.setHeaderFnAccumulator.push({ key, value });
         }
     }
@@ -154,10 +154,12 @@ export default class LambderResponseBuilder {
     ;
     async file(filePath, headers, fallbackFilePath) {
         const doesFileExist = await this.checkPublicFileExist(filePath);
-        if (!doesFileExist && fallbackFilePath) {
-            const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
-            if (doesFallbackExist) {
-                return await this.file(fallbackFilePath, headers);
+        if (!doesFileExist) {
+            if (fallbackFilePath) {
+                const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
+                if (doesFallbackExist) {
+                    return await this.file(fallbackFilePath, headers);
+                }
             }
             return this.json({ error: "File not found: " + filePath });
         }

package/dist/LambderSessionController.d.ts

@@ -1,4 +1,4 @@
-import { LambderRenderContext, LambderSessionRenderContext } from "./Lambder.js";
+import { LambderRenderContext, LambderSessionRenderContext } from "./LambderContext.js";
 import type LambderSessionManager from "./LambderSessionManager.js";
 import type { LambderSessionContext } from "./LambderSessionManager.js";
 export default class LambderSessionController<TSessionData = any> {

package/dist/index.d.ts

@@ -6,3 +6,5 @@ export { default as LambderResolver } from "./LambderResolver.js";
 export { default as LambderSessionManager } from "./LambderSessionManager.js";
 export { default as LambderMSW } from "./LambderMSW.js";
 export { type ApiContractShape, } from "./LambderApiContract.js";
+export type { LambderRenderContext, LambderSessionRenderContext } from "./LambderContext.js";
+export { createContext } from "./LambderContext.js";

package/dist/index.js

@@ -5,3 +5,4 @@ export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
 export { default as LambderResolver } from "./LambderResolver.js";
 export { default as LambderSessionManager } from "./LambderSessionManager.js";
 export { default as LambderMSW } from "./LambderMSW.js";
+export { createContext } from "./LambderContext.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "2.0.5",
+  "version": "2.0.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Lambder.ts

@@ -1,44 +1,17 @@
-import cookieParser from "cookie";
 import { match } from "path-to-regexp";
 import { z } from "zod";
 
-import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
+import type { APIGatewayProxyEvent, Context } from "aws-lambda";
 import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 import LambderUtils from "./LambderUtils.js";
-import LambderSessionManager, { type LambderSessionContext } from "./LambderSessionManager.js";
+import LambderSessionManager from "./LambderSessionManager.js";
 import LambderSessionController from "./LambderSessionController.js";
 import type { MergeContract } from "./LambderApiContract.js";
+import { createContext, type LambderRenderContext, type LambderSessionRenderContext } from "./LambderContext.js";
 
 type Path = `/${string}`;
 
-export type LambderRenderContext<TApiPayload = any> = {
-    host: string;
-    path: string;
-    pathParams: Record<string, any> | null;
-    method: string;
-    get: Record<string, any>;
-    post: Record<string, any>;
-    cookie: Record<string, any>;
-    session: null;
-    apiName: string;
-    apiPayload: TApiPayload;
-    headers: APIGatewayProxyEventHeaders;
-    event: APIGatewayProxyEvent;
-    lambdaContext: Context;
-    _otherInternal: { 
-        isApiCall: boolean,
-        requestVersion: string|null;
-        setHeaderFnAccumulator: { key:string, value:string|string[] }[];
-        addHeaderFnAccumulator: { key:string, value:string }[];
-        logToApiResponseAccumulator: any[];
-    };
-};
-
-export type LambderSessionRenderContext<
-    TApiPayload = any, SessionData = any
-> = Omit<LambderRenderContext<TApiPayload>, 'session'> & { session: LambderSessionContext<SessionData> };
-
 type ConditionFunction = (ctx: LambderRenderContext<any>) => boolean;
 type ActionFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
 type SessionActionFunction<SessionData = any> = (ctx: LambderSessionRenderContext<any, SessionData>, resolver: LambderResolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
@@ -54,55 +27,7 @@ type HookFallbackFunction = (ctx: LambderRenderContext<any>, resolver: LambderRe
 type GlobalErrorHandlerFunction = (err: Error, ctx: LambderRenderContext<any>|null, response: LambderResponseBuilder, logListToApiResponse?: any[]) => LambderResolverResponse|Promise<LambderResolverResponse>;
 type RouteFallbackHandlerFunction = (ctx:LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse;
 type ApiFallbackHandlerFunction = (ctx:LambderRenderContext<any>, resolver: LambderResolver) => LambderResolverResponse;
-
-
-export const createContext = (
-    event: APIGatewayProxyEvent, 
-    lambdaContext: Context,
-    apiPath: string,
-):LambderRenderContext<any> => {
-    const host = event.headers.Host || event.headers.host || "";
-    const path = event.path;
-    const pathParams = null;
-    const get: Record<string, any> = event.queryStringParameters || {};
-    const method = event.httpMethod;
-    const cookie = cookieParser.parse(event.headers.Cookie || event.headers.cookie || "");
-    const headers = event.headers;
-    
-    // Decode body for the post
-    let post: Record<string, any> = {};
-    try {
-        const decodedBody = event.isBase64Encoded ? ( event.body ? Buffer.from(event.body,"base64").toString() : "{}" ) : ( event.body || "{}" );
-        try { post = JSON.parse(decodedBody) || {}; }
-        catch(e){ 
-            const params = new URLSearchParams(decodedBody);
-            post = {};
-            for(const [key, value] of params.entries()){
-                post[key] = value;
-            }
-        }
-    }catch(e){}
-    // Parse api variables
-
-    const isApiCall = method === "POST" && apiPath && path === apiPath && post.apiName;
-    const apiName:string = isApiCall ? post.apiName : null;
-    const apiPayload:string = isApiCall ? post.payload : null;
-    const requestVersion:string = isApiCall ? post.version : null;
-
-    return { 
-        host, path, pathParams, method, 
-        get, post, cookie, event,
-        session: null,
-        apiName, apiPayload, 
-        headers, lambdaContext, 
-        _otherInternal: { 
-            isApiCall, requestVersion,
-            setHeaderFnAccumulator: [], 
-            addHeaderFnAccumulator: [], 
-            logToApiResponseAccumulator: [], 
-        } 
-    };
-}
+type ApiInputValidationErrorHandlerFunction = (ctx: LambderRenderContext<any>, resolver: LambderResolver, zodError: z.ZodError) => LambderResolverResponse|Promise<LambderResolverResponse>;
 
 /**
  * Main Lambder class for building type-safe serverless APIs
@@ -147,6 +72,7 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
     private globalErrorHandler: GlobalErrorHandlerFunction|null = null;
     private routeFallbackHandler: RouteFallbackHandlerFunction|null = null;
     private apiFallbackHandler: ApiFallbackHandlerFunction|null = null;
+    private apiInputValidationErrorHandler: ApiInputValidationErrorHandlerFunction|null = null;
 
     public utils: LambderUtils;
 
@@ -202,6 +128,10 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
         this.apiFallbackHandler = apiFallbackHandler;
         return this;
     }
+    setApiInputValidationErrorHandler(apiInputValidationErrorHandler: ApiInputValidationErrorHandlerFunction): this {
+        this.apiInputValidationErrorHandler = apiInputValidationErrorHandler;
+        return this;
+    }
     setGlobalErrorHandler(globalErrorHandler: GlobalErrorHandlerFunction): this {
         this.globalErrorHandler = globalErrorHandler;
         return this;
@@ -308,6 +238,9 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
                 // Validate Input
                 const inputResult = schema.input.safeParse(ctx.apiPayload);
                 if (!inputResult.success) {
+                    if (this.apiInputValidationErrorHandler) {
+                        return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
+                    }
                     return resolver.raw({
                         statusCode: 400,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),
@@ -346,6 +279,9 @@ export default class Lambder<TSessionData = any, _TContract extends Record<strin
                 // Validate Input
                 const inputResult = schema.input.safeParse(ctx.apiPayload);
                 if (!inputResult.success) {
+                    if (this.apiInputValidationErrorHandler) {
+                        return await this.apiInputValidationErrorHandler(ctx, resolver, inputResult.error);
+                    }
                     return resolver.raw({
                         statusCode: 400,
                         body: JSON.stringify({ error: "Input validation failed", zodError: inputResult.error }),

package/src/LambderContext.ts

@@ -0,0 +1,78 @@
+import cookieParser from "cookie";
+import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
+import type { LambderSessionContext } from "./LambderSessionManager.js";
+
+export type LambderRenderContext<TApiPayload = any> = {
+    host: string;
+    path: string;
+    pathParams: Record<string, any> | null;
+    method: string;
+    get: Record<string, any>;
+    post: Record<string, any>;
+    cookie: Record<string, any>;
+    session: null;
+    apiName: string;
+    apiPayload: TApiPayload;
+    headers: APIGatewayProxyEventHeaders;
+    event: APIGatewayProxyEvent;
+    lambdaContext: Context;
+    _otherInternal: { 
+        isApiCall: boolean,
+        requestVersion: string|null;
+        setHeaderFnAccumulator: { key:string, value:string|string[] }[];
+        addHeaderFnAccumulator: { key:string, value:string }[];
+        logToApiResponseAccumulator: any[];
+    };
+};
+
+export type LambderSessionRenderContext<
+    TApiPayload = any, SessionData = any
+> = Omit<LambderRenderContext<TApiPayload>, 'session'> & { session: LambderSessionContext<SessionData> };
+
+export const createContext = (
+    event: APIGatewayProxyEvent, 
+    lambdaContext: Context,
+    apiPath: string,
+):LambderRenderContext<any> => {
+    const host = event.headers.Host || event.headers.host || "";
+    const path = event.path;
+    const pathParams = null;
+    const get: Record<string, any> = event.queryStringParameters || {};
+    const method = event.httpMethod;
+    const cookie = cookieParser.parse(event.headers.Cookie || event.headers.cookie || "");
+    const headers = event.headers;
+    
+    // Decode body for the post
+    let post: Record<string, any> = {};
+    try {
+        const decodedBody = event.isBase64Encoded ? ( event.body ? Buffer.from(event.body,"base64").toString() : "{}" ) : ( event.body || "{}" );
+        try { post = JSON.parse(decodedBody) || {}; }
+        catch(e){ 
+            const params = new URLSearchParams(decodedBody);
+            post = {};
+            for(const [key, value] of params.entries()){
+                post[key] = value;
+            }
+        }
+    }catch(e){}
+    // Parse api variables
+
+    const isApiCall = method === "POST" && apiPath && path === apiPath && post.apiName;
+    const apiName:string = isApiCall ? post.apiName : null;
+    const apiPayload:string = isApiCall ? post.payload : null;
+    const requestVersion:string = isApiCall ? post.version : null;
+
+    return { 
+        host, path, pathParams, method, 
+        get, post, cookie, event,
+        session: null,
+        apiName, apiPayload, 
+        headers, lambdaContext, 
+        _otherInternal: { 
+            isApiCall, requestVersion,
+            setHeaderFnAccumulator: [], 
+            addHeaderFnAccumulator: [], 
+            logToApiResponseAccumulator: [], 
+        } 
+    };
+}

package/src/LambderResolver.ts

@@ -1,4 +1,4 @@
-import type { LambderRenderContext } from "./Lambder.js";
+import type { LambderRenderContext } from "./LambderContext.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 import LambderUtils from "./LambderUtils.js";
 

package/src/LambderResponseBuilder.ts

@@ -1,6 +1,6 @@
 import mimeTypeResolver from "mime-types";
 import LambderUtils from "./LambderUtils.js";
-import { LambderRenderContext } from "./Lambder.js";
+import { LambderRenderContext } from "./LambderContext.js";
 import { getFS, getPath } from "./node-polyfills.js";
 
 const convertToMultiHeader = (
@@ -102,7 +102,7 @@ export default class LambderResponseBuilder<TResponse = any> {
         if(!this.ctx) throw new Error(".setHeader function is not available within this hook"); 
         else{
             this.ctx._otherInternal.addHeaderFnAccumulator = this.ctx._otherInternal.addHeaderFnAccumulator
-                .filter(header=>header.key !== key);
+                .filter((header: { key: string, value: string }) => header.key !== key);
             this.ctx._otherInternal.setHeaderFnAccumulator.push({ key, value });
         }
     };
@@ -211,10 +211,12 @@ export default class LambderResponseBuilder<TResponse = any> {
         fallbackFilePath?: string,
     ):Promise<LambderResolverResponse>{
         const doesFileExist = await this.checkPublicFileExist(filePath);
-        if(!doesFileExist && fallbackFilePath){
-            const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
-            if(doesFallbackExist){
-                return await this.file(fallbackFilePath, headers);
+        if(!doesFileExist){
+            if(fallbackFilePath){
+                const doesFallbackExist = await this.checkPublicFileExist(fallbackFilePath);
+                if(doesFallbackExist){
+                    return await this.file(fallbackFilePath, headers);
+                }
             }
             return this.json({ error: "File not found: " + filePath })
         }

package/src/LambderSessionController.ts

@@ -1,4 +1,4 @@
-import { LambderRenderContext, LambderSessionRenderContext } from "./Lambder.js";
+import { LambderRenderContext, LambderSessionRenderContext } from "./LambderContext.js";
 import type LambderSessionManager from "./LambderSessionManager.js";
 import type { LambderSessionContext } from "./LambderSessionManager.js";
 

package/src/index.ts

@@ -11,3 +11,7 @@ export { default as LambderMSW } from "./LambderMSW.js";
 export { 
     type ApiContractShape,
 } from "./LambderApiContract.js";
+
+// Context types and utilities
+export type { LambderRenderContext, LambderSessionRenderContext } from "./LambderContext.js";
+export { createContext } from "./LambderContext.js";