effect-app 4.0.0-beta.268 → 4.0.0-beta.269
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 +24 -0
- package/dist/Model/filter/types/path/eager.d.ts +1 -29
- package/dist/Model/filter/types/path/eager.d.ts.map +1 -1
- package/dist/Model/filter/types/path/eager.js +9 -10
- package/dist/RequestContext.d.ts +121 -4
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +7 -2
- package/dist/Schema/Class.d.ts +93 -1
- package/dist/Schema/Class.d.ts.map +1 -1
- package/dist/Schema/Class.js +23 -1
- package/dist/Schema.d.ts +2 -2
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +2 -2
- package/dist/client/errors.d.ts +1 -1
- package/dist/client/errors.d.ts.map +1 -1
- package/dist/client/errors.js +2 -2
- package/dist/utils.d.ts +1 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +15 -11
- package/package.json +1 -1
- package/src/Model/filter/types/path/eager.ts +8 -6
- package/src/RequestContext.ts +39 -6
- package/src/Schema/Class.ts +242 -0
- package/src/Schema.ts +1 -1
- package/src/client/errors.ts +6 -1
- package/src/utils.ts +21 -17
- package/tsconfig.json +1 -0
package/dist/utils.js
CHANGED
|
@@ -106,9 +106,10 @@ resultSelector) {
|
|
|
106
106
|
if (!descriptor) {
|
|
107
107
|
descriptor = Object.getOwnPropertyDescriptor(target, key);
|
|
108
108
|
if (!descriptor) {
|
|
109
|
-
const e = new Error("@LazyGetter is unable to determine the property descriptor")
|
|
110
|
-
|
|
111
|
-
|
|
109
|
+
const e = Object.assign(new Error("@LazyGetter is unable to determine the property descriptor"), {
|
|
110
|
+
$key: key,
|
|
111
|
+
$target: target
|
|
112
|
+
});
|
|
112
113
|
throw e;
|
|
113
114
|
}
|
|
114
115
|
}
|
|
@@ -163,16 +164,16 @@ target, key, isStatic, enumerable, originalMethod, thisArg, args, setProto, make
|
|
|
163
164
|
export function LazyGetter(setProto = false, makeNonConfigurable = false, resultSelector = defaultFilter) {
|
|
164
165
|
let desc;
|
|
165
166
|
let prop;
|
|
166
|
-
let args
|
|
167
|
+
let args;
|
|
167
168
|
let isLegacy;
|
|
168
169
|
function decorator(targetOrDesc, key, descriptor) {
|
|
169
|
-
|
|
170
|
-
args = arguments;
|
|
170
|
+
args = [targetOrDesc, key, descriptor];
|
|
171
171
|
if (key === undefined) {
|
|
172
172
|
if (typeof desc === "undefined") {
|
|
173
|
+
const newDescriptor = targetOrDesc;
|
|
173
174
|
isLegacy = false;
|
|
174
|
-
prop =
|
|
175
|
-
desc = Object.assign({},
|
|
175
|
+
prop = newDescriptor.key;
|
|
176
|
+
desc = Object.assign({}, newDescriptor.descriptor
|
|
176
177
|
/* istanbul ignore next */ || targetOrDesc);
|
|
177
178
|
}
|
|
178
179
|
return decorateNew(targetOrDesc, setProto, makeNonConfigurable, resultSelector);
|
|
@@ -196,11 +197,14 @@ export function LazyGetter(setProto = false, makeNonConfigurable = false, result
|
|
|
196
197
|
if (!desc) {
|
|
197
198
|
throw new Error("Unable to restore descriptor. Did you remember to apply your decorator to a method?");
|
|
198
199
|
}
|
|
200
|
+
if (!args) {
|
|
201
|
+
throw new Error("Unable to restore descriptor before applying the decorator.");
|
|
202
|
+
}
|
|
199
203
|
// Restore descriptor to its original state
|
|
200
204
|
Object.defineProperty(on, prop, desc);
|
|
201
|
-
// eslint-disable-next-line prefer-spread
|
|
202
205
|
const ret = decorator.apply(null, args);
|
|
203
|
-
|
|
206
|
+
const restoredDescriptor = isLegacy ? ret : "descriptor" in ret && ret.descriptor ? ret.descriptor : ret;
|
|
207
|
+
Object.defineProperty(on, prop, restoredDescriptor);
|
|
204
208
|
};
|
|
205
209
|
return decorator;
|
|
206
210
|
}
|
|
@@ -398,4 +402,4 @@ const genConstructor = (function* () { }).constructor;
|
|
|
398
402
|
* @since 3.11.0
|
|
399
403
|
*/
|
|
400
404
|
export const isGeneratorFunction = (u) => isFunction(u) && u.constructor === genConstructor;
|
|
401
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
405
|
+
//# 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
|
@@ -44,7 +44,7 @@ export type Path<T, Seen = never> = T extends ReadonlyArray<infer V> ? IsTuple<T
|
|
|
44
44
|
*/
|
|
45
45
|
export type FieldPath<TFieldValues extends FieldValues> = Path<TFieldValues>
|
|
46
46
|
|
|
47
|
-
|
|
47
|
+
{
|
|
48
48
|
// Regression: self-referential types must terminate instead of blowing past
|
|
49
49
|
// TS's instantiation limit (TS2589). `JsonLike` mirrors effect's `Json` — the
|
|
50
50
|
// encoded form of `Schema.Defect()` — whose `{ [x: string]: Json }` index
|
|
@@ -57,12 +57,14 @@ export namespace PathRecursionTests {
|
|
|
57
57
|
| null
|
|
58
58
|
| ReadonlyArray<JsonLike>
|
|
59
59
|
| { readonly [x: string]: JsonLike }
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
type _RawDefect = Path<{ id: string; raw: JsonLike }>
|
|
61
|
+
type _NestedDefect = Path<{ a: { b: { error: { raw: JsonLike } } } }>
|
|
62
|
+
type _ArrayOfDefect = Path<{ items: ReadonlyArray<{ raw: JsonLike }> }>
|
|
63
63
|
// finite paths are still produced
|
|
64
64
|
expectTypeOf<"id">().toExtend<_RawDefect>()
|
|
65
65
|
expectTypeOf<"raw">().toExtend<_RawDefect>()
|
|
66
|
+
expectTypeOf<"a.b.error.raw">().toExtend<_NestedDefect>()
|
|
67
|
+
expectTypeOf<`items.${number}.raw`>().toExtend<_ArrayOfDefect>()
|
|
66
68
|
}
|
|
67
69
|
|
|
68
70
|
/**
|
|
@@ -191,7 +193,7 @@ export type RefineFieldPathValue<
|
|
|
191
193
|
Exclde extends boolean = false
|
|
192
194
|
> = EraseNeverContainingUnionElements<RefinePathValue<TFieldValues, TFieldPath, X, Exclde>>
|
|
193
195
|
|
|
194
|
-
|
|
196
|
+
{
|
|
195
197
|
type test1 = RefineFieldPathValue<{ a: { b: "tag1"; v1: string } | { b: "tag2"; v2: number } }, "a.b", "tag1">
|
|
196
198
|
expectTypeOf<test1>().toEqualTypeOf<{ a: { b: "tag1"; v1: string } }>()
|
|
197
199
|
|
|
@@ -259,7 +261,7 @@ export namespace RefinePathValueTests {
|
|
|
259
261
|
}>()
|
|
260
262
|
}
|
|
261
263
|
|
|
262
|
-
|
|
264
|
+
{
|
|
263
265
|
type test1 = SetFieldPathValue<{ foo: { bar: string[] } }, `foo.bar`, boolean>
|
|
264
266
|
expectTypeOf<test1>().toEqualTypeOf<{ foo: { bar: boolean } }>()
|
|
265
267
|
|
package/src/RequestContext.ts
CHANGED
|
@@ -8,10 +8,7 @@ export type Locale = typeof Locale.Type
|
|
|
8
8
|
|
|
9
9
|
export class LocaleRef extends Context.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
RequestContext,
|
|
13
|
-
RequestContext.Encoded
|
|
14
|
-
>()(S.Struct({
|
|
11
|
+
class _RequestContext extends S.Opaque<_RequestContext>()(S.Struct({
|
|
15
12
|
span: S.Struct({
|
|
16
13
|
traceId: S.String,
|
|
17
14
|
spanId: S.String,
|
|
@@ -34,6 +31,17 @@ export class RequestContext extends S.Opaque<
|
|
|
34
31
|
}
|
|
35
32
|
}
|
|
36
33
|
|
|
34
|
+
// codegen:start {preset: modelFacade, className: _RequestContext, schema: S}
|
|
35
|
+
// eslint-disable-next-line typescript/no-unsafe-declaration-merging
|
|
36
|
+
export class RequestContext extends S.OpaqueFacadeClass<
|
|
37
|
+
RequestContext,
|
|
38
|
+
RequestContext.Encoded,
|
|
39
|
+
RequestContext.Make,
|
|
40
|
+
RequestContext.DecodingServices,
|
|
41
|
+
RequestContext.EncodingServices
|
|
42
|
+
>()(_RequestContext) {}
|
|
43
|
+
// codegen:end
|
|
44
|
+
|
|
37
45
|
export const spanAttributes = (ctx: Pick<RequestContext, "locale" | "namespace"> & Partial<RequestContext>) => ({
|
|
38
46
|
"code.function.name": ctx.name,
|
|
39
47
|
"app.locale": ctx.locale,
|
|
@@ -52,10 +60,35 @@ export const spanAttributes = (ctx: Pick<RequestContext, "locale" | "namespace">
|
|
|
52
60
|
: {})
|
|
53
61
|
})
|
|
54
62
|
|
|
55
|
-
// codegen:start {preset: model}
|
|
63
|
+
// codegen:start {preset: model, static: true, facade: true}
|
|
56
64
|
//
|
|
65
|
+
export interface RequestContext {
|
|
66
|
+
readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
|
|
67
|
+
readonly name: S.NonEmptyString255
|
|
68
|
+
readonly locale: "en" | "de"
|
|
69
|
+
readonly namespace: S.NonEmptyString255
|
|
70
|
+
readonly sourceId?: undefined | S.NonEmptyString255
|
|
71
|
+
readonly userProfile?: undefined | { readonly sub: UserProfileId }
|
|
72
|
+
}
|
|
57
73
|
export namespace RequestContext {
|
|
58
|
-
export interface Encoded
|
|
74
|
+
export interface Encoded {
|
|
75
|
+
readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
|
|
76
|
+
readonly name: string
|
|
77
|
+
readonly locale: "en" | "de"
|
|
78
|
+
readonly namespace: string
|
|
79
|
+
readonly sourceId?: undefined | string
|
|
80
|
+
readonly userProfile?: undefined | { readonly sub: string }
|
|
81
|
+
}
|
|
82
|
+
export interface Make {
|
|
83
|
+
readonly span: { readonly traceId: string; readonly spanId: string; readonly sampled: boolean }
|
|
84
|
+
readonly name: S.NonEmptyString255
|
|
85
|
+
readonly locale: "en" | "de"
|
|
86
|
+
readonly namespace: S.NonEmptyString255
|
|
87
|
+
readonly sourceId?: undefined | S.NonEmptyString255
|
|
88
|
+
readonly userProfile?: undefined | { readonly sub: UserProfileId }
|
|
89
|
+
}
|
|
90
|
+
export type DecodingServices = never
|
|
91
|
+
export type EncodingServices = never
|
|
59
92
|
}
|
|
60
93
|
//
|
|
61
94
|
// codegen:end
|
package/src/Schema/Class.ts
CHANGED
|
@@ -309,3 +309,245 @@ export interface Opaque<Self, Encoded, SchemaS extends S.Top, Brand>
|
|
|
309
309
|
export const Opaque: <Self, Encoded = ExtendedSchemaNoEncoded, Brand = {}>() => <S extends S.Top>(
|
|
310
310
|
schema: S
|
|
311
311
|
) => Opaque<Self, Encoded, S, Brand> & Omit<S, keyof S.Top> = S.Opaque as any
|
|
312
|
+
|
|
313
|
+
/**
|
|
314
|
+
* Like {@link Opaque}, but the class **instance type is exactly `Self`** (the supplied
|
|
315
|
+
* decoded `Type`) instead of the structurally-computed `struct["Type"] & Brand`.
|
|
316
|
+
*
|
|
317
|
+
* Stock `Opaque` types the instance as `struct["Type"] & Brand` and only overrides the
|
|
318
|
+
* schema's `Type`/`Encoded` *members* with `Self`/`Encoded`. So `make`/`copy`/consumers
|
|
319
|
+
* still resolve the struct's mapped `Type`. With a codegen-supplied pre-expanded literal
|
|
320
|
+
* `Type` interface, `OpaqueType` lets all of those resolve a single **named** interface
|
|
321
|
+
* (resolved once per checker) instead of re-deriving the mapped `Type` — cutting
|
|
322
|
+
* instantiation on `Type`-touching consumers.
|
|
323
|
+
*
|
|
324
|
+
* Use with `class X extends OpaqueType<X.Type, X.Encoded>()(struct) {}` where `X.Type`
|
|
325
|
+
* and `X.Encoded` are generated literal interfaces (see `@effect-app/eslint-codegen-model`,
|
|
326
|
+
* `static` + `type` mode).
|
|
327
|
+
*
|
|
328
|
+
* KNOWN GAP — **no branding**: the instance type is a plain structural `Self`, so opaque
|
|
329
|
+
* types of identical shape are mutually assignable. (Stock `Opaque` is also structural by
|
|
330
|
+
* default — `Brand` defaults to `{}` — so this only differs if you passed a non-default
|
|
331
|
+
* `Brand`.) Re-introducing a nominal brand on top of a supplied `Self` (e.g. branding the
|
|
332
|
+
* generated `Type` interface) is not yet implemented.
|
|
333
|
+
*
|
|
334
|
+
* NOTE: only `Type` (via `Self`) and `Encoded` are supplied statically here; `make`'s input
|
|
335
|
+
* (`~type.make.in`) and other derived members are still computed from the struct. See
|
|
336
|
+
* a future `OpaqueShape`-style helper if those also need to be supplied.
|
|
337
|
+
*/
|
|
338
|
+
export interface OpaqueType<Self, Encoded, SchemaS extends S.Top, Brand>
|
|
339
|
+
extends S.Opaque<Self, ExtendedSchema<SchemaS, Encoded>, Brand>
|
|
340
|
+
{
|
|
341
|
+
new(_: never): Self
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
export const OpaqueType: <Self, Encoded = ExtendedSchemaNoEncoded, Brand = {}>() => <S extends S.Top>(
|
|
345
|
+
schema: S
|
|
346
|
+
) => OpaqueType<Self, Encoded, S, Brand> & Omit<S, keyof S.Top> = S.Opaque as any
|
|
347
|
+
|
|
348
|
+
// Override both the `Encoded` and make-input (`~type.make.in`) members in one go,
|
|
349
|
+
// like `ExtendedSchema` does for `Encoded` alone.
|
|
350
|
+
type ExtendedShape<SchemaS extends S.Top, Encoded, MakeIn> =
|
|
351
|
+
& Omit<SchemaS, "Encoded" | "~type.make.in">
|
|
352
|
+
& { readonly Encoded: Encoded; readonly "~type.make.in": MakeIn }
|
|
353
|
+
|
|
354
|
+
type OpaqueFacadeConstructorArgs<MakeIn> = {} extends MakeIn ? [props?: MakeIn, options?: S.MakeOptions]
|
|
355
|
+
: [props: MakeIn, options?: S.MakeOptions]
|
|
356
|
+
|
|
357
|
+
// Only the codec channels are required. `copy`/`fields`/`mapFields` are NOT
|
|
358
|
+
// required here: transformed schemas (`.pipe(S.encodeKeys/annotate/filter/...)`)
|
|
359
|
+
// don't expose them at the static level, and requiring them would reject those
|
|
360
|
+
// models from facading. When present they still flow through via
|
|
361
|
+
// `OpaqueFacadeStatics`; when absent the facade simply doesn't offer them.
|
|
362
|
+
type OpaqueFacadeInput<DecodingServices, EncodingServices> = S.Top & {
|
|
363
|
+
readonly DecodingServices: DecodingServices
|
|
364
|
+
readonly EncodingServices: EncodingServices
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
// Carry the schema's own statics, dropping the generic `S.Top` machinery and
|
|
368
|
+
// `prototype`. EXCEPT `to`: models compose each other via `X.to.fields` /
|
|
369
|
+
// `X.to.copy` at definition time, so it must survive on the facade.
|
|
370
|
+
type OpaqueFacadeStatics<SchemaS extends S.Top> = Omit<SchemaS, Exclude<keyof S.Top, "to"> | "prototype">
|
|
371
|
+
|
|
372
|
+
/**
|
|
373
|
+
* Like {@link OpaqueType}, but ALSO supplies a static **make-input** shape, so
|
|
374
|
+
* `make`/`copy` resolve a named `MakeIn` interface instead of re-deriving the struct's
|
|
375
|
+
* mapped `~type.make.in`. Use with codegen-supplied `X.Type` / `X.Encoded` / `X.Make`:
|
|
376
|
+
*
|
|
377
|
+
* ```ts
|
|
378
|
+
* class X extends OpaqueShape<X.Type, X.Encoded, X.Make>()(struct) {}
|
|
379
|
+
* ```
|
|
380
|
+
*
|
|
381
|
+
* `decode`/`encode` already use the supplied `Type`/`Encoded` (they read the schema's
|
|
382
|
+
* `Type`/`Encoded` members, which are `Self`/`Encoded` here) — no separate override needed.
|
|
383
|
+
*
|
|
384
|
+
* NOTE — measured gain is modest (~5%): the struct passed to the wrapper is still
|
|
385
|
+
* constructed in full (definition cost dominates); the static shapes only cheapen
|
|
386
|
+
* consumer-side reads of `Type`/`Encoded`/`MakeIn`. Same `no-branding` gap as
|
|
387
|
+
* {@link OpaqueType}.
|
|
388
|
+
*/
|
|
389
|
+
export interface OpaqueShape<Self, Encoded, MakeIn, SchemaS extends S.Top, Brand>
|
|
390
|
+
extends S.Opaque<Self, ExtendedShape<SchemaS, Encoded, MakeIn>, Brand>
|
|
391
|
+
{
|
|
392
|
+
new(_: never): Self
|
|
393
|
+
}
|
|
394
|
+
|
|
395
|
+
export const OpaqueShape: <Self, Encoded, MakeIn, Brand = {}>() => <S extends S.Top>(
|
|
396
|
+
schema: S
|
|
397
|
+
) => OpaqueShape<Self, Encoded, MakeIn, S, Brand> & Omit<S, keyof S.Top> = S.Opaque as any
|
|
398
|
+
|
|
399
|
+
/**
|
|
400
|
+
* Shallow public view for generated model facades.
|
|
401
|
+
*
|
|
402
|
+
* The runtime value can still be the full private schema class, but emitted
|
|
403
|
+
* declarations expose only named `Type` / `Encoded` / `Make` interfaces and a
|
|
404
|
+
* small static surface. This keeps downstream project references from pulling
|
|
405
|
+
* the private struct field map back through `typeof Model`.
|
|
406
|
+
*/
|
|
407
|
+
export interface OpaqueFacade<
|
|
408
|
+
Self,
|
|
409
|
+
Encoded,
|
|
410
|
+
MakeIn,
|
|
411
|
+
DecodingServices = never,
|
|
412
|
+
EncodingServices = DecodingServices,
|
|
413
|
+
Brand = {}
|
|
414
|
+
> extends
|
|
415
|
+
S.Bottom<
|
|
416
|
+
Self,
|
|
417
|
+
Encoded,
|
|
418
|
+
DecodingServices,
|
|
419
|
+
EncodingServices,
|
|
420
|
+
SchemaAST.AST,
|
|
421
|
+
S.Codec<Self, Encoded, DecodingServices, EncodingServices>,
|
|
422
|
+
MakeIn,
|
|
423
|
+
Self,
|
|
424
|
+
readonly [],
|
|
425
|
+
MakeIn
|
|
426
|
+
>
|
|
427
|
+
{
|
|
428
|
+
new(...args: OpaqueFacadeConstructorArgs<MakeIn>): Self & Brand
|
|
429
|
+
readonly copy: ReturnType<typeof copyOrigin<new(_: MakeIn) => Self>>
|
|
430
|
+
// NOTE: `fields` / `mapFields` are intentionally NOT redeclared here. They are
|
|
431
|
+
// carried (precise) from the underlying schema via `OpaqueFacadeStatics`. A wide
|
|
432
|
+
// `mapFields(f: (fields: S.Struct.Fields) => To)` override would win overload
|
|
433
|
+
// resolution and erase field precision in `Q.project(X.mapFields(...))`.
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
export function OpaqueFacade<
|
|
437
|
+
Self,
|
|
438
|
+
Encoded,
|
|
439
|
+
MakeIn,
|
|
440
|
+
DecodingServices = never,
|
|
441
|
+
EncodingServices = DecodingServices,
|
|
442
|
+
Brand = {}
|
|
443
|
+
>() {
|
|
444
|
+
return <SchemaS extends OpaqueFacadeInput<DecodingServices, EncodingServices>>(
|
|
445
|
+
schema: SchemaS
|
|
446
|
+
): OpaqueFacade<Self, Encoded, MakeIn, DecodingServices, EncodingServices, Brand> & OpaqueFacadeStatics<SchemaS> =>
|
|
447
|
+
schema as SchemaS & OpaqueFacade<Self, Encoded, MakeIn, DecodingServices, EncodingServices, Brand>
|
|
448
|
+
}
|
|
449
|
+
|
|
450
|
+
export interface OpaqueFacadeClass<
|
|
451
|
+
Self,
|
|
452
|
+
Encoded,
|
|
453
|
+
MakeIn,
|
|
454
|
+
DecodingServices = never,
|
|
455
|
+
EncodingServices = DecodingServices,
|
|
456
|
+
Brand = {}
|
|
457
|
+
> extends
|
|
458
|
+
S.Bottom<
|
|
459
|
+
Self,
|
|
460
|
+
Encoded,
|
|
461
|
+
DecodingServices,
|
|
462
|
+
EncodingServices,
|
|
463
|
+
SchemaAST.AST,
|
|
464
|
+
S.Codec<Self, Encoded, DecodingServices, EncodingServices>,
|
|
465
|
+
MakeIn,
|
|
466
|
+
Self,
|
|
467
|
+
readonly [],
|
|
468
|
+
MakeIn
|
|
469
|
+
>
|
|
470
|
+
{
|
|
471
|
+
new(...args: OpaqueFacadeConstructorArgs<MakeIn>): Brand
|
|
472
|
+
readonly copy: ReturnType<typeof copyOrigin<new(_: MakeIn) => Self>>
|
|
473
|
+
// NOTE: `fields` / `mapFields` intentionally not redeclared — carried precise
|
|
474
|
+
// from the underlying schema via `OpaqueFacadeStatics` (see OpaqueFacade above).
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
export function OpaqueFacadeClass<
|
|
478
|
+
Self,
|
|
479
|
+
Encoded,
|
|
480
|
+
MakeIn,
|
|
481
|
+
DecodingServices = never,
|
|
482
|
+
EncodingServices = DecodingServices,
|
|
483
|
+
Brand = {}
|
|
484
|
+
>() {
|
|
485
|
+
return <SchemaS extends OpaqueFacadeInput<DecodingServices, EncodingServices>>(
|
|
486
|
+
schema: SchemaS
|
|
487
|
+
):
|
|
488
|
+
& OpaqueFacadeClass<Self, Encoded, MakeIn, DecodingServices, EncodingServices, Brand>
|
|
489
|
+
& OpaqueFacadeStatics<SchemaS> =>
|
|
490
|
+
{
|
|
491
|
+
// Make the result constructable (like `S.Opaque`), so the private `_X` may be a
|
|
492
|
+
// plain `S.Struct`/`S.TaggedStruct` (lighter type) — not only an `S.Opaque` class —
|
|
493
|
+
// while `export class X extends ...(_X)` still works.
|
|
494
|
+
class Facade {}
|
|
495
|
+
return Object.setPrototypeOf(Facade, schema)
|
|
496
|
+
}
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
/**
|
|
500
|
+
* Like {@link OpaqueFacadeClass}, but for error models (`TaggedErrorClass` /
|
|
501
|
+
* `ErrorClass`). The decoded instance type carries `Cause.YieldableError`, so
|
|
502
|
+
* `yield* new MyError(...)`, `Effect.fail(myError)`, and `instanceof` all keep
|
|
503
|
+
* working through the facade — the runtime `_X` is the real error class (the
|
|
504
|
+
* facade `X extends ...(_X)` inherits its prototype), and the type reflects it.
|
|
505
|
+
* Nothing is lost vs the underlying error class.
|
|
506
|
+
*/
|
|
507
|
+
export interface OpaqueErrorFacadeClass<
|
|
508
|
+
Self,
|
|
509
|
+
Encoded,
|
|
510
|
+
MakeIn,
|
|
511
|
+
DecodingServices = never,
|
|
512
|
+
EncodingServices = DecodingServices,
|
|
513
|
+
Brand = {}
|
|
514
|
+
> extends
|
|
515
|
+
S.Bottom<
|
|
516
|
+
Self,
|
|
517
|
+
Encoded,
|
|
518
|
+
DecodingServices,
|
|
519
|
+
EncodingServices,
|
|
520
|
+
SchemaAST.AST,
|
|
521
|
+
S.Codec<Self, Encoded, DecodingServices, EncodingServices>,
|
|
522
|
+
MakeIn,
|
|
523
|
+
Self,
|
|
524
|
+
readonly [],
|
|
525
|
+
MakeIn
|
|
526
|
+
>
|
|
527
|
+
{
|
|
528
|
+
// YieldableError (not Self) on the constructed instance — like OpaqueFacadeClass's
|
|
529
|
+
// `new(): Brand`, the data type comes from the declaration-merged `interface X`,
|
|
530
|
+
// so `Self` must NOT appear here (would recurse). Merging `X & YieldableError`
|
|
531
|
+
// makes `yield* new X()` / `Effect.fail` / `instanceof` work without losing data.
|
|
532
|
+
new(...args: OpaqueFacadeConstructorArgs<MakeIn>): Cause.YieldableError & Brand
|
|
533
|
+
readonly copy: ReturnType<typeof copyOrigin<new(_: MakeIn) => Self>>
|
|
534
|
+
}
|
|
535
|
+
|
|
536
|
+
export function OpaqueErrorFacadeClass<
|
|
537
|
+
Self,
|
|
538
|
+
Encoded,
|
|
539
|
+
MakeIn,
|
|
540
|
+
DecodingServices = never,
|
|
541
|
+
EncodingServices = DecodingServices,
|
|
542
|
+
Brand = {}
|
|
543
|
+
>() {
|
|
544
|
+
return <SchemaS extends OpaqueFacadeInput<DecodingServices, EncodingServices>>(
|
|
545
|
+
schema: SchemaS
|
|
546
|
+
):
|
|
547
|
+
& OpaqueErrorFacadeClass<Self, Encoded, MakeIn, DecodingServices, EncodingServices, Brand>
|
|
548
|
+
& OpaqueFacadeStatics<SchemaS> =>
|
|
549
|
+
{
|
|
550
|
+
class Facade {}
|
|
551
|
+
return Object.setPrototypeOf(Facade, schema)
|
|
552
|
+
}
|
|
553
|
+
}
|
package/src/Schema.ts
CHANGED
|
@@ -110,7 +110,7 @@ export { withDecodingDefaultTypeKey } from "effect/Schema"
|
|
|
110
110
|
export * from "effect/Schema"
|
|
111
111
|
|
|
112
112
|
export * from "./Schema/Class.ts"
|
|
113
|
-
export { Class, ErrorClass, Opaque, TaggedClass, TaggedErrorClass } from "./Schema/Class.ts"
|
|
113
|
+
export { Class, ErrorClass, Opaque, OpaqueErrorFacadeClass, OpaqueFacade, OpaqueFacadeClass, OpaqueShape, OpaqueType, TaggedClass, TaggedErrorClass } from "./Schema/Class.ts"
|
|
114
114
|
|
|
115
115
|
export { fromBrand, nominal } from "./Schema/brand.ts"
|
|
116
116
|
export { Array, Boolean, Date, DateFromString, DateValid, Finite, Literals, NullOr, Number, ReadonlyMap, ReadonlySet } from "./Schema/ext.ts"
|
package/src/client/errors.ts
CHANGED
|
@@ -243,11 +243,16 @@ export const silenceError = (e: Record<PropertyKey, any>) => {
|
|
|
243
243
|
}
|
|
244
244
|
|
|
245
245
|
export class CauseException<E> extends Error {
|
|
246
|
-
|
|
246
|
+
readonly originalCause: Cause.Cause<E>
|
|
247
|
+
readonly _tag: string
|
|
248
|
+
|
|
249
|
+
constructor(originalCause: Cause.Cause<E>, _tag: string) {
|
|
247
250
|
const limit = Error.stackTraceLimit
|
|
248
251
|
Error.stackTraceLimit = 0
|
|
249
252
|
super()
|
|
250
253
|
Error.stackTraceLimit = limit
|
|
254
|
+
this.originalCause = originalCause
|
|
255
|
+
this._tag = _tag
|
|
251
256
|
this.cause = Cause.squash(originalCause)
|
|
252
257
|
// v4: makeFiberFailure removed — use Cause.prettyErrors instead
|
|
253
258
|
const errors = Cause.prettyErrors(originalCause)
|
package/src/utils.ts
CHANGED
|
@@ -228,7 +228,7 @@ function decorateNew(
|
|
|
228
228
|
function decorateLegacy(
|
|
229
229
|
target: any,
|
|
230
230
|
key: PropertyKey,
|
|
231
|
-
descriptor: PropertyDescriptor,
|
|
231
|
+
descriptor: PropertyDescriptor | undefined,
|
|
232
232
|
setProto: boolean,
|
|
233
233
|
makeNonConfigurable: boolean,
|
|
234
234
|
// tslint:enable:bool-param-default
|
|
@@ -236,11 +236,12 @@ function decorateLegacy(
|
|
|
236
236
|
): PropertyDescriptor {
|
|
237
237
|
/* istanbul ignore if */
|
|
238
238
|
if (!descriptor) {
|
|
239
|
-
descriptor =
|
|
239
|
+
descriptor = Object.getOwnPropertyDescriptor(target, key)
|
|
240
240
|
if (!descriptor) {
|
|
241
|
-
const e = new Error("@LazyGetter is unable to determine the property descriptor")
|
|
242
|
-
|
|
243
|
-
|
|
241
|
+
const e = Object.assign(new Error("@LazyGetter is unable to determine the property descriptor"), {
|
|
242
|
+
$key: key,
|
|
243
|
+
$target: target
|
|
244
|
+
})
|
|
244
245
|
throw e
|
|
245
246
|
}
|
|
246
247
|
}
|
|
@@ -295,7 +296,7 @@ function defaultFilter(): boolean {
|
|
|
295
296
|
|
|
296
297
|
function validateAndExtractMethodFromDescriptor(desc: PropertyDescriptor): Function {
|
|
297
298
|
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
298
|
-
const originalMethod =
|
|
299
|
+
const originalMethod = desc.get
|
|
299
300
|
|
|
300
301
|
if (!originalMethod) {
|
|
301
302
|
throw new Error("@LazyGetter can only decorate getters!")
|
|
@@ -318,7 +319,7 @@ function getterCommon( // tslint:disable-line:parameters-max-number
|
|
|
318
319
|
makeNonConfigurable: boolean,
|
|
319
320
|
resultSelector: ResultSelectorFn
|
|
320
321
|
): any {
|
|
321
|
-
const value = originalMethod.apply(thisArg,
|
|
322
|
+
const value = originalMethod.apply(thisArg, args)
|
|
322
323
|
|
|
323
324
|
if (resultSelector(value)) {
|
|
324
325
|
const newDescriptor: PropertyDescriptor = {
|
|
@@ -353,23 +354,23 @@ export function LazyGetter(
|
|
|
353
354
|
): MethodDecorator & ResettableDescriptor {
|
|
354
355
|
let desc: PropertyDescriptor
|
|
355
356
|
let prop: PropertyKey
|
|
356
|
-
let args:
|
|
357
|
+
let args: [targetOrDesc: any, key: PropertyKey | undefined, descriptor: PropertyDescriptor | undefined] | undefined
|
|
357
358
|
let isLegacy: boolean
|
|
358
359
|
|
|
359
360
|
function decorator(
|
|
360
361
|
targetOrDesc: any,
|
|
361
|
-
key: PropertyKey,
|
|
362
|
-
descriptor: PropertyDescriptor
|
|
362
|
+
key: PropertyKey | undefined,
|
|
363
|
+
descriptor: PropertyDescriptor | undefined
|
|
363
364
|
): DecoratorReturn {
|
|
364
|
-
|
|
365
|
-
args = arguments
|
|
365
|
+
args = [targetOrDesc, key, descriptor]
|
|
366
366
|
if (key === undefined) {
|
|
367
367
|
if (typeof desc === "undefined") {
|
|
368
|
+
const newDescriptor = targetOrDesc as NewDescriptor
|
|
368
369
|
isLegacy = false
|
|
369
|
-
prop =
|
|
370
|
+
prop = newDescriptor.key
|
|
370
371
|
desc = Object.assign(
|
|
371
372
|
{},
|
|
372
|
-
|
|
373
|
+
newDescriptor.descriptor
|
|
373
374
|
/* istanbul ignore next */ || targetOrDesc
|
|
374
375
|
)
|
|
375
376
|
}
|
|
@@ -411,11 +412,14 @@ export function LazyGetter(
|
|
|
411
412
|
"Unable to restore descriptor. Did you remember to apply your decorator to a method?"
|
|
412
413
|
)
|
|
413
414
|
}
|
|
415
|
+
if (!args) {
|
|
416
|
+
throw new Error("Unable to restore descriptor before applying the decorator.")
|
|
417
|
+
}
|
|
414
418
|
// Restore descriptor to its original state
|
|
415
419
|
Object.defineProperty(on, prop, desc)
|
|
416
|
-
|
|
417
|
-
const ret:
|
|
418
|
-
Object.defineProperty(on, prop,
|
|
420
|
+
const ret = decorator.apply(null, args)
|
|
421
|
+
const restoredDescriptor = isLegacy ? ret : "descriptor" in ret && ret.descriptor ? ret.descriptor : ret
|
|
422
|
+
Object.defineProperty(on, prop, restoredDescriptor)
|
|
419
423
|
}
|
|
420
424
|
|
|
421
425
|
return decorator
|
package/tsconfig.json
CHANGED