@konker.dev/middleware-fp 0.1.9 → 0.1.10

package/dist/contrib/jwtDecoder.js

@@ -2,12 +2,12 @@ import { extractBearerToken } from '@konker.dev/tiny-auth-utils-fp/helpers';
 import { jwtDecodeToken } from '@konker.dev/tiny-auth-utils-fp/jwt';
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
+import { makeRequestW } from '../lib/http.js';
 import { HttpApiError } from '../lib/HttpApiError.js';
 const TAG = 'jwtDecoder';
 // --------------------------------------------------------------------------
 export const middleware = () => (wrapped) => (i) => {
-    return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('authToken', () => extractBearerToken(i.headers.authorization)), Effect.bind('decoded', ({ authToken }) => jwtDecodeToken(authToken)), Effect.map(({ decoded }) => ({
-        ...i,
+    return pipe(Effect.Do, Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.bind('authToken', () => extractBearerToken(i.headers.authorization)), Effect.bind('decoded', ({ authToken }) => jwtDecodeToken(authToken)), Effect.map(({ decoded }) => makeRequestW(i, {
         userId: decoded.sub,
     })), Effect.mapError((e) => HttpApiError('UnauthorizedError', `Invalid JWT credentials: ${e.message}`, 401, TAG, e)), Effect.tapError((_) => Effect.logError(`UnauthorizedError: Invalid JWT credentials: ${i.headers}`)), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 };

package/dist/contrib/jwtDecoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwtDecoder.js","sourceRoot":"","sources":["../../src/contrib/jwtDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,YAAY,CAAC;AAKzB,6EAA6E;AAE7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAyC,EACwB,EAAE,CACrE,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,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3E,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EACpE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,CAAC;QACJ,MAAM,EAAE,OAAO,CAAC,GAAG;KACpB,CAAC,CAAC,EACH,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAC/G,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EACnG,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":"jwtDecoder.js","sourceRoot":"","sources":["../../src/contrib/jwtDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,YAAY,CAAC;AAOzB,6EAA6E;AAE7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAAwD,EACwB,EAAE,CACpF,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,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3E,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EACpE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACzB,YAAY,CAAC,CAAC,EAAE;QACd,MAAM,EAAE,OAAO,CAAC,GAAG;KACpB,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAC/G,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EACnG,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/jwtDecoder.test.js

@@ -3,27 +3,31 @@ import { TEST_TOKEN } from '@konker.dev/tiny-auth-utils-fp/test/fixtures/test-jw
 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 './jwtDecoder.js';
 // https://stackoverflow.com/a/72885576/203284
 // https://github.com/vitest-dev/vitest/issues/6099
 vi.mock('effect/Effect', { spy: true });
 const VALID_JWT_VALUE = `Bearer ${TEST_TOKEN}`;
 const INVALID_JWT_VALUE = 'Bearer Banana';
-const TEST_IN_1 = {
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {
         authorization: VALID_JWT_VALUE,
     },
-    isBase64Encoded: false,
+    headersNormalizerRequestRaw: {
+        Authorization: VALID_JWT_VALUE,
+    },
     body: {},
-};
-const TEST_IN_2 = {
+});
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
     headers: {
         authorization: INVALID_JWT_VALUE,
     },
-    isBase64Encoded: false,
-    body: {},
-};
+    headersNormalizerRequestRaw: {
+        Authorization: INVALID_JWT_VALUE,
+    },
+});
 describe('middleware/jwt-decoder', () => {
     let errorSpy;
     beforeEach(() => {
@@ -35,20 +39,32 @@ describe('middleware/jwt-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_JWT_VALUE,
+                authorization: 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIiLCJzdWIiOiJ0ZXN0LXN1YiIsImlhdCI6MTY3MTU3MzgwOCwiZXhwIjoxNjcxNTc3NDA4LCJpc3MiOiJ0ZXN0LWlzcyJ9.IfZ_IlbKl2S7pkKBqTis0kyBmDuXGbBkCdCkrDdLq_Q',
+            },
+            in: {
+                method: 'GET',
+                body: {},
+                pathParameters: {},
+                queryStringParameters: {},
+                headers: {
+                    authorization: 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIiLCJzdWIiOiJ0ZXN0LXN1YiIsImlhdCI6MTY3MTU3MzgwOCwiZXhwIjoxNjcxNTc3NDA4LCJpc3MiOiJ0ZXN0LWlzcyJ9.IfZ_IlbKl2S7pkKBqTis0kyBmDuXGbBkCdCkrDdLq_Q',
+                },
+                headersNormalizerRequestRaw: {
+                    Authorization: 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIiLCJzdWIiOiJ0ZXN0LXN1YiIsImlhdCI6MTY3MTU3MzgwOCwiZXhwIjoxNjcxNTc3NDA4LCJpc3MiOiJ0ZXN0LWlzcyJ9.IfZ_IlbKl2S7pkKBqTis0kyBmDuXGbBkCdCkrDdLq_Q',
+                },
+                userId: 'test-sub',
             },
-            body: {},
-            isBase64Encoded: false,
-            userId: 'test-sub',
         });
         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), Effect.runPromise);
         await expect(result).rejects.toThrow('Invalid JWT credentials');
         expect(errorSpy).toHaveBeenCalledTimes(1);

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

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

