foldkit 0.162.0 → 0.163.0

package/dist/runtime/subscriptionFibers.js

@@ -1,4 +1,4 @@
-import { Effect, Option, Record, Ref, Schema, Stream, pipe, } from 'effect';
+import { Effect, Option, PubSub, Record, Ref, Schema, Scope, Stream, pipe, } from 'effect';
 import { measureSlowPhase, reportSlowPhase, } from './slowPhase.js';
 /**
  * Forks one fiber per Subscription into the runtime scope. Each fiber
@@ -18,7 +18,8 @@ export const forkSubscriptionFibers = ({ subscriptions, initModel, modelPubSub,
         thresholdMs,
     }));
     const latestDependenciesRef = yield* Ref.make(initDependencies);
-    const modelChangesStream = Stream.fromPubSub(modelPubSub).pipe(
+    const modelSubscription = yield* PubSub.subscribe(modelPubSub).pipe(Effect.provideService(Scope.Scope, runtimeScope));
+    const modelChangesStream = Stream.fromSubscription(modelSubscription).pipe(
     // NOTE: Ref.set runs upstream of Stream.changesWith on
     // every model change, so readDependencies() returns
     // current values even when the equivalence filter

package/dist/struct/index.d.ts

@@ -7,12 +7,12 @@ type StrictKeys<O, T> = T extends Record<string, any> ? Exclude<keyof T, keyof O
 type Evolved<O, T> = {
     [K in keyof O]: K extends keyof T ? T[K] extends (a: any) => infer R ? R : O[K] : O[K];
 };
-/** Immutably updates fields of a struct by applying transform functions. Wraps Effect's `Struct.evolve` with stricter key checking. */
-export declare const evo: {
+/** Immutably modifies fields of a struct by applying transform functions. Each transformer must return its field's existing type. Wraps Effect's `Struct.evolve` with stricter key checking. */
+export declare const modifyFields: {
     <O, const T extends EvolveTransform<O>>(t: StrictKeys<O, T>): (obj: O) => Evolved<O, T>;
     <O, const T extends EvolveTransform<O>>(obj: O, t: StrictKeys<O, T>): Evolved<O, T>;
 };
-/** Creates a variant of `evo` whose transforms are checked against a supertype. Useful in generic contexts where `evo`'s `StrictKeys` can't resolve `keyof` on an open type parameter. The returned function evolves a subtype model, preserving all fields not in the transform, and returns the subtype. */
-export declare const makeConstrainedEvo: <Constraint extends Record<string, unknown>>() => <Model extends Constraint>(model: Model, transforms: EvolveTransform<Constraint>) => Model;
+/** Creates a field modifier for a base shape. Use in generic helpers whose Model extends that shape. Transformers are checked against the base shape, and the returned function preserves the Model's subtype and all fields not in the transform. */
+export declare const makeModifyFieldsFor: <Base extends Record<string, unknown>>() => <Model extends Base>(model: Model, transforms: EvolveTransform<Base>) => Model;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/struct/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/struct/index.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,CAAC,CAAC,IAAI,OAAO,CAAC;KAC/B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AAEF,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAClB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,SAAS,KAAK,GACrC,CAAC,GACD,CAAC,GAAG;KACD,CAAC,IAAI,gBAAgB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK;CACnE,GACH,KAAK,CAAA;AAEX,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI;KAClB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAC7B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,GAC9B,CAAC,GACD,CAAC,CAAC,CAAC,CAAC,GACN,CAAC,CAAC,CAAC,CAAC;CACT,CAAA;AAED,uIAAuI;AACvI,eAAO,MAAM,GAAG,EAAE;IAChB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,EACpC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAClB,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,EACpC,GAAG,EAAE,CAAC,EACN,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAClB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CACD,CAAA;AAEjB,8SAA8S;AAC9S,eAAO,MAAM,kBAAkB,GAC5B,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1C,KAAK,SAAS,UAAU,SAChB,KAAK,cACA,eAAe,CAAC,UAAU,CAAC,KACtC,KAE+C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/struct/index.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,CAAC,CAAC,IAAI,OAAO,CAAC;KAC/B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AAEF,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAClB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,SAAS,KAAK,GACrC,CAAC,GACD,CAAC,GAAG;KACD,CAAC,IAAI,gBAAgB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK;CACnE,GACH,KAAK,CAAA;AAEX,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI;KAClB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAC7B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,GAC9B,CAAC,GACD,CAAC,CAAC,CAAC,CAAC,GACN,CAAC,CAAC,CAAC,CAAC;CACT,CAAA;AAED,gMAAgM;AAChM,eAAO,MAAM,YAAY,EAAE;IACzB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,EACpC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAClB,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,EACpC,GAAG,EAAE,CAAC,EACN,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAClB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CACD,CAAA;AAEjB,sPAAsP;AACtP,eAAO,MAAM,mBAAmB,GAC7B,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QACpC,KAAK,SAAS,IAAI,SACV,KAAK,cACA,eAAe,CAAC,IAAI,CAAC,KAChC,KAE+C,CAAA"}

package/dist/struct/index.js

@@ -1,7 +1,7 @@
 import { Struct } from 'effect';
-/** Immutably updates fields of a struct by applying transform functions. Wraps Effect's `Struct.evolve` with stricter key checking. */
-export const evo = Struct.evolve;
-/** Creates a variant of `evo` whose transforms are checked against a supertype. Useful in generic contexts where `evo`'s `StrictKeys` can't resolve `keyof` on an open type parameter. The returned function evolves a subtype model, preserving all fields not in the transform, and returns the subtype. */
-export const makeConstrainedEvo = () => (model, transforms) => 
+/** Immutably modifies fields of a struct by applying transform functions. Each transformer must return its field's existing type. Wraps Effect's `Struct.evolve` with stricter key checking. */
+export const modifyFields = Struct.evolve;
+/** Creates a field modifier for a base shape. Use in generic helpers whose Model extends that shape. Transformers are checked against the base shape, and the returned function preserves the Model's subtype and all fields not in the transform. */
+export const makeModifyFieldsFor = () => (model, transforms) => 
 /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
 Struct.evolve(model, transforms);

package/dist/struct/public.d.ts

@@ -1,2 +1,2 @@
-export { evo, makeConstrainedEvo } from './index.js';
+export { modifyFields, makeModifyFieldsFor } from './index.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/struct/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/struct/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/struct/public.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA"}

package/dist/struct/public.js

@@ -1 +1 @@
-export { evo, makeConstrainedEvo } from './index.js';
+export { modifyFields, makeModifyFieldsFor } from './index.js';

package/dist/submodel/submodel.d.ts

@@ -9,13 +9,13 @@
  *
  *  Being dual, it reads two ways. Data-first sets the field and returns the
  *  model; data-last returns `(model) => model`, which slots point-free into
- *  an `evo` callback:
+ *  a `modifyFields` callback:
  *
  *  ```ts
  *  // data-first
  *  const next = Slider.reflectRange(model.priceSlider, rangeFromUrl)
- *  // data-last, point-free in evo
- *  evo(model, { priceSlider: Slider.reflectRange(rangeFromUrl) })
+ *  // data-last, point-free in modifyFields
+ *  modifyFields(model, { priceSlider: Slider.reflectRange(rangeFromUrl) })
  *  ```
  */
 export type Reflect<Model, Value> = {

package/dist/subscription/fromEvent.d.ts

@@ -51,10 +51,10 @@ type PreventDefaultEventListenerOptions = Omit<AddEventListenerOptions, 'passive
  * `document`.
  *
  * `type` is constrained to the event names the target declares, and
- * `toMessage`'s parameter is the event those two resolve to. Annotating that
+ * `mapEvent`'s parameter is the event those two resolve to. Annotating that
  * parameter is checked against the resolved event rather than replacing it.
  *
- * `toMessage(event)` transforms each dispatched event into a Message. The
+ * `mapEvent(event)` transforms each dispatched event into a Stream value. The
  * mapper runs synchronously in the same call stack as the browser's event
  * dispatch, so calling `event.preventDefault()` inside it takes effect,
  * unless the listener is passive. Some browsers default wheel and touch
@@ -62,11 +62,14 @@ type PreventDefaultEventListenerOptions = Omit<AddEventListenerOptions, 'passive
  * ignored. Pass `options: { passive: false }` explicitly when cancelling
  * those events, or reach for `fromEventFilterMapPreventDefault`, which does
  * so for you.
+ *
+ * The output type is inferred from the mapper; `Subscription.make` checks
+ * that the final Stream emits the application's Message type.
  */
-export type FromEventConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+export type FromEventConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Output> = Readonly<{
     target: Target | (() => Target);
     type: Type;
-    toMessage: (event: EventOf<Target, Type>) => Message;
+    mapEvent: (event: EventOf<Target, Type>) => Output;
     options?: AddEventListenerOptions;
 }>;
 /**
@@ -79,10 +82,10 @@ export type FromEventConfig<Target extends EventTarget, Type extends EventTypeOf
  * `document`.
  *
  * `type` is constrained to the event names the target declares, and
- * `toMessage`'s parameter is the event those two resolve to. Annotating that
+ * `filterMapEvent`'s parameter is the event those two resolve to. Annotating that
  * parameter is checked against the resolved event rather than replacing it.
  *
- * `toMessage(event)` returns `Option.some(message)` to emit a Message for the
+ * `filterMapEvent(event)` returns `Option.some(value)` to emit a value for the
  * event, or `Option.none()` to ignore it. The mapper runs synchronously in the
  * same call stack as the browser's event dispatch, so calling
  * `event.preventDefault()` inside it takes effect, unless the listener is
@@ -90,11 +93,14 @@ export type FromEventConfig<Target extends EventTarget, Type extends EventTypeOf
  * to passive, where `preventDefault()` is ignored. Pass
  * `options: { passive: false }` explicitly when cancelling those events, or
  * reach for `fromEventFilterMapPreventDefault`, which does so for you.
+ *
+ * The output type is inferred from the mapper; `Subscription.make` checks
+ * that the final Stream emits the application's Message type.
  */
-export type FromEventFilterMapConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+export type FromEventFilterMapConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Output> = Readonly<{
     target: Target | (() => Target);
     type: Type;
-    toMessage: (event: EventOf<Target, Type>) => Option.Option<Message>;
+    filterMapEvent: (event: EventOf<Target, Type>) => Option.Option<Output>;
     options?: AddEventListenerOptions;
 }>;
 /**
@@ -107,36 +113,38 @@ export type FromEventFilterMapConfig<Target extends EventTarget, Type extends Ev
  * `document`.
  *
  * `type` is constrained to the event names the target declares, and
- * `toMessage`'s parameter is the event those two resolve to. Annotating that
+ * `filterMapEvent`'s parameter is the event those two resolve to. Annotating that
  * parameter is checked against the resolved event rather than replacing it.
  *
- * `toMessage(event)` returns `Option.some(message)` to mark the dispatch
+ * `filterMapEvent(event)` returns `Option.some(value)` to mark the dispatch
  * handled, or `Option.none()` to leave the default behavior intact. For a
  * handled dispatch the helper calls `event.preventDefault()` and queues the
- * Message before the listener returns; the mapper itself never calls
+ * value before the listener returns; the mapper itself never calls
  * `preventDefault()`.
  *
  * `options.passive` defaults to `false` so `preventDefault()` keeps working
  * for the events browsers would otherwise register as passive. The config
  * rejects `passive: true`; the runtime guard also throws for unchecked
  * JavaScript inputs.
+ *
+ * The output type is inferred from the mapper; `Subscription.make` checks
+ * that the final Stream emits the application's Message type.
  */
-export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Output> = Readonly<{
     target: Target | (() => Target);
     type: Type;
-    toMessage: (event: EventOf<Target, Type>) => Option.Option<Message>;
+    filterMapEvent: (event: EventOf<Target, Type>) => Option.Option<Output>;
     options?: PreventDefaultEventListenerOptions;
 }>;
 /**
- * Build a Stream that emits a Message for the dispatches of a DOM event the
+ * Build a Stream that emits a value for the dispatches of a DOM event the
  * mapper chooses to keep, registering the listener when the Stream's scope
  * opens and removing it when the scope closes.
  *
- * This is the filtered variant of `fromEvent`. Its `toMessage` returns
- * `Option.some(message)` to emit and `Option.none()` to ignore the event, so a
+ * This is the filtered variant of `fromEvent`. Its `filterMapEvent` returns
+ * `Option.some(value)` to emit and `Option.none()` to ignore the event, so a
  * single listener can react to some dispatches while passing on the rest. A
- * mapper that never emits produces a `Stream<never>`, which composes wherever
- * a Message-producing Stream is expected.
+ * mapper that never emits produces a `Stream<never>`.
  *
  * Reach for this over a downstream `Stream.filterMap` whenever the decision to
  * keep an event is paired with `event.preventDefault()`. The mapper runs
@@ -164,7 +172,9 @@ export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, T
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * @example
  * ```typescript
@@ -178,7 +188,7 @@ export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, T
  *           Subscription.fromEventFilterMap({
  *             target: window,
  *             type: 'keydown',
- *             toMessage: event =>
+ *             filterMapEvent: event =>
  *               event.key === 'Escape'
  *                 ? Option.some(Message.PressedEscape())
  *                 : Option.none(),
@@ -190,9 +200,9 @@ export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, T
  * }))
  * ```
  */
-export declare const fromEventFilterMap: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventFilterMapConfig<Target, Type, Message>) => Stream.Stream<Message>;
+export declare const fromEventFilterMap: <Target extends EventTarget, Type extends EventTypeOf<Target>, Output>(config: FromEventFilterMapConfig<Target, Type, Output>) => Stream.Stream<Output>;
 /**
- * Build a Stream that emits a Message for every dispatch of a DOM event,
+ * Build a Stream that emits a value for every dispatch of a DOM event,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
@@ -212,10 +222,12 @@ export declare const fromEventFilterMap: <Target extends EventTarget, Type exten
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * For a listener that reacts to only some events, reach for
- * `fromEventFilterMap`, whose mapper returns `Option<Message>`. For a
+ * `fromEventFilterMap`, whose mapper returns `Option<Output>`. For a
  * listener that also cancels the default action of the events it handles,
  * reach for `fromEventFilterMapPreventDefault`.
  *
@@ -231,7 +243,7 @@ export declare const fromEventFilterMap: <Target extends EventTarget, Type exten
  *           Subscription.fromEvent({
  *             target: window,
  *             type: 'keydown',
- *             toMessage: event => Message.PressedKey({ key: event.key }),
+ *             mapEvent: event => Message.PressedKey({ key: event.key }),
  *           }),
  *           Effect.sync(() => isListening),
  *         ),
@@ -240,17 +252,17 @@ export declare const fromEventFilterMap: <Target extends EventTarget, Type exten
  * }))
  * ```
  */
-export declare const fromEvent: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventConfig<Target, Type, Message>) => Stream.Stream<Message>;
+export declare const fromEvent: <Target extends EventTarget, Type extends EventTypeOf<Target>, Output>(config: FromEventConfig<Target, Type, Output>) => Stream.Stream<Output>;
 /**
- * Build a Stream that emits a Message for the dispatches of a DOM event the
+ * Build a Stream that emits a value for the dispatches of a DOM event the
  * mapper marks handled, calling `event.preventDefault()` on each of them,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
  * This is the cancelling variant of `fromEventFilterMap`, mirroring
- * `h.OnKeyDownPreventDefault` from `foldkit/html`. Its `toMessage` returns
- * `Option.some(message)` to mark a dispatch handled. The helper evaluates the
- * mapper, calls `event.preventDefault()`, and queues the Message before the
+ * `h.OnKeyDownPreventDefault` from `foldkit/html`. Its `filterMapEvent` returns
+ * `Option.some(value)` to mark a dispatch handled. The helper evaluates the
+ * mapper, calls `event.preventDefault()`, and queues the value before the
  * native listener returns. `Option.none()` leaves the default behavior intact.
  * The mapper never calls `preventDefault()` itself.
  *
@@ -275,7 +287,9 @@ export declare const fromEvent: <Target extends EventTarget, Type extends EventT
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * @example
  * ```typescript
@@ -289,7 +303,7 @@ export declare const fromEvent: <Target extends EventTarget, Type extends EventT
  *           Subscription.fromEventFilterMapPreventDefault({
  *             target: window,
  *             type: 'wheel',
- *             toMessage: () => Option.some(Message.SuppressedWheelScroll()),
+ *             filterMapEvent: () => Option.some(Message.SuppressedWheelScroll()),
  *           }),
  *           Effect.sync(() => isModalOpen),
  *         ),
@@ -298,6 +312,6 @@ export declare const fromEvent: <Target extends EventTarget, Type extends EventT
  * }))
  * ```
  */
