@mak-98/dirvi-cli 0.3.2 → 0.4.0

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

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

package/dist/ui/components/UnixEntry.js

@@ -1,12 +1,19 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from 'react/jsx-runtime';
 import { Text } from 'ink';
-export function UnixEntry({ entry, selected, }) {
-    switch (entry.kind) {
-        case 'file':
-            return _jsx(Text, { inverse: selected, children: entry.name });
-        case 'symlink':
-            return (_jsxs(Text, { inverse: selected, children: [entry.name, " -> ", entry.target] }));
-        case 'directory':
-            return (_jsxs(Text, { inverse: selected, color: "blue", children: [entry.name, "/"] }));
-    }
+export function UnixEntry({ entry, selected }) {
+  switch (entry.kind) {
+    case 'file':
+      return _jsx(Text, { inverse: selected, children: entry.name });
+    case 'symlink':
+      return _jsxs(Text, {
+        inverse: selected,
+        children: [entry.name, ' -> ', entry.target],
+      });
+    case 'directory':
+      return _jsxs(Text, {
+        inverse: selected,
+        color: 'blue',
+        children: [entry.name, '/'],
+      });
+  }
 }

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

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

package/dist/ui/components/UnixEntryComponent.js

@@ -1,12 +1,19 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from 'react/jsx-runtime';
 import { Text } from 'ink';
-export function UnixEntryComponent({ entry, selected, }) {
-    switch (entry.kind) {
-        case 'file':
-            return _jsx(Text, { inverse: selected, children: entry.name });
-        case 'symlink':
-            return (_jsxs(Text, { inverse: selected, children: [entry.name, " -> ", entry.target] }));
-        case 'directory':
-            return (_jsxs(Text, { inverse: selected, color: "blue", children: [entry.name, "/"] }));
-    }
+export function UnixEntryComponent({ entry, selected }) {
+  switch (entry.kind) {
+    case 'file':
+      return _jsx(Text, { inverse: selected, children: entry.name });
+    case 'symlink':
+      return _jsxs(Text, {
+        inverse: selected,
+        children: [entry.name, ' -> ', entry.target],
+      });
+    case 'directory':
+      return _jsxs(Text, {
+        inverse: selected,
+        color: 'blue',
+        children: [entry.name, '/'],
+      });
+  }
 }

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

@@ -1,5 +1,7 @@
 import { ViewRow } from '../view.js';
-export declare function ViewRowComponent({ row }: {
-    row: ViewRow;
-}): import("react").JSX.Element;
-//# sourceMappingURL=ViewRowComponent.d.ts.map
+export declare function ViewRowComponent({
+  row,
+}: {
+  row: ViewRow;
+}): import('react').JSX.Element;
+//# sourceMappingURL=ViewRowComponent.d.ts.map

package/dist/ui/components/ViewRowComponent.js

@@ -1,13 +1,33 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from 'react/jsx-runtime';
 import { Box, Text } from 'ink';
 export function ViewRowComponent({ row }) {
-    const prefix = '';
-    switch (row.type) {
-        case 'file':
-            return (_jsx(Box, { paddingLeft: row.indent * 2, children: _jsxs(Text, { inverse: row.selected, children: [prefix, row.content] }) }));
-        case 'directory':
-            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] }) }));
-    }
+  const prefix = '';
+  switch (row.type) {
+    case 'file':
+      return _jsx(Box, {
+        paddingLeft: row.indent * 2,
+        children: _jsxs(Text, {
+          inverse: row.selected,
+          children: [prefix, row.content],
+        }),
+      });
+    case 'directory':
+      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],
+        }),
+      });
+  }
 }

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

@@ -1,4 +1,8 @@
 import { NavigationNode, State } from 'dirvi-lib';
 import { View } from '../view.js';