package/dist/contrib/momentoClientInit.d.ts

@@ -1,6 +1,6 @@
 import type { MomentoClientConfigProps } from '@konker.dev/momento-cache-client-effect';
 import { MomentoClientDeps, MomentoClientFactoryDeps } from '@konker.dev/momento-cache-client-effect';
-import type { Handler } from '../index.js';
+import type { Rec, RequestResponseHandler } from '../index.js';
 export type Adapted<R> = Exclude<R, MomentoClientDeps> | MomentoClientFactoryDeps;
-export declare const middleware: (config: MomentoClientConfigProps) => <I, O, E, R>(wrapped: Handler<I, O, E, R | MomentoClientDeps>) => Handler<I, O, E, Adapted<R>>;
+export declare const middleware: (config: MomentoClientConfigProps) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R | MomentoClientDeps>) => RequestResponseHandler<I, O, E, Adapted<R>>;
 //# sourceMappingURL=momentoClientInit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"momentoClientInit.d.ts","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAItG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI3C,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,wBAAwB,CAAC;AAGlF,eAAO,MAAM,UAAU,WACZ,wBAAwB,MAChC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,KAAG,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAexF,CAAC"}
+{"version":3,"file":"momentoClientInit.d.ts","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAItG,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAK/D,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,wBAAwB,CAAC;AAGlF,eAAO,MAAM,UAAU,WACZ,wBAAwB,MAChC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,WACxB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,KAC9D,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAe1C,CAAC"}

package/dist/contrib/momentoClientInit.js.map

