@youtyan/code-viewer 0.1.29 → 0.1.31

package/dist/code-viewer.js

@@ -188,9 +188,13 @@ function startServer(options) {
       const request = nodeRequestToWeb(req, options.hostname, server.address());
       const response = await options.fetch(request);
       await writeWebResponse(res, response);
-    } catch {
-      if (!res.headersSent)
-        res.writeHead(500, { "Content-Type": "text/plain; charset=utf-8" });
+    } catch (error) {
+      console.error("[code-viewer] request error:", req.method, req.url, error);
+      if (res.headersSent || res.writableEnded) {
+        res.destroy(error instanceof Error ? error : undefined);
+        return;
+      }
+      res.writeHead(500, { "Content-Type": "text/plain; charset=utf-8" });
       res.end("internal server error");
     }
   });
@@ -203,7 +207,18 @@ function startServer(options) {
       });
       const address = server.address();
       const port = typeof address === "object" && address ? address.port : options.port;
-      resolve({ port });
+      resolve({
+        port,
+        close: () => new Promise((resolveClose, rejectClose) => {
+          server.close((error) => {
+            if (error)
+              rejectClose(error);
+            else
+              resolveClose();
+          });
+          server.closeAllConnections?.();
+        })
+      });
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youtyan/code-viewer",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "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
   };
@@ -10310,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;
@@ -10451,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);
@@ -10485,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) => {
@@ -10526,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)

package/web/mermaid.js

@@ -1930,8 +1930,7 @@ function createDOMPurify() {
       ;
     else if (value) {
       return false;
-    } else
-      ;
+    }
     return true;
   };
   const RESERVED_CUSTOM_ELEMENT_NAMES = addToSet({}, ["annotation-xml", "color-profile", "font-face", "font-face-format", "font-face-name", "font-face-src", "font-face-uri", "missing-glyph"]);
@@ -78802,7 +78801,7 @@ var require_layout_base = __commonJS((exports, module) => {
               result[2] = p2x;
               result[3] = topLeftBy;
               return false;
-            } else {}
+            }
           } else if (p1y === p2y) {
             if (p1x > p2x) {
               result[0] = topLeftAx;
@@ -78816,7 +78815,7 @@ var require_layout_base = __commonJS((exports, module) => {
               result[2] = topLeftBx;
               result[3] = p2y;
               return false;
-            } else {}
+            }
           } else {
             var slopeA = rectA.height / rectA.width;
             var slopeB = rectB.height / rectB.width;
@@ -109930,7 +109929,7 @@ class DefaultDocumentBuilder {
           options: options2,
           result: state2?.result
         });
-      } else {}
+      }
     }
   }
   async runCancelable(documents, targetState, cancelToken, callback) {
@@ -143202,7 +143201,7 @@ var require_layout_base2 = __commonJS((exports, module) => {
               result[2] = p2x;
               result[3] = topLeftBy;
               return false;
-            } else {}
+            }
           } else if (p1y === p2y) {
             if (p1x > p2x) {
               result[0] = topLeftAx;
@@ -143216,7 +143215,7 @@ var require_layout_base2 = __commonJS((exports, module) => {
               result[2] = topLeftBx;
               result[3] = p2y;
               return false;
-            } else {}
+            }
           } else {
             var slopeA = rectA.height / rectA.width;
             var slopeB = rectB.height / rectB.width;

package/web/shiki.js

@@ -7836,7 +7836,7 @@ var RuleFactory = class _RuleFactory {
               let localIncludedRule = repository[reference.ruleName];
               if (localIncludedRule) {
                 ruleId = _RuleFactory.getCompiledRuleId(localIncludedRule, helper, repository);
-              } else {}
+              }
               break;
             case 3:
             case 4:
@@ -7848,11 +7848,11 @@ var RuleFactory = class _RuleFactory {
                   let externalIncludedRule = externalGrammar.repository[externalGrammarInclude];
                   if (externalIncludedRule) {
                     ruleId = _RuleFactory.getCompiledRuleId(externalIncludedRule, helper, externalGrammar.repository);
-                  } else {}
+                  }
                 } else {
                   ruleId = _RuleFactory.getCompiledRuleId(externalGrammar.repository.$self, helper, externalGrammar.repository);
                 }
-              } else {}
+              }
               break;
           }
         } else {