foldkit 0.160.0 → 0.161.0

package/dist/runtime/devToolsIntegration.js

@@ -1,11 +1,17 @@
 import { Array, Effect, Option, PubSub, Stream, SubscriptionRef, } from 'effect';
 import { createDevToolsStore, } from '../devTools/store.js';
+import { extractSubmodelInfo, isTagged } from '../devTools/submodelPath.js';
 import { startWebSocketBridge } from '../devTools/webSocketBridge.js';
 import { MountRuntime, liveViewStateChanges, } from '../mount/index.js';
 import { resolveDevToolsConfig, resolveDevToolsKeyframeInterval, resolveDevToolsMaxEntries, resolveExcludeFromHistoryTags, } from './devToolsConfig.js';
-const toCommandRecord = (command) => command.args !== undefined
-    ? { name: command.name, args: command.args }
-    : { name: command.name };
+const toCommandRecord = ({ id, command }) => command.args !== undefined
+    ? {
+        id,
+        name: command.name,
+        args: command.args,
+        maybeSubmodelPath: Option.none(),
+    }
+    : { id, name: command.name, maybeSubmodelPath: Option.none() };
 /**
  * Builds the DevTools integration for one runtime from the `devTools`
  * config. `update` and `maybeFreezeModel` drive time-travel replay, and
@@ -169,8 +175,18 @@ export const makeDevToolsIntegration = ({ devTools, update, maybeFreezeModel, en
             }
         }
     };
+    const recordCommandResult = (id, message) => {
+        if (devToolsStore === null) {
+            return;
+        }
+        const submodelPath = isTagged(message)
+            ? extractSubmodelInfo(message._tag, message).submodelPath
+            : [];
+        Effect.runFork(devToolsStore.recordResolvedCommand(id, submodelPath));
+    };
     const resumeDevTools = Effect.suspend(() => devToolsStore !== null ? devToolsStore.resume : Effect.void);
     return {
+        isRecordingCommands: Option.isSome(resolvedDevTools),
         mountTracker,
         mountRuntime,
         drainMountEvents,
@@ -181,6 +197,7 @@ export const makeDevToolsIntegration = ({ devTools, update, maybeFreezeModel, en
         resumeDevTools,
         recordInit,
         recordMessage,
+        recordCommandResult,
         attachRenderedMounts,
     };
 });

package/dist/runtime/runtime.d.ts.map

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

package/dist/runtime/runtime.js

@@ -1,4 +1,6 @@
 import { Array, Duration, Effect, Exit, Option, Predicate, PubSub, Schema, pipe, } from 'effect';
+import { DialogRuntime } from '../dom/dialogRuntime.js';
+import { releaseDialogResources } from '../dom/dom.js';
 import { __htmlBuilder as htmlBuilderFor, } from '../html/index.js';
 import { RenderCommit, createCommitNotifier } from '../render/commit.js';
 import { fromString as urlFromString } from '../url/index.js';
@@ -56,6 +58,7 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
         // the same signal. A commit in one embedded application must never wake a
         // `Render.afterCommit` awaiting inside another.
         const commitNotifier = createCommitNotifier();
+        const dialogIds = new Set();
         return Effect.scoped(Effect.gen(function* () {
             if (runtimeId === '') {
                 return yield* Effect.die(new Error('[foldkit] Runtime container must have an `id` for Model preservation across reloads. ' +
@@ -174,7 +177,12 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
                 maybeFreezeModel,
                 enqueueMessageEffect,
             });
-            const { installDevToolsStore, recordInit, recordMessage } = devToolsIntegration;
+            const { isRecordingCommands, installDevToolsStore, recordInit, recordMessage, recordCommandResult, } = devToolsIntegration;
+            let nextCommandId = 0;
+            const assignCommandIds = (commands) => Array.map(commands, command => ({
+                id: nextCommandId++,
+                command,
+            }));
             if (import.meta.hot) {
                 yield* Effect.addFinalizer(() => Effect.sync(() => duplicateIdScanner?.cancel()));
             }
@@ -210,6 +218,7 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
                 messageQueue,
                 devToolsIntegration,
             });
+            yield* Effect.addFinalizer(() => Effect.forEach(pipe(dialogIds, Array.fromIterable, Array.reverse), releaseDialogResources, { discard: true }));
             // NOTE: the fork is deferred one microtask so a Command's Effect
             // never begins on the dispatching stack. Commands are facts from
             // outside the update loop; their results always arrive
@@ -223,7 +232,7 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
             // Stream step) would reschedule through clamped `setTimeout`
             // instead of the browser microtask scheduler carried by
             // `runtimeContext`.
-            const forkCommand = (command, message) => {
+            const forkCommand = (command, message, id) => {
                 queueMicrotask(() => {
                     // NOTE: `isCrashed` as well as `isRuntimeDisposed`. A crash is
                     // terminal but does not dispose the runtime, and a Command forked
@@ -235,9 +244,13 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
                     if (status.isRuntimeDisposed || status.isCrashed) {
                         return;
                     }
-                    Effect.runForkWith(runtimeContext)(Effect.forkIn(runtimeScope)(command.effect.pipe(Effect.withSpan(command.name, {
+                    const providedCommand = command.effect.pipe(Effect.withSpan(command.name, {
                         attributes: command.args ?? {},
-                    }), provideAllResources, Effect.flatMap(enqueueMessageEffect), Effect.catchCause(cause => crashWith(cause, message)))));
+                    }), provideAllResources);
+                    const recordedCommand = id !== undefined
+                        ? providedCommand.pipe(Effect.tap(result => Effect.sync(() => recordCommandResult(id, result))))
+                        : providedCommand;
+                    Effect.runForkWith(runtimeContext)(Effect.forkIn(runtimeScope)(recordedCommand.pipe(Effect.flatMap(enqueueMessageEffect), Effect.catchCause(cause => crashWith(cause, message)))));
                 });
             };
             const processMessagePlain = (message) => {
@@ -263,14 +276,22 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
                     }
                     scheduleRenderFrame();
                 }
-                if (!Array.isReadonlyArrayEmpty(commands)) {
+                if (isRecordingCommands) {
+                    const commandInvocations = assignCommandIds(commands);
+                    for (const { command, id } of commandInvocations) {
+                        forkCommand(
+                        /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+                        command, Option.some(message), id);
+                    }
+                    recordMessage(message, currentModel, nextModel, commandInvocations);
+                }
+                else {
                     for (const command of commands) {
                         forkCommand(
                         /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
                         command, Option.some(message));
                     }
                 }
-                recordMessage(message, currentModel, nextModel, commands);
             };
             yield* installDevToolsStore(devToolsRenderBridge);
             const initRenderExit = yield* Effect.exit(render(initModel, Option.none()));
@@ -285,7 +306,12 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
             if (isPreserveScrollActive) {
                 yield* restorePreservedScrollPosition(runtimeId);
             }
-            yield* recordInit(initModel, initCommands);
+            const initCommandInvocations = isRecordingCommands
+                ? assignCommandIds(initCommands)
+                : [];
+            if (isRecordingCommands) {
+                yield* recordInit(initModel, initCommandInvocations);
+            }
             if (subscriptions) {
                 yield* forkSubscriptionFibers({
                     subscriptions,
@@ -328,10 +354,19 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
             // ManagedResources, ports) is attached. forkCommand also defers each
             // start by a microtask, so a fully synchronous init Command still
             // delivers its result asynchronously.
-            for (const command of initCommands) {
-                forkCommand(
-                /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-                command, Option.none());
+            if (isRecordingCommands) {
+                for (const { command, id } of initCommandInvocations) {
+                    forkCommand(
+                    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+                    command, Option.none(), id);
+                }
+            }
+            else {
+                for (const command of initCommands) {
+                    forkCommand(
+                    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+                    command, Option.none());
+                }
             }
             completeBoot();
             // NOTE: suspend forever. Messages are processed synchronously on
@@ -340,7 +375,14 @@ export const makeRuntime = ({ ports, kind, Model, Flags: FlagsCodec, configuredF
             // runtime scope open until interruption (an embedded app's dispose)
             // or the document goes away.
             yield* Effect.never;
-        })).pipe(Effect.provideService(RenderCommit, commitNotifier.service));
+        })).pipe(Effect.provideService(RenderCommit, commitNotifier.service), Effect.provideService(DialogRuntime, {
+            register: id => {
+                dialogIds.add(id);
+            },
+            unregister: id => {
+                dialogIds.delete(id);
+            },
+        }));
     };
     const start = (preservedModel) => startWith(Option.none(), preservedModel, 'Fresh');
     const program = {

package/dist/subscription/fromEvent.d.ts

@@ -1,4 +1,46 @@
 import { Option, Stream } from 'effect';
+declare const EventMapMarker: unique symbol;
+/**
+ * An `EventTarget` that declares the events it dispatches, so the `fromEvent`
+ * helpers can resolve an event name to its event type the way they do for
+ * `window`, `document`, and the DOM interfaces lib.dom declares event maps
+ * for.
+ *
+ * Annotate a target with this and the mapper's parameter follows from the
+ * event name, including a `CustomEvent`'s `detail`. A declared event overrides
+ * the corresponding native event and otherwise augments the target's native
+ * events, so an element that dispatches custom events can be annotated without
+ * losing events such as `click`. Any `EventTarget` is assignable to it, so the
+ * annotation is the only change needed.
+ *
+ * @example
+ * ```ts
+ * const slowWarningTarget: Subscription.TypedEventTarget<{
+ *   'foldkit:slow-warning': CustomEvent<SlowWarningReport>
+ * }> = new EventTarget()
+ * ```
+ */
+export interface TypedEventTarget<EventMap extends {
+    readonly [Type in keyof EventMap]: Event;
+}> extends EventTarget {
+    readonly [EventMapMarker]?: EventMap;
+}
+type EventMapMarkerKey = typeof EventMapMarker;
+type DeclaredEventMap<Target> = EventMapMarkerKey extends keyof Target ? NonNullable<Target[EventMapMarkerKey & keyof Target]> : never;
+type EventFromHandler<Handler> = NonNullable<Handler> extends (event: infer EventType, ...args: ReadonlyArray<unknown>) => unknown ? EventType extends Event ? EventType : never : never;
+type EventMapFromHandlers<Target> = {
+    readonly [Key in keyof Target as Key extends `on${infer Type}` ? [EventFromHandler<Target[Key]>] extends [never] ? never : Type : never]: EventFromHandler<Target[Key]>;
+};
+type OverrideEventMap<Base, Declared> = Omit<Base, keyof Declared> & Declared;
+type ElementEventMapOf<Target> = Target extends HTMLVideoElement ? HTMLVideoElementEventMap : Target extends HTMLMediaElement ? HTMLMediaElementEventMap : Target extends HTMLBodyElement ? HTMLBodyElementEventMap : Target extends HTMLFrameSetElement ? HTMLFrameSetElementEventMap : Target extends HTMLElement ? HTMLElementEventMap : Target extends MathMLElement ? MathMLElementEventMap : Target extends SVGSVGElement ? SVGSVGElementEventMap : Target extends SVGElement ? SVGElementEventMap : Target extends Element ? ElementEventMap & GlobalEventHandlersEventMap : never;
+type NativeEventMapOf<Target> = Target extends Window ? WindowEventMap : Target extends Document ? DocumentEventMap : Target extends XMLHttpRequest ? XMLHttpRequestEventMap : Target extends XMLHttpRequestEventTarget ? XMLHttpRequestEventTargetEventMap : [ElementEventMapOf<Target>] extends [never] ? EventMapFromHandlers<Target> : ElementEventMapOf<Target>;
+type EventMapOfMember<Target> = [DeclaredEventMap<Target>] extends [never] ? [keyof NativeEventMapOf<Target>] extends [never] ? Readonly<Record<string, Event>> : NativeEventMapOf<Target> : [keyof NativeEventMapOf<Target>] extends [never] ? DeclaredEventMap<Target> : OverrideEventMap<NativeEventMapOf<Target>, DeclaredEventMap<Target>>;
+type EventMapOf<Target> = Target extends unknown ? EventMapOfMember<Target> : never;
+type EventTypeOf<Target> = keyof EventMapOf<Target> & string;
+type EventOf<Target, Type extends EventTypeOf<Target>> = Type extends keyof EventMapOf<Target> ? EventMapOf<Target>[Type] extends infer Resolved extends Event ? Resolved : Event : Event;
+type PreventDefaultEventListenerOptions = Omit<AddEventListenerOptions, 'passive'> & Readonly<{
+    passive?: false;
+}>;
 /**
  * Configuration for the `fromEvent` Stream helper.
  *
@@ -8,6 +50,10 @@ import { Option, Stream } from 'effect';
  * pass the `EventTarget` directly for always-present globals like `window` or
  * `document`.
  *
+ * `type` is constrained to the event names the target declares, and
+ * `toMessage`'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
  * mapper runs synchronously in the same call stack as the browser's event
  * dispatch, so calling `event.preventDefault()` inside it takes effect,
@@ -17,10 +63,10 @@ import { Option, Stream } from 'effect';
  * those events, or reach for `fromEventFilterMapPreventDefault`, which does
  * so for you.
  */