@@ -1 +1 @@
-{"version":3,"file":"momentoClientInit.js","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,MAAM,GAAG,GAAG,mBAAmB,CAAC;AAIhC,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,MAAgC,EAAE,EAAE,CACrC,CAAa,OAAgD,EAAgC,EAAE,CAC/F,CAAC,CAAI,EAAE,EAAE,CACP,IAAI,CACF,wBAAwB,EACxB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,IAAI,CACF,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,cAAc,CACnB,iBAAiB,EACjB,iBAAiB,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAC/E,CACF,CACF,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
+{"version":3,"file":"momentoClientInit.js","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,MAAM,GAAG,GAAG,mBAAmB,CAAC;AAIhC,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,MAAgC,EAAE,EAAE,CACrC,CACE,OAA+D,EAClB,EAAE,CACjD,CAAC,CAAc,EAAE,EAAE,CACjB,IAAI,CACF,wBAAwB,EACxB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,IAAI,CACF,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,cAAc,CACnB,iBAAiB,EACjB,iBAAiB,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAC/E,CACF,CACF,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}

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

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

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

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

package/dist/contrib/momentoClientInit.test.js

@@ -3,9 +3,9 @@ import { mockMomentoClientFactoryDeps } from '@konker.dev/momento-cache-client-e
 import { pipe } from 'effect';
 import * as Effect from 'effect/Effect';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { echoCoreInDeps } from '../test/test-common.js';
+import { EMPTY_REQUEST_W } from '../lib/http.js';
+import { echoCoreInDepsW } from '../test/test-common.js';
 import * as unit from './momentoClientInit.js';
-const TEST_IN = { foo: 'foo' };
 describe('middleware/momento-client-init', () => {
     const OLD_ENV = process.env;
     beforeAll(() => {
@@ -15,10 +15,20 @@ describe('middleware/momento-client-init', () => {
         process.env = OLD_ENV;
     });
     it('should work as expected', async () => {
-        const egHandler = pipe(echoCoreInDeps(MomentoClientDeps), (x) => x, unit.middleware({}), (x) => x);
-        const result = await pipe(egHandler(TEST_IN), mockMomentoClientFactoryDeps(), Effect.runPromise);
-        expect(result).toMatchObject(TEST_IN);
-        expect(result).toHaveProperty('makeMomentoClient');
+        const egHandler = pipe(echoCoreInDepsW(MomentoClientDeps), unit.middleware({}));
+        const result = await pipe(egHandler(EMPTY_REQUEST_W), mockMomentoClientFactoryDeps(), Effect.runPromise);
+        expect(result).toMatchObject({
+            body: 'OK',
+            headers: {},
+            in: {
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringParameters: {},
+            },
+            statusCode: 200,
+        });
+        expect(result.deps).toHaveProperty('makeMomentoClient');
         // expect(clientFactoryMock).toHaveBeenCalledTimes(1);
     });
 });

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

@@ -1 +1 @@
-{"version":3,"file":"momentoClientInit.test.js","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAChG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAG/C,MAAM,OAAO,GAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAEnC,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,SAAS,GAAG,IAAI,CACpB,cAAc,CAAC,iBAAiB,CAAC,EACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EACR,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EACnB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACT,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,4BAA4B,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEjG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QACnD,sDAAsD;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"momentoClientInit.test.js","sourceRoot":"","sources":["../../src/contrib/momentoClientInit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAChG,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,4BAA4B,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEzG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;YAC3B,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,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QACxD,sDAAsD;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/pathParametersValidator.d.ts

@@ -1,12 +1,10 @@
 import { Schema } from 'effect';
-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 WithPathParameters = {
-    pathParameters?: unknown;
-};
 export type WithValidatedPathParameters<V> = {
     pathParameters: V;
-    validatorRawPathParameters: unknown;
+    pathParametersValidatorRaw: RequestW['pathParameters'];
 };
-export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I, O, E, R>(wrapped: Handler<I & WithValidatedPathParameters<V0>, O, E, R>) => Handler<I & WithPathParameters, 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 & WithValidatedPathParameters<V0>, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
 //# sourceMappingURL=pathParametersValidator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pathParametersValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.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,kBAAkB,GAAG;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI;IAC3C,cAAc,EAAE,CAAC,CAAC;IAClB,0BAA0B,EAAE,OAAO,CAAC;CACrC,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,WACA,OAAO,CAAC,CAAC,GAAG,2BAA2B,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC7D,OAAO,CAAC,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAezD,CAAC"}
+{"version":3,"file":"pathParametersValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,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,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI;IAC3C,cAAc,EAAE,CAAC,CAAC;IAClB,0BAA0B,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;CACxD,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,2BAA2B,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC5E,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAiBnD,CAAC"}

package/dist/contrib/pathParametersValidator.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 = 'pathParametersValidator';
-export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.pathParameters, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedPathParameters) => ({
-    ...i,
+export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.pathParameters, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedPathParameters) => makeRequestW(i, {
     pathParameters: validatedPathParameters,
-    validatorRawPathParameters: i.pathParameters,
-})), Effect.flatMap(wrapped));
+    pathParametersValidatorRaw: i.pathParameters,
+})), Effect.flatMap(wrapped), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
 //# sourceMappingURL=pathParametersValidator.js.map

package/dist/contrib/pathParametersValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathParametersValidator.js","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.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,yBAAyB,CAAC;AAUtC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAA8D,EACF,EAAE,CAChE,CAAC,CAAyB,EAAE,EAAE,CAC5B,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,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CACpG,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,uBAA2B,EAAE,EAAE,CAAC,CAAC;IAC3C,GAAG,CAAC;IACJ,cAAc,EAAE,uBAAuB;IACvC,0BAA0B,EAAE,CAAC,CAAC,cAAc;CAC7C,CAAC,CAAC,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
+{"version":3,"file":"pathParametersValidator.js","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.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,yBAAyB,CAAC;AAOtC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAA6E,EACvB,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,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CACpG,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,uBAA2B,EAAE,EAAE,CACzC,YAAY,CAAC,CAAC,EAAE;IACd,cAAc,EAAE,uBAAuB;IACvC,0BAA0B,EAAE,CAAC,CAAC,cAAc;CAC7C,CAAC,CACH,EACD,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/pathParametersValidator.test.d.ts

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

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

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

package/dist/contrib/pathParametersValidator.test.js

@@ -1,33 +1,42 @@
 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 './pathParametersValidator.js';
 export const testSchema = Schema.Struct({
     foo: Schema.Literal('foo_value'),
     num: Schema.NumberFromString,
 });
-const TEST_IN_1 = { pathParameters: { foo: 'foo_value', num: '123' } };
-const TEST_IN_2 = { pathParameters: { foo: 'wam', num: '123' } };
-const TEST_IN_3 = {};
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { pathParameters: { foo: 'foo_value', num: '123' } });
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { pathParameters: { foo: 'wam', num: '123' } });
+const TEST_IN_3 = makeRequestW(EMPTY_REQUEST_W, {});
 describe('middleware/path-parameters-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({
-            validatorRawPathParameters: { foo: 'foo_value', num: '123' },
-            pathParameters: { foo: 'foo_value', num: 123 },
+            statusCode: 200,
+            body: 'OK',
+            headers: {},
+            in: {
+                method: 'GET',
+                headers: {},
+                queryStringParameters: {},
+                pathParametersValidatorRaw: { foo: 'foo_value', num: '123' },
+                pathParameters: { foo: 'foo_value', num: 123 },
+            },
         });
     });
     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"');
