@middy/s3 4.6.5 → 5.0.0-alpha.1

package/index.d.ts

@@ -3,23 +3,43 @@ import { Options as MiddyOptions } from '@middy/util'
 import { Context as LambdaContext } from 'aws-lambda'
 import { GetObjectCommandInput, S3Client, S3ClientConfig } from '@aws-sdk/client-s3'
 
-export type Options<AwsS3Client = S3Client> = Omit<MiddyOptions<AwsS3Client, S3ClientConfig>, 'fetchData'>
+export type GetObjectCommandInputNoChecksumMode = Omit<GetObjectCommandInput, 'ChecksumMode'> & {
+  ChecksumMode?: never
+}
+export type ParamType<T> = GetObjectCommandInputNoChecksumMode & { __returnType?: T }
+export declare function s3Req<T> (req: GetObjectCommandInputNoChecksumMode): ParamType<T>
+
+export type S3Options<AwsS3Client = S3Client> = Omit<MiddyOptions<AwsS3Client, S3ClientConfig>, 'fetchData'>
 & {
   fetchData?: {
-    [key: string]: Omit<GetObjectCommandInput, 'ChecksumMode'> & {
-      ChecksumMode?: never
-    }
+    [key: string]: GetObjectCommandInputNoChecksumMode | ParamType<unknown>
   }
 }
 
-export type Context<TOptions extends Options | undefined> = TOptions extends {
-  setToContext: true
-}
-  ? LambdaContext & Record<keyof TOptions['fetchData'], any>
+export type Context<TOptions extends S3Options | undefined> =
+TOptions extends { setToContext: true }
+  ? TOptions extends { fetchData: infer TFetchData }
+    ? LambdaContext & {
+      [Key in keyof TFetchData]: TFetchData[Key] extends ParamType<infer T>
+        ? T
+        : unknown
+    }
+    : never
   : LambdaContext
 
-declare function s3Middleware<TOptions extends Options | undefined> (
+export type Internal<TOptions extends S3Options | undefined> =
+TOptions extends S3Options
+  ? TOptions extends { fetchData: infer TFetchData }
+    ? {
+        [Key in keyof TFetchData]: TFetchData[Key] extends ParamType<infer T>
+          ? T
+          : unknown
+      }
+    : {}
+  : {}
+
+declare function s3Middleware<TOptions extends S3Options | undefined> (
   options?: TOptions
-): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>, Internal<TOptions>>
 
 export default s3Middleware

package/index.js

@@ -1,61 +1,77 @@
-import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
-import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient,
+  getCache,
+  getInternal,
+  processCache,
+  modifyCache,
+  jsonSafeParse
+} from '@middy/util'
+import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3'
 const defaults = {
-    AwsClient: S3Client,
-    awsClientOptions: {},
-    awsClientAssumeRole: undefined,
-    awsClientCapture: undefined,
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 's3',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const contentTypePattern = /^application\/(.+\+)?json($|;.+)/;
-const s3Middleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.send(new GetObjectCommand(options.fetchData[internalKey])).then(async (resp)=>{
-                let value = await resp.Body.transformToString();
-                if (contentTypePattern.test(resp.ContentType)) {
-                    value = jsonSafeParse(value);
-                }
-                return value;
-            }).catch((e)=>{
-                const value = getCache(options.cacheKey).value ?? {};
-                value[internalKey] = undefined;
-                modifyCache(options.cacheKey, value);
-                throw e;
-            });
-        }
-        return values;
-    };
-    let client;
-    if (canPrefetch(options)) {
-        client = createPrefetchClient(options);
-        processCache(options, fetch);
+  AwsClient: S3Client,
+  awsClientOptions: {},
+  awsClientAssumeRole: undefined,
+  awsClientCapture: undefined,
+  fetchData: {},
+  disablePrefetch: false,
+  cacheKey: 's3',
+  cacheKeyExpiry: {},
+  cacheExpiry: -1,
+  setToContext: false
+}
+const contentTypePattern = /^application\/(.+\+)?json($|;.+)/
+const s3Middleware = (opts = {}) => {
+  const options = {
+    ...defaults,
+    ...opts
+  }
+  const fetch = (request, cachedValues = {}) => {
+    const values = {}
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue
+      values[internalKey] = client
+        .send(new GetObjectCommand(options.fetchData[internalKey]))
+        .then(async (resp) => {
+          let value = await resp.Body.transformToString()
+          if (contentTypePattern.test(resp.ContentType)) {
+            value = jsonSafeParse(value)
+          }
+          return value
+        })
+        .catch((e) => {
+          const value = getCache(options.cacheKey).value ?? {}
+          value[internalKey] = undefined
+          modifyCache(options.cacheKey, value)
+          throw e
+        })
     }
-    const s3MiddlewareBefore = async (request)=>{
-        if (!client) {
-            client = await createClient(options, request);
-        }
-        const { value } = processCache(options, fetch, request);
-        Object.assign(request.internal, value);
-        if (options.setToContext) {
-            const data = await getInternal(Object.keys(options.fetchData), request);
-            Object.assign(request.context, data);
-        }
-    };
-    return {
-        before: s3MiddlewareBefore
-    };
-};
-export default s3Middleware;
+    return values
+  }
+  let client
+  if (canPrefetch(options)) {
+    client = createPrefetchClient(options)
+    processCache(options, fetch)
+  }
+  const s3MiddlewareBefore = async (request) => {
+    if (!client) {
+      client = await createClient(options, request)
+    }
+    const { value } = processCache(options, fetch, request)
+    Object.assign(request.internal, value)
+    if (options.setToContext) {
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      Object.assign(request.context, data)
+    }
+  }
+  return {
+    before: s3MiddlewareBefore
+  }
+}
+export default s3Middleware
 
