dirvi-lib 0.11.0-beta.6 → 0.11.0-beta.7

package/dist/app/app-api.d.ts

@@ -1,4 +1,6 @@
-import type { CursorApi, FoldsApi, NavNodeApi, SerializableKey, StateApi, TreeNode, TreeNodeApi } from '../trees/index.js';
+import type { NavMethods, SerializableKey, StateApi } from '../state-and-nav/index.js';
+import type { PresentNode } from './node-presentation.js';
+import { TreeNode } from '../state-and-nav/index.js';
 /**
  * Application-specific tree dependencies and operations.
  *
@@ -15,24 +17,21 @@ export type AppApi<Id extends SerializableKey, Value, ViewKey = string> = Readon
      * Name used to distinguish a particular application instance.
      */
     name: string;
-    /**
-     * ID used for the application's root node.
-     */
-    rootId: Id;
     /**
      * Loads direct children for the branch addressed by `path`.
      *
      * Returned nodes must be opaque tree values created or decoded through this
      * application's TreeNodeApi specialization.
      */
-    loadBranches: (path: readonly Id[]) => Promise<readonly TreeNode<Id, Value>[]>;
+    loadChildren: (path: readonly Id[]) => Promise<readonly TreeNode<Id, Value>[]>;
     /**
      * Creates the application's root node.
      *
      * Invariant: the returned node is an open branch. That invariant is checked
      * when an initial State is created.
      */
-    createRoot: () => Promise<TreeNode<Id, Value>>;
+    loadRoot: () => Promise<TreeNode<Id, Value>>;
+    presentNode: PresentNode<Id>;
     /**
      * Subscribes to external data changes that require tree state to be loaded
      * again.
@@ -40,27 +39,10 @@ export type AppApi<Id extends SerializableKey, Value, ViewKey = string> = Readon
      * Returns an unsubscribe function.
      */
     subscribeToResync: (listener: () => void) => () => void;
-    /**
-     * Generic structural operations for this application's buffer tree.
-     */
-    treeNodeApi: TreeNodeApi<Id, Value>;
-    /**
-     * Semantic fold-state operations.
-     *
-     * This remains temporarily available while FoldNode itself is migrated.
-     */
-    foldsApi: FoldsApi<Id>;
-    cursorApi: CursorApi<Id>;
     stateApi: StateApi<Id, Value>;
     /**
      * UI navigation projection and cursor-navigation operations.
      */
-    navNodeApi: NavNodeApi<Id, Value>;
-}>;
-export type AppStateApis<Id extends SerializableKey, Value> = Readonly<{
-    treeNodeApi: TreeNodeApi<Id, Value>;
-    cursorApi: CursorApi<Id>;
-    stateApi: StateApi<Id, Value>;
+    navMethods: NavMethods<Id, Value>;
 }>;
-export declare function createAppStateApis<Id extends SerializableKey, Value>(): AppStateApis<Id, Value>;
 //# sourceMappingURL=app-api.d.ts.map

