effect-app 4.0.0-beta.16 → 4.0.0-beta.18
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/CHANGELOG.md +12 -0
- package/dist/Operations.d.ts +25 -29
- package/dist/Operations.d.ts.map +1 -1
- package/dist/Schema/ext.d.ts +22 -22
- package/dist/Schema/ext.d.ts.map +1 -1
- package/dist/Schema/ext.js +7 -7
- package/dist/Schema.d.ts +23 -24
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +18 -18
- package/package.json +1 -1
- package/src/Schema/ext.ts +16 -16
- package/src/Schema.ts +44 -31
- package/test/schema.test.ts +32 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @effect-app/prelude
|
|
2
2
|
|
|
3
|
+
## 4.0.0-beta.18
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- e9dbbdd: Tighten schema helper generics in `Schema/ext.ts` so default-related helpers accept properly named schema type parameters instead of bare `S.Top` inputs.
|
|
8
|
+
|
|
9
|
+
## 4.0.0-beta.17
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- c8a6a3f: fix TaggedUnion
|
|
14
|
+
|
|
3
15
|
## 4.0.0-beta.16
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/Operations.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as S from "./Schema.js";
|
|
2
2
|
export type OperationId = S.StringId;
|
|
3
|
-
export declare const OperationId: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "
|
|
3
|
+
export declare const OperationId: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & {
|
|
4
4
|
make: () => S.StringId;
|
|
5
|
-
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "
|
|
6
|
-
}> & S.brand<S.String, "NonEmptyString" | "
|
|
5
|
+
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & S.WithoutConstructorDefault>;
|
|
6
|
+
}> & S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & {
|
|
7
7
|
make: () => S.StringId;
|
|
8
|
-
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "
|
|
8
|
+
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & S.WithoutConstructorDefault>;
|
|
9
9
|
};
|
|
10
10
|
declare const OperationProgress_base: S.EnhancedClass<OperationProgress, S.Struct<{
|
|
11
11
|
completed: S.WithDefaults<S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber">> & S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber"> & {
|
|
@@ -20,49 +20,45 @@ export declare class OperationProgress extends OperationProgress_base {
|
|
|
20
20
|
declare const OperationSuccess_base: S.EnhancedTaggedClass<OperationSuccess, "OperationSuccess", {
|
|
21
21
|
readonly _tag: S.tag<"OperationSuccess">;
|
|
22
22
|
} & {
|
|
23
|
-
message: S.withConstructorDefault<import("effect/Schema").NullOr<S.WithDefaults<S.brand<S.String, "NonEmptyString" | "
|
|
23
|
+
message: S.withConstructorDefault<import("effect/Schema").NullOr<S.WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">> & S.WithoutConstructorDefault>;
|
|
24
24
|
}, OperationSuccess.Encoded>;
|
|
25
25
|
export declare class OperationSuccess extends OperationSuccess_base {
|
|
26
26
|
}
|
|
27
27
|
declare const OperationFailure_base: S.EnhancedTaggedClass<OperationFailure, "OperationFailure", {
|
|
28
28
|
readonly _tag: S.tag<"OperationFailure">;
|
|
29
29
|
} & {
|
|
30
|
-
message: S.withConstructorDefault<import("effect/Schema").NullOr<S.WithDefaults<S.brand<S.String, "NonEmptyString" | "
|
|
30
|
+
message: S.withConstructorDefault<import("effect/Schema").NullOr<S.WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">> & S.WithoutConstructorDefault>;
|
|
31
31
|
}, OperationFailure.Encoded>;
|
|
32
32
|
export declare class OperationFailure extends OperationFailure_base {
|
|
33
33
|
}
|
|
34
34
|
export declare const OperationResult: S.Union<[typeof OperationSuccess, typeof OperationFailure]> & {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
tagMap: any;
|
|
43
|
-
tags: any;
|
|
35
|
+
isA: S.Is<OperationSuccess | OperationFailure>;
|
|
36
|
+
isAnyOf: S.IsAny<OperationSuccess | OperationFailure>;
|
|
37
|
+
tagMap: {
|
|
38
|
+
OperationSuccess: typeof OperationSuccess;
|
|
39
|
+
OperationFailure: typeof OperationFailure;
|
|
40
|
+
};
|
|
41
|
+
tags: S.Literals<["OperationSuccess", "OperationFailure"]>;
|
|
44
42
|
};
|
|
45
43
|
export type OperationResult = S.Schema.Type<typeof OperationResult>;
|
|
46
44
|
declare const Operation_base: S.EnhancedClass<Operation, S.Struct<{
|
|
47
|
-
id: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "
|
|
45
|
+
id: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & {
|
|
48
46
|
make: () => S.StringId;
|
|
49
|
-
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "
|
|
50
|
-
}> & S.brand<S.String, "NonEmptyString" | "
|
|
47
|
+
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & S.WithoutConstructorDefault>;
|
|
48
|
+
}> & S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & {
|
|
51
49
|
make: () => S.StringId;
|
|
52
|
-
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "
|
|
50
|
+
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "StringId" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "NonEmptyString255" | "NonEmptyString2k" | "NonEmptyString64k"> & S.WithoutConstructorDefault>;
|
|
53
51
|
};
|
|
54
|
-
title: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "
|
|
52
|
+
title: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString2k" | "NonEmptyString64k">;
|
|
55
53
|
progress: S.optional<typeof OperationProgress>;
|
|
56
54
|
result: S.optional<S.Union<[typeof OperationSuccess, typeof OperationFailure]> & {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
tagMap: any;
|
|
65
|
-
tags: any;
|
|
55
|
+
isA: S.Is<OperationSuccess | OperationFailure>;
|
|
56
|
+
isAnyOf: S.IsAny<OperationSuccess | OperationFailure>;
|
|
57
|
+
tagMap: {
|
|
58
|
+
OperationSuccess: typeof OperationSuccess;
|
|
59
|
+
OperationFailure: typeof OperationFailure;
|
|
60
|
+
};
|
|
61
|
+
tags: S.Literals<["OperationSuccess", "OperationFailure"]>;
|
|
66
62
|
}>;
|
|
67
63
|
createdAt: S.withConstructorDefault<S.decodeTo<import("effect/Schema").Date, S.String, never, never> & S.WithoutConstructorDefault>;
|
|
68
64
|
updatedAt: S.withConstructorDefault<import("effect/Schema").NullOr<S.decodeTo<import("effect/Schema").Date, S.String, never, never> & {
|
package/dist/Operations.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../src/Operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,aAAa,CAAA;AAEhC,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAA;AACpC,eAAO,MAAM,WAAW;;;;;;CAAa,CAAA;;;;;;;;;AAErC,qBAAa,iBAAkB,SAAQ,sBAMrC;CAAG;;;;;;AAEL,qBAAa,gBACX,SAAQ,qBAEN;CACF;;;;;;AAEF,qBAAa,gBACX,SAAQ,qBAEN;CACF;AAEF,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"Operations.d.ts","sourceRoot":"","sources":["../src/Operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,aAAa,CAAA;AAEhC,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAA;AACpC,eAAO,MAAM,WAAW;;;;;;CAAa,CAAA;;;;;;;;;AAErC,qBAAa,iBAAkB,SAAQ,sBAMrC;CAAG;;;;;;AAEL,qBAAa,gBACX,SAAQ,qBAEN;CACF;;;;;;AAEF,qBAAa,gBACX,SAAQ,qBAEN;CACF;AAEF,eAAO,MAAM,eAAe;;;;;;;;CAAoD,CAAA;AAChF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;AAEnE,qBAAa,SAAU,SAAQ,cAO7B;CAAG;AAKL,yBAAiB,iBAAiB,CAAC;IACjC,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACzF;AACD,yBAAiB,gBAAgB,CAAC;IAChC,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACxF;AACD,yBAAiB,gBAAgB,CAAC;IAChC,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KAAG;CACxF;AACD,yBAAiB,SAAS,CAAC;IACzB,UAAiB,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;KAAG;CACjF"}
|
package/dist/Schema/ext.d.ts
CHANGED
|
@@ -35,46 +35,46 @@ export declare const Literal: <Literals extends NonEmptyReadonlyArray<AST.Litera
|
|
|
35
35
|
/**
|
|
36
36
|
* Like the default Schema `Array` but with `withDefault` => []
|
|
37
37
|
*/
|
|
38
|
-
export declare function Array<
|
|
39
|
-
withDefault: Schema.withConstructorDefault<Schema.$Array<
|
|
38
|
+
export declare function Array<ValueSchema extends S.Top>(value: ValueSchema): Schema.$Array<ValueSchema> & {
|
|
39
|
+
withDefault: Schema.withConstructorDefault<Schema.$Array<ValueSchema> & Schema.WithoutConstructorDefault>;
|
|
40
40
|
};
|
|
41
41
|
/**
|
|
42
42
|
* Like the default Schema `Map` but with `withDefault` => []
|
|
43
43
|
*/
|
|
44
|
-
declare function Map_<
|
|
45
|
-
key:
|
|
46
|
-
value:
|
|
47
|
-
}): Schema.$ReadonlyMap<
|
|
48
|
-
withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<
|
|
44
|
+
declare function Map_<KeySchema extends S.Top, ValueSchema extends S.Top>(input: {
|
|
45
|
+
key: KeySchema;
|
|
46
|
+
value: ValueSchema;
|
|
47
|
+
}): Schema.$ReadonlyMap<KeySchema, ValueSchema> & {
|
|
48
|
+
withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<KeySchema, ValueSchema> & Schema.WithoutConstructorDefault>;
|
|
49
49
|
};
|
|
50
50
|
export { Map_ as Map };
|
|
51
51
|
/**
|
|
52
52
|
* Like the default Schema `ReadonlySet` but with `withDefault` => new Set()
|
|
53
53
|
*/
|
|
54
|
-
export declare const ReadonlySet: <
|
|
55
|
-
withDefault: Schema.withConstructorDefault<Schema.$ReadonlySet<
|
|
54
|
+
export declare const ReadonlySet: <ValueSchema extends S.Top>(value: ValueSchema) => Schema.$ReadonlySet<ValueSchema> & {
|
|
55
|
+
withDefault: Schema.withConstructorDefault<Schema.$ReadonlySet<ValueSchema> & Schema.WithoutConstructorDefault>;
|
|
56
56
|
};
|
|
57
57
|
/**
|
|
58
58
|
* Like the default Schema `ReadonlyMap` but with `withDefault` => new Map()
|
|
59
59
|
*/
|
|
60
|
-
export declare const ReadonlyMap: <
|
|
61
|
-
readonly key:
|
|
62
|
-
readonly value:
|
|
63
|
-
}) => Schema.$ReadonlyMap<
|
|
64
|
-
withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<
|
|
60
|
+
export declare const ReadonlyMap: <KeySchema extends S.Top, ValueSchema extends S.Top>(pair: {
|
|
61
|
+
readonly key: KeySchema;
|
|
62
|
+
readonly value: ValueSchema;
|
|
63
|
+
}) => Schema.$ReadonlyMap<KeySchema, ValueSchema> & {
|
|
64
|
+
withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<KeySchema, ValueSchema> & Schema.WithoutConstructorDefault>;
|
|
65
65
|
};
|
|
66
66
|
/**
|
|
67
67
|
* Like the default Schema `NullOr` but with `withDefault` => null
|
|
68
68
|
*/
|
|
69
|
-
export declare const NullOr: <
|
|
70
|
-
withDefault: Schema.withConstructorDefault<Schema.NullOr<
|
|
69
|
+
export declare const NullOr: <Schema extends S.Top>(self: Schema) => Schema.NullOr<Schema> & {
|
|
70
|
+
withDefault: Schema.withConstructorDefault<Schema.NullOr<Schema> & Schema.WithoutConstructorDefault>;
|
|
71
71
|
};
|
|
72
|
-
export declare const defaultDate:
|
|
73
|
-
export declare const defaultBool:
|
|
74
|
-
export declare const defaultNullable:
|
|
75
|
-
export declare const defaultArray:
|
|
76
|
-
export declare const defaultMap:
|
|
77
|
-
export declare const defaultSet:
|
|
72
|
+
export declare const defaultDate: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
73
|
+
export declare const defaultBool: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
74
|
+
export declare const defaultNullable: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
75
|
+
export declare const defaultArray: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
76
|
+
export declare const defaultMap: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
77
|
+
export declare const defaultSet: <Schema extends S.Top>(schema: Schema) => Schema.withConstructorDefault<Schema & Schema.WithoutConstructorDefault>;
|
|
78
78
|
export declare const withDefaultMake: <Self extends S.Top>(s: Self) => WithDefaults<Self> & Self;
|
|
79
79
|
export type WithDefaults<Self extends S.Top> = (i: Self["Encoded"], options?: SchemaAST.ParseOptions) => Self["Type"];
|
|
80
80
|
export declare const inputDate: Schema.Union<readonly [Schema.Date, Schema.Date]> & {
|
package/dist/Schema/ext.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ext.d.ts","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAgB,MAAM,EAAE,KAAK,SAAS,EAAgB,WAAW,EAAsC,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAA;AACrJ,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,aAAa,CAAA;AAMtC,eAAO,MAAM,sBAAsB,GAAI,CAAC,EACtC,aAAa,MAAM,OAAO,CAAC,CAAC,CAAC,MAE9B,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,KAAG,CAAC,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,yBAAyB,CAK5F,CAAA;AAUD;;GAEG;AACH,eAAO,MAAM,IAAI;;CAEf,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO;;CAElB,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;;CAA2F,CAAA;AAE9G;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,SAAS,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,UAAU,QAAQ;oBAK/E,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;;;;aAMxB,CAAA,OAAO,QAAQ,EAAC,CAAC,CAAC;;CAG/C,CAAA;AAEH;;GAEG;AACH,wBAAgB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ext.d.ts","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAgB,MAAM,EAAE,KAAK,SAAS,EAAgB,WAAW,EAAsC,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAA;AACrJ,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,aAAa,CAAA;AAMtC,eAAO,MAAM,sBAAsB,GAAI,CAAC,EACtC,aAAa,MAAM,OAAO,CAAC,CAAC,CAAC,MAE9B,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,KAAG,CAAC,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC,yBAAyB,CAK5F,CAAA;AAUD;;GAEG;AACH,eAAO,MAAM,IAAI;;CAEf,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO;;CAElB,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;;CAA2F,CAAA;AAE9G;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,SAAS,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,UAAU,QAAQ;oBAK/E,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;;;;aAMxB,CAAA,OAAO,QAAQ,EAAC,CAAC,CAAC;;CAG/C,CAAA;AAEH;;GAEG;AACH,wBAAgB,KAAK,CAAC,WAAW,SAAS,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW;;EAKlE;AAED;;GAEG;AACH,iBAAS,IAAI,CAAC,SAAS,SAAS,CAAC,CAAC,GAAG,EAAE,WAAW,SAAS,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE;;EAK9G;AAED,OAAO,EAAE,IAAI,IAAI,GAAG,EAAE,CAAA;AAEtB;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,WAAW,SAAS,CAAC,CAAC,GAAG,EAAE,OAAO,WAAW;;CAKtE,CAAA;AAEH;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,SAAS,CAAC,CAAC,GAAG,EAAE,WAAW,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM;IACpF,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAC5B;;CAIE,CAAA;AAEH;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,MAAM;;CAItD,CAAA;AAEH,eAAO,MAAM,WAAW,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EACF,CAAA;AAE9D,eAAO,MAAM,WAAW,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EAAqD,CAAA;AAErH,eAAO,MAAM,eAAe,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EAAoD,CAAA;AAExH,eAAO,MAAM,YAAY,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EAAkD,CAAA;AAEnH,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EAAyD,CAAA;AAExH,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,CAAC,CAAC,GAAG,EAAE,QAAQ,MAAM,6EAAyD,CAAA;AAExH,eAAO,MAAM,eAAe,GAAI,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,8BAM1D,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,GAAG,IAAI,CAC7C,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAClB,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,KAC7B,IAAI,CAAC,MAAM,CAAC,CAAA;AAgBjB,eAAO,MAAM,SAAS;;CAGrB,CAAA;AAED,MAAM,WAAW,UAAU;CAAG;AAI9B,wBAAgB,YAAY,CAAC,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACtD,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG;CAC7F,CAKA;AAED,wBAAgB,iBAAiB,CAAC,GAAG,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAC3D,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG;CAChG,CAKA;AAED,yEAAyE;AACzE,eAAO,MAAM,WAAW,GAAI,EAAE,SAAS,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,CAAC,GAAG,EAC9D,MAAM,IAAI,EACV,IAAI,EAAE,EACN,QAAQ,CACN,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EACnB,OAAO,EAAE,SAAS,CAAC,YAAY,KAC5B,EAAE,CAAC,SAAS,CAAC,4CAgBjB,CAAA;AAEH,+EAA+E;AAC/E,eAAO,MAAM,iBAAiB,GAAI,EAAE,SAAS,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,EACxE,MAAM,IAAI,EACV,IAAI,EAAE,EACN,QAAQ,CACN,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EACnB,OAAO,EAAE,SAAS,CAAC,YAAY,KAC5B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,4CAgBvD,CAAA;AAIH,eAAO,MAAM,OAAO,GAAI,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,EAC3C,MAAM,IAAI,EACV,SAAS,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,KAChC,GAaF,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS,SAAS,GAAG,EAAE,EACjF,OAAO,IAAI,EACX,GAAG,WAAW,IAAI,KACjB,GAEF,CAAA"}
|
package/dist/Schema/ext.js
CHANGED
|
@@ -69,12 +69,12 @@ export const ReadonlyMap = (pair) => pipe(S.ReadonlyMap(pair.key, pair.value), (
|
|
|
69
69
|
* Like the default Schema `NullOr` but with `withDefault` => null
|
|
70
70
|
*/
|
|
71
71
|
export const NullOr = (self) => pipe(S.NullOr(self), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => null)) }));
|
|
72
|
-
export const defaultDate = (
|
|
73
|
-
export const defaultBool = (
|
|
74
|
-
export const defaultNullable = (
|
|
75
|
-
export const defaultArray = (
|
|
76
|
-
export const defaultMap = (
|
|
77
|
-
export const defaultSet = (
|
|
72
|
+
export const defaultDate = (schema) => schema.pipe(withDefaultConstructor(() => new global.Date()));
|
|
73
|
+
export const defaultBool = (schema) => schema.pipe(withDefaultConstructor(() => false));
|
|
74
|
+
export const defaultNullable = (schema) => schema.pipe(withDefaultConstructor(() => null));
|
|
75
|
+
export const defaultArray = (schema) => schema.pipe(withDefaultConstructor(() => []));
|
|
76
|
+
export const defaultMap = (schema) => schema.pipe(withDefaultConstructor(() => new Map()));
|
|
77
|
+
export const defaultSet = (schema) => schema.pipe(withDefaultConstructor(() => new Set()));
|
|
78
78
|
export const withDefaultMake = (s) => {
|
|
79
79
|
const a = Object.assign(S.decodeSync(s), s);
|
|
80
80
|
Object.setPrototypeOf(a, s);
|
|
@@ -133,4 +133,4 @@ export const provide = (self, context) => {
|
|
|
133
133
|
export const contextFromServices = (_self, ..._services) => {
|
|
134
134
|
throw new Error("contextFromServices: not yet migrated to v4");
|
|
135
135
|
};
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
|
package/dist/Schema.d.ts
CHANGED
|
@@ -32,10 +32,10 @@ export declare const PhoneNumber: import("./Schema/ext.js").WithDefaults<import(
|
|
|
32
32
|
export type PhoneNumber = PhoneNumberType;
|
|
33
33
|
export declare const makeIs: <A extends {
|
|
34
34
|
_tag: string;
|
|
35
|
-
}, I,
|
|
35
|
+
}, I, RD, RE>(schema: S.Codec<A, I, RD, RE>) => Is<A>;
|
|
36
36
|
export declare const makeIsAnyOf: <A extends {
|
|
37
37
|
_tag: string;
|
|
38
|
-
}, I,
|
|
38
|
+
}, I, RD, RE>(schema: S.Codec<A, I, RD, RE>) => IsAny<A>;
|
|
39
39
|
export type ExtractUnion<A extends {
|
|
40
40
|
_tag: string;
|
|
41
41
|
}, Tags extends A["_tag"]> = Extract<A, Record<"_tag", Tags>>;
|
|
@@ -50,40 +50,39 @@ export interface IsAny<A extends {
|
|
|
50
50
|
}> {
|
|
51
51
|
<Keys extends A["_tag"][]>(...keys: Keys): (a: A) => a is ExtractUnion<A, ElemType<Keys>>;
|
|
52
52
|
}
|
|
53
|
+
type TaggedUnionMap<Members extends readonly (S.Top & {
|
|
54
|
+
fields: {
|
|
55
|
+
_tag: S.tag<string>;
|
|
56
|
+
};
|
|
57
|
+
})[]> = {
|
|
58
|
+
[Key in Members[number] as Key["fields"]["_tag"]["Type"]]: Key;
|
|
59
|
+
};
|
|
53
60
|
export declare const taggedUnionMap: <Members extends readonly (S.Top & {
|
|
54
61
|
fields: {
|
|
55
62
|
_tag: S.tag<string>;
|
|
56
63
|
};
|
|
57
|
-
})[]>(self: Members) =>
|
|
64
|
+
})[]>(self: Members) => TaggedUnionMap<Members>;
|
|
58
65
|
export declare const tags: <Members extends NonEmptyReadonlyArray<(S.Top & {
|
|
59
66
|
fields: {
|
|
60
67
|
_tag: S.tag<string>;
|
|
61
68
|
};
|
|
62
|
-
})>>(self: Members) =>
|
|
69
|
+
})>>(self: Members) => S.Literals<{ [Index in keyof Members]: S.Schema.Type<Members[Index]["fields"]["_tag"]>; }>;
|
|
63
70
|
export declare const ExtendTaggedUnion: <A extends {
|
|
64
|
-
_tag: string;
|
|
71
|
+
readonly _tag: string;
|
|
65
72
|
}, I, R>(schema: S.Codec<A, I, R>) => S.Codec<A, I, R, never> & {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
_tag: string;
|
|
69
|
-
}>;
|
|
70
|
-
isAnyOf: IsAny<{
|
|
71
|
-
_tag: string;
|
|
72
|
-
}>;
|
|
73
|
+
isA: Is<A>;
|
|
74
|
+
isAnyOf: IsAny<A>;
|
|
73
75
|
};
|
|
74
|
-
export declare const TaggedUnion: <Members extends
|
|
76
|
+
export declare const TaggedUnion: <Members extends NonEmptyReadonlyArray<S.Codec<{
|
|
77
|
+
readonly _tag: string;
|
|
78
|
+
}, any, any, any> & {
|
|
75
79
|
fields: {
|
|
76
|
-
_tag: S.tag<
|
|
80
|
+
_tag: S.tag<string>;
|
|
77
81
|
};
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}>;
|
|
83
|
-
isAnyOf: IsAny<{
|
|
84
|
-
_tag: string;
|
|
85
|
-
}>;
|
|
86
|
-
tagMap: any;
|
|
87
|
-
tags: any;
|
|
82
|
+
}>>(...a: Members) => S.Union<Members> & {
|
|
83
|
+
isA: Is<{ [K in keyof Members]: Members[K]["Type"]; }[number]>;
|
|
84
|
+
isAnyOf: IsAny<{ [K in keyof Members]: Members[K]["Type"]; }[number]>;
|
|
85
|
+
tagMap: TaggedUnionMap<Members>;
|
|
86
|
+
tags: S.Literals<{ [Index in keyof Members]: S.Schema.Type<Members[Index]["fields"]["_tag"]>; }>;
|
|
88
87
|
};
|
|
89
88
|
//# sourceMappingURL=Schema.d.ts.map
|
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,EAAkC,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAA;AACpE,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAClC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEvD,OAAO,EAAE,KAAK,IAAI,MAAM,EAAE,KAAK,KAAK,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,KAAK,WAAW,IAAI,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAI1G,cAAc,eAAe,CAAA;AAE7B,OAAO,EAAE,gBAAgB,IAAI,WAAW,EAAE,MAAM,eAAe,CAAA;AAE/D,cAAc,mBAAmB,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC9G,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,eAAe,CAAA;AAE7C,eAAO,MAAM,MAAM,eAAW,CAAA;AAC9B,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC,MAAM,WAAW,gBAAgB;IAC/B,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAA;CACvB;AAKD,eAAO,MAAM,KAAK,iGAOf,CAAA;AAEH,MAAM,MAAM,KAAK,GAAG,SAAS,CAAA;AAE7B,eAAO,MAAM,WAAW,mQAQrB,CAAA;AAEH,MAAM,MAAM,WAAW,GAAG,eAAe,CAAA;AAEzC,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"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"}
|
package/dist/Schema.js
CHANGED
|
@@ -69,31 +69,31 @@ export const makeIsAnyOf = (schema) => {
|
|
|
69
69
|
}
|
|
70
70
|
throw new Error("Unsupported");
|
|
71
71
|
};
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
return
|
|
85
|
-
|
|
86
|
-
|
|
72
|
+
const getTagLiteral = (schema) => {
|
|
73
|
+
if (!SchemaAST.isLiteral(schema.ast)) {
|
|
74
|
+
throw new Error("Unsupported _tag schema: expected a literal AST");
|
|
75
|
+
}
|
|
76
|
+
return schema.ast.literal;
|
|
77
|
+
};
|
|
78
|
+
export const taggedUnionMap = (self) => {
|
|
79
|
+
const out = {};
|
|
80
|
+
for (const key of self) {
|
|
81
|
+
const tag = getTagLiteral(key.fields._tag);
|
|
82
|
+
out[tag] = key;
|
|
83
|
+
}
|
|
84
|
+
return out;
|
|
85
|
+
};
|
|
86
|
+
export const tags = (self) => S.Literals(self.map((key) => getTagLiteral(key.fields._tag)));
|
|
87
87
|
export const ExtendTaggedUnion = (schema) => extendM(schema, (_) => ({
|
|
88
|
-
is: S.is(schema),
|
|
88
|
+
// is: S.is(schema), // only works with never DecodingServices
|
|
89
89
|
isA: makeIs(_),
|
|
90
90
|
isAnyOf: makeIsAnyOf(_) /*, map: taggedUnionMap(a) */
|
|
91
91
|
}));
|
|
92
92
|
export const TaggedUnion = (...a) => pipe(S.Union(a), (_) => extendM(_, (_) => ({
|
|
93
|
-
is: S.is(_),
|
|
93
|
+
// is: S.is(_), // only works with never DecodingServices
|
|
94
94
|
isA: makeIs(_),
|
|
95
95
|
isAnyOf: makeIsAnyOf(_),
|
|
96
96
|
tagMap: taggedUnionMap(a),
|
|
97
97
|
tags: tags(a)
|
|
98
98
|
})));
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFlLE1BQU0sUUFBUSxDQUFBO0FBQ3BFLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBRWxDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLEtBQUssSUFBSSxNQUFNLEVBQTJCLE1BQU0sbUJBQW1CLENBQUE7QUFDNUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2pELE9BQU8sRUFBRSxXQUFXLElBQUksWUFBWSxFQUF1QyxNQUFNLHlCQUF5QixDQUFBO0FBRTFHLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFcEMsY0FBYyxlQUFlLENBQUE7QUFDN0IsOENBQThDO0FBQzlDLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxXQUFXLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFFL0QsY0FBYyxtQkFBbUIsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRXRELE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDdEQsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDOUcsT0FBTyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUV6RCxjQUFjLG1CQUFtQixDQUFBO0FBQ2pDLGNBQWMsaUJBQWlCLENBQUE7QUFDL0IsY0FBYyx5QkFBeUIsQ0FB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
|
package/package.json
CHANGED
package/src/Schema/ext.ts
CHANGED
|
@@ -69,7 +69,7 @@ export const Literal = <Literals extends NonEmptyReadonlyArray<AST.LiteralValue>
|
|
|
69
69
|
/**
|
|
70
70
|
* Like the default Schema `Array` but with `withDefault` => []
|
|
71
71
|
*/
|
|
72
|
-
export function Array<
|
|
72
|
+
export function Array<ValueSchema extends S.Top>(value: ValueSchema) {
|
|
73
73
|
return pipe(
|
|
74
74
|
S.Array(value),
|
|
75
75
|
(s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => [])) })
|
|
@@ -79,7 +79,7 @@ export function Array<Value extends S.Top>(value: Value) {
|
|
|
79
79
|
/**
|
|
80
80
|
* Like the default Schema `Map` but with `withDefault` => []
|
|
81
81
|
*/
|
|
82
|
-
function Map_<
|
|
82
|
+
function Map_<KeySchema extends S.Top, ValueSchema extends S.Top>(input: { key: KeySchema; value: ValueSchema }) {
|
|
83
83
|
return pipe(
|
|
84
84
|
S.ReadonlyMap(input.key, input.value),
|
|
85
85
|
(s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new global.Map())) })
|
|
@@ -91,18 +91,19 @@ export { Map_ as Map }
|
|
|
91
91
|
/**
|
|
92
92
|
* Like the default Schema `ReadonlySet` but with `withDefault` => new Set()
|
|
93
93
|
*/
|
|
94
|
-
export const ReadonlySet = <
|
|
94
|
+
export const ReadonlySet = <ValueSchema extends S.Top>(value: ValueSchema) =>
|
|
95
95
|
pipe(
|
|
96
96
|
S.ReadonlySet(value),
|
|
97
|
-
(s) =>
|
|
97
|
+
(s) =>
|
|
98
|
+
Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new Set<S.Schema.Type<ValueSchema>>())) })
|
|
98
99
|
)
|
|
99
100
|
|
|
100
101
|
/**
|
|
101
102
|
* Like the default Schema `ReadonlyMap` but with `withDefault` => new Map()
|
|
102
103
|
*/
|
|
103
|
-
export const ReadonlyMap = <
|
|
104
|
-
readonly key:
|
|
105
|
-
readonly value:
|
|
104
|
+
export const ReadonlyMap = <KeySchema extends S.Top, ValueSchema extends S.Top>(pair: {
|
|
105
|
+
readonly key: KeySchema
|
|
106
|
+
readonly value: ValueSchema
|
|
106
107
|
}) =>
|
|
107
108
|
pipe(
|
|
108
109
|
S.ReadonlyMap(pair.key, pair.value),
|
|
@@ -112,25 +113,24 @@ export const ReadonlyMap = <K extends S.Top, V extends S.Top>(pair: {
|
|
|
112
113
|
/**
|
|
113
114
|
* Like the default Schema `NullOr` but with `withDefault` => null
|
|
114
115
|
*/
|
|
115
|
-
export const NullOr = <
|
|
116
|
+
export const NullOr = <Schema extends S.Top>(self: Schema) =>
|
|
116
117
|
pipe(
|
|
117
118
|
S.NullOr(self),
|
|
118
119
|
(s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => null)) })
|
|
119
120
|
)
|
|
120
121
|
|
|
121
|
-
export const defaultDate =
|
|
122
|
+
export const defaultDate = <Schema extends S.Top>(schema: Schema) =>
|
|
123
|
+
schema.pipe(withDefaultConstructor(() => new global.Date()))
|
|
122
124
|
|
|
123
|
-
export const defaultBool =
|
|
125
|
+
export const defaultBool = <Schema extends S.Top>(schema: Schema) => schema.pipe(withDefaultConstructor(() => false))
|
|
124
126
|
|
|
125
|
-
export const defaultNullable = (
|
|
126
|
-
s: S.Top
|
|
127
|
-
) => s.pipe(withDefaultConstructor(() => null))
|
|
127
|
+
export const defaultNullable = <Schema extends S.Top>(schema: Schema) => schema.pipe(withDefaultConstructor(() => null))
|
|
128
128
|
|
|
129
|
-
export const defaultArray =
|
|
129
|
+
export const defaultArray = <Schema extends S.Top>(schema: Schema) => schema.pipe(withDefaultConstructor(() => []))
|
|
130
130
|
|
|
131
|
-
export const defaultMap =
|
|
131
|
+
export const defaultMap = <Schema extends S.Top>(schema: Schema) => schema.pipe(withDefaultConstructor(() => new Map()))
|
|
132
132
|
|
|
133
|
-
export const defaultSet =
|
|
133
|
+
export const defaultSet = <Schema extends S.Top>(schema: Schema) => schema.pipe(withDefaultConstructor(() => new Set()))
|
|
134
134
|
|
|
135
135
|
export const withDefaultMake = <Self extends S.Top>(s: Self) => {
|
|
136
136
|
const a = Object.assign(S.decodeSync(s as any) as WithDefaults<Self>, s)
|
package/src/Schema.ts
CHANGED
|
@@ -66,8 +66,8 @@ export const PhoneNumber = PhoneNumberT
|
|
|
66
66
|
|
|
67
67
|
export type PhoneNumber = PhoneNumberType
|
|
68
68
|
|
|
69
|
-
export const makeIs = <A extends { _tag: string }, I,
|
|
70
|
-
schema: S.Codec<A, I,
|
|
69
|
+
export const makeIs = <A extends { _tag: string }, I, RD, RE>(
|
|
70
|
+
schema: S.Codec<A, I, RD, RE>
|
|
71
71
|
) => {
|
|
72
72
|
// In v4, transformations are stored as encoding on nodes, not as wrapper nodes.
|
|
73
73
|
// Union member ASTs are directly Objects (TypeLiteral equivalent).
|
|
@@ -94,8 +94,8 @@ export const makeIs = <A extends { _tag: string }, I, R>(
|
|
|
94
94
|
throw new Error("Unsupported")
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
-
export const makeIsAnyOf = <A extends { _tag: string }, I,
|
|
98
|
-
schema: S.Codec<A, I,
|
|
97
|
+
export const makeIsAnyOf = <A extends { _tag: string }, I, RD, RE>(
|
|
98
|
+
schema: S.Codec<A, I, RD, RE>
|
|
99
99
|
): IsAny<A> => {
|
|
100
100
|
if (SchemaAST.isUnion(schema.ast)) {
|
|
101
101
|
return <Keys extends A["_tag"][]>(...keys: Keys) => (a: A): a is ExtractUnion<A, ElemType<Keys>> =>
|
|
@@ -111,20 +111,30 @@ export interface IsAny<A extends { _tag: string }> {
|
|
|
111
111
|
<Keys extends A["_tag"][]>(...keys: Keys): (a: A) => a is ExtractUnion<A, ElemType<Keys>>
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
+
const getTagLiteral = <Tag extends string>(schema: S.tag<Tag>): Tag => {
|
|
115
|
+
if (!SchemaAST.isLiteral(schema.ast)) {
|
|
116
|
+
throw new Error("Unsupported _tag schema: expected a literal AST")
|
|
117
|
+
}
|
|
118
|
+
return schema.ast.literal as Tag
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
type TaggedUnionMap<Members extends readonly (S.Top & { fields: { _tag: S.tag<string> } })[]> = {
|
|
122
|
+
[Key in Members[number] as Key["fields"]["_tag"]["Type"]]: Key
|
|
123
|
+
}
|
|
124
|
+
|
|
114
125
|
export const taggedUnionMap = <
|
|
115
126
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
116
127
|
Members extends readonly (S.Top & { fields: { _tag: S.tag<string> } })[]
|
|
117
128
|
>(
|
|
118
129
|
self: Members
|
|
119
|
-
) =>
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}, {} as any)
|
|
130
|
+
) => {
|
|
131
|
+
const out = {} as TaggedUnionMap<Members>
|
|
132
|
+
for (const key of self) {
|
|
133
|
+
const tag = getTagLiteral(key.fields._tag) as keyof TaggedUnionMap<Members>
|
|
134
|
+
out[tag] = key as TaggedUnionMap<Members>[typeof tag]
|
|
135
|
+
}
|
|
136
|
+
return out
|
|
137
|
+
}
|
|
128
138
|
|
|
129
139
|
export const tags = <
|
|
130
140
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -132,38 +142,41 @@ export const tags = <
|
|
|
132
142
|
>(
|
|
133
143
|
self: Members
|
|
134
144
|
) =>
|
|
135
|
-
S.Literals(
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
145
|
+
S.Literals(
|
|
146
|
+
self.map((key) => getTagLiteral(key.fields._tag)) as {
|
|
147
|
+
[Index in keyof Members]: S.Schema.Type<Members[Index]["fields"]["_tag"]>
|
|
148
|
+
}
|
|
149
|
+
) as S.Literals<
|
|
150
|
+
{
|
|
151
|
+
[Index in keyof Members]: S.Schema.Type<Members[Index]["fields"]["_tag"]>
|
|
152
|
+
}
|
|
153
|
+
>
|
|
154
|
+
|
|
155
|
+
export const ExtendTaggedUnion = <A extends { readonly _tag: string }, I, R>(
|
|
144
156
|
schema: S.Codec<A, I, R>
|
|
145
157
|
) =>
|
|
146
158
|
extendM(
|
|
147
159
|
schema,
|
|
148
160
|
(_) => ({
|
|
149
|
-
is: S.is(schema
|
|
150
|
-
isA: makeIs(_
|
|
151
|
-
isAnyOf: makeIsAnyOf(_
|
|
161
|
+
// is: S.is(schema), // only works with never DecodingServices
|
|
162
|
+
isA: makeIs(_),
|
|
163
|
+
isAnyOf: makeIsAnyOf(_) /*, map: taggedUnionMap(a) */
|
|
152
164
|
})
|
|
153
165
|
)
|
|
154
166
|
|
|
155
167
|
export const TaggedUnion = <
|
|
156
|
-
|
|
157
|
-
|
|
168
|
+
Members extends NonEmptyReadonlyArray<
|
|
169
|
+
S.Codec<{ readonly _tag: string }, any, any, any> & { fields: { _tag: S.tag<string> } }
|
|
170
|
+
>
|
|
158
171
|
>(...a: Members) =>
|
|
159
172
|
pipe(
|
|
160
173
|
S.Union(a),
|
|
161
174
|
(_) =>
|
|
162
175
|
extendM(_, (_) => ({
|
|
163
|
-
is: S.is(_
|
|
164
|
-
isA: makeIs(_
|
|
165
|
-
isAnyOf: makeIsAnyOf(_
|
|
176
|
+
// is: S.is(_), // only works with never DecodingServices
|
|
177
|
+
isA: makeIs(_),
|
|
178
|
+
isAnyOf: makeIsAnyOf(_),
|
|
166
179
|
tagMap: taggedUnionMap(a),
|
|
167
|
-
tags: tags(a
|
|
180
|
+
tags: tags(a)
|
|
168
181
|
}))
|
|
169
182
|
)
|
package/test/schema.test.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// import { generateFromArbitrary } from "@effect-app/infra/test"
|
|
2
2
|
import { Array, S } from "effect-app"
|
|
3
|
-
import { test } from "vitest"
|
|
3
|
+
import { expect, test } from "vitest"
|
|
4
4
|
|
|
5
5
|
const A = S.Struct({ a: S.NonEmptyString255, email: S.NullOr(S.Email) })
|
|
6
6
|
test("works", () => {
|
|
@@ -23,3 +23,34 @@ test("literal default works", () => {
|
|
|
23
23
|
const s2 = S.Struct({ l: l2.withDefault })
|
|
24
24
|
expect(s2.makeUnsafe({}).l).toBe("b")
|
|
25
25
|
})
|
|
26
|
+
|
|
27
|
+
test("tagged union derives tag map and tags from v4 literal ast", () => {
|
|
28
|
+
const schema = S.TaggedUnion(
|
|
29
|
+
S.TaggedStruct("A", { a: S.String }),
|
|
30
|
+
S.TaggedStruct("B", { b: S.Number }),
|
|
31
|
+
S.TaggedStruct("C", { c: S.Boolean })
|
|
32
|
+
)
|
|
33
|
+
const caseA = schema.tagMap["A"]
|
|
34
|
+
const caseB = schema.tagMap["B"]
|
|
35
|
+
const caseC = schema.tagMap["C"]
|
|
36
|
+
const isAOrB = schema.isAnyOf("A", "B")
|
|
37
|
+
|
|
38
|
+
expect(caseA.fields._tag.ast.literal).toBe("A")
|
|
39
|
+
expect(caseB.fields._tag.ast.literal).toBe("B")
|
|
40
|
+
expect(caseC.fields._tag.ast.literal).toBe("C")
|
|
41
|
+
expect(S.decodeSync(schema.tags)("A")).toBe("A")
|
|
42
|
+
expect(S.decodeSync(schema.tags)("B")).toBe("B")
|
|
43
|
+
expect(S.decodeSync(schema.tags)("C")).toBe("C")
|
|
44
|
+
expect(() => S.decodeUnknownSync(schema.tags)("D")).toThrow()
|
|
45
|
+
|
|
46
|
+
expect(schema.isA.A({ _tag: "A", a: "ok" })).toBe(true)
|
|
47
|
+
expect(schema.isA.A({ _tag: "B", b: 1 })).toBe(false)
|
|
48
|
+
expect(schema.isA.B({ _tag: "B", b: 1 })).toBe(true)
|
|
49
|
+
expect(schema.isA.B({ _tag: "A", a: "ok" })).toBe(false)
|
|
50
|
+
expect(schema.isA.C({ _tag: "C", c: true })).toBe(true)
|
|
51
|
+
expect(schema.isA.C({ _tag: "A", a: "ok" })).toBe(false)
|
|
52
|
+
|
|
53
|
+
expect(isAOrB({ _tag: "A", a: "ok" })).toBe(true)
|
|
54
|
+
expect(isAOrB({ _tag: "B", b: 1 })).toBe(true)
|
|
55
|
+
expect(isAOrB({ _tag: "C", c: true })).toBe(false)
|
|
56
|
+
})
|