@mak-98/dirvi-cli 0.7.0 → 0.8.0

package/dist/application/effect-to-action.d.ts

@@ -1,6 +1,6 @@
 import type { ReducerAction } from './reducer-action.js';
 import { SerializableKey, TreeNode, TreeNodeApi } from 'dirvi-lib/dist/tree-surfer/tree-node/tree-node.types.js';
-import { CursorApi, EffectAction, NavNode, NavNodeApi, State } from 'dirvi-lib';
-export type EffectToAction<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>> = (effectAction: EffectAction<Id, BufferNode>, navigation: NavNode<Id, BufferNode>, state: State<Id, BufferNode>) => ReducerAction<Id, BufferNode> | undefined;
-export declare function createEffectToAction<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(treeNodeApi: TreeNodeApi<Id, BufferNode>, cursorApi: CursorApi<Id>, navNodeApi: NavNodeApi<Id, BufferNode>): EffectToAction<Id, BufferNode>;
+import { CursorApi, EffectAction, NavBranch, NavNodeApi, State } from 'dirvi-lib';
+export type EffectToAction<Id extends SerializableKey, Node extends TreeNode<Id, Node>> = (effectAction: EffectAction<Id, Node>, navigation: NavBranch<Id>, state: State<Id, Node>) => ReducerAction<Id, Node> | undefined;
+export declare function createEffectToAction<Id extends SerializableKey, Node extends TreeNode<Id, Node>>(treeNodeApi: TreeNodeApi<Id, Node>, cursorApi: CursorApi<Id>, navNodeApi: NavNodeApi<Id, Node>): EffectToAction<Id, Node>;
 //# sourceMappingURL=effect-to-action.d.ts.map

