lambder 1.0.64 → 1.0.66

package/dist/Lambder.d.ts

@@ -1,8 +1,8 @@
 import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 type Path = `/${string}`;
-type Session = {
+type LambderSession = {
     userId: string;
     userIdHash: string;
     sessionHash: string;
@@ -11,7 +11,7 @@ type Session = {
     expiresTimeStamp: number;
     data: Record<string, any>;
 };
-type RenderContext = {
+type LambderRenderContext = {
     host: string;
     path: string;
     pathParams: Record<string, any> | null;
@@ -21,19 +21,19 @@ type RenderContext = {
     cookie: Record<string, any>;
     apiName: string;
     headers: APIGatewayProxyEventHeaders;
-    session: Session | null;
+    session: LambderSession | null;
     lambdaContext: Context;
 };
-type ConditionFunction = (ctx: RenderContext) => boolean;
-type ActionFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
+type ConditionFunction = (ctx: LambderRenderContext) => boolean;
+type ActionFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse | Promise<LambderResolverResponse>;
 type HookCreatedFunction = (lambderInstance: Lambder) => Promise<void>;
-type HookBeforeRenderFunction = (ctx: RenderContext, resolver: Resolver) => RenderContext | Error | Promise<RenderContext | Error>;
-type HookAfterRenderFunction = (ctx: RenderContext, resolver: Resolver, response: LambderResolverResponse) => LambderResolverResponse | Error | Promise<LambderResolverResponse | Error>;
-type HookFallbackFunction = (ctx: RenderContext, resolver: Resolver) => void | Promise<void>;
-type GlobalErrorHandlerFunction = (err: Error, ctx: RenderContext | null, response: LambderResponseBuilder) => LambderResolverResponse | Promise<LambderResolverResponse>;
-type RouteFallbackHandlerFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse;
-type ApiFallbackHandlerFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse;
-export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context, apiPath?: string | null) => RenderContext;
+type HookBeforeRenderFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderRenderContext | Error | Promise<LambderRenderContext | Error>;
+type HookAfterRenderFunction = (ctx: LambderRenderContext, resolver: LambderResolver, response: LambderResolverResponse) => LambderResolverResponse | Error | Promise<LambderResolverResponse | Error>;
+type HookFallbackFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => void | Promise<void>;
+type GlobalErrorHandlerFunction = (err: Error, ctx: LambderRenderContext | null, response: LambderResponseBuilder) => LambderResolverResponse | Promise<LambderResolverResponse>;
+type RouteFallbackHandlerFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse;
+type ApiFallbackHandlerFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse;
+export declare const createContext: (event: APIGatewayProxyEvent, lambdaContext: Context, apiPath?: string | null) => LambderRenderContext;
 export default class Lambder {
     private apiPath;
     private apiVersion;

package/dist/Lambder.js

@@ -1,7 +1,7 @@
 import querystring from "querystring";
 import cookieParser from "cookie";
 import { match } from "path-to-regexp";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder from "./LambderResponseBuilder.js";
 export const createContext = (event, lambdaContext, apiPath = null) => {
     const host = event.headers.Host || event.headers.host || "";
@@ -192,7 +192,7 @@ export default class Lambder {
     }
     ;
     getResolver(resolve, reject) {
-        return new Resolver({
+        return new LambderResolver({
             isCorsEnabled: this.isCorsEnabled,
             publicPath: this.publicPath,
             apiVersion: this.apiVersion,

package/dist/{Resolver.d.ts → LambderResolver.d.ts}

@@ -12,7 +12,7 @@ interface DieResolverMethods {
     file: MethodType<LambderResponseBuilder, 'file'>;
     api: MethodType<LambderResponseBuilder, 'api'>;
 }
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     resolve: (response: LambderResolverResponse) => void;
     reject: (err: Error) => void;
     die: DieResolverMethods;

package/dist/{Resolver.js → LambderResolver.js}

@@ -1,5 +1,5 @@
 import LambderResponseBuilder from "./LambderResponseBuilder.js";
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     resolve;
     reject;
     die;

package/dist/index.d.ts

@@ -2,4 +2,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";

package/dist/index.js

@@ -2,4 +2,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";

package/package.json

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

package/src/Lambder.ts

@@ -3,12 +3,12 @@ import cookieParser from "cookie";
 import { match } from "path-to-regexp";
 
 import type { APIGatewayProxyEvent, APIGatewayProxyEventHeaders, Context } from "aws-lambda";
-import Resolver from "./Resolver.js";
+import LambderResolver from "./LambderResolver.js";
 import LambderResponseBuilder, { LambderResolverResponse } from "./LambderResponseBuilder.js";
 
 type Path = `/${string}`;
 
-type Session = {
+type LambderSession = {
     userId: string,
     userIdHash: string;
     sessionHash: string;
@@ -18,7 +18,7 @@ type Session = {
     data: Record<string, any>;
 };
 
-type RenderContext = {
+type LambderRenderContext = {
     host: string;
     path: string;
     pathParams: Record<string, any> | null;
@@ -28,30 +28,30 @@ type RenderContext = {
     cookie: Record<string, any>;
     apiName: string;
     headers: APIGatewayProxyEventHeaders;
-    session: Session|null;
+    session: LambderSession|null;
     lambdaContext: Context;
 };
 
-type ConditionFunction = (ctx: RenderContext) => boolean;
-type ActionFunction = (ctx: RenderContext, resolver: Resolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
+type ConditionFunction = (ctx: LambderRenderContext) => boolean;
+type ActionFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse|Promise<LambderResolverResponse>;
 type ActionObject = { conditionFn: ConditionFunction, actionFn: ActionFunction };
 
+type HookEventType = "created"|"beforeRender"|"afterRender"|"fallback";
 type HookCreatedFunction = (lambderInstance: Lambder) => Promise<void>;
-type HookBeforeRenderFunction = (ctx: RenderContext, resolver: Resolver) => RenderContext|Error|Promise<RenderContext|Error>;
-type HookAfterRenderFunction = (ctx: RenderContext, resolver: Resolver, response: LambderResolverResponse) => LambderResolverResponse|Error|Promise<LambderResolverResponse|Error>;
-type HookFallbackFunction = (ctx: RenderContext, resolver: Resolver) => void|Promise<void>;
+type HookBeforeRenderFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => LambderRenderContext|Error|Promise<LambderRenderContext|Error>;
+type HookAfterRenderFunction = (ctx: LambderRenderContext, resolver: LambderResolver, response: LambderResolverResponse) => LambderResolverResponse|Error|Promise<LambderResolverResponse|Error>;
+type HookFallbackFunction = (ctx: LambderRenderContext, resolver: LambderResolver) => void|Promise<void>;
 
-type GlobalErrorHandlerFunction = (err: Error, ctx: RenderContext|null, response: LambderResponseBuilder) => LambderResolverResponse|Promise<LambderResolverResponse>;
-type RouteFallbackHandlerFunction = (ctx:RenderContext, resolver: Resolver) => LambderResolverResponse;
-type ApiFallbackHandlerFunction = (ctx:RenderContext, resolver: Resolver) => LambderResolverResponse;
+type GlobalErrorHandlerFunction = (err: Error, ctx: LambderRenderContext|null, response: LambderResponseBuilder) => LambderResolverResponse|Promise<LambderResolverResponse>;
+type RouteFallbackHandlerFunction = (ctx:LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse;
+type ApiFallbackHandlerFunction = (ctx:LambderRenderContext, resolver: LambderResolver) => LambderResolverResponse;
 
-type HookEventType = "created"|"beforeRender"|"afterRender"|"fallback";
 
 export const createContext = (
     event: APIGatewayProxyEvent, 
     lambdaContext: Context,
     apiPath: string|null = null
-):RenderContext => {
+):LambderRenderContext => {
     const host = event.headers.Host || event.headers.host || "";
     const path = event.path;
     const pathParams = null;
@@ -123,7 +123,7 @@ export default class Lambder {
         return (match(pattern, { decode: decodeURIComponent }))(path) !== false;
     }
 
-    private async validateSession (ctx: RenderContext): Promise<boolean>{
+    private async validateSession (ctx: LambderRenderContext): Promise<boolean>{
         const { session, apiName, post, cookie } = ctx;
         if(!session) return false;
         if(!session.userId || !session.userIdHash || !session.sessionHash || !session.csrfToken) return false;
@@ -139,7 +139,7 @@ export default class Lambder {
         return false;
     };
 
-    private async handleNoMatchedAction(ctx: RenderContext, resolver: Resolver){
+    private async handleNoMatchedAction(ctx: LambderRenderContext, resolver: LambderResolver){
         for(const hook of this.hookList["fallback"]){  await hook.hookFn(ctx, resolver); }
 
         const isAPI = ctx.path === this.apiPath;
@@ -159,7 +159,7 @@ export default class Lambder {
     }
     addRoute(condition: Path|ConditionFunction|RegExp, actionFn: ActionFunction):void{
         this.actionList.push({ 
-            conditionFn: (ctx:RenderContext) => (
+            conditionFn: (ctx:LambderRenderContext) => (
                 ctx.method === "GET" && 
                 (
                     (typeof condition === "string" && this.testPatternMatch(condition, ctx.path)) ||
@@ -167,7 +167,7 @@ export default class Lambder {
                     (condition?.constructor == RegExp && condition.test(ctx.path))
                 )
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
+            actionFn: async (ctx:LambderRenderContext, resolver: LambderResolver) => {
                 if(typeof condition === "string"){
                     ctx.pathParams = this.getPatternMatch(condition, ctx.path);
                 }else if(condition?.constructor == RegExp){
@@ -181,7 +181,7 @@ export default class Lambder {
 
     addSessionRoute(condition: Path|ConditionFunction|RegExp, actionFn: ActionFunction):void{
         this.actionList.push({ 
-            conditionFn: (ctx:RenderContext) => (
+            conditionFn: (ctx:LambderRenderContext) => (
                 ctx.method === "GET" &&
                 (
                     (typeof condition === "string" && this.testPatternMatch(condition, ctx.path)) ||
@@ -189,7 +189,7 @@ export default class Lambder {
                     (condition?.constructor == RegExp && condition.test(ctx.path))
                 )
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
+            actionFn: async (ctx:LambderRenderContext, resolver: LambderResolver) => {
                 const isSessionValid = this.validateSession(ctx);
                 if(!isSessionValid) throw new Error("Session not found");
                 if(typeof condition === "string"){
@@ -204,23 +204,23 @@ export default class Lambder {
     
     addApi(apiName: string|ConditionFunction|RegExp, actionFn: ActionFunction):void{
         this.actionList.push({ 
-            conditionFn: (ctx:RenderContext) =>  (
+            conditionFn: (ctx:LambderRenderContext) =>  (
                 (typeof apiName === "string" && ctx.apiName === apiName) ||
                 (typeof apiName === "function" && apiName(ctx)) ||
                 (apiName?.constructor == RegExp && apiName.test(ctx.apiName))
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => await actionFn(ctx, resolver),
+            actionFn: async (ctx:LambderRenderContext, resolver: LambderResolver) => await actionFn(ctx, resolver),
         });
     };
 
     addSessionApi(apiName: string|ConditionFunction|RegExp, actionFn: ActionFunction):void{
         this.actionList.push({ 
-            conditionFn: (ctx:RenderContext) =>  (
+            conditionFn: (ctx:LambderRenderContext) =>  (
                 (typeof apiName === "string" && ctx.apiName === apiName) ||
                 (typeof apiName === "function" && apiName(ctx)) ||
                 (apiName?.constructor == RegExp && apiName.test(ctx.apiName))
             ), 
-            actionFn: async (ctx:RenderContext, resolver: Resolver) => {
+            actionFn: async (ctx:LambderRenderContext, resolver: LambderResolver) => {
                 const isSessionValid = this.validateSession(ctx);
                 if(!isSessionValid) throw new Error("Session not found");
                 return await actionFn(ctx, resolver);
@@ -254,7 +254,7 @@ export default class Lambder {
     };
 
     private getResolver(resolve: (response: LambderResolverResponse) => void, reject: (err: Error) => void){
-        return new Resolver({
+        return new LambderResolver({
             isCorsEnabled: this.isCorsEnabled, 
             publicPath: this.publicPath,
             apiVersion: this.apiVersion,
@@ -266,7 +266,7 @@ export default class Lambder {
         event: APIGatewayProxyEvent,
         lambdaContext: Context
     ): Promise<LambderResolverResponse>{
-        let eventRenderContext:RenderContext|null = null;
+        let eventRenderContext:LambderRenderContext|null = null;
         
         try {
             let ctx = createContext(event, lambdaContext);

package/src/{Resolver.ts → LambderResolver.ts}

@@ -15,7 +15,7 @@ interface DieResolverMethods {
     api: MethodType<LambderResponseBuilder, 'api'>;
 }
 
-export default class Resolver extends LambderResponseBuilder {
+export default class LambderResolver extends LambderResponseBuilder {
     public resolve: (response: LambderResolverResponse) => void;
     public reject: (err: Error) => void;
     public die: DieResolverMethods;

package/src/index.ts

@@ -3,4 +3,4 @@ import Lambder from './Lambder.js';
 export default Lambder;
 export { default as LambderCaller } from "./LambderCaller.js";
 export { default as LambderResponseBuilder } from "./LambderResponseBuilder.js";
-export { default as Resolver } from "./Resolver.js";
+export { default as LambderResolver } from "./LambderResolver.js";