.

Author: naorpeled

index.d.ts

@@ -653,3 +653,66 @@ export declare function isAlbRequest<
 >(
   req: Request<any, TQuery, TParams, TBody>
 ): req is Request<ALBContext, TQuery, TParams, TBody>;
+
+/**
+ * Source-agnostic request type that works with any AWS Lambda trigger
+ */
+export type SourceAgnosticRequest<
+  TQuery extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TParams extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TBody = any
+> = Request<RequestContext, TQuery, TParams, TBody>;
+
+/**
+ * Source-agnostic middleware type that works with any AWS Lambda trigger
+ */
+export type SourceAgnosticMiddleware<
+  TResponse = any,
+  TQuery extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TParams extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TBody = any
+> = Middleware<TResponse, RequestContext, TQuery, TParams, TBody>;
+
+/**
+ * Source-agnostic handler function type that works with any AWS Lambda trigger
+ */
+export type SourceAgnosticHandler<
+  TResponse = any,
+  TQuery extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TParams extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TBody = any
+> = HandlerFunction<TResponse, RequestContext, TQuery, TParams, TBody>;
+
+/**
+ * Source-agnostic error handling middleware type that works with any AWS Lambda trigger
+ */
+export type SourceAgnosticErrorHandler<
+  TResponse = any,
+  TQuery extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TParams extends Record<string, string | undefined> = Record<
+    string,
+    string | undefined
+  >,
+  TBody = any
+> = ErrorHandlingMiddleware<TResponse, RequestContext, TQuery, TParams, TBody>;

index.test-d.ts

@@ -22,6 +22,9 @@ import {
   isApiGatewayV2Event,
   isAlbEvent,
   App,
+  SourceAgnosticMiddleware,
+  SourceAgnosticHandler,
+  SourceAgnosticErrorHandler,
 } from './index';
 import {
   APIGatewayProxyEvent,
@@ -99,11 +102,7 @@ const testEventTypeGuards = () => {
   }
 };
 
-const sourceAgnosticMiddleware: Middleware<any, RequestContext> = (
-  req,
-  res,
-  next
-) => {
+const sourceAgnosticMiddleware: SourceAgnosticMiddleware = (req, res, next) => {
   if (isApiGatewayContext(req.requestContext)) {
     expectType<string>(req.requestContext.requestId);
     const sourceIp = req.requestContext.identity.sourceIp;
@@ -190,7 +189,7 @@ const testRequestTypeGuards = () => {
   }
 };
 
-const sourceAgnosticHandler: HandlerFunction<UserResponse, RequestContext> = (
+const sourceAgnosticHandler: SourceAgnosticHandler<UserResponse> = (
   req,
   res
 ) => {
@@ -614,3 +613,53 @@ const testDefaultTypes = () => {
   );
   expectType<Promise<any>>(apiGwV2Result);
 };
+
+const testSourceAgnosticTypes = () => {
+  // Test source-agnostic handler with minimal type parameters
+  const simpleSourceAgnosticHandler: SourceAgnosticHandler = (req, res) => {
+    expectType<RequestContext>(req.requestContext);
+    res.json({ message: 'ok' });
+  };
+
+  // Test source-agnostic handler with response type
+  const typedSourceAgnosticHandler: SourceAgnosticHandler<UserResponse> = (
+    req,
+    res
+  ) => {
+    res.json({
+      id: '1',
+      name: 'John',
+      email: '[email protected]',
+    });
+  };
+
+  // Test source-agnostic middleware with minimal type parameters
+  const simpleSourceAgnosticMiddleware: SourceAgnosticMiddleware = (
+    req,
+    res,
+    next
+  ) => {
+    expectType<RequestContext>(req.requestContext);
+    next();
+  };
+
+  // Test source-agnostic error handler
+  const sourceAgnosticErrorHandler: SourceAgnosticErrorHandler = (
+    error,
+    req,
+    res,
+    next
+  ) => {
+    expectType<RequestContext>(req.requestContext);
+    res.status(500).json({ error: error.message });
+  };
+
+  // Test using source-agnostic types with API
+  api.get('/source-agnostic', simpleSourceAgnosticHandler);
+  api.post(
+    '/source-agnostic',
+    simpleSourceAgnosticMiddleware,
+    typedSourceAgnosticHandler
+  );
+  api.use(sourceAgnosticErrorHandler);
+};