package/dist/app/app-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-api.d.ts","sourceRoot":"","sources":["../../src/app/app-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,UAAU,EACV,eAAe,EAEf,QAAQ,EACR,QAAQ,EACR,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAO3B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,MAAM,CAChB,EAAE,SAAS,eAAe,EAC1B,KAAK,EACL,OAAO,GAAG,MAAM,IACd,QAAQ,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,EAAE,CAAC;IAEX;;;;;OAKG;IACH,YAAY,EAAE,CACZ,IAAI,EAAE,SAAS,EAAE,EAAE,KAChB,OAAO,CAAC,SAAS,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAE7C;;;;;OAKG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAExD;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAEpC;;;;OAIG;IACH,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvB,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAEzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAE9B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAKnC,CAAC,CAAC;AAEH,MAAM,MAAM,YAAY,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAAI,QAAQ,CAAC;IACrE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACpC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAC/B,CAAC,CAAC;AAEH,wBAAgB,kBAAkB,CAChC,EAAE,SAAS,eAAe,EAC1B,KAAK,KACF,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAU3B"}
+{"version":3,"file":"app-api.d.ts","sourceRoot":"","sources":["../../src/app/app-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,QAAQ,EACT,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD;;;;;;;;;;GAUG;AACH,MAAM,MAAM,MAAM,CAChB,EAAE,SAAS,eAAe,EAC1B,KAAK,EACL,OAAO,GAAG,MAAM,IACd,QAAQ,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,YAAY,EAAE,CACZ,IAAI,EAAE,SAAS,EAAE,EAAE,KAChB,OAAO,CAAC,SAAS,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAE7C,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAExD,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAE9B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CACnC,CAAC,CAAC"}

package/dist/app/app-api.js

@@ -1,11 +1 @@
-import { createCursorApi, createStateApi, createTreeNodeApi, } from '../trees/index.js';
-export function createAppStateApis() {
-    const treeNodeApi = createTreeNodeApi();
-    const cursorApi = createCursorApi();
-    const stateApi = createStateApi(treeNodeApi, cursorApi);
-    return {
-        treeNodeApi,
-        cursorApi,
-        stateApi,
-    };
-}
+export {};

package/dist/app/index.d.ts

@@ -1,4 +1,5 @@
 export * from './app-api.js';
+export * from './node-presentation.js';
 export * from './reducer/effect-to-action.js';
 export * from './reducer/reducer.js';
 export * from './reducer/reducer-action.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,eAAe,CAAC"}

package/dist/app/index.js

@@ -1,4 +1,5 @@
 export * from './app-api.js';
+export * from './node-presentation.js';
 export * from './reducer/effect-to-action.js';
 export * from './reducer/reducer.js';
 export * from './reducer/reducer-action.js';

package/dist/app/node-presentation.d.ts

@@ -0,0 +1,13 @@
+import type { SerializableKey } from '../state-and-nav/index.js';
+/**
+ * A semantic highlight name, not a concrete terminal color.
+ *
+ * Dot-separated names allow fallback to broader categories:
+ * "filesystem.directory" can fall back to "filesystem".
+ */
+export type HighlightToken = string;
+export type PresentNode<Id extends SerializableKey> = (id: Id, isBranch: boolean) => Readonly<{
+    content: string;
+    highlight: HighlightToken;
+}>;
+//# sourceMappingURL=node-presentation.d.ts.map

package/dist/app/node-presentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-presentation.d.ts","sourceRoot":"","sources":["../../src/app/node-presentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,WAAW,CAAC,EAAE,SAAS,eAAe,IAAI,CACpD,EAAE,EAAE,EAAE,EACN,QAAQ,EAAE,OAAO,KACd,QAAQ,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC"}

package/dist/app/reducer/effect-to-action.d.ts

@@ -1,4 +1,4 @@
-import type { CursorApi, FoldsApi, NavBranch, NavNodeApi, SerializableKey, State } from '../../trees/index.js';
+import type { NavBranch, NavMethods, SerializableKey, State, StateApi } from '../../state-and-nav/index.js';
 import type { EffectAction } from '../../input/domain/index.js';
 import type { ReducerAction } from './reducer-action.js';
 export type EffectToActionResult<Id extends SerializableKey, Value> = Readonly<{
@@ -11,5 +11,5 @@ export type EffectToActionResult<Id extends SerializableKey, Value> = Readonly<{
     kind: 'ignored';
 }>;
 export type EffectToAction<Id extends SerializableKey, Value> = (effectAction: EffectAction<Id, Value>, navigation: NavBranch<Id>, state: State<Id, Value>) => EffectToActionResult<Id, Value>;
-export declare function createEffectToAction<Id extends SerializableKey, Value>(foldsApi: FoldsApi<Id>, cursorApi: CursorApi<Id>, navNodeApi: NavNodeApi<Id, Value>): EffectToAction<Id, Value>;
+export declare function createEffectToAction<Id extends SerializableKey, Value>(stateApi: StateApi<Id, Value>, navNodeApi: NavMethods<Id, Value>): EffectToAction<Id, Value>;
 //# sourceMappingURL=effect-to-action.d.ts.map

package/dist/app/reducer/effect-to-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"effect-to-action.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/effect-to-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAGT,QAAQ,EACR,SAAS,EACT,UAAU,EACV,eAAe,EACf,KAAK,EACN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAC9D,QAAQ,CAAC;IACP,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAClC,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEP,MAAM,MAAM,cAAc,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAAI,CAC9D,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,EACrC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,EACzB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KACpB,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAoDrC,wBAAgB,oBAAoB,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACpE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,EACtB,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,GAChC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAsO3B"}
+{"version":3,"file":"effect-to-action.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/effect-to-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,SAAS,EACT,UAAU,EACV,eAAe,EACf,KAAK,EACL,QAAQ,EACT,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAC9D,QAAQ,CAAC;IACP,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAClC,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,GACF,QAAQ,CAAC;IACP,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEP,MAAM,MAAM,cAAc,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAAI,CAC9D,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,EACrC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,EACzB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KACpB,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAqDrC,wBAAgB,oBAAoB,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACpE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,GAChC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CA8S3B"}

package/dist/app/reducer/effect-to-action.js

@@ -10,7 +10,7 @@ function resolveFoldTreeIndex(foldsApi, folds, foldTree) {
                     kind: 'notFound',
                     message: `Fold tree at index ${foldTree.index} not found.`,
                 };
-        case 'name':
+        case 'name': {
             const index = foldsApi.getIndexByName(folds, foldTree.name);
             return index === undefined
                 ? {
@@ -21,13 +21,15 @@ function resolveFoldTreeIndex(foldsApi, folds, foldTree) {
                     kind: 'found',
                     index,
                 };
+        }
         default: {
             const _exhaustive = foldTree;
             throw new Error(`Unhandled fold tree reference: ${JSON.stringify(_exhaustive)}`);
         }
     }
 }
-export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
+export function createEffectToAction(stateApi, navNodeApi) {
+    const { cursorApi, foldsApi } = stateApi;
     function action(reducerAction) {
         return {
             kind: 'action',
@@ -46,23 +48,25 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
         };
     }
     function effectToAction(effectAction, navigation, state) {
+        const cursor = stateApi.getCursor(state);
+        const folds = stateApi.getFolds(state);
         switch (effectAction.effectActionType) {
             case 'nextEntry': {
-                const cursor = navNodeApi.nextCursor(navigation, state.cursor);
-                return cursor === undefined
+                const nextCursor = navNodeApi.nextCursor(navigation, cursor);
+                return nextCursor === undefined
                     ? ignored()
                     : action({
                         kind: 'changeCursor',
-                        cursor,
+                        cursor: nextCursor,
                     });
             }
             case 'prevEntry': {
-                const cursor = navNodeApi.previousCursor(navigation, state.cursor);
-                return cursor === undefined
+                const previousCursor = navNodeApi.previousCursor(navigation, cursor);
+                return previousCursor === undefined
                     ? ignored()
                     : action({
                         kind: 'changeCursor',
-                        cursor,
+                        cursor: previousCursor,
                     });
             }
             case 'setBranchEntries':
@@ -72,63 +76,113 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     entries: effectAction.entries,
                 });
             case 'navigateToParent': {
-                // TODO: navigation should be Loaded Branch instead to encode invariant
-                // in state
+                // TODO: Encode the loaded-root invariant in the navigation type.
                 const navNode = navigation.children;
                 if (navNode === null) {
                     return ignored();
                 }
-                const cursor = navNodeApi.parentCursor(navNode, state.cursor);
-                return cursor === undefined
+                const parentCursor = navNodeApi.parentCursor(navNode, cursor);
+                return parentCursor === undefined
                     ? ignored()
                     : action({
                         kind: 'changeCursor',
-                        cursor,
+                        cursor: parentCursor,
                     });
             }
             case 'addToFoldTree': {
-                const foldTree = resolveFoldTreeIndex(foldsApi, state.folds, effectAction.foldTree);
+                const foldTree = resolveFoldTreeIndex(foldsApi, folds, effectAction.foldTree);
                 if (foldTree.kind === 'notFound') {
                     return rejected(foldTree.message);
                 }
-                if (state.cursor.length === 0) {
+                // The root cannot be folded, and a fold marker is already folded.
+                if (!cursorApi.isNodeCursor(cursor) || cursor.path.length === 0) {
                     return ignored();
                 }
-                const cursor = navNodeApi.cursorAfterFold(navigation, state.cursor);
-                if (cursor === undefined) {
+                /*
+                 * Adding an entry to an inactive fold tree does not change the
+                 * navigation projection, so keep the cursor where it is.
+                 */
+                const nextCursor = foldsApi.isActiveAtIndex(folds, foldTree.index) === true
+                    ? navNodeApi.cursorAfterFold(navigation, cursor)
+                    : cursor;
+                if (nextCursor === undefined) {
                     return ignored();
                 }
                 return action({
                     kind: 'addToFoldTree',
-                    path: state.cursor,
-                    cursor,
+                    path: cursor.path,
+                    cursor: nextCursor,
                     foldTreeIndex: foldTree.index,
                 });
             }
             case 'removeFromFoldTree': {
-                const foldTree = resolveFoldTreeIndex(foldsApi, state.folds, effectAction.foldTree);
+                const foldTree = resolveFoldTreeIndex(foldsApi, folds, effectAction.foldTree);
                 if (foldTree.kind === 'notFound') {
                     return rejected(foldTree.message);
                 }
-                const currentPath = cursorApi.getPath(state.cursor);
                 const navNode = navigation.children;
-                // TODO: Should not be possible with update type
+                // TODO: Encode the loaded-root invariant in the navigation type.
                 if (navNode === null) {
                     return ignored();
                 }
-                const node = navNodeApi.getNodeAtPath(navNode, currentPath);
-                if (node === undefined || node.folded?.entries.length === 0) {
+                if (cursorApi.isFoldCursor(cursor)) {
+                    const parent = navNodeApi.getNodeAtPath(navNode, cursor.parentPath);
+                    const foldEntry = parent?.entries.find((entry) => {
+                        if (!navNodeApi.entryIsFold(entry)) {
+                            return false;
+                        }
+                        const firstEntry = entry.folded[0];
+                        return (firstEntry !== undefined &&
+                            !navNodeApi.entryIsFold(firstEntry) &&
+                            firstEntry.id === cursor.firstId);
+                    });
+                    if (foldEntry === undefined || !navNodeApi.entryIsFold(foldEntry)) {
+                        return ignored();
+                    }
+                    /*
+                     * Remove only this fold tree's contribution to the selected
+                     * ordered run. Other fold trees may still hide some entries.
+                     */
+                    const entryIds = [];
+                    for (const entry of foldEntry.folded) {
+                        if (!navNodeApi.entryIsFold(entry) &&
+                            foldsApi.isEntryHiddenInFoldAtPath(folds, foldTree.index, cursor.parentPath, entry.id)) {
+                            entryIds.push(entry.id);
+                        }
+                    }
+                    const firstId = entryIds[0];
+                    if (firstId === undefined) {
+                        return ignored();
+                    }
+                    return action({
+                        kind: 'removeFromFoldTree',
+                        path: cursor.parentPath,
+                        entryIds,
+                        cursor: {
+                            path: [...cursor.parentPath, firstId],
+                        },
+                        foldTreeIndex: foldTree.index,
+                    });
+                }
+                /*
+                 * In unordered navigation, folds are summarized on the selected
+                 * parent. Reveal all direct entries hidden by this fold tree there.
+                 */
+                const node = navNodeApi.getNodeAtPath(navNode, cursor.path);
+                const hasFoldedEntries = node?.entries.some((entry) => navNodeApi.entryIsFold(entry) && entry.folded.length > 0);
+                if (!hasFoldedEntries) {
                     return ignored();
                 }
                 return action({
                     kind: 'removeFromFoldTree',
-                    path: currentPath,
-                    cursor: state.cursor,
+                    path: cursor.path,
+                    entryIds: null,
+                    cursor,
                     foldTreeIndex: foldTree.index,
                 });
             }
             case 'fold': {
-                const foldTree = resolveFoldTreeIndex(foldsApi, state.folds, effectAction.foldTree);
+                const foldTree = resolveFoldTreeIndex(foldsApi, folds, effectAction.foldTree);
                 return foldTree.kind === 'notFound'
                     ? rejected(foldTree.message)
                     : action({
@@ -137,7 +191,7 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     });
             }
             case 'unfold': {
-                const foldTree = resolveFoldTreeIndex(foldsApi, state.folds, effectAction.foldTree);
+                const foldTree = resolveFoldTreeIndex(foldsApi, folds, effectAction.foldTree);
                 return foldTree.kind === 'notFound'
                     ? rejected(foldTree.message)
                     : action({
@@ -146,7 +200,7 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     });
             }
             case 'toggleFold': {
-                const foldTree = resolveFoldTreeIndex(foldsApi, state.folds, effectAction.foldTree);
+                const foldTree = resolveFoldTreeIndex(foldsApi, folds, effectAction.foldTree);
                 return foldTree.kind === 'notFound'
                     ? rejected(foldTree.message)
                     : action({
@@ -155,7 +209,7 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     });
             }
             case 'createFoldTree': {
-                const existingIndex = foldsApi.getIndexByName(state.folds, effectAction.name);
+                const existingIndex = foldsApi.getIndexByName(folds, effectAction.name);
                 return existingIndex === undefined
                     ? action({
                         kind: 'createFoldTree',
@@ -164,7 +218,7 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     : rejected(`Fold tree named "${effectAction.name}" already exists.`);
             }
             case 'deleteFoldTree': {
-                const foldTreeIndex = foldsApi.getIndexByName(state.folds, effectAction.name);
+                const foldTreeIndex = foldsApi.getIndexByName(folds, effectAction.name);
                 if (foldTreeIndex === undefined) {
                     return rejected(`Fold tree named "${effectAction.name}" not found.`);
                 }
@@ -176,9 +230,10 @@ export function createEffectToAction(foldsApi, cursorApi, navNodeApi) {
                     name: effectAction.name,
                 });
             }
-            default:
+            default: {
                 const _exhaustive = effectAction;
                 throw new Error(`Unhandled effect action: ${JSON.stringify(_exhaustive)}`);
+            }
         }
     }
     return effectToAction;

package/dist/app/reducer/reducer-action.d.ts

@@ -1,4 +1,4 @@
-import type { Cursor, SerializableKey, State, TreeNode } from '../../trees/index.js';
+import type { Cursor, FoldIndex, SerializableKey, State, TreeNode } from '../../state-and-nav/index.js';
 export type ReducerAction<Id extends SerializableKey, Value> = {
     kind: 'changeCursor';
     cursor: Cursor<Id>;
@@ -14,31 +14,37 @@ export type ReducerAction<Id extends SerializableKey, Value> = {
     kind: 'addToFoldTree';
     path: readonly Id[];
     cursor: Cursor<Id>;
-    foldTreeIndex: number;
+    foldTreeIndex: FoldIndex;
 } | {
     kind: 'removeFromFoldTree';
+    /** Parent branch containing the hidden entries. */
     path: readonly Id[];
+    /**
+     * null removes every direct hidden entry in this fold tree.
+     * An array removes only the specified entries of an inline fold run.
+     */
+    entryIds: readonly Id[] | null;
     cursor: Cursor<Id>;
-    foldTreeIndex: number;
+    foldTreeIndex: FoldIndex;
 } | {
     /**
      * Activates a fold tree, making its hidden entries contribute to the
      * visible navigation projection.
      */
     kind: 'fold';
-    foldTreeIndex: number;
+    foldTreeIndex: FoldIndex;
 } | {
     /**
      * Deactivates a fold tree while preserving its fold definition.
      */
     kind: 'unfold';
-    foldTreeIndex: number;
+    foldTreeIndex: FoldIndex;
 } | {
     /**
      * Inverts whether a fold tree contributes to hiding entries.
      */
     kind: 'toggleFold';
-    foldTreeIndex: number;
+    foldTreeIndex: FoldIndex;
 } | {
     kind: 'createFoldTree';
     name: string;

package/dist/app/reducer/reducer-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reducer-action.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/reducer-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EACf,KAAK,EACL,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IACvD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,OAAO,EAAE,SAAS,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC;CAChD,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}
+{"version":3,"file":"reducer-action.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/reducer-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EAAE,SAAS,EACjB,eAAe,EACf,KAAK,EACL,QAAQ,EACT,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IACvD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,OAAO,EAAE,SAAS,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC;CAChD,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,aAAa,EAAE,SAAS,CAAC;CAC1B,GACD;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,mDAAmD;IACnD,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IAEpB;;;OAGG;IACH,QAAQ,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,aAAa,EAAE,SAAS,CAAC;CAC1B,GACD;IACE;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,SAAS,CAAC;CAC1B,GACD;IACE;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,SAAS,CAAC;CAC1B,GACD;IACE;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,SAAS,CAAC;CAC1B,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/dist/app/reducer/reducer.d.ts

@@ -1,5 +1,7 @@
-import type { FoldsApi, SerializableKey, State, TreeNodeApi } from '../../trees/index.js';
+import type { NavMethods } from '../../state-and-nav/index.js';
+import type { SerializableKey } from '../../state-and-nav/index.js';
+import type { State, StateApi } from '../../state-and-nav/index.js';
 import type { ReducerAction } from './reducer-action.js';
 export type Reducer<Id extends SerializableKey, Value> = (state: State<Id, Value>, action: ReducerAction<Id, Value>) => State<Id, Value>;
-export declare function createReducer<Id extends SerializableKey, Value>(treeNodeApi: TreeNodeApi<Id, Value>, foldsApi: FoldsApi<Id>): Reducer<Id, Value>;
+export declare function createReducer<Id extends SerializableKey, Value>(stateApi: StateApi<Id, Value>, navNodeApi: NavMethods<Id, Value>): Reducer<Id, Value>;
 //# sourceMappingURL=reducer.d.ts.map

package/dist/app/reducer/reducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,KAAK,EACL,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAezD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAAI,CACvD,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,KAC7B,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAEtB,wBAAgB,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAC7D,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,EACnC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,GACrB,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CA+LpB"}
+{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../../src/app/reducer/reducer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EACV,eAAe,EAChB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAezD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,IAAI,CACvD,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,KAC7B,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;AAEtB,wBAAgB,aAAa,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAC7D,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,GAChC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAkRpB"}