@ivlev-dev/silent-validation 0.12.0 → 0.13.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/README.md +59 -26
- package/dist/engine.d.ts +2 -0
- package/dist/engine.d.ts.map +1 -1
- package/dist/engine.js +239 -56
- package/dist/engine.js.map +1 -1
- package/dist/messages.d.ts +2 -0
- package/dist/messages.d.ts.map +1 -1
- package/dist/messages.js +129 -14
- package/dist/messages.js.map +1 -1
- package/dist/modifiers.d.ts.map +1 -1
- package/dist/modifiers.js +5 -11
- package/dist/modifiers.js.map +1 -1
- package/dist/property.d.ts.map +1 -1
- package/dist/property.js +6 -3
- package/dist/property.js.map +1 -1
- package/dist/registry.d.ts +1 -1
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +106 -3
- package/dist/registry.js.map +1 -1
- package/dist/rules/strings.d.ts.map +1 -1
- package/dist/rules/strings.js +45 -5
- package/dist/rules/strings.js.map +1 -1
- package/dist/type-validation.d.ts +11 -0
- package/dist/type-validation.d.ts.map +1 -1
- package/dist/type-validation.js +121 -17
- package/dist/type-validation.js.map +1 -1
- package/dist/types.d.ts +2 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +3 -3
package/dist/registry.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { constructorOf } from "./property.js";
|
|
2
2
|
const states = new WeakMap();
|
|
3
|
+
const conditionIdentities = new WeakMap();
|
|
3
4
|
export function classStateFor(ctor) {
|
|
4
5
|
let state = states.get(ctor);
|
|
5
6
|
if (state === undefined) {
|
|
@@ -39,12 +40,107 @@ function beginToken(state, token, field) {
|
|
|
39
40
|
state.revision += 1;
|
|
40
41
|
return true;
|
|
41
42
|
}
|
|
43
|
+
function sameValue(a, b, seen) {
|
|
44
|
+
if (Object.is(a, b)) {
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
if (a instanceof RegExp || b instanceof RegExp) {
|
|
51
|
+
return a instanceof RegExp
|
|
52
|
+
&& b instanceof RegExp
|
|
53
|
+
&& a.source === b.source
|
|
54
|
+
&& a.flags === b.flags;
|
|
55
|
+
}
|
|
56
|
+
if (a instanceof Date || b instanceof Date) {
|
|
57
|
+
return a instanceof Date
|
|
58
|
+
&& b instanceof Date
|
|
59
|
+
&& a.getTime() === b.getTime();
|
|
60
|
+
}
|
|
61
|
+
if (Array.isArray(a) || Array.isArray(b)) {
|
|
62
|
+
if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
for (let index = 0; index < a.length; index += 1) {
|
|
66
|
+
if (!sameValue(a[index], b[index], seen)) {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
if (a instanceof Map || b instanceof Map || a instanceof Set || b instanceof Set) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
const proto = Object.getPrototypeOf(a);
|
|
76
|
+
if (proto !== Object.getPrototypeOf(b) || (proto !== Object.prototype && proto !== null)) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
let matched = seen.get(a);
|
|
80
|
+
if (matched?.has(b) === true) {
|
|
81
|
+
return true;
|
|
82
|
+
}
|
|
83
|
+
if (matched === undefined) {
|
|
84
|
+
matched = new Set();
|
|
85
|
+
seen.set(a, matched);
|
|
86
|
+
}
|
|
87
|
+
matched.add(b);
|
|
88
|
+
const keysA = Object.keys(a);
|
|
89
|
+
const keysB = Object.keys(b);
|
|
90
|
+
if (keysA.length !== keysB.length) {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
for (const key of keysA) {
|
|
94
|
+
if (!Object.hasOwn(b, key)) {
|
|
95
|
+
return false;
|
|
96
|
+
}
|
|
97
|
+
const left = a[key];
|
|
98
|
+
const right = b[key];
|
|
99
|
+
if (!sameValue(left, right, seen)) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
return true;
|
|
104
|
+
}
|
|
105
|
+
function sameGroups(left, right) {
|
|
106
|
+
const leftEmpty = left === undefined || left.length === 0;
|
|
107
|
+
const rightEmpty = right === undefined || right.length === 0;
|
|
108
|
+
if (leftEmpty || rightEmpty) {
|
|
109
|
+
return leftEmpty && rightEmpty;
|
|
110
|
+
}
|
|
111
|
+
return left.length === right.length
|
|
112
|
+
&& left.every((group, index) => group === right[index]);
|
|
113
|
+
}
|
|
114
|
+
function sameOptions(left, right) {
|
|
115
|
+
return left.message === right.message
|
|
116
|
+
&& left.messageKey === right.messageKey
|
|
117
|
+
&& left.label === right.label
|
|
118
|
+
&& left.when === right.when
|
|
119
|
+
&& left.each === right.each
|
|
120
|
+
&& sameGroups(left.groups, right.groups);
|
|
121
|
+
}
|
|
122
|
+
function sameRule(left, right) {
|
|
123
|
+
if (left === right) {
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
if (left.name !== right.name || left.nested !== right.nested || left.check !== right.check) {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
return sameValue(left.params, right.params, new Map());
|
|
130
|
+
}
|
|
131
|
+
function hasSameRule(slot, entry) {
|
|
132
|
+
return slot.rules.some((existing) => (sameRule(existing.rule, entry.rule) && sameOptions(existing.options, entry.options)));
|
|
133
|
+
}
|
|
42
134
|
export function installRule(ctor, token, entry) {
|
|
43
135
|
const state = classStateFor(ctor);
|
|
44
136
|
if (!beginToken(state, token, entry.field)) {
|
|
45
137
|
return;
|
|
46
138
|
}
|
|
47
|
-
fieldSlot(state, entry.field, entry.fieldName)
|
|
139
|
+
const slot = fieldSlot(state, entry.field, entry.fieldName);
|
|
140
|
+
if (hasSameRule(slot, entry)) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
slot.rules.push(entry);
|
|
48
144
|
}
|
|
49
145
|
export function installLabel(ctor, token, field, fieldName, label) {
|
|
50
146
|
const state = classStateFor(ctor);
|
|
@@ -67,12 +163,19 @@ export function installOptional(ctor, token, field, fieldName) {
|
|
|
67
163
|
}
|
|
68
164
|
fieldSlot(state, field, fieldName).optional = true;
|
|
69
165
|
}
|
|
70
|
-
export function installCondition(ctor, token, field, fieldName, condition) {
|
|
166
|
+
export function installCondition(ctor, token, field, fieldName, condition, identity) {
|
|
71
167
|
const state = classStateFor(ctor);
|
|
72
168
|
if (!beginToken(state, token, field)) {
|
|
73
169
|
return;
|
|
74
170
|
}
|
|
75
|
-
fieldSlot(state, field, fieldName)
|
|
171
|
+
const slot = fieldSlot(state, field, fieldName);
|
|
172
|
+
const key = identity ?? condition;
|
|
173
|
+
const existing = slot.conditions.some((candidate) => ((conditionIdentities.get(candidate) ?? candidate) === key));
|
|
174
|
+
if (existing) {
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
conditionIdentities.set(condition, key);
|
|
178
|
+
slot.conditions.push(condition);
|
|
76
179
|
}
|
|
77
180
|
export function validationStateFor(instance) {
|
|
78
181
|
const ctor = constructorOf(instance);
|
package/dist/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.d.ts","sourceRoot":"","sources":["../../src/rules/strings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,WAAW,EACZ,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"strings.d.ts","sourceRoot":"","sources":["../../src/rules/strings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,WAAW,EACZ,MAAM,aAAa,CAAC;AA0HrB,eAAO,MAAM,WAAW;;;;YAGV,GAAG;;;;;;;YAMH,GAAG;;;;;;;YAMH,MAAM;;;;;;;YAMN,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DpB,CAAC;AAEF,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3E;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3E;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3E;AAED,wBAAgB,OAAO,CACrB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,CAAC,EAAE,WAAW,GACpB,aAAa,CAMf;AAED,wBAAgB,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE5D;AAED,wBAAgB,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE1D;AAED,wBAAgB,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3D;AAED,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE9D;AAED,wBAAgB,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE5D;AAED,wBAAgB,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE5D;AAED,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAEnE;AAED,wBAAgB,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3D;AAED,wBAAgB,UAAU,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE/D;AAED,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE7D;AAED,wBAAgB,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,aAAa,CAE3D"}
|
package/dist/rules/strings.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ruleDecorator } from "../rule.js";
|
|
2
2
|
const EMAIL_PATTERN = /^[A-Za-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[A-Za-z0-9!#$%&'*+/=?^_`{|}~-]+)*@[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?(?:\.[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*\.[A-Za-z]{2,}$/;
|
|
3
3
|
const UUID_PATTERN = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
|
|
4
|
-
const ISO8601_PATTERN =
|
|
4
|
+
const ISO8601_PATTERN = /^(\d{4})-(\d{2})-(\d{2})(?:[T ](\d{2}):(\d{2})(?::(\d{2})(?:\.\d{1,9})?)?(Z|[+-]\d{2}:\d{2})?)?$/;
|
|
5
5
|
const PHONE_PATTERN = /^\+?[0-9 ()-]{7,20}$/;
|
|
6
6
|
const ALPHA_PATTERN = /^\p{L}+$/u;
|
|
7
7
|
const ALPHANUMERIC_PATTERN = /^[\p{L}\p{N}]+$/u;
|
|
@@ -11,6 +11,9 @@ const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/
|
|
|
11
11
|
function isString(value) {
|
|
12
12
|
return typeof value === "string";
|
|
13
13
|
}
|
|
14
|
+
function stringLength(value) {
|
|
15
|
+
return Array.from(value).length;
|
|
16
|
+
}
|
|
14
17
|
function numericParam(value) {
|
|
15
18
|
return typeof value === "number" ? value : Number.NaN;
|
|
16
19
|
}
|
|
@@ -44,10 +47,47 @@ function isHttpUrl(value) {
|
|
|
44
47
|
return false;
|
|
45
48
|
}
|
|
46
49
|
}
|
|
50
|
+
function daysInMonth(year, month) {
|
|
51
|
+
if (month === 2) {
|
|
52
|
+
const leap = year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
|
|
53
|
+
return leap ? 29 : 28;
|
|
54
|
+
}
|
|
55
|
+
if (month === 4 || month === 6 || month === 9 || month === 11) {
|
|
56
|
+
return 30;
|
|
57
|
+
}
|
|
58
|
+
return 31;
|
|
59
|
+
}
|
|
47
60
|
function isIso8601(value) {
|
|
48
|
-
|
|
61
|
+
const match = ISO8601_PATTERN.exec(value);
|
|
62
|
+
if (match === null) {
|
|
49
63
|
return false;
|
|
50
64
|
}
|
|
65
|
+
const year = Number(match[1]);
|
|
66
|
+
const month = Number(match[2]);
|
|
67
|
+
const day = Number(match[3]);
|
|
68
|
+
if (month < 1 || month > 12 || day < 1 || day > daysInMonth(year, month)) {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
if (match[4] !== undefined) {
|
|
72
|
+
const hour = Number(match[4]);
|
|
73
|
+
const minute = Number(match[5]);
|
|
74
|
+
const second = match[6] === undefined ? 0 : Number(match[6]);
|
|
75
|
+
const endOfDay = hour === 24 && minute === 0 && second === 0;
|
|
76
|
+
if ((hour > 23 && !endOfDay) || minute > 59 || second > 59) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
const zone = match[7];
|
|
80
|
+
if (zone !== undefined && zone !== "Z") {
|
|
81
|
+
const zoneHour = Number(zone.slice(1, 3));
|
|
82
|
+
const zoneMinute = Number(zone.slice(4, 6));
|
|
83
|
+
if (zoneHour > 23 || zoneMinute > 59) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
// Date.parse отсекает невозможные значения (например, месяц 13),
|
|
89
|
+
// но нормализует переполнение дня (2024-02-31 -> 2 марта), поэтому
|
|
90
|
+
// компоненты проверяются выше вручную.
|
|
51
91
|
return !Number.isNaN(Date.parse(value));
|
|
52
92
|
}
|
|
53
93
|
function isBase64(value) {
|
|
@@ -69,17 +109,17 @@ export const stringRules = {
|
|
|
69
109
|
minLength: {
|
|
70
110
|
name: "minLength",
|
|
71
111
|
params: { min: 0 },
|
|
72
|
-
check: (value, context) => isString(value) && value
|
|
112
|
+
check: (value, context) => isString(value) && stringLength(value) >= numericParam(context.params.min),
|
|
73
113
|
},
|
|
74
114
|
maxLength: {
|
|
75
115
|
name: "maxLength",
|
|
76
116
|
params: { max: Number.MAX_SAFE_INTEGER },
|
|
77
|
-
check: (value, context) => isString(value) && value
|
|
117
|
+
check: (value, context) => isString(value) && stringLength(value) <= numericParam(context.params.max),
|
|
78
118
|
},
|
|
79
119
|
length: {
|
|
80
120
|
name: "length",
|
|
81
121
|
params: { length: 0 },
|
|
82
|
-
check: (value, context) => isString(value) && value
|
|
122
|
+
check: (value, context) => isString(value) && stringLength(value) === numericParam(context.params.length),
|
|
83
123
|
},
|
|
84
124
|
matches: {
|
|
85
125
|
name: "matches",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/rules/strings.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,aAAa,GACjB,yLAAyL,CAAC;AAC5L,MAAM,YAAY,GAChB,+EAA+E,CAAC;AAClF,MAAM,eAAe,GACnB,
|
|
1
|
+
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/rules/strings.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,14 @@ export interface TypeRuntime {
|
|
|
14
14
|
resolvedClasses?: WeakMap<object, Function | null> | undefined;
|
|
15
15
|
lazyResolutions?: WeakMap<object, LazyResolution> | undefined;
|
|
16
16
|
instanceFields?: WeakMap<Function, FieldSchemaMap | null> | undefined;
|
|
17
|
+
/**
|
|
18
|
+
* Успешно проверенные пары (значение-объект, схема) → минимальная глубина,
|
|
19
|
+
* на которой проверка завершилась без ошибок. Кешируются только пустые
|
|
20
|
+
* результаты: ошибки зависят от пути и labels.
|
|
21
|
+
*/
|
|
22
|
+
successCache?: WeakMap<object, Map<TypeSchema, number>> | undefined;
|
|
23
|
+
/** Счётчик срабатываний защиты от циклов; успехи с циклами не кешируются. */
|
|
24
|
+
cycleHits?: number | undefined;
|
|
17
25
|
}
|
|
18
26
|
export interface TypeValidationContext {
|
|
19
27
|
readonly instance: object;
|
|
@@ -25,7 +33,10 @@ export interface TypeValidationContext {
|
|
|
25
33
|
readonly visiting?: WeakSet<object>;
|
|
26
34
|
readonly runtime?: TypeRuntime | undefined;
|
|
27
35
|
readonly nested?: NestedInstance[] | undefined;
|
|
36
|
+
/** Остановиться после первой ошибки (используется движком при stopAtFirst). */
|
|
37
|
+
readonly stopAtFirst?: boolean | undefined;
|
|
28
38
|
}
|
|
39
|
+
export declare const MAX_DEPTH = 256;
|
|
29
40
|
export declare function validateFastPrimitive(value: unknown, schema: TypeSchema, context: TypeValidationContext): ValidationError | null | undefined;
|
|
30
41
|
export declare function typeName(schema: TypeSchema): string;
|
|
31
42
|
export declare function validateType(value: unknown, schema: TypeSchema, context: TypeValidationContext): ValidationError | ValidationError[] | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-validation.d.ts","sourceRoot":"","sources":["../src/type-validation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAEV,gBAAgB,EAChB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,cAAc;IACtB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACvD,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IAC/D,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC;IAC9D,cAAc,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"type-validation.d.ts","sourceRoot":"","sources":["../src/type-validation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAEV,gBAAgB,EAChB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,cAAc;IACtB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACvD,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IAC/D,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC;IAC9D,cAAc,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IACtE;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IACpE,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC/D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAC/C,+EAA+E;IAC/E,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC5C;AAqBD,eAAO,MAAM,SAAS,MAAM,CAAC;AAiN7B,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,qBAAqB,GAC7B,eAAe,GAAG,IAAI,GAAG,SAAS,CAiBpC;AAuFD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAEnD;AAuqBD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,qBAAqB,GAC7B,eAAe,GAAG,eAAe,EAAE,GAAG,IAAI,CAyB5C"}
|
package/dist/type-validation.js
CHANGED
|
@@ -2,7 +2,7 @@ import { DEFAULT_LOCALE, resolveMessage } from "./messages.js";
|
|
|
2
2
|
import { constructorOf, readFieldValue } from "./property.js";
|
|
3
3
|
import { readClassSchema, readInstanceSchema } from "./schema.js";
|
|
4
4
|
import { isThenable, suppress, suppressThenable } from "./thenable.js";
|
|
5
|
-
const MAX_DEPTH = 256;
|
|
5
|
+
export const MAX_DEPTH = 256;
|
|
6
6
|
const PRIMITIVE_NAMES = {
|
|
7
7
|
string: "string",
|
|
8
8
|
number: "number",
|
|
@@ -336,6 +336,34 @@ function createError(value, schema, ctx, name) {
|
|
|
336
336
|
function depthError(value, ctx) {
|
|
337
337
|
return buildError(value, { type: "depth" }, ctx, "validation.depth");
|
|
338
338
|
}
|
|
339
|
+
function appendErrors(target, source) {
|
|
340
|
+
for (let index = 0; index < source.length; index += 1) {
|
|
341
|
+
const error = source[index];
|
|
342
|
+
if (error !== undefined) {
|
|
343
|
+
target.push(error);
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
const PATH_IDENTIFIER = /^[A-Za-z_$][\w$]*$/;
|
|
348
|
+
function childPath(parent, key) {
|
|
349
|
+
return PATH_IDENTIFIER.test(key)
|
|
350
|
+
? `${parent}.${key}`
|
|
351
|
+
: `${parent}[${JSON.stringify(key)}]`;
|
|
352
|
+
}
|
|
353
|
+
function mapKeyLabel(key, index) {
|
|
354
|
+
switch (typeof key) {
|
|
355
|
+
case "string":
|
|
356
|
+
return key;
|
|
357
|
+
case "number":
|
|
358
|
+
case "bigint":
|
|
359
|
+
case "boolean":
|
|
360
|
+
case "symbol":
|
|
361
|
+
case "undefined":
|
|
362
|
+
return String(key);
|
|
363
|
+
default:
|
|
364
|
+
return `#${index}`;
|
|
365
|
+
}
|
|
366
|
+
}
|
|
339
367
|
function childContext(ctx, path, label, index) {
|
|
340
368
|
return {
|
|
341
369
|
...ctx,
|
|
@@ -344,14 +372,41 @@ function childContext(ctx, path, label, index) {
|
|
|
344
372
|
index,
|
|
345
373
|
};
|
|
346
374
|
}
|
|
375
|
+
function cycleHit(runtime) {
|
|
376
|
+
runtime.cycleHits = (runtime.cycleHits ?? 0) + 1;
|
|
377
|
+
}
|
|
347
378
|
function enter(value, ctx) {
|
|
348
379
|
const visiting = ctx.runtime.visiting;
|
|
349
380
|
if (visiting.has(value)) {
|
|
381
|
+
cycleHit(ctx.runtime);
|
|
350
382
|
return false;
|
|
351
383
|
}
|
|
352
384
|
visiting.add(value);
|
|
353
385
|
return true;
|
|
354
386
|
}
|
|
387
|
+
function isLazyActive(runtime, schema, value) {
|
|
388
|
+
if (!Array.isArray(schema) || schema[0] !== "lazy") {
|
|
389
|
+
return false;
|
|
390
|
+
}
|
|
391
|
+
const active = runtime.lazyActive?.get(schema);
|
|
392
|
+
return active !== undefined && active.has(value);
|
|
393
|
+
}
|
|
394
|
+
function lookupSuccess(runtime, value, schema, depth) {
|
|
395
|
+
const stored = runtime.successCache?.get(value)?.get(schema);
|
|
396
|
+
return stored !== undefined && depth <= stored;
|
|
397
|
+
}
|
|
398
|
+
function recordSuccess(runtime, value, schema, depth) {
|
|
399
|
+
const cache = runtime.successCache ??= new WeakMap();
|
|
400
|
+
let entry = cache.get(value);
|
|
401
|
+
if (entry === undefined) {
|
|
402
|
+
entry = new Map();
|
|
403
|
+
cache.set(value, entry);
|
|
404
|
+
}
|
|
405
|
+
const stored = entry.get(schema);
|
|
406
|
+
if (stored === undefined || depth < stored) {
|
|
407
|
+
entry.set(schema, depth);
|
|
408
|
+
}
|
|
409
|
+
}
|
|
355
410
|
function leave(value, ctx) {
|
|
356
411
|
ctx.runtime.visiting.delete(value);
|
|
357
412
|
}
|
|
@@ -382,8 +437,11 @@ function validateFields(owner, fields, ctx, childDepth) {
|
|
|
382
437
|
if (fieldSchema === undefined) {
|
|
383
438
|
continue;
|
|
384
439
|
}
|
|
385
|
-
const path =
|
|
386
|
-
errors
|
|
440
|
+
const path = childPath(ctx.path, key);
|
|
441
|
+
appendErrors(errors, validateSchema(readFieldValue(owner, key), fieldSchema, childContext(ctx, path, key, undefined), childDepth));
|
|
442
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
443
|
+
return errors;
|
|
444
|
+
}
|
|
387
445
|
}
|
|
388
446
|
return errors;
|
|
389
447
|
}
|
|
@@ -395,7 +453,10 @@ function validateArray(value, itemSchema, ctx, depth) {
|
|
|
395
453
|
try {
|
|
396
454
|
for (let index = 0; index < value.length; index += 1) {
|
|
397
455
|
const path = `${ctx.path}[${index}]`;
|
|
398
|
-
errors
|
|
456
|
+
appendErrors(errors, validateSchema(value[index], itemSchema, childContext(ctx, path, undefined, index), depth + 1));
|
|
457
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
458
|
+
return errors;
|
|
459
|
+
}
|
|
399
460
|
}
|
|
400
461
|
}
|
|
401
462
|
finally {
|
|
@@ -411,12 +472,15 @@ function validateMap(value, keySchema, valueSchema, ctx, depth) {
|
|
|
411
472
|
try {
|
|
412
473
|
let index = 0;
|
|
413
474
|
for (const [key, entryValue] of value) {
|
|
414
|
-
const
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
errors
|
|
475
|
+
const path = `${ctx.path}[${mapKeyLabel(key, index)}]`;
|
|
476
|
+
appendErrors(errors, validateSchema(entryValue, valueSchema, childContext(ctx, path, undefined, index), depth + 1));
|
|
477
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
478
|
+
return errors;
|
|
479
|
+
}
|
|
480
|
+
appendErrors(errors, validateSchema(key, keySchema, childContext(ctx, `${path}.key`, "key", index), depth + 1));
|
|
481
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
482
|
+
return errors;
|
|
483
|
+
}
|
|
420
484
|
index += 1;
|
|
421
485
|
}
|
|
422
486
|
}
|
|
@@ -434,7 +498,10 @@ function validateSet(value, itemSchema, ctx, depth) {
|
|
|
434
498
|
let index = 0;
|
|
435
499
|
for (const item of value) {
|
|
436
500
|
const path = `${ctx.path}[${index}]`;
|
|
437
|
-
errors
|
|
501
|
+
appendErrors(errors, validateSchema(item, itemSchema, childContext(ctx, path, undefined, index), depth + 1));
|
|
502
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
503
|
+
return errors;
|
|
504
|
+
}
|
|
438
505
|
index += 1;
|
|
439
506
|
}
|
|
440
507
|
}
|
|
@@ -474,12 +541,18 @@ function validateTuple(value, items, rest, schema, ctx, depth) {
|
|
|
474
541
|
continue;
|
|
475
542
|
}
|
|
476
543
|
const path = `${ctx.path}[${index}]`;
|
|
477
|
-
errors
|
|
544
|
+
appendErrors(errors, validateSchema(value[index], itemSchema, childContext(ctx, path, undefined, index), depth + 1));
|
|
545
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
546
|
+
return errors;
|
|
547
|
+
}
|
|
478
548
|
}
|
|
479
549
|
if (rest !== undefined) {
|
|
480
550
|
for (let index = items.length; index < value.length; index += 1) {
|
|
481
551
|
const path = `${ctx.path}[${index}]`;
|
|
482
|
-
errors
|
|
552
|
+
appendErrors(errors, validateSchema(value[index], rest, childContext(ctx, path, undefined, index), depth + 1));
|
|
553
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
554
|
+
return errors;
|
|
555
|
+
}
|
|
483
556
|
}
|
|
484
557
|
}
|
|
485
558
|
}
|
|
@@ -590,6 +663,29 @@ function validateSchema(value, schema, ctx, depth) {
|
|
|
590
663
|
if (depth > MAX_DEPTH) {
|
|
591
664
|
return [depthError(value, ctx)];
|
|
592
665
|
}
|
|
666
|
+
const target = typeof value === "object" && value !== null ? value : undefined;
|
|
667
|
+
const runtime = ctx.runtime;
|
|
668
|
+
if (target !== undefined) {
|
|
669
|
+
// Значение уже в стеке (цикл) или lazy-ветка активна для него —
|
|
670
|
+
// кеш не используем: результат получен через защиту от циклов.
|
|
671
|
+
if (!runtime.visiting.has(target) && !isLazyActive(runtime, schema, value)) {
|
|
672
|
+
if (lookupSuccess(runtime, target, schema, depth)) {
|
|
673
|
+
return [];
|
|
674
|
+
}
|
|
675
|
+
}
|
|
676
|
+
}
|
|
677
|
+
const cyclesBefore = runtime.cycleHits ?? 0;
|
|
678
|
+
const nestedMark = ctx.nested?.length ?? 0;
|
|
679
|
+
const errors = validateSchemaCore(value, schema, ctx, depth);
|
|
680
|
+
if (target !== undefined
|
|
681
|
+
&& errors.length === 0
|
|
682
|
+
&& (runtime.cycleHits ?? 0) === cyclesBefore
|
|
683
|
+
&& (ctx.nested === undefined || ctx.nested.length === nestedMark)) {
|
|
684
|
+
recordSuccess(runtime, target, schema, depth);
|
|
685
|
+
}
|
|
686
|
+
return errors;
|
|
687
|
+
}
|
|
688
|
+
function validateSchemaCore(value, schema, ctx, depth) {
|
|
593
689
|
if (typeof schema === "string") {
|
|
594
690
|
return matchesPrimitive(value, schema) ? [] : [createError(value, schema, ctx)];
|
|
595
691
|
}
|
|
@@ -621,12 +717,13 @@ function validateSchema(value, schema, ctx, depth) {
|
|
|
621
717
|
const lazyActive = ctx.runtime.lazyActive ??= new Map();
|
|
622
718
|
const active = lazyActive.get(schema);
|
|
623
719
|
if (active !== undefined && active.has(value)) {
|
|
720
|
+
cycleHit(ctx.runtime);
|
|
624
721
|
return [];
|
|
625
722
|
}
|
|
626
723
|
if (active === undefined) {
|
|
627
724
|
lazyActive.set(schema, new Set([value]));
|
|
628
725
|
try {
|
|
629
|
-
return validateSchema(value, resolved, ctx, depth
|
|
726
|
+
return validateSchema(value, resolved, ctx, depth);
|
|
630
727
|
}
|
|
631
728
|
finally {
|
|
632
729
|
lazyActive.delete(schema);
|
|
@@ -634,7 +731,7 @@ function validateSchema(value, schema, ctx, depth) {
|
|
|
634
731
|
}
|
|
635
732
|
active.add(value);
|
|
636
733
|
try {
|
|
637
|
-
return validateSchema(value, resolved, ctx, depth
|
|
734
|
+
return validateSchema(value, resolved, ctx, depth);
|
|
638
735
|
}
|
|
639
736
|
finally {
|
|
640
737
|
active.delete(value);
|
|
@@ -656,7 +753,10 @@ function validateSchema(value, schema, ctx, depth) {
|
|
|
656
753
|
case "intersection": {
|
|
657
754
|
const errors = [];
|
|
658
755
|
for (const branch of schema[1]) {
|
|
659
|
-
errors
|
|
756
|
+
appendErrors(errors, validateSchema(value, branch, ctx, depth));
|
|
757
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
758
|
+
return errors;
|
|
759
|
+
}
|
|
660
760
|
}
|
|
661
761
|
return dedupeErrors(errors);
|
|
662
762
|
}
|
|
@@ -694,7 +794,10 @@ function validateSchema(value, schema, ctx, depth) {
|
|
|
694
794
|
const errors = [];
|
|
695
795
|
try {
|
|
696
796
|
for (const [key, entryValue] of Object.entries(value)) {
|
|
697
|
-
errors
|
|
797
|
+
appendErrors(errors, validateSchema(entryValue, fieldSchema, childContext(ctx, childPath(ctx.path, key), key, undefined), depth + 1));
|
|
798
|
+
if (ctx.stopAtFirst && errors.length > 0) {
|
|
799
|
+
return errors;
|
|
800
|
+
}
|
|
698
801
|
}
|
|
699
802
|
}
|
|
700
803
|
finally {
|
|
@@ -732,6 +835,7 @@ export function validateType(value, schema, context) {
|
|
|
732
835
|
},
|
|
733
836
|
nested: context.nested,
|
|
734
837
|
index: undefined,
|
|
838
|
+
stopAtFirst: context.stopAtFirst === true,
|
|
735
839
|
};
|
|
736
840
|
const errors = validateSchema(value, schema, ctx, 0);
|
|
737
841
|
if (errors.length === 0) {
|