-export declare function useView(navigation: NavigationNode, state: State): View;
-//# sourceMappingURL=useView.d.ts.map
+export declare function useView(
+  navigation: NavigationNode,
+  state: State,
+  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,EAAsB,cAAc,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,IAAI,EAAW,MAAM,YAAY,CAAC;AAO3C,wBAAgB,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAmBtE"}
+{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,IAAI,EAAW,MAAM,YAAY,CAAC;AAO3C,wBAAgB,OAAO,CACrB,UAAU,EAAE,cAAc,EAC1B,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,IAAI,CAkBN"}

package/dist/ui/hooks/useView.js

@@ -1,30 +1,38 @@
 import { View } from '../view.js';
-import { useWindowSize } from 'ink';
 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) {
-    const { rows: terminalRows } = useWindowSize();
-    const viewportStartRef = useRef(0);
-    const viewportHeight = Math.max(1, terminalRows);
-    const rows = View.createRows(navigation, state.cursor);
-    viewportStartRef.current = viewportStart(rows, viewportHeight, viewportStartRef.current);
-    return View.create(navigation, state.cursor, viewportHeight, viewportStartRef.current);
+export function useView(navigation, state, terminalRows) {
+  const viewportStartRef = useRef(0);
+  const viewportHeight = Math.max(1, terminalRows - STATUS_BAR_HEIGHT);
+  const rows = View.createRows(navigation, state.cursor);
+  viewportStartRef.current = viewportStart(
+    rows,
+    viewportHeight,
+    viewportStartRef.current,
+  );
+  return View.create(
+    navigation,
+    state.cursor,
+    viewportHeight,
+    viewportStartRef.current,
+  );
 }
 function viewportStart(rows, viewportHeight, currentViewportStart) {
-    const scrollMargin = 3;
-    const cursorIndex = rows.findIndex((row) => row.cursor);
-    const maximumViewportStart = Math.max(0, rows.length - viewportHeight);
-    let viewportStart = currentViewportStart;
-    if (cursorIndex >= 0) {
-        const firstVisibleCursorIndex = viewportStart + scrollMargin;
-        const lastVisibleCursorIndex = viewportStart + viewportHeight - 1 - scrollMargin;
-        if (cursorIndex < firstVisibleCursorIndex) {
-            viewportStart = cursorIndex - scrollMargin;
-        }
-        else if (cursorIndex > lastVisibleCursorIndex) {
-            viewportStart = cursorIndex - viewportHeight + 1 + scrollMargin;
-        }
+  const scrollMargin = 3;
+  const cursorIndex = rows.findIndex((row) => row.cursor);
+  const maximumViewportStart = Math.max(0, rows.length - viewportHeight);
+  let viewportStart = currentViewportStart;
+  if (cursorIndex >= 0) {
+    const firstVisibleCursorIndex = viewportStart + scrollMargin;
+    const lastVisibleCursorIndex =
+      viewportStart + viewportHeight - 1 - scrollMargin;
+    if (cursorIndex < firstVisibleCursorIndex) {
+      viewportStart = cursorIndex - scrollMargin;
+    } else if (cursorIndex > lastVisibleCursorIndex) {
+      viewportStart = cursorIndex - viewportHeight + 1 + scrollMargin;
     }
-    return Math.max(0, Math.min(viewportStart, maximumViewportStart));
+  }
+  return Math.max(0, Math.min(viewportStart, maximumViewportStart));
 }

package/dist/ui/view.d.ts

@@ -1,18 +1,23 @@
 import { Cursor, NavigationNode } from 'dirvi-lib';
 export type ViewRowType = 'file' | 'directory' | 'fold';
 export type ViewRow = {
-    id: string;
-    indent: number;
-    selected: boolean;
-    cursor: boolean;
-    content: string;
-    type: ViewRowType;
+  id: string;
+  indent: number;
+  selected: boolean;
+  cursor: boolean;
+  content: string;
+  type: ViewRowType;
 };
 export type View = {
-    rows: ViewRow[];
+  rows: ViewRow[];
 };
 export declare const View: {
-    createRows(navigation: NavigationNode, cursor: Cursor): ViewRow[];
-    create(navigation: NavigationNode, cursor: Cursor, viewportHeight: number, viewportStart: number): View;
+  createRows(navigation: NavigationNode, cursor: Cursor): ViewRow[];
+  create(
+    navigation: NavigationNode,
+    cursor: Cursor,
+    viewportHeight: number,
+    viewportStart: number,
+  ): View;
 };
-//# sourceMappingURL=view.d.ts.map
+//# 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,EACL,MAAM,EAEN,cAAc,EAEf,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;AAMxD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;2BAED,cAAc,UAClB,MAAM,GACb,OAAO,EAAE;uBAKE,cAAc,UAClB,MAAM,kBACE,MAAM,iBACP,MAAM,GACpB,IAAI;CAUR,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,cAAc,EAEf,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;AAMxD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;2BACQ,cAAc,UAAU,MAAM,GAAG,OAAO,EAAE;uBAKnD,cAAc,UAClB,MAAM,kBACE,MAAM,iBACP,MAAM,GACpB,IAAI;CAOR,CAAC"}

package/dist/ui/view.js

@@ -1,74 +1,78 @@
-import { UnixEntryPath, } from 'dirvi-lib';
+import { UnixEntryPath } from 'dirvi-lib';
 export const View = {
-    createRows(navigation, cursor) {
-        return viewRowsAtNode(navigation, [], cursor);
-    },
-    create(navigation, cursor, viewportHeight, viewportStart) {
-        const rows = View.createRows(navigation, cursor);
-        return {
-            rows: rows.slice(viewportStart, viewportStart + viewportHeight),
-        };
-    },
+  createRows(navigation, cursor) {
+    return viewRowsAtNode(navigation, [], cursor);
+  },
+  create(navigation, cursor, viewportHeight, viewportStart) {
+    const rows = View.createRows(navigation, cursor);
+    return {
+      rows: rows.slice(viewportStart, viewportStart + viewportHeight),
+    };
+  },
 };
 function viewRowsAtNode(node, parentPath, cursor) {
-    const rows = [];
-    for (const entry of node.entries) {
-        const isCursor = cursor.kind === 'entry' &&
-            UnixEntryPath.equal(cursor.parentPath, parentPath) &&
-            cursor.entryName === entry.name;
-        rows.push(viewRowForEntry(entry, parentPath, isCursor));
-        if (entry.kind !== 'directory' || entry.node === undefined) {
-            continue;
-        }
-        rows.push(...viewRowsAtNode(entry.node, [...parentPath, entry.name], cursor));
+  const rows = [];
+  for (const entry of node.entries) {
+    const isCursor =
+      cursor.kind === 'entry' &&
+      UnixEntryPath.equal(cursor.parentPath, parentPath) &&
+      cursor.entryName === entry.name;
+    rows.push(viewRowForEntry(entry, parentPath, isCursor));
+    if (entry.kind !== 'directory' || entry.node === undefined) {
+      continue;
     }
-    if (node.foldedEntries.length > 0) {
-        const isCursor = cursor.kind === 'fold' &&
-            UnixEntryPath.equal(cursor.parentPath, parentPath);
-        rows.push({
-            id: foldId(parentPath),
-            indent: parentPath.length,
-            selected: isCursor,
-            cursor: isCursor,
-            content: `⋯ ${node.foldedEntries.length} folded entries`,
-            type: 'fold',
-        });
-    }
-    return rows;
+    rows.push(
+      ...viewRowsAtNode(entry.node, [...parentPath, entry.name], cursor),
+    );
+  }
+  if (node.foldedEntries.length > 0) {
+    const isCursor =
+      cursor.kind === 'fold' &&
+      UnixEntryPath.equal(cursor.parentPath, parentPath);
+    rows.push({
+      id: foldId(parentPath),
+      indent: parentPath.length,
+      selected: isCursor,
+      cursor: isCursor,
+      content: `⋯ ${node.foldedEntries.length} folded`,
+      type: 'fold',
+    });
+  }
+  return rows;
 }
 function viewRowForEntry(entry, parentPath, cursor) {
-    return {
-        id: entryId(parentPath, entry.name),
-        indent: parentPath.length,
-        selected: cursor,
-        cursor,
-        content: content(entry),
-        type: type(entry),
-    };
+  return {
+    id: entryId(parentPath, entry.name),
+    indent: parentPath.length,
+    selected: cursor,
+    cursor,
+    content: content(entry),
+    type: type(entry),
+  };
 }
 function entryId(parentPath, entryName) {
-    return `entry:${JSON.stringify([...parentPath, entryName])}`;
+  return `entry:${JSON.stringify([...parentPath, entryName])}`;
 }
 function foldId(parentPath) {
-    return `fold:${JSON.stringify(parentPath)}`;
+  return `fold:${JSON.stringify(parentPath)}`;
 }
 function content(entry) {
-    switch (entry.kind) {
-        case 'file':
-            return entry.name;
-        case 'directory':
-            return `${entry.name}/`;
-        case 'symlink':
-            return `${entry.name} -> ${entry.target}`;
-    }
+  switch (entry.kind) {
+    case 'file':
+      return entry.name;
+    case 'directory':
+      return `${entry.name}/`;
+    case 'symlink':
+      return `${entry.name} -> ${entry.target}`;
+  }
 }
 function type(entry) {
-    switch (entry.kind) {
-        case 'file':
-            return 'file';
-        case 'directory':
-            return 'directory';
-        case 'symlink':
-            return 'file';
-    }
+  switch (entry.kind) {
+    case 'file':
+      return 'file';
+    case 'directory':
+      return 'directory';
+    case 'symlink':
+      return 'file';
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mak-98/dirvi-cli",
-  "version": "0.3.2",
+  "version": "0.4.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.3.0",
+    "dirvi-lib": "0.4.0",
     "ink": "^7.1.1",
     "react": "^19.0.0"
   },
@@ -28,6 +28,7 @@
     "dev": "FORCE_COLOR=3 tsx src/index.tsx",
     "start": "node dist/index.js",
     "typecheck": "tsc --noEmit",
+    "format": "prettier . --write",
     "update-global": "npm install --global @mak-98/dirvi-cli@latest"
   }
 }