effect-app 3.15.1 → 4.0.0-beta.0

package/dist/Pure.d.ts

@@ -1,5 +1,5 @@
-import { Chunk, Effect, Either } from "effect";
-import * as Context from "./Context.js";
+import { Chunk, Effect, Result } from "effect";
+import * as ServiceMap from "./ServiceMap.js";
 declare const S1: unique symbol;
 declare const S2: unique symbol;
 declare const W: unique symbol;
@@ -35,8 +35,19 @@ export declare function GMUA_<W, S, S2, GR, GE, GA, MR, ME, MA, UR, UE, UA>(get:
 export declare function GMUA<W, S, S2, GA, MR, ME, MA>(modify: (i: GA) => Pure<W, S, S2, MR, ME, readonly [GA, MA]>): <GR, GE, UR, UE, UA>(get: Pure<W, S, S2, GR, GE, GA>, update: (i: GA) => Pure<W, S, S2, UR, UE, UA>) => Pure<W, S, S2, MR | GR | UR, ME | GE | UE, MA>;
 export declare function GMU_<W, S, S2, GR, GE, GA, MR, ME, UR, UE, UA>(get: Pure<W, S, S2, GR, GE, GA>, modify: (i: GA) => Pure<W, S, S2, MR, ME, GA>, update: (i: GA) => Pure<W, S, S2, UR, UE, UA>): Pure<W, S, S2, GR | MR | UR, GE | ME | UE, UA>;
 export declare function GMU<W, S, S2, GA, MR, ME>(modify: (i: GA) => Pure<W, S, S2, MR, ME, GA>): <GR, GE, UR, UE, UA>(get: Pure<W, S, S2, GR, GE, GA>, update: (i: GA) => Pure<W, S, S2, UR, UE, UA>) => Pure<W, S, S2, MR | GR | UR, ME | GE | UE, UA>;
+export declare const ServiceTag: unique symbol;
+export type ServiceTag = typeof ServiceTag;
+export declare abstract class PhantomTypeParameter<Identifier extends keyof any, InstantiatedType> {
+    protected abstract readonly [ServiceTag]: {
+        readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType;
+    };
+}
+export type ServiceShape<T extends ServiceMap.ServiceClass.Shape<any, any>> = Omit<T, keyof ServiceMap.ServiceClass.Shape<any, any>>;
+export declare abstract class ServiceTagged<ServiceKey> extends PhantomTypeParameter<string, ServiceKey> {
+}
+export declare function makeService<T extends ServiceTagged<any>>(_: Omit<T, ServiceTag>): T;
 export declare const PureEnvEnv: unique symbol;
-export interface PureEnvEnv<W, S, S2> extends Context.ServiceTagged<typeof PureEnvEnv> {
+export interface PureEnvEnv<W, S, S2> extends ServiceTagged<typeof PureEnvEnv> {
     env: PureEnv<W, S, S2>;
 }
 export declare function get<S>(): Pure<never, S, S, never, never, S>;
@@ -44,10 +55,10 @@ export declare function set<S>(s: S): Pure<never, S, S, never, never, void>;
 export type PureLogT<W> = Pure<W, unknown, never, never, never, void>;
 export declare function log<W>(w: W): PureLogT<W>;
 export declare function logMany<W>(w: Iterable<W>): PureLogT<W>;
-export declare function runAll<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Either.Either<readonly [S3, A], E>], never, Exclude<R, {
+export declare function runAll<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Result.Result<readonly [S3, A], E>], never, Exclude<R, {
     env: PureEnv<W3, S1, S3>;
 }>>;
-export declare function runResult<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Effect.Effect<S3, E, never>], never, Exclude<R, {
+export declare function runResult<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Result.Result<S3, E>], never, Exclude<R, {
     env: PureEnv<W3, S1, S3>;
 }>>;
 export declare function runTerm<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [S3, W3[], A], E, Exclude<R, {
@@ -56,7 +67,7 @@ export declare function runTerm<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect
 export declare function runTermDiscard<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [S3, W3[]], E, Exclude<R, {
     env: PureEnv<W3, S1, S3>;
 }>>;
-export declare function runA<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Effect.Effect<A, E, never>], never, Exclude<R, {
+export declare function runA<R, E, A, W3, S1, S3, S4 extends S1>(self: Effect.Effect<A, E, FixEnv<R, W3, S1, S3>>, s: S4): Effect.Effect<readonly [Chunk.Chunk<W3>, Result.Result<A, E>], never, Exclude<R, {
     env: PureEnv<W3, S1, S3>;
 }>>;
 export declare function modify<S2, A, S3>(mod: (s: S2) => readonly [S3, A]): Effect.Effect<A, never, {

package/dist/Pure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pure.d.ts","sourceRoot":"","sources":["../src/Pure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Pure.d.ts","sourceRoot":"","sources":["../src/Pure.ts"],"names":[],"mappings":"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"}

package/dist/Pure.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Chunk, Effect, Either, Layer } from "effect";
-import * as Context from "./Context.js";
+import { Chunk, Effect, Layer, Result } from "effect";
 import { tuple } from "./Function.js";
+import * as ServiceMap from "./ServiceMap.js";
 const S1 = Symbol();
 const S2 = Symbol();
 const W = Symbol();
@@ -37,52 +37,70 @@ export function GMU_(get, modify, update) {
 export function GMU(modify) {
     return (get, update) => GMU_(get, modify, update);
 }
-const tagg = Context.GenericTag("PureEnv");
+const tagg = ServiceMap.Service("PureEnv");
 function castTag() {
     return tagg;
 }
+export const ServiceTag = Symbol();
+export class PhantomTypeParameter {
+}
+export class ServiceTagged extends PhantomTypeParameter {
+}
+export function makeService(_) {
+    return _;
+}
 export const PureEnvEnv = Symbol();
 export function get() {
-    return Effect.map(castTag(), (_) => _.env.state);
+    return castTag().use((_) => _.env.state);
 }
 export function set(s) {
-    return Effect.map(castTag(), (_) => _.env.state = s);
+    return castTag().use((_) => {
+        _.env.state = s;
+    });
 }
 export function log(w) {
-    return Effect.map(castTag(), (_) => _.env.log = Chunk.append(_.env.log, w));
+    return castTag().use((_) => {
+        _.env.log = Chunk.append(_.env.log, w);
+    });
 }
 export function logMany(w) {
-    return Effect.map(castTag(), (_) => _.env.log = Chunk.appendAll(_.env.log, Chunk.fromIterable(w)));
+    return castTag().use((_) => {
+        _.env.log = Chunk.appendAll(_.env.log, Chunk.fromIterable(w));
+    });
 }
 export function runAll(self, s) {
     const a = Effect
         .flatMap(self, (x) => castTag()
-        .pipe(Effect.flatMap(({ env: _ }) => Effect.sync(() => ({ log: _.log, state: _.state })) //            Ref.get(_.log).flatMap(log => Ref.get(_.state).map(state => ({ log, state })))
-    ), Effect.map(({ log, state }) => tuple(log, Either.right(tuple(state, x))))))
-        .pipe(Effect.catchAll((err) => Effect.map(tagg, (env) => tuple(env.env.log, Either.left(err)))));
+        .use(({ env: _ }) => Effect.sync(() => ({ log: _.log, state: _.state })))
+        .pipe(Effect.flatMap((_) => Effect.succeed(_)), Effect.map(({ log, state }) => tuple(log, Result.succeed(tuple(state, x))))))
+        .pipe(Effect.catch((err) => tagg.use((env) => tuple(env.env.log, Result.fail(err)))));
     return Effect.provide(a, Layer.succeed(tagg, { env: makePureEnv(s) }));
 }
 export function runResult(self, s) {
-    return Effect.map(runAll(self, s), ([log, r]) => tuple(log, Effect.map(r, ([s]) => s)));
+    return Effect.map(runAll(self, s), ([log, r]) => tuple(log, Result.map(r, ([s]) => s)));
 }
 export function runTerm(self, s) {
-    return Effect.flatMap(runAll(self, s), ([evts, r]) => Effect.map(r, ([s3, a]) => tuple(s3, Chunk.toArray(evts), a)));
+    return Effect.flatMap(runAll(self, s), ([evts, r]) => Effect.map(Effect.fromResult(r), ([s3, a]) => tuple(s3, Chunk.toArray(evts), a)));
 }
 export function runTermDiscard(self, s) {
     return Effect.map(runTerm(self, s), ([s3, w3]) => tuple(s3, w3));
 }
 export function runA(self, s) {
-    return Effect.map(runAll(self, s), ([log, r]) => tuple(log, Effect.map(r, ([, a]) => a)));
+    return Effect.map(runAll(self, s), ([log, r]) => tuple(log, Result.map(r, ([, a]) => a)));
 }
 export function modify(mod) {
-    return Effect.map(castTag(), (_) => Effect.map(Effect.sync(() => mod(_.env.state)), ([s, a]) => {
+    return castTag().use((_) => {
+        const [s, a] = mod(_.env.state);
         _.env.state = s;
         return a;
-    }));
+    });
 }
 export function modifyM(mod) {
     // return serviceWithEffect(_ => Ref.modifyM_(_.state, mod))
-    return Effect.flatMap(castTag(), (_) => Effect.map(mod(_.env.state), ([s, a]) => Effect.map(Effect.sync(() => _.env.state = s), () => a)));
+    return Effect.flatMap(castTag().use((_) => _), (_) => Effect.map(mod(_.env.state), ([s, a]) => {
+        _.env.state = s;
+        return a;
+    }));
 }
 export function updateWith(upd) {
     return modify((_) => {
@@ -266,4 +284,4 @@ export function updateWithEffect(upd) {
 //   abc,
 //   { a: 1 }
 // )
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Pure.js","sourceRoot":"","sources":["../src/Pure.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Pure.js","sourceRoot":"","sources":["../src/Pure.ts"],"names":[],"mappings":"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"}

package/dist/Schema/Class.d.ts

@@ -1,12 +1,9 @@
-import type { Schema, Struct } from "effect/Schema";
+import type { Struct } from "effect/Schema";
 import * as S from "effect/Schema";
-import type { Simplify } from "effect/Types";
-type ClassAnnotations<Self, A> = S.Annotations.Schema<Self> | readonly [
-    S.Annotations.Schema<Self> | undefined,
-    (S.Annotations.Schema<Self> | undefined)?,
-    S.Annotations.Schema<A>?
-];
-export interface EnhancedClass<Self, Fields extends Struct.Fields, I, R, C, Inherited, Proto> extends S.Class<Self, Fields, I, R, C, Inherited, Proto>, /* Reason for enhancement */ PropsExtensions<Fields> {
+type ClassAnnotations<Self> = S.Annotations.Declaration<Self, readonly [any]>;
+export interface EnhancedClass<Self, SchemaS extends S.Top & {
+    readonly fields: Struct.Fields;
+}, Inherited> extends S.Class<Self, SchemaS, Inherited>, /* Reason for enhancement */ PropsExtensions<SchemaS["fields"]> {
 }
 type MissingSelfGeneric<Usage extends string, Params extends string = ""> = `Missing \`Self\` generic - use \`class Self extends ${Usage}<Self>()(${Params}{ ... })\``;
 export interface PropsExtensions<Fields> {
@@ -18,17 +15,17 @@ type HasFields<Fields extends Struct.Fields> = {
 } | {
     readonly from: HasFields<Fields>;
 };
-export declare const Class: <Self = never>(identifier: string) => <Fields extends S.Struct.Fields>(fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self, Struct.Type<Fields>>) => [Self] extends [never] ? MissingSelfGeneric<"Class"> : EnhancedClass<Self, Fields, Simplify<Struct.Encoded<Fields>>, Struct.Context<Fields>, Simplify<S.Struct.Constructor<Fields>>, {}, {}>;
-export declare const TaggedClass: <Self = never>(identifier?: string) => <Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self, Struct.Type<Fields>>) => [Self] extends [never] ? MissingSelfGeneric<"Class"> : EnhancedClass<Self, {
+export declare const Class: <Self = never>(identifier: string) => <Fields extends S.Struct.Fields>(fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self>) => [Self] extends [never] ? MissingSelfGeneric<"Class"> : EnhancedClass<Self, S.Struct<Fields>, {}>;
+export declare const TaggedClass: <Self = never>(identifier?: string) => <Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self>) => [Self] extends [never] ? MissingSelfGeneric<"Class"> : EnhancedClass<Self, S.Struct<{
     readonly _tag: S.tag<Tag>;
-} & Fields, Simplify<{
-    readonly _tag: Tag;
-} & Struct.Encoded<Fields>>, Schema.Context<Fields[keyof Fields]>, Simplify<S.Struct.Constructor<Fields>>, {}, {}>;
-export declare const ExtendedClass: <Self, SelfFrom>(identifier: string) => <Fields extends S.Struct.Fields>(fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self, Struct.Type<Fields>>) => EnhancedClass<Self, Fields, SelfFrom, Schema.Context<Fields[keyof Fields]>, Simplify<S.Struct.Constructor<Fields>>, {}, {}>;
-export interface EnhancedTaggedClass<Self, Tag extends string, Fields extends Struct.Fields, SelfFrom> extends EnhancedClass<Self, Fields, SelfFrom, Struct.Context<Fields>, Struct.Constructor<Omit<Fields, "_tag">>, {}, {}> {
+} & Fields>, {}>;
+export declare const ExtendedClass: <Self, _SelfFrom>(identifier: string) => <Fields extends S.Struct.Fields>(fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self>) => EnhancedClass<Self, S.Struct<Fields>, {}>;
+export interface EnhancedTaggedClass<Self, Tag extends string, Fields extends Struct.Fields, SelfFrom> extends EnhancedClass<Self, S.Struct<Fields> & {
+    readonly Encoded: SelfFrom;
+}, {}> {
     readonly _tag: Tag;
 }
-export declare const ExtendedTaggedClass: <Self, SelfFrom>(identifier?: string) => <Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self, Struct.Type<Fields>>) => EnhancedTaggedClass<Self, Tag, {
+export declare const ExtendedTaggedClass: <Self, SelfFrom>(identifier?: string) => <Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fieldsOr: Fields | HasFields<Fields>, annotations?: ClassAnnotations<Self>) => EnhancedTaggedClass<Self, Tag, {
     readonly _tag: S.tag<Tag>;
 } & Fields, SelfFrom>;
 export {};

package/dist/Schema/Class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../src/Schema/Class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Class.d.ts","sourceRoot":"","sources":["../../src/Schema/Class.ts"],"names":[],"mappings":"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"}

package/dist/Schema/Class.js

@@ -1,28 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { pipe, Struct as Struct2 } from "effect";
 import * as S from "effect/Schema";
-// const isPropertySignature = (u: unknown): u is PropertySignature.All =>
-//   Predicate.hasProperty(u, PropertySignatureTypeId)
-// const isField = (u: unknown) => S.isSchema(u) || S.isPropertySignature(u)
-// const isFields = <Fields extends Struct.Fields>(fields: object): fields is Fields =>
-//   ownKeys(fields).every((key) => isField((fields as any)[key]))
-// const getFields = <Fields extends Struct.Fields>(hasFields: HasFields<Fields>): Fields =>
-//   "fields" in hasFields ? hasFields.fields : getFields(hasFields.from)
-// const getSchemaFromFieldsOr = <Fields extends Struct.Fields>(fieldsOr: Fields | HasFields<Fields>): Schema.Any =>
-//   isFields(fieldsOr) ? Struct(fieldsOr) : S.isSchema(fieldsOr) ? fieldsOr : Struct(getFields(fieldsOr))
-// const getFieldsFromFieldsOr = <Fields extends Struct.Fields>(fieldsOr: Fields | HasFields<Fields>): Fields =>
-//   isFields(fieldsOr) ? fieldsOr : getFields(fieldsOr)
-// export function include<Fields extends S.Struct.Fields>(fields: Fields | HasFields<Fields>) {
-//   return <NewProps extends S.Struct.Fields>(
-//     fnc: (fields: Fields) => NewProps
-//   ) => include_(fields, fnc)
-// }
-// export function include_<
-//   Fields extends S.Struct.Fields,
-//   NewProps extends S.Struct.Fields
-// >(fields: Fields | HasFields<Fields>, fnc: (fields: Fields) => NewProps) {
-//   return fnc("fields" in fields ? fields.fields : fields)
-// }
 export const Class = (identifier) => (fields, annotations) => {
     const cls = S.Class;
     return class extends cls(identifier)(fields, annotations) {
@@ -30,8 +8,8 @@ export const Class = (identifier) => (fields, annotations) => {
             super(a, b);
         }
         // static readonly include = include(fields)
-        static pick = (...selection) => pipe(this["fields"], Struct2.pick(...selection));
-        static omit = (...selection) => pipe(this["fields"], Struct2.omit(...selection));
+        static pick = (...selection) => pipe(this["fields"], Struct2.pick(selection));
+        static omit = (...selection) => pipe(this["fields"], Struct2.omit(selection));
     };
 };
 export const TaggedClass = (identifier) => (tag, fields, annotations) => {
@@ -41,10 +19,10 @@ export const TaggedClass = (identifier) => (tag, fields, annotations) => {
             super(a, b);
         }
         // static readonly include = include(fields)
-        static pick = (...selection) => pipe(this["fields"], Struct2.pick(...selection));
-        static omit = (...selection) => pipe(this["fields"], Struct2.omit(...selection));
+        static pick = (...selection) => pipe(this["fields"], Struct2.pick(selection));
+        static omit = (...selection) => pipe(this["fields"], Struct2.omit(selection));
     };
 };
 export const ExtendedClass = Class;
 export const ExtendedTaggedClass = TaggedClass;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL0NsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sSUFBSSxPQUFPLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFFaEQsT0FBTyxLQUFLLENBQUMsTUFBTSxlQUFlLENBQUE7QUFtQ2xDLDBFQUEwRTtBQUMxRSxzREFBc0Q7QUFFdEQsNEVBQTRFO0FBRTVFLHVGQUF1RjtBQUN2RixrRUFBa0U7QUFFbEUsNEZBQTRGO0FBQzVGLHlFQUF5RTtBQUV6RSxvSEFBb0g7QUFDcEgsMEdBQTBHO0FBRTFHLGdIQUFnSDtBQUNoSCx3REFBd0Q7QUFFeEQsZ0dBQWdHO0FBQ2hHLCtDQUErQztBQUMvQyx3Q0FBd0M7QUFDeEMsK0JBQStCO0FBQy9CLElBQUk7QUFFSiw0QkFBNEI7QUFDNUIsb0NBQW9DO0FBQ3BDLHFDQUFxQztBQUNyQyw2RUFBNkU7QUFDN0UsNERBQTREO0FBQzVELElBQUk7QUFFSixNQUFNLENBQUMsTUFBTSxLQUFLLEdBWVosQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxFQUFFO0lBQzFDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxLQUFZLENBQUE7SUFDMUIsT0FBTyxLQUFNLFNBQVEsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUM7UUFDdkQsWUFBWSxDQUFNLEVBQUUsQ0FBQyxHQUFHLElBQUk7WUFDMUIsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNiLENBQUM7UUFDRCw0Q0FBNEM7UUFDNUMsTUFBTSxDQUFVLElBQUksR0FBRyxDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUNoRyxNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsR0FBRyxTQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFBO0tBQzFGLENBQUE7QUFDVixDQUFDLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBYWxCLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEVBQUU7SUFDL0MsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUFDLFdBQWtCLENBQUE7SUFDaEMsT0FBTyxLQUFNLFNBQVEsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsV0FBVyxDQUFDO1FBQzVELFlBQVksQ0FBTSxFQUFFLENBQUMsR0FBRyxJQUFJO1lBQzFCLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDYixDQUFDO1FBQ0QsNENBQTRDO1FBQzVDLE1BQU0sQ0FBVSxJQUFJLEdBQUcsQ0FBQyxHQUFHLFNBQWdCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDaEcsTUFBTSxDQUFVLElBQUksR0FBRyxDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQTtLQUMxRixDQUFBO0FBQ1YsQ0FBQyxDQUFBO0FBRUgsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQVd0QixLQUFZLENBQUE7QUFpQmhCLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQVc1QixXQUFrQixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL0NsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sSUFBSSxPQUFPLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFFaEQsT0FBTyxLQUFLLENBQUMsTUFBTSxlQUFlLENBQUE7QUF5QmxDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FRWixDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsV0FBVyxFQUFFLEVBQUU7SUFDMUMsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUFDLEtBQVksQ0FBQTtJQUMxQixPQUFPLEtBQU0sU0FBUSxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQztRQUN2RCxZQUFZLENBQU0sRUFBRSxDQUFDLEdBQUcsSUFBSTtZQUMxQixLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ2IsQ0FBQztRQUNELDRDQUE0QztRQUM1QyxNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsR0FBRyxTQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUM3RixNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsR0FBRyxTQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtLQUN2RixDQUFBO0FBQ1YsQ0FBQyxDQUFBO0FBRUgsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQVNsQixDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxFQUFFO0lBQy9DLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxXQUFrQixDQUFBO0lBQ2hDLE9BQU8sS0FBTSxTQUFRLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBQztRQUM1RCxZQUFZLENBQU0sRUFBRSxDQUFDLEdBQUcsSUFBSTtZQUMxQixLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ2IsQ0FBQztRQUNELDRDQUE0QztRQUM1QyxNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsR0FBRyxTQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUM3RixNQUFNLENBQVUsSUFBSSxHQUFHLENBQUMsR0FBRyxTQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtLQUN2RixDQUFBO0FBQ1YsQ0FBQyxDQUFBO0FBRUgsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQU90QixLQUFZLENBQUE7QUFhaEIsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBVzVCLFdBQWtCLENBQUEifQ==

package/dist/Schema/brand.d.ts

@@ -1,10 +1,9 @@
 import type { Option } from "effect";
 import * as B from "effect/Brand";
 import type * as Brand from "effect/Brand";
-import type * as Either from "effect/Either";
+import type * as Result from "effect/Result";
 import * as S from "effect/Schema";
 export interface Constructor<in out A extends B.Brand<any>> {
-    readonly [B.RefinedConstructorsTypeId]: B.RefinedConstructorsTypeId;
     /**
      * Constructs a branded type from a value of type `A`, throwing an error if
      * the provided `A` is not valid.
@@ -16,20 +15,18 @@ export interface Constructor<in out A extends B.Brand<any>> {
      */
     option(args: Unbranded<A>): Option.Option<A>;
     /**
-     * Constructs a branded type from a value of type `A`, returning `Right<A>`
-     * if the provided `A` is valid, `Left<BrandError>` otherwise.
+     * Constructs a branded type from a value of type `A`, returning `Result.succeed`
+     * if the provided `A` is valid, `Result.fail` otherwise.
      */
-    either(args: Unbranded<A>): Either.Either<A, Brand.Brand.BrandErrors>;
+    result(args: Unbranded<A>): Result.Result<A, Brand.BrandError>;
     /**
      * Attempts to refine the provided value of type `A`, returning `true` if
      * the provided `A` is valid, `false` otherwise.
      */
     is(a: Unbranded<A>): a is Unbranded<A> & A;
 }
-export declare const fromBrand: <C extends Brand.Brand<string | symbol>>(constructor: Constructor<C>, options?: S.Annotations.Filter<Unbranded<C>>) => <R, I, A extends Unbranded<C>>(self: S.Schema<A, I, R>) => S.Schema<A & C, I, R>;
-export type Brands<P> = P extends B.Brand<any> ? {
-    readonly [B.BrandTypeId]: P[B.BrandTypeId];
-} : never;
-export type Unbranded<P> = P extends infer Q & Brands<P> ? Q : P;
+export declare const fromBrand: <C extends Brand.Brand<string>>(constructor: Constructor<C>, options?: S.Annotations.Filter) => <Self extends S.Top>(self: Self) => S.brand<Self["~rebuild.out"], Brand.Brand.Keys<C>>;
+export type Brands<P> = P extends B.Brand<any> ? Brand.Brand.Brands<P> : never;
+export type Unbranded<P> = P extends B.Brand<any> ? Brand.Brand.Unbranded<P> : P;
 export declare const nominal: <A extends B.Brand<any>>() => Constructor<A>;
 //# sourceMappingURL=brand.d.ts.map

package/dist/Schema/brand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brand.d.ts","sourceRoot":"","sources":["../../src/Schema/brand.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAElC,MAAM,WAAW,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IACxD,QAAQ,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,yBAAyB,CAAA;IACnE;;;OAGG;IACH,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACvB;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5C;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACrE;;;OAGG;IACH,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;CAC3C;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAC9D,aAAa,WAAW,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAE7C,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAE5E,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG;IAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;CAAE,GAC3F,KAAK,CAAA;AAET,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAEhE,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,CAIvC,CAAA"}
+{"version":3,"file":"brand.d.ts","sourceRoot":"","sources":["../../src/Schema/brand.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAElC,MAAM,WAAW,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IACxD;;;OAGG;IACH,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACvB;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5C;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC9D;;;OAGG;IACH,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;CAC3C;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EACrD,aAAa,WAAW,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,CAAC,WAAW,CAAC,MAAM,MAE/B,IAAI,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,KAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAGlF,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAClE,KAAK,CAAA;AAET,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAEhF,eAAO,MAAM,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,CAIvC,CAAA"}

package/dist/Schema/brand.js

@@ -1,7 +1,8 @@
 import * as B from "effect/Brand";
 import * as S from "effect/Schema";
 export const fromBrand = (constructor, options) => (self) => {
-    return S.fromBrand(constructor, options)(self);
+    const branded = S.fromBrand(options?.identifier ?? "Brand", constructor)(self);
+    return options ? branded.pipe(S.annotate(options)) : branded;
 };
 export const nominal = () => B.nominal();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJhbmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL2JyYW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sS0FBSyxDQUFDLE1BQU0sY0FBYyxDQUFBO0FBR2pDLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBMEJsQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsQ0FDdkIsV0FBMkIsRUFDM0IsT0FBNEMsRUFDNUMsRUFBRSxDQUNKLENBQStCLElBQXVCLEVBQXlCLEVBQUU7SUFDL0UsT0FBTyxDQUFDLENBQUMsU0FBUyxDQUFDLFdBQWtCLEVBQUUsT0FBYyxDQUFDLENBQUMsSUFBVyxDQUFRLENBQUE7QUFDNUUsQ0FBQyxDQUFBO0FBT0QsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFpRCxHQUluRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBWSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJhbmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL2JyYW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxDQUFDLE1BQU0sY0FBYyxDQUFBO0FBR2pDLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBeUJsQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsQ0FDdkIsV0FBMkIsRUFDM0IsT0FBOEIsRUFDOUIsRUFBRSxDQUNKLENBQXFCLElBQVUsRUFBc0QsRUFBRTtJQUNyRixNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxVQUFVLElBQUksT0FBTyxFQUFFLFdBQWtCLENBQUMsQ0FBQyxJQUFXLENBQUMsQ0FBQTtJQUM1RixPQUFPLE9BQU8sQ0FBQyxDQUFDLENBQUUsT0FBZSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQWMsQ0FBQTtBQUM5RSxDQUFDLENBQUE7QUFPRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQWlELEdBSW5FLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFZLENBQUEifQ==

package/dist/Schema/email.d.ts

@@ -5,5 +5,5 @@ import type { NonEmptyStringBrand } from "./strings.js";
 export interface EmailBrand extends Simplify<NonEmptyStringBrand & B.Brand<"Email">> {
 }
 export type Email = string & EmailBrand;
-export declare const Email: S.refine<string & EmailBrand, S.Schema<string, string, never>>;
+export declare const Email: S.refine<Email, S.String>;
 //# sourceMappingURL=email.d.ts.map

package/dist/Schema/email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../src/Schema/email.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAClC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,MAAM,WAAW,UAAW,SAAQ,QAAQ,CAAC,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;CAAG;AAEvF,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,UAAU,CAAA;AAEvC,eAAO,MAAM,KAAK,gEAUf,CAAA"}
+{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../src/Schema/email.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAA;AAClC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,MAAM,WAAW,UAAW,SAAQ,QAAQ,CAAC,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;CAAG;AAEvF,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,UAAU,CAAA;AAEvC,eAAO,MAAM,KAAK,2BAUf,CAAA"}

package/dist/Schema/email.js

@@ -2,11 +2,11 @@ import { isValidEmail } from "effect-app/validation";
 import * as S from "effect/Schema";
 export const Email = S
     .String
-    .pipe(S.filter(isValidEmail, {
+    .pipe(S.refine(isValidEmail, {
     identifier: "Email",
     title: "Email",
     description: "an email according to RFC 5322",
     jsonSchema: { format: "email", minLength: 3, /* a@b */ maxLength: 998 },
     arbitrary: () => (fc) => fc.emailAddress().map((_) => _)
 }));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1haWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL2VtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNwRCxPQUFPLEtBQUssQ0FBQyxNQUFNLGVBQWUsQ0FBQTtBQVNsQyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQztLQUNuQixNQUFNO0tBQ04sSUFBSSxDQUNILENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBeUMsRUFBRTtJQUNsRCxVQUFVLEVBQUUsT0FBTztJQUNuQixLQUFLLEVBQUUsT0FBTztJQUNkLFdBQVcsRUFBRSxnQ0FBZ0M7SUFDN0MsVUFBVSxFQUFFLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFO0lBQ3ZFLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBVSxDQUFDO0NBQ2xFLENBQUMsQ0FDSCxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1haWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL2VtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNwRCxPQUFPLEtBQUssQ0FBQyxNQUFNLGVBQWUsQ0FBQTtBQVNsQyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQztLQUNuQixNQUFNO0tBQ04sSUFBSSxDQUNILENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBeUMsRUFBRTtJQUNsRCxVQUFVLEVBQUUsT0FBTztJQUNuQixLQUFLLEVBQUUsT0FBTztJQUNkLFdBQVcsRUFBRSxnQ0FBZ0M7SUFDN0MsVUFBVSxFQUFFLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFO0lBQ3ZFLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQU0sRUFBRSxFQUFFLENBQUMsQ0FBVSxDQUFDO0NBQzVFLENBQUMsQ0FDSCxDQUFBIn0=