@typed/fx 1.18.4 → 1.20.0

package/dist/esm/Form.js

@@ -2,19 +2,21 @@
  * @since 1.18.0
  */
 import { AST } from "@effect/schema";
-import { from } from "@effect/schema/Equivalence";
+import { make } from "@effect/schema/Equivalence";
 import * as S from "@effect/schema/Schema";
-import { Effect } from "effect";
-import { Computed } from "./Computed.js";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import { hasProperty } from "effect/Predicate";
 import * as FormEntry from "./FormEntry.js";
 import * as core from "./internal/core.js";
 import { FxEffectBase } from "./internal/protos.js";
 import { hold } from "./internal/share.js";
+import * as RefSubject from "./RefSubject.js";
 import { ComputedTypeId, FilteredTypeId, RefSubjectTypeId, TypeId } from "./TypeId.js";
 /**
  * @since 1.18.0
  */
-export const FormTypeId = Symbol.for("./Form.js");
+export const FormTypeId = Symbol.for("@typed/fx/Form");
 /**
  * @since 1.18.0
  */
@@ -22,24 +24,48 @@ export function Form(entries) {
     return new FormImpl(entries);
 }
 /**
- * @since 1.18.0
+ * @since 1.20.0
  */
-export function make(schema) {
+export function derive(schema) {
     return (input) => Effect.map(deriveMakeEntries(input, schema.ast), (entries) => {
         const form = Form(entries);
         if (RefSubjectTypeId in input) {
             return Object.assign(form, {
-                persist: Effect.matchCauseEffect(form.decoded, input)
+                persist: Effect.matchEffect(form.decoded, {
+                    onFailure: (error) => isParseError(error) ? Effect.unit : input.onFailure(Cause.fail(error)),
+                    onSuccess: (a) => input.onSuccess(a)
+                })
+            });
+        }
+        return form;
+    });
+}
+/**
+ * @since 1.18.0
+ */
+export function deriveInput(schema) {
+    return (input) => Effect.map(deriveMakeInputEntries(input, schema.ast), (entries) => {
+        const form = Form(entries);
+        if (RefSubjectTypeId in input) {
+            return Object.assign(form, {
+                persist: Effect.matchEffect(form, {
+                    onFailure: (error) => isParseError(error) ? Effect.unit : input.onFailure(Cause.fail(error)),
+                    onSuccess: (a) => input.onSuccess(a)
+                })
             });
         }
         return form;
     });
 }
+function isParseError(u) {
+    return hasProperty(u, "_tag") && u["_tag"] === "ParseError";
+}
 const parseOptions = { errors: "all", onExcessProperty: "ignore" };
-// @ts-expect-error
 class FormImpl extends FxEffectBase {
     entries;
     [FormTypeId] = FormTypeId;
+    _fx;
+    version;
     constructor(entries) {
         super();
         this.entries = entries;
@@ -47,17 +73,17 @@ class FormImpl extends FxEffectBase {
         this.version = Effect.map(
         // @ts-ignore Infinite type instantiation
         Effect.all(Object.values(entries).map((e) => e.version)), (versions) => versions.reduce((a, b) => a + b, 0));
+        this._fx = hold(core.skipRepeatsWith(core.struct(this.entries), make(S.from(this.schema))));
     }
     get = (k) => this.entries[k];
     schema;
-    version;
-    toFx() {
-        return hold(core.skipRepeatsWith(core.struct(this.entries), from(this.schema)));
+    run(sink) {
+        return this._fx.run(sink);
     }
     toEffect() {
         return Effect.all(this.entries, { concurrency: "unbounded" });
     }
-    decoded = Computed(this, (i) => S.decode(this.schema)(i, parseOptions));
+    decoded = RefSubject.mapEffect(this, (i) => S.decode(this.schema)(i, parseOptions));
 }
 function buildSchema(entries) {
     const schemas = {};
@@ -85,7 +111,35 @@ const deriveMakeEntries = (input, ast) => Effect.suspend(() => {
                         entries[prop.name] = Form((yield* _(deriveMakeEntries(nested, ast))));
                     }
                     else {
-                        entries[prop.name] = yield* _(FormEntry.make({
+                        entries[prop.name] = yield* _(FormEntry.derive({
+                            name: prop.name,
+                            schema: S.make(ast)
+                        })(nested));
+                    }
+                }
+                return entries;
+            });
+        }
+        default: {
+            // TODO: Wrap in an error
+            return Effect.die(new TypeError("Form.deriveMakeEntries only supports TypeLiteral schemas."));
+        }
+    }
+});
+const deriveMakeInputEntries = (input, ast) => Effect.suspend(() => {
+    switch (ast._tag) {
+        case "TypeLiteral": {
+            const propertySignatures = ast.propertySignatures;
+            return Effect.gen(function* (_) {
+                const entries = {};
+                for (const prop of propertySignatures) {
+                    const nested = propOf(input, prop.name);
+                    const ast = prop.isOptional ? AST.createUnion([prop.type, AST.undefinedKeyword]) : prop.type;
+                    if (prop.type._tag === "TypeLiteral") {
+                        entries[prop.name] = Form((yield* _(deriveMakeInputEntries(nested, ast))));
+                    }
+                    else {
+                        entries[prop.name] = yield* _(FormEntry.deriveInput({
                             name: prop.name,
                             schema: S.make(ast)
                         })(nested));
@@ -95,13 +149,14 @@ const deriveMakeEntries = (input, ast) => Effect.suspend(() => {
             });
         }
         default: {
+            // TODO: Wrap in an error
             return Effect.die(new TypeError("Form.deriveMakeEntries only supports TypeLiteral schemas."));
         }
     }
 });
 const propOf = (input, key) => {
     if (RefSubjectTypeId in input || ComputedTypeId in input || FilteredTypeId in input) {
-        return input.map((o) => o[key]);
+        return RefSubject.map(input, (o) => o[key]);
     }
     else if (TypeId in input)
         return core.map(input, (o) => o[key]);

package/dist/esm/Form.js.map

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

package/dist/esm/FormEntry.js

@@ -2,71 +2,96 @@
  * @since 1.18.0
  */
 import { Schema } from "@effect/schema";
-import * as schemaEquivalence from "@effect/schema/Equivalence";
-import { Deferred, Effect, Exit, Ref } from "effect";
-import * as Option from "effect/Option";
-import { run } from "./Fx.js";
-import { RefSubjectImpl } from "./internal/core-ref-subject.js";
-import { makeHoldSubject } from "./internal/core-subject.js";
-import { DeferredRef } from "./internal/deferred-ref.js";
-import { Sink } from "./Sink.js";
-import { RefSubjectTypeId, TypeId } from "./TypeId.js";
+import * as Effect from "effect/Effect";
+import * as Fx from "./Fx.js";
+import { FxEffectBase } from "./internal/protos.js";
+import * as RefSubject from "./RefSubject.js";
+import { ComputedTypeId, RefSubjectTypeId } from "./TypeId.js";
 /**
  * @since 1.18.0
  */
-export function make(options) {
-    return ((input) => {
-        if (RefSubjectTypeId in input) {
-            return makeDerivedFormEntry(input, options);
-        }
-        else if (TypeId in input) {
-            return makeFxFormEntry(input, options);
-        }
-        else {
-            return makeEffectFormEntry(input, options);
-        }
-    });
+export function derive(options) {
+    const encode = Schema.encode(options.schema);
+    const decode = Schema.decode(options.schema);
+    const makeFormEntry = (input) => {
+        const initial = Fx.mapEffect(Effect.isEffect(input) ? Fx.fromEffect(input) : input, (o) => encode(o, parseOptions));
+        return Effect.map(RefSubject.make(initial), (inputRef) => {
+            if (RefSubject.isRefSubject(input)) {
+                const persist = Effect.flatMap(Effect.flatMap(inputRef, (i) => decode(i, parseOptions)), (o) => RefSubject.set(input, o));
+                return new DerivedFormEntryImpl(inputRef, options.name, options.schema, RefSubject.isDerived(input) ? Effect.tap(persist, () => input.persist) : persist);
+            }
+            else {
+                return new FromEntryImpl(inputRef, options.name, options.schema);
+            }
+        });
+    };
+    return makeFormEntry;
+}
+/**
+ * @since 1.18.0
+ */
+export function deriveInput(options) {
+    const decode = Schema.decode(options.schema);
+    const makeFormEntry = (input) => {
+        const initial = Effect.isEffect(input) ? Fx.fromEffect(input) : input;
+        return Effect.map(RefSubject.make(initial), (inputRef) => {
+            if (RefSubject.isRefSubject(input)) {
+                const persist = Effect.flatMap(Effect.flatMap(inputRef, (i) => RefSubject.set(input, i)), (i) => decode(i, parseOptions));
+                return new DerivedFormEntryImpl(inputRef, options.name, options.schema, RefSubject.isDerived(input) ? Effect.tap(persist, () => input.persist) : persist);
+            }
+            else {
+                return new FromEntryImpl(inputRef, options.name, options.schema);
+            }
+        });
+    };
+    return makeFormEntry;
 }
 const parseOptions = {
     errors: "all",
     onExcessProperty: "ignore"
 };
-function makeEffectFormEntry(input, options) {
-    return Effect.contextWith((ctx) => FormEntryImpl.formEntry(Effect.provide(Effect.flatMap(input, (i) => Schema.encode(options.schema)(i, parseOptions)), ctx), options.name, options.schema));
-}
-function makeFxFormEntry(input, options) {
-    const encode_ = Schema.encode(options.schema);
-    return Effect.gen(function* (_) {
-        const deferred = new DeferredRef(yield* _(Deferred.make()));
-        const entry = FormEntryImpl.formEntry(deferred, options.name, options.schema);
-        const done = (exit) => Effect.flatMap(Effect.exit(Effect.flatMap(exit, encode_)), (exit) => Effect.flatMap(deferred.done(exit), (closed) => {
-            if (closed)
-                return Effect.unit;
-            return Exit.match(exit, entry);
-        }));
-        yield* _(Effect.forkScoped(run(input, Sink((e) => done(Exit.failCause(e)), (a) => done(Exit.succeed(a))))));
-        return entry;
-    });
-}
-function makeDerivedFormEntry(input, options) {
-    const decode_ = Schema.decode(options.schema);
-    return Effect.map(makeFxFormEntry(input, options), (entry) => Object.assign(entry, {
-        persist: input.updateEffect(() => Effect.flatMap(entry, decode_))
-    }));
-}
-class FormEntryImpl extends RefSubjectImpl {
+class FromEntryImpl extends FxEffectBase {
+    ref;
     name;
     schema;
-    parseOptions;
-    constructor(initial, name, schema, parseOptions) {
-        super(initial, schemaEquivalence.from(schema), Ref.unsafeMake(Option.none()), Effect.unsafeMakeSemaphore(1), makeHoldSubject());
+    [ComputedTypeId] = ComputedTypeId;
+    [RefSubjectTypeId] = RefSubjectTypeId;
+    decoded;
+    version;
+    subscriberCount;
+    interrupt;
+    constructor(ref, name, schema) {
+        super();
+        this.ref = ref;
         this.name = name;
         this.schema = schema;
-        this.parseOptions = parseOptions;
+        const decode = Schema.decode(schema);
+        this.decoded = RefSubject.mapEffect(ref, (i) => decode(i, parseOptions));
+        this.version = ref.version;
+        this.subscriberCount = ref.subscriberCount;
+        this.interrupt = ref.interrupt;
     }
-    decoded = this.mapEffect((i) => Schema.decode(this.schema)(i, this.parseOptions));
-    static formEntry(initial, name, schema) {
-        return new FormEntryImpl(initial, name, schema, parseOptions);
+    run(sink) {
+        return this.ref.run(sink);
+    }
+    toEffect() {
+        return this.ref;
+    }
+    runUpdates(f) {
+        return this.ref.runUpdates(f);
+    }
+    onFailure(cause) {
+        return this.ref.onFailure(cause);
+    }
+    onSuccess(value) {
+        return this.ref.onSuccess(value);
+    }
+}
+class DerivedFormEntryImpl extends FromEntryImpl {
+    persist;
+    constructor(ref, name, schema, persist) {
+        super(ref, name, schema);
+        this.persist = persist;
     }
 }
 //# sourceMappingURL=FormEntry.js.map

package/dist/esm/FormEntry.js.map

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