+        await expect(result).rejects.toThrow('{ readonly foo: "foo_value"; readonly num: NumberFromString }');
     });
     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"; readonly num: NumberFromString }, actual undefined');
+        await expect(result).rejects.toThrow('{ readonly foo: "foo_value"; readonly num: NumberFromString }');
     });
 });
 //# sourceMappingURL=pathParametersValidator.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pathParametersValidator.test.js","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.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,8BAA8B,CAAC;AAIrD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAO,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;AAC3E,MAAM,SAAS,GAAO,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;AACrE,MAAM,SAAS,GAAO,EAAE,CAAC;AAEzB,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,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,0BAA0B,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE;YAC5D,cAAc,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;SAC/C,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,CAClC,0FAA0F,CAC3F,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"pathParametersValidator.test.js","sourceRoot":"","sources":["../../src/contrib/pathParametersValidator.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,8BAA8B,CAAC;AAErD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AACtG,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAChG,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAEpD,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,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,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,qBAAqB,EAAE,EAAE;gBACzB,0BAA0B,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE;gBAC5D,cAAc,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;aAC/C;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,+DAA+D,CAAC,CAAC;IACxG,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,+DAA+D,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/contrib/pathTokenAuthorizer.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 PathTokenAuthorizerDeps = {
     readonly secretTokenEnvName: string;
     readonly pathParamName: string;
 };
 export declare const PathTokenAuthorizerDeps: Context.Tag<PathTokenAuthorizerDeps, PathTokenAuthorizerDeps>;
-export declare const middleware: () => <I extends APIGatewayProxyEventV2, O, E, R>(wrapped: Handler<I, O, E, R>) => Handler<I, O, E | HttpApiError, R | PathTokenAuthorizerDeps>;
+export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E | HttpApiError, R | PathTokenAuthorizerDeps>;
 //# sourceMappingURL=pathTokenAuthorizer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pathTokenAuthorizer.d.ts","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.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,aAAa,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAKtD,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC,CAAC;AACF,eAAO,MAAM,uBAAuB,+DAAyE,CAAC;AAG9G,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,uBAAuB,CAqB7D,CAAC"}
+{"version":3,"file":"pathTokenAuthorizer.d.ts","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.ts"],"names":[],"mappings":"AAAA,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;AAKtD,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC,CAAC;AACF,eAAO,MAAM,uBAAuB,+DAAyE,CAAC;AAG9G,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,uBAAuB,CAqB5E,CAAC"}