-export type FromEventConfig<EventType extends Event, Message> = Readonly<{
-    target: EventTarget | (() => EventTarget);
-    type: string;
-    toMessage: (event: EventType) => Message;
+export type FromEventConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+    target: Target | (() => Target);
+    type: Type;
+    toMessage: (event: EventOf<Target, Type>) => Message;
     options?: AddEventListenerOptions;
 }>;
 /**
@@ -32,6 +78,10 @@ export type FromEventConfig<EventType extends Event, Message> = Readonly<{
  * pass the `EventTarget` directly for always-present globals like `window` or
  * `document`.
  *
+ * `type` is constrained to the event names the target declares, and
+ * `toMessage`'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
  * event, or `Option.none()` to ignore it. The mapper runs synchronously in the
  * same call stack as the browser's event dispatch, so calling
@@ -41,10 +91,10 @@ export type FromEventConfig<EventType extends Event, Message> = Readonly<{
  * `options: { passive: false }` explicitly when cancelling those events, or
  * reach for `fromEventFilterMapPreventDefault`, which does so for you.
  */
-export type FromEventFilterMapConfig<EventType extends Event, Message> = Readonly<{
-    target: EventTarget | (() => EventTarget);
-    type: string;
-    toMessage: (event: EventType) => Option.Option<Message>;
+export type FromEventFilterMapConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+    target: Target | (() => Target);
+    type: Type;
+    toMessage: (event: EventOf<Target, Type>) => Option.Option<Message>;
     options?: AddEventListenerOptions;
 }>;
 /**
@@ -56,6 +106,10 @@ export type FromEventFilterMapConfig<EventType extends Event, Message> = Readonl
  * pass the `EventTarget` directly for always-present globals like `window` or
  * `document`.
  *
+ * `type` is constrained to the event names the target declares, and
+ * `toMessage`'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
  * handled, or `Option.none()` to leave the default behavior intact. For a
  * handled dispatch the helper calls `event.preventDefault()` and queues the
@@ -63,14 +117,15 @@ export type FromEventFilterMapConfig<EventType extends Event, Message> = Readonl
  * `preventDefault()`.
  *
  * `options.passive` defaults to `false` so `preventDefault()` keeps working
- * for the events browsers would otherwise register as passive. Passing
- * `passive: true` explicitly contradicts the helper's purpose and throws.
+ * for the events browsers would otherwise register as passive. The config
+ * rejects `passive: true`; the runtime guard also throws for unchecked
+ * JavaScript inputs.
  */
