github-search-cli 9.1.1 → 9.2.1

package/src/package.ts

@@ -1,137 +1,137 @@
-/**
- * package.ts — package-registry search provider (prototype for ticket 002-008).
- *
- * npm-only for the MVP (ticket 002-005). Query is passed through verbatim to npm's
- * native `/-/v1/search` (ticket 002-006) and the response normalized to the parallel
- * `Package` shape (ticket 002-007). Rough on purpose — this is the artifact to react to.
- */
-import type { Package } from "./types";
-
-export interface PackageSearchResult {
-  totalCount: number;
-  packages: Package[];
-}
-
-/** The npm `/-/v1/search` object shape we actually consume (research 002-001). */
-interface NpmSearchObject {
-  package: {
-    name?: string;
-    scope?: string;
-    version?: string;
-    description?: string | null;
-    keywords?: string[];
-    date?: string;
-    links?: { npm?: string; homepage?: string; repository?: string };
-    publisher?: { username?: string };
-    author?: { name?: string };
-  };
-  score?: { final?: number; detail?: { quality?: number; popularity?: number; maintenance?: number } };
-  searchScore?: number;
-  downloads?: { npm?: number; total?: number; monthly?: number };
-}
-
-export function normalizeNpmObject(obj: NpmSearchObject): Package {
-  const p = obj.package;
-  const name = p.name ?? "";
-  return {
-    name,
-    version: p.version ?? "",
-    description: p.description ?? null,
-    url: p.links?.npm ?? `https://www.npmjs.com/package/${name}`,
-    downloads: obj.downloads?.monthly ?? 0,
-    score: obj.score?.final ?? obj.searchScore ?? 0,
-    publisher: p.publisher?.username ?? p.author?.name ?? null,
-    keywords: p.keywords ?? [],
-    registry: "npm",
-  };
-}
-
-export function createPackageSearch() {
-  return {
-    async searchPackage(rawQuery: string, limit: number): Promise<PackageSearchResult> {
-      const size = Math.min(Math.max(Math.trunc(limit) || 50, 1), 250); // npm caps size at 250
-      const url = `https://registry.npmjs.org/-/v1/search?text=${encodeURIComponent(rawQuery)}&size=${size}`;
-      const res = await fetch(url, {
-        headers: { "User-Agent": "ghfind", Accept: "application/json" },
-      });
-      if (!res.ok) {
-        throw new Error(`npm search failed: HTTP ${res.status}`);
-      }
-      const data = (await res.json()) as { objects?: NpmSearchObject[]; total?: number };
-      const packages = (data.objects ?? []).map(normalizeNpmObject);
-      return { totalCount: data.total ?? packages.length, packages };
-    },
-  };
-}
-
-/** Sort strategies for package results (npm registry order IS best-match). */
-export type PackageSortMode = "best-match" | "score" | "downloads" | "name";
-
-/** Sort modes in cycle order for the TUI Sort menu. */
-export const PACKAGE_SORT_MODES: { key: PackageSortMode; label: string }[] = [
-  { key: "best-match", label: "best-match" },
-  { key: "downloads", label: "downloads" },
-  { key: "score", label: "score" },
-  { key: "name", label: "name" },
-];
-
-/**
- * Sort fetched packages. "best-match" is a no-op: it preserves the registry's
- * relevance order, which is the canonical npm ranking.
- */
-export function sortPackages(pkgs: Package[], sort: PackageSortMode): Package[] {
-  if (sort === "best-match" || pkgs.length < 2) return pkgs;
-  const arr = [...pkgs];
-  if (sort === "score") {
-    arr.sort((a, b) => b.score - a.score);
-  } else if (sort === "downloads") {
-    arr.sort((a, b) => b.downloads - a.downloads);
-  } else {
-    arr.sort((a, b) => a.name.localeCompare(b.name));
-  }
-  return arr;
-}
-
-// ── Package output formatters (parallel to output.ts for repo) ─────────
-// Entity model (ticket 002-007): json/text/count/limit are shared generics
-// (json uses JSON.stringify on Package[]); csv/markdown/urls/names get package
-// variants here. git-only formats (ssh-urls, clone-commands, ids) stay repo-only.
-
-function csvEscape(val: unknown): string {
-  const str = String(val ?? "");
-  if (str.includes('"') || str.includes(",") || str.includes("\n")) {
-    return `"${str.replace(/"/g, '""')}"`;
-  }
-  return str;
-}
-
-export function formatPackagesJson(pkgs: Package[]): string {
-  return JSON.stringify(pkgs, null, 2);
-}
-
-export function formatPackagesCsv(pkgs: Package[]): string {
-  const header = "rank,name,version,downloads,score,url";
-  const rows = pkgs.map(
-    (p, i) =>
-      `${i + 1},${csvEscape(p.name)},${p.version},${p.downloads},${p.score.toFixed(2)},${csvEscape(p.url)}`,
-  );
-  return [header, ...rows].join("\n");
-}
-
-export function formatPackagesMarkdown(pkgs: Package[]): string {
-  const header = "| # | Package | Version | Downloads | Score |";
-  const sep = "|---|---------|---------|-----------|-------|";
-  const rows = pkgs.map(
-    (p, i) =>
-      `| ${i + 1} | [${p.name}@${p.version}](${p.url}) | ${p.version} | ${p.downloads.toLocaleString()} | ${p.score.toFixed(2)} |`,
-  );
-  return [header, sep, ...rows].join("\n");
-}
-
-export function formatPackagesUrls(pkgs: Package[]): string {
-  return pkgs.map((p) => p.url).join("\n");
-}
-
-export function formatPackagesNames(pkgs: Package[]): string {
-  return pkgs.map((p) => p.name).join("\n");
-}
+/**
+ * package.ts — package-registry search provider (prototype for ticket 002-008).
+ *
+ * npm-only for the MVP (ticket 002-005). Query is passed through verbatim to npm's
+ * native `/-/v1/search` (ticket 002-006) and the response normalized to the parallel
+ * `Package` shape (ticket 002-007). Rough on purpose — this is the artifact to react to.
+ */
+import type { Package } from "./types";
+
+export interface PackageSearchResult {
+  totalCount: number;
+  packages: Package[];
+}
+
+/** The npm `/-/v1/search` object shape we actually consume (research 002-001). */
+interface NpmSearchObject {
+  package: {
+    name?: string;
+    scope?: string;
+    version?: string;
+    description?: string | null;
+    keywords?: string[];
+    date?: string;
+    links?: { npm?: string; homepage?: string; repository?: string };
+    publisher?: { username?: string };
+    author?: { name?: string };
+  };
+  score?: { final?: number; detail?: { quality?: number; popularity?: number; maintenance?: number } };
+  searchScore?: number;
+  downloads?: { npm?: number; total?: number; monthly?: number };
+}
+
+export function normalizeNpmObject(obj: NpmSearchObject): Package {
+  const p = obj.package;
+  const name = p.name ?? "";
+  return {
+    name,
+    version: p.version ?? "",
+    description: p.description ?? null,
+    url: p.links?.npm ?? `https://www.npmjs.com/package/${name}`,
+    downloads: obj.downloads?.monthly ?? 0,
+    score: obj.score?.final ?? obj.searchScore ?? 0,
+    publisher: p.publisher?.username ?? p.author?.name ?? null,
+    keywords: p.keywords ?? [],
+    registry: "npm",
+  };
+}
+
+export function createPackageSearch() {
+  return {
+    async searchPackage(rawQuery: string, limit: number): Promise<PackageSearchResult> {
+      const size = Math.min(Math.max(Math.trunc(limit) || 50, 1), 250); // npm caps size at 250
+      const url = `https://registry.npmjs.org/-/v1/search?text=${encodeURIComponent(rawQuery)}&size=${size}`;
+      const res = await fetch(url, {
+        headers: { "User-Agent": "ghfind", Accept: "application/json" },
+      });
+      if (!res.ok) {
+        throw new Error(`npm search failed: HTTP ${res.status}`);
+      }
+      const data = (await res.json()) as { objects?: NpmSearchObject[]; total?: number };
+      const packages = (data.objects ?? []).map(normalizeNpmObject);
+      return { totalCount: data.total ?? packages.length, packages };
+    },
+  };
+}
+
+/** Sort strategies for package results (npm registry order IS best-match). */
+export type PackageSortMode = "best-match" | "score" | "downloads" | "name";
+
+/** Sort modes in cycle order for the TUI Sort menu. */
+export const PACKAGE_SORT_MODES: { key: PackageSortMode; label: string }[] = [
+  { key: "best-match", label: "best-match" },
+  { key: "downloads", label: "downloads" },
+  { key: "score", label: "score" },
+  { key: "name", label: "name" },
+];
+
+/**
+ * Sort fetched packages. "best-match" is a no-op: it preserves the registry's
+ * relevance order, which is the canonical npm ranking.
+ */
+export function sortPackages(pkgs: Package[], sort: PackageSortMode): Package[] {
+  if (sort === "best-match" || pkgs.length < 2) return pkgs;
+  const arr = [...pkgs];
+  if (sort === "score") {
+    arr.sort((a, b) => b.score - a.score);
+  } else if (sort === "downloads") {
+    arr.sort((a, b) => b.downloads - a.downloads);
+  } else {
+    arr.sort((a, b) => a.name.localeCompare(b.name));
+  }
+  return arr;
+}
+
+// ── Package output formatters (parallel to output.ts for repo) ─────────
+// Entity model (ticket 002-007): json/text/count/limit are shared generics
+// (json uses JSON.stringify on Package[]); csv/markdown/urls/names get package
+// variants here. git-only formats (ssh-urls, clone-commands, ids) stay repo-only.
+
+function csvEscape(val: unknown): string {
+  const str = String(val ?? "");
+  if (str.includes('"') || str.includes(",") || str.includes("\n")) {
+    return `"${str.replace(/"/g, '""')}"`;
+  }
+  return str;
+}
+
+export function formatPackagesJson(pkgs: Package[]): string {
+  return JSON.stringify(pkgs, null, 2);
+}
+
+export function formatPackagesCsv(pkgs: Package[]): string {
+  const header = "rank,name,version,downloads,score,url";
+  const rows = pkgs.map(
+    (p, i) =>
+      `${i + 1},${csvEscape(p.name)},${p.version},${p.downloads},${p.score.toFixed(2)},${csvEscape(p.url)}`,
+  );
+  return [header, ...rows].join("\n");
+}
+
+export function formatPackagesMarkdown(pkgs: Package[]): string {
+  const header = "| # | Package | Version | Downloads | Score |";
+  const sep = "|---|---------|---------|-----------|-------|";
+  const rows = pkgs.map(
+    (p, i) =>
+      `| ${i + 1} | [${p.name}@${p.version}](${p.url}) | ${p.version} | ${p.downloads.toLocaleString()} | ${p.score.toFixed(2)} |`,
+  );
+  return [header, sep, ...rows].join("\n");
+}
+
+export function formatPackagesUrls(pkgs: Package[]): string {
+  return pkgs.map((p) => p.url).join("\n");
+}
+
+export function formatPackagesNames(pkgs: Package[]): string {
+  return pkgs.map((p) => p.name).join("\n");
+}

