@middy/ssm 3.1.1 → 3.2.2

package/index.cjs

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-module.exports = void 0;
-var _util = require("@middy/util");
-var _ssmJs = _interopRequireDefault(require("aws-sdk/clients/ssm.js"));
+Object.defineProperty(module, "exports", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _util = require("@middy/util");
+const _ssmJs = _interopRequireDefault(require("aws-sdk/clients/ssm.js"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -40,12 +43,12 @@ const ssmMiddleware = (opts = {})=>{
         let batchFetchKeys = [];
         const internalKeys = Object.keys(options.fetchData);
         const fetchKeys = Object.values(options.fetchData);
-        for (const [idx, internalKey2] of internalKeys.entries()){
-            if (cachedValues[internalKey2]) continue;
-            const fetchKey1 = options.fetchData[internalKey2];
-            if (fetchKey1.substr(-1) === '/') continue;
-            batchInternalKeys.push(internalKey2);
-            batchFetchKeys.push(fetchKey1);
+        for (const [idx, internalKey] of internalKeys.entries()){
+            if (cachedValues[internalKey]) continue;
+            const fetchKey = options.fetchData[internalKey];
+            if (fetchKey.substr(-1) === '/') continue;
+            batchInternalKeys.push(internalKey);
+            batchFetchKeys.push(fetchKey);
             if ((!idx || (idx + 1) % awsRequestLimit !== 0) && !(idx + 1 === internalKeys.length)) {
                 continue;
             }
@@ -57,9 +60,9 @@ const ssmMiddleware = (opts = {})=>{
                     return {
                         [fetchKey]: new Promise(()=>{
                             const internalKey = internalKeys[fetchKeys.indexOf(fetchKey)];
-                            const value = (0, _util).getCache(options.cacheKey).value ?? {};
+                            const value = (0, _util.getCache)(options.cacheKey).value ?? {};
                             value[internalKey] = undefined;
-                            (0, _util).modifyCache(options.cacheKey, value);
+                            (0, _util.modifyCache)(options.cacheKey, value);
                             throw new Error('[ssm] InvalidParameter ' + fetchKey);
                         })
                     };
@@ -69,9 +72,9 @@ const ssmMiddleware = (opts = {})=>{
                     };
                 }));
             }).catch((e)=>{
-                const value = (0, _util).getCache(options.cacheKey).value ?? {};
-                value[internalKey2] = undefined;
-                (0, _util).modifyCache(options.cacheKey, value);
+                const value = (0, _util.getCache)(options.cacheKey).value ?? {};
+                value[internalKey] = undefined;
+                (0, _util.modifyCache)(options.cacheKey, value);
                 throw e;
             });
             for (const internalKey1 of batchInternalKeys){
@@ -92,9 +95,9 @@ const ssmMiddleware = (opts = {})=>{
             const fetchKey = options.fetchData[internalKey];
             if (fetchKey.substr(-1) !== '/') continue;
             values[internalKey] = fetchPath(fetchKey).catch((e)=>{
-                const value = (0, _util).getCache(options.cacheKey).value ?? {};
+                const value = (0, _util.getCache)(options.cacheKey).value ?? {};
                 value[internalKey] = undefined;
-                (0, _util).modifyCache(options.cacheKey, value);
+                (0, _util.modifyCache)(options.cacheKey, value);
                 throw e;
             });
         }
@@ -109,7 +112,7 @@ const ssmMiddleware = (opts = {})=>{
         }).promise().then((resp)=>{
             Object.assign(values, ...resp.Parameters.map((param)=>{
                 return {
-                    [(0, _util).sanitizeKey(param.Name.replace(path, ''))]: parseValue(param)
+                    [(0, _util.sanitizeKey)(param.Name.replace(path, ''))]: parseValue(param)
                 };
             }));
             if (resp.NextToken) return fetchPath(path, resp.NextToken, values);
@@ -120,21 +123,21 @@ const ssmMiddleware = (opts = {})=>{
         if (param.Type === 'StringList') {
             return param.Value.split(',');
         }
-        return (0, _util).jsonSafeParse(param.Value);
+        return (0, _util.jsonSafeParse)(param.Value);
     };
     let prefetch, client;
-    if ((0, _util).canPrefetch(options)) {
-        client = (0, _util).createPrefetchClient(options);
-        prefetch = (0, _util).processCache(options, fetch);
+    if ((0, _util.canPrefetch)(options)) {
+        client = (0, _util.createPrefetchClient)(options);
+        prefetch = (0, _util.processCache)(options, fetch);
     }
     const ssmMiddlewareBefore = async (request)=>{
         if (!client) {
-            client = await (0, _util).createClient(options, request);
+            client = await (0, _util.createClient)(options, request);
         }
-        const { value  } = prefetch ?? (0, _util).processCache(options, fetch, request);
+        const { value  } = prefetch ?? (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);
+            const data = await (0, _util.getInternal)(Object.keys(options.fetchData), request);
             Object.assign(request.context, data);
         }
         prefetch = null;
@@ -143,8 +146,7 @@ const ssmMiddleware = (opts = {})=>{
         before: ssmMiddlewareBefore
     };
 };
-var _default = ssmMiddleware;
-module.exports = _default;
+const _default = ssmMiddleware;
 
 
 //# sourceMappingURL=index.cjs.map

package/index.d.ts

@@ -1,9 +1,28 @@
-import SSM from 'aws-sdk/clients/ssm'
-import { Options as MiddyOptions } from '@middy/util'
 import middy from '@middy/core'
+import { Options as MiddyOptions } from '@middy/util'
+import { Context as LambdaContext } from 'aws-lambda'
+import SSM from 'aws-sdk/clients/ssm'
+import { JsonValue } from 'type-fest'
+
+interface Options<S = SSM>
+  extends MiddyOptions<S, SSM.Types.ClientConfiguration> {}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+type ExtractSingles<T> = T extends `/${infer _}` ? never : T
 
-interface Options<S = SSM> extends MiddyOptions<S, SSM.Types.ClientConfiguration> {}
+export type Context<TOptions extends Options | undefined> = TOptions extends {
+  setToContext: true
+}
+  ? LambdaContext &
+  Record<ExtractSingles<keyof TOptions['fetchData']>, JsonValue> &
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  (keyof TOptions['fetchData'] extends `${infer _P}/${infer _S}`
+    ? Record<string, JsonValue>
+    : unknown)
+  : LambdaContext
 
-declare function ssm (options?: Options): middy.MiddlewareObj
+declare function ssm<TOptions extends Options> (
+  options?: TOptions
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default ssm

package/index.js

@@ -30,12 +30,12 @@ const ssmMiddleware = (opts = {})=>{
         let batchFetchKeys = [];
         const internalKeys = Object.keys(options.fetchData);
         const fetchKeys = Object.values(options.fetchData);
-        for (const [idx, internalKey2] of internalKeys.entries()){
-            if (cachedValues[internalKey2]) continue;
-            const fetchKey1 = options.fetchData[internalKey2];
-            if (fetchKey1.substr(-1) === '/') continue;
-            batchInternalKeys.push(internalKey2);
-            batchFetchKeys.push(fetchKey1);
+        for (const [idx, internalKey] of internalKeys.entries()){
+            if (cachedValues[internalKey]) continue;
+            const fetchKey = options.fetchData[internalKey];
+            if (fetchKey.substr(-1) === '/') continue;
+            batchInternalKeys.push(internalKey);
+            batchFetchKeys.push(fetchKey);
             if ((!idx || (idx + 1) % awsRequestLimit !== 0) && !(idx + 1 === internalKeys.length)) {
                 continue;
             }
@@ -60,7 +60,7 @@ const ssmMiddleware = (opts = {})=>{
                 }));
             }).catch((e)=>{
                 const value = getCache(options.cacheKey).value ?? {};
-                value[internalKey2] = undefined;
+                value[internalKey] = undefined;
                 modifyCache(options.cacheKey, value);
                 throw e;
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/ssm",
-  "version": "3.1.1",
+  "version": "3.2.2",
   "description": "SSM (EC2 Systems Manager) parameters middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -62,12 +62,14 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "3.1.1"
+    "@middy/util": "3.2.2"
   },
   "devDependencies": {
-    "@middy/core": "3.1.1",
+    "@middy/core": "3.2.2",
+    "@types/aws-lambda": "^8.10.101",
     "aws-sdk": "^2.939.0",
-    "aws-xray-sdk": "^3.3.3"
+    "aws-xray-sdk": "^3.3.3",
+    "type-fest": "^2.18.0"
   },
-  "gitHead": "d53fc91d035b01d3fd296cb6c7d0acd8305e9f76"
+  "gitHead": "4c960a361cc8844f7b2e6202d9544c852366fb01"
 }