ok

src/index.ts

@@ -1,85 +1,78 @@
 import { serve } from "bun";
-import packages from "../database/database/packages.json" assert { type: "json" };
-import programs from "../database/database/programs.json" assert { type: "json" };
+import packages from "../database/database/packages.json";
+import programs from "../database/database/programs.json";
 
-const typedPackages: Item[] = packages as Item[];
-const typedPrograms: Item[] = programs as Item[];
-
-type Item = {
+interface Item {
   name?: string;
   full_name?: string;
   owner?: string;
-  description?: string | null;
+  description?: string;
   topics?: string[];
   created_at?: string;
   usage_count?: number;
-};
+}
 
 const corsHeaders = {
   "Content-Type": "application/json",
   "Access-Control-Allow-Origin": "*",
 };
 
-const sortByDate = (a: Item, b: Item) =>
-  new Date(b.created_at ?? "").getTime() - new Date(a.created_at ?? "").getTime();
+const sortByDate = (a: Item, b: Item): number =>
+  new Date(b.created_at || "").getTime() - new Date(a.created_at || "").getTime();
 
-const sortByUsage = (a: Item, b: Item) =>
-  (b.usage_count ?? 0) - (a.usage_count ?? 0);
+const sortByUsage = (a: Item, b: Item): number =>
+  (b.usage_count || 0) - (a.usage_count || 0);
 
 const sorted = {
   packages: {
-    latest: [...typedPackages].sort(sortByDate),
-    mostUsed: [...typedPackages].sort(sortByUsage),
+    latest: [...packages].sort(sortByDate),
+    mostUsed: [...packages].sort(sortByUsage),
   },
   programs: {
-    latest: [...typedPrograms].sort(sortByDate),
-    mostUsed: [...typedPrograms].sort(sortByUsage),
-  },
-};
+    latest: [...programs].sort(sortByDate),
     mostUsed: [...programs].sort(sortByUsage),
   },
 };
 
