@koala-ts/framework 2.9.1 → 2.11.0
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/Application/Response.test.js +1 -4
- package/dist/Application/Response.test.js.map +1 -1
- package/dist/Routing/Router.test.js +1 -5
- package/dist/Routing/Router.test.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/serializer/normalizer/normalizer.test.js +60 -0
- package/dist/serializer/normalizer/normalizer.test.js.map +1 -1
- package/dist/serializer/normalizer/record-normalizer.d.ts.map +1 -1
- package/dist/serializer/normalizer/record-normalizer.js +25 -4
- package/dist/serializer/normalizer/record-normalizer.js.map +1 -1
- package/dist/serializer/normalizer/record-normalizer.test.js +4 -4
- package/dist/serializer/normalizer/record-normalizer.test.js.map +1 -1
- package/dist/serializer/normalizer/types.d.ts +3 -1
- package/dist/serializer/normalizer/types.d.ts.map +1 -1
- package/dist/validator/constraints/basic/not-blank.d.ts +3 -0
- package/dist/validator/constraints/basic/not-blank.d.ts.map +1 -0
- package/dist/validator/constraints/basic/not-blank.js +21 -0
- package/dist/validator/constraints/basic/not-blank.js.map +1 -0
- package/dist/validator/constraints/basic/not-blank.test.d.ts +2 -0
- package/dist/validator/constraints/basic/not-blank.test.d.ts.map +1 -0
- package/dist/validator/constraints/basic/not-blank.test.js +79 -0
- package/dist/validator/constraints/basic/not-blank.test.js.map +1 -0
- package/dist/validator/constraints/index.d.ts +7 -0
- package/dist/validator/constraints/index.d.ts.map +1 -0
- package/dist/validator/constraints/index.js +9 -0
- package/dist/validator/constraints/index.js.map +1 -0
- package/dist/validator/constraints/other/compound.d.ts +3 -0
- package/dist/validator/constraints/other/compound.d.ts.map +1 -0
- package/dist/validator/constraints/other/compound.integration.test.d.ts +2 -0
- package/dist/validator/constraints/other/compound.integration.test.d.ts.map +1 -0
- package/dist/validator/constraints/other/compound.integration.test.js +76 -0
- package/dist/validator/constraints/other/compound.integration.test.js.map +1 -0
- package/dist/validator/constraints/other/compound.js +6 -0
- package/dist/validator/constraints/other/compound.js.map +1 -0
- package/dist/validator/constraints/other/compound.test.d.ts +2 -0
- package/dist/validator/constraints/other/compound.test.d.ts.map +1 -0
- package/dist/validator/constraints/other/compound.test.js +62 -0
- package/dist/validator/constraints/other/compound.test.js.map +1 -0
- package/dist/validator/constraints/string/email.d.ts +3 -0
- package/dist/validator/constraints/string/email.d.ts.map +1 -0
- package/dist/validator/constraints/string/email.js +29 -0
- package/dist/validator/constraints/string/email.js.map +1 -0
- package/dist/validator/constraints/string/email.test.d.ts +2 -0
- package/dist/validator/constraints/string/email.test.d.ts.map +1 -0
- package/dist/validator/constraints/string/email.test.js +119 -0
- package/dist/validator/constraints/string/email.test.js.map +1 -0
- package/dist/validator/errors.d.ts +4 -0
- package/dist/validator/errors.d.ts.map +1 -0
- package/dist/validator/errors.js +7 -0
- package/dist/validator/errors.js.map +1 -0
- package/dist/validator/index.d.ts +4 -0
- package/dist/validator/index.d.ts.map +1 -0
- package/dist/validator/index.js +4 -0
- package/dist/validator/index.js.map +1 -0
- package/dist/validator/types.d.ts +31 -0
- package/dist/validator/types.d.ts.map +1 -0
- package/dist/validator/types.js +1 -0
- package/dist/validator/types.js.map +1 -0
- package/dist/validator/validator.d.ts +3 -0
- package/dist/validator/validator.d.ts.map +1 -0
- package/dist/validator/validator.js +59 -0
- package/dist/validator/validator.js.map +1 -0
- package/dist/validator/validator.test.d.ts +2 -0
- package/dist/validator/validator.test.d.ts.map +1 -0
- package/dist/validator/validator.test.js +281 -0
- package/dist/validator/validator.test.js.map +1 -0
- package/package.json +6 -7
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
|
2
1
|
import { extendResponse } from '../Application/Response.js';
|
|
2
|
+
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
|
3
3
|
describe('Response', () => {
|
|
4
4
|
describe('Extend response', () => {
|
|
5
5
|
let scope;
|
|
@@ -11,7 +11,6 @@ describe('Response', () => {
|
|
|
11
11
|
test('it should extend response with setHeader method', async () => {
|
|
12
12
|
await extendResponse(scope, next);
|
|
13
13
|
scope.response.setHeader('Content-Type', 'application/json');
|
|
14
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
15
14
|
expect(scope.set).toHaveBeenCalledWith('Content-Type', 'application/json');
|
|
16
15
|
});
|
|
17
16
|
test('response.setHeader should be chainable', async () => {
|
|
@@ -25,9 +24,7 @@ describe('Response', () => {
|
|
|
25
24
|
'Content-Type': 'application/json',
|
|
26
25
|
'X-Custom-Header': 'value',
|
|
27
26
|
});
|
|
28
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
29
27
|
expect(scope.set).toHaveBeenCalledWith('Content-Type', 'application/json');
|
|
30
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
31
28
|
expect(scope.set).toHaveBeenCalledWith('X-Custom-Header', 'value');
|
|
32
29
|
});
|
|
33
30
|
test('response.withHeaders is chainable', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Response.test.js","sourceRoot":"","sources":["../../src/Application/Response.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Response.test.js","sourceRoot":"","sources":["../../src/Application/Response.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEhE,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,KAAgB,CAAC;QACrB,IAAI,IAAU,CAAC;QAEf,UAAU,CAAC,GAAG,EAAE;YACd,KAAK,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,EAA0B,CAAC;YAC/D,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAElC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAE7D,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAE9E,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACnE,MAAM,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAElC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACzB,cAAc,EAAE,kBAAkB;gBAClC,iBAAiB,EAAE,OAAO;aAC3B,CAAC,CAAC;YAEH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAC3E,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAElC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAC1C,cAAc,EAAE,kBAAkB;gBAClC,iBAAiB,EAAE,OAAO;aAC3B,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { describe, expect, test, vi } from 'vitest';
|
|
11
10
|
import { getRoutes, Route } from '../Routing/Router.js';
|
|
11
|
+
import { describe, expect, test, vi } from 'vitest';
|
|
12
12
|
describe('Route', () => {
|
|
13
13
|
const exampleMiddleware = vi.fn();
|
|
14
14
|
class Foo {
|
|
@@ -68,7 +68,6 @@ describe('Route', () => {
|
|
|
68
68
|
expect(getRoutes()).toEqual([
|
|
69
69
|
{
|
|
70
70
|
methods: ['get'],
|
|
71
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
72
71
|
handler: Foo.prototype.bar,
|
|
73
72
|
path: '/foo',
|
|
74
73
|
parseBody: false,
|
|
@@ -77,7 +76,6 @@ describe('Route', () => {
|
|
|
77
76
|
},
|
|
78
77
|
{
|
|
79
78
|
methods: ['get', 'post'],
|
|
80
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
81
79
|
handler: Foo.prototype.routeWithMultipleMethods,
|
|
82
80
|
path: '/route-with-multiple-methods',
|
|
83
81
|
parseBody: true,
|
|
@@ -86,7 +84,6 @@ describe('Route', () => {
|
|
|
86
84
|
},
|
|
87
85
|
{
|
|
88
86
|
methods: ['all'],
|
|
89
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
90
87
|
handler: Foo.prototype.routeWithAnyMethod,
|
|
91
88
|
path: '/route-with-any-method',
|
|
92
89
|
parseBody: true,
|
|
@@ -95,7 +92,6 @@ describe('Route', () => {
|
|
|
95
92
|
},
|
|
96
93
|
{
|
|
97
94
|
methods: ['all'],
|
|
98
|
-
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
99
95
|
handler: Foo.prototype.routeWithAllMethod,
|
|
100
96
|
path: '/route-with-all-method',
|
|
101
97
|
parseBody: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.test.js","sourceRoot":"","sources":["../../src/Routing/Router.test.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Router.test.js","sourceRoot":"","sources":["../../src/Routing/Router.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
|
|
@@ -20,5 +20,65 @@ describe('Normalizer', () => {
|
|
|
20
20
|
const expected = { id: 1, createdAt: '2024-01-01T00:00:00.000Z' };
|
|
21
21
|
expect(result).toEqual(expected);
|
|
22
22
|
});
|
|
23
|
+
it('should handle nested metadata', () => {
|
|
24
|
+
const normalize = createNormalizer();
|
|
25
|
+
const input = {
|
|
26
|
+
user: { id: 'u1', name: 'John', title: 'Developer' },
|
|
27
|
+
post: { id: 'p1', title: 'Hello world!' },
|
|
28
|
+
};
|
|
29
|
+
const metadata = {
|
|
30
|
+
user: {
|
|
31
|
+
groups: ['post:read'],
|
|
32
|
+
metadata: {
|
|
33
|
+
id: { groups: ['post:read'] },
|
|
34
|
+
name: { groups: ['post:read'] },
|
|
35
|
+
title: { groups: ['admin'] },
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
post: {
|
|
39
|
+
groups: ['post:read'],
|
|
40
|
+
metadata: {
|
|
41
|
+
id: { groups: ['post:read'] },
|
|
42
|
+
title: { groups: ['post:read'] },
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
const result = normalize(input, { metadata, groups: ['post:read'] });
|
|
47
|
+
expect(result).toEqual({
|
|
48
|
+
user: { id: 'u1', name: 'John' },
|
|
49
|
+
post: { id: 'p1', title: 'Hello world!' },
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
it('should handle nested metadata with arrays', () => {
|
|
53
|
+
const normalize = createNormalizer();
|
|
54
|
+
const input = {
|
|
55
|
+
user: { id: 'u1', name: 'John' },
|
|
56
|
+
posts: [
|
|
57
|
+
{ id: 'p1', title: 'Hello world!' },
|
|
58
|
+
{ id: 'p2', title: 'Another post' },
|
|
59
|
+
],
|
|
60
|
+
};
|
|
61
|
+
const metadata = {
|
|
62
|
+
user: {
|
|
63
|
+
groups: ['post:delete'],
|
|
64
|
+
metadata: {
|
|
65
|
+
id: { groups: ['post:read'] },
|
|
66
|
+
name: { groups: ['post:read'] },
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
posts: {
|
|
70
|
+
groups: ['post:delete'],
|
|
71
|
+
metadata: {
|
|
72
|
+
id: { groups: ['post:delete'] },
|
|
73
|
+
title: { groups: ['post:read'] },
|
|
74
|
+
},
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
const result = normalize(input, { metadata, groups: ['post:delete'] });
|
|
78
|
+
expect(result).toEqual({
|
|
79
|
+
user: {},
|
|
80
|
+
posts: [{ id: 'p1' }, { id: 'p2' }],
|
|
81
|
+
});
|
|
82
|
+
});
|
|
23
83
|
});
|
|
24
84
|
//# sourceMappingURL=normalizer.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizer.test.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/normalizer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"normalizer.test.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/normalizer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-normalizer.d.ts","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,UAAU,EAA0B,MAAM,+BAA+B,CAAC;AAE/G,KAAK,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC;AAE3C,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"record-normalizer.d.ts","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,UAAU,EAA0B,MAAM,+BAA+B,CAAC;AAE/G,KAAK,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC;AAE3C,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CA2BzF"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
export function createRecordNormalizer(normalize) {
|
|
2
2
|
return function recordNormalizer(value, context) {
|
|
3
|
-
if (
|
|
3
|
+
if (!isRecord(value)) {
|
|
4
4
|
return undefined;
|
|
5
5
|
}
|
|
6
|
-
const obj = value;
|
|
7
6
|
const normalizedRecord = {};
|
|
8
7
|
const shouldHandleGroups = undefined !== context?.groups && context.groups.length > 0;
|
|
9
8
|
const activeGroups = new Set(context?.groups ?? []);
|
|
10
|
-
for (const [key, val] of Object.entries(
|
|
9
|
+
for (const [key, val] of Object.entries(value)) {
|
|
11
10
|
const rule = context?.metadata?.[key];
|
|
12
11
|
if (rule?.ignore === true)
|
|
13
12
|
continue;
|
|
@@ -17,9 +16,31 @@ export function createRecordNormalizer(normalize) {
|
|
|
17
16
|
if (!hasMatchingGroup)
|
|
18
17
|
continue;
|
|
19
18
|
}
|
|
20
|
-
normalizedRecord[rule?.serializedName ?? key] = normalize(val, context);
|
|
19
|
+
normalizedRecord[rule?.serializedName ?? key] = normalize(val, resolveContextForProperty(val, key, context));
|
|
21
20
|
}
|
|
22
21
|
return normalizedRecord;
|
|
23
22
|
};
|
|
24
23
|
}
|
|
24
|
+
function isRecord(value) {
|
|
25
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value) && !(value instanceof Date);
|
|
26
|
+
}
|
|
27
|
+
function resolveContextForProperty(value, key, parentContext) {
|
|
28
|
+
if (undefined === parentContext)
|
|
29
|
+
return undefined;
|
|
30
|
+
if (requiresNestedContext(value))
|
|
31
|
+
return createNestedContext(key, parentContext);
|
|
32
|
+
return parentContext;
|
|
33
|
+
}
|
|
34
|
+
function requiresNestedContext(value) {
|
|
35
|
+
return isRecord(value) || Array.isArray(value);
|
|
36
|
+
}
|
|
37
|
+
function createNestedContext(key, parentContext) {
|
|
38
|
+
const metadata = parentContext?.metadata?.[key]?.metadata;
|
|
39
|
+
if (undefined === metadata)
|
|
40
|
+
return undefined;
|
|
41
|
+
return {
|
|
42
|
+
...parentContext,
|
|
43
|
+
metadata,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
25
46
|
//# sourceMappingURL=record-normalizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-normalizer.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,sBAAsB,CAAC,SAAqB;IAC1D,OAAO,SAAS,gBAAgB,CAAC,KAAc,EAAE,OAA2B;QAC1E,IAAI,
|
|
1
|
+
{"version":3,"file":"record-normalizer.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,sBAAsB,CAAC,SAAqB;IAC1D,OAAO,SAAS,gBAAgB,CAAC,KAAc,EAAE,OAA2B;QAC1E,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,gBAAgB,GAAqB,EAAE,CAAC;QAE9C,MAAM,kBAAkB,GAAG,SAAS,KAAK,OAAO,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACtF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;QAEpD,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;YAEtC,IAAI,IAAI,EAAE,MAAM,KAAK,IAAI;gBAAE,SAAS;YAEpC,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,UAAU,GAAG,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;gBACtC,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3E,IAAI,CAAC,gBAAgB;oBAAE,SAAS;YAClC,CAAC;YAED,gBAAgB,CAAC,IAAI,EAAE,cAAc,IAAI,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,EAAE,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/G,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC;AAC1G,CAAC;AAED,SAAS,yBAAyB,CAChC,KAAc,EACd,GAAW,EACX,aAAiC;IAEjC,IAAI,SAAS,KAAK,aAAa;QAAE,OAAO,SAAS,CAAC;IAElD,IAAI,qBAAqB,CAAC,KAAK,CAAC;QAAE,OAAO,mBAAmB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAEjF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc;IAC3C,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,aAAiC;IACzE,MAAM,QAAQ,GAAG,aAAa,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAC1D,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE7C,OAAO;QACL,GAAG,aAAa;QAChB,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -47,25 +47,25 @@ describe('Record normalizer', () => {
|
|
|
47
47
|
it('should return only props of target groups', () => {
|
|
48
48
|
const normalizer = vi.fn().mockImplementation((value) => value);
|
|
49
49
|
const input = { id: 1, firstName: 'John', lastName: 'Doe', password: 'secret' };
|
|
50
|
-
const
|
|
50
|
+
const metadata = {
|
|
51
51
|
id: { groups: ['read'] },
|
|
52
52
|
firstName: { groups: ['public'] },
|
|
53
53
|
lastName: { groups: ['public'] },
|
|
54
54
|
password: { groups: ['private'] },
|
|
55
55
|
};
|
|
56
56
|
const recordNormalizer = createRecordNormalizer(normalizer);
|
|
57
|
-
const result = recordNormalizer(input, { groups: ['public', 'read'], metadata
|
|
57
|
+
const result = recordNormalizer(input, { groups: ['public', 'read'], metadata });
|
|
58
58
|
expect(result).toEqual({ id: 1, firstName: 'John', lastName: 'Doe' });
|
|
59
59
|
});
|
|
60
60
|
it('should prioritize ignore over groups', () => {
|
|
61
61
|
const normalizer = vi.fn().mockImplementation((value) => value);
|
|
62
62
|
const input = { id: 1, firstName: 'John', lastName: 'Doe', password: 'secret' };
|
|
63
|
-
const
|
|
63
|
+
const metadata = {
|
|
64
64
|
id: { groups: ['public'] },
|
|
65
65
|
password: { groups: ['private'], ignore: true },
|
|
66
66
|
};
|
|
67
67
|
const recordNormalizer = createRecordNormalizer(normalizer);
|
|
68
|
-
const result = recordNormalizer(input, { groups: ['public', 'private'], metadata
|
|
68
|
+
const result = recordNormalizer(input, { groups: ['public', 'private'], metadata });
|
|
69
69
|
expect(result).toEqual({ id: 1 });
|
|
70
70
|
});
|
|
71
71
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-normalizer.test.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"record-normalizer.test.js","sourceRoot":"","sources":["../../../src/serializer/normalizer/record-normalizer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,12 @@ export interface PropertyMetadata {
|
|
|
7
7
|
ignore?: boolean;
|
|
8
8
|
groups?: string[];
|
|
9
9
|
serializedName?: string;
|
|
10
|
+
metadata?: Metadata;
|
|
10
11
|
}
|
|
12
|
+
export type Metadata = Record<string, PropertyMetadata>;
|
|
11
13
|
export interface NormalizerContext {
|
|
12
14
|
groups?: string[];
|
|
13
|
-
metadata?:
|
|
15
|
+
metadata?: Metadata;
|
|
14
16
|
}
|
|
15
17
|
export type Normalizer<From = unknown, To = NormalizedValue> = (input: From, context?: NormalizerContext) => To;
|
|
16
18
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/serializer/normalizer/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;CAChC;AAED,MAAM,MAAM,eAAe,GAAG,eAAe,EAAE,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/serializer/normalizer/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;CAChC;AAED,MAAM,MAAM,eAAe,GAAG,eAAe,EAAE,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAExD,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,MAAM,MAAM,UAAU,CAAC,IAAI,GAAG,OAAO,EAAE,EAAE,GAAG,eAAe,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"not-blank.d.ts","sourceRoot":"","sources":["../../../../src/validator/constraints/basic/not-blank.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAShE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,GAAG,SAAS,EAAE,CAmBhF"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
const DEFAULT_MESSAGE = 'This value should not be blank.';
|
|
2
|
+
export function notBlank(value, context) {
|
|
3
|
+
const options = context.options;
|
|
4
|
+
const message = options.message ?? DEFAULT_MESSAGE;
|
|
5
|
+
const normalizedValue = typeof value === 'string' && typeof options.normalizer === 'function' ? options.normalizer(value) : value;
|
|
6
|
+
if (isBlank(normalizedValue)) {
|
|
7
|
+
return [
|
|
8
|
+
{
|
|
9
|
+
path: context.path,
|
|
10
|
+
constraint: context.constraint,
|
|
11
|
+
message,
|
|
12
|
+
value,
|
|
13
|
+
},
|
|
14
|
+
];
|
|
15
|
+
}
|
|
16
|
+
return [];
|
|
17
|
+
}
|
|
18
|
+
function isBlank(value) {
|
|
19
|
+
return value === '' || value === null || value === undefined || (Array.isArray(value) && value.length === 0);
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=not-blank.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"not-blank.js","sourceRoot":"","sources":["../../../../src/validator/constraints/basic/not-blank.ts"],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,iCAAiC,CAAC;AAO1D,MAAM,UAAU,QAAQ,CAAC,KAAc,EAAE,OAA0B;IACjE,MAAM,OAAO,GAAG,OAAO,CAAC,OAA0B,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,eAAe,CAAC;IAEnD,MAAM,eAAe,GACnB,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE5G,IAAI,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAC7B,OAAO;YACL;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO;gBACP,KAAK;aACN;SACF,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;AAC/G,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"not-blank.test.d.ts","sourceRoot":"","sources":["../../../../src/validator/constraints/basic/not-blank.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { notBlank } from './not-blank.js';
|
|
3
|
+
describe('notBlank', () => {
|
|
4
|
+
it.each([
|
|
5
|
+
{ value: '', label: 'empty string' },
|
|
6
|
+
{ value: null, label: 'null' },
|
|
7
|
+
{ value: undefined, label: 'undefined' },
|
|
8
|
+
{ value: [], label: 'empty array' },
|
|
9
|
+
])('returns a violation when value is $label and no options are provided', ({ value }) => {
|
|
10
|
+
const context = {
|
|
11
|
+
path: 'name',
|
|
12
|
+
root: { name: value },
|
|
13
|
+
value,
|
|
14
|
+
constraint: 'notBlank',
|
|
15
|
+
options: {},
|
|
16
|
+
runNestedRules: () => [],
|
|
17
|
+
};
|
|
18
|
+
const violations = notBlank(value, context);
|
|
19
|
+
expect(violations).toHaveLength(1);
|
|
20
|
+
expect(violations[0]).toEqual({
|
|
21
|
+
path: 'name',
|
|
22
|
+
constraint: 'notBlank',
|
|
23
|
+
message: 'This value should not be blank.',
|
|
24
|
+
value,
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
it('uses a custom message when provided', () => {
|
|
28
|
+
const context = {
|
|
29
|
+
path: 'name',
|
|
30
|
+
root: { name: '' },
|
|
31
|
+
value: '',
|
|
32
|
+
constraint: 'notBlank',
|
|
33
|
+
options: { message: 'Required' },
|
|
34
|
+
runNestedRules: () => [],
|
|
35
|
+
};
|
|
36
|
+
const violations = notBlank('', context);
|
|
37
|
+
expect(violations).toHaveLength(1);
|
|
38
|
+
expect(violations[0]).toEqual({
|
|
39
|
+
path: 'name',
|
|
40
|
+
constraint: 'notBlank',
|
|
41
|
+
message: 'Required',
|
|
42
|
+
value: '',
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
it('normalizes string values before checking blankness', () => {
|
|
46
|
+
const context = {
|
|
47
|
+
path: 'name',
|
|
48
|
+
root: { name: ' ' },
|
|
49
|
+
value: ' ',
|
|
50
|
+
constraint: 'notBlank',
|
|
51
|
+
options: { normalizer: (value) => value.trim() },
|
|
52
|
+
runNestedRules: () => [],
|
|
53
|
+
};
|
|
54
|
+
const violations = notBlank(' ', context);
|
|
55
|
+
expect(violations).toHaveLength(1);
|
|
56
|
+
expect(violations[0]).toEqual({
|
|
57
|
+
path: 'name',
|
|
58
|
+
constraint: 'notBlank',
|
|
59
|
+
message: 'This value should not be blank.',
|
|
60
|
+
value: ' ',
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
it.each([
|
|
64
|
+
{ value: 'valid', label: 'non-empty string' },
|
|
65
|
+
{ value: ['value'], label: 'non-empty array' },
|
|
66
|
+
])('returns no violations for $label', ({ value }) => {
|
|
67
|
+
const context = {
|
|
68
|
+
path: 'name',
|
|
69
|
+
root: { name: value },
|
|
70
|
+
value,
|
|
71
|
+
constraint: 'notBlank',
|
|
72
|
+
options: {},
|
|
73
|
+
runNestedRules: () => [],
|
|
74
|
+
};
|
|
75
|
+
const violations = notBlank(value, context);
|
|
76
|
+
expect(violations).toHaveLength(0);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=not-blank.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"not-blank.test.js","sourceRoot":"","sources":["../../../../src/validator/constraints/basic/not-blank.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { notBlank } from '../../validator/constraints/basic/not-blank.js';
|
|
2
|
+
import { email } from '../../validator/constraints/string/email.js';
|
|
3
|
+
export declare const builtInConstraints: {
|
|
4
|
+
notBlank: typeof notBlank;
|
|
5
|
+
email: typeof email;
|
|
6
|
+
};
|
|
7
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validator/constraints/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,eAAO,MAAM,kBAAkB;;;CAM9B,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { notBlank } from '../../validator/constraints/basic/not-blank.js';
|
|
2
|
+
import { email } from '../../validator/constraints/string/email.js';
|
|
3
|
+
export const builtInConstraints = {
|
|
4
|
+
// Basic
|
|
5
|
+
notBlank,
|
|
6
|
+
// String
|
|
7
|
+
email,
|
|
8
|
+
};
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validator/constraints/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,QAAQ;IACR,QAAQ;IAER,SAAS;IACT,KAAK;CACN,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compound.d.ts","sourceRoot":"","sources":["../../../../src/validator/constraints/other/compound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE5E,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,IACL,OAAO,OAAO,EAAE,SAAS,iBAAiB,KAAG,SAAS,EAAE,CAG5F"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compound.integration.test.d.ts","sourceRoot":"","sources":["../../../../src/validator/constraints/other/compound.integration.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { createValidator } from '../../validator.js';
|
|
3
|
+
import { notBlank } from '../basic/not-blank.js';
|
|
4
|
+
import { email } from '../string/email.js';
|
|
5
|
+
import { compound } from './compound.js';
|
|
6
|
+
describe('compound (integration)', () => {
|
|
7
|
+
it('applies nested constraints to the same value', () => {
|
|
8
|
+
const requiredEmail = compound(['notBlank', 'email']);
|
|
9
|
+
const validate = createValidator({
|
|
10
|
+
constraints: {
|
|
11
|
+
requiredEmail,
|
|
12
|
+
notBlank,
|
|
13
|
+
email,
|
|
14
|
+
},
|
|
15
|
+
});
|
|
16
|
+
const rules = {
|
|
17
|
+
userEmail: ['requiredEmail'],
|
|
18
|
+
};
|
|
19
|
+
const violations = validate({ userEmail: '' }, rules);
|
|
20
|
+
expect(violations).toHaveLength(2);
|
|
21
|
+
expect(violations[0]).toEqual({
|
|
22
|
+
path: 'userEmail',
|
|
23
|
+
constraint: 'notBlank',
|
|
24
|
+
message: 'This value should not be blank.',
|
|
25
|
+
value: '',
|
|
26
|
+
});
|
|
27
|
+
expect(violations[1]).toEqual({
|
|
28
|
+
path: 'userEmail',
|
|
29
|
+
constraint: 'email',
|
|
30
|
+
message: 'This value is not a valid email address.',
|
|
31
|
+
value: '',
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
it('accepts object rule definitions with options', () => {
|
|
35
|
+
const requiredEmail = compound(['notBlank', { email: { message: 'Invalid email' } }]);
|
|
36
|
+
const validate = createValidator({
|
|
37
|
+
constraints: {
|
|
38
|
+
requiredEmail,
|
|
39
|
+
notBlank,
|
|
40
|
+
email,
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
const rules = {
|
|
44
|
+
userEmail: ['requiredEmail'],
|
|
45
|
+
};
|
|
46
|
+
const violations = validate({ userEmail: '' }, rules);
|
|
47
|
+
expect(violations).toHaveLength(2);
|
|
48
|
+
expect(violations[0]).toEqual({
|
|
49
|
+
path: 'userEmail',
|
|
50
|
+
constraint: 'notBlank',
|
|
51
|
+
message: 'This value should not be blank.',
|
|
52
|
+
value: '',
|
|
53
|
+
});
|
|
54
|
+
expect(violations[1]).toEqual({
|
|
55
|
+
path: 'userEmail',
|
|
56
|
+
constraint: 'email',
|
|
57
|
+
message: 'Invalid email',
|
|
58
|
+
value: '',
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
it('uses the nested value passed via applyConstraints', () => {
|
|
62
|
+
const requiredEmail = compound([{ email: { normalizer: (value) => value.trim() } }]);
|
|
63
|
+
const validate = createValidator({
|
|
64
|
+
constraints: {
|
|
65
|
+
requiredEmail,
|
|
66
|
+
email,
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
const rules = {
|
|
70
|
+
userEmail: ['requiredEmail'],
|
|
71
|
+
};
|
|
72
|
+
const violations = validate({ userEmail: ' user@example.com ' }, rules);
|
|
73
|
+
expect(violations).toHaveLength(0);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
//# sourceMappingURL=compound.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compound.integration.test.js","sourceRoot":"","sources":["../../../../src/validator/constraints/other/compound.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compound.js","sourceRoot":"","sources":["../../../../src/validator/constraints/other/compound.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,QAAQ,CAAC,KAAiB;IACxC,OAAO,SAAS,kBAAkB,CAAC,KAAc,EAAE,OAA0B;QAC3E,OAAO,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compound.test.d.ts","sourceRoot":"","sources":["../../../../src/validator/constraints/other/compound.test.ts"],"names":[],"mappings":""}
|