package/dist/contrib/pathTokenAuthorizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathTokenAuthorizer.js","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.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,wBAAwB,CAAC;AAEtD,MAAM,GAAG,GAAG,qBAAqB,CAAC;AAOlC,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC,UAAU,CAA0B,yBAAyB,CAAC,CAAC;AAE9G,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA4B,EACkC,EAAE,CAClE,CAAC,CAAI,EAAE,EAAE;IACP,OAAO,IAAI,CACT,uBAAuB,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,EAAE,CACvD,MAAM,CAAC,EAAE,CACP,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAC1G;QACE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,CACZ,IAAI,CACF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC,EACpE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAChE;KACJ,CACF,CACF,EACD,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":"pathTokenAuthorizer.js","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.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,wBAAwB,CAAC;AAEtD,MAAM,GAAG,GAAG,qBAAqB,CAAC;AAOlC,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC,UAAU,CAA0B,yBAAyB,CAAC,CAAC;AAE9G,6EAA6E;AAC7E,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA2C,EACkC,EAAE,CACjF,CAAC,CAAc,EAAE,EAAE;IACjB,OAAO,IAAI,CACT,uBAAuB,EACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAAE,EAAE,CACvD,MAAM,CAAC,EAAE,CACP,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAC1G;QACE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,OAAO,EAAE,GAAG,EAAE,CACZ,IAAI,CACF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC,EACpE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAChE;KACJ,CACF,CACF,EACD,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/pathTokenAuthorizer.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathTokenAuthorizer.test.d.ts","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAC;AAMjD,eAAO,MAAM,6BAA6B,qBAAqB,CAAC;AAChE,eAAO,MAAM,+BAA+B,sBAAsB,CAAC;AACnE,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,eAAO,MAAM,+BAA+B,EAAE,IAAI,CAAC,uBAGjD,CAAC;AAEH,eAAO,MAAM,2BAA2B,0GAGvC,CAAC"}
+{"version":3,"file":"pathTokenAuthorizer.test.d.ts","sourceRoot":"","sources":["../../src/contrib/pathTokenAuthorizer.test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAC;AAMjD,eAAO,MAAM,6BAA6B,qBAAqB,CAAC;AAChE,eAAO,MAAM,+BAA+B,sBAAsB,CAAC;AACnE,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,eAAO,MAAM,+BAA+B,EAAE,IAAI,CAAC,uBAGjD,CAAC;AAEH,eAAO,MAAM,2BAA2B,0GAGvC,CAAC"}

package/dist/contrib/pathTokenAuthorizer.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 { 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 './pathTokenAuthorizer.js';
 // https://stackoverflow.com/a/72885576/203284
 // https://github.com/vitest-dev/vitest/issues/6099
@@ -14,24 +15,16 @@ export const PATH_TOKEN_AUTHORIZER_TEST_DEPS = unit.PathTokenAuthorizerDeps.of({
     pathParamName: 'pathToken',
 });
 export const mockPathTokenAuthorizerDeps = Effect.provideService(unit.PathTokenAuthorizerDeps, PATH_TOKEN_AUTHORIZER_TEST_DEPS);
-const TEST_IN_1 = {
-    headers: {},
-    isBase64Encoded: false,
-    requestContext: {},
-    body: {},
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
     pathParameters: {
         pathToken: CORRECT_TEST_PATH_TOKEN_VALUE,
     },
-};
-const TEST_IN_2 = {
-    headers: {},
-    isBase64Encoded: false,
-    requestContext: {},
-    body: {},
+});
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
     pathParameters: {
         pathToken: INCORRECT_TEST_PATH_TOKEN_VALUE,
     },
-};
+});
 describe('middleware/path-token-authorizer KONK90', () => {
     let errorSpy;
     let oldEnv;
@@ -48,20 +41,25 @@ describe('middleware/path-token-authorizer KONK90', () => {
         process.env = oldEnv;
     });
     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), mockPathTokenAuthorizerDeps, Effect.runPromise);
         expect(result).toStrictEqual({
             statusCode: 200,
-            headers: {
-                QUX: 'qux_value',
+            body: 'OK',
+            headers: {},
+            in: {
+                headers: {},
+                method: 'GET',
+                pathParameters: {
+                    pathToken: 'test-token-value',
+                },
+                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), mockPathTokenAuthorizerDeps, Effect.runPromise);
         await expect(result).rejects.toThrow('Invalid token');
         expect(errorSpy).toHaveBeenCalledTimes(1);

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

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

package/dist/contrib/queryStringValidator.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 WithQueryStringParameters = {
-    queryStringParameters?: unknown;
-};
 export type WithValidatedQueryStringParameters<V> = {
     queryStringParameters: V;
-    validatorRawQueryStringParameters: unknown;
+    queryStringValidatorRaw: unknown;
 };
-export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I, O, E, R>(wrapped: Handler<I & WithValidatedQueryStringParameters<V0>, O, E, R>) => Handler<I & WithQueryStringParameters, 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 & WithValidatedQueryStringParameters<V0>, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
 //# sourceMappingURL=queryStringValidator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"queryStringValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,yBAAyB,GAAG;IACtC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,kCAAkC,CAAC,CAAC,IAAI;IAClD,qBAAqB,EAAE,CAAC,CAAC;IACzB,iCAAiC,EAAE,OAAO,CAAC;CAC5C,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,WACA,OAAO,CAAC,CAAC,GAAG,kCAAkC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACpE,OAAO,CAAC,CAAC,GAAG,yBAAyB,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAehE,CAAC"}
+{"version":3,"file":"queryStringValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,kCAAkC,CAAC,CAAC,IAAI;IAClD,qBAAqB,EAAE,CAAC,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;CAClC,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,kCAAkC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACnF,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAgBnD,CAAC"}

package/dist/contrib/queryStringValidator.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 = 'queryStringValidator';
-export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.queryStringParameters, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedQueryStringParameters) => ({
-    ...i,
+export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.queryStringParameters, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedQueryStringParameters) => makeRequestW(i, {
     queryStringParameters: validatedQueryStringParameters,
-    validatorRawQueryStringParameters: i.queryStringParameters,
+    queryStringValidatorRaw: i.queryStringParameters,
 })), Effect.flatMap(wrapped));
 //# sourceMappingURL=queryStringValidator.js.map

