@konker.dev/middleware-fp 0.1.9 → 0.1.10

package/dist/contrib/cacheInMemory.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cacheInMemory.test.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.test.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,EAAE,GAAG;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,CAAC"}
+{"version":3,"file":"cacheInMemory.test.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.test.ts"],"names":[],"mappings":""}

package/dist/contrib/cacheInMemory.test.js

@@ -1,19 +1,32 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { describe, expect, it, vi } from 'vitest';
+import { EMPTY_REQUEST_W } from '../lib/http.js';
 import * as common from '../test/test-common.js';
-import { TestDeps } from '../test/test-common.js';
+import { TestDepsW } from '../test/test-common.js';
 import * as unit from './cacheInMemory.js';
-const TEST_IN = { foo: 'foo' };
 const TEST_DEPS = { bar: 'bar' };
 describe('middleware/cache-in-memory', () => {
     const cacheKeyResolver = (_) => Effect.succeed('CACHE_KEY');
-    const coreSpy = vi.spyOn(common, 'echoCoreInDeps');
-    const stack = pipe(common.echoCoreInDeps(common.TestDeps), unit.middleware(cacheKeyResolver));
+    const coreSpy = vi.spyOn(common, 'echoCoreInDepsW');
+    const stack = pipe(common.echoCoreInDepsW(TestDepsW), unit.middleware(cacheKeyResolver));
     it('should work as expected', async () => {
-        const result1 = await pipe(stack(TEST_IN), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
-        const result2 = await pipe(stack(TEST_IN), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
-        expect(result1).toStrictEqual({ foo: 'foo', bar: 'bar' });
+        const result1 = await pipe(stack(EMPTY_REQUEST_W), Effect.provideService(TestDepsW, TEST_DEPS), Effect.runPromise);
+        const result2 = await pipe(stack(EMPTY_REQUEST_W), Effect.provideService(TestDepsW, TEST_DEPS), Effect.runPromise);
+        expect(result1).toStrictEqual({
+            body: 'OK',
+            deps: {
+                bar: 'bar',
+            },
+            headers: {},
+            in: {
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringParameters: {},
+            },
+            statusCode: 200,
+        });
         expect(result2).toStrictEqual(result1);
         expect(coreSpy).toHaveBeenCalledTimes(1);
     });

package/dist/contrib/cacheInMemory.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheInMemory.test.js","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAI3C,MAAM,OAAO,GAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AACnC,MAAM,SAAS,GAAoB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAElD,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,MAAM,gBAAgB,GAAG,CAAI,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,UAAU,CAAsB,gBAAgB,CAAC,CAAC,CAAC;IAEnH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1G,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1G,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cacheInMemory.test.js","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAE3C,MAAM,SAAS,GAAc,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAE5C,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,MAAM,gBAAgB,GAAG,CAAI,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,UAAU,CAAuB,gBAAgB,CAAC,CAAC,CAAC;IAE/G,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACnH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACnH,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;YAC5B,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,GAAG,EAAE,KAAK;aACX;YACD,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B;YACD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/cacheMomento.d.ts

@@ -1,7 +1,8 @@
 import type { MomentoClientDeps } from '@konker.dev/momento-cache-client-effect';
-import type { CacheType } from '@konker.dev/tiny-cache-fp';
+import type { TinyCache } from '@konker.dev/tiny-cache-fp';
 import type { CacheKeyResolver } from '@konker.dev/tiny-cache-fp/lib/CacheKeyResolver';
-import type { Handler } from '../index.js';
+import type { Rec, RequestResponseHandler } from '../index.js';
+import { type ResponseW } from '../lib/http.js';
 import type { MiddlewareError } from '../lib/MiddlewareError.js';
-export declare const middleware: <I, O, CR>(cacheKeyResolver: CacheKeyResolver<I, CR>, cache: CacheType<O, MomentoClientDeps>, ttl?: number) => <E, R>(wrapped: Handler<I, O, E, R>) => Handler<I, O, E | MiddlewareError, R | CR | MomentoClientDeps>;
+export declare const middleware: <I extends Rec, O extends Rec, CR>(cacheKeyResolver: CacheKeyResolver<I, CR>, cache: TinyCache<ResponseW<O> | unknown, MomentoClientDeps>, ttl?: number) => <E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R | CR | MomentoClientDeps>;
 //# sourceMappingURL=cacheMomento.d.ts.map

package/dist/contrib/cacheMomento.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cacheMomento.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheMomento.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAKvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,eAAO,MAAM,UAAU,GACpB,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAoB,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,QAAQ,MAAM,MACzG,CAAC,EAAE,CAAC,WAAW,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,iBAAiB,CA6BhG,CAAC"}
+{"version":3,"file":"cacheMomento.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheMomento.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAKvF,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAkD,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,eAAO,MAAM,UAAU,GACpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,EAAE,oBACb,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,SAClC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,iBAAiB,CAAC,QACrD,MAAM,MAEb,CAAC,EAAE,CAAC,WACM,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAgC5E,CAAC"}

package/dist/contrib/cacheMomento.js

@@ -1,6 +1,7 @@
 import { chainGetVal, chainSetVal } from '@konker.dev/tiny-cache-fp/lib/helpers';
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
+import { EMPTY_RESPONSE_W, makeResponseW } from '../lib/http.js';
 import { toMiddlewareError } from '../lib/MiddlewareError.js';
 const TAG = 'cacheMomento';
 export const middleware = (cacheKeyResolver, cache, ttl) => (wrapped) => (i) => pipe(
@@ -9,9 +10,11 @@ Effect.succeed(i),
 // Log before
 Effect.tap(Effect.logDebug(`[${TAG}] IN`)), 
 // Try to get the cached value, using a key based on the input
-Effect.flatMap(cacheKeyResolver), Effect.flatMap(chainGetVal(cache)), Effect.mapError(toMiddlewareError), 
+Effect.flatMap(cacheKeyResolver), Effect.flatMap(chainGetVal(cache)), Effect.tap(Effect.logInfo(`[${TAG}] CACHE HIT`)), Effect.map((cacheHit) => makeResponseW(EMPTY_RESPONSE_W, cacheHit)), // FIXME: cast as makeResponseW
+Effect.mapError(toMiddlewareError), 
 // If it's a cache miss, call the next middleware in the stack, and set the output into the cache
-Effect.orElse(() => pipe(wrapped(i), Effect.tap(Effect.logInfo(`[${TAG}] CACHE MISS`)), Effect.flatMap((o) => pipe(cacheKeyResolver(i), Effect.flatMap((cacheKey) => chainSetVal(cache, cacheKey, o, ttl)), Effect.mapError(toMiddlewareError))))), 
+Effect.orElse(() => pipe(wrapped(i), Effect.tap(Effect.logInfo(`[${TAG}] CACHE MISS`)), Effect.flatMap((o) => pipe(cacheKeyResolver(i), Effect.flatMap((cacheKey) => chainSetVal(cache, cacheKey, o, ttl)), Effect.map((cachedItem) => makeResponseW(EMPTY_RESPONSE_W, cachedItem)), // FIXME: cast as makeResponseW
+Effect.mapError(toMiddlewareError))))), 
 // Log after
 Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 //# sourceMappingURL=cacheMomento.js.map

package/dist/contrib/cacheMomento.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheMomento.js","sourceRoot":"","sources":["../../src/contrib/cacheMomento.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,GAAG,GAAG,cAAc,CAAC;AAE3B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAW,gBAAyC,EAAE,KAAsC,EAAE,GAAY,EAAE,EAAE,CAC9G,CAAO,OAA4B,EAAkE,EAAE,CACvG,CAAC,CAAI,EAAE,EAAE,CACP,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,8DAA8D;AAC9D,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAClC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC;AAElC,iGAAiG;AACjG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CACjB,IAAI,CACF,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,EACjD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CACF,gBAAgB,CAAC,CAAC,CAAC,EACnB,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAClE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACnC,CACF,CACF,CACF;AAED,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
+{"version":3,"file":"cacheMomento.js","sourceRoot":"","sources":["../../src/contrib/cacheMomento.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAiC,MAAM,gBAAgB,CAAC;AAEhG,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,GAAG,GAAG,cAAc,CAAC;AAE3B,MAAM,CAAC,MAAM,UAAU,GACrB,CACE,gBAAyC,EACzC,KAA2D,EAC3D,GAAY,EACZ,EAAE,CACJ,CACE,OAA2C,EACoC,EAAE,CACnF,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,8DAA8D;AAC9D,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC,EAChD,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,QAAa,CAAC,CAAC,EAAE,+BAA+B;AACzG,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC;AAElC,iGAAiG;AACjG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CACjB,IAAI,CACF,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,EACjD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CACF,gBAAgB,CAAC,CAAC,CAAC,EACnB,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAClE,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAe,CAAC,CAAC,EAAE,+BAA+B;AAC7G,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CACnC,CACF,CACF,CACF;AAED,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}

package/dist/contrib/cacheMomento.test.d.ts

@@ -1,4 +1,2 @@
-export type In = {
-    foo: 'foo';
-};
+export {};
 //# sourceMappingURL=cacheMomento.test.d.ts.map

package/dist/contrib/cacheMomento.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cacheMomento.test.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheMomento.test.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,EAAE,GAAG;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,CAAC"}
+{"version":3,"file":"cacheMomento.test.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheMomento.test.ts"],"names":[],"mappings":""}

package/dist/contrib/cacheMomento.test.js

@@ -1,16 +1,15 @@
-import { MomentoClientDeps } from '@konker.dev/momento-cache-client-effect';
-import { MockMomentoClient, TEST_MOMENTO_AUTH_TOKEN } from '@konker.dev/momento-cache-client-effect/lib/test';
-import { MomentoStringCacheJson } from '@konker.dev/tiny-cache-fp/momento/MomentoStringCacheJson';
+import { mockMomentoClientDeps, TEST_MOMENTO_AUTH_TOKEN } from '@konker.dev/momento-cache-client-effect/lib/test';
+import { JsonCache } from '@konker.dev/tiny-cache-fp/JsonCache';
+import { MomentoStringCache } from '@konker.dev/tiny-cache-fp/momento/MomentoStringCache';
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-import * as common from '../test/test-common.js';
-import { TestDeps } from '../test/test-common.js';
+import { EMPTY_REQUEST_W, makeResponseW } from '../lib/http.js';
+import { TestDepsW } from '../test/test-common.js';
 import * as unit from './cacheMomento.js';
-const TEST_IN = { foo: 'foo' };
 describe('middleware/cache-momento', () => {
-    const cache = MomentoStringCacheJson();
-    let TEST_DEPS;
+    const cache = JsonCache(MomentoStringCache);
+    const __cache = {};
     let oldEnv;
     beforeAll(() => {
         oldEnv = process.env;
@@ -19,23 +18,36 @@ describe('middleware/cache-momento', () => {
         };
     });
     beforeEach(() => {
-        TEST_DEPS = {
-            makeMomentoClient: () => Effect.succeed(MockMomentoClient()),
-        };
+        vi.clearAllMocks();
     });
     afterAll(() => {
         process.env = oldEnv;
     });
     const cacheKeyResolver = (_) => Effect.succeed('CACHE_KEY');
-    const coreSpy = vi.spyOn(common, 'echoCoreInDeps');
-    // const stack = unit.middleware(cacheKeyResolver, cache)(common.echoCoreIn);
-    const stack = pipe(common.echoCoreInDeps(common.TestDeps), unit.middleware(cacheKeyResolver, cache));
+    const coreDummy = vi.fn().mockImplementation((i) => Effect.succeed(makeResponseW({
+        statusCode: 200,
+        headers: {
+            ...i.headers,
+        },
+        body: i.body ?? 'OK',
+    }, { in: i })));
+    const stack = pipe(coreDummy, unit.middleware(cacheKeyResolver, cache));
     it('should work as expected', async () => {
-        const result1 = await pipe(stack(TEST_IN), Effect.provideService(TestDeps, {}), Effect.provideService(MomentoClientDeps, TEST_DEPS), Effect.runPromise);
-        const result2 = await pipe(stack(TEST_IN), Effect.provideService(TestDeps, {}), Effect.provideService(MomentoClientDeps, TEST_DEPS), Effect.runPromise);
-        expect(result1).toStrictEqual({ foo: 'foo' });
+        const result1 = await pipe(stack(EMPTY_REQUEST_W), Effect.provideService(TestDepsW, {}), mockMomentoClientDeps(__cache), Effect.runPromise);
+        const result2 = await pipe(stack(EMPTY_REQUEST_W), Effect.provideService(TestDepsW, {}), mockMomentoClientDeps(__cache), Effect.runPromise);
+        expect(result1).toStrictEqual({
+            body: 'OK',
+            headers: {},
+            in: {
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringParameters: {},
+            },
+            statusCode: 200,
+        });
         expect(result2).toStrictEqual(result1);
-        expect(coreSpy).toHaveBeenCalledTimes(1);
+        expect(coreDummy).toHaveBeenCalledTimes(1);
     });
 });
 //# sourceMappingURL=cacheMomento.test.js.map

package/dist/contrib/cacheMomento.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheMomento.test.js","sourceRoot":"","sources":["../../src/contrib/cacheMomento.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC9G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEnF,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAI1C,MAAM,OAAO,GAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAEnC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,KAAK,GAAG,sBAAsB,EAAE,CAAC;IACvC,IAAI,SAA4B,CAAC;IACjC,IAAI,MAAW,CAAC;IAEhB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;QACrB,OAAO,CAAC,GAAG,GAAG;YACZ,kBAAkB,EAAE,uBAAuB;SAC5C,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,GAAG;YACV,iBAAiB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;SAC7D,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAI,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACnD,6EAA6E;IAC7E,MAAM,KAAK,GAAG,IAAI,CAChB,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,EACtC,IAAI,CAAC,UAAU,CAA2B,gBAAgB,EAAE,KAAK,CAAC,CACnE,CAAC;IAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,KAAK,CAAC,OAAO,CAAC,EACd,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,EACnC,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,SAAS,CAAC,EACnD,MAAM,CAAC,UAAU,CAClB,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,KAAK,CAAC,OAAO,CAAC,EACd,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,EACnC,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,SAAS,CAAC,EACnD,MAAM,CAAC,UAAU,CAClB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cacheMomento.test.js","sourceRoot":"","sources":["../../src/contrib/cacheMomento.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEnF,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAE1C,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,KAAK,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,IAAI,MAAW,CAAC;IAEhB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;QACrB,OAAO,CAAC,GAAG,GAAG;YACZ,kBAAkB,EAAE,uBAAuB;SAC5C,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAI,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,CACjD,MAAM,CAAC,OAAO,CACZ,aAAa,CACX;QACE,UAAU,EAAE,GAAG;QACf,OAAO,EAAE;YACP,GAAG,CAAC,CAAC,OAAO;SACb;QACD,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;KACrB,EACD,EAAE,EAAE,EAAE,CAAC,EAAE,CACV,CACF,CACF,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAqB,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC;IAE5F,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,KAAK,CAAC,eAAe,CAAC,EACtB,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,EACpC,qBAAqB,CAAC,OAAO,CAAC,EAC9B,MAAM,CAAC,UAAU,CAClB,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,KAAK,CAAC,eAAe,CAAC,EACtB,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,EACpC,qBAAqB,CAAC,OAAO,CAAC,EAC9B,MAAM,CAAC,UAAU,CAClB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;YAC5B,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B;YACD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/envValidator.d.ts

@@ -1,8 +1,8 @@
 import { Schema } from 'effect';
-import type { Handler } from '../index.js';
+import type { Rec, RequestResponseHandler } from '../index.js';
 import type { MiddlewareError } from '../lib/MiddlewareError.js';
 export type WithValidatedEnv<V> = {
     validatedEnv: V;
 };
-export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I, O, E, R>(wrapped: Handler<I & WithValidatedEnv<V0>, O, E, R>) => Handler<I, O, E | MiddlewareError, R>;
+export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithValidatedEnv<V0>, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
 //# sourceMappingURL=envValidator.d.ts.map

package/dist/contrib/envValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"envValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/envValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,YAAY,EAAE,CAAC,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,UAAU,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,OAAO,CAAC,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAoBpG,CAAC"}
+{"version":3,"file":"envValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/envValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,YAAY,EAAE,CAAC,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,UAAU,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACjE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAanD,CAAC"}

package/dist/contrib/envValidator.js

@@ -1,19 +1,9 @@
 import { pipe, Schema } from 'effect';
 import * as Effect from 'effect/Effect';
+import { makeRequestW } from '../lib/http.js';
 import { toMiddlewareError } from '../lib/MiddlewareError.js';
 const TAG = 'envValidator';
-export const middleware = (schema) => (wrapped) => (i) => pipe(
-// Lift the input
-Effect.succeed(i), 
-// Log before
-Effect.tap(Effect.logDebug(`[${TAG}] IN`)), 
+export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), 
 // Parse the environment according to the given schema and inject into input
-Effect.flatMap((_) => pipe(process.env, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError(toMiddlewareError), Effect.map((validatedEnv) => ({
-    ...i,
-    validatedEnv,
-})), 
-// Call the next middleware in the stack
-Effect.flatMap(wrapped), 
-// Log after
-Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
+Effect.flatMap((_) => pipe(process.env, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError(toMiddlewareError), Effect.map((validatedEnv) => makeRequestW(i, { validatedEnv })), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 //# sourceMappingURL=envValidator.js.map

package/dist/contrib/envValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"envValidator.js","sourceRoot":"","sources":["../../src/contrib/envValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,GAAG,GAAG,cAAc,CAAC;AAM3B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CAAa,OAAmD,EAAyC,EAAE,CAC3G,CAAC,CAAI,EAAE,EAAE,CACP,IAAI;AACF,iBAAiB;AACjB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AACjB,aAAa;AACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,4EAA4E;AAC5E,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC/F,EACD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,YAAgB,EAAE,EAAE,CAAC,CAAC;IAChC,GAAG,CAAC;IACJ,YAAY;CACb,CAAC,CAAC;AACH,wCAAwC;AACxC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;AACvB,YAAY;AACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
+{"version":3,"file":"envValidator.js","sourceRoot":"","sources":["../../src/contrib/envValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,GAAG,GAAG,cAAc,CAAC;AAM3B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAkE,EACZ,EAAE,CAC1D,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAC1C,4EAA4E;AAC5E,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC/F,EACD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,MAAM,CAAC,GAAG,CAAC,CAAC,YAAgB,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,EACnE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}

package/dist/contrib/envValidator.test.d.ts

@@ -1,7 +1,4 @@
 import { Schema } from 'effect';
-export type In = {
-    foo: 'foo';
-};
 export declare const testSchema: Schema.Struct<{
     qux: Schema.Literal<["qux_value"]>;
     str: typeof Schema.String;

package/dist/contrib/envValidator.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"envValidator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/envValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAOtC,MAAM,MAAM,EAAE,GAAG;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhC,eAAO,MAAM,UAAU;;;;EAIrB,CAAC"}
+{"version":3,"file":"envValidator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/envValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQtC,eAAO,MAAM,UAAU;;;;EAIrB,CAAC"}

package/dist/contrib/envValidator.test.js

@@ -1,14 +1,15 @@
 import { pipe, Schema } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterEach, describe, expect, it } from 'vitest';
-import { echoCoreIn } from '../test/test-common.js';
+import { EMPTY_REQUEST_W, makeRequestW } from '../lib/http.js';
+import { echoCoreIn200W } from '../test/test-common.js';
 import * as unit from './envValidator.js';
 export const testSchema = Schema.Struct({
     qux: Schema.Literal('qux_value'),
     str: Schema.String,
     num: Schema.NumberFromString,
 });
-const TEST_IN = { foo: 'foo' };
+const TEST_IN = makeRequestW(EMPTY_REQUEST_W, { foo: 'foo' });
 describe('middleware/env-validator', () => {
     const OLD_ENV = process.env;
     afterEach(() => {
@@ -16,16 +17,29 @@ describe('middleware/env-validator', () => {
     });
     it('should work as expected with valid data', async () => {
         process.env = { qux: 'qux_value', str: 'some-string', num: '123' };
-        const egHandler = pipe(echoCoreIn, unit.middleware(testSchema));
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
         const result = pipe(egHandler(TEST_IN), Effect.runPromise);
         await expect(result).resolves.toStrictEqual({
-            foo: 'foo',
-            validatedEnv: { qux: 'qux_value', str: 'some-string', num: 123 },
+            statusCode: 200,
+            body: 'OK',
+            headers: {},
+            in: {
+                method: 'GET',
+                headers: {},
+                pathParameters: {},
+                queryStringParameters: {},
+                foo: 'foo',
+                validatedEnv: {
+                    num: 123,
+                    qux: 'qux_value',
+                    str: 'some-string',
+                },
+            },
         });
     });
     it('should work as expected with invalid data', async () => {
         process.env = { noqux: 'noqux_value' };
-        const egHandler = pipe(echoCoreIn, unit.middleware(testSchema));
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
         const result = pipe(egHandler(TEST_IN), Effect.runPromise);
         await expect(result).rejects.toThrow('is missing');
     });

package/dist/contrib/envValidator.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"envValidator.test.js","sourceRoot":"","sources":["../../src/contrib/envValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAI1C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,MAAM;IAClB,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,OAAO,GAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAEnC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QAEnE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,GAAG,EAAE,KAAK;YACV,YAAY,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE;SACjE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,OAAO,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QAEvC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"envValidator.test.js","sourceRoot":"","sources":["../../src/contrib/envValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAE1C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,MAAM;IAClB,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;AAE9D,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QAEnE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,GAAG,EAAE,KAAK;gBACV,YAAY,EAAE;oBACZ,GAAG,EAAE,GAAG;oBACR,GAAG,EAAE,WAAW;oBAChB,GAAG,EAAE,aAAa;iBACnB;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,OAAO,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QAEvC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/headerSignatureAuthorizer/index.d.ts

@@ -1,11 +1,10 @@
-import type { APIGatewayProxyEventV2 } from 'aws-lambda';
 import { Context } from 'effect';
-import type { Handler } from '../../index.js';
+import type { Rec, RequestResponseHandler } from '../../index.js';
 import { HttpApiError } from '../../lib/HttpApiError.js';
 export type HeaderSignatureAuthorizerDeps = {
     readonly secret: string;
     readonly signatureHeaderName: string;
 };
 export declare const HeaderSignatureAuthorizerDeps: Context.Tag<HeaderSignatureAuthorizerDeps, HeaderSignatureAuthorizerDeps>;
-export declare const middleware: () => <I extends APIGatewayProxyEventV2, O, E, R>(wrapped: Handler<I, O, E, R>) => Handler<I, O, E | HttpApiError, R | HeaderSignatureAuthorizerDeps>;
+export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E | HttpApiError, R | HeaderSignatureAuthorizerDeps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/contrib/headerSignatureAuthorizer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMzD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACtC,CAAC;AACF,eAAO,MAAM,6BAA6B,2EAEzC,CAAC;AAGF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,sBAAsB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAC/B,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC3B,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,6BAA6B,CAenE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMzD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACtC,CAAC;AACF,eAAO,MAAM,6BAA6B,2EAEzC,CAAC;AAGF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,6BAA6B,CAelF,CAAC"}

package/dist/contrib/headerSignatureAuthorizer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAEnD,MAAM,GAAG,GAAG,2BAA2B,CAAC;AAOxC,MAAM,CAAC,MAAM,6BAA6B,GAAG,OAAO,CAAC,UAAU,CAC7D,+BAA+B,CAChC,CAAC;AAEF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA4B,EACwC,EAAE,CACxE,CAAC,CAAI,EAAE,EAAE;IACP,OAAO,IAAI,CACT,6BAA6B,EAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,EAAE,CACjD,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAE,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAClF,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;KACxF,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAC1F,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAEnD,MAAM,GAAG,GAAG,2BAA2B,CAAC;AAOxC,MAAM,CAAC,MAAM,6BAA6B,GAAG,OAAO,CAAC,UAAU,CAC7D,+BAA+B,CAChC,CAAC;AAEF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA2C,EACwC,EAAE,CACvF,CAAC,CAAc,EAAE,EAAE;IACjB,OAAO,IAAI,CACT,6BAA6B,EAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,EAAE,CACjD,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QACjF,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;KACxF,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAC1F,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}

package/dist/contrib/headerSignatureAuthorizer/index.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.test.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAMnC,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AACzD,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAC5D,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAC7D,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,eAAO,MAAM,qCAAqC,EAAE,IAAI,CAAC,6BAIrD,CAAC;AAEL,eAAO,MAAM,iCAAiC,gHAG7C,CAAC"}
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAMnC,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AACzD,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAC5D,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAC7D,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,eAAO,MAAM,qCAAqC,EAAE,IAAI,CAAC,6BAIrD,CAAC;AAEL,eAAO,MAAM,iCAAiC,gHAG7C,CAAC"}

package/dist/contrib/headerSignatureAuthorizer/index.test.js

@@ -2,7 +2,8 @@ import * as hashUtils from '@konker.dev/tiny-utils-fp/hash';
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { http200CoreIn } from '../../test/test-common.js';
+import { EMPTY_REQUEST_W, makeRequestW } from '../../lib/http.js';
+import { echoCoreIn200W } from '../../test/test-common.js';
 import * as unit from './index.js';
 // https://stackoverflow.com/a/72885576/203284
 // https://github.com/vitest-dev/vitest/issues/6099
@@ -16,22 +17,20 @@ export const HEADER_SIGNATURE_AUTHORIZER_TEST_DEPS = unit.HeaderSignatureAuthori
     signatureHeaderName: TEST_SIGNATURE_HEADER_NAME,
 });
 export const mockHeaderSignatureAuthorizerDeps = Effect.provideService(unit.HeaderSignatureAuthorizerDeps, HEADER_SIGNATURE_AUTHORIZER_TEST_DEPS);
-const TEST_IN_1 = {
-    isBase64Encoded: false,
-    requestContext: {},
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
+    method: 'POST',
     body: 'TEST_BODY',
     headers: {
         [TEST_SIGNATURE_HEADER_NAME]: CORRECT_TEST_HMAC_VALUE,
     },
-};
-const TEST_IN_2 = {
-    isBase64Encoded: false,
-    requestContext: {},
+});
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
+    method: 'POST',
     body: 'TEST_BODY',
     headers: {
         [TEST_SIGNATURE_HEADER_NAME]: INCORRECT_TEST_HMAC_VALUE,
     },
-};
+});
 describe('middleware/header-signature-authorizer', () => {
     let errorSpy;
     beforeEach(() => {
@@ -43,20 +42,28 @@ describe('middleware/header-signature-authorizer', () => {
         vi.restoreAllMocks();
     });
     it('should work as expected in an success case', async () => {
-        const egHandler = pipe(http200CoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = await pipe(egHandler(TEST_IN_1), mockHeaderSignatureAuthorizerDeps, Effect.runPromise);
         expect(result).toStrictEqual({
             statusCode: 200,
+            body: 'TEST_BODY',
             headers: {
-                QUX: 'qux_value',
+                'x-test-signature': 'test-hmac-value',
+            },
+            in: {
+                body: 'TEST_BODY',
+                headers: {
+                    'x-test-signature': 'test-hmac-value',
+                },
+                method: 'POST',
+                pathParameters: {},
+                queryStringParameters: {},
             },
-            body: JSON.stringify({ result: 'OK' }),
-            isBase64Encoded: false,
         });
         expect(errorSpy).toHaveBeenCalledTimes(0);
     });
     it('should work as expected in an error case', async () => {
-        const egHandler = pipe(http200CoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = pipe(egHandler(TEST_IN_2), mockHeaderSignatureAuthorizerDeps, Effect.runPromise);
         await expect(result).rejects.toThrow('Invalid signature');
         expect(errorSpy).toHaveBeenCalledTimes(1);

package/dist/contrib/headerSignatureAuthorizer/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/index.test.ts"],"names":[],"mappings":"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"}

package/dist/contrib/headerSignatureAuthorizer/lib.d.ts

@@ -1,4 +1,4 @@
 import * as Effect from 'effect/Effect';
-import type { HttpApiError } from '../../lib/HttpApiError.js';
-export declare function validateHeaderSignature(signature: string, requestRawBody: unknown, secret: string): Effect.Effect<boolean, HttpApiError>;
+import { type HttpApiError } from '../../lib/HttpApiError.js';
+export declare function validateHeaderSignature(signature: string | undefined, requestRawBody: unknown, secret: string): Effect.Effect<boolean, HttpApiError>;
 //# sourceMappingURL=lib.d.ts.map

package/dist/contrib/headerSignatureAuthorizer/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAMtC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,2BAA2B,CAAC;AAE9E,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,cAAc,EAAE,OAAO,EACvB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAStC"}

package/dist/contrib/headerSignatureAuthorizer/lib.js

@@ -3,6 +3,9 @@ import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { toHttpApiError } from '../../lib/HttpApiError.js';
 export function validateHeaderSignature(signature, requestRawBody, secret) {
+    if (!signature) {
+        return Effect.succeed(false);
+    }
     return pipe(sha256HmacHex(String(requestRawBody), secret), Effect.flatMap((calculatedHmac) => Effect.succeed(calculatedHmac === signature)), Effect.mapError(toHttpApiError));
 }
 //# sourceMappingURL=lib.js.map

package/dist/contrib/headerSignatureAuthorizer/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,UAAU,uBAAuB,CACrC,SAAiB,EACjB,cAAuB,EACvB,MAAc;IAEd,OAAO,IAAI,CACT,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,EAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAqB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE9E,MAAM,UAAU,uBAAuB,CACrC,SAA6B,EAC7B,cAAuB,EACvB,MAAc;IAEd,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,IAAI,CACT,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,EAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,CAAC;AACJ,CAAC"}

package/dist/contrib/headerSignatureAuthorizer/lib.test.js

@@ -22,6 +22,10 @@ describe('middleware/header-signature-authorizer/lib', () => {
         const result = await pipe(unit.validateHeaderSignature(CORRECT_TEST_HMAC_VALUE, TEST_BODY, TEST_SECRET), Effect.runPromise);
         expect(result).toStrictEqual(true);
     });
+    it('should work as expected in an success case with missing signature', async () => {
+        const result = await pipe(unit.validateHeaderSignature(undefined, TEST_BODY, TEST_SECRET), Effect.runPromise);
+        expect(result).toStrictEqual(false);
+    });
     it('should work as expected in an error case', async () => {
         const result = await pipe(unit.validateHeaderSignature(INCORRECT_TEST_HMAC_VALUE, TEST_BODY, TEST_SECRET), Effect.runPromise);
         expect(result).toStrictEqual(false);

package/dist/contrib/headerSignatureAuthorizer/lib.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;AACzD,MAAM,CAAC,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC5D,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;AAEzC,8CAA8C;AAC9C,mDAAmD;AACnD,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAExC,QAAQ,CAAC,4CAA4C,EAAE,GAAG,EAAE;IAC1D,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAC9F,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,EAAE,SAAS,EAAE,WAAW,CAAC,EAC7E,MAAM,CAAC,UAAU,CAClB,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,EAAE,SAAS,EAAE,WAAW,CAAC,EAC/E,MAAM,CAAC,UAAU,CAClB,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../src/contrib/headerSignatureAuthorizer/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;AACzD,MAAM,CAAC,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC5D,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;AAEzC,8CAA8C;AAC9C,mDAAmD;AACnD,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAExC,QAAQ,CAAC,4CAA4C,EAAE,GAAG,EAAE;IAC1D,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAC9F,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,EAAE,SAAS,EAAE,WAAW,CAAC,EAC7E,MAAM,CAAC,UAAU,CAClB,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAE9G,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,EAAE,SAAS,EAAE,WAAW,CAAC,EAC/E,MAAM,CAAC,UAAU,CAClB,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/headersNormalizer/index.d.ts

@@ -1,7 +1,7 @@
-import type { Handler } from '../../index.js';
-import type { WithNormalizedInputHeaders, WithNormalizedOutputHeaders, WithPossibleInputHeaders, WithPossibleOutputHeaders } from './types.js';
-export declare const middleware: <I, O, E, R>({ normalizeRequestHeaders, normalizeResponseHeaders }?: {
+import type { Rec, RequestResponseHandler } from '../../index.js';
+import type { WithNormalizedInputHeaders, WithNormalizedOutputHeaders } from './types.js';
+export declare const middleware: ({ normalizeRequestHeaders, normalizeResponseHeaders }?: {
     normalizeRequestHeaders?: boolean | undefined;
     normalizeResponseHeaders?: boolean | undefined;
-}) => (wrapped: Handler<I & WithNormalizedInputHeaders, O & WithPossibleOutputHeaders, E, R>) => Handler<I & WithPossibleInputHeaders, O & WithNormalizedOutputHeaders, E, R>;
+}) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithNormalizedInputHeaders, O, E, R>) => RequestResponseHandler<I, O & WithNormalizedOutputHeaders, E, R>;
 //# sourceMappingURL=index.d.ts.map

package/dist/contrib/headersNormalizer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,KAAK,EACV,0BAA0B,EAC1B,2BAA2B,EAC3B,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,YAAY,CAAC;AAIpB,eAAO,MAAM,UAAU,GACpB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;;;gBAEA,OAAO,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,GAAG,yBAAyB,EAAE,CAAC,EAAE,CAAC,CAAC,KACpF,OAAO,CAAC,CAAC,GAAG,wBAAwB,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,CAAC,CAU7E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAGlE,OAAO,KAAK,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAI1F,eAAO,MAAM,UAAU;;;OAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvE,sBAAsB,CAAC,CAAC,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,CAAC,CAUjE,CAAC"}

package/dist/contrib/headersNormalizer/index.js

@@ -1,7 +1,7 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { transformInput, transformOutput } from './lib.js';
-const TAG = 'headerNormalizer';
+const TAG = 'headersNormalizer';
 export const middleware = ({ normalizeRequestHeaders = true, normalizeResponseHeaders = true } = {}) => (wrapped) => (i) => {
     return pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.map(transformInput(normalizeRequestHeaders)), Effect.flatMap(wrapped), Effect.map(transformOutput(normalizeResponseHeaders)), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 };

package/dist/contrib/headersNormalizer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAQ3D,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAE/B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAa,EAAE,uBAAuB,GAAG,IAAI,EAAE,wBAAwB,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CACzF,CACE,OAAqF,EACP,EAAE,CAClF,CAAC,CAA+B,EAAE,EAAE;IAClC,OAAO,IAAI,CACT,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,EACnD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,EACrD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3D,MAAM,GAAG,GAAG,mBAAmB,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,EAAE,uBAAuB,GAAG,IAAI,EAAE,wBAAwB,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAC7E,CACE,OAAwE,EACN,EAAE,CACtE,CAAC,CAAc,EAAE,EAAE;IACjB,OAAO,IAAI,CACT,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,EACnD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,EACrD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}

package/dist/contrib/headersNormalizer/index.test.d.ts

@@ -1,9 +1,2 @@
-import * as Effect from 'effect/Effect';
-import type { Handler } from '../../index.js';
-import { TestDeps } from '../../test/test-common.js';
-export type In = {
-    headers: Record<string, string | undefined>;
-};
-export declare function _testCore<E, D extends TestDeps, I extends In>(i: I): Effect.Effect<D, E, any>;
-export declare const testCore: Handler<any, object, any, any>;
+export {};
 //# sourceMappingURL=index.test.d.ts.map

package/dist/contrib/headersNormalizer/index.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,MAAM,MAAM,EAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,CAAC;AAKjE,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAc7F;AACD,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAa,CAAC"}
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.test.ts"],"names":[],"mappings":""}