+// used for TS type inference (see index.d.ts)
+export function s3Req (req) {
+  return req
+}

package/package.json

@@ -1,33 +1,27 @@
 {
   "name": "@middy/s3",
-  "version": "4.6.5",
+  "version": "5.0.0-alpha.1",
   "description": "S3 middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "./index.cjs",
   "module": "./index.js",
   "exports": {
     ".": {
       "import": {
         "types": "./index.d.ts",
         "default": "./index.js"
-      },
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.cjs"
       }
     }
   },
   "types": "index.d.ts",
   "files": [
     "index.js",
-    "index.cjs",
     "index.d.ts"
   ],
   "scripts": {
@@ -64,13 +58,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "4.6.5"
+    "@middy/util": "5.0.0-alpha.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
-    "@middy/core": "4.6.5",
+    "@middy/core": "5.0.0-alpha.1",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "573d7b0bb243d8c5a9bcb00cf29d031aa7a0c606"
+  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
 }

package/index.cjs

@@ -1,71 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(module, "exports", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-const _util = require("@middy/util");
-const _clients3 = require("@aws-sdk/client-s3");
-const defaults = {
-    AwsClient: _clients3.S3Client,
-    awsClientOptions: {},
-    awsClientAssumeRole: undefined,
-    awsClientCapture: undefined,
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 's3',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const contentTypePattern = /^application\/(.+\+)?json($|;.+)/;
-const s3Middleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.send(new _clients3.GetObjectCommand(options.fetchData[internalKey])).then(async (resp)=>{
-                let value = await resp.Body.transformToString();
-                if (contentTypePattern.test(resp.ContentType)) {
-                    value = (0, _util.jsonSafeParse)(value);
-                }
-                return value;
-            }).catch((e)=>{
-                const value = (0, _util.getCache)(options.cacheKey).value ?? {};
-                value[internalKey] = undefined;
-                (0, _util.modifyCache)(options.cacheKey, value);
-                throw e;
-            });
-        }
-        return values;
-    };
-    let client;
-    if ((0, _util.canPrefetch)(options)) {
-        client = (0, _util.createPrefetchClient)(options);
-        (0, _util.processCache)(options, fetch);
-    }
-    const s3MiddlewareBefore = async (request)=>{
-        if (!client) {
-            client = await (0, _util.createClient)(options, request);
-        }
-        const { value } = (0, _util.processCache)(options, fetch, request);
-        Object.assign(request.internal, value);
-        if (options.setToContext) {
-            const data = await (0, _util.getInternal)(Object.keys(options.fetchData), request);
-            Object.assign(request.context, data);
-        }
-    };
-    return {
-        before: s3MiddlewareBefore
-    };
-};
-const _default = s3Middleware;
-