@mak-98/dirvi-cli 0.2.0 → 0.3.0

package/dist/application/user-input-to-intent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-input-to-intent.d.ts","sourceRoot":"","sources":["../../src/application/user-input-to-intent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,MAAM,MAAM,MAAM,GACd;IACE,UAAU,EAAE,eAAe,CAAC;CAC7B,GACD;IACE,UAAU,EAAE,cAAc,CAAC;CAC5B,GACD;IACE,UAAU,EAAE,cAAc,CAAC;CAC5B,GACD;IACE,UAAU,EAAE,YAAY,CAAC;CAC1B,GACD;IACE,UAAU,EAAE,qBAAqB,CAAC;IAClC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAqCN,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAiCpB"}

package/dist/application/user-input-to-intent.js

@@ -0,0 +1,56 @@
+function characterToIntent(character, commandBuffer) {
+    if (commandBuffer === '') {
+        switch (character) {
+            case 'l':
+                return {
+                    intentType: 'interactRight',
+                };
+            case 'h':
+                return {
+                    intentType: 'interactLeft',
+                };
+            case 'j':
+                return {
+                    intentType: 'interactDown',
+                };
+            case 'k':
+                return {
+                    intentType: 'interactUp',
+                };
+        }
+    }
+    return {
+        intentType: 'updateCommandBuffer',
+        updatedCommandBuffer: commandBuffer + character,
+    };
+}
+// Derive the intent from the user input and the commandBuffer.
+export function userInputToIntent(userInput, commandBuffer) {
+    if (userInput.userInputType === 'esc') {
+        return {
+            intentType: 'updateCommandBuffer',
+            updatedCommandBuffer: '',
+        };
+    }
+    if (userInput.userInputType === 'character') {
+        return characterToIntent(userInput.string, commandBuffer);
+    }
+    switch (userInput.userInputType) {
+        case 'rightArrow':
+            return {
+                intentType: 'interactRight',
+            };
+        case 'leftArrow':
+            return {
+                intentType: 'interactLeft',
+            };
+        case 'downArrow':
+            return {
+                intentType: 'interactDown',
+            };
+        case 'upArrow':
+            return {
+                intentType: 'interactUp',
+            };
+    }
+}

package/dist/domain/event-message.d.ts

@@ -1,12 +1,12 @@
-import { EntryPath, View } from 'dirvi-lib';
+import { UnixEntryPath, State } from 'dirvi-lib';
 export type EventMessage = {
     type: 'view';
-    view: View;
+    view: State;
 } | {
     type: 'displayed-files-paths';
     paths: string[];
 } | {
     type: 'file';
-    path: EntryPath;
+    path: UnixEntryPath;
 };
 //# sourceMappingURL=event-message.d.ts.map

package/dist/domain/event-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-message.d.ts","sourceRoot":"","sources":["../../src/domain/event-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE5C,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,IAAI,CAAC;CACZ,GACD;IACE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC"}
+{"version":3,"file":"event-message.d.ts","sourceRoot":"","sources":["../../src/domain/event-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEjD,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,CAAC;CACb,GACD;IACE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;CACrB,CAAC"}

package/dist/index.js

@@ -5,7 +5,7 @@ import { render } from 'ink';
 import { AppShell } from './ui/AppShell.js';
 import { loadInitialProps } from './infrastructure/load-initial-props.js';
 const program = new Command();
-// ---*--- TERMINAL ALT SCREEN ---*---
+// ---*--- TERMINAL ALTERNATE SCREEN ---*---
 // Restore the terminal during normal cleanup and as a
 // last-resort fallback when Node is exiting.
 // Write UI to stderr

package/dist/infrastructure/input.d.ts

@@ -1,7 +1,7 @@
 import type { Key } from 'ink';
-import type { View } from 'dirvi-lib';
-import type { Action } from '../application/reducer.js';
+import { State } from 'dirvi-lib';
+import { Action } from '../application/action.js';
 export type PendingInput = 'z';
 export type InputResult = Action | PendingInput | undefined;
-export declare function inputToInputResult(input: string, key: Key, view: View, pendingInput?: PendingInput): InputResult;
+export declare function userInputToInputResult(input: string, key: Key, view: State, pendingInput?: PendingInput): InputResult;
 //# sourceMappingURL=input.d.ts.map

package/dist/infrastructure/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/infrastructure/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC;AAC/B,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;AAE5D,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,YAAY,GAC1B,WAAW,CAsFb"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/infrastructure/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE/B,OAAO,EAAU,KAAK,EAAQ,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC;AAC/B,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;AAE5D,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK,EACX,YAAY,CAAC,EAAE,YAAY,GAC1B,WAAW,CA8Fb"}

