fix rest of aws lambda exports

Author: AbhiPrasad

packages/serverless/src/awslambda-auto.ts

@@ -1,4 +1,4 @@
-import * as Sentry from './index';
+import { init, tryPatchHandler } from './awslambda';
 
 const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT;
 if (lambdaTaskRoot) {
@@ -7,11 +7,11 @@ if (lambdaTaskRoot) {
     throw Error(`LAMBDA_TASK_ROOT is non-empty(${lambdaTaskRoot}) but _HANDLER is not set`);
   }
 
-  Sentry.AWSLambda.init({
+  init({
     _invokedByLambdaLayer: true,
   });
 
-  Sentry.AWSLambda.tryPatchHandler(lambdaTaskRoot, handlerString);
+  tryPatchHandler(lambdaTaskRoot, handlerString);
 } else {
   throw Error('LAMBDA_TASK_ROOT environment variable is not set');
 }

packages/serverless/src/awslambda.ts

@@ -26,8 +26,6 @@ import { awsServicesIntegration } from './awsservices';
 import { DEBUG_BUILD } from './debug-build';
 import { markEventUnhandled } from './utils';
 
-export * from '@sentry/node';
-
 const { isPromise } = types;
 
 // https://www.npmjs.com/package/aws-lambda-consumer
@@ -37,7 +35,7 @@ type SyncHandler<T extends Handler> = (
   callback: Parameters<T>[2],
 ) => void;
 
-export type AsyncHandler<T extends Handler> = (
+type AsyncHandler<T extends Handler> = (
   event: Parameters<T>[0],
   context: Parameters<T>[1],
 ) => Promise<NonNullable<Parameters<Parameters<T>[2]>[1]>>;

packages/serverless/src/index.awslambda.ts

@@ -1,8 +1,12 @@
 /** This file is used as the entrypoint for the lambda layer bundle, and is not included in the npm package. */
 
-// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
-import * as AWSLambda from './awslambda';
-export { AWSLambda };
+import { init as awsLambdaInit, tryPatchHandler, wrapHandler } from './awslambda';
+
+export const AWSLambda = {
+  init: awsLambdaInit,
+  wrapHandler,
+  tryPatchHandler,
+};
 
 export * from './awsservices';
 export * from '@sentry/node';

packages/serverless/src/index.ts

@@ -1,11 +1,11 @@
 export { awsServicesIntegration } from './awsservices';
-
-import { init as awsLambdaInit, wrapHandler } from './awslambda';
+import { init as awsLambdaInit, tryPatchHandler, wrapHandler } from './awslambda';
 import { init as gcpFunctionInit } from './gcpfunction';
 
 const AWSLambda = {
   init: awsLambdaInit,
   wrapHandler,
+  tryPatchHandler,
 };
 
 const GCPFunction = {
@@ -14,6 +14,9 @@ const GCPFunction = {
 
 export { AWSLambda, GCPFunction };
 
+import type { WrapperOptions as AWSWrapperOptions } from './awslambda';
+export type { AWSWrapperOptions };
+
 // TODO(v8): We have to explicitly export these because of the namespace exports
 // above. This is because just doing `export * from '@sentry/node'` will not
 // work with Node native esm while we also have namespace exports in a package.