@youtyan/code-viewer 0.1.27 → 0.1.29

package/dist/code-viewer.js

@@ -5,7 +5,7 @@ import {
   closeSync,
   constants,
   existsSync as existsSync3,
-  lstatSync as lstatSync3,
+  lstatSync as lstatSync4,
   mkdirSync,
   openSync,
   readFileSync as readFileSync2,
@@ -17,7 +17,7 @@ import {
   writeFileSync
 } from "node:fs";
 import { homedir } from "node:os";
-import { basename as basename2, dirname as dirname2, extname, join as join4, relative } from "node:path";
+import { basename as basename2, dirname as dirname2, extname, join as join5, relative as relative2 } from "node:path";
 
 // web-src/directory-name.ts
 function normalizeNewDirectoryName(name) {
@@ -280,6 +280,8 @@ var DEFAULT_WORKTREE_OMIT_DIR_NAMES = [
   "out",
   "target",
   ".gradle",
+  ".pnpm-store",
+  ".turbo",
   "__pycache__",
   ".pytest_cache",
   ".tox",
@@ -1240,9 +1242,181 @@ function parseGitGrepOutput(stdout, ref, max, omitDirNames = [], excludeNames =
   return parseRgOutput(normalized, max, omitDirNames, excludeNames);
 }
 
+// web-src/server/worktree-watcher.ts
+import {
+  lstatSync as lstatSync3,
+  readdirSync as nodeReaddirSync,
+  watch as nodeWatch
+} from "node:fs";
+import { join as join4, relative } from "node:path";
+function normalizeRelativePath(path) {
+  return path.replace(/\\/g, "/").replace(/^\/+/, "");
+}
+function isInsideRoot(root, path) {
+  const rel = relative(root, path).replace(/\\/g, "/");
+  return rel === "" || !rel.startsWith("..") && !rel.startsWith("/");
+}
+function startWorktreeUpdateWatch(options) {
+  const watch = options.watch || nodeWatch;
+  const readDirs = options.readdirSync || ((path) => nodeReaddirSync(path, { withFileTypes: true }));
+  const isDirectory = options.isDirectory || ((path) => {
+    try {
+      return lstatSync3(path).isDirectory();
+    } catch {
+      return false;
+    }
+  });
+  const directorySignature = options.directorySignature || ((path) => {
+    try {
+      const stats = lstatSync3(path);
+      if (!stats.isDirectory())
+        return null;
+      return `${stats.dev}:${stats.ino}`;
+    } catch {
+      return null;
+    }
+  });
+  const setTimer = options.setTimeoutFn || setTimeout;
+  const clearTimer = options.clearTimeoutFn || clearTimeout;
+  const debounceMs = options.debounceMs ?? 250;
+  const watchers = new Map;
+  const signatures = new Map;
+  const initialScanAsync = options.initialScanMode === "async" || (!options.watch || options.watch === nodeWatch) && !options.readdirSync;
+  const initialScanQueue = [];
+  let initialScanTimer = null;
+  let timer = null;
+  const ignored = (path) => isSkippableSearchPath(normalizeRelativePath(path), options.omitDirNames, options.excludeNames);
+  const scheduleUpdate = () => {
+    if (timer)
+      clearTimer(timer);
+    timer = setTimer(() => {
+      timer = null;
+      options.onUpdate();
+    }, debounceMs);
+  };
+  const closeSubtree = (dir) => {
+    for (const [watchedDir, watcher] of [...watchers]) {
+      if (watchedDir !== dir && !watchedDir.startsWith(`${dir}/`))
+        continue;
+      try {
+        watcher.close?.();
+      } catch {}
+      watchers.delete(watchedDir);
+      signatures.delete(watchedDir);
+    }
+  };
+  const closeAll = () => {
+    if (initialScanTimer) {
+      clearTimer(initialScanTimer);
+      initialScanTimer = null;
+    }
+    initialScanQueue.length = 0;
+    for (const watcher of [...watchers.values()]) {
+      try {
+        watcher.close?.();
+      } catch {}
+    }
+    watchers.clear();
+    signatures.clear();
+  };
+  const readChildDirectories = (dir) => {
+    let entries;
+    try {
+      entries = readDirs(dir);
+    } catch (error) {
+      options.onError?.(error);
+      return [];
+    }
+    const children = [];
+    for (const entry of entries) {
+      if (!entry.isDirectory())
+        continue;
+      children.push(join4(dir, entry.name));
+    }
+    return children;
+  };
+  const processInitialScanQueue = () => {
+    initialScanTimer = null;
+    const next = initialScanQueue.shift();
+    if (next)
+      watchDirectory(next, true);
+    if (initialScanQueue.length)
+      initialScanTimer = setTimer(processInitialScanQueue, 50);
+  };
+  const queueInitialChildren = (dir) => {
+    initialScanQueue.push(...readChildDirectories(dir));
+    if (!initialScanTimer)
+      initialScanTimer = setTimer(processInitialScanQueue, 5000);
+  };
+  const watchDirectory = (dir, initialScan = false) => {
+    if (watchers.has(dir))
+      return;
+    const rel = normalizeRelativePath(relative(options.root, dir));
+    if (rel && ignored(rel))
+      return;
+    try {
+      const watcher = watch(dir, { persistent: false }, (_event, filename) => {
+        if (!filename) {
+          scheduleUpdate();
+          return;
+        }
+        const changed = normalizeRelativePath(join4(rel, filename.toString()));
+        if (ignored(changed))
+          return;
+        const fullChangedPath = join4(options.root, changed);
+        if (!isInsideRoot(options.root, fullChangedPath))
+          return;
+        const known = watchers.has(fullChangedPath);
+        if (isDirectory(fullChangedPath)) {
+          if (known) {
+            const signature2 = directorySignature(fullChangedPath);
+            if (signature2 && signature2 !== signatures.get(fullChangedPath)) {
+              closeSubtree(fullChangedPath);
+              watchDirectory(fullChangedPath);
+            }
+            scheduleUpdate();
+            return;
+          }
+          watchDirectory(fullChangedPath);
+        } else if (known) {
+          closeSubtree(fullChangedPath);
+        }
+        scheduleUpdate();
+      }) || {};
+      watchers.set(dir, watcher);
+      const signature = directorySignature(dir);
+      if (signature)
+        signatures.set(dir, signature);
+      watcher.on?.("error", () => {
+        if (watchers.get(dir) === watcher) {
+          watchers.delete(dir);
+          signatures.delete(dir);
+        }
+      });
+      watcher.on?.("close", () => {
+        if (watchers.get(dir) === watcher) {
+          watchers.delete(dir);
+          signatures.delete(dir);
+        }
+      });
+    } catch (error) {
+      options.onError?.(error);
+      return;
+    }
+    if (initialScanAsync && initialScan) {
+      queueInitialChildren(dir);
+      return;
+    }
+    for (const child of readChildDirectories(dir))
+      watchDirectory(child);
+  };
+  watchDirectory(options.root, true);
+  return { started: watchers.size > 0, close: closeAll };
+}
+
 // web-src/server/preview.ts
-var WEB_ROOT = join4(ROOT, "web");
-var VERSION = JSON.parse(readFileSync2(join4(ROOT, "package.json"), "utf8")).version;
+var WEB_ROOT = join5(ROOT, "web");
+var VERSION = JSON.parse(readFileSync2(join5(ROOT, "package.json"), "utf8")).version;
 var DEFAULT_ARGS = ["HEAD"];
 var PREVIEW_HUNKS_DEFAULT = 3;
 var PREVIEW_LINES_DEFAULT = 1200;
@@ -1448,7 +1622,7 @@ function staticFile(pathname) {
   const spec = map[pathname];
   if (!spec)
     return null;
-  const full = join4(WEB_ROOT, spec[0]);
+  const full = join5(WEB_ROOT, spec[0]);
   if (!existsSync3(full))
     return text("not found", 404);
   return new Response(readFileSync2(full), {
@@ -1682,7 +1856,7 @@ function parseScopeExcludeNamesQuery(value) {
   return normalizeScopeExcludeNames(names);
 }
 function loadProjectConfig() {
-  const full = join4(cwd, ".code-viewer.json");
+  const full = join5(cwd, ".code-viewer.json");
   if (!existsSync3(full))
     return null;
   let realCwd;
@@ -1747,7 +1921,7 @@ function safeWorktreePath(path) {
     return null;
   if (isGitInternalPath(path))
     return null;
-  const full = join4(cwd, path);
+  const full = join5(cwd, path);
   if (!existsSync3(full))
     return null;
   let realCwd;
@@ -1758,7 +1932,7 @@ function safeWorktreePath(path) {
   } catch {
     return null;
   }
-  const rel = relative(realCwd, realFull);
+  const rel = relative2(realCwd, realFull);
   if (rel === "" || rel.startsWith("..") || rel.startsWith("/") || rel.startsWith("\\"))
     return null;
   if (isGitInternalPath(rel))
@@ -1766,7 +1940,7 @@ function safeWorktreePath(path) {
   return realFull;
 }
 function worktreePath(path) {
-  return join4(cwd, path);
+  return join5(cwd, path);
 }
 function safeOpenWorktreePath(path) {
   if (path === "") {
@@ -1963,7 +2137,7 @@ function grepWorktreeFallback(query, max, paths, omitDirNames, excludeNames) {
       continue;
     let stat;
     try {
-      stat = lstatSync3(full);
+      stat = lstatSync4(full);
     } catch {
       continue;
     }
@@ -2529,8 +2703,8 @@ async function handleUploadFiles(req) {
     total += file.size;
     if (total > MAX_UPLOAD_TOTAL_BYTES)
       return text("upload too large", 413);
-    const target = join4(realDir, safeName);
-    if (relative(realDir, dirname2(target)) !== "")
+    const target = join5(realDir, safeName);
+    if (relative2(realDir, dirname2(target)) !== "")
       return text("invalid filename", 400);
     if (existsSync3(target))
       return text("file exists", 409);
@@ -2557,10 +2731,7 @@ async function handleUploadFiles(req) {
       return text("file exists", 409);
     return text("upload failed", 500);
   }
-  generation++;
-  fileCache.clear();
-  metaCache.clear();
-  sendSse("update");
+  triggerUpdate();
   return json({
     ok: true,
     files: uploads.map((upload) => upload.name),
@@ -2647,10 +2818,15 @@ function clearMutableCaches() {
   metaCache.clear();
   fileListCache.clear();
 }
+function triggerUpdate() {
+  generation++;
+  clearMutableCaches();
+  sendSse("update");
+}
 function moveMacPathIntoTrash(path) {
-  const trashDir = join4(homedir(), ".Trash");
+  const trashDir = join5(homedir(), ".Trash");
   const base = basename2(path) || "code-viewer-trash-item";
-  const target = join4(trashDir, `${base}-${Date.now()}-${process.pid}-${Math.random().toString(36).slice(2, 8)}`);
+  const target = join5(trashDir, `${base}-${Date.now()}-${process.pid}-${Math.random().toString(36).slice(2, 8)}`);
   try {
     mkdirSync(trashDir, { recursive: true });
     renameSync(path, target);
@@ -2660,7 +2836,7 @@ function moveMacPathIntoTrash(path) {
   }
 }
 function movePathToTrash(path) {
-  lstatSync3(path);
+  lstatSync4(path);
   if (process.platform === "darwin") {
     return moveMacPathIntoTrash(path);
   }
@@ -2692,8 +2868,8 @@ function restoreTrashPath(originalPath, trashPath) {
     if (!existsSync3(trashPath))
       return { ok: false, error: "trash item not found" };
     try {
-      const trashRoot = join4(homedir(), ".Trash");
-      const trashRelative = relative(trashRoot, trashPath);
+      const trashRoot = join5(homedir(), ".Trash");
+      const trashRelative = relative2(trashRoot, trashPath);
       if (trashRelative === "" || trashRelative.startsWith("..") || trashRelative.startsWith("/") || trashRelative.startsWith("\\"))
         return { ok: false, error: "invalid trash handle" };
       mkdirSync(dirname2(original), { recursive: true });
@@ -2799,9 +2975,7 @@ async function handleTrashPath(req) {
       trashPath: moved.trashPath
     }
   };
-  generation++;
-  clearMutableCaches();
-  sendSse("update");
+  triggerUpdate();
   return json({ ok: true, generation, undo });
 }
 async function handleCreateDirectory(req) {
@@ -2844,7 +3018,7 @@ async function handleCreateDirectory(req) {
   const targetPath = dir ? `${dir}/${name}` : name;
   if (!safeRepoPath(targetPath) || isGitInternalPath(targetPath))
     return text("invalid target", 400);
-  const target = join4(parent, name);
+  const target = join5(parent, name);
   if (existsSync3(target))
     return text("already exists", 409);
   try {
@@ -2854,9 +3028,7 @@ async function handleCreateDirectory(req) {
       return text("already exists", 409);
     return text("create failed", 500);
   }
-  generation++;
-  clearMutableCaches();
-  sendSse("update");
+  triggerUpdate();
   return json({ ok: true, path: targetPath, generation });
 }
 async function handleRestoreTrash(req) {
@@ -2888,9 +3060,7 @@ async function handleRestoreTrash(req) {
   const restored = restoreTrashPath(originalPath, trashPath || undefined);
   if (!restored.ok)
     return text(restored.error || "undo failed", 409);
-  generation++;
-  clearMutableCaches();
-  sendSse("update");
+  triggerUpdate();
   return json({ ok: true, generation });
 }
 function sendSse(event, data = "tick") {
@@ -2954,9 +3124,7 @@ var server = await startServer({
     if (url.pathname === "/refresh" && req.method === "POST") {
       if (!sideEffectRequestAllowed(req))
         return text("forbidden", 403);
-      generation++;
-      clearMutableCaches();
-      sendSse("update");
+      triggerUpdate();
       return json({ ok: true, generation });
     }
     if (url.pathname === "/events") {
@@ -3007,5 +3175,17 @@ startDevAssetReload({
   watch,
   sendReload: () => sendSse("reload")
 });
+startWorktreeUpdateWatch({
+  root: cwd,
+  omitDirNames: scopeOmitDirNames,
+  excludeNames: scopeExcludeNames,
+  watch,
+  initialScanMode: "async",
+  onUpdate: triggerUpdate,
+  onError: (error) => {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(`code-viewer worktree watch skipped: ${message}`);
+  }
+});
 console.log(`GDP_LISTEN_URL=http://127.0.0.1:${server.port}/`);
 console.log(`git-diff-preview serving ${cwd}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youtyan/code-viewer",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Local browser-based code and git diff viewer",
   "type": "module",
   "bin": {

package/web/app.js

@@ -7002,7 +7002,9 @@ ${frontmatter.yaml}
     let SIDEBAR_VISIBLE_ROWS = [];
     let SIDEBAR_ROW_BY_PATH = new Map;
     let SIDEBAR_VIRTUAL_ACTIVE_PATH = "";
-    const SIDEBAR_TREE_ITEMS_CACHE = new WeakMap;
+    let SIDEBAR_TREE_ITEMS_CACHE = new WeakMap;
+    const SIDEBAR_LAZY_LOADED_DIRS = new Set;
+    const SIDEBAR_LAZY_LOADING_DIRS = new Map;
     let REPO_SORT = {
       key: "name",
       direction: "asc"
@@ -8058,6 +8060,86 @@ ${frontmatter.yaml}
       SIDEBAR_TREE_ITEMS_CACHE.set(node, items);
       return items;
     }
+    function sidebarTreeNodeHasChildren(node) {
+      return Object.keys(node.dirs).length > 0 || node.files.length > 0;
+    }
+    function shouldLazyLoadSidebarDir(dir) {
+      return isRepositorySidebarMode() && isVirtualSidebarActive() && !dir.children_omitted && !sidebarTreeNodeHasChildren(dir) && !SIDEBAR_LAZY_LOADED_DIRS.has(dir.path);
+    }
+    function upsertSidebarTreeEntry(entry, order) {
+      if (!SIDEBAR_TREE_ROOT)
+        return;
+      const parts = entry.path.split("/").filter(Boolean);
+      if (!parts.length)
+        return;
+      let node = SIDEBAR_TREE_ROOT;
+      let acc = "";
+      const dirPartCount = entry.type === "tree" ? parts.length : parts.length - 1;
+      for (let i2 = 0;i2 < dirPartCount; i2++) {
+        const part = parts[i2];
+        acc = acc ? `${acc}/${part}` : part;
+        if (!node.dirs[part]) {
+          node.dirs[part] = {
+            name: part,
+            dirs: {},
+            files: [],
+            path: acc,
+            minOrder: order
+          };
+        }
+        node = node.dirs[part];
+        node.minOrder = Math.min(node.minOrder, order);
+      }
+      if (entry.type === "tree") {
+        node.explicit = true;
+        if (entry.children_omitted === true) {
+          node.children_omitted = true;
+          node.children_omitted_reason = entry.children_omitted_reason;
+        }
+        return;
+      }
+      if (!node.files.some((file) => file.path === entry.path))
+        node.files.push({ ...entry, order });
+    }
+    function mergeSidebarTreeEntries(entries) {
+      entries.forEach((entry, index) => {
+        upsertSidebarTreeEntry(entry, entry.order ?? index + 1);
+      });
+      SIDEBAR_TREE_ITEMS_CACHE = new WeakMap;
+      if (SIDEBAR_TREE_ROOT)
+        buildSidebarTreeRows(SIDEBAR_TREE_ROOT);
+    }
+    function ensureVirtualSidebarDirLoaded(dir) {
+      if (!shouldLazyLoadSidebarDir(dir))
+        return Promise.resolve();
+      const existing = SIDEBAR_LAZY_LOADING_DIRS.get(dir.path);
+      if (existing)
+        return existing;
+      const params = new URLSearchParams;
+      params.set("ref", REPO_SIDEBAR_REF || "worktree");
+      params.set("path", dir.path);
+      appendScopeParams(params);
+      const load2 = trackLoad(fetch(`/_tree?${params.toString()}`).then((response) => {
+        if (!response.ok)
+          throw new Error("failed to load repository tree");
+        return response.json();
+      })).then((meta) => {
+        const entries = meta.entries.map((entry, index) => ({
+          order: dir.minOrder + (index + 1) / 1e5,
+          path: entry.path,
+          display_path: entry.path,
+          type: entry.type,
+          children_omitted: entry.children_omitted,
+          children_omitted_reason: entry.children_omitted_reason
+        }));
+        mergeSidebarTreeEntries(entries);
+        SIDEBAR_LAZY_LOADED_DIRS.add(dir.path);
+      }).finally(() => {
+        SIDEBAR_LAZY_LOADING_DIRS.delete(dir.path);
+      });
+      SIDEBAR_LAZY_LOADING_DIRS.set(dir.path, load2);
+      return load2;
+    }
     function createTreeDirRow(dir, depth, onFileClick) {
       const li = document.createElement("li");
       li.className = "tree-dir";
@@ -8105,16 +8187,26 @@ ${frontmatter.yaml}
       const updateIcon = () => {
         setFolderIcon(dirIcon, li.classList.contains("collapsed"));
       };
-      const toggleDir = (e2) => {
+      const toggleDir = async (e2) => {
         e2.stopPropagation();
-        li.classList.toggle("collapsed");
-        updateIcon();
-        if (li.classList.contains("collapsed"))
-          STATE.collapsedDirs.add(dir.path);
-        else
-          STATE.collapsedDirs.delete(dir.path);
-        localStorage.setItem("gdp:collapsed-dirs", JSON.stringify([...STATE.collapsedDirs]));
-        rerenderVirtualSidebar();
+        if (li.dataset.toggling === "true")
+          return;
+        const expanding = li.classList.contains("collapsed");
+        li.dataset.toggling = "true";
+        try {
+          if (expanding)
+            await ensureVirtualSidebarDirLoaded(dir);
+          li.classList.toggle("collapsed");
+          updateIcon();
+          if (li.classList.contains("collapsed"))
+            STATE.collapsedDirs.add(dir.path);
+          else
+            STATE.collapsedDirs.delete(dir.path);
+          localStorage.setItem("gdp:collapsed-dirs", JSON.stringify([...STATE.collapsedDirs]));
+          rerenderVirtualSidebar();
+        } finally {
+          delete li.dataset.toggling;
+        }
       };
       li.classList.toggle("collapsed", STATE.collapsedDirs.has(dir.path));
       updateIcon();
@@ -8382,6 +8474,8 @@ ${frontmatter.yaml}
       SIDEBAR_TREE_ROWS = [];
       SIDEBAR_VISIBLE_ROWS = [];
       SIDEBAR_ROW_BY_PATH = new Map;
+      SIDEBAR_LAZY_LOADED_DIRS.clear();
+      SIDEBAR_LAZY_LOADING_DIRS.clear();
       STATE.files = files;
       SIDEBAR_FILES = files;
       SIDEBAR_ON_FILE_CLICK = onFileClick;
@@ -9851,6 +9945,14 @@ ${frontmatter.yaml}
     function activateRepoSidebarPath(currentPath) {
       markActive(currentPath, { reveal: true });
       applyFilter();
+      const row = SIDEBAR_ROW_BY_PATH.get(currentPath);
+      if (row?.kind === "dir" && row.dir && shouldLazyLoadSidebarDir(row.dir))
+        ensureVirtualSidebarDirLoaded(row.dir).then(() => {
+          if (SIDEBAR_VIRTUAL_ACTIVE_PATH === currentPath) {
+            rerenderVirtualSidebar();
+            scrollVirtualSidebarPathIntoView(currentPath);
+          }
+        });
     }
     function createPlaceholder(f2) {
       const card = document.createElement("div");