effect-app 4.0.0-beta.146 → 4.0.0-beta.148
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 +17 -977
- package/dist/Operations.d.ts.map +1 -1
- package/dist/Schema/Class.d.ts +2 -2
- package/dist/Schema/Class.d.ts.map +1 -1
- package/dist/Schema.d.ts +19 -7
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +46 -3
- package/dist/utils.d.ts +18 -4
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +1 -1
- package/package.json +1 -1
- package/src/Schema.ts +76 -12
- package/src/utils.ts +36 -3
- package/test/schema.test.ts +19 -0
- package/test/special.test.ts +43 -0
package/dist/utils.js
CHANGED
|
@@ -412,4 +412,4 @@ const genConstructor = (function* () { }).constructor;
|
|
|
412
412
|
* @since 3.11.0
|
|
413
413
|
*/
|
|
414
414
|
export const isGeneratorFunction = (u) => isObject(u) && u.constructor === genConstructor;
|
|
415
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
415
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Schema.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { fakerArb } from "./faker.js"
|
|
|
5
5
|
import { Email as EmailT, type Email as EmailType } from "./Schema/email.js"
|
|
6
6
|
import { concurrencyUnbounded, withDefaultMake } from "./Schema/ext.js"
|
|
7
7
|
import { PhoneNumber as PhoneNumberT, type PhoneNumber as PhoneNumberType } from "./Schema/phoneNumber.js"
|
|
8
|
-
import { copy, type
|
|
8
|
+
import { copy, extendM, type StructuralCopyOrigin } from "./utils.js"
|
|
9
9
|
|
|
10
10
|
export * from "effect/Schema"
|
|
11
11
|
|
|
@@ -36,24 +36,86 @@ export { Void as Void_ } from "effect/Schema"
|
|
|
36
36
|
// Struct / NonEmptyArray / Record — with concurrency: "unbounded"
|
|
37
37
|
// ---------------------------------------------------------------------------
|
|
38
38
|
|
|
39
|
-
type WithSchemaCopy<Self extends S.Top> = Self & {
|
|
40
|
-
readonly copy:
|
|
39
|
+
type WithSchemaCopy<Self extends S.Top & { readonly Type: object }> = Self & {
|
|
40
|
+
readonly copy: StructuralCopyOrigin<Self["Type"]>
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
|
|
43
|
+
type OptionalMakeInput<Fields extends S.Struct.Fields> = {} extends S.Struct.MakeIn<Fields> ? {
|
|
44
|
+
make(input?: S.Struct.MakeIn<Fields>, options?: S.MakeOptions): S.Struct.Type<Fields>
|
|
45
|
+
}
|
|
46
|
+
: {}
|
|
47
|
+
|
|
48
|
+
export function Struct<const Fields extends S.Struct.Fields>(
|
|
49
|
+
fields: Fields
|
|
50
|
+
): Struct<Fields> & OptionalMakeInput<Fields> {
|
|
44
51
|
const result = S.Struct(fields).annotate(concurrencyUnbounded)
|
|
52
|
+
const allowVoidMake = (schema: any): any => {
|
|
53
|
+
// Normalize omitted input to an empty object so optional/default-only structs can be constructed with make().
|
|
54
|
+
const origMake: any = schema.make
|
|
55
|
+
const origMakeOption: any = schema.makeOption
|
|
56
|
+
const origMakeEffect: any = schema.makeEffect
|
|
57
|
+
schema.make = function(this: any, input: any, options?: any) {
|
|
58
|
+
return origMake.call(this, input === undefined ? {} : input, options)
|
|
59
|
+
}
|
|
60
|
+
schema.makeOption = function(this: any, input: any, options?: any) {
|
|
61
|
+
return origMakeOption.call(this, input === undefined ? {} : input, options)
|
|
62
|
+
}
|
|
63
|
+
schema.makeEffect = function(this: any, input: any, options?: any) {
|
|
64
|
+
return origMakeEffect.call(this, input === undefined ? {} : input, options)
|
|
65
|
+
}
|
|
66
|
+
return schema
|
|
67
|
+
}
|
|
45
68
|
// eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
|
|
46
69
|
const origMapFields: any = result.mapFields
|
|
70
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
|
|
71
|
+
const origAnnotate: any = result.annotate
|
|
72
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
|
|
73
|
+
const origAnnotateKey: any = result.annotateKey
|
|
74
|
+
|
|
75
|
+
const preserveCopyAndMethods = (schema: any): any => {
|
|
76
|
+
schema.copy = copy
|
|
77
|
+
schema.mapFields = function(this: any, f: any, options?: any) {
|
|
78
|
+
return (result as any).mapFields.call(this, f, options)
|
|
79
|
+
}
|
|
80
|
+
schema.annotate = function(this: any, annotations?: any) {
|
|
81
|
+
return (result as any).annotate.call(this, annotations)
|
|
82
|
+
}
|
|
83
|
+
schema.annotateKey = function(this: any, annotations?: any) {
|
|
84
|
+
return (result as any).annotateKey.call(this, annotations)
|
|
85
|
+
}
|
|
86
|
+
return allowVoidMake(schema)
|
|
87
|
+
}
|
|
47
88
|
;(result as any).mapFields = function(this: any, f: any, options?: any) {
|
|
48
89
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
49
90
|
const mapped = origMapFields.call(this, f, options).annotate(concurrencyUnbounded)
|
|
50
|
-
mapped
|
|
51
|
-
|
|
91
|
+
return preserveCopyAndMethods(mapped)
|
|
92
|
+
}
|
|
93
|
+
;(result as any).annotate = function(this: any, annotations?: any) {
|
|
94
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
95
|
+
const annotated = origAnnotate.call(this, annotations)
|
|
96
|
+
return preserveCopyAndMethods(annotated)
|
|
97
|
+
}
|
|
98
|
+
;(result as any).annotateKey = function(this: any, annotations?: any) {
|
|
99
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
100
|
+
const annotated = origAnnotateKey.call(this, annotations)
|
|
101
|
+
return preserveCopyAndMethods(annotated)
|
|
52
102
|
}
|
|
53
103
|
;(result as any).copy = copy
|
|
54
|
-
|
|
104
|
+
allowVoidMake(result)
|
|
105
|
+
return result as Struct<Fields> & OptionalMakeInput<Fields>
|
|
106
|
+
}
|
|
107
|
+
export interface Struct<Fields extends S.Struct.Fields> extends WithSchemaCopy<S.Struct<Fields>> {
|
|
108
|
+
annotate(
|
|
109
|
+
annotations: S.Annotations.Bottom<S.Struct.Type<Fields>, S.Struct<Fields>["~type.parameters"]>
|
|
110
|
+
): Struct<Fields>
|
|
111
|
+
annotateKey(annotations: S.Annotations.Key<S.Struct.Type<Fields>>): Struct<Fields>
|
|
112
|
+
mapFields<To extends S.Struct.Fields>(
|
|
113
|
+
f: (fields: Fields) => To,
|
|
114
|
+
options?: {
|
|
115
|
+
readonly unsafePreserveChecks?: boolean | undefined
|
|
116
|
+
}
|
|
117
|
+
): Struct<Readonly<To>>
|
|
55
118
|
}
|
|
56
|
-
export interface Struct<Fields extends S.Struct.Fields> extends WithSchemaCopy<S.Struct<Fields>> {}
|
|
57
119
|
export declare namespace Struct {
|
|
58
120
|
export type Fields = S.Struct.Fields
|
|
59
121
|
export type Type<F extends S.Struct.Fields> = S.Struct.Type<F>
|
|
@@ -71,12 +133,14 @@ export function NonEmptyArray<Value extends S.Top>(value: Value): S.NonEmptyArra
|
|
|
71
133
|
export function TaggedStruct<const Tag extends SchemaAST.LiteralValue, const Fields extends S.Struct.Fields>(
|
|
72
134
|
value: Tag,
|
|
73
135
|
fields: Fields
|
|
74
|
-
):
|
|
136
|
+
): TaggedStruct<Tag, Fields> {
|
|
75
137
|
return Struct({ _tag: S.tag(value), ...fields }) as any
|
|
76
138
|
}
|
|
77
|
-
export type TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends S.Struct.Fields> =
|
|
78
|
-
|
|
79
|
-
>
|
|
139
|
+
export type TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends S.Struct.Fields> =
|
|
140
|
+
& WithSchemaCopy<
|
|
141
|
+
S.TaggedStruct<Tag, Fields>
|
|
142
|
+
>
|
|
143
|
+
& OptionalMakeInput<Readonly<{ readonly _tag: S.tag<Tag> } & Fields>>
|
|
80
144
|
|
|
81
145
|
export function Record<Key extends S.Record.Key, Value extends S.Top>(
|
|
82
146
|
key: Key,
|
package/src/utils.ts
CHANGED
|
@@ -733,23 +733,56 @@ export const copy = dual<
|
|
|
733
733
|
}
|
|
734
734
|
>(2, <A>(self: A, f: Partial<A> | ((a: A) => Partial<A>)) => clone(self, { ...self, ...(isFunction(f) ? f(self) : f) }))
|
|
735
735
|
|
|
736
|
-
type CopyOriginU<U, Ctor extends new(...args: any[]) => any> =
|
|
736
|
+
export type CopyOriginU<U, Ctor extends new(...args: any[]) => any> =
|
|
737
737
|
& {
|
|
738
738
|
[K in keyof U & keyof InstanceType<Ctor>]?: U[K]
|
|
739
739
|
}
|
|
740
740
|
& {}
|
|
741
741
|
|
|
742
|
-
type CopyOriginRet<A, U> =
|
|
742
|
+
export type CopyOriginRet<A, U> =
|
|
743
743
|
& {
|
|
744
744
|
[K in keyof A | keyof U]: K extends keyof U ? U[K] : A[K & keyof A]
|
|
745
745
|
}
|
|
746
746
|
& {}
|
|
747
747
|
|
|
748
|
-
type CopyOriginSelf<A, U> = Equals<{}, U> extends true
|
|
748
|
+
export type CopyOriginSelf<A, U> = Equals<{}, U> extends true
|
|
749
749
|
? Equals<keyof {}, keyof U> extends true ? `updates argument is empty or contains only extra properties`
|
|
750
750
|
: A
|
|
751
751
|
: A
|
|
752
752
|
|
|
753
|
+
export interface StructuralCopyOrigin<Self extends object> {
|
|
754
|
+
<A extends Self, U extends Partial<Self>>(
|
|
755
|
+
f: (a: A) =>
|
|
756
|
+
& {
|
|
757
|
+
[K in keyof U & keyof Self]?: U[K]
|
|
758
|
+
}
|
|
759
|
+
& {}
|
|
760
|
+
): (self: CopyOriginSelf<A, U>) => CopyOriginRet<A, U>
|
|
761
|
+
<A extends Self, U extends Partial<Self>>(
|
|
762
|
+
updates:
|
|
763
|
+
& {
|
|
764
|
+
[K in keyof U & keyof Self]?: U[K]
|
|
765
|
+
}
|
|
766
|
+
& {}
|
|
767
|
+
): (self: CopyOriginSelf<A, U>) => CopyOriginRet<A, U>
|
|
768
|
+
<A extends Self, U extends Partial<Self>>(
|
|
769
|
+
self: CopyOriginSelf<A, U>,
|
|
770
|
+
f: (a: A) =>
|
|
771
|
+
& {
|
|
772
|
+
[K in keyof U & keyof Self]?: U[K]
|
|
773
|
+
}
|
|
774
|
+
& {}
|
|
775
|
+
): CopyOriginRet<A, U>
|
|
776
|
+
<A extends Self, U extends Partial<Self>>(
|
|
777
|
+
self: CopyOriginSelf<A, U>,
|
|
778
|
+
updates:
|
|
779
|
+
& {
|
|
780
|
+
[K in keyof U & keyof Self]?: U[K]
|
|
781
|
+
}
|
|
782
|
+
& {}
|
|
783
|
+
): CopyOriginRet<A, U>
|
|
784
|
+
}
|
|
785
|
+
|
|
753
786
|
// just one input param: the convention is that the ctor takes an object
|
|
754
787
|
// containing the properties of the value (I can't put object there as type because of contravariance)
|
|
755
788
|
/**
|
package/test/schema.test.ts
CHANGED
|
@@ -68,6 +68,25 @@ test("S.Literals([\"A\", \"B\"]).Default is typed as \"A\"", () => {
|
|
|
68
68
|
expectTypeOf(l.Default).toEqualTypeOf<"A">()
|
|
69
69
|
})
|
|
70
70
|
|
|
71
|
+
test("Struct.make accepts void when all fields are optional", () => {
|
|
72
|
+
const schema = S.Struct({
|
|
73
|
+
a: S.optional(S.String),
|
|
74
|
+
b: S.optional(S.Number)
|
|
75
|
+
})
|
|
76
|
+
|
|
77
|
+
const made = schema.make()
|
|
78
|
+
expect(made).toEqual({})
|
|
79
|
+
expectTypeOf(made).toEqualTypeOf<{ readonly a?: string | undefined; readonly b?: number | undefined }>()
|
|
80
|
+
})
|
|
81
|
+
|
|
82
|
+
test("TaggedStruct.make accepts void when only constructor-default fields exist", () => {
|
|
83
|
+
const schema = S.TaggedStruct("OnlyTag", {})
|
|
84
|
+
|
|
85
|
+
const made = schema.make()
|
|
86
|
+
expect(made).toEqual({ _tag: "OnlyTag" })
|
|
87
|
+
expectTypeOf(made).toEqualTypeOf<{ readonly _tag: "OnlyTag" }>()
|
|
88
|
+
})
|
|
89
|
+
|
|
71
90
|
test("tagged union derives tag map and tags from v4 literal ast", () => {
|
|
72
91
|
const schema = S.TaggedUnion(
|
|
73
92
|
S.TaggedStruct("A", { a: S.String }),
|
package/test/special.test.ts
CHANGED
|
@@ -281,6 +281,49 @@ describe("Struct.copy", () => {
|
|
|
281
281
|
|
|
282
282
|
expect(copied).toEqual({ name: "x", state: { _tag: "b", b: 1 } })
|
|
283
283
|
})
|
|
284
|
+
|
|
285
|
+
it("copy function is preserved when using .annotate()", () => {
|
|
286
|
+
const A = AppSchema.Struct({ a: S.String, b: S.Number }).annotate({ title: "A" })
|
|
287
|
+
|
|
288
|
+
const instance = A.make({ a: "hello", b: 1 })
|
|
289
|
+
const copied = A.copy(instance, { b: 2 })
|
|
290
|
+
|
|
291
|
+
expect(copied).toEqual({ a: "hello", b: 2 })
|
|
292
|
+
expect(copied).not.toBe(instance)
|
|
293
|
+
})
|
|
294
|
+
|
|
295
|
+
it("copy function is preserved when using .annotateKey()", () => {
|
|
296
|
+
const A = AppSchema.Struct({ a: S.String, b: S.Number }).annotateKey({ title: "A" })
|
|
297
|
+
|
|
298
|
+
const instance = A.make({ a: "hello", b: 1 })
|
|
299
|
+
const copied = A.copy(instance, { b: 2 })
|
|
300
|
+
|
|
301
|
+
expect(copied).toEqual({ a: "hello", b: 2 })
|
|
302
|
+
expect(copied).not.toBe(instance)
|
|
303
|
+
})
|
|
304
|
+
|
|
305
|
+
it("copy function is preserved when using .mapFields()", () => {
|
|
306
|
+
const A = AppSchema.Struct({ a: S.String, b: S.Number }).mapFields((f) => ({ ...f }))
|
|
307
|
+
|
|
308
|
+
const instance = A.make({ a: "hello", b: 1 })
|
|
309
|
+
const copied = A.copy(instance, { b: 2 })
|
|
310
|
+
|
|
311
|
+
expect(copied).toEqual({ a: "hello", b: 2 })
|
|
312
|
+
expect(copied).not.toBe(instance)
|
|
313
|
+
})
|
|
314
|
+
|
|
315
|
+
it("copy function is preserved through chained calls", () => {
|
|
316
|
+
const A = AppSchema
|
|
317
|
+
.Struct({ a: S.String, b: S.Number })
|
|
318
|
+
.annotate({ title: "A" })
|
|
319
|
+
.annotateKey({ description: "test" })
|
|
320
|
+
|
|
321
|
+
const instance = A.make({ a: "hello", b: 1 })
|
|
322
|
+
const copied = A.copy(instance, { b: 2 })
|
|
323
|
+
|
|
324
|
+
expect(copied).toEqual({ a: "hello", b: 2 })
|
|
325
|
+
expect(copied).not.toBe(instance)
|
|
326
|
+
})
|
|
284
327
|
})
|
|
285
328
|
|
|
286
329
|
describe("TaggedStruct.copy", () => {
|