package/src/search.ts

@@ -612,6 +612,7 @@ export class SearchModule implements SearchProvider {
       options.sort,
       String(options.limit),
       String(options.page ?? 1),
+      options.trendingSince ?? "none",
     );
     const cached = SearchModule.cache.get(cacheKey);
     if (cached) {

package/src/trending.ts

@@ -253,6 +253,14 @@ export async function launchTrending(): Promise<void> {
     paddingX: 1,
   });
   const tabTexts: TextRenderable[] = [];
+  const underlineBox = new BoxRenderable(renderer, {
+    height: 1,
+    backgroundColor: C.bg,
+    paddingX: 1,
+  });
+  function tabWidth(name: string): number {
+    return name.length + 2; // " name " padding
+  }
   function renderTabBar() {
     for (const t of tabTexts) tabBox.remove(t);
     tabTexts.length = 0;
@@ -261,8 +269,8 @@ export async function launchTrending(): Promise<void> {
       const label = ` ${name} `;
       const tt = new TextRenderable(renderer, {
         content: isActive ? t`${bold(fg(C.bg)(label))}` : t`${fg(C.muted)(label)}`,
-        color: isActive ? C.bg : C.muted,
-        backgroundColor: isActive ? C.cyan : C.bg,
+        fg: isActive ? C.bg : C.muted,
+        bg: isActive ? C.cyan : C.bg,
         height: 1,
       });
       tabTexts.push(tt);
@@ -270,17 +278,35 @@ export async function launchTrending(): Promise<void> {
       if (i < TAB_NAMES.length - 1) {
         const sp = new TextRenderable(renderer, {
           content: "  ",
-          color: C.muted,
-          backgroundColor: C.bg,
+          fg: C.muted,
+          bg: C.bg,
           height: 1,
         });
         tabTexts.push(sp);
         tabBox.add(sp);
       }
     });
+    // ── cyan underline bar under active tab ──
+    let offset = 1; // paddingX
+    for (let i = 0; i < selectedTab; i++) {
+      offset += tabWidth(TAB_NAMES[i]) + 2; // tab + separator
+    }
+    const w = tabWidth(TAB_NAMES[selectedTab]);
+    const dots = "┉".repeat(w);
+    underlineBox.remove(underlineText);
+    underlineText.content = t`${fg(C.cyan)(dots)}`;
+    underlineText.left = offset;
   }
