@middy/s3-object-response 2.5.2 → 3.0.0-alpha.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2022 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -104,7 +104,7 @@ Everyone is very welcome to contribute to this repository. Feel free to [raise i
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2021 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
 
 <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy?ref=badge_large">
   <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy.svg?type=large" alt="FOSSA Status"  style="max-width:100%;">

package/index.d.ts

@@ -1,13 +1,10 @@
 import { S3 } from 'aws-sdk'
-import { captureAWSClient } from 'aws-xray-sdk'
 import middy from '@middy/core'
+import { Options as MiddyOptions } from '@middy/util'
 
-interface Options<S = S3> {
-  AwsClient?: new() => S
-  awsClientOptions?: Partial<S3.Types.ClientConfiguration>
-  awsClientAssumeRole?: string
-  awsClientCapture?: typeof captureAWSClient
-  disablePrefetch?: boolean
+interface Options<S = S3>
+  extends Pick<MiddyOptions<S, S3.Types.ClientConfiguration>,
+  'AwsClient' | 'awsClientOptions' | 'awsClientAssumeRole' | 'awsClientCapture' | 'disablePrefetch'> {
   bodyType?: string
 }
 

package/index.js

@@ -1,31 +1,18 @@
-"use strict";
-
-let https = require('https');
-
-const {
-  URL
-} = require('url');
-
-const {
-  canPrefetch,
-  createPrefetchClient,
-  createClient
-} = require('@middy/util');
-
-const S3 = require('aws-sdk/clients/s3'); // v2
-// const { S3 } = require('@aws-sdk/client-s3') // v3
-
-
+import __https from 'https';
+import { URL } from 'url';
+import { canPrefetch, createPrefetchClient, createClient } from '@middy/util';
+import S3 from 'aws-sdk/clients/s3.js';
 const defaults = {
   AwsClient: S3,
-  // Allow for XRay
   awsClientOptions: {},
   awsClientAssumeRole: undefined,
   awsClientCapture: undefined,
   httpsCapture: undefined,
   disablePrefetch: false,
-  bodyType: undefined
+  bodyType: undefined,
+  __https
 };
+let https = __https;
 
 const s3ObjectResponseMiddleware = (opts = {}) => {
   const options = { ...defaults,
@@ -37,7 +24,7 @@ const s3ObjectResponseMiddleware = (opts = {}) => {
   }
 
   if (options.httpsCapture) {
-    https = options.httpsCapture(https);
+    https = options.httpsCapture(options.__https);
   }
 
   let client;
@@ -66,19 +53,19 @@ const s3ObjectResponseMiddleware = (opts = {}) => {
   };
 
   const s3ObjectResponseMiddlewareAfter = async request => {
-    var _request$response$Bod;
+    var _request$response;
 
     if (!client) {
       client = await createClient(options, request);
     }
 
-    request.response.Body = (_request$response$Bod = request.response.Body) !== null && _request$response$Bod !== void 0 ? _request$response$Bod : request.response.body;
+    (_request$response = request.response).Body ?? (_request$response.Body = request.response.body);
     delete request.response.body;
     return client.writeGetObjectResponse({ ...request.response,
       ...request.internal.s3ObjectResponse
     }).promise().then(() => ({
       statusCode: 200
-    })); // TODO test if needed
+    }));
   };
 
   return {
@@ -113,4 +100,4 @@ const fetchPromise = fetchOptions => {
   });
 };
 
-module.exports = s3ObjectResponseMiddleware;
+export default s3ObjectResponseMiddleware;

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@middy/s3-object-response",
-  "version": "2.5.2",
+  "version": "3.0.0-alpha.1",
   "description": "S3 object response handling middleware for the middy framework",
-  "type": "commonjs",
+  "type": "module",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "index.js",
+  "exports": "./index.js",
   "types": "index.d.ts",
   "files": [
+    "index.js",
     "index.d.ts"
   ],
   "scripts": {
@@ -46,12 +47,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.2"
+    "@middy/util": "^3.0.0-alpha.1"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.2",
+    "@middy/core": "^3.0.0-alpha.1",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4"
+  "gitHead": "a14125c6b2e21b181824f9985a919a47f1e4711f"
 }