@fougere/schema 0.12.2-alpha.0 → 0.12.4-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/Schema.d.ts +4 -13
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js.map +1 -1
- package/dist/SchemaConstraints.d.ts +2 -2
- package/dist/SchemaConstraints.d.ts.map +1 -1
- package/dist/SchemaConstraints.js +6 -10
- package/dist/SchemaConstraints.js.map +1 -1
- package/dist/SchemaDefinition.d.ts +7 -10
- package/dist/SchemaDefinition.d.ts.map +1 -1
- package/dist/SchemaDefinition.js +9 -23
- package/dist/SchemaDefinition.js.map +1 -1
- package/dist/SchemaView.d.ts +2 -2
- package/dist/SchemaView.d.ts.map +1 -1
- package/dist/axis/shape/Shape.d.ts +4 -0
- package/dist/axis/shape/Shape.d.ts.map +1 -1
- package/dist/axis/shape/Shape.js +7 -3
- package/dist/axis/shape/Shape.js.map +1 -1
- package/dist/entity/EntityAdapterSet.d.ts +1 -0
- package/dist/entity/EntityAdapterSet.d.ts.map +1 -1
- package/dist/entity/EntityAdapterSet.js +2 -1
- package/dist/entity/EntityAdapterSet.js.map +1 -1
- package/dist/projection/card/Card.d.ts.map +1 -1
- package/dist/projection/card/Card.js +3 -6
- package/dist/projection/card/Card.js.map +1 -1
- package/dist/projection/card/Diff.d.ts.map +1 -1
- package/dist/projection/card/Diff.js +2 -4
- package/dist/projection/card/Diff.js.map +1 -1
- package/dist/validator/FieldValueValidator.d.ts.map +1 -1
- package/dist/validator/FieldValueValidator.js +0 -1
- package/dist/validator/FieldValueValidator.js.map +1 -1
- package/package.json +1 -1
- package/src/Schema.ts +14 -25
- package/src/SchemaConstraints.ts +10 -14
- package/src/SchemaDefinition.ts +17 -33
- package/src/SchemaView.ts +2 -2
- package/src/axis/shape/Shape.ts +8 -5
- package/src/entity/EntityAdapterSet.ts +3 -1
- package/src/projection/card/Card.ts +3 -6
- package/src/projection/card/Diff.ts +2 -4
- package/src/validator/FieldValueValidator.ts +0 -1
package/dist/Schema.d.ts
CHANGED
|
@@ -5,8 +5,7 @@ import { type EntityDeclarations } from './entity/EntityDeclarations.js';
|
|
|
5
5
|
import { type PreviousNames } from './entity/PreviousNames.js';
|
|
6
6
|
import { type EntityAdapters } from './entity/EntityAdapters.js';
|
|
7
7
|
import { SchemaDerivation } from './SchemaDerivation.js';
|
|
8
|
-
import { type
|
|
9
|
-
import { SchemaDefinition } from './SchemaDefinition.js';
|
|
8
|
+
import { SchemaDefinition, type SchemaDeclaration } from './SchemaDefinition.js';
|
|
10
9
|
import { type ValidateOptions } from './validator/ValidateOptions.js';
|
|
11
10
|
import type { SchemaView } from './SchemaView.js';
|
|
12
11
|
import type { SchemaConstructor } from './SchemaConstructor.js';
|
|
@@ -23,8 +22,8 @@ export declare class Schema {
|
|
|
23
22
|
static getFields(): Fields;
|
|
24
23
|
/** An entry survives every derivation that kept its field: `Post.pick('body').getAdapters()`. */
|
|
25
24
|
static getAdapters(): EntityAdapters<Fields>;
|
|
26
|
-
static getUnique(): FieldGroups<Fields
|
|
27
|
-
static getIndex(): FieldGroups<Fields
|
|
25
|
+
static getUnique(): FieldGroups<Fields>;
|
|
26
|
+
static getIndex(): FieldGroups<Fields>;
|
|
28
27
|
static getOpts(): ValidateOptions;
|
|
29
28
|
static validate(input: unknown): import("./index.js").ValidationResult<Record<string, unknown>>;
|
|
30
29
|
static from(data: Record<string, unknown>): Record<string, unknown>;
|
|
@@ -38,15 +37,7 @@ export declare class Schema {
|
|
|
38
37
|
static extend(extra: Fields): SchemaConstructor<Fields>;
|
|
39
38
|
static named(name: string): typeof Schema;
|
|
40
39
|
static compose<T extends SchemaView[]>(...sources: T): SchemaConstructor<Merged<T>>;
|
|
41
|
-
static of<TFields extends Fields>(declaration:
|
|
42
|
-
fields: TFields;
|
|
43
|
-
derivation?: SchemaDerivation;
|
|
44
|
-
adapters?: EntityAdapters<TFields>;
|
|
45
|
-
opts?: ValidateOptions;
|
|
46
|
-
previous?: PreviousNames<TFields>;
|
|
47
|
-
anchored?: boolean;
|
|
48
|
-
constraints?: SchemaConstraints;
|
|
49
|
-
}): SchemaConstructor<TFields>;
|
|
40
|
+
static of<TFields extends Fields>(declaration: SchemaDeclaration<TFields>): SchemaConstructor<TFields>;
|
|
50
41
|
private static subclass;
|
|
51
42
|
}
|
|
52
43
|
type Merged<T extends SchemaView[]> = UnionToIntersection<T[number] extends {
|
package/dist/Schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"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"}
|
package/dist/Schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Schema.js","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAMvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"Schema.js","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAMvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAA0B,MAAM,uBAAuB,CAAC;AAMjF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAE9C,MAAM,OAAO,MAAM;IACjB,uFAAuF;IACvF,MAAM,CAAC,UAAU,GAAqB,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAE1E,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;IACpC,CAAC;IACD,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;IAClC,CAAC;IACD,kEAAkE;IAClE,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED,YAAY,IAA8B;QACxC,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE;gBAC/B,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,CAAC,SAAS;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAChC,CAAC;IACD,iGAAiG;IACjG,MAAM,CAAC,WAAW;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;IAC7C,CAAC;IACD,MAAM,CAAC,SAAS;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,QAAQ;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC;IAC3C,CAAC;IACD,MAAM,CAAC,OAAO;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,KAAc;QAC5B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAEzC,OAAO,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,IAA6B;QACvC,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;gBAAE,SAAS;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjB,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjD,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1D,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM,KAAK,CAAC,WAAW,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAEzC,OAAO;YACL,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,QAAQ,CAAC,KAAc;gBACrB,MAAM,OAAO,GAAG,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAChE,IAAI,OAAO,CAAC,OAAO;oBAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;gBAEpD,OAAO;oBACL,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBACjC,OAAO,EAAE,CAAC,CAAC,OAAO;wBAClB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;qBACrE,CAAC,CAAC;iBACJ,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,IAAc;QAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,IAAc;QAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAA+B;QAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,YAAwC;QACtD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,OAAO;QACZ,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAa;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAY;QACvB,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,WAAW,CAAC,cAAc,IAAI,+BAA+B,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACxC,MAAM,IAAI,WAAW,CACnB,cAAc,IAAI,CAAC,IAAI,+CAA+C,CACvE,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,OAAO,CAAyB,GAAG,OAAU;QAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,EAAE,CAAyB,WAAuC;QACvE,OAAO,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEO,MAAM,CAAC,QAAQ,CACrB,UAA4B;QAE5B,MAAM,OAAQ,SAAQ,MAAM;SAAG;QAC/B,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;QAChC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;YACrC,KAAK,EAAE,qBAAqB;YAC5B,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,OAAgD,CAAC;IAC1D,CAAC;CACF"}
|
|
@@ -8,8 +8,8 @@ import { type FieldGroups } from './entity/FieldGroups.js';
|
|
|
8
8
|
* argument in a list that has already lost one.
|
|
9
9
|
*/
|
|
10
10
|
export declare class SchemaConstraints<TFields extends Fields = Fields> {
|
|
11
|
-
readonly unique
|
|
12
|
-
readonly index
|
|
11
|
+
readonly unique: FieldGroups<TFields>;
|
|
12
|
+
readonly index: FieldGroups<TFields>;
|
|
13
13
|
private constructor();
|
|
14
14
|
static readonly none: SchemaConstraints<Fields>;
|
|
15
15
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaConstraints.d.ts","sourceRoot":"","sources":["../src/SchemaConstraints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D;;;;;;GAMG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"SchemaConstraints.d.ts","sourceRoot":"","sources":["../src/SchemaConstraints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D;;;;;;GAMG;AACH,qBAAa,iBAAiB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IAE1D,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAFtC,OAAO,eAGH;IAEJ,MAAM,CAAC,QAAQ,CAAC,IAAI,4BAAiC;IAErD;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,OAAO,SAAS,MAAM,EAC9B,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QAAC,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;KAAE,GACtE,iBAAiB,CAAC,OAAO,CAAC,CAE5B;IAED,oFAAoF;IACpF,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAAG,iBAAiB,CAKzE;CACF"}
|
|
@@ -9,12 +9,10 @@ export class SchemaConstraints {
|
|
|
9
9
|
unique;
|
|
10
10
|
index;
|
|
11
11
|
constructor(unique, index) {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (index)
|
|
15
|
-
this.index = index;
|
|
12
|
+
this.unique = unique;
|
|
13
|
+
this.index = index;
|
|
16
14
|
}
|
|
17
|
-
static none = new SchemaConstraints();
|
|
15
|
+
static none = new SchemaConstraints([], []);
|
|
18
16
|
/**
|
|
19
17
|
* The order is part of a group, so `['a','b']` and `['b','a']` are two constraints.
|
|
20
18
|
* FR : l'ordre fait partie du groupe : `['a','b']` et `['b','a']` sont deux contraintes.
|
|
@@ -31,17 +29,15 @@ export class SchemaConstraints {
|
|
|
31
29
|
});
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
|
-
const deduped = (groups) => {
|
|
35
|
-
if (!groups)
|
|
36
|
-
return undefined;
|
|
32
|
+
const deduped = (groups = []) => {
|
|
37
33
|
const seen = new Map();
|
|
38
34
|
for (const group of groups)
|
|
39
35
|
seen.set(JSON.stringify(group), group);
|
|
40
|
-
return
|
|
36
|
+
return [...seen.values()];
|
|
41
37
|
};
|
|
42
38
|
const survivors = (groups, transform) => {
|
|
43
39
|
const kept = [];
|
|
44
|
-
for (const group of groups
|
|
40
|
+
for (const group of groups) {
|
|
45
41
|
const renamed = group.map(transform);
|
|
46
42
|
if (renamed.every((key) => key !== undefined))
|
|
47
43
|
kept.push(renamed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaConstraints.js","sourceRoot":"","sources":["../src/SchemaConstraints.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,OAAO,iBAAiB;
|
|
1
|
+
{"version":3,"file":"SchemaConstraints.js","sourceRoot":"","sources":["../src/SchemaConstraints.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,OAAO,iBAAiB;IAEjB,MAAM;IACN,KAAK;IAFhB,YACW,MAA4B,EAC5B,KAA2B;sBAD3B,MAAM;qBACN,KAAK;IACb,CAAC;IAEJ,MAAM,CAAU,IAAI,GAAG,IAAI,iBAAiB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAErD;;;;OAIG;IACH,MAAM,CAAC,EAAE,CACP,MAAuE;QAEvE,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,oFAAoF;IACpF,OAAO,CAAC,SAA8C;QACpD,OAAO,iBAAiB,CAAC,EAAE,CAAC;YAC1B,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC;YACzC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,GAAG,CACd,MAAM,GAAyB,EAAE,EACX,EAAE;IACxB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAyC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,MAAM;QAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAEnE,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,MAA2B,EAC3B,SAA8C,EAClC,EAAE;IACd,MAAM,IAAI,GAAe,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
import { type Fields } from './field/Fields.js';
|
|
2
2
|
import { type EntityDeclarations } from './entity/EntityDeclarations.js';
|
|
3
3
|
import { type PreviousNames } from './entity/PreviousNames.js';
|
|
4
|
-
import { type EntityAdapters } from './entity/EntityAdapters.js';
|
|
5
4
|
import { EntityAdapterSet } from './entity/EntityAdapterSet.js';
|
|
6
5
|
import { SchemaDerivation } from './SchemaDerivation.js';
|
|
7
6
|
import { type ValidateOptions } from './validator/ValidateOptions.js';
|
|
8
7
|
import type { SchemaView } from './SchemaView.js';
|
|
9
8
|
import { SchemaConstraints } from './SchemaConstraints.js';
|
|
9
|
+
/** What a schema is built from; the rest is stated by `declares` or inherited by a derivation. */
|
|
10
|
+
export interface SchemaDeclaration<TFields extends Fields> {
|
|
11
|
+
fields: TFields;
|
|
12
|
+
opts?: ValidateOptions;
|
|
13
|
+
constraints?: SchemaConstraints;
|
|
14
|
+
}
|
|
10
15
|
/**
|
|
11
16
|
* Everything a schema IS, apart from being a class whose instances are rows.
|
|
12
17
|
*
|
|
@@ -38,15 +43,7 @@ export declare class SchemaDefinition {
|
|
|
38
43
|
*/
|
|
39
44
|
private restated;
|
|
40
45
|
/** Built complete or not at all — no static assigned on the side. */
|
|
41
|
-
static of(declaration:
|
|
42
|
-
fields: Fields;
|
|
43
|
-
adapters?: EntityAdapters<Fields>;
|
|
44
|
-
opts?: ValidateOptions;
|
|
45
|
-
previous?: PreviousNames<Fields>;
|
|
46
|
-
derivation?: SchemaDerivation;
|
|
47
|
-
anchored?: boolean;
|
|
48
|
-
constraints?: SchemaConstraints;
|
|
49
|
-
}): SchemaDefinition;
|
|
46
|
+
static of(declaration: SchemaDeclaration<Fields>): SchemaDefinition;
|
|
50
47
|
declaring(declarations: EntityDeclarations<Fields>): SchemaDefinition;
|
|
51
48
|
anchoring(): SchemaDefinition;
|
|
52
49
|
pick(keys: readonly string[], root: SchemaView): SchemaDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaDefinition.d.ts","sourceRoot":"","sources":["../src/SchemaDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SchemaDefinition.d.ts","sourceRoot":"","sources":["../src/SchemaDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAoB3D,kGAAkG;AAClG,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,MAAM;IACvD,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACjC;AAKD;;;;;;;;;;GAUG;AACH,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,UAAU,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAExC,OAAO,eAQN;IAED;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO;IAItB;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAIhB,qEAAqE;IACrE,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAQlE;IAED,SAAS,CAAC,YAAY,EAAE,kBAAkB,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAiBpE;IAED,SAAS,IAAI,gBAAgB,CAE5B;IAED,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,gBAAgB,CAIhE;IAED,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,gBAAgB,CAKhE;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,GAAG,gBAAgB,CAK1E;IAED;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAiBhB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,gBAAgB,CAQ1C;IAED,sFAAsF;IACtF,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,gBAAgB,CAQ1D;IAED,6EAA6E;IAC7E,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,gBAAgB,CAqB5D;IAED;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,MAAM;CAKf"}
|
package/dist/SchemaDefinition.js
CHANGED
|
@@ -43,42 +43,28 @@ export class SchemaDefinition {
|
|
|
43
43
|
* What they do not name is kept, and that is the whole difference with `derived`.
|
|
44
44
|
*/
|
|
45
45
|
restated(state) {
|
|
46
|
-
return new SchemaDefinition({
|
|
47
|
-
fields: this.fields,
|
|
48
|
-
adapterSet: this.adapterSet,
|
|
49
|
-
opts: this.opts,
|
|
50
|
-
previous: this.previous,
|
|
51
|
-
derivation: this.derivation,
|
|
52
|
-
anchored: this.anchored,
|
|
53
|
-
constraints: this.constraints,
|
|
54
|
-
...state,
|
|
55
|
-
});
|
|
46
|
+
return new SchemaDefinition({ ...this, ...state });
|
|
56
47
|
}
|
|
57
48
|
/** Built complete or not at all — no static assigned on the side. */
|
|
58
49
|
static of(declaration) {
|
|
59
|
-
return
|
|
50
|
+
return SchemaDefinition.derived({
|
|
60
51
|
fields: declaration.fields,
|
|
61
|
-
adapterSet: EntityAdapterSet.
|
|
52
|
+
adapterSet: EntityAdapterSet.none,
|
|
62
53
|
opts: declaration.opts ?? {},
|
|
63
|
-
|
|
64
|
-
derivation: declaration.derivation,
|
|
65
|
-
anchored: declaration.anchored ?? false,
|
|
54
|
+
derivation: undefined,
|
|
66
55
|
constraints: declaration.constraints ?? SchemaConstraints.none,
|
|
67
56
|
});
|
|
68
57
|
}
|
|
69
58
|
declaring(declarations) {
|
|
70
|
-
const
|
|
59
|
+
const adapterSet = EntityAdapterSet.of(declarations.adapters);
|
|
71
60
|
this.assertKnown('declares', [
|
|
72
|
-
...
|
|
61
|
+
...adapterSet.fieldNames,
|
|
73
62
|
...Object.keys(declarations.previous ?? {}),
|
|
74
63
|
]);
|
|
75
64
|
const declared = FieldSet.declaring(this.fields, declarations);
|
|
76
65
|
return this.restated({
|
|
77
66
|
fields: declared.fields,
|
|
78
|
-
adapterSet: EntityAdapterSet.merged([
|
|
79
|
-
this.adapterSet,
|
|
80
|
-
EntityAdapterSet.of(declarations.adapters),
|
|
81
|
-
]),
|
|
67
|
+
adapterSet: EntityAdapterSet.merged([this.adapterSet, adapterSet]),
|
|
82
68
|
previous: declarations.previous ?? this.previous,
|
|
83
69
|
constraints: declarations.unique === undefined && declarations.index === undefined
|
|
84
70
|
? this.constraints
|
|
@@ -149,8 +135,8 @@ export class SchemaDefinition {
|
|
|
149
135
|
for (const view of views) {
|
|
150
136
|
Object.assign(fields, view.getFields());
|
|
151
137
|
opts = { ...opts, ...view.getOpts() };
|
|
152
|
-
groups.unique.push(...
|
|
153
|
-
groups.index.push(...
|
|
138
|
+
groups.unique.push(...view.getUnique());
|
|
139
|
+
groups.index.push(...view.getIndex());
|
|
154
140
|
}
|
|
155
141
|
return SchemaDefinition.derived({
|
|
156
142
|
fields,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaDefinition.js","sourceRoot":"","sources":["../src/SchemaDefinition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"SchemaDefinition.js","sourceRoot":"","sources":["../src/SchemaDefinition.ts"],"names":[],"mappings":"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"}
|
package/dist/SchemaView.d.ts
CHANGED
|
@@ -16,8 +16,8 @@ export interface SchemaView<TFields extends Fields = Fields> {
|
|
|
16
16
|
readonly anchored?: boolean;
|
|
17
17
|
getFields(): TFields;
|
|
18
18
|
getAdapters(): EntityAdapters<TFields>;
|
|
19
|
-
getUnique(): FieldGroups<TFields
|
|
20
|
-
getIndex(): FieldGroups<TFields
|
|
19
|
+
getUnique(): FieldGroups<TFields>;
|
|
20
|
+
getIndex(): FieldGroups<TFields>;
|
|
21
21
|
getOpts(): ValidateOptions;
|
|
22
22
|
validate(input: unknown): ValidationResult<Values<TFields>>;
|
|
23
23
|
}
|
package/dist/SchemaView.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaView.d.ts","sourceRoot":"","sources":["../src/SchemaView.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC,6EAA6E;IAC7E,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,IAAI,OAAO,CAAC;IACrB,WAAW,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,SAAS,IAAI,WAAW,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"SchemaView.d.ts","sourceRoot":"","sources":["../src/SchemaView.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC,6EAA6E;IAC7E,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,IAAI,OAAO,CAAC;IACrB,WAAW,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,SAAS,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,QAAQ,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,eAAe,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;CAC7D"}
|
|
@@ -79,6 +79,10 @@ export declare class Shapes {
|
|
|
79
79
|
* `{ type: 'string', enum: ['draft'] }` → `{ type: ['string','null'], enum: ['draft', null] }`
|
|
80
80
|
*/
|
|
81
81
|
static nullable(shape: Shape): Shape;
|
|
82
|
+
/** Every type name a shape states — none, since a card may carry a property with no `type`. */
|
|
83
|
+
static typesOf(shape: {
|
|
84
|
+
type?: string | readonly string[];
|
|
85
|
+
}): readonly string[];
|
|
82
86
|
static of(shape?: Shape): ShapeParts;
|
|
83
87
|
static isNullable(shape?: Shape): boolean;
|
|
84
88
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../../src/axis/shape/Shape.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAE3D,yEAAyE;AACzE,UAAU,UAAU;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,iBAAkB,SAAQ,UAAU;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED,UAAU,kBAAmB,SAAQ,UAAU;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;CACnC;AAED,UAAU,gBAAiB,SAAQ,UAAU;IAC3C,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,iBAAkB,SAAQ,UAAU;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IACvC,aAAa,CAAC,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,KAAK,GACb,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;CAAE,GAAG,iBAAiB,CAAC,GAClD,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;CAAE,GAAG,kBAAkB,CAAC,GACzE,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;CAAE,GAAG,UAAU,CAAC,GAC5C,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAAE,GAAG,gBAAgB,CAAC,GAChD,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;CAAE,GAAG,iBAAiB,CAAC,CAAC;AAEvD,eAAO,MAAM,WAAW,YACtB,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,SAAS,EACT,OAAO,EACP,QAAQ,CACA,CAAC;AAEX,KAAK,SAAS,GACV,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,iBAAiB,CAAC,GACxC,CAAC;IAAE,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAA;CAAE,GAAG,kBAAkB,CAAC,GACrD,CAAC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GAAG,UAAU,CAAC,GAClC,CAAC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,gBAAgB,CAAC,GACtC,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG,iBAAiB,CAAC,CAAC;AAE7C,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../../src/axis/shape/Shape.ts"],"names":[],"mappings":"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"}
|
package/dist/axis/shape/Shape.js
CHANGED
|
@@ -6,8 +6,6 @@ export const SHAPE_TYPES = [
|
|
|
6
6
|
'array',
|
|
7
7
|
'object',
|
|
8
8
|
];
|
|
9
|
-
/** Every type name a shape states, whether it states one or a union of them. */
|
|
10
|
-
const typesOf = (shape) => (Array.isArray(shape.type) ? shape.type : [shape.type]);
|
|
11
9
|
export class Shapes {
|
|
12
10
|
static cache = new WeakMap();
|
|
13
11
|
static none = { base: undefined, nullable: false };
|
|
@@ -49,7 +47,7 @@ export class Shapes {
|
|
|
49
47
|
* `{ type: 'string', enum: ['draft'] }` → `{ type: ['string','null'], enum: ['draft', null] }`
|
|
50
48
|
*/
|
|
51
49
|
static nullable(shape) {
|
|
52
|
-
const types = typesOf(shape);
|
|
50
|
+
const types = Shapes.typesOf(shape);
|
|
53
51
|
if (types.includes('null'))
|
|
54
52
|
return shape;
|
|
55
53
|
const nullable = { ...shape, type: [...types, 'null'] };
|
|
@@ -61,6 +59,12 @@ export class Shapes {
|
|
|
61
59
|
}
|
|
62
60
|
return nullable;
|
|
63
61
|
}
|
|
62
|
+
/** Every type name a shape states — none, since a card may carry a property with no `type`. */
|
|
63
|
+
static typesOf(shape) {
|
|
64
|
+
if (shape.type === undefined)
|
|
65
|
+
return [];
|
|
66
|
+
return typeof shape.type === 'string' ? [shape.type] : shape.type;
|
|
67
|
+
}
|
|
64
68
|
static of(shape) {
|
|
65
69
|
if (!shape)
|
|
66
70
|
return this.none;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shape.js","sourceRoot":"","sources":["../../../src/axis/shape/Shape.ts"],"names":[],"mappings":"AA6CA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,SAAS;IACT,OAAO;IACP,QAAQ;CACA,CAAC;AA8BX,
|
|
1
|
+
{"version":3,"file":"Shape.js","sourceRoot":"","sources":["../../../src/axis/shape/Shape.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare class EntityAdapterSet {
|
|
|
6
6
|
* `{ sql: { body: { columnType: { pg: 'tsvector' } } } }`
|
|
7
7
|
*/
|
|
8
8
|
private constructor();
|
|
9
|
+
static readonly none: EntityAdapterSet;
|
|
9
10
|
/**
|
|
10
11
|
* Stops a malformed declaration from propagating, by checking its two levels.
|
|
11
12
|
* `of({ sql: { body: 3 } })` → passes; `of({ sql: 'oops' })` → throws, naming `adapters.sql`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityAdapterSet.d.ts","sourceRoot":"","sources":["../../src/entity/EntityAdapterSet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,qBAAa,gBAAgB;IAIP,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC;IAH7D;;OAEG;IACH,OAAO,eAA0D;IAEjE;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAmB7D;IAED,yEAAyE;IACzE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,gBAAgB,CAQxE;IAED,OAAO,KAAK,OAAO,GAElB;IAED,2FAA2F;IAC3F,IAAI,UAAU,IAAI,MAAM,EAAE,CAIzB;IAED,0EAA0E;IAC1E,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAAG,gBAAgB,CAkBvE;CACF"}
|
|
1
|
+
{"version":3,"file":"EntityAdapterSet.d.ts","sourceRoot":"","sources":["../../src/entity/EntityAdapterSet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,qBAAa,gBAAgB;IAIP,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC;IAH7D;;OAEG;IACH,OAAO,eAA0D;IAEjE,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAA4B;IAEhD;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAmB7D;IAED,yEAAyE;IACzE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,gBAAgB,CAQxE;IAED,OAAO,KAAK,OAAO,GAElB;IAED,2FAA2F;IAC3F,IAAI,UAAU,IAAI,MAAM,EAAE,CAIzB;IAED,0EAA0E;IAC1E,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAAG,gBAAgB,CAkBvE;CACF"}
|
|
@@ -8,13 +8,14 @@ export class EntityAdapterSet {
|
|
|
8
8
|
constructor(adapters) {
|
|
9
9
|
this.adapters = adapters;
|
|
10
10
|
}
|
|
11
|
+
static none = new EntityAdapterSet({});
|
|
11
12
|
/**
|
|
12
13
|
* Stops a malformed declaration from propagating, by checking its two levels.
|
|
13
14
|
* `of({ sql: { body: 3 } })` → passes; `of({ sql: 'oops' })` → throws, naming `adapters.sql`
|
|
14
15
|
*/
|
|
15
16
|
static of(adapters) {
|
|
16
17
|
if (!adapters)
|
|
17
|
-
return
|
|
18
|
+
return EntityAdapterSet.none;
|
|
18
19
|
if (!isObject(adapters)) {
|
|
19
20
|
throw new SchemaError(`adapters: expected an object keyed by adapter name, got ${typeof adapters}.`);
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityAdapterSet.js","sourceRoot":"","sources":["../../src/entity/EntityAdapterSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAKhD,MAAM,OAAO,gBAAgB;IAIE,QAAQ;IAHrC;;OAEG;IACH,YAA6B,QAAgC;wBAAhC,QAAQ;IAA2B,CAAC;IAEjE;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,QAAiC;QACzC,IAAI,CAAC,QAAQ;YAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"EntityAdapterSet.js","sourceRoot":"","sources":["../../src/entity/EntityAdapterSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAKhD,MAAM,OAAO,gBAAgB;IAIE,QAAQ;IAHrC;;OAEG;IACH,YAA6B,QAAgC;wBAAhC,QAAQ;IAA2B,CAAC;IAEjE,MAAM,CAAU,IAAI,GAAG,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,EAAE,CAAC,QAAiC;QACzC,IAAI,CAAC,QAAQ;YAAE,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAE5C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,WAAW,CACnB,2DAA2D,OAAO,QAAQ,GAAG,CAC9E,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,WAAW,CACnB,YAAY,OAAO,iDAAiD,OAAO,MAAM,IAAI;oBACnF,oEAAoE,CACvE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,yEAAyE;IACzE,MAAM,CAAC,MAAM,CAAC,WAAwC;QACpD,MAAM,cAAc,GAA0B,EAAE,CAAC;QAEjD,KAAK,MAAM,UAAU,IAAI,WAAW;YAClC,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,UAAU,CAAC,OAAO;gBACvD,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC;QAE/E,OAAO,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED,IAAY,OAAO;QACjB,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,2FAA2F;IAC3F,IAAI,UAAU;QACZ,OAAO;YACL,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;SACpF,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,MAAM,CAAC,SAA8C;QACnD,MAAM,OAAO,GAA0B,EAAE,CAAC;QAE1C,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACpD,MAAM,MAAM,GAAyB,EAAE,CAAC;YAExC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzD,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAE/B,IAAI,OAAO,KAAK,SAAS;oBAAE,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YACrD,CAAC;YAED,+EAA+E;YAC/E,iDAAiD;YACjD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;gBAAE,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;QAC5D,CAAC;QAED,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Card.d.ts","sourceRoot":"","sources":["../../../src/projection/card/Card.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Card.d.ts","sourceRoot":"","sources":["../../../src/projection/card/Card.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAW,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAErD;;;;GAIG;AACH,qBAAa,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IACd,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IAAzD,OAAO,eAAsD;IAE7D,MAAM,CAAC,UAAU,CAAC,OAAO,SAAS,MAAM,EACtC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,EAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CA2BvB;IAED,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC,CAE/E;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAEzC;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,SAAS,CAEpC;IAED,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAuC1E;IAED,sFAAsF;IACtF,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,GAAE,WAAgB,GAAG,IAAI,CAEjD;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Axes } from '../../axis/Axes.js';
|
|
2
|
+
import { Shapes } from '../../axis/shape/Shape.js';
|
|
2
3
|
import { CardForms } from './CardForms.js';
|
|
3
4
|
import { clean, isObject } from '../../lib/utils.js';
|
|
4
5
|
import { Field } from '../../field/Field.js';
|
|
@@ -29,7 +30,7 @@ export class Card {
|
|
|
29
30
|
required.push(key);
|
|
30
31
|
}
|
|
31
32
|
for (const kind of ['unique', 'index'])
|
|
32
|
-
for (const group of
|
|
33
|
+
for (const group of kind === 'unique' ? schema.getUnique() : schema.getIndex())
|
|
33
34
|
for (const member of group)
|
|
34
35
|
carryGroup(properties[member], kind, group);
|
|
35
36
|
const descriptor = {
|
|
@@ -139,11 +140,7 @@ function originOf(schema) {
|
|
|
139
140
|
* `{ type: 'string', maxLength: 200 }` → the same shape `text({ max: 200 })` states
|
|
140
141
|
*/
|
|
141
142
|
function reconstructShape(property) {
|
|
142
|
-
const types =
|
|
143
|
-
? property.type
|
|
144
|
-
: property.type
|
|
145
|
-
? [property.type]
|
|
146
|
-
: [];
|
|
143
|
+
const types = Shapes.typesOf(property);
|
|
147
144
|
if (!types.some((type) => type !== 'null'))
|
|
148
145
|
return undefined;
|
|
149
146
|
// `describeField` writes the shape whole, so it is read whole: a list of keywords here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Card.js","sourceRoot":"","sources":["../../../src/projection/card/Card.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,OAAO,EAAa,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;GAIG;AACH,MAAM,OAAO,IAAI;IACc,UAAU;IAAvC,YAA6B,UAA4B;0BAA5B,UAAU;IAAqB,CAAC;IAE7D,MAAM,CAAC,UAAU,CACf,MAA2B,EAC3B,IAAa;QAEb,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAoC,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,UAAU,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAU;YAC7C,KAAK,MAAM,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"Card.js","sourceRoot":"","sources":["../../../src/projection/card/Card.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../../../src/projection/card/Diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../../../src/projection/card/Diff.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,WAAW,IAAI;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,yFAAyF;IACzF,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CACrB,GAAG,EAAE,gBAAgB,EACrB,EAAE,EAAE,gBAAgB,EACpB,OAAO,GAAE,WAAgB,GACxB,IAAI,CAmCN"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { dequal } from 'dequal';
|
|
2
2
|
import { Axes } from '../../axis/Axes.js';
|
|
3
|
+
import { Shapes } from '../../axis/shape/Shape.js';
|
|
3
4
|
/**
|
|
4
5
|
* What changed between two descriptions of the same entity, read from the wire form alone.
|
|
5
6
|
* FR : ce qui a changé entre deux descriptions d'une même entité, lu du seul format du fil.
|
|
@@ -76,10 +77,7 @@ function shapeOf(descriptor) {
|
|
|
76
77
|
* `typesOf({ type: ['null', 'string'] })` → `['null', 'string']`
|
|
77
78
|
*/
|
|
78
79
|
function typesOf(descriptor) {
|
|
79
|
-
|
|
80
|
-
if (type === undefined)
|
|
81
|
-
return [];
|
|
82
|
-
return (Array.isArray(type) ? [...type] : [type]).sort();
|
|
80
|
+
return [...Shapes.typesOf(descriptor)].sort();
|
|
83
81
|
}
|
|
84
82
|
/**
|
|
85
83
|
* The shape without its type, which is what tells a `reshaped` from a `retyped`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Diff.js","sourceRoot":"","sources":["../../../src/projection/card/Diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"Diff.js","sourceRoot":"","sources":["../../../src/projection/card/Diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,CAqBhC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAM7B;IAED,OAAO,CAAC,MAAM,CAAC,OAAO;IAetB,OAAO,CAAC,MAAM,CAAC,cAAc;CAW9B"}
|
|
@@ -17,7 +17,6 @@ export class FieldValueValidator {
|
|
|
17
17
|
validate(value) {
|
|
18
18
|
const shape = this.field.shape;
|
|
19
19
|
const type = Shapes.typeOf(shape);
|
|
20
|
-
const base = Shapes.of(shape).base;
|
|
21
20
|
if (value !== null) {
|
|
22
21
|
if (type === 'date' && value instanceof Date) {
|
|
23
22
|
return Number.isNaN(value.getTime()) ? { message: 'Invalid date' } : { value };
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"FieldValueValidator.js","sourceRoot":"","sources":["../../src/validator/FieldValueValidator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Schema.ts
CHANGED
|
@@ -8,8 +8,7 @@ import { type PreviousNames } from './entity/PreviousNames.js';
|
|
|
8
8
|
import { type EntityAdapters } from './entity/EntityAdapters.js';
|
|
9
9
|
import { InputValidator } from './validator/InputValidator.js';
|
|
10
10
|
import { SchemaDerivation } from './SchemaDerivation.js';
|
|
11
|
-
import { type
|
|
12
|
-
import { SchemaDefinition } from './SchemaDefinition.js';
|
|
11
|
+
import { SchemaDefinition, type SchemaDeclaration } from './SchemaDefinition.js';
|
|
13
12
|
import { type ValidateOptions } from './validator/ValidateOptions.js';
|
|
14
13
|
|
|
15
14
|
import type { SchemaView } from './SchemaView.js';
|
|
@@ -54,11 +53,11 @@ export class Schema {
|
|
|
54
53
|
static getAdapters(): EntityAdapters<Fields> {
|
|
55
54
|
return this.definition.adapterSet.adapters;
|
|
56
55
|
}
|
|
57
|
-
static getUnique(): FieldGroups<Fields>
|
|
56
|
+
static getUnique(): FieldGroups<Fields> {
|
|
58
57
|
return this.definition.constraints.unique;
|
|
59
58
|
}
|
|
60
59
|
|
|
61
|
-
static getIndex(): FieldGroups<Fields>
|
|
60
|
+
static getIndex(): FieldGroups<Fields> {
|
|
62
61
|
return this.definition.constraints.index;
|
|
63
62
|
}
|
|
64
63
|
static getOpts(): ValidateOptions {
|
|
@@ -150,26 +149,16 @@ export class Schema {
|
|
|
150
149
|
}
|
|
151
150
|
|
|
152
151
|
static compose<T extends SchemaView[]>(...sources: T): SchemaConstructor<Merged<T>> {
|
|
153
|
-
return Schema.subclass(
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
previous?: PreviousNames<TFields>;
|
|
164
|
-
anchored?: boolean;
|
|
165
|
-
constraints?: SchemaConstraints;
|
|
166
|
-
}): SchemaConstructor<TFields> {
|
|
167
|
-
return Schema.subclass(
|
|
168
|
-
SchemaDefinition.of(declaration),
|
|
169
|
-
) as unknown as SchemaConstructor<TFields>;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
private static subclass(definition: SchemaDefinition): SchemaConstructor<Fields> {
|
|
152
|
+
return Schema.subclass(SchemaDefinition.merged(sources));
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
static of<TFields extends Fields>(declaration: SchemaDeclaration<TFields>): SchemaConstructor<TFields> {
|
|
156
|
+
return Schema.subclass(SchemaDefinition.of(declaration));
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
private static subclass<TFields extends Fields = Fields>(
|
|
160
|
+
definition: SchemaDefinition,
|
|
161
|
+
): SchemaConstructor<TFields> {
|
|
173
162
|
class Derived extends Schema {}
|
|
174
163
|
Derived.definition = definition;
|
|
175
164
|
Object.defineProperty(Derived, 'name', {
|
|
@@ -177,7 +166,7 @@ export class Schema {
|
|
|
177
166
|
configurable: true,
|
|
178
167
|
});
|
|
179
168
|
|
|
180
|
-
return Derived as unknown as SchemaConstructor<
|
|
169
|
+
return Derived as unknown as SchemaConstructor<TFields>;
|
|
181
170
|
}
|
|
182
171
|
}
|
|
183
172
|
|
package/src/SchemaConstraints.ts
CHANGED
|
@@ -10,15 +10,12 @@ import { type FieldGroups } from './entity/FieldGroups.js';
|
|
|
10
10
|
* argument in a list that has already lost one.
|
|
11
11
|
*/
|
|
12
12
|
export class SchemaConstraints<TFields extends Fields = Fields> {
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
private constructor(
|
|
14
|
+
readonly unique: FieldGroups<TFields>,
|
|
15
|
+
readonly index: FieldGroups<TFields>,
|
|
16
|
+
) {}
|
|
15
17
|
|
|
16
|
-
|
|
17
|
-
if (unique) this.unique = unique;
|
|
18
|
-
if (index) this.index = index;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
static readonly none = new SchemaConstraints();
|
|
18
|
+
static readonly none = new SchemaConstraints([], []);
|
|
22
19
|
|
|
23
20
|
/**
|
|
24
21
|
* The order is part of a group, so `['a','b']` and `['b','a']` are two constraints.
|
|
@@ -41,21 +38,20 @@ export class SchemaConstraints<TFields extends Fields = Fields> {
|
|
|
41
38
|
}
|
|
42
39
|
|
|
43
40
|
const deduped = <TFields extends Fields>(
|
|
44
|
-
groups
|
|
45
|
-
): FieldGroups<TFields>
|
|
46
|
-
if (!groups) return undefined;
|
|
41
|
+
groups: FieldGroups<TFields> = [],
|
|
42
|
+
): FieldGroups<TFields> => {
|
|
47
43
|
const seen = new Map<string, readonly FieldName<TFields>[]>();
|
|
48
44
|
for (const group of groups) seen.set(JSON.stringify(group), group);
|
|
49
45
|
|
|
50
|
-
return
|
|
46
|
+
return [...seen.values()];
|
|
51
47
|
};
|
|
52
48
|
|
|
53
49
|
const survivors = (
|
|
54
|
-
groups: FieldGroups<Fields
|
|
50
|
+
groups: FieldGroups<Fields>,
|
|
55
51
|
transform: (key: string) => string | undefined,
|
|
56
52
|
): string[][] => {
|
|
57
53
|
const kept: string[][] = [];
|
|
58
|
-
for (const group of groups
|
|
54
|
+
for (const group of groups) {
|
|
59
55
|
const renamed = group.map(transform);
|
|
60
56
|
if (renamed.every((key): key is string => key !== undefined)) kept.push(renamed);
|
|
61
57
|
}
|
package/src/SchemaDefinition.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { FieldSet } from './field/FieldSet.js';
|
|
|
3
3
|
|
|
4
4
|
import { type EntityDeclarations } from './entity/EntityDeclarations.js';
|
|
5
5
|
import { type PreviousNames } from './entity/PreviousNames.js';
|
|
6
|
-
import { type EntityAdapters } from './entity/EntityAdapters.js';
|
|
7
6
|
import { EntityAdapterSet } from './entity/EntityAdapterSet.js';
|
|
8
7
|
import { SchemaDerivation } from './SchemaDerivation.js';
|
|
9
8
|
import { type ValidateOptions } from './validator/ValidateOptions.js';
|
|
@@ -28,6 +27,13 @@ interface SchemaState {
|
|
|
28
27
|
constraints: SchemaConstraints;
|
|
29
28
|
}
|
|
30
29
|
|
|
30
|
+
/** What a schema is built from; the rest is stated by `declares` or inherited by a derivation. */
|
|
31
|
+
export interface SchemaDeclaration<TFields extends Fields> {
|
|
32
|
+
fields: TFields;
|
|
33
|
+
opts?: ValidateOptions;
|
|
34
|
+
constraints?: SchemaConstraints;
|
|
35
|
+
}
|
|
36
|
+
|
|
31
37
|
/** The keys a derivation keeps, in the order it keeps them, under the names they take. */
|
|
32
38
|
type Renaming = ReadonlyMap<string, string>;
|
|
33
39
|
|
|
@@ -74,53 +80,31 @@ export class SchemaDefinition {
|
|
|
74
80
|
* What they do not name is kept, and that is the whole difference with `derived`.
|
|
75
81
|
*/
|
|
76
82
|
private restated(state: Partial<SchemaState>): SchemaDefinition {
|
|
77
|
-
return new SchemaDefinition({
|
|
78
|
-
fields: this.fields,
|
|
79
|
-
adapterSet: this.adapterSet,
|
|
80
|
-
opts: this.opts,
|
|
81
|
-
previous: this.previous,
|
|
82
|
-
derivation: this.derivation,
|
|
83
|
-
anchored: this.anchored,
|
|
84
|
-
constraints: this.constraints,
|
|
85
|
-
...state,
|
|
86
|
-
});
|
|
83
|
+
return new SchemaDefinition({ ...this, ...state });
|
|
87
84
|
}
|
|
88
85
|
|
|
89
86
|
/** Built complete or not at all — no static assigned on the side. */
|
|
90
|
-
static of(declaration: {
|
|
91
|
-
|
|
92
|
-
adapters?: EntityAdapters<Fields>;
|
|
93
|
-
opts?: ValidateOptions;
|
|
94
|
-
previous?: PreviousNames<Fields>;
|
|
95
|
-
derivation?: SchemaDerivation;
|
|
96
|
-
anchored?: boolean;
|
|
97
|
-
constraints?: SchemaConstraints;
|
|
98
|
-
}): SchemaDefinition {
|
|
99
|
-
return new SchemaDefinition({
|
|
87
|
+
static of(declaration: SchemaDeclaration<Fields>): SchemaDefinition {
|
|
88
|
+
return SchemaDefinition.derived({
|
|
100
89
|
fields: declaration.fields,
|
|
101
|
-
adapterSet: EntityAdapterSet.
|
|
90
|
+
adapterSet: EntityAdapterSet.none,
|
|
102
91
|
opts: declaration.opts ?? {},
|
|
103
|
-
|
|
104
|
-
derivation: declaration.derivation,
|
|
105
|
-
anchored: declaration.anchored ?? false,
|
|
92
|
+
derivation: undefined,
|
|
106
93
|
constraints: declaration.constraints ?? SchemaConstraints.none,
|
|
107
94
|
});
|
|
108
95
|
}
|
|
109
96
|
|
|
110
97
|
declaring(declarations: EntityDeclarations<Fields>): SchemaDefinition {
|
|
111
|
-
const
|
|
98
|
+
const adapterSet = EntityAdapterSet.of(declarations.adapters);
|
|
112
99
|
this.assertKnown('declares', [
|
|
113
|
-
...
|
|
100
|
+
...adapterSet.fieldNames,
|
|
114
101
|
...Object.keys(declarations.previous ?? {}),
|
|
115
102
|
]);
|
|
116
103
|
const declared = FieldSet.declaring(this.fields, declarations);
|
|
117
104
|
|
|
118
105
|
return this.restated({
|
|
119
106
|
fields: declared.fields,
|
|
120
|
-
adapterSet: EntityAdapterSet.merged([
|
|
121
|
-
this.adapterSet,
|
|
122
|
-
EntityAdapterSet.of(declarations.adapters),
|
|
123
|
-
]),
|
|
107
|
+
adapterSet: EntityAdapterSet.merged([this.adapterSet, adapterSet]),
|
|
124
108
|
previous: declarations.previous ?? this.previous,
|
|
125
109
|
constraints:
|
|
126
110
|
declarations.unique === undefined && declarations.index === undefined
|
|
@@ -204,8 +188,8 @@ export class SchemaDefinition {
|
|
|
204
188
|
for (const view of views) {
|
|
205
189
|
Object.assign(fields, view.getFields());
|
|
206
190
|
opts = { ...opts, ...view.getOpts() };
|
|
207
|
-
groups.unique.push(...
|
|
208
|
-
groups.index.push(...
|
|
191
|
+
groups.unique.push(...view.getUnique());
|
|
192
|
+
groups.index.push(...view.getIndex());
|
|
209
193
|
}
|
|
210
194
|
|
|
211
195
|
return SchemaDefinition.derived({
|
package/src/SchemaView.ts
CHANGED
|
@@ -17,8 +17,8 @@ export interface SchemaView<TFields extends Fields = Fields> {
|
|
|
17
17
|
readonly anchored?: boolean;
|
|
18
18
|
getFields(): TFields;
|
|
19
19
|
getAdapters(): EntityAdapters<TFields>;
|
|
20
|
-
getUnique(): FieldGroups<TFields
|
|
21
|
-
getIndex(): FieldGroups<TFields
|
|
20
|
+
getUnique(): FieldGroups<TFields>;
|
|
21
|
+
getIndex(): FieldGroups<TFields>;
|
|
22
22
|
getOpts(): ValidateOptions;
|
|
23
23
|
validate(input: unknown): ValidationResult<Values<TFields>>;
|
|
24
24
|
}
|
package/src/axis/shape/Shape.ts
CHANGED
|
@@ -80,10 +80,6 @@ type _ShapeTypesAreTheStandardsLessNull = Assert<
|
|
|
80
80
|
: false
|
|
81
81
|
>;
|
|
82
82
|
|
|
83
|
-
/** Every type name a shape states, whether it states one or a union of them. */
|
|
84
|
-
const typesOf = (shape: Shape): readonly string[] =>
|
|
85
|
-
(Array.isArray(shape.type) ? shape.type : [shape.type]) as readonly string[];
|
|
86
|
-
|
|
87
83
|
export class Shapes {
|
|
88
84
|
private static readonly cache = new WeakMap<object, ShapeParts>();
|
|
89
85
|
private static readonly none: ShapeParts = { base: undefined, nullable: false };
|
|
@@ -128,7 +124,7 @@ export class Shapes {
|
|
|
128
124
|
* `{ type: 'string', enum: ['draft'] }` → `{ type: ['string','null'], enum: ['draft', null] }`
|
|
129
125
|
*/
|
|
130
126
|
static nullable(shape: Shape): Shape {
|
|
131
|
-
const types = typesOf(shape);
|
|
127
|
+
const types = Shapes.typesOf(shape);
|
|
132
128
|
if (types.includes('null')) return shape;
|
|
133
129
|
|
|
134
130
|
const nullable = { ...shape, type: [...types, 'null'] } as unknown as Shape;
|
|
@@ -142,6 +138,13 @@ export class Shapes {
|
|
|
142
138
|
return nullable;
|
|
143
139
|
}
|
|
144
140
|
|
|
141
|
+
/** Every type name a shape states — none, since a card may carry a property with no `type`. */
|
|
142
|
+
static typesOf(shape: { type?: string | readonly string[] }): readonly string[] {
|
|
143
|
+
if (shape.type === undefined) return [];
|
|
144
|
+
|
|
145
|
+
return typeof shape.type === 'string' ? [shape.type] : shape.type;
|
|
146
|
+
}
|
|
147
|
+
|
|
145
148
|
static of(shape?: Shape): ShapeParts {
|
|
146
149
|
if (!shape) return this.none;
|
|
147
150
|
let parts = this.cache.get(shape);
|
|
@@ -12,12 +12,14 @@ export class EntityAdapterSet {
|
|
|
12
12
|
*/
|
|
13
13
|
private constructor(readonly adapters: EntityAdapters<Fields>) {}
|
|
14
14
|
|
|
15
|
+
static readonly none = new EntityAdapterSet({});
|
|
16
|
+
|
|
15
17
|
/**
|
|
16
18
|
* Stops a malformed declaration from propagating, by checking its two levels.
|
|
17
19
|
* `of({ sql: { body: 3 } })` → passes; `of({ sql: 'oops' })` → throws, naming `adapters.sql`
|
|
18
20
|
*/
|
|
19
21
|
static of(adapters?: EntityAdapters<Fields>): EntityAdapterSet {
|
|
20
|
-
if (!adapters) return
|
|
22
|
+
if (!adapters) return EntityAdapterSet.none;
|
|
21
23
|
|
|
22
24
|
if (!isObject(adapters)) {
|
|
23
25
|
throw new SchemaError(
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Axes } from '../../axis/Axes.js';
|
|
2
|
+
import { Shapes } from '../../axis/shape/Shape.js';
|
|
2
3
|
import { CardForms } from './CardForms.js';
|
|
3
4
|
import { type Resolver } from '../../axis/Resolver.js';
|
|
4
5
|
import { clean, isObject } from '../../lib/utils.js';
|
|
@@ -42,7 +43,7 @@ export class Card<T = Values<Fields>> {
|
|
|
42
43
|
if (validator.requires(field)) required.push(key);
|
|
43
44
|
}
|
|
44
45
|
for (const kind of ['unique', 'index'] as const)
|
|
45
|
-
for (const group of
|
|
46
|
+
for (const group of kind === 'unique' ? schema.getUnique() : schema.getIndex())
|
|
46
47
|
for (const member of group) carryGroup(properties[member], kind, group);
|
|
47
48
|
|
|
48
49
|
const descriptor: SchemaDescriptor = {
|
|
@@ -172,11 +173,7 @@ function originOf(schema: SchemaView): DerivedFrom | undefined {
|
|
|
172
173
|
* `{ type: 'string', maxLength: 200 }` → the same shape `text({ max: 200 })` states
|
|
173
174
|
*/
|
|
174
175
|
function reconstructShape(property: FieldDescriptor): Field['shape'] | undefined {
|
|
175
|
-
const types =
|
|
176
|
-
? property.type
|
|
177
|
-
: property.type
|
|
178
|
-
? [property.type]
|
|
179
|
-
: [];
|
|
176
|
+
const types = Shapes.typesOf(property);
|
|
180
177
|
if (!types.some((type) => type !== 'null')) return undefined;
|
|
181
178
|
|
|
182
179
|
// `describeField` writes the shape whole, so it is read whole: a list of keywords here
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { dequal } from 'dequal';
|
|
2
2
|
import { Axes } from '../../axis/Axes.js';
|
|
3
|
+
import { Shapes } from '../../axis/shape/Shape.js';
|
|
3
4
|
import type { FieldDescriptor } from './FieldDescriptor.js';
|
|
4
5
|
import type { FieldExtension } from './FieldExtension.js';
|
|
5
6
|
|
|
@@ -117,10 +118,7 @@ function shapeOf(descriptor: FieldDescriptor): Record<string, unknown> {
|
|
|
117
118
|
* `typesOf({ type: ['null', 'string'] })` → `['null', 'string']`
|
|
118
119
|
*/
|
|
119
120
|
function typesOf(descriptor: FieldDescriptor): TypeSet {
|
|
120
|
-
|
|
121
|
-
if (type === undefined) return [];
|
|
122
|
-
|
|
123
|
-
return (Array.isArray(type) ? [...type] : [type]).sort();
|
|
121
|
+
return [...Shapes.typesOf(descriptor)].sort();
|
|
124
122
|
}
|
|
125
123
|
|
|
126
124
|
/**
|
|
@@ -28,7 +28,6 @@ export class FieldValueValidator {
|
|
|
28
28
|
validate(value: unknown): Verdict {
|
|
29
29
|
const shape = this.field.shape;
|
|
30
30
|
const type = Shapes.typeOf(shape);
|
|
31
|
-
const base = Shapes.of(shape).base;
|
|
32
31
|
if (value !== null) {
|
|
33
32
|
if (type === 'date' && value instanceof Date) {
|
|
34
33
|
return Number.isNaN(value.getTime()) ? { message: 'Invalid date' } : { value };
|