+  const underlineText = new TextRenderable(renderer, {
+    content: "",
+    fg: C.cyan,
+    bg: C.bg,
+    height: 1,
+  });
+  underlineBox.add(underlineText);
   renderTabBar();
   outerBox.add(tabBox);
+  outerBox.add(underlineBox);
   const divider = new TextRenderable(renderer, {
     content: "─".repeat(80),
     color: C.border,
@@ -357,7 +383,7 @@ export async function launchTrending(): Promise<void> {
     paddingX: 1,
   });
   const footerText = new TextRenderable(renderer, {
-    content: " ↑↓ navigate  ↵ open  / search  1-5 tab  q quit  r refresh",
+    content: " ↑↓ navigate  ↵ open  / search  1-3 tab  q quit  r refresh",
     color: C.muted,
     height: 1,
   });

package/src/tui.ts

@@ -457,28 +457,28 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
   for (let i = 0; i < landingOptions.length; i++) {
     const opt = landingOptions[i];
     const card = new BoxRenderable(renderer, {
-      flexDirection: "row",
-      height: 1,
+      flexDirection: "column",
+      height: 5,
       width: "60%",
       marginTop: 1,
-      backgroundColor: undefined,
+      border: true,
       borderColor: i === 0 ? colors.accent : colors.border,
-      borderWidth: 1,
       paddingX: 1,
-      alignItems: "center",
       focusable: false,
     });
     landingCards.push(card);
     landingBox.add(card);
 
+    const spacerTop = new TextRenderable(renderer, { content: "", height: 1 });
     const titleLine = new TextRenderable(renderer, {
       content: opt.title,
       color: i === 0 ? colors.accent : colors.text,
-      backgroundColor: undefined,
       height: 1,
-      flexGrow: 1,
     });
+    const spacerBot = new TextRenderable(renderer, { content: "", height: 1 });
+    card.add(spacerTop);
     card.add(titleLine);
+    card.add(spacerBot);
   }
 
   const landingHint = new TextRenderable(renderer, {
@@ -503,38 +503,12 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
 
   function updateLandingCards() {
     for (let i = 0; i < landingCards.length; i++) {
-      const opt = landingOptions[i];
       const isSel = i === landingSelected;
-      landingCards[i].backgroundColor = isSel ? colors.selectionBg : colors.surface;
       landingCards[i].borderColor = isSel ? colors.accent : colors.border;
-      landingCards[i].borderWidth = isSel ? 1 : 0;
       const children = landingCards[i].children ?? [];
-      if (children[0]) {
-        const iconCol = children[0] as BoxRenderable;
-        const iconChildren = iconCol.children ?? [];
-        const iconTextChild = iconChildren[0] as TextRenderable;
-        if (iconTextChild) {
-          iconTextChild.color = isSel ? colors.accent : colors.text;
-          iconTextChild.backgroundColor = isSel ? colors.selectionBg : colors.surface;
-        }
-        const iconSpacerChild = iconChildren[1] as TextRenderable;
-        if (iconSpacerChild) {
-          iconSpacerChild.backgroundColor = isSel ? colors.selectionBg : colors.surface;
-        }
-      }
-      if (children[1]) {
-        const contentCol = children[1] as BoxRenderable;
-        const contentChildren = contentCol.children ?? [];
-        const titleChild = contentChildren[0] as TextRenderable;
-        if (titleChild) {
-          titleChild.color = isSel ? colors.accent : colors.text;
-          titleChild.backgroundColor = isSel ? colors.selectionBg : colors.surface;
-        }
-        const descChild = contentChildren[1] as TextRenderable;
-        if (descChild) {
-          descChild.backgroundColor = isSel ? colors.selectionBg : colors.surface;
-        }
-        const hintChild = contentChildren[2] as TextRenderable;
+      const titleChild = children[1] as TextRenderable;
+      if (titleChild) {
+        titleChild.color = isSel ? colors.accent : colors.text;
       }
     }
   }
@@ -2041,6 +2015,7 @@ export async function launchBrowser(theme_override?: string): Promise<void> {
     searchBox.visible = false;
     toolbarText.visible = false;
     trendingTabBox.visible = true;
+    body.visible = true;
     renderTrendingTabs();
     resultsSelect.options = [
       { name: "  Loading trending...", description: "", value: null },
@@ -2686,6 +2661,18 @@ ${pack.description ?? ""}`;
     }
     }
 
+    // 'c' toggles compare on selected repo (when not typing in search)
+    if (key.name === "c" && !searchInput.focused) {
+      if (currentOverlay === "compare") {
+        showOverlay("none");
+      } else {
+        toggleCompareOnSelected();
+        refreshCompare();
+        showOverlay("compare");
+      }
+      return;
+    }
+
     // '?' / Ctrl+H toggle help overlay (fast path)
     if (key.name === "?" || (key.name === "h" && key.ctrl)) {
       showOverlay("help");