unity-hub-cli 0.8.0 → 0.9.0

package/dist/index.js

@@ -623,6 +623,52 @@ var UnityTempDirectoryCleaner = class {
 import clipboard from "clipboardy";
 import { Box, Text, useApp, useInput, useStdout } from "ink";
 import { useCallback, useEffect, useMemo, useState } from "react";
+
+// src/infrastructure/config.ts
+import { mkdir, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
+var defaultPreferences = {
+  favoritesFirst: true,
+  primary: "updated",
+  direction: "desc"
+};
+var getConfigDir = () => {
+  const home = process.env.HOME ?? "";
+  return `${home}/Library/Application Support/UnityHubCli`;
+};
+var getConfigPath = () => `${getConfigDir()}/config.json`;
+var isValidPrimary = (value) => value === "updated" || value === "name";
+var isValidDirection = (value) => value === "asc" || value === "desc";
+var sanitizePreferences = (input) => {
+  if (!input || typeof input !== "object") {
+    return defaultPreferences;
+  }
+  const record = input;
+  const favoritesFirst = typeof record.favoritesFirst === "boolean" ? record.favoritesFirst : defaultPreferences.favoritesFirst;
+  const primary = isValidPrimary(record.primary) ? record.primary : defaultPreferences.primary;
+  const direction = isValidDirection(record.direction) ? record.direction : defaultPreferences.direction;
+  return { favoritesFirst, primary, direction };
+};
+var readSortPreferences = async () => {
+  try {
+    const content = await readFile3(getConfigPath(), "utf8");
+    const json = JSON.parse(content);
+    return sanitizePreferences(json);
+  } catch {
+    return defaultPreferences;
+  }
+};
+var writeSortPreferences = async (prefs) => {
+  try {
+    await mkdir(getConfigDir(), { recursive: true });
+  } catch {
+  }
+  const sanitized = sanitizePreferences(prefs);
+  const json = JSON.stringify(sanitized, void 0, 2);
+  await writeFile2(getConfigPath(), json, "utf8");
+};
+var getDefaultSortPreferences = () => defaultPreferences;
+
+// src/presentation/App.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
 var extractRootFolder = (repository) => {
   if (!repository?.root) {
@@ -707,7 +753,7 @@ var formatUpdatedText = (lastModified) => {
 var homeDirectory = process.env.HOME ?? "";
 var homePrefix = homeDirectory ? `${homeDirectory}/` : "";
 var minimumVisibleProjectCount = 4;
-var defaultHintMessage = "Move with arrows or j/k \xB7 Launch with o \xB7 Quit Unity with q \xB7 Refresh with r \xB7 Copy cd path with c";
+var defaultHintMessage = "Select: j/k \xB7 Open: o \xB7 Quit: q \xB7 Refresh: r \xB7 CopyPath: c \xB7 Sort: s \xB7 Close: ctrl + c";
 var PROJECT_COLOR = "#abd8e7";
 var BRANCH_COLOR = "#e3839c";
 var PATH_COLOR = "#719bd8";
@@ -730,8 +776,50 @@ var shortenHomePath = (targetPath) => {
   return targetPath;
 };
 var buildCdCommand = (targetPath) => {
-  const escapedPath = targetPath.replaceAll('"', '\\"');
-  return `cd "${escapedPath}"`;
+  return `cd ${targetPath}`;
+};
+var getCopyTargetPath = (view) => {
+  const root = view.repository?.root;
+  return root && root.length > 0 ? root : view.project.path;
+};
+var isControl = (code) => code >= 0 && code < 32 || code >= 127 && code < 160;
+var isFullwidth = (code) => {
+  if (code >= 4352 && (code <= 4447 || // Hangul Jamo
+  code === 9001 || code === 9002 || code >= 11904 && code <= 42191 && code !== 12351 || // CJK ... Yi
+  code >= 44032 && code <= 55203 || // Hangul Syllables
+  code >= 63744 && code <= 64255 || // CJK Compatibility Ideographs
+  code >= 65040 && code <= 65049 || // Vertical forms
+  code >= 65072 && code <= 65135 || // CJK Compatibility Forms
+  code >= 65280 && code <= 65376 || // Fullwidth forms
+  code >= 65504 && code <= 65510 || code >= 127744 && code <= 128591 || // Emojis
+  code >= 129280 && code <= 129535 || code >= 131072 && code <= 262141)) {
+    return true;
+  }
+  return false;
+};
+var charWidth = (char) => {
+  const code = char.codePointAt(0);
+  if (code === void 0) return 0;
+  if (isControl(code)) return 0;
+  return isFullwidth(code) ? 2 : 1;
+};
+var stringWidth = (text) => {
+  let width = 0;
+  for (const ch of text) {
+    width += charWidth(ch);
+  }
+  return width;
+};
+var truncateToWidth = (text, maxWidth) => {
+  let width = 0;
+  let result = "";
+  for (const ch of text) {
+    const w = charWidth(ch);
+    if (width + w > maxWidth) break;
+    result += ch;
+    width += w;
+  }
+  return result;
 };
 var App = ({
   projects,
@@ -752,36 +840,87 @@ var App = ({
   const [releasedProjects, setReleasedProjects] = useState(/* @__PURE__ */ new Set());
   const [launchedProjects, setLaunchedProjects] = useState(/* @__PURE__ */ new Set());
   const [isRefreshing, setIsRefreshing] = useState(false);
+  const [isSortMenuOpen, setIsSortMenuOpen] = useState(false);
+  const [sortMenuIndex, setSortMenuIndex] = useState(0);
+  const [sortPreferences, setSortPreferences] = useState(getDefaultSortPreferences());
+  const [isSortPreferencesLoaded, setIsSortPreferencesLoaded] = useState(false);
+  const [renderEpoch, setRenderEpoch] = useState(0);
   const linesPerProject = (showBranch ? 1 : 0) + (showPath ? 1 : 0) + 2;
+  const forceFullRepaint = useCallback(() => {
+    if (!stdout) {
+      return;
+    }
+    stdout.write("\x1B[2J\x1B[3J\x1B[H");
+  }, [stdout]);
   const sortedProjects = useMemo(() => {
     const fallbackTime = 0;
-    const toSortKey = (view) => {
-      if (useGitRootName) {
-        const rootName = extractRootFolder(view.repository);
-        if (rootName) {
-          return rootName.toLocaleLowerCase();
-        }
+    const getNameKey = (view) => {
+      const rootName = extractRootFolder(view.repository);
+      const base = rootName || view.project.title;
+      return base.toLocaleLowerCase();
+    };
+    const tieBreaker = (view) => view.project.path.toLocaleLowerCase();
+    const compareByUpdated = (a, b, direction) => {
+      const timeA = a.project.lastModified?.getTime() ?? fallbackTime;
+      const timeB = b.project.lastModified?.getTime() ?? fallbackTime;
+      if (timeA === timeB) {
+        return 0;
+      }
+      return direction === "desc" ? timeB - timeA : timeA - timeB;
+    };
+    const compareByName = (a, b, direction) => {
+      const keyA = getNameKey(a);
+      const keyB = getNameKey(b);
+      if (keyA === keyB) {
+        return 0;
       }
-      return view.project.title.toLocaleLowerCase();
+      return direction === "desc" ? keyB.localeCompare(keyA) : keyA.localeCompare(keyB);
     };
-    const toTieBreaker = (view) => view.project.path.toLocaleLowerCase();
     return [...projectViews].sort((a, b) => {
-      if (a.project.favorite !== b.project.favorite) {
+      if (sortPreferences.favoritesFirst && a.project.favorite !== b.project.favorite) {
         return a.project.favorite ? -1 : 1;
       }
-      const timeA = a.project.lastModified?.getTime() ?? fallbackTime;
-      const timeB = b.project.lastModified?.getTime() ?? fallbackTime;
-      if (timeA !== timeB) {
-        return timeB - timeA;
+      const primary = sortPreferences.primary;
+      const direction = sortPreferences.direction;
+      if (primary === "updated") {
+        const updatedOrder2 = compareByUpdated(a, b, direction);
+        if (updatedOrder2 !== 0) {
+          return updatedOrder2;
+        }
+        const nameOrder2 = compareByName(a, b, "asc");
+        if (nameOrder2 !== 0) {
+          return nameOrder2;
+        }
+        return tieBreaker(a).localeCompare(tieBreaker(b));
       }
-      const keyA = toSortKey(a);
-      const keyB = toSortKey(b);
-      if (keyA === keyB) {
-        return toTieBreaker(a).localeCompare(toTieBreaker(b));
+      const nameOrder = compareByName(a, b, direction);
+      if (nameOrder !== 0) {
+        return nameOrder;
+      }
+      const updatedOrder = compareByUpdated(a, b, "desc");
+      if (updatedOrder !== 0) {
+        return updatedOrder;
       }
-      return keyA.localeCompare(keyB);
+      return tieBreaker(a).localeCompare(tieBreaker(b));
     });
-  }, [projectViews, useGitRootName]);
+  }, [projectViews, sortPreferences]);
+  useEffect(() => {
+    void (async () => {
+      try {
+        const prefs = await readSortPreferences();
+        setSortPreferences(prefs);
+      } catch {
+      } finally {
+        setIsSortPreferencesLoaded(true);
+      }
+    })();
+  }, []);
+  useEffect(() => {
+    if (!isSortPreferencesLoaded) {
+      return;
+    }
+    void writeSortPreferences(sortPreferences);
+  }, [sortPreferences, isSortPreferencesLoaded]);
   useEffect(() => {
     const handleSigint = () => {
       exit();
@@ -800,12 +939,9 @@ var App = ({
       const borderRows = 2;
       const hintRows = 1;
       const reservedRows = borderRows + hintRows;
-      const availableRows = stdout.rows - reservedRows;
+      const availableRows = Math.max(0, stdout.rows - reservedRows);
       const rowsPerProject = Math.max(linesPerProject, 1);
-      const calculatedCount = Math.max(
-        minimumVisibleProjectCount,
-        Math.floor(availableRows / rowsPerProject)
-      );
+      const calculatedCount = Math.max(1, Math.floor(availableRows / rowsPerProject));
       setVisibleCount(calculatedCount);
     };
     updateVisibleCount();
@@ -814,7 +950,7 @@ var App = ({
       stdout?.off("resize", updateVisibleCount);
     };
   }, [linesPerProject, stdout]);
-  const limit = Math.max(minimumVisibleProjectCount, visibleCount);
+  const limit = Math.max(1, visibleCount);
   const move = useCallback(
     (delta) => {
       setIndex((prev) => {
@@ -880,7 +1016,8 @@ var App = ({
     });
   }, [index, limit, sortedProjects.length]);
   const copyProjectPath = useCallback(() => {
-    const projectPath = sortedProjects[index]?.project.path;
+    const projectView = sortedProjects[index];
+    const projectPath = projectView ? getCopyTargetPath(projectView) : void 0;
     if (!projectPath) {
       setHint("No project to copy");
       setTimeout(() => {
@@ -892,7 +1029,7 @@ var App = ({
       const command = buildCdCommand(projectPath);
       clipboard.writeSync(command);
       const displayPath = shortenHomePath(projectPath);
-      setHint(`Copied command: cd "${displayPath}"`);
+      setHint(`Copied command: cd ${displayPath}`);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       setHint(`Failed to copy: ${message}`);
@@ -912,7 +1049,8 @@ var App = ({
     }
     const { project } = projectView;
     try {
-      const command = buildCdCommand(project.path);
+      const cdTarget = getCopyTargetPath(projectView);
+      const command = buildCdCommand(cdTarget);
       clipboard.writeSync(command);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -1058,6 +1196,50 @@ var App = ({
     }
   }, [isRefreshing, onRefresh, sortedProjects]);
   useInput((input, key) => {
+    if (isSortMenuOpen) {
+      if (key.escape || input === "\x1B") {
+        clearOverlay();
+        forceFullRepaint();
+        setIsSortMenuOpen(false);
+        setRenderEpoch((prev) => prev + 1);
+        return;
+      }
+      if (input === "j") {
+        setSortMenuIndex((prev) => {
+          const last = 2;
+          const next = prev + 1;
+          return next > last ? 0 : next;
+        });
+        return;
+      }
+      if (input === "k") {
+        setSortMenuIndex((prev) => {
+          const last = 2;
+          const next = prev - 1;
+          return next < 0 ? last : next;
+        });
+        return;
+      }
+      const toggleCurrent = () => {
+        if (sortMenuIndex === 0) {
+          setSortPreferences((prev) => ({ ...prev, primary: prev.primary === "updated" ? "name" : "updated" }));
+          return;
+        }
+        if (sortMenuIndex === 1) {
+          setSortPreferences((prev) => ({ ...prev, direction: prev.direction === "asc" ? "desc" : "asc" }));
+          return;
+        }
+        setSortPreferences((prev) => ({ ...prev, favoritesFirst: !prev.favoritesFirst }));
+      };
+      if (input === " ") {
+        toggleCurrent();
+      }
+      return;
+    }
+    if (input === "S" || input === "s") {
+      setIsSortMenuOpen(true);
+      return;
+    }
     if (input === "j" || key.downArrow) {
       move(1);
     }
@@ -1126,7 +1308,7 @@ var App = ({
     return visibleProjects.map(({ project, repository, launchStatus }, offset) => {
       const rowIndex = startIndex + offset;
       const isSelected = rowIndex === index;
-      const arrow = isSelected ? ">" : " ";
+      const selectionBar = isSelected ? "\u2503" : " ";
       const projectName = formatProjectName(project, repository, useGitRootName);
       const versionLabel = `(${project.version.value})`;
       const updatedText = formatUpdatedText(project.lastModified);
@@ -1151,28 +1333,23 @@ var App = ({
       const statusLabel = STATUS_LABELS[displayStatus];
       const statusColor = displayStatus === "running" ? LOCK_COLOR : displayStatus === "crashed" ? "red" : void 0;
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
-        /* @__PURE__ */ jsxs(Box, { flexGrow: 1, flexDirection: "column", children: [
-          /* @__PURE__ */ jsxs(Text, { children: [
-            /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : PROJECT_COLOR, bold: true, children: [
-              arrow,
-              " ",
-              projectName
-            ] }),
-            /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : void 0, children: [
+        /* @__PURE__ */ jsxs(Box, { width: 1, flexDirection: "column", alignItems: "center", marginLeft: isSelected ? 1 : 0, children: [
+          /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: selectionBar }),
+          showBranch ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: selectionBar }) : null,
+          showPath ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: selectionBar }) : null
+        ] }),
+        /* @__PURE__ */ jsxs(Box, { flexGrow: 1, flexDirection: "column", marginLeft: isSelected ? 2 : 1, children: [
+          /* @__PURE__ */ jsxs(Text, { wrap: "truncate", children: [
+            /* @__PURE__ */ jsx(Text, { color: PROJECT_COLOR, bold: true, children: projectName }),
+            /* @__PURE__ */ jsxs(Text, { children: [
               " ",
               versionLabel
             ] }),
-            updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null,
+            updatedText ? /* @__PURE__ */ jsx(Text, { children: `  ${updatedText}` }) : null,
             statusLabel && statusColor ? /* @__PURE__ */ jsx(Text, { color: statusColor, children: `  ${statusLabel}` }) : null
           ] }),
-          showBranch ? /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : BRANCH_COLOR, children: [
-            "  ",
-            branchLine
-          ] }) : null,
-          showPath ? /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : PATH_COLOR, children: [
-            "  ",
-            pathLine
-          ] }) : null,
+          showBranch ? /* @__PURE__ */ jsx(Text, { color: BRANCH_COLOR, wrap: "truncate", children: branchLine }) : null,
+          showPath ? /* @__PURE__ */ jsx(Text, { color: PATH_COLOR, wrap: "truncate", children: pathLine }) : null,
           /* @__PURE__ */ jsx(Text, { children: " " })
         ] }),
         /* @__PURE__ */ jsxs(Box, { marginLeft: 1, width: 1, flexDirection: "column", alignItems: "center", children: [
@@ -1194,10 +1371,121 @@ var App = ({
     useGitRootName,
     visibleProjects
   ]);
+  useEffect(() => {
+    if (!isSortMenuOpen || !stdout) {
+      return;
+    }
+    const columns = typeof stdout.columns === "number" ? stdout.columns : 80;
+    const contentRows = rows.length === 0 ? 1 : visibleProjects.length * linesPerProject;
+    const contentWidth = Math.max(10, columns - 2);
+    const modalInnerWidth = Math.min(60, Math.max(28, contentWidth - 6));
+    const modalWidth = Math.min(contentWidth, modalInnerWidth);
+    const leftPadding = Math.max(0, Math.floor((contentWidth - modalWidth) / 2));
+    const title = "Sort Menu (Select: j/k, Toggle: Space, Close: Esc)";
+    const linePrimary = `Primary: ${sortPreferences.primary === "updated" ? "Updated" : "Name (Git root)"}`;
+    const lineDirection = `Direction: ${sortPreferences.primary === "updated" ? sortPreferences.direction === "desc" ? "New to Old" : "Old to New" : sortPreferences.direction === "asc" ? "A to Z" : "Z to A"}`;
+    const lineFav = `Favorites first: ${sortPreferences.favoritesFirst ? "ON" : "OFF"}`;
+    const innerWidth = modalWidth - 2;
+    const BORDER_ON = "\x1B[32m";
+    const BORDER_OFF = "\x1B[39m";
+    const fixedPrefixWidth = 2;
+    const buildContentLine = (label, selected) => {
+      const arrow = selected ? "> " : "  ";
+      const maxLabelWidth = Math.max(0, innerWidth - fixedPrefixWidth);
+      const rawLabel = label;
+      const limitedLabel = stringWidth(rawLabel) > maxLabelWidth ? `${truncateToWidth(rawLabel, Math.max(0, maxLabelWidth - 3))}...` : rawLabel;
+      const visibleBase = `${arrow}${limitedLabel}`;
+      const colored = selected ? `\x1B[32m${visibleBase}\x1B[39m` : visibleBase;
+      const pad = Math.max(0, innerWidth - stringWidth(visibleBase));
+      return `${BORDER_ON}\u2502${BORDER_OFF}${colored}${" ".repeat(pad)}${BORDER_ON}\u2502${BORDER_OFF}`;
+    };
+    const contentLines = [
+      (() => {
+        const prefix = "  ";
+        const maxTitleWidth = Math.max(0, innerWidth - fixedPrefixWidth);
+        const visibleTitle = stringWidth(title) > maxTitleWidth ? `${truncateToWidth(title, Math.max(0, maxTitleWidth - 3))}...` : title;
+        const content = `${prefix}${visibleTitle}`;
+        const pad = Math.max(0, innerWidth - stringWidth(content));
+        return `${BORDER_ON}\u2502${BORDER_OFF}${content}${" ".repeat(pad)}${BORDER_ON}\u2502${BORDER_OFF}`;
+      })(),
+      `${BORDER_ON}\u2502${BORDER_OFF}${" ".repeat(innerWidth)}${BORDER_ON}\u2502${BORDER_OFF}`,
+      buildContentLine(linePrimary, sortMenuIndex === 0),
+      buildContentLine(lineDirection, sortMenuIndex === 1),
+      buildContentLine(lineFav, sortMenuIndex === 2)
+    ];
+    const topBorder = `${BORDER_ON}\u250C${"\u2500".repeat(modalWidth - 2)}\u2510${BORDER_OFF}`;
+    const bottomBorder = `${BORDER_ON}\u2514${"\u2500".repeat(modalWidth - 2)}\u2518${BORDER_OFF}`;
+    const overlayLines = [topBorder, ...contentLines, bottomBorder];
+    const overlayHeight = overlayLines.length;
+    const overlayTopWithinContent = Math.max(0, Math.floor((contentRows - overlayHeight) / 2));
+    const overlayTopRelativeToComponent = 1 + overlayTopWithinContent;
+    const bottomIndex = contentRows + 2;
+    const moveUp = Math.max(0, bottomIndex - overlayTopRelativeToComponent);
+    const moveRight = 1 + leftPadding;
+    stdout.write("\x1B7");
+    if (moveUp > 0) {
+      stdout.write(`\x1B[${moveUp}A`);
+    }
+    stdout.write("\r");
+    for (let i = 0; i < overlayLines.length; i++) {
+      stdout.write("\r");
+      if (moveRight > 0) {
+        stdout.write(`\x1B[${moveRight}C`);
+      }
+      stdout.write(" ".repeat(Math.max(0, modalWidth)));
+      stdout.write(`\x1B[${Math.max(0, modalWidth)}D`);
+      stdout.write(overlayLines[i]);
+      if (i < overlayLines.length - 1) {
+        stdout.write("\r\n");
+      }
+    }
+    stdout.write("\x1B8");
+  }, [
+    isSortMenuOpen,
+    linesPerProject,
+    rows,
+    sortPreferences,
+    sortMenuIndex,
+    stdout,
+    visibleProjects.length
+  ]);
+  const clearOverlay = useCallback(() => {
+    if (!stdout) {
+      return;
+    }
+    const columns = typeof stdout.columns === "number" ? stdout.columns : 80;
+    const contentRows = rows.length === 0 ? 1 : visibleProjects.length * linesPerProject;
+    const contentWidth = Math.max(10, columns - 2);
+    const modalInnerWidth = Math.min(60, Math.max(28, contentWidth - 6));
+    const modalWidth = Math.min(contentWidth, modalInnerWidth);
+    const leftPadding = Math.max(0, Math.floor((contentWidth - modalWidth) / 2));
+    const overlayHeight = 6;
+    const overlayTopWithinContent = Math.max(0, Math.floor((contentRows - overlayHeight) / 2));
+    const overlayTopRelativeToComponent = 1 + overlayTopWithinContent;
+    const bottomIndex = contentRows + 2;
+    const moveUp = Math.max(0, bottomIndex - overlayTopRelativeToComponent);
+    const moveRight = 1 + leftPadding;
+    stdout.write("\x1B7");
+    if (moveUp > 0) {
+      stdout.write(`\x1B[${moveUp}A`);
+    }
+    stdout.write("\r");
+    for (let i = 0; i < overlayHeight; i++) {
+      stdout.write("\r");
+      if (moveRight > 0) {
+        stdout.write(`\x1B[${moveRight}C`);
+      }
+      stdout.write(" ".repeat(Math.max(0, modalWidth)));
+      if (i < overlayHeight - 1) {
+        stdout.write("\r\n");
+      }
+    }
+    stdout.write("\x1B8");
+  }, [linesPerProject, rows.length, visibleProjects.length, stdout]);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", children: rows.length === 0 ? /* @__PURE__ */ jsx(Text, { children: "No Unity Hub projects were found." }) : rows }),
-    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { children: hint }) })
-  ] });
+    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { wrap: "truncate", children: hint }) })
+  ] }, renderEpoch);
 };
 
 // src/index.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {