foldkit 0.160.0 → 0.161.0

package/dist/dom/dom.js

@@ -1,11 +1,131 @@
-import { Array, Effect, Equal, Function, Match, Number, Option } from 'effect';
+import { Array, Effect, Equal, Function, Match, Number, Option, Result, } from 'effect';
 import { afterCommit, afterPaint } from '../render/render.js';
+import { DialogRuntime } from './dialogRuntime.js';
 import { ElementNotFound } from './error.js';
+import { makeOutsideIsolation } from './inert.js';
 import { unlockScroll } from './scrollLock.js';
 const BASE_DIALOG_Z_INDEX = 2147483600;
 let openDialogCount = 0;
 const dialogHygieneById = new Map();
 let openDialogStack = [];
+let modalIsolation;
+let modalObserver;
+let modalAllowedElements = [];
+let modalAllowedOutsideElements = [];
+let modalAllowedSelectors = [];
+let modalAllowedAncestors = new Set();
+const containsAllowedSelector = (node) => {
+    if (!(node instanceof Element || node instanceof DocumentFragment)) {
+        return false;
+    }
+    return Array.some(modalAllowedSelectors, selector => {
+        try {
+            return ((node instanceof Element && node.matches(selector)) ||
+                node.querySelector(selector) !== null);
+        }
+        catch {
+            return false;
+        }
+    });
+};
+const containsCurrentAllowedElement = (node) => Array.some(modalAllowedElements, element => node.contains(element));
+const isRelevantModalMutation = (mutation) => {
+    if (mutation.type === 'attributes' &&
+        (mutation.attributeName === 'aria-hidden' ||
+            mutation.attributeName === 'inert')) {
+        return (mutation.target instanceof HTMLElement &&
+            modalIsolation?.contains(mutation.target) === true);
+    }
+    if (mutation.type === 'attributes') {
+        return (Array.some(modalAllowedOutsideElements, element => mutation.target.contains(element)) || containsAllowedSelector(mutation.target));
+    }
+    const changedNodes = [
+        ...Array.fromIterable(mutation.addedNodes),
+        ...Array.fromIterable(mutation.removedNodes),
+    ];
+    if (mutation.target instanceof HTMLElement &&
+        modalAllowedAncestors.has(mutation.target) &&
+        Array.some(changedNodes, node => node instanceof Element)) {
+        return true;
+    }
+    return Array.some(changedNodes, node => containsCurrentAllowedElement(node) || containsAllowedSelector(node));
+};
+const ancestorsOfAllowedElements = (allowedElements) => {
+    const ancestors = new Set();
+    for (const allowedElement of allowedElements) {
+        let ancestor = allowedElement.parentElement;
+        while (ancestor !== null) {
+            ancestors.add(ancestor);
+            if (ancestor === document.body) {
+                break;
+            }
+            ancestor = ancestor.parentElement;
+        }
+    }
+    return ancestors;
+};
+const recordModalAttributeMutations = (mutations) => {
+    for (const mutation of mutations) {
+        if (mutation.type === 'attributes' &&
+            mutation.target instanceof HTMLElement &&
+            (mutation.attributeName === 'aria-hidden' ||
+                mutation.attributeName === 'inert')) {
+            modalIsolation?.recordAttributeMutation(mutation.target, mutation.attributeName);
+        }
+    }
+};
+const synchronizeModalIsolation = () => {
+    if (modalObserver !== undefined) {
+        recordModalAttributeMutations(modalObserver.takeRecords());
+    }
+    modalObserver?.disconnect();
+    const maybeTopmostModal = Array.last(Array.filter(openDialogStack, dialog => dialog.isModal));
+    if (Option.isNone(maybeTopmostModal)) {
+        modalObserver?.disconnect();
+        modalObserver = undefined;
+        modalIsolation?.dispose();
+        modalIsolation = undefined;
+        modalAllowedElements = [];
+        modalAllowedOutsideElements = [];
+        modalAllowedSelectors = [];
+        modalAllowedAncestors = new Set();
+        return;
+    }
+    const { allowedOutsideSelectors } = maybeTopmostModal.value;
+    const dialogsAtOrAboveModal = Array.dropWhile(openDialogStack, dialog => dialog !== maybeTopmostModal.value);
+    const allowedOutsideElements = Array.filterMap(allowedOutsideSelectors, selector => {
+        try {
+            const outsideElement = document.querySelector(selector);
+            return outsideElement instanceof HTMLElement
+                ? Result.succeed(outsideElement)
+                : Result.failVoid;
+        }
+        catch {
+            return Result.failVoid;
+        }
+    });
+    const nextAllowedElements = [
+        ...Array.map(dialogsAtOrAboveModal, dialog => dialog.element),
+        ...allowedOutsideElements,
+    ];
+    modalIsolation ??= makeOutsideIsolation();
+    modalIsolation.update(nextAllowedElements);
+    modalAllowedElements = nextAllowedElements;
+    modalAllowedOutsideElements = allowedOutsideElements;
+    modalAllowedSelectors = allowedOutsideSelectors;
+    modalAllowedAncestors = ancestorsOfAllowedElements(nextAllowedElements);
+    modalObserver ??= new MutationObserver(mutations => {
+        if (Array.some(mutations, isRelevantModalMutation)) {
+            recordModalAttributeMutations(mutations);
+            synchronizeModalIsolation();
+        }
+    });
+    modalObserver.observe(document.body, {
+        childList: true,
+        subtree: true,
+        attributes: true,
+    });
+};
 const FOCUSABLE_SELECTOR = Array.join([
     'a[href]:not([tabindex="-1"])',
     'button:not([disabled]):not([tabindex="-1"])',
@@ -14,6 +134,8 @@ const FOCUSABLE_SELECTOR = Array.join([
     'textarea:not([disabled]):not([tabindex="-1"])',
     '[tabindex]:not([tabindex="-1"])',
 ], ', ');
+const isVisibleAndInteractiveElement = (element) => element.closest('[hidden], [inert]') === null &&
+    element.checkVisibility({ visibilityProperty: true });
 const isFocusableElement = (element) => {
     if (!(element instanceof HTMLElement)) {
         return false;
@@ -27,12 +149,18 @@ const isFocusableElement = (element) => {
     if (element.tabIndex < 0 && !element.hasAttribute('tabindex')) {
         return false;
     }
-    if (element.closest('[hidden], [inert]') !== null) {
+    return isVisibleAndInteractiveElement(element);
+};
+const focusableElementsWithin = (root) => Array.filter(Array.fromIterable(root.querySelectorAll(FOCUSABLE_SELECTOR)), isFocusableElement);
+const isValidReturnFocus = (element) => {
+    if (!document.contains(element)) {
         return false;
     }
-    return element.checkVisibility({ visibilityProperty: true });
+    if (element instanceof HTMLDialogElement) {
+        return element.open && isVisibleAndInteractiveElement(element);
+    }
+    return isFocusableElement(element);
 };
-const focusableElementsWithin = (root) => Array.filter(Array.fromIterable(root.querySelectorAll(FOCUSABLE_SELECTOR)), isFocusableElement);
 const queryHTMLElement = (selector) => Effect.suspend(() => {
     const element = document.querySelector(selector);
     return element instanceof HTMLElement
@@ -101,7 +229,11 @@ export const focus = (selector, options) => Effect.gen(function* () {
  * a `CustomEvent` named `cancel`, distinguishing it from native `cancel` events
  * while preserving the dialog event contract. Uses `show()` instead of
  * `showModal()` so that DevTools (and any other high-z-index overlay) remains
- * interactive. The Dialog component provides its own backdrop, scroll locking,
+ * interactive. Pass `isModal: true` to make the background inert and hide it
+ * from assistive technology. `allowedOutsideSelectors` keeps separate developer
+ * overlays available while modal isolation is active. Stacked modal dialogs
+ * isolate against the topmost one, and closing it restores the dialog beneath.
+ * The Dialog component provides its own backdrop, scroll locking,
  * and transitions. Fails with `ElementNotFound` if the selector does not match
  * an `HTMLDialogElement`.
  *
@@ -110,12 +242,16 @@ export const focus = (selector, options) => Effect.gen(function* () {
  * falls back to the first focusable descendant and then to the dialog itself.
  *
  * Records the element that had focus when the dialog opened so `closeDialog`
- * can return focus there, the way `showModal()` would natively.
+ * can return focus there, the way `showModal()` would natively. Resolves to
+ * `true` when it installs the dialog resources, or `false` when that id already
+ * holds them. The latter makes concurrent lifecycle recovery and application
+ * Commands safe without duplicating focus traps or stack entries.
  *
  * @example
  * ```typescript
  * Dom.showDialog('#my-dialog')
  * Dom.showDialog('#my-dialog', { focusSelector: '#search-input' })
+ * Dom.showDialog('#my-dialog', { isModal: true })
  * ```
  */
 export const showDialog = (selector, options) => Effect.gen(function* () {
@@ -125,17 +261,28 @@ export const showDialog = (selector, options) => Effect.gen(function* () {
         return yield* Effect.fail(new ElementNotFound({ selector }));
     }
     const { id } = element;
+    const maybeDialogRuntime = yield* Effect.serviceOption(DialogRuntime);
+    const existingHygiene = dialogHygieneById.get(id);
+    if (existingHygiene !== undefined) {
+        return false;
+    }
     element.style.position = 'fixed';
     element.style.inset = '0';
-    openDialogCount++;
-    element.style.zIndex = String(BASE_DIALOG_Z_INDEX + openDialogCount);
     const previouslyFocused = document.activeElement;
     const returnFocus = previouslyFocused instanceof HTMLElement &&
         previouslyFocused !== document.body
         ? previouslyFocused
         : undefined;
     element.show();
-    openDialogStack = Array.append(Array.filter(openDialogStack, dialog => dialog.element !== element), { id, element });
+    openDialogCount++;
+    element.style.zIndex = String(BASE_DIALOG_Z_INDEX + openDialogCount);
+    openDialogStack = Array.append(Array.filter(openDialogStack, dialog => dialog.element !== element), {
+        id,
+        element,
+        isModal: options?.isModal ?? false,
+        allowedOutsideSelectors: options?.allowedOutsideSelectors ?? [],
+    });
+    synchronizeModalIsolation();
     const handleKeydown = (event) => {
         if (!element.open) {
             return;
@@ -157,10 +304,17 @@ export const showDialog = (selector, options) => Effect.gen(function* () {
     document.addEventListener('keydown', handleKeydown);
     dialogHygieneById.set(id, {
         removeKeydownListener: () => document.removeEventListener('keydown', handleKeydown),
+        unregisterOwner: Option.isSome(maybeDialogRuntime)
+            ? () => maybeDialogRuntime.value.unregister(id)
+            : undefined,
         returnFocus,
     });
+    if (Option.isSome(maybeDialogRuntime)) {
+        maybeDialogRuntime.value.register(id);
+    }
     const focusTarget = findDialogFocusTarget(element, options?.focusSelector);
     focusTarget.focus();
+    return true;
 });
 const findDialogFocusTarget = (dialog, focusSelector) => {
     if (focusSelector !== undefined) {
@@ -196,9 +350,10 @@ const trapFocusWithinDialog = (event, dialog) => {
 };
 /**
  * Closes a dialog element using `.close()`.
- * Cleans up the keyboard handlers installed by `showDialog` and restores focus to
- * the element that was focused before the dialog opened (the trigger, or the
- * dialog beneath it when closing a stacked dialog).
+ * Cleans up the keyboard handlers installed by `showDialog`, restores modal
+ * background isolation, and then returns focus to the element that was focused
+ * before the dialog opened (the trigger, or the dialog beneath it when closing
+ * a stacked dialog).
  * Resolves to `true` when it released the keyboard handlers, the return
  * focus, and the stack entry.
  * Resolves to `false` when the dialog held none, for example when the close
@@ -224,23 +379,46 @@ const releaseDialogHygieneById = (id) => {
     if (hygiene === undefined) {
         return false;
     }
+    const maybeReleasedDialog = Array.findFirst(openDialogStack, dialog => dialog.id === id);
+    const isTopmost = Option.exists(Array.last(openDialogStack), dialog => dialog.id === id);
+    if (Option.isSome(maybeReleasedDialog)) {
+        for (const openDialog of openDialogStack) {
+            if (openDialog.id === id) {
+                continue;
+            }
+            const openHygiene = dialogHygieneById.get(openDialog.id);
+            const openReturnFocus = openHygiene?.returnFocus;
+            if (openHygiene !== undefined &&
+                openReturnFocus !== undefined &&
+                maybeReleasedDialog.value.element.contains(openReturnFocus)) {
+                dialogHygieneById.set(openDialog.id, {
+                    ...openHygiene,
+                    returnFocus: hygiene.returnFocus,
+                });
+            }
+        }
+    }
     openDialogStack = Array.filter(openDialogStack, dialog => dialog.id !== id);
+    synchronizeModalIsolation();
     openDialogCount = Math.max(0, Number.decrement(openDialogCount));
     hygiene.removeKeydownListener();
     dialogHygieneById.delete(id);
+    hygiene.unregisterOwner?.();
     const { returnFocus } = hygiene;
-    if (returnFocus !== undefined && document.contains(returnFocus)) {
+    if (isTopmost &&
+        returnFocus !== undefined &&
+        isValidReturnFocus(returnFocus)) {
         returnFocus.focus();
     }
     return true;
 };
 /**
  * Releases the framework hygiene a dialog holds while open: the focus-trap
- * keyboard handler, the recorded return focus, the dialog stack entry, the
- * z-index counter, and one page scroll lock. Use this as a backstop for the
- * case where a dialog's element is removed from the DOM without a purposeful
- * close, the classic example being navigation away from a route-keyed subtree
- * that contains the dialog. The normal close path already releases these.
+ * keyboard handler, modal background isolation, the recorded return focus,
+ * the dialog stack entry, the z-index counter, and one page scroll lock.
+ * Use this when the element is removed without a close Message, such as
+ * navigation away from a route-keyed subtree. The runtime also calls it
+ * directly on disposal. The normal close path already releases these.
  * That path is `closeDialog` first, then the Dialog component's scroll unlock
  * when `closeDialog` reports a release. This function is the cleanup for the
  * case where no close Message ever reaches `update`.

package/dist/dom/inert.d.ts

@@ -1,4 +1,12 @@
 import { Effect } from 'effect';
+type InertAttribute = 'aria-hidden' | 'inert';
+export declare const makeOutsideIsolation: () => Readonly<{
+    update: (allowedElements: ReadonlyArray<HTMLElement>) => void;
+    contains: (element: HTMLElement) => boolean;
+    recordAttributeMutation: (element: HTMLElement, attributeName: InertAttribute) => void;
+    dispose: () => void;
+}>;
+export declare const isolateOutsideElements: (allowedElements: ReadonlyArray<HTMLElement>) => (() => void);
 /**
  * Marks all DOM elements outside the given selectors as `inert` and
  * `aria-hidden="true"`. Walks each allowed element up to `document.body`,
@@ -23,4 +31,5 @@ export declare const inertOthers: (id: string, allowedSelectors: ReadonlyArray<s
  * ```
  */
 export declare const restoreInert: (id: string) => Effect.Effect<void>;
+export {};
 //# sourceMappingURL=inert.d.ts.map

package/dist/dom/inert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inert.d.ts","sourceRoot":"","sources":["../../src/dom/inert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA2C,MAAM,QAAQ,CAAA;AA0F/E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,WAAW,OAClB,MAAM,oBACQ,aAAa,CAAC,MAAM,CAAC,KACtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAyBjB,CAAA;AAEJ;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,OAAQ,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAUxD,CAAA"}
+{"version":3,"file":"inert.d.ts","sourceRoot":"","sources":["../../src/dom/inert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA2C,MAAM,QAAQ,CAAA;AAc/E,KAAK,cAAc,GAAG,aAAa,GAAG,OAAO,CAAA;AAoH7C,eAAO,MAAM,oBAAoB,QAAO,QAAQ,CAAC;IAC/C,MAAM,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,WAAW,CAAC,KAAK,IAAI,CAAA;IAC7D,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAA;IAC3C,uBAAuB,EAAE,CACvB,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,cAAc,KAC1B,IAAI,CAAA;IACT,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,CAyCA,CAAA;AAED,eAAO,MAAM,sBAAsB,oBAChB,aAAa,CAAC,WAAW,CAAC,KAC1C,CAAC,MAAM,IAAI,CAKb,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,WAAW,OAClB,MAAM,oBACQ,aAAa,CAAC,MAAM,CAAC,KACtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAiBjB,CAAA;AAEJ;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,OAAQ,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAUxD,CAAA"}

package/dist/dom/inert.js

@@ -39,6 +39,24 @@ const markNotInert = (element) => {
         inertState.counts.set(element, Number.decrement(count));
     }
 };
+const recordCurrentAttribute = (element, attributeName) => {
+    const original = inertState.originals.get(element);
+    if (original === undefined) {
+        return;
+    }
+    if (attributeName === 'aria-hidden') {
+        inertState.originals.set(element, {
+            ...original,
+            ariaHidden: element.getAttribute('aria-hidden'),
+        });
+    }
+    else {
+        inertState.originals.set(element, {
+            ...original,
+            inert: element.inert,
+        });
+    }
+};
 const resolveElements = (selectors) => Array.filterMap(selectors, selector => Result.liftPredicate(document.querySelector(selector), (element) => element instanceof HTMLElement, () => undefined));
 const ancestorsUpToBody = (element) => Array.unfold(element.parentElement, current => Predicate.isNotNull(current)
     ? Option.some([
@@ -50,6 +68,61 @@ const inertableSiblings = (parent, allowedElements) => pipe(parent.children, Arr
     !Array.some(allowedElements, allowed => child.contains(allowed))
     ? Result.succeed(child)
     : Result.failVoid));
+const outsideCandidates = (allowedElements) => {
+    const candidates = new Set();
+    for (const allowedElement of allowedElements) {
+        for (const ancestor of ancestorsUpToBody(allowedElement)) {
+            for (const sibling of inertableSiblings(ancestor, allowedElements)) {
+                candidates.add(sibling);
+            }
+        }
+    }
+    return candidates;
+};
+export const makeOutsideIsolation = () => {
+    const cleanups = new Map();
+    return {
+        update: allowedElements => {
+            const candidates = outsideCandidates(allowedElements);
+            for (const [element, cleanup] of cleanups) {
+                if (!candidates.has(element)) {
+                    cleanup();
+                    cleanups.delete(element);
+                }
+            }
+            for (const element of candidates) {
+                if (!cleanups.has(element)) {
+                    cleanups.set(element, markInert(element));
+                }
+                else {
+                    if (element.getAttribute('aria-hidden') !== 'true') {
+                        element.setAttribute('aria-hidden', 'true');
+                    }
+                    if (!element.inert) {
+                        element.inert = true;
+                    }
+                }
+            }
+        },
+        contains: element => cleanups.has(element),
+        recordAttributeMutation: (element, attributeName) => {
+            if (cleanups.has(element)) {
+                recordCurrentAttribute(element, attributeName);
+            }
+        },
+        dispose: () => {
+            for (const cleanup of cleanups.values()) {
+                cleanup();
+            }
+            cleanups.clear();
+        },
+    };
+};
+export const isolateOutsideElements = (allowedElements) => {
+    const isolation = makeOutsideIsolation();
+    isolation.update(allowedElements);
+    return isolation.dispose;
+};
 /**
  * Marks all DOM elements outside the given selectors as `inert` and
  * `aria-hidden="true"`. Walks each allowed element up to `document.body`,
@@ -73,8 +146,7 @@ export const inertOthers = (id, allowedSelectors) => Effect.gen(function* () {
         return;
     }
     const allowedElements = resolveElements(allowedSelectors);
-    const cleanupFunctions = pipe(allowedElements, Array.flatMap(ancestorsUpToBody), Array.flatMap(ancestor => Array.map(inertableSiblings(ancestor, allowedElements), markInert)));
-    inertState.cleanups.set(id, cleanupFunctions);
+    inertState.cleanups.set(id, [isolateOutsideElements(allowedElements)]);
 });
 /**
  * Restores all elements previously marked inert by `inertOthers` for the

package/dist/managedResource/managedResource.d.ts

@@ -224,12 +224,54 @@ export declare const lift: <Resources extends Record<string, Entry<any, any, Opt
     readonly toChildModel: (parentModel: ParentModel) => Option.Option<ChildModelOf<Resources>>;
     readonly toParentMessage: (message: ChildMessageOf<Resources>) => ParentMessage;
 }) => { readonly [Key in keyof Resources]: Resources[Key] extends Entry<any, any, infer Requirements, infer Value, infer Service, infer OnAcquired extends (...args: ReadonlyArray<any>) => any> ? Entry<ParentModel, ParentMessage, Requirements, Value, Service, (...args: Parameters<OnAcquired>) => ParentMessage> : never; };
-type MergeRecords<Records extends ReadonlyArray<unknown>> = Records extends readonly [infer Head, ...infer Rest] ? Head & (Rest extends ReadonlyArray<unknown> ? MergeRecords<Rest> : {}) : {};
+type RuntimeKey<Key> = Key extends string ? Key : Key extends number ? `${Key}` : never;
+type RuntimeEntries<RecordType> = {
+    readonly [Key in keyof RecordType as RuntimeKey<Key>]: RecordType[Key];
+};
+type MergeRecords<Records extends ReadonlyArray<unknown>> = Records extends readonly [infer Head, ...infer Rest] ? RuntimeEntries<Head> & (Rest extends ReadonlyArray<unknown> ? MergeRecords<Rest> : {}) : {};
+type AnyResources = Readonly<Record<string, Entry<any, any, any, any, any>>>;
+type AnyResourcesList = readonly [AnyResources, ...ReadonlyArray<AnyResources>];
+type EntriesOfRecord<ResourcesRecord> = ResourcesRecord extends unknown ? ResourcesRecord[keyof ResourcesRecord] : never;
+type ModelOfEntry<AnyEntry> = [AnyEntry] extends [
+    Entry<infer Model, any, any, any, any>
+] ? unknown extends Model ? never : Model : never;
+type MessageOfEntry<AnyEntry> = AnyEntry extends Entry<any, infer Message, any, any, any> ? Message : never;
+type MessageOf<Records extends AnyResourcesList> = MessageOfEntry<EntriesOfRecord<Records[number]>>;
+type ReferenceModel<Records extends ReadonlyArray<AnyResources>> = Records extends readonly [
+    infer Head extends AnyResources,
+    ...infer Rest extends ReadonlyArray<AnyResources>
+] ? [ModelOfEntry<EntriesOfRecord<Head>>] extends [never] ? ReferenceModel<Rest> : ModelOfEntry<EntriesOfRecord<Head>> : never;
+type CompatibleResources<Records extends AnyResourcesList> = {
+    readonly [Index in keyof Records]: Records[Index] & Readonly<Record<string, Entry<ReferenceModel<Records>, MessageOf<Records>, any, any, any>>>;
+};
 /**
  * Combines multiple Managed Resources records into one. Throws on duplicate
  * keys so a misconfigured aggregate fails loudly at startup rather than
  * silently overriding.
+ *
+ * Pass the records directly and the Model and Message are read off them. The
+ * Model of the first record is the one every later record is checked against,
+ * so a record from another Model universe fails at its own argument position.
+ * Message widens to the union across all records.
+ *
+ * The result keeps each record's keys, each entry's requirements schema and
+ * resource service, and the arity of each `onAcquired` handler. Read the
+ * service union off the result with {@link ServicesOf}.
+ *
+ * The curried form remains available for a record that has to be typed before
+ * its entries exist, such as a value annotated at a module boundary.
+ *
+ * @example
+ * ```ts
+ * const managedResources = ManagedResource.aggregate(
+ *   playgroundManagedResources,
+ *   notePlayerManagedResources,
+ * )
+ * ```
  */
-export declare const aggregate: <Model, Message>() => <Records extends ReadonlyArray<Record<string, Entry<Model, Message, any, any, any>>>>(...records: Records) => MergeRecords<Records>;
+export declare const aggregate: {
+    <Model, Message>(): <Records extends ReadonlyArray<Record<string, Entry<Model, Message, any, any, any>>>>(...records: Records) => MergeRecords<Records>;
+    <Records extends AnyResourcesList>(...records: CompatibleResources<Records>): MergeRecords<Records>;
+};
 export {};
 //# sourceMappingURL=managedResource.d.ts.map

package/dist/managedResource/managedResource.d.ts.map

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

package/dist/managedResource/managedResource.js

@@ -1,4 +1,4 @@
-import { Context, Data, Effect, Option, Record, Ref, } from 'effect';
+import { Array, Context, Data, Effect, Option, Record, Ref, } from 'effect';
 /** Typed error raised when a command accesses a managed resource that is not currently acquired. */
 export class ResourceNotAvailable extends Data.TaggedError('ResourceNotAvailable') {
 }
@@ -144,22 +144,52 @@ Record.map(resources, resource => ({
     onReleased: () => config.toParentMessage(resource.onReleased()),
     onAcquireError: (error) => config.toParentMessage(resource.onAcquireError(error)),
 }));
-/**
- * Combines multiple Managed Resources records into one. Throws on duplicate
- * keys so a misconfigured aggregate fails loudly at startup rather than
- * silently overriding.
- */
-export const aggregate = () => (...records) => {
+const mergeResources = (records) => {
     const result = {};
     for (const record of records) {
         for (const key of Object.keys(record)) {
             if (Object.hasOwn(result, key)) {
                 throw new Error(`ManagedResource.aggregate: duplicate key "${key}" across records`);
             }
-            /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-            result[key] = record[key];
+            Object.defineProperty(result, key, {
+                configurable: true,
+                enumerable: true,
+                value: record[key],
+                writable: true,
+            });
         }
     }
-    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
     return result;
 };
+/**
+ * Combines multiple Managed Resources records into one. Throws on duplicate
+ * keys so a misconfigured aggregate fails loudly at startup rather than
+ * silently overriding.
+ *
+ * Pass the records directly and the Model and Message are read off them. The
+ * Model of the first record is the one every later record is checked against,
+ * so a record from another Model universe fails at its own argument position.
+ * Message widens to the union across all records.
+ *
+ * The result keeps each record's keys, each entry's requirements schema and
+ * resource service, and the arity of each `onAcquired` handler. Read the
+ * service union off the result with {@link ServicesOf}.
+ *
+ * The curried form remains available for a record that has to be typed before
+ * its entries exist, such as a value annotated at a module boundary.
+ *
+ * @example
+ * ```ts
+ * const managedResources = ManagedResource.aggregate(
+ *   playgroundManagedResources,
+ *   notePlayerManagedResources,
+ * )
+ * ```
+ */
+export const aggregate = ((...records) => {
+    return Array.match(records, {
+        onEmpty: () => (...curriedRecords) => mergeResources(curriedRecords),
+        onNonEmpty: mergeResources,
+    });
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+});

package/dist/runtime/devToolsIntegration.d.ts

@@ -7,10 +7,13 @@ export type MountEvents = Readonly<{
     starts: ReadonlyArray<MountRecord>;
     ends: ReadonlyArray<MountRecord>;
 }>;
-/** What the DevTools history keeps about a Command: its name and arguments. */
+/** A Command invocation and its runtime-local identity for DevTools history. */
 export type RecordableCommand = Readonly<{
-    name: string;
-    args?: Record<string, unknown>;
+    id: number;
+    command: Readonly<{
+        name: string;
+        args?: Record<string, unknown>;
+    }>;
 }>;
 /** The replay bridge the render side hands the store when it is installed. */
 export type DevToolsRenderBridge = Readonly<{
@@ -27,6 +30,7 @@ export type DevToolsRenderBridge = Readonly<{
  * helpers no-op until the store exists.
  */
 export type DevToolsIntegration<Model, Message> = Readonly<{
+    isRecordingCommands: boolean;
     mountTracker: typeof MountTracker.Service;
     mountRuntime: typeof MountRuntime.Service;
     drainMountEvents: () => MountEvents;
@@ -37,6 +41,7 @@ export type DevToolsIntegration<Model, Message> = Readonly<{
     resumeDevTools: Effect.Effect<void>;
     recordInit: (initModel: Model, initCommands: ReadonlyArray<RecordableCommand>) => Effect.Effect<void>;
     recordMessage: (message: Message, currentModel: Model, nextModel: Model, commands: ReadonlyArray<RecordableCommand>) => void;
+    recordCommandResult: (id: number, message: Message) => void;
     attachRenderedMounts: () => void;
 }>;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"devToolsIntegration.d.ts","sourceRoot":"","sources":["../../src/runtime/devToolsIntegration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EAIN,KAAK,KAAK,EAGX,MAAM,QAAQ,CAAA;AAEf,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,KAAK,SAAS,EAEf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EACL,KAAK,cAAc,EAKpB,MAAM,qBAAqB,CAAA;AAE5B,+DAA+D;AAC/D,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;IAClC,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;CACjC,CAAC,CAAA;AAEF,+EAA+E;AAC/E,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B,CAAC,CAAA;AAEF,8EAA8E;AAC9E,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrD,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CACvC,CAAC,CAAA;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC;IACzD,YAAY,EAAE,OAAO,YAAY,CAAC,OAAO,CAAA;IACzC,YAAY,EAAE,OAAO,YAAY,CAAC,OAAO,CAAA;IACzC,gBAAgB,EAAE,MAAM,WAAW,CAAA;IACnC,aAAa,EAAE,MAAM,SAAS,CAAA;IAC9B,YAAY,EAAE,CAAC,aAAa,EAAE,SAAS,KAAK,IAAI,CAAA;IAChD,WAAW,EAAE,MAAM,OAAO,CAAA;IAC1B,oBAAoB,EAAE,CACpB,MAAM,EAAE,oBAAoB,KACzB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC5C,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACnC,UAAU,EAAE,CACV,SAAS,EAAE,KAAK,EAChB,YAAY,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,aAAa,EAAE,CACb,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,KAAK,EACnB,SAAS,EAAE,KAAK,EAChB,QAAQ,EAAE,aAAa,CAAC,iBAAiB,CAAC,KACvC,IAAI,CAAA;IACT,oBAAoB,EAAE,MAAM,IAAI,CAAA;CACjC,CAAC,CAAA;AAOF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,KAAK,EAAE,OAAO,iEAKnD,QAAQ,CAAC;IACV,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,QAAQ,CAAC;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAA;IACtE,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,KAAK,CAAA;IACzC,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAChE,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAuOlD,CAAA"}
+{"version":3,"file":"devToolsIntegration.d.ts","sourceRoot":"","sources":["../../src/runtime/devToolsIntegration.ts"],"names":[],"mappings":"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"}