-function filterItems(items: Item[], q: string | null, filter: string | null) {
+function filterItems(items: Item[], q: string | null, filter: string | null): Item[] {
   return items.filter(({ name, full_name, description, topics }) => {
     if (filter && !topics?.some(t => t.toLowerCase() === filter)) return false;
     if (!q) return true;
-    const qlc = q.toLowerCase();
-    return [name, full_name, description, ...(topics ?? [])].some(
-      field => field?.toLowerCase().includes(qlc)
-    );
+    const lowerQ = q.toLowerCase();
+    return [name, full_name, description, ...(topics || [])]
+      .some(field => field?.toLowerCase().includes(lowerQ));
   });
 }
 
-function getPaginated(items: Item[], page = 0, size = 10) {
-  return items.slice(page * size, page * size + size);
+function getPaginated(items: Item[], page: number = 0, size: number = 10): Item[] {
+  const start = page * size;
+  return items.slice(start, start + size);
 }
 
-function findItem(items: Item[], owner: string, repo: string) {
-  owner = owner.toLowerCase();
-  repo = repo.toLowerCase();
-  return items.find(
-    ({ owner: o, name, full_name }) =>
-      (o?.toLowerCase() === owner && name?.toLowerCase() === repo) ||
-      full_name?.toLowerCase() === `${owner}/${repo}`
+function findItem(items: Item[], owner: string, repo: string): Item | undefined {
+  return items.find(({ owner: o, name, full_name }) =>
+    (o?.toLowerCase() === owner && name?.toLowerCase() === repo) ||
+    full_name?.toLowerCase() === `${owner}/${repo}`
   );
 }
 
 function parseRange(str: string | null, max: number): [number, number] {
-  const m = str?.match(/^(\d+)\.\.(\d+)$/);
-  const [start, end] = m ? [parseInt(m[1]), parseInt(m[2])] : [0, 10];
+  const match = str?.match(/^(\d+)\.\.(\d+)$/);
+  const [start, end] = match
+    ? [parseInt(match[1]), parseInt(match[2])]
+    : [0, 10];
   return [Math.max(0, start), Math.min(max, end)];
 }
 
 serve({
   port: 7860,
-  fetch(req) {
+  fetch(req: Request): Response | Promise<Response> {
     const url = new URL(req.url);
     const { pathname, searchParams } = url;
     const q = searchParams.get("q")?.trim().toLowerCase() ?? null;
     const filter = searchParams.get("filter")?.trim().toLowerCase() ?? null;
 
-    if (req.method === "OPTIONS")
+    if (req.method === "OPTIONS") {
       return new Response(null, {
         status: 204,
         headers: {
@@ -88,17 +81,23 @@ serve({
           "Access-Control-Allow-Headers": "Content-Type",
         },
       });
+    }
 
-    if (pathname === "/api/searchPackages")
-      return Response.json(filterItems(packages, q, filter).slice(0, 25), { headers: corsHeaders });
+    if (pathname === "/api/searchPackages") {
+      const result = filterItems(packages, q, filter).slice(0, 25);
+      return Response.json(result, { headers: corsHeaders });
+    }
 
-    if (pathname === "/api/searchPrograms")
-      return Response.json(filterItems(programs, q, filter).slice(0, 25), { headers: corsHeaders });
+    if (pathname === "/api/searchPrograms") {
+      const result = filterItems(programs, q, filter).slice(0, 25);
+      return Response.json(result, { headers: corsHeaders });
+    }
 
     if (pathname === "/api/infiniteScrollPackages") {
       const page = parseInt(searchParams.get("pageNumber") || "0", 10);
       if (isNaN(page) || page < 0)
         return Response.json({ error: "Invalid page number" }, { status: 400, headers: corsHeaders });
+
       return Response.json(getPaginated(packages, page), { headers: corsHeaders });
     }
 
@@ -106,12 +105,13 @@ serve({
       const page = parseInt(searchParams.get("pageNumber") || "0", 10);
       if (isNaN(page) || page < 0)
         return Response.json({ error: "Invalid page number" }, { status: 400, headers: corsHeaders });
+
       return Response.json(getPaginated(programs, page), { headers: corsHeaders });
     }
 
-    const programMatch = pathname.match(/^\/api\/programs\/([^/]+)\/([^/]+)$/);
+    const programMatch = pathname.match(/^\/api\/programs\/([^\/]+)\/([^\/]+)$/);
     if (programMatch) {
-      const [, owner, repo] = programMatch.map(s => s.toLowerCase());
+      const [_, owner, repo] = programMatch.map(s => s.toLowerCase());
       const found = findItem(programs, owner, repo);
       return Response.json(found || { error: "Program not found" }, {
         status: found ? 200 : 404,
@@ -119,9 +119,9 @@ serve({
       });
     }
 
-    const packageMatch = pathname.match(/^\/api\/packages\/([^/]+)\/([^/]+)$/);
+    const packageMatch = pathname.match(/^\/api\/packages\/([^\/]+)\/([^\/]+)$/);
     if (packageMatch) {
-      const [, owner, repo] = packageMatch.map(s => s.toLowerCase());
+      const [_, owner, repo] = packageMatch.map(s => s.toLowerCase());
       const found = findItem(packages, owner, repo);
       return Response.json(found || { error: "Package not found" }, {
         status: found ? 200 : 404,
@@ -129,18 +129,34 @@ serve({
       });
     }
 
-    if (pathname === "/api/indexDetailsPackages" || pathname === "/api/indexDetailsPrograms") {
-      const section = searchParams.get("section");
-      if (section !== "latestRepos" && section !== "mostUsed")
+    if (pathname === "/api/indexDetailsPackages") {
+      let section = searchParams.get("section");
+      if (section !== "latestRepos" && section !== "mostUsed") {
+        return Response.json({ error: "Invalid section" }, { status: 400, headers: corsHeaders });
+      }
+      // Map 'latestRepos' to 'latest' for sorting
+      const sortKey = section === "latestRepos" ? "latest" : "mostUsed";
+      let data = sorted.packages[sortKey as keyof typeof sorted.packages] ?? packages;
+      const [start, end] = parseRange(searchParams.get("range"), data.length);
+      return Response.json(data.slice(start, end), { headers: corsHeaders });
+    }
+
+    if (pathname === "/api/indexDetailsPrograms") {
+      let section = searchParams.get("section");
+      if (section !== "latestRepos" && section !== "mostUsed") {
         return Response.json({ error: "Invalid section" }, { status: 400, headers: corsHeaders });
-      const key = section === "latestRepos" ? "latest" : "mostUsed";
-      const which = pathname.includes("Packages") ? "packages" : "programs";
-      const data = sorted[which as "packages" | "programs"][key as "latest" | "mostUsed"] ?? (which === "packages" ? packages : programs);
+      }
+      // Map 'latestRepos' to 'latest' for sorting
+      const sortKey = section === "latestRepos" ? "latest" : "mostUsed";
+      let data = sorted.programs[sortKey as keyof typeof sorted.programs] ?? programs;
       const [start, end] = parseRange(searchParams.get("range"), data.length);
       return Response.json(data.slice(start, end), { headers: corsHeaders });
     }
 
-    return new Response("Not Found", { status: 404, headers: corsHeaders });
+    return new Response("Not Found", {
+      status: 404,
+      headers: corsHeaders,
+    });
   },
 });