-export type FromEventFilterMapPreventDefaultConfig<EventType extends Event, Message> = Readonly<{
-    target: EventTarget | (() => EventTarget);
-    type: string;
-    toMessage: (event: EventType) => Option.Option<Message>;
-    options?: AddEventListenerOptions;
+export type FromEventFilterMapPreventDefaultConfig<Target extends EventTarget, Type extends EventTypeOf<Target>, Message> = Readonly<{
+    target: Target | (() => Target);
+    type: Type;
+    toMessage: (event: EventOf<Target, Type>) => Option.Option<Message>;
+    options?: PreventDefaultEventListenerOptions;
 }>;
 /**
  * Build a Stream that emits a Message for the dispatches of a DOM event the
@@ -79,7 +134,9 @@ export type FromEventFilterMapPreventDefaultConfig<EventType extends Event, Mess
  *
  * This is the filtered variant of `fromEvent`. Its `toMessage` returns
  * `Option.some(message)` to emit and `Option.none()` to ignore the event, so a
- * single listener can react to some dispatches while passing on the rest.
+ * 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.
  *
  * Reach for this over a downstream `Stream.filterMap` whenever the decision to
  * keep an event is paired with `event.preventDefault()`. The mapper runs
@@ -91,6 +148,13 @@ export type FromEventFilterMapPreventDefaultConfig<EventType extends Event, Mess
  * `options: { passive: false }` explicitly when cancelling those events, or
  * reach for `fromEventFilterMapPreventDefault`, which does so for you.
  *
+ * The target, the event name, and the event the mapper receives are one fact:
+ * `type` is constrained to the names the target declares, and the mapper's
+ * parameter is what those two resolve to, so annotating it narrows nothing and
+ * cannot contradict the name. A target that is neither annotated nor one
+ * lib.dom declares a map for accepts any name and reports `Event`; annotate it
+ * with {@link TypedEventTarget} to resolve its own events.
+ *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
  * `removeEventListener` is registered only after acquire completes, so the
@@ -111,8 +175,8 @@ export type FromEventFilterMapPreventDefaultConfig<EventType extends Event, Mess
  *       modelToDependencies: model => ({ isListening: model.isListening }),
  *       dependenciesToStream: ({ isListening }) =>
  *         Stream.when(
- *           Subscription.fromEventFilterMap<KeyboardEvent, Message>({
- *             target: document,
+ *           Subscription.fromEventFilterMap({
+ *             target: window,
  *             type: 'keydown',
  *             toMessage: event =>
  *               event.key === 'Escape'
@@ -126,12 +190,19 @@ export type FromEventFilterMapPreventDefaultConfig<EventType extends Event, Mess
  * }))
  * ```
  */
-export declare const fromEventFilterMap: <EventType extends Event, Message>(config: FromEventFilterMapConfig<EventType, Message>) => Stream.Stream<Message>;
+export declare const fromEventFilterMap: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventFilterMapConfig<Target, Type, Message>) => Stream.Stream<Message>;
 /**
  * Build a Stream that emits a Message for every dispatch of a DOM event,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
+ * The target, the event name, and the event the mapper receives are one fact:
+ * `type` is constrained to the names the target declares, and the mapper's
+ * parameter is what those two resolve to, so annotating it narrows nothing and
+ * cannot contradict the name. A target that is neither annotated nor one
+ * lib.dom declares a map for accepts any name and reports `Event`; annotate it
+ * with {@link TypedEventTarget} to resolve its own events.
+ *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
  * `removeEventListener` is registered only after acquire completes, so the
@@ -157,7 +228,7 @@ export declare const fromEventFilterMap: <EventType extends Event, Message>(conf
  *       modelToDependencies: model => ({ isListening: model.isListening }),
  *       dependenciesToStream: ({ isListening }) =>
  *         Stream.when(
- *           Subscription.fromEvent<KeyboardEvent, Message>({
+ *           Subscription.fromEvent({
  *             target: window,
  *             type: 'keydown',
  *             toMessage: event => Message.PressedKey({ key: event.key }),
@@ -169,7 +240,7 @@ export declare const fromEventFilterMap: <EventType extends Event, Message>(conf
  * }))
  * ```
  */
