@konker.dev/middleware-fp 0.1.7 → 0.1.10

package/README.md

@@ -2,7 +2,6 @@
 
 A typesafe middleware system based on [Effect-TS](https://www.effect.website/)
 
-![License](https://img.shields.io/github/license/konkerdotdev/middleware-fp)
+![License](https://img.shields.io/github/license/konker/konker.dev)
 [![NPM Version](https://img.shields.io/npm/v/%40konker.dev%2Fmiddleware-fp)](https://www.npmjs.com/package/@konker.dev/middleware-fp)
-[![CI](https://github.com/konkerdotdev/middleware-fp/actions/workflows/ci.yml/badge.svg)](https://github.com/konkerdotdev/middleware-fp/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/konkerdotdev/middleware-fp/graph/badge.svg?token=W3BFLXCWTH)](https://codecov.io/gh/konkerdotdev/middleware-fp)
+[![codecov](https://codecov.io/gh/konker/konker.dev/graph/badge.svg?token=G0CMXHW679&flag=@konker.dev/middleware-fp)](https://codecov.io/gh/konker/konker.dev?flags[0]=@konker.dev/middleware-fp)

package/dist/contrib/base64BodyDecoder.d.ts

@@ -1,8 +1,5 @@
-import type { Handler } from '../index.js';
+import type { Rec, RequestResponseHandler } from '../index.js';
+import { type RequestW } from '../lib/http.js';
 import type { MiddlewareError } from '../lib/MiddlewareError.js';
-export type WithBase64Body = {
-    body?: string;
-    isBase64Encoded?: boolean;
-};
-export declare const middleware: () => <I, O, E, R>(wrapped: Handler<I, O, E, R>) => Handler<I & WithBase64Body, O, E | MiddlewareError, R>;
+export declare const middleware: <I extends Rec>(isBase64Encoded: (i: RequestW<I>) => boolean) => <O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
 //# sourceMappingURL=base64BodyDecoder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"base64BodyDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE1E,eAAO,MAAM,UAAU,SAEpB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAY9F,CAAC"}
+{"version":3,"file":"base64BodyDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,eAAO,MAAM,UAAU,GACpB,CAAC,SAAS,GAAG,mBAAmB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,MAC3D,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACT,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAanD,CAAC"}

package/dist/contrib/base64BodyDecoder.js

@@ -1,9 +1,10 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
+import { makeRequestW } from '../lib/http.js';
 import { toMiddlewareError } from '../lib/MiddlewareError.js';
 const TAG = 'base64BodyDecoder';
-export const middleware = () => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => Effect.try({
-    try: () => (i.isBase64Encoded ? { ...i, body: Buffer.from(i.body ?? '', 'base64').toString('utf-8') } : i),
+export const middleware = (isBase64Encoded) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => Effect.try({
+    try: () => isBase64Encoded(i) ? makeRequestW(i, { body: Buffer.from(i.body ?? '', 'base64').toString('utf-8') }) : i,
     catch: toMiddlewareError,
 })), Effect.flatMap(wrapped));
 //# sourceMappingURL=base64BodyDecoder.js.map

package/dist/contrib/base64BodyDecoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"base64BodyDecoder.js","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.ts"],"names":[],"mappings":"AAAA,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,mBAAmB,CAAC;AAIhC,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CAAa,OAA4B,EAA0D,EAAE,CACrG,CAAC,CAAqB,EAAE,EAAE,CACxB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1G,KAAK,EAAE,iBAAiB;CACzB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
+{"version":3,"file":"base64BodyDecoder.js","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,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,mBAAmB,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAgB,eAA4C,EAAE,EAAE,CAChE,CACE,OAA2C,EACW,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,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE,CACR,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,KAAK,EAAE,iBAAiB;CACzB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}

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

@@ -1,5 +1,2 @@
-export type In = {
-    body?: string;
-    isBase64Encoded?: boolean;
-};
+export {};
 //# sourceMappingURL=base64BodyDecoder.test.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"base64BodyDecoder.test.d.ts","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.test.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,EAAE,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC"}
+{"version":3,"file":"base64BodyDecoder.test.d.ts","sourceRoot":"","sources":["../../src/contrib/base64BodyDecoder.test.ts"],"names":[],"mappings":""}

package/dist/contrib/base64BodyDecoder.test.js

@@ -1,49 +1,70 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { echoCoreInDeps, TestDeps } 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 './base64BodyDecoder.js';
-const TEST_IN_1 = { body: '{"foo":"ABC"}', isBase64Encoded: false };
-const TEST_IN_2 = { body: 'eyJmb28iOiJBQkMifQ==', isBase64Encoded: true };
-const TEST_IN_3 = { isBase64Encoded: true };
-const TEST_DEPS = { bar: 'bar' };
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { body: '{"foo":"ABC"}' });
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { body: 'eyJmb28iOiJBQkMifQ==' });
+const TEST_IN_3 = makeRequestW(EMPTY_REQUEST_W, {});
 describe('middleware/base64-body-decoder', () => {
     afterEach(() => {
         vi.restoreAllMocks();
     });
     it('should work as expected with un-encoded body', async () => {
-        const egHandler = pipe(echoCoreInDeps(TestDeps), unit.middleware());
-        const result = pipe(egHandler(TEST_IN_1), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(() => false));
+        const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
         await expect(result).resolves.toStrictEqual({
-            bar: 'bar',
+            statusCode: 200,
             body: '{"foo":"ABC"}',
-            isBase64Encoded: false,
+            headers: {},
+            in: {
+                method: 'GET',
+                body: '{"foo":"ABC"}',
+                headers: {},
+                pathParameters: {},
+                queryStringParameters: {},
+            },
         });
     });
     it('should work as expected with encoded body', async () => {
-        const egHandler = pipe(echoCoreInDeps(TestDeps), unit.middleware());
-        const result = pipe(egHandler(TEST_IN_2), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(() => true));
+        const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
         await expect(result).resolves.toStrictEqual({
-            bar: 'bar',
+            statusCode: 200,
             body: '{"foo":"ABC"}',
-            isBase64Encoded: true,
+            headers: {},
+            in: {
+                method: 'GET',
+                body: '{"foo":"ABC"}',
+                headers: {},
+                pathParameters: {},
+                queryStringParameters: {},
+            },
         });
     });
     it('should work as expected with error with missing body', async () => {
-        const egHandler = pipe(echoCoreInDeps(TestDeps), unit.middleware());
-        const result = pipe(egHandler(TEST_IN_3), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(() => true));
+        const result = pipe(egHandler(TEST_IN_3), Effect.runPromise);
         await expect(result).resolves.toStrictEqual({
-            bar: 'bar',
+            statusCode: 200,
             body: '',
-            isBase64Encoded: true,
+            headers: {},
+            in: {
+                body: '',
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringParameters: {},
+            },
         });
     });
     it('should work as expected with error in decoding', async () => {
         vi.spyOn(Buffer, 'from').mockImplementation(() => {
             throw new Error('BOOM!');
         });
-        const egHandler = pipe(echoCoreInDeps(TestDeps), unit.middleware());
-        const result = pipe(egHandler(TEST_IN_2), Effect.provideService(TestDeps, TEST_DEPS), Effect.runPromise);
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(() => true));
+        const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
         await expect(result).rejects.toThrow('BOOM!');
     });
 });

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

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

package/dist/contrib/basicAuthAuthenticator.d.ts

@@ -1,12 +1,14 @@
 import type { ValidBasicAuthCredentialSet } from '@konker.dev/tiny-auth-utils-fp/basic-auth';
-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';
-import type { WithNormalizedInputHeaders, WithUserId } from './headersNormalizer/types.js';
+import type { WithNormalizedInputHeaders } from './headersNormalizer/types.js';
 export type BasicAuthAuthenticatorDeps = {
     readonly validBasicAuthCredentialSet: ValidBasicAuthCredentialSet;
 };
 export declare const BasicAuthAuthenticatorDeps: Context.Tag<BasicAuthAuthenticatorDeps, BasicAuthAuthenticatorDeps>;
-export declare const middleware: () => <I extends APIGatewayProxyEventV2, O, E, R>(wrapped: Handler<I & WithUserId, O, E, R>) => Handler<I & WithNormalizedInputHeaders, O, E | HttpApiError, R | BasicAuthAuthenticatorDeps>;
+export type WithUserId = {
+    readonly userId: string | undefined;
+};
+export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithUserId, O, E, R>) => RequestResponseHandler<I & WithNormalizedInputHeaders, O, E | HttpApiError, R | BasicAuthAuthenticatorDeps>;
 //# sourceMappingURL=basicAuthAuthenticator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"basicAuthAuthenticator.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAG7F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK3F,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;CACnE,CAAC;AACF,eAAO,MAAM,0BAA0B,qEAA+E,CAAC;AAGvH,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,sBAAsB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAC/B,OAAO,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACxC,OAAO,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,0BAA0B,CA0B7F,CAAC"}
+{"version":3,"file":"basicAuthAuthenticator.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAG7F,OAAO,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAK/E,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;CACnE,CAAC;AACF,eAAO,MAAM,0BAA0B,qEAA+E,CAAC;AAEvH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAGF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvD,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,0BAA0B,CA0B5G,CAAC"}

package/dist/contrib/basicAuthAuthenticator.js.map

@@ -1 +1 @@
-{"version":3,"file":"basicAuthAuthenticator.js","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACnH,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAErF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,wBAAwB,CAAC;AAMrC,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC,UAAU,CAA6B,4BAA4B,CAAC,CAAC;AAEvH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAyC,EACqD,EAAE,CAClG,CAAC,CAAiC,EAAE,EAAE;IACpC,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,EACrD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACpF,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAChD,IAAI,CAAC,OAAO,EAAE,0BAA0B,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAC5E,EACD,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAClC,YAAY,CAAC,QAAQ;QACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;YACb,GAAG,CAAC;YACJ,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACxB,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,YAAY,CAAC,mBAAmB,EAAE,mCAAmC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAChG,EACD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAChC,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":"basicAuthAuthenticator.js","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACnH,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,wBAAwB,CAAC;AAMrC,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC,UAAU,CAA6B,4BAA4B,CAAC,CAAC;AAMvH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAwD,EACqD,EAAE,CACjH,CAAC,CAA2C,EAAE,EAAE;IAC9C,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,EACrD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACpF,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAChD,IAAI,CAAC,OAAO,EAAE,0BAA0B,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAC5E,EACD,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAClC,YAAY,CAAC,QAAQ;QACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;YACb,GAAG,CAAC;YACJ,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACxB,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,YAAY,CAAC,mBAAmB,EAAE,mCAAmC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAChG,EACD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAChC,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/basicAuthAuthenticator.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicAuthAuthenticator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,IAAI,MAAM,6BAA6B,CAAC;AAOpD,eAAO,MAAM,kCAAkC,EAAE,IAAI,CAAC,0BAOpD,CAAC;AAEH,eAAO,MAAM,8BAA8B,6GAG1C,CAAC"}
+{"version":3,"file":"basicAuthAuthenticator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthAuthenticator.test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,IAAI,MAAM,6BAA6B,CAAC;AAMpD,eAAO,MAAM,kCAAkC,EAAE,IAAI,CAAC,0BAOpD,CAAC;AAEH,eAAO,MAAM,8BAA8B,6GAG1C,CAAC"}

package/dist/contrib/basicAuthAuthenticator.test.js

@@ -1,7 +1,8 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterEach, beforeEach, describe, expect, it, vi } 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 './basicAuthAuthenticator.js';
 // https://stackoverflow.com/a/72885576/203284
 // https://github.com/vitest-dev/vitest/issues/6099
@@ -19,20 +20,22 @@ export const mockBasicAuthAuthenticatorDeps = Effect.provideService(unit.BasicAu
 const VALID_BASIC_AUTH_VALUE = 'Basic dXNlcjA6c2VjcmV0LTA=';
 // user0:bad-secret
 const INVALID_BASIC_AUTH_VALUE = 'Basic dXNlcjA6YmFkLXNlY3JldA==';
-const TEST_IN_1 = {
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {
         authorization: VALID_BASIC_AUTH_VALUE,
     },
-    isBase64Encoded: false,
-    body: {},
-};
-const TEST_IN_2 = {
+    headersNormalizerRequestRaw: {
+        Authorization: VALID_BASIC_AUTH_VALUE,
+    },
+});
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {
         authorization: INVALID_BASIC_AUTH_VALUE,
     },
-    isBase64Encoded: false,
-    body: {},
-};
+    headersNormalizerRequestRaw: {
+        Authorization: INVALID_BASIC_AUTH_VALUE,
+    },
+});
 describe('middleware/basic-auth-authenticator', () => {
     let errorSpy;
     beforeEach(() => {
@@ -43,20 +46,31 @@ describe('middleware/basic-auth-authenticator', () => {
         vi.restoreAllMocks();
     });
     it('should work as expected in an success case', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = await pipe(egHandler(TEST_IN_1), mockBasicAuthAuthenticatorDeps, Effect.runPromise);
         expect(result).toStrictEqual({
+            statusCode: 200,
+            body: 'OK',
             headers: {
-                authorization: VALID_BASIC_AUTH_VALUE,
+                authorization: 'Basic dXNlcjA6c2VjcmV0LTA=',
+            },
+            in: {
+                headers: {
+                    authorization: 'Basic dXNlcjA6c2VjcmV0LTA=',
+                },
+                method: 'GET',
+                headersNormalizerRequestRaw: {
+                    Authorization: 'Basic dXNlcjA6c2VjcmV0LTA=',
+                },
+                pathParameters: {},
+                queryStringParameters: {},
+                userId: 'user0',
             },
-            body: {},
-            isBase64Encoded: false,
-            userId: 'user0',
         });
         expect(errorSpy).toHaveBeenCalledTimes(0);
     });
     it('should work as expected in an error case', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = pipe(egHandler(TEST_IN_2), mockBasicAuthAuthenticatorDeps, Effect.runPromise);
         await expect(result).rejects.toThrow('Invalid basic auth credentials');
         expect(errorSpy).toHaveBeenCalledTimes(1);

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

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

package/dist/contrib/basicAuthDecoder.d.ts

@@ -1,7 +1,8 @@
-import type { APIGatewayProxyEventV2 } from 'aws-lambda';
-import type { Handler } from '../index.js';
+import type { Rec, RequestResponseHandler } from '../index.js';
 import type { MiddlewareError } from '../lib/MiddlewareError.js';
-import type { WithNormalizedInputHeaders, WithUserId } from './headersNormalizer/types.js';
-export type { WithUserId } from './headersNormalizer/types.js';
-export declare const middleware: () => <I extends APIGatewayProxyEventV2, O, E, R>(wrapped: Handler<I & WithUserId, O, E, R>) => Handler<I & WithNormalizedInputHeaders, O, E | MiddlewareError, R>;
+import type { WithNormalizedInputHeaders } from './headersNormalizer/types.js';
+export type WithUserId = {
+    readonly userId: string | undefined;
+};
+export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithUserId, O, E, R>) => RequestResponseHandler<I & WithNormalizedInputHeaders, O, E | MiddlewareError, R>;
 //# sourceMappingURL=basicAuthDecoder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"basicAuthDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAIzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAK3F,YAAY,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE/D,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,sBAAsB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAC/B,OAAO,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACxC,OAAO,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAenE,CAAC"}
+{"version":3,"file":"basicAuthDecoder.d.ts","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAK/E,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvD,sBAAsB,CAAC,CAAC,GAAG,0BAA0B,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAgBlF,CAAC"}

package/dist/contrib/basicAuthDecoder.js

@@ -2,11 +2,11 @@ import { basicAuthDecodeHeaderValue } from '@konker.dev/tiny-auth-utils-fp/basic
 import { extractBasicAuthHeaderValue } from '@konker.dev/tiny-auth-utils-fp/helpers';
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
+import { makeRequestW } from '../lib/http.js';
 import { toMiddlewareError } from '../lib/MiddlewareError.js';
 const TAG = 'basicAuthDecoder';
 export const middleware = () => (wrapped) => (i) => {
-    return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('authToken', () => extractBasicAuthHeaderValue(i.headers.authorization)), Effect.bind('decoded', ({ authToken }) => basicAuthDecodeHeaderValue(authToken)), Effect.map(({ decoded }) => ({
-        ...i,
+    return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('authToken', () => extractBasicAuthHeaderValue(i.headers.authorization)), Effect.bind('decoded', ({ authToken }) => basicAuthDecodeHeaderValue(authToken)), Effect.map(({ decoded }) => makeRequestW(i, {
         userId: decoded.username,
     })), Effect.mapError(toMiddlewareError), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 };

package/dist/contrib/basicAuthDecoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"basicAuthDecoder.js","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAErF,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAK/B,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAyC,EAC2B,EAAE,CACxE,CAAC,CAAiC,EAAE,EAAE;IACpC,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACpF,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,CAAC;QACJ,MAAM,EAAE,OAAO,CAAC,QAAQ;KACzB,CAAC,CAAC,EACH,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,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":"basicAuthDecoder.js","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAO/B,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAwD,EAC2B,EAAE,CACvF,CAAC,CAA2C,EAAE,EAAE;IAC9C,OAAO,IAAI,CACT,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACpF,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC,EAChF,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACzB,YAAY,CAAC,CAAC,EAAE;QACd,MAAM,EAAE,OAAO,CAAC,QAAQ;KACzB,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClC,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/basicAuthDecoder.test.js

@@ -1,25 +1,28 @@
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterEach, beforeEach, describe, expect, it, vi } 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 './basicAuthDecoder.js';
 // https://stackoverflow.com/a/72885576/203284
 // https://github.com/vitest-dev/vitest/issues/6099
 vi.mock('effect/Effect', { spy: true });
 // user0:secret-0
 const VALID_BASIC_AUTH_VALUE = 'Basic dXNlcjA6c2VjcmV0LTA=';
-const TEST_IN_1 = {
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {
         authorization: VALID_BASIC_AUTH_VALUE,
     },
-    isBase64Encoded: false,
+    headersNormalizerRequestRaw: {
+        Authorization: VALID_BASIC_AUTH_VALUE,
+    },
     body: {},
-};
-const TEST_IN_2 = {
+});
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {},
-    isBase64Encoded: false,
+    headersNormalizerRequestRaw: {},
     body: {},
-};
+});
 describe('middleware/basic-auth-decoder', () => {
     beforeEach(() => {
         vi.spyOn(Effect, 'logDebug').mockReturnValue(Effect.succeed(undefined));
@@ -28,19 +31,31 @@ describe('middleware/basic-auth-decoder', () => {
         vi.restoreAllMocks();
     });
     it('should work as expected in an success case', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = await pipe(egHandler(TEST_IN_1), Effect.runPromise);
         expect(result).toStrictEqual({
+            statusCode: 200,
+            body: {},
             headers: {
                 authorization: VALID_BASIC_AUTH_VALUE,
             },
-            body: {},
-            isBase64Encoded: false,
-            userId: 'user0',
+            in: {
+                method: 'GET',
+                body: {},
+                headers: {
+                    authorization: VALID_BASIC_AUTH_VALUE,
+                },
+                headersNormalizerRequestRaw: {
+                    Authorization: VALID_BASIC_AUTH_VALUE,
+                },
+                pathParameters: {},
+                queryStringParameters: {},
+                userId: 'user0',
+            },
         });
     });
     it('should work as expected in an error case', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware());
+        const egHandler = pipe(echoCoreIn200W, unit.middleware());
         const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
         await expect(result).rejects.toThrow('No token found');
     });

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

@@ -1 +1 @@
-{"version":3,"file":"basicAuthDecoder.test.js","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.test.ts"],"names":[],"mappings":"AACA,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,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,8CAA8C;AAC9C,mDAAmD;AACnD,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAExC,iBAAiB;AACjB,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAE5D,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE;QACP,aAAa,EAAE,sBAAsB;KACtC;IACD,eAAe,EAAE,KAAK;IACtB,IAAI,EAAE,EAAE;CACyD,CAAC;AAEpE,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,EAAE;IACX,eAAe,EAAE,KAAK;IACtB,IAAI,EAAE,EAAE;CACyD,CAAC;AAEpE,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,UAAU,CAAC,GAAG,EAAE;QACd,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,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEnE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAC3B,OAAO,EAAE;gBACP,aAAa,EAAE,sBAAsB;aACtC;YACD,IAAI,EAAE,EAAE;YACR,eAAe,EAAE,KAAK;YACtB,MAAM,EAAE,OAAO;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAE7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"basicAuthDecoder.test.js","sourceRoot":"","sources":["../../src/contrib/basicAuthDecoder.test.ts"],"names":[],"mappings":"AAAA,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,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,8CAA8C;AAC9C,mDAAmD;AACnD,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAExC,iBAAiB;AACjB,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAE5D,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE;QACP,aAAa,EAAE,sBAAsB;KACtC;IACD,2BAA2B,EAAE;QAC3B,aAAa,EAAE,sBAAsB;KACtC;IACD,IAAI,EAAE,EAAE;CACT,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE,EAAE;IACX,2BAA2B,EAAE,EAAE;IAC/B,IAAI,EAAE,EAAE;CACT,CAAC,CAAC;AAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,UAAU,CAAC,GAAG,EAAE;QACd,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,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEnE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAC3B,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;YACR,OAAO,EAAE;gBACP,aAAa,EAAE,sBAAsB;aACtC;YACD,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE;oBACP,aAAa,EAAE,sBAAsB;iBACtC;gBACD,2BAA2B,EAAE;oBAC3B,aAAa,EAAE,sBAAsB;iBACtC;gBACD,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,MAAM,EAAE,OAAO;aAChB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAE7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/bodyValidator.d.ts

@@ -1,12 +1,9 @@
 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 WithBody = {
-    body?: unknown;
-};
 export type WithValidatedBody<V> = {
-    body: V;
-    validatorRawBody: unknown;
+    readonly body: V;
+    readonly bodyValidatorRaw: unknown;
 };
-export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I, O, E, R>(wrapped: Handler<I & WithValidatedBody<V0>, O, E, R>) => Handler<I & WithBody, 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 & WithValidatedBody<V0>, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
 //# sourceMappingURL=bodyValidator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bodyValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/bodyValidator.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,QAAQ,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAC1C,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IAAE,IAAI,EAAE,CAAC,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAAC;AAE1E,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,UAAU,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WACA,OAAO,CAAC,CAAC,GAAG,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACnD,OAAO,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAa/C,CAAC"}
+{"version":3,"file":"bodyValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/bodyValidator.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,iBAAiB,CAAC,CAAC,IAAI;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC,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,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAClE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAcnD,CAAC"}

package/dist/contrib/bodyValidator.js

@@ -1,10 +1,10 @@
 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 = 'bodyValidator';
-export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.body, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedBody) => ({
-    ...i,
+export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.body, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedBody) => makeRequestW(i, {
     body: validatedBody,
-    validatorRawBody: i.body,
+    bodyValidatorRaw: i.body,
 })), Effect.flatMap(wrapped));
 //# sourceMappingURL=bodyValidator.js.map

package/dist/contrib/bodyValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"bodyValidator.js","sourceRoot":"","sources":["../../src/contrib/bodyValidator.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,eAAe,CAAC;AAK5B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAoD,EACF,EAAE,CACtD,CAAC,CAAe,EAAE,EAAE,CAClB,IAAI,CACF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAChH,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,aAAiB,EAAE,EAAE,CAAC,CAAC;IACjC,GAAG,CAAC;IACJ,IAAI,EAAE,aAAa;IACnB,gBAAgB,EAAE,CAAC,CAAC,IAAI;CACzB,CAAC,CAAC,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
+{"version":3,"file":"bodyValidator.js","sourceRoot":"","sources":["../../src/contrib/bodyValidator.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,eAAe,CAAC;AAO5B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAmE,EACb,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,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAChH,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,aAAiB,EAAE,EAAE,CAC/B,YAAY,CAAC,CAAC,EAAE;IACd,IAAI,EAAE,aAAa;IACnB,gBAAgB,EAAE,CAAC,CAAC,IAAI;CACzB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}

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

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

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

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

package/dist/contrib/bodyValidator.test.js

@@ -1,30 +1,44 @@
 import { pipe, Schema } from 'effect';
 import * as Effect from 'effect/Effect';
 import { 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 './bodyValidator.js';
 export const testSchema = Schema.Struct({
     foo: Schema.Literal('foo_value'),
 });
-const TEST_IN_1 = { body: { foo: 'foo_value' } };
-const TEST_IN_2 = { body: { foo: 'wam' } };
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { body: { foo: 'foo_value' } });
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { body: { foo: 'wam' } });
 const TEST_IN_3 = {};
 describe('middleware/body-validator', () => {
     it('should work as expected with valid data', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware(testSchema));
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
         const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
         await expect(result).resolves.toStrictEqual({
-            validatorRawBody: { foo: 'foo_value' },
+            statusCode: 200,
             body: { foo: 'foo_value' },
+            headers: {},
+            in: {
+                body: {
+                    foo: 'foo_value',
+                },
+                bodyValidatorRaw: {
+                    foo: 'foo_value',
+                },
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringParameters: {},
+            },
         });
     });
     it('should work as expected with invalid data', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware(testSchema));
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
         const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
         await expect(result).rejects.toThrow('Expected "foo_value", actual "wam"');
     });
     it('should work as expected with invalid data', async () => {
-        const egHandler = pipe(echoCoreIn, unit.middleware(testSchema));
+        const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
         const result = pipe(egHandler(TEST_IN_3), Effect.runPromise);
         await expect(result).rejects.toThrow('Expected { readonly foo: "foo_value" }, actual undefined');
     });

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

@@ -1 +1 @@
-{"version":3,"file":"bodyValidator.test.js","sourceRoot":"","sources":["../../src/contrib/bodyValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAI3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC;AACrD,MAAM,SAAS,GAAO,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;AAC/C,MAAM,SAAS,GAAQ,EAAE,CAAC;AAE1B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,gBAAgB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE;YACtC,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,0DAA0D,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"bodyValidator.test.js","sourceRoot":"","sources":["../../src/contrib/bodyValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAE3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAC1E,MAAM,SAAS,GAAQ,EAAE,CAAC;AAE1B,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YAC1C,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE;YAC1B,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,IAAI,EAAE;oBACJ,GAAG,EAAE,WAAW;iBACjB;gBACD,gBAAgB,EAAE;oBAChB,GAAG,EAAE,WAAW;iBACjB;gBACD,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;aAC1B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,0DAA0D,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/cacheInMemory.d.ts

@@ -1,5 +1,5 @@
 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 { MiddlewareError } from '../lib/MiddlewareError.js';
-export declare const middleware: <I, CR>(cacheKeyResolver: CacheKeyResolver<I, CR>) => <O, E, R>(wrapped: Handler<I, O, E, R>) => Handler<I, O, E | MiddlewareError, R | CR>;
+export declare const middleware: <I extends Rec, CR>(cacheKeyResolver: CacheKeyResolver<I, CR>) => <O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R | CR>;
 //# sourceMappingURL=cacheInMemory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cacheInMemory.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAMvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,eAAO,MAAM,UAAU,GACpB,CAAC,EAAE,EAAE,oBAAoB,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,MAChD,CAAC,EAAE,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,CAgCjF,CAAC"}
+{"version":3,"file":"cacheInMemory.d.ts","sourceRoot":"","sources":["../../src/contrib/cacheInMemory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAMvF,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAKjE,eAAO,MAAM,UAAU,GACpB,CAAC,SAAS,GAAG,EAAE,EAAE,oBAAoB,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,MAC5D,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACT,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,GAAG,EAAE,CAiC1D,CAAC"}