effect-app 4.0.0-beta.9 → 4.0.0-beta.91
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 +370 -0
- package/dist/Config/SecretURL.js +2 -2
- package/dist/Config.d.ts +7 -0
- package/dist/Config.d.ts.map +1 -0
- package/dist/Config.js +6 -0
- package/dist/ConfigProvider.d.ts +39 -0
- package/dist/ConfigProvider.d.ts.map +1 -0
- package/dist/ConfigProvider.js +42 -0
- package/dist/Context.d.ts +40 -0
- package/dist/Context.d.ts.map +1 -0
- package/dist/Context.js +66 -0
- package/dist/Effect.d.ts +8 -7
- package/dist/Effect.d.ts.map +1 -1
- package/dist/Effect.js +3 -2
- package/dist/Layer.d.ts +5 -4
- package/dist/Layer.d.ts.map +1 -1
- package/dist/Layer.js +1 -1
- package/dist/Operations.d.ts +68 -31
- package/dist/Operations.d.ts.map +1 -1
- package/dist/Pure.d.ts +2 -2
- package/dist/Pure.d.ts.map +1 -1
- package/dist/Pure.js +13 -13
- package/dist/Schema/Class.d.ts +60 -5
- package/dist/Schema/Class.d.ts.map +1 -1
- package/dist/Schema/Class.js +103 -12
- package/dist/Schema/SpecialJsonSchema.d.ts +21 -0
- package/dist/Schema/SpecialJsonSchema.d.ts.map +1 -0
- package/dist/Schema/SpecialJsonSchema.js +59 -0
- package/dist/Schema/SpecialOpenApi.d.ts +32 -0
- package/dist/Schema/SpecialOpenApi.d.ts.map +1 -0
- package/dist/Schema/SpecialOpenApi.js +123 -0
- package/dist/Schema/brand.d.ts +8 -5
- package/dist/Schema/brand.d.ts.map +1 -1
- package/dist/Schema/brand.js +1 -1
- package/dist/Schema/email.d.ts.map +1 -1
- package/dist/Schema/email.js +9 -4
- package/dist/Schema/ext.d.ts +103 -46
- package/dist/Schema/ext.d.ts.map +1 -1
- package/dist/Schema/ext.js +110 -51
- package/dist/Schema/moreStrings.d.ts +19 -7
- package/dist/Schema/moreStrings.d.ts.map +1 -1
- package/dist/Schema/moreStrings.js +14 -9
- package/dist/Schema/numbers.d.ts +11 -11
- package/dist/Schema/numbers.d.ts.map +1 -1
- package/dist/Schema/numbers.js +10 -9
- package/dist/Schema/phoneNumber.d.ts.map +1 -1
- package/dist/Schema/phoneNumber.js +8 -3
- package/dist/Schema/strings.d.ts +4 -4
- package/dist/Schema/strings.d.ts.map +1 -1
- package/dist/Schema.d.ts +23 -56
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +44 -65
- package/dist/client/apiClientFactory.d.ts +11 -28
- package/dist/client/apiClientFactory.d.ts.map +1 -1
- package/dist/client/apiClientFactory.js +17 -18
- package/dist/client/clientFor.d.ts +6 -5
- package/dist/client/clientFor.d.ts.map +1 -1
- package/dist/client/errors.d.ts +18 -9
- package/dist/client/errors.d.ts.map +1 -1
- package/dist/client/errors.js +35 -10
- package/dist/client/makeClient.d.ts +21 -16
- package/dist/client/makeClient.d.ts.map +1 -1
- package/dist/client/makeClient.js +32 -23
- package/dist/http/Request.d.ts.map +1 -1
- package/dist/http/Request.js +5 -5
- package/dist/ids.d.ts +3 -3
- package/dist/ids.d.ts.map +1 -1
- package/dist/ids.js +3 -2
- package/dist/index.d.ts +3 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -9
- package/dist/middleware.d.ts +2 -2
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +3 -3
- package/dist/rpc/MiddlewareMaker.d.ts +4 -3
- package/dist/rpc/MiddlewareMaker.d.ts.map +1 -1
- package/dist/rpc/MiddlewareMaker.js +7 -6
- package/dist/rpc/RpcContextMap.d.ts +2 -2
- package/dist/rpc/RpcContextMap.d.ts.map +1 -1
- package/dist/rpc/RpcContextMap.js +4 -4
- package/dist/rpc/RpcMiddleware.d.ts +4 -3
- package/dist/rpc/RpcMiddleware.d.ts.map +1 -1
- package/dist/rpc/RpcMiddleware.js +1 -1
- package/dist/utils/gen.d.ts +1 -1
- package/dist/utils/gen.d.ts.map +1 -1
- package/dist/utils/logger.d.ts +2 -2
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +3 -3
- package/dist/utils.d.ts +18 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +24 -5
- package/package.json +29 -17
- package/src/Config/SecretURL.ts +1 -1
- package/src/Config.ts +14 -0
- package/src/ConfigProvider.ts +48 -0
- package/src/{ServiceMap.ts → Context.ts} +57 -64
- package/src/Effect.ts +11 -9
- package/src/Layer.ts +5 -4
- package/src/Pure.ts +17 -18
- package/src/Schema/Class.ts +168 -20
- package/src/Schema/SpecialJsonSchema.ts +69 -0
- package/src/Schema/SpecialOpenApi.ts +130 -0
- package/src/Schema/brand.ts +13 -7
- package/src/Schema/email.ts +10 -2
- package/src/Schema/ext.ts +185 -82
- package/src/Schema/moreStrings.ts +21 -11
- package/src/Schema/numbers.ts +9 -8
- package/src/Schema/phoneNumber.ts +8 -1
- package/src/Schema.ts +80 -104
- package/src/client/apiClientFactory.ts +30 -34
- package/src/client/clientFor.ts +6 -1
- package/src/client/errors.ts +46 -12
- package/src/client/makeClient.ts +122 -62
- package/src/http/Request.ts +7 -4
- package/src/ids.ts +3 -2
- package/src/index.ts +3 -11
- package/src/middleware.ts +2 -2
- package/src/rpc/MiddlewareMaker.ts +8 -7
- package/src/rpc/RpcContextMap.ts +6 -5
- package/src/rpc/RpcMiddleware.ts +5 -4
- package/src/utils/gen.ts +1 -1
- package/src/utils/logger.ts +2 -2
- package/src/utils.ts +26 -4
- package/test/dist/moreStrings.test.d.ts.map +1 -0
- package/test/dist/rpc.test.d.ts.map +1 -1
- package/test/dist/secretURL.test.d.ts.map +1 -0
- package/test/dist/special.test.d.ts.map +1 -0
- package/test/moreStrings.test.ts +17 -0
- package/test/rpc.test.ts +28 -6
- package/test/schema.test.ts +397 -4
- package/test/secretURL.test.ts +157 -0
- package/test/special.test.ts +732 -0
- package/test/utils.test.ts +2 -2
- package/tsconfig.base.json +0 -1
- package/tsconfig.json +0 -1
- package/dist/ServiceMap.d.ts +0 -44
- package/dist/ServiceMap.d.ts.map +0 -1
- package/dist/ServiceMap.js +0 -91
- package/dist/Struct.d.ts +0 -44
- package/dist/Struct.d.ts.map +0 -1
- package/dist/Struct.js +0 -29
- package/src/Struct.ts +0 -54
package/src/utils.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unsafe-function-type */
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
3
|
/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
|
|
4
|
-
import { Effect, Exit, Fiber, Option, Record } from "effect"
|
|
4
|
+
import { Cause, Effect, Exit, Fiber, Option, Record } from "effect"
|
|
5
5
|
import { dual } from "effect/Function"
|
|
6
|
-
import { isFunction } from "effect/Predicate"
|
|
6
|
+
import { isFunction, isObject } from "effect/Predicate"
|
|
7
7
|
import * as Result from "effect/Result"
|
|
8
8
|
import type { GetFieldType, NumericDictionary, PropertyPath } from "lodash"
|
|
9
9
|
import { identity, pipe } from "./Function.js"
|
|
@@ -924,8 +924,8 @@ export const runtimeFiberAsPromise = <A, E>(fiber: Fiber.Fiber<A, E>, signal?: A
|
|
|
924
924
|
if (Exit.isSuccess(exit)) {
|
|
925
925
|
resolve(exit.value)
|
|
926
926
|
} else {
|
|
927
|
-
//
|
|
928
|
-
reject(exit.cause)
|
|
927
|
+
// eslint-disable-next-line
|
|
928
|
+
reject(Cause.squash(exit.cause))
|
|
929
929
|
}
|
|
930
930
|
})
|
|
931
931
|
)
|
|
@@ -950,3 +950,25 @@ export type UnionToTuples<T, U = T> = [T] extends [never] ? []
|
|
|
950
950
|
| [T, ...UnionToTuples<Exclude<U, T>>]
|
|
951
951
|
| UnionToTuples<Exclude<U, T>>
|
|
952
952
|
: []
|
|
953
|
+
|
|
954
|
+
const genConstructor = (function*() {}).constructor
|
|
955
|
+
|
|
956
|
+
/**
|
|
957
|
+
* @example
|
|
958
|
+
* ```ts
|
|
959
|
+
* import { Utils } from "effect"
|
|
960
|
+
*
|
|
961
|
+
* function* generatorFn() {
|
|
962
|
+
* yield 1
|
|
963
|
+
* yield 2
|
|
964
|
+
* }
|
|
965
|
+
*
|
|
966
|
+
* console.log(Utils.isGeneratorFunction(generatorFn)) // true
|
|
967
|
+
* console.log(Utils.isGeneratorFunction(() => {})) // false
|
|
968
|
+
* ```
|
|
969
|
+
*
|
|
970
|
+
* @category predicates
|
|
971
|
+
* @since 3.11.0
|
|
972
|
+
*/
|
|
973
|
+
export const isGeneratorFunction = (u: unknown): u is (...args: Array<any>) => Generator<any, any, any> =>
|
|
974
|
+
isObject(u) && u.constructor === genConstructor
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"moreStrings.test.d.ts","sourceRoot":"","sources":["../moreStrings.test.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.test.d.ts","sourceRoot":"","sources":["../rpc.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc.test.d.ts","sourceRoot":"","sources":["../rpc.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAErF,OAAO,EAAE,CAAC,EAAE,MAAM,iBAAiB,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,qBAAa,iBAAkB,SAAQ,sBAIrC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKL,qBAAa,KAAM,SAAQ,UAQzB;CAAG"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secretURL.test.d.ts","sourceRoot":"","sources":["../secretURL.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"special.test.d.ts","sourceRoot":"","sources":["../special.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { S } from "effect-app"
|
|
2
|
+
import * as fc from "fast-check"
|
|
3
|
+
import { urlAlphabet } from "nanoid"
|
|
4
|
+
import { test } from "vitest"
|
|
5
|
+
|
|
6
|
+
const nanoidAlphabet = new Set(urlAlphabet)
|
|
7
|
+
|
|
8
|
+
const isNanoId = (value: string) => value.length === 21 && Array.from(value).every((char) => nanoidAlphabet.has(char))
|
|
9
|
+
|
|
10
|
+
test("StringId arbitrary generates nanoid-shaped values", () => {
|
|
11
|
+
fc.assert(
|
|
12
|
+
fc.property(S.toArbitrary(S.StringId), (value) => {
|
|
13
|
+
expect(isNanoId(value)).toBe(true)
|
|
14
|
+
expect(S.is(S.StringId)(value)).toBe(true)
|
|
15
|
+
})
|
|
16
|
+
)
|
|
17
|
+
})
|
package/test/rpc.test.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { expect, test } from "vitest"
|
|
1
2
|
import { makeRpcClient, NotLoggedInError, UnauthorizedError } from "../src/client.js"
|
|
3
|
+
import { ForceVoid } from "../src/client/makeClient.js"
|
|
2
4
|
import { S } from "../src/index.js"
|
|
3
5
|
import { RpcContextMap } from "../src/rpc.js"
|
|
4
6
|
|
|
@@ -8,16 +10,36 @@ export class RequestContextMap extends RpcContextMap.makeMap({
|
|
|
8
10
|
test: RpcContextMap.make()(S.Never)
|
|
9
11
|
}) {}
|
|
10
12
|
|
|
11
|
-
const {
|
|
13
|
+
const { TaggedRequestFor } = makeRpcClient(RequestContextMap)
|
|
14
|
+
const TaggedRequest = TaggedRequestFor("Test")
|
|
12
15
|
|
|
13
16
|
export class Stats extends TaggedRequest<Stats>()("Stats", {}, {
|
|
14
17
|
allowedRoles: ["manager"],
|
|
15
18
|
success: {
|
|
16
|
-
usersActive24Hours: S.
|
|
17
|
-
usersActiveLastWeek: S.
|
|
18
|
-
newUsersLast24Hours: S.
|
|
19
|
-
newUsersLastWeek: S.
|
|
19
|
+
usersActive24Hours: S.Finite,
|
|
20
|
+
usersActiveLastWeek: S.Finite,
|
|
21
|
+
newUsersLast24Hours: S.Finite,
|
|
22
|
+
newUsersLastWeek: S.Finite
|
|
20
23
|
}
|
|
21
24
|
}) {}
|
|
22
25
|
|
|
23
|
-
declare const _stats: typeof Stats.
|
|
26
|
+
declare const _stats: typeof Stats.Type
|
|
27
|
+
declare const _statsSuccess: typeof Stats.success.Type
|
|
28
|
+
declare const _statsError: typeof Stats.error.Type
|
|
29
|
+
|
|
30
|
+
test("ForceVoid decodes and encodes as void", () => {
|
|
31
|
+
expect(S.decodeUnknownSync(ForceVoid)(undefined)).toBe(undefined)
|
|
32
|
+
expect(S.is(ForceVoid)(undefined)).toBe(true)
|
|
33
|
+
expect(S.decodeUnknownSync(ForceVoid)("test")).toBe(undefined)
|
|
34
|
+
expect(S.is(ForceVoid)("test")).toBe(true)
|
|
35
|
+
expect(S.encodeUnknownSync(ForceVoid)("test")).toBe(undefined)
|
|
36
|
+
expect(S.encodeUnknownSync(S.toCodecJson(ForceVoid))("test")).toBe(null)
|
|
37
|
+
expectTypeOf<typeof _stats>().toEqualTypeOf<Stats>()
|
|
38
|
+
expectTypeOf<typeof _statsSuccess>().toEqualTypeOf<{
|
|
39
|
+
readonly usersActive24Hours: number
|
|
40
|
+
readonly usersActiveLastWeek: number
|
|
41
|
+
readonly newUsersLast24Hours: number
|
|
42
|
+
readonly newUsersLastWeek: number
|
|
43
|
+
}>()
|
|
44
|
+
expectTypeOf<typeof _statsError>().toEqualTypeOf<NotLoggedInError | UnauthorizedError>()
|
|
45
|
+
})
|
package/test/schema.test.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// import { generateFromArbitrary } from "@effect-app/infra/test"
|
|
2
2
|
import { Array, S } from "effect-app"
|
|
3
|
-
import {
|
|
3
|
+
import { specialJsonSchemaDocument } from "effect-app/Schema/SpecialJsonSchema"
|
|
4
|
+
import { describe, expect, expectTypeOf, test } from "vitest"
|
|
4
5
|
|
|
5
6
|
const A = S.Struct({ a: S.NonEmptyString255, email: S.NullOr(S.Email) })
|
|
6
7
|
test("works", () => {
|
|
@@ -14,12 +15,404 @@ test("works", () => {
|
|
|
14
15
|
})
|
|
15
16
|
|
|
16
17
|
test("literal default works", () => {
|
|
17
|
-
const l = S.
|
|
18
|
+
const l = S.Literals(["a", "b"])
|
|
18
19
|
expect(l.Default).toBe("a")
|
|
19
20
|
const s = S.Struct({ l: l.withDefault })
|
|
20
|
-
expect(s.
|
|
21
|
+
expect(s.make({}).l).toBe("a")
|
|
21
22
|
|
|
22
23
|
const l2 = l.changeDefault("b")
|
|
23
24
|
const s2 = S.Struct({ l: l2.withDefault })
|
|
24
|
-
expect(s2.
|
|
25
|
+
expect(s2.make({}).l).toBe("b")
|
|
26
|
+
})
|
|
27
|
+
|
|
28
|
+
test("tagged union derives tag map and tags from v4 literal ast", () => {
|
|
29
|
+
const schema = S.TaggedUnion(
|
|
30
|
+
S.TaggedStruct("A", { a: S.String }),
|
|
31
|
+
S.TaggedStruct("B", { b: S.Finite }),
|
|
32
|
+
S.TaggedStruct("C", { c: S.Boolean })
|
|
33
|
+
)
|
|
34
|
+
const caseA = schema.cases["A"]
|
|
35
|
+
const caseB = schema.cases["B"]
|
|
36
|
+
const caseC = schema.cases["C"]
|
|
37
|
+
const isAOrB = schema.isAnyOf(["A", "B"])
|
|
38
|
+
|
|
39
|
+
expect(caseA.fields._tag.ast.literal).toBe("A")
|
|
40
|
+
expect(caseB.fields._tag.ast.literal).toBe("B")
|
|
41
|
+
expect(caseC.fields._tag.ast.literal).toBe("C")
|
|
42
|
+
expect(S.decodeSync(schema.tags)("A")).toBe("A")
|
|
43
|
+
expect(S.decodeSync(schema.tags)("B")).toBe("B")
|
|
44
|
+
expect(S.decodeSync(schema.tags)("C")).toBe("C")
|
|
45
|
+
expect(() => S.decodeUnknownSync(schema.tags)("D")).toThrow()
|
|
46
|
+
|
|
47
|
+
expect(schema.guards.A({ _tag: "A", a: "ok" })).toBe(true)
|
|
48
|
+
expect(schema.guards.A({ _tag: "B", b: 1 })).toBe(false)
|
|
49
|
+
expect(schema.guards.B({ _tag: "B", b: 1 })).toBe(true)
|
|
50
|
+
expect(schema.guards.B({ _tag: "A", a: "ok" })).toBe(false)
|
|
51
|
+
expect(schema.guards.C({ _tag: "C", c: true })).toBe(true)
|
|
52
|
+
expect(schema.guards.C({ _tag: "A", a: "ok" })).toBe(false)
|
|
53
|
+
|
|
54
|
+
expect(isAOrB({ _tag: "A", a: "ok" })).toBe(true)
|
|
55
|
+
expect(isAOrB({ _tag: "B", b: 1 })).toBe(true)
|
|
56
|
+
expect(isAOrB({ _tag: "C", c: true })).toBe(false)
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
test("TaggedUnion tags returns a Literals schema with correct literal values", () => {
|
|
60
|
+
const schema = S.TaggedUnion(
|
|
61
|
+
S.TaggedStruct("X", { x: S.String }),
|
|
62
|
+
S.TaggedStruct("Y", { y: S.Finite })
|
|
63
|
+
)
|
|
64
|
+
|
|
65
|
+
expect(schema.tags.literals).toEqual(["X", "Y"])
|
|
66
|
+
expectTypeOf(schema.tags.literals).toMatchTypeOf<readonly ["X", "Y"]>()
|
|
67
|
+
})
|
|
68
|
+
|
|
69
|
+
test("TaggedUnion tags.pick returns a subset of the tag literals", () => {
|
|
70
|
+
const schema = S.TaggedUnion(
|
|
71
|
+
S.TaggedStruct("A", { a: S.String }),
|
|
72
|
+
S.TaggedStruct("B", { b: S.Finite }),
|
|
73
|
+
S.TaggedStruct("C", { c: S.Boolean })
|
|
74
|
+
)
|
|
75
|
+
|
|
76
|
+
const subset = schema.tags.pick(["A", "C"])
|
|
77
|
+
expect(subset.literals).toEqual(["A", "C"])
|
|
78
|
+
expect(S.decodeSync(subset)("A")).toBe("A")
|
|
79
|
+
expect(S.decodeSync(subset)("C")).toBe("C")
|
|
80
|
+
expect(() => S.decodeUnknownSync(subset)("B")).toThrow()
|
|
81
|
+
})
|
|
82
|
+
|
|
83
|
+
test("tags standalone function extracts tags from member schemas", () => {
|
|
84
|
+
const members = [
|
|
85
|
+
S.TaggedStruct("Foo", { foo: S.String }),
|
|
86
|
+
S.TaggedStruct("Bar", { bar: S.Finite })
|
|
87
|
+
] as const
|
|
88
|
+
|
|
89
|
+
const tagSchema = S.tags(members)
|
|
90
|
+
expect(tagSchema.literals).toEqual(["Foo", "Bar"])
|
|
91
|
+
expect(S.decodeSync(tagSchema)("Foo")).toBe("Foo")
|
|
92
|
+
expect(S.decodeSync(tagSchema)("Bar")).toBe("Bar")
|
|
93
|
+
expect(() => S.decodeUnknownSync(tagSchema)("Baz")).toThrow()
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
test("ExtendTaggedUnion adds tags to an existing Union", () => {
|
|
97
|
+
const union = S.Union([
|
|
98
|
+
S.TaggedStruct("P", { p: S.String }),
|
|
99
|
+
S.TaggedStruct("Q", { q: S.Finite })
|
|
100
|
+
])
|
|
101
|
+
const extended = S.ExtendTaggedUnion(union)
|
|
102
|
+
|
|
103
|
+
expect(extended.tags.literals).toEqual(["P", "Q"])
|
|
104
|
+
expect(S.decodeSync(extended.tags)("P")).toBe("P")
|
|
105
|
+
expect(S.decodeSync(extended.tags)("Q")).toBe("Q")
|
|
106
|
+
expect(() => S.decodeUnknownSync(extended.tags)("R")).toThrow()
|
|
107
|
+
expect(extended.cases["P"].fields._tag.ast.literal).toBe("P")
|
|
108
|
+
expect(extended.guards.P({ _tag: "P", p: "ok" })).toBe(true)
|
|
109
|
+
expect(extended.guards.P({ _tag: "Q", q: 1 })).toBe(false)
|
|
110
|
+
})
|
|
111
|
+
|
|
112
|
+
test("TaggedUnion match dispatches on _tag", () => {
|
|
113
|
+
const schema = S.TaggedUnion(
|
|
114
|
+
S.TaggedStruct("A", { a: S.String }),
|
|
115
|
+
S.TaggedStruct("B", { b: S.Finite })
|
|
116
|
+
)
|
|
117
|
+
type T = S.Schema.Type<typeof schema>
|
|
118
|
+
|
|
119
|
+
const matcher = schema.match({
|
|
120
|
+
A: (v) => `got A: ${v.a}`,
|
|
121
|
+
B: (v) => `got B: ${v.b}`
|
|
122
|
+
})
|
|
123
|
+
expect(matcher({ _tag: "A", a: "hello" } as T)).toBe("got A: hello")
|
|
124
|
+
expect(matcher({ _tag: "B", b: 42 } as T)).toBe("got B: 42")
|
|
125
|
+
})
|
|
126
|
+
|
|
127
|
+
test("TaggedUnion with single member", () => {
|
|
128
|
+
const schema = S.TaggedUnion(
|
|
129
|
+
S.TaggedStruct("Only", { val: S.String })
|
|
130
|
+
)
|
|
131
|
+
|
|
132
|
+
expect(schema.tags.literals).toEqual(["Only"])
|
|
133
|
+
expect(S.decodeSync(schema.tags)("Only")).toBe("Only")
|
|
134
|
+
expect(() => S.decodeUnknownSync(schema.tags)("Other")).toThrow()
|
|
135
|
+
expect(schema.guards.Only({ _tag: "Only", val: "x" })).toBe(true)
|
|
136
|
+
})
|
|
137
|
+
|
|
138
|
+
test("TaggedUnion tags type is narrowed to the exact tag literals", () => {
|
|
139
|
+
const schema = S.TaggedUnion(
|
|
140
|
+
S.TaggedStruct("Alpha", { a: S.String }),
|
|
141
|
+
S.TaggedStruct("Beta", { b: S.Finite }),
|
|
142
|
+
S.TaggedStruct("Gamma", { c: S.Boolean })
|
|
143
|
+
)
|
|
144
|
+
|
|
145
|
+
type Tags = S.Schema.Type<typeof schema.tags>
|
|
146
|
+
expectTypeOf<Tags>().toEqualTypeOf<"Alpha" | "Beta" | "Gamma">()
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
test("TaggedUnion with encodeKeys renaming a non-tag key", () => {
|
|
150
|
+
const MemberA = S.TaggedStruct("A", { firstName: S.String }).pipe(
|
|
151
|
+
S.encodeKeys({ firstName: "first_name" })
|
|
152
|
+
)
|
|
153
|
+
const MemberB = S.TaggedStruct("B", { lastName: S.Finite }).pipe(
|
|
154
|
+
S.encodeKeys({ lastName: "last_name" })
|
|
155
|
+
)
|
|
156
|
+
|
|
157
|
+
const schema = S.TaggedUnion(MemberA, MemberB)
|
|
158
|
+
|
|
159
|
+
expect(schema.tags.literals).toEqual(["A", "B"])
|
|
160
|
+
expect(S.decodeSync(schema.tags)("A")).toBe("A")
|
|
161
|
+
expect(S.decodeSync(schema.tags)("B")).toBe("B")
|
|
162
|
+
|
|
163
|
+
// decode from encoded (snake_case) to decoded (camelCase)
|
|
164
|
+
const decoded = S.decodeUnknownSync(schema)({ _tag: "A", first_name: "Alice" })
|
|
165
|
+
expect(decoded).toEqual({ _tag: "A", firstName: "Alice" })
|
|
166
|
+
|
|
167
|
+
const decoded2 = S.decodeUnknownSync(schema)({ _tag: "B", last_name: 42 })
|
|
168
|
+
expect(decoded2).toEqual({ _tag: "B", lastName: 42 })
|
|
169
|
+
|
|
170
|
+
// encode back to snake_case
|
|
171
|
+
type T = S.Schema.Type<typeof schema>
|
|
172
|
+
const encoded = S.encodeSync(schema)({ _tag: "A", firstName: "Alice" } as T)
|
|
173
|
+
expect(encoded).toEqual({ _tag: "A", first_name: "Alice" })
|
|
174
|
+
|
|
175
|
+
// guards work on decoded values
|
|
176
|
+
expect(schema.guards.A({ _tag: "A", firstName: "Alice" })).toBe(true)
|
|
177
|
+
expect(schema.guards.A({ _tag: "B", lastName: 42 })).toBe(false)
|
|
178
|
+
expect(schema.guards.B({ _tag: "B", lastName: 42 })).toBe(true)
|
|
179
|
+
})
|
|
180
|
+
|
|
181
|
+
test("TaggedUnion with TaggedClass members", () => {
|
|
182
|
+
class Foo extends S.TaggedClass<Foo>()("Foo", { name: S.String }) {}
|
|
183
|
+
class Bar extends S.TaggedClass<Bar>()("Bar", { count: S.Finite }) {}
|
|
184
|
+
|
|
185
|
+
const schema = S.TaggedUnion(Foo, Bar)
|
|
186
|
+
|
|
187
|
+
expect(schema.tags.literals).toEqual(["Foo", "Bar"])
|
|
188
|
+
expect(S.decodeSync(schema.tags)("Foo")).toBe("Foo")
|
|
189
|
+
expect(S.decodeSync(schema.tags)("Bar")).toBe("Bar")
|
|
190
|
+
expect(() => S.decodeUnknownSync(schema.tags)("Baz")).toThrow()
|
|
191
|
+
|
|
192
|
+
const decoded = S.decodeUnknownSync(schema)({ _tag: "Foo", name: "Alice" })
|
|
193
|
+
expect(decoded).toBeInstanceOf(Foo)
|
|
194
|
+
expect(decoded).toEqual(new Foo({ name: "Alice" }))
|
|
195
|
+
|
|
196
|
+
const decoded2 = S.decodeUnknownSync(schema)({ _tag: "Bar", count: 3 })
|
|
197
|
+
expect(decoded2).toBeInstanceOf(Bar)
|
|
198
|
+
expect(decoded2).toEqual(new Bar({ count: 3 }))
|
|
199
|
+
|
|
200
|
+
expect(schema.guards.Foo(new Foo({ name: "Alice" }))).toBe(true)
|
|
201
|
+
expect(schema.guards.Foo(new Bar({ count: 3 }))).toBe(false)
|
|
202
|
+
expect(schema.guards.Bar(new Bar({ count: 3 }))).toBe(true)
|
|
203
|
+
})
|
|
204
|
+
|
|
205
|
+
describe("ReadonlySetFromArray", () => {
|
|
206
|
+
test("decodes an array of strings to a Set", () => {
|
|
207
|
+
const schema = S.ReadonlySetFromArray(S.String)
|
|
208
|
+
const decoded = S.decodeUnknownSync(schema)(["a", "b", "c"])
|
|
209
|
+
expect(decoded).toEqual(new Set(["a", "b", "c"]))
|
|
210
|
+
})
|
|
211
|
+
|
|
212
|
+
test("encodes a Set back to an array", () => {
|
|
213
|
+
const schema = S.ReadonlySetFromArray(S.String)
|
|
214
|
+
const encoded = S.encodeSync(schema)(new Set(["a", "b"]))
|
|
215
|
+
expect(encoded).toEqual(["a", "b"])
|
|
216
|
+
})
|
|
217
|
+
|
|
218
|
+
test("decodes with NumberFromString as value", () => {
|
|
219
|
+
const schema = S.ReadonlySetFromArray(S.NumberFromString)
|
|
220
|
+
const decoded = S.decodeUnknownSync(schema)(["1", "2", "3"])
|
|
221
|
+
expect(decoded).toEqual(new Set([1, 2, 3]))
|
|
222
|
+
expectTypeOf(decoded).toEqualTypeOf<ReadonlySet<number>>()
|
|
223
|
+
})
|
|
224
|
+
|
|
225
|
+
test("encodes with NumberFromString as value", () => {
|
|
226
|
+
const schema = S.ReadonlySetFromArray(S.NumberFromString)
|
|
227
|
+
const encoded = S.encodeSync(schema)(new Set([1, 2, 3]))
|
|
228
|
+
expect(encoded).toEqual(["1", "2", "3"])
|
|
229
|
+
})
|
|
230
|
+
|
|
231
|
+
test("rejects invalid input", () => {
|
|
232
|
+
const schema = S.ReadonlySetFromArray(S.NumberFromString)
|
|
233
|
+
expect(() => S.decodeUnknownSync(schema)([1, 2])).toThrow()
|
|
234
|
+
})
|
|
235
|
+
})
|
|
236
|
+
|
|
237
|
+
describe("ReadonlyMapFromArray", () => {
|
|
238
|
+
test("decodes an array of tuples to a Map", () => {
|
|
239
|
+
const schema = S.ReadonlyMap({ key: S.String, value: S.Finite })
|
|
240
|
+
const decoded = S.decodeUnknownSync(schema)([["a", 1], ["b", 2]])
|
|
241
|
+
expect(decoded).toEqual(new Map([["a", 1], ["b", 2]]))
|
|
242
|
+
})
|
|
243
|
+
|
|
244
|
+
test("encodes a Map back to an array of tuples", () => {
|
|
245
|
+
const schema = S.ReadonlyMapFromArray({ key: S.String, value: S.Finite })
|
|
246
|
+
const encoded = S.encodeSync(schema)(new Map([["a", 1], ["b", 2]]))
|
|
247
|
+
expect(encoded).toEqual([["a", 1], ["b", 2]])
|
|
248
|
+
})
|
|
249
|
+
|
|
250
|
+
test("decodes with NumberFromString as key", () => {
|
|
251
|
+
const schema = S.ReadonlyMapFromArray({ key: S.NumberFromString, value: S.String })
|
|
252
|
+
const decoded = S.decodeUnknownSync(schema)([["1", "one"], ["2", "two"]])
|
|
253
|
+
expect(decoded).toEqual(new Map([[1, "one"], [2, "two"]]))
|
|
254
|
+
expectTypeOf(decoded).toEqualTypeOf<ReadonlyMap<number, string>>()
|
|
255
|
+
})
|
|
256
|
+
|
|
257
|
+
test("encodes with NumberFromString as key", () => {
|
|
258
|
+
const schema = S.ReadonlyMapFromArray({ key: S.NumberFromString, value: S.String })
|
|
259
|
+
const encoded = S.encodeSync(schema)(new Map([[1, "one"], [2, "two"]]))
|
|
260
|
+
expect(encoded).toEqual([["1", "one"], ["2", "two"]])
|
|
261
|
+
})
|
|
262
|
+
|
|
263
|
+
test("decodes with NumberFromString as value", () => {
|
|
264
|
+
const schema = S.ReadonlyMapFromArray({ key: S.String, value: S.NumberFromString })
|
|
265
|
+
const decoded = S.decodeUnknownSync(schema)([["a", "10"], ["b", "20"]])
|
|
266
|
+
expect(decoded).toEqual(new Map([["a", 10], ["b", 20]]))
|
|
267
|
+
expectTypeOf(decoded).toEqualTypeOf<ReadonlyMap<string, number>>()
|
|
268
|
+
})
|
|
269
|
+
|
|
270
|
+
test("encodes with NumberFromString as value", () => {
|
|
271
|
+
const schema = S.ReadonlyMapFromArray({ key: S.String, value: S.NumberFromString })
|
|
272
|
+
const encoded = S.encodeSync(schema)(new Map([["a", 10], ["b", 20]]))
|
|
273
|
+
expect(encoded).toEqual([["a", "10"], ["b", "20"]])
|
|
274
|
+
})
|
|
275
|
+
|
|
276
|
+
test("decodes with NumberFromString as both key and value", () => {
|
|
277
|
+
const schema = S.ReadonlyMapFromArray({ key: S.NumberFromString, value: S.NumberFromString })
|
|
278
|
+
const decoded = S.decodeUnknownSync(schema)([["1", "10"], ["2", "20"]])
|
|
279
|
+
expect(decoded).toEqual(new Map([[1, 10], [2, 20]]))
|
|
280
|
+
expectTypeOf(decoded).toEqualTypeOf<ReadonlyMap<number, number>>()
|
|
281
|
+
})
|
|
282
|
+
|
|
283
|
+
test("rejects invalid input", () => {
|
|
284
|
+
const schema = S.ReadonlyMapFromArray({ key: S.NumberFromString, value: S.String })
|
|
285
|
+
expect(() => S.decodeUnknownSync(schema)([[1, "val"]])).toThrow()
|
|
286
|
+
})
|
|
287
|
+
})
|
|
288
|
+
|
|
289
|
+
describe("ReadonlySet (with withDefault)", () => {
|
|
290
|
+
test("make provides withDefault", () => {
|
|
291
|
+
const schema = S.ReadonlySet(S.NumberFromString)
|
|
292
|
+
const struct = S.Struct({ items: schema.withDefault })
|
|
293
|
+
const made = struct.make({})
|
|
294
|
+
expect(made.items).toEqual(new Set())
|
|
295
|
+
})
|
|
296
|
+
|
|
297
|
+
test("decodes array with NumberFromString values", () => {
|
|
298
|
+
const schema = S.ReadonlySet(S.NumberFromString)
|
|
299
|
+
const decoded = S.decodeUnknownSync(schema)(["1", "2"])
|
|
300
|
+
expect(decoded).toEqual(new Set([1, 2]))
|
|
301
|
+
})
|
|
302
|
+
})
|
|
303
|
+
|
|
304
|
+
describe("ReadonlyMap (with withDefault)", () => {
|
|
305
|
+
test("make provides withDefault", () => {
|
|
306
|
+
const schema = S.ReadonlyMap({ key: S.NumberFromString, value: S.String })
|
|
307
|
+
const struct = S.Struct({ items: schema.withDefault })
|
|
308
|
+
const made = struct.make({})
|
|
309
|
+
expect(made.items).toEqual(new Map())
|
|
310
|
+
})
|
|
311
|
+
|
|
312
|
+
test("decodes array of tuples with NumberFromString keys", () => {
|
|
313
|
+
const schema = S.ReadonlyMap({ key: S.NumberFromString, value: S.String })
|
|
314
|
+
const decoded = S.decodeUnknownSync(schema)([["1", "one"]])
|
|
315
|
+
expect(decoded).toEqual(new Map([[1, "one"]]))
|
|
316
|
+
})
|
|
317
|
+
})
|
|
318
|
+
|
|
319
|
+
describe("JSON Schema", () => {
|
|
320
|
+
test("Email has format, minLength, maxLength", () => {
|
|
321
|
+
const doc = S.toJsonSchemaDocument(S.Email)
|
|
322
|
+
expect(doc).toStrictEqual({
|
|
323
|
+
dialect: "draft-2020-12",
|
|
324
|
+
schema: { "$ref": "#/$defs/Email" },
|
|
325
|
+
definitions: {
|
|
326
|
+
Email: {
|
|
327
|
+
type: "string",
|
|
328
|
+
title: "Email",
|
|
329
|
+
description: "an email according to RFC 5322",
|
|
330
|
+
format: "email",
|
|
331
|
+
allOf: [
|
|
332
|
+
{ minLength: 3 },
|
|
333
|
+
{ maxLength: 998 }
|
|
334
|
+
]
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
})
|
|
338
|
+
})
|
|
339
|
+
|
|
340
|
+
test("Email specialJsonSchemaDocument flattens allOf", () => {
|
|
341
|
+
const doc = specialJsonSchemaDocument(S.Email)
|
|
342
|
+
expect(doc).toStrictEqual({
|
|
343
|
+
dialect: "draft-2020-12",
|
|
344
|
+
schema: { "$ref": "#/$defs/Email" },
|
|
345
|
+
definitions: {
|
|
346
|
+
Email: {
|
|
347
|
+
type: "string",
|
|
348
|
+
title: "Email",
|
|
349
|
+
description: "an email according to RFC 5322",
|
|
350
|
+
format: "email",
|
|
351
|
+
minLength: 3,
|
|
352
|
+
maxLength: 998
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
})
|
|
356
|
+
})
|
|
357
|
+
|
|
358
|
+
test("Date has format date-time and description", () => {
|
|
359
|
+
const doc = S.toJsonSchemaDocument(S.Date)
|
|
360
|
+
expect(doc).toStrictEqual({
|
|
361
|
+
dialect: "draft-2020-12",
|
|
362
|
+
schema: { "$ref": "#/$defs/Date" },
|
|
363
|
+
definitions: {
|
|
364
|
+
Date: {
|
|
365
|
+
type: "string",
|
|
366
|
+
description: "a string in ISO 8601 format that will be decoded as a Date",
|
|
367
|
+
format: "date-time"
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
})
|
|
371
|
+
})
|
|
372
|
+
|
|
373
|
+
test("DateValid has format date-time", () => {
|
|
374
|
+
const doc = S.toJsonSchemaDocument(S.DateValid)
|
|
375
|
+
expect(doc).toStrictEqual({
|
|
376
|
+
dialect: "draft-2020-12",
|
|
377
|
+
schema: { "$ref": "#/$defs/Date" },
|
|
378
|
+
definitions: {
|
|
379
|
+
Date: {
|
|
380
|
+
type: "string",
|
|
381
|
+
description: "a string in ISO 8601 format that will be decoded as a Date",
|
|
382
|
+
format: "date-time"
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
})
|
|
386
|
+
})
|
|
387
|
+
|
|
388
|
+
test("PhoneNumber has format phone", () => {
|
|
389
|
+
const doc = specialJsonSchemaDocument(S.PhoneNumber)
|
|
390
|
+
expect(doc).toStrictEqual({
|
|
391
|
+
dialect: "draft-2020-12",
|
|
392
|
+
schema: { "$ref": "#/$defs/PhoneNumber" },
|
|
393
|
+
definitions: {
|
|
394
|
+
PhoneNumber: {
|
|
395
|
+
type: "string",
|
|
396
|
+
title: "PhoneNumber",
|
|
397
|
+
description: "a phone number with at least 7 digits",
|
|
398
|
+
format: "phone"
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
})
|
|
402
|
+
})
|
|
403
|
+
|
|
404
|
+
test("Url has format uri", () => {
|
|
405
|
+
const doc = specialJsonSchemaDocument(S.Url)
|
|
406
|
+
expect(doc).toStrictEqual({
|
|
407
|
+
dialect: "draft-2020-12",
|
|
408
|
+
schema: { "$ref": "#/$defs/Url" },
|
|
409
|
+
definitions: {
|
|
410
|
+
Url: {
|
|
411
|
+
type: "string",
|
|
412
|
+
title: "Url",
|
|
413
|
+
format: "uri"
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
})
|
|
417
|
+
})
|
|
25
418
|
})
|