-export declare const fromEvent: <EventType extends Event, Message>(config: FromEventConfig<EventType, Message>) => Stream.Stream<Message>;
+export declare const fromEvent: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventConfig<Target, Type, Message>) => Stream.Stream<Message>;
 /**
  * Build a Stream that emits a Message for the dispatches of a DOM event the
  * mapper marks handled, calling `event.preventDefault()` on each of them,
@@ -186,8 +257,14 @@ export declare const fromEvent: <EventType extends Event, Message>(config: FromE
  * Because cancelling is the point, the listener registers with
  * `passive: false` when the config does not say otherwise. This keeps wheel
  * and touch events cancelable when a browser would otherwise make listeners
- * on a global target passive. Passing `passive: true` explicitly contradicts
- * the helper's purpose and throws.
+ * on a global target passive. The config rejects `passive: true`; the runtime
+ * guard also throws for unchecked JavaScript inputs.
+ *
+ * The target, event name, and mapper parameter are one fact: `type` is
+ * constrained to the names the target declares, and the mapper receives the
+ * event those two resolve to. A target with no declared event map accepts any
+ * name and reports `Event`; annotate it with {@link TypedEventTarget} to
+ * resolve its own events.
  *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
@@ -209,10 +286,7 @@ export declare const fromEvent: <EventType extends Event, Message>(config: FromE
  *       modelToDependencies: model => ({ isModalOpen: model.isModalOpen }),
  *       dependenciesToStream: ({ isModalOpen }) =>
  *         Stream.when(
- *           Subscription.fromEventFilterMapPreventDefault<
- *             WheelEvent,
- *             Message
- *           >({
+ *           Subscription.fromEventFilterMapPreventDefault({
  *             target: window,
  *             type: 'wheel',
  *             toMessage: () => Option.some(Message.SuppressedWheelScroll()),
@@ -224,5 +298,6 @@ export declare const fromEvent: <EventType extends Event, Message>(config: FromE
  * }))
  * ```
  */
