@fougere/schema 0.12.3-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/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/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/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.js +2 -2
- package/dist/validator/FieldValueValidator.js.map +1 -1
- package/package.json +11 -11
- 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/boundary/Boundary.ts +81 -8
- package/src/axis/boundary/Decoder.ts +1 -1
- 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 +2 -2
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":"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"}
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -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"}
|