effect-app 4.0.0-beta.117 → 4.0.0-beta.119
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 +13 -0
- package/dist/Operations.d.ts +2 -2
- package/dist/Schema/Class.d.ts.map +1 -1
- package/dist/Schema/Class.js +14 -2
- package/dist/Schema/SpecialJsonSchema.d.ts +7 -1
- package/dist/Schema/SpecialJsonSchema.d.ts.map +1 -1
- package/dist/Schema/SpecialJsonSchema.js +46 -3
- package/dist/Schema/ext.d.ts +6 -1
- package/dist/Schema/ext.d.ts.map +1 -1
- package/dist/Schema/ext.js +6 -4
- package/dist/Schema.d.ts +22 -1
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +24 -2
- package/dist/client/errors.d.ts +8 -8
- package/package.json +2 -2
- package/src/Schema/Class.ts +13 -1
- package/src/Schema/SpecialJsonSchema.ts +48 -2
- package/src/Schema/ext.ts +6 -3
- package/src/Schema.ts +53 -1
- package/test/special.test.ts +89 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @effect-app/prelude
|
|
2
2
|
|
|
3
|
+
## 4.0.0-beta.119
|
|
4
|
+
|
|
5
|
+
## 4.0.0-beta.118
|
|
6
|
+
|
|
7
|
+
### Minor Changes
|
|
8
|
+
|
|
9
|
+
- 08d2e70: Add `concurrency: "unbounded"` parseOptions annotation to Schema constructors (Struct, Array, NonEmptyArray, Record, TaggedStruct, ReadonlySet, ReadonlyMap, Class, TaggedClass) so all encode/decode operations automatically run with unbounded concurrency. Also override `mapFields` on Struct and Class/TaggedClass to preserve the annotation.
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- bd26832: Add nested anyOf flattening to JSON Schema post-processing
|
|
14
|
+
- Update effect packages to 4.0.0-beta.52
|
|
15
|
+
|
|
3
16
|
## 4.0.0-beta.117
|
|
4
17
|
|
|
5
18
|
## 4.0.0-beta.116
|
package/dist/Operations.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare const OperationId: S.WithDefaults<S.brand<S.String, "NonEmptyStri
|
|
|
7
7
|
make: () => S.StringId;
|
|
8
8
|
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId">>;
|
|
9
9
|
};
|
|
10
|
-
declare const OperationProgress_base: S.EnhancedClass<OperationProgress,
|
|
10
|
+
declare const OperationProgress_base: S.EnhancedClass<OperationProgress, import("effect/Schema").Struct<{
|
|
11
11
|
completed: S.WithDefaults<S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber">> & S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber"> & {
|
|
12
12
|
withDefault: S.withConstructorDefault<S.WithDefaults<S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber">> & S.brand<import("effect/Schema").Int, "NonNegativeInt" | "Int" | "NonNegativeNumber">>;
|
|
13
13
|
};
|
|
@@ -79,7 +79,7 @@ export declare const OperationResult: S.Union<[typeof OperationSuccess, typeof O
|
|
|
79
79
|
};
|
|
80
80
|
};
|
|
81
81
|
export type OperationResult = S.Schema.Type<typeof OperationResult>;
|
|
82
|
-
declare const Operation_base: S.EnhancedClass<Operation,
|
|
82
|
+
declare const Operation_base: S.EnhancedClass<Operation, import("effect/Schema").Struct<{
|
|
83
83
|
id: S.WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId"> & {
|
|
84
84
|
make: () => S.StringId;
|
|
85
85
|
withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId">>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../src/Schema/Class.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../src/Schema/Class.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAGlC,KAAK,gBAAgB,CAAC,IAAI,IAAI,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAE7E,MAAM,WAAW,aAAa,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,CAAC,GAAG,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;CAAE,EAAE,SAAS,CAC1G,SAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC;CAE1C;AACD,KAAK,kBAAkB,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,SAAS,MAAM,GAAG,EAAE,IACtE,uDAAuD,KAAK,YAAY,MAAM,YAAY,CAAA;AAE5F,KAAK,SAAS,CAAC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB,GAAG;IACF,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;CAAE,EAAE,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;AAqCxH;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,KAAK,EAAE,CAAC,IAAI,GAAG,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACvF,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EACpC,WAAW,CAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,KACjC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,GACrD,aAAa,CACb,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAChB,EAAE,CAyBH,CAAA;AAMH;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,WAAW,EAAE,CAAC,IAAI,GAAG,KAAK,EACrC,UAAU,CAAC,EAAE,MAAM,KAChB,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACtD,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EACpC,WAAW,CAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,KACjC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,aAAa,CAAC,GAC3D,aAAa,CACb,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,EAChD,EAAE,CAmBH,CAAA;AAMH,eAAO,MAAM,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAClG,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EACpC,WAAW,CAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,KACjC,aAAa,CAChB,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAChB,EAAE,CACY,CAAA;AAMhB,MAAM,WAAW,mBAAmB,CAAC,IAAI,EAAE,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CACrG,SACE,aAAa,CACX,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,EACjD,EAAE,CACH;IAEH,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAA;CACnB;AAED,eAAO,MAAM,mBAAmB,EAAE,CAAC,IAAI,EAAE,QAAQ,EAC/C,UAAU,CAAC,EAAE,MAAM,KAChB,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACtD,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EACpC,WAAW,CAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,KACjC,mBAAmB,CACtB,IAAI,EACJ,GAAG,EACH;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,EACtC,QAAQ,CACY,CAAA"}
|
package/dist/Schema/Class.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { Effect, Option, Schema, SchemaAST, SchemaIssue } from "effect";
|
|
3
3
|
import * as S from "effect/Schema";
|
|
4
|
+
import { concurrencyUnbounded } from "./ext.js";
|
|
4
5
|
/**
|
|
5
6
|
* Build a modified Declaration that accepts struct-matching values during
|
|
6
7
|
* encoding, given the original Declaration and the class's fields.
|
|
@@ -8,12 +9,17 @@ import * as S from "effect/Schema";
|
|
|
8
9
|
function makeRelaxedDeclaration(ast, fields, cls) {
|
|
9
10
|
const structSchema = Schema.Struct(fields);
|
|
10
11
|
const isStructValue = Schema.is(structSchema);
|
|
12
|
+
const existingParseOptions = ast.annotations?.["parseOptions"];
|
|
13
|
+
const annotations = {
|
|
14
|
+
...ast.annotations,
|
|
15
|
+
parseOptions: { ...existingParseOptions, concurrency: "unbounded" }
|
|
16
|
+
};
|
|
11
17
|
return new SchemaAST.Declaration(ast.typeParameters, () => (input, self) => {
|
|
12
18
|
if (input instanceof cls || isStructValue(input)) {
|
|
13
19
|
return Effect.succeed(input);
|
|
14
20
|
}
|
|
15
21
|
return Effect.fail(new SchemaIssue.InvalidType(self, Option.some(input)));
|
|
16
|
-
},
|
|
22
|
+
}, annotations, ast.checks, ast.encoding, ast.context);
|
|
17
23
|
}
|
|
18
24
|
// ---------------------------------------------------------------------------
|
|
19
25
|
// Class — like Schema.Class but with relaxed encoding
|
|
@@ -56,6 +62,9 @@ export const Class = (identifier) => (fields, annotations) => {
|
|
|
56
62
|
astCache.set(this, cached);
|
|
57
63
|
return cached;
|
|
58
64
|
}
|
|
65
|
+
static mapFields(f, options) {
|
|
66
|
+
return Base.mapFields(f, options).annotate(concurrencyUnbounded);
|
|
67
|
+
}
|
|
59
68
|
};
|
|
60
69
|
};
|
|
61
70
|
// ---------------------------------------------------------------------------
|
|
@@ -91,6 +100,9 @@ export const TaggedClass = (identifier) => (tag, fields, annotations) => {
|
|
|
91
100
|
astCache.set(this, cached);
|
|
92
101
|
return cached;
|
|
93
102
|
}
|
|
103
|
+
static mapFields(f, options) {
|
|
104
|
+
return Base.mapFields(f, options).annotate(concurrencyUnbounded);
|
|
105
|
+
}
|
|
94
106
|
};
|
|
95
107
|
};
|
|
96
108
|
// ---------------------------------------------------------------------------
|
|
@@ -98,4 +110,4 @@ export const TaggedClass = (identifier) => (tag, fields, annotations) => {
|
|
|
98
110
|
// ---------------------------------------------------------------------------
|
|
99
111
|
export const ExtendedClass = Class;
|
|
100
112
|
export const ExtendedTaggedClass = TaggedClass;
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL0NsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUN2RSxPQUFPLEtBQUssQ0FBQyxNQUFNLGVBQWUsQ0FBQTtBQUNsQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFtQi9DOzs7R0FHRztBQUNILFNBQVMsc0JBQXNCLENBQzdCLEdBQTBCLEVBQzFCLE1BQTRCLEVBQzVCLEdBQVE7SUFFUixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzFDLE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDN0MsTUFBTSxvQkFBb0IsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUMsY0FBYyxDQUF1QyxDQUFBO0lBQ3BHLE1BQU0sV0FBVyxHQUFHO1FBQ2xCLEdBQUcsR0FBRyxDQUFDLFdBQVc7UUFDbEIsWUFBWSxFQUFFLEVBQUUsR0FBRyxvQkFBb0IsRUFBRSxXQUFXLEVBQUUsV0FBb0IsRUFBRTtLQUM3RSxDQUFBO0lBQ0QsT0FBTyxJQUFJLFNBQVMsQ0FBQyxXQUFXLENBQzlCLEdBQUcsQ0FBQyxjQUFjLEVBQ2xCLEdBQUcsRUFBRSxDQUFDLENBQUMsS0FBYyxFQUFFLElBQTJCLEVBQUUsRUFBRTtRQUNwRCxJQUFJLEtBQUssWUFBWSxHQUFHLElBQUksYUFBYSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDakQsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxXQUFX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
|
|
@@ -19,9 +19,15 @@ export declare function flattenSimpleAllOf(obj: unknown): unknown;
|
|
|
19
19
|
* Only removes when the value is exactly `false` -- other values are left intact.
|
|
20
20
|
*/
|
|
21
21
|
export declare function removeAdditionalPropertiesFalse(obj: unknown): unknown;
|
|
22
|
+
/**
|
|
23
|
+
* Flattens nested `anyOf` entries: if an anyOf entry is itself just `{ anyOf: [...] }`
|
|
24
|
+
* with no other keys, its children are inlined. If only one item remains, the anyOf
|
|
25
|
+
* wrapper is removed entirely.
|
|
26
|
+
*/
|
|
27
|
+
export declare function flattenNestedAnyOf(obj: unknown): unknown;
|
|
22
28
|
/**
|
|
23
29
|
* Applies JSON Schema post-processing: flattens simple allOf,
|
|
24
|
-
* then strips additionalProperties: false.
|
|
30
|
+
* flattens nested anyOf, then strips additionalProperties: false.
|
|
25
31
|
*/
|
|
26
32
|
export declare function postProcessJsonSchema(obj: JsonSchema.JsonSchema): JsonSchema.JsonSchema;
|
|
27
33
|
//# sourceMappingURL=SpecialJsonSchema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpecialJsonSchema.d.ts","sourceRoot":"","sources":["../../src/Schema/SpecialJsonSchema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAwB,MAAM,QAAQ,CAAA;AAE3E;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,GAAG,EAClB,OAAO,CAAC,EAAE,MAAM,CAAC,mBAAmB,GACnC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAYtC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CA6BxD;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAerE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAEvF"}
|
|
1
|
+
{"version":3,"file":"SpecialJsonSchema.d.ts","sourceRoot":"","sources":["../../src/Schema/SpecialJsonSchema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAwB,MAAM,QAAQ,CAAA;AAE3E;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,GAAG,EAClB,OAAO,CAAC,EAAE,MAAM,CAAC,mBAAmB,GACnC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAYtC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CA6BxD;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAerE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAuCxD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAEvF"}
|
|
@@ -69,11 +69,54 @@ export function removeAdditionalPropertiesFalse(obj) {
|
|
|
69
69
|
}
|
|
70
70
|
return result;
|
|
71
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Flattens nested `anyOf` entries: if an anyOf entry is itself just `{ anyOf: [...] }`
|
|
74
|
+
* with no other keys, its children are inlined. If only one item remains, the anyOf
|
|
75
|
+
* wrapper is removed entirely.
|
|
76
|
+
*/
|
|
77
|
+
export function flattenNestedAnyOf(obj) {
|
|
78
|
+
if (obj === null || typeof obj !== "object")
|
|
79
|
+
return obj;
|
|
80
|
+
if (globalThis.Array.isArray(obj))
|
|
81
|
+
return obj.map(flattenNestedAnyOf);
|
|
82
|
+
const record = obj;
|
|
83
|
+
const result = {};
|
|
84
|
+
for (const [key, value] of Object.entries(record)) {
|
|
85
|
+
result[key] = flattenNestedAnyOf(value);
|
|
86
|
+
}
|
|
87
|
+
if (globalThis.Array.isArray(result["anyOf"])) {
|
|
88
|
+
const anyOf = result["anyOf"];
|
|
89
|
+
const flattened = [];
|
|
90
|
+
for (const entry of anyOf) {
|
|
91
|
+
if (typeof entry === "object"
|
|
92
|
+
&& entry !== null
|
|
93
|
+
&& !globalThis.Array.isArray(entry)
|
|
94
|
+
&& "anyOf" in entry
|
|
95
|
+
&& Object.keys(entry).length === 1
|
|
96
|
+
&& globalThis.Array.isArray(entry["anyOf"])) {
|
|
97
|
+
flattened.push(...entry["anyOf"]);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
flattened.push(entry);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
if (flattened.length === 1) {
|
|
104
|
+
const { anyOf: _, ...rest } = result;
|
|
105
|
+
const single = flattened[0];
|
|
106
|
+
if (typeof single === "object" && single !== null && !globalThis.Array.isArray(single)) {
|
|
107
|
+
return { ...rest, ...single };
|
|
108
|
+
}
|
|
109
|
+
return single;
|
|
110
|
+
}
|
|
111
|
+
result["anyOf"] = flattened;
|
|
112
|
+
}
|
|
113
|
+
return result;
|
|
114
|
+
}
|
|
72
115
|
/**
|
|
73
116
|
* Applies JSON Schema post-processing: flattens simple allOf,
|
|
74
|
-
* then strips additionalProperties: false.
|
|
117
|
+
* flattens nested anyOf, then strips additionalProperties: false.
|
|
75
118
|
*/
|
|
76
119
|
export function postProcessJsonSchema(obj) {
|
|
77
|
-
return removeAdditionalPropertiesFalse(flattenSimpleAllOf(obj));
|
|
120
|
+
return removeAdditionalPropertiesFalse(flattenNestedAnyOf(flattenSimpleAllOf(obj)));
|
|
78
121
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3BlY2lhbEpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL1NwZWNpYWxKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUNILE9BQU8sRUFBZ0Msb0JBQW9CLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFFM0U7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLHlCQUF5QixDQUN2QyxNQUFrQixFQUNsQixPQUFvQztJQUVwQyxNQUFNLEdBQUcsR0FBRyxvQkFBb0IsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3BELE1BQU0sRUFBRSxHQUFHLG9CQUFvQixDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUNsRSxNQUFNLGFBQWEsR0FBMkIsRUFBRSxDQUFBO0lBQ2hELEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1FBQ3hELGFBQWEsQ0FBQyxHQUFHLENBQUMsR0FBRyxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNqRCxDQUFDO0lBQ0QsT0FBTztRQUNMLE9BQU8sRUFBRSxlQUFlO1FBQ3hCLE1BQU0sRUFBRSxxQkFBcUIsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDO1FBQ3hDLFdBQVcsRUFBRSxhQUFhO0tBQzNCLENBQUE7QUFDSCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxHQUFZO0lBQzdDLElBQUksR0FBRyxLQUFLLElBQUksSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRO1FBQUUsT0FBTyxHQUFHLENBQUE7SUFFdkQsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE9BQU8sR0FBRyxDQUFD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
|
package/dist/Schema/ext.d.ts
CHANGED
|
@@ -76,6 +76,12 @@ export declare const Literals: <const Literals extends NonEmptyReadonlyArray<AST
|
|
|
76
76
|
/**
|
|
77
77
|
* Like the default Schema `Array` but with `withDefault` => []
|
|
78
78
|
*/
|
|
79
|
+
declare const co: {
|
|
80
|
+
parseOptions: {
|
|
81
|
+
concurrency: "unbounded";
|
|
82
|
+
};
|
|
83
|
+
};
|
|
84
|
+
export { co as concurrencyUnbounded };
|
|
79
85
|
export declare function Array<ValueSchema extends S.Top>(value: ValueSchema): S.$Array<ValueSchema> & {
|
|
80
86
|
withDefault: S.withConstructorDefault<S.$Array<ValueSchema>>;
|
|
81
87
|
withDecodingDefaultType: S.withDecodingDefaultType<S.$Array<ValueSchema>>;
|
|
@@ -150,5 +156,4 @@ export declare const transformTo: <To extends S.Top, From extends S.Top>(from: F
|
|
|
150
156
|
export declare const transformToOrFail: <To extends S.Top, From extends S.Top, RD>(from: From, to: To, decode: (fromA: From["Type"], options: SchemaAST.ParseOptions) => Effect.Effect<To["Encoded"], SchemaIssue.Issue, RD>) => S.decodeTo<To, From, RD, never>;
|
|
151
157
|
export declare const provide: <Self extends S.Top, R>(self: Self, context: Context.Context<R>) => ProvidedCodec<Self, R>;
|
|
152
158
|
export declare const contextFromServices: <Self extends S.Top, Tags extends ReadonlyArray<Context.Key<any, any>>>(self: Self, ...services: Tags) => Effect.Effect<ProvidedCodec<Self, Context.Service.Identifier<Tags[number]>>, never, Context.Service.Identifier<Tags[number]>>;
|
|
153
|
-
export {};
|
|
154
159
|
//# sourceMappingURL=ext.d.ts.map
|
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":"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"}
|
|
1
|
+
{"version":3,"file":"ext.d.ts","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
|
package/dist/Schema/ext.js
CHANGED
|
@@ -77,8 +77,10 @@ export const Literals = (literals) => pipe(S.Literals(literals), (s) => Object.a
|
|
|
77
77
|
/**
|
|
78
78
|
* Like the default Schema `Array` but with `withDefault` => []
|
|
79
79
|
*/
|
|
80
|
+
const co = { parseOptions: { concurrency: "unbounded" } };
|
|
81
|
+
export { co as concurrencyUnbounded };
|
|
80
82
|
export function Array(value) {
|
|
81
|
-
return pipe(S.Array(value), (s) => Object.assign(s, {
|
|
83
|
+
return pipe(S.Array(value).annotate(co), (s) => Object.assign(s, {
|
|
82
84
|
withDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => []))),
|
|
83
85
|
withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => [])))
|
|
84
86
|
}));
|
|
@@ -89,7 +91,7 @@ export function Array(value) {
|
|
|
89
91
|
export const ReadonlySetFromArray = (value) => {
|
|
90
92
|
const from = S
|
|
91
93
|
.Array(value)
|
|
92
|
-
.annotate({ expected: "an array of unique items that will be decoded as a ReadonlySet" });
|
|
94
|
+
.annotate({ ...co, expected: "an array of unique items that will be decoded as a ReadonlySet" });
|
|
93
95
|
const to = S.instanceOf(Set);
|
|
94
96
|
const schema = from.pipe(S.decodeTo(to, SchemaTransformation.transform({
|
|
95
97
|
decode: (arr) => new Set(arr),
|
|
@@ -103,7 +105,7 @@ export const ReadonlySetFromArray = (value) => {
|
|
|
103
105
|
export const ReadonlyMapFromArray = (pair) => {
|
|
104
106
|
const from = S
|
|
105
107
|
.Array(S.Tuple([pair.key, pair.value]))
|
|
106
|
-
.annotate({ expected: "an array of key-value tuples that will be decoded as a ReadonlyMap" });
|
|
108
|
+
.annotate({ ...co, expected: "an array of key-value tuples that will be decoded as a ReadonlyMap" });
|
|
107
109
|
const to = S.instanceOf(Map);
|
|
108
110
|
const schema = from.pipe(S.decodeTo(to, SchemaTransformation.transform({
|
|
109
111
|
decode: (arr) => new Map(arr),
|
|
@@ -192,4 +194,4 @@ export const contextFromServices = (self, ...services) => Effect.gen(function* (
|
|
|
192
194
|
const context = Context.pick(...services)(yield* Effect.context());
|
|
193
195
|
return provide(self, context);
|
|
194
196
|
});
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
|
|
197
|
+
//# 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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Tracer } from "effect";
|
|
1
|
+
import { SchemaAST, type Tracer } from "effect";
|
|
2
2
|
import * as S from "effect/Schema";
|
|
3
3
|
import type { NonEmptyReadonlyArray } from "./Array.js";
|
|
4
4
|
import { Email as EmailT, type Email as EmailType } from "./Schema/email.js";
|
|
@@ -22,6 +22,27 @@ export { NonEmptyString } from "./Schema/strings.js";
|
|
|
22
22
|
export * as SchemaIssue from "effect/SchemaIssue";
|
|
23
23
|
export * as SchemaParser from "effect/SchemaParser";
|
|
24
24
|
export { Void as Void_ } from "effect/Schema";
|
|
25
|
+
export declare function Struct<const Fields extends S.Struct.Fields>(fields: Fields): S.Struct<Fields>;
|
|
26
|
+
export interface Struct<Fields extends S.Struct.Fields> extends S.Struct<Fields> {
|
|
27
|
+
}
|
|
28
|
+
export declare namespace Struct {
|
|
29
|
+
type Fields = S.Struct.Fields;
|
|
30
|
+
type Type<F extends S.Struct.Fields> = S.Struct.Type<F>;
|
|
31
|
+
type Encoded<F extends S.Struct.Fields> = S.Struct.Encoded<F>;
|
|
32
|
+
type DecodingServices<F extends S.Struct.Fields> = S.Struct.DecodingServices<F>;
|
|
33
|
+
type EncodingServices<F extends S.Struct.Fields> = S.Struct.EncodingServices<F>;
|
|
34
|
+
type MakeIn<F extends S.Struct.Fields> = S.Struct.MakeIn<F>;
|
|
35
|
+
type Iso<F extends S.Struct.Fields> = S.Struct.Iso<F>;
|
|
36
|
+
}
|
|
37
|
+
export declare function NonEmptyArray<Value extends S.Top>(value: Value): S.NonEmptyArray<Value>;
|
|
38
|
+
export declare function TaggedStruct<const Tag extends SchemaAST.LiteralValue, const Fields extends S.Struct.Fields>(value: Tag, fields: Fields): S.TaggedStruct<Tag, Fields>;
|
|
39
|
+
export type TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends S.Struct.Fields> = S.TaggedStruct<Tag, Fields>;
|
|
40
|
+
export declare function Record<Key extends S.Record.Key, Value extends S.Top>(key: Key, value: Value): S.$Record<Key, Value>;
|
|
41
|
+
export declare namespace Record {
|
|
42
|
+
type Key = S.Record.Key;
|
|
43
|
+
type Type<K extends S.Record.Key, V extends S.Top> = S.Record.Type<K, V>;
|
|
44
|
+
type Encoded<K extends S.Record.Key, V extends S.Top> = S.Record.Encoded<K, V>;
|
|
45
|
+
}
|
|
25
46
|
export declare const SpanId: unique symbol;
|
|
26
47
|
export type SpanId = typeof SpanId;
|
|
27
48
|
export interface WithOptionalSpan {
|
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,
|
|
1
|
+
{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.ts"],"names":[],"mappings":"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"}
|
package/dist/Schema.js
CHANGED
|
@@ -2,7 +2,7 @@ import { SchemaAST } from "effect";
|
|
|
2
2
|
import * as S from "effect/Schema";
|
|
3
3
|
import { fakerArb } from "./faker.js";
|
|
4
4
|
import { Email as EmailT } from "./Schema/email.js";
|
|
5
|
-
import { withDefaultMake } from "./Schema/ext.js";
|
|
5
|
+
import { concurrencyUnbounded, withDefaultMake } from "./Schema/ext.js";
|
|
6
6
|
import { PhoneNumber as PhoneNumberT } from "./Schema/phoneNumber.js";
|
|
7
7
|
import { extendM } from "./utils.js";
|
|
8
8
|
export * from "effect/Schema";
|
|
@@ -24,6 +24,28 @@ export { NonEmptyString } from "./Schema/strings.js";
|
|
|
24
24
|
export * as SchemaIssue from "effect/SchemaIssue";
|
|
25
25
|
export * as SchemaParser from "effect/SchemaParser";
|
|
26
26
|
export { Void as Void_ } from "effect/Schema";
|
|
27
|
+
// ---------------------------------------------------------------------------
|
|
28
|
+
// Struct / NonEmptyArray / Record — with concurrency: "unbounded"
|
|
29
|
+
// ---------------------------------------------------------------------------
|
|
30
|
+
export function Struct(fields) {
|
|
31
|
+
const result = S.Struct(fields).annotate(concurrencyUnbounded);
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
|
|
33
|
+
const origMapFields = result.mapFields;
|
|
34
|
+
result.mapFields = function (f, options) {
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
36
|
+
return origMapFields.call(this, f, options).annotate(concurrencyUnbounded);
|
|
37
|
+
};
|
|
38
|
+
return result;
|
|
39
|
+
}
|
|
40
|
+
export function NonEmptyArray(value) {
|
|
41
|
+
return S.NonEmptyArray(value).annotate(concurrencyUnbounded);
|
|
42
|
+
}
|
|
43
|
+
export function TaggedStruct(value, fields) {
|
|
44
|
+
return Struct({ _tag: S.tag(value), ...fields });
|
|
45
|
+
}
|
|
46
|
+
export function Record(key, value) {
|
|
47
|
+
return S.Record(key, value).annotate(concurrencyUnbounded);
|
|
48
|
+
}
|
|
27
49
|
export const SpanId = Symbol();
|
|
28
50
|
const makeEmail = S.decodeSync(EmailT);
|
|
29
51
|
const makePhoneNumber = S.decodeSync(PhoneNumberT);
|
|
@@ -93,4 +115,4 @@ const extendTaggedUnionWithTags = (schema) => extendM(schema.pipe(S.toTaggedUnio
|
|
|
93
115
|
});
|
|
94
116
|
export const ExtendTaggedUnion = (schema) => extendTaggedUnionWithTags(schema);
|
|
95
117
|
export const TaggedUnion = (...a) => extendTaggedUnionWithTags(S.Union(a));
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFlLE1BQU0sUUFBUSxDQUFBO0FBQy9DLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBRWxDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLEtBQUssSUFBSSxNQUFNLEVBQTJCLE1BQU0sbUJBQW1CLENBQUE7QUFDNUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGVBQWUsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSxXQUFXLElBQUksWUFBWSxFQUF1QyxNQUFNLHlCQUF5QixDQUFBO0FBQzFHLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFcEMsY0FBYyxlQUFlLENBQUE7QUFFN0IsY0FBYyxtQkFBbUIsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRXRELE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDdEQsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUM3SSxPQUFPLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBRXpELGNBQWMsbUJBQW1CLENBQUE7QUFDakMsY0FBYyxpQkFBaUIsQ0FBQTtBQUMvQixjQUFjLHlCQUF5QixDQUFBO0FBQ3ZDLGNBQWMscUJBQXFCLENBQUE7QUFDbkMsY0FBYyx5QkFBeUIsQ0FBQTtBQUN2QyxjQUFjLG9CQUFv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
|
package/dist/client/errors.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export declare const tryToJson: (error: {
|
|
|
4
4
|
toJSON(): unknown;
|
|
5
5
|
toString(): string;
|
|
6
6
|
}) => unknown;
|
|
7
|
-
declare const NotFoundError_base: import("effect/Schema").Class<NotFoundError<ItemType>,
|
|
7
|
+
declare const NotFoundError_base: import("effect/Schema").Class<NotFoundError<ItemType>, import("effect/Schema").TaggedStruct<"NotFoundError", {
|
|
8
8
|
readonly type: S.String;
|
|
9
9
|
readonly id: S.Unknown;
|
|
10
10
|
}>, Cause.YieldableError>;
|
|
@@ -17,7 +17,7 @@ export declare class NotFoundError<ItemType = string> extends NotFoundError_base
|
|
|
17
17
|
get message(): string;
|
|
18
18
|
toString(): string;
|
|
19
19
|
}
|
|
20
|
-
declare const InvalidStateError_base: import("effect/Schema").Class<InvalidStateError,
|
|
20
|
+
declare const InvalidStateError_base: import("effect/Schema").Class<InvalidStateError, import("effect/Schema").TaggedStruct<"InvalidStateError", {
|
|
21
21
|
readonly message: S.String;
|
|
22
22
|
}>, Cause.YieldableError>;
|
|
23
23
|
export declare class InvalidStateError extends InvalidStateError_base {
|
|
@@ -27,7 +27,7 @@ export declare class InvalidStateError extends InvalidStateError_base {
|
|
|
27
27
|
}, disableValidation?: boolean);
|
|
28
28
|
toString(): string;
|
|
29
29
|
}
|
|
30
|
-
declare const ServiceUnavailableError_base: import("effect/Schema").Class<ServiceUnavailableError,
|
|
30
|
+
declare const ServiceUnavailableError_base: import("effect/Schema").Class<ServiceUnavailableError, import("effect/Schema").TaggedStruct<"ServiceUnavailableError", {
|
|
31
31
|
readonly message: S.String;
|
|
32
32
|
}>, Cause.YieldableError>;
|
|
33
33
|
export declare class ServiceUnavailableError extends ServiceUnavailableError_base {
|
|
@@ -37,7 +37,7 @@ export declare class ServiceUnavailableError extends ServiceUnavailableError_bas
|
|
|
37
37
|
}, disableValidation?: boolean);
|
|
38
38
|
toString(): string;
|
|
39
39
|
}
|
|
40
|
-
declare const ValidationError_base: import("effect/Schema").Class<ValidationError,
|
|
40
|
+
declare const ValidationError_base: import("effect/Schema").Class<ValidationError, import("effect/Schema").TaggedStruct<"ValidationError", {
|
|
41
41
|
readonly errors: S.$Array<S.Unknown> & {
|
|
42
42
|
withDefault: S.withConstructorDefault<S.$Array<S.Unknown>>;
|
|
43
43
|
withDecodingDefaultType: S.withDecodingDefaultType<S.$Array<S.Unknown>>;
|
|
@@ -51,7 +51,7 @@ export declare class ValidationError extends ValidationError_base {
|
|
|
51
51
|
get message(): string;
|
|
52
52
|
toString(): string;
|
|
53
53
|
}
|
|
54
|
-
declare const NotLoggedInError_base: import("effect/Schema").Class<NotLoggedInError,
|
|
54
|
+
declare const NotLoggedInError_base: import("effect/Schema").Class<NotLoggedInError, import("effect/Schema").TaggedStruct<"NotLoggedInError", {
|
|
55
55
|
readonly message: S.String;
|
|
56
56
|
}>, Cause.YieldableError>;
|
|
57
57
|
export declare class NotLoggedInError extends NotLoggedInError_base {
|
|
@@ -61,7 +61,7 @@ export declare class NotLoggedInError extends NotLoggedInError_base {
|
|
|
61
61
|
}, disableValidation?: boolean);
|
|
62
62
|
toString(): string;
|
|
63
63
|
}
|
|
64
|
-
declare const LoginError_base: import("effect/Schema").Class<LoginError,
|
|
64
|
+
declare const LoginError_base: import("effect/Schema").Class<LoginError, import("effect/Schema").TaggedStruct<"NotLoggedInError", {
|
|
65
65
|
readonly message: S.String;
|
|
66
66
|
}>, Cause.YieldableError>;
|
|
67
67
|
/**
|
|
@@ -74,7 +74,7 @@ export declare class LoginError extends LoginError_base {
|
|
|
74
74
|
}, disableValidation?: boolean);
|
|
75
75
|
toString(): string;
|
|
76
76
|
}
|
|
77
|
-
declare const UnauthorizedError_base: import("effect/Schema").Class<UnauthorizedError,
|
|
77
|
+
declare const UnauthorizedError_base: import("effect/Schema").Class<UnauthorizedError, import("effect/Schema").TaggedStruct<"UnauthorizedError", {
|
|
78
78
|
readonly message: S.String;
|
|
79
79
|
}>, Cause.YieldableError>;
|
|
80
80
|
export declare class UnauthorizedError extends UnauthorizedError_base {
|
|
@@ -91,7 +91,7 @@ type OptimisticConcurrencyDetails = {
|
|
|
91
91
|
readonly current?: string | undefined;
|
|
92
92
|
readonly found?: string | undefined;
|
|
93
93
|
};
|
|
94
|
-
declare const OptimisticConcurrencyException_base: import("effect/Schema").Class<OptimisticConcurrencyException,
|
|
94
|
+
declare const OptimisticConcurrencyException_base: import("effect/Schema").Class<OptimisticConcurrencyException, import("effect/Schema").TaggedStruct<"OptimisticConcurrencyException", {
|
|
95
95
|
readonly message: S.String;
|
|
96
96
|
}>, Cause.YieldableError>;
|
|
97
97
|
export declare class OptimisticConcurrencyException extends OptimisticConcurrencyException_base {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "effect-app",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.119",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@effect-app/eslint-shared-config": "0.6.0-beta.10"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
|
-
"effect": "^4.0.0-beta.
|
|
28
|
+
"effect": "^4.0.0-beta.52"
|
|
29
29
|
},
|
|
30
30
|
"typesVersions": {
|
|
31
31
|
"*": {
|
package/src/Schema/Class.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { Effect, Option, Schema, SchemaAST, SchemaIssue } from "effect"
|
|
3
3
|
import * as S from "effect/Schema"
|
|
4
|
+
import { concurrencyUnbounded } from "./ext.js"
|
|
4
5
|
|
|
5
6
|
type ClassAnnotations<Self> = S.Annotations.Declaration<Self, readonly [any]>
|
|
6
7
|
|
|
@@ -30,6 +31,11 @@ function makeRelaxedDeclaration(
|
|
|
30
31
|
): SchemaAST.Declaration {
|
|
31
32
|
const structSchema = Schema.Struct(fields)
|
|
32
33
|
const isStructValue = Schema.is(structSchema)
|
|
34
|
+
const existingParseOptions = ast.annotations?.["parseOptions"] as SchemaAST.ParseOptions | undefined
|
|
35
|
+
const annotations = {
|
|
36
|
+
...ast.annotations,
|
|
37
|
+
parseOptions: { ...existingParseOptions, concurrency: "unbounded" as const }
|
|
38
|
+
}
|
|
33
39
|
return new SchemaAST.Declaration(
|
|
34
40
|
ast.typeParameters,
|
|
35
41
|
() => (input: unknown, self: SchemaAST.Declaration) => {
|
|
@@ -38,7 +44,7 @@ function makeRelaxedDeclaration(
|
|
|
38
44
|
}
|
|
39
45
|
return Effect.fail(new SchemaIssue.InvalidType(self, Option.some(input)))
|
|
40
46
|
},
|
|
41
|
-
|
|
47
|
+
annotations,
|
|
42
48
|
ast.checks,
|
|
43
49
|
ast.encoding,
|
|
44
50
|
ast.context
|
|
@@ -96,6 +102,9 @@ export const Class: <Self = never>(identifier: string) => <Fields extends S.Stru
|
|
|
96
102
|
astCache.set(this, cached)
|
|
97
103
|
return cached
|
|
98
104
|
}
|
|
105
|
+
static mapFields(f: any, options?: any) {
|
|
106
|
+
return Base.mapFields(f, options).annotate(concurrencyUnbounded)
|
|
107
|
+
}
|
|
99
108
|
} as any
|
|
100
109
|
}
|
|
101
110
|
|
|
@@ -144,6 +153,9 @@ export const TaggedClass: <Self = never>(
|
|
|
144
153
|
astCache.set(this, cached)
|
|
145
154
|
return cached
|
|
146
155
|
}
|
|
156
|
+
static mapFields(f: any, options?: any) {
|
|
157
|
+
return Base.mapFields(f, options).annotate(concurrencyUnbounded)
|
|
158
|
+
}
|
|
147
159
|
} as any
|
|
148
160
|
}
|
|
149
161
|
|
|
@@ -82,10 +82,56 @@ export function removeAdditionalPropertiesFalse(obj: unknown): unknown {
|
|
|
82
82
|
return result
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
+
/**
|
|
86
|
+
* Flattens nested `anyOf` entries: if an anyOf entry is itself just `{ anyOf: [...] }`
|
|
87
|
+
* with no other keys, its children are inlined. If only one item remains, the anyOf
|
|
88
|
+
* wrapper is removed entirely.
|
|
89
|
+
*/
|
|
90
|
+
export function flattenNestedAnyOf(obj: unknown): unknown {
|
|
91
|
+
if (obj === null || typeof obj !== "object") return obj
|
|
92
|
+
if (globalThis.Array.isArray(obj)) return obj.map(flattenNestedAnyOf)
|
|
93
|
+
|
|
94
|
+
const record = obj as Record<string, unknown>
|
|
95
|
+
const result: Record<string, unknown> = {}
|
|
96
|
+
for (const [key, value] of Object.entries(record)) {
|
|
97
|
+
result[key] = flattenNestedAnyOf(value)
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
if (globalThis.Array.isArray(result["anyOf"])) {
|
|
101
|
+
const anyOf = result["anyOf"] as Array<unknown>
|
|
102
|
+
const flattened: Array<unknown> = []
|
|
103
|
+
for (const entry of anyOf) {
|
|
104
|
+
if (
|
|
105
|
+
typeof entry === "object"
|
|
106
|
+
&& entry !== null
|
|
107
|
+
&& !globalThis.Array.isArray(entry)
|
|
108
|
+
&& "anyOf" in entry
|
|
109
|
+
&& Object.keys(entry).length === 1
|
|
110
|
+
&& globalThis.Array.isArray((entry as Record<string, unknown>)["anyOf"])
|
|
111
|
+
) {
|
|
112
|
+
flattened.push(...(entry as Record<string, unknown>)["anyOf"] as Array<unknown>)
|
|
113
|
+
} else {
|
|
114
|
+
flattened.push(entry)
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
if (flattened.length === 1) {
|
|
118
|
+
const { anyOf: _, ...rest } = result
|
|
119
|
+
const single = flattened[0]
|
|
120
|
+
if (typeof single === "object" && single !== null && !globalThis.Array.isArray(single)) {
|
|
121
|
+
return { ...rest, ...single }
|
|
122
|
+
}
|
|
123
|
+
return single
|
|
124
|
+
}
|
|
125
|
+
result["anyOf"] = flattened
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
return result
|
|
129
|
+
}
|
|
130
|
+
|
|
85
131
|
/**
|
|
86
132
|
* Applies JSON Schema post-processing: flattens simple allOf,
|
|
87
|
-
* then strips additionalProperties: false.
|
|
133
|
+
* flattens nested anyOf, then strips additionalProperties: false.
|
|
88
134
|
*/
|
|
89
135
|
export function postProcessJsonSchema(obj: JsonSchema.JsonSchema): JsonSchema.JsonSchema {
|
|
90
|
-
return removeAdditionalPropertiesFalse(flattenSimpleAllOf(obj)) as JsonSchema.JsonSchema
|
|
136
|
+
return removeAdditionalPropertiesFalse(flattenNestedAnyOf(flattenSimpleAllOf(obj))) as JsonSchema.JsonSchema
|
|
91
137
|
}
|
package/src/Schema/ext.ts
CHANGED
|
@@ -109,9 +109,12 @@ export const Literals = <const Literals extends NonEmptyReadonlyArray<AST.Litera
|
|
|
109
109
|
/**
|
|
110
110
|
* Like the default Schema `Array` but with `withDefault` => []
|
|
111
111
|
*/
|
|
112
|
+
const co = { parseOptions: { concurrency: "unbounded" as const } }
|
|
113
|
+
export { co as concurrencyUnbounded }
|
|
114
|
+
|
|
112
115
|
export function Array<ValueSchema extends S.Top>(value: ValueSchema) {
|
|
113
116
|
return pipe(
|
|
114
|
-
S.Array(value),
|
|
117
|
+
S.Array(value).annotate(co),
|
|
115
118
|
(s) =>
|
|
116
119
|
Object.assign(s, {
|
|
117
120
|
withDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => []))),
|
|
@@ -126,7 +129,7 @@ export function Array<ValueSchema extends S.Top>(value: ValueSchema) {
|
|
|
126
129
|
export const ReadonlySetFromArray = <ValueSchema extends S.Top>(value: ValueSchema) => {
|
|
127
130
|
const from = S
|
|
128
131
|
.Array(value)
|
|
129
|
-
.annotate({ expected: "an array of unique items that will be decoded as a ReadonlySet" })
|
|
132
|
+
.annotate({ ...co, expected: "an array of unique items that will be decoded as a ReadonlySet" })
|
|
130
133
|
const to = S.instanceOf(Set) as S.instanceOf<ReadonlySet<S.Schema.Type<ValueSchema>>>
|
|
131
134
|
const schema = from.pipe(
|
|
132
135
|
S.decodeTo(
|
|
@@ -149,7 +152,7 @@ export const ReadonlyMapFromArray = <KeySchema extends S.Top, ValueSchema extend
|
|
|
149
152
|
}) => {
|
|
150
153
|
const from = S
|
|
151
154
|
.Array(S.Tuple([pair.key, pair.value]))
|
|
152
|
-
.annotate({ expected: "an array of key-value tuples that will be decoded as a ReadonlyMap" })
|
|
155
|
+
.annotate({ ...co, expected: "an array of key-value tuples that will be decoded as a ReadonlyMap" })
|
|
153
156
|
const to = S.instanceOf(Map) as S.instanceOf<
|
|
154
157
|
ReadonlyMap<S.Schema.Type<KeySchema>, S.Schema.Type<ValueSchema>>
|
|
155
158
|
>
|
package/src/Schema.ts
CHANGED
|
@@ -3,7 +3,7 @@ import * as S from "effect/Schema"
|
|
|
3
3
|
import type { NonEmptyReadonlyArray } from "./Array.js"
|
|
4
4
|
import { fakerArb } from "./faker.js"
|
|
5
5
|
import { Email as EmailT, type Email as EmailType } from "./Schema/email.js"
|
|
6
|
-
import { withDefaultMake } from "./Schema/ext.js"
|
|
6
|
+
import { concurrencyUnbounded, withDefaultMake } from "./Schema/ext.js"
|
|
7
7
|
import { PhoneNumber as PhoneNumberT, type PhoneNumber as PhoneNumberType } from "./Schema/phoneNumber.js"
|
|
8
8
|
import { extendM } from "./utils.js"
|
|
9
9
|
|
|
@@ -32,6 +32,58 @@ export * as SchemaParser from "effect/SchemaParser"
|
|
|
32
32
|
|
|
33
33
|
export { Void as Void_ } from "effect/Schema"
|
|
34
34
|
|
|
35
|
+
// ---------------------------------------------------------------------------
|
|
36
|
+
// Struct / NonEmptyArray / Record — with concurrency: "unbounded"
|
|
37
|
+
// ---------------------------------------------------------------------------
|
|
38
|
+
|
|
39
|
+
export function Struct<const Fields extends S.Struct.Fields>(fields: Fields): S.Struct<Fields> {
|
|
40
|
+
const result = S.Struct(fields).annotate(concurrencyUnbounded)
|
|
41
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
|
|
42
|
+
const origMapFields: any = result.mapFields
|
|
43
|
+
;(result as any).mapFields = function(this: any, f: any, options?: any) {
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
45
|
+
return origMapFields.call(this, f, options).annotate(concurrencyUnbounded)
|
|
46
|
+
}
|
|
47
|
+
return result
|
|
48
|
+
}
|
|
49
|
+
export interface Struct<Fields extends S.Struct.Fields> extends S.Struct<Fields> {}
|
|
50
|
+
export declare namespace Struct {
|
|
51
|
+
export type Fields = S.Struct.Fields
|
|
52
|
+
export type Type<F extends S.Struct.Fields> = S.Struct.Type<F>
|
|
53
|
+
export type Encoded<F extends S.Struct.Fields> = S.Struct.Encoded<F>
|
|
54
|
+
export type DecodingServices<F extends S.Struct.Fields> = S.Struct.DecodingServices<F>
|
|
55
|
+
export type EncodingServices<F extends S.Struct.Fields> = S.Struct.EncodingServices<F>
|
|
56
|
+
export type MakeIn<F extends S.Struct.Fields> = S.Struct.MakeIn<F>
|
|
57
|
+
export type Iso<F extends S.Struct.Fields> = S.Struct.Iso<F>
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function NonEmptyArray<Value extends S.Top>(value: Value): S.NonEmptyArray<Value> {
|
|
61
|
+
return S.NonEmptyArray(value).annotate(concurrencyUnbounded)
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function TaggedStruct<const Tag extends SchemaAST.LiteralValue, const Fields extends S.Struct.Fields>(
|
|
65
|
+
value: Tag,
|
|
66
|
+
fields: Fields
|
|
67
|
+
): S.TaggedStruct<Tag, Fields> {
|
|
68
|
+
return Struct({ _tag: S.tag(value), ...fields }) as any
|
|
69
|
+
}
|
|
70
|
+
export type TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends S.Struct.Fields> = S.TaggedStruct<
|
|
71
|
+
Tag,
|
|
72
|
+
Fields
|
|
73
|
+
>
|
|
74
|
+
|
|
75
|
+
export function Record<Key extends S.Record.Key, Value extends S.Top>(
|
|
76
|
+
key: Key,
|
|
77
|
+
value: Value
|
|
78
|
+
): S.$Record<Key, Value> {
|
|
79
|
+
return S.Record(key, value).annotate(concurrencyUnbounded)
|
|
80
|
+
}
|
|
81
|
+
export declare namespace Record {
|
|
82
|
+
export type Key = S.Record.Key
|
|
83
|
+
export type Type<K extends S.Record.Key, V extends S.Top> = S.Record.Type<K, V>
|
|
84
|
+
export type Encoded<K extends S.Record.Key, V extends S.Top> = S.Record.Encoded<K, V>
|
|
85
|
+
}
|
|
86
|
+
|
|
35
87
|
export const SpanId = Symbol()
|
|
36
88
|
export type SpanId = typeof SpanId
|
|
37
89
|
|
package/test/special.test.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Option, Predicate, Schema, SchemaGetter } from "effect"
|
|
|
2
2
|
import { InvalidStateError, LoginError, NotFoundError, NotLoggedInError, OptimisticConcurrencyException, ServiceUnavailableError, UnauthorizedError, ValidationError } from "effect-app/client/errors"
|
|
3
3
|
import * as AppSchema from "effect-app/Schema"
|
|
4
4
|
import { Class, TaggedClass } from "effect-app/Schema/Class"
|
|
5
|
-
import { flattenSimpleAllOf, specialJsonSchemaDocument } from "effect-app/Schema/SpecialJsonSchema"
|
|
5
|
+
import { flattenNestedAnyOf, flattenSimpleAllOf, specialJsonSchemaDocument } from "effect-app/Schema/SpecialJsonSchema"
|
|
6
6
|
import { deduplicateOpenApiSchemas } from "effect-app/Schema/SpecialOpenApi"
|
|
7
7
|
import * as S from "effect/Schema"
|
|
8
8
|
import { describe, expect, it } from "vitest"
|
|
@@ -706,7 +706,7 @@ describe("Post-processing integration — real Effect Schema types", () => {
|
|
|
706
706
|
})
|
|
707
707
|
})
|
|
708
708
|
|
|
709
|
-
it("NullOr union
|
|
709
|
+
it("NullOr union flattens nested anyOf members", () => {
|
|
710
710
|
const A = S.String.annotate({ identifier: "A", title: "A" })
|
|
711
711
|
const B = S.Boolean.annotate({ identifier: "B", title: "B" })
|
|
712
712
|
const schema = S.Struct({
|
|
@@ -717,9 +717,95 @@ describe("Post-processing integration — real Effect Schema types", () => {
|
|
|
717
717
|
|
|
718
718
|
expect(valueProp).toStrictEqual({
|
|
719
719
|
anyOf: [
|
|
720
|
-
{
|
|
720
|
+
{ $ref: "#/$defs/A" },
|
|
721
|
+
{ $ref: "#/$defs/B" },
|
|
721
722
|
{ type: "null" }
|
|
722
723
|
]
|
|
723
724
|
})
|
|
724
725
|
})
|
|
725
726
|
})
|
|
727
|
+
|
|
728
|
+
describe("flattenNestedAnyOf", () => {
|
|
729
|
+
it("flattens nested anyOf with no sibling keys", () => {
|
|
730
|
+
const input = {
|
|
731
|
+
anyOf: [
|
|
732
|
+
{ anyOf: [{ type: "string" }, { type: "number" }] },
|
|
733
|
+
{ type: "null" }
|
|
734
|
+
]
|
|
735
|
+
}
|
|
736
|
+
expect(flattenNestedAnyOf(input)).toStrictEqual({
|
|
737
|
+
anyOf: [
|
|
738
|
+
{ type: "string" },
|
|
739
|
+
{ type: "number" },
|
|
740
|
+
{ type: "null" }
|
|
741
|
+
]
|
|
742
|
+
})
|
|
743
|
+
})
|
|
744
|
+
|
|
745
|
+
it("does not flatten anyOf entry with sibling keys", () => {
|
|
746
|
+
const input = {
|
|
747
|
+
anyOf: [
|
|
748
|
+
{ anyOf: [{ type: "string" }], title: "X" },
|
|
749
|
+
{ type: "null" }
|
|
750
|
+
]
|
|
751
|
+
}
|
|
752
|
+
// The inner anyOf is not flattened into the outer (sibling "title" prevents it),
|
|
753
|
+
// but the single-element inner anyOf is unwrapped within the entry itself
|
|
754
|
+
expect(flattenNestedAnyOf(input)).toStrictEqual({
|
|
755
|
+
anyOf: [
|
|
756
|
+
{ type: "string", title: "X" },
|
|
757
|
+
{ type: "null" }
|
|
758
|
+
]
|
|
759
|
+
})
|
|
760
|
+
})
|
|
761
|
+
|
|
762
|
+
it("unwraps anyOf with single item after flattening", () => {
|
|
763
|
+
const input = {
|
|
764
|
+
anyOf: [
|
|
765
|
+
{ anyOf: [{ type: "string" }] }
|
|
766
|
+
]
|
|
767
|
+
}
|
|
768
|
+
expect(flattenNestedAnyOf(input)).toStrictEqual({ type: "string" })
|
|
769
|
+
})
|
|
770
|
+
|
|
771
|
+
it("unwraps anyOf with single item, merging sibling properties", () => {
|
|
772
|
+
const input = {
|
|
773
|
+
title: "MyField",
|
|
774
|
+
anyOf: [{ type: "string" }]
|
|
775
|
+
}
|
|
776
|
+
expect(flattenNestedAnyOf(input)).toStrictEqual({
|
|
777
|
+
title: "MyField",
|
|
778
|
+
type: "string"
|
|
779
|
+
})
|
|
780
|
+
})
|
|
781
|
+
|
|
782
|
+
it("recurses into nested objects", () => {
|
|
783
|
+
const input = {
|
|
784
|
+
properties: {
|
|
785
|
+
field: {
|
|
786
|
+
anyOf: [
|
|
787
|
+
{ anyOf: [{ $ref: "#/defs/A" }, { $ref: "#/defs/B" }] },
|
|
788
|
+
{ type: "null" }
|
|
789
|
+
]
|
|
790
|
+
}
|
|
791
|
+
}
|
|
792
|
+
}
|
|
793
|
+
expect(flattenNestedAnyOf(input)).toStrictEqual({
|
|
794
|
+
properties: {
|
|
795
|
+
field: {
|
|
796
|
+
anyOf: [
|
|
797
|
+
{ $ref: "#/defs/A" },
|
|
798
|
+
{ $ref: "#/defs/B" },
|
|
799
|
+
{ type: "null" }
|
|
800
|
+
]
|
|
801
|
+
}
|
|
802
|
+
}
|
|
803
|
+
})
|
|
804
|
+
})
|
|
805
|
+
|
|
806
|
+
it("passes through non-objects unchanged", () => {
|
|
807
|
+
expect(flattenNestedAnyOf(null)).toBe(null)
|
|
808
|
+
expect(flattenNestedAnyOf(42)).toBe(42)
|
|
809
|
+
expect(flattenNestedAnyOf("hello")).toBe("hello")
|
|
810
|
+
})
|
|
811
|
+
})
|