-export declare const fromEventFilterMapPreventDefault: <EventType extends Event, Message>(config: FromEventFilterMapPreventDefaultConfig<EventType, Message>) => Stream.Stream<Message>;
+export declare const fromEventFilterMapPreventDefault: <Target extends EventTarget, Type extends EventTypeOf<Target>, Message>(config: FromEventFilterMapPreventDefaultConfig<Target, Type, Message>) => Stream.Stream<Message>;
+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":"AAAA,OAAO,EAAU,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEtD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC;IACvE,MAAM,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAA;IACxC,OAAO,CAAC,EAAE,uBAAuB,CAAA;CAClC,CAAC,CAAA;AAMF;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,wBAAwB,CAClC,SAAS,SAAS,KAAK,EACvB,OAAO,IACL,QAAQ,CAAC;IACX,MAAM,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,EAAE,uBAAuB,CAAA;CAClC,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,sCAAsC,CAChD,SAAS,SAAS,KAAK,EACvB,OAAO,IACL,QAAQ,CAAC;IACX,MAAM,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAA;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,EAAE,uBAAuB,CAAA;CAClC,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,SAAS,KAAK,EAAE,OAAO,UACzD,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,KACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAsBrB,CAAA;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,eAAO,MAAM,SAAS,GAAI,SAAS,SAAS,KAAK,EAAE,OAAO,UAChD,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,KAC1C,MAAM,CAAC,MAAM,CAAC,OAAO,CAIpB,CAAA;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,eAAO,MAAM,gCAAgC,GAC3C,SAAS,SAAS,KAAK,EACvB,OAAO,UAEC,sCAAsC,CAAC,SAAS,EAAE,OAAO,CAAC,KACjE,MAAM,CAAC,MAAM,CAAC,OAAO,CA0BvB,CAAA"}
+{"version":3,"file":"fromEvent.d.ts","sourceRoot":"","sources":["../../src/subscription/fromEvent.ts"],"names":[],"mappings":"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"}

