@youtyan/code-viewer 0.1.15 → 0.1.17

package/web/style.css

@@ -2350,12 +2350,45 @@ table.d2h-diff-table tr.gdp-diff-line-target > td:first-child {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.gdp-source-virtual-actions {
+.gdp-source-virtual-search {
   display: inline-flex;
   align-items: center;
   gap: 6px;
+  min-width: 0;
   margin-left: auto;
 }
+.gdp-source-virtual-search[hidden] {
+  display: none;
+}
+.gdp-source-virtual-search input {
+  width: min(220px, 28vw);
+  min-width: 120px;
+  height: 28px;
+  padding: 0 8px;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--bg);
+  color: var(--fg);
+}
+.gdp-source-virtual-search button {
+  height: 28px;
+  padding: 0 8px;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--bg-subtle);
+  color: var(--fg);
+  cursor: pointer;
+}
+.gdp-source-virtual-search-count {
+  min-width: 62px;
+  color: var(--fg-muted);
+  font-size: 12px;
+}
+.gdp-source-virtual-actions {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
 .gdp-source-virtual-action {
   display: inline-flex;
   align-items: center;
@@ -2385,8 +2418,7 @@ table.d2h-diff-table tr.gdp-diff-line-target > td:first-child {
   font-family: "Monaspace Neon", ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace;
   font-size: var(--code-font-size);
   line-height: 20px;
-  cursor: pointer;
-  user-select: none;
+  cursor: text;
 }
 .gdp-source-virtual-spacer {
   position: relative;
@@ -2426,6 +2458,15 @@ table.d2h-diff-table tr.gdp-diff-line-target > td:first-child {
 .gdp-source-virtual-line-code.hljs {
   background: var(--bg);
 }
+.gdp-source-virtual-search-hit {
+  background: #fff8c5;
+  color: inherit;
+  border-radius: 2px;
+}
+.gdp-source-virtual-search-hit.active {
+  background: var(--accent);
+  color: var(--bg);
+}
 .gdp-standalone-source.gdp-file-shell {
   border: 0;
   border-radius: 0;

package/web-src/routes.ts

@@ -1,148 +0,0 @@
-export type DiffRange = {
-  from: string;
-  to: string;
-};
-
-export type SourceLineRange = {
-  start: number;
-  end: number;
-};
-
-export type SourceLineTarget = number | SourceLineRange;
-
-export type SourceFileTarget = {
-  path: string;
-  ref: string;
-};
-
-export type AppRoute =
-  | { screen: 'repo'; ref: string; path: string; range: DiffRange }
-  | { screen: 'diff'; range: DiffRange; path?: string; line?: SourceLineTarget }
-  | { screen: 'file'; path: string; ref: string; range: DiffRange; view?: 'blob' | 'detail'; line?: SourceLineTarget }
-  | { screen: 'help'; range: DiffRange; lang: string; section: string }
-  | { screen: 'unknown'; reason: 'unknown-pathname' | 'missing-path'; rawPathname: string; rawSearch: string; range: DiffRange };
-
-export const SPA_PATHS = ['/todif', '/todiff', '/file', '/help'] as const;
-export const APP_ENTRY_PATHS = ['/', '/index.html'] as const;
-
-export function assertNever(value: never): never {
-  throw new Error('unhandled route: ' + JSON.stringify(value));
-}
-
-function parseLegacyRange(value: string | null | undefined, fallback: DiffRange): DiffRange {
-  const raw = value || '';
-  const sep = raw.indexOf('..');
-  if (sep < 0) return fallback;
-  return {
-    from: raw.slice(0, sep) || fallback.from,
-    to: raw.slice(sep + 2) || fallback.to,
-  };
-}
-
-function parseLineTarget(value: string | null | undefined): SourceLineTarget | undefined {
-  const raw = value || '';
-  const range = /^(\d+)-(\d+)$/.exec(raw);
-  if (range) {
-    const a = Number(range[1]);
-    const b = Number(range[2]);
-    const start = Math.min(a, b);
-    const end = Math.max(a, b);
-    if (start > 0) return { start, end };
-    return undefined;
-  }
-  const line = Number(raw);
-  return Number.isInteger(line) && line > 0 ? line : undefined;
-}
-
-function formatLineTarget(line: SourceLineTarget): string {
-  return typeof line === 'number' ? String(line) : line.start + '-' + line.end;
-}
-
-export function parseRoute(pathname: string, search: string, fallbackRange: DiffRange): AppRoute {
-  const params = new URLSearchParams(search);
-  const legacyRange = parseLegacyRange(params.get('range'), fallbackRange);
-  const range = {
-    from: params.get('from') || legacyRange.from,
-    to: params.get('to') || legacyRange.to,
-  };
-  switch (pathname) {
-    case '/':
-    case '/index.html':
-      return {
-        screen: 'repo',
-        ref: params.get('ref') || params.get('target') || 'worktree',
-        path: params.get('path') || '',
-        range,
-      };
-    case '/todif':
-    case '/todiff':
-      return {
-        screen: 'diff',
-        range,
-        ...(params.get('path') ? { path: params.get('path') || '' } : {}),
-        ...(parseLineTarget(params.get('line')) ? { line: parseLineTarget(params.get('line')) } : {}),
-      };
-    case '/file': {
-      const path = params.get('path') || '';
-      const target = params.get('target') || '';
-      const ref = target || params.get('ref') || 'worktree';
-      const line = parseLineTarget(params.get('line'));
-      if (!path) return { screen: 'unknown', reason: 'missing-path', rawPathname: pathname, rawSearch: search, range };
-      return { screen: 'file', path, ref, range, view: target ? 'blob' : 'detail', ...(line ? { line } : {}) };
-    }
-    case '/help':
-      return {
-        screen: 'help',
-        range,
-        lang: params.get('lang') || 'en',
-        section: params.get('section') || 'keybindings',
-      };
-    default:
-      return { screen: 'unknown', reason: 'unknown-pathname', rawPathname: pathname, rawSearch: search, range };
-  }
-}
-
-export function buildRoute(route: AppRoute): string {
-  switch (route.screen) {
-    case 'repo': {
-      const params = new URLSearchParams();
-      if (route.ref && route.ref !== 'worktree') params.set('ref', route.ref);
-      if (route.path) params.set('path', route.path);
-      const qs = params.toString();
-      return '/' + (qs ? '?' + qs : '');
-    }
-    case 'file':
-      if (route.view === 'blob') {
-        return '/file?path=' + encodeURIComponent(route.path) +
-          '&target=' + encodeURIComponent(route.ref || 'worktree') +
-          (route.line ? '&line=' + encodeURIComponent(formatLineTarget(route.line)) : '');
-      }
-      return '/file?path=' + encodeURIComponent(route.path) +
-        '&ref=' + encodeURIComponent(route.ref || 'worktree') +
-        '&from=' + encodeURIComponent(route.range.from || '') +
-        '&to=' + encodeURIComponent(route.range.to || 'worktree') +
-        (route.line ? '&line=' + encodeURIComponent(formatLineTarget(route.line)) : '');
-    case 'diff':
-      return '/todif?from=' + encodeURIComponent(route.range.from || '') +
-        '&to=' + encodeURIComponent(route.range.to || 'worktree') +
-        (route.path ? '&path=' + encodeURIComponent(route.path) : '') +
-        (route.line ? '&line=' + encodeURIComponent(formatLineTarget(route.line)) : '');
-    case 'help': {
-      const params = new URLSearchParams();
-      if (route.lang && route.lang !== 'en') params.set('lang', route.lang);
-      if (route.section && route.section !== 'keybindings') params.set('section', route.section);
-      const qs = params.toString();
-      return '/help' + (qs ? '?' + qs : '');
-    }
-    case 'unknown':
-      return '/todif?from=' + encodeURIComponent(route.range.from || '') +
-        '&to=' + encodeURIComponent(route.range.to || 'worktree');
-    default:
-      return assertNever(route);
-  }
-}
-
-export function buildRawFileUrl(target: SourceFileTarget): string {
-  return '/_file?path=' + encodeURIComponent(target.path) +
-    '&ref=' + encodeURIComponent(target.ref || 'worktree');
-}

package/web-src/server/cache.ts

@@ -1,64 +0,0 @@
-import { lstatSync } from 'node:fs';
-import { join } from 'node:path';
-
-// Short enough that a browser reload self-heals stale git data, while still
-// coalescing bursts from one render pass.
-export const CACHE_TTL_MS = 1500;
-export const MAX_TIMED_CACHE_ENTRIES = 200;
-
-export type TimedCacheEntry<T> = T & { storedAt: number };
-
-export function cacheFresh<T>(
-  cached: TimedCacheEntry<T> | undefined,
-  now = Date.now(),
-  ttlMs = CACHE_TTL_MS,
-): cached is TimedCacheEntry<T> {
-  return !!cached && now - cached.storedAt <= ttlMs;
-}
-
-export function setTimedCacheEntry<T>(
-  cache: Map<string, TimedCacheEntry<T>>,
-  key: string,
-  value: T,
-  now = Date.now(),
-  maxEntries = MAX_TIMED_CACHE_ENTRIES,
-): void {
-  cache.set(key, { ...value, storedAt: now });
-  while (cache.size > maxEntries) {
-    const oldest = cache.keys().next().value;
-    if (oldest === undefined) break;
-    cache.delete(oldest);
-  }
-}
-
-export function worktreeFileSignature(path: string, cwd: string): string {
-  try {
-    const stats = lstatSync(join(cwd, path));
-    const inode = 'ino' in stats ? stats.ino : 0;
-    return `state:file|size:${stats.size}|mtime:${stats.mtimeMs}|ctime:${stats.ctimeMs}|ino:${inode}`;
-  } catch {
-    return 'state:missing';
-  }
-}
-
-export function fileDiffCacheKey(options: {
-  path: string;
-  oldPath?: string | null;
-  isUntracked: boolean;
-  range: { from?: string; to?: string };
-  extras: string[];
-  args: string[];
-  cwd: string;
-}): string {
-  const worktreeTarget = options.range.from === 'worktree' || !options.range.to || options.range.to === 'worktree';
-  if (options.isUntracked && !worktreeTarget) {
-    throw new Error('untracked file diffs require a worktree range');
-  }
-  const signature = worktreeTarget
-    ? `\0${worktreeFileSignature(options.path, options.cwd)}`
-    : '';
-  if (options.isUntracked) {
-    return `u\0${options.path}${signature}\0${options.extras.join('\0')}`;
-  }
-  return `t\0${options.path}\0${options.oldPath || ''}${signature}\0${[...options.extras, ...options.args].join('\0')}`;
-}

package/web-src/server/dev-assets.ts

@@ -1,37 +0,0 @@
-import { basename } from 'node:path';
-
-export type WatchFn = (
-  path: string,
-  options: { persistent?: boolean },
-  listener: (eventType: string, filename: string | Buffer | null) => void,
-) => unknown;
-
-type DevAssetReloadOptions = {
-  enabled: boolean;
-  webRoot: string;
-  watchedFiles: readonly string[];
-  watch: WatchFn;
-  sendReload: () => void;
-  setTimeoutFn?: typeof setTimeout;
-  clearTimeoutFn?: typeof clearTimeout;
-  debounceMs?: number;
-};
-
-export function startDevAssetReload(options: DevAssetReloadOptions): boolean {
-  if (!options.enabled) return false;
-  const watched = new Set(options.watchedFiles);
-  const setTimer = options.setTimeoutFn || setTimeout;
-  const clearTimer = options.clearTimeoutFn || clearTimeout;
-  const debounceMs = options.debounceMs ?? 150;
-  let timer: ReturnType<typeof setTimeout> | null = null;
-
-  options.watch(options.webRoot, { persistent: false }, (_event, filename) => {
-    if (!filename || !watched.has(basename(filename.toString()))) return;
-    if (timer) clearTimer(timer);
-    timer = setTimer(() => {
-      timer = null;
-      options.sendReload();
-    }, debounceMs);
-  });
-  return true;
-}

package/web-src/server/dev.ts

@@ -1,100 +0,0 @@
-#!/usr/bin/env bun
-
-import { readdirSync, statSync } from 'node:fs';
-import { join, normalize } from 'node:path';
-
-const ROOT = normalize(join(import.meta.dir, '..', '..'));
-const SERVER_ROOT = join(ROOT, 'web-src', 'server');
-const DEFAULT_DEV_PORT = 64160;
-
-type ChildProcess = {
-  kill(signal?: string): void;
-  exited: Promise<number>;
-};
-
-let server: ChildProcess | null = null;
-let build: ChildProcess | null = null;
-let restarting = false;
-let firstStart = true;
-
-function withDefaultPort(args: string[]) {
-  if (args.includes('--port')) return args;
-  return ['--port', String(DEFAULT_DEV_PORT), ...args];
-}
-
-function withoutOpen(args: string[]) {
-  return args.filter((arg) => arg !== '--open');
-}
-
-function serverArgs() {
-  const args = withDefaultPort(process.argv.slice(2));
-  return firstStart ? args : withoutOpen(args);
-}
-
-function watchedFiles() {
-  return readdirSync(SERVER_ROOT)
-    .filter((name) => name.endsWith('.ts') && name !== 'runtime.d.ts')
-    .map((name) => join(SERVER_ROOT, name))
-    .concat(join(ROOT, 'web-src', 'types.ts'));
-}
-
-function watchSignature() {
-  return watchedFiles()
-    .map((file) => `${file}:${statSync(file).mtimeMs}`)
-    .join('|');
-}
-
-function startBuild() {
-  build = Bun.spawn([
-    'bun', 'build', '--watch', '--target=browser', '--format=iife',
-    '--outfile=web/app.js', 'web-src/app.ts',
-  ], { cwd: ROOT, stdout: 'inherit', stderr: 'inherit' }) as ChildProcess;
-}
-
-function startServer() {
-  const args = serverArgs();
-  firstStart = false;
-  server = Bun.spawn([
-    'bun', 'run', 'web-src/server/preview.ts', ...args,
-  ], {
-    cwd: ROOT,
-    stdout: 'inherit',
-    stderr: 'inherit',
-    env: { ...process.env, CODE_VIEWER_DEV: '1' },
-  }) as ChildProcess;
-}
-
-async function restartServer() {
-  if (restarting) return;
-  restarting = true;
-  const old = server;
-  server = null;
-  if (old) {
-    old.kill();
-    await old.exited.catch(() => 1);
-  }
-  startServer();
-  restarting = false;
-}
-
-function shutdown() {
-  if (server) server.kill();
-  if (build) build.kill();
-  process.exit(0);
-}
-
-process.on('SIGINT', shutdown);
-process.on('SIGTERM', shutdown);
-
-console.log(`code-viewer dev server watching ${SERVER_ROOT}`);
-startBuild();
-startServer();
-
-let sig = watchSignature();
-setInterval(() => {
-  const next = watchSignature();
-  if (next === sig) return;
-  sig = next;
-  console.log('server source changed; restarting preview server');
-  restartServer();
-}, 500);