@konker.dev/middleware-fp 0.1.9 → 0.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/contrib/base64BodyDecoder.d.ts +3 -6
- package/dist/contrib/base64BodyDecoder.d.ts.map +1 -1
- package/dist/contrib/base64BodyDecoder.js +3 -2
- package/dist/contrib/base64BodyDecoder.js.map +1 -1
- package/dist/contrib/base64BodyDecoder.test.d.ts +1 -4
- package/dist/contrib/base64BodyDecoder.test.d.ts.map +1 -1
- package/dist/contrib/base64BodyDecoder.test.js +40 -19
- package/dist/contrib/base64BodyDecoder.test.js.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.d.ts +6 -4
- package/dist/contrib/basicAuthAuthenticator.d.ts.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.js.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.test.d.ts.map +1 -1
- package/dist/contrib/basicAuthAuthenticator.test.js +29 -15
- package/dist/contrib/basicAuthAuthenticator.test.js.map +1 -1
- package/dist/contrib/basicAuthDecoder.d.ts +6 -5
- package/dist/contrib/basicAuthDecoder.d.ts.map +1 -1
- package/dist/contrib/basicAuthDecoder.js +2 -2
- package/dist/contrib/basicAuthDecoder.js.map +1 -1
- package/dist/contrib/basicAuthDecoder.test.js +27 -12
- package/dist/contrib/basicAuthDecoder.test.js.map +1 -1
- package/dist/contrib/bodyValidator.d.ts +4 -7
- package/dist/contrib/bodyValidator.d.ts.map +1 -1
- package/dist/contrib/bodyValidator.js +3 -3
- package/dist/contrib/bodyValidator.js.map +1 -1
- package/dist/contrib/bodyValidator.test.d.ts +0 -3
- package/dist/contrib/bodyValidator.test.d.ts.map +1 -1
- package/dist/contrib/bodyValidator.test.js +21 -7
- package/dist/contrib/bodyValidator.test.js.map +1 -1
- package/dist/contrib/cacheInMemory.d.ts +2 -2
- package/dist/contrib/cacheInMemory.d.ts.map +1 -1
- package/dist/contrib/cacheInMemory.js.map +1 -1
- package/dist/contrib/cacheInMemory.test.d.ts +1 -3
- package/dist/contrib/cacheInMemory.test.d.ts.map +1 -1
- package/dist/contrib/cacheInMemory.test.js +20 -7
- package/dist/contrib/cacheInMemory.test.js.map +1 -1
- package/dist/contrib/cacheMomento.d.ts +4 -3
- package/dist/contrib/cacheMomento.d.ts.map +1 -1
- package/dist/contrib/cacheMomento.js +5 -2
- package/dist/contrib/cacheMomento.js.map +1 -1
- package/dist/contrib/cacheMomento.test.d.ts +1 -3
- package/dist/contrib/cacheMomento.test.d.ts.map +1 -1
- package/dist/contrib/cacheMomento.test.js +30 -18
- package/dist/contrib/cacheMomento.test.js.map +1 -1
- package/dist/contrib/envValidator.d.ts +2 -2
- package/dist/contrib/envValidator.d.ts.map +1 -1
- package/dist/contrib/envValidator.js +3 -13
- package/dist/contrib/envValidator.js.map +1 -1
- package/dist/contrib/envValidator.test.d.ts +0 -3
- package/dist/contrib/envValidator.test.d.ts.map +1 -1
- package/dist/contrib/envValidator.test.js +20 -6
- package/dist/contrib/envValidator.test.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.d.ts +2 -3
- package/dist/contrib/headerSignatureAuthorizer/index.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.test.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/index.test.js +21 -14
- package/dist/contrib/headerSignatureAuthorizer/index.test.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.d.ts +2 -2
- package/dist/contrib/headerSignatureAuthorizer/lib.d.ts.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.js +3 -0
- package/dist/contrib/headerSignatureAuthorizer/lib.js.map +1 -1
- package/dist/contrib/headerSignatureAuthorizer/lib.test.js +4 -0
- package/dist/contrib/headerSignatureAuthorizer/lib.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/index.d.ts +4 -4
- package/dist/contrib/headersNormalizer/index.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/index.js +1 -1
- package/dist/contrib/headersNormalizer/index.js.map +1 -1
- package/dist/contrib/headersNormalizer/index.test.d.ts +1 -8
- package/dist/contrib/headersNormalizer/index.test.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/index.test.js +38 -35
- package/dist/contrib/headersNormalizer/index.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/lib.d.ts +5 -4
- package/dist/contrib/headersNormalizer/lib.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/lib.js +8 -11
- package/dist/contrib/headersNormalizer/lib.js.map +1 -1
- package/dist/contrib/headersNormalizer/lib.test.d.ts +1 -3
- package/dist/contrib/headersNormalizer/lib.test.d.ts.map +1 -1
- package/dist/contrib/headersNormalizer/lib.test.js +6 -15
- package/dist/contrib/headersNormalizer/lib.test.js.map +1 -1
- package/dist/contrib/headersNormalizer/types.d.ts +4 -13
- package/dist/contrib/headersNormalizer/types.d.ts.map +1 -1
- package/dist/contrib/headersValidator.d.ts +4 -5
- package/dist/contrib/headersValidator.d.ts.map +1 -1
- package/dist/contrib/headersValidator.js +3 -3
- package/dist/contrib/headersValidator.js.map +1 -1
- package/dist/contrib/headersValidator.test.d.ts +0 -3
- package/dist/contrib/headersValidator.test.d.ts.map +1 -1
- package/dist/contrib/headersValidator.test.js +33 -8
- package/dist/contrib/headersValidator.test.js.map +1 -1
- package/dist/contrib/helmetJsHeaders.d.ts +2 -6
- package/dist/contrib/helmetJsHeaders.d.ts.map +1 -1
- package/dist/contrib/helmetJsHeaders.js +2 -12
- package/dist/contrib/helmetJsHeaders.js.map +1 -1
- package/dist/contrib/helmetJsHeaders.test.d.ts +1 -3
- package/dist/contrib/helmetJsHeaders.test.d.ts.map +1 -1
- package/dist/contrib/helmetJsHeaders.test.js +4 -4
- package/dist/contrib/helmetJsHeaders.test.js.map +1 -1
- package/dist/contrib/identity.d.ts +2 -2
- package/dist/contrib/identity.d.ts.map +1 -1
- package/dist/contrib/identity.js.map +1 -1
- package/dist/contrib/identity.test.d.ts +1 -3
- package/dist/contrib/identity.test.d.ts.map +1 -1
- package/dist/contrib/identity.test.js +16 -6
- package/dist/contrib/identity.test.js.map +1 -1
- package/dist/contrib/index.d.ts +1 -4
- package/dist/contrib/index.d.ts.map +1 -1
- package/dist/contrib/index.js +1 -4
- package/dist/contrib/index.js.map +1 -1
- package/dist/contrib/jsonBodyParser.d.ts +4 -7
- package/dist/contrib/jsonBodyParser.d.ts.map +1 -1
- package/dist/contrib/jsonBodyParser.js +3 -3
- package/dist/contrib/jsonBodyParser.js.map +1 -1
- package/dist/contrib/jsonBodyParser.test.d.ts +1 -3
- package/dist/contrib/jsonBodyParser.test.d.ts.map +1 -1
- package/dist/contrib/jsonBodyParser.test.js +31 -15
- package/dist/contrib/jsonBodyParser.test.js.map +1 -1
- package/dist/contrib/jwtAuthenticator.d.ts +6 -5
- package/dist/contrib/jwtAuthenticator.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticator.js +3 -3
- package/dist/contrib/jwtAuthenticator.js.map +1 -1
- package/dist/contrib/jwtAuthenticator.test.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticator.test.js +33 -19
- package/dist/contrib/jwtAuthenticator.test.js.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.d.ts +6 -5
- package/dist/contrib/jwtAuthenticatorRsa.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.js +3 -3
- package/dist/contrib/jwtAuthenticatorRsa.js.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.test.d.ts.map +1 -1
- package/dist/contrib/jwtAuthenticatorRsa.test.js +28 -14
- package/dist/contrib/jwtAuthenticatorRsa.test.js.map +1 -1
- package/dist/contrib/jwtDecoder.d.ts +6 -5
- package/dist/contrib/jwtDecoder.d.ts.map +1 -1
- package/dist/contrib/jwtDecoder.js +2 -2
- package/dist/contrib/jwtDecoder.js.map +1 -1
- package/dist/contrib/jwtDecoder.test.js +30 -14
- package/dist/contrib/jwtDecoder.test.js.map +1 -1
- package/dist/contrib/momentoClientInit.d.ts +2 -2
- package/dist/contrib/momentoClientInit.d.ts.map +1 -1
- package/dist/contrib/momentoClientInit.js.map +1 -1
- package/dist/contrib/momentoClientInit.test.d.ts +1 -3
- package/dist/contrib/momentoClientInit.test.d.ts.map +1 -1
- package/dist/contrib/momentoClientInit.test.js +16 -6
- package/dist/contrib/momentoClientInit.test.js.map +1 -1
- package/dist/contrib/pathParametersValidator.d.ts +4 -6
- package/dist/contrib/pathParametersValidator.d.ts.map +1 -1
- package/dist/contrib/pathParametersValidator.js +4 -4
- package/dist/contrib/pathParametersValidator.js.map +1 -1
- package/dist/contrib/pathParametersValidator.test.d.ts +0 -3
- package/dist/contrib/pathParametersValidator.test.d.ts.map +1 -1
- package/dist/contrib/pathParametersValidator.test.js +20 -11
- package/dist/contrib/pathParametersValidator.test.js.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.d.ts +2 -3
- package/dist/contrib/pathTokenAuthorizer.d.ts.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.js.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.test.d.ts.map +1 -1
- package/dist/contrib/pathTokenAuthorizer.test.js +17 -19
- package/dist/contrib/pathTokenAuthorizer.test.js.map +1 -1
- package/dist/contrib/queryStringValidator.d.ts +3 -6
- package/dist/contrib/queryStringValidator.d.ts.map +1 -1
- package/dist/contrib/queryStringValidator.js +3 -3
- package/dist/contrib/queryStringValidator.js.map +1 -1
- package/dist/contrib/queryStringValidator.test.d.ts +0 -3
- package/dist/contrib/queryStringValidator.test.d.ts.map +1 -1
- package/dist/contrib/queryStringValidator.test.js +20 -11
- package/dist/contrib/queryStringValidator.test.js.map +1 -1
- package/dist/contrib/requestResponseLogger.d.ts +2 -2
- package/dist/contrib/requestResponseLogger.d.ts.map +1 -1
- package/dist/contrib/requestResponseLogger.js.map +1 -1
- package/dist/contrib/requestResponseLogger.test.js +7 -10
- package/dist/contrib/requestResponseLogger.test.js.map +1 -1
- package/dist/contrib/responseProcessor.d.ts +4 -0
- package/dist/contrib/responseProcessor.d.ts.map +1 -0
- package/dist/contrib/{awsSimpleAuthorizerProcessor.js → responseProcessor.js} +5 -8
- package/dist/contrib/responseProcessor.js.map +1 -0
- package/dist/contrib/responseProcessor.test.d.ts +5 -0
- package/dist/contrib/responseProcessor.test.d.ts.map +1 -0
- package/dist/contrib/{awsApiGatewayProcessor.test.js → responseProcessor.test.js} +14 -23
- package/dist/contrib/responseProcessor.test.js.map +1 -0
- package/dist/contrib/trivial.d.ts +3 -3
- package/dist/contrib/trivial.d.ts.map +1 -1
- package/dist/contrib/trivial.js +5 -4
- package/dist/contrib/trivial.js.map +1 -1
- package/dist/contrib/trivial.test.d.ts +1 -3
- package/dist/contrib/trivial.test.d.ts.map +1 -1
- package/dist/contrib/trivial.test.js +17 -6
- package/dist/contrib/trivial.test.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/lib/HttpApiError.d.ts +3 -0
- package/dist/lib/HttpApiError.d.ts.map +1 -1
- package/dist/lib/HttpApiError.js +15 -0
- package/dist/lib/HttpApiError.js.map +1 -1
- package/dist/lib/HttpApiError.test.js +1 -1
- package/dist/lib/HttpApiError.test.js.map +1 -1
- package/dist/lib/http.d.ts +19 -45
- package/dist/lib/http.d.ts.map +1 -1
- package/dist/lib/http.js +38 -40
- package/dist/lib/http.js.map +1 -1
- package/dist/lib/http.test.js +108 -43
- package/dist/lib/http.test.js.map +1 -1
- package/dist/test/test-common.d.ts +10 -6
- package/dist/test/test-common.d.ts.map +1 -1
- package/dist/test/test-common.js +18 -17
- package/dist/test/test-common.js.map +1 -1
- package/dist/test/unit/auth-1.test.js +7 -4
- package/dist/test/unit/auth-1.test.js.map +1 -1
- package/dist/test/unit/basic-1.test.js +7 -5
- package/dist/test/unit/basic-1.test.js.map +1 -1
- package/dist/test/unit/basic-2.test.d.ts.map +1 -1
- package/dist/test/unit/basic-2.test.js +7 -5
- package/dist/test/unit/basic-2.test.js.map +1 -1
- package/dist/test/unit/basic-3.test.js +7 -5
- package/dist/test/unit/basic-3.test.js.map +1 -1
- package/dist/test/unit/kitchen-sink.test.d.ts.map +1 -1
- package/dist/test/unit/kitchen-sink.test.js +62 -16
- package/dist/test/unit/kitchen-sink.test.js.map +1 -1
- package/package.json +28 -48
- package/dist/contrib/awsApiGatewayProcessor.d.ts +0 -5
- package/dist/contrib/awsApiGatewayProcessor.d.ts.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.js +0 -27
- package/dist/contrib/awsApiGatewayProcessor.js.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.test.d.ts +0 -6
- package/dist/contrib/awsApiGatewayProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsApiGatewayProcessor.test.js.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.d.ts +0 -6
- package/dist/contrib/awsIamAuthorizerProcessor.d.ts.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.js +0 -13
- package/dist/contrib/awsIamAuthorizerProcessor.js.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.test.d.ts +0 -6
- package/dist/contrib/awsIamAuthorizerProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsIamAuthorizerProcessor.test.js +0 -96
- package/dist/contrib/awsIamAuthorizerProcessor.test.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.d.ts +0 -5
- package/dist/contrib/awsSimpleAuthorizerProcessor.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.d.ts +0 -7
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.js +0 -56
- package/dist/contrib/awsSimpleAuthorizerProcessor.test.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.d.ts +0 -6
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.js +0 -16
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.js.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.d.ts +0 -13
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.d.ts.map +0 -1
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.js +0 -65
- package/dist/contrib/awsSimpleAuthorizerWithContextProcessor.test.js.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.d.ts +0 -7
- package/dist/contrib/dynamodbDocClientInit/index.d.ts.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.js +0 -7
- package/dist/contrib/dynamodbDocClientInit/index.js.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.test.d.ts +0 -4
- package/dist/contrib/dynamodbDocClientInit/index.test.d.ts.map +0 -1
- package/dist/contrib/dynamodbDocClientInit/index.test.js +0 -29
- package/dist/contrib/dynamodbDocClientInit/index.test.js.map +0 -1
- package/dist/test/unit/auth-2.test.d.ts +0 -2
- package/dist/test/unit/auth-2.test.d.ts.map +0 -1
- package/dist/test/unit/auth-2.test.js +0 -50
- package/dist/test/unit/auth-2.test.js.map +0 -1
|
@@ -1,56 +1,59 @@
|
|
|
1
1
|
import { pipe } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY_REQUEST_W, makeRequestW } from '../../lib/http.js';
|
|
5
|
+
import { echoCoreIn200W } from '../../test/test-common.js';
|
|
5
6
|
import * as unit from './index.js';
|
|
6
|
-
const TEST_IN =
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
return pipe(TestDeps, Effect.flatMap((deps) => Effect.succeed({
|
|
10
|
-
...i,
|
|
11
|
-
...deps,
|
|
12
|
-
headers: {
|
|
13
|
-
...i.headers,
|
|
14
|
-
QUX: 'qux_value',
|
|
15
|
-
},
|
|
16
|
-
})));
|
|
17
|
-
}
|
|
18
|
-
export const testCore = _testCore;
|
|
7
|
+
const TEST_IN = makeRequestW(EMPTY_REQUEST_W, {
|
|
8
|
+
headers: { FOO: 'foo_value' },
|
|
9
|
+
});
|
|
19
10
|
describe('middleware/headers-normalizer', () => {
|
|
20
11
|
it('should work as expected with default params', async () => {
|
|
21
|
-
const egHandler = pipe(
|
|
22
|
-
const result = pipe(egHandler(TEST_IN), Effect.
|
|
12
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
13
|
+
const result = pipe(egHandler(TEST_IN), Effect.runPromise);
|
|
23
14
|
await expect(result).resolves.toStrictEqual({
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
15
|
+
statusCode: 200,
|
|
16
|
+
body: 'OK',
|
|
17
|
+
headers: { Foo: 'foo_value' },
|
|
18
|
+
in: {
|
|
19
|
+
method: 'GET',
|
|
20
|
+
headers: { foo: 'foo_value' },
|
|
21
|
+
headersNormalizerRequestRaw: { FOO: 'foo_value' },
|
|
22
|
+
pathParameters: {},
|
|
23
|
+
queryStringParameters: {},
|
|
28
24
|
},
|
|
29
|
-
normalizerRawInputHeaders: { FOO: 'foo_value' },
|
|
30
25
|
});
|
|
31
26
|
});
|
|
32
27
|
it('should work as expected with un-normalized request param', async () => {
|
|
33
|
-
const egHandler = pipe(
|
|
34
|
-
const result = pipe(egHandler(TEST_IN), Effect.
|
|
28
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware({ normalizeRequestHeaders: false }));
|
|
29
|
+
const result = pipe(egHandler(TEST_IN), Effect.runPromise);
|
|
35
30
|
await expect(result).resolves.toStrictEqual({
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
statusCode: 200,
|
|
32
|
+
body: 'OK',
|
|
33
|
+
headers: { Foo: 'foo_value' },
|
|
34
|
+
in: {
|
|
35
|
+
headers: { FOO: 'foo_value' },
|
|
36
|
+
headersNormalizerRequestRaw: { FOO: 'foo_value' },
|
|
37
|
+
method: 'GET',
|
|
38
|
+
pathParameters: {},
|
|
39
|
+
queryStringParameters: {},
|
|
40
40
|
},
|
|
41
|
-
normalizerRawInputHeaders: { FOO: 'foo_value' },
|
|
42
41
|
});
|
|
43
42
|
});
|
|
44
43
|
it('should work as expected with un-normalized response params', async () => {
|
|
45
|
-
const egHandler = pipe(
|
|
46
|
-
const result = pipe(egHandler(TEST_IN), Effect.
|
|
44
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware({ normalizeResponseHeaders: false }));
|
|
45
|
+
const result = pipe(egHandler(TEST_IN), Effect.runPromise);
|
|
47
46
|
await expect(result).resolves.toStrictEqual({
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
47
|
+
statusCode: 200,
|
|
48
|
+
body: 'OK',
|
|
49
|
+
headers: { foo: 'foo_value' },
|
|
50
|
+
in: {
|
|
51
|
+
headers: { foo: 'foo_value' },
|
|
52
|
+
headersNormalizerRequestRaw: { FOO: 'foo_value' },
|
|
53
|
+
method: 'GET',
|
|
54
|
+
pathParameters: {},
|
|
55
|
+
queryStringParameters: {},
|
|
52
56
|
},
|
|
53
|
-
normalizerRawInputHeaders: { FOO: 'foo_value' },
|
|
54
57
|
});
|
|
55
58
|
});
|
|
56
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
1
|
+
import type { Rec } from '../../index.js';
|
|
2
|
+
import { type RequestW, type ResponseW } from '../../lib/http.js';
|
|
3
|
+
import type { WithNormalizedInputHeaders, WithNormalizedOutputHeaders } from './types.js';
|
|
3
4
|
export declare function fromExceptionList(s: string): string | undefined;
|
|
4
5
|
export declare function lowerCaseNormalizer(s: string): string;
|
|
5
6
|
export declare function canonicalNormalizer(s: string): string;
|
|
6
7
|
export declare function normalizeKeys(rec: Record<string, string | number | boolean | undefined> | undefined, normalizer: (s: string) => string): Record<string, string>;
|
|
7
|
-
export declare const transformInput: <I extends
|
|
8
|
-
export declare const transformOutput: (normalizeResponseHeaders: boolean) =>
|
|
8
|
+
export declare const transformInput: <I extends Rec>(normalizeRequestHeaders: boolean) => (i: RequestW<I>) => RequestW<I & WithNormalizedInputHeaders>;
|
|
9
|
+
export declare const transformOutput: <O extends Rec>(normalizeResponseHeaders: boolean) => (o: ResponseW<O>) => ResponseW<O & WithNormalizedOutputHeaders>;
|
|
9
10
|
//# sourceMappingURL=lib.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAA+B,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,KAAK,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAmC1F,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG/D;AAGD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CASrD;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAAG,SAAS,EACtE,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAChC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUxB;AAGD,eAAO,MAAM,cAAc,GACxB,CAAC,SAAS,GAAG,EAAE,yBAAyB,OAAO,MAC/C,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAG,QAAQ,CAAC,CAAC,GAAG,0BAA0B,CAIrD,CAAC;AAEP,eAAO,MAAM,eAAe,GACzB,CAAC,SAAS,GAAG,EAAE,0BAA0B,OAAO,MAChD,GAAG,SAAS,CAAC,CAAC,CAAC,KAAG,SAAS,CAAC,CAAC,GAAG,2BAA2B,CAI3D,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { makeRequestW, makeResponseW } from '../../lib/http.js';
|
|
1
2
|
const EXCEPTIONS_LIST = [
|
|
2
3
|
'ALPN',
|
|
3
4
|
'C-PEP',
|
|
@@ -30,9 +31,6 @@ const EXCEPTIONS_LIST = [
|
|
|
30
31
|
'X-XSS-Protection',
|
|
31
32
|
];
|
|
32
33
|
// --------------------------------------------------------------------------
|
|
33
|
-
export function isWithOutputHeaders(x) {
|
|
34
|
-
return !!(x && typeof x === 'object' && 'headers' in x && typeof x.headers === 'object');
|
|
35
|
-
}
|
|
36
34
|
export function fromExceptionList(s) {
|
|
37
35
|
const ss = s.toLowerCase();
|
|
38
36
|
return EXCEPTIONS_LIST.find((i) => i.toLowerCase() === ss);
|
|
@@ -58,14 +56,13 @@ export function normalizeKeys(rec, normalizer) {
|
|
|
58
56
|
: {};
|
|
59
57
|
}
|
|
60
58
|
// --------------------------------------------------------------------------
|
|
61
|
-
export const transformInput = (normalizeRequestHeaders) => (i) => ({
|
|
62
|
-
...i,
|
|
59
|
+
export const transformInput = (normalizeRequestHeaders) => (i) => makeRequestW(i, {
|
|
63
60
|
headers: normalizeRequestHeaders ? normalizeKeys(i.headers, lowerCaseNormalizer) : { ...i.headers },
|
|
64
|
-
|
|
61
|
+
headersNormalizerRequestRaw: i.headers,
|
|
65
62
|
});
|
|
66
|
-
export const transformOutput = (normalizeResponseHeaders) => (o) =>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
63
|
+
export const transformOutput = (normalizeResponseHeaders) => (o) => {
|
|
64
|
+
return makeResponseW(o, {
|
|
65
|
+
headers: normalizeResponseHeaders ? normalizeKeys(o.headers, canonicalNormalizer) : { ...o.headers },
|
|
66
|
+
});
|
|
67
|
+
};
|
|
71
68
|
//# sourceMappingURL=lib.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAiC,MAAM,mBAAmB,CAAC;AAG/F,MAAM,eAAe,GAAG;IACtB,MAAM;IACN,OAAO;IACP,YAAY;IACZ,kBAAkB;IAClB,YAAY;IACZ,aAAa;IACb,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,YAAY;IACZ,gBAAgB;IAChB,eAAe;IACf,cAAc;IACd,2BAA2B;IAC3B,sBAAsB;IACtB,0BAA0B;IAC1B,mBAAmB;IACnB,wBAAwB;IACxB,uBAAuB;IACvB,MAAM;IACN,KAAK;IACL,IAAI;IACJ,KAAK;IACL,kBAAkB;IAClB,gBAAgB;IAChB,uBAAuB;IACvB,QAAQ;IACR,kBAAkB;CACnB,CAAC;AAEF,6EAA6E;AAC7E,MAAM,UAAU,iBAAiB,CAAC,CAAS;IACzC,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3B,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,mBAAmB,CAAC,CAAS;IAC3C,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,CAAS;IAC3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACvC,OAAO,CACL,SAAS;QACT,CAAC;aACE,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aACpE,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAsE,EACtE,UAAiC;IAEjC,OAAO,GAAG;QACR,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CACrB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACb,GAAG,GAAG;YACN,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;SAC5B,CAAC,EACF,EAAE,CACH;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,cAAc,GACzB,CAAgB,uBAAgC,EAAE,EAAE,CACpD,CAAC,CAAc,EAA4C,EAAE,CAC3D,YAAY,CAAC,CAAC,EAAE;IACd,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE;IACnG,2BAA2B,EAAE,CAAC,CAAC,OAAO;CACvC,CAAC,CAAC;AAEP,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAgB,wBAAiC,EAAE,EAAE,CACrD,CAAC,CAAe,EAA8C,EAAE;IAC9D,OAAO,aAAa,CAAC,CAAC,EAAE;QACtB,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE;KACrG,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib.test.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vitest';
|
|
2
2
|
import * as unit from './lib.js';
|
|
3
3
|
describe('middleware/headers-normalizer/lib', () => {
|
|
4
|
-
describe('isWithHeaders', () => {
|
|
5
|
-
it('should work as expected', () => {
|
|
6
|
-
expect(unit.isWithOutputHeaders({ headers: { foo: 'abc' } })).toEqual(true);
|
|
7
|
-
expect(unit.isWithOutputHeaders({ headers: {} })).toEqual(true);
|
|
8
|
-
expect(unit.isWithOutputHeaders({ headers: undefined })).toEqual(false);
|
|
9
|
-
expect(unit.isWithOutputHeaders({})).toEqual(false);
|
|
10
|
-
expect(unit.isWithOutputHeaders('banana')).toEqual(false);
|
|
11
|
-
});
|
|
12
|
-
});
|
|
13
4
|
describe('fromExceptionList', () => {
|
|
14
5
|
it('should work as expected', () => {
|
|
15
6
|
expect(unit.fromExceptionList('MIME-Version')).toEqual('MIME-Version');
|
|
@@ -49,19 +40,19 @@ describe('middleware/headers-normalizer/lib', () => {
|
|
|
49
40
|
it('should work as expected', () => {
|
|
50
41
|
expect(unit.transformInput(true)({ headers: { FOO: 'ABC' } })).toStrictEqual({
|
|
51
42
|
headers: { foo: 'ABC' },
|
|
52
|
-
|
|
43
|
+
headersNormalizerRequestRaw: { FOO: 'ABC' },
|
|
53
44
|
});
|
|
54
45
|
expect(unit.transformInput(true)({ headers: { FOO: undefined } })).toStrictEqual({
|
|
55
46
|
headers: { foo: undefined },
|
|
56
|
-
|
|
47
|
+
headersNormalizerRequestRaw: { FOO: undefined },
|
|
57
48
|
});
|
|
58
49
|
expect(unit.transformInput(true)({})).toStrictEqual({
|
|
59
50
|
headers: {},
|
|
60
|
-
|
|
51
|
+
headersNormalizerRequestRaw: undefined,
|
|
61
52
|
});
|
|
62
53
|
expect(unit.transformInput(false)({ headers: { FOO: 'ABC' } })).toStrictEqual({
|
|
63
54
|
headers: { FOO: 'ABC' },
|
|
64
|
-
|
|
55
|
+
headersNormalizerRequestRaw: { FOO: 'ABC' },
|
|
65
56
|
});
|
|
66
57
|
});
|
|
67
58
|
});
|
|
@@ -73,8 +64,8 @@ describe('middleware/headers-normalizer/lib', () => {
|
|
|
73
64
|
expect(unit.transformOutput(false)({ headers: { FOO: 'ABC' } })).toStrictEqual({
|
|
74
65
|
headers: { FOO: 'ABC' },
|
|
75
66
|
});
|
|
76
|
-
expect(unit.transformOutput(true)({})).toStrictEqual({});
|
|
77
|
-
expect(unit.transformOutput(false)({})).toStrictEqual({});
|
|
67
|
+
expect(unit.transformOutput(true)({})).toStrictEqual({ headers: {} });
|
|
68
|
+
expect(unit.transformOutput(false)({})).toStrictEqual({ headers: {} });
|
|
78
69
|
});
|
|
79
70
|
});
|
|
80
71
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/lib.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,9 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export type WithPossibleInputHeaders = {
|
|
3
|
-
headers?: OptionalRequestHeaders;
|
|
4
|
-
};
|
|
5
|
-
export type WithPossibleOutputHeaders = {
|
|
6
|
-
headers?: OptionalResponseHeaders;
|
|
7
|
-
};
|
|
1
|
+
import type { RequestW, ResponseW } from '../../lib/http.js';
|
|
8
2
|
export type WithNormalizedInputHeaders = {
|
|
9
|
-
headers:
|
|
10
|
-
|
|
3
|
+
headers: RequestW['headers'];
|
|
4
|
+
headersNormalizerRequestRaw: Record<string, string>;
|
|
11
5
|
};
|
|
12
6
|
export type WithNormalizedOutputHeaders = {
|
|
13
|
-
headers
|
|
14
|
-
};
|
|
15
|
-
export type WithUserId = {
|
|
16
|
-
readonly userId: string | undefined;
|
|
7
|
+
headers: ResponseW['headers'];
|
|
17
8
|
};
|
|
18
9
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/contrib/headersNormalizer/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC7B,2BAA2B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { Schema } from 'effect';
|
|
2
|
-
import type {
|
|
3
|
-
import type
|
|
2
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
3
|
+
import { type RequestW } from '../lib/http.js';
|
|
4
4
|
import type { MiddlewareError } from '../lib/MiddlewareError.js';
|
|
5
|
-
import type { WithPossibleInputHeaders } from './headersNormalizer/types.js';
|
|
6
5
|
export type WithValidatedHeaders<V> = {
|
|
7
6
|
headers: V;
|
|
8
|
-
|
|
7
|
+
headersValidatorRaw: RequestW['headers'] | undefined;
|
|
9
8
|
};
|
|
10
|
-
export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I, O, E, R>(wrapped:
|
|
9
|
+
export declare const middleware: <V0, V1>(schema: Schema.Schema<V0, V1>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I & WithValidatedHeaders<V0>, O, E, R>) => RequestResponseHandler<I, O, E | MiddlewareError, R>;
|
|
11
10
|
//# sourceMappingURL=headersValidator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headersValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/headersValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"headersValidator.d.ts","sourceRoot":"","sources":["../../src/contrib/headersValidator.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,oBAAoB,CAAC,CAAC,IAAI;IACpC,OAAO,EAAE,CAAC,CAAC;IACX,mBAAmB,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;CACtD,CAAC;AAEF,eAAO,MAAM,UAAU,GACpB,EAAE,EAAE,EAAE,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,MACrC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACrE,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAgBnD,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { pipe, Schema } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
|
+
import { makeRequestW } from '../lib/http.js';
|
|
3
4
|
import { toMiddlewareError } from '../lib/MiddlewareError.js';
|
|
4
5
|
const TAG = 'headersValidator';
|
|
5
|
-
export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.headers, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedHeaders) => ({
|
|
6
|
-
...i,
|
|
6
|
+
export const middleware = (schema) => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap((i) => pipe(i.headers, Schema.decodeUnknown(schema, { errors: 'all', onExcessProperty: 'ignore' }))), Effect.mapError((e) => toMiddlewareError(e)), Effect.map((validatedHeaders) => makeRequestW(i, {
|
|
7
7
|
headers: validatedHeaders,
|
|
8
|
-
|
|
8
|
+
headersValidatorRaw: i.headers,
|
|
9
9
|
})), Effect.flatMap(wrapped));
|
|
10
10
|
//# sourceMappingURL=headersValidator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headersValidator.js","sourceRoot":"","sources":["../../src/contrib/headersValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"headersValidator.js","sourceRoot":"","sources":["../../src/contrib/headersValidator.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,kBAAkB,CAAC;AAO/B,MAAM,CAAC,MAAM,UAAU,GACrB,CAAS,MAA6B,EAAE,EAAE,CAC1C,CACE,OAAsE,EAChB,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,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC7F,EACD,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,gBAAoB,EAAE,EAAE,CAClC,YAAY,CAAC,CAAC,EAAE;IACd,OAAO,EAAE,gBAAgB;IACzB,mBAAmB,EAAE,CAAC,CAAC,OAAO;CAC/B,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headersValidator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/headersValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"headersValidator.test.d.ts","sourceRoot":"","sources":["../../src/contrib/headersValidator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQtC,eAAO,MAAM,UAAU;;;;EAIrB,CAAC"}
|
|
@@ -1,32 +1,57 @@
|
|
|
1
1
|
import { pipe, Schema } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY_REQUEST_W, makeRequestW } from '../lib/http.js';
|
|
5
|
+
import { echoCoreIn200W } from '../test/test-common.js';
|
|
5
6
|
import * as unit from './headersValidator.js';
|
|
6
7
|
export const testSchema = Schema.Struct({
|
|
7
8
|
foo: Schema.Literal('foo_value'),
|
|
8
9
|
'content-type': Schema.Literal('application/json'),
|
|
9
10
|
num: Schema.NumberFromString,
|
|
10
11
|
});
|
|
11
|
-
const TEST_IN_1 =
|
|
12
|
-
|
|
12
|
+
const TEST_IN_1 = makeRequestW(EMPTY_REQUEST_W, {
|
|
13
|
+
headers: { foo: 'foo_value', 'content-type': 'application/json', num: '123' },
|
|
14
|
+
});
|
|
15
|
+
const TEST_IN_2 = makeRequestW(EMPTY_REQUEST_W, {
|
|
16
|
+
headers: { foo: 'foo_value', 'content-type': 'text/xml' },
|
|
17
|
+
});
|
|
13
18
|
const TEST_IN_3 = {};
|
|
14
19
|
describe('middleware/headers-validator', () => {
|
|
15
20
|
it('should work as expected with valid data', async () => {
|
|
16
|
-
const egHandler = pipe(
|
|
21
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
|
|
17
22
|
const result = pipe(egHandler(TEST_IN_1), Effect.runPromise);
|
|
18
23
|
await expect(result).resolves.toStrictEqual({
|
|
19
|
-
|
|
20
|
-
|
|
24
|
+
statusCode: 200,
|
|
25
|
+
body: 'OK',
|
|
26
|
+
headers: {
|
|
27
|
+
'content-type': 'application/json',
|
|
28
|
+
foo: 'foo_value',
|
|
29
|
+
num: 123,
|
|
30
|
+
},
|
|
31
|
+
in: {
|
|
32
|
+
method: 'GET',
|
|
33
|
+
pathParameters: {},
|
|
34
|
+
queryStringParameters: {},
|
|
35
|
+
headers: {
|
|
36
|
+
'content-type': 'application/json',
|
|
37
|
+
foo: 'foo_value',
|
|
38
|
+
num: 123,
|
|
39
|
+
},
|
|
40
|
+
headersValidatorRaw: {
|
|
41
|
+
'content-type': 'application/json',
|
|
42
|
+
foo: 'foo_value',
|
|
43
|
+
num: '123',
|
|
44
|
+
},
|
|
45
|
+
},
|
|
21
46
|
});
|
|
22
47
|
});
|
|
23
48
|
it('should work as expected with invalid data', async () => {
|
|
24
|
-
const egHandler = pipe(
|
|
49
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
|
|
25
50
|
const result = pipe(egHandler(TEST_IN_2), Effect.runPromise);
|
|
26
51
|
await expect(result).rejects.toThrow('Expected "application/json", actual "text/xml"');
|
|
27
52
|
});
|
|
28
53
|
it('should work as expected with invalid data', async () => {
|
|
29
|
-
const egHandler = pipe(
|
|
54
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware(testSchema));
|
|
30
55
|
const result = pipe(egHandler(TEST_IN_3), Effect.runPromise);
|
|
31
56
|
await expect(result).rejects.toThrow('Expected { readonly foo: "foo_value"; readonly content-type: "application/json"; readonly num: NumberFromString }, actual undefined');
|
|
32
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headersValidator.test.js","sourceRoot":"","sources":["../../src/contrib/headersValidator.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,
|
|
1
|
+
{"version":3,"file":"headersValidator.test.js","sourceRoot":"","sources":["../../src/contrib/headersValidator.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,uBAAuB,CAAC;AAE9C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAClD,GAAG,EAAE,MAAM,CAAC,gBAAgB;CAC7B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,EAAE;CAC9E,CAAC,CAAC;AACH,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE;IAC9C,OAAO,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE;CAC1D,CAAC,CAAC;AACH,MAAM,SAAS,GAAQ,EAAE,CAAC;AAE1B,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,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;gBACP,cAAc,EAAE,kBAAkB;gBAClC,GAAG,EAAE,WAAW;gBAChB,GAAG,EAAE,GAAG;aACT;YACD,EAAE,EAAE;gBACF,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,EAAE;gBAClB,qBAAqB,EAAE,EAAE;gBACzB,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,GAAG,EAAE,WAAW;oBAChB,GAAG,EAAE,GAAG;iBACT;gBACD,mBAAmB,EAAE;oBACnB,cAAc,EAAE,kBAAkB;oBAClC,GAAG,EAAE,WAAW;oBAChB,GAAG,EAAE,KAAK;iBACX;aACF;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,gDAAgD,CAAC,CAAC;IACzF,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,CAClC,qIAAqI,CACtI,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
export type WithOutputHeaders = {
|
|
4
|
-
readonly headers?: OptionalResponseHeaders;
|
|
5
|
-
};
|
|
6
|
-
export declare const middleware: () => <I, O, E, R>(wrapped: Handler<I, O & WithOutputHeaders, E, R>) => Handler<I, O, E, R>;
|
|
1
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
2
|
+
export declare const middleware: () => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E, R>;
|
|
7
3
|
//# sourceMappingURL=helmetJsHeaders.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helmetJsHeaders.d.ts","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"helmetJsHeaders.d.ts","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAM/D,eAAO,MAAM,UAAU,SAEpB,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CA2BjC,CAAC"}
|
|
@@ -2,15 +2,7 @@ import { pipe } from 'effect';
|
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
// Based on : https://helmetjs.github.io/
|
|
4
4
|
const TAG = 'helmetJsHeaders';
|
|
5
|
-
export const middleware = () => (wrapped) => (i) => pipe(
|
|
6
|
-
// Lift the input
|
|
7
|
-
Effect.succeed(i),
|
|
8
|
-
// Log before
|
|
9
|
-
Effect.tap(Effect.logDebug(`[${TAG}] IN`)),
|
|
10
|
-
// Call the next middleware in the stack
|
|
11
|
-
Effect.flatMap(wrapped),
|
|
12
|
-
// Do something with the output
|
|
13
|
-
Effect.map((x) => ({
|
|
5
|
+
export const middleware = () => (wrapped) => (i) => pipe(Effect.succeed(i), Effect.tap(Effect.logDebug(`[${TAG}] IN`)), Effect.flatMap(wrapped), Effect.map((x) => ({
|
|
14
6
|
...x,
|
|
15
7
|
headers: {
|
|
16
8
|
'Content-Security-Policy': "default-src 'self';base-uri 'self';font-src 'self' https: data:;form-action 'self';frame-ancestors 'self';img-src 'self' data:;object-src 'none';script-src 'self';script-src-attr 'none';style-src 'self' https: 'unsafe-inline';upgrade-insecure-requests",
|
|
@@ -28,7 +20,5 @@ Effect.map((x) => ({
|
|
|
28
20
|
'X-XSS-Protection': '0',
|
|
29
21
|
...x.headers,
|
|
30
22
|
},
|
|
31
|
-
})),
|
|
32
|
-
// Log after
|
|
33
|
-
Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
23
|
+
})), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
34
24
|
//# sourceMappingURL=helmetJsHeaders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helmetJsHeaders.js","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,yCAAyC;AACzC,MAAM,GAAG,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"helmetJsHeaders.js","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,yCAAyC;AACzC,MAAM,GAAG,GAAG,iBAAiB,CAAC;AAE9B,MAAM,CAAC,MAAM,UAAU,GACrB,GAAG,EAAE,CACL,CACE,OAA2C,EACP,EAAE,CACxC,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,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACjB,GAAG,CAAC;IACJ,OAAO,EAAE;QACP,yBAAyB,EACvB,6PAA6P;QAC/P,8BAA8B,EAAE,cAAc;QAC9C,4BAA4B,EAAE,aAAa;QAC3C,8BAA8B,EAAE,aAAa;QAC7C,sBAAsB,EAAE,IAAI;QAC5B,iBAAiB,EAAE,aAAa;QAChC,2BAA2B,EAAE,qCAAqC;QAClE,wBAAwB,EAAE,SAAS;QACnC,wBAAwB,EAAE,KAAK;QAC/B,oBAAoB,EAAE,QAAQ;QAC9B,iBAAiB,EAAE,YAAY;QAC/B,mCAAmC,EAAE,MAAM;QAC3C,kBAAkB,EAAE,GAAG;QACvB,GAAG,CAAC,CAAC,OAAO;KACb;CACF,CAAC,CAAC,EACH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helmetJsHeaders.test.d.ts","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helmetJsHeaders.test.d.ts","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { pipe } from 'effect';
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { describe, expect, it } from 'vitest';
|
|
4
|
-
import {
|
|
4
|
+
import { EMPTY_REQUEST_W } from '../lib/http.js';
|
|
5
|
+
import { echoCoreIn200W } from '../test/test-common.js';
|
|
5
6
|
import * as unit from './helmetJsHeaders.js';
|
|
6
|
-
const TEST_IN = { headers: { FOO: 'foo_value' } };
|
|
7
7
|
describe('middleware/helmet-js-headers', () => {
|
|
8
8
|
describe('middleware', () => {
|
|
9
9
|
it('should work as expected with default params', async () => {
|
|
10
|
-
const egHandler = pipe(
|
|
11
|
-
const result = pipe(egHandler(
|
|
10
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
11
|
+
const result = pipe(egHandler(EMPTY_REQUEST_W), Effect.runPromise);
|
|
12
12
|
await expect(result).resolves.toMatchObject({
|
|
13
13
|
headers: {
|
|
14
14
|
'Cross-Origin-Embedder-Policy': 'require-corp',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helmetJsHeaders.test.js","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"helmetJsHeaders.test.js","sourceRoot":"","sources":["../../src/contrib/helmetJsHeaders.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,sBAAsB,CAAC;AAE7C,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEnE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC1C,OAAO,EAAE;oBACP,8BAA8B,EAAE,cAAc;oBAC9C,4BAA4B,EAAE,aAAa;oBAC3C,8BAA8B,EAAE,aAAa;oBAC7C,sBAAsB,EAAE,IAAI;iBAC7B;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const middleware: <I, O, E, R>(
|
|
1
|
+
import type { Rec, RequestResponseHandler } from '../index.js';
|
|
2
|
+
export declare const middleware: (_params?: never) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R>) => RequestResponseHandler<I, O, E, R>;
|
|
3
3
|
//# sourceMappingURL=identity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/contrib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/contrib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAE/D,eAAO,MAAM,UAAU,GACpB,UAAU,KAAK,MACf,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC1C,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/contrib/identity.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GACrB,
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/contrib/identity.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,OAAe,EAAE,EAAE,CACpB,CACE,OAA2C,EACP,EAAE,CACtC,OAAO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.test.d.ts","sourceRoot":"","sources":["../../src/contrib/identity.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"identity.test.d.ts","sourceRoot":"","sources":["../../src/contrib/identity.test.ts"],"names":[],"mappings":""}
|