revisions

Author: AmirSa12

packages/app/app/components/RepoSearch.vue

@@ -1,51 +1,37 @@
 <script lang="ts" setup>
 import type { RepoNode } from "../../server/utils/types";
 const search = useSessionStorage("search", "");
-const searchResults = ref<
-  Array<{
-    id: string;
-    name: string;
-    owner: { login: string; avatarUrl: string };
-    stars?: number;
-  }>
->([]);
+const searchResults = ref<RepoNode[]>([]);
 const isLoading = ref(false);
 
-let activeController: AbortController | null = null;
-let searchToken = 0;
+const activeController = ref<AbortController | null>(null);
 const throttledSearch = useThrottle(search, 500, true, false);
 
 watch(
   throttledSearch,
   async (newValue) => {
-    activeController?.abort();
+    activeController.value?.abort();
     searchResults.value = [];
     if (!newValue) {
       isLoading.value = false;
       return;
     }
 
-    searchToken++;
-    const currentToken = searchToken;
     isLoading.value = true;
-    activeController = new AbortController();
+    activeController.value = new AbortController();
     try {
       const response = await fetch(
         `/api/repo/search?text=${encodeURIComponent(newValue)}`,
-        { signal: activeController.signal },
+        { signal: activeController.value.signal },
       );
       const data = (await response.json()) as { nodes?: RepoNode[] };
-      if (currentToken === searchToken) {
-        searchResults.value = data.nodes ? data.nodes : [];
-      }
+      searchResults.value = data.nodes ? data.nodes : [];
     } catch (err: any) {
       if (err.name !== "AbortError") {
         console.error(err);
       }
     } finally {
-      if (currentToken === searchToken) {
-        isLoading.value = false;
-      }
+      isLoading.value = false;
     }
   },
   { immediate: false },

packages/app/server/api/repo/search.get.ts

@@ -35,10 +35,8 @@ export default defineEventHandler(async (event) => {
         ownerLogin,
         searchText,
       );
-      const includes =
-        repoName.includes(searchText) || ownerLogin.includes(searchText);
 
-      if (includes || nameScore > 0.5 || ownerScore > 0.5) {
+      if (nameScore > 0.5 || ownerScore > 0.5) {
         matches.push({
           id: repository.id,
           name: repository.name,
@@ -47,7 +45,7 @@ export default defineEventHandler(async (event) => {
             avatarUrl: repository.owner.avatar_url,
           },
           stars: repository.stargazers_count || 0,
-          score: Math.max(nameScore, ownerScore, includes ? 1 : 0),
+          score: Math.max(nameScore, ownerScore),
         });
       }
     });