package/dist/contrib/queryStringValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryStringValidator.js","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,sBAAsB,CAAC;AAUnC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAqE,EACF,EAAE,CACvE,CAAC,CAAgC,EAAE,EAAE,CACnC,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,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC3G,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,8BAAkC,EAAE,EAAE,CAAC,CAAC;IAClD,GAAG,CAAC;IACJ,qBAAqB,EAAE,8BAA8B;IACrD,iCAAiC,EAAE,CAAC,CAAC,qBAAqB;CAC3D,CAAC,CAAC,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
+{"version":3,"file":"queryStringValidator.js","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,sBAAsB,CAAC;AAOnC,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAoF,EAC9B,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,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC3G,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,8BAAkC,EAAE,EAAE,CAChD,YAAY,CAAC,CAAC,EAAE;IACd,qBAAqB,EAAE,8BAA8B;IACrD,uBAAuB,EAAE,CAAC,CAAC,qBAAqB;CACjD,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}

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

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

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

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

package/dist/contrib/queryStringValidator.test.js

@@ -1,33 +1,42 @@
 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 './queryStringValidator.js';
 export const testSchema = Schema.Struct({
     foo: Schema.Literal('foo_value'),
     num: Schema.NumberFromString,
 });
-const TEST_IN_1 = { queryStringParameters: { foo: 'foo_value', num: '123' } };
-const TEST_IN_2 = { queryStringParameters: { foo: 'wam', num: '123' } };
-const TEST_IN_3 = {};
+const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, { queryStringParameters: { foo: 'foo_value', num: '123' } });
+const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, { queryStringParameters: { foo: 'wam', num: '123' } });
+const TEST_IN_3 = makeRequestW(EMPTY_REQUEST_W, {});
 describe('middleware/query-string-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({
-            validatorRawQueryStringParameters: { foo: 'foo_value', num: '123' },
-            queryStringParameters: { foo: 'foo_value', num: 123 },
+            statusCode: 200,
+            body: 'OK',
+            headers: {},
+            in: {
+                headers: {},
+                method: 'GET',
+                pathParameters: {},
+                queryStringValidatorRaw: { foo: 'foo_value', num: '123' },
+                queryStringParameters: { foo: 'foo_value', num: 123 },
+            },
         });
     });
     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"');
+        await expect(result).rejects.toThrow('{ readonly foo: "foo_value"; readonly num: NumberFromString }');
     });
     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"; readonly num: NumberFromString }, actual undefined');
+        await expect(result).rejects.toThrow('{ readonly foo: "foo_value"; readonly num: NumberFromString }');
     });
 });
 //# sourceMappingURL=queryStringValidator.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"queryStringValidator.test.js","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,2BAA2B,CAAC;AAIlD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAO,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;AAClF,MAAM,SAAS,GAAO,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;AAC5E,MAAM,SAAS,GAAO,EAAE,CAAC;AAEzB,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,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,iCAAiC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE;YACnE,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;SACtD,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,CAClC,0FAA0F,CAC3F,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"queryStringValidator.test.js","sourceRoot":"","sources":["../../src/contrib/queryStringValidator.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,2BAA2B,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AAC7G,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;AACvG,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAEpD,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,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,IAAI;YACV,OAAO,EAAE,EAAE;YACX,EAAE,EAAE;gBACF,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,uBAAuB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE;gBACzD,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE;aACtD;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,+DAA+D,CAAC,CAAC;IACxG,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,+DAA+D,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}