-export declare const fromEventFilterMapPreventDefault: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventFilterMapPreventDefaultConfig<Target, Type, Message>) => Stream.Stream<Message>;
+export declare const fromEventFilterMapPreventDefault: <Target extends EventTarget, Type extends EventTypeOf<Target>, Output>(config: FromEventFilterMapPreventDefaultConfig<Target, Type, Output>) => Stream.Stream<Output>;
 export {};
 //# sourceMappingURL=fromEvent.d.ts.map

package/dist/subscription/fromEvent.d.ts.map

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

package/dist/subscription/fromEvent.js

@@ -4,9 +4,9 @@ const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect
     const target = resolveTarget(config.target);
     const handleEvent = (event) => {
         /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-        const maybeMessage = config.toMessage(event);
-        if (Option.isSome(maybeMessage)) {
-            Queue.offerUnsafe(queue, maybeMessage.value);
+        const maybeOutput = config.filterMapEvent(event);
+        if (Option.isSome(maybeOutput)) {
+            Queue.offerUnsafe(queue, maybeOutput.value);
         }
     };
     target.addEventListener(config.type, handleEvent, config.options);
@@ -15,15 +15,14 @@ const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect
     target.removeEventListener(config.type, handleEvent, config.options);
 })).pipe(Effect.flatMap(() => Effect.never)));
 /**
- * Build a Stream that emits a Message for the dispatches of a DOM event the
+ * Build a Stream that emits a value for the dispatches of a DOM event the
  * mapper chooses to keep, registering the listener when the Stream's scope
  * opens and removing it when the scope closes.
  *
- * This is the filtered variant of `fromEvent`. Its `toMessage` returns
- * `Option.some(message)` to emit and `Option.none()` to ignore the event, so a
+ * This is the filtered variant of `fromEvent`. Its `filterMapEvent` returns
+ * `Option.some(value)` to emit and `Option.none()` to ignore the event, so a
  * single listener can react to some dispatches while passing on the rest. A
- * mapper that never emits produces a `Stream<never>`, which composes wherever
- * a Message-producing Stream is expected.
+ * mapper that never emits produces a `Stream<never>`.
  *
  * Reach for this over a downstream `Stream.filterMap` whenever the decision to
  * keep an event is paired with `event.preventDefault()`. The mapper runs
@@ -51,7 +50,9 @@ const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * @example
  * ```typescript
@@ -65,7 +66,7 @@ const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect
  *           Subscription.fromEventFilterMap({
  *             target: window,
  *             type: 'keydown',
- *             toMessage: event =>
+ *             filterMapEvent: event =>
  *               event.key === 'Escape'
  *                 ? Option.some(Message.PressedEscape())
  *                 : Option.none(),
@@ -79,7 +80,7 @@ const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect
  */
 export const fromEventFilterMap = (config) => listen(config);
 /**
- * Build a Stream that emits a Message for every dispatch of a DOM event,
+ * Build a Stream that emits a value for every dispatch of a DOM event,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
@@ -99,10 +100,12 @@ export const fromEventFilterMap = (config) => listen(config);
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * For a listener that reacts to only some events, reach for
- * `fromEventFilterMap`, whose mapper returns `Option<Message>`. For a
+ * `fromEventFilterMap`, whose mapper returns `Option<Output>`. For a
  * listener that also cancels the default action of the events it handles,
  * reach for `fromEventFilterMapPreventDefault`.
  *
@@ -118,7 +121,7 @@ export const fromEventFilterMap = (config) => listen(config);
  *           Subscription.fromEvent({
  *             target: window,
  *             type: 'keydown',
- *             toMessage: event => Message.PressedKey({ key: event.key }),
+ *             mapEvent: event => Message.PressedKey({ key: event.key }),
  *           }),
  *           Effect.sync(() => isListening),
  *         ),
@@ -129,18 +132,18 @@ export const fromEventFilterMap = (config) => listen(config);
  */
 export const fromEvent = (config) => listen({
     ...config,
-    toMessage: event => Option.some(config.toMessage(event)),
+    filterMapEvent: event => Option.some(config.mapEvent(event)),
 });
 /**
- * Build a Stream that emits a Message for the dispatches of a DOM event the
+ * Build a Stream that emits a value for the dispatches of a DOM event the
  * mapper marks handled, calling `event.preventDefault()` on each of them,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
  * This is the cancelling variant of `fromEventFilterMap`, mirroring
- * `h.OnKeyDownPreventDefault` from `foldkit/html`. Its `toMessage` returns
- * `Option.some(message)` to mark a dispatch handled. The helper evaluates the
- * mapper, calls `event.preventDefault()`, and queues the Message before the
+ * `h.OnKeyDownPreventDefault` from `foldkit/html`. Its `filterMapEvent` returns
+ * `Option.some(value)` to mark a dispatch handled. The helper evaluates the
+ * mapper, calls `event.preventDefault()`, and queues the value before the
  * native listener returns. `Option.none()` leaves the default behavior intact.
  * The mapper never calls `preventDefault()` itself.
  *
@@ -165,7 +168,9 @@ export const fromEvent = (config) => listen({
  * `Subscription.persistent` for a listener whose lifetime spans the whole
  * Subscriptions record, or plug it into a `Subscription.make` entry's
  * `dependenciesToStream` (typically behind `Stream.when`) to gate it on a
- * Model condition.
+ * Model condition. The mapper's output type is inferred (even a raw Event is
+ * accepted here); `Subscription.make` checks the final Stream against the
+ * application's Message type.
  *
  * @example
  * ```typescript
@@ -179,7 +184,7 @@ export const fromEvent = (config) => listen({
  *           Subscription.fromEventFilterMapPreventDefault({
  *             target: window,
  *             type: 'wheel',
- *             toMessage: () => Option.some(Message.SuppressedWheelScroll()),
+ *             filterMapEvent: () => Option.some(Message.SuppressedWheelScroll()),
  *           }),
  *           Effect.sync(() => isModalOpen),
  *         ),
@@ -204,12 +209,12 @@ export const fromEventFilterMapPreventDefault = (config) => {
     return fromEventFilterMap({
         ...config,
         options: { ...options, passive: false },
-        toMessage: event => {
-            const maybeMessage = config.toMessage(event);
-            if (Option.isSome(maybeMessage)) {
+        filterMapEvent: event => {
+            const maybeOutput = config.filterMapEvent(event);
+            if (Option.isSome(maybeOutput)) {
                 event.preventDefault();
             }
-            return maybeMessage;
+            return maybeOutput;
         },
     });
 };

package/dist/subscription/keyBindings.d.ts

@@ -3,9 +3,9 @@ import { Duration, Stream } from 'effect';
 export type WhileTyping = 'Suppress' | 'Allow';
 /** A single key press or a sequence of two or more key presses. */
 export type KeySequence = string | Readonly<[string, string, ...Array<string>]>;
