@thisisagile/easy 15.5.2 → 15.6.1
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.
|
@@ -46,6 +46,6 @@ const maxLength = (length, message) => (0, exports.constraint)(v => (0, types_1.
|
|
|
46
46
|
.map(v => (0, types_1.text)(v).toString().length <= length)
|
|
47
47
|
.orElse(true), message ?? `Value {actual} cannot be longer than '${length}' characters.`);
|
|
48
48
|
exports.maxLength = maxLength;
|
|
49
|
-
const rule = (message) => (0, exports.constraint)(v => ((0, types_1.isFunction)(v) ? v() : false), message ?? `Value {actual} must be true`);
|
|
49
|
+
const rule = (message) => (0, exports.constraint)(v => ((0, types_1.isFunction)(v) ? v() : (0, types_1.isBoolean)(v) ? v : false), message ?? `Value {actual} must be true`);
|
|
50
50
|
exports.rule = rule;
|
|
51
51
|
//# sourceMappingURL=Contraints.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Contraints.js","sourceRoot":"","sources":["../../src/validation/Contraints.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Contraints.js","sourceRoot":"","sources":["../../src/validation/Contraints.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ exports.asResults = asResults;
|
|
|
8
8
|
const validators = (subject) => (0, types_1.meta)(subject)
|
|
9
9
|
.keys('constraint')
|
|
10
10
|
.reduce((list, vs) => list.add(vs), (0, types_1.toList)());
|
|
11
|
-
const runValidator = (v, subject) => (0, types_1.tryTo)(() => subject[v.property])
|
|
11
|
+
const runValidator = (v, subject) => (0, types_1.tryTo)(() => ((0, types_1.isFunction)(subject[v.property]) ? subject[v.property]() : subject[v.property]))
|
|
12
12
|
.map(actual => [actual, v.constraint(actual)])
|
|
13
13
|
.map(([actual, res]) => ((0, types_1.isResults)(res) ? res : !res ? (0, exports.asResults)(subject, v.text, { ...v, actual }) : (0, types_1.toResults)()))
|
|
14
14
|
.recover(e => (0, exports.asResults)(subject, (0, types_1.asString)(e))).value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validate.js","sourceRoot":"","sources":["../../src/validation/Validate.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Validate.js","sourceRoot":"","sources":["../../src/validation/Validate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.6.1",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "15.
|
|
34
|
+
"@thisisagile/easy-test": "15.6.1",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^9.0.2",
|
|
37
37
|
"@types/luxon": "3.2.0",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Func, inFuture, inPast, isDefined, isFunction, isIn, isNotEmpty, isString, List, meta, Results, text, Text, toList, tryTo } from '../types';
|
|
1
|
+
import { Func, inFuture, inPast, isBoolean, isDefined, isFunction, isIn, isNotEmpty, isString, List, meta, Results, text, Text, toList, tryTo } from '../types';
|
|
2
2
|
import { validate, Validator } from './Validate';
|
|
3
3
|
|
|
4
4
|
export type Constraint = Func<boolean | Results, any>;
|
|
@@ -64,4 +64,4 @@ export const maxLength = (length: number, message?: Text): PropertyDecorator =>
|
|
|
64
64
|
);
|
|
65
65
|
|
|
66
66
|
export const rule = (message?: Text): PropertyDecorator =>
|
|
67
|
-
constraint(v => (isFunction(v) ? (v() as boolean | Results) : false), message ?? `Value {actual} must be true`);
|
|
67
|
+
constraint(v => (isFunction(v) ? (v() as boolean | Results) : isBoolean(v) ? v : false), message ?? `Value {actual} must be true`);
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
choose,
|
|
4
4
|
isArray,
|
|
5
5
|
isEnum,
|
|
6
|
+
isFunction,
|
|
6
7
|
isResults,
|
|
7
8
|
isValidatable,
|
|
8
9
|
isValue,
|
|
@@ -32,7 +33,7 @@ const validators = (subject: unknown): List<Validator> =>
|
|
|
32
33
|
.reduce((list, vs) => list.add(vs), toList<Validator>());
|
|
33
34
|
|
|
34
35
|
const runValidator = (v: Validator, subject?: unknown): Results =>
|
|
35
|
-
tryTo(() => (subject as any)[v.property])
|
|
36
|
+
tryTo(() => (isFunction((subject as any)[v.property]) ? (subject as any)[v.property]() : (subject as any)[v.property]))
|
|
36
37
|
.map(actual => [actual, v.constraint(actual)])
|
|
37
38
|
.map(([actual, res]) => (isResults(res) ? res : !res ? asResults(subject, v.text, { ...v, actual }) : toResults()))
|
|
38
39
|
.recover(e => asResults(subject, asString(e))).value;
|