@middy/service-discovery 3.1.0 → 3.2.1

package/index.cjs

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-module.exports = void 0;
-var _util = require("@middy/util");
-var _servicediscoveryJs = _interopRequireDefault(require("aws-sdk/clients/servicediscovery.js"));
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _util = require("@middy/util");
+const _servicediscoveryJs = _interopRequireDefault(require("aws-sdk/clients/servicediscovery.js"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -31,27 +34,27 @@ const serviceDiscoveryMiddleware = (opts = {})=>{
         for (const internalKey of Object.keys(options.fetchData)){
             if (cachedValues[internalKey]) continue;
             values[internalKey] = client.discoverInstances(options.fetchData[internalKey]).promise().then((resp)=>resp.Instances).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;
             });
         }
         return values;
     };
     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 serviceDiscoveryMiddlewareBefore = 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);
             if (options.setToContext) Object.assign(request.context, data);
         }
         prefetch = null;
@@ -60,8 +63,7 @@ const serviceDiscoveryMiddleware = (opts = {})=>{
         before: serviceDiscoveryMiddlewareBefore
     };
 };
-var _default = serviceDiscoveryMiddleware;
-module.exports = _default;
+const _default = serviceDiscoveryMiddleware;
 
 
 //# sourceMappingURL=index.cjs.map

package/index.d.ts

@@ -1,13 +1,31 @@
-import { ServiceDiscovery } from 'aws-sdk'
 import middy from '@middy/core'
 import { Options as MiddyOptions } from '@middy/util'
+import { Context as LambdaContext } from 'aws-lambda'
+import ServiceDiscovery, {
+  HttpInstanceSummaryList
+} from 'aws-sdk/clients/servicediscovery'
 
 interface Options<S = ServiceDiscovery>
-  extends Pick<MiddyOptions<S, ServiceDiscovery.Types.ClientConfiguration>,
-  'AwsClient' | 'awsClientOptions' | 'awsClientCapture' |
-  'fetchData' | 'disablePrefetch' | 'cacheKey' | 'cacheExpiry' | 'setToContext'> {
+  extends Pick<
+  MiddyOptions<S, ServiceDiscovery.Types.ClientConfiguration>,
+  | 'AwsClient'
+  | 'awsClientOptions'
+  | 'awsClientCapture'
+  | 'fetchData'
+  | 'disablePrefetch'
+  | 'cacheKey'
+  | 'cacheExpiry'
+  | 'setToContext'
+  > {}
+
+export type Context<TOptions extends Options | undefined> = TOptions extends {
+  setToContext: true
 }
+  ? LambdaContext & Record<keyof TOptions['fetchData'], HttpInstanceSummaryList>
+  : LambdaContext
 
-declare function serviceDiscovery (options?: Options): middy.MiddlewareObj
+declare function serviceDiscovery<TOptions extends Options | undefined> (
+  options?: TOptions
+): middy.MiddlewareObj<unknown, any, Error, Context<TOptions>>
 
 export default serviceDiscovery

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/service-discovery",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "Service Discovery (Cloud Map) instances middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -11,6 +11,7 @@
     "access": "public"
   },
   "main": "./index.cjs",
+  "module": "./index.js",
   "exports": {
     ".": {
       "import": {
@@ -60,12 +61,13 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "3.1.0"
+    "@middy/util": "3.2.1"
   },
   "devDependencies": {
-    "@middy/core": "3.1.0",
+    "@middy/core": "3.2.1",
+    "@types/aws-lambda": "^8.10.101",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "d5284fd11c175516c189b6061fee7312106d9709"
+  "gitHead": "b4169ec20b798650e934a7c25ee80ae98d11e03a"
 }