-type BindingBase<Message> = Readonly<{
+type BindingBase<Output> = Readonly<{
     keys: KeySequence;
-    toMessage: (event: KeyboardEvent) => Message;
+    mapEvent: (event: KeyboardEvent) => Output;
     isEnabled?: boolean;
     whileTyping?: WhileTyping;
     preventDefault?: boolean;
@@ -17,7 +17,7 @@ type BindingBase<Message> = Readonly<{
  * An array describes a sequence of at least two presses, such as
  * `['G', 'H']` or `['G', 'Shift+G']`.
  */
-export type KeyBinding<Message> = BindingBase<Message> & (Readonly<{
+export type KeyBinding<Output> = BindingBase<Output> & (Readonly<{
     keys: string;
     whenRepeated?: 'Ignore' | 'Allow';
 }> | Readonly<{
@@ -26,14 +26,16 @@ export type KeyBinding<Message> = BindingBase<Message> & (Readonly<{
 }>);
 type ModKey = 'Control' | 'Meta';
 /** Configuration for the {@link keyBindings} Stream helper. */
-export type KeyBindingsConfig<Message> = Readonly<{
-    bindings: ReadonlyArray<KeyBinding<Message>>;
+export type KeyBindingsConfig<Output> = Readonly<{
+    bindings: ReadonlyArray<KeyBinding<Output>>;
     target?: EventTarget | (() => EventTarget);
     modKey?: ModKey;
     sequenceTimeout?: Duration.Input;
 }>;
 /**
- * Build a Stream that turns declarative key bindings into Messages.
+ * Build a Stream that maps declarative key bindings to values. The output is
+ * inferred from each binding's `mapEvent` callback; `Subscription.make`
+ * checks that the final Stream emits the application's Message type.
  *
  * A string describes one key press. Modifiers are joined with `+`:
  * `'Mod+K'`, `'Control+Shift+P'`, or `'Alt+ArrowDown'`. The supported modifiers
@@ -69,7 +71,7 @@ export type KeyBindingsConfig<Message> = Readonly<{
  * or put bindings with different parent-owned lifetimes in separate child
  * entries so `Subscription.lift` can gate them individually. If the meaning
  * of a key depends on the Model, dispatch a factual key Message and decide
- * what it means in update instead of reading the Model from `toMessage`.
+ * what it means in update instead of reading the Model from `mapEvent`.
  *
  * @example
  * ```typescript
@@ -87,16 +89,16 @@ export type KeyBindingsConfig<Message> = Readonly<{
  *               keys: 'Escape',
  *               isEnabled: isPaletteOpen,
  *               whileTyping: 'Allow',
- *               toMessage: () => Message.PressedEscape(),
+ *               mapEvent: () => Message.PressedEscape(),
  *             },
  *             {
  *               keys: 'Mod+K',
  *               whileTyping: 'Allow',
- *               toMessage: () => Message.PressedSearchShortcut(),
+ *               mapEvent: () => Message.PressedSearchShortcut(),
  *             },
  *             {
  *               keys: ['G', 'L'],
- *               toMessage: () => Message.PressedListShortcut(),
+ *               mapEvent: () => Message.PressedListShortcut(),
  *             },
  *           ],
  *         }),
@@ -105,6 +107,6 @@ export type KeyBindingsConfig<Message> = Readonly<{
  * }))
  * ```
  */
-export declare const keyBindings: <Message>(config: KeyBindingsConfig<Message>) => Stream.Stream<Message>;
+export declare const keyBindings: <Output>(config: KeyBindingsConfig<Output>) => Stream.Stream<Output>;
 export {};
 //# sourceMappingURL=keyBindings.d.ts.map

package/dist/subscription/keyBindings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyBindings.d.ts","sourceRoot":"","sources":["../../src/subscription/keyBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAOR,MAAM,EAGP,MAAM,QAAQ,CAAA;AAEf,oFAAoF;AACpF,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,CAAA;AAE9C,mEAAmE;AACnE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAE/E,KAAK,WAAW,CAAC,OAAO,IAAI,QAAQ,CAAC;IACnC,IAAI,EAAE,WAAW,CAAA;IACjB,SAAS,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAA;IAC5C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC,CAAA;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,GACpD,CACI,QAAQ,CAAC;IACP,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;CAClC,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAClD,YAAY,CAAC,EAAE,KAAK,CAAA;CACrB,CAAC,CACL,CAAA;AAEH,KAAK,MAAM,GAAG,SAAS,GAAG,MAAM,CAAA;AAEhC,+DAA+D;AAC/D,MAAM,MAAM,iBAAiB,CAAC,OAAO,IAAI,QAAQ,CAAC;IAChD,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5C,MAAM,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAA;CACjC,CAAC,CAAA;AA2sBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwEG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,UACzB,iBAAiB,CAAC,OAAO,CAAC,KACjC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAuD,CAAA"}
+{"version":3,"file":"keyBindings.d.ts","sourceRoot":"","sources":["../../src/subscription/keyBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAOR,MAAM,EAGP,MAAM,QAAQ,CAAA;AAEf,oFAAoF;AACpF,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,CAAA;AAE9C,mEAAmE;AACnE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAE/E,KAAK,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC;IAClC,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,MAAM,CAAA;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAC,CAAA;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,GAClD,CACI,QAAQ,CAAC;IACP,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAA;CAClC,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAClD,YAAY,CAAC,EAAE,KAAK,CAAA;CACrB,CAAC,CACL,CAAA;AAEH,KAAK,MAAM,GAAG,SAAS,GAAG,MAAM,CAAA;AAEhC,+DAA+D;AAC/D,MAAM,MAAM,iBAAiB,CAAC,MAAM,IAAI,QAAQ,CAAC;IAC/C,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAA;IAC3C,MAAM,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAA;CACjC,CAAC,CAAA;AA2sBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0EG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,UACxB,iBAAiB,CAAC,MAAM,CAAC,KAChC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAuD,CAAA"}

package/dist/subscription/keyBindings.js

@@ -109,7 +109,7 @@ const compileBinding = (binding) => {
         : Array.map(binding.keys, parsePress);
     return {
         presses,
-        toMessage: binding.toMessage,
+        mapEvent: binding.mapEvent,
         whileTyping: binding.whileTyping ?? 'Suppress',
         preventDefault: binding.preventDefault ?? true,
         whenRepeated: binding.whenRepeated ?? 'Ignore',
@@ -237,7 +237,7 @@ const emitBindingMessage = (context, binding, event) => {
     if (binding.preventDefault) {
         event.preventDefault();
     }
-    context.emitMessage(binding.toMessage(event));
+    context.emitMessage(binding.mapEvent(event));
 };
 const isMatchingOnePressBinding = (event, modKey, isEditable) => (binding) => !isSequence(binding) &&
     isAllowedWhileTyping(binding, isEditable) &&
@@ -368,7 +368,9 @@ const keyBindingStream = (config) => Stream.callback(queue => {
     return Effect.acquireRelease(Effect.sync(() => acquireKeyBindingListener(config, emitMessage)), listener => Effect.sync(() => releaseKeyBindingListener(listener)));
 });
 /**
- * Build a Stream that turns declarative key bindings into Messages.
+ * Build a Stream that maps declarative key bindings to values. The output is
+ * inferred from each binding's `mapEvent` callback; `Subscription.make`
+ * checks that the final Stream emits the application's Message type.
  *
  * A string describes one key press. Modifiers are joined with `+`:
  * `'Mod+K'`, `'Control+Shift+P'`, or `'Alt+ArrowDown'`. The supported modifiers
@@ -404,7 +406,7 @@ const keyBindingStream = (config) => Stream.callback(queue => {
  * or put bindings with different parent-owned lifetimes in separate child
  * entries so `Subscription.lift` can gate them individually. If the meaning
  * of a key depends on the Model, dispatch a factual key Message and decide
- * what it means in update instead of reading the Model from `toMessage`.
+ * what it means in update instead of reading the Model from `mapEvent`.
  *
  * @example
  * ```typescript
@@ -422,16 +424,16 @@ const keyBindingStream = (config) => Stream.callback(queue => {
  *               keys: 'Escape',
  *               isEnabled: isPaletteOpen,
  *               whileTyping: 'Allow',
- *               toMessage: () => Message.PressedEscape(),
+ *               mapEvent: () => Message.PressedEscape(),
  *             },
  *             {
  *               keys: 'Mod+K',
  *               whileTyping: 'Allow',
- *               toMessage: () => Message.PressedSearchShortcut(),
+ *               mapEvent: () => Message.PressedSearchShortcut(),
  *             },
  *             {
  *               keys: ['G', 'L'],
- *               toMessage: () => Message.PressedListShortcut(),
+ *               mapEvent: () => Message.PressedListShortcut(),
  *             },
  *           ],
  *         }),

package/dist/subscription/public.d.ts

@@ -1,5 +1,5 @@
 export { aggregate, lift, make, persistent } from './subscription.js';
-export type { EntryWithoutKeepAlive, GatedDependencies, Subscription, Subscriptions, } from './subscription.js';
+export type { EntryGates, EntryWithoutKeepAlive, GatedDependencies, Subscription, Subscriptions, } from './subscription.js';
 export { animationFrame } from './animationFrame.js';
 export type { AnimationFrameConfig } from './animationFrame.js';
 export { fromEvent, fromEventFilterMap, fromEventFilterMapPreventDefault, } from './fromEvent.js';