@youtyan/code-viewer 0.1.28 → 0.1.30

package/dist/code-viewer.js

@@ -280,6 +280,8 @@ var DEFAULT_WORKTREE_OMIT_DIR_NAMES = [
   "out",
   "target",
   ".gradle",
+  ".pnpm-store",
+  ".turbo",
   "__pycache__",
   ".pytest_cache",
   ".tox",
@@ -1279,6 +1281,9 @@ function startWorktreeUpdateWatch(options) {
   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 = () => {
@@ -1301,6 +1306,11 @@ function startWorktreeUpdateWatch(options) {
     }
   };
   const closeAll = () => {
+    if (initialScanTimer) {
+      clearTimer(initialScanTimer);
+      initialScanTimer = null;
+    }
+    initialScanQueue.length = 0;
     for (const watcher of [...watchers.values()]) {
       try {
         watcher.close?.();
@@ -1309,7 +1319,36 @@ function startWorktreeUpdateWatch(options) {
     watchers.clear();
     signatures.clear();
   };
-  const watchDirectory = (dir) => {
+  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));
@@ -1364,20 +1403,14 @@ function startWorktreeUpdateWatch(options) {
       options.onError?.(error);
       return;
     }
-    let entries;
-    try {
-      entries = readDirs(dir);
-    } catch (error) {
-      options.onError?.(error);
+    if (initialScanAsync && initialScan) {
+      queueInitialChildren(dir);
       return;
     }
-    for (const entry of entries) {
-      if (!entry.isDirectory())
-        continue;
-      watchDirectory(join4(dir, entry.name));
-    }
+    for (const child of readChildDirectories(dir))
+      watchDirectory(child);
   };
-  watchDirectory(options.root);
+  watchDirectory(options.root, true);
   return { started: watchers.size > 0, close: closeAll };
 }
 
@@ -3147,6 +3180,7 @@ startWorktreeUpdateWatch({
   omitDirNames: scopeOmitDirNames,
   excludeNames: scopeExcludeNames,
   watch,
+  initialScanMode: "async",
   onUpdate: triggerUpdate,
   onError: (error) => {
     const message = error instanceof Error ? error.message : String(error);

package/package.json

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

package/web/app.js

@@ -90,6 +90,12 @@
   function trailingClickRange(hunkEndNew, step) {
     return { start: hunkEndNew, end: hunkEndNew + step - 1 };
   }
+  function trailingExpandTargetIndex(hunkCount) {
+    return hunkCount > 0 ? hunkCount - 1 : null;
+  }
+  function shouldAttachTrailingExpand(probeLineCount) {
+    return probeLineCount > 0;
+  }
   function applyTrailingResult(state, receivedCount, step) {
     return {
       newStart: state.newStart + receivedCount,
@@ -106,6 +112,8 @@
     applyUp,
     applyDown,
     mapNewToOld,
+    trailingExpandTargetIndex,
+    shouldAttachTrailingExpand,
     trailingClickRange,
     applyTrailingResult
   };
@@ -7002,7 +7010,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 +8068,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 +8195,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 +8482,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 +9953,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");
@@ -10208,6 +10318,10 @@ ${frontmatter.yaml}
       for (const item of infoRows) {
         attachExpandControls(item, file, ref, refPath);
       }
+      const trailingIndex = window.GdpExpandLogic.trailingExpandTargetIndex(infoRows.length);
+      if (trailingIndex != null) {
+        probeAndAttachTrailingExpandControls(infoRows[trailingIndex], file, ref, refPath);
+      }
     }
     function attachExpandControls(item, file, ref, refPath) {
       const { hunk, prevHunkEndNew, prevHunkEndOld } = item;
@@ -10349,7 +10463,10 @@ ${frontmatter.yaml}
       requestAnimationFrame(syncHeight);
       setTimeout(syncHeight, 100);
     }
-    function _attachTrailingExpandControls(item, file, ref, refPath) {
+    function attachTrailingExpandControls(item, file, ref, refPath) {
+      const hasTrailingRow = (item.siblings || []).some((sib) => !!sib.tr.parentElement?.querySelector(".gdp-trailing-expand-row"));
+      if (hasTrailingRow)
+        return;
       const STEP = 20;
       let nextNewStart = nextNewLine(item.hunk);
       let nextOldStart = nextOldLine(item.hunk);
@@ -10383,9 +10500,16 @@ ${frontmatter.yaml}
       };
       const fetchAndInsert = () => {
         const range = window.GdpExpandLogic.trailingClickRange(nextNewStart, STEP);
+        const myGen = SERVER_GENERATION;
         setBusy(true);
         const url = "/file_range?path=" + refPath + "&ref=" + encodeURIComponent(ref) + "&start=" + range.start + "&end=" + range.end;
         trackLoad(fetch(url).then((r2) => r2.json())).then((data) => {
+          if (myGen !== SERVER_GENERATION || data.generation && data.generation !== SERVER_GENERATION) {
+            setBusy(false);
+            return;
+          }
+          if (!item.tr.isConnected)
+            return;
           const lines = data?.lines || [];
           if (!lines.length) {
             rows.forEach((row) => {
@@ -10424,6 +10548,25 @@ ${frontmatter.yaml}
       });
       syncExpandRowHeights(rows.map((row) => row.tr), rows[0].tr);
     }
+    function probeAndAttachTrailingExpandControls(item, file, ref, refPath) {
+      const start = nextNewLine(item.hunk);
+      const myGen = SERVER_GENERATION;
+      const url = "/file_range?path=" + refPath + "&ref=" + encodeURIComponent(ref) + "&start=" + start + "&end=" + start;
+      trackLoad(fetch(url).then((r2) => r2.json())).then((data) => {
+        if (myGen !== SERVER_GENERATION)
+          return;
+        if (data.generation && data.generation !== SERVER_GENERATION)
+          return;
+        if (!item.tr.isConnected)
+          return;
+        const hasTrailingRow = (item.siblings || []).some((sib) => !!sib.tr.parentElement?.querySelector(".gdp-trailing-expand-row"));
+        if (hasTrailingRow)
+          return;
+        if (!window.GdpExpandLogic.shouldAttachTrailingExpand(data?.lines?.length || 0))
+          return;
+        attachTrailingExpandControls(item, file, ref, refPath);
+      }).catch(() => {});
+    }
     function insertContextRows(targetTr, lines, newStart, oldStart, dir, sideIndex) {
       const tbody = targetTr.parentElement;
       if (!tbody)