@typed/fx 2.0.0-beta.6 → 2.0.0-beta.8

package/dist/RefSubject/RefSubject.js

@@ -2,6 +2,7 @@
 /** @effect-diagnostics missingEffectContext:skip-file */
 import * as Array from "effect/Array";
 import * as Effect from "effect/Effect";
+import * as Effectable from "effect/Effectable";
 import * as Semaphore from "effect/Semaphore";
 import { equals } from "effect/Equal";
 import * as Exit from "effect/Exit";
@@ -47,7 +48,7 @@ import { hasProperty } from "effect/Predicate";
  * source errors, services, and lifetime.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Type identity
  */
 export const RefSubjectTypeId = Symbol.for("@typed/fx/RefSubject");
 /**
@@ -64,7 +65,7 @@ export const RefSubjectTypeId = Symbol.for("@typed/fx/RefSubject");
  * source errors, services, and lifetime.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Type identity
  */
 export const ComputedTypeId = Symbol.for("@typed/fx/Computed");
 /**
@@ -81,7 +82,7 @@ export const ComputedTypeId = Symbol.for("@typed/fx/Computed");
  * source errors, services, and lifetime.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Type identity
  */
 export const FilteredTypeId = Symbol.for("@typed/fx/Filtered");
 /**
@@ -101,12 +102,23 @@ export const FilteredTypeId = Symbol.for("@typed/fx/Filtered");
  * still owns any subscription created by `"multiple"`.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Observation policy
  */
 export const CurrentComputedBehavior = Context.Reference("@typed/fx/CurrentComputedBehavior", {
     defaultValue: () => "multiple",
 });
 const checkIsMultiple = (ctx) => Context.getUnsafe(ctx, CurrentComputedBehavior) === "multiple";
+function holdInContext(fx) {
+    const contexts = new WeakMap();
+    return unwrap(Effect.map(Effect.context(), (context) => {
+        let shared = contexts.get(context);
+        if (!shared) {
+            shared = Subject.hold(fx);
+            contexts.set(context, shared);
+        }
+        return shared;
+    }));
+}
 class ComputedImpl extends Versioned.VersionedTransform {
     [ComputedTypeId] = ComputedTypeId;
     _computed;
@@ -116,7 +128,7 @@ class ComputedImpl extends Versioned.VersionedTransform {
         super(input, (fx) => fxMapEffect(fx, f), Effect.flatMap(f));
         this.input = input;
         this.f = f;
-        this._computed = Subject.hold(unwrap(Effect.map(Effect.context(), (ctx) => {
+        this._computed = holdInContext(unwrap(Effect.map(Effect.context(), (ctx) => {
             if (checkIsMultiple(ctx)) {
                 return fxFromEffect(input).pipe(continueWith(() => input), skipRepeats, fxMapEffect(f));
             }
@@ -138,12 +150,13 @@ class ComputedImpl extends Versioned.VersionedTransform {
  *
  * ## Ownership and lifetime
  *
- * Current reads directly sample and transform the input. The pushed channel uses `Subject.hold`:
- * concurrent observers share one active upstream session and its latest retained projection; the
- * last observer ends the session and clears that held value. The observing Scope owns cleanup.
+ * Current reads cache the transformed input by source version within each Effect Context. The
+ * pushed channel uses `Subject.hold`: observers with the same Context object share one upstream
+ * session and its retained projection; distinct Context objects have separate sessions. The last
+ * observer ends its session and clears its held value. The observing Scope owns cleanup.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Derived queries
  */
 export function makeComputed(input, f) {
     return new ComputedImpl(input, f);
@@ -166,16 +179,14 @@ export function makeComputed(input, f) {
  *
  * ## Ownership and lifetime
  *
- * Calling `scan` allocates one private `MutableRef` for the returned Computed's Effect-read
- * accumulator. Every Effect read of that same Computed shares it and advances it after a
- * successful fold; separate `scan` calls do not share state. The pushed channel runs
- * `Fx.scanEffect` from `initial` inside `Subject.hold`: concurrent observers share the active scan
- * and its latest retained result, while the last observer ends that session and clears the held
- * value. The observing Scope owns subscription cleanup. The private read accumulator has no
- * finalizer and is collected with the returned Computed.
+ * Each Effect Context object gets a private current-read accumulator, advanced after a successful
+ * fold for a new source version. The pushed channel runs `Fx.scanEffect` from `initial` inside
+ * `Subject.hold`: observers using the same Context share that active scan and retained result.
+ * The last observer ends its session and clears its held value. The observing Scope owns
+ * subscription cleanup. Read accumulators are weakly held by Context and need no finalizer.
  *
  * @since 1.0.0
- * @category combinators
+ * @category Accumulation
  */
 export const scan = dual(3, function scan(versioned, initial, f) {
     return new ComputedScanImpl(versioned, initial, (s, a) => Effect.succeed(f(s, a)));
@@ -191,16 +202,15 @@ export const scan = dual(3, function scan(versioned, initial, f) {
  *
  * ## Ownership and lifetime
  *
- * Calling `scanEffect` allocates one private `MutableRef` for the returned Computed's Effect-read
- * accumulator. Every Effect read of that same Computed shares it; the accumulator advances only
- * after `f` succeeds, so a typed failure leaves the previous state intact. The pushed channel runs
- * `Fx.scanEffect` from `initial` inside `Subject.hold`: concurrent observers share the active scan
- * and latest retained result, and each fold requires `R3`. The last observer ends that session and
- * clears the held value. The observing Scope owns cleanup; the private read accumulator has no
- * finalizer and is collected with the returned Computed.
+ * Each Effect Context object gets a private current-read accumulator. It advances only after `f`
+ * succeeds, so a typed failure leaves the previous state intact. The pushed channel runs
+ * `Fx.scanEffect` from `initial` inside `Subject.hold`: observers using the same Context share
+ * that active scan and retained result; each fold requires `R3`. The last observer ends its
+ * session and clears its held value. The observing Scope owns cleanup. Read accumulators are
+ * weakly held by Context and need no finalizer.
  *
  * @since 1.0.0
- * @category combinators
+ * @category Accumulation
  */
 export const scanEffect = dual(3, function scanEffect(versioned, initial, f) {
     return new ComputedScanImpl(versioned, initial, f);
@@ -212,15 +222,23 @@ class ComputedScanImpl extends Versioned.VersionedTransform {
     initial;
     f;
     constructor(input, initial, f) {
-        const state = MutableRef.make(initial);
-        super(input, (fx) => fxScanEffect(fx, initial, f), (effect) => Effect.flatMap(effect, (a) => Effect.flatMap(f(MutableRef.get(state), a), (next) => Effect.sync(() => {
-            MutableRef.set(state, next);
-            return next;
-        }))));
+        const states = new WeakMap();
+        super(input, (fx) => fxScanEffect(fx, initial, f), (effect) => Effect.contextWith((context) => {
+            let state = states.get(context);
+            if (!state) {
+                state = MutableRef.make(initial);
+                states.set(context, state);
+            }
+            const current = state;
+            return Effect.flatMap(effect, (a) => Effect.flatMap(f(MutableRef.get(current), a), (next) => Effect.sync(() => {
+                MutableRef.set(current, next);
+                return next;
+            })));
+        }));
         this.input = input;
         this.initial = initial;
         this.f = f;
-        this._computed = Subject.hold(unwrap(Effect.map(Effect.context(), (ctx) => {
+        this._computed = holdInContext(unwrap(Effect.map(Effect.context(), (ctx) => {
             if (checkIsMultiple(ctx)) {
                 return fxFromEffect(input).pipe(continueWith(() => input), skipRepeats, fxScanEffect(initial, f));
             }
@@ -242,11 +260,12 @@ class ComputedScanImpl extends Versioned.VersionedTransform {
  *
  * ## Ownership and lifetime
  *
- * The make filtered view retains no independent value. Its Effect read fails with NoSuchElement
- * while absent; the observing Scope owns and finalizes its Fx subscription.
+ * Sampled results and pushed sessions are isolated by Effect Context identity. Within one Context,
+ * current reads cache by source version and observers share the active held projection. Its
+ * Effect read fails with NoSuchElement while absent; the observing Scope owns its subscription.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Optional queries
  */
 export function makeFiltered(input, f) {
     return new FilteredImpl(input, f);
@@ -260,7 +279,7 @@ class FilteredImpl extends Versioned.VersionedTransform {
         super(input, (fx) => fxFilterMapEffect(fx, f), (effect) => Effect.flatMap(Effect.flatMap(effect, f), Effect.fromOption));
         this.input = input;
         this.f = f;
-        this._computed = Subject.hold(unwrap(Effect.map(Effect.context(), (ctx) => {
+        this._computed = holdInContext(unwrap(Effect.map(Effect.context(), (ctx) => {
             if (checkIsMultiple(ctx)) {
                 return fxFromEffect(input).pipe(continueWith(() => input), skipRepeats, fxFilterMapEffect(f));
             }
@@ -504,7 +523,7 @@ class RefSubjectImpl extends YieldableFx {
  * ```
  *
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export function make(effect, options) {
     if (isFx(effect)) {
@@ -552,7 +571,7 @@ export function make(effect, options) {
  * ```
  *
  * @since 1.0.0
- * @category constructors
+ * @category Source adapters
  */
 export function fromEffect(effect, options) {
     return Effect.map(makeCore(effect, options), (core) => new RefSubjectImpl(core));
@@ -591,7 +610,7 @@ export function fromEffect(effect, options) {
  * ```
  *
  * @since 1.0.0
- * @category constructors
+ * @category Source adapters
  */
 export function fromFx(fx, options) {
     return Effect.gen(function* () {
@@ -619,7 +638,7 @@ export function fromFx(fx, options) {
  * expose `E`.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Source adapters
  */
 export function fromStream(stream, options) {
     return Effect.gen(function* () {
@@ -657,7 +676,7 @@ export function fromStream(stream, options) {
  * ```
  *
  * @since 1.0.0
- * @category constructors
+ * @category Source adapters
  */
 export function fromOption(option, options) {
     return make(option, options);
@@ -682,7 +701,7 @@ export function fromOption(option, options) {
  * ```
  *
  * @since 1.0.0
- * @category constructors
+ * @category Source adapters
  */
 function optionFromNullable(value) {
     return value === null || value === undefined
@@ -705,7 +724,7 @@ function optionFromNullable(value) {
  * fail. The returned RefSubject owns and publishes subsequent Option writes.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Source adapters
  */
 export function fromNullable(value, options) {
     return make(optionFromNullable(value), options);
@@ -742,12 +761,21 @@ function getOrInitializeCore(core, lockInitialize) {
     });
 }
 function initializeCoreEffect(core, lock) {
+    let completed = false;
     const initialize = Effect.onExit(Effect.provide(core.initial, core.services), (exit) => Effect.sync(() => {
+        completed = true;
         core._fiber = undefined;
         core.deferredRef.done(exit);
     }));
     const isSourceBacked = core.initial === core.deferredRef;
-    return Effect.flatMap(Effect.forkIn(lock && !isSourceBacked ? core.semaphore.withPermits(1)(initialize) : initialize, core.scope), (fiber) => Effect.sync(() => (core._fiber = fiber)));
+    return Effect.flatMap(Effect.forkIn(lock && !isSourceBacked ? core.semaphore.withPermits(1)(initialize) : initialize, core.scope, 
+    // Acquire the initializer's permit before a competing update can hold it while awaiting us.
+    { startImmediately: true }), (fiber) => Effect.sync(() => {
+        // A synchronous initializer has already cleared its ownership in onExit.
+        if (!completed)
+            core._fiber = fiber;
+        return fiber;
+    }));
 }
 function initializeCoreAndTap(core, lock) {
     return Effect.flatMapEager(initializeCoreEffect(core, lock), () => 
@@ -865,7 +893,7 @@ function sendEvent(core, exit) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export const set = dual(2, function set(ref, a) {
     return ref.updates((ref) => ref.set(a));
@@ -907,7 +935,7 @@ export const set = dual(2, function set(ref, a) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export function reset(ref) {
     return ref.updates((ref) => ref.delete);
@@ -937,7 +965,7 @@ export {
  * ```
  *
  * @since 1.20.0
- * @category combinators
+ * @category State updates
  */
 reset as delete, };
 /**
@@ -973,7 +1001,7 @@ reset as delete, };
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export const updateEffect = dual(2, function updateEffect(ref, f) {
     return ref.updates((ref) => Effect.flatMap(Effect.flatMap(ref.get, f), ref.set));
@@ -1022,7 +1050,7 @@ export const updateEffect = dual(2, function updateEffect(ref, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export const update = dual(2, function update(ref, f) {
     return updateEffect(ref, (value) => Effect.succeed(f(value)));
@@ -1062,7 +1090,7 @@ export const update = dual(2, function update(ref, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Transactions
  */
 export const modifyEffect = dual(2, function modifyEffect(ref, f) {
     return ref.updates((ref) => Effect.flatMap(ref.get, (value) => Effect.flatMap(f(value), ([b, a]) => Effect.as(ref.set(a), b))));
@@ -1099,7 +1127,7 @@ export const modifyEffect = dual(2, function modifyEffect(ref, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Transactions
  */
 export const modify = dual(2, function modify(ref, f) {
     return modifyEffect(ref, (value) => Effect.succeed(f(value)));
@@ -1134,7 +1162,7 @@ export const modify = dual(2, function modify(ref, f) {
  * ```
  *
  * @since 1.0.0
- * @category guards
+ * @category Type guards
  */
 export function isRefSubject(value) {
     return hasProperty(value, RefSubjectTypeId) && value[RefSubjectTypeId] === RefSubjectTypeId;
@@ -1154,7 +1182,7 @@ const isRefSubjectDataFirst = (args) => isRefSubject(args[0]);
  * This synchronous predicate performs no Effect, subscription, or acquisition.
  *
  * @since 1.18.0
- * @category guards
+ * @category Type guards
  */
 export function isComputed(value) {
     return hasProperty(value, ComputedTypeId) && value[ComputedTypeId] === ComputedTypeId;
@@ -1203,7 +1231,7 @@ export function isComputed(value) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Transactions
  */
 export const runUpdates = dual(isRefSubjectDataFirst, function runUpdates(ref, f, options) {
     if (options === undefined) {
@@ -1249,7 +1277,7 @@ export const runUpdates = dual(isRefSubjectDataFirst, function runUpdates(ref, f
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export function increment(ref) {
     return update(ref, (value) => value + 1);
@@ -1287,7 +1315,7 @@ export function increment(ref) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State updates
  */
 export function decrement(ref) {
     return update(ref, (value) => value - 1);
@@ -1315,7 +1343,7 @@ const Variance = {
  * while consumers require only the generated `Self` service.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Services
  */
 export function Service() {
     return (id) => {
@@ -1327,6 +1355,11 @@ export function Service() {
                 // @effect-diagnostics-next-line floatingEffect:off
                 Object.assign(this, service);
                 Object.setPrototypeOf(this, Object.getPrototypeOf(service));
+                // @effect-diagnostics-next-line floatingEffect:off
+                Object.assign(this, Effectable.Prototype({
+                    label: "RefSubject.Service",
+                    evaluate: () => Effect.flatMap(service, identity),
+                }));
             }
             static id = id;
             static service = service;
@@ -1351,7 +1384,7 @@ export function Service() {
             static [RefSubjectTypeId] = RefSubjectTypeId;
             static updates = (f) => Effect.flatMap(service, (ref) => ref.updates(f));
             // Yieldable
-            static override = service;
+            static override = Effect.flatten(service);
             static [Symbol.iterator] = function* () {
                 const ref = yield* service;
                 return yield* ref;
@@ -1416,7 +1449,7 @@ function getDefaultBounds(options) {
  * ```
  *
  * @since 2.0.0
- * @category combinators
+ * @category Derived queries
  */
 export const proxy = (source) => {
     const target = {};
@@ -1471,7 +1504,7 @@ export const proxy = (source) => {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Derived queries
  */
 export const mapEffect = dual(2, function mapEffect(versioned, f) {
     return FilteredTypeId in versioned
@@ -1524,7 +1557,7 @@ export const mapEffect = dual(2, function mapEffect(versioned, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Derived queries
  */
 export const map = dual(2, function map(versioned, f) {
     return mapEffect(versioned, (a) => Effect.succeed(f(a)));
@@ -1563,7 +1596,7 @@ export const map = dual(2, function map(versioned, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Optional queries
  */
 export const filterMapEffect = dual(2, function filterMapEffect(versioned, f) {
     return new FilteredImpl(versioned, f);
@@ -1602,7 +1635,7 @@ export const filterMapEffect = dual(2, function filterMapEffect(versioned, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Optional queries
  */
 export const filterMap = dual(2, function filterMap(versioned, f) {
     return new FilteredImpl(versioned, (a) => Effect.succeed(f(a)));
@@ -1643,7 +1676,7 @@ export const filterMap = dual(2, function filterMap(versioned, f) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Optional queries
  */
 export const compact = function compact(versioned) {
     return new FilteredImpl(versioned, Effect.succeed);
@@ -1683,7 +1716,7 @@ export const compact = function compact(versioned) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Optional queries
  */
 export const getOrElse = dual(2, function getOrElse(ref, fallback) {
     const computed = FilteredTypeId in ref ? ref.asComputed() : ref;
@@ -1742,7 +1775,7 @@ class RefSubjectSimpleTransform extends YieldableFx {
  * source RefSubject.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Observation policy
  */
 export const slice = dual(3, function slice(ref, skip, take) {
     return new RefSubjectSimpleTransform(ref, (_) => fxSlice(_, { skip, take }), identity);
@@ -1832,7 +1865,7 @@ class RefSubjectTransform extends YieldableFx {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category Writable views
  */
 export const transform = dual(3, function transform(ref, toB, toA) {
     return new RefSubjectTransform(ref, toB, toA);
@@ -1905,7 +1938,7 @@ function getRefKind(refs) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State composition
  */
 export function struct(refs) {
     const kind = getRefKind(Object.values(refs));
@@ -1958,7 +1991,7 @@ export function struct(refs) {
  * ```
  *
  * @since 1.0.0
- * @category combinators
+ * @category State composition
  */
 export function tuple(refs) {
     const kind = getRefKind(refs);
@@ -1980,10 +2013,32 @@ const sampleRefSubject = (ref) =>
 Effect.gen(function* () {
     return yield* ref;
 });
+function versionedInContext(make) {
+    // Automatic composites share both pushed sessions and in-flight reads only within one Context.
+    const contexts = new WeakMap();
+    const current = Effect.map(Effect.context(), (context) => {
+        let versioned = contexts.get(context);
+        if (!versioned) {
+            versioned = make();
+            contexts.set(context, versioned);
+        }
+        return versioned;
+    });
+    return new (class extends YieldableFx {
+        version = Effect.flatMap(current, (versioned) => versioned.version);
+        interrupt = Effect.flatMap(current, (versioned) => versioned.interrupt);
+        run(sink) {
+            return Effect.flatMap(current, (versioned) => versioned.run(sink));
+        }
+        toEffect() {
+            return Effect.flatMap(current, identity);
+        }
+    })();
+}
 function makeCompositeVersioned(refs, current) {
     const version = Effect.map(Effect.all(refs.map((ref) => ref.version), UNBOUNDED), (versions) => versions.reduce(sum, 0));
     const changes = skipRepeats(fxMapEffect(fxMergeAll(...refs), () => current));
-    return Versioned.hold(Versioned.make(version, changes, current));
+    return versionedInContext(() => Versioned.hold(Versioned.make(version, changes, current)));
 }
 class RefSubjectTuple extends YieldableFx {
     [ComputedTypeId] = ComputedTypeId;
@@ -1999,7 +2054,7 @@ class RefSubjectTuple extends YieldableFx {
         this.refs = refs;
         this.versioned = (refs.length > 0 && getTupleTransactionAccess(refs)
             ? makeCompositeVersioned(refs, Effect.all(refs.map(sampleRefSubject), UNBOUNDED))
-            : Versioned.hold(Versioned.tuple(refs)));
+            : versionedInContext(() => Versioned.hold(Versioned.tuple(refs))));
         this.version = this.versioned.version;
         this.interrupt = Effect.all(refs.map((r) => r.interrupt), UNBOUNDED);
         this.subscriberCount = Effect.map(Effect.all(refs.map((r) => r.subscriberCount), UNBOUNDED), Array.reduce(0, sum));
@@ -2034,10 +2089,10 @@ class RefSubjectTuple extends YieldableFx {
     }
 }
 function makeTupleComputed(refs) {
-    return new ComputedImpl(Versioned.tuple(refs), Effect.succeed);
+    return new ComputedImpl(versionedInContext(() => Versioned.tuple(refs)), Effect.succeed);
 }
 function makeTupleFiltered(refs) {
-    return new FilteredImpl(Versioned.tuple(refs), Effect.succeedSome);
+    return new FilteredImpl(versionedInContext(() => Versioned.tuple(refs)), Effect.succeedSome);
 }
 function makeStructRef(refs) {
     return new RefSubjectStruct(refs);
@@ -2058,7 +2113,7 @@ class RefSubjectStruct extends YieldableFx {
         const current = Effect.map(Effect.all(keys.map((key) => sampleRefSubject(refs[key])), UNBOUNDED), (values) => Object.fromEntries(keys.map((key, index) => [key, values[index]])));
         this.versioned = (keys.length > 0 && getStructTransactionAccess(refs)
             ? makeCompositeVersioned(Object.values(refs), current)
-            : Versioned.hold(Versioned.struct(refs)));
+            : versionedInContext(() => Versioned.hold(Versioned.struct(refs))));
         this.version = this.versioned.version;
         this.interrupt = Effect.all(Object.values(refs).map((r) => r.interrupt), UNBOUNDED);
         this.subscriberCount = Effect.map(Effect.all(Object.values(refs).map((r) => r.subscriberCount), UNBOUNDED), Array.reduce(0, sum));
@@ -2093,10 +2148,10 @@ class RefSubjectStruct extends YieldableFx {
     }
 }
 function makeStructComputed(refs) {
-    return new ComputedImpl(Versioned.struct(refs), Effect.succeed);
+    return new ComputedImpl(versionedInContext(() => Versioned.struct(refs)), Effect.succeed);
 }
 function makeStructFiltered(refs) {
-    return new FilteredImpl(Versioned.struct(refs), Effect.succeedSome);
+    return new FilteredImpl(versionedInContext(() => Versioned.struct(refs)), Effect.succeedSome);
 }
 /**
  * Lifts an Effect-provided Computed into a Computed facade.
@@ -2114,7 +2169,7 @@ function makeStructFiltered(refs) {
  * failures remain `E`, and the observing Scope owns the delegated subscription.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Services
  */
 export function computedFromService(effect) {
     return new ComputedFromService(effect);
@@ -2152,7 +2207,7 @@ class ComputedFromService extends YieldableFx {
  * while absent; the observing Scope owns and finalizes its Fx subscription.
  *
  * @since 1.18.0
- * @category combinators
+ * @category Services
  */
 export function filteredFromService(effect) {
     return new FilteredFromService(effect);