package/dist/infrastructure/input.js

@@ -1,4 +1,5 @@
-export function inputToInputResult(input, key, view, pendingInput) {
+import { Cursor, View } from 'dirvi-lib';
+export function userInputToInputResult(input, key, view, pendingInput) {
     // Adding Pending Input
     if (pendingInput === undefined && input === 'z') {
         return 'z';
@@ -25,18 +26,26 @@ export function inputToInputResult(input, key, view, pendingInput) {
     }
     // Not prefixed inputs
     if (input === 'l' || key.rightArrow) {
-        // To do: `L` does recursive opening directories
-        if (view.cursor.kind !== 'entry') {
+        const currentEntry = View.getEntryAtCursor(view);
+        if (currentEntry === undefined) {
             return undefined;
         }
-        const path = [...view.cursor.parentPath, view.cursor.entry.name];
-        if (view.cursor.entry.kind === 'directory') {
+        if (currentEntry.kind === 'directory') {
+            const path = Cursor.getPath(view.cursor);
+            if (path === undefined) {
+                return undefined;
+            }
             return {
-                kind: 'toggleDir',
+                kind: 'updateDir',
                 path,
+                entries: currentEntry.entries,
             };
         }
-        if (view.cursor.entry.kind === 'file') {
+        if (currentEntry.kind === 'file') {
+            const path = Cursor.getPath(view.cursor);
+            if (path === undefined) {
+                return undefined;
+            }
             return {
                 kind: 'printFile',
                 path,

package/dist/infrastructure/load-initial-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-initial-props.d.ts","sourceRoot":"","sources":["../../src/infrastructure/load-initial-props.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CAmC/D"}
+{"version":3,"file":"load-initial-props.d.ts","sourceRoot":"","sources":["../../src/infrastructure/load-initial-props.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,CAiC/D"}

package/dist/infrastructure/load-initial-props.js

@@ -1,11 +1,11 @@
-import { getCwdAbsPath, getDirLazyEntries, unixEntryToDisplayEntry, createEmptyFoldNode, } from 'dirvi-lib';
+import { getCwdAbsPath, getDirLazyEntries, FoldNode, DisplayEntry, } from 'dirvi-lib';
 export async function loadInitialProps() {
     const cwdAddress = getCwdAbsPath();
     const lazyEntries = await getDirLazyEntries(cwdAddress);
     if (lazyEntries.length === 0) {
         return {
             cwdAddress,
-            initialView: {
+            initialState: {
                 cursor: undefined,
             },
         };
@@ -16,16 +16,14 @@ export async function loadInitialProps() {
     }
     return {
         cwdAddress,
-        initialView: {
-            buffer: {
-                entries: lazyEntries,
-            },
+        initialState: {
+            buffer: lazyEntries,
             cursor: {
                 kind: 'entry',
                 parentPath: [],
-                entry: unixEntryToDisplayEntry(firstEntry),
+                entryName: DisplayEntry.fromUnixEntry(firstEntry).name,
             },
-            folds: createEmptyFoldNode(),
+            folds: FoldNode.createEmpty(),
         },
     };
 }

package/dist/infrastructure/user-input.d.ts

@@ -0,0 +1,17 @@
+import type { Key } from 'ink';
+export type UserInput = {
+    userInputType: 'character';
+    string: string;
+} | {
+    userInputType: 'esc';
+} | {
+    userInputType: 'rightArrow';
+} | {
+    userInputType: 'leftArrow';
+} | {
+    userInputType: 'downArrow';
+} | {
+    userInputType: 'upArrow';
+};
+export declare function inkInputToUserInput(input: string, key: Key): UserInput | undefined;
+//# sourceMappingURL=user-input.d.ts.map

package/dist/infrastructure/user-input.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-input.d.ts","sourceRoot":"","sources":["../../src/infrastructure/user-input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE/B,MAAM,MAAM,SAAS,GACjB;IACE,aAAa,EAAE,WAAW,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,aAAa,EAAE,KAAK,CAAC;CACtB,GACD;IACE,aAAa,EAAE,YAAY,CAAC;CAC7B,GACD;IACE,aAAa,EAAE,WAAW,CAAC;CAC5B,GACD;IACE,aAAa,EAAE,WAAW,CAAC;CAC5B,GACD;IACE,aAAa,EAAE,SAAS,CAAC;CAC1B,CAAC;AAGN,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,CAuClF"}

package/dist/infrastructure/user-input.js

@@ -0,0 +1,35 @@
+// Interprets raw user input to typed UserInput.
+export function inkInputToUserInput(input, key) {
+    if (key.escape) {
+        return {
+            userInputType: 'esc',
+        };
+    }
+    if (key.rightArrow) {
+        return {
+            userInputType: 'rightArrow',
+        };
+    }
+    if (key.leftArrow) {
+        return {
+            userInputType: 'leftArrow',
+        };
+    }
+    if (key.upArrow) {
+        return {
+            userInputType: 'upArrow',
+        };
+    }
+    if (key.downArrow) {
+        return {
+            userInputType: 'downArrow',
+        };
+    }
+    if (input !== '') {
+        return {
+            userInputType: 'character',
+            string: input,
+        };
+    }
+    return undefined;
+}

package/dist/ui/App.d.ts

@@ -1,12 +1,11 @@
-import { DisplayRow } from 'dirvi-lib';
-import type { UnixAbsolutePath, View } from 'dirvi-lib';
+import { State } from 'dirvi-lib';
+import type { UnixAbsolutePath } from 'dirvi-lib';
 import { EventMessage } from '../domain/event-message.js';
 export type AppProps = {
     cwdAddress: UnixAbsolutePath;
-    initialView: View;
+    initialState: State;
     print?: (message: EventMessage) => void;
     onError?: (error: Error) => void;
 };
-export declare function App({ cwdAddress, initialView, print, onError }: AppProps): import("react").JSX.Element | null;
-export declare function displayedFilePaths(rows: readonly DisplayRow[]): string[];
+export declare function App({ cwdAddress, initialState, print, onError }: AppProps): import("react").JSX.Element | null;
 //# 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":"AAIA,OAAO,EAAE,UAAU,EAAqB,MAAM,WAAW,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAMxD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,sCA+GxE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,GAAG,MAAM,EAAE,CAYxE"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAqC,KAAK,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAO1D,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAY,EAAE,KAAK,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,sCAwHzE"}

package/dist/ui/App.js

@@ -1,52 +1,49 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { join } from 'node:path';
 import { Box, Text, useApp, useInput } from 'ink';
-import { useEffect, useReducer, useRef, useState } from 'react';
-import { getDirLazyEntries } from 'dirvi-lib';
+import { useEffect, useMemo, useReducer, useState } from 'react';
+import { getDirLazyEntries, NavigationNode } from 'dirvi-lib';
+import { useView } from './hooks/useView.js';
 import { reducer } from '../application/reducer.js';
-import { inputToInputResult } from '../infrastructure/input.js';
-import DirEntries from './components/DirEntries.js';
-import { createDisplayRows } from '../application/display-rows.js';
-import { entryAtPath } from '../application/dir-buffer-helpers.js';
-import * as path from 'node:path';
-export function App({ cwdAddress, initialView, print, onError }) {
-    const [view, dispatch] = useReducer(reducer, initialView);
-    const { buffer, folds, cursor } = view;
-    const displayRows = createDisplayRows(buffer, folds);
-    const pendingInput = useRef(undefined);
+import { ViewRowComponent } from './components/ViewRowComponent.js';
+import { inkInputToUserInput } from '../infrastructure/user-input.js';
+import { userInputToIntent } from '../application/user-input-to-intent.js';
+import { intentToEffect } from '../application/intent-to-effect.js';
+import { effectToAction } from '../application/effect-to-action.js';
+export function App({ cwdAddress, initialState, print, onError }) {
+    const [state, dispatch] = useReducer(reducer, initialState);
+    const navigation = useMemo(() => NavigationNode.from(state.buffer, state.folds), [state.buffer, state.folds]);
+    const [commandBuffer, setCommandBuffer] = useState('');
+    const view = useView(navigation, state);
     const [exitStatus, setExitStatus] = useState();
     // Print view on changes
     useEffect(() => {
-        print?.({ type: 'view', view: view });
+        print?.({ type: 'view', view: state });
+        const visibleFilesPaths = NavigationNode.visibleFilesPaths(navigation).map((path) => join(cwdAddress, ...path));
         print?.({
             type: 'displayed-files-paths',
-            paths: displayedFilePaths(displayRows),
+            paths: visibleFilesPaths,
         });
-    }, [view, print]);
-    // --- Input ---
-    useInput((input, key) => {
-        const result = inputToInputResult(input, key, view, pendingInput.current);
-        if (result === undefined) {
-            return;
-        }
-        if (result === 'z') {
-            pendingInput.current = result;
+    }, [state, print, navigation, cwdAddress]);
+    function executeEffect(effect) {
+        if (effect === undefined) {
             return;
         }
-        pendingInput.current = undefined;
-        const action = result;
-        // May need to load entries:
-        if (action.kind === 'toggleDir') {
-            const currentEntry = entryAtPath(view.buffer, action.path);
-            // If the entry at the path is directory with no entries loaded:
-            if (currentEntry?.kind === 'directory' &&
-                currentEntry.entries === undefined) {
-                const address = join(cwdAddress, ...action.path);
+        switch (effect.effectType) {
+            case 'dispatchEffectAsAction':
+                const action = effectToAction(effect.action, navigation, state);
+                if (action === undefined) {
+                    return;
+                }
+                dispatch(action);
+                return;
+            case 'loadDir': {
+                const address = join(cwdAddress, ...effect.path);
                 void getDirLazyEntries(address)
                     .then((entries) => {
                     dispatch({
-                        kind: 'directoryLoaded',
-                        path: action.path,
+                        kind: 'updateDir',
+                        path: effect.path,
                         entries,
                     });
                 })
@@ -55,26 +52,35 @@ export function App({ cwdAddress, initialView, print, onError }) {
                     onError?.(appError);
                     setExitStatus(`Unable to open directory: ${appError.message}`);
                 });
+                return;
             }
-            else if (currentEntry?.kind === 'directory') {
-                dispatch({
-                    kind: 'toggleDir',
-                    path: action.path,
+            case 'printFile':
+                print?.({
+                    type: 'file',
+                    path: effect.path,
                 });
-            }
+                return;
+            case 'exit':
+                setExitStatus(effect.exitMessage);
+                return;
+        }
+    }
+    // --- Input Hook ---
+    useInput((input, key) => {
+        const userInput = inkInputToUserInput(input, key);
+        if (userInput === undefined) {
             return;
         }
-        if (action.kind === 'printFile') {
-            print?.({
-                type: 'file',
-                path: action.path,
-            });
+        const intent = userInputToIntent(userInput, commandBuffer);
+        if (intent === undefined) {
             return;
         }
-        if (action.kind === 'exit') {
-            setExitStatus(action.exitMessage);
+        const effectResult = intentToEffect(intent, state);
+        if (effectResult === undefined) {
+            return;
         }
-        dispatch(action);
+        setCommandBuffer(effectResult.commandBuffer);
+        executeEffect(effectResult.effect);
     });
     // --- Exit Logic ---
     const { exit } = useApp();
@@ -91,16 +97,5 @@ export function App({ cwdAddress, initialView, print, onError }) {
         return null;
     }
     // --- JSX ---
-    return (_jsx(Box, { flexDirection: "column", children: buffer.entries.length === 0 || cursor === undefined ? (_jsx(Text, { dimColor: true, children: "Directory is empty." })) : (_jsx(DirEntries, { rows: displayRows, cursor: cursor })) }));
-}
-export function displayedFilePaths(rows) {
-    return rows.flatMap((row) => {
-        if (row.kind !== 'entry') {
-            return [];
-        }
-        if (row.entry.kind !== 'file') {
-            return [];
-        }
-        return [path.posix.join(String(row.parentPath), String(row.entry.name))];
-    });
+    return (_jsx(Box, { flexDirection: "column", children: view.rows.length === 0 ? (_jsx(Text, { dimColor: true, children: "Directory is empty." })) : (view.rows.map((row) => (_jsx(ViewRowComponent, { row: row }, row.id)))) }));
 }

package/dist/ui/App2.d.ts

@@ -0,0 +1,11 @@
+import { State } from 'dirvi-lib';
+import type { UnixAbsolutePath } from 'dirvi-lib';
+import { EventMessage } from '../domain/event-message.js';
+export type AppProps = {
+    cwdAddress: UnixAbsolutePath;
+    initialState: State;
+    print?: (message: EventMessage) => void;
+    onError?: (error: Error) => void;
+};
+export declare function App2({ cwdAddress, initialState, print, onError }: AppProps): import("react").JSX.Element | null;
+//# sourceMappingURL=App2.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"App2.d.ts","sourceRoot":"","sources":["../../src/ui/App2.tsx"],"names":[],"mappings":"AAIA,OAAO,EAA6B,KAAK,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAQlD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAY,EAAE,KAAK,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,IAAI,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,sCAsH1E"}

package/dist/ui/App2.js

@@ -0,0 +1,96 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { join } from 'node:path';
+import { Box, Text, useApp, useInput } from 'ink';
+import { useEffect, useReducer, useRef, useState } from 'react';
+import { Cursor, getDirLazyEntries } from 'dirvi-lib';
+import { useView } from './hooks/useView.js';
+import { reducer } from '../application/reducer.js';
+import { userInputToInputResult, } from '../infrastructure/input.js';
+import { ViewRowComponent } from './components/ViewRowComponent.js';
+export function App2({ cwdAddress, initialState, print, onError }) {
+    const [state, dispatch] = useReducer(reducer, initialState);
+    const view = useView(state);
+    const pendingInput = useRef(undefined);
+    const [exitStatus, setExitStatus] = useState();
+    // Print view on changes
+    useEffect(() => {
+        print?.({ type: 'view', view: state });
+        // print?.({
+        //   type: 'displayed-files-paths',
+        //   paths: displayedFilePaths(displayRows),
+        // });
+    }, [state, print]);
+    // --- Input ---
+    useInput((input, key) => {
+        const result = userInputToInputResult(input, key, state, pendingInput.current);
+        if (result === undefined) {
+            return;
+        }
+        if (result === 'z') {
+            pendingInput.current = result;
+            return;
+        }
+        pendingInput.current = undefined;
+        const action = result;
+        // Contents of `updateDir` change meaning at this boundary:
+        if (action.kind === 'updateDir') {
+            // If the entry at the path is directory with no entries loaded:
+            if (action.entries === undefined) {
+                const path = Cursor.getPath(state.cursor);
+                if (path === undefined) {
+                    return undefined;
+                }
+                const address = join(cwdAddress, ...path);
+                void getDirLazyEntries(address)
+                    .then((entries) => {
+                    dispatch({
+                        kind: 'updateDir',
+                        path: path,
+                        entries,
+                    });
+                })
+                    .catch((error) => {
+                    const appError = error instanceof Error ? error : new Error(String(error));
+                    onError?.(appError);
+                    setExitStatus(`Unable to open directory: ${appError.message}`);
+                });
+            }
+            else {
+                // Otherwise need to wipe the entries:
+                dispatch({
+                    kind: 'updateDir',
+                    path: action.path,
+                    entries: undefined,
+                });
+            }
+            return;
+        }
+        if (action.kind === 'printFile') {
+            print?.({
+                type: 'file',
+                path: action.path,
+            });
+            return;
+        }
+        if (action.kind === 'exit') {
+            setExitStatus(action.exitMessage);
+        }
+        dispatch(action);
+    });
+    // --- Exit Logic ---
+    const { exit } = useApp();
+    useEffect(() => {
+        if (exitStatus === undefined) {
+            return;
+        }
+        if (exitStatus !== '') {
+            onError?.(new Error(exitStatus));
+        }
+        exit();
+    }, [exitStatus, exit, onError]);
+    if (exitStatus !== undefined) {
+        return null;
+    }
+    // --- JSX ---
+    return (_jsx(Box, { flexDirection: "column", children: view.rows.length === 0 ? (_jsx(Text, { dimColor: true, children: "Directory is empty." })) : (view.rows.map((row) => (_jsx(ViewRowComponent, { row: row }, row.id)))) }));
+}

package/dist/ui/AppShell.d.ts

@@ -1,13 +1,13 @@
-import { UnixAbsolutePath, View } from 'dirvi-lib';
+import { UnixAbsolutePath, State } from 'dirvi-lib';
 import { EventMessage } from '../domain/event-message.js';
 export type EmptyView = {
     cursor: undefined;
 };
 export type ShellAppProps = {
     cwdAddress: UnixAbsolutePath;
-    initialView: View | EmptyView;
+    initialState: State | EmptyView;
     print?: (message: EventMessage) => void;
     onError?: (error: Error) => void;
 };
-export declare function AppShell({ cwdAddress, initialView, print, onError, }: ShellAppProps): import("react").JSX.Element;
+export declare function AppShell({ cwdAddress, initialState, print, onError, }: ShellAppProps): import("react").JSX.Element;
 //# sourceMappingURL=AppShell.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AppShell.d.ts","sourceRoot":"","sources":["../../src/ui/AppShell.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,IAAI,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,EACvB,UAAU,EACV,WAAW,EACX,KAAK,EACL,OAAO,GACR,EAAE,aAAa,+BAaf"}
+{"version":3,"file":"AppShell.d.ts","sourceRoot":"","sources":["../../src/ui/AppShell.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAY,EAAE,KAAK,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,EACvB,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,GACR,EAAE,aAAa,+BAaf"}

package/dist/ui/AppShell.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Text } from 'ink';
 import { App } from './App.js';
-export function AppShell({ cwdAddress, initialView, print, onError, }) {
-    if (initialView.cursor === undefined) {
+export function AppShell({ cwdAddress, initialState, print, onError, }) {
+    if (initialState.cursor === undefined) {
         return _jsx(Text, { dimColor: true, children: "Directory is empty." });
     }
-    return (_jsx(App, { cwdAddress: cwdAddress, initialView: initialView, print: print, onError: onError }));
+    return (_jsx(App, { cwdAddress: cwdAddress, initialState: initialState, print: print, onError: onError }));
 }

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

@@ -1,4 +1,5 @@
-import type { Cursor, DisplayRow } from 'dirvi-lib';
+import { Cursor } from 'dirvi-lib';
+import { DisplayRow } from 'dirvi-lib';
 declare function DirEntries({ rows, cursor }: {
     rows: DisplayRow[];
     cursor: Cursor;

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

@@ -1 +1 @@
-{"version":3,"file":"DirEntries.d.ts","sourceRoot":"","sources":["../../../src/ui/components/DirEntries.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQpD,iBAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,+BA0D3E;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"DirEntries.d.ts","sourceRoot":"","sources":["../../../src/ui/components/DirEntries.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC,iBAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,+BA2D3E;AAED,eAAe,UAAU,CAAC"}

package/dist/ui/components/DirEntries.js

@@ -1,15 +1,13 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text, useWindowSize } from 'ink';
-import { rowsEqual } from 'dirvi-lib';
-import { UnixEntry as UnixEntryComponent } from './UnixEntry.js';
+import { Cursor } from 'dirvi-lib';
+import { UnixEntryComponent as UnixEntryComponent } from './UnixEntryComponent.js';
 import { useRef } from 'react';
-// Display column of entries in directory, indented, and optional
-// cursor in position.
 function DirEntries({ rows, cursor }) {
     const scrollMargin = 3;
     const { rows: terminalRows } = useWindowSize();
     const viewportStartRef = useRef(0);
-    const cursorIndex = rows.findIndex((row) => rowsEqual(cursor, row));
+    const cursorIndex = rows.findIndex((row) => Cursor.matchesDisplayRow(cursor, row));
     const viewportHeight = Math.max(1, terminalRows);
     const maximumViewportStart = Math.max(0, rows.length - viewportHeight);
     let viewportStart = viewportStartRef.current;
@@ -29,10 +27,11 @@ function DirEntries({ rows, cursor }) {
     viewportStartRef.current = viewportStart;
     const visibleRows = rows.slice(viewportStart, viewportStart + viewportHeight);
     return (_jsx(_Fragment, { children: visibleRows.map((row) => {
-            const selected = rowsEqual(cursor, row);
+            const selected = Cursor.matchesDisplayRow(cursor, row);
             const indent = row.parentPath.length;
             if (row.kind === 'fold') {
-                return (_jsx(Box, { paddingLeft: indent * 2, children: _jsx(Text, { inverse: selected, dimColor: !selected, children: "..." }) }, `fold-${row.parentPath.join('/')}-${row.entryNames[0]}`));
+                const key = `fold-${row.parentPath.join('/')}-${row.entryNames[0]}`;
+                return (_jsx(Box, { paddingLeft: indent * 2, children: _jsx(Text, { inverse: selected, dimColor: !selected, children: "..." }) }, key));
             }
             return (_jsx(Box, { paddingLeft: indent * 2, children: _jsx(UnixEntryComponent, { entry: row.entry, selected: selected }) }, [...row.parentPath, row.entry.name].join('/')));
         }) }));

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

@@ -0,0 +1,6 @@
+import { UnixEntry } from 'dirvi-lib';
+export declare function UnixEntryComponent({ entry, selected, }: {
+    entry: UnixEntry;
+    selected: boolean;
+}): import("react").JSX.Element;
+//# sourceMappingURL=UnixEntryComponent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UnixEntryComponent.d.ts","sourceRoot":"","sources":["../../../src/ui/components/UnixEntryComponent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,+BAmBA"}