package/dist/application/effect-to-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"effect-to-action.d.ts","sourceRoot":"","sources":["../../src/application/effect-to-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EACL,eAAe,EACf,QAAQ,EACR,WAAW,EACZ,MAAM,yDAAyD,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEhF,MAAM,MAAM,cAAc,CACxB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,IACzC,CACF,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE,UAAU,CAAC,EAC1C,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,EACnC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,KACzB,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,GAAG,SAAS,CAAC;AAE/C,wBAAgB,oBAAoB,CAClC,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAE3C,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,EACxC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,GACrC,cAAc,CAAC,EAAE,EAAE,UAAU,CAAC,CA+GhC"}
+{"version":3,"file":"effect-to-action.d.ts","sourceRoot":"","sources":["../../src/application/effect-to-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EACL,eAAe,EACf,QAAQ,EACR,WAAW,EACZ,MAAM,yDAAyD,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAW,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAE3F,MAAM,MAAM,cAAc,CACxB,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,IAC7B,CACF,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,EACpC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,EACzB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,KACnB,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;AAEzC,wBAAgB,oBAAoB,CAClC,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAE/B,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,EAClC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,GAC/B,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAgG1B"}

package/dist/application/effect-to-action.js

@@ -26,7 +26,11 @@ export function createEffectToAction(treeNodeApi, cursorApi, navNodeApi) {
                     entries: effectAction.entries,
                 };
             case 'navigateToParent': {
-                const cursor = navNodeApi.parentCursor(navigation, state.cursor);
+                const navNode = navigation.children;
+                if (navNode === null) {
+                    return undefined;
+                }
+                const cursor = navNodeApi.parentCursor(navNode, state.cursor);
                 return cursor === undefined
                     ? undefined
                     : {
@@ -35,12 +39,7 @@ export function createEffectToAction(treeNodeApi, cursorApi, navNodeApi) {
                     };
             }
             case 'fold': {
-                if (state.cursor.kind === 'fold') {
-                    return undefined;
-                }
-                const path = [...state.cursor.parentPath, state.cursor.entryId];
-                const entry = treeNodeApi.getAtPath(state.buffer, path, (node) => node);
-                if (entry === undefined) {
+                if (state.cursor.length === 0) {
                     return undefined;
                 }
                 const cursor = navNodeApi.cursorAfterFold(navigation, state.cursor);
@@ -49,36 +48,26 @@ export function createEffectToAction(treeNodeApi, cursorApi, navNodeApi) {
                 }
                 return {
                     kind: 'fold',
-                    parentPath: [...state.cursor.parentPath],
-                    entry,
+                    path: state.cursor,
                     cursor,
                 };
             }
             case 'unfold': {
-                if (state.cursor.kind !== 'fold') {
+                const currentPath = cursorApi.getPath(state.cursor);
+                const navNode = navigation.children;
+                if (navNode === null) {
                     return undefined;
                 }
-                const node = navNodeApi.getNodeAtPath(navigation, [
-                    ...state.cursor.parentPath,
-                ]);
-                if (node === undefined || node.foldedEntries.length === 0) {
+                const node = navNodeApi.getNodeAtPath(navNode, currentPath);
+                if (node === undefined || node.folded?.entries.length === 0) {
                     return undefined;
                 }
-                const firstFoldedEntry = node.foldedEntries[0];
                 return {
                     kind: 'unfold',
-                    parentPath: [...state.cursor.parentPath],
-                    cursor: {
-                        kind: 'entry',
-                        parentPath: state.cursor.parentPath,
-                        entryId: firstFoldedEntry.id,
-                    },
+                    path: currentPath,
+                    cursor: state.cursor,
                 };
             }
-            case 'toggleFold':
-                return effectToAction(state.cursor.kind === 'fold'
-                    ? { effectActionType: 'unfold' }
-                    : { effectActionType: 'fold' }, navigation, state);
         }
     }
     return effectToAction;

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

@@ -12,12 +12,11 @@ export type ReducerAction<Id extends SerializableKey, BufferNode extends TreeNod
     newState: State<Id, BufferNode>;
 } | {
     kind: 'fold';
-    parentPath: Id[];
-    entry: BufferNode;
+    path: readonly Id[];
     cursor: Cursor<Id>;
 } | {
     kind: 'unfold';
-    parentPath: Id[];
+    path: Id[];
     cursor: Cursor<Id>;
 };
 //# sourceMappingURL=reducer-action.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"reducer-action.d.ts","sourceRoot":"","sources":["../../src/application/reducer-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1E,MAAM,MAAM,aAAa,CACvB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,IAEzC;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC9B,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CACjC,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,CAAC"}
+{"version":3,"file":"reducer-action.d.ts","sourceRoot":"","sources":["../../src/application/reducer-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1E,MAAM,MAAM,aAAa,CACvB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,IAEzC;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC9B,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CACjC,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,EAAE,EAAE,CAAC;IACX,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,CAAC"}

package/dist/application/reducer.d.ts

@@ -1,5 +1,5 @@
 import { FoldNodeService, SerializableKey, State, TreeNode, TreeNodeApi } from 'dirvi-lib';
 import { ReducerAction } from './reducer-action.js';
 export type Reducer<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>> = (state: State<Id, BufferNode>, action: ReducerAction<Id, BufferNode>) => State<Id, BufferNode>;
-export declare function createReducer<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(treeNodeApi: TreeNodeApi<Id, BufferNode>, foldNodeService: FoldNodeService<Id>): Reducer<Id, BufferNode>;
+export declare function createReducer<Id extends SerializableKey, Node extends TreeNode<Id, Node>>(treeNodeApi: TreeNodeApi<Id, Node>, foldNodeService: FoldNodeService<Id>): Reducer<Id, Node>;
 //# sourceMappingURL=reducer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/application/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,eAAe,EACf,KAAK,EACL,QAAQ,EACR,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,OAAO,CACjB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,IACzC,CACF,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,EAC5B,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,KAClC,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;AAE3B,wBAAgB,aAAa,CAC3B,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAE3C,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,EACxC,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,GACnC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CA0FzB"}
+{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/application/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,KAAK,EACL,QAAQ,EACR,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,OAAO,CACjB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,IACzC,CACF,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,EAC5B,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,KAClC,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;AAE3B,wBAAgB,aAAa,CAC3B,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAE/B,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,EAClC,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,GACnC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAkGnB"}

package/dist/application/reducer.js

@@ -7,7 +7,7 @@ export function createReducer(treeNodeApi, foldNodeService) {
                     cursor: action.cursor,
                 };
             case 'updateBranch':
-                const buffer = treeNodeApi.modifyAtPath(state.buffer, action.path, (node) => {
+                const root = treeNodeApi.modifyAtPath(state.root, action.path, (node) => {
                     // A branch update cannot turn a leaf into a branch.
                     if (!treeNodeApi.isBranch(node)) {
                         return undefined;
@@ -17,12 +17,12 @@ export function createReducer(treeNodeApi, foldNodeService) {
                         children: action.entries,
                     };
                 });
-                if (buffer === undefined) {
+                if (root === undefined) {
                     return state;
                 }
                 return {
                     ...state,
-                    buffer,
+                    root,
                 };
             case 'setState': {
                 // A newer update has already been applied.
@@ -34,32 +34,37 @@ export function createReducer(treeNodeApi, foldNodeService) {
                 };
             }
             case 'fold': {
-                const foldNode = foldNodeService.addFoldedEntryAtPath(state.foldNode, action.parentPath, action.entry.id);
+                const entryId = action.path.at(-1);
+                if (entryId === undefined) {
+                    return state;
+                }
+                const parentPath = action.path.slice(0, -1);
+                const foldRoot = foldNodeService.addFoldedEntryAtPath(state.foldRoot, parentPath, entryId);
                 /*
                  * addFoldedEntryAtPath creates missing fold paths, so this should
                  * normally never be undefined. Preserve the existing state if it is.
                  */
-                if (foldNode === undefined) {
+                if (foldRoot === undefined) {
                     return state;
                 }
                 return {
                     ...state,
-                    foldNode,
+                    foldRoot,
                     cursor: action.cursor,
                 };
             }
             case 'unfold': {
-                const foldNode = foldNodeService.clearFoldedEntriesAtPath(state.foldNode, action.parentPath);
+                const foldRoot = foldNodeService.clearFoldedEntriesAtPath(state.foldRoot, action.path);
                 /*
                  * Unlike adding a fold, clearing only operates on an existing path.
                  * An undefined result means that the fold path no longer exists.
                  */
-                if (foldNode === undefined) {
+                if (foldRoot === undefined) {
                     return state;
                 }
                 return {
                     ...state,
-                    foldNode,
+                    foldRoot,
                     cursor: action.cursor,
                 };
             }

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

@@ -1,22 +1,26 @@
-import { CursorApi, FoldNodeApi, FoldNodeService, NavNodeApi, SerializableKey, State, StateApi, TreeNode, TreeNodeApi } from 'dirvi-lib';
+import { BranchTreeNode, CursorApi, FoldNodeApi, FoldNodeService, NavNodeApi, SerializableKey, State, StateApi, TreeNode, TreeNodeApi } from 'dirvi-lib';
 import { ViewApi } from './view-api.js';
-export type AppApi<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>, ViewKey = string> = {
+export type AppApi<Id extends SerializableKey, Node extends TreeNode<Id, Node>, ViewKey = string> = {
+    /**
+     * Name used to distinguish the app, e.g. 'posix' for POSIX directory app.
+     */
     appId: string;
     /**
-     * Name displayed to distinguish app instance.
+     * Name to distinguish app instance.
      */
     name: string;
+    rootId: Id;
     /**
-     * Message displayed when the entries are empty and there is nothing
-     * to display.
+     * Message displayed when there are no root children.
      */
-    emptyForestMessage: string;
+    emptyRootMessage: string;
     /**
      * Loads the children of the branch at `path`.
      *
      * The empty path represents the root branch.
      */
-    loadBranches: (path: Id[]) => Promise<BufferNode[]>;
+    loadBranches: (path: Id[]) => Promise<Node[]>;
+    createRoot: () => Promise<Node & BranchTreeNode<Id, Node>>;
     /**
      * Subscribes to external data changes that require the tree state
      * to be loaded again.
@@ -24,7 +28,7 @@ export type AppApi<Id extends SerializableKey, BufferNode extends TreeNode<Id, B
      * Returns an unsubscribe function.
      */
     subscribeToResync: (listener: () => void) => () => void;
-    treeNodeApi: TreeNodeApi<Id, BufferNode>;
+    treeNodeApi: TreeNodeApi<Id, Node>;
     /**
      * Structural fold-tree traversal and immutable path updates.
      */
@@ -35,10 +39,10 @@ export type AppApi<Id extends SerializableKey, BufferNode extends TreeNode<Id, B
      */
     foldNodeService: FoldNodeService<Id>;
     cursorApi: CursorApi<Id>;
-    stateApi: StateApi<Id, BufferNode>;
-    navNodeApi: NavNodeApi<Id, BufferNode>;
+    stateApi: StateApi<Id, Node>;
+    navNodeApi: NavNodeApi<Id, Node>;
     viewKey: ViewKey;
-    viewApi: ViewApi<State<Id, BufferNode>, ViewKey>;
+    viewApi: ViewApi<State<Id, Node>, ViewKey>;
 };
 export declare function createAppApis<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(): {
     treeNodeApi: TreeNodeApi<Id, BufferNode>;

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

@@ -1 +1 @@
-{"version":3,"file":"app-api.d.ts","sourceRoot":"","sources":["../../src/domain/app-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,SAAS,EACT,WAAW,EACX,eAAe,EACf,UAAU,EACV,eAAe,EACf,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,MAAM,MAAM,CAChB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,IACd;IAIF,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACH,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAExD,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzC;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAE7B;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;IAErC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAEzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAEnC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAEvC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;CAClD,CAAC;AAEF,wBAAgB,aAAa,CAC3B,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,KACxC;IACH,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACzC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CACxC,CAkCA"}
+{"version":3,"file":"app-api.d.ts","sourceRoot":"","sources":["../../src/domain/app-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAMd,SAAS,EAET,WAAW,EACX,eAAe,EACf,UAAU,EACV,eAAe,EACf,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,MAAM,MAAM,CAChB,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAC/B,OAAO,GAAG,MAAM,IACd;IACF;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,MAAM,EAAE,EAAE,CAAC;IAEX;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3D;;;;;OAKG;IACH,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAExD,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAEnC;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAE7B;;;OAGG;IACH,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;IAErC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAEzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAE7B,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAEjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;CAC5C,CAAC;AAEF,wBAAgB,aAAa,CAC3B,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,KACxC;IACH,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACzC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;CACxC,CA4BA"}

package/dist/domain/app-api.js

@@ -1,14 +1,10 @@
-import { createCursorApi, createFoldNodeApi, createFoldNodeService, createNavNodeApi, createStateApi, createTreeNodeApi, } from 'dirvi-lib';
+import { createCursorApi, createFoldNodeService, createNavNodeApi, createStateApi, createTreeNodeApi, } from 'dirvi-lib';
 export function createAppApis() {
     const treeNodeApi = createTreeNodeApi();
-    const foldNodeApi = createFoldNodeApi();
-    const foldNodeService = createFoldNodeService(foldNodeApi, (id) => ({
-        id,
-        children: [],
-        folds: new Set(),
-    }));
+    const foldNodeApi = createTreeNodeApi();
+    const foldNodeService = createFoldNodeService(foldNodeApi);
     const cursorApi = createCursorApi();
-    const navNodeApi = createNavNodeApi(treeNodeApi, foldNodeApi, cursorApi);
+    const navNodeApi = createNavNodeApi(treeNodeApi, foldNodeService, cursorApi);
     const stateApi = createStateApi(treeNodeApi, foldNodeApi, cursorApi, navNodeApi);
     return {
         treeNodeApi,

package/dist/domain/posix-tree-node.d.ts

@@ -1,9 +1,10 @@
 import { z } from 'zod';
 import { UnixPath } from './unix-path.js';
-import { Cursor, FoldNode, FoldNodeRoot, NavNode, State } from 'dirvi-lib';
+import { BranchTreeNode, Cursor, FoldNode, NavNode, State } from 'dirvi-lib';
 export declare const PosixNameSchema: z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodString>;
 export type PosixName = z.output<typeof PosixNameSchema>;
 export declare const PosixTreeNodeSchema: z.ZodType<PosixTreeNode>;
+export declare const PosixBranchTreeNodeSchema: z.ZodType<PosixTreeNode & BranchTreeNode<PosixName, PosixTreeNode>>;
 export type PosixTreeNode = {
     kind: 'file';
     id: PosixName;
@@ -18,14 +19,13 @@ export type PosixTreeNode = {
 };
 export declare const PosixTreeNodeApi: import("dirvi-lib").TreeNodeApi<string, PosixTreeNode>;
 export declare const PosixFoldNodeSchema: z.ZodType<PosixFoldNode>;
-export declare const PosixFoldNodeRootSchema: z.ZodType<PosixFoldNodeRoot>;
 export type PosixFoldNode = FoldNode<PosixName>;
-export type PosixFoldNodeRoot = FoldNodeRoot<PosixName>;
-export declare const PosixFoldNodeApi: import("dirvi-lib").FoldNodeApi<string>;
+export declare const PosixFoldNodeApi: import("dirvi-lib").TreeNodeApi<string, FoldNode<string>>;
+export declare const PosixFoldNodeService: import("dirvi-lib").FoldNodeService<string>;
 export declare const PosixCursorSchema: z.ZodType<PosixCursor>;
 export type PosixCursor = Cursor<PosixName>;
 export declare const PosixCursorApi: import("dirvi-lib").CursorApi<string>;
-export type PosixNavNode = NavNode<PosixName, PosixTreeNode>;
+export type PosixNavNode = NavNode<PosixName>;
 export declare const PosixNavApi: import("dirvi-lib").NavNodeApi<string, PosixTreeNode>;
 export declare const PosixStateSchema: z.ZodType<PosixState>;
 export type PosixState = State<PosixName, PosixTreeNode>;

package/dist/domain/posix-tree-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"posix-tree-node.d.ts","sourceRoot":"","sources":["../../src/domain/posix-tree-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAUL,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,OAAO,EAEP,KAAK,EAEN,MAAM,WAAW,CAAC;AAQnB,eAAO,MAAM,eAAe,yEAU3B,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAUzD,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAsBvD,CAAC;AAGH,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,SAAS,CAAC;CACf,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,QAAQ,CAAC;CAClB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,SAAS,CAAC;IACd,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;CAClC,CAAC;AAQN,eAAO,MAAM,gBAAgB,wDAAgD,CAAC;AAQ9E,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAkB,CAAC;AAC5E,eAAO,MAAM,uBAAuB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAC7C,CAAC;AAGrB,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;AAChD,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AAGxD,eAAO,MAAM,gBAAgB,yCAAiC,CAAC;AAK/D,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAChB,CAAC;AAGtC,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAE5C,eAAO,MAAM,cAAc,uCAA+B,CAAC;AAG3D,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAE7D,eAAO,MAAM,WAAW,uDAIvB,CAAC;AAKF,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAIlD,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAGzD,eAAO,MAAM,aAAa,qDAKzB,CAAC"}
+{"version":3,"file":"posix-tree-node.d.ts","sourceRoot":"","sources":["../../src/domain/posix-tree-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EACL,cAAc,EASd,MAAM,EACN,QAAQ,EACR,OAAO,EAEP,KAAK,EAEN,MAAM,WAAW,CAAC;AAQnB,eAAO,MAAM,eAAe,yEAU3B,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAUzD,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAsBvD,CAAC;AAEH,eAAO,MAAM,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAC/C,aAAa,GAAG,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAOzD,CAAC;AAGF,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,SAAS,CAAC;CACf,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,QAAQ,CAAC;CAClB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,SAAS,CAAC;IACd,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;CAClC,CAAC;AAQN,eAAO,MAAM,gBAAgB,wDAAgD,CAAC;AAM9E,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAkB,CAAC;AAE5E,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEhD,eAAO,MAAM,gBAAgB,2DAAsD,CAAC;AAEpF,eAAO,MAAM,oBAAoB,6CAAqD,CAAA;AAKtF,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAChB,CAAC;AAEtC,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAC5C,eAAO,MAAM,cAAc,uCAA+B,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAC9C,eAAO,MAAM,WAAW,uDAIvB,CAAC;AAKF,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAIlD,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAGzD,eAAO,MAAM,aAAa,qDAKzB,CAAC"}

package/dist/domain/posix-tree-node.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { UnixPathSchema } from './unix-path.js';
-import { createCursorApi, createCursorSchema, createFoldNodeApi, createFoldNodeSchemas, createNavNodeApi, createStateApi, createStateSchema, createTreeNodeApi, createTreeNodeSchemas, serializableKeySchema, } from 'dirvi-lib';
+import { createCursorApi, createCursorSchema, createFoldNodeSchemas, createFoldNodeService, createNavNodeApi, createStateApi, createStateSchema, createTreeNodeApi, createTreeNodeSchemas, serializableKeySchema, } from 'dirvi-lib';
 // --- PosixName extends PropertyKey ---
 // Schema
 export const PosixNameSchema = serializableKeySchema.pipe(z
@@ -32,22 +32,26 @@ export const PosixTreeNodeSchema = z.lazy(() => {
         }),
     ]);
 });
+export const PosixBranchTreeNodeSchema = PosixTreeNodeSchema.refine((node) => 'children' in node, {
+    message: 'The state root must be a branch node.',
+});
 // API
 export const PosixTreeNodeApi = createTreeNodeApi();
 // --- PosixFoldNode ---
 // Schema
-const { foldNodeSchema, foldNodeRootSchema } = createFoldNodeSchemas(PosixNameSchema);
+const foldNodeSchema = createFoldNodeSchemas(PosixNameSchema);
 export const PosixFoldNodeSchema = foldNodeSchema;
-export const PosixFoldNodeRootSchema = foldNodeRootSchema;
 // API
-export const PosixFoldNodeApi = createFoldNodeApi();
+export const PosixFoldNodeApi = createTreeNodeApi();
+// Service
+export const PosixFoldNodeService = createFoldNodeService(PosixFoldNodeApi);
 // --- PosixCursor ---
 // Schema
 export const PosixCursorSchema = createCursorSchema(PosixNameSchema);
 export const PosixCursorApi = createCursorApi();
-export const PosixNavApi = createNavNodeApi(PosixTreeNodeApi, PosixFoldNodeApi, PosixCursorApi);
+export const PosixNavApi = createNavNodeApi(PosixTreeNodeApi, PosixFoldNodeService, PosixCursorApi);
 // --- PosixState ---
 // Schema
-export const PosixStateSchema = createStateSchema(PosixTreeNodeSchema, PosixFoldNodeRootSchema, PosixCursorSchema);
+export const PosixStateSchema = createStateSchema(PosixBranchTreeNodeSchema, PosixFoldNodeSchema, PosixCursorSchema);
 // API
 export const PosixStateApi = createStateApi(PosixTreeNodeApi, PosixFoldNodeApi, PosixCursorApi, PosixNavApi);

package/dist/index.js

@@ -28,7 +28,7 @@ process.on('exit', restoreTerminal);
 program
     .name('direx')
     .description('View and manage directories.')
-    .version('0.7.0')
+    .version('0.7.1')
     .helpOption('--help')
     .option('-d, --directory <path>', 'Directory to browse')
     .action(async () => {

package/dist/infrastructure/load-posix-app-api.d.ts

@@ -4,14 +4,15 @@ import { UnixAbsolutePath } from '../domain/unix-path.js';
 export type StoredPosixFoldNode = {
     id: PosixName;
     children: StoredPosixFoldNode[];
-    folds: PosixName[];
+    foldedChildren: StoredPosixFoldNode[];
 };
-export type StoredPosixFoldNodeRoot = {
-    children: StoredPosixFoldNode[];
-    folds: PosixName[];
-};
-export type StoredPosixState = Omit<PosixState, 'foldNode'> & {
-    foldNode: StoredPosixFoldNodeRoot;
+export type StoredPosixState = Omit<PosixState, 'foldRoot'> & {
+    foldRoot: StoredPosixFoldNode;
 };
+/**
+ * Creates the AppApi for the POSIX app.
+ *
+ * @param directory - optional directory path for loading the app not at the cwd.
+ */
 export declare function loadPosixAppApi(directory?: string): AppApi<PosixName, PosixTreeNode, UnixAbsolutePath>;
 //# sourceMappingURL=load-posix-app-api.d.ts.map

package/dist/infrastructure/load-posix-app-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-posix-app-api.d.ts","sourceRoot":"","sources":["../../src/infrastructure/load-posix-app-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAiB,MAAM,sBAAsB,CAAC;AAM7D,OAAO,EAIL,SAAS,EAET,UAAU,EACV,aAAa,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAkB1D,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,SAAS,CAAC;IACd,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB,CAAC;AAsBF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;IAC5D,QAAQ,EAAE,uBAAuB,CAAC;CACnC,CAAC;AA2DF,wBAAgB,eAAe,CAC7B,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAyBpD"}
+{"version":3,"file":"load-posix-app-api.d.ts","sourceRoot":"","sources":["../../src/infrastructure/load-posix-app-api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAiB,MAAM,sBAAsB,CAAC;AAM7D,OAAO,EAIL,SAAS,EAET,UAAU,EACV,aAAa,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAiB1D,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,SAAS,CAAC;IACd,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC,CAAC;AAoBF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;IAC5D,QAAQ,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AA0CF;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAoCpD"}

package/dist/infrastructure/load-posix-app-api.js

@@ -1,4 +1,4 @@
-import { join } from 'node:path';
+import { basename, join } from 'node:path';
 import { watch } from 'node:fs';
 import { createAppApis } from '../domain/app-api.js';
 import { getUnixAbsPath } from './get-unix-abs-path.js';
@@ -6,89 +6,91 @@ import { getDirEntries } from './get-dir-entries.js';
 import envPaths from 'env-paths';
 import { createFileViewApi } from './create-file-view-api.js';
 import { createHash } from 'node:crypto';
-import { PosixCursorSchema, PosixNameSchema, PosixTreeNodeSchema, } from '../domain/posix-tree-node.js';
+import { PosixBranchTreeNodeSchema, PosixCursorSchema, PosixNameSchema, } from '../domain/posix-tree-node.js';
 import { z } from 'zod';
 // ---*--- App Data ---*---
 // Paths for app data:
-const paths = envPaths('dirvi');
-const posixAppDataDirectory = join(paths.data, 'apps', 'posix');
+const environmentPaths = envPaths('dirvi');
+const posixAppDataDirectory = join(environmentPaths.data, 'apps', 'posix');
 const posixAppViewsDirectory = join(posixAppDataDirectory, 'views');
 // Helpers for saving app data:
-// The key for the Posix app instance is just the directory working in.
 function encodeKey(key) {
     return createHash('sha256').update(key).digest('hex');
 }
 const StoredPosixFoldNodeSchema = z.lazy(() => z.object({
     id: PosixNameSchema,
     children: z.array(StoredPosixFoldNodeSchema),
-    folds: z.array(PosixNameSchema),
+    foldedChildren: z.array(StoredPosixFoldNodeSchema),
 }));
-const StoredPosixFoldNodeRootSchema = z.object({
-    children: z.array(StoredPosixFoldNodeSchema),
-    folds: z.array(PosixNameSchema),
-});
-const StoredPosixStateSchema = z.object({
-    buffer: z.array(PosixTreeNodeSchema),
-    foldNode: StoredPosixFoldNodeRootSchema,
+const StoredPosixStateSchema = z
+    .object({
+    root: PosixBranchTreeNodeSchema,
+    foldRoot: StoredPosixFoldNodeSchema,
     cursor: PosixCursorSchema,
+})
+    .refine((state) => state.root.id !== state.foldRoot.id, {
+    message: 'The fold root ID must match the tree root ID.',
 });
 // ---*--- Codec ---*---
 function encodePosixFoldNode(node) {
     return {
         id: node.id,
         children: node.children.map(encodePosixFoldNode),
-        folds: [...node.folds],
+        foldedChildren: [...node.foldedChildren],
     };
 }
 function decodePosixFoldNode(node) {
     return {
         id: node.id,
         children: node.children.map(decodePosixFoldNode),
-        folds: new Set(node.folds),
-    };
-}
-function encodePosixFoldNodeRoot(root) {
-    return {
-        children: root.children.map(encodePosixFoldNode),
-        folds: [...root.folds],
-    };
-}
-function decodePosixFoldNodeRoot(root) {
-    return {
-        children: root.children.map(decodePosixFoldNode),
-        folds: new Set(root.folds),
+        foldedChildren: node.foldedChildren.map(decodePosixFoldNode),
     };
 }
 const posixStateCodec = {
     schema: StoredPosixStateSchema,
     encode(state) {
         return {
-            buffer: state.buffer,
-            foldNode: encodePosixFoldNodeRoot(state.foldNode),
+            root: state.root,
+            foldRoot: encodePosixFoldNode(state.foldRoot),
             cursor: state.cursor,
         };
     },
     decode(state) {
         return {
-            buffer: state.buffer,
-            foldNode: decodePosixFoldNodeRoot(state.foldNode),
+            root: state.root,
+            foldRoot: decodePosixFoldNode(state.foldRoot),
             cursor: state.cursor,
         };
     },
 };
 // --- Creating Posix App API ---
+/**
+ * Creates the AppApi for the POSIX app.
+ *
+ * @param directory - optional directory path for loading the app not at the cwd.
+ */
 export function loadPosixAppApi(directory) {
     const unixAbsPath = getUnixAbsPath(directory ?? process.cwd());
+    const rootId = PosixNameSchema.parse(basename(unixAbsPath));
     const apis = createAppApis();
     return {
         appId: 'posix',
-        name: `Posix(${unixAbsPath})`,
-        emptyForestMessage: 'The directory is empty.',
+        name: unixAbsPath,
+        rootId,
+        emptyRootMessage: 'The directory is empty.',
         loadBranches: (path) => {
             const address = join(unixAbsPath, ...path);
             return getDirEntries(address);
         },
+        createRoot: async () => {
+            return {
+                id: rootId,
+                kind: 'directory',
+                children: null
+            };
+        },
         subscribeToResync: createFsResyncSubscription(join(unixAbsPath)),
+        // The key for the Posix app instance is just the directory working in:
         viewKey: unixAbsPath,
         viewApi: createFileViewApi({
             directory: posixAppViewsDirectory,

package/dist/ui/App.d.ts

@@ -12,6 +12,6 @@ type AppProps<Id extends SerializableKey, BufferNode extends TreeNode<Id, Buffer
     clipboard?: (value: string) => void;
     onError?: (error: Error) => void;
 };
-export declare function App<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>, ViewKey = string>({ appApi, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }: AppProps<Id, BufferNode, ViewKey>): import("react").JSX.Element | null;
+export declare function App<Id extends SerializableKey, Node extends TreeNode<Id, Node>, ViewKey = string>({ appApi, initialState, reducer, intentToEffect, effectToAction, stdout, clipboard, onError, }: AppProps<Id, Node, ViewKey>): import("react").JSX.Element | null;
 export {};
 //# sourceMappingURL=App.d.ts.map

package/dist/ui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAGA,OAAO,EAGL,cAAc,EACd,eAAe,EACf,KAAK,EACL,QAAQ,EAET,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAOpD,KAAK,QAAQ,CACX,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,IACd;IACF,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxC,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAC/C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CACjB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,EAChB,EACA,MAAM,EACN,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,sCA6NnC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAGA,OAAO,EAGL,cAAc,EACd,eAAe,EACf,KAAK,EACL,QAAQ,EAET,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAOpD,KAAK,QAAQ,CACX,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,IACd;IACF,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxC,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAC/C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CACjB,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAC/B,OAAO,GAAG,MAAM,EAChB,EACA,MAAM,EACN,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,sCA4O7B"}

package/dist/ui/App.js

@@ -14,16 +14,15 @@ export function App({ appApi, initialState, reducer, intentToEffect, effectToAct
     // Give `subscribeToResync` callback a way to see current state:
     const stateRef = useRef(state);
     stateRef.current = state;
-    const navigation = useMemo(() => appApi.navNodeApi.from(state.buffer, state.foldNode), [appApi.navNodeApi, state.buffer, state.foldNode]);
+    const navEntry = useMemo(() => appApi.navNodeApi.from(state.root, state.foldRoot), [appApi.navNodeApi, state.root, state.foldRoot]);
     const [inputState, setInputState] = useState({
         inputMode: 'normal',
         normalBuffer: '',
     });
     const { rows: terminalRows } = useWindowSize();
-    const view = useView(navigation, state, appApi.cursorApi, terminalRows);
+    const view = useView(navEntry, state, appApi.navNodeApi, appApi.cursorApi, terminalRows);
     const [exitStatus, setExitStatus] = useState();
-    // Subscribe to directory watcher, do not
-    // resubscribe on every state change.
+    // Subscribe to directory watcher, do not resubscribe on every state change.
     useEffect(() => {
         let active = true;
         const unsubscribe = appApi.subscribeToResync(() => {
@@ -56,7 +55,7 @@ export function App({ appApi, initialState, reducer, intentToEffect, effectToAct
         }
         switch (effect.effectType) {
             case 'dispatchEffectAction':
-                const action = effectToAction(effect.action, navigation, state);
+                const action = effectToAction(effect.action, navEntry, state);
                 if (action === undefined) {
                     return;
                 }
@@ -86,7 +85,14 @@ export function App({ appApi, initialState, reducer, intentToEffect, effectToAct
                 });
                 return;
             }
+            case 'peekFold':
+                // TODO: Need a peek state to know what to display
+                return;
             case 'emitVisibleLeavesPaths':
+                const navigation = navEntry.children;
+                if (navigation === null) {
+                    return;
+                }
                 const visibleLeavesPaths = appApi.navNodeApi.visibleLeavesPaths(navigation);
                 stdout?.(JSON.stringify({
                     type: 'displayed-leaves-paths',

package/dist/ui/LoadingApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoadingApp.d.ts","sourceRoot":"","sources":["../../src/ui/LoadingApp.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,EAEf,QAAQ,EACT,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,KAAK,eAAe,CAClB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,IACd;IACF,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AA0BF,wBAAgB,UAAU,CACxB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,EAChB,EACA,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,+BAgG1C"}
+{"version":3,"file":"LoadingApp.d.ts","sourceRoot":"","sources":["../../src/ui/LoadingApp.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,eAAe,EAEf,QAAQ,EACT,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,KAAK,eAAe,CAClB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,IACd;IACF,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,UAAU,CACxB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAC3C,OAAO,GAAG,MAAM,EAChB,EACA,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,+BA4F1C"}

package/dist/ui/LoadingApp.js

@@ -5,37 +5,24 @@ import { createIntentToEffect, } from 'dirvi-lib';
 import { App } from './App.js';
 import { createReducer } from '../application/reducer.js';
 import { createEffectToAction } from '../application/effect-to-action.js';
-function createInitialState(rootBranches, createEmptyFoldRoot) {
-    if (rootBranches.length === 0) {
-        throw new Error('createInitialState cannot create a state for an empty forest');
-    }
-    return {
-        buffer: rootBranches,
-        foldNode: createEmptyFoldRoot(),
-        cursor: {
-            kind: 'entry',
-            parentPath: [],
-            entryId: rootBranches[0].id,
-        },
-    };
-}
 export function LoadingApp({ appApi, stdout, clipboard, onError, }) {
     const [initialState, setInitialState] = useState();
     const [empty, setEmpty] = useState(false);
     const [error, setError] = useState();
+    // Loading and setting initial state.
     useEffect(() => {
         let mounted = true;
         appApi
-            .loadBranches([])
-            .then((rootBranches) => {
+            .createRoot()
+            .then((root) => {
             if (!mounted) {
                 return;
             }
-            if (rootBranches.length === 0) {
-                setEmpty(true);
-                return;
-            }
-            setInitialState(createInitialState(rootBranches, () => appApi.foldNodeService.createEmptyRoot()));
+            setInitialState({
+                root,
+                foldRoot: appApi.foldNodeService.createEmptyNode(appApi.rootId),
+                cursor: [],
+            });
         })
             .catch((cause) => {
             const nextError = cause instanceof Error ? cause : new Error(String(cause));
@@ -58,7 +45,7 @@ export function LoadingApp({ appApi, stdout, clipboard, onError, }) {
         return _jsx(Text, { color: "red", children: error.message });
     }
     if (empty) {
-        return _jsx(Text, { dimColor: true, children: appApi.emptyForestMessage });
+        return _jsx(Text, { dimColor: true, children: appApi.emptyRootMessage });
     }
     if (initialState === undefined) {
         return _jsx(Text, { dimColor: true, children: "Loading." });

package/dist/ui/components/StatusBar.d.ts

@@ -1,7 +1,7 @@
-import { InputState } from 'dirvi-lib';
+import { InputModeState } from 'dirvi-lib';
 export declare const STATUS_BAR_HEIGHT = 1;
 type StatusBarProps = {
-    inputState: InputState;
+    inputState: InputModeState;
 };
 export declare function StatusBar({ inputState }: StatusBarProps): import("react").JSX.Element;
 export {};

package/dist/ui/components/StatusBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StatusBar.d.ts","sourceRoot":"","sources":["../../../src/ui/components/StatusBar.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,wBAAgB,SAAS,CAAC,EAAE,UAAU,EAAE,EAAE,cAAc,+BAyBvD"}
+{"version":3,"file":"StatusBar.d.ts","sourceRoot":"","sources":["../../../src/ui/components/StatusBar.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,cAAc,CAAC;CAC5B,CAAC;AAEF,wBAAgB,SAAS,CAAC,EAAE,UAAU,EAAE,EAAE,cAAc,+BAyBvD"}

package/dist/ui/components/ViewRowComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewRowComponent.d.ts","sourceRoot":"","sources":["../../../src/ui/components/ViewRowComponent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,wBAAgB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,+BAkCzD"}
+{"version":3,"file":"ViewRowComponent.d.ts","sourceRoot":"","sources":["../../../src/ui/components/ViewRowComponent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,wBAAgB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,+BAwBzD"}

package/dist/ui/components/ViewRowComponent.js

@@ -1,13 +1,10 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 export function ViewRowComponent({ row }) {
-    const prefix = '';
     switch (row.type) {
         case 'leaf':
-            return (_jsx(Box, { paddingLeft: row.indent * 2, children: _jsxs(Text, { inverse: row.selected, children: [prefix, row.content] }) }));
+            return (_jsx(Box, { paddingLeft: row.indent * 2, children: _jsx(Text, { inverse: row.cursor, children: row.content }) }));
         case 'branch':
-            return (_jsx(Box, { paddingLeft: row.indent * 2, children: _jsxs(Text, { inverse: row.selected, color: "blue", children: [prefix, row.content] }) }));
-        case 'fold':
-            return (_jsx(Box, { paddingLeft: row.indent * 2, children: _jsxs(Text, { inverse: row.selected, dimColor: true, children: [prefix, row.content] }) }));
+            return (_jsxs(Box, { paddingLeft: row.indent * 2, children: [_jsx(Text, { inverse: row.cursor, color: "blue", children: row.content }), row.foldedCount > 0 && (_jsx(Text, { color: "gray", dimColor: true, children: ` … ${row.foldedCount} folded` }))] }));
     }
 }

package/dist/ui/hooks/useView.d.ts

@@ -1,5 +1,4 @@
-import { CursorApi, NavNode, SerializableKey, State, TreeNode } from 'dirvi-lib';
+import { CursorApi, NavBranch, NavNodeApi, SerializableKey, State, TreeNode } from 'dirvi-lib';
 import { View } from '../view.js';
-export type UseView = <Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(navigation: NavNode<Id, BufferNode>, state: State<Id, BufferNode>, terminalRows: number) => View;
-export declare function useView<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(navigation: NavNode<Id, BufferNode>, state: State<Id, BufferNode>, cursorApi: CursorApi<Id>, terminalRows: number): View;
+export declare function useView<Id extends SerializableKey, Node extends TreeNode<Id, Node>>(navNode: NavBranch<Id>, state: State<Id, Node>, navNodeApi: NavNodeApi<Id, Node>, cursorApi: CursorApi<Id>, terminalRows: number): View;
 //# sourceMappingURL=useView.d.ts.map

package/dist/ui/hooks/useView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,OAAO,EACP,eAAe,EACf,KAAK,EACL,QAAQ,EACT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAW,MAAM,YAAY,CAAC;AAI3C,MAAM,MAAM,OAAO,GAAG,CACpB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAE3C,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,EACnC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,EAC5B,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;AAIV,wBAAgB,OAAO,CACrB,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,EAE3C,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,EACnC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,EAC5B,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,YAAY,EAAE,MAAM,GACnB,IAAI,CAoBN"}
+{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAAE,SAAS,EACX,UAAU,EACnB,eAAe,EACf,KAAK,EACL,QAAQ,EACT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAW,MAAM,YAAY,CAAC;AAM3C,wBAAgB,OAAO,CACrB,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAE/B,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EACtB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EACtB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,EAChC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,YAAY,EAAE,MAAM,GACnB,IAAI,CAyBN"}

package/dist/ui/hooks/useView.js

@@ -3,12 +3,12 @@ import { useRef } from 'react';
 import { STATUS_BAR_HEIGHT } from '../components/StatusBar.js';
 // Hooks that keeps Ref of the viewport's start, and returns View sliced to
 // only the rows that should be visible.
-export function useView(navigation, state, cursorApi, terminalRows) {
+export function useView(navNode, state, navNodeApi, cursorApi, terminalRows) {
     const viewportStartRef = useRef(0);
     const viewportHeight = Math.max(1, terminalRows - STATUS_BAR_HEIGHT);
-    const rows = View.createRows(navigation, state.cursor, cursorApi);
+    const rows = View.createRows(navNode, navNodeApi, state.cursor, cursorApi);
     viewportStartRef.current = viewportStart(rows, viewportHeight, viewportStartRef.current);
-    return View.create(navigation, state.cursor, cursorApi, viewportHeight, viewportStartRef.current);
+    return View.create(navNode, navNodeApi, state.cursor, cursorApi, viewportHeight, viewportStartRef.current);
 }
 function viewportStart(rows, viewportHeight, currentViewportStart) {
     const scrollMargin = 3;

package/dist/ui/view.d.ts

@@ -1,19 +1,24 @@
-import { CursorApi, SerializableKey, TreeNode } from 'dirvi-lib';
-import { Cursor, NavNode } from 'dirvi-lib';
-export type ViewRowType = 'leaf' | 'branch' | 'fold';
-export type ViewRow = {
+import { CursorApi, NavBranch, NavNodeApi, SerializableKey, TreeNode } from 'dirvi-lib';
+import { Cursor } from 'dirvi-lib';
+type ViewRowBase = {
     id: string;
     indent: number;
     selected: boolean;
     cursor: boolean;
     content: string;
-    type: ViewRowType;
 };
+export type ViewRow = (ViewRowBase & {
+    type: 'leaf';
+}) | (ViewRowBase & {
+    type: 'branch';
+    foldedCount: number;
+});
 export type View = {
     rows: ViewRow[];
 };
 export declare const View: {
-    createRows<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(navigation: NavNode<Id, BufferNode>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>): ViewRow[];
-    create<Id extends SerializableKey, BufferNode extends TreeNode<Id, BufferNode>>(navigation: NavNode<Id, BufferNode>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>, viewportHeight: number, viewportStart: number): View;
+    createRows<Id extends SerializableKey, Node extends TreeNode<Id, Node>>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Node>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>): ViewRow[];
+    create<Id extends SerializableKey, Node extends TreeNode<Id, Node>>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Node>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>, viewportHeight: number, viewportStart: number): View;
 };
+export {};
 //# sourceMappingURL=view.d.ts.map

package/dist/ui/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,MAAM,EAAyB,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAMrD,MAAM,MAAM,OAAO,GAAG;IAEpB,EAAE,EAAE,MAAM,CAAC;IAGX,MAAM,EAAE,MAAM,CAAC;IAGf,QAAQ,EAAE,OAAO,CAAC;IAGlB,MAAM,EAAE,OAAO,CAAC;IAGhB,OAAO,EAAE,MAAM,CAAC;IAGhB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;eAEb,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,cAE/B,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,UAC3B,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,GACvB,OAAO,EAAE;WAKV,EAAE,SAAS,eAAe,EAC1B,UAAU,SAAS,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,cAE/B,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,UAC3B,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,kBACR,MAAM,iBACP,MAAM,GACpB,IAAI;CAOR,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,MAAM,EAAqB,MAAM,WAAW,CAAC;AAEtD,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,OAAO,GACf,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEP,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;eAEb,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,YAErB,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UACxB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,GACvB,OAAO,EAAE;WAqBV,EAAE,SAAS,eAAe,EAC1B,IAAI,SAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,YAErB,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UACxB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,kBACR,MAAM,iBACP,MAAM,GACpB,IAAI;CAOR,CAAC"}

package/dist/ui/view.js

@@ -1,10 +1,17 @@
-import { isNavBranch } from 'dirvi-lib';
 export const View = {
-    createRows(navigation, cursor, cursorApi) {
-        return viewRowsAtNode(navigation, [], cursor, cursorApi);
+    createRows(rootNode, navNodeApi, cursor, cursorApi) {
+        const rootCursor = [];
+        const rootRow = viewRowForEntry(rootNode, null, cursorApi.equal(cursor, rootCursor), navNodeApi);
+        if (rootNode.children === null) {
+            return [rootRow];
+        }
+        return [
+            rootRow,
+            ...viewRowsAtNode(rootNode.children, [], navNodeApi, cursor, cursorApi),
+        ];
     },
-    create(navigation, cursor, cursorApi, viewportHeight, viewportStart) {
-        const rows = View.createRows(navigation, cursor, cursorApi);
+    create(rootNode, navNodeApi, cursor, cursorApi, viewportHeight, viewportStart) {
+        const rows = View.createRows(rootNode, navNodeApi, cursor, cursorApi);
         return {
             rows: rows.slice(viewportStart, viewportStart + viewportHeight),
         };
@@ -20,79 +27,48 @@ export const View = {
  *   []              root directory
  *   ['src']         root/src
  *   ['src', 'lib']  root/src/lib
- *
- * The function uses a depth-first, pre-order traversal:
- *
- *   1. Add an entry's row.
- *   2. If the entry is an opened branch, recursively add its children.
- *   3. After all visible entries, add the directory's fold row.
- *
- * This ordering is what makes the flat row list visually represent a tree.
  */
-function viewRowsAtNode(node, parentPath, cursor, cursorApi) {
+function viewRowsAtNode(node, parentPath, navNodeApi, cursor, cursorApi) {
     const rows = [];
-    /*
-     * `node.entries` contains only the entries currently visible in this
-     * directory. Folded entries are kept separately in `node.foldedEntries`
-     * and are represented by one fold row added below.
-     */
     for (const entry of node.entries) {
-        const entryCursor = {
-            kind: 'entry',
-            parentPath,
-            entryId: entry.id,
-        };
-        // If cursor at entry, needs to be rendered differently
+        const entryCursor = [...parentPath, entry.id];
         const isCursor = cursorApi.equal(cursor, entryCursor);
-        // Add entry before visiting branches
-        rows.push(viewRowForEntry(entry, parentPath, isCursor));
+        rows.push(viewRowForEntry(entry, parentPath, isCursor, navNodeApi));
         // Case where there's no branches
-        if (!isNavBranch(entry) || entry.children === null) {
+        if (!navNodeApi.entryIsBranch(entry) || entry.children === null) {
             continue;
         }
-        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], cursor, cursorApi));
-    }
-    /*
-     * Folded entries are not rendered individually. They are represented
-     * by one synthetic row placed after all visible entries and descendants
-     * of this directory.
-     */
-    if (node.foldedEntries.length > 0) {
-        const foldCursor = {
-            kind: 'fold',
-            parentPath,
-        };
-        const isCursor = cursorApi.equal(cursor, foldCursor);
-        rows.push({
-            id: foldId(parentPath),
-            indent: parentPath.length,
-            selected: isCursor,
-            cursor: isCursor,
-            content: `⋯ ${node.foldedEntries.length} folded`,
-            type: 'fold',
-        });
+        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], navNodeApi, cursor, cursorApi));
     }
     return rows;
 }
-function viewRowForEntry(entry, parentPath, cursor) {
+function viewRowForEntry(entry, parentPath, cursor, navNodeApi) {
+    const id = entryId(parentPath ?? [], entry.id);
+    const indent = parentPath ? parentPath.length + 1 : 0;
+    const selected = false;
+    if (navNodeApi.entryIsBranch(entry)) {
+        const foldedCount = entry.children === null || entry.children.folded === null
+            ? 0
+            : entry.children.folded.entries.length;
+        return {
+            id,
+            indent,
+            selected,
+            cursor,
+            content: `${String(entry.id)}/`,
+            type: 'branch',
+            foldedCount,
+        };
+    }
     return {
-        id: entryId(parentPath, entry.id),
-        indent: parentPath.length,
-        selected: cursor,
+        id,
+        indent,
+        selected,
         cursor,
-        content: content(entry),
-        type: type(entry),
+        content: String(entry.id),
+        type: 'leaf',
     };
 }
 function entryId(parentPath, entryName) {
     return `entry:${JSON.stringify([...parentPath, entryName])}`;
 }
-function foldId(parentPath) {
-    return `fold:${JSON.stringify(parentPath)}`;
-}
-function content(entry) {
-    return isNavBranch(entry) ? `${String(entry.id)}/` : String(entry.id);
-}
-function type(entry) {
-    return isNavBranch(entry) ? 'branch' : 'leaf';
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mak-98/dirvi-cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A Vim-inspired TUI for browsing directories.",
   "type": "module",
   "license": "GPL-3.0-or-later",
@@ -13,7 +13,7 @@
   ],
   "dependencies": {
     "commander": "^13.0.0",
-    "dirvi-lib": "0.7.0",
+    "dirvi-lib": "0.8.0",
     "env-paths": "^4.0.0",
     "ink": "^7.1.1",
     "react": "^19.0.0",
@@ -31,6 +31,8 @@
     "start": "node dist/index.js",
     "typecheck": "tsc --noEmit",
     "format": "prettier . --write",
-    "update-global": "npm install --global @mak-98/dirvi-cli@latest"
+    "update-global": "npm install --global @mak-98/dirvi-cli@latest",
+    "debug": "node --inspect=9229 --import=tsx src/index.tsx 2>/tmp/dirvi-debug.log",
+    "debug:watch": "tail -f /tmp/dirvi-debug.log"
   }
 }