lambder 2.0.12 → 2.0.13

package/dist/LambderResolver.d.ts

@@ -7,7 +7,7 @@ interface DieResolverMethods<TOutput> {
     json: MethodType<LambderResponseBuilder, 'json'>;
     xml: MethodType<LambderResponseBuilder, 'xml'>;
     html: MethodType<LambderResponseBuilder, 'html'>;
-    status301: MethodType<LambderResponseBuilder, 'status301'>;
+    redirect: MethodType<LambderResponseBuilder, 'redirect'>;
     status404: MethodType<LambderResponseBuilder, 'status404'>;
     cors: MethodType<LambderResponseBuilder, 'cors'>;
     fileBase64: MethodType<LambderResponseBuilder, 'fileBase64'>;

package/dist/LambderResolver.js

@@ -12,7 +12,7 @@ export default class LambderResolver extends LambderResponseBuilder {
             json: this.autoResolve(this.json),
             xml: this.autoResolve(this.xml),
             html: this.autoResolve(this.html),
-            status301: this.autoResolve(this.status301),
+            redirect: this.autoResolve(this.redirect),
             status404: this.autoResolve(this.status404),
             cors: this.autoResolve(this.cors),
             fileBase64: this.autoResolve(this.fileBase64),

package/dist/LambderResponseBuilder.d.ts

@@ -1,7 +1,8 @@
 import LambderUtils from "./LambderUtils.js";
 import { LambderRenderContext } from "./LambderContext.js";
+export type HttpStatusCode = 200 | 201 | 202 | 204 | 300 | 301 | 302 | 303 | 304 | 307 | 308 | 400 | 401 | 403 | 404 | 405 | 409 | 410 | 413 | 415 | 422 | 429 | 500 | 501 | 502 | 503 | 504;
 export type LambderResolverResponse = {
-    statusCode: number;
+    statusCode: HttpStatusCode;
     multiValueHeaders?: Record<string, string[]>;
     body: string | null;
     isBase64Encoded?: boolean;
@@ -39,7 +40,7 @@ export default class LambderResponseBuilder<TResponse = any> {
     json(data: Record<string, any>, headers?: Record<string, string | string[]>): LambderResolverResponse;
     xml(data: string): LambderResolverResponse;
     html(data: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
-    status301(url: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
+    redirect(url: string, statusCode?: HttpStatusCode, headers?: Record<string, string | string[]>): LambderResolverResponse;
     status404(data: string, headers?: Record<string, string | string[]>): LambderResolverResponse;
     versionExpired(headers?: Record<string, string | string[]>): LambderResolverResponse;
     cors(): LambderResolverResponse;

package/dist/LambderResponseBuilder.js

@@ -116,9 +116,9 @@ export default class LambderResponseBuilder {
         });
     }
     ;
-    status301(url, headers) {
+    redirect(url, statusCode = 302, headers) {
         return this.raw({
-            statusCode: 301,
+            statusCode: statusCode,
             multiValueHeaders: { "Location": [url], ...convertToMultiHeader(headers) },
             body: null
         });

package/package.json

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

package/src/LambderResolver.ts

@@ -9,7 +9,7 @@ interface DieResolverMethods<TOutput> {
     json: MethodType<LambderResponseBuilder, 'json'>;
     xml: MethodType<LambderResponseBuilder, 'xml'>;
     html: MethodType<LambderResponseBuilder, 'html'>;
-    status301: MethodType<LambderResponseBuilder, 'status301'>;
+    redirect: MethodType<LambderResponseBuilder, 'redirect'>;
     status404: MethodType<LambderResponseBuilder, 'status404'>;
     cors: MethodType<LambderResponseBuilder, 'cors'>;
     fileBase64: MethodType<LambderResponseBuilder, 'fileBase64'>;
@@ -49,7 +49,7 @@ export default class LambderResolver<TOutput = any> extends LambderResponseBuild
             json: this.autoResolve(this.json),
             xml: this.autoResolve(this.xml),
             html: this.autoResolve(this.html),
-            status301: this.autoResolve(this.status301),
+            redirect: this.autoResolve(this.redirect),
             status404: this.autoResolve(this.status404),
             cors: this.autoResolve(this.cors),
             fileBase64: this.autoResolve(this.fileBase64),

package/src/LambderResponseBuilder.ts

@@ -15,8 +15,14 @@ const CORS_HEADERS = convertToMultiHeader({
     "Access-Control-Allow-Methods": "OPTIONS,POST",
 });
 
+export type HttpStatusCode = 
+    | 200 | 201 | 202 | 204
+    | 300 | 301 | 302 | 303 | 304 | 307 | 308
+    | 400 | 401 | 403 | 404 | 405 | 409 | 410 | 413 | 415 | 422 | 429
+    | 500 | 501 | 502 | 503 | 504;
+
 export type LambderResolverResponse = { 
-    statusCode: number, 
+    statusCode: HttpStatusCode, 
     multiValueHeaders?: Record<string, string[]>, 
     body: string | null,
     isBase64Encoded?: boolean,
@@ -157,12 +163,13 @@ export default class LambderResponseBuilder<TResponse = any> {
         });
     };
 
-	status301(
+    redirect(
         url: string, 
+        statusCode: HttpStatusCode = 302,
         headers?: Record<string, string|string[]>,
     ):LambderResolverResponse{
         return this.raw({
-            statusCode: 301, 
+            statusCode: statusCode, 
             multiValueHeaders: { "Location" : [url], ...convertToMultiHeader(headers) },
             body:null
         });

package/tests/UNTESTED_FEATURES.md

@@ -98,7 +98,7 @@ Based on existing test files:
 - [ ] `res.fileBase64()`
 - [ ] `res.ejsFile()`
 - [ ] `res.ejsTemplate()`
-- [ ] `res.status301()` (redirects)
+- [ ] `res.redirect()` (redirects)
 - [ ] `res.status404()`
 - [ ] `res.cors()`
 - [ ] `res.die.*` methods (skip afterRender hooks)

package/tests/redirect.test.ts

@@ -0,0 +1,88 @@
+import { describe, it, expect } from 'vitest';
+import Lambder from '../src/Lambder.js';
+import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
+
+const createMockEvent = (path: string, method: string = 'GET'): APIGatewayProxyEvent => ({
+    body: null,
+    headers: { 
+        Host: 'localhost',
+    },
+    multiValueHeaders: {},
+    httpMethod: method,
+    isBase64Encoded: false,
+    path,
+    pathParameters: null,
+    queryStringParameters: null,
+    multiValueQueryStringParameters: null,
+    stageVariables: null,
+    requestContext: {} as any,
+    resource: '',
+});
+
+const createMockContext = (): Context => ({
+    callbackWaitsForEmptyEventLoop: false,
+    functionName: 'test',
+    functionVersion: '1',
+    invokedFunctionArn: 'arn',
+    memoryLimitInMB: '128',
+    awsRequestId: '123',
+    logGroupName: 'group',
+    logStreamName: 'stream',
+    getRemainingTimeInMillis: () => 1000,
+    done: () => {},
+    fail: () => {},
+    succeed: () => {},
+});
+
+describe('Redirect Response', () => {
+    it('should redirect with default status code 302', async () => {
+        const lambder = new Lambder({
+            publicPath: './public',
+            apiPath: '/api'
+        })
+            .addRoute('/old-path', (ctx, res) => {
+                return res.redirect('/new-path');
+            });
+
+        const handler = lambder.getHandler();
+        const event = createMockEvent('/old-path');
+        const result = await handler(event, createMockContext());
+
+        expect(result.statusCode).toBe(302);
+        expect(result.multiValueHeaders?.Location).toEqual(['/new-path']);
+    });
+
+    it('should redirect with custom status code', async () => {
+        const lambder = new Lambder({
+            publicPath: './public',
+            apiPath: '/api'
+        })
+            .addRoute('/moved-permanently', (ctx, res) => {
+                return res.redirect('/new-location', 301);
+            });
+
+        const handler = lambder.getHandler();
+        const event = createMockEvent('/moved-permanently');
+        const result = await handler(event, createMockContext());
+
+        expect(result.statusCode).toBe(301);
+        expect(result.multiValueHeaders?.Location).toEqual(['/new-location']);
+    });
+
+    it('should redirect using die.redirect', async () => {
+        const lambder = new Lambder({
+            publicPath: './public',
+            apiPath: '/api'
+        })
+            .addRoute('/die-redirect', (ctx, res) => {
+                return res.die.redirect('/somewhere-else');
+            });
+
+        const handler = lambder.getHandler();
+        const event = createMockEvent('/die-redirect');
+        const result = await handler(event, createMockContext());
+
+        expect(result.statusCode).toBe(302);
+        expect(result.multiValueHeaders?.Location).toEqual(['/somewhere-else']);
+    });
+});