Merge pull request #2869 from tsedio/fix-lambda-v3

Fix lambda v3
tsedio · Oct 20, 2024 · dceac3d · dceac3d
2 parents 3004e5a + f689407
commit dceac3d
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 221 deletions.
diff --git a/packages/platform/platform-serverless-http/src/decorators/serverlessContext.ts b/packages/platform/platform-serverless-http/src/decorators/serverlessContext.ts
@@ -1,5 +1,5 @@
 import {Req} from "@tsed/platform-http";
-import {Context} from "aws-lambda";
+import type {Context} from "aws-lambda";
 
 /**
  * Return the Serverless context

diff --git a/packages/platform/platform-serverless-testing/src/PlatformServerlessTest.ts b/packages/platform/platform-serverless-testing/src/PlatformServerlessTest.ts
@@ -1,8 +1,12 @@
 import {nameOf, Type} from "@tsed/core";
 import {destroyInjector, DITest, hasInjector} from "@tsed/di";
 import type {PlatformBuilder, PlatformBuilderSettings} from "@tsed/platform-http";
-import {APIGatewayEventDefaultAuthorizerContext, APIGatewayProxyEventBase, APIGatewayProxyHandler} from "aws-lambda";
-import {APIGatewayProxyResult} from "aws-lambda/trigger/api-gateway-proxy.js";
+import type {
+  APIGatewayEventDefaultAuthorizerContext,
+  APIGatewayProxyEventBase,
+  APIGatewayProxyHandler,
+  APIGatewayProxyResult
+} from "aws-lambda";
 
 import {createFakeContext} from "./createFakeContext.js";
 import {createFakeEvent} from "./createFakeEvent.js";

diff --git a/packages/platform/platform-serverless-testing/src/createFakeContext.ts b/packages/platform/platform-serverless-testing/src/createFakeContext.ts
@@ -1,4 +1,4 @@
-import {Context} from "aws-lambda";
+import type {Context} from "aws-lambda";
 
 export function createFakeContext(context?: Context): Context {
   return {

diff --git a/packages/platform/platform-serverless-testing/src/createFakeEvent.ts b/packages/platform/platform-serverless-testing/src/createFakeEvent.ts
@@ -1,4 +1,4 @@
-import {APIGatewayEventDefaultAuthorizerContext, APIGatewayProxyEventBase} from "aws-lambda";
+import type {APIGatewayEventDefaultAuthorizerContext, APIGatewayProxyEventBase} from "aws-lambda";
 
 export function createFakeEvent(event: Partial<APIGatewayProxyEventBase<APIGatewayEventDefaultAuthorizerContext>> = {}) {
   return {

diff --git a/packages/platform/platform-serverless/package.json b/packages/platform/platform-serverless/package.json
@@ -40,7 +40,6 @@
     "@types/aws-lambda": "^8.10.145",
     "@types/encodeurl": "^1.0.2",
     "@types/mime": "^4.0.0",
-    "aws-lambda": "1.0.7",
     "eslint": "9.12.0",
     "find-my-way": "^9.1.0",
     "typescript": "5.4.5",

diff --git a/packages/platform/platform-serverless/src/builder/PlatformServerless.ts b/packages/platform/platform-serverless/src/builder/PlatformServerless.ts
@@ -2,8 +2,7 @@ import {Env, Type} from "@tsed/core";
 import {createContainer, injector, InjectorService, setLoggerConfiguration} from "@tsed/di";
 import {$log, Logger} from "@tsed/logger";
 import {getOperationsRoutes, JsonEntityStore} from "@tsed/schema";
-import type {Handler} from "aws-lambda";
-import type {Context} from "aws-lambda/handler.js";
+import type {Context, Handler} from "aws-lambda";
 import type {HTTPMethod, Instance} from "find-my-way";
 
 import {ServerlessContext} from "../domain/ServerlessContext.js";

diff --git a/packages/platform/platform-serverless/src/domain/ServerlessContext.ts b/packages/platform/platform-serverless/src/domain/ServerlessContext.ts
@@ -1,6 +1,6 @@
 import {DIContext, DIContextOptions} from "@tsed/di";
 import {JsonEntityStore} from "@tsed/schema";
-import {type APIGatewayProxyEvent, Context} from "aws-lambda";
+import type {APIGatewayProxyEvent, Context} from "aws-lambda";
 
 import {ServerlessRequest} from "./ServerlessRequest.js";
 import {ServerlessResponse} from "./ServerlessResponse.js";

diff --git a/packages/platform/platform-serverless/src/domain/ServerlessResponse.ts b/packages/platform/platform-serverless/src/domain/ServerlessResponse.ts
@@ -1,4 +1,4 @@
-import {getValue, isStream} from "@tsed/core";
+import {getValue} from "@tsed/core";
 import {getStatusMessage} from "@tsed/schema";
 import type {APIGatewayProxyEvent} from "aws-lambda";
 import encodeUrl from "encodeurl";

diff --git a/packages/platform/platform-serverless/src/utils/getRequestId.ts b/packages/platform/platform-serverless/src/utils/getRequestId.ts
@@ -1,4 +1,4 @@
-import {Context} from "aws-lambda";
+import type {Context} from "aws-lambda";
 import {v4} from "uuid";
 
 import type {ServerlessEvent} from "../domain/ServerlessEvent.js";