package/dist/subscription/fromEvent.js

@@ -1,5 +1,19 @@
 import { Effect, Option, Queue, Stream } from 'effect';
 const resolveTarget = (target) => (typeof target === 'function' ? target() : target);
+const listen = (config) => Stream.callback(queue => Effect.acquireRelease(Effect.sync(() => {
+    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);
+        }
+    };
+    target.addEventListener(config.type, handleEvent, config.options);
+    return { target, handleEvent };
+}), ({ target, handleEvent }) => Effect.sync(() => {
+    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
  * mapper chooses to keep, registering the listener when the Stream's scope
@@ -7,7 +21,9 @@ const resolveTarget = (target) => (typeof target === 'function' ? target() : tar
  *
  * This is the filtered variant of `fromEvent`. Its `toMessage` returns
  * `Option.some(message)` to emit and `Option.none()` to ignore the event, so a
- * single listener can react to some dispatches while passing on the rest.
+ * 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.
  *
  * Reach for this over a downstream `Stream.filterMap` whenever the decision to
  * keep an event is paired with `event.preventDefault()`. The mapper runs
@@ -19,6 +35,13 @@ const resolveTarget = (target) => (typeof target === 'function' ? target() : tar
  * `options: { passive: false }` explicitly when cancelling those events, or
  * reach for `fromEventFilterMapPreventDefault`, which does so for you.
  *
+ * The target, the event name, and the event the mapper receives are one fact:
+ * `type` is constrained to the names the target declares, and the mapper's
+ * parameter is what those two resolve to, so annotating it narrows nothing and
+ * cannot contradict the name. A target that is neither annotated nor one
+ * lib.dom declares a map for accepts any name and reports `Event`; annotate it
+ * with {@link TypedEventTarget} to resolve its own events.
+ *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
  * `removeEventListener` is registered only after acquire completes, so the
@@ -39,8 +62,8 @@ const resolveTarget = (target) => (typeof target === 'function' ? target() : tar
  *       modelToDependencies: model => ({ isListening: model.isListening }),
  *       dependenciesToStream: ({ isListening }) =>
  *         Stream.when(
- *           Subscription.fromEventFilterMap<KeyboardEvent, Message>({
- *             target: document,
+ *           Subscription.fromEventFilterMap({
+ *             target: window,
  *             type: 'keydown',
  *             toMessage: event =>
  *               event.key === 'Escape'
@@ -54,25 +77,19 @@ const resolveTarget = (target) => (typeof target === 'function' ? target() : tar
  * }))
  * ```
  */
-export const fromEventFilterMap = (config) => Stream.callback(queue => Effect.acquireRelease(Effect.sync(() => {
-    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);
-        }
-    };
-    target.addEventListener(config.type, handleEvent, config.options);
-    return { target, handleEvent };
-}), ({ target, handleEvent }) => Effect.sync(() => {
-    target.removeEventListener(config.type, handleEvent, config.options);
-})).pipe(Effect.flatMap(() => Effect.never)));
+export const fromEventFilterMap = (config) => listen(config);
 /**
  * Build a Stream that emits a Message for every dispatch of a DOM event,
  * registering the listener when the Stream's scope opens and removing it when
  * the scope closes.
  *
+ * The target, the event name, and the event the mapper receives are one fact:
+ * `type` is constrained to the names the target declares, and the mapper's
+ * parameter is what those two resolve to, so annotating it narrows nothing and
+ * cannot contradict the name. A target that is neither annotated nor one
+ * lib.dom declares a map for accepts any name and reports `Event`; annotate it
+ * with {@link TypedEventTarget} to resolve its own events.
+ *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
  * `removeEventListener` is registered only after acquire completes, so the
@@ -98,7 +115,7 @@ export const fromEventFilterMap = (config) => Stream.callback(queue => Effect.ac
  *       modelToDependencies: model => ({ isListening: model.isListening }),
  *       dependenciesToStream: ({ isListening }) =>
  *         Stream.when(
- *           Subscription.fromEvent<KeyboardEvent, Message>({
+ *           Subscription.fromEvent({
  *             target: window,
  *             type: 'keydown',
  *             toMessage: event => Message.PressedKey({ key: event.key }),
@@ -110,7 +127,7 @@ export const fromEventFilterMap = (config) => Stream.callback(queue => Effect.ac
  * }))
  * ```
  */
-export const fromEvent = (config) => fromEventFilterMap({
+export const fromEvent = (config) => listen({
     ...config,
     toMessage: event => Option.some(config.toMessage(event)),
 });
@@ -130,8 +147,14 @@ export const fromEvent = (config) => fromEventFilterMap({
  * Because cancelling is the point, the listener registers with
  * `passive: false` when the config does not say otherwise. This keeps wheel
  * and touch events cancelable when a browser would otherwise make listeners
- * on a global target passive. Passing `passive: true` explicitly contradicts
- * the helper's purpose and throws.
+ * on a global target passive. The config rejects `passive: true`; the runtime
+ * guard also throws for unchecked JavaScript inputs.
+ *
+ * The target, event name, and mapper parameter are one fact: `type` is
+ * constrained to the names the target declares, and the mapper receives the
+ * event those two resolve to. A target with no declared event map accepts any
+ * name and reports `Event`; annotate it with {@link TypedEventTarget} to
+ * resolve its own events.
  *
  * The listener lifecycle uses `Effect.acquireRelease`. The `addEventListener`
  * call happens inside the acquire Effect, and the matching
@@ -153,10 +176,7 @@ export const fromEvent = (config) => fromEventFilterMap({
  *       modelToDependencies: model => ({ isModalOpen: model.isModalOpen }),
  *       dependenciesToStream: ({ isModalOpen }) =>
  *         Stream.when(
- *           Subscription.fromEventFilterMapPreventDefault<
- *             WheelEvent,
- *             Message
- *           >({
+ *           Subscription.fromEventFilterMapPreventDefault({
  *             target: window,
  *             type: 'wheel',
  *             toMessage: () => Option.some(Message.SuppressedWheelScroll()),
@@ -169,7 +189,8 @@ export const fromEvent = (config) => fromEventFilterMap({
  * ```
  */
 export const fromEventFilterMapPreventDefault = (config) => {
-    if (config.options?.passive === true) {
+    const options = config.options;
+    if (options?.passive === true) {
         throw new Error(`Foldkit: \`Subscription.fromEventFilterMapPreventDefault\` was passed ` +
             `\`options: { passive: true }\` for a "${config.type}" listener. ` +
             `The helper exists to call \`event.preventDefault()\` on every ` +
@@ -182,7 +203,7 @@ export const fromEventFilterMapPreventDefault = (config) => {
     }
     return fromEventFilterMap({
         ...config,
-        options: { ...config.options, passive: false },
+        options: { ...options, passive: false },
         toMessage: event => {
             const maybeMessage = config.toMessage(event);
             if (Option.isSome(maybeMessage)) {