@fougere/schema 0.12.4-alpha.0 → 0.12.5-alpha.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/axis/boundary/Boundary.d.ts +6 -1
- package/dist/axis/boundary/Boundary.d.ts.map +1 -1
- package/dist/axis/boundary/Boundary.js +81 -9
- package/dist/axis/boundary/Boundary.js.map +1 -1
- package/dist/axis/boundary/Decoder.js +1 -1
- package/dist/axis/boundary/Decoder.js.map +1 -1
- package/dist/validator/FieldValueValidator.d.ts.map +1 -1
- package/dist/validator/FieldValueValidator.js +2 -1
- package/dist/validator/FieldValueValidator.js.map +1 -1
- package/package.json +3 -2
- package/src/axis/boundary/Boundary.ts +81 -8
- package/src/axis/boundary/Decoder.ts +1 -1
- package/src/validator/FieldValueValidator.ts +2 -1
|
@@ -39,8 +39,13 @@ export declare class Boundary {
|
|
|
39
39
|
/** The server fills it, so a caller never sends it. */
|
|
40
40
|
static admitsAbsence(field: Field): boolean;
|
|
41
41
|
static of(field: Field): Boundary;
|
|
42
|
-
/**
|
|
42
|
+
/**
|
|
43
|
+
* `date-time` means a `Date` on both sides, without a word in the entity — and so does a
|
|
44
|
+
* `date-time` inside `json(Address)`, read off the properties the shape already states.
|
|
45
|
+
*/
|
|
43
46
|
static forShape(shape: Shape | undefined): Boundary;
|
|
47
|
+
private static within;
|
|
48
|
+
private static each;
|
|
44
49
|
/** The dual of `declared`: what `readOnly()` writes back on the field, not a judge. */
|
|
45
50
|
declaring(overrides: BoundaryRules): BoundaryRules;
|
|
46
51
|
readOnly(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Boundary.d.ts","sourceRoot":"","sources":["../../../src/axis/boundary/Boundary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Boundary.d.ts","sourceRoot":"","sources":["../../../src/axis/boundary/Boundary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM5D,QAAA,MAAM,KAAK;;;;;;;EAAoF,CAAC;AAEhG,QAAA,MAAM,QAAQ;;;;;;;kBAGb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,QAAQ,CAAC,CAAC;AAMpD,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,KAAK;IANxB,MAAM,CAAC,QAAQ,CAAC,MAAM;;;;;;;uBAAY;IAElC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB,OAAO,eAMN;IAED,mCAAmC;IACnC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,QAAQ,CAStC;IAED,uDAAuD;IACvD,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE1C;IAED,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,QAAQ,CAsBhC;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,QAAQ,CAalD;IAED,OAAO,CAAC,MAAM,CAAC,MAAM;IAgCrB,OAAO,CAAC,MAAM,CAAC,IAAI;IAwBnB,uFAAuF;IACvF,SAAS,CAAC,SAAS,EAAE,aAAa,GAAG,aAAa,CAEjD;IAED,QAAQ,IAAI,OAAO,CAElB;IAED,SAAS,IAAI,OAAO,CAEnB;CACF;AAED,OAAO,QAAQ,2BAA2B,CAAC;IACzC,UAAU,gBAAgB;QACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC;KACjC;CACF"}
|
|
@@ -2,6 +2,7 @@ import { Boundaries } from './Decoder.js';
|
|
|
2
2
|
import { Shapes } from '../shape/Shape.js';
|
|
3
3
|
import { SchemaError } from '../../SchemaError.js';
|
|
4
4
|
import { Format } from '../../lib/Format.js';
|
|
5
|
+
import { isObject } from '../../lib/utils.js';
|
|
5
6
|
const closedOr = (verb) => Format.either(Format.tokens(['closed']), Format.of().key(verb, Format.text).needs(verb).closed());
|
|
6
7
|
const RULES = Format.of().key('in', closedOr('decode')).key('out', closedOr('encode')).closed();
|
|
7
8
|
const BOUNDARY = Format.named('axis/boundary', Format.either(Format.text.as(), RULES));
|
|
@@ -41,20 +42,91 @@ export class Boundary {
|
|
|
41
42
|
out: declared.rules.out ?? derived.rules.out,
|
|
42
43
|
};
|
|
43
44
|
return new Boundary(rules, {
|
|
44
|
-
decode:
|
|
45
|
-
?
|
|
46
|
-
:
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
decode: rules.in === 'closed'
|
|
46
|
+
? identityDecoder
|
|
47
|
+
: typeof declared.rules.in === 'object'
|
|
48
|
+
? Boundaries.decoders.resolve(declared.rules.in.decode)
|
|
49
|
+
: derived.decode,
|
|
50
|
+
encode: rules.out === 'closed'
|
|
51
|
+
? identityEncoder
|
|
52
|
+
: typeof declared.rules.out === 'object'
|
|
53
|
+
? Boundaries.encoders.resolve(declared.rules.out.encode)
|
|
54
|
+
: derived.encode,
|
|
50
55
|
});
|
|
51
56
|
}
|
|
52
|
-
/**
|
|
57
|
+
/**
|
|
58
|
+
* `date-time` means a `Date` on both sides, without a word in the entity — and so does a
|
|
59
|
+
* `date-time` inside `json(Address)`, read off the properties the shape already states.
|
|
60
|
+
*/
|
|
53
61
|
static forShape(shape) {
|
|
54
|
-
if (Shapes.typeOf(shape) === 'date')
|
|
55
|
-
return new Boundary(Boundaries.aliases.resolve('isoDate')
|
|
62
|
+
if (Shapes.typeOf(shape) === 'date') {
|
|
63
|
+
return new Boundary(Boundaries.aliases.resolve('isoDate'), {
|
|
64
|
+
decode: Boundaries.decoders.resolve('isoDate'),
|
|
65
|
+
encode: Boundaries.encoders.resolve('isoDate'),
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
const base = Shapes.of(shape).base;
|
|
69
|
+
if (base?.type === 'object' && base.properties)
|
|
70
|
+
return Boundary.within(base.properties);
|
|
71
|
+
if (base?.type === 'array' && base.items)
|
|
72
|
+
return Boundary.each(Boundary.forShape(base.items));
|
|
56
73
|
return new Boundary();
|
|
57
74
|
}
|
|
75
|
+
static within(properties) {
|
|
76
|
+
const boundaries = Object.entries(properties)
|
|
77
|
+
.map(([key, shape]) => [key, Boundary.forShape(shape)])
|
|
78
|
+
.filter(([, boundary]) => boundary.decode !== identityDecoder);
|
|
79
|
+
if (boundaries.length === 0)
|
|
80
|
+
return new Boundary();
|
|
81
|
+
const decode = (value) => {
|
|
82
|
+
if (!isObject(value))
|
|
83
|
+
return { value };
|
|
84
|
+
const row = { ...value };
|
|
85
|
+
for (const [key, boundary] of boundaries) {
|
|
86
|
+
if (row[key] === null || row[key] === undefined)
|
|
87
|
+
continue;
|
|
88
|
+
const verdict = boundary.decode(row[key]);
|
|
89
|
+
if ('message' in verdict)
|
|
90
|
+
return { ...verdict, path: [key, ...(verdict.path ?? [])] };
|
|
91
|
+
row[key] = verdict.value;
|
|
92
|
+
}
|
|
93
|
+
return { value: row };
|
|
94
|
+
};
|
|
95
|
+
const encode = (value) => {
|
|
96
|
+
if (!isObject(value))
|
|
97
|
+
return value;
|
|
98
|
+
const row = { ...value };
|
|
99
|
+
for (const [key, boundary] of boundaries) {
|
|
100
|
+
if (row[key] === null || row[key] === undefined)
|
|
101
|
+
continue;
|
|
102
|
+
row[key] = boundary.encode(row[key]);
|
|
103
|
+
}
|
|
104
|
+
return row;
|
|
105
|
+
};
|
|
106
|
+
return new Boundary({}, { decode, encode });
|
|
107
|
+
}
|
|
108
|
+
static each(item) {
|
|
109
|
+
if (item.decode === identityDecoder)
|
|
110
|
+
return new Boundary();
|
|
111
|
+
const decode = (value) => {
|
|
112
|
+
if (!Array.isArray(value))
|
|
113
|
+
return { value };
|
|
114
|
+
const items = [];
|
|
115
|
+
for (const [index, element] of value.entries()) {
|
|
116
|
+
if (element === null || element === undefined) {
|
|
117
|
+
items.push(element);
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
const verdict = item.decode(element);
|
|
121
|
+
if ('message' in verdict)
|
|
122
|
+
return { ...verdict, path: [String(index), ...(verdict.path ?? [])] };
|
|
123
|
+
items.push(verdict.value);
|
|
124
|
+
}
|
|
125
|
+
return { value: items };
|
|
126
|
+
};
|
|
127
|
+
const encode = (value) => Array.isArray(value) ? value.map((element) => (element === null || element === undefined ? element : item.encode(element))) : value;
|
|
128
|
+
return new Boundary({}, { decode, encode });
|
|
129
|
+
}
|
|
58
130
|
/** The dual of `declared`: what `readOnly()` writes back on the field, not a judge. */
|
|
59
131
|
declaring(overrides) {
|
|
60
132
|
return { in: overrides.in ?? this.rules.in, out: overrides.out ?? this.rules.out };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Boundary.js","sourceRoot":"","sources":["../../../src/axis/boundary/Boundary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Boundary.js","sourceRoot":"","sources":["../../../src/axis/boundary/Boundary.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,6 @@ Boundaries.decoders.register('isoDate', (value) => {
|
|
|
20
20
|
}
|
|
21
21
|
return { message: 'Expected a date' };
|
|
22
22
|
});
|
|
23
|
-
Boundaries.encoders.register('isoDate', (value) => value instanceof Date ? value.toISOString() : value);
|
|
23
|
+
Boundaries.encoders.register('isoDate', (value) => value instanceof Date && !Number.isNaN(value.getTime()) ? value.toISOString() : value);
|
|
24
24
|
Boundaries.aliases.register('isoDate', { in: { decode: 'isoDate' }, out: { encode: 'isoDate' } });
|
|
25
25
|
//# sourceMappingURL=Decoder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Decoder.js","sourceRoot":"","sources":["../../../src/axis/boundary/Decoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAWjD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,IAAI,QAAQ,CACpB,kBAAkB,EAClB,6CAA6C,CAC9C;IACD,QAAQ,EAAE,IAAI,QAAQ,CACpB,kBAAkB,EAClB,6CAA6C,CAC9C;IACD,OAAO,EAAE,IAAI,QAAQ,CAAgB,gBAAgB,CAAC;CACvD,CAAC;AAEF,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;IAChD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAE7B,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACtF,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxC,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAChD,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"Decoder.js","sourceRoot":"","sources":["../../../src/axis/boundary/Decoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAWjD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,IAAI,QAAQ,CACpB,kBAAkB,EAClB,6CAA6C,CAC9C;IACD,QAAQ,EAAE,IAAI,QAAQ,CACpB,kBAAkB,EAClB,6CAA6C,CAC9C;IACD,OAAO,EAAE,IAAI,QAAQ,CAAgB,gBAAgB,CAAC;CACvD,CAAC;AAEF,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;IAChD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAE7B,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACtF,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxC,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAChD,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CACtF,CAAC;AACF,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldValueValidator.d.ts","sourceRoot":"","sources":["../../src/validator/FieldValueValidator.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAUjD,qBAAa,mBAAmB;IAGV,OAAO,CAAC,QAAQ,CAAC,KAAK;IAF1C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAoC;IAEjE,OAAO,eAA8C;IAErD,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,mBAAmB,CAE3C;IAED,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"FieldValueValidator.d.ts","sourceRoot":"","sources":["../../src/validator/FieldValueValidator.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAUjD,qBAAa,mBAAmB;IAGV,OAAO,CAAC,QAAQ,CAAC,KAAK;IAF1C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAoC;IAEjE,OAAO,eAA8C;IAErD,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,mBAAmB,CAE3C;IAED,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsBhC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAM7B;IAED,OAAO,CAAC,MAAM,CAAC,OAAO;IAetB,OAAO,CAAC,MAAM,CAAC,cAAc;CAW9B"}
|
|
@@ -26,7 +26,8 @@ export class FieldValueValidator {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
const plan = FieldValueValidator.planFor(shape);
|
|
29
|
-
const
|
|
29
|
+
const travelling = type === 'object' || type === 'array' ? Boundary.forShape(shape).encode(value) : value;
|
|
30
|
+
const refusal = JsonSchemaValidator.of(shape).refusalOf(travelling, []);
|
|
30
31
|
if (refusal) {
|
|
31
32
|
return refusal.path.length > 0 ? { message: refusal.message, path: refusal.path } : { message: refusal.message };
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldValueValidator.js","sourceRoot":"","sources":["../../src/validator/FieldValueValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAO/D,MAAM,OAAO,mBAAmB;IAGO,KAAK;IAFlC,MAAM,CAAU,KAAK,GAAG,IAAI,OAAO,EAAqB,CAAC;IAEjE,YAAqC,KAAY;qBAAZ,KAAK;IAAU,CAAC;IAErD,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,KAAY;QACpB,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,KAAc;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,IAAI,KAAK,MAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC7C,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,SAAS,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClG,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,CAAC,KAAmB,CAAC,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"FieldValueValidator.js","sourceRoot":"","sources":["../../src/validator/FieldValueValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAO/D,MAAM,OAAO,mBAAmB;IAGO,KAAK;IAFlC,MAAM,CAAU,KAAK,GAAG,IAAI,OAAO,EAAqB,CAAC;IAEjE,YAAqC,KAAY;qBAAZ,KAAK;IAAU,CAAC;IAErD,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,KAAY;QACpB,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,KAAc;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,IAAI,KAAK,MAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC7C,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,SAAS,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClG,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC1G,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,CAAC,KAAmB,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACtF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QACnH,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpE,OAAO,EAAE,OAAO,EAAE,iCAAiC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;QAC3E,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAc;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,SAAS,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QACzC,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI;YAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAEnD,OAAO,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,KAAY;QACjC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACrE,IAAI,GAAG;gBACL,MAAM,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;gBAC9E,UAAU;aACX,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,IAAY;QACxC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,WAAW,CACnB,oBAAoB,IAAI,+CAA+C,IAAI,UAAU;gBACnF,wBAAwB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,gDAAgD,CAC5G,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fougere/schema",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.5-alpha.0",
|
|
4
4
|
"description": "The entity and its 4 axes — shape, role, lifecycle, boundary. Subject-owned judgments, edge-safe.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fougere",
|
|
@@ -36,7 +36,8 @@
|
|
|
36
36
|
"@cfworker/json-schema": "^4.1.1",
|
|
37
37
|
"@paralleldrive/cuid2": "^3.3.0",
|
|
38
38
|
"@standard-schema/spec": "^1.1.0",
|
|
39
|
-
"dequal": "^2.0.3"
|
|
39
|
+
"dequal": "^2.0.3",
|
|
40
|
+
"@types/json-schema": "^7.0.15"
|
|
40
41
|
},
|
|
41
42
|
"devDependencies": {
|
|
42
43
|
"@tanstack/form-core": "^1.33.5",
|
|
@@ -6,6 +6,7 @@ import { type Shape } from '../shape/Shape.js';
|
|
|
6
6
|
import { Shapes } from '../shape/Shape.js';
|
|
7
7
|
import { SchemaError } from '../../SchemaError.js';
|
|
8
8
|
import { Format, type Accepted } from '../../lib/Format.js';
|
|
9
|
+
import { isObject } from '../../lib/utils.js';
|
|
9
10
|
|
|
10
11
|
const closedOr = <Verb extends 'decode' | 'encode'>(verb: Verb) =>
|
|
11
12
|
Format.either(Format.tokens(['closed']), Format.of().key(verb, Format.text).needs(verb).closed());
|
|
@@ -66,23 +67,95 @@ export class Boundary {
|
|
|
66
67
|
|
|
67
68
|
return new Boundary(rules, {
|
|
68
69
|
decode:
|
|
69
|
-
|
|
70
|
-
?
|
|
71
|
-
:
|
|
70
|
+
rules.in === 'closed'
|
|
71
|
+
? identityDecoder
|
|
72
|
+
: typeof declared.rules.in === 'object'
|
|
73
|
+
? Boundaries.decoders.resolve(declared.rules.in.decode)
|
|
74
|
+
: derived.decode,
|
|
72
75
|
encode:
|
|
73
|
-
|
|
74
|
-
?
|
|
75
|
-
:
|
|
76
|
+
rules.out === 'closed'
|
|
77
|
+
? identityEncoder
|
|
78
|
+
: typeof declared.rules.out === 'object'
|
|
79
|
+
? Boundaries.encoders.resolve(declared.rules.out.encode)
|
|
80
|
+
: derived.encode,
|
|
76
81
|
});
|
|
77
82
|
}
|
|
78
83
|
|
|
79
|
-
/**
|
|
84
|
+
/**
|
|
85
|
+
* `date-time` means a `Date` on both sides, without a word in the entity — and so does a
|
|
86
|
+
* `date-time` inside `json(Address)`, read off the properties the shape already states.
|
|
87
|
+
*/
|
|
80
88
|
static forShape(shape: Shape | undefined): Boundary {
|
|
81
|
-
if (Shapes.typeOf(shape) === 'date')
|
|
89
|
+
if (Shapes.typeOf(shape) === 'date') {
|
|
90
|
+
return new Boundary(Boundaries.aliases.resolve('isoDate'), {
|
|
91
|
+
decode: Boundaries.decoders.resolve('isoDate'),
|
|
92
|
+
encode: Boundaries.encoders.resolve('isoDate'),
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const base = Shapes.of(shape).base;
|
|
97
|
+
if (base?.type === 'object' && base.properties) return Boundary.within(base.properties as Record<string, Shape>);
|
|
98
|
+
if (base?.type === 'array' && base.items) return Boundary.each(Boundary.forShape(base.items));
|
|
82
99
|
|
|
83
100
|
return new Boundary();
|
|
84
101
|
}
|
|
85
102
|
|
|
103
|
+
private static within(properties: Record<string, Shape>): Boundary {
|
|
104
|
+
const boundaries = Object.entries(properties)
|
|
105
|
+
.map(([key, shape]) => [key, Boundary.forShape(shape)] as const)
|
|
106
|
+
.filter(([, boundary]) => boundary.decode !== identityDecoder);
|
|
107
|
+
if (boundaries.length === 0) return new Boundary();
|
|
108
|
+
|
|
109
|
+
const decode: Decoder = (value) => {
|
|
110
|
+
if (!isObject(value)) return { value };
|
|
111
|
+
const row: Record<string, unknown> = { ...value };
|
|
112
|
+
for (const [key, boundary] of boundaries) {
|
|
113
|
+
if (row[key] === null || row[key] === undefined) continue;
|
|
114
|
+
const verdict = boundary.decode(row[key]);
|
|
115
|
+
if ('message' in verdict) return { ...verdict, path: [key, ...(verdict.path ?? [])] };
|
|
116
|
+
row[key] = verdict.value;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
return { value: row };
|
|
120
|
+
};
|
|
121
|
+
const encode: Encoder = (value) => {
|
|
122
|
+
if (!isObject(value)) return value;
|
|
123
|
+
const row: Record<string, unknown> = { ...value };
|
|
124
|
+
for (const [key, boundary] of boundaries) {
|
|
125
|
+
if (row[key] === null || row[key] === undefined) continue;
|
|
126
|
+
row[key] = boundary.encode(row[key]);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
return row;
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
return new Boundary({}, { decode, encode });
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
private static each(item: Boundary): Boundary {
|
|
136
|
+
if (item.decode === identityDecoder) return new Boundary();
|
|
137
|
+
|
|
138
|
+
const decode: Decoder = (value) => {
|
|
139
|
+
if (!Array.isArray(value)) return { value };
|
|
140
|
+
const items: unknown[] = [];
|
|
141
|
+
for (const [index, element] of value.entries()) {
|
|
142
|
+
if (element === null || element === undefined) {
|
|
143
|
+
items.push(element);
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
const verdict = item.decode(element);
|
|
147
|
+
if ('message' in verdict) return { ...verdict, path: [String(index), ...(verdict.path ?? [])] };
|
|
148
|
+
items.push(verdict.value);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
return { value: items };
|
|
152
|
+
};
|
|
153
|
+
const encode: Encoder = (value) =>
|
|
154
|
+
Array.isArray(value) ? value.map((element) => (element === null || element === undefined ? element : item.encode(element))) : value;
|
|
155
|
+
|
|
156
|
+
return new Boundary({}, { decode, encode });
|
|
157
|
+
}
|
|
158
|
+
|
|
86
159
|
/** The dual of `declared`: what `readOnly()` writes back on the field, not a judge. */
|
|
87
160
|
declaring(overrides: BoundaryRules): BoundaryRules {
|
|
88
161
|
return { in: overrides.in ?? this.rules.in, out: overrides.out ?? this.rules.out };
|
|
@@ -40,6 +40,6 @@ Boundaries.decoders.register('isoDate', (value) => {
|
|
|
40
40
|
return { message: 'Expected a date' };
|
|
41
41
|
});
|
|
42
42
|
Boundaries.encoders.register('isoDate', (value) =>
|
|
43
|
-
value instanceof Date ? value.toISOString() : value,
|
|
43
|
+
value instanceof Date && !Number.isNaN(value.getTime()) ? value.toISOString() : value,
|
|
44
44
|
);
|
|
45
45
|
Boundaries.aliases.register('isoDate', { in: { decode: 'isoDate' }, out: { encode: 'isoDate' } });
|
|
@@ -37,7 +37,8 @@ export class FieldValueValidator {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
const plan = FieldValueValidator.planFor(shape);
|
|
40
|
-
const
|
|
40
|
+
const travelling = type === 'object' || type === 'array' ? Boundary.forShape(shape).encode(value) : value;
|
|
41
|
+
const refusal = JsonSchemaValidator.of(shape as JsonSchema).refusalOf(travelling, []);
|
|
41
42
|
if (refusal) {
|
|
42
43
|
return refusal.path.length > 0 ? { message: refusal.message, path: refusal.path } : { message: refusal